Packman Build Service PMBS

Changes of Revision 4

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/ISSUE_TEMPLATE/bug_report.md Deleted

@@ -1,29 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve. On the next screen, please fill in the template provided in the post description.
----
-
-### Problem description:
-
-Please replace this text with a description of the problem. Include any steps necessary to reproduce the problem.
-
-### HandBrake version (e.g., 1.3.0):
-
-Please replace this text with the version of HandBrake you are running.
-
-### Operating system and version (e.g., Ubuntu 19.10, macOS 10.15 Catalina, Windows 10 1909):
-
-Please replace this text with the version of the operation system you are running.
-
-### Error message text and/or screenshot:
-
-Please provide any error messages or screenshots that may help.
-
-### HandBrake Activity Log:
-
-An Activity Log is required for support. Please read https://handbrake.fr/docs/en/latest/help/activity-log.html for more information.
-
-~~~
-Please replace this text with the Activity Log, or upload the log file to Github by dragging and dropping the file on this post.
-Leave the ~ marks above and below.
-~~~

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/ISSUE_TEMPLATE/feature_request.md Deleted

@@ -1,25 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project. Please note, requesting third-party library updates is not required; we periodically update these in batches.
----
-
-### Description of the feature or enhancement you'd like to see in HandBrake:
-
-Please replace this text with information about the feature request you'd like to see implemented and why.
-
-### What version of HandBrake are you currently running (e.g., 1.3.0)?
-
-Please replace this text with the version of HandBrake that you are currently running. 
-
-### What operating system and version are you running (e.g., Ubuntu 19.10, macOS 10.15 Catalina, Windows 10 1909)?
-
-Please replace this text with the version of the operation system you are running.
-
-### HandBrake Activity Log:
-
-If this request is related to an error or unsupported file, an Activity Log will help us track down what exactly is not working properly or not implemented. Please read https://handbrake.fr/docs/en/latest/help/activity-log.html for more information.
-
-~~~
-Please replace this text with the Activity Log, or upload the log file to Github by dragging and dropping the file on this post.
-Leave the ~ marks above and below.
-~~~

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/ISSUE_TEMPLATE/translate_request.md Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/GNUmakefile Deleted

@@ -1,130 +0,0 @@
-## generated by configure on Fri Jan 10 20:23:31 2020
-
-CONF.args                  = --prefix=/usr --enable-x265 --enable-numa --enable-nvenc --enable-qsv
-
-HB.title                   = HandBrake 20200110131950-073c2fb-master (2020011001)
-HB.name                    = HandBrake
-HB.name.lower              = handbrake
-HB.name.upper              = HANDBRAKE
-HB.acro.lower              = hb
-HB.acro.upper              = HB
-HB.url.website             = https://handbrake.fr
-HB.url.community           = https://forum.handbrake.fr
-HB.url.irc                 = irc://irc.freenode.net/handbrake
-HB.url.appcast             = https://handbrake.fr/appcast_unstable.xml
-HB.url.appnote             = https://handbrake.fr/appcast/unstable.html
-HB.version.major           = 0
-HB.version.minor           = 0
-HB.version.point           = 0
-HB.version.suffix          =
-HB.version                 = 20200110131950-073c2fb-master
-HB.debversion              = 20200110131950-073c2fb-master
-HB.version.hex             = 0000000000002741
-HB.build                   = 2020011001
-HB.repo.url                = https://github.com/HandBrake/HandBrake.git
-HB.repo.tag                =
-HB.repo.rev                = 10049
-HB.repo.hash               = 073c2fb84b3ead86d2f2b28cbd737bb936cc0696
-HB.repo.shorthash          = 073c2fb
-HB.repo.branch             = master
-HB.repo.remote             = origin
-HB.repo.type               = developer
-HB.repo.official           = 1
-HB.repo.date               = 2020-01-10 13:19:50
-
-BUILD.spec                 = x86_64-pc-linux-gnu
-BUILD.machine              = x86_64
-BUILD.vendor               = pc
-BUILD.system               = linux
-BUILD.systemf              = Linux
-BUILD.release              =
-BUILD.extra                = gnu
-BUILD.title                = Linux x86_64
-BUILD.ncpu                 = 8
-BUILD.jobs                 = 8
-BUILD.date                 = Fri Jan 10 19:23:30 2020
-
-HOST.spec                  = x86_64-pc-linux-gnu
-HOST.machine               = x86_64
-HOST.vendor                = pc
-HOST.system                = linux
-HOST.systemf               = Linux
-HOST.release               =
-HOST.extra                 = gnu
-HOST.title                 = Linux x86_64
-HOST.cross                 = 0
-HOST.cross.prefix          =
-HOST.arch                  = x86_64
-
-SRC                        = ..
-SRC/                       = ../
-BUILD                      = .
-BUILD/                     = ./
-PREFIX                     = /usr
-PREFIX/                    = /usr/
-
-SECURITY.sandbox           = 0
-SECURITY.harden            = 0
-
-FEATURE.asm                = 0
-FEATURE.fdk_aac            = 0
-FEATURE.ffmpeg_aac         = 1
-FEATURE.flatpak            = 0
-FEATURE.gtk4               = 0
-FEATURE.gtk                = 1
-FEATURE.gtk.mingw          = 0
-FEATURE.gtk.update.checks  = 1
-FEATURE.gst                = 1
-FEATURE.nvenc              = 1
-FEATURE.qsv                = 1
-FEATURE.vce                = 0
-FEATURE.x265               = 1
-FEATURE.numa               = 1
-
-HAS.strerror_r             = 1
-
-## define debug mode and optimize before other includes
-## since it is tested in some module.defs
-GCC.g                      = none
-GCC.O                      = speed
-
-## include definitions
-include $(SRC/)make/include/main.defs
-
-AR.exe                     = /usr/bin/ar
-CP.exe                     = /usr/bin/cp
-M4.exe                     = /usr/bin/m4
-MKDIR.exe                  = /usr/bin/mkdir
-PATCH.exe                  = /usr/bin/patch
-RM.exe                     = /usr/bin/rm
-RANLIB.exe                 = /usr/bin/ranlib
-STRIP.exe                  = /usr/bin/strip
-TAR.exe                    = /usr/bin/tar
-PYTHON.exe                 = /usr/bin/python3
-GCC.gcc                    = /usr/bin/gcc
-GMAKE.exe                  = /usr/bin/gmake
-AUTOCONF.exe               = /usr/bin/autoconf
-AUTOMAKE.exe               = /usr/bin/automake
-LIBTOOL.exe                = /usr/bin/libtool
-LIPO.exe                   = lipo
-PKGCONFIG.exe              = /usr/bin/pkg-config
-MESON.exe                  = /usr/bin/meson
-NASM.exe                   = /usr/bin/nasm
-NINJA.exe                  = /usr/bin/ninja
-XCODEBUILD.exe             = xcodebuild
-CMAKE.exe                  = /usr/bin/cmake
-
-GCC.archs                  = x86_64
-GCC.sysroot                =
-GCC.minver                 =
-GCC.W.extra                = no-format-truncation
-LIBHB.GCC.D               += ARCH_X86_64
-
-## include custom definitions
--include $(SRC/)custom.defs
--include $(BUILD/)GNUmakefile.custom.defs
-
-## include rules
-include $(SRC/)make/include/main.rules
--include $(SRC/)custom.rules
--include $(BUILD/)GNUmakefile.custom.rules

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/GNUmakefile~ Deleted

@@ -1,130 +0,0 @@
-## generated by configure on Tue Nov 12 12:13:52 2019
-
-CONF.args                  =
-
-HB.title                   = HandBrake 1.3.0 (2019111200)
-HB.name                    = HandBrake
-HB.name.lower              = handbrake
-HB.name.upper              = HANDBRAKE
-HB.acro.lower              = hb
-HB.acro.upper              = HB
-HB.url.website             = https://handbrake.fr
-HB.url.community           = https://forum.handbrake.fr
-HB.url.irc                 = irc://irc.freenode.net/handbrake
-HB.url.appcast             = https://handbrake.fr/appcast.xml
-HB.url.appnote             = https://handbrake.fr/appcast/stable.html
-HB.version.major           = 1
-HB.version.minor           = 3
-HB.version.point           = 0
-HB.version.suffix          =
-HB.version                 = 1.3.0
-HB.debversion              = 1.3.0
-HB.version.hex             = 0001030000000000
-HB.build                   = 2019111200
-HB.repo.url                = https://github.com/HandBrake/HandBrake.git
-HB.repo.tag                = 1.3.0
-HB.repo.rev                = 0
-HB.repo.hash               = 4672248655ddd687161bacdb539c208abde15c59
-HB.repo.shorthash          = 4672248
-HB.repo.branch             =
-HB.repo.remote             = https://github.com/HandBrake/HandBrake.git
-HB.repo.type               = release
-HB.repo.official           = 1
-HB.repo.date               = 2019-11-09 20:44:32
-
-BUILD.spec                 = x86_64-pc-linux-gnu
-BUILD.machine              = x86_64
-BUILD.vendor               = pc
-BUILD.system               = linux
-BUILD.systemf              = Linux
-BUILD.release              =
-BUILD.extra                = gnu
-BUILD.title                = Linux x86_64
-BUILD.ncpu                 = 8
-BUILD.jobs                 = 8
-BUILD.date                 = Tue Nov 12 11:13:52 2019
-
-HOST.spec                  = x86_64-pc-linux-gnu
-HOST.machine               = x86_64
-HOST.vendor                = pc
-HOST.system                = linux
-HOST.systemf               = Linux
-HOST.release               =
-HOST.extra                 = gnu
-HOST.title                 = Linux x86_64
-HOST.cross                 = 0
-HOST.cross.prefix          =
-HOST.arch                  = x86_64
-
-SRC                        = ..
-SRC/                       = ../
-BUILD                      = .
-BUILD/                     = ./
-PREFIX                     = /usr/local
-PREFIX/                    = /usr/local/
-
-SECURITY.sandbox           = 0
-SECURITY.harden            = 0
-
-FEATURE.asm                = 0
-FEATURE.fdk_aac            = 0
-FEATURE.ffmpeg_aac         = 1
-FEATURE.flatpak            = 0
-FEATURE.gtk4               = 0
-FEATURE.gtk                = 1
-FEATURE.gtk.mingw          = 0
-FEATURE.gtk.update.checks  = 1
-FEATURE.gst                = 1
-FEATURE.nvenc              = 1
-FEATURE.qsv                = 0
-FEATURE.vce                = 0
-FEATURE.x265               = 1
-FEATURE.numa               = 1
-
-HAS.strerror_r             = 1
-
-## define debug mode and optimize before other includes
-## since it is tested in some module.defs
-GCC.g                      = none
-GCC.O                      = speed
-
-## include definitions
-include $(SRC/)make/include/main.defs
-
-AR.exe                     = /usr/bin/ar
-CP.exe                     = /usr/bin/cp
-M4.exe                     = /usr/bin/m4
-MKDIR.exe                  = /usr/bin/mkdir
-PATCH.exe                  = /usr/bin/patch
-RM.exe                     = /usr/bin/rm
-RANLIB.exe                 = /usr/bin/ranlib
-STRIP.exe                  = /usr/bin/strip
-TAR.exe                    = /usr/bin/tar
-PYTHON.exe                 = /usr/bin/python3
-GCC.gcc                    = /usr/bin/gcc
-GMAKE.exe                  = /usr/bin/gmake
-AUTOCONF.exe               = /usr/bin/autoconf
-AUTOMAKE.exe               = /usr/bin/automake
-LIBTOOL.exe                = /usr/bin/libtool
-LIPO.exe                   = lipo
-PKGCONFIG.exe              = /usr/bin/pkg-config
-MESON.exe                  = /usr/bin/meson
-NASM.exe                   = /usr/bin/nasm
-NINJA.exe                  = /usr/bin/ninja
-XCODEBUILD.exe             = xcodebuild
-CMAKE.exe                  = /usr/bin/cmake
-
-GCC.archs                  = x86_64
-GCC.sysroot                =
-GCC.minver                 =
-GCC.W.extra                = no-format-truncation
-LIBHB.GCC.D               += ARCH_X86_64
-
-## include custom definitions
--include $(SRC/)custom.defs
--include $(BUILD/)GNUmakefile.custom.defs
-
-## include rules
-include $(SRC/)make/include/main.rules
--include $(SRC/)custom.rules
--include $(BUILD/)GNUmakefile.custom.rules

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/distfile.cfg Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/log Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/log/build.txt Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/log/config.info.txt Deleted

@@ -1,44 +0,0 @@
-probe: build tuple...(pass) x86_64-pc-linux-gnu
-find: ar...(pass) /usr/bin/ar
-find: cp...(pass) /usr/bin/cp
-find: gm4...(pass) /usr/bin/m4
-find: mkdir...(pass) /usr/bin/mkdir
-find: gpatch...(pass) /usr/bin/patch
-find: rm...(pass) /usr/bin/rm
-find: ranlib...(pass) /usr/bin/ranlib
-find: strip...(pass) /usr/bin/strip
-find: gtar...(pass) /usr/bin/tar
-find: python3...(pass) /usr/bin/python3
-find: gcc...(pass) /usr/bin/gcc
-find: gmake...(pass) /usr/bin/gmake
-find: autoconf...(pass) /usr/bin/autoconf
-find: automake...(pass) /usr/bin/automake
-find: libtool...(pass) /usr/bin/libtool
-find: lipo...(fail) not found
-find: pkg-config...(pass) /usr/bin/pkg-config
-find: meson...(pass) /usr/bin/meson
-find: nasm...(pass) /usr/bin/nasm
-find: ninja-build...(pass) /usr/bin/ninja
-find: xcodebuild...(fail) not found
-compute: available architectures...(pass) x86_64
-probe: number of CPU cores...(pass) 8
-probe: repo info...(pass) https://github.com/HandBrake/HandBrake.git
-compute: project data...(pass) HandBrake (developer)
-version probe: autoconf 2.69.0...(pass) 2.69
-version probe: automake 1.15.0...(pass) 1.16.1
-version probe: pkg-config 0.29.0...(pass) 1.6.3
-version probe: meson 0.47.0...(pass) 0.51.2
-version probe: nasm 2.13.0...(pass) 2.14.02
-compute: host tuple...(pass) x86_64-pc-linux-gnu
-find: cmake...(pass) /usr/bin/cmake
-version probe: cmake 2.8.12...(pass) 3.16.2
-probe: numa...(pass) 
-probe: strerror_r...(pass) 
-probe: checking for -Wno-format-truncation...(pass) end
-compute: makevar SRC/    = ..
-compute: makevar BUILD/  = .
-compute: makevar PREFIX/ = /usr
-chdir: ./build
-write: GNUmakefile
-write: project/handbrake.m4
-write: distfile.cfg

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/log/config.verbose.txt Deleted

@@ -1,120 +0,0 @@
-probe: build tuple...(pass) x86_64-pc-linux-gnu
- + ./make/config.guess
- : b'x86_64-pc-linux-gnu'
-find: ar...(pass) /usr/bin/ar
- : name0 = ar
-find: cp...(pass) /usr/bin/cp
- : name0 = cp
-find: gm4...(pass) /usr/bin/m4
- : name0 = gm4
- : name1 = m4
-find: mkdir...(pass) /usr/bin/mkdir
- : name0 = mkdir
-find: gpatch...(pass) /usr/bin/patch
- : name0 = gpatch
- : name1 = patch
-find: rm...(pass) /usr/bin/rm
- : name0 = rm
-find: ranlib...(pass) /usr/bin/ranlib
- : name0 = ranlib
-find: strip...(pass) /usr/bin/strip
- : name0 = strip
-find: gtar...(pass) /usr/bin/tar
- : name0 = gtar
- : name1 = tar
-find: python3...(pass) /usr/bin/python3
- : name0 = python3
-find: gcc...(pass) /usr/bin/gcc
- : name0 = gcc
-find: gmake...(pass) /usr/bin/gmake
- : name0 = gmake
- : name1 = make
-find: autoconf...(pass) /usr/bin/autoconf
- : name0 = autoconf
-find: automake...(pass) /usr/bin/automake
- : name0 = automake
-find: libtool...(pass) /usr/bin/libtool
- : name0 = libtool
-find: lipo...(fail) not found
- : name0 = lipo
-find: pkg-config...(pass) /usr/bin/pkg-config
- : name0 = pkg-config
-find: meson...(pass) /usr/bin/meson
- : name0 = meson
-find: nasm...(pass) /usr/bin/nasm
- : name0 = nasm
-find: ninja-build...(pass) /usr/bin/ninja
- : name0 = ninja-build
- : name1 = ninja
-find: xcodebuild...(fail) not found
- : name0 = xcodebuild
-compute: available architectures...(pass) x86_64
- : <NO-OUTPUT>
-probe: number of CPU cores...(pass) 8
- : <NO-OUTPUT>
-probe: repo info...(pass) https://github.com/HandBrake/HandBrake.git
- + ./scripts/repo-info.sh .
- : b'URL=https://github.com/HandBrake/HandBrake.git'
- : b'HASH=073c2fb84b3ead86d2f2b28cbd737bb936cc0696'
- : b'SHORTHASH=073c2fb84'
- : b'REV=10049'
- : b'BRANCH=master'
- : b'REMOTE=origin'
- : b'DATE=2020-01-10 14:19:50 +0100'
-compute: project data...(pass) HandBrake (developer)
- : <NO-OUTPUT>
-version probe: autoconf 2.69.0...(pass) 2.69
- + /usr/bin/autoconf --version
- : b'autoconf (GNU Autoconf) 2.69'
- : b'Copyright (C) 2012 Free Software Foundation, Inc.'
- : b'License GPLv3+/Autoconf: GNU GPL version 3 or later'
- : b'<http://gnu.org/licenses/gpl.html>, <http://gnu.org/licenses/exceptions.html>'
- : b'This is free software: you are free to change and redistribute it.'
- : b'There is NO WARRANTY, to the extent permitted by law.'
- : b''
- : b'Written by David J. MacKenzie and Akim Demaille.'
-version probe: automake 1.15.0...(pass) 1.16.1
- + /usr/bin/automake --version
- : b'automake (GNU automake) 1.16.1'
- : b'Copyright (C) 2018 Free Software Foundation, Inc.'
- : b'License GPLv2+: GNU GPL version 2 or later <https://gnu.org/licenses/gpl-2.0.html>'
- : b'This is free software: you are free to change and redistribute it.'
- : b'There is NO WARRANTY, to the extent permitted by law.'
- : b''
- : b'Written by Tom Tromey <tromey@redhat.com>'
- : b' and Alexandre Duret-Lutz <adl@gnu.org>.'
-version probe: pkg-config 0.29.0...(pass) 1.6.3
- + /usr/bin/pkg-config --version
- : b'1.6.3'
-version probe: meson 0.47.0...(pass) 0.51.2
- + /usr/bin/meson --version
- : b'0.51.2'
-version probe: nasm 2.13.0...(pass) 2.14.02
- + /usr/bin/nasm --version
- : b'NASM version 2.14.02 compiled on Nov 30 2019'
-compute: host tuple...(pass) x86_64-pc-linux-gnu
- : <NO-OUTPUT>
-find: cmake...(pass) /usr/bin/cmake
- : name0 = cmake
-version probe: cmake 2.8.12...(pass) 3.16.2
- + /usr/bin/cmake --version
- : b'cmake version 3.16.2'
- : b''
- : b'CMake suite maintained and supported by Kitware (kitware.com/cmake).'
-probe: numa...(pass) 
- : b'-lnuma '
-probe: strerror_r...(pass) 
- + /usr/bin/gcc
- : <NO-OUTPUT>
-probe: checking for -Wno-format-truncation...(pass) end
- + /usr/bin/gcc -O2 -Werror -Wno-format-truncation -S -o /dev/null -xc /dev/null > /dev/null 2>&1
- : <NO-OUTPUT>
-compute: makevar SRC/ = ..
-compute: makevar BUILD/ = .
-compute: makevar PREFIX/ = /usr
-chdir: ./build
-write: GNUmakefile
-write: project/handbrake.m4
-write: distfile.cfg
-write: log/config.info.txt
-write: log/config.verbose.txt

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/project Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/build/project/handbrake.m4 Deleted

@@ -1,116 +0,0 @@
-dnl generated by configure on Fri Jan 10 20:23:31 2020
-dnl
-define(<<__CONF_args>>, <<--prefix=/usr --enable-x265 --enable-numa --enable-nvenc --enable-qsv>>)dnl
-dnl
-define(<<__HB_title>>, <<HandBrake 20200110131950-073c2fb-master (2020011001)>>)dnl
-define(<<__HB_name>>, <<HandBrake>>)dnl
-define(<<__HB_name_lower>>, <<handbrake>>)dnl
-define(<<__HB_name_upper>>, <<HANDBRAKE>>)dnl
-define(<<__HB_acro_lower>>, <<hb>>)dnl
-define(<<__HB_acro_upper>>, <<HB>>)dnl
-define(<<__HB_url_website>>, <<https://handbrake.fr>>)dnl
-define(<<__HB_url_community>>, <<https://forum.handbrake.fr>>)dnl
-define(<<__HB_url_irc>>, <<irc://irc.freenode.net/handbrake>>)dnl
-define(<<__HB_url_appcast>>, <<https://handbrake.fr/appcast_unstable.xml>>)dnl
-define(<<__HB_url_appnote>>, <<https://handbrake.fr/appcast/unstable.html>>)dnl
-define(<<__HB_version_major>>, <<0>>)dnl
-define(<<__HB_version_minor>>, <<0>>)dnl
-define(<<__HB_version_point>>, <<0>>)dnl
-define(<<__HB_version_suffix>>, <<>>)dnl
-define(<<__HB_version>>, <<20200110131950-073c2fb-master>>)dnl
-define(<<__HB_debversion>>, <<20200110131950-073c2fb-master>>)dnl
-define(<<__HB_version_hex>>, <<0000000000002741>>)dnl
-define(<<__HB_build>>, <<2020011001>>)dnl
-define(<<__HB_repo_url>>, <<https://github.com/HandBrake/HandBrake.git>>)dnl
-define(<<__HB_repo_tag>>, <<>>)dnl
-define(<<__HB_repo_rev>>, <<10049>>)dnl
-define(<<__HB_repo_hash>>, <<073c2fb84b3ead86d2f2b28cbd737bb936cc0696>>)dnl
-define(<<__HB_repo_shorthash>>, <<073c2fb>>)dnl
-define(<<__HB_repo_branch>>, <<master>>)dnl
-define(<<__HB_repo_remote>>, <<origin>>)dnl
-define(<<__HB_repo_type>>, <<developer>>)dnl
-define(<<__HB_repo_official>>, <<1>>)dnl
-define(<<__HB_repo_date>>, <<2020-01-10 13:19:50>>)dnl
-dnl
-define(<<__BUILD_spec>>, <<x86_64-pc-linux-gnu>>)dnl
-define(<<__BUILD_machine>>, <<x86_64>>)dnl
-define(<<__BUILD_vendor>>, <<pc>>)dnl
-define(<<__BUILD_system>>, <<linux>>)dnl
-define(<<__BUILD_systemf>>, <<Linux>>)dnl
-define(<<__BUILD_release>>, <<>>)dnl
-define(<<__BUILD_extra>>, <<gnu>>)dnl
-define(<<__BUILD_title>>, <<Linux x86_64>>)dnl
-define(<<__BUILD_ncpu>>, <<8>>)dnl
-define(<<__BUILD_jobs>>, <<8>>)dnl
-define(<<__BUILD_date>>, <<Fri Jan 10 19:23:30 2020>>)dnl
-dnl
-define(<<__HOST_spec>>, <<x86_64-pc-linux-gnu>>)dnl
-define(<<__HOST_machine>>, <<x86_64>>)dnl
-define(<<__HOST_vendor>>, <<pc>>)dnl
-define(<<__HOST_system>>, <<linux>>)dnl
-define(<<__HOST_systemf>>, <<Linux>>)dnl
-define(<<__HOST_release>>, <<>>)dnl
-define(<<__HOST_extra>>, <<gnu>>)dnl
-define(<<__HOST_title>>, <<Linux x86_64>>)dnl
-define(<<__HOST_cross>>, <<0>>)dnl
-define(<<__HOST_cross_prefix>>, <<>>)dnl
-define(<<__HOST_arch>>, <<x86_64>>)dnl
-dnl
-define(<<__SRC>>, <<..>>)dnl
-define(<<__SRC/>>, <<../>>)dnl
-define(<<__BUILD>>, <<.>>)dnl
-define(<<__BUILD/>>, <<./>>)dnl
-define(<<__PREFIX>>, <</usr>>)dnl
-define(<<__PREFIX/>>, <</usr/>>)dnl
-dnl
-define(<<__SECURITY_sandbox>>, <<0>>)dnl
-define(<<__SECURITY_harden>>, <<0>>)dnl
-dnl
-define(<<__FEATURE_asm>>, <<0>>)dnl
-define(<<__FEATURE_fdk_aac>>, <<0>>)dnl
-define(<<__FEATURE_ffmpeg_aac>>, <<1>>)dnl
-define(<<__FEATURE_flatpak>>, <<0>>)dnl
-define(<<__FEATURE_gtk4>>, <<0>>)dnl
-define(<<__FEATURE_gtk>>, <<1>>)dnl
-define(<<__FEATURE_gtk_mingw>>, <<0>>)dnl
-define(<<__FEATURE_gtk_update_checks>>, <<1>>)dnl
-define(<<__FEATURE_gst>>, <<1>>)dnl
-define(<<__FEATURE_nvenc>>, <<1>>)dnl
-define(<<__FEATURE_qsv>>, <<1>>)dnl
-define(<<__FEATURE_vce>>, <<0>>)dnl
-define(<<__FEATURE_x265>>, <<1>>)dnl
-define(<<__FEATURE_numa>>, <<1>>)dnl
-dnl
-define(<<__HAS_strerror_r>>, <<1>>)dnl
-define(<<__GCC_g>>, <<none>>)dnl
-define(<<__GCC_O>>, <<speed>>)dnl
-dnl
-dnl
-define(<<__AR_exe>>, <</usr/bin/ar>>)dnl
-define(<<__CP_exe>>, <</usr/bin/cp>>)dnl
-define(<<__M4_exe>>, <</usr/bin/m4>>)dnl
-define(<<__MKDIR_exe>>, <</usr/bin/mkdir>>)dnl
-define(<<__PATCH_exe>>, <</usr/bin/patch>>)dnl
-define(<<__RM_exe>>, <</usr/bin/rm>>)dnl
-define(<<__RANLIB_exe>>, <</usr/bin/ranlib>>)dnl
-define(<<__STRIP_exe>>, <</usr/bin/strip>>)dnl
-define(<<__TAR_exe>>, <</usr/bin/tar>>)dnl
-define(<<__PYTHON_exe>>, <</usr/bin/python3>>)dnl
-define(<<__GCC_gcc>>, <</usr/bin/gcc>>)dnl
-define(<<__GMAKE_exe>>, <</usr/bin/gmake>>)dnl
-define(<<__AUTOCONF_exe>>, <</usr/bin/autoconf>>)dnl
-define(<<__AUTOMAKE_exe>>, <</usr/bin/automake>>)dnl
-define(<<__LIBTOOL_exe>>, <</usr/bin/libtool>>)dnl
-define(<<__LIPO_exe>>, <<lipo>>)dnl
-define(<<__PKGCONFIG_exe>>, <</usr/bin/pkg-config>>)dnl
-define(<<__MESON_exe>>, <</usr/bin/meson>>)dnl
-define(<<__NASM_exe>>, <</usr/bin/nasm>>)dnl
-define(<<__NINJA_exe>>, <</usr/bin/ninja>>)dnl
-define(<<__XCODEBUILD_exe>>, <<xcodebuild>>)dnl
-define(<<__CMAKE_exe>>, <</usr/bin/cmake>>)dnl
-dnl
-define(<<__GCC_archs>>, <<x86_64>>)dnl
-define(<<__GCC_sysroot>>, <<>>)dnl
-define(<<__GCC_minver>>, <<>>)dnl
-define(<<__GCC_W_extra>>, <<no-format-truncation>>)dnl
-define(<<__LIBHB_GCC_D>>, <<ARCH_X86_64>>)dnl

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A00-amf-h264-loop.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A02-corrupt-h264-frames.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A04-videotoolbox.patch Deleted

@@ -1,27 +0,0 @@
-diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
-index 7796a68..e8b6245 100644
---- a/libavcodec/videotoolboxenc.c
-+++ b/libavcodec/videotoolboxenc.c
-@@ -866,6 +866,14 @@ static int get_cv_color_primaries(AVCodecContext *avctx,
-             *primaries = NULL;
-             break;
- 
-+        case AVCOL_PRI_BT470BG:
-+			*primaries = kCVImageBufferColorPrimaries_EBU_3213;
-+            break;
-+
-+        case AVCOL_PRI_SMPTE170M:
-+			*primaries = kCVImageBufferColorPrimaries_SMPTE_C;
-+            break;
-+
-         case AVCOL_PRI_BT709:
-             *primaries = kCVImageBufferColorPrimaries_ITU_R_709_2;
-             break;
-@@ -1302,6 +1310,7 @@ static av_cold int vtenc_init(AVCodecContext *avctx)
-         vtctx->get_param_set_func = compat_keys.CMVideoFormatDescriptionGetHEVCParameterSetAtIndex;
-         if (!vtctx->get_param_set_func) return AVERROR(EINVAL);
-         if (!get_vt_hevc_profile_level(avctx, &profile_level)) return AVERROR(EINVAL);
-+        vtctx->has_b_frames = avctx->max_b_frames > 0;
-     }
- 
-     vtctx->session = NULL;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A05-mov-read-name-track-tag-written-by-movenc.patch Deleted

@@ -1,65 +0,0 @@
-From 375d09561cb88a7002a833614dbd399446479cd1 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins@jetheaddev.com>
-Date: Wed, 31 Jul 2019 15:27:40 -0700
-Subject: PATCH 1/3 mov: read 'name' track tag written by movenc
-
----
- libavformat/mov.c | 26 +++++++++++++++++---------
- 1 file changed, 17 insertions(+), 9 deletions(-)
-
-diff --git a/libavformat/mov.c b/libavformat/mov.c
-index 24de5429d1..1f933cccfd 100644
---- a/libavformat/mov.c
-+++ b/libavformat/mov.c
-@@ -306,6 +306,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
- int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL;
- int raw = 0;
- int num = 0;
-+ AVDictionary *metadata;
- 
- switch (atom.type) {
- case MKTAG( '@','P','R','M'): key = "premiere_version"; raw = 1; break;
-@@ -338,6 +339,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
- return mov_metadata_loci(c, pb, atom.size);
- case MKTAG( 'm','a','n','u'): key = "make"; break;
- case MKTAG( 'm','o','d','l'): key = "model"; break;
-+ case MKTAG( 'n','a','m','e'): key = "title"; raw = 1; break;
- case MKTAG( 'p','c','s','t'): key = "podcast";
- parse = mov_metadata_int8_no_padding; break;
- case MKTAG( 'p','g','a','p'): key = "gapless_playback";
-@@ -514,17 +516,23 @@ retry:
- }
- strstr_size = 0;
- }
-- c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
-- av_dict_set(&c->fc->metadata, key, str, 0);
-+ if (c->trak_index < 0) {
-+ metadata = c->fc->metadata;
-+ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
-+ if (!strcmp(key, "encoder")) {
-+ int major, minor, micro;
-+ if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, &micro) == 3) {
-+ c->handbrake_version = 1000000*major + 1000*minor + micro;
-+ }
-+ }
-+ }
-+ else {
-+ metadata = c->fc->streamsc->trak_index->metadata;
-+ }
-+ av_dict_set(&metadata, key, str, 0);
- if (*language && strcmp(language, "und")) {
- snprintf(key2, sizeof(key2), "%s-%s", key, language);
-- av_dict_set(&c->fc->metadata, key2, str, 0);
-- }
-- if (!strcmp(key, "encoder")) {
-- int major, minor, micro;
-- if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, &micro) == 3) {
-- c->handbrake_version = 1000000*major + 1000*minor + micro;
-- }
-+ av_dict_set(&metadata, key2, str, 0);
- }
- }
- 
--- 
-2.21.0
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A06-movenc-write-3gpp-track-titl-tag.patch Deleted

@@ -1,126 +0,0 @@
-From e9dde141a5fc27df87eb4b3454e34d725b211708 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins@jetheaddev.com>
-Date: Sun, 4 Aug 2019 10:52:30 -0700
-Subject: PATCH 2/3 movenc: write 3gpp track 'titl' tag
-
-Apple software used to use 'name' raw tag for track titles. When they
-rewrote everything with AVFoundation, they switched to using 3gpp 'titl'
-tag for track titles and 'name' no longer works.
----
- libavformat/movenc.c | 78 +++++++++++++++++++++++---------------------
- 1 file changed, 40 insertions(+), 38 deletions(-)
-
-diff --git a/libavformat/movenc.c b/libavformat/movenc.c
-index a96139077b..b1b6ef0e4e 100644
---- a/libavformat/movenc.c
-+++ b/libavformat/movenc.c
-@@ -3077,6 +3077,35 @@ static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)
- return len + 24;
- }
- 
-+static uint16_t language_code(const char *str)
-+{
-+ return (((str0 - 0x60) & 0x1F) << 10) +
-+ (((str1 - 0x60) & 0x1F) << 5) +
-+ (( str2 - 0x60) & 0x1F);
-+}
-+
-+static int mov_write_3gp_udta_tag(AVIOContext *pb, AVDictionary *metadata,
-+ const char *tag, const char *str)
-+{
-+ int64_t pos = avio_tell(pb);
-+ AVDictionaryEntry *t = av_dict_get(metadata, str, NULL, 0);
-+ if (!t || !utf8len(t->value))
-+ return 0;
-+ avio_wb32(pb, 0); /* size */
-+ ffio_wfourcc(pb, tag); /* type */
-+ avio_wb32(pb, 0); /* version + flags */
-+ if (!strcmp(tag, "yrrc"))
-+ avio_wb16(pb, atoi(t->value));
-+ else {
-+ avio_wb16(pb, language_code("eng")); /* language */
-+ avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
-+ if (!strcmp(tag, "albm") &&
-+ (t = av_dict_get(metadata, "track", NULL, 0)))
-+ avio_w8(pb, atoi(t->value));
-+ }
-+ return update_size(pb, pos);
-+}
-+
- static int mov_write_track_metadata(AVIOContext *pb, AVStream *st,
- const char *tag, const char *str)
- {
-@@ -3105,8 +3134,10 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
- if (ret < 0)
- return ret;
- 
-- if (mov->mode & (MODE_MP4|MODE_MOV))
-+ if (mov->mode & (MODE_MP4|MODE_MOV)) {
- mov_write_track_metadata(pb_buf, st, "name", "title");
-+ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
-+ }
- 
- if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
- avio_wb32(pb, size + 8);
-@@ -3680,35 +3711,6 @@ static int ascii_to_wc(AVIOContext *pb, const uint8_t *b)
- return 0;
- }
- 
--static uint16_t language_code(const char *str)
--{
-- return (((str0 - 0x60) & 0x1F) << 10) +
-- (((str1 - 0x60) & 0x1F) << 5) +
-- (( str2 - 0x60) & 0x1F);
--}
--
--static int mov_write_3gp_udta_tag(AVIOContext *pb, AVFormatContext *s,
-- const char *tag, const char *str)
--{
-- int64_t pos = avio_tell(pb);
-- AVDictionaryEntry *t = av_dict_get(s->metadata, str, NULL, 0);
-- if (!t || !utf8len(t->value))
-- return 0;
-- avio_wb32(pb, 0); /* size */
-- ffio_wfourcc(pb, tag); /* type */
-- avio_wb32(pb, 0); /* version + flags */
-- if (!strcmp(tag, "yrrc"))
-- avio_wb16(pb, atoi(t->value));
-- else {
-- avio_wb16(pb, language_code("eng")); /* language */
-- avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
-- if (!strcmp(tag, "albm") &&
-- (t = av_dict_get(s->metadata, "track", NULL, 0)))
-- avio_w8(pb, atoi(t->value));
-- }
-- return update_size(pb, pos);
--}
--
- static int mov_write_chpl_tag(AVIOContext *pb, AVFormatContext *s)
- {
- int64_t pos = avio_tell(pb);
-@@ -3747,14 +3749,14 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
- return ret;
- 
- if (mov->mode & MODE_3GP) {
-- mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");
-- mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
-- mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
-- mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
-- mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
-- mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
-- mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
-- mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "perf", "artist");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "titl", "title");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "auth", "author");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "gnre", "genre");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "dscp", "comment");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "albm", "album");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "cprt", "copyright");
-+ mov_write_3gp_udta_tag(pb_buf, s->metadata, "yrrc", "date");
- mov_write_loci_tag(s, pb_buf);
- } else if (mov->mode == MODE_MOV && !(mov->flags & FF_MOV_FLAG_USE_MDTA)) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
- mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0);
--- 
-2.21.0
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A07-mov-read-3gpp-udta-tags.patch Deleted

@@ -1,160 +0,0 @@
-From 1b02b0afe201cd14a97d83dc08716bf9cc188cb0 Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins@jetheaddev.com>
-Date: Sun, 4 Aug 2019 10:59:38 -0700
-Subject: PATCH 3/3 mov: read 3gpp udta tags
-
----
- libavformat/mov.c | 110 ++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 107 insertions(+), 3 deletions(-)
-
-diff --git a/libavformat/mov.c b/libavformat/mov.c
-index 1f933cccfd..0c365cde3e 100644
---- a/libavformat/mov.c
-+++ b/libavformat/mov.c
-@@ -50,6 +50,7 @@
- #include "libavcodec/flac.h"
- #include "libavcodec/mpegaudiodecheader.h"
- #include "avformat.h"
-+#include "avlanguage.h"
- #include "internal.h"
- #include "avio_internal.h"
- #include "riff.h"
-@@ -295,6 +296,82 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len)
- return 0;
- }
- 
-+static int mov_read_3gp_udta_tag(MOVContext *c, AVIOContext *pb, MOVAtom atom)
-+{
-+ const char *key;
-+ AVDictionary *metadata;
-+ uint16_t langcode = 0;
-+ char key232, language4 = {0};
-+ uint32_t str_size, version;
-+ char *str;
-+
-+ if (atom.size < 6)
-+ return AVERROR_INVALIDDATA;
-+
-+ switch (atom.type) {
-+ case MKTAG( 'a','l','b','m'): key = "album"; break;
-+ case MKTAG( 'a','u','t','h'): key = "author"; break;
-+ case MKTAG( 'c','p','r','t'): key = "copyright"; break;
-+ case MKTAG( 'd','s','c','p'): key = "comment"; break;
-+ case MKTAG( 'g','n','r','e'): key = "genre"; break;
-+ case MKTAG( 'p','e','r','f'): key = "artist"; break;
-+ case MKTAG( 't','i','t','l'): key = "title"; break;
-+ case MKTAG( 'y','r','r','c'): key = "date"; break;
-+ default: return 0;
-+ }
-+
-+ version = avio_rb32(pb); // version + flags
-+ if (version != 0)
-+ return AVERROR_INVALIDDATA;
-+
-+ if (MKTAG( 'y','r','r','c') == atom.type) {
-+ int year;
-+ year = avio_rb16(pb);
-+ str = av_asprintf("%d", year);
-+ if (!str)
-+ return AVERROR(ENOMEM);
-+ } else {
-+ int ret;
-+ const char *tmp;
-+ langcode = avio_rb16(pb);
-+ ff_mov_lang_to_iso639(langcode, language);
-+ tmp = ff_convert_lang_to(language, AV_LANG_ISO639_2_BIBL);
-+ if (!tmp)
-+ return AVERROR_INVALIDDATA;
-+
-+ str_size = atom.size - 6;
-+ if (str_size <= 0 || str_size >= INT_MAX/2)
-+ return AVERROR_INVALIDDATA;
-+
-+ str = av_mallocz(str_size + 1);
-+ if (!str)
-+ return AVERROR(ENOMEM);
-+
-+ ret = ffio_read_size(pb, str, str_size);
-+ if (ret < 0) {
-+ av_free(str);
-+ return ret;
-+ }
-+ strstr_size = 0;
-+ }
-+
-+ if (c->trak_index < 0) {
-+ metadata = c->fc->metadata;
-+ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
-+ }
-+ else {
-+ metadata = c->fc->streamsc->trak_index->metadata;
-+ }
-+ av_dict_set(&metadata, key, str, 0);
-+ if (*language && strcmp(language, "und")) {
-+ snprintf(key2, sizeof(key2), "%s-%s", key, language);
-+ av_dict_set(&metadata, key2, str, 0);
-+ }
-+
-+ av_freep(&str);
-+ return 0;
-+}
-+
- static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
- {
- char tmp_key5;
-@@ -320,15 +397,33 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
- case MKTAG( 'c','a','t','g'): key = "category"; break;
- case MKTAG( 'c','p','i','l'): key = "compilation";
- parse = mov_metadata_int8_no_padding; break;
-- case MKTAG( 'c','p','r','t'): key = "copyright"; break;
-+ case MKTAG( 'c','p','r','t'):
-+ key = "copyright";
-+ if (!c->itunes_metadata) {
-+ int64_t pos = avio_tell(pb);
-+ int ret = mov_read_3gp_udta_tag(c, pb, atom);
-+ if (ret != AVERROR_INVALIDDATA)
-+ return ret;
-+ avio_seek(pb, pos, SEEK_SET);
-+ }
-+ break;
- case MKTAG( 'd','e','s','c'): key = "description"; break;
- case MKTAG( 'd','i','s','k'): key = "disc";
- parse = mov_metadata_track_or_disc_number; break;
- case MKTAG( 'e','g','i','d'): key = "episode_uid";
- parse = mov_metadata_int8_no_padding; break;
- case MKTAG( 'F','I','R','M'): key = "firmware"; raw = 1; break;
-- case MKTAG( 'g','n','r','e'): key = "genre";
-- parse = mov_metadata_gnre; break;
-+ case MKTAG( 'g','n','r','e'):
-+ key = "genre";
-+ parse = mov_metadata_gnre;
-+ if (!c->itunes_metadata) {
-+ int64_t pos = avio_tell(pb);
-+ int ret = mov_read_3gp_udta_tag(c, pb, atom);
-+ if (ret != AVERROR_INVALIDDATA)
-+ return ret;
-+ avio_seek(pb, pos, SEEK_SET);
-+ }
-+ break;
- case MKTAG( 'h','d','v','d'): key = "hd_video";
- parse = mov_metadata_int8_no_padding; break;
- case MKTAG( 'H','M','M','T'):
-@@ -399,6 +494,15 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
- case MKTAG(0xa9,'w','r','n'): key = "warning"; break;
- case MKTAG(0xa9,'w','r','t'): key = "composer"; break;
- case MKTAG(0xa9,'x','y','z'): key = "location"; break;
-+ case MKTAG( 'a','l','b','m'):
-+ case MKTAG( 'a','u','t','h'):
-+ case MKTAG( 'd','s','c','p'):
-+ case MKTAG( 'p','e','r','f'):
-+ case MKTAG( 't','i','t','l'):
-+ case MKTAG( 'y','r','r','c'):
-+ if (!c->itunes_metadata) {
-+ return mov_read_3gp_udta_tag(c, pb, atom);
-+ }
- }
- retry:
- if (c->itunes_metadata && atom.size > 8) {
--- 
-2.21.0
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A08-movenc-write-3gpp-track-names-tags-for-all-available.patch Deleted

@@ -1,77 +0,0 @@
-From defbe24539ad6e2564db84641a84543256f8609f Mon Sep 17 00:00:00 2001
-From: John Stebbins <jstebbins@jetheaddev.com>
-Date: Tue, 6 Aug 2019 11:45:11 -0600
-Subject: PATCH movenc: write 3gpp track names tags for all available
- languages
-
-Metadata keys can have a language suffix. Iterate through all language
-variations of the metadata key.
----
- libavformat/movenc.c | 28 ++++++++++++++++++++++++++--
- 1 file changed, 26 insertions(+), 2 deletions(-)
-
-diff --git a/libavformat/movenc.c b/libavformat/movenc.c
-index b1b6ef0e4e..3d9800d386 100644
---- a/libavformat/movenc.c
-+++ b/libavformat/movenc.c
-@@ -26,6 +26,7 @@
- 
- #include "movenc.h"
- #include "avformat.h"
-+#include "avlanguage.h"
- #include "avio_internal.h"
- #include "riff.h"
- #include "avio.h"
-@@ -3089,15 +3090,25 @@ static int mov_write_3gp_udta_tag(AVIOContext *pb, AVDictionary *metadata,
- {
- int64_t pos = avio_tell(pb);
- AVDictionaryEntry *t = av_dict_get(metadata, str, NULL, 0);
-+
- if (!t || !utf8len(t->value))
- return 0;
-+
- avio_wb32(pb, 0); /* size */
- ffio_wfourcc(pb, tag); /* type */
- avio_wb32(pb, 0); /* version + flags */
- if (!strcmp(tag, "yrrc"))
- avio_wb16(pb, atoi(t->value));
- else {
-- avio_wb16(pb, language_code("eng")); /* language */
-+ int lang = 0, len;
-+ len = strlen(t->key);
-+ if (t->keylen - 4 == '-') {
-+ lang = ff_mov_iso639_to_lang(&t->keylen - 3, 1);
-+ }
-+ if (!lang)
-+ lang = ff_mov_iso639_to_lang("und", 1);
-+
-+ avio_wb16(pb, lang); /* language */
- avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
- if (!strcmp(tag, "albm") &&
- (t = av_dict_get(metadata, "track", NULL, 0)))
-@@ -3135,8 +3146,21 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
- return ret;
- 
- if (mov->mode & (MODE_MP4|MODE_MOV)) {
-+ AVDictionaryEntry *t = NULL;
-+ int und = 0;
-+
- mov_write_track_metadata(pb_buf, st, "name", "title");
-- mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
-+ while ((t = av_dict_get(st->metadata, "title-", t, AV_DICT_IGNORE_SUFFIX))) {
-+ int len = strlen(t->key);
-+ if (len == 10 &&
-+ ff_convert_lang_to(&t->keylen - 3, AV_LANG_ISO639_2_BIBL)) {
-+ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", t->key);
-+ if (!strcmp("und", &t->keylen - 3))
-+ und = 1;
-+ }
-+ }
-+ if (!und)
-+ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
- }
- 
- if ((size = avio_close_dyn_buf(pb_buf, &buf)) > 0) {
--- 
-2.21.0
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A11-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch Deleted

@@ -1,78 +0,0 @@
-From patchwork Mon Jan 14 19:02:20 2019
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: FFmpeg-devel amfenc: Add support for pict_type field
-From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
-X-Patchwork-Id: 11748
-Message-Id: <20190114190220.16236-1-info@xaymar.com>
-To: ffmpeg-devel@ffmpeg.org
-Cc: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
-Date: Mon, 14 Jan 2019 20:02:20 +0100
-
-Adds support for the pict_type field in AVFrame to amf_h264 and amf_h265 simultaneously. This field is needed in cases where the application wishes to override the frame type with another one, such as forcefully inserting a key frame for chapter markers or similar.
-
-Additionally this abuses AV_PICTURE_TYPE_S for marking Skip frames, a special type of frame in AVC, SVC and HEVC which is a flag for the decoder to repeat the last frame.
-
-Signed-off-by: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
----
- libavcodec/amfenc.c | 46 +++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 46 insertions(+)
-
-diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
-index 384d8efc92..eb4b65e4f2 100644
---- a/libavcodec/amfenc.c
-+++ b/libavcodec/amfenc.c
-@@ -680,6 +680,52 @@ int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame)
- break;
- }
- 
-+ // Override Picture Type for Frame
-+ if (avctx->codec->id == AV_CODEC_ID_H264) {
-+ switch (frame->pict_type) {
-+ case AV_PICTURE_TYPE_I:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_I);
-+ break;
-+ case AV_PICTURE_TYPE_P:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_P);
-+ break;
-+ case AV_PICTURE_TYPE_B:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_B);
-+ break;
-+ case AV_PICTURE_TYPE_S:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP);
-+ break;
-+ default:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE);
-+ break;
-+ }
-+ // Keyframe overrides previous assignment.
-+ if (frame->key_frame) {
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR);
-+ }
-+ } else if (avctx->codec->id == AV_CODEC_ID_HEVC) {
-+ switch (frame->pict_type) {
-+ case AV_PICTURE_TYPE_I:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I);
-+ break;
-+ case AV_PICTURE_TYPE_P:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P);
-+ break;
-+ case AV_PICTURE_TYPE_B:
-+ av_log(ctx, AV_LOG_WARNING, "Ignoring B-Frame, unsupported by AMD AMF H.265 Encoder.");
-+ break;
-+ case AV_PICTURE_TYPE_S:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP);
-+ break;
-+ default:
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE);
-+ break;
-+ }
-+ // Keyframe overrides previous assignment.
-+ if (frame->key_frame) {
-+ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR);
-+ }
-+ }
- 
- // submit surface
- res = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)surface);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A12-FFmpeg-devel-Vulkan-support.patch Deleted

@@ -1,78 +0,0 @@
-From patchwork Mon Sep 17 00:00:00 2001
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: FFmpeg-devel amfenc: Add support Vulkan encoder
-From: OvchinnikovDmitrii <ovchinnikov.dmitrii@gmail.com>
-Date: Wed, 5 Jun 2019 02:43:10 +0300
-Subject: PATCH patch.
-
-
----
- libavcodec/amfenc.c | 22 ++++++++++++++++++++--
- libavcodec/amfenc.h | 3 ++-
- 2 files changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
-index 3be9ff9..04d21f2 100644
---- a/libavcodec/amfenc.c
-+++ b/libavcodec/amfenc.c
-@@ -234,6 +234,7 @@ static int amf_init_context(AVCodecContext *avctx)
- ctx->trace->pVtbl->SetWriterLevel(ctx->trace, FFMPEG_AMF_WRITER_ID, AMF_TRACE_TRACE);
- 
- res = ctx->factory->pVtbl->CreateContext(ctx->factory, &ctx->context);
-+ ctx->context1 = NULL;
- AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext() failed with error %d\n", res);
- 
- // If a device was passed to the encoder, try to initialise from that.
-@@ -311,8 +312,19 @@ static int amf_init_context(AVCodecContext *avctx)
- if (res == AMF_OK) {
- av_log(avctx, AV_LOG_VERBOSE, "AMF initialisation succeeded via D3D9.\n");
- } else {
-- av_log(avctx, AV_LOG_ERROR, "AMF initialisation failed via D3D9: error %d.\n", res);
-- return AVERROR(ENOSYS);
-+ AMFGuid guid = IID_AMFContext1();
-+ res = ctx->context->pVtbl->QueryInterface(ctx->context, &guid, (void**)&ctx->context1);
-+ AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "CreateContext1() failed with error %d\n", res);
-+
-+ res = ctx->context1->pVtbl->InitVulkan(ctx->context1, NULL);
-+ if (res != AMF_OK) {
-+ if (res == AMF_NOT_SUPPORTED)
-+ av_log(avctx, AV_LOG_ERROR, "AMF via Vulkan is not supported on the given device.\n");
-+ else
-+ av_log(avctx, AV_LOG_ERROR, "AMF failed to initialise on the given Vulkan device: %d.\n", res);
-+ return AVERROR(ENOSYS);
-+ }
-+ av_log(avctx, AV_LOG_VERBOSE, "AMF initialisation succeeded via Vulkan.\n");
- }
- }
- }
-@@ -373,6 +385,12 @@ int av_cold ff_amf_encode_close(AVCodecContext *avctx)
- ctx->context->pVtbl->Release(ctx->context);
- ctx->context = NULL;
- }
-+
-+ if (ctx->context1) {
-+ ctx->context1->pVtbl->Terminate(ctx->context1);
-+ ctx->context1->pVtbl->Release(ctx->context1);
-+ ctx->context1 = NULL;
-+ }
- av_buffer_unref(&ctx->hw_device_ctx);
- av_buffer_unref(&ctx->hw_frames_ctx);
- 
-diff --git a/libavcodec/amfenc.h b/libavcodec/amfenc.h
-index b136184..ac2ed43 100644
---- a/libavcodec/amfenc.h
-+++ b/libavcodec/amfenc.h
-@@ -53,7 +53,8 @@ typedef struct AmfContext {
- 
- amf_uint64 version; ///< version of AMF runtime
- AmfTraceWriter tracer; ///< AMF writer registered with AMF
-- AMFContext *context; ///< AMF context
-+ AMFContext *context; ///< AMF context
-+ AMFContext1 *context1;
- //encoder
- AMFComponent *encoder; ///< AMF encoder object
- amf_bool eof; ///< flag indicating EOF happened
--- 
-2.18.0.windows.1

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A12-videotoolbox-smpte2084-hlg-transfer.patch Deleted

@@ -1,69 +0,0 @@
-From 391b67fcb58f95b5cc65b75070fd9a3dce4f8ac6 Mon Sep 17 00:00:00 2001
-From: Limin Wang <lance.lmwang@gmail.com>
-Date: Wed, 26 Jun 2019 18:57:59 +0800
-Subject: PATCH lavc/videotoolboxenc: add hdr10, linear, hlg color transfer
- function for videotoolboxenc
-
-Below is the testing ffmpeg command for the setting:
-./ffmpeg -i input.ts -c:v hevc_videotoolbox -color_primaries bt2020 -colorspace bt2020_ncl -color_trc smpte2084 smpte2048.ts
-./ffmpeg -i input.ts -c:v hevc_videotoolbox -color_primaries bt2020 -colorspace bt2020_ncl -color_trc linear linear.ts
-./ffmpeg -i input.ts -c:v hevc_videotoolbox -color_primaries bt2020 -colorspace bt2020_ncl -color_trc arib-std-b67 hlg.ts
-
-Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
-Signed-off-by: Rick Kern <kernrj@gmail.com>
----
- configure | 6 ++++++
- libavcodec/videotoolboxenc.c | 16 ++++++++++++++++
- 2 files changed, 22 insertions(+)
-
-diff --git a/configure b/configure
-index 34c2adb4a4f..3fb8f3521d2 100755
---- a/configure
-+++ b/configure
-@@ -2268,6 +2268,9 @@ TOOLCHAIN_FEATURES="
- TYPES_LIST="
- kCMVideoCodecType_HEVC
- kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange
-+ kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ
-+ kCVImageBufferTransferFunction_ITU_R_2100_HLG
-+ kCVImageBufferTransferFunction_Linear
- socklen_t
- struct_addrinfo
- struct_group_source_req
-@@ -6069,6 +6072,9 @@ enabled videotoolbox && {
- check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices"
- check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVC "-framework CoreMedia"
- check_func_headers CoreVideo/CVPixelBuffer.h kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange "-framework CoreVideo"
-+ check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ "-framework CoreVideo"
-+ check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_ITU_R_2100_HLG "-framework CoreVideo"
-+ check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferTransferFunction_Linear "-framework CoreVideo"
- }
- 
- check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss
-diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
-index ff33c279c3a..ece9d6ea8fb 100644
---- a/libavcodec/videotoolboxenc.c
-+++ b/libavcodec/videotoolboxenc.c
-@@ -915,6 +915,22 @@ static int get_cv_transfer_function(AVCodecContext *avctx,
- *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_240M_1995;
- break;
- 
-+#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ
-+ case AVCOL_TRC_SMPTE2084:
-+ *transfer_fnc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
-+ break;
-+#endif
-+#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR
-+ case AVCOL_TRC_LINEAR:
-+ *transfer_fnc = kCVImageBufferTransferFunction_Linear;
-+ break;
-+#endif
-+#if HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG
-+ case AVCOL_TRC_ARIB_STD_B67:
-+ *transfer_fnc = kCVImageBufferTransferFunction_ITU_R_2100_HLG;
-+ break;
-+#endif
-+
- case AVCOL_TRC_GAMMA22:
- gamma = 2.2;
- *transfer_fnc = kCVImageBufferTransferFunction_UseGamma;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/A13-qsv-dx11.patch Deleted

@@ -1,309 +0,0 @@
-diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
-index 986d4f6022..35879834d8 100644
---- a/libavcodec/qsv.c
-+++ b/libavcodec/qsv.c
-@@ -328,7 +328,7 @@ load_plugin_fail:
- int ff_qsv_init_internal_session(AVCodecContext *avctx, mfxSession *session,
- const char *load_plugins)
- {
-- mfxIMPL impl = MFX_IMPL_AUTO_ANY;
-+ mfxIMPL impl = MFX_IMPL_AUTO_ANY | MFX_IMPL_VIA_D3D11;
- mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } };
- 
- const char *desc;
-@@ -406,6 +406,7 @@ static AVBufferRef *qsv_create_mids(AVBufferRef *hw_frames_ref)
- for (i = 0; i < nb_surfaces; i++) {
- QSVMid *mid = &midsi;
- mid->handle = frames_hwctx->surfacesi.Data.MemId;
-+ mid->texture = frames_hwctx->texture;
- mid->hw_frames_ref = hw_frames_ref1;
- }
- 
-@@ -615,7 +616,14 @@ static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
- static mfxStatus qsv_frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
- {
- QSVMid *qsv_mid = (QSVMid*)mid;
-- *hdl = qsv_mid->handle;
-+
-+ if (qsv_mid->texture) {
-+ mfxHDLPair *pPair = (mfxHDLPair*)hdl;
-+ pPair->first = qsv_mid->texture;
-+ pPair->second = qsv_mid->handle;
-+ } else {
-+ *hdl = qsv_mid->handle;
-+ }
- return MFX_ERR_NONE;
- }
- 
-@@ -624,8 +632,8 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
- {
- static const mfxHandleType handle_types = {
- MFX_HANDLE_VA_DISPLAY,
-- MFX_HANDLE_D3D9_DEVICE_MANAGER,
- MFX_HANDLE_D3D11_DEVICE,
-+ MFX_HANDLE_D3D9_DEVICE_MANAGER,
- };
- AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)device_ref->data;
- AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
-diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
-index b63a7d6a31..e8a766d15e 100644
---- a/libavcodec/qsv_internal.h
-+++ b/libavcodec/qsv_internal.h
-@@ -46,6 +46,8 @@ typedef struct QSVMid {
- AVBufferRef *hw_frames_ref;
- mfxHDL handle;
- 
-+ void *texture;
-+
- AVFrame *locked_frame;
- AVFrame *hw_frame;
- mfxFrameSurface1 surf;
-diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
-index 6670c47579..096770b9ce 100644
---- a/libavutil/hwcontext_d3d11va.c
-+++ b/libavutil/hwcontext_d3d11va.c
-@@ -494,12 +494,12 @@ static void d3d11va_device_uninit(AVHWDeviceContext *hwdev)
- }
- 
- if (device_hwctx->video_device) {
-- ID3D11VideoDevice_Release(device_hwctx->video_device);
-+ //ID3D11VideoDevice_Release(device_hwctx->video_device);
- device_hwctx->video_device = NULL;
- }
- 
- if (device_hwctx->video_context) {
-- ID3D11VideoContext_Release(device_hwctx->video_context);
-+ //ID3D11VideoContext_Release(device_hwctx->video_context);
- device_hwctx->video_context = NULL;
- }
- 
-@@ -510,6 +510,42 @@ static void d3d11va_device_uninit(AVHWDeviceContext *hwdev)
- }
- }
- 
-+static int d3d11va_device_find_qsv_adapter(AVHWDeviceContext *ctx, UINT creationFlags)
-+{
-+ HRESULT hr;
-+ IDXGIAdapter *pAdapter = NULL;
-+ int adapter_id = 0;
-+ IDXGIFactory2 *pDXGIFactory;
-+ hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
-+ while (IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter_id++, &pAdapter) != DXGI_ERROR_NOT_FOUND)
-+ {
-+ ID3D11Device* g_pd3dDevice = NULL;
-+ DXGI_ADAPTER_DESC adapterDesc;
-+
-+ hr = mD3D11CreateDevice(pAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, creationFlags, NULL, 0, D3D11_SDK_VERSION, &g_pd3dDevice, NULL, NULL);
-+ if (FAILED(hr)) {
-+ av_log(ctx, AV_LOG_ERROR, "D3D11CreateDevice returned error\n");
-+ continue;
-+ }
-+
-+ hr = IDXGIAdapter2_GetDesc(pAdapter, &adapterDesc);
-+ if (FAILED(hr)) {
-+ av_log(ctx, AV_LOG_ERROR, "IDXGIAdapter2_GetDesc returned error\n");
-+ continue;
-+ }
-+
-+ if (pAdapter)
-+ IDXGIAdapter_Release(pAdapter);
-+
-+ if (adapterDesc.VendorId == 0x8086) {
-+ IDXGIFactory2_Release(pDXGIFactory);
-+ return adapter_id - 1;
-+ }
-+ }
-+ IDXGIFactory2_Release(pDXGIFactory);
-+ return -1;
-+}
-+
- static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
- AVDictionary *opts, int flags)
- {
-@@ -519,7 +555,9 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
- IDXGIAdapter *pAdapter = NULL;
- ID3D10Multithread *pMultithread;
- UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
-+ int adapter = -1;
- int is_debug = !!av_dict_get(opts, "debug", NULL, 0);
-+ int is_qsv = !!av_dict_get(opts, "d3d11va_qsv", NULL, 0);
- int ret;
- 
- // (On UWP we can't check this.)
-@@ -538,11 +576,22 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
- return AVERROR_UNKNOWN;
- }
- 
-+ if (is_qsv) {
-+ adapter = d3d11va_device_find_qsv_adapter(ctx, creationFlags);
-+ if (adapter < 0) {
-+ av_log(ctx, AV_LOG_ERROR, "Failed to find DX11 adapter with QSV support\n");
-+ return AVERROR_UNKNOWN;
-+ }
-+ }
-+
- if (device) {
-+ adapter = atoi(device);
-+ }
-+
-+ if (adapter >= 0) {
- IDXGIFactory2 *pDXGIFactory;
- hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
- if (SUCCEEDED(hr)) {
-- int adapter = atoi(device);
- if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter)))
- pAdapter = NULL;
- IDXGIFactory2_Release(pDXGIFactory);
-diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
-index 59e4ed9157..56f3ccc94a 100644
---- a/libavutil/hwcontext_qsv.c
-+++ b/libavutil/hwcontext_qsv.c
-@@ -30,6 +30,9 @@
- #if CONFIG_VAAPI
- #include "hwcontext_vaapi.h"
- #endif
-+#if CONFIG_D3D11VA
-+#include "hwcontext_d3d11va.h"
-+#endif
- #if CONFIG_DXVA2
- #include "hwcontext_dxva2.h"
- #endif
-@@ -71,7 +74,7 @@ typedef struct QSVFramesContext {
- AVBufferRef *child_frames_ref;
- mfxFrameSurface1 *surfaces_internal;
- int nb_surfaces_used;
--
-+ void *texture;
- // used in the frame allocator for non-opaque surfaces
- mfxMemId *mem_ids;
- // used in the opaque alloc request for opaque surfaces
-@@ -89,6 +92,9 @@ static const struct {
- #if CONFIG_VAAPI
- { MFX_HANDLE_VA_DISPLAY, AV_HWDEVICE_TYPE_VAAPI, AV_PIX_FMT_VAAPI },
- #endif
-+#if CONFIG_D3D11VA
-+ { MFX_HANDLE_D3D11_DEVICE, AV_HWDEVICE_TYPE_D3D11VA, AV_PIX_FMT_D3D11 },
-+#endif
- #if CONFIG_DXVA2
- { MFX_HANDLE_D3D9_DEVICE_MANAGER, AV_HWDEVICE_TYPE_DXVA2, AV_PIX_FMT_DXVA2_VLD },
- #endif
-@@ -229,6 +235,12 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
- child_device_hwctx->display = (VADisplay)device_priv->handle;
- }
- #endif
-+#if CONFIG_D3D11VA
-+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
-+ AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx;
-+ child_device_hwctx->device = (ID3D11Device*)device_priv->handle;
-+ }
-+#endif
- #if CONFIG_DXVA2
- if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
- AVDXVA2DeviceContext *child_device_hwctx = child_device_ctx->hwctx;
-@@ -255,6 +267,15 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
- child_frames_ctx->width = FFALIGN(ctx->width, 16);
- child_frames_ctx->height = FFALIGN(ctx->height, 16);
- 
-+#if CONFIG_D3D11VA
-+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
-+ AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
-+ if (hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET)
-+ child_frames_hwctx->BindFlags = D3D11_BIND_RENDER_TARGET ;
-+ else
-+ child_frames_hwctx->BindFlags = D3D11_BIND_DECODER;
-+ }
-+#endif
- #if CONFIG_DXVA2
- if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
- AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
-@@ -279,6 +300,18 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
- hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
- }
- #endif
-+#if CONFIG_D3D11VA
-+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
-+ AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
-+ hwctx->texture = child_frames_hwctx->texture;
-+ for (i = 0; i < ctx->initial_pool_size; i++)
-+ s->surfaces_internali.Data.MemId = (mfxMemId)i;
-+ if (child_frames_hwctx->BindFlags == D3D11_BIND_DECODER)
-+ hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
-+ else
-+ hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET;
-+ }
-+#endif
- #if CONFIG_DXVA2
- if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
- AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
-@@ -1074,7 +1107,7 @@ static void qsv_device_free(AVHWDeviceContext *ctx)
- av_freep(&priv);
- }
- 
--static mfxIMPL choose_implementation(const char *device)
-+static mfxIMPL choose_implementation(const char *device, enum AVHWDeviceType child_device_type)
- {
- static const struct {
- const char *name;
-@@ -1103,6 +1136,10 @@ static mfxIMPL choose_implementation(const char *device)
- impl = strtol(device, NULL, 0);
- }
- 
-+ if ( (child_device_type == AV_HWDEVICE_TYPE_D3D11VA) && (impl != MFX_IMPL_SOFTWARE) ) {
-+ impl |= MFX_IMPL_VIA_D3D11;
-+ }
-+
- return impl;
- }
- 
-@@ -1129,6 +1166,15 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx,
- }
- break;
- #endif
-+#if CONFIG_D3D11VA
-+ case AV_HWDEVICE_TYPE_D3D11VA:
-+ {
-+ AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx;
-+ handle_type = MFX_HANDLE_D3D11_DEVICE;
-+ handle = (mfxHDL)child_device_hwctx->device;
-+ }
-+ break;
-+#endif
- #if CONFIG_DXVA2
- case AV_HWDEVICE_TYPE_DXVA2:
- {
-@@ -1231,9 +1277,12 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
- // possible, even when multiple devices and drivers are available.
- av_dict_set(&child_device_opts, "kernel_driver", "i915", 0);
- av_dict_set(&child_device_opts, "driver", "iHD", 0);
-- } else if (CONFIG_DXVA2)
-+ } else if (CONFIG_D3D11VA) {
-+ child_device_type = AV_HWDEVICE_TYPE_D3D11VA;
-+ av_dict_set(&child_device_opts, "d3d11va_qsv", "enabled", 0);
-+ } else if (CONFIG_DXVA2) {
- child_device_type = AV_HWDEVICE_TYPE_DXVA2;
-- else {
-+ } else {
- av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n");
- return AVERROR(ENOSYS);
- }
-@@ -1245,7 +1294,7 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
- 
- child_device = (AVHWDeviceContext*)priv->child_device_ctx->data;
- 
-- impl = choose_implementation(device);
-+ impl = choose_implementation(device, child_device_type);
- 
- return qsv_device_derive_from_child(ctx, impl, child_device, 0);
- }
-diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h
-index b98d611cfc..f5a9691949 100644
---- a/libavutil/hwcontext_qsv.h
-+++ b/libavutil/hwcontext_qsv.h
-@@ -42,6 +42,7 @@ typedef struct AVQSVDeviceContext {
- typedef struct AVQSVFramesContext {
- mfxFrameSurface1 *surfaces;
- int nb_surfaces;
-+ void *texture;
- 
- /**
- * A combination of MFX_MEMTYPE_* describing the frame pool.

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/freetype/P01-solaris-use-gmake.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libbluray/P03-darwin-mount.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libogg/A00-fix-unsigned-types.patch Deleted

@@ -1,33 +0,0 @@
-From c8fca6b4a02d695b1ceea39b330d4406001c03ed Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Sat, 7 Sep 2019 00:46:59 -0400
-Subject: PATCH os_types: fix unsigned typedefs for MacOS
-
-This effectively reverts f8ce071e1040c766157d630d920d6165d35fe422 which was
-probably broken by 6449883ccacfee276ed9d99fa047342cdc51ab88.
----
- include/ogg/os_types.h | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
-index eb8a322..e655a1d 100644
---- a/include/ogg/os_types.h
-+++ b/include/ogg/os_types.h
-@@ -72,11 +72,11 @@
- 
- # include <sys/types.h>
- typedef int16_t ogg_int16_t;
-- typedef uint16_t ogg_uint16_t;
-+ typedef u_int16_t ogg_uint16_t;
- typedef int32_t ogg_int32_t;
-- typedef uint32_t ogg_uint32_t;
-+ typedef u_int32_t ogg_uint32_t;
- typedef int64_t ogg_int64_t;
-- typedef uint64_t ogg_uint64_t;
-+ typedef u_int64_t ogg_uint64_t;
- 
- #elif defined(__HAIKU__)
- 
--- 
-2.17.1
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265/A01-limit-tu_fix.patch Deleted

@@ -1,26 +0,0 @@
-# HG changeset patch
-# User Aruna Matheswaran <aruna@multicorewareinc.com>
-# Date 1573207250 -19800
-# Branch Release_3.2
-# Node ID 09f3b1d9349ac84d74f14f99297f9418bc8b2b02
-# Parent b5c86a64bbbede216b25092def72272ecde5523a
-limit-tu: Fix bug in loading co-located CU's TU depth
-
-diff --git a/source/encoder/analysis.cpp b/source/encoder/analysis.cpp
---- a/source/encoder/analysis.cpp
-+++ b/source/encoder/analysis.cpp
-@@ -375,12 +375,12 @@
- CUData* neighbourCU;
- uint8_t count = 0;
- int32_t maxTUDepth = -1;
-- neighbourCU = m_slice->m_refFrameList00->m_encData->m_picCTU;
-+ neighbourCU = &m_slice->m_refFrameList00->m_encData->m_picCTUparentCTU.m_cuAddr;
- predDepth += neighbourCU->m_refTuDepthcuGeom.geomRecurId;
- count++;
- if (m_slice->isInterB())
- {
-- neighbourCU = m_slice->m_refFrameList10->m_encData->m_picCTU;
-+ neighbourCU = &m_slice->m_refFrameList10->m_encData->m_picCTUparentCTU.m_cuAddr;
- predDepth += neighbourCU->m_refTuDepthcuGeom.geomRecurId;
- count++;
- }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265/A02-2pass_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265/A03-vbv-macroblocking.patch Deleted

@@ -1,24 +0,0 @@
-# HG changeset patch
-# User Kirithika <kirithika@multicorewareinc.com>
-# Date 1577092232 -19800
-# Branch Release_3.2
-# Node ID b4b2ecac21f666af2664b679c4122a930c07475b
-# Parent 09f3b1d9349ac84d74f14f99297f9418bc8b2b02
-Fix VBV macroblocking that comes up with the last Intra frame
-
-This patch enables the VBV Lookahead computation of an I Slice to consider the
-last MiniGop frames available in the lookahead,hence fixing the VBV macroblocking
-issue that comes due to lack of frames in the Lookahead at the end of the video.
-
-diff --git a/source/encoder/slicetype.cpp b/source/encoder/slicetype.cpp
---- a/source/encoder/slicetype.cpp
-+++ b/source/encoder/slicetype.cpp
-@@ -1748,7 +1748,7 @@
- if (m_param->bBPyramid && curNonB - prevNonB > 1)
- curBRef = (prevNonB + curNonB + 1) / 2;
- int miniGopEnd = keyframe ? prevNonB : curNonB;
-- while (curNonB < numFrames + !keyframe)
-+ while (curNonB <= numFrames)
- {
- /* P/I cost: This shouldn't include the cost of nextNonB */
- if (nextNonB != curNonB)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_10bit/A01-limit-tu_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_10bit/A02-2pass_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_10bit/A03-vbv-macroblocking.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_12bit/A01-limit-tu_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_12bit/A02-2pass_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_12bit/A03-vbv-macroblocking.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_8bit/A01-limit-tu_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_8bit/A02-2pass_fix.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_8bit/A03-vbv-macroblocking.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/fr.handbrake.ghb.appdata.template.xml Deleted

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="desktop-application">
- <id>fr.handbrake.ghb</id>
- <translation>ghb</translation>
- <update_contact>jstebbins.hb_AT_gmail.com</update_contact>
- <launchable type="desktop-id">fr.handbrake.ghb.desktop</launchable>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-2.0+</project_license>
- <name>HandBrake</name>
- <summary>Video Transcoder</summary>
-
- <description>
- HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.
- Reasons you'll love Handbrake:
- <ul>
- <li>Convert video from nearly any format</li>
- <li>Free and Open Source</li>
- <li>Multi-Platform (Windows, Mac and Linux)</li>
- </ul>
- </description>
-
- <url type="homepage">https://handbrake.fr/</url>
- <url type="help">https://handbrake.fr/docs/</url>
- <url type="bugtracker">https://github.com/HandBrake/HandBrake/issues</url>
- <url type="translate">https://www.transifex.com/HandBrakeProject/</url>
- <mimetypes>
- <mimetype>application/ogg</mimetype>
- <mimetype>application/x-extension-mp4</mimetype>
- <mimetype>application/x-flac</mimetype>
- <mimetype>application/x-matroska</mimetype>
- <mimetype>application/x-ogg</mimetype>
- <mimetype>audio/ac3</mimetype>
- <mimetype>audio/mp4</mimetype>
- <mimetype>audio/mpeg</mimetype>
- <mimetype>audio/ogg</mimetype>
- <mimetype>audio/x-flac</mimetype>
- <mimetype>audio/x-matroska</mimetype>
- <mimetype>audio/x-mp3</mimetype>
- <mimetype>audio/x-mpeg</mimetype>
- <mimetype>audio/x-vorbis</mimetype>
- <mimetype>video/mp4</mimetype>
- <mimetype>video/mp4v-es</mimetype>
- <mimetype>video/mpeg</mimetype>
- <mimetype>video/msvideo</mimetype>
- <mimetype>video/quicktime</mimetype>
- <mimetype>video/vnd.divx</mimetype>
- <mimetype>video/x-avi</mimetype>
- <mimetype>video/x-m4v</mimetype>
- <mimetype>video/x-matroska</mimetype>
- <mimetype>video/x-mpeg</mimetype>
- <mimetype>video/ogg</mimetype>
- <mimetype>video/x-ogm+ogg</mimetype>
- <mimetype>video/x-theora+ogg</mimetype>
- <mimetype>x-content/video-dvd</mimetype>
- <mimetype>x-content/video-vcd</mimetype>
- <mimetype>x-content/video-svcd</mimetype>
- </mimetypes>
-
- <screenshots>
- <screenshot type="default">
- <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Summary_linux.png</image>
- <caption>Main window and settings summary</caption>
- </screenshot>
- <screenshot>
- <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Dimensions_linux.png</image>
- <caption>Video resolution and cropping settings</caption>
- </screenshot>
- <screenshot>
- <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Video_linux.png</image>
- <caption>Video encoder settings</caption>
- </screenshot>
- <screenshot>
- <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Audio_linux.png</image>
- <caption>Audio track selection and settings</caption>
- </screenshot>
- <screenshot>
- <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Chapters_linux.png</image>
- <caption>Chapter title editing</caption>
- </screenshot>
- </screenshots>
-
- <provides>
- <binary>ghb</binary>
- </provides>
-
- <releases>
- RELEASE_TAG
- </releases>
- 
- <content_rating type="oars-1.1">
- <content_attribute id="violence-cartoon">none</content_attribute>
- <content_attribute id="violence-fantasy">none</content_attribute>
- <content_attribute id="violence-realistic">none</content_attribute>
- <content_attribute id="violence-bloodshed">none</content_attribute>
- <content_attribute id="violence-sexual">none</content_attribute>
- <content_attribute id="violence-desecration">none</content_attribute>
- <content_attribute id="violence-slavery">none</content_attribute>
- <content_attribute id="violence-worship">none</content_attribute>
- <content_attribute id="drugs-alcohol">none</content_attribute>
- <content_attribute id="drugs-narcotics">none</content_attribute>
- <content_attribute id="drugs-tobacco">none</content_attribute>
- <content_attribute id="sex-nudity">none</content_attribute>
- <content_attribute id="sex-themes">none</content_attribute>
- <content_attribute id="sex-homosexuality">none</content_attribute>
- <content_attribute id="sex-prostitution">none</content_attribute>
- <content_attribute id="sex-adultery">none</content_attribute>
- <content_attribute id="sex-appearance">none</content_attribute>
- <content_attribute id="language-profanity">none</content_attribute>
- <content_attribute id="language-humor">none</content_attribute>
- <content_attribute id="language-discrimination">none</content_attribute>
- <content_attribute id="social-chat">none</content_attribute>
- <content_attribute id="social-info">none</content_attribute>
- <content_attribute id="social-audio">none</content_attribute>
- <content_attribute id="social-location">none</content_attribute>
- <content_attribute id="social-contacts">none</content_attribute>
- <content_attribute id="money-purchasing">none</content_attribute>
- <content_attribute id="money-gambling">none</content_attribute>
- </content_rating>
- 
-</component>
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/internal_defaults.json Deleted

@@ -1,113 +0,0 @@
-{
-    "Globals": {
-        "SkipDiskFreeCheck": false,
-        "show_preview": false,
-        "scan_source": "",
-        "volume": "New Video"
-    },
-    "OneTimeInitialization": {
-        "title": "none"
-    },
-    "Initialization": {
-        "AudioAllowMP3Pass": false,
-        "AudioAllowAACPass": false,
-        "AudioAllowAC3Pass": false,
-        "AudioAllowDTSPass": false,
-        "AudioAllowDTSHDPass": false,
-        "AudioAllowEAC3Pass": false,
-        "AudioAllowFLACPass": false,
-        "AudioAllowTRUEHDPass": false,
-        "AudioBitrate": "192",
-        "AudioEncoder": "copy:ac3",
-        "AudioTrack": 0,
-        "AudioTrackQualityEnable": false,
-        "AudioTrackQuality": -1.0,
-        "AudioTrackGainSlider": 0.0,
-        "AudioTrackDRCSlider": 0.0,
-        "AudioMixdown": "dpl2",
-        "AudioSamplerate": "auto",
-        "AudioTrackName": "",
-        "angle_count": 1,
-        "angle": 1,
-        "autoscale": true,
-        "dest_dir": "",
-        "end_point": 100.0,
-        "MetaName": "",
-        "MetaArtist": "",
-        "MetaAlbumArtist": "",
-        "MetaReleaseDate": "",
-        "MetaComment": "",
-        "MetaGenre": "",
-        "MetaDescription": "",
-        "MetaLongDescription": "",
-        "PresetFullName": "/Regular/Normal",
-        "PresetCategory": "new",
-        "preset_modified": false,
-        "preset_reload": false,
-        "PictureDisplayWidth": 720,
-        "PictureDisplayHeight": 480,
-        "PtoPType": "chapter",
-        "scale_height": 0,
-        "scale_width": 0,
-        "single_title": 1,
-        "start_point": 1.0,
-        "start_frame": -1,
-        "title_selected": false,
-        "source_label": "New Video",
-        "chapter_list": ,
-        "vquality_type_bitrate": false,
-        "vquality_type_constant": false,
-        "ImportLanguage": "und",
-        "SrtCodeset": "ISO-8859-1",
-        "ImportFile": "",
-        "ImportOffset": 0,
-        "VideoFramerateCFR": false,
-        "VideoFrameratePFR": false,
-        "VideoFramerateVFR": true,
-        "PictureDeinterlaceDecomb": false,
-        "VideoPresetSlider": 0,
-        "x264ZeroLatency": false,
-        "x264FastDecode": false
-    },
-    "Preferences": {
-        "ActivityFontSize": 8,
-        "DiskFreeCheck": true,
-        "DiskFreeLimit": 2000,
-        "RemoveFinishedJobs": false,
-        "SyncTitleSettings": true,
-        "AutoScan": false,
-        "AddCC": false,
-        "EncodeLogLocation": false,
-        "allow_tweaks": false,
-        "last_update_check": 0,
-        "check_updates": "weekly",
-        "default_source": "/dev/dvd",
-        "ExportDirectory": "",
-        "destination_dir": "",
-        "hbfd": false,
-        "hbfd_feature": false,
-        "live_duration": 15,
-        "LoggingLevel": "1",
-        "LogLongevity": "immortal",
-        "use_dvdnav": true,
-        "reduce_hd_preview": true,
-        "MinTitleDuration": 10,
-        "preview_count": 10,
-        "preview_show_crop": false,
-        "preview_x": -1,
-        "preview_y": -1,
-        "UseM4v": true,
-        "auto_name": true,
-        "auto_name_template": "{source}",
-        "update_skip_version": 0,
-        "VideoQualityGranularity": "1",
-        "version": "0.1",
-        "PreferredLanguage": "und",
-        "WhenComplete": "notify",
-        "SrtDir": "",
-        "window_width": 1,
-        "window_height": 1,
-        "preset_window_width": 1,
-        "preset_window_height": 1
-    }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/deccc608sub.c Deleted

@@ -1,1867 +0,0 @@
-/* deccc608sub.c
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/*
- * From ccextractor, leave this file as intact and close to the original as possible so that
- * it is easy to patch in fixes - even though this file contains code that we don't need.
- *
- * Note that the SRT sub generation from CC could be useful for mkv subs.
- */
-#include "handbrake/handbrake.h"
-#include "handbrake/deccc608sub.h"
-
-#define SSA_PREAMBLE_LEN 24
-/*
- * ccextractor static configuration variables.
- */
-static int debug_608 = 0;
-static int cc_channel = 1;
-static int subs_delay = 0;
-
-int rowdata = {11,-1,1,2,3,4,12,13,14,15,5,6,7,8,9,10};
-// Relationship between the first PAC byte and the row number
-
-// The following enc_buffer is not used at the moment, if it does get used
-// we need to bring it into the swrite struct. Same for "str".
-#define INITIAL_ENC_BUFFER_CAPACITY 2048
-
-static const unsigned char pac2_attribs3= // Color, font, ident
-{
- {COL_WHITE, FONT_REGULAR, 0}, // 0x40 || 0x60
- {COL_WHITE, FONT_UNDERLINED, 0}, // 0x41 || 0x61
- {COL_GREEN, FONT_REGULAR, 0}, // 0x42 || 0x62
- {COL_GREEN, FONT_UNDERLINED, 0}, // 0x43 || 0x63
- {COL_BLUE, FONT_REGULAR, 0}, // 0x44 || 0x64
- {COL_BLUE, FONT_UNDERLINED, 0}, // 0x45 || 0x65
- {COL_CYAN, FONT_REGULAR, 0}, // 0x46 || 0x66
- {COL_CYAN, FONT_UNDERLINED, 0}, // 0x47 || 0x67
- {COL_RED, FONT_REGULAR, 0}, // 0x48 || 0x68
- {COL_RED, FONT_UNDERLINED, 0}, // 0x49 || 0x69
- {COL_YELLOW, FONT_REGULAR, 0}, // 0x4a || 0x6a
- {COL_YELLOW, FONT_UNDERLINED, 0}, // 0x4b || 0x6b
- {COL_MAGENTA, FONT_REGULAR, 0}, // 0x4c || 0x6c
- {COL_MAGENTA, FONT_UNDERLINED, 0}, // 0x4d || 0x6d
- {COL_WHITE, FONT_ITALICS, 0}, // 0x4e || 0x6e
- {COL_WHITE, FONT_UNDERLINED_ITALICS, 0}, // 0x4f || 0x6f
- {COL_WHITE, FONT_REGULAR, 0}, // 0x50 || 0x70
- {COL_WHITE, FONT_UNDERLINED, 0}, // 0x51 || 0x71
- {COL_WHITE, FONT_REGULAR, 4}, // 0x52 || 0x72
- {COL_WHITE, FONT_UNDERLINED, 4}, // 0x53 || 0x73
- {COL_WHITE, FONT_REGULAR, 8}, // 0x54 || 0x74
- {COL_WHITE, FONT_UNDERLINED, 8}, // 0x55 || 0x75
- {COL_WHITE, FONT_REGULAR, 12}, // 0x56 || 0x76
- {COL_WHITE, FONT_UNDERLINED, 12}, // 0x57 || 0x77
- {COL_WHITE, FONT_REGULAR, 16}, // 0x58 || 0x78
- {COL_WHITE, FONT_UNDERLINED, 16}, // 0x59 || 0x79
- {COL_WHITE, FONT_REGULAR, 20}, // 0x5a || 0x7a
- {COL_WHITE, FONT_UNDERLINED, 20}, // 0x5b || 0x7b
- {COL_WHITE, FONT_REGULAR, 24}, // 0x5c || 0x7c
- {COL_WHITE, FONT_UNDERLINED, 24}, // 0x5d || 0x7d
- {COL_WHITE, FONT_REGULAR, 28}, // 0x5e || 0x7e
- {COL_WHITE, FONT_UNDERLINED, 28} // 0x5f || 0x7f
-};
-
-// Default color
-static enum color_code default_color=COL_WHITE;
-
-static const char *command_type =
-{
- "Unknown",
- "EDM - EraseDisplayedMemory",
- "RCL - ResumeCaptionLoading",
- "EOC - End Of Caption",
- "TO1 - Tab Offset, 1 column",
- "TO2 - Tab Offset, 2 column",
- "TO3 - Tab Offset, 3 column",
- "RU2 - Roll up 2 rows",
- "RU3 - Roll up 3 rows",
- "RU4 - Roll up 4 rows",
- "CR - Carriage Return",
- "ENM - Erase non-displayed memory",
- "BS - Backspace",
- "RTD - Resume Text Display"
-};
-
-static const char *font_text=
-{
- "regular",
- "italics",
- "underlined",
- "underlined italics"
-};
-
-static const char *color_text2=
-{
- {"white", "&HFFFFFF&"},
- {"green", "&H00FF00&"},
- {"blue", "&HFF0000&"},
- {"cyan", "&HFFFF00&"},
- {"red", "&H0000FF&"},
- {"yellow", "&H00FFFF&"},
- {"magenta", "&HFF00FF&"},
- {"userdefined", "&HFFFFFF&"}
-};
-
-static int general_608_init (struct s_write *wb)
-{
- if( !wb->enc_buffer )
- {
- wb->enc_buffer=(unsigned char *) malloc (INITIAL_ENC_BUFFER_CAPACITY);
- if (wb->enc_buffer==NULL)
- return -1;
- wb->enc_buffer_capacity=INITIAL_ENC_BUFFER_CAPACITY;
- }
-
- if( !wb->subline) {
- wb->subline = malloc(2048);
-
- if (!wb->subline)
- {
- return -1;
- }
- }
-
- wb->new_sentence = 1;
- wb->new_channel = 1;
- wb->in_xds_mode = 0;
-
- hb_buffer_list_clear(&wb->list);
- wb->last_pts = 0;
- wb->last_scr_sequence = 0;
- return 0;
-}
-
-/*
- * Free up CC memory - don't call this from HB just yet since it will cause
- * parallel encodes to fail - to be honest they will be stuffed anyway since
- * the CC's may be overwriting the buffers.
- */
-static void general_608_close (struct s_write *wb)
-{
- if( wb->enc_buffer ) {
- free(wb->enc_buffer);
- wb->enc_buffer_capacity = 0;
- wb->enc_buffer_used = 0;
- }
- if( wb->subline ) {
- free(wb->subline);
- }
- hb_buffer_list_close(&wb->list);
-}
-
-
-#include <ctype.h>
-
-// Returns number of bytes used
-static int get_char_in_utf8(unsigned char *buffer, unsigned char c)
-{
- if (c == 0x00)
- return 0;
-
- // Regular line-21 character set, mostly ASCII except these exceptions
- if (c < 0x80)
- {
- switch (c)
- {
- case 0x2a: // lowercase a, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0xa1;
- return 2;
- case 0x5c: // lowercase e, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0xa9;
- return 2;
- case 0x5e: // lowercase i, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0xad;
- return 2;
- case 0x5f: // lowercase o, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0xb3;
- return 2;
- case 0x60: // lowercase u, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0xba;
- return 2;
- case 0x7b: // lowercase c with cedilla
- *buffer = 0xc3;
- *(buffer+1) = 0xa7;
- return 2;
- case 0x7c: // division symbol
- *buffer = 0xc3;
- *(buffer+1) = 0xb7;
- return 2;
- case 0x7d: // uppercase N tilde
- *buffer = 0xc3;
- *(buffer+1) = 0x91;
- return 2;
- case 0x7e: // lowercase n tilde
- *buffer = 0xc3;
- *(buffer+1) = 0xb1;
- return 2;
- default:
- *buffer = c;
- return 1;
- }
- }
- switch (c)
- {
- // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE = 0x11 AND LOW BETWEEN 0x30 AND 0x3F
- case 0x80: // Registered symbol (R)
- *buffer = 0xc2;
- *(buffer+1) = 0xae;
- return 2;
- case 0x81: // degree sign
- *buffer = 0xc2;
- *(buffer+1) = 0xb0;
- return 2;
- case 0x82: // 1/2 symbol
- *buffer = 0xc2;
- *(buffer+1) = 0xbd;
- return 2;
- case 0x83: // Inverted (open) question mark
- *buffer = 0xc2;
- *(buffer+1) = 0xbf;
- return 2;
- case 0x84: // Trademark symbol (TM)
- *buffer = 0xe2;
- *(buffer+1) = 0x84;
- *(buffer+2) = 0xa2;
- return 3;
- case 0x85: // Cents symbol
- *buffer = 0xc2;
- *(buffer+1) = 0xa2;
- return 2;
- case 0x86: // Pounds sterling
- *buffer = 0xc2;
- *(buffer+1) = 0xa3;
- return 2;
- case 0x87: // Music note
- *buffer = 0xe2;
- *(buffer+1) = 0x99;
- *(buffer+2) = 0xaa;
- return 3;
- case 0x88: // lowercase a, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0xa0;
- return 2;
- case 0x89: // transparent space, we make it regular
- *buffer = 0x20;
- return 1;
- case 0x8a: // lowercase e, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0xa8;
- return 2;
- case 0x8b: // lowercase a, circumflex accent
- *buffer = 0xc3;
- *(buffer+1) = 0xa2;
- return 2;
- case 0x8c: // lowercase e, circumflex accent
- *buffer = 0xc3;
- *(buffer+1) = 0xaa;
- return 2;
- case 0x8d: // lowercase i, circumflex accent
- *buffer = 0xc3;
- *(buffer+1) = 0xae;
- return 2;
- case 0x8e: // lowercase o, circumflex accent
- *buffer = 0xc3;
- *(buffer+1) = 0xb4;
- return 2;
- case 0x8f: // lowercase u, circumflex accent
- *buffer = 0xc3;
- *(buffer+1) = 0xbb;
- return 2;
- // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE = 0x12 AND LOW BETWEEN 0x20 AND 0x3F
- case 0x90: // capital letter A with acute
- *buffer = 0xc3;
- *(buffer+1) = 0x81;
- return 2;
- case 0x91: // capital letter E with acute
- *buffer = 0xc3;
- *(buffer+1) = 0x89;
- return 2;
- case 0x92: // capital letter O with acute
- *buffer = 0xc3;
- *(buffer+1) = 0x93;
- return 2;
- case 0x93: // capital letter U with acute
- *buffer = 0xc3;
- *(buffer+1) = 0x9a;
- return 2;
- case 0x94: // capital letter U with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0x9c;
- return 2;
- case 0x95: // lowercase letter U with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0xbc;
- return 2;
- case 0x96: // apostrophe
- *buffer = 0x27;
- return 1;
- case 0x97: // inverted exclamation mark
- *buffer = 0xc2;
- *(buffer+1) = 0xa1;
- return 2;
- case 0x98: // asterisk
- *buffer = 0x2a;
- return 1;
- case 0x99: // apostrophe (yes, duped). See CCADI source code.
- *buffer = 0x27;
- return 1;
- case 0x9a: // hyphen-minus
- *buffer = 0x2d;
- return 1;
- case 0x9b: // copyright sign
- *buffer = 0xc2;
- *(buffer+1) = 0xa9;
- return 2;
- case 0x9c: // Service mark
- *buffer = 0xe2;
- *(buffer+1) = 0x84;
- *(buffer+2) = 0xa0;
- return 3;
- case 0x9d: // Full stop (.)
- *buffer = 0x2e;
- return 1;
- case 0x9e: // Quotation mark
- *buffer = 0x22;
- return 1;
- case 0x9f: // Quotation mark
- *buffer = 0x22;
- return 1;
- case 0xa0: // uppercase A, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0x80;
- return 2;
- case 0xa1: // uppercase A, circumflex
- *buffer = 0xc3;
- *(buffer+1) = 0x82;
- return 2;
- case 0xa2: // uppercase C with cedilla
- *buffer = 0xc3;
- *(buffer+1) = 0x87;
- return 2;
- case 0xa3: // uppercase E, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0x88;
- return 2;
- case 0xa4: // uppercase E, circumflex
- *buffer = 0xc3;
- *(buffer+1) = 0x8a;
- return 2;
- case 0xa5: // capital letter E with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0x8b;
- return 2;
- case 0xa6: // lowercase letter e with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0xab;
- return 2;
- case 0xa7: // uppercase I, circumflex
- *buffer = 0xc3;
- *(buffer+1) = 0x8e;
- return 2;
- case 0xa8: // uppercase I, with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0x8f;
- return 2;
- case 0xa9: // lowercase i, with diaeresis
- *buffer = 0xc3;
- *(buffer+1) = 0xaf;
- return 2;
- case 0xaa: // uppercase O, circumflex
- *buffer = 0xc3;
- *(buffer+1) = 0x94;
- return 2;
- case 0xab: // uppercase U, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0x99;
- return 2;
- case 0xac: // lowercase u, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0xb9;
- return 2;
- case 0xad: // uppercase U, circumflex
- *buffer = 0xc3;
- *(buffer+1) = 0x9b;
- return 2;
- case 0xae: // LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- *buffer = 0xc2;
- *(buffer+1) = 0xab;
- return 2;
- case 0xaf: // RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
- *buffer = 0xc2;
- *(buffer+1) = 0xbb;
- return 2;
- // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
- // THAT COME FROM HI BYTE = 0x13 AND LOW BETWEEN 0x20 AND 0x3F
- case 0xb0: // Uppercase A, tilde
- *buffer = 0xc3;
- *(buffer+1) = 0x83;
- return 2;
- case 0xb1: // Lowercase a, tilde
- *buffer = 0xc3;
- *(buffer+1) = 0xa3;
- return 2;
- case 0xb2: // Uppercase I, acute accent
- *buffer = 0xc3;
- *(buffer+1) = 0x8d;
- return 2;
- case 0xb3: // Uppercase I, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0x8c;
- return 2;
- case 0xb4: // Lowercase i, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0xac;
- return 2;
- case 0xb5: // Uppercase O, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0x92;
- return 2;
- case 0xb6: // Lowercase o, grave accent
- *buffer = 0xc3;
- *(buffer+1) = 0xb2;
- return 2;
- case 0xb7: // Uppercase O, tilde
- *buffer = 0xc3;
- *(buffer+1) = 0x95;
- return 2;
- case 0xb8: // Lowercase o, tilde
- *buffer = 0xc3;
- *(buffer+1) = 0xb5;
- return 2;
- case 0xb9: // Open curly brace
- *buffer = 0x7b;
- return 1;
- case 0xba: // Closing curly brace
- *buffer = 0x7d;
- return 1;
- case 0xbb: // Backslash
- *buffer = 0x5c;
- return 1;
- case 0xbc: // Caret
- *buffer = 0x5e;
- return 1;
- case 0xbd: // Underscore
- *buffer = 0x5f;
- return 1;
- case 0xbe: // Pipe (broken bar)
- *buffer = 0xc2;
- *(buffer+1) = 0xa6;
- return 1;
- case 0xbf: // Tilde
- *buffer = 0x7e; // Not sure
- return 1;
- case 0xc0: // Uppercase A, umlaut
- *buffer = 0xc3;
- *(buffer+1) = 0x84;
- return 2;
- case 0xc1: // Lowercase A, umlaut
- *buffer = 0xc3;
- *(buffer+1) = 0xa4;
- return 2;
- case 0xc2: // Uppercase O, umlaut
- *buffer = 0xc3;
- *(buffer+1) = 0x96;
- return 2;
- case 0xc3: // Lowercase o, umlaut
- *buffer = 0xc3;
- *(buffer+1) = 0xb6;
- return 2;
- case 0xc4: // Esszett (sharp S)
- *buffer = 0xc3;
- *(buffer+1) = 0x9f;
- return 2;
- case 0xc5: // Yen symbol
- *buffer = 0xc2;
- *(buffer+1) = 0xa5;
- return 2;
- case 0xc6: // Currency symbol
- *buffer = 0xc2;
- *(buffer+1) = 0xa4;
- return 2;
- case 0xc7: // Vertical bar
- *buffer = 0x7c;
- return 1;
- case 0xc8: // Uppercase A, ring
- *buffer = 0xc3;
- *(buffer+1) = 0x85;
- return 2;
- case 0xc9: // Lowercase A, ring
- *buffer = 0xc3;
- *(buffer+1) = 0xa5;
- return 2;
- case 0xca: // Uppercase O, slash
- *buffer = 0xc3;
- *(buffer+1) = 0x98;
- return 2;
- case 0xcb: // Lowercase o, slash
- *buffer = 0xc3;
- *(buffer+1) = 0xb8;
- return 2;
- case 0xcc: // Upper left corner
- *buffer = 0xe2;
- *(buffer+1) = 0x8c;
- *(buffer+2) = 0x9c;
- return 3;
- case 0xcd: // Upper right corner
- *buffer = 0xe2;
- *(buffer+1) = 0x8c;
- *(buffer+2) = 0x9d;
- return 3;
- case 0xce: // Lower left corner
- *buffer = 0xe2;
- *(buffer+1) = 0x8c;
- *(buffer+2) = 0x9e;
- return 3;
- case 0xcf: // Lower right corner
- *buffer = 0xe2;
- *(buffer+1) = 0x8c;
- *(buffer+2) = 0x9f;
- return 3;
- default: //
- *buffer = '?'; // I'll do it eventually, I promise
- return 1; // This are weird chars anyway
- }
-}
-
-// Encodes a generic string. Note that since we use the encoders for closed
-// caption data, text would have to be encoded as CCs... so using special
-// characters here it's a bad idea.
-static unsigned encode_line(unsigned char *buffer, unsigned char *text)
-{
- unsigned bytes = 0;
- while (*text)
- {
- *buffer++ = *text++;
- bytes++;
- }
- return bytes;
-}
-
-static unsigned stuff_space(unsigned char *buffer, int space)
-{
- int ii;
- for (ii = 0; ii < space; ii++)
- {
- *buffer++ = '\\';
- *buffer++ = 'h';
- }
- return space * 2;
-}
-
-static void find_limit_characters(unsigned char *line, int *first_non_blank,
- int *last_non_blank)
-{
- int i;
-
- *last_non_blank = -1;
- *first_non_blank = -1;
- for (i = 0; i < CC608_SCREEN_WIDTH; i++)
- {
- unsigned char c = linei;
- if (c != ' ' && c != 0x89)
- {
- if (*first_non_blank == -1)
- *first_non_blank = i;
- *last_non_blank = i;
- }
- }
-}
-
-static unsigned get_decoder_line_encoded(struct s_write *wb,
- unsigned char *buffer, int line_num,
- struct eia608_screen *data)
-{
- uint8_t font_style;
- uint8_t font_color;
- int i;
-
- unsigned char *line = data->charactersline_num;
- unsigned char *orig = buffer; // Keep for debugging
- int first = 0, last = 31;
-
- find_limit_characters(line, &first, &last);
- for (i = first; i <= last; i++)
- {
- // Handle color
- font_color = data->colorsline_numi;
- font_style = data->fontsline_numi;
-
- // Handle reset to defaults
- if ((font_style & FONT_STYLE_MASK) == 0 && font_color == COL_WHITE)
- {
- if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
- (font_color != wb->prev_font_color))
- {
- buffer += encode_line(buffer, (uint8_t*)"{\\r}");
- }
- }
- else
- {
- // Open markup
- if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
- (font_color != wb->prev_font_color))
- {
- // style changed
- buffer += encode_line(buffer, (uint8_t*)"{");
- }
-
- // Handle underlined
- if ((font_style ^ wb->prev_font_style) & FONT_UNDERLINED)
- {
- int enable = !!(font_style & FONT_UNDERLINED);
- buffer += encode_line(buffer, (uint8_t*)"\\u");
- *buffer++ = enable + 0x30;
- }
-
- // Handle italics
- if ((font_style ^ wb->prev_font_style) & FONT_ITALICS)
- {
- int enable = !!(font_style & FONT_ITALICS);
- buffer += encode_line(buffer, (uint8_t*)"\\i");
- *buffer++ = enable + 0x30;
- }
-
- // Handle color
- if (font_color != wb->prev_font_color)
- {
- buffer += encode_line(buffer, (uint8_t*)"\\1c");
- buffer += encode_line(buffer,
- (uint8_t*)color_textfont_color1);
- }
-
- // Close markup
- if (((font_style ^ wb->prev_font_style) & FONT_STYLE_MASK) ||
- (font_color != wb->prev_font_color))
- {
- // style changed
- buffer += encode_line(buffer, (uint8_t*)"}");
- }
- }
- wb->prev_font_style = font_style;
- wb->prev_font_color = font_color;
-
- int bytes = 0;
- bytes = get_char_in_utf8(buffer, linei);
- buffer += bytes;
- }
- *buffer = 0;
- return (unsigned) (buffer - orig); // Return length
-}
-
-
-static void clear_eia608_cc_buffer (struct eia608_screen *data)
-{
- int i;
-
- for (i=0;i<15;i++)
- {
- memset(data->charactersi,' ',CC608_SCREEN_WIDTH);
- data->charactersiCC608_SCREEN_WIDTH=0;
- memset (data->colorsi,default_color,CC608_SCREEN_WIDTH+1);
- memset (data->fontsi,FONT_REGULAR,CC608_SCREEN_WIDTH+1);
- data->row_usedi=0;
- }
- data->empty=1;
-}
-
-static void init_eia608 (struct eia608 *data)
-{
- data->cursor_column = 0;
- data->cursor_row = 0;
- clear_eia608_cc_buffer (&data->buffer1);
- clear_eia608_cc_buffer (&data->buffer2);
- data->visible_buffer = 1;
- data->last_c1 = 0;
- data->last_c2 = 0;
- data->mode = MODE_POPUP;
- data->current_visible_start_ms = 0;
- data->ssa_counter = 0;
- data->screenfuls_counter = 0;
- data->channel = 1;
- data->color = default_color;
- data->font = FONT_REGULAR;
- data->rollup_base_row = 14;
-}
-
-static struct eia608_screen *get_current_hidden_buffer(struct s_write *wb)
-{
- struct eia608_screen *data;
- if (wb->data608->visible_buffer == 1)
- data = &wb->data608->buffer2;
- else
- data = &wb->data608->buffer1;
- return data;
-}
-
-static struct eia608_screen *get_current_visible_buffer(struct s_write *wb)
-{
- struct eia608_screen *data;
- if (wb->data608->visible_buffer == 1)
- data = &wb->data608->buffer1;
- else
- data = &wb->data608->buffer2;
- return data;
-}
-
-static void swap_visible_buffer(struct s_write *wb)
-{
- wb->data608->visible_buffer = (wb->data608->visible_buffer == 1) ? 2 : 1;
-}
-
-static struct eia608_screen *get_writing_buffer(struct s_write *wb)
-{
- struct eia608_screen *use_buffer=NULL;
- switch (wb->data608->mode)
- {
- case MODE_POPUP: // Write on the non-visible buffer
- use_buffer = get_current_hidden_buffer(wb);
- break;
- case MODE_ROLLUP_2: // Write directly to screen
- case MODE_ROLLUP_3:
- case MODE_ROLLUP_4:
- case MODE_TEXT:
- use_buffer = get_current_visible_buffer(wb);
- break;
- default:
- hb_error("Caption mode has an illegal value at get_writing_buffer(), this is a bug.");
- }
- return use_buffer;
-}
-
-static void write_char(const unsigned char c, struct s_write *wb)
-{
- if (wb->data608->mode != MODE_TEXT)
- {
- struct eia608_screen * use_buffer = get_writing_buffer(wb);
- if (use_buffer != NULL)
- {
- /* hb_log ("\rWriting char %c at %s:%d:%d\n",c,
- use_buffer == &wb->data608->buffer1?"B1":"B2",
- wb->data608->cursor_row,wb->data608->cursor_column); */
- use_buffer->characterswb->data608->cursor_rowwb->data608->cursor_column = c;
- use_buffer->colorswb->data608->cursor_rowwb->data608->cursor_column = wb->data608->color;
- use_buffer->fontswb->data608->cursor_rowwb->data608->cursor_column = wb->data608->font;
- use_buffer->row_usedwb->data608->cursor_row = 1;
- use_buffer->empty = 0;
- if (wb->data608->cursor_column < 31)
- wb->data608->cursor_column++;
- use_buffer->dirty = 1;
- }
- }
-
-}
-
-/* Handle MID-ROW CODES. */
-static void handle_text_attr(const unsigned char c1, const unsigned char c2,
- struct s_write *wb)
-{
- // Handle channel change
- wb->data608->channel=wb->new_channel;
- if (wb->data608->channel!=cc_channel)
- return;
- if (debug_608)
- hb_log ("\r608: text_attr: %02X %02X",c1,c2);
- if ( ((c1!=0x11 && c1!=0x19) ||
- (c2<0x20 || c2>0x2f)) && debug_608)
- {
- hb_log ("\rThis is not a text attribute!\n");
- }
- else
- {
- int i = c2-0x20;
- wb->data608->color=pac2_attribsi0;
- wb->data608->font=pac2_attribsi1;
- if (debug_608)
- hb_log(" -- Color: %s, font: %s\n",
- color_textwb->data608->color0,
- font_textwb->data608->font);
- if (wb->data608->cursor_column<31)
- wb->data608->cursor_column++;
- }
-}
-
-static int write_cc_buffer_as_ssa(struct eia608_screen *data,
- struct s_write *wb)
-{
- int wrote_something = 0;
- int i;
- int64_t ms_start = wb->data608->current_visible_start_ms;
- //int64_t ms_end = wb->last_pts + subs_delay;
-
- ms_start += subs_delay;
- if (ms_start<0) // Drop screens that because of subs_delay start too early
- return 0;
-
- if (debug_608)
- {
- char timeline128;
- wb->data608->ssa_counter++;
- sprintf (timeline,"%u\r\n",wb->data608->ssa_counter);
-
- hb_log ("\n- - - SSA caption - - -\n");
- hb_log ("%s", timeline);
- }
-
- /*
- * Write all the lines into enc_buffer, and then write that out at the end
- * ensure that we only have two lines, insert a newline after the first one,
- * and have a big bottom line (strip spaces from any joined lines).
- */
- int rows = 0, columns = 0;
- int min_row = 15, max_row = 0;
- int min_col = 41, max_col = 0;
- for (i = 0; i < 15; i++)
- {
- if (data->row_usedi)
- {
- int first, last;
-
- rows++;
- find_limit_characters(data->charactersi, &first, &last);
- if (last - first + 1 > columns)
- columns = last - first + 1;
- if (min_col > first)
- min_col = first;
- if (min_row > i)
- min_row = i;
- if (max_col < last)
- max_col = last;
- if (max_row < i)
- max_row = i;
- }
- }
-
- wb->prev_font_style = FONT_REGULAR;
- wb->prev_font_color = COL_WHITE;
- wb->enc_buffer_used = 0;
-
- int cropped_width, cropped_height, font_size;
- int cell_width, cell_height;
- int safe_x, safe_y;
- int min_safe_x, min_safe_y;
- double aspect;
-
- cropped_height = wb->height - wb->crop0 - wb->crop1;
- cropped_width = wb->width - wb->crop2 - wb->crop3;
- aspect = (double)wb->width * wb->par.num /
- (wb->height * wb->par.den);
-
- // CC grid is 16 rows by 32 columns (for 4:3 video)
- // Our SSA resolution is the title resolution
- // Translate CC grid to SSA coordinates
- // The numbers are tweaked to keep things off the very
- // edges of the screen and in the "safe" zone
- int screen_columns = 32;
- if (aspect >= 1.6)
- {
- // If the display aspect is close to or greater than 16:9
- // then width of screen is 42 columns (see CEA-708)
- screen_columns = 42;
- }
- font_size = wb->height * .8 * .08;
-
- safe_x = 0.1 * wb->width;
- safe_y = 0.1 * wb->height;
- min_safe_x = 0.025 * cropped_width;
- min_safe_y = 0.025 * cropped_height;
- cell_height = (wb->height - 2 * safe_y) / 16;
- cell_width = (wb->width - 2 * safe_x) / screen_columns;
-
- char *pos;
- int y, x, top;
- int col = min_col;
- if (aspect >= 1.6)
- {
- // If the display aspect is close to or greater than 16:9
- // center the CC in about a 4:3 region
- col += 5;
- }
- y = cell_height * (min_row + 1 + rows) + safe_y - wb->crop0;
- x = cell_width * col + safe_x - wb->crop2;
- top = y - rows * font_size;
-
- if (top < min_safe_y)
- y = (rows * font_size) + min_safe_y;
- if (y > cropped_height - min_safe_y)
- y = cropped_height - min_safe_y;
- if (x + columns * cell_width > cropped_width - min_safe_x)
- x = cropped_width - columns * cell_width - min_safe_x;
- if (x < min_safe_x)
- x = min_safe_x;
- pos = hb_strdup_printf("{\\an1\\pos(%d,%d)}", x, y);
-
- int line = 1;
- for (i = 0; i < 15; i++)
- {
- if (data->row_usedi)
- {
- int first, last;
- // Get position for this CC
- find_limit_characters(data->charactersi, &first, &last);
-
- /*
- * The intention was to use a newline but QT doesn't like it,
- * old code still here just in case..
- */
- int space = first - min_col;
- if (line == 1) {
- wb->enc_buffer_used += encode_line(
- wb->enc_buffer + wb->enc_buffer_used, (uint8_t*)pos);
- wb->enc_buffer_used += stuff_space(
- wb->enc_buffer + wb->enc_buffer_used, space);
- wb->enc_buffer_used += get_decoder_line_encoded(wb,
- wb->enc_buffer + wb->enc_buffer_used, i, data);
- line = 2;
- } else {
- wb->enc_buffer_used += encode_line(
- wb->enc_buffer + wb->enc_buffer_used, (uint8_t*)"\\N");
- wb->enc_buffer_used += stuff_space(
- wb->enc_buffer + wb->enc_buffer_used, space);
- wb->enc_buffer_used += get_decoder_line_encoded(wb,
- wb->enc_buffer + wb->enc_buffer_used, i, data);
- }
- }
- }
- free(pos);
- if (wb->enc_buffer_used && wb->enc_buffer0 != 0 && data->dirty)
- {
- hb_buffer_t *buffer;
- int len;
-
- // bump past null terminator
- wb->enc_buffer_used++;
- buffer = hb_buffer_init(wb->enc_buffer_used + SSA_PREAMBLE_LEN);
- buffer->s.frametype = HB_FRAME_SUBTITLE;
- buffer->s.start = ms_start;
- buffer->s.stop = AV_NOPTS_VALUE;
- buffer->s.scr_sequence = wb->data608->current_visible_scr_sequence;
- sprintf((char*)buffer->data, "%d,,Default,,0,0,0,,", ++wb->line);
- len = strlen((char*)buffer->data);
- memcpy(buffer->data + len, wb->enc_buffer, wb->enc_buffer_used);
- hb_buffer_list_append(&wb->list, buffer);
- wrote_something=1;
- wb->clear_sub_needed = 1;
- }
- else if (wb->clear_sub_needed)
- {
- hb_buffer_t *buffer = hb_buffer_init(0);
- buffer->s.frametype = HB_FRAME_SUBTITLE;
- buffer->s.flags = HB_BUF_FLAG_EOS;
- buffer->s.start = ms_start;
- buffer->s.stop = ms_start;
- buffer->s.scr_sequence = wb->data608->current_visible_scr_sequence;
- hb_buffer_list_append(&wb->list, buffer);
- wb->clear_sub_needed = 0;
- }
- if (debug_608)
- {
- hb_log ("- - - - - - - - - - - -\r\n");
- }
- return wrote_something;
-}
-
-static int write_cc_buffer(struct s_write *wb)
-{
- struct eia608_screen *data;
- int wrote_something=0;
-
- data = get_current_visible_buffer(wb);
- if (!data->dirty)
- return 0;
- wb->new_sentence=1;
- wrote_something = write_cc_buffer_as_ssa(data, wb);
- data->dirty = 0;
- return wrote_something;
-}
-
-static void move_roll_up(struct s_write *wb, int row)
-{
- struct eia608_screen *use_buffer;
- int ii, src, dst, keep_lines;
-
- switch (wb->data608->mode)
- {
- case MODE_ROLLUP_2:
- keep_lines = 2;
- break;
- case MODE_ROLLUP_3:
- keep_lines = 3;
- break;
- case MODE_ROLLUP_4:
- keep_lines = 4;
- break;
- default:
- // Not rollup mode, nothing to do
- return;
- }
-
- if (row == wb->data608->rollup_base_row)
- {
- // base row didn't change, nothing to do
- return;
- }
-
- use_buffer = get_current_visible_buffer(wb);
- if (row < wb->data608->rollup_base_row)
- {
- src = wb->data608->rollup_base_row - keep_lines + 1;
- dst = row - keep_lines + 1;
- for (ii = 0; ii < keep_lines; ii++)
- {
- memcpy(use_buffer->charactersdst, use_buffer->characterssrc, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->colorsdst, use_buffer->colorssrc, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->fontsdst, use_buffer->fontssrc, CC608_SCREEN_WIDTH+1);
- use_buffer->row_useddst = use_buffer->row_usedsrc;
-
- memset(use_buffer->characterssrc, ' ', CC608_SCREEN_WIDTH);
- memset(use_buffer->colorssrc, COL_WHITE, CC608_SCREEN_WIDTH);
- memset(use_buffer->fontssrc, FONT_REGULAR, CC608_SCREEN_WIDTH);
- use_buffer->characterssrcCC608_SCREEN_WIDTH = 0;
- use_buffer->row_usedsrc = 0;
-
- src++;
- dst++;
- }
- }
- else
- {
- src = wb->data608->rollup_base_row;
- dst = row;
- for (ii = 0; ii < keep_lines; ii++)
- {
- memcpy(use_buffer->charactersdst, use_buffer->characterssrc, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->colorsdst, use_buffer->colorssrc, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->fontsdst, use_buffer->fontssrc, CC608_SCREEN_WIDTH+1);
- use_buffer->row_useddst = use_buffer->row_usedsrc;
-
- memset(use_buffer->characterssrc, ' ', CC608_SCREEN_WIDTH);
- memset(use_buffer->colorssrc, COL_WHITE, CC608_SCREEN_WIDTH);
- memset(use_buffer->fontssrc, FONT_REGULAR, CC608_SCREEN_WIDTH);
- use_buffer->characterssrcCC608_SCREEN_WIDTH = 0;
- use_buffer->row_usedsrc = 0;
-
- src--;
- dst--;
- }
- }
- use_buffer->dirty = 1;
-}
-
-static void roll_up(struct s_write *wb)
-{
- struct eia608_screen *use_buffer;
- int i, j;
-
- use_buffer = get_current_visible_buffer(wb);
- int keep_lines;
- switch (wb->data608->mode)
- {
- case MODE_ROLLUP_2:
- keep_lines = 2;
- break;
- case MODE_ROLLUP_3:
- keep_lines = 3;
- break;
- case MODE_ROLLUP_4:
- keep_lines = 4;
- break;
- default: // Shouldn't happen
- keep_lines = 0;
- break;
- }
- int firstrow = -1, lastrow = -1;
- // Look for the last line used
- int rows_now = 0; // Number of rows in use right now
- for (i = 0; i < 15; i++)
- {
- if (use_buffer->row_usedi)
- {
- rows_now++;
- if (firstrow == -1)
- firstrow = i;
- lastrow = i;
- }
- }
-
- if (debug_608)
- hb_log ("\rIn roll-up: %d lines used, first: %d, last: %d\n", rows_now, firstrow, lastrow);
-
- if (lastrow==-1) // Empty screen, nothing to rollup
- return;
-
- for (j = lastrow - keep_lines + 1; j < lastrow; j++)
- {
- if (j >= 0)
- {
- memcpy(use_buffer->charactersj, use_buffer->charactersj+1, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->colorsj, use_buffer->colorsj+1, CC608_SCREEN_WIDTH+1);
- memcpy(use_buffer->fontsj, use_buffer->fontsj+1, CC608_SCREEN_WIDTH+1);
- use_buffer->row_usedj = use_buffer->row_usedj+1;
- }
- }
- for (j = 0; j < (1 + wb->data608->cursor_row - keep_lines); j++)
- {
- memset(use_buffer->charactersj, ' ', CC608_SCREEN_WIDTH);
- memset(use_buffer->colorsj, COL_WHITE, CC608_SCREEN_WIDTH);
- memset(use_buffer->fontsj, FONT_REGULAR, CC608_SCREEN_WIDTH);
- use_buffer->charactersjCC608_SCREEN_WIDTH = 0;
- use_buffer->row_usedj = 0;
- }
- memset(use_buffer->characterslastrow, ' ', CC608_SCREEN_WIDTH);
- memset(use_buffer->colorslastrow, COL_WHITE, CC608_SCREEN_WIDTH);
- memset(use_buffer->fontslastrow, FONT_REGULAR, CC608_SCREEN_WIDTH);
-
- use_buffer->characterslastrowCC608_SCREEN_WIDTH = 0;
- use_buffer->row_usedlastrow = 0;
-
- // Sanity check
- rows_now = 0;
- for (i = 0; i < 15; i++)
- if (use_buffer->row_usedi)
- rows_now++;
- if (rows_now > keep_lines)
- hb_log ("Bug in roll_up, should have %d lines but I have %d.\n",
- keep_lines, rows_now);
- use_buffer->dirty = 1;
-}
-
-void erase_memory (struct s_write *wb, int displayed)
-{
- struct eia608_screen *buf;
- if (displayed)
- {
- buf = get_current_visible_buffer(wb);
- }
- else
- {
- buf = get_current_hidden_buffer(wb);
- }
- clear_eia608_cc_buffer (buf);
-}
-
-static int is_current_row_empty (struct s_write *wb)
-{
- struct eia608_screen *use_buffer;
- int i;
-
- use_buffer = get_current_visible_buffer(wb);
- for (i=0;i<CC608_SCREEN_WIDTH;i++)
- {
- if (use_buffer->characterswb->data608->rollup_base_rowi!=' ')
- return 0;
- }
- return 1;
-}
-
-/* Process GLOBAL CODES */
-static void handle_command(unsigned char c1, const unsigned char c2,
- struct s_write *wb)
-{
- // Handle channel change
- wb->data608->channel=wb->new_channel;
- if (wb->data608->channel!=cc_channel)
- return;
-
- enum command_code command = COM_UNKNOWN;
- if (c1==0x15)
- c1=0x14;
- if ((c1==0x14 || c1==0x1C) && c2==0x2C)
- command = COM_ERASEDISPLAYEDMEMORY;
- if ((c1==0x14 || c1==0x1C) && c2==0x20)
- command = COM_RESUMECAPTIONLOADING;
- if ((c1==0x14 || c1==0x1C) && c2==0x2F)
- command = COM_ENDOFCAPTION;
- if ((c1==0x17 || c1==0x1F) && c2==0x21)
- command = COM_TABOFFSET1;
- if ((c1==0x17 || c1==0x1F) && c2==0x22)
- command = COM_TABOFFSET2;
- if ((c1==0x17 || c1==0x1F) && c2==0x23)
- command = COM_TABOFFSET3;
- if ((c1==0x14 || c1==0x1C) && c2==0x25)
- command = COM_ROLLUP2;
- if ((c1==0x14 || c1==0x1C) && c2==0x26)
- command = COM_ROLLUP3;
- if ((c1==0x14 || c1==0x1C) && c2==0x27)
- command = COM_ROLLUP4;
- if ((c1==0x14 || c1==0x1C) && c2==0x2D)
- command = COM_CARRIAGERETURN;
- if ((c1==0x14 || c1==0x1C) && c2==0x2E)
- command = COM_ERASENONDISPLAYEDMEMORY;
- if ((c1==0x14 || c1==0x1C) && c2==0x21)
- command = COM_BACKSPACE;
- if ((c1==0x14 || c1==0x1C) && c2==0x2b)
- command = COM_RESUMETEXTDISPLAY;
- if (debug_608)
- {
- hb_log ("\rCommand: %02X %02X (%s)\n",c1,c2,command_typecommand);
- }
- switch (command)
- {
- case COM_BACKSPACE:
- if (wb->data608->cursor_column>0)
- {
- struct eia608_screen *data;
- data = get_writing_buffer(wb);
- if (data != NULL)
- {
- wb->data608->cursor_column--;
- data->characterswb->data608->cursor_rowwb->data608->cursor_column = ' ';
- data->dirty = 1;
- }
- }
- break;
- case COM_TABOFFSET1:
- if (wb->data608->cursor_column<31)
- wb->data608->cursor_column++;
- break;
- case COM_TABOFFSET2:
- wb->data608->cursor_column+=2;
- if (wb->data608->cursor_column>31)
- wb->data608->cursor_column=31;
- break;
- case COM_TABOFFSET3:
- wb->data608->cursor_column+=3;
- if (wb->data608->cursor_column>31)
- wb->data608->cursor_column=31;
- break;
- case COM_RESUMECAPTIONLOADING:
- wb->data608->mode=MODE_POPUP;
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- break;
- case COM_RESUMETEXTDISPLAY:
- wb->data608->mode=MODE_TEXT;
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- break;
- case COM_ROLLUP2:
- if (wb->data608->rollup_base_row + 1 < 2)
- {
- move_roll_up(wb, 1);
- wb->data608->rollup_base_row = 1;
- }
- if (wb->data608->mode==MODE_POPUP)
- {
- swap_visible_buffer(wb);
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
- erase_memory (wb, 1);
- }
- wb->data608->color=default_color;
- wb->data608->font=FONT_REGULAR;
- if (wb->data608->mode==MODE_ROLLUP_2 && !is_current_row_empty(wb))
- {
- if (debug_608)
- hb_log ("Two RU2, current line not empty. Simulating a CR\n");
- handle_command(0x14, 0x2D, wb);
- wb->rollup_cr = 1;
- }
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- wb->data608->mode=MODE_ROLLUP_2;
- erase_memory (wb, 0);
- wb->data608->cursor_column = 0;
- wb->data608->cursor_row = wb->data608->rollup_base_row;
- break;
- case COM_ROLLUP3:
- if (wb->data608->rollup_base_row + 1 < 3)
- {
- move_roll_up(wb, 2);
- wb->data608->rollup_base_row = 2;
- }
- if (wb->data608->mode==MODE_POPUP)
- {
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
- erase_memory (wb, 1);
- }
- wb->data608->color=default_color;
- wb->data608->font=FONT_REGULAR;
- if (wb->data608->mode==MODE_ROLLUP_3 && !is_current_row_empty(wb))
- {
- if (debug_608)
- hb_log ("Two RU3, current line not empty. Simulating a CR\n");
- handle_command(0x14, 0x2D, wb);
- wb->rollup_cr = 1;
- }
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- wb->data608->mode=MODE_ROLLUP_3;
- erase_memory (wb, 0);
- wb->data608->cursor_column = 0;
- wb->data608->cursor_row = wb->data608->rollup_base_row;
- break;
- case COM_ROLLUP4:
- if (wb->data608->rollup_base_row + 1 < 4)
- {
- move_roll_up(wb, 3);
- wb->data608->rollup_base_row = 3;
- }
- if (wb->data608->mode==MODE_POPUP)
- {
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
- erase_memory (wb, 1);
- }
- wb->data608->color=default_color;
- wb->data608->font=FONT_REGULAR;
- if (wb->data608->mode==MODE_ROLLUP_4 && !is_current_row_empty(wb))
- {
- if (debug_608)
- hb_log ("Two RU4, current line not empty. Simulating a CR\n");
- handle_command(0x14, 0x2D, wb);
- wb->rollup_cr = 1;
- }
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- wb->data608->mode = MODE_ROLLUP_4;
- wb->data608->cursor_column = 0;
- wb->data608->cursor_row = wb->data608->rollup_base_row;
- erase_memory (wb, 0);
- break;
- case COM_CARRIAGERETURN:
- // In transcript mode, CR doesn't write the whole screen, to avoid
- // repeated lines.
-
- // Skip initial CR if rollup has already done it
- if (wb->rollup_cr && is_current_row_empty(wb))
- {
- wb->rollup_cr = 0;
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- break;
- }
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
- roll_up(wb);
- wb->data608->cursor_column = 0;
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- break;
- case COM_ERASENONDISPLAYEDMEMORY:
- erase_memory (wb,0);
- break;
- case COM_ERASEDISPLAYEDMEMORY:
- // There may be "displayed" rollup data that has not been
- // written to a buffer yet.
- if (wb->data608->mode == MODE_ROLLUP_2 ||
- wb->data608->mode == MODE_ROLLUP_3 ||
- wb->data608->mode == MODE_ROLLUP_4)
- {
- write_cc_buffer(wb);
- }
- erase_memory (wb,1);
-
- // the last pts is the time to remove the previously
- // displayed CC from the display
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
-
- // Write "clear" subtitle if necessary
- struct eia608_screen *data;
- data = get_current_visible_buffer(wb);
- data->dirty = 1;
- write_cc_buffer(wb);
- break;
- case COM_ENDOFCAPTION: // Switch buffers
- // The currently *visible* buffer is leaving, so now we know it's ending
- // time. Time to actually write it to file.
- if (wb->data608->mode == MODE_POPUP)
- {
- swap_visible_buffer(wb);
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- }
- if (write_cc_buffer(wb))
- wb->data608->screenfuls_counter++;
-
- if (wb->data608->mode != MODE_POPUP)
- swap_visible_buffer(wb);
- wb->data608->cursor_column = 0;
- wb->data608->cursor_row = 0;
- wb->data608->color=default_color;
- wb->data608->font=FONT_REGULAR;
- break;
- default:
- if (debug_608)
- {
- hb_log ("\rNot yet implemented.\n");
- }
- break;
- }
-}
-
-static void handle_end_of_data(struct s_write *wb)
-{
- // We issue a EraseDisplayedMemory here so if there's any captions pending
- // they get written to file.
- handle_command (0x14, 0x2c, wb); // EDM
-}
-
-static void handle_double(const unsigned char c1, const unsigned char c2,
- struct s_write *wb)
-{
- unsigned char c;
- if (wb->data608->channel!=cc_channel)
- return;
- if (c2>=0x30 && c2<=0x3f)
- {
- c=c2 + 0x50; // So if c>=0x80 && c<=0x8f, it comes from here
- if (debug_608)
- hb_log ("\rDouble: %02X %02X --> %c\n",c1,c2,c);
- write_char(c,wb);
- }
-}
-
-/* Process EXTENDED CHARACTERS */
-static unsigned char handle_extended(unsigned char hi, unsigned char lo,
- struct s_write *wb)
-{
- // Handle channel change
- if (wb->new_channel > 2)
- {
- wb->new_channel -= 2;
- if (debug_608)
- hb_log ("\nChannel correction, now %d\n", wb->new_channel);
- }
- wb->data608->channel=wb->new_channel;
- if (wb->data608->channel!=cc_channel)
- return 0;
-
- // For lo values between 0x20-0x3f
- unsigned char c=0;
-
- if (debug_608)
- hb_log ("\rExtended: %02X %02X\n",hi,lo);
- if (lo>=0x20 && lo<=0x3f && (hi==0x12 || hi==0x13))
- {
- switch (hi)
- {
- case 0x12:
- c=lo+0x70; // So if c>=0x90 && c<=0xaf it comes from here
- break;
- case 0x13:
- c=lo+0x90; // So if c>=0xb0 && c<=0xcf it comes from here
- break;
- }
- // This column change is because extended characters replace
- // the previous character (which is sent for basic decoders
- // to show something similar to the real char)
- if (wb->data608->cursor_column>0)
- wb->data608->cursor_column--;
-
- write_char (c,wb);
- }
- return 1;
-}
-
-/* Process PREAMBLE ACCESS CODES (PAC) */
-static void handle_pac(unsigned char c1, unsigned char c2, struct s_write *wb)
-{
- // Handle channel change
- if (wb->new_channel > 2)
- {
- wb->new_channel -= 2;
- if (debug_608)
- hb_log ("\nChannel correction, now %d\n", wb->new_channel);
- }
- wb->data608->channel=wb->new_channel;
- if (wb->data608->channel!=cc_channel)
- return;
-
- int row=rowdata((c1<<1)&14)|((c2>>5)&1);
-
- if (debug_608)
- hb_log ("\rPAC: %02X %02X",c1,c2);
-
- if (c2>=0x40 && c2<=0x5f)
- {
- c2=c2-0x40;
- }
- else
- {
- if (c2>=0x60 && c2<=0x7f)
- {
- c2=c2-0x60;
- }
- else
- {
- if (debug_608)
- hb_log ("\rThis is not a PAC!!!!!\n");
- return;
- }
- }
- wb->data608->color=pac2_attribsc20;
- wb->data608->font=pac2_attribsc21;
- int indent=pac2_attribsc22;
- if (debug_608)
- hb_log (" -- Position: %d:%d, color: %s, font: %s\n", row, indent,
- color_textwb->data608->color0,
- font_textwb->data608->font);
-
- // CC spec says to the preferred method to handle a roll-up base row
- // that causes the display to scroll off the top of the screen is to
- // adjust the base row down.
- int keep_lines;
- switch (wb->data608->mode)
- {
- case MODE_ROLLUP_2:
- keep_lines = 2;
- break;
- case MODE_ROLLUP_3:
- keep_lines = 3;
- break;
- case MODE_ROLLUP_4:
- keep_lines = 4;
- break;
- default:
- // Not rollup mode, all rows ok
- keep_lines = 0;
- break;
- }
- if (row < keep_lines)
- {
- row = keep_lines;
- }
- if (wb->data608->mode != MODE_TEXT)
- {
- // According to Robson, row info is discarded in text mode
- // but column is accepted
- //
- // CC-608 spec says current rollup display must move to the
- // new position when the cursor row changes
- move_roll_up(wb, row - 1);
- wb->data608->cursor_row = row - 1 ; // Since the array is 0 based
- }
- wb->data608->rollup_base_row = row - 1;
- wb->data608->cursor_column = indent;
-}
-
-
-static void handle_single(const unsigned char c1, struct s_write *wb)
-{
- if (c1<0x20 || wb->data608->channel!=cc_channel)
- return; // We don't allow special stuff here
- if (debug_608)
- hb_log ("%c",c1);
-
- /*if (debug_608)
- hb_log ("Character: %02X (%c) -> %02X (%c)\n",c1,c1,c,c); */
- write_char (c1,wb);
-}
-
-static int check_channel(unsigned char c1, struct s_write *wb)
-{
- if (c1==0x14)
- {
- if (debug_608 && wb->data608->channel!=1)
- hb_log ("\nChannel change, now 1\n");
- return 1;
- }
- if (c1==0x1c)
- {
- if (debug_608 && wb->data608->channel!=2)
- hb_log ("\nChannel change, now 2\n");
- return 2;
- }
- if (c1==0x15)
- {
- if (debug_608 && wb->data608->channel!=3)
- hb_log ("\nChannel change, now 3\n");
- return 3;
- }
- if (c1==0x1d)
- {
- if (debug_608 && wb->data608->channel!=4)
- hb_log ("\nChannel change, now 4\n");
- return 4;
- }
-
- // Otherwise keep the current channel
- return wb->data608->channel;
-}
-
-/* Handle Command, special char or attribute and also check for
-* channel changes.
-* Returns 1 if something was written to screen, 0 otherwise */
-static int disCommand(unsigned char hi, unsigned char lo, struct s_write *wb)
-{
- int wrote_to_screen=0;
-
- /* Full channel changes are only allowed for "GLOBAL CODES",
- * "OTHER POSITIONING CODES", "BACKGROUND COLOR CODES",
- * "MID-ROW CODES".
- * "PREAMBLE ACCESS CODES", "BACKGROUND COLOR CODES" and
- * SPECIAL/SPECIAL CHARACTERS allow only switching
- * between 1&3 or 2&4. */
- wb->new_channel = check_channel (hi,wb);
- //if (wb->data608->channel!=cc_channel)
- // continue;
-
- if (hi>=0x18 && hi<=0x1f)
- hi=hi-8;
-
- switch (hi)
- {
- case 0x10:
- if (lo>=0x40 && lo<=0x5f)
- handle_pac (hi,lo,wb);
- break;
- case 0x11:
- if (lo>=0x20 && lo<=0x2f)
- handle_text_attr (hi,lo,wb);
- if (lo>=0x30 && lo<=0x3f)
- {
- wrote_to_screen=1;
- handle_double (hi,lo,wb);
- }
- if (lo>=0x40 && lo<=0x7f)
- handle_pac (hi,lo,wb);
- break;
- case 0x12:
- case 0x13:
- if (lo>=0x20 && lo<=0x3f)
- {
- wrote_to_screen=handle_extended (hi,lo,wb);
- }
- if (lo>=0x40 && lo<=0x7f)
- handle_pac (hi,lo,wb);
- break;
- case 0x14:
- case 0x15:
- if (lo>=0x20 && lo<=0x2f)
- handle_command (hi,lo,wb);
- if (lo>=0x40 && lo<=0x7f)
- handle_pac (hi,lo,wb);
- break;
- case 0x16:
- if (lo>=0x40 && lo<=0x7f)
- handle_pac (hi,lo,wb);
- break;
- case 0x17:
- if (lo>=0x21 && lo<=0x23)
- handle_command (hi,lo,wb);
- if (lo>=0x2e && lo<=0x2f)
- handle_text_attr (hi,lo,wb);
- if (lo>=0x40 && lo<=0x7f)
- handle_pac (hi,lo,wb);
- break;
- }
- return wrote_to_screen;
-}
-
-static void process608(const unsigned char *data, int length,
- struct s_write *wb)
-{
- static int textprinted = 0;
- int i;
-
- if (data!=NULL)
- {
- for (i=0;i<length;i=i+2)
- {
- unsigned char hi, lo;
- hi = datai & 0x7F; // Get rid of parity bit
- lo = datai+1 & 0x7F; // Get rid of parity bit
-
- if (hi==0 && lo==0) // Just padding
- continue;
- if (hi>=0x01 && hi<=0x0E)
- {
- // XDS crap - mode. Would be nice to support it eventually
- // wb->data608->last_c1=0;
- // wb->data608->last_c2=0;
- wb->data608->channel=3; // Always channel 3
- wb->in_xds_mode=1;
- }
- if (hi==0x0F) // End of XDS block
- {
- wb->in_xds_mode=0;
- continue;
- }
- if (hi>=0x10 && hi<0x1F) // Non-character code or special/extended char
- // http://www.geocities.com/mcpoodle43/SCC_TOOLS/DOCS/CC_CODES.HTML
- // http://www.geocities.com/mcpoodle43/SCC_TOOLS/DOCS/CC_CHARS.HTML
- {
- // We were writing characters before, start a new line for
- // diagnostic output from disCommand()
- if (debug_608 && textprinted == 1 )
- {
- hb_log("\n");
- textprinted = 0;
- }
-
- wb->in_xds_mode=0; // Back to normal
- if (wb->data608->last_c1==hi && wb->data608->last_c2==lo)
- {
- // Duplicate dual code, discard
- continue;
- }
- wb->data608->last_c1=hi;
- wb->data608->last_c2=lo;
- disCommand (hi,lo,wb);
- }
- if (hi>=0x20) // Standard characters (always in pairs)
- {
- // Only print if the channel is active
- if (wb->data608->channel!=cc_channel)
- continue;
-
- if (debug_608)
- {
- if( textprinted == 0 )
- {
- hb_log("\n");
- textprinted = 1;
- }
- }
-
- handle_single(hi,wb);
- handle_single(lo,wb);
- wb->data608->last_c1=0;
- wb->data608->last_c2=0;
- }
-
- if ( debug_608 && !textprinted && wb->data608->channel==cc_channel )
- { // Current FTS information after the characters are shown
- //hb_log("Current FTS: %s\n", print_mstime(wb->last_pts));
- }
-
- if ((wb->data608->mode == MODE_ROLLUP_2 ||
- wb->data608->mode == MODE_ROLLUP_3 ||
- wb->data608->mode == MODE_ROLLUP_4) &&
- wb->direct_rollup)
- {
- // If we are showing rollup on the fly (direct_rollup)
- // write a buffer now
- write_cc_buffer(wb);
- wb->data608->current_visible_start_ms = wb->last_pts;
- wb->data608->current_visible_scr_sequence = wb->last_scr_sequence;
- }
- }
- }
-}
-
-struct hb_work_private_s
-{
- hb_job_t * job;
- struct s_write * cc608;
-};
-
-static int decccInit( hb_work_object_t * w, hb_job_t * job )
-{
- int retval = 1;
- hb_work_private_t * pv;
-
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- if( pv )
- {
- w->private_data = pv;
-
- pv->job = job;
-
- pv->cc608 = calloc(1, sizeof(struct s_write));
-
- if( pv->cc608 )
- {
- pv->cc608->width = job->title->geometry.width;
- pv->cc608->height = job->title->geometry.height;
- memcpy(pv->cc608->crop, job->crop, sizeof(int4));
- pv->cc608->par = job->title->geometry.par;
- retval = general_608_init(pv->cc608);
- if( !retval )
- {
- pv->cc608->data608 = calloc(1, sizeof(struct eia608));
- if( !pv->cc608->data608 )
- {
- retval = 1;
- }
- else
- {
- init_eia608(pv->cc608->data608);
- }
- }
-
- // When rendering subs, we need to push rollup subtitles out
- // asap (instead of waiting for a completed line) so that we
- // do not miss the frame that they should be rendered over.
- pv->cc608->direct_rollup = w->subtitle->config.dest == RENDERSUB;
- }
-
- if (!retval)
- {
- // Generate generic SSA Script Info.
- int height = job->title->geometry.height - job->crop0 - job->crop1;
- int width = job->title->geometry.width - job->crop2 - job->crop3;
- int safe_height = 0.8 * job->title->geometry.height;
- hb_subtitle_add_ssa_header(w->subtitle, HB_FONT_MONO,
- .08 * safe_height, width, height);
- }
- }
- return retval;
-}
-
-static int decccWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * in = *buf_in;
-
- if (in->s.flags & HB_BUF_FLAG_EOF)
- {
- /* EOF on input stream - send it downstream & say that we're done */
- handle_end_of_data(pv->cc608);
- /*
- * Grab any pending buffer and output them with the EOF on the end
- */
- *buf_in = NULL;
- hb_buffer_list_append(&pv->cc608->list, in);
- *buf_out = hb_buffer_list_clear(&pv->cc608->list);
- return HB_WORK_DONE;
- }
-
- pv->cc608->last_pts = in->s.start;
- pv->cc608->last_scr_sequence = in->s.scr_sequence;
- process608(in->data, in->size, pv->cc608);
-
- /*
- * If there is one waiting then pass it on
- */
- *buf_out = hb_buffer_list_clear(&pv->cc608->list);
- return HB_WORK_OK;
-}
-
-static void decccClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- if (pv)
- {
- general_608_close( pv->cc608 );
- free( pv->cc608->data608 );
- free( pv->cc608 );
- }
- free( w->private_data );
-}
-
-hb_work_object_t hb_deccc608 =
-{
- WORK_DECCC608,
- "Closed Caption (608) decoder",
- decccInit,
- decccWork,
- decccClose
-};

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decpgssub.c Deleted

@@ -1,509 +0,0 @@
-/* decpgssub.c
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "handbrake/handbrake.h"
-#include "handbrake/hbffmpeg.h"
-
-struct hb_work_private_s
-{
- AVCodecContext * context;
- hb_job_t * job;
- // For PGS subs, when doing passthru, we don't know if we need a
- // packet until we have processed several packets. So we cache
- // all the packets we see until libav returns a subtitle with
- // the information we need.
- hb_buffer_list_t list_pass;
- // It is possible for multiple subtitles to be encapsulated in
- // one packet. This won't happen for PGS subs, but may for other
- // types of subtitles. Since I plan to generalize this code to handle
- // other than PGS, we will need to keep a list of all subtitles seen
- // while parsing an input packet.
- hb_buffer_list_t list;
- // XXX: we may occasionally see subtitles with broken timestamps
- // while this should really get fixed elsewhere,
- // dropping subtitles should be avoided as much as possible
- int64_t last_pts;
- // for PGS subs, we need to pass 'empty' subtitles through (they clear the
- // display) - when doing forced-only extraction, only pass empty subtitles
- // through if we've seen a forced sub and haven't seen any empty sub since
- uint8_t seen_forced_sub;
- // if we start encoding partway through the source, we may encounter empty
- // subtitles before we see any actual subtitle content - discard them
- uint8_t discard_subtitle;
-};
-
-static int decsubInit( hb_work_object_t * w, hb_job_t * job )
-{
- AVCodec *codec = avcodec_find_decoder( AV_CODEC_ID_HDMV_PGS_SUBTITLE );
- AVCodecContext *context = avcodec_alloc_context3( codec );
- context->codec = codec;
-
- hb_work_private_t * pv;
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- w->private_data = pv;
-
- hb_buffer_list_clear(&pv->list);
- hb_buffer_list_clear(&pv->list_pass);
- pv->discard_subtitle = 1;
- pv->seen_forced_sub = 0;
- pv->last_pts = AV_NOPTS_VALUE;
- pv->context = context;
- context->pkt_timebase.num = w->subtitle->timebase.num;
- context->pkt_timebase.den = w->subtitle->timebase.den;
- pv->job = job;
-
- // Set decoder opts...
- AVDictionary * av_opts = NULL;
- // e.g. av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
-
- if (hb_avcodec_open(pv->context, codec, &av_opts, 0))
- {
- av_dict_free( &av_opts );
- hb_log("decsubInit: avcodec_open failed");
- return 1;
- }
- av_dict_free( &av_opts );
-
-
- return 0;
-}
-
-static void make_empty_pgs( hb_buffer_t * buf )
-{
- hb_buffer_t * b = buf;
- uint8_t done = 0;
-
- // Each buffer is composed of 1 or more segments.
- // Segment header is:
- // type - 1 byte
- // length - 2 bytes
- // We want to modify the presentation segment which is type 0x16
- //
- // Note that every pgs display set is required to have a presentation
- // segment, so we will only have to look at one display set.
- while ( b && !done )
- {
- int ii = 0;
-
- while (ii + 3 <= b->size)
- {
- uint8_t type;
- int len;
- int segment_len_pos;
-
- type = b->dataii++;
- segment_len_pos = ii;
- len = ((int)b->dataii << 8) + b->dataii+1;
- ii += 2;
-
- if (type == 0x16 && ii + len <= b->size)
- {
- int obj_count;
- int kk, jj = ii;
- int obj_start;
-
- // Skip
- // video descriptor 5 bytes
- // composition descriptor 3 bytes
- // palette update flg 1 byte
- // palette id ref 1 byte
- jj += 10;
-
- // Set number of composition objects to 0
- obj_count = b->datajj;
- b->datajj = 0;
- jj++;
- obj_start = jj;
-
- // And remove all the composition objects
- for (kk = 0; kk < obj_count; kk++)
- {
- uint8_t crop;
-
- crop = b->datajj + 3;
- // skip
- // object id - 2 bytes
- // window id - 1 byte
- // object/forced flag - 1 byte
- // x pos - 2 bytes
- // y pos - 2 bytes
- jj += 8;
- if (crop & 0x80)
- {
- // skip
- // crop x - 2 bytes
- // crop y - 2 bytes
- // crop w - 2 bytes
- // crop h - 2 bytes
- jj += 8;
- }
- }
- if (jj < b->size)
- {
- memmove(b->data + obj_start, b->data + jj, b->size - jj);
- }
- b->size = obj_start + ( b->size - jj );
- done = 1;
- len = obj_start - (segment_len_pos + 2);
- b->datasegment_len_pos = len >> 8;
- b->datasegment_len_pos+1 = len & 0xff;
- break;
- }
- ii += len;
- }
- b = b->next;
- }
-}
-
-static int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * in = *buf_in;
-
- if (in->s.flags & HB_BUF_FLAG_EOF)
- {
- /* EOF on input stream - send it downstream & say that we're done */
- *buf_in = NULL;
- hb_buffer_list_append(&pv->list, in);
-
- *buf_out = hb_buffer_list_clear(&pv->list);
- return HB_WORK_DONE;
- }
-
- if ( !pv->job->indepth_scan &&
- w->subtitle->config.dest == PASSTHRUSUB &&
- hb_subtitle_can_pass( PGSSUB, pv->job->mux ) )
- {
- // Append to buffer list. It will be sent to fifo after we determine
- // if this is a packet we need.
- hb_buffer_list_append(&pv->list_pass, in);
-
- // We are keeping the buffer, so prevent the filter loop from
- // deleting it.
- *buf_in = NULL;
- }
-
- AVSubtitle subtitle;
- memset( &subtitle, 0, sizeof(subtitle) );
-
- AVPacket avp;
- av_init_packet( &avp );
- avp.data = in->data;
- avp.size = in->size;
- avp.pts = in->s.start;
-
- int has_subtitle = 0;
-
- do
- {
- int usedBytes = avcodec_decode_subtitle2( pv->context, &subtitle, &has_subtitle, &avp );
- if (usedBytes < 0)
- {
- hb_log("unable to decode subtitle with %d bytes.", avp.size);
- return HB_WORK_OK;
- }
-
- if (usedBytes <= avp.size)
- {
- avp.data += usedBytes;
- avp.size -= usedBytes;
- }
- else
- {
- avp.size = 0;
- }
-
- /* Subtitles are "usable" if:
- * 1. FFmpeg returned a subtitle (has_subtitle) AND
- * 2. we're not doing Foreign Audio Search (!pv->job->indepth_scan) AND
- * 3. the sub is non-empty or we've seen one such sub before (!pv->discard_subtitle)
- * For forced-only extraction, usable subtitles also need to:
- * a. be forced (subtitle.rects0->flags & AV_SUBTITLE_FLAG_FORCED) OR
- * b. follow a forced sub (pv->seen_forced_sub) */
- uint8_t forced_sub = 0;
- uint8_t useable_sub = 0;
- uint8_t clear_subtitle = 0;
-
- if (has_subtitle)
- {
- // subtitle statistics
- if (subtitle.num_rects)
- {
- w->subtitle->hits++;
- if (subtitle.rects0->flags & AV_SUBTITLE_FLAG_FORCED)
- {
- forced_sub = 1;
- w->subtitle->forced_hits++;
- }
- }
- else
- {
- clear_subtitle = 1;
- }
- // are we doing Foreign Audio Search?
- if (!pv->job->indepth_scan)
- {
- // do we want to discard this subtitle?
- pv->discard_subtitle = pv->discard_subtitle && clear_subtitle;
- // do we need this subtitle?
- useable_sub = (!pv->discard_subtitle &&
- (!w->subtitle->config.force ||
- forced_sub || pv->seen_forced_sub));
- // do we need to create an empty subtitle?
- if (w->subtitle->config.force &&
- useable_sub && !forced_sub && !clear_subtitle)
- {
- // We are forced-only and need to output this subtitle, but
- // it's neither forced nor empty.
- //
- // If passthru, create an empty subtitle.
- // Also, flag an empty subtitle for subtitle RENDER.
- make_empty_pgs(hb_buffer_list_head(&pv->list_pass));
- clear_subtitle = 1;
- }
- // is the subtitle forced?
- pv->seen_forced_sub = forced_sub;
- }
- }
-
- if (useable_sub)
- {
- int64_t pts = AV_NOPTS_VALUE;
- hb_buffer_t * out = NULL;
-
- if (subtitle.pts != AV_NOPTS_VALUE)
- {
- pts = av_rescale(subtitle.pts, 90000, AV_TIME_BASE);
- }
- else
- {
- if (in->s.start >= 0)
- {
- pts = in->s.start;
- }
- else
- {
- // XXX: a broken pts will cause us to drop this subtitle,
- // which is bad; use a default duration of 3 seconds
- //
- // A broken pts is only generated when a pgs packet
- // occurs after a discontinuity and before the
- // next audio or video packet which re-establishes
- // timing (afaik).
- if (pv->last_pts == AV_NOPTS_VALUE)
- {
- pts = 0LL;
- }
- else
- {
- pts = pv->last_pts + 3 * 90000LL;
- }
- hb_log("warning decpgssub: track %d, invalid PTS",
- w->subtitle->out_track);
- }
- }
- // work around broken timestamps
- if (pts < pv->last_pts)
- {
- // XXX: this should only happen if the previous pts
- // was unknown and our 3 second default duration
- // overshot the next pgs pts.
- //
- // assign a 1 second duration
- hb_log("decpgssub: track %d, non-monotically increasing PTS, last %"PRId64" current %"PRId64"",
- w->subtitle->out_track,
- pv->last_pts, pts);
- pts = pv->last_pts + 1 * 90000LL;
- }
- pv->last_pts = pts;
-
- if ( w->subtitle->config.dest == PASSTHRUSUB &&
- hb_subtitle_can_pass( PGSSUB, pv->job->mux ) )
- {
- /* PGS subtitles are spread across multiple packets,
- * 1 per segment.
- *
- * In the MKV container, all segments are found in the same
- * packet (this is expected by some devices, such as the
- * WD TV Live). So if there are multiple packets,
- * merge them. */
- if (hb_buffer_list_count(&pv->list_pass) == 1)
- {
- // packets already merged (e.g. MKV sources)
- out = hb_buffer_list_clear(&pv->list_pass);
- }
- else
- {
- int size = 0;
- uint8_t * data;
- hb_buffer_t * b;
-
- b = hb_buffer_list_head(&pv->list_pass);
- while (b != NULL)
- {
- size += b->size;
- b = b->next;
- }
-
- out = hb_buffer_init( size );
- data = out->data;
- b = hb_buffer_list_head(&pv->list_pass);
- while (b != NULL)
- {
- memcpy(data, b->data, b->size);
- data += b->size;
- b = b->next;
- }
- hb_buffer_list_close(&pv->list_pass);
-
- out->s = in->s;
- }
- out->s.frametype = HB_FRAME_SUBTITLE;
- out->s.renderOffset = AV_NOPTS_VALUE;
- out->s.stop = AV_NOPTS_VALUE;
- out->s.start = pts;
- }
- else
- {
- if (!clear_subtitle)
- {
- unsigned ii, x0, y0, x1, y1, w, h;
-
- x0 = subtitle.rects0->x;
- y0 = subtitle.rects0->y;
- x1 = subtitle.rects0->x + subtitle.rects0->w;
- y1 = subtitle.rects0->y + subtitle.rects0->h;
-
- // First, find total bounding rectangle
- for (ii = 1; ii < subtitle.num_rects; ii++)
- {
- if (subtitle.rectsii->x < x0)
- x0 = subtitle.rectsii->x;
- if (subtitle.rectsii->y < y0)
- y0 = subtitle.rectsii->y;
- if (subtitle.rectsii->x + subtitle.rectsii->w > x1)
- x1 = subtitle.rectsii->x + subtitle.rectsii->w;
- if (subtitle.rectsii->y + subtitle.rectsii->h > y1)
- y1 = subtitle.rectsii->y + subtitle.rectsii->h;
- }
- w = x1 - x0;
- h = y1 - y0;
-
- out = hb_frame_buffer_init(AV_PIX_FMT_YUVA420P, w, h);
- memset(out->data, 0, out->size);
-
- out->s.frametype = HB_FRAME_SUBTITLE;
- out->s.id = in->s.id;
- out->s.start = pts;
- out->s.stop = AV_NOPTS_VALUE;
- out->s.renderOffset = AV_NOPTS_VALUE;
- out->s.scr_sequence = in->s.scr_sequence;
- out->f.x = x0;
- out->f.y = y0;
- out->f.window_width = pv->context->width;
- out->f.window_height = pv->context->height;
- for (ii = 0; ii < subtitle.num_rects; ii++)
- {
- AVSubtitleRect *rect = subtitle.rectsii;
-
- int off_x = rect->x - x0;
- int off_y = rect->y - y0;
- uint8_t *lum = out->plane0.data;
- uint8_t *chromaU = out->plane1.data;
- uint8_t *chromaV = out->plane2.data;
- uint8_t *alpha = out->plane3.data;
-
- lum += off_y * out->plane0.stride + off_x;
- alpha += off_y * out->plane3.stride + off_x;
- chromaU += (off_y >> 1) * out->plane1.stride + (off_x >> 1);
- chromaV += (off_y >> 1) * out->plane2.stride + (off_x >> 1);
-
- int xx, yy;
- for (yy = 0; yy < rect->h; yy++)
- {
- for (xx = 0; xx < rect->w; xx++)
- {
- uint32_t argb, yuv;
- int pixel;
- uint8_t color;
-
- pixel = yy * rect->w + xx;
- color = rect->data0pixel;
- argb = ((uint32_t*)rect->data1)color;
- yuv = hb_rgb2yuv(argb);
-
- lumxx = (yuv >> 16) & 0xff;
- alphaxx = (argb >> 24) & 0xff;
- if ((xx & 1) == 0 && (yy & 1) == 0)
- {
- chromaVxx>>1 = (yuv >> 8) & 0xff;
- chromaUxx>>1 = yuv & 0xff;
- }
- }
- lum += out->plane0.stride;
- if ((yy & 1) == 0)
- {
- chromaU += out->plane1.stride;
- chromaV += out->plane2.stride;
- }
- alpha += out->plane3.stride;
- }
- }
- hb_buffer_list_append(&pv->list, out);
- out = NULL;
- }
- else
- {
- out = hb_buffer_init( 0 );
-
- out->s.frametype = HB_FRAME_SUBTITLE;
- out->s.flags = HB_BUF_FLAG_EOS;
- out->s.id = in->s.id;
- out->s.start = pts;
- out->s.stop = pts;
- out->s.renderOffset = AV_NOPTS_VALUE;
- out->s.scr_sequence = in->s.scr_sequence;
- out->f.x = 0;
- out->f.y = 0;
- out->f.width = 0;
- out->f.height = 0;
- }
- }
- hb_buffer_list_append(&pv->list, out);
- }
- else if (has_subtitle)
- {
- hb_buffer_list_close(&pv->list_pass);
- }
- if (has_subtitle)
- {
- avsubtitle_free(&subtitle);
- }
- } while (avp.size > 0);
-
- *buf_out = hb_buffer_list_clear(&pv->list);
- return HB_WORK_OK;
-}
-
-static void decsubClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
- avcodec_flush_buffers( pv->context );
- avcodec_free_context( &pv->context );
-}
-
-hb_work_object_t hb_decpgssub =
-{
- WORK_DECPGSSUB,
- "PGS decoder",
- decsubInit,
- decsubWork,
- decsubClose
-};

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decutf8sub.c Deleted

@@ -1,87 +0,0 @@
-/* decutf8sub.c
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/*
- * Decoder for UTF-8 subtitles obtained from file input-sources.
- *
- * Input and output packet format is UTF-8 encoded text,
- * with limited HTML-style markup (only , , and ).
- *
- * @author David Foster (davidfstr)
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "handbrake/handbrake.h"
-#include "handbrake/decsrtsub.h"
-
-struct hb_work_private_s
-{
- int line; // SSA line number
-};
-
-static int decutf8Init(hb_work_object_t *w, hb_job_t *job)
-{
- hb_work_private_t * pv;
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- if (pv == NULL)
- return 1;
- w->private_data = pv;
-
- // Generate generic SSA Script Info.
- int height = job->title->geometry.height - job->crop0 - job->crop1;
- int width = job->title->geometry.width - job->crop2 - job->crop3;
- hb_subtitle_add_ssa_header(w->subtitle, HB_FONT_SANS,
- .066 * job->title->geometry.height,
- width, height);
-
- return 0;
-}
-
-static int decutf8Work(hb_work_object_t * w,
- hb_buffer_t **buf_in, hb_buffer_t **buf_out)
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * in = *buf_in;
- hb_buffer_t *out = *buf_in;
-
- *buf_in = NULL;
- if (in->s.flags & HB_BUF_FLAG_EOF)
- {
- *buf_out = in;
- return HB_WORK_DONE;
- }
-
- // Warn if the subtitle's duration has not been passed through by the
- // demuxer, which will prevent the subtitle from displaying at all
- if (out->s.stop == 0)
- {
- hb_log("decutf8sub: subtitle packet lacks duration");
- }
-
- hb_srt_to_ssa(out, ++pv->line);
- out->s.frametype = HB_FRAME_SUBTITLE;
- *buf_out = out;
-
- return HB_WORK_OK;
-}
-
-static void decutf8Close(hb_work_object_t *w)
-{
- free(w->private_data);
-}
-
-hb_work_object_t hb_decutf8sub =
-{
- WORK_DECUTF8SUB,
- "UTF-8 Subtitle Decoder",
- decutf8Init,
- decutf8Work,
- decutf8Close
-};

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decvobsub.c Deleted

@@ -1,734 +0,0 @@
-/* decvobsub.c
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/*
- * Decoder for DVD bitmap subtitles, also known as "VOB subtitles" within the HandBrake source code.
- *
- * Input format of the subtitle packets is described here:
- * http://sam.zoy.org/writings/dvd/subtitles/
- *
- * An auxiliary input is the color palette lookup table, in 'subtitle->palette'.
- * The demuxer implementation must fill out this table appropriately.
- * - In the case of a true DVD input, the palette is read from the IFO file.
- * - In the case of an MKV file input, the palette is read from the codec private data of the subtitle track.
- *
- * Output format of this decoder is PICTURESUB, which is:
- * struct PictureSubPacket {
- * uint8_t lumpixelCount; // Y
- * uint8_t alphapixelCount; // alpha (max = 16)
- * uint8_t chromaUpixelCount; // Cb
- * uint8_t chromaVpixelCount; // Cr
- * }
- */
-
-#include "handbrake/handbrake.h"
-
-struct hb_work_private_s
-{
- hb_job_t * job;
-
- hb_buffer_t * buf;
- int size_sub;
- int size_got;
- int size_rle;
- int64_t pts;
- int current_scr_sequence;
- int64_t pts_start;
- int64_t pts_stop;
- int scr_sequence;
- int pts_forced;
- int x;
- int y;
- int width;
- int height;
- int stream_id;
-
- int offsets2;
- uint8_t lum4;
- uint8_t chromaU4;
- uint8_t chromaV4;
- uint8_t alpha4;
- uint8_t palette_set;
-};
-
-static hb_buffer_t * Decode( hb_work_object_t * );
-
-int decsubInit( hb_work_object_t * w, hb_job_t * job )
-{
- hb_work_private_t * pv;
-
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- w->private_data = pv;
-
- pv->job = job;
- pv->pts = 0;
-
- // Warn if the input color palette is empty
- pv->palette_set = w->subtitle->palette_set;
- if ( pv->palette_set )
- {
- // Make sure the entries in the palette are not all 0
- pv->palette_set = 0;
- int i;
- for (i=0; i<16; i++)
- {
- if (w->subtitle->palettei)
- {
- pv->palette_set = 1;
- break;
- }
- }
- }
- if (!pv->palette_set) {
- hb_log( "decvobsub: input color palette is empty!" );
- }
-
- return 0;
-}
-
-int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_work_private_t * pv = w->private_data;
- hb_buffer_t * in = *buf_in;
- int size_sub, size_rle;
-
- if (in->s.flags & HB_BUF_FLAG_EOF)
- {
- /* EOF on input stream - send it downstream & say that we're done */
- *buf_out = in;
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- pv->stream_id = in->s.id;
-
- size_sub = ( in->data0 << 8 ) | in->data1;
- size_rle = ( in->data2 << 8 ) | in->data3;
-
- if( !pv->size_sub )
- {
- /* We are looking for the start of a new subtitle */
- if( size_sub && size_rle && size_sub > size_rle &&
- in->size <= size_sub )
- {
- /* Looks all right so far */
- pv->size_sub = size_sub;
- pv->size_rle = size_rle;
-
- pv->buf = hb_buffer_init( 0xFFFF );
- memcpy( pv->buf->data, in->data, in->size );
- pv->buf->s.id = in->s.id;
- pv->buf->s.frametype = HB_FRAME_SUBTITLE;
- pv->size_got = in->size;
- if( in->s.start >= 0 )
- {
- pv->pts = in->s.start;
- pv->current_scr_sequence = in->s.scr_sequence;
- }
- }
- }
- else
- {
- /* We are waiting for the end of the current subtitle */
- if( in->size <= pv->size_sub - pv->size_got )
- {
- memcpy( pv->buf->data + pv->size_got, in->data, in->size );
- pv->buf->s.id = in->s.id;
- pv->size_got += in->size;
- if( in->s.start >= 0 )
- {
- pv->pts = in->s.start;
- pv->current_scr_sequence = in->s.scr_sequence;
- }
- }
- else
- {
- // bad size, must have lost sync
- // force re-sync
- if ( pv->buf != NULL )
- hb_buffer_close( &pv->buf );
- pv->size_sub = 0;
- }
-
- }
-
- *buf_out = NULL;
-
- if( pv->size_sub && pv->size_sub == pv->size_got )
- {
- pv->buf->size = pv->size_sub;
-
- /* We got a complete subtitle, decode it */
- *buf_out = Decode( w );
-
- if ( *buf_out != NULL )
- (*buf_out)->s.id = in->s.id;
-
- /* Wait for the next one */
- pv->size_sub = 0;
- pv->size_got = 0;
- pv->size_rle = 0;
-
- if ( pv->pts_stop != AV_NOPTS_VALUE )
- {
- // If we don't get a valid next timestamp, use the stop time
- // of the current sub as the start of the next.
- // This can happen if reader invalidates timestamps while
- // waiting for an audio to update the SCR.
- pv->pts = pv->pts_stop;
- pv->current_scr_sequence = pv->scr_sequence;
- }
- }
-
- return HB_WORK_OK;
-}
-
-void decsubClose( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
-
- if ( pv && pv->buf )
- hb_buffer_close( &pv->buf );
- free( w->private_data );
-}
-
-hb_work_object_t hb_decvobsub =
-{
- WORK_DECVOBSUB,
- "VOBSUB decoder",
- decsubInit,
- decsubWork,
- decsubClose
-};
-
-
-/***********************************************************************
- * ParseControls
- ***********************************************************************
- * Get the start and end dates (relative to the PTS from the PES
- * header), the width and height of the subpicture and the colors and
- * alphas used in it
- **********************************************************************/
-static int ParseControls( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
- uint8_t * buf = pv->buf->data;
-
- int i;
- int command;
- int date, next;
-
- pv->pts_start = AV_NOPTS_VALUE;
- pv->pts_stop = AV_NOPTS_VALUE;
- pv->pts_forced = 0;
-
- pv->alpha3 = 0;
- pv->alpha2 = 0;
- pv->alpha1 = 0;
- pv->alpha0 = 0;
-
- for( i = pv->size_rle; ; )
- {
- if ( i + 1 >= pv->buf->size )
- {
- return 1;
- }
-
- date = ( bufi << 8 ) | bufi+1; i += 2;
- next = ( bufi << 8 ) | bufi+1; i += 2;
-
- for( ;; )
- {
- if ( i >= pv->buf->size )
- {
- return 1;
- }
- command = bufi++;
-
- /*
- * There are eight commands available for
- * Sub-Pictures. The first SP_DCSQ should contain, as a
- * minimum, SET_COLOR, SET_CONTR, SET_DAREA, and
- * SET_DSPXA
- */
-
- if( command == 0xFF ) // 0xFF - CMD_END - ends one SP_DCSQ
- {
- break;
- }
-
- switch( command )
- {
- case 0x00: // 0x00 - FSTA_DSP - Forced Start Display, no arguments
- pv->pts_start = pv->pts + date * 1024;
- pv->scr_sequence = pv->current_scr_sequence;
- pv->pts_forced = 1;
- w->subtitle->hits++;
- w->subtitle->forced_hits++;
- break;
-
- case 0x01: // 0x01 - STA_DSP - Start Display, no arguments
- pv->pts_start = pv->pts + date * 1024;
- pv->scr_sequence = pv->current_scr_sequence;
- pv->pts_forced = 0;
- w->subtitle->hits++;
- break;
-
- case 0x02: // 0x02 - STP_DSP - Stop Display, no arguments
- if (pv->pts_stop == AV_NOPTS_VALUE)
- {
- pv->pts_stop = pv->pts + date * 1024;
- pv->scr_sequence = pv->current_scr_sequence;
- }
- break;
-
- case 0x03: // 0x03 - SET_COLOR - Set Colour indices
- {
- /*
- * SET_COLOR - provides four indices into the CLUT
- * for the current PGC to associate with the four
- * pixel values
- */
- int colors4;
- int j;
-
- if ( i + 1 >= pv->buf->size )
- {
- return 1;
- }
-
- colors0 = (bufi+0>>4)&0x0f;
- colors1 = (bufi+0)&0x0f;
- colors2 = (bufi+1>>4)&0x0f;
- colors3 = (bufi+1)&0x0f;
-
- for( j = 0; j < 4; j++ )
- {
- /*
- * Not sure what is happening here, in theory
- * the palette is in YCbCr. And we want YUV.
- *
- * However it looks more like YCrCb (according
- * to pgcedit). And the scalers for YCrCb don't
- * work, but I get the right colours by doing
- * no conversion.
- */
- uint32_t color = w->subtitle->palettecolorsj;
- uint8_t Cr, Cb, y;
- y = (color>>16) & 0xff;
- Cr = (color>>8) & 0xff;
- Cb = (color) & 0xff;
- pv->lum3-j = y;
- pv->chromaU3-j = Cb;
- pv->chromaV3-j = Cr;
- /* hb_log("color%d y = %d, u = %d, v = %d",
- 3-j,
- pv->lum3-j,
- pv->chromaU3-j,
- pv->chromaV3-j);
- */
- }
- i += 2;
- break;
- }
- case 0x04: // 0x04 - SET_CONTR - Set Contrast
- {
- /*
- * SET_CONTR - directly provides the four contrast
- * (alpha blend) values to associate with the four
- * pixel values
- */
- uint8_t alpha4;
-
- if ( i + 1 >= pv->buf->size )
- {
- return 1;
- }
-
- alpha3 = ((bufi+0 >> 4) & 0x0f) << 4;
- alpha2 = ((bufi+0 ) & 0x0f) << 4;
- alpha1 = ((bufi+1 >> 4) & 0x0f) << 4;
- alpha0 = ((bufi+1 ) & 0x0f) << 4;
-
-
- int lastAlpha = pv->alpha3 + pv->alpha2 + pv->alpha1 + pv->alpha0;
- int currAlpha = alpha3 + alpha2 + alpha1 + alpha0;
-
- // fading-in, save the highest alpha value
- if( currAlpha > lastAlpha )
- {
- pv->alpha3 = alpha3;
- pv->alpha2 = alpha2;
- pv->alpha1 = alpha1;
- pv->alpha0 = alpha0;
- }
-
- // fading-out
- if (currAlpha < lastAlpha && pv->pts_stop == AV_NOPTS_VALUE)
- {
- pv->pts_stop = pv->pts + date * 1024;
- pv->scr_sequence = pv->current_scr_sequence;
- }
-
- i += 2;
- break;
- }
- case 0x05: // 0x05 - SET_DAREA - defines the display area
- {
- if ( i + 4 >= pv->buf->size )
- {
- return 1;
- }
-
- pv->x = (bufi+0<<4) | ((bufi+1>>4)&0x0f);
- pv->width = (((bufi+1&0x0f)<<8)| bufi+2) - pv->x + 1;
- pv->y = (bufi+3<<4)| ((bufi+4>>4)&0x0f);
- pv->height = (((bufi+4&0x0f)<<8)| bufi+5) - pv->y + 1;
- i += 6;
- break;
- }
- case 0x06: // 0x06 - SET_DSPXA - defines the pixel data addresses
- {
- pv->offsets0 = ( bufi << 8 ) | bufi+1; i += 2;
- pv->offsets1 = ( bufi << 8 ) | bufi+1; i += 2;
- break;
- }
- }
- }
-
-
-
- if( i > next )
- {
- break;
- }
- i = next;
- }
- // Generate timestamps if they are not set
- if( pv->pts_start == AV_NOPTS_VALUE )
- {
- // Set pts to end of last sub if the start time is unknown.
- pv->pts_start = pv->pts;
- pv->scr_sequence = pv->current_scr_sequence;
- }
-
- return 0;
-}
-
-/***********************************************************************
- * CropSubtitle
- ***********************************************************************
- * Given a raw decoded subtitle, detects transparent borders and
- * returns a cropped subtitle in a hb_buffer_t ready to be used by
- * the renderer, or NULL if the subtitle was completely transparent
- **********************************************************************/
-static int LineIsTransparent( hb_work_object_t * w, uint8_t * p )
-{
- hb_work_private_t * pv = w->private_data;
- int i;
- for( i = 0; i < pv->width; i++ )
- {
- if( pi )
- {
- return 0;
- }
- }
- return 1;
-}
-
-static int ColumnIsTransparent( hb_work_object_t * w, uint8_t * p )
-{
- hb_work_private_t * pv = w->private_data;
- int i;
- for( i = 0; i < pv->height; i++ )
- {
- if( pi*pv->width )
- {
- return 0;
- }
- }
- return 1;
-}
-
-// Brain dead resampler. This should really use swscale...
-// Uses Bresenham algo to pick source samples for averaging
-static void resample( uint8_t * dst, uint8_t * src, int dst_w, int src_w )
-{
- int dst_x, src_x, err, cnt, sum, val;
-
- if( dst_w < src_w )
- {
- // sample down
- sum = 0;
- val = 0;
- cnt = 0;
- err = src_w / 2;
- dst_x = 0;
- for( src_x = 0; src_x < src_w; src_x++ )
- {
- sum += srcsrc_x;
- cnt++;
- err -= dst_w;
- if( err < 0 )
- {
- val = sum / cnt;
- dstdst_x++ = val;
- sum = cnt = 0;
- err += src_w;
- }
- }
- for( ; dst_x < dst_w; dst_x++ )
- {
- dstdst_x = val;
- }
- }
- else
- {
- // sample up
- err = dst_w / 2;
- src_x = 0;
- for( dst_x = 0; dst_x < dst_w; dst_x++ )
- {
- dstdst_x = srcsrc_x;
- err -= src_w;
- if( err < 0 )
- {
- src_x++;
- err += dst_w;
- }
- }
- }
-}
-
-static hb_buffer_t * CropSubtitle( hb_work_object_t * w, uint8_t * raw )
-{
- hb_work_private_t * pv = w->private_data;
- int i;
- int crop4 = { -1,-1,-1,-1 };
- uint8_t * alpha;
- int realwidth, realheight;
- hb_buffer_t * buf;
- uint8_t * lum_in, * alpha_in, * u_in, * v_in;
-
- alpha = raw + pv->width * pv->height;
-
- /* Top */
- for( i = 0; i < pv->height; i++ )
- {
- if( !LineIsTransparent( w, &alphai*pv->width ) )
- {
- crop0 = i;
- break;
- }
- }
-
- if( crop0 < 0 )
- {
- /* Empty subtitle */
- return NULL;
- }
-
- /* Bottom */
- for( i = pv->height - 1; i >= 0; i-- )
- {
- if( !LineIsTransparent( w, &alphai*pv->width ) )
- {
- crop1 = i;
- break;
- }
- }
-
- /* Left */
- for( i = 0; i < pv->width; i++ )
- {
- if( !ColumnIsTransparent( w, &alphai ) )
- {
- crop2 = i;
- break;
- }
- }
-
- /* Right */
- for( i = pv->width - 1; i >= 0; i-- )
- {
- if( !ColumnIsTransparent( w, &alphai ) )
- {
- crop3 = i;
- break;
- }
- }
-
- realwidth = crop3 - crop2 + 1;
- realheight = crop1 - crop0 + 1;
-
- buf = hb_frame_buffer_init( AV_PIX_FMT_YUVA420P, realwidth, realheight );
- buf->s.frametype = HB_FRAME_SUBTITLE;
- buf->s.start = pv->pts_start;
- buf->s.stop = pv->pts_stop;
- buf->s.scr_sequence = pv->scr_sequence;
-
- buf->f.x = pv->x + crop2;
- buf->f.y = pv->y + crop0;
- buf->f.window_width = w->subtitle->width;
- buf->f.window_height = w->subtitle->height;
-
- lum_in = raw + crop0 * pv->width + crop2;
- alpha_in = lum_in + pv->width * pv->height;
- u_in = alpha_in + pv->width * pv->height;
- v_in = u_in + pv->width * pv->height;
-
- uint8_t *dst;
- for( i = 0; i < realheight; i++ )
- {
- // Luma
- dst = buf->plane0.data + buf->plane0.stride * i;
- memcpy( dst, lum_in, realwidth );
-
- if( ( i & 1 ) == 0 )
- {
- // chroma U (resample to YUV420)
- dst = buf->plane1.data + buf->plane1.stride * ( i >> 1 );
- resample( dst, u_in, buf->plane1.width, realwidth );
-
- // chroma V (resample to YUV420)
- dst = buf->plane2.data + buf->plane2.stride * ( i >> 1 );
- resample( dst, v_in, buf->plane2.width, realwidth );
- }
- // Alpha
- dst = buf->plane3.data + buf->plane3.stride * i;
- memcpy( dst, alpha_in, realwidth );
-
- lum_in += pv->width;
- alpha_in += pv->width;
- u_in += pv->width;
- v_in += pv->width;
- }
-
- return buf;
-}
-
-static hb_buffer_t * Decode( hb_work_object_t * w )
-{
- hb_work_private_t * pv = w->private_data;
- int code, line, col;
- int offsets2;
- int * offset;
- hb_buffer_t * buf;
- uint8_t * buf_raw = NULL;
- hb_job_t * job = pv->job;
-
- /* Get infos about the subtitle */
- if ( ParseControls( w ) )
- {
- /*
- * Couldn't parse the info
- */
- hb_deep_log( 2, "decvobsub: Could not parse info!" );
-
- hb_buffer_close( &pv->buf );
- return NULL;
- }
-
- if( job->indepth_scan || ( w->subtitle->config.force && pv->pts_forced == 0 ) )
- {
- /*
- * Don't encode subtitles when doing a scan.
- *
- * When forcing subtitles, ignore all those that don't
- * have the forced flag set.
- */
- hb_buffer_close( &pv->buf );
- return NULL;
- }
-
- if (w->subtitle->config.dest == PASSTHRUSUB)
- {
- pv->buf->s.start = pv->pts_start;
- pv->buf->s.stop = pv->pts_stop;
- pv->buf->s.scr_sequence = pv->scr_sequence;
- buf = pv->buf;
- pv->buf = NULL;
- return buf;
- }
-
- /* Do the actual decoding now */
- buf_raw = malloc( ( pv->width * pv->height ) * 4 );
-
-#define GET_NEXT_NIBBLE code = ( code << 4 ) | ( ( ( *offset & 1 ) ? \
-( pv->buf->data((*offset)>>1) & 0xF ) : ( pv->buf->data((*offset)>>1) >> 4 ) ) ); \
-(*offset)++
-
- offsets0 = pv->offsets0 * 2;
- offsets1 = pv->offsets1 * 2;
-
- for( line = 0; line < pv->height; line++ )
- {
- /* Select even or odd field */
- offset = ( line & 1 ) ? &offsets1 : &offsets0;
-
- for( col = 0; col < pv->width; col += code >> 2 )
- {
- uint8_t * lum, * alpha, * chromaU, * chromaV;
- int idx, len;
-
- code = 0;
- GET_NEXT_NIBBLE;
- if( code < 0x4 )
- {
- GET_NEXT_NIBBLE;
- if( code < 0x10 )
- {
- GET_NEXT_NIBBLE;
- if( code < 0x40 )
- {
- GET_NEXT_NIBBLE;
- if( code < 0x100 )
- {
- /* End of line */
- code |= ( pv->width - col ) << 2;
- }
- }
- }
- }
-
- lum = buf_raw;
- alpha = lum + pv->width * pv->height;
- chromaU = alpha + pv->width * pv->height;
- chromaV = chromaU + pv->width * pv->height;
- idx = code & 3;
- len = code >> 2;
- // Protect against malformed VOBSUB with invalid run length
- if (len > pv->width - col)
- {
- len = pv->width - col;
- }
-
- memset( lum + line * pv->width + col, pv->lumidx, len );
- memset( alpha + line * pv->width + col, pv->alphaidx, len );
- memset( chromaU + line * pv->width + col, pv->chromaUidx, len );
- memset( chromaV + line * pv->width + col, pv->chromaVidx, len );
- }
-
- /* Byte-align */
- if( *offset & 1 )
- {
- (*offset)++;
- }
- }
-
- hb_buffer_close( &pv->buf );
-
- /* Crop subtitle (remove transparent borders) */
- buf = CropSubtitle( w, buf_raw );
-
- free( buf_raw );
-
- return buf;
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encvobsub.c Deleted

@@ -1,75 +0,0 @@
-/* encvobsub.c
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-#include "handbrake/handbrake.h"
-#include "handbrake/hbffmpeg.h"
-
-struct hb_work_private_s
-{
- hb_job_t * job;
-};
-
-int encsubInit( hb_work_object_t * w, hb_job_t * job )
-{
- hb_work_private_t * pv;
-
- pv = calloc( 1, sizeof( hb_work_private_t ) );
- w->private_data = pv;
-
- pv->job = job;
-
- return 0;
-}
-
-int encsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
- hb_buffer_t ** buf_out )
-{
- hb_buffer_t * in = *buf_in;
-
- if (w->subtitle->source != VOBSUB)
- {
- // Invalid source, send EOF, this shouldn't ever happen
- hb_log("encvobsub: invalid subtitle source");
- hb_buffer_close( buf_in );
- *buf_out = hb_buffer_eof_init();
- }
- if (in->s.flags & HB_BUF_FLAG_EOF)
- {
- /* EOF on input stream - send it downstream & say that we're done */
- *buf_out = in;
- *buf_in = NULL;
- return HB_WORK_DONE;
- }
-
- /*
- * Not much to do, just pass the buffer on.
- * Some day, we may re-encode bd subtitles here ;)
- */
- if (buf_out)
- {
- *buf_out = in;
- *buf_in = NULL;
- }
-
- return HB_WORK_OK;
-}
-
-void encsubClose( hb_work_object_t * w )
-{
- free( w->private_data );
-}
-
-hb_work_object_t hb_encvobsub =
-{
- WORK_ENCVOBSUB,
- "VOBSUB encoder",
- encsubInit,
- encsubWork,
- encsubClose
-};

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/deccc608sub.h Deleted

@@ -1,146 +0,0 @@
-/* deccc608sub.h
-
- Copyright (c) 2003-2020 HandBrake Team
- This file is part of the HandBrake source code
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License v2.
- For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
- */
-
-/*
- * From ccextractor...
- */
-#ifndef HANDBRAKE_DECCC608SUB_H
-#define HANDBRAKE_DECCC608SUB_H
-
-#include "handbrake/common.h"
-
-struct s_write;
-
-#define CC608_SCREEN_WIDTH 32
-
-enum cc_modes
-{
- MODE_POPUP = 0,
- MODE_ROLLUP_2 = 1,
- MODE_ROLLUP_3 = 2,
- MODE_ROLLUP_4 = 3,
- MODE_TEXT = 4
-};
-
-enum color_code
-{
- COL_WHITE = 0,
- COL_GREEN = 1,
- COL_BLUE = 2,
- COL_CYAN = 3,
- COL_RED = 4,
- COL_YELLOW = 5,
- COL_MAGENTA = 6,
- COL_USERDEFINED = 7
-};
-
-
-enum font_bits
-{
- FONT_REGULAR = 0,
- FONT_ITALICS = 1,
- FONT_UNDERLINED = 2,
- FONT_UNDERLINED_ITALICS = 3
-};
-
-#define FONT_STYLE_MASK FONT_UNDERLINED_ITALICS
-
-struct eia608_screen // A CC buffer
-{
- unsigned char characters1533;
- unsigned char colors1533;
- unsigned char fonts1533; // Extra char at the end for a 0
- int row_used15; // Any data in row?
- int empty; // Buffer completely empty?
- int dirty; // Flag indicates buffer has changed since written
-};
-
-struct eia608
-{
- struct eia608_screen buffer1;
- struct eia608_screen buffer2;
- int cursor_row, cursor_column;
- int visible_buffer;
- int ssa_counter; // Number of subs currently written
- int screenfuls_counter; // Number of meaningful screenfuls written
- int64_t current_visible_start_ms; // At what time did the current visible buffer became so?
- int64_t current_visible_scr_sequence; // At what SCR did the current visible buffer became so?
- enum cc_modes mode;
- unsigned char last_c1, last_c2;
- int channel; // Currently selected channel
- unsigned char color; // Color we are currently using to write
- unsigned char font; // Font we are currently using to write
- int rollup_base_row;
-};
-
-struct s_write {
- struct eia608 *data608;
- FILE *fh;
- unsigned char *subline;
- int new_sentence;
- int new_channel;
- int in_xds_mode;
- hb_buffer_list_t list;
- hb_buffer_t *hb_buffer;
- hb_buffer_t *hb_last_buffer;
- int64_t last_pts;
- int last_scr_sequence;
- unsigned char *enc_buffer; // Generic general purpose buffer
- unsigned enc_buffer_used;
- unsigned enc_buffer_capacity;
-
- int clear_sub_needed; // Indicates that we need to send a null
- // subtitle to clear the current subtitle
-
- int rollup_cr; // Flag indicates if CR command performed by rollup
- int direct_rollup;
- int line; // SSA line number
- int width;
- int height;
- int crop4;
- hb_rational_t par;
- uint8_t prev_font_style;
- uint8_t prev_font_color;
-};
-
-enum command_code
-{
- COM_UNKNOWN = 0,
- COM_ERASEDISPLAYEDMEMORY = 1,
- COM_RESUMECAPTIONLOADING = 2,
- COM_ENDOFCAPTION = 3,
- COM_TABOFFSET1 = 4,
- COM_TABOFFSET2 = 5,
- COM_TABOFFSET3 = 6,
- COM_ROLLUP2 = 7,
- COM_ROLLUP3 = 8,
- COM_ROLLUP4 = 9,
- COM_CARRIAGERETURN = 10,
- COM_ERASENONDISPLAYEDMEMORY = 11,
- COM_BACKSPACE = 12,
- COM_RESUMETEXTDISPLAY = 13
-};
-
-enum encoding_type
-{
- ENC_UNICODE = 0,
- ENC_LATIN_1 = 1,
- ENC_UTF_8 = 2
-};
-
-enum output_format
-{
- OF_RAW = 0,
- OF_SRT = 1,
- OF_SAMI = 2,
- OF_TRANSCRIPT = 3,
- OF_RCWT = 4
-};
-
-#endif // HANDBRAKE_DECCC608SUB_H

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/decsrtsub.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/decssasub.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/PictureSettings.xib Deleted

@@ -1,548 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
- <dependencies>
- <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
- <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
- </dependencies>
- <objects>
- <customObject id="-2" userLabel="File's Owner" customClass="HBPictureController">
- <connections>
- <outlet property="fAnamorphicPopUp" destination="132" id="140"/>
- <outlet property="fHeightStepper" destination="46" id="cLy-f3-fot"/>
- <outlet property="fPictureCropBox" destination="7" id="242"/>
- <outlet property="fPictureSizeBox" destination="436" id="437"/>
- <outlet property="fWidthStepper" destination="44" id="z49-FB-Xci"/>
- <outlet property="window" destination="5" id="184"/>
- </connections>
- </customObject>
- <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <window title="Picture" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="PictureSizing" animationBehavior="default" id="5" userLabel="PicturePanel" customClass="NSPanel">
- <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES" HUD="YES"/>
- <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="152" y="1024" width="648" height="148"/>
- <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
- <view key="contentView" wantsLayer="YES" id="6">
- <rect key="frame" x="0.0" y="0.0" width="648" height="148"/>
- <autoresizingMask key="autoresizingMask"/>
- <userGuides>
- <userLayoutGuide affinity="minY"/>
- <userLayoutGuide location="115" affinity="minX"/>
- </userGuides>
- <subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="XmO-LR-1DQ">
- <rect key="frame" x="257" y="61" width="120" height="17"/>
- <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Nothing to inspect" id="buq-K6-Wvy">
- 
- <color key="textColor" name="highlightColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture" id="00s-D3-JmF">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <box borderType="none" title="Box" titlePosition="noTitle" id="436">
- <rect key="frame" x="17" y="5" width="358" height="126"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <view key="contentView" id="izI-da-gGT">
- <rect key="frame" x="0.0" y="0.0" width="358" height="126"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="402">
- <rect key="frame" x="192" y="106" width="82" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Display Width:" id="403">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" id="aUz-kE-qa4">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="440">
- <rect key="frame" x="278" y="81" width="37" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="441">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="14I-lw-kIN"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" previousBinding="b7l-Ej-dxa" id="4ER-Vi-m2V">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="Wvz-jo-lwE"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="Wvz-jo-lwE" id="b7l-Ej-dxa">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.parWidth" id="PXg-GA-vo6"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="442">
- <rect key="frame" x="278" y="56" width="37" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="443">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="t04-vN-OL7"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" previousBinding="kG8-EC-OJR" id="6PT-Pz-qs1">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="Vjg-8L-veN"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="Vjg-8L-veN" id="kG8-EC-OJR">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.parHeight" id="HrI-5d-evg"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="444">
- <rect key="frame" x="207" y="81" width="67" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="PAR Width:" id="445">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" id="Gp6-pf-QeR">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="446">
- <rect key="frame" x="202" y="56" width="71" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="PAR Height:" id="447">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" id="IQs-tB-UlR">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="44">
- <rect key="frame" x="143" y="103" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="169">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxWidth" id="P3g-UC-vRH"/>
- <binding destination="-2" name="value" keyPath="self.picture.width" previousBinding="P3g-UC-vRH" id="Ilz-OP-M5c"/>
- </connections>
- </stepper>
- <popUpButton verticalHuggingPriority="750" id="384">
- <rect key="frame" x="75" y="15" width="46" height="15"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <popUpButtonCell key="cell" type="push" title="4" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="389" id="385">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="386">
- <items>
- <menuItem title="16" id="387"/>
- <menuItem title="8" id="388"/>
- <menuItem title="4" state="on" id="389"/>
- <menuItem title="2" id="Fx1-DI-r18"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <binding destination="-2" name="selectedValue" keyPath="self.picture.modulus" id="anc-Ha-mxE"/>
- </connections>
- </popUpButton>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="42">
- <rect key="frame" x="76" y="107" width="62" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="167">
- <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="le0-iC-NhW"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="value" keyPath="self.picture.width" id="Dr6-U5-h7T">
- <dictionary key="options">
- <integer key="NSNullPlaceholder" value="0"/>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="46">
- <rect key="frame" x="143" y="78" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="171">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="value" keyPath="self.picture.height" previousBinding="nJk-wN-aaB" id="l4c-7G-SMf"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxHeight" id="nJk-wN-aaB"/>
- </connections>
- </stepper>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="138">
- <rect key="frame" x="-1" y="38" width="73" height="14"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anamorphic:" id="174">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="41">
- <rect key="frame" x="-1" y="82" width="73" height="14"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Height:" id="166">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <popUpButton verticalHuggingPriority="750" id="132">
- <rect key="frame" x="75" y="38" width="80" height="15"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <popUpButtonCell key="cell" type="push" title="Off" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="135" id="173">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="134">
- <items>
- <menuItem title="Off" state="on" id="135"/>
- <menuItem title="Auto" tag="4" id="136"/>
- <menuItem title="Loose" tag="2" id="137"/>
- <menuItem title="Custom" tag="3" id="Gsa-Ti-xiw"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <binding destination="-2" name="selectedTag" keyPath="self.picture.anamorphicMode" id="edu-WH-uPF"/>
- </connections>
- </popUpButton>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="390">
- <rect key="frame" x="19" y="15" width="53" height="14"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Modulus:" id="391">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="47">
- <rect key="frame" x="-1" y="108" width="71" height="14"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Width:" id="172">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="43">
- <rect key="frame" x="76" y="81" width="62" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="168">
- <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="9iU-HJ-b4u"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="value" keyPath="self.picture.height" id="T7h-fp-Qs6">
- <dictionary key="options">
- <integer key="NSNullPlaceholder" value="0"/>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <button id="45">
- <rect key="frame" x="73" y="57" width="125" height="18"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <buttonCell key="cell" type="check" title="Keep Aspect Ratio" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="170">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="-2" name="value" keyPath="self.picture.keepDisplayAspect" id="8uc-2H-rkz"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspectEditable" id="DSI-Ra-G0d"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="396">
- <rect key="frame" x="278" y="106" width="61" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="397">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="nQn-4z-uRG"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture.customAnamorphicEnabled" previousBinding="gD3-Yl-3au" id="PSj-Fl-3Ni">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="zMs-ue-T1n"/>
- <binding destination="-2" name="value" keyPath="self.picture.displayWidth" id="nMg-v2-Fvg"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="zMs-ue-T1n" id="gD3-Yl-3au">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- </subviews>
- </view>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture" id="KPV-JY-efR">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNil</string>
- </dictionary>
- </binding>
- </connections>
- </box>
- <box borderType="none" titlePosition="noTitle" id="7">
- <rect key="frame" x="377" y="5" width="254" height="126"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <view key="contentView" id="tBW-2g-t2L">
- <rect key="frame" x="0.0" y="0.0" width="254" height="126"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="12">
- <rect key="frame" x="169" y="55" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="152">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="Vp0-sU-c5s">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropTop" previousBinding="Kft-ci-UbK" id="Zqw-Pu-qi1"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxTopCrop" id="Kft-ci-UbK"/>
- </connections>
- </stepper>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="15">
- <rect key="frame" x="232" y="45" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="155">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="5QD-Dh-bzl">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropRight" previousBinding="Fyc-RI-h9A" id="L3c-i2-kQY"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxRightCrop" id="Fyc-RI-h9A"/>
- </connections>
- </stepper>
- <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" id="16">
- <rect key="frame" x="64" y="84" width="190" height="43"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="190" height="20"/>
- <size key="intercellSpacing" width="2" height="3"/>
- <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" controlSize="small" inset="2" id="178">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="Automatic" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="17">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <buttonCell type="radio" title="Custom:" imagePosition="left" alignment="left" controlSize="small" inset="2" id="18">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- </column>
- </cells>
- <connections>
- <binding destination="-2" name="selectedIndex" keyPath="self.picture.autocrop" id="9wD-y3-pVM">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </matrix>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="13">
- <rect key="frame" x="131" y="58" width="36" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="153">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="DlH-KY-uVi">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="ABP-Q9-NDw">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="10">
- <rect key="frame" x="131" y="31" width="36" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="150">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="Hai-0I-6yj">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="nVf-lw-Tr1">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="19">
- <rect key="frame" x="110" y="46" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="156">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="WmV-2A-EDo">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropLeft" previousBinding="CcF-LX-2Wg" id="VtG-0s-YHK"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxLeftCrop" id="CcF-LX-2Wg"/>
- </connections>
- </stepper>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="11">
- <rect key="frame" x="72" y="49" width="36" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="151">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="egn-yP-dYe">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="ste-Ks-OLX">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="14">
- <rect key="frame" x="169" y="28" width="15" height="22"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="154">
- 
- </stepperCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="soK-UE-pde">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropBottom" previousBinding="YKW-no-4sN" id="4AO-dA-bmi"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxBottomCrop" id="YKW-no-4sN"/>
- </connections>
- </stepper>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="382">
- <rect key="frame" x="3" y="107" width="59" height="17"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Cropping:" id="383">
- 
- <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="9">
- <rect key="frame" x="194" y="48" width="36" height="16"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="149">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="yw7-7Q-sse">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="lou-1C-A2w">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- </subviews>
- </view>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.picture" id="jts-02-CW1">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNil</string>
- </dictionary>
- </binding>
- </connections>
- </box>
- </subviews>
- </view>
- <connections>
- <outlet property="delegate" destination="-2" id="hby-dR-NFK"/>
- </connections>
- <point key="canvasLocation" x="117" y="-28"/>
- </window>
- <userDefaultsController representsSharedInstance="YES" id="vUw-ux-GVV"/>
- </objects>
-</document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDistributedArray.h Deleted

@@ -1,53 +0,0 @@
-/* HBDistributedArray.h $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import <Cocoa/Cocoa.h>
-
-extern NSString *HBDistributedArrayChanged;
-
-/**
- * Objects in HBDistributedArray
- * must implement this protocol.
- */
-@protocol HBUniqueObject <NSObject>
-
-@property (nonatomic, readonly) NSString *uuid;
-
-@end
-
-typedef NS_ENUM(NSUInteger, HBDistributedArrayContent) {
- HBDistributedArrayContentAcquired,
- HBDistributedArrayContentReload,
-};
-
-/**
- * HBDistributedArray
- * a mutable array that share its content between processes.
- * post a HBDistributedArrayChanged when the content is changed
- * by another process.
- *
- * Use beginTransaction and commit to wrap atomic changes to the array.
- *
- * It is safe to keep a reference to an array object.
- */
-@interface HBDistributedArray<ObjectType> : NSMutableArray
-
-- (instancetype)initWithURL:(NSURL *)fileURL class:(Class)objectClass;
-
-/**
- * Begins a transaction on the array
- *
- * @return whether the array content changes or not after beginning the transaction.
- */
-- (HBDistributedArrayContent)beginTransaction;
-
-/**
- * Commit the changes and notify
- * the observers about the changes.
- */
-- (void)commit;
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDistributedArray.m Deleted

@@ -1,356 +0,0 @@
-/* HBDistributedArray.m $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import "HBDistributedArray.h"
-#import "HBUtilities.h"
-
-#include <semaphore.h>
-
-/**
- * HBProxyArrayObject wraps an object inside a proxy
- * to make it possible to keep a reference to an array
- * object even if the underlying has been swapped
- */
-
-@interface HBProxyArrayObject : NSProxy
-
-- (instancetype)initWithObject:(id)object;
-
-@property (nonatomic, strong) id representedObject;
-@property (unsafe_unretained, nonatomic, readonly) NSString *uuid;
-
-@end
-
-@implementation HBProxyArrayObject
-
-- (instancetype)initWithObject:(id)object
-{
- _representedObject = object;
-
- return self;
-}
-
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)selector
-{
- return self.representedObject methodSignatureForSelector:selector;
-}
-
-- (void)forwardInvocation:(NSInvocation *)invocation
-{
- invocation invokeWithTarget:self.representedObject;
-}
-
-- (NSString *)uuid
-{
- return self.representedObject uuid;
-}
-
-@end
-
-NSString *HBDistributedArrayChanged = @"HBDistributedArrayChanged";
-NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
-
-@interface HBDistributedArray<ObjectType> ()
-
-@property (nonatomic, readonly) NSMutableArray<ObjectType> *array;
-@property (nonatomic, readonly) NSURL *fileURL;
-@property (nonatomic, readwrite) NSTimeInterval modifiedTime;
-
-@property (nonatomic, readonly) NSSet *objectClasses;
-
-@property (nonatomic, readonly) sem_t *mutex;
-@property (nonatomic, readwrite) uint32_t mutexCount;
-
-@property (nonatomic, readwrite) BOOL multipleInstances;
-
-@end
-
-@implementation HBDistributedArray
-
-- (instancetype)initWithURL:(NSURL *)fileURL class:(Class)objectClass
-{
- self = super init;
- if (self)
- {
- _fileURL = fileURL copy;
- _array = NSMutableArray alloc init;
- _objectClasses = NSSet setWithObjects:NSMutableArray class, objectClass, nil;
-
- NSString *identifier = NSBundle mainBundle bundleIdentifier;
- NSArray *runningInstances = NSRunningApplication runningApplicationsWithBundleIdentifier:identifier;
- const char *name = NSString stringWithFormat:@"%@/%@", identifier, _fileURL.lastPathComponent.stringByDeletingPathExtension.UTF8String;
-
- // Unlink the semaphore if we are the only
- // instance running, this fixes the case where
- // HB crashed while the sem is locked.
- if (runningInstances.count == 1)
- {
- sem_unlink(name);
- }
-
- // Use a named semaphore as a mutex for now
- // it can cause a deadlock if an instance
- // crashed while it has the lock on the semaphore.
- _mutex = sem_open(name, O_CREAT, 0777, 1);
- if (_mutex == SEM_FAILED)
- {
- HBUtilities writeToActivityLog:"%s: %d", "Error in creating semaphore: ", errno;
- }
-
- self lock;
- NSUInteger instances = NSRunningApplication runningApplicationsWithBundleIdentifier:NSBundle.mainBundle.bundleIdentifier.count;
- _multipleInstances = instances > 1;
- self unlock;
-
- NSDistributedNotificationCenter.defaultCenter addObserver:self selector:@selector(handleNotification:) name:HBDistributedArraWrittenToDisk object:nil;
-
- if (NSFileManager.defaultManager fileExistsAtPath:_fileURL.path)
- {
- // Load the array from disk
- self lock;
- self reload;
- self unlock;
- }
- }
-
- return self;
-}
-
-- (void)dealloc
-{
- NSDistributedNotificationCenter.defaultCenter removeObserver:self;
-
- self lock;
- self synchronize;
- self unlock;
-
- sem_close(_mutex);
-}
-
-- (uint32_t)lock
-{
- if (self.mutexCount == 0)
- {
- sem_wait(self.mutex);
- }
-
- self.mutexCount++;
- return self.mutexCount;
-}
-
-- (void)unlock
-{
- if (self.mutexCount == 1)
- {
- sem_post(self.mutex);
- }
-
- self.mutexCount--;
-}
-
-- (HBDistributedArrayContent)beginTransaction
-{
- BOOL alreadyLocked = self lock > 1;
- // We got the lock, need to check if
- // someone else modified the file
- // while we were locked, because we
- // could have not received the notification yet
- if (alreadyLocked == false && self.multipleInstances)
- {
- NSDate *date = nil;
- self.fileURL getResourceValue:&date forKey:NSURLAttributeModificationDateKey error:nil;
-
- if (date.timeIntervalSinceReferenceDate > self.modifiedTime)
- {
- // File was modified while we waited on the lock
- // reload it
- self reload;
- return HBDistributedArrayContentReload;
- }
- }
-
- return HBDistributedArrayContentAcquired;
-}
-
-- (void)commit
-{
- // Save changes to disk
- // and unlock
- self synchronizeIfNeeded;
- self unlock;
-}
-
-- (void)postNotification
-{
- NSNotificationCenter defaultCenter postNotificationName:HBDistributedArrayChanged object:self;
-}
-
-/**
- * Handle the distributed notification
- */
-- (void)handleNotification:(NSNotification *)notification
-{
- if (!(notification.object integerValue == getpid()))
- {
- self.multipleInstances = YES;
- self lock;
- self reload;
- self unlock;
- }
-}
-
-/**
- * Reload the array from disk
- */
-- (void)reload
-{
- NSMutableArray<HBUniqueObject> *jobsArray;
- NSError *error;
-
- NSData *queue = NSData dataWithContentsOfURL:self.fileURL;
- NSKeyedUnarchiver *unarchiver = NSKeyedUnarchiver alloc initForReadingWithData:queue;
- unarchiver.requiresSecureCoding = YES;
- jobsArray = unarchiver decodeTopLevelObjectOfClasses:self.objectClasses forKey:NSKeyedArchiveRootObjectKey error:&error;
-
- if (error)
- {
- HBUtilities writeErrorToActivityLog:error;
- }
-
- unarchiver finishDecoding;
-
- // Swap the proxy objects representation with the new
- // one read from disk
- NSMutableArray *proxyArray = NSMutableArray array;
- for (id<HBUniqueObject> anObject in jobsArray)
- {
- NSString *uuid = anObject.uuid;
-
- HBProxyArrayObject *proxy = nil;
- for (HBProxyArrayObject *temp in self.array)
- {
- if (temp.uuid isEqualToString:uuid)
- {
- temp.representedObject = anObject;
- proxy = temp;
- break;
- }
- }
-
- if (proxy)
- {
- proxyArray addObject:proxy;
- }
- else
- {
- proxyArray addObject:self wrapObjectIfNeeded:anObject;
- }
- }
-
- self setArray:proxyArray;
- self postNotification;
-
- // Update the time, so we can avoid reloaded the file from disk later.
- self.modifiedTime = NSDate timeIntervalSinceReferenceDate;
-}
-
-/**
- * Writes the changes to disk only if we aren't exiting a recursive lock
- */
-- (void)synchronizeIfNeeded
-{
- if (self.mutexCount == 1)
- {
- self synchronize;
- }
-}
-
-/**
- * Writes the changes to disk
- */
-- (void)synchronize
-{
- NSMutableArray *temp = NSMutableArray array;
-
- // Unwrap the array objects and save them to disk
- for (HBProxyArrayObject *proxy in self)
- {
- temp addObject:proxy.representedObject;
- }
-
- if (!NSKeyedArchiver archiveRootObject:temp toFile:self.fileURL.path)
- {
- HBUtilities writeToActivityLog:"Failed to write the queue to disk";
- }
-
- // Send a distributed notification.
- NSDistributedNotificationCenter defaultCenter postNotificationName:HBDistributedArraWrittenToDisk
- object:NSString stringWithFormat:@"%d", getpid()
- userInfo:nil
- deliverImmediately:YES;
-
- // Update the time, so we can avoid reloaded the file from disk later.
- self.modifiedTime = NSDate timeIntervalSinceReferenceDate;
-}
-
-/**
- * Wraps an object inside a HBObjectProxy instance
- * if it's not already wrapped.
- *
- * @param anObject the object to wrap
- *
- * @return a wrapped object
- */
-- (id)wrapObjectIfNeeded:(id)anObject
-{
- if (anObject class isEqual:HBProxyArrayObject class)
- {
- return anObject;
- }
- else
- {
- return HBProxyArrayObject alloc initWithObject:anObject;
- }
-}
-
-#pragma mark - Methods needed to subclass NSMutableArray
-
-- (void)insertObject:(id)anObject atIndex:(NSUInteger)index
-{
- self.array insertObject:self wrapObjectIfNeeded:anObject atIndex:index;
-}
-
-- (void)removeObjectAtIndex:(NSUInteger)index
-{
- self.array removeObjectAtIndex:index;
-}
-
-- (void)addObject:(id)anObject
-{
- self.array addObject:self wrapObjectIfNeeded:anObject;
-}
-
-- (void)removeLastObject
-{
- self.array removeLastObject;
-}
-
-- (void)replaceObjectAtIndex:(NSUInteger)index withObject:(id)anObject
-{
- (self.array)index = self wrapObjectIfNeeded:anObject;
-}
-
-- (NSUInteger)count
-{
- return self.array count;
-}
-
-- (id)objectAtIndex:(NSUInteger)index
-{
- return (self.array)index;
-}
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPictureController.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPictureController.m Deleted

@@ -1,214 +0,0 @@
-/* $Id: PictureController.mm,v 1.11 2005/08/01 15:10:44 titer Exp $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import "HBPictureController.h"
-
-@import HandBrakeKit;
-
-static void *HBPictureControllerContext = &HBPictureControllerContext;
-
-@interface HBPictureController ()
-{
- /* Picture Sizing */
- IBOutlet NSBox * fPictureSizeBox;
- IBOutlet NSBox * fPictureCropBox;
-
-	IBOutlet NSPopUpButton * fAnamorphicPopUp;
- IBOutlet NSStepper * fWidthStepper;
- IBOutlet NSStepper * fHeightStepper;
-
-}
-
-@end
-
-@implementation HBPictureController
-
-- (instancetype)init
-{
-	if (self = super initWithWindowNibName:@"PictureSettings")
-	{
- // NSWindowController likes to lazily load its window. However since
- // this controller tries to set all sorts of outlets before the window
- // is displayed, we need it to load immediately. The correct way to do
- // this, according to the documentation, is simply to invoke the window
- // getter once.
- //
- // If/when we switch a lot of this stuff to bindings, this can probably
- // go away.
- self window;
-
- self addObserver:self forKeyPath:@"self.picture.anamorphicMode" options:NSKeyValueObservingOptionInitial context:HBPictureControllerContext;
- self addObserver:self forKeyPath:@"self.picture.modulus" options:NSKeyValueObservingOptionInitial context:HBPictureControllerContext;
- }
-
-	return self;
-}
-
-- (void)dealloc
-{
- NSArray *observerdKeyPaths = @@"self.picture.anamorphicMode", @"self.picture.modulus";
- @try
- {
- for (NSString *keyPath in observerdKeyPaths)
- {
- self removeObserver:self forKeyPath:keyPath context:HBPictureControllerContext;
- }
-
- } @catch (NSException * __unused exception) {}
-}
-
-- (void)windowDidLoad
-{
- self window setExcludedFromWindowsMenu:YES;
-
- self resizeInspectorForTab:nil;
- self adjustSizingDisplay:nil;
-}
-
-- (NSUndoManager *)windowWillReturnUndoManager:(NSWindow *)window
-{
- return self.previewController.window.undoManager;
-}
-
-#pragma mark - KVO
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
- if (context == HBPictureControllerContext)
- {
- // We use KVO to update the panel
- // and notify the main controller of the changes
- // in the filters and picture settings.
-
- if (keyPath isEqualToString:@"self.picture.anamorphicMode")
- {
- self adjustSizingDisplay:nil;
- }
- else if (keyPath isEqualToString:@"self.picture.modulus")
- {
- fWidthStepper setIncrement:self.picture.modulus;
- fHeightStepper setIncrement:self.picture.modulus;
- }
- }
- else
- {
- super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
- }
-}
-
-#pragma mark -
-#pragma mark Interface Resize
-
-/**
- * This method is used to detect clicking on a tab in fSizeFilterView
- */
-- (void)tabView:(NSTabView *)tabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem
-{
- self resizeInspectorForTab:nil;
-}
-
-/**
- * resizeInspectorForTab is called at launch, and each time either the
- * Size or Filters tab is clicked. Size gives a horizontally oriented
- * inspector and Filters is a vertically aligned inspector.
- */
-- (void)resizeInspectorForTab:(id)sender
-{
- NSRect frame = self.window.frame;
- NSSize screenSize = self.window.screen.frame.size;
- NSPoint screenOrigin = self.window.screen.frame.origin;
-
- frame.size.width = 30.0 + fPictureSizeBox.frame.size.width + fPictureCropBox.frame.size.width;
-
- /* get delta's for the change in window size */
- CGFloat deltaX = frame.size.width - self window frame.size.width;
- CGFloat deltaY = frame.size.height - self window frame.size.height;
-
- /* change the inspector origin via the deltaY */
- frame.origin.y -= deltaY;
- /* keep the inspector centered so the tabs stay in place */
- frame.origin.x -= deltaX / 2.0;
-
- /* we make sure we are not horizontally off of our screen.
- * this would be the case if we are on the vertical filter tab
- * and we hit the size tab and the inspector grows horizontally
- * off the screen to the right
- */
- if ((frame.origin.x + frame.size.width) > (screenOrigin.x + screenSize.width))
- {
- /* the right side of the preview is off the screen, so shift to the left */
- frame.origin.x = (screenOrigin.x + screenSize.width) - frame.size.width;
- }
-
- self window setFrame:frame display:YES animate:YES;
-}
-
-- (void)adjustSizingDisplay:(id)sender
-{
- NSSize pictureSizingBoxSize = fPictureSizeBox frame.size;
-
- NSPoint fPictureSizeBoxOrigin = fPictureSizeBox frame.origin;
- NSSize pictureCropBoxSize = fPictureCropBox frame.size;
- NSPoint fPictureCropBoxOrigin = fPictureCropBox frame.origin;
-
- if (fAnamorphicPopUp indexOfSelectedItem == 3)
- { // custom / power user jamboree
- pictureSizingBoxSize.width = 350;
- }
- else
- {
- pictureSizingBoxSize.width = 200;
- }
-
- /* Check to see if we have changed the size from current */
- if (pictureSizingBoxSize.height != fPictureSizeBox frame.size.height ||
- pictureSizingBoxSize.width != fPictureSizeBox frame.size.width)
- {
- /* Get our delta for the change in picture size box height */
- CGFloat deltaYSizeBoxShift = pictureSizingBoxSize.height -
- fPictureSizeBox frame.size.height;
- fPictureSizeBoxOrigin.y -= deltaYSizeBoxShift;
- /* Get our delta for the change in picture size box width */
- CGFloat deltaXSizeBoxShift = pictureSizingBoxSize.width -
- fPictureSizeBox frame.size.width;
- //fPictureSizeBoxOrigin.x += deltaXSizeBoxShift;
- /* set our new Picture size box size */
- fPictureSizeBox setFrameSize:pictureSizingBoxSize;
- fPictureSizeBox setFrameOrigin:fPictureSizeBoxOrigin;
-
- pictureCropBoxSize.height += deltaYSizeBoxShift;
- fPictureCropBoxOrigin.y -= deltaYSizeBoxShift;
- fPictureCropBoxOrigin.x += deltaXSizeBoxShift;
-
- fPictureCropBox setFrameSize:pictureCropBoxSize;
- fPictureCropBox animator setFrameOrigin:fPictureCropBoxOrigin;
- }
-
- /* now we call to resize the entire inspector window */
- self resizeInspectorForTab:nil;
-}
-
-#pragma mark -
-
-/**
- * Displays and brings the picture window to the front
- */
-- (void)showWindow:(id)sender
-{
- if (self.window.isVisible)
- {
- self.window close;
- }
- else
- {
- super showWindow:self;
- }
-
- self resizeInspectorForTab:nil;
- self adjustSizingDisplay:nil;
-}
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItem.m Deleted

@@ -1,274 +0,0 @@
-/* HBQueueItem.m $
-
- This file is part of the HandBrake source code.
- Homepage: <http://handbrake.fr/>.
- It may be used under the terms of the GNU General Public License. */
-
-#import "HBQueueItem.h"
-
-#import "HBCodingUtilities.h"
-#import "HBAttributedStringAdditions.h"
-
-static NSDateFormatter *_dateFormatter = nil;
-static NSByteCountFormatter *_byteFormatter = nil;
-
-static NSDictionary *detailAttr;
-static NSDictionary *detailBoldAttr;
-static NSDictionary *shortHeightAttr;
-
-@interface HBQueueItem ()
-
-@property (nonatomic, nullable) NSDate *pausedDate;
-@property (nonatomic, nullable) NSDate *resumedDate;
-
-@property (nonatomic) NSUInteger fileSize;
-
-@property (nonatomic, readwrite, nullable) NSAttributedString *attributedStatistics;
-
-@end
-
-@implementation HBQueueItem
-
-+ (void)initialize
-{
- if (self == HBQueueItem class) {
- _dateFormatter = NSDateFormatter alloc init;
- _dateFormatter setDateStyle:NSDateFormatterLongStyle;
- _dateFormatter setTimeStyle:NSDateFormatterLongStyle;
-
- _byteFormatter = NSByteCountFormatter alloc init;
-
- // Attributes
- NSMutableParagraphStyle *ps = NSParagraphStyle.defaultParagraphStyle mutableCopy;
- ps.headIndent = 88.0;
- ps.paragraphSpacing = 1.0;
- ps.tabStops = @NSTextTab alloc initWithType:NSRightTabStopType location:88,
- NSTextTab alloc initWithType:NSLeftTabStopType location:90;
-
- detailAttr = @{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize,
- NSParagraphStyleAttributeName: ps,
- NSForegroundColorAttributeName: NSColor.labelColor};
-
- detailBoldAttr = @{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize,
- NSParagraphStyleAttributeName: ps,
- NSForegroundColorAttributeName: NSColor.labelColor};
-
- shortHeightAttr = @{NSFontAttributeName: NSFont systemFontOfSize:6.0};
- }
-}
-
-@synthesize job = _job;
-@synthesize attributedDescription = _attributedDescription;
-
-@synthesize uuid = _uuid;
-
-- (instancetype)initWithJob:(HBJob *)job
-{
- self = super init;
- if (self)
- {
- _job = job;
- _uuid = NSUUID UUID.UUIDString;
- }
- return self;
-}
-
-#pragma mark - Properties
-
-- (void)setState:(HBQueueItemState)state
-{
- _state = state;
- if (state == HBQueueItemStateReady)
- {
- self resetStatistics;
- self.activityLogURL = nil;
- }
-}
-
-- (NSURL *)fileURL
-{
- return _job.fileURL;
-}
-
-- (NSString *)outputFileName
-{
- return _job.outputFileName;
-}
-
-- (NSURL *)outputURL
-{
- return _job.outputURL;
-}
-
-- (NSURL *)completeOutputURL
-{
- return _job.completeOutputURL;
-}
-
-- (NSAttributedString *)attributedDescription
-{
- if (_attributedDescription == nil) {
- _attributedDescription = _job.attributedDescription;
- }
- return _attributedDescription;
-}
-
-- (NSAttributedString *)attributedStatistics
-{
- if (self.endedDate == nil && self.startedDate == nil)
- {
- return nil;
- }
-
- if (_attributedStatistics == nil)
- {
- NSMutableAttributedString *attrString = NSMutableAttributedString alloc init;
-
- if (self.startedDate)
- {
- attrString appendString:@"\t" withAttributes:detailAttr;
- attrString appendString:NSLocalizedString(@"Started at:", @"Job statistics") withAttributes:detailBoldAttr;
- attrString appendString:@" \t" withAttributes:detailAttr;
- attrString appendString:_dateFormatter stringFromDate:self.startedDate withAttributes:detailAttr;
- }
-
- if (self.startedDate && self.endedDate)
- {
- attrString appendString:@"\n\t" withAttributes:detailAttr;
- attrString appendString:NSLocalizedString(@"Ended at:", @"Job statistics") withAttributes:detailBoldAttr;
- attrString appendString:@" \t" withAttributes:detailAttr;
- attrString appendString:_dateFormatter stringFromDate:self.endedDate withAttributes:detailAttr;
- attrString appendString:@"\n\n" withAttributes:shortHeightAttr;
- attrString appendString:@"\t" withAttributes:detailAttr;
-
- attrString appendString:NSLocalizedString(@"Run time:", @"Job statistics") withAttributes:detailBoldAttr;
- attrString appendString:@" \t" withAttributes:detailAttr;
- uint64_t encodeDuration = (uint64_t)self.encodeDuration;
- attrString appendString:NSString stringWithFormat:@"%02lld:%02lld:%02lld", encodeDuration / 3600, (encodeDuration/ 60) % 60, encodeDuration % 60 withAttributes:detailAttr;
- attrString appendString:@"\n\t" withAttributes:detailAttr;
- attrString appendString:NSLocalizedString(@"Paused time:", @"Job statistics") withAttributes:detailBoldAttr;
- attrString appendString:@" \t" withAttributes:detailAttr;
- uint64_t pauseDuration = (uint64_t)self.pauseDuration;
- attrString appendString:NSString stringWithFormat:@"%02lld:%02lld:%02lld", pauseDuration / 3600, (pauseDuration/ 60) % 60, pauseDuration % 60 withAttributes:detailAttr;
-
- attrString appendString:@"\n\n" withAttributes:shortHeightAttr;
- attrString appendString:@"\t" withAttributes:detailAttr;
-
- attrString appendString:NSLocalizedString(@"Size:", @"Job statistics") withAttributes:detailBoldAttr;
- attrString appendString:@" \t" withAttributes:detailAttr;
- attrString appendString:_byteFormatter stringFromByteCount:self.fileSize withAttributes:detailAttr;
- }
-
- _attributedStatistics = attrString;
- }
-
- return _attributedStatistics;
-}
-
-#pragma mark - Statistics
-
-- (void)resetStatistics
-{
- self.pausedDate = nil;
- self.resumedDate = nil;
- self.startedDate = nil;
- self.endedDate = nil;
- self.encodeDuration = 0;
- self.pauseDuration = 0;
- self.fileSize = 0;
- self.attributedStatistics = nil;
-}
-
-- (void)pausedAtDate:(NSDate *)date
-{
- self.pausedDate = date;
-}
-
-- (void)resumedAtDate:(NSDate *)date
-{
- self.resumedDate = date;
- self.pauseDuration += self.resumedDate timeIntervalSinceDate:self.pausedDate;
- self.pausedDate = nil;
-}
-
-- (void)setStartedDate:(NSDate *)startedDate
-{
- _startedDate = startedDate;
- self.attributedStatistics = nil;
-}
-
-- (void)setEndedDate:(NSDate *)endedDate
-{
- _endedDate = endedDate;
- if (endedDate && self.pausedDate)
- {
- self resumedAtDate:endedDate;
- }
- if (endedDate && self.startedDate)
- {
- self.encodeDuration = self.endedDate timeIntervalSinceDate:self.startedDate;
- self.encodeDuration -= self.pauseDuration;
- }
-
- self.completeOutputURL removeCachedResourceValueForKey:NSURLFileSizeKey;
- NSDictionary<NSURLResourceKey, id> *values = self.completeOutputURL resourceValuesForKeys:@NSURLFileSizeKey error:NULL;
-
- self.fileSize = valuesNSURLFileSizeKey integerValue;
-
- self.attributedStatistics = nil;
-}
-
-#pragma mark - NSSecureCoding
-
-+ (BOOL)supportsSecureCoding
-{
- return YES;
-}
-
-static NSString *versionKey = @"HBQueueItemVersion";
-
-- (void)encodeWithCoder:(nonnull NSCoder *)coder
-{
- coder encodeInt:1 forKey:versionKey;
- encodeInteger(_state);
- encodeObject(_job);
- encodeObject(_uuid);
-
- encodeObject(_activityLogURL);
-
- encodeDouble(_encodeDuration);
- encodeDouble(_pauseDuration);
-
- encodeObject(_startedDate);
- encodeObject(_endedDate);
-
- encodeInteger(_fileSize);
-}
-
-- (nullable instancetype)initWithCoder:(nonnull NSCoder *)decoder
-{
- int version = decoder decodeIntForKey:versionKey;
-
- if (version == 1 && (self = super init))
- {
- decodeInteger(_state); if (_state < HBQueueItemStateReady || _state > HBQueueItemStateFailed) { goto fail; }
- decodeObjectOrFail(_job, HBJob);
- decodeObjectOrFail(_uuid, NSString);
-
- decodeObject(_activityLogURL, NSURL);
-
- decodeDouble(_encodeDuration);
- decodeDouble(_pauseDuration);
-
- decodeObject(_startedDate, NSDate);
- decodeObject(_endedDate, NSDate);
-
- decodeInteger(_fileSize);
-
- return self;
- }
-fail:
- return nil;
-}
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme Deleted

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "1130"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- buildConfiguration = "release"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES">
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <Testables>
- </Testables>
- </TestAction>
- <LaunchAction
- buildConfiguration = "release"
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- debugServiceExtension = "internal"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </LaunchAction>
- <ProfileAction
- buildConfiguration = "release"
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable
- runnableDebuggingMode = "0">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "273F203814ADBC200021BE6D"
- BuildableName = "HandBrake.app"
- BlueprintName = "HandBrake"
- ReferencedContainer = "container:HandBrake.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "release">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "release"
- customArchiveName = "HandBrake"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Headers Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Modules Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Resources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Sparkle Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUDownloadData.h Deleted

@@ -1,43 +0,0 @@
-//
-// SPUDownloadData.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 8/10/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*!
- * A class for containing downloaded data along with some information about it.
- */
-SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
-
-- (instancetype)initWithData:(NSData *)data textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString * _Nullable)MIMEType;
-
-/*!
- * The raw data that was downloaded.
- */
-@property (nonatomic, readonly) NSData *data;
-
-/*!
- * The IANA charset encoding name if available. Eg: "utf-8"
- */
-@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
-
-/*!
- * The MIME type if available. Eg: "text/plain"
- */
-@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUStandardUpdaterController.h Deleted

@@ -1,101 +0,0 @@
-//
-// SPUStandardUpdaterController.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 2/28/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Cocoa;
-#else
-#import <Cocoa/Cocoa.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class SPUUpdater;
-@protocol SPUUserDriver, SPUStandardUserDriverProtocol, SPUUpdaterDelegate, SPUStandardUserDriverDelegate;
-
-/*!
- A controller class that instantiates a SPUUpdater and allows binding UI to it.
- 
- This class can be instantiated in a nib or created using initWithUpdaterDelegate:userDriverDelegate:. The controller's updater targets the application's main bundle
- and uses Sparkle's standard user interface. Typically, this class is used by sticking it as a custom NSObject subclass in an Interface Builder nib (probably in MainMenu).
- 
- The controller creates an SPUUpdater instance and allows hooking up the check for updates action and menu item validation. It also allows hooking
- up the updater's and user driver's delegates.
- 
- This controller class may not be valuable to you if:
- * You want to control or defer the instantiation of an SPUUpdater, or don't want to be tied into a nib's instantiation, or don't want to use a nib
- * You want to target a bundle that's not the main bundle
- * You want to provide a custom user interface, or perhaps one that provides little-to-none
- * You don't want to use a convenience class that provides very little glue ;)
- 
- */
-SU_EXPORT @interface SPUStandardUpdaterController : NSObject
-
-/*!
- Interface builder outlet for the updater's delegate.
- 
- This property should only be set using Interface Builder by creating a connection using the outlet
- */
-@property (nonatomic, weak, nullable) IBOutlet id<SPUUpdaterDelegate> updaterDelegate;
-
-/*!
- Interface builder outlet for the user driver's delegate.
- 
- This property should only be set using Interface Builder by creating a connection using the outlet
- */
-@property (nonatomic, weak, nullable) IBOutlet id<SPUStandardUserDriverDelegate> userDriverDelegate;
-
-/*!
- Accessible property for the updater. Some properties on the updater can be binded via KVO
- 
- This is nil before being loaded from the nib.
- You may access this property after your application has finished launching, or after your window controller has finished loading.
- */
-@property (nonatomic, readonly, nullable) SPUUpdater *updater;
-
-/*!
- Accessible property for the updater's user driver.
- 
- This is nil before being loaded from the nib.
- You may access this property after your application has finished launching, or after your window controller has finished loading.
- */
-@property (nonatomic, readonly, nullable) id <SPUStandardUserDriverProtocol> userDriver;
-
-/*!
- Use initWithUpdaterDelegate:userDriverDelegate: instead.
- */
-- (instancetype)init NS_UNAVAILABLE;
-
-/*!
- Create a new SPUStandardUpdaterController programmatically.
- */
-- (instancetype)initWithUpdaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
-
-/*!
- Explicitly checks for updates and displays a progress dialog while doing so.
- 
- This method is meant for a main menu item.
- Connect any menu item to this action in Interface Builder,
- and Sparkle will check for updates and report back its findings verbosely
- when it is invoked.
- 
- This action checks updates by invoking -SPUUpdater checkForUpdates
- */
-- (IBAction)checkForUpdates:(id)sender;
-
-/*!
- Validates if the menu item for checkForUpdates: can be invoked or not
- 
- This validates the menu item by checking -SPUStandardUserDriver canCheckForUpdates
- */
-- (BOOL)validateMenuItem:(NSMenuItem *)item;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUStandardUserDriver.h Deleted

@@ -1,43 +0,0 @@
-//
-// SPUStandardUserDriver.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 2/14/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Cocoa;
-#else
-#import <Cocoa/Cocoa.h>
-#endif
-
-#import <Sparkle/SPUUserDriver.h>
-#import <Sparkle/SPUStandardUserDriverProtocol.h>
-#import <Sparkle/SUExport.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@protocol SPUStandardUserDriverDelegate;
-
-/*!
- Sparkle's standard built-in user driver for updater interactions
- */
-SU_EXPORT @interface SPUStandardUserDriver : NSObject <SPUUserDriver, SPUStandardUserDriverProtocol>
-
-/*!
- Initializes a Sparkle's standard user driver for user update interactions
- 
- @param hostBundle The target bundle of the host that is being updated.
- @param delegate The delegate to this user driver. Pass nil if you don't want to provide one.
- */
-- (instancetype)initWithHostBundle:(NSBundle *)hostBundle delegate:(nullable id<SPUStandardUserDriverDelegate>)delegate;
-
-/*!
- * Enable or disable hideOnDeactivate for standard update window.
- */
-@property (nonatomic) BOOL hideOnDeactivate;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUStandardUserDriverDelegate.h Deleted

@@ -1,47 +0,0 @@
-//
-// SPUStandardUserDriverDelegate.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 3/3/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-@protocol SUVersionDisplay;
-
-/*!
- A protocol for Sparkle's standard user driver's delegate
- 
- This includes methods related to UI interactions
- */
-SU_EXPORT @protocol SPUStandardUserDriverDelegate <NSObject>
-
-@optional
-
-/*!
- Called before showing a modal alert window,
- to give the opportunity to hide attached windows that may get in the way.
- */
-- (void)standardUserDriverWillShowModalAlert;
-
-/*!
- Called after showing a modal alert window,
- to give the opportunity to hide attached windows that may get in the way.
- */
-- (void)standardUserDriverDidShowModalAlert;
-
-/*!
- Returns an object that formats version numbers for display to the user.
- If you don't implement this method or return \c nil,
- the standard version formatter will be used.
- */
-- (_Nullable id <SUVersionDisplay>)standardUserDriverRequestsVersionDisplayer;
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUStandardUserDriverProtocol.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUStatusCompletionResults.h Deleted

@@ -1,45 +0,0 @@
-//
-// SPUStatusCompletionResults.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 2/29/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#ifndef SPUStatusCompletionResults_h
-#define SPUStatusCompletionResults_h
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-typedef NS_ENUM(NSUInteger, SPUUserInitiatedCheckStatus) {
- SPUUserInitiatedCheckDone,
- SPUUserInitiatedCheckCanceled
-};
-
-typedef NS_ENUM(NSUInteger, SPUDownloadUpdateStatus) {
- SPUDownloadUpdateDone,
- SPUDownloadUpdateCanceled
-};
-
-typedef NS_ENUM(NSUInteger, SPUInstallUpdateStatus) {
- SPUInstallUpdateNow,
- SPUInstallAndRelaunchUpdateNow,
- SPUDismissUpdateInstallation
-};
-
-typedef NS_ENUM(NSInteger, SPUUpdateAlertChoice) {
- SPUInstallUpdateChoice,
- SPUInstallLaterChoice,
- SPUSkipThisVersionChoice
-};
-
-typedef NS_ENUM(NSInteger, SPUInformationalUpdateAlertChoice) {
- SPUDismissInformationalNoticeChoice,
- SPUSkipThisInformationalVersionChoice
-};
-
-#endif /* SPUStatusCompletionResults_h */

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUpdatePermissionRequest.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUpdater.h Deleted

@@ -1,209 +0,0 @@
-//
-// SPUUpdater.h
-// Sparkle
-//
-// Created by Andy Matuschak on 1/4/06.
-// Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <Sparkle/SUExport.h>
-#import <Sparkle/SPUUserDriver.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class SUAppcastItem, SUAppcast;
-
-@protocol SPUUpdaterDelegate;
-
-/*!
- The main API in Sparkle for controlling the update mechanism.
-
- This class is used to configure the update parameters as well as manually
- and automatically schedule and control checks for updates.
- */
-SU_EXPORT @interface SPUUpdater : NSObject
-
-/*!
- Initializes a new SPUUpdater instance
- 
- This does not start the updater. To start it, see -SPUUpdater startUpdater:
- 
- Note that this is a normal initializer and doesn't implement the singleton pattern (i.e, instances aren't cached, so no surprises)
- This also means that updater instances can be deallocated, and that they will be torn down properly.
- 
- Related: See SPUStandardUpdaterController which wraps a SPUUpdater instance and is suitable for instantiating in nib files
- 
- @param hostBundle The bundle that should be targetted for updating. This must not be nil.
- @param applicationBundle The application bundle that should be relaunched and waited for termination. Usually this can be the same as hostBundle. This may differ when updating a plug-in or other non-application bundle.
- @param userDriver The user driver that Sparkle uses for user update interaction
- @param delegate The delegate for SPUUpdater. This may be nil.
- */
-- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id <SPUUserDriver>)userDriver delegate:(id<SPUUpdaterDelegate> _Nullable)delegate;
-
-/*!
- Starts the updater.
-
- This method checks if Sparkle is configured properly. A valid feed URL should be set before this method is invoked.
- Other properties of this SPUUpdater instance can be set before this method is invoked as well, such as automatic update checks.
-
- If the configuration is valid, this method may bring up a permission prompt (if needed) for checking if the user wants automatic update checking.
- This method then starts the regular update cycle if automatic update checks are enabled.
-
- One of -checkForUpdates, -checkForUpdatesInBackground, or -checkForUpdateInformation can be invoked before starting the updater.
- This preschedules an update action before starting the updater. When the updater is started, the prescheduled action is immediately invoked.
- This may be useful for example if you want to check for updates right away without a permission prompt potentially showing.
-
- This must be called on the main thread.
-
- @param error The error that is populated if this method fails. Pass NULL if not interested in the error information.
- @return YES if the updater started otherwise NO with a populated error
- */
-- (BOOL)startUpdater:(NSError * __autoreleasing *)error;
-
-/*!
- Checks for updates, and displays progress while doing so.
- 
- This is meant for users initiating an update check.
- This may find a resumable update that has already been downloaded or has begun installing, or
- this may find a new update that can start to be downloaded if the user requests it.
- This will find updates that the user has opted into skipping.
- */
-- (void)checkForUpdates;
-
-/*!
- Checks for updates, but does not display any UI unless an update is found.
- 
- This is meant for programmatically initating a check for updates.
- That is, it will display no UI unless it finds an update, in which case it proceeds as usual.
- This will not find updates that the user has opted into skipping.
- 
- Note if there is no resumable update found, and automated updating is turned on,
- the update will be downloaded in the background without disrupting the user.
- */
-- (void)checkForUpdatesInBackground;
-
-/*!
- Begins a "probing" check for updates which will not actually offer to
- update to that version.
- 
- However, the delegate methods
- SPUUpdaterDelegate::updater:didFindValidUpdate: and
- SPUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
- so you can use that information in your UI.
- 
- Updates that have been skipped by the user will not be found.
- */
-- (void)checkForUpdateInformation;
-
-/*!
- A property indicating whether or not to check for updates automatically.
- 
- Setting this property will persist in the host bundle's user defaults.
- The update schedule cycle will be reset in a short delay after the property's new value is set.
- This is to allow reverting this property without kicking off a schedule change immediately
- */
-@property (nonatomic) BOOL automaticallyChecksForUpdates;
-
-/*!
- A property indicating the current automatic update check interval.
- 
- Setting this property will persist in the host bundle's user defaults.
- The update schedule cycle will be reset in a short delay after the property's new value is set.
- This is to allow reverting this property without kicking off a schedule change immediately
- */
-@property (nonatomic) NSTimeInterval updateCheckInterval;
-
-/*!
- A property indicating whether or not updates can be automatically downloaded in the background.
- 
- Note that the developer can disallow automatic downloading of updates from being enabled.
- In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
- 
- Setting this property will persist in the host bundle's user defaults.
- */
-@property (nonatomic) BOOL automaticallyDownloadsUpdates;
-
-/*!
- The URL of the appcast used to download update information.
- 
- If the updater's delegate implements -SPUUpdaterDelegate feedURLStringForUpdater:, this will return that feed URL.
- Otherwise if the feed URL has been set before, the feed URL returned will be retrieved from the host bundle's user defaults.
- Otherwise the feed URL in the host bundle's Info.plist will be returned.
- If no feed URL can be retrieved, this will raise an exception.
- 
- This property must be called on the main thread.
- */
-@property (nonatomic, readonly) NSURL *feedURL;
-
-/*!
- Set the URL of the appcast used to download update information. Using this method is discouraged.
- 
- Setting this property will persist in the host bundle's user defaults.
- To avoid this, you should consider instead implementing
- -SPUUpdaterDelegate feedURLStringForUpdater: or -SPUUpdaterDelegate feedParametersForUpdater:sendingSystemProfile:
- 
- Passing nil will remove any feed URL that has been set in the host bundle's user defaults.
- 
- This method must be called on the main thread.
- */
-- (void)setFeedURL:(NSURL * _Nullable)feedURL;
-
-/*!
- The host bundle that is being updated.
- */
-@property (nonatomic, readonly) NSBundle *hostBundle;
-
-/*!
- The bundle this class (SPUUpdater) is loaded into
- */
-@property (nonatomic, readonly) NSBundle *sparkleBundle;
-
-/*!
- * The user agent used when checking for updates.
- *
- * The default implementation can be overrided.
- */
-@property (nonatomic, copy) NSString *userAgentString;
-
-/*!
- The HTTP headers used when checking for updates.
- 
- The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
- */
-#if __has_feature(objc_generics)
-@property (nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
-#else
-@property (nonatomic, copy, nullable) NSDictionary *httpHeaders;
-#endif
-
-/*!
- A property indicating whether or not the user's system profile information is sent when checking for updates.
-
- Setting this property will persist in the host bundle's user defaults.
- */
-@property (nonatomic) BOOL sendsSystemProfile;
-
-/*!
- Returns the date of last update check.
-
- \returns \c nil if no check has been performed.
- */
-@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate;
-
-/*!
- Appropriately schedules or cancels the update checking timer according to
- the preferences for time interval and automatic checks.
-
- This call does not change the date of the next check,
- but only the internal timer.
- */
-- (void)resetUpdateCycle;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUpdaterDelegate.h Deleted

@@ -1,305 +0,0 @@
-//
-// SPUUpdaterDelegate.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 8/12/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-@protocol SUVersionComparison;
-@class SPUUpdater, SUAppcast, SUAppcastItem;
-
-NS_ASSUME_NONNULL_BEGIN
-
-// -----------------------------------------------------------------------------
-// SUUpdater Notifications for events that might be interesting to more than just the delegate
-// The updater will be the notification object
-// -----------------------------------------------------------------------------
-SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
-#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
-#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
-
-// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
-// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
-
-// -----------------------------------------------------------------------------
-//	SPUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-typedef NS_ENUM(NSInteger, SPUUpdateCheck)
-{
- SPUUpdateCheckUserInitiated = 0,
- SPUUpdateCheckBackgroundScheduled = 1
-};
-
-/*!
- Provides methods to control the behavior of an SPUUpdater object.
- */
-@protocol SPUUpdaterDelegate <NSObject>
-@optional
-
-/*!
- Called when a background update will be scheduled after a delay.
- 
- Automatic update checks need to be enabled for this to trigger.
- 
- \param delay The delay until the next scheduled update will occur.
- 
- \param updater The updater instance.
- */
-- (void)updater:(SPUUpdater *)updater willScheduleUpdateCheckAfterDelay:(NSTimeInterval)delay;
-
-/*!
- Called when no updates will be scheduled in the future.
- 
- This may later change if automatic update checks become enabled.
- 
- \param updater The updater instance.
- */
-- (void)updaterWillIdleSchedulingUpdates:(SPUUpdater *)updater;
-
-/*!
- Returns whether to allow Sparkle to pop up.
- 
- For example, this may be used to prevent Sparkle from interrupting a setup assistant.
- Alternatively, you may want to consider starting the updater after eg: the setup assistant finishes
- 
- \param updater The updater instance.
- */
-- (BOOL)updaterMayCheckForUpdates:(SPUUpdater *)updater;
-
-/*!
- Returns additional parameters to append to the appcast URL's query string.
- 
- This is potentially based on whether or not Sparkle will also be sending along the system profile.
- 
- \param updater The updater instance.
- \param sendingProfile Whether the system profile will also be sent.
- 
- \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- */
-#if __has_feature(objc_generics)
-- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SPUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-#else
-- (NSArray *)feedParametersForUpdater:(SPUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-#endif
-
-/*!
- Returns a custom appcast URL.
- 
- Override this to dynamically specify the entire URL.
- Alternatively you may want to consider adding a feed parameter using -feedParametersForUpdater:sendingSystemProfile:
- and having the server which appcast to serve.
- 
- \param updater The updater instance.
- */
-- (nullable NSString *)feedURLStringForUpdater:(SPUUpdater *)updater;
-
-/*!
- Returns whether Sparkle should prompt the user about automatic update checks.
- 
- Use this to override the default behavior.
- 
- \param updater The updater instance.
- */
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)updater;
-
-/*!
- Called after Sparkle has downloaded the appcast from the remote server.
- 
- Implement this if you want to do some special handling with the appcast once it finishes loading.
- 
- \param updater The updater instance.
- \param appcast The appcast that was downloaded from the remote server.
- */
-- (void)updater:(SPUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-/*!
- Returns the item in the appcast corresponding to the update that should be installed.
- 
- If you're using special logic or extensions in your appcast,
- implement this to use your own logic for finding a valid update, if any,
- in the given appcast.
- 
- \param appcast The appcast that was downloaded from the remote server.
- \param updater The updater instance.
- \return The best valid appcast item, or nil if you don't want to be delegated this task.
- */
-- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SPUUpdater *)updater;
-
-/*!
- Called when a valid update is found by the update driver.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SPUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
-
-/*!
- Called when a valid update is not found.
- 
- \param updater The updater instance.
- */
-- (void)updaterDidNotFindUpdate:(SPUUpdater *)updater;
-
-/*!
- Returns whether the release notes (if available) should be downloaded after an update is found and shown.
- 
- This is specifically for the releaseNotesLink element in the appcast.
- 
- \param updater The updater instance.
- 
- \return \c YES to download and show the release notes if available, otherwise NO. The default behavior is YES.
- */
-- (BOOL)updaterShouldDownloadReleaseNotes:(SPUUpdater *)updater;
-
-/*!
- Called immediately before downloading the specified update.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that is proposed to be downloaded.
- \param request The mutable URL request that will be used to download the update.
- */
-- (void)updater:(SPUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
-
-/*!
- Called after the specified update failed to download.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that failed to download.
- \param error The error generated by the failed download.
- */
-- (void)updater:(SPUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
-
-/*!
- Called when the user clicks the cancel button while and update is being downloaded.
- 
- \param updater The updater instance.
- */
-- (void)userDidCancelDownload:(SPUUpdater *)updater;
-
-/*!
- Called immediately before installing the specified update.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SPUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
-
-/*!
- Returns whether the relaunch should be delayed in order to perform other tasks.
- 
- This is not called if the user didn't relaunch on the previous update,
- in that case it will immediately restart.
- 
- This may also not be called if the application is not going to relaunch after it terminates.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- \param installHandler The install handler that must be completed before continuing with the relaunch.
- 
- \return \c YES to delay the relaunch until \p installHandler is invoked.
- */
-- (BOOL)updater:(SPUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvokingBlock:(void (^)(void))installHandler;
-
-/*!
- Returns whether the application should be relaunched at all.
- 
- Some apps \b cannot be relaunched under certain circumstances.
- This method can be used to explicitly prevent a relaunch.
- 
- \param updater The updater instance.
- \return YES if the updater should be relaunched, otherwise NO if it shouldn't.
- */
-- (BOOL)updaterShouldRelaunchApplication:(SPUUpdater *)updater;
-
-/*!
- Called immediately before relaunching.
- 
- \param updater The updater instance.
- */
-- (void)updaterWillRelaunchApplication:(SPUUpdater *)updater;
-
-/*!
- Returns an object that compares version numbers to determine their arithmetic relation to each other.
- 
- This method allows you to provide a custom version comparator.
- If you don't implement this method or return \c nil,
- the standard version comparator will be used. Note that the
- standard version comparator may be used during installation for preventing
- a downgrade, even if you provide a custom comparator here.
- 
- \sa SUStandardVersionComparator
- 
- \param updater The updater instance.
- \return The custom version comparator or nil if you don't want to be delegated this task.
- */
-- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)updater;
-
-/*!
- Returns whether or not the updater should allow interaction from the installer
- 
- Use this to override the default behavior which is to allow interaction with the installer.
- 
- If interaction is allowed, then an authorization prompt may show up to the user if they do
- not curently have sufficient privileges to perform the installation of the new update.
- The installer may also show UI and progress when interaction is allowed.
- 
- On the other hand, if interaction is not allowed, then an installation may fail if the user does not
- have sufficient privileges to perform the installation. In this case, the feed and update may not even be downloaded.
- 
- Note this has no effect if the update has already been downloaded in the background silently and ready to be resumed.
- 
- \param updater The updater instance.
- \param updateCheck The type of update check being performed.
- */
-- (BOOL)updater:(SPUUpdater *)updater shouldAllowInstallerInteractionForUpdateCheck:(SPUUpdateCheck)updateCheck;
-
-/*!
- Returns the decryption password (if any) which is used to extract the update archive DMG.
- 
- Return nil if no password should be used.
- 
- \param updater The updater instance.
- \return The password used for decrypting the archive, or nil if no password should be used.
- */
-- (nullable NSString *)decryptionPasswordForUpdater:(SPUUpdater *)updater;
-
-/*!
- Called when an update is scheduled to be silently installed on quit after downloading the update automatically.
- 
- \param updater The updater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- \param immediateInstallHandler The install handler to immediately install the update. No UI interaction will be shown and the application will be relaunched after installation.
- \return Return YES if the delegate will handle installing the update or NO if the updater should be given responsibility.
- 
- If the updater is given responsibility, it can later remind the user an update is available if they have not terminated the application for a long time.
- Also if the updater is given responsibility and the update item is marked critical, the new update will be presented to the user immediately after.
- Even if the immediateInstallHandler is not invoked, the installer will attempt to install the update on termination.
- */
-- (BOOL)updater:(SPUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))immediateInstallHandler;
-
-/*!
- Called after an update is aborted due to an error.
- 
- \param updater The updater instance.
- \param error The error that caused the abort
- */
-- (void)updater:(SPUUpdater *)updater didAbortWithError:(NSError *)error;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUpdaterSettings.h Deleted

@@ -1,59 +0,0 @@
-//
-// SPUUpdaterSettings.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 3/27/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*!
- This class can be used for reading certain updater settings.
- 
- It retrieves the settings by first looking into the host's user defaults.
- If the setting is not found in there, then the host's Info.plist file is looked at.
- */
-SU_EXPORT @interface SPUUpdaterSettings : NSObject
-
-- (instancetype)initWithHostBundle:(NSBundle *)hostBundle;
-
-/*!
- * Indicates whether or not automatic update checks are enabled.
- */
-@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates;
-
-/*!
- * The regular update check interval.
- */
-@property (readonly, nonatomic) NSTimeInterval updateCheckInterval;
-
-/*!
- * Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
- */
-@property (readonly, nonatomic) BOOL allowsAutomaticUpdates;
-
-/*!
- * Indicates whether or not automatically downloading updates is enabled by the user or developer.
- *
- * Note this does not indicate whether or not automatic downloading of updates is allowable.
- * See `-allowsAutomaticUpdates` property for that.
- */
-@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates;
-
-/*!
- * Indicates whether or not anonymous system profile information is sent when checking for updates.
- */
-@property (readonly, nonatomic) BOOL sendsSystemProfile;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUserDriver.h Deleted

@@ -1,334 +0,0 @@
-//
-// SPUUserDriver.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 2/14/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SPUStatusCompletionResults.h>
-#import <Sparkle/SUExport.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@class SPUUpdatePermissionRequest, SUUpdatePermissionResponse, SUAppcastItem, SPUDownloadData;
-
-/*!
- The API in Sparkle for controlling the user interaction.
- 
- This protocol is used for implementing a user interface for the Sparkle updater. Sparkle's internal drivers tell
- an object that implements this protocol what actions to take and show to the user.
- 
- Every method in this protocol is required (i.e, not optional) and has a void return type and can optionally take a single parameter block, which waits for
- a response back from the user driver. Note that every parameter block, or reply, *must* be responded to eventually -
- that is, none can be ignored. Furthermore, they can only be replied to *once* - a reply or completion block should be considered
- invalidated after it's once used. The faster a reply can be made, the more Sparkle may be able to idle, and so the better.
- Lastly, every method in this protocol can be called from any thread. Thus, an implementor may choose to always
- dispatch asynchronously to the main thread. However, an implementor should also avoid unnecessary nested asynchronous dispatches.
- 
- An implementor of this protocol should act defensively. For example, it may be possible for an action that says to
- invalidate or dismiss something to be called multiple times in succession, and the implementor may choose to ignore further requests.
- 
- Note: Once upon a time, when first developing the user driver API, I had the user driver exist in a separate process from the rest of the framework.
- If you're familiar with how the higher level XPC APIs work, this explains why some of the decisions above were made
- (reply block executed on any thread, reply block replied only once, single reply block, void return types, idleness, no optional methods, ...)
- This is somewhat of an artifact (maybe?) now, but I think most of these set of restrictions still enforces a well designed API.
- */
-SU_EXPORT @protocol SPUUserDriver <NSObject>
-
-/*!
- * Show that an update can be checked by the user or not
- *
- * A client may choose to update the interface letting the user know if they can check for updates.
- * For example, this can be used for menu item validation on the "Check for Updates" action.
- *
- * This can be called from any thread.
- */
-- (void)showCanCheckForUpdates:(BOOL)canCheckForUpdates;
-
-/*!
- * Show an updater permission request to the user
- *
- * Ask the user for their permission regarding update checks.
- * This is typically only called once per app installation.
- *
- * @param request The update permission request.
- * @param reply A reply with a update permission response.
- *
- * This can be called from any thread
- */
-- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply;
-
-/*!
- * Show the user initating an update check
- *
- * Respond to the user initiating an update check. Sparkle uses this to show the user a window with an indeterminate progress bar.
- *
- * @param updateCheckStatusCompletion A reply indicating whether the initiated update check is done or canceled.
- * Attempts to canceling can be made before -dismissUserInitiatedUpdateCheck is invoked. Replying with SPUUserInitiatedCheckDone
- * on the other hand should not be done until -dismissUserInitiatedUpdateCheck is invoked.
- *
- * This can be called from any thread
- */
-- (void)showUserInitiatedUpdateCheckWithCompletion:(void (^)(SPUUserInitiatedCheckStatus))updateCheckStatusCompletion;
-
-/*!
- * Dismiss the user initiated update check from the user
- *
- * Dismiss whatever was started in -showUserInitiatedUpdateCheckWithCompletion:
- * This is an appropriate time to reply with SPUUserInitiatedCheckDone if not having done so already
- *
- * This can be called from any thread
- */
-- (void)dismissUserInitiatedUpdateCheck;
-
-/*!
- * Show the user a new update is found and can be downloaded and installed
- *
- * Let the user know a new update is found and ask them what they want to do.
- *
- * @param appcastItem The Appcast Item containing information that reflects the new update
- *
- * @param userInitiated A flag indicating whether or not a user initiated this update check
- *
- * @param reply
- * A reply of SPUInstallUpdateChoice begins downloading and installing the new update.
- *
- * A reply of SPUInstallLaterChoice reminds the user later of the update, which can act as a "do nothing" option.
- *
- * A reply of SPUSkipThisVersionChoice skips this particular version and won't bother the user again,
- * unless they initiate an update check themselves.
- *
- * This can be called from any thread
- */
-- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem userInitiated:(BOOL)userInitiated reply:(void (^)(SPUUpdateAlertChoice))reply;
-
-/*!
- * Show the user a new update has been downloaded and can be installed
- *
- * This method behaves just like -showUpdateFoundWithAppcastItem:reply: except the update has already been downloaded.
- */
-- (void)showDownloadedUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem userInitiated:(BOOL)userInitiated reply:(void (^)(SPUUpdateAlertChoice))reply;
-
-/*!
- * Show the user an update that has started installing can be resumed and installed immediately
- *
- * Let the user know an update that has already been downloaded and started installing can be resumed.
- * Note at this point the update cannot be canceled.
- *
- * @param appcastItem The Appcast Item containing information that reflects the new update
- *
- * @param userInitiated A flag indicating whether or not a user initiated this update check
- *
- * @param reply
- * A reply of SPUInstallAndRelaunchUpdateNow installs the update immediately and relaunches the new update.
- * Note: the application is not relaunched if it was not running before installing the update.
- * A reply of SPUInstallUpdateNow installs the update immediately but does not relaunch the new update.
- * A reply of SPUDismissUpdateInstallation dismisses the update installation. Note the update will attempt to finish installation
- * after the application terminates.
- *
- * This can be called from any thread
- */
-- (void)showResumableUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem userInitiated:(BOOL)userInitiated reply:(void (^)(SPUInstallUpdateStatus))reply;
-
-/*!
- * Show the user a new informational only update has been found
- *
- * Let the user know a new informational update is found and ask them what they want to do.
- *
- * @param appcastItem The Appcast Item containing information that reflects the new update.
- * The infoURL property for the appcastItem may be of interest.
- *
- * @param userInitiated A flag indicating whether or not a user initiated this update check
- *
- * @param reply
- * A reply of SPUDismissInformationalNoticeChoice dismisses this notice.
- * An implementor may decide to invoke another action before dismissing the notice.
- *
- * A reply of SPUSkipThisInformationalVersionChoice skips this particular version and won't bother the user again,
- * unless they initiate an update check themselves.
- *
- * This can be called from any thread
- */
-- (void)showInformationalUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem userInitiated:(BOOL)userInitiated reply:(void (^)(SPUInformationalUpdateAlertChoice))reply;
-
-/*!
- * Show the user the release notes for the new update
- *
- * Display the release notes to the user. This will be called after showing the new update.
- * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file.
- * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil.
- *
- * @param downloadData The data for the release notes that was downloaded from the new update's appcast.
- *
- * This can be called from any thread
- */
-- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData;
-
-/*!
- * Show the user that the new update's release notes could not be downloaded
- *
- * This will be called after showing the new update.
- * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file.
- * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil.
- *
- * @param error The error associated with why the new update's release notes could not be downloaded.
- *
- * This can be called from any thread
- */
-- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error;
-
-/*!
- * Show the user a new update was not found
- *
- * Let the user know a new update was not found after they tried initiating an update check.
- *
- * @param acknowledgement Acknowledge to the updater that no update found was shown.
- *
- * This can be called from any thread
- */
-- (void)showUpdateNotFoundWithAcknowledgement:(void (^)(void))acknowledgement;
-
-/*!
- * Show the user an update error occurred
- *
- * Let the user know that the updater failed with an error. This will not be invoked without the user having been
- * aware that an update was in progress.
- *
- * @param acknowledgement Acknowledge to the updater that the error was shown.
- *
- * This can be called from any thread
- */
-- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement;
-
-/*!
- * Show the user that downloading the new update initiated
- *
- * Let the user know that downloading the new update started.
- *
- * @param downloadUpdateStatusCompletion A reply of SPUDownloadUpdateCanceled can be used to cancel
- * the download at any point before -showDownloadDidStartExtractingUpdate is invoked.
- * A reply of SPUDownloadUpdateDone signifies that the download is done, which should not be invoked until
- * -showDownloadDidStartExtractingUpdate
- *
- * This can be called from any thread
- */
-- (void)showDownloadInitiatedWithCompletion:(void (^)(SPUDownloadUpdateStatus))downloadUpdateStatusCompletion;
-
-/*!
- * Show the user the content length of the new update that will be downloaded
- *
- * @param expectedContentLength The expected content length of the new update being downloaded.
- * An implementor should be able to handle if this value is invalid (more or less than actual content length downloaded).
- * Additionally, this method may be called more than once for the same download in rare scenarios.
- *
- * This can be called from any thread
- */
-- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
-
-/*!
- * Show the user that the update download received more data
- *
- * This may be an appropriate time to advance a visible progress indicator of the download
- * @param length The length of the data that was just downloaded
- *
- * This can be called from any thread
- */
-- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length;
-
-/*!
- * Show the user that the update finished downloading and started extracting
- *
- * This is an appropriate time to reply with SPUDownloadUpdateDone if not done so already
- * Sparkle uses this to show an indeterminate progress bar.
- *
- * Note that an update can resume at this point after having been downloaded before,
- * so this may be called without any of the download callbacks being invoked prior.
- *
- * This can be called from any thread
- */
-- (void)showDownloadDidStartExtractingUpdate;
-
-/*!
- * Show the user that the update is extracting with progress
- *
- * Let the user know how far along the update extraction is.
- *
- * @param progress The progress of the extraction from a 0.0 to 1.0 scale
- *
- * This can be called from any thread
- */
-- (void)showExtractionReceivedProgress:(double)progress;
-
-/*!
- * Show the user that the update is ready to install
- *
- * Let the user know that the update is ready and ask them whether they want to install or not.
- * Note if the target application is already terminated and an update can be performed silently, this method may not be invoked.
- *
- * @param installUpdateHandler
- * A reply of SPUInstallAndRelaunchUpdateNow installs the update immediately and relaunches the new update.
- * Note: the application is not relaunched if it was not running before installing the update.
- * A reply of SPUInstallUpdateNow installes the update immediately but does not relaunch the new update.
- * A reply of SPUDismissUpdateInstallation dismisses the update installation. Note the update may still be installed after
- * the application terminates, however there is not a strong guarantee that this will happen.
- *
- * This can be called from any thread
- */
-- (void)showReadyToInstallAndRelaunch:(void (^)(SPUInstallUpdateStatus))installUpdateHandler;
-
-/*!
- * Show the user that the update is installing
- *
- * Let the user know that the update is currently installing. Sparkle uses this to show an indeterminate progress bar.
- *
- * This can be called from any thread
- */
-- (void)showInstallingUpdate;
-
-/*!
- * Show or dismiss progress while a termination signal is being sent to the application
- *
- * Terminating and relaunching the application (if requested to be relaunched) may happen quickly,
- * or it may take some time to perform the final installation, or the termination signal can be canceled or delayed by the application or user.
- *
- * It is up to the implementor whether or not to decide to continue showing installation progress
- * or dismissing UI that won't remain obscuring other parts of the user interface.
- *
- * This can be called from any thread
- */
-- (void)showSendingTerminationSignal;
-
-/*!
- * Show the user that the update installation finished
- *
- * Let the user know that the update finished installing.
- * This will only be invoked if the updater process is still alive, which is typically not the case if
- * the updater's lifetime is tied to the application it is updating.
- *
- * @param acknowledgement Acknowledge to the updater that the installation finish was shown.
- *
- * This can be called from any thread
- */
-- (void)showUpdateInstallationDidFinishWithAcknowledgement:(void (^)(void))acknowledgement;
-
-/*!
- * Dismiss the current update installation
- *
- * Stop and tear down everything. Reply to all outstanding reply/completion blocks.
- * Dismiss all update windows, alerts, progress, etc from the user.
- * Basically, stop everything that could have been started. Sparkle may invoke this when aborting or finishing an update.
- *
- * This can be called from any thread
- */
-- (void)dismissUpdateInstallation;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SPUUserDriverCoreComponent.h Deleted

@@ -1,42 +0,0 @@
-//
-// SUUserDriverCoreComponent.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 3/4/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SPUStatusCompletionResults.h>
-#import <Sparkle/SUExport.h>
-
-@protocol SPUStandardUserDriverDelegate;
-
-SU_EXPORT @interface SPUUserDriverCoreComponent : NSObject
-
-- (void)showCanCheckForUpdates:(BOOL)canCheckForUpdates;
-
-@property (nonatomic, readonly) BOOL canCheckForUpdates;
-
-- (void)registerInstallUpdateHandler:(void (^)(SPUInstallUpdateStatus))installUpdateHandler;
-- (void)installUpdateWithChoice:(SPUInstallUpdateStatus)choice;
-
-- (void)registerUpdateCheckStatusHandler:(void (^)(SPUUserInitiatedCheckStatus))updateCheckStatusCompletion;
-- (void)cancelUpdateCheckStatus;
-- (void)completeUpdateCheckStatus;
-
-- (void)registerDownloadStatusHandler:(void (^)(SPUDownloadUpdateStatus))downloadUpdateStatusCompletion;
-- (void)cancelDownloadStatus;
-- (void)completeDownloadStatus;
-
-- (void)registerAcknowledgement:(void (^)(void))acknowledgement;
-- (void)acceptAcknowledgement;
-
-- (void)dismissUpdateInstallation;
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcast.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUAppcastItem.h Deleted

@@ -1,52 +0,0 @@
-//
-// SUAppcastItem.h
-// Sparkle
-//
-// Created by Andy Matuschak on 3/12/06.
-// Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUAPPCASTITEM_H
-#define SUAPPCASTITEM_H
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <Sparkle/SUExport.h>
-
-SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
-@property (copy, readonly) NSString *title;
-@property (copy, readonly) NSString *dateString;
-@property (copy, readonly) NSString *itemDescription;
-@property (strong, readonly) NSURL *releaseNotesURL;
-@property (copy, readonly) NSString *DSASignature;
-@property (copy, readonly) NSString *minimumSystemVersion;
-@property (copy, readonly) NSString *maximumSystemVersion;
-@property (strong, readonly) NSURL *fileURL;
-@property (nonatomic, readonly) uint64_t contentLength;
-@property (copy, readonly) NSString *versionString;
-@property (copy, readonly) NSString *osString;
-@property (copy, readonly) NSString *displayVersionString;
-@property (copy, readonly) NSDictionary *deltaUpdates;
-@property (strong, readonly) NSURL *infoURL;
-@property (nonatomic, copy, readonly) NSString *installationType;
-
-// Initializes with data from a dictionary provided by the RSS class.
-- (instancetype)initWithDictionary:(NSDictionary *)dict;
-- (instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString **)error;
-
-@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
-@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
-@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
-@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
-
-// Returns the dictionary provided in initWithDictionary; this might be useful later for extensions.
-@property (readonly, copy) NSDictionary *propertiesDictionary;
-
-- (NSURL *)infoURL;
-
-@end
-
-#endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUErrors.h Deleted

@@ -1,62 +0,0 @@
-//
-// SUErrors.h
-// Sparkle
-//
-// Created by C.W. Betts on 10/13/14.
-// Copyright (c) 2014 Sparkle Project. All rights reserved.
-//
-
-#ifndef SUERRORS_H
-#define SUERRORS_H
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <Sparkle/SUExport.h>
-
-/**
- * Error domain used by Sparkle
- */
-SU_EXPORT extern NSString *const SUSparkleErrorDomain;
-
-typedef NS_ENUM(OSStatus, SUError) {
- // Configuration phase errors
- SUNoPublicDSAFoundError = 0001,
- SUInsufficientSigningError = 0002,
- SUInsecureFeedURLError = 0003,
- SUInvalidFeedURLError = 0004,
- SUInvalidUpdaterError = 0005,
- SUInvalidHostBundleIdentifierError = 0006,
- SUInvalidHostVersionError = 0007,
- 
- // Appcast phase errors.
- SUAppcastParseError = 1000,
- SUNoUpdateError = 1001,
- SUAppcastError = 1002,
- SURunningFromDiskImageError = 1003,
- SUResumeAppcastError = 1004,
-
- // Download phase errors.
- SUTemporaryDirectoryError = 2000,
- SUDownloadError = 2001,
-
- // Extraction phase errors.
- SUUnarchivingError = 3000,
- SUSignatureError = 3001,
- 
- // Installation phase errors.
- SUFileCopyFailure = 4000,
- SUAuthenticationFailure = 4001,
- SUMissingUpdateError = 4002,
- SUMissingInstallerToolError = 4003,
- SURelaunchError = 4004,
- SUInstallationError = 4005,
- SUDowngradeError = 4006,
- SUInstallationCanceledError = 4007,
- SUInstallationAuthorizeLaterError = 4008,
- SUNotAllowedInteractionError = 4009
-};
-
-#endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUStandardVersionComparator.h Deleted

@@ -1,52 +0,0 @@
-//
-// SUStandardVersionComparator.h
-// Sparkle
-//
-// Created by Andy Matuschak on 12/21/07.
-// Copyright 2007 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUSTANDARDVERSIONCOMPARATOR_H
-#define SUSTANDARDVERSIONCOMPARATOR_H
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-#import <Sparkle/SUExport.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/*!
- Sparkle's default version comparator.
-
- This comparator is adapted from MacPAD, by Kevin Ballard.
- It's "dumb" in that it does essentially string comparison,
- in components split by character type.
-*/
-SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
-
-/*!
- Initializes a new instance of the standard version comparator.
-*/
-- (instancetype)init;
-
-/*!
- Returns a singleton instance of the comparator.
-
- It is usually preferred to alloc/init new a comparator instead.
- */
-+ (SUStandardVersionComparator *)defaultComparator;
-
-/*!
- Compares version strings through textual analysis.
-
- See the implementation for more details.
-*/
-- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
-@end
-
-NS_ASSUME_NONNULL_END
-#endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdatePermissionResponse.h Deleted

@@ -1,40 +0,0 @@
-//
-// SUUpdatePermissionResponse.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 2/8/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-/*!
- This class represents a response for permission to check updates.
-*/
-SU_EXPORT @interface SUUpdatePermissionResponse : NSObject<NSSecureCoding>
-
-/*!
- Initializes a new update permission response instance.
- 
- @param automaticUpdateChecks Flag for whether to allow automatic update checks.
- @param sendSystemProfile Flag for if system profile information should be sent to the server hosting the appcast.
- */
-- (instancetype)initWithAutomaticUpdateChecks:(BOOL)automaticUpdateChecks sendSystemProfile:(BOOL)sendSystemProfile;
-
-/*!
- A read-only property indicating whether automatic update checks are allowed or not.
- */
-@property (nonatomic, readonly) BOOL automaticUpdateChecks;
-
-/*!
- A read-only property indicating if system profile should be sent or not.
- */
-@property (nonatomic, readonly) BOOL sendSystemProfile;
-
-@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdater.h Deleted

@@ -1,205 +0,0 @@
-//
-// SUUpdater.h
-// Sparkle
-//
-// Created by Andy Matuschak on 1/4/06.
-// Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SUUPDATER_H
-#define SUUPDATER_H
-
-#if __has_feature(modules)
-@import Cocoa;
-#else
-#import <Cocoa/Cocoa.h>
-#endif
-#import <Sparkle/SUExport.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
-#import <Sparkle/SUVersionDisplayProtocol.h>
-#import <Sparkle/SUUpdaterDelegate.h>
-
-@class SUAppcastItem, SUAppcast, NSMenuItem;
-
-@protocol SUUpdaterDelegate;
-
-/*!
- The main API in Sparkle for controlling the update mechanism.
-
- This class is used to configure the update paramters as well as manually
- and automatically schedule and control checks for updates.
- 
- Note: This class is now deprecated and acts as a thin wrapper around SPUUpdater and SPUStandardUserDriver
- */
-__deprecated_msg("Use SPUStandardUpdaterController or SPUUpdater instead")
-SU_EXPORT @interface SUUpdater : NSObject
-
-@property (unsafe_unretained, nonatomic) IBOutlet id<SUUpdaterDelegate> delegate;
-
-/*!
- The shared updater for the main bundle.
- 
- This is equivalent to passing NSBundle mainBundle to SUUpdater::updaterForBundle:
- */
-+ (SUUpdater *)sharedUpdater;
-
-/*!
- The shared updater for a specified bundle.
- If an updater has already been initialized for the provided bundle, that shared instance will be returned.
- */
-+ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
-
-/*!
- Designated initializer for SUUpdater.
- 
- If an updater has already been initialized for the provided bundle, that shared instance will be returned.
- */
-- (instancetype)initForBundle:(NSBundle *)bundle;
-
-/*!
- Explicitly checks for updates and displays a progress dialog while doing so.
-
- This method is meant for a main menu item.
- Connect any menu item to this action in Interface Builder,
- and Sparkle will check for updates and report back its findings verbosely
- when it is invoked.
-
- This will find updates that the user has opted into skipping.
- */
-- (IBAction)checkForUpdates:(id)sender;
-
-/*!
- The menu item validation used for the -checkForUpdates: action
- */
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
-
-/*!
- Checks for updates, but does not display any UI unless an update is found.
-
- This is meant for programmatically initating a check for updates. That is,
- it will display no UI unless it actually finds an update, in which case it
- proceeds as usual.
-
- If automatic downloading of updates it turned on and allowed, however,
- this will invoke that behavior, and if an update is found, it will be downloaded
- in the background silently and will be prepped for installation.
-
- This will not find updates that the user has opted into skipping.
- */
-- (void)checkForUpdatesInBackground;
-
-/*!
- A property indicating whether or not to check for updates automatically.
-
- Setting this property will persist in the host bundle's user defaults.
- The update schedule cycle will be reset in a short delay after the property's new value is set.
- This is to allow reverting this property without kicking off a schedule change immediately
- */
-@property (nonatomic) BOOL automaticallyChecksForUpdates;
-
-/*!
- A property indicating whether or not updates can be automatically downloaded in the background.
-
- Note that automatic downloading of updates can be disallowed by the developer.
- In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
-
- Setting this property will persist in the host bundle's user defaults.
- */
-@property (nonatomic) BOOL automaticallyDownloadsUpdates;
-
-/*!
- A property indicating the current automatic update check interval.
-
- Setting this property will persist in the host bundle's user defaults.
- The update schedule cycle will be reset in a short delay after the property's new value is set.
- This is to allow reverting this property without kicking off a schedule change immediately
- */
-@property (nonatomic) NSTimeInterval updateCheckInterval;
-
-/*!
- Begins a "probing" check for updates which will not actually offer to
- update to that version.
-
- However, the delegate methods
- SUUpdaterDelegate::updater:didFindValidUpdate: and
- SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
- so you can use that information in your UI.
-
- Updates that have been skipped by the user will not be found.
- */
-- (void)checkForUpdateInformation;
-
-/*!
- The URL of the appcast used to download update information.
-
- Setting this property will persist in the host bundle's user defaults.
- If you don't want persistence, you may want to consider instead implementing
- SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
-
- This property must be called on the main thread.
- */
-@property (nonatomic, copy) NSURL *feedURL;
-
-/*!
- The host bundle that is being updated.
- */
-@property (readonly, nonatomic) NSBundle *hostBundle;
-
-/*!
- The bundle this class (SUUpdater) is loaded into.
- */
-@property (nonatomic, readonly) NSBundle *sparkleBundle;
-
-/*!
- The user agent used when checking for updates.
-
- The default implementation can be overrided.
- */
-@property (nonatomic, copy) NSString *userAgentString;
-
-/*!
- The HTTP headers used when checking for updates.
-
- The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
- */
-@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
-
-/*!
- A property indicating whether or not the user's system profile information is sent when checking for updates.
-
- Setting this property will persist in the host bundle's user defaults.
- */
-@property (nonatomic) BOOL sendsSystemProfile;
-
-/*!
- A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
- */
-@property (nonatomic, copy) NSString *decryptionPassword;
-
-/*!
- Returns the date of last update check.
-
- \returns \c nil if no check has been performed.
- */
-@property (nonatomic, readonly, copy) NSDate *lastUpdateCheckDate;
-
-/*!
- Appropriately schedules or cancels the update checking timer according to
- the preferences for time interval and automatic checks.
-
- This call does not change the date of the next check,
- but only the internal NSTimer.
- */
-- (void)resetUpdateCycle;
-
-/*!
- A property indicating whether or not an update is in progress.
-
- Note this property is not indicative of whether or not user initiated updates can be performed.
- Use SUUpdater::validateMenuItem: for that instead.
- */
-@property (nonatomic, readonly) BOOL updateInProgress;
-
-@end
-
-#endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUUpdaterDelegate.h Deleted

@@ -1,284 +0,0 @@
-//
-// SUUpdaterDelegate.h
-// Sparkle
-//
-// Created by Mayur Pawashe on 3/12/16.
-// Copyright © 2016 Sparkle Project. All rights reserved.
-//
-
-#if __has_feature(modules)
-@import Foundation;
-#else
-#import <Foundation/Foundation.h>
-#endif
-
-#import <Sparkle/SUExport.h>
-
-@protocol SUVersionComparison, SUVersionDisplay;
-@class SUUpdater, SUAppcast, SUAppcastItem;
-
-NS_ASSUME_NONNULL_BEGIN
-
-// -----------------------------------------------------------------------------
-// SUUpdater Notifications for events that might be interesting to more than just the delegate
-// The updater will be the notification object
-// -----------------------------------------------------------------------------
-SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
-SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
-#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
-#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
-
-// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
-// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
-SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
-
-// -----------------------------------------------------------------------------
-//	SUUpdater Delegate:
-// -----------------------------------------------------------------------------
-
-/*!
- Provides methods to control the behavior of an SUUpdater object.
- */
-__deprecated_msg("See SPUUpdaterDelegate instead")
-@protocol SUUpdaterDelegate <NSObject>
-@optional
-
-/*!
- Returns whether to allow Sparkle to pop up.
- 
- For example, this may be used to prevent Sparkle from interrupting a setup assistant.
- 
- \param updater The SUUpdater instance.
- */
-- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
-
-/*!
- Returns additional parameters to append to the appcast URL's query string.
- 
- This is potentially based on whether or not Sparkle will also be sending along the system profile.
- 
- \param updater The SUUpdater instance.
- \param sendingProfile Whether the system profile will also be sent.
- 
- \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
- */
-- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
-
-/*!
- Returns a custom appcast URL.
- 
- Override this to dynamically specify the entire URL.
- 
- An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
- and let the server handle what kind of feed to provide.
- 
- \param updater The SUUpdater instance.
- */
-- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
-
-/*!
- Returns whether Sparkle should prompt the user about automatic update checks.
- 
- Use this to override the default behavior.
- 
- \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
-
-/*!
- Called after Sparkle has downloaded the appcast from the remote server.
- 
- Implement this if you want to do some special handling with the appcast once it finishes loading.
- 
- \param updater The SUUpdater instance.
- \param appcast The appcast that was downloaded from the remote server.
- */
-- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
-
-/*!
- Returns the item in the appcast corresponding to the update that should be installed.
- 
- If you're using special logic or extensions in your appcast,
- implement this to use your own logic for finding a valid update, if any,
- in the given appcast.
- 
- \param appcast The appcast that was downloaded from the remote server.
- \param updater The SUUpdater instance.
- */
-- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
-
-/*!
- Called when a valid update is found by the update driver.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
-
-/*!
- Called when a valid update is not found.
- 
- \param updater The SUUpdater instance.
- */
-- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
-
-/*!
- Called immediately before downloading the specified update.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that is proposed to be downloaded.
- \param request The mutable URL request that will be used to download the update.
- */
-- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
-
-/*!
- Called after the specified update failed to download.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that failed to download.
- \param error The error generated by the failed download.
- */
-- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
-
-/*!
- Called when the user clicks the cancel button while and update is being downloaded.
- 
- \param updater The SUUpdater instance.
- */
-- (void)userDidCancelDownload:(SUUpdater *)updater;
-
-/*!
- Called immediately before installing the specified update.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
-
-/*!
- Returns whether the relaunch should be delayed in order to perform other tasks.
- 
- This is not called if the user didn't relaunch on the previous update,
- in that case it will immediately restart.
- 
- This may also not be called if the application is not going to relaunch after it terminates.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- \param invocation The invocation that must be completed with `invocation invoke` before continuing with the relaunch.
- 
- \return \c YES to delay the relaunch until \p invocation is invoked.
- */
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
-
-/*!
- Returns whether the application should be relaunched at all.
- 
- Some apps \b cannot be relaunched under certain circumstances.
- This method can be used to explicitly prevent a relaunch.
- 
- \param updater The SUUpdater instance.
- */
-- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
-
-/*!
- Called immediately before relaunching.
- 
- \param updater The SUUpdater instance.
- */
-- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
-
-/*!
- Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
- 
- \param updater The SUUpdater instance.
- */
-- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
-
-/*!
- Returns an object that compares version numbers to determine their arithmetic relation to each other.
- 
- This method allows you to provide a custom version comparator.
- If you don't implement this method or return \c nil,
- the standard version comparator will be used. Note that the
- standard version comparator may be used during installation for preventing
- a downgrade, even if you provide a custom comparator here.
- 
- \sa SUStandardVersionComparator
- 
- \param updater The SUUpdater instance.
- */
-- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
-
-/*!
- Returns an object that formats version numbers for display to the user.
- If you don't implement this method or return \c nil, the standard version formatter will be used.
- 
- \sa SUUpdateAlert
- \param updater The SUUpdater instance.
- */
-- (nullable id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
-
-/*!
- Returns the path to the application which is used to relaunch after the update is installed.
- 
- The installer also waits for the termination of the application at this path.
- 
- The default is the path of the host bundle.
- 
- \param updater The SUUpdater instance.
- */
-- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
-
-/*!
- Called before an updater shows a modal alert window,
- to give the host the opportunity to hide attached windows that may get in the way.
- 
- \param updater The SUUpdater instance.
- */
-- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
-
-/*!
- Called after an updater shows a modal alert window,
- to give the host the opportunity to hide attached windows that may get in the way.
- 
- \param updater The SUUpdater instance.
- */
-- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
-
-/*!
- Called when an update is scheduled to be silently installed on quit.
- 
- This is after an update has been automatically downloaded in the background.
- (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that is proposed to be installed.
- \param invocation Can be used to trigger an immediate silent install and relaunch.
- */
-- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
-
-/*!
- Calls after an update that was scheduled to be silently installed on quit has been canceled.
- 
- \param updater The SUUpdater instance.
- \param item The appcast item corresponding to the update that was proposed to be installed.
- 
- \deprecated This method is no longer invoked. The installer will try to its best ability to install the update.
- */
-- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item __deprecated;
-
-/*!
- Called after an update is aborted due to an error.
- 
- \param updater The SUUpdater instance.
- \param error The error that caused the abort
- */
-- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
-
-@end
-
-NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUVersionComparisonProtocol.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/SUVersionDisplayProtocol.h Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Headers/Sparkle.h Deleted

@@ -1,38 +0,0 @@
-//
-// Sparkle.h
-// Sparkle
-//
-// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
-// Copyright 2006 Andy Matuschak. All rights reserved.
-//
-
-#ifndef SPARKLE_H
-#define SPARKLE_H
-
-// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
-// there are name-space collisions) so we can list all of them to start with:
-
-#import <Sparkle/SUExport.h>
-#import <Sparkle/SUAppcast.h>
-#import <Sparkle/SUAppcastItem.h>
-#import <Sparkle/SUStandardVersionComparator.h>
-#import <Sparkle/SPUUpdater.h>
-#import <Sparkle/SPUUpdaterDelegate.h>
-#import <Sparkle/SPUUpdaterSettings.h>
-#import <Sparkle/SPUStandardUpdaterController.h>
-#import <Sparkle/SUVersionComparisonProtocol.h>
-#import <Sparkle/SUVersionDisplayProtocol.h>
-#import <Sparkle/SUErrors.h>
-#import <Sparkle/SPUUpdatePermissionRequest.h>
-#import <Sparkle/SUUpdatePermissionResponse.h>
-#import <Sparkle/SPUUserDriver.h>
-#import <Sparkle/SPUStandardUserDriver.h>
-#import <Sparkle/SPUStandardUserDriverDelegate.h>
-#import <Sparkle/SPUUserDriverCoreComponent.h>
-#import <Sparkle/SPUDownloadData.h>
-
-#import <Sparkle/SUUpdater.h> // deprecated
-#import <Sparkle/SUUpdaterDelegate.h> // deprecated
-
-
-#endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Modules Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Modules/module.modulemap Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Autoupdate Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/DarkAqua.css Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Info.plist Deleted

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Sparkle</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.Sparkle</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Sparkle</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10P107d</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18E205d</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1020</string>
-	<key>DTXcodeBuild</key>
-	<string>10P107d</string>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/SUModelTranslation.plist Deleted

@@ -1,314 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ADP2,1</key>
-	<string>Developer Transition Kit</string>
-	<key>iMac1,1</key>
-	<string>iMac G3 (Rev A-D)</string>
-	<key>iMac4,1</key>
-	<string>iMac (Core Duo)</string>
-	<key>iMac4,2</key>
-	<string>iMac for Education (17 inch, Core Duo)</string>
-	<key>iMac5,1</key>
-	<string>iMac (Core 2 Duo, 17 or 20 inch, SuperDrive)</string>
-	<key>iMac5,2</key>
-	<string>iMac (Core 2 Duo, 17 inch, Combo Drive)</string>
-	<key>iMac6,1</key>
-	<string>iMac (Core 2 Duo, 24 inch, SuperDrive)</string>
-	<key>iMac7,1</key>
-	<string>iMac Intel Core 2 Duo (aluminum enclosure)</string>
-	<key>iMac8,1</key>
-	<string>iMac (Core 2 Duo, 20 or 24 inch, Early 2008 )</string>
-	<key>iMac9,1</key>
-	<string>iMac (Core 2 Duo, 20 or 24 inch, Early or Mid 2009 )</string>
-	<key>iMac10,1</key>
-	<string>iMac (Core 2 Duo, 21.5 or 27 inch, Late 2009 )</string>
-	<key>iMac11,1</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2009)</string>
-	<key>iMac11,2</key>
-	<string>21.5&quot; iMac (mid 2010)</string>
-	<key>iMac11,3</key>
-	<string>iMac (Core i5 or i7, 27 inch Mid 2010)</string>
-	<key>iMac12,1</key>
-	<string>iMac (Core i3 or i5 or i7, 21.5 inch Mid 2010 or Late 2011)</string>
-	<key>iMac12,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Mid 2011)</string>
-	<key>iMac13,1</key>
-	<string>iMac (Core i3 or i5 or i7, 21.5 inch Late 2012 or Early 2013)</string>
-	<key>iMac13,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2012)</string>
-	<key>iMac14,1</key>
-	<string>iMac (Core i5, 21.5 inch Late 2013)</string>
-	<key>iMac14,2</key>
-	<string>iMac (Core i5 or i7, 27 inch Late 2013)</string>
-	<key>iMac14,3</key>
-	<string>iMac (Core i5 or i7, 21.5 inch Late 2013)</string>
-	<key>iMac14,4</key>
-	<string>iMac (Core i5, 21.5 inch Mid 2014)</string>
-	<key>iMac15,1</key>
-	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2014 or Mid 2015)</string>
-	<key>iMac16,1</key>
-	<string>iMac (Core i5, 21,5 inch Late 2015)</string>
-	<key>iMac16,2</key>
-	<string>iMac (Retina 4K Core i5 or i7, 21.5 inch Late 2015)</string>
-	<key>iMac17,1</key>
-	<string>iMac (Retina 5K Core i5 or i7, 27 inch Late 2015)</string>
-	<key>MacBook1,1</key>
-	<string>MacBook (Core Duo)</string>
-	<key>MacBook2,1</key>
-	<string>MacBook (Core 2 Duo)</string>
-	<key>MacBook4,1</key>
-	<string>MacBook (Core 2 Duo Feb 2008)</string>
-	<key>MacBook5,1</key>
-	<string>MacBook (Core 2 Duo, Late 2008, Unibody)</string>
-	<key>MacBook5,2</key>
-	<string>MacBook (Core 2 Duo, Early 2009, White)</string>
-	<key>MacBook6,1</key>
-	<string>MacBook (Core 2 Duo, Late 2009, Unibody)</string>
-	<key>MacBook7,1</key>
-	<string>MacBook (Core 2 Duo, Mid 2010, White)</string>
-	<key>MacBook8,1</key>
-	<string>MacBook (Core M, 12 inch, Early 2015)</string>
-	<key>MacBookAir1,1</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Early 2008)</string>
-	<key>MacBookAir2,1</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Mid 2009)</string>
-	<key>MacBookAir3,1</key>
-	<string>MacBook Air (Core 2 Duo, 11 inch, Late 2010)</string>
-	<key>MacBookAir3,2</key>
-	<string>MacBook Air (Core 2 Duo, 13 inch, Late 2010)</string>
-	<key>MacBookAir4,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2011)</string>
-	<key>MacBookAir4,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2011)</string>
-	<key>MacBookAir5,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2012)</string>
-	<key>MacBookAir5,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2012)</string>
-	<key>MacBookAir6,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Mid 2013 or Early 2014)</string>
-	<key>MacBookAir6,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Mid 2013 or Early 2014)</string>
-	<key>MacBookAir7,1</key>
-	<string>MacBook Air (Core i5 or i7, 11 inch, Early 2015)</string>
-	<key>MacBookAir7,2</key>
-	<string>MacBook Air (Core i5 or i7, 13 inch, Early 2015)</string>
-	<key>MacBookPro1,1</key>
-	<string>MacBook Pro Core Duo (15-inch)</string>
-	<key>MacBookPro1,2</key>
-	<string>MacBook Pro Core Duo (17-inch)</string>
-	<key>MacBookPro2,1</key>
-	<string>MacBook Pro Core 2 Duo (17-inch)</string>
-	<key>MacBookPro2,2</key>
-	<string>MacBook Pro Core 2 Duo (15-inch)</string>
-	<key>MacBookPro3,1</key>
-	<string>MacBook Pro Core 2 Duo (15-inch LED, Core 2 Duo)</string>
-	<key>MacBookPro3,2</key>
-	<string>MacBook Pro Core 2 Duo (17-inch HD, Core 2 Duo)</string>
-	<key>MacBookPro4,1</key>
-	<string>MacBook Pro (Core 2 Duo Feb 2008)</string>
-	<key>MacBookPro5,1</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,2</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,3</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,4</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro5,5</key>
-	<string>MacBook Pro Intel Core 2 Duo (aluminum unibody)</string>
-	<key>MacBookPro6,1</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
-	<key>MacBookPro6,2</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7 (mid 2010)</string>
-	<key>MacBookPro7,1</key>
-	<string>MacBook Pro Intel Core 2 Duo (mid 2010)</string>
-	<key>MacBookPro8,1</key>
-	<string>MacBook Pro Intel Core i5, Intel Core i7, 13&quot; (early 2011)</string>
-	<key>MacBookPro8,2</key>
-	<string>MacBook Pro Intel Core i7, 15&quot; (early 2011)</string>
-	<key>MacBookPro8,3</key>
-	<string>MacBook Pro Intel Core i7, 17&quot; (early 2011)</string>
-	<key>MacBookPro9,1</key>
-	<string>MacBook Pro (15-inch, Mid 2012)</string>
-	<key>MacBookPro9,2</key>
-	<string>MacBook Pro (13-inch, Mid 2012)</string>
-	<key>MacBookPro10,1</key>
-	<string>MacBook Pro (Retina, Mid 2012)</string>
-	<key>MacBookPro10,2</key>
-	<string>MacBook Pro (Retina, 13-inch, Late 2012)</string>
-	<key>MacBookPro11,1</key>
-	<string>MacBook Pro (Retina, 13-inch, Late 2013)</string>
-	<key>MacBookPro11,2</key>
-	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
-	<key>MacBookPro11,3</key>
-	<string>MacBook Pro (Retina, 15-inch, Late 2013)</string>
-	<key>MacbookPro11,4</key>
-	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
-	<key>MacbookPro11,5</key>
-	<string>MacBook Pro (Retina, 15-inch, Mid 2015)</string>
-	<key>MacbookPro12,1 </key>
-	<string>MacBook Pro (Retina, 13-inch, Early 2015)</string>
-	<key>Macmini1,1</key>
-	<string>Mac Mini (Core Solo/Duo)</string>
-	<key>Macmini2,1</key>
-	<string>Mac mini Intel Core</string>
-	<key>Macmini3,1</key>
-	<string>Mac mini Intel Core</string>
-	<key>Macmini4,1</key>
-	<string>Mac mini Intel Core (Mid 2010)</string>
-	<key>Macmini5,1</key>
-	<string>Mac mini (Core i5, Mid 2011)</string>
-	<key>Macmini5,2</key>
-	<string>Mac mini (Core i5 or Core i7, Mid 2011)</string>
-	<key>Macmini5,3</key>
-	<string>Mac mini (Core i7, Server, Mid 2011)</string>
-	<key>Macmini6,1</key>
-	<string>Mac mini (Core i5, Late 2012)</string>
-	<key>Macmini6,2</key>
-	<string>Mac mini (Core i7, Normal or Server, Late 2012)</string>
-	<key>Macmini7,1</key>
-	<string>Mac mini (Core i5 or Core i7, Late 2014)</string>
-	<key>MacPro1,1,Quad</key>
-	<string>Mac Pro</string>
-	<key>MacPro1,1</key>
-	<string>Mac Pro (four-core)</string>
-	<key>MacPro2,1</key>
-	<string>Mac Pro (eight-core)</string>
-	<key>MacPro3,1</key>
-	<string>Mac Pro (January 2008 4- or 8- core &quot;Harpertown&quot;)</string>
-	<key>MacPro4,1</key>
-	<string>Mac Pro (March 2009)</string>
-	<key>MacPro5,1</key>
-	<string>Mac Pro (2010 or 2012)</string>
-	<key>MacPro6,1</key>
-	<string>Mac Pro (Late 2013)</string>
-	<key>PowerBook1,1</key>
-	<string>PowerBook G3</string>
-	<key>PowerBook2,1</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,2</key>
-	<string>iBook G3 (FireWire)</string>
-	<key>PowerBook2,3</key>
-	<string>iBook G3</string>
-	<key>PowerBook2,4</key>
-	<string>iBook G3</string>
-	<key>PowerBook3,1</key>
-	<string>PowerBook G3 (FireWire)</string>
-	<key>PowerBook3,2</key>
-	<string>PowerBook G4</string>
-	<key>PowerBook3,3</key>
-	<string>PowerBook G4 (Gigabit Ethernet)</string>
-	<key>PowerBook3,4</key>
-	<string>PowerBook G4 (DVI)</string>
-	<key>PowerBook3,5</key>
-	<string>PowerBook G4 (1GHz / 867MHz)</string>
-	<key>PowerBook4,1</key>
-	<string>iBook G3 (Dual USB, Late 2001)</string>
-	<key>PowerBook4,2</key>
-	<string>iBook G3 (16MB VRAM)</string>
-	<key>PowerBook4,3</key>
-	<string>iBook G3 Opaque 16MB VRAM, 32MB VRAM, Early 2003)</string>
-	<key>PowerBook5,1</key>
-	<string>PowerBook G4 (17 inch)</string>
-	<key>PowerBook5,2</key>
-	<string>PowerBook G4 (15 inch FW 800)</string>
-	<key>PowerBook5,3</key>
-	<string>PowerBook G4 (17-inch 1.33GHz)</string>
-	<key>PowerBook5,4</key>
-	<string>PowerBook G4 (15 inch 1.5/1.33GHz)</string>
-	<key>PowerBook5,5</key>
-	<string>PowerBook G4 (17-inch 1.5GHz)</string>
-	<key>PowerBook5,6</key>
-	<string>PowerBook G4 (15 inch 1.67GHz/1.5GHz)</string>
-	<key>PowerBook5,7</key>
-	<string>PowerBook G4 (17-inch 1.67GHz)</string>
-	<key>PowerBook5,8</key>
-	<string>PowerBook G4 (Double layer SD, 15 inch)</string>
-	<key>PowerBook5,9</key>
-	<string>PowerBook G4 (Double layer SD, 17 inch)</string>
-	<key>PowerBook6,1</key>
-	<string>PowerBook G4 (12 inch)</string>
-	<key>PowerBook6,2</key>
-	<string>PowerBook G4 (12 inch, DVI)</string>
-	<key>PowerBook6,3</key>
-	<string>iBook G4</string>
-	<key>PowerBook6,4</key>
-	<string>PowerBook G4 (12 inch 1.33GHz)</string>
-	<key>PowerBook6,5</key>
-	<string>iBook G4 (Early-Late 2004)</string>
-	<key>PowerBook6,7</key>
-	<string>iBook G4 (Mid 2005)</string>
-	<key>PowerBook6,8</key>
-	<string>PowerBook G4 (12 inch 1.5GHz)</string>
-	<key>PowerMac1,1</key>
-	<string>Power Macintosh G3 (Blue &amp; White)</string>
-	<key>PowerMac1,2</key>
-	<string>Power Macintosh G4 (PCI Graphics)</string>
-	<key>PowerMac2,1</key>
-	<string>iMac G3 (Slot-loading CD-ROM)</string>
-	<key>PowerMac2,2</key>
-	<string>iMac G3 (Summer 2000)</string>
-	<key>PowerMac3,1</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,2</key>
-	<string>Power Macintosh G4 (AGP Graphics)</string>
-	<key>PowerMac3,3</key>
-	<string>Power Macintosh G4 (Gigabit Ethernet)</string>
-	<key>PowerMac3,4</key>
-	<string>Power Macintosh G4 (Digital Audio)</string>
-	<key>PowerMac3,5</key>
-	<string>Power Macintosh G4 (Quick Silver)</string>
-	<key>PowerMac3,6</key>
-	<string>Power Macintosh G4 (Mirrored Drive Door)</string>
-	<key>PowerMac4,1</key>
-	<string>iMac G3 (Early/Summer 2001)</string>
-	<key>PowerMac4,2</key>
-	<string>iMac G4 (Flat Panel)</string>
-	<key>PowerMac4,4</key>
-	<string>eMac</string>
-	<key>PowerMac4,5</key>
-	<string>iMac G4 (17-inch Flat Panel)</string>
-	<key>PowerMac5,1</key>
-	<string>Power Macintosh G4 Cube</string>
-	<key>PowerMac5,2</key>
-	<string>Power Mac G4 Cube</string>
-	<key>PowerMac6,1</key>
-	<string>iMac G4 (USB 2.0)</string>
-	<key>PowerMac6,3</key>
-	<string>iMac G4 (20-inch Flat Panel)</string>
-	<key>PowerMac6,4</key>
-	<string>eMac (USB 2.0, 2005)</string>
-	<key>PowerMac7,2</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac7,3</key>
-	<string>Power Macintosh G5</string>
-	<key>PowerMac8,1</key>
-	<string>iMac G5</string>
-	<key>PowerMac8,2</key>
-	<string>iMac G5 (Ambient Light Sensor)</string>
-	<key>PowerMac9,1</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac10,1</key>
-	<string>Mac Mini G4</string>
-	<key>PowerMac10,2</key>
-	<string>Mac Mini (Late 2005)</string>
-	<key>PowerMac11,2</key>
-	<string>Power Macintosh G5 (Late 2005)</string>
-	<key>PowerMac12,1</key>
-	<string>iMac G5 (iSight)</string>
-	<key>RackMac1,1</key>
-	<string>Xserve G4</string>
-	<key>RackMac1,2</key>
-	<string>Xserve G4 (slot-loading, cluster node)</string>
-	<key>RackMac3,1</key>
-	<string>Xserve G5</string>
-	<key>Xserve1,1</key>
-	<string>Xserve (Intel Xeon)</string>
-	<key>Xserve2,1</key>
-	<string>Xserve (January 2008 quad-core)</string>
-	<key>Xserve3,1</key>
-	<string>Xserve (early 2009)</string>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/SUStatus.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Info.plist Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Updater</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.Sparkle.Updater</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Updater</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10P107d</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18E205d</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1020</string>
-	<key>DTXcodeBuild</key>
-	<string>10P107d</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.9</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/MacOS/Updater Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/PkgInfo Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/SUStatus.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ar.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ar.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ca.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ca.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/cs.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/cs.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/da.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/da.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/de.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/de.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/el.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/el.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/en.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/en.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/es.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/es.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fi.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fi.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/fr_CA.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/he.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/he.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/is.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/is.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/it.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/it.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ja.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ja.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ko.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ko.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/nb.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/nb.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/nl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/nl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt_BR.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt_BR.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt_PT.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/pt_PT.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ro.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ro.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ru.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/ru.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sv.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/sv.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/th.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/th.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/tr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/tr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/uk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/uk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/zh_CN.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/zh_CN.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/zh_TW.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/Resources/zh_TW.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/Updater.app/Contents/_CodeSignature/CodeResources Deleted

@@ -1,802 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Resources/SUStatus.nib</key>
-		<data>
-		WeHAQlGzzecLWofOPo/0rgREQao=
-		</data>
-		<key>Resources/ar.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			9n6+2ab5/d3baNlcFRfSpztHdKc=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ca.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			K1BEF6sG2vXMLgibwfo3j2h588E=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/cs.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			oV92AOAArGmSW7Mp1Cr74C7zx1s=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/da.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			88FAIY52ex+k6CHvZHUHiYpaSdQ=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/de.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			aFIBXoHVaewkHZLyMy8rCTXUNQ0=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/el.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			gQTKA4Zd4FpsXRLWTcEfqV3Czu0=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/en.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			D14kRfcAqRpBq5GMobJjIRUh/yc=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/es.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			saEdp9H51NgvY5tzYYY5QoM5dsg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/fi.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Xfk3iYvY4+ymcoVUpHQATY5FNLg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/fr.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			ySuf1W/oXCB4ZX1wloQDxoAMmAA=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/he.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			ONZyQ7mMihp025wvYCm+YH5p9t8=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/is.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			bKE7f6KUVWbXzh+cBrwa31j6sXU=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/it.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			PGQtWau2xbYKJPKZjSvkwnPSSJU=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ja.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			SkZ6V1m0j1Za3GCmzVfpgP0pIBU=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ko.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			36Fahhtf/RNpPA22ntiODYGqG30=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/nb.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			lxEVDkftYdIz5tpFIlCBRzjq1G8=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/nl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			3esiRzch9B/dcmSDuZOlhGRmvhI=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			5DAYxRDmzfZJHVzkzmq9B33cV+Q=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			9OEsTkc4OnLubR99mP0Br13Mflo=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pt_PT.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			DXgfdoW9r94wdvH+tYnJNakKzDs=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ro.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Yk1UW9SBQyAtNbFvLmiIjW/UCcc=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ru.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Px2O36VmsQbjS8ywxoJ/Pp+xQiQ=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sk.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			8A/scZSblfhf9/SAyz5Di2EqrqM=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			YRXBwzauFczYTqobmqCxBBPR4DE=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sv.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			K+ak+cmJ5S1D27ODU3IntD0wITI=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/th.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			anxUgZs0IJsgMZlzI1HUeCjvmrc=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/tr.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			4L5cXvWM1KkQdn5c+uYML/PX6xg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/uk.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			uhJ3st+FckuLz8HIH0r/RtUVGsw=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/zh_CN.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			JFvKYN1jjNAURBvctgcHJxsr1iA=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/zh_TW.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			fq2MGchNCsDkfRX6i950z9hnHAM=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Resources/SUStatus.nib</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			WeHAQlGzzecLWofOPo/0rgREQao=
-			</data>
-			<key>hash2</key>
-			<data>
-			SuBluccOQqNjKuMoBnL5ccxkxMs3HX6C0Ju2cAu6TKY=
-			</data>
-		</dict>
-		<key>Resources/ar.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			9n6+2ab5/d3baNlcFRfSpztHdKc=
-			</data>
-			<key>hash2</key>
-			<data>
-			kEBNsn9OraKT0YF/n5ZaJC14Y/+GW/HI/CjiahPHgwM=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ca.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			K1BEF6sG2vXMLgibwfo3j2h588E=
-			</data>
-			<key>hash2</key>
-			<data>
-			D01nO0KWUvaVR/PR0E95dLAlJCYEKPRh858t+lcxFto=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/cs.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			oV92AOAArGmSW7Mp1Cr74C7zx1s=
-			</data>
-			<key>hash2</key>
-			<data>
-			7GfIV0Cn0XzZpKh/k81zfx5tMrwh4BC40CcYDTDzDZ8=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/da.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			88FAIY52ex+k6CHvZHUHiYpaSdQ=
-			</data>
-			<key>hash2</key>
-			<data>
-			YtLfD1azWIUD2eqATgQak+tKys3x9ZFjo91mSYwSY68=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/de.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			aFIBXoHVaewkHZLyMy8rCTXUNQ0=
-			</data>
-			<key>hash2</key>
-			<data>
-			veXcpERRtworZCTZFpq6GTcRafdACMWDh9QC0psa2/0=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/el.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			gQTKA4Zd4FpsXRLWTcEfqV3Czu0=
-			</data>
-			<key>hash2</key>
-			<data>
-			DpBU2fltmtw85+0U85gXwPH8qApgI0zbG6K0qIn2X0c=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/en.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			D14kRfcAqRpBq5GMobJjIRUh/yc=
-			</data>
-			<key>hash2</key>
-			<data>
-			UgBa+U3LY4m8juJ+PqXx4Zq4/EaRW9KMvUIp1GE/AQs=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/es.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			saEdp9H51NgvY5tzYYY5QoM5dsg=
-			</data>
-			<key>hash2</key>
-			<data>
-			Rv71G/XkSv/4JZd+ejfFkpu4HKXFsM0Nxe094rw3mAQ=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/fi.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Xfk3iYvY4+ymcoVUpHQATY5FNLg=
-			</data>
-			<key>hash2</key>
-			<data>
-			DwdjkY2nc5XvSzY7wbwHcwKnnCfJXwDl1bO6PbtoeUU=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/fr.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			ySuf1W/oXCB4ZX1wloQDxoAMmAA=
-			</data>
-			<key>hash2</key>
-			<data>
-			uwpnRFOnusMwYJvTxNLG0RdzAwDoH83iKciaeRTtmMk=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/fr_CA.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>fr.lproj</string>
-		</dict>
-		<key>Resources/he.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			ONZyQ7mMihp025wvYCm+YH5p9t8=
-			</data>
-			<key>hash2</key>
-			<data>
-			35ECtsAW7lQQpZTAtYBIKgel5ItYO6FvWJaSueWWqVU=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/is.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			bKE7f6KUVWbXzh+cBrwa31j6sXU=
-			</data>
-			<key>hash2</key>
-			<data>
-			Dh4VgRSkntzRdCDvUFT0O91wxRUTyfKmsonwoD8JO3s=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/it.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			PGQtWau2xbYKJPKZjSvkwnPSSJU=
-			</data>
-			<key>hash2</key>
-			<data>
-			6KWPm6/BMUnxP7kax40a/akTj6RVSNWSgXpS2+5bkMg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ja.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			SkZ6V1m0j1Za3GCmzVfpgP0pIBU=
-			</data>
-			<key>hash2</key>
-			<data>
-			WwKlqu3Hr89+HxOExBoaMwcXdNeW7VhIHqnvUraJFv0=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ko.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			36Fahhtf/RNpPA22ntiODYGqG30=
-			</data>
-			<key>hash2</key>
-			<data>
-			oX2Hsbm8fF05oGgMFXazS+rqg3KswApukPT1inQKxs8=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/nb.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			lxEVDkftYdIz5tpFIlCBRzjq1G8=
-			</data>
-			<key>hash2</key>
-			<data>
-			j1Ga6bYhYJ7h65dfZiX0udIIngNspVWPJaqKaEZhdIY=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/nl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			3esiRzch9B/dcmSDuZOlhGRmvhI=
-			</data>
-			<key>hash2</key>
-			<data>
-			Ft3lAx+eG7MsySkCRtYN7wT7zRTPWDsJDJnghgcNWrA=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			5DAYxRDmzfZJHVzkzmq9B33cV+Q=
-			</data>
-			<key>hash2</key>
-			<data>
-			tv/j3ywfuO1E3J5/vmrVFQ3cbZPi3EudMtacnjqVqWA=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pt.lproj</key>
-		<dict>
-			<key>symlink</key>
-			<string>pt_BR.lproj</string>
-		</dict>
-		<key>Resources/pt_BR.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			9OEsTkc4OnLubR99mP0Br13Mflo=
-			</data>
-			<key>hash2</key>
-			<data>
-			p12hYL8AHpuT+aXzheKTHwZEQFpPfc/qCoaYe7NmP6I=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/pt_PT.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			DXgfdoW9r94wdvH+tYnJNakKzDs=
-			</data>
-			<key>hash2</key>
-			<data>
-			xjNkmadedPLED0QHUgWiGXlJ/d0rZeHWkUmAyGdURyA=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ro.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Yk1UW9SBQyAtNbFvLmiIjW/UCcc=
-			</data>
-			<key>hash2</key>
-			<data>
-			IffqR5gxQdL9YEeJj/L9jauu1eduqT1taxe3hKDDXOk=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/ru.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			Px2O36VmsQbjS8ywxoJ/Pp+xQiQ=
-			</data>
-			<key>hash2</key>
-			<data>
-			MBWSZcnNsYWJkCrv3YDWyANbEghjnWl8TFrApZqIh8c=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sk.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			8A/scZSblfhf9/SAyz5Di2EqrqM=
-			</data>
-			<key>hash2</key>
-			<data>
-			hKJVJbokW6LXrUqrf3FyGAxdnXJe+NAM1IzwtfMpPTs=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sl.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			YRXBwzauFczYTqobmqCxBBPR4DE=
-			</data>
-			<key>hash2</key>
-			<data>
-			mO9OxrL9L5y2wDXWsMt11pjcxa4wJrXVXM26w/TWqpE=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/sv.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			K+ak+cmJ5S1D27ODU3IntD0wITI=
-			</data>
-			<key>hash2</key>
-			<data>
-			OXVaG3Vrb1xKlSXHj2qnMe/+X3r5r+huDymhPpx7j5w=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/th.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			anxUgZs0IJsgMZlzI1HUeCjvmrc=
-			</data>
-			<key>hash2</key>
-			<data>
-			uFBTQa44/YKNE5qHbmLqdlZUuLF0Zfk0LepBeIQ7ZQ8=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/tr.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			4L5cXvWM1KkQdn5c+uYML/PX6xg=
-			</data>
-			<key>hash2</key>
-			<data>
-			rOuDu7og0MYRXCQMAZ48ge5FRTN4+ZBYl9DxJEDnDaY=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/uk.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			uhJ3st+FckuLz8HIH0r/RtUVGsw=
-			</data>
-			<key>hash2</key>
-			<data>
-			AdON9wb2iTlde8P8StWkzdTMy8iL7M6mj94hIj6ixA0=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/zh_CN.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			JFvKYN1jjNAURBvctgcHJxsr1iA=
-			</data>
-			<key>hash2</key>
-			<data>
-			NgmrcL+YBJDI967Qilj/xC5XpMheyS0Jlyg+J8qEhrg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-		<key>Resources/zh_TW.lproj/Sparkle.strings</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			fq2MGchNCsDkfRX6i950z9hnHAM=
-			</data>
-			<key>hash2</key>
-			<data>
-			4bQfH6cx4JPlejfZbFtgdDFbRS9FENa0UFlKJqZqhtg=
-			</data>
-			<key>optional</key>
-			<true/>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^^/+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ar.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ar.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ar.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ca.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ca.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/cs.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/da.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/da.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/da.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/de.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/de.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/de.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/el.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/el.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/el.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/en.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/en.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/en.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/es.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/es.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/es.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fi.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fi.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fr.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/fr_CA.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/he.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/he.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/is.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/is.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/is.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/it.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/it.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/it.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ja.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ja.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ja.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ko.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ko.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ko.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nb.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nb.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nb.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nl.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/nl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pl.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_BR.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_BR.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_PT.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/pt_PT.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ro.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ro.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ro.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ru.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ru.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/ru.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sk.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sl.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sv.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sv.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/sv.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/th.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/th.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/th.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/tr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/tr.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/tr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/uk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/uk.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/uk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_CN.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_CN.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_TW.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdateAlert.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/SUUpdatePermissionPrompt.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Resources/zh_TW.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/A/Sparkle Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/Sparkle.framework/Versions/Current Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/codesign_xpc Deleted

@@ -1,46 +0,0 @@
-#!/usr/bin/env python
-
-import os, sys, subprocess
-
-def log_message(message):
- sys.stderr.write(message + "\n")
-
-#Surround a token with double quotes if it has a space in it
-def sanitize(argument):
- return ('"' + argument + '"' if ' ' in argument else argument)
-
-def _codesign_service(identity, path, entitlements_path=None):
- command = "codesign", "-o", "runtime", "-fs", identity, path + ( if entitlements_path is None else "--entitlements", entitlements_path)
- log_message(" ".join(map(sanitize, command)))
-
- process = subprocess.Popen(command, stdout=subprocess.PIPE)
- process.communicate()
- if process.returncode != 0:
- log_message("Error: Failed to codesign %s" % (path))
- sys.exit(1)
-
-def codesign_service(service_name, identity, path, entitlements_path=None):
- #Sign the auxiliary executables (if any)
- executables_path = os.path.join(path, "Contents/MacOS/")
- if os.path.exists(executables_path):
- for executable in os.listdir(executables_path):
- if executable != service_name:
- _codesign_service(identity, os.path.join(executables_path, executable), entitlements_path)
-
- #Sign the service bundle
- _codesign_service(identity, path, entitlements_path)
-
-if __name__ == "__main__":
- if len(sys.argv) < 3:
- log_message("Usage:\n\t%s code-signing-identity xpc-service xpc-service2 ..." % (sys.argv0))
- log_message("Example:\n\t%s \"Developer ID Application\" ./XPCServices/*.xpc" % (sys.argv0))
- sys.exit(1)
-
- signing_identity = sys.argv1
- executables = sys.argv2:
-
- for executable in executables:
- parent, child = os.path.split(executable)
- service_name = os.path.splitext(child)0
- entitlements_path = os.path.join(parent, service_name + ".entitlements")
- codesign_service(service_name, signing_identity, executable, None if not os.path.exists(entitlements_path) else entitlements_path)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents/Info.plist Deleted

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>org.sparkle-project.Downloader</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.Downloader</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>org.sparkle-project.Downloader</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10B61</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18B71</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1010</string>
-	<key>DTXcodeBuild</key>
-	<string>10B61</string>
-	<key>NSAppTransportSecurity</key>
-	<dict>
-		<key>NSAllowsArbitraryLoads</key>
-		<false/>
-	</dict>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
-	<key>XPCService</key>
-	<dict>
-		<key>RunLoopType</key>
-		<string>NSRunLoop</string>
-		<key>ServiceType</key>
-		<string>Application</string>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.Downloader.xpc/Contents/_CodeSignature/CodeResources Deleted

@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict/>
-	<key>files2</key>
-	<dict/>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^^/+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents/Info.plist Deleted

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>org.sparkle-project.InstallerConnection</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.InstallerConnection</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>org.sparkle-project.InstallerConnection</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10B61</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18B71</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1010</string>
-	<key>DTXcodeBuild</key>
-	<string>10B61</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
-	<key>XPCService</key>
-	<dict>
-		<key>ServiceType</key>
-		<string>Application</string>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents/MacOS/org.sparkle-project.InstallerConnection Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerConnection.xpc/Contents/_CodeSignature/CodeResources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/Info.plist Deleted

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>org.sparkle-project.InstallerLauncher</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.InstallerLauncher</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>org.sparkle-project.InstallerLauncher</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10B61</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18B71</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1010</string>
-	<key>DTXcodeBuild</key>
-	<string>10B61</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
-	<key>XPCService</key>
-	<dict>
-		<key>JoinExistingSession</key>
-		<true/>
-		<key>ServiceType</key>
-		<string>Application</string>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Autoupdate Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Info.plist Deleted

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>Updater</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.Sparkle.Updater</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Updater</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10B61</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18B71</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1010</string>
-	<key>DTXcodeBuild</key>
-	<string>10B61</string>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.9</string>
-	<key>LSUIElement</key>
-	<string>1</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/MacOS/Updater Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/PkgInfo Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/SUStatus.nib Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ar.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ar.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ca.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ca.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/cs.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/cs.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/da.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/da.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/de.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/de.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/el.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/el.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/en.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/en.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/es.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/es.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fi.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fi.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/fr_CA.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/he.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/he.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/is.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/is.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/it.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/it.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ja.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ja.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ko.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ko.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/nb.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/nb.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/nl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/nl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt_BR.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt_BR.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt_PT.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/pt_PT.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ro.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ro.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ru.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/ru.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sl.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sl.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sv.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/sv.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/th.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/th.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/tr.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/tr.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/uk.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/uk.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/zh_CN.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/zh_CN.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/zh_TW.lproj Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/Resources/zh_TW.lproj/Sparkle.strings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/_CodeSignature/CodeResources Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerLauncher.xpc/Contents/_CodeSignature/CodeResources Deleted

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict/>
-	<key>files2</key>
-	<dict>
-		<key>MacOS/Autoupdate</key>
-		<dict>
-			<key>cdhash</key>
-			<data>
-			6r9yO3FL6iqQJgfQRO0aSFSDIas=
-			</data>
-			<key>requirement</key>
-			<string>identifier Autoupdate and anchor apple generic and certificate 1field.1.2.840.113635.100.6.2.6 /* exists */ and certificate leaffield.1.2.840.113635.100.6.1.13 /* exists */ and certificate leafsubject.OU = "5X9DE89KYV"</string>
-		</dict>
-		<key>MacOS/Updater.app</key>
-		<dict>
-			<key>cdhash</key>
-			<data>
-			Ze8Wj/J9L0C9wuYWk32SlzQ2NLI=
-			</data>
-			<key>requirement</key>
-			<string>identifier "org.sparkle-project.Sparkle.Updater" and anchor apple generic and certificate 1field.1.2.840.113635.100.6.2.6 /* exists */ and certificate leaffield.1.2.840.113635.100.6.1.13 /* exists */ and certificate leafsubject.OU = "5X9DE89KYV"</string>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^Resources/</key>
-		<true/>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^Resources/.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^Resources/.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Resources/Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^^/+$</key>
-		<dict>
-			<key>nested</key>
-			<true/>
-			<key>weight</key>
-			<real>10</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc/Contents Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc/Contents/Info.plist Deleted

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildMachineOSBuild</key>
-	<string>18E205e</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>org.sparkle-project.InstallerStatus</string>
-	<key>CFBundleIdentifier</key>
-	<string>org.sparkle-project.InstallerStatus</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>org.sparkle-project.InstallerStatus</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.20.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleSupportedPlatforms</key>
-	<array>
-		<string>MacOSX</string>
-	</array>
-	<key>CFBundleVersion</key>
-	<string>1.20.0</string>
-	<key>DTCompiler</key>
-	<string>com.apple.compilers.llvm.clang.1_0</string>
-	<key>DTPlatformBuild</key>
-	<string>10B61</string>
-	<key>DTPlatformVersion</key>
-	<string>GM</string>
-	<key>DTSDKBuild</key>
-	<string>18B71</string>
-	<key>DTSDKName</key>
-	<string>macosx10.14</string>
-	<key>DTXcode</key>
-	<string>1010</string>
-	<key>DTXcodeBuild</key>
-	<string>10B61</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
-	<key>XPCService</key>
-	<dict>
-		<key>ServiceType</key>
-		<string>Application</string>
-	</dict>
-</dict>
-</plist>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc/Contents/MacOS Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc/Contents/MacOS/org.sparkle-project.InstallerStatus Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Sparkle/org.sparkle-project.InstallerStatus.xpc/Contents/_CodeSignature Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/archive.plist Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/PictureSettings.strings Deleted

@@ -1,87 +0,0 @@
-/* Class = "NSWindow"; title = "Picture"; ObjectID = "5"; */
-"5.title" = "Bild";
-
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "17"; */
-"17.title" = "Automatisch";
-
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "18"; */
-"18.title" = "Eigene:";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "134"; */
-"134.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "Off"; ObjectID = "135"; */
-"135.title" = "Aus";
-
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "136"; */
-"136.title" = "Auto";
-
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "137"; */
-"137.title" = "Loose";
-
-/* Class = "NSTextFieldCell"; title = "Height:"; ObjectID = "166"; */
-"166.title" = "Höhe:";
-
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "170"; */
-"170.title" = "Bildformat erhalten";
-
-/* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "172"; */
-"172.title" = "Breite:";
-
-/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "174"; */
-"174.title" = "Anamorphisch:";
-
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "178"; */
-"178.title" = "Radio";
-
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "383"; */
-"383.title" = "Beschneiden:";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "386"; */
-"386.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "387"; */
-"387.title" = "16";
-
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "388"; */
-"388.title" = "8";
-
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "389"; */
-"389.title" = "4";
-
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "391"; */
-"391.title" = "Modulus:";
-
-/* Class = "NSTextFieldCell"; title = "Display Width:"; ObjectID = "403"; */
-"403.title" = "Anzeigebreite:";
-
-/* Class = "NSBox"; title = "Box"; ObjectID = "436"; */
-"436.title" = "Box";
-
-/* Class = "NSTextFieldCell"; title = "PAR Width:"; ObjectID = "445"; */
-"445.title" = "AR-Breite:";
-
-/* Class = "NSTextFieldCell"; title = "PAR Height:"; ObjectID = "447"; */
-"447.title" = "PAR-Höhe:";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ABP-Q9-NDw"; */
-"ABP-Q9-NDw.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "NSTextFieldCell"; title = "Nothing to inspect"; ObjectID = "buq-K6-Wvy"; */
-"buq-K6-Wvy.title" = "Nichts zu inspizieren";
-
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "Fx1-DI-r18"; */
-"Fx1-DI-r18.title" = "2";
-
-/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Gsa-Ti-xiw"; */
-"Gsa-Ti-xiw.title" = "Eigene";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "lou-1C-A2w"; */
-"lou-1C-A2w.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "nVf-lw-Tr1"; */
-"nVf-lw-Tr1.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ste-Ks-OLX"; */
-"ste-Ks-OLX.ibShadowedIsNilPlaceholder" = "0";
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/PictureSettings.strings Deleted

@@ -1,87 +0,0 @@
-/* Class = "NSWindow"; title = "Picture"; ObjectID = "5"; */
-"5.title" = "Image";
-
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "17"; */
-"17.title" = "Automatique";
-
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "18"; */
-"18.title" = "Personnalisé :";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "134"; */
-"134.title" = "AutresVues";
-
-/* Class = "NSMenuItem"; title = "Off"; ObjectID = "135"; */
-"135.title" = "Off";
-
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "136"; */
-"136.title" = "Auto";
-
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "137"; */
-"137.title" = "Perte";
-
-/* Class = "NSTextFieldCell"; title = "Height:"; ObjectID = "166"; */
-"166.title" = "Hauteur :";
-
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "170"; */
-"170.title" = "Conserver le ratio d'aspect";
-
-/* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "172"; */
-"172.title" = "Largeur :";
-
-/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "174"; */
-"174.title" = "Anamorphique :";
-
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "178"; */
-"178.title" = "Radio";
-
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "383"; */
-"383.title" = "Recadrage :";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "386"; */
-"386.title" = "AutresVues";
-
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "387"; */
-"387.title" = "16";
-
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "388"; */
-"388.title" = "8";
-
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "389"; */
-"389.title" = "4";
-
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "391"; */
-"391.title" = "Module :";
-
-/* Class = "NSTextFieldCell"; title = "Display Width:"; ObjectID = "403"; */
-"403.title" = "Largeur d'affichage :";
-
-/* Class = "NSBox"; title = "Box"; ObjectID = "436"; */
-"436.title" = "Boîte";
-
-/* Class = "NSTextFieldCell"; title = "PAR Width:"; ObjectID = "445"; */
-"445.title" = "Largeur PAR :";
-
-/* Class = "NSTextFieldCell"; title = "PAR Height:"; ObjectID = "447"; */
-"447.title" = "Hauteur PAR :";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ABP-Q9-NDw"; */
-"ABP-Q9-NDw.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "NSTextFieldCell"; title = "Nothing to inspect"; ObjectID = "buq-K6-Wvy"; */
-"buq-K6-Wvy.title" = "Rien à inspecter";
-
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "Fx1-DI-r18"; */
-"Fx1-DI-r18.title" = "2";
-
-/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Gsa-Ti-xiw"; */
-"Gsa-Ti-xiw.title" = "Personnaliser";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "lou-1C-A2w"; */
-"lou-1C-A2w.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "nVf-lw-Tr1"; */
-"nVf-lw-Tr1.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ste-Ks-OLX"; */
-"ste-Ks-OLX.ibShadowedIsNilPlaceholder" = "0";
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/PictureSettings.strings Deleted

@@ -1,87 +0,0 @@
-/* Class = "NSWindow"; title = "Picture"; ObjectID = "5"; */
-"5.title" = "Immagine";
-
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "17"; */
-"17.title" = "Automatico";
-
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "18"; */
-"18.title" = "Personalizzato:";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "134"; */
-"134.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "Off"; ObjectID = "135"; */
-"135.title" = "Spento";
-
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "136"; */
-"136.title" = "Auto";
-
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "137"; */
-"137.title" = "Sciolto";
-
-/* Class = "NSTextFieldCell"; title = "Height:"; ObjectID = "166"; */
-"166.title" = "Altezza:";
-
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "170"; */
-"170.title" = "Mantieni rapporto dimensioni";
-
-/* Class = "NSTextFieldCell"; title = "Width:"; ObjectID = "172"; */
-"172.title" = "Larghezza:";
-
-/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "174"; */
-"174.title" = "Anamorfico:";
-
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "178"; */
-"178.title" = "Radio";
-
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "383"; */
-"383.title" = "Ritaglio:";
-
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "386"; */
-"386.title" = "OtherViews";
-
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "387"; */
-"387.title" = "16";
-
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "388"; */
-"388.title" = "8";
-
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "389"; */
-"389.title" = "4";
-
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "391"; */
-"391.title" = "Modulo:";
-
-/* Class = "NSTextFieldCell"; title = "Display Width:"; ObjectID = "403"; */
-"403.title" = "Larghezza Visualizzata:";
-
-/* Class = "NSBox"; title = "Box"; ObjectID = "436"; */
-"436.title" = "Box";
-
-/* Class = "NSTextFieldCell"; title = "PAR Width:"; ObjectID = "445"; */
-"445.title" = "Larghezza PAR:";
-
-/* Class = "NSTextFieldCell"; title = "PAR Height:"; ObjectID = "447"; */
-"447.title" = "Altezza PAR:";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ABP-Q9-NDw"; */
-"ABP-Q9-NDw.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "NSTextFieldCell"; title = "Nothing to inspect"; ObjectID = "buq-K6-Wvy"; */
-"buq-K6-Wvy.title" = "Nulla da ispezionare";
-
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "Fx1-DI-r18"; */
-"Fx1-DI-r18.title" = "2";
-
-/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Gsa-Ti-xiw"; */
-"Gsa-Ti-xiw.title" = "Personalizzato";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "lou-1C-A2w"; */
-"lou-1C-A2w.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "nVf-lw-Tr1"; */
-"nVf-lw-Tr1.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ste-Ks-OLX"; */
-"ste-Ks-OLX.ibShadowedIsNilPlaceholder" = "0";
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/xcconfig/base/os.osx1011.xcconfig Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/xcconfig/osx1011.x86_64.xcconfig Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/variant/darwin.rules Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/flatpak/fr.handbrake.plugin.IntelMediaSDK.json Deleted

@@ -1,130 +0,0 @@
-{
-    "app-id": "fr.handbrake.plugin.IntelMediaSDK",
-    "branch": "1",
-    "runtime": "fr.handbrake.ghb",
-    "runtime-version": "development",
-    "sdk": "org.gnome.Sdk//3.34",
-    "build-extension": true,
-    "separate-locales": false,
-    "appstream-compose": false,
-    "modules": 
-        {
-            "name": "libdrm",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://dri.freedesktop.org/libdrm/libdrm-2.4.99.tar.gz",
-                    "sha256": "597fb879e2f45193431a0d352d10cd79ef61a24ab31f44320168583e10cb6302"
-                }
-            ,
-            "no-autogen": true,
-            "config-opts": ,
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK"
-            }
-        },
-        {
-            "name": "intel-gmmlib",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://github.com/intel/gmmlib/archive/intel-gmmlib-19.2.3.tar.gz",
-                    "sha256": "60944d54a4992553f92d71ba9f8f4191d297407b564b0f24e9912b415689582e"
-                }
-            ,
-            "buildsystem": "cmake",
-            "builddir": true,
-            "config-opts": 
-                "-DCMAKE_BUILD_TYPE=Release"
-            ,
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK",
-                "make-args": 
-                    "VERBOSE=1"
-                ,
-                "make-install-args": 
-                    "VERBOSE=1"
-                
-            }
-        },
-        {
-            "name": "libva",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://github.com/intel/libva/releases/download/2.5.0/libva-2.5.0.tar.bz2",
-                    "sha256": "3aa89cd369a506ac4dbe5de7c0ef5da4f3d220bf986403f02fa1f6f702af6878"
-                }
-            ,
-            "no-autogen": true,
-            "config-opts": "--with-drivers-path=/app/extensions/IntelMediaSDK/lib/dri",
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK"
-            }
-        },
-        {
-            "name": "libva-utils",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://github.com/intel/libva-utils/releases/download/2.5.0/libva-utils-2.5.0.tar.bz2",
-                    "sha256": "9238c9d5110d60f935683390b8383fdac3507346384cd5f117a23c6db1d72a17"
-                }
-            ,
-            "no-autogen": true,
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK",
-                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
-            }
-        },
-        {
-            "name": "intel-media-driver",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://github.com/intel/media-driver/archive/intel-media-19.2.1.tar.gz",
-                    "sha256": "79279c991d918deaa52239dac55787b9c7562e520cd58744171b468d28b8af40"
-                },
-                {
-                    "type": "patch",
-                    "path": "patch/intel-media-driver-implicit-function-decl-error.patch"
-                }
-            ,
-            "buildsystem": "cmake",
-            "builddir": true,
-            "config-opts": 
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DMEDIA_RUN_TEST_SUITE=OFF"
-            ,
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK",
-                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
-            }
-        },
-        {
-            "name": "mediasdk",
-            "sources": 
-                {
-                    "type": "archive",
-                    "url": "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-19.2.1.tar.gz",
-                    "sha256": "03c11a0379b61e292e789fa3dc9308ce45f36d68b4ebf437806c0e2c32357970"
-                }
-            ,
-            "buildsystem": "cmake",
-            "builddir": true,
-            "config-opts": 
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DBUILD_SAMPLES=OFF",
-                "-DBUILD_TESTS=OFF",
-                "-DBUILD_TOOLS=OFF",
-                "-DBUILD_TESTS=OFF",
-                "-DMFX_ENABLE_SW_FALLBACK=OFF"
-            ,
-            "build-options": {
-                "prefix" : "/app/extensions/IntelMediaSDK",
-                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
-            }
-        }
-    
-}
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/flatpak/patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/flatpak/patch/intel-media-driver-implicit-function-decl-error.patch Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/fakexcode.cpp Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/fr.handbrake.HandBrakeCLI.appdata.xml.template Deleted

@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<component type="console-application">
- <id>fr.handbrake.HandBrakeCLI</id>
- <metadata_license>CC0</metadata_license>
- <project_license>GPL-2.0+</project_license>
- <name>HandBrakeCLI</name>
- <summary>Video Transcoder</summary>
-
- <description>
- 
- HandBrake is a tool for converting video from nearly any format to a
- selection of modern, widely supported codecs.
- 
- Reasons you'll love Handbrake:
- <ul>
- <li>Convert video from nearly any format</li>
- <li>Free and Open Source</li>
- <li>Multi-Platform (Windows, Mac and Linux)</li>
- </ul>
- </description>
-
- <url type="homepage">https://handbrake.fr/</url>
- <url type="help">https://handbrake.fr/docs/</url>
- <url type="bugtracker">https://github.com/HandBrake/HandBrake/issues</url>
- <mimetypes>
- <mimetype>application/ogg</mimetype>
- <mimetype>application/x-extension-mp4</mimetype>
- <mimetype>application/x-flac</mimetype>
- <mimetype>application/x-matroska</mimetype>
- <mimetype>application/x-ogg</mimetype>
- <mimetype>audio/ac3</mimetype>
- <mimetype>audio/mp4</mimetype>
- <mimetype>audio/mpeg</mimetype>
- <mimetype>audio/ogg</mimetype>
- <mimetype>audio/x-flac</mimetype>
- <mimetype>audio/x-matroska</mimetype>
- <mimetype>audio/x-mp3</mimetype>
- <mimetype>audio/x-mpeg</mimetype>
- <mimetype>audio/x-vorbis</mimetype>
- <mimetype>video/mp4</mimetype>
- <mimetype>video/mp4v-es</mimetype>
- <mimetype>video/mpeg</mimetype>
- <mimetype>video/msvideo</mimetype>
- <mimetype>video/quicktime</mimetype>
- <mimetype>video/vnd.divx</mimetype>
- <mimetype>video/x-avi</mimetype>
- <mimetype>video/x-m4v</mimetype>
- <mimetype>video/x-matroska</mimetype>
- <mimetype>video/x-mpeg</mimetype>
- <mimetype>video/ogg</mimetype>
- <mimetype>video/x-ogm+ogg</mimetype>
- <mimetype>video/x-theora+ogg</mimetype>
- <mimetype>x-content/video-dvd</mimetype>
- <mimetype>x-content/video-vcd</mimetype>
- <mimetype>x-content/video-svcd</mimetype>
- </mimetypes>
-
- <provides>
- <binary>HandBrakeCLI</binary>
- </provides>
-
- <releases>
- RELEASE_TAG
- </releases>
-
- <content_rating type="oars-1.1">
- <content_attribute id="violence-cartoon">none</content_attribute>
- <content_attribute id="violence-fantasy">none</content_attribute>
- <content_attribute id="violence-realistic">none</content_attribute>
- <content_attribute id="violence-bloodshed">none</content_attribute>
- <content_attribute id="violence-sexual">none</content_attribute>
- <content_attribute id="violence-desecration">none</content_attribute>
- <content_attribute id="violence-slavery">none</content_attribute>
- <content_attribute id="violence-worship">none</content_attribute>
- <content_attribute id="drugs-alcohol">none</content_attribute>
- <content_attribute id="drugs-narcotics">none</content_attribute>
- <content_attribute id="drugs-tobacco">none</content_attribute>
- <content_attribute id="sex-nudity">none</content_attribute>
- <content_attribute id="sex-themes">none</content_attribute>
- <content_attribute id="sex-homosexuality">none</content_attribute>
- <content_attribute id="sex-prostitution">none</content_attribute>
- <content_attribute id="sex-adultery">none</content_attribute>
- <content_attribute id="sex-appearance">none</content_attribute>
- <content_attribute id="language-profanity">none</content_attribute>
- <content_attribute id="language-humor">none</content_attribute>
- <content_attribute id="language-discrimination">none</content_attribute>
- <content_attribute id="social-chat">none</content_attribute>
- <content_attribute id="social-info">none</content_attribute>
- <content_attribute id="social-audio">none</content_attribute>
- <content_attribute id="social-location">none</content_attribute>
- <content_attribute id="social-contacts">none</content_attribute>
- <content_attribute id="money-purchasing">none</content_attribute>
- <content_attribute id="money-gambling">none</content_attribute>
- </content_rating>
-
-</component>
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/HandBrake.Interop.nuspec Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/EventArgs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeCompletedEventArgs.cs Deleted

@@ -1,35 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the EncodeCompletedEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.EventArgs
-{
- using System;
-
- /// <summary>
- /// Encode Completed Event Args
- /// </summary>
- public class EncodeCompletedEventArgs : EventArgs
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="EncodeCompletedEventArgs"/> class.
- /// </summary>
- /// <param name="error">
- /// The error.
- /// </param>
- public EncodeCompletedEventArgs(bool error)
- {
- this.Error = error;
- }
-
- /// <summary>
- /// Gets a value indicating whether an error occurred during the encode.
- /// </summary>
- public bool Error { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/EventArgs/EncodeProgressEventArgs.cs Deleted

@@ -1,120 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the EncodeProgressEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.EventArgs
-{
- using System;
-
- /// <summary>s
- /// Encode Progress Event Args
- /// </summary>
- public class EncodeProgressEventArgs : EventArgs
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="EncodeProgressEventArgs"/> class.
- /// </summary>
- /// <param name="fractionComplete">
- /// The fraction complete.
- /// </param>
- /// <param name="currentFrameRate">
- /// The current frame rate.
- /// </param>
- /// <param name="averageFrameRate">
- /// The average frame rate.
- /// </param>
- /// <param name="estimatedTimeLeft">
- /// The estimated time left.
- /// </param>
- /// <param name="passId">
- /// The pass id.
- /// </param>
- /// <param name="pass">
- /// The pass.
- /// </param>
- /// <param name="passCount">
- /// The pass count.
- /// </param>
- /// <param name="stateCode">
- /// The code for the state the encode process is in.
- /// </param>
- public EncodeProgressEventArgs(double fractionComplete, double currentFrameRate, double averageFrameRate, TimeSpan estimatedTimeLeft, int passId, int pass, int passCount, string stateCode)
- {
- this.FractionComplete = fractionComplete;
- this.CurrentFrameRate = currentFrameRate;
- this.AverageFrameRate = averageFrameRate;
- this.EstimatedTimeLeft = estimatedTimeLeft;
- this.PassId = passId;
- this.Pass = pass;
- this.PassCount = passCount;
- this.StateCode = stateCode;
- }
-
- /// <summary>
- /// Gets the % Complete.
- /// </summary>
- public double FractionComplete { get; private set; }
-
- /// <summary>
- /// Gets the Current FrameRate.
- /// </summary>
- public double CurrentFrameRate { get; private set; }
-
- /// <summary>
- /// Gets the Average FrameRate.
- /// </summary>
- public double AverageFrameRate { get; private set; }
-
- /// <summary>
- /// Gets the Estimated Time Left.
- /// </summary>
- public TimeSpan EstimatedTimeLeft { get; private set; }
-
- /// <summary>
- /// Gets the pass ID.
- /// </summary>
- /// <remarks>
- /// -1: Subtitle scan
- /// 0: Encode
- /// 1: Encode first pass
- /// 2: Encode second pass
- /// </remarks>
- public int PassId { get; private set; }
-
- /// <summary>
- /// Gets the current encoding pass. (1-based)
- /// </summary>
- public int Pass { get; private set; }
-
- /// <summary>
- /// Gets the pass count.
- /// </summary>
- public int PassCount { get; private set; }
-
- /// <summary>
- /// Gets the state code of the encode process.
- /// </summary>
- public string StateCode { get; }
-
- /// <summary>
- /// Gets a value indicating that we are doing a subtitle scan pass.
- /// </summary>
- public bool IsSubtitleScan
- {
- get
- {
- if (this.PassId == -1)
- {
- return true;
- }
-
- return false;
- }
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/EventArgs/MessageLoggedEventArgs.cs Deleted

@@ -1,35 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MessageLoggedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the MessageLoggedEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.EventArgs
-{
- using System;
-
- /// <summary>
- /// The Message Logged Event Args
- /// </summary>
- public class MessageLoggedEventArgs : EventArgs
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="MessageLoggedEventArgs"/> class.
- /// </summary>
- /// <param name="message">
- /// The message.
- /// </param>
- public MessageLoggedEventArgs(string message)
- {
- this.Message = message;
- }
-
- /// <summary>
- /// Gets the Message.
- /// </summary>
- public string Message { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/EventArgs/ScanProgressEventArgs.cs Deleted

@@ -1,71 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the ScanProgressEventArgs type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.EventArgs
-{
- using System;
-
- /// <summary>
- /// The Scan Progress Event Args
- /// </summary>
- public class ScanProgressEventArgs : EventArgs
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="ScanProgressEventArgs"/> class.
- /// </summary>
- /// <param name="progress">
- /// The progress.
- /// </param>
- /// <param name="currentPreview">
- /// The current preview.
- /// </param>
- /// <param name="previews">
- /// The previews.
- /// </param>
- /// <param name="currentTitle">
- /// The current title.
- /// </param>
- /// <param name="titles">
- /// The titles.
- /// </param>
- public ScanProgressEventArgs(double progress, int currentPreview, int previews, int currentTitle, int titles)
- {
- this.Progress = progress;
- this.CurrentPreview = currentPreview;
- this.Previews = previews;
- this.CurrentTitle = currentTitle;
- this.Titles = titles;
- }
-
- /// <summary>
- /// Gets the total progress fraction for the scan.
- /// </summary>
- public double Progress { get; private set; }
-
- /// <summary>
- /// Gets the current preview being processed on the scan.
- /// </summary>
- public int CurrentPreview { get; private set; }
-
- /// <summary>
- /// Gets the total number of previews to process.
- /// </summary>
- public int Previews { get; private set; }
-
- /// <summary>
- /// Gets the current title being processed on the scan.
- /// </summary>
- public int CurrentTitle { get; private set; }
-
- /// <summary>
- /// Gets the total number of titles to process.
- /// </summary>
- public int Titles { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Factories Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Factories/AnamorphicFactory.cs Deleted

@@ -1,94 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AnamorphicFactory.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The Anamorphic factory.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Factories
-{
- using System.Collections.Generic;
-
- using HandBrake.Interop.Interop.Json.Anamorphic;
- using HandBrake.Interop.Interop.Json.Shared;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Model.Preview;
-
- /// <summary>
- /// The anamorphic factory.
- /// </summary>
- public class AnamorphicFactory
- {
- /// <summary>
- /// The keep setting.
- /// </summary>
- public enum KeepSetting
- {
- HB_KEEP_WIDTH = 0x01, 
- HB_KEEP_HEIGHT = 0x02, 
- HB_KEEP_DISPLAY_ASPECT = 0x04
- }
-
- /// <summary>
- /// Finds output geometry for the given preview settings and title.
- /// </summary>
- /// <param name="settings">
- /// The preview settings.
- /// </param>
- /// <param name="title">
- /// Information on the title to consider.
- /// </param>
- /// <returns>
- /// Geometry Information
- /// </returns>
- public static Geometry CreateGeometry(PreviewSettings settings, SourceVideoInfo title)
- {
- int settingMode = settings.KeepDisplayAspect ? 0x04 : 0;
-
- // Sanitize the Geometry First.
- AnamorphicGeometry anamorphicGeometry = new AnamorphicGeometry
- {
- SourceGeometry = new Geometry
- {
- Width = title.Resolution.Width, 
- Height = title.Resolution.Height, 
- PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height }
- }, 
- DestSettings = new DestSettings
- {
- AnamorphicMode = (int)settings.Anamorphic, 
- Geometry =
- {
- Width = settings.Width, 
- Height = settings.Height, 
- PAR = new PAR
- {
- Num = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Width : settings.PixelAspectX, 
- Den = settings.Anamorphic != Anamorphic.Custom ? title.ParVal.Height : settings.PixelAspectY, 
- }
- }, 
- Keep = settingMode, 
- Crop = new List<int> { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right }, 
- Modulus = settings.Modulus ?? 16, 
- MaxWidth = settings.MaxWidth, 
- MaxHeight = settings.MaxHeight, 
- ItuPAR = false
- }
- };
-
- if (settings.Anamorphic == Anamorphic.Custom)
- {
- anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = settings.PixelAspectX, Den = settings.PixelAspectY };
- }
- else
- {
- anamorphicGeometry.DestSettings.Geometry.PAR = new PAR { Num = title.ParVal.Width, Den = title.ParVal.Height };
- }
-
- return HandBrakeUtils.GetAnamorphicSize(anamorphicGeometry);
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/Wrappers Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/Wrappers/HbFunctionsDirect.cs Deleted

@@ -1,501 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IHbFunctions.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// An interface to access the native libhb functions without using static methods.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.HbLib.Wrappers
-{
- using System;
- using System.Runtime.InteropServices;
-
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
-
- public class HbFunctionsDirect : IHbFunctions
- {
- public void hb_register_logger(LoggingCallback callback)
- {
- HBFunctions.hb_register_logger(callback);
- }
-
- public void hb_register_error_handler(LoggingCallback callback)
- {
- HBFunctions.hb_register_error_handler(callback);
- }
-
- public int hb_global_init()
- {
- return HBFunctions.hb_global_init();
- }
-
- public int hb_global_init_no_hardware()
- {
- return HBFunctions.hb_global_init_no_hardware();
- }
-
- public IntPtr hb_init(int verbose, int update_check)
- {
- return HBFunctions.hb_init(verbose, update_check);
- }
-
- public IntPtr hb_init_dl(int verbose, int update_check)
- {
- return HBFunctions.hb_init_dl(verbose, update_check);
- }
-
- public IntPtr hb_get_version(IntPtr hbHandle)
- {
- return HBFunctions.hb_get_version(hbHandle);
- }
-
- public int hb_get_build(IntPtr hbHandle)
- {
- return HBFunctions.hb_get_build(hbHandle);
- }
-
- public IntPtr hb_dvd_name(IntPtr path)
- {
- return HBFunctions.hb_dvd_name(path);
- }
-
- public void hb_dvd_set_dvdnav(int enable)
- {
- HBFunctions.hb_dvd_set_dvdnav(enable);
- }
-
- public void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration)
- {
- HBFunctions.hb_scan(hbHandle, path, title_index, preview_count, store_previews, min_duration);
- }
-
- public void hb_scan_stop(IntPtr hbHandle)
- {
- HBFunctions.hb_scan_stop(hbHandle);
- }
-
- public IntPtr hb_get_titles(IntPtr hbHandle)
- {
- return HBFunctions.hb_get_titles(hbHandle);
- }
-
- public void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result)
- {
- HBFunctions.hb_set_anamorphic_size2(ref sourceGeometry, ref uiGeometry, ref result);
- }
-
- public int hb_count(IntPtr hbHandle)
- {
- return HBFunctions.hb_count(hbHandle);
- }
-
- public IntPtr hb_job(IntPtr hbHandle, int jobIndex)
- {
- return HBFunctions.hb_job(hbHandle, jobIndex);
- }
-
- public void hb_rem(IntPtr hbHandle, IntPtr job)
- {
- HBFunctions.hb_rem(hbHandle, job);
- }
-
- public void hb_start(IntPtr hbHandle)
- {
- HBFunctions.hb_start(hbHandle);
- }
-
- public void hb_pause(IntPtr hbHandle)
- {
- HBFunctions.hb_pause(hbHandle);
- }
-
- public void hb_resume(IntPtr hbHandle)
- {
- HBFunctions.hb_resume(hbHandle);
- }
-
- public void hb_stop(IntPtr hbHandle)
- {
- HBFunctions.hb_stop(hbHandle);
- }
-
- public void hb_close(IntPtr hbHandle)
- {
- HBFunctions.hb_close(hbHandle);
- }
-
- public void hb_global_close()
- {
- HBFunctions.hb_global_close();
- }
-
- public IntPtr hb_list_init()
- {
- return HBFunctions.hb_list_init();
- }
-
- public int hb_list_count(IntPtr listPtr)
- {
- return HBFunctions.hb_list_count(listPtr);
- }
-
- public void hb_list_add(IntPtr listPtr, IntPtr item)
- {
- HBFunctions.hb_list_add(listPtr, item);
- }
-
- public void hb_list_insert(IntPtr listPtr, int pos, IntPtr item)
- {
- HBFunctions.hb_list_insert(listPtr, pos, item);
- }
-
- public void hb_list_rem(IntPtr listPtr, IntPtr item)
- {
- HBFunctions.hb_list_rem(listPtr, item);
- }
-
- public IntPtr hb_list_item(IntPtr listPtr, int itemIndex)
- {
- return HBFunctions.hb_list_item(listPtr, itemIndex);
- }
-
- public void hb_list_close(IntPtr listPtrPtr)
- {
- HBFunctions.hb_list_close(listPtrPtr);
- }
-
- public int hb_subtitle_can_force(int source)
- {
- return HBFunctions.hb_subtitle_can_force(source);
- }
-
- public int hb_subtitle_can_burn(int source)
- {
- return HBFunctions.hb_subtitle_can_burn(source);
- }
-
- public int hb_subtitle_can_pass(int source, int mux)
- {
- return HBFunctions.hb_subtitle_can_pass(source, mux);
- }
-
- public int hb_video_framerate_get_from_name(IntPtr name)
- {
- return HBFunctions.hb_video_framerate_get_from_name(name);
- }
-
- public IntPtr hb_video_framerate_get_next(IntPtr last)
- {
- return HBFunctions.hb_video_framerate_get_next(last);
- }
-
- public IntPtr hb_audio_samplerate_get_next(IntPtr last)
- {
- return HBFunctions.hb_audio_samplerate_get_next(last);
- }
-
- public int hb_audio_samplerate_find_closest(int samplerate, uint codec)
- {
- return HBFunctions.hb_audio_samplerate_find_closest(samplerate, codec);
- }
-
- public int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown)
- {
- return HBFunctions.hb_audio_bitrate_get_best(codec, bitrate, samplerate, mixdown);
- }
-
- public int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown)
- {
- return HBFunctions.hb_audio_bitrate_get_default(codec, samplerate, mixdown);
- }
-
- public int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high)
- {
- return HBFunctions.hb_audio_bitrate_get_limits(codec, samplerate, mixdown, ref low, ref high);
- }
-
- public IntPtr hb_audio_bitrate_get_next(IntPtr last)
- {
- return HBFunctions.hb_audio_bitrate_get_next(last);
- }
-
- public void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction)
- {
- HBFunctions.hb_video_quality_get_limits(codec, ref low, ref high, ref granularity, ref direction);
- }
-
- public IntPtr hb_video_quality_get_name(uint codec)
- {
- return HBFunctions.hb_video_quality_get_name(codec);
- }
-
- public void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction)
- {
- HBFunctions.hb_audio_quality_get_limits(codec, ref low, ref high, ref granularity, ref direction);
- }
-
- public float hb_audio_quality_get_default(uint codec)
- {
- return HBFunctions.hb_audio_quality_get_default(codec);
- }
-
- public void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction)
- {
- HBFunctions.hb_audio_compression_get_limits(codec, ref low, ref high, ref granularity, ref direction);
- }
-
- public float hb_audio_compression_get_default(uint codec)
- {
- return HBFunctions.hb_audio_compression_get_default(codec);
- }
-
- public int hb_audio_can_apply_drc2(IntPtr handle, int title_index, int audio_index, int encoder)
- {
- return HBFunctions.hb_audio_can_apply_drc2(handle, title_index, audio_index, encoder);
- }
-
- public int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout)
- {
- return HBFunctions.hb_mixdown_is_supported(mixdown, codec, layout);
- }
-
- public int hb_mixdown_has_codec_support(int mixdown, uint codec)
- {
- return HBFunctions.hb_mixdown_has_codec_support(mixdown, codec);
- }
-
- public int hb_mixdown_has_remix_support(int mixdown, ulong layout)
- {
- return HBFunctions.hb_mixdown_has_remix_support(mixdown, layout);
- }
-
- public int hb_mixdown_get_best(uint codec, ulong layout, int mixdown)
- {
- return HBFunctions.hb_mixdown_get_best(codec, layout, mixdown);
- }
-
- public int hb_mixdown_get_default(uint codec, ulong layout)
- {
- return HBFunctions.hb_mixdown_get_default(codec, layout);
- }
-
- public IntPtr hb_mixdown_get_next(IntPtr last)
- {
- return HBFunctions.hb_mixdown_get_next(last);
- }
-
- public IntPtr hb_video_encoder_get_next(IntPtr last)
- {
- return HBFunctions.hb_video_encoder_get_next(last);
- }
-
- public IntPtr hb_audio_encoder_get_next(IntPtr last)
- {
- return HBFunctions.hb_audio_encoder_get_next(last);
- }
-
- public IntPtr hb_container_get_next(IntPtr last)
- {
- return HBFunctions.hb_container_get_next(last);
- }
-
- public IntPtr hb_video_encoder_get_presets(int encoder)
- {
- return HBFunctions.hb_video_encoder_get_presets(encoder);
- }
-
- public IntPtr hb_video_encoder_get_tunes(int encoder)
- {
- return HBFunctions.hb_video_encoder_get_tunes(encoder);
- }
-
- public IntPtr hb_video_encoder_get_profiles(int encoder)
- {
- return HBFunctions.hb_video_encoder_get_profiles(encoder);
- }
-
- public IntPtr hb_video_encoder_get_levels(int encoder)
- {
- return HBFunctions.hb_video_encoder_get_levels(encoder);
- }
-
- public IntPtr lang_get_next(IntPtr last)
- {
- return HBFunctions.lang_get_next(last);
- }
-
- public IntPtr lang_for_code2(In MarshalAs(UnmanagedType.LPStr) string code2)
- {
- return HBFunctions.lang_for_code2(code2);
- }
-
- public void hb_job_close(IntPtr job)
- {
- HBFunctions.hb_job_close(job);
- }
-
- public IntPtr hb_filter_get_keys(int filter_id)
- {
- return HBFunctions.hb_filter_get_keys(filter_id);
- }
-
- public IntPtr hb_x264_encopt_name(IntPtr name)
- {
- return HBFunctions.hb_x264_encopt_name(name);
- }
-
- public int hb_check_h264_level(
- In MarshalAs(UnmanagedType.LPStr) string level,
- int width,
- int height,
- int fps_num,
- int fps_den,
- int interlaced,
- int fake_interlaced)
- {
- return HBFunctions.hb_check_h264_level(
- level,
- width,
- height,
- fps_num,
- fps_den,
- interlaced,
- fake_interlaced);
- }
-
- public IntPtr hb_x264_param_unparse(
- int bit_depth,
- In MarshalAs(UnmanagedType.LPStr) string x264_preset,
- In MarshalAs(UnmanagedType.LPStr) string x264_tune,
- In MarshalAs(UnmanagedType.LPStr) string x264_encopts,
- In MarshalAs(UnmanagedType.LPStr) string x264_profile,
- In MarshalAs(UnmanagedType.LPStr) string h264_level,
- int width,
- int height)
- {
- return HBFunctions.hb_x264_param_unparse(
- bit_depth,
- x264_preset,
- x264_tune,
- x264_encopts,
- x264_profile,
- h264_level,
- width,
- height);
- }
-
- public int hb_qsv_available()
- {
- return HBFunctions.hb_qsv_available();
- }
-
- public int hb_vce_h264_available()
- {
- return HBFunctions.hb_vce_h264_available();
- }
-
- public int hb_vce_h265_available()
- {
- return HBFunctions.hb_vce_h265_available();
- }
-
- public int hb_nvenc_h264_available()
- {
- return HBFunctions.hb_nvenc_h264_available();
- }
-
- public int hb_nvenc_h265_available()
- {
- return HBFunctions.hb_nvenc_h265_available();
- }
-
- public IntPtr hb_get_preview2(IntPtr hbHandle, int title_idx, int preview_idx, ref hb_geometry_settings_s geo, int deinterlace)
- {
- return HBFunctions.hb_get_preview2(hbHandle, title_idx, preview_idx, ref geo, deinterlace);
- }
-
- public IntPtr hb_image_close(IntPtr image)
- {
- return HBFunctions.hb_image_close(image);
- }
-
- /* JSON API */
-
- public IntPtr hb_get_title_set_json(IntPtr hbHandle)
- {
- return HBFunctions.hb_get_title_set_json(hbHandle);
- }
-
- public IntPtr hb_job_init_json(IntPtr hbHandle, int title_index)
- {
- return HBFunctions.hb_job_init_json(hbHandle, title_index);
- }
-
- public IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job)
- {
- return HBFunctions.hb_json_to_job(hbHandle, json_job);
- }
-
- public int hb_add_json(IntPtr hbHandle, IntPtr json_job)
- {
- return HBFunctions.hb_add_json(hbHandle, json_job);
- }
-
- public IntPtr hb_set_anamorphic_size_json(IntPtr json_param)
- {
- return HBFunctions.hb_set_anamorphic_size_json(json_param);
- }
-
- public IntPtr hb_get_state_json(IntPtr hbHandle)
- {
- return HBFunctions.hb_get_state_json(hbHandle);
- }
-
- public IntPtr hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, ref hb_geometry_settings_s settings)
- {
- return HBFunctions.hb_get_preview_params_json(title_idx, preview_idx, deinterlace, ref settings);
- }
-
- public void hb_presets_builtin_init()
- {
- HBFunctions.hb_presets_builtin_init();
- }
-
- public IntPtr hb_presets_builtin_get_json()
- {
- return HBFunctions.hb_presets_builtin_get_json();
- }
-
- public IntPtr hb_presets_read_file_json(IntPtr filename)
- {
- return HBFunctions.hb_presets_read_file_json(filename);
- }
-
- public IntPtr hb_presets_current_version(IntPtr major, IntPtr minor, IntPtr micro)
- {
- return HBFunctions.hb_presets_current_version(major, minor, micro);
- }
-
- public IntPtr hb_generate_filter_settings_json(
- int filter_id,
- In MarshalAs(UnmanagedType.LPStr) string preset,
- In MarshalAs(UnmanagedType.LPStr) string tune,
- In MarshalAs(UnmanagedType.LPStr) string custom)
- {
- return HBFunctions.hb_generate_filter_settings_json(filter_id, preset, tune, custom);
- }
-
- public IntPtr hb_filter_get_presets_json(int filter_id)
- {
- return HBFunctions.hb_filter_get_presets_json(filter_id);
- }
-
- public IntPtr hb_filter_get_tunes_json(int filter_id)
- {
- return HBFunctions.hb_filter_get_tunes_json(filter_id);
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/Wrappers/Interfaces Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/Wrappers/Interfaces/IHbFunctions.cs Deleted

@@ -1,215 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IHbFunctions.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// An interface to access the native libhb functions without using static methods.
-// </summary>
-// <auto-generated> Disable Stylecop Warnings for this file </auto-generated>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces
-{
- using System;
- using System.Runtime.InteropServices;
-
- public interface IHbFunctions
- {
- void hb_register_logger(LoggingCallback callback);
-
- void hb_register_error_handler(LoggingCallback callback);
-
- int hb_global_init();
-
- int hb_global_init_no_hardware();
-
- IntPtr hb_init(int verbose, int update_check);
-
- IntPtr hb_init_dl(int verbose, int update_check);
-
- IntPtr hb_get_version(IntPtr hbHandle);
-
- int hb_get_build(IntPtr hbHandle);
-
- IntPtr hb_dvd_name(IntPtr path);
-
- void hb_dvd_set_dvdnav(int enable);
-
- void hb_scan(IntPtr hbHandle, IntPtr path, int title_index, int preview_count, int store_previews, ulong min_duration);
-
- void hb_scan_stop(IntPtr hbHandle);
-
- IntPtr hb_get_titles(IntPtr hbHandle);
-
- void hb_set_anamorphic_size2(ref hb_geometry_s sourceGeometry, ref hb_geometry_settings_s uiGeometry, ref hb_geometry_s result);
-
- int hb_count(IntPtr hbHandle);
-
- IntPtr hb_job(IntPtr hbHandle, int jobIndex);
-
- void hb_rem(IntPtr hbHandle, IntPtr job);
-
- void hb_start(IntPtr hbHandle);
-
- void hb_pause(IntPtr hbHandle);
-
- void hb_resume(IntPtr hbHandle);
-
- void hb_stop(IntPtr hbHandle);
-
- void hb_close(IntPtr hbHandle);
-
- void hb_global_close();
-
- IntPtr hb_list_init();
-
- int hb_list_count(IntPtr listPtr);
-
- void hb_list_add(IntPtr listPtr, IntPtr item);
-
- void hb_list_insert(IntPtr listPtr, int pos, IntPtr item);
-
- void hb_list_rem(IntPtr listPtr, IntPtr item);
-
- IntPtr hb_list_item(IntPtr listPtr, int itemIndex);
-
- void hb_list_close(IntPtr listPtrPtr);
-
- int hb_subtitle_can_force(int source);
-
- int hb_subtitle_can_burn(int source);
-
- int hb_subtitle_can_pass(int source, int mux);
-
- int hb_video_framerate_get_from_name(IntPtr name);
-
- IntPtr hb_video_framerate_get_next(IntPtr last);
-
- IntPtr hb_audio_samplerate_get_next(IntPtr last);
-
- int hb_audio_samplerate_find_closest(int samplerate, uint codec);
-
- int hb_audio_bitrate_get_best(uint codec, int bitrate, int samplerate, int mixdown);
-
- int hb_audio_bitrate_get_default(uint codec, int samplerate, int mixdown);
-
- int hb_audio_bitrate_get_limits(uint codec, int samplerate, int mixdown, ref int low, ref int high);
-
- IntPtr hb_audio_bitrate_get_next(IntPtr last);
-
- void hb_video_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
- IntPtr hb_video_quality_get_name(uint codec);
-
- void hb_audio_quality_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
- float hb_audio_quality_get_default(uint codec);
-
- void hb_audio_compression_get_limits(uint codec, ref float low, ref float high, ref float granularity, ref int direction);
-
- float hb_audio_compression_get_default(uint codec);
-
- int hb_audio_can_apply_drc2(IntPtr handle, int title_index, int audio_index, int encoder);
-
- int hb_mixdown_is_supported(int mixdown, uint codec, ulong layout);
-
- int hb_mixdown_has_codec_support(int mixdown, uint codec);
-
- int hb_mixdown_has_remix_support(int mixdown, ulong layout);
-
- int hb_mixdown_get_best(uint codec, ulong layout, int mixdown);
-
- int hb_mixdown_get_default(uint codec, ulong layout);
-
- IntPtr hb_mixdown_get_next(IntPtr last);
-
- IntPtr hb_video_encoder_get_next(IntPtr last);
-
- IntPtr hb_audio_encoder_get_next(IntPtr last);
-
- IntPtr hb_container_get_next(IntPtr last);
-
- IntPtr hb_video_encoder_get_presets(int encoder);
-
- IntPtr hb_video_encoder_get_tunes(int encoder);
-
- IntPtr hb_video_encoder_get_profiles(int encoder);
-
- IntPtr hb_video_encoder_get_levels(int encoder);
-
- IntPtr lang_get_next(IntPtr last);
-
- IntPtr lang_for_code2(In MarshalAs(UnmanagedType.LPStr) string code2);
-
- void hb_job_close(IntPtr job);
-
- IntPtr hb_filter_get_keys(int filter_id);
-
- IntPtr hb_x264_encopt_name(IntPtr name);
-
- int hb_check_h264_level(
- In MarshalAs(UnmanagedType.LPStr) string level,
- int width,
- int height,
- int fps_num,
- int fps_den,
- int interlaced,
- int fake_interlaced);
-
- IntPtr hb_x264_param_unparse(
- int bit_depth,
- In MarshalAs(UnmanagedType.LPStr) string x264_preset,
- In MarshalAs(UnmanagedType.LPStr) string x264_tune,
- In MarshalAs(UnmanagedType.LPStr) string x264_encopts,
- In MarshalAs(UnmanagedType.LPStr) string x264_profile,
- In MarshalAs(UnmanagedType.LPStr) string h264_level,
- int width,
- int height);
-
- int hb_qsv_available();
-
- int hb_vce_h264_available();
-
- int hb_vce_h265_available();
-
- int hb_nvenc_h264_available();
-
- int hb_nvenc_h265_available();
-
- IntPtr hb_get_preview2(IntPtr hbHandle, int title_idx, int preview_idx, ref hb_geometry_settings_s geo, int deinterlace);
-
- IntPtr hb_image_close(IntPtr image);
-
- IntPtr hb_get_title_set_json(IntPtr hbHandle);
-
- IntPtr hb_job_init_json(IntPtr hbHandle, int title_index);
-
- IntPtr hb_json_to_job(IntPtr hbHandle, IntPtr json_job);
-
- int hb_add_json(IntPtr hbHandle, IntPtr json_job);
-
- IntPtr hb_set_anamorphic_size_json(IntPtr json_param);
-
- IntPtr hb_get_state_json(IntPtr hbHandle);
-
- IntPtr hb_get_preview_params_json(int title_idx, int preview_idx, int deinterlace, ref hb_geometry_settings_s settings);
-
- void hb_presets_builtin_init();
-
- IntPtr hb_presets_builtin_get_json();
-
- IntPtr hb_presets_read_file_json(IntPtr filename);
-
- IntPtr hb_presets_current_version(IntPtr major, IntPtr minor, IntPtr micro);
-
- IntPtr hb_generate_filter_settings_json(
- int filter_id,
- In MarshalAs(UnmanagedType.LPStr) string preset,
- In MarshalAs(UnmanagedType.LPStr) string tune,
- In MarshalAs(UnmanagedType.LPStr) string custom);
-
- IntPtr hb_filter_get_presets_json(int filter_id);
-
- IntPtr hb_filter_get_tunes_json(int filter_id);
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetCategory.cs Deleted

@@ -1,44 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PresetCategory.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The preset category.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Json.Presets
-{
- using System.Collections.Generic;
-
- /// <summary>
- /// The preset category.
- /// </summary>
- public class PresetCategory
- {
- /// <summary>
- /// Gets or sets the children array.
- /// </summary>
- public List<HBPreset> ChildrenArray { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether folder.
- /// </summary>
- public bool Folder { get; set; }
-
- /// <summary>
- /// Gets or sets the preset name.
- /// </summary>
- public string PresetName { get; set; }
-
- /// <summary>
- /// Description for the preset group.
- /// </summary>
- public string PresetDescription { get; set; }
-
- /// <summary>
- /// Gets or sets the type.
- /// </summary>
- public int Type { get; set; }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/BitrateLimits.cs Deleted

@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="BitrateLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the BitrateLimits type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// Represents bitrate limits as a range.
- /// </summary>
- public class BitrateLimits
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="BitrateLimits"/> class.
- /// </summary>
- /// <param name="low">
- /// The low.
- /// </param>
- /// <param name="high">
- /// The high.
- /// </param>
- public BitrateLimits(int low, int high)
- {
- this.Low = low;
- this.High = high;
- }
-
- /// <summary>
- /// Gets the inclusive lower limit for the bitrate.
- /// </summary>
- public int Low { get; private set; }
-
- /// <summary>
- /// Gets the inclusive upper limit for the bitrate.
- /// </summary>
- public int High { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Cropping.cs Deleted

@@ -1,99 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Cropping.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the Cropping type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// The Cropping Model
- /// </summary>
- public class Cropping
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="Cropping"/> class. 
- /// </summary>
- public Cropping()
- {
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Cropping"/> class.
- /// Copy Constructor
- /// </summary>
- /// <param name="croping">
- /// The croping.
- /// </param>
- public Cropping(Cropping croping)
- {
- this.Top = croping.Top;
- this.Bottom = croping.Bottom;
- this.Left = croping.Left;
- this.Right = croping.Right;
- }
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Cropping"/> class. 
- /// </summary>
- /// <param name="top">
- /// The Top Value
- /// </param>
- /// <param name="bottom">
- /// The Bottom Value
- /// </param>
- /// <param name="left">
- /// The Left Value
- /// </param>
- /// <param name="right">
- /// The Right Value
- /// </param>
- public Cropping(int top, int bottom, int left, int right)
- {
- this.Top = top;
- this.Bottom = bottom;
- this.Left = left;
- this.Right = right;
- }
-
- /// <summary>
- /// Gets or sets Top.
- /// </summary>
- public int Top { get; set; }
-
- /// <summary>
- /// Gets or sets Bottom.
- /// </summary>
- public int Bottom { get; set; }
-
- /// <summary>
- /// Gets or sets Left.
- /// </summary>
- public int Left { get; set; }
-
- /// <summary>
- /// Gets or sets Right.
- /// </summary>
- public int Right { get; set; }
-
- /// <summary>
- /// Clone this model
- /// </summary>
- /// <returns>
- /// A Cloned copy
- /// </returns>
- public Cropping Clone()
- {
- return new Cropping
- {
- Top = this.Top,
- Bottom = this.Bottom,
- Left = this.Left,
- Right = this.Right
- };
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/Anamorphic.cs Deleted

@@ -1,32 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Anamorphic.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the Anamorphic type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- using HandBrake.Interop.Attributes;
-
- /// <summary>
- /// The anamorphic.
- /// </summary>
- public enum Anamorphic
- {
- DisplayName("None")
- ShortName("none")
- None = 0,
- DisplayName("Automatic")
- ShortName("auto")
- Automatic = 4,
- DisplayName("Loose")
- ShortName("loose")
- Loose = 2,
- DisplayName("Custom")
- ShortName("custom")
- Custom = 3
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/CombDetect.cs Deleted

@@ -1,34 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="CombDetect.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the CombDetect type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- using HandBrake.Interop.Attributes;
-
- /// <summary>
- /// The CombDetect Type.
- /// </summary>
- public enum CombDetect
- {
- ShortName("off")
- Off,
-
- ShortName("custom")
- Custom,
-
- ShortName("default")
- Default,
-
- ShortName("permissive")
- LessSensitive,
-
- ShortName("fast")
- Fast
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/Container.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/DeinterlaceFilter.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/Denoise.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/Detelecine.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBAudioEncoder.cs Deleted

@@ -1,131 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The hb audio encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- using HandBrake.Interop.Interop.HbLib;
-
- /// <summary>
- /// The hb audio encoder.
- /// </summary>
- public class HBAudioEncoder
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="HBAudioEncoder"/> class.
- /// </summary>
- /// <param name="compatibleContainers">
- /// The compatible containers.
- /// </param>
- /// <param name="compressionLimits">
- /// The compression limits.
- /// </param>
- /// <param name="defaultCompression">
- /// The default compression.
- /// </param>
- /// <param name="defaultQuality">
- /// The default quality.
- /// </param>
- /// <param name="displayName">
- /// The display name.
- /// </param>
- /// <param name="id">
- /// The id.
- /// </param>
- /// <param name="qualityLimits">
- /// The quality limits.
- /// </param>
- /// <param name="shortName">
- /// The short name.
- /// </param>
- public HBAudioEncoder(int compatibleContainers, RangeLimits compressionLimits, float defaultCompression, float defaultQuality, string displayName, int id, RangeLimits qualityLimits, string shortName)
- {
- this.CompatibleContainers = compatibleContainers;
- this.CompressionLimits = compressionLimits;
- this.DefaultCompression = defaultCompression;
- this.DefaultQuality = defaultQuality;
- this.DisplayName = displayName;
- this.Id = id;
- this.QualityLimits = qualityLimits;
- this.ShortName = shortName;
- }
-
- /// <summary>
- /// Gets the compatible containers.
- /// </summary>
- public int CompatibleContainers { get; private set; }
-
- /// <summary>
- /// Gets the compression limits.
- /// </summary>
- public RangeLimits CompressionLimits { get; private set; }
-
- /// <summary>
- /// Gets the default compression.
- /// </summary>
- public float DefaultCompression { get; private set; }
-
- /// <summary>
- /// Gets the default quality.
- /// </summary>
- public float DefaultQuality { get; private set; }
-
- /// <summary>
- /// Gets the display name.
- /// </summary>
- public string DisplayName { get; private set; }
-
- /// <summary>
- /// Gets the id.
- /// </summary>
- public int Id { get; private set; }
-
- /// <summary>
- /// Gets a value indicating whether the encoder is passthrough.
- /// </summary>
- public bool IsPassthrough
- {
- get
- {
- return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
- }
- }
-
- /// <summary>
- /// Gets or sets the quality limits.
- /// </summary>
- public RangeLimits QualityLimits { get; set; }
-
- /// <summary>
- /// Gets or sets the short name.
- /// </summary>
- public string ShortName { get; set; }
-
- /// <summary>
- /// Gets a value indicating whether the encoder supports compression.
- /// </summary>
- public bool SupportsCompression
- {
- get
- {
- return this.CompressionLimits.High >= 0;
- }
- }
-
- /// <summary>
- /// Gets a value indicating whether the encoder supports quality.
- /// </summary>
- public bool SupportsQuality
- {
- get
- {
- return this.QualityLimits.High >= 0;
- }
- }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBContainer.cs Deleted

@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBContainer.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The hb container.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- /// <summary>
- /// The hb container.
- /// </summary>
- public class HBContainer
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="HBContainer"/> class.
- /// </summary>
- /// <param name="defaultExtension">
- /// The default extension.
- /// </param>
- /// <param name="displayName">
- /// The display name.
- /// </param>
- /// <param name="id">
- /// The id.
- /// </param>
- /// <param name="shortName">
- /// The short name.
- /// </param>
- public HBContainer(string defaultExtension, string displayName, int id, string shortName)
- {
- this.DefaultExtension = defaultExtension;
- this.DisplayName = displayName;
- this.Id = id;
- this.ShortName = shortName;
- }
-
- /// <summary>
- /// Gets the default extension.
- /// </summary>
- public string DefaultExtension { get; private set; }
-
- /// <summary>
- /// Gets the display name.
- /// </summary>
- public string DisplayName { get; private set; }
-
- /// <summary>
- /// Gets the id.
- /// </summary>
- public int Id { get; private set; }
-
- /// <summary>
- /// Gets the short name.
- /// </summary>
- public string ShortName { get; private set; }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBMixdown.cs Deleted

@@ -1,51 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBMixdown.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The hb mixdown.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- /// <summary>
- /// The hb mixdown.
- /// </summary>
- public class HBMixdown
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="HBMixdown"/> class.
- /// </summary>
- /// <param name="displayName">
- /// The display name.
- /// </param>
- /// <param name="id">
- /// The id.
- /// </param>
- /// <param name="shortName">
- /// The short name.
- /// </param>
- public HBMixdown(string displayName, int id, string shortName)
- {
- this.DisplayName = displayName;
- this.Id = id;
- this.ShortName = shortName;
- }
-
- /// <summary>
- /// Gets the display name.
- /// </summary>
- public string DisplayName { get; private set; }
-
- /// <summary>
- /// Gets the id.
- /// </summary>
- public int Id { get; private set; }
-
- /// <summary>
- /// Gets the short name.
- /// </summary>
- public string ShortName { get; private set; }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBPresetTune.cs Deleted

@@ -1,46 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBPresetTune.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// An object represetning the key and name of a Filter Preset or Tune option.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- public class HBPresetTune
- {
- public HBPresetTune()
- {
- }
-
- public HBPresetTune(string name, string shortName)
- {
- this.Name = name;
- this.ShortName = shortName;
- }
-
- public string Name { get; set; }
-
- public string ShortName { get; set; }
-
- public override bool Equals(object obj)
- {
- if (ReferenceEquals(null, obj)) return false;
- if (ReferenceEquals(this, obj)) return true;
- if (obj.GetType() != this.GetType()) return false;
- return this.Equals((HBPresetTune)obj);
- }
-
- public override int GetHashCode()
- {
- return this.ShortName != null ? this.ShortName.GetHashCode() : 0;
- }
-
- protected bool Equals(HBPresetTune other)
- {
- return string.Equals(this.ShortName, other.ShortName);
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBRate.cs Deleted

@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBRate.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Represents a rate in HandBrake: audio sample rate or video framerate.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- /// <summary>
- /// Represents a rate in HandBrake: audio sample rate or video framerate.
- /// </summary>
- public class HBRate
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="HBRate"/> class.
- /// </summary>
- /// <param name="name">
- /// The name.
- /// </param>
- /// <param name="rate">
- /// The rate.
- /// </param>
- public HBRate(string name, int rate)
- {
- this.Name = name;
- this.Rate = rate;
- }
-
- /// <summary>
- /// Gets the name to use for this rate.
- /// </summary>
- public string Name { get; private set; }
-
- /// <summary>
- /// Gets the raw rate.
- /// </summary>
- public int Rate { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/HBVideoEncoder.cs Deleted

@@ -1,117 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The hb video encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- using System.Collections.Generic;
-
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Helpers;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- /// <summary>
- /// The hb video encoder.
- /// </summary>
- public class HBVideoEncoder
- {
- private IHbFunctions hbFunctions;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HBVideoEncoder"/> class.
- /// </summary>
- /// <param name="compatibleContainers">
- /// The compatible containers.
- /// </param>
- /// <param name="displayName">
- /// The display name.
- /// </param>
- /// <param name="id">
- /// The id.
- /// </param>
- /// <param name="shortName">
- /// The short name.
- /// </param>
- public HBVideoEncoder(int compatibleContainers, string displayName, int id, string shortName)
- {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
-
- this.CompatibleContainers = compatibleContainers;
- this.DisplayName = displayName;
- this.Id = id;
- this.ShortName = shortName;
- }
-
- /// <summary>
- /// Gets the compatible containers.
- /// </summary>
- public int CompatibleContainers { get; private set; }
-
- /// <summary>
- /// Gets the display name.
- /// </summary>
- public string DisplayName { get; private set; }
-
- /// <summary>
- /// Gets the id.
- /// </summary>
- public int Id { get; private set; }
-
- /// <summary>
- /// Gets the short name.
- /// </summary>
- public string ShortName { get; private set; }
-
- /// <summary>
- /// Gets the list of presets this encoder supports. (null if the encoder doesn't support presets)
- /// </summary>
- public List<string> Presets
- {
- get
- {
- return InteropUtilities.ToStringListFromArrayPtr(hbFunctions.hb_video_encoder_get_presets(this.Id));
- }
- }
-
- /// <summary>
- /// Gets the list of tunes this encoder supports. (null if the encoder doesn't support tunes)
- /// </summary>
- public List<string> Tunes
- {
- get
- {
- return InteropUtilities.ToStringListFromArrayPtr(hbFunctions.hb_video_encoder_get_tunes(this.Id));
- }
- }
-
- /// <summary>
- /// Gets the list of profiles this encoder supports. (null if the encoder doesn't support profiles)
- /// </summary>
- public List<string> Profiles
- {
- get
- {
- return InteropUtilities.ToStringListFromArrayPtr(hbFunctions.hb_video_encoder_get_profiles(this.Id));
- }
- }
-
- /// <summary>
- /// Gets the list of levels this encoder supports. (null if the encoder doesn't support levels)
- /// </summary>
- public List<string> Levels
- {
- get
- {
- return InteropUtilities.ToStringListFromArrayPtr(hbFunctions.hb_video_encoder_get_levels(this.Id));
- }
- } 
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/PictureRotation.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/ScaleMethod.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/Sharpen.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncodeRateType.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Encoding/VideoEncoder.cs Deleted

@@ -1,87 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoEncoder.cs" company="HandBrake Project (https://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The video encoder.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Encoding
-{
- using HandBrake.Interop.Attributes;
-
- /// <summary>
- /// The video encoder.
- /// </summary>
- public enum VideoEncoder
- {
- DisplayName("H.264 (x264)")
- ShortName("x264")
- X264 = 0,
-
- DisplayName("H.264 10-bit (x264)")
- ShortName("x264_10bit")
- X264_10,
-
- DisplayName("H.264 (Intel QSV)")
- ShortName("qsv_h264")
- QuickSync,
-
- DisplayName("H.264 (AMD VCE)")
- ShortName("vce_h264")
- VceH264,
-
- DisplayName("H.264 (Nvidia NVEnc)")
- ShortName("nvenc_h264")
- NvencH264,
- 
- DisplayName("MPEG-4")
- ShortName("mpeg4")
- FFMpeg,
-
- DisplayName("MPEG-2")
- ShortName("mpeg2")
- FFMpeg2,
-
- DisplayName("Theora")
- ShortName("theora")
- Theora,
-
- DisplayName("H.265 (x265)")
- ShortName("x265")
- X265,
-
- DisplayName("H.265 12-bit (x265)")
- ShortName("x265_12bit")
- X265_12,
-
- DisplayName("H.265 10-bit (x265)")
- ShortName("x265_10bit")
- X265_10,
-
- DisplayName("H.265 (Intel QSV)")
- ShortName("qsv_h265")
- QuickSyncH265,
-
- DisplayName("H.265 10-bit (Intel QSV)")
- ShortName("qsv_h265_10bit")
- QuickSyncH26510b,
-
- DisplayName("H.265 (AMD VCE)")
- ShortName("vce_h265")
- VceH265,
-
- DisplayName("H.265 (Nvidia NVEnc)")
- ShortName("nvenc_h265")
- NvencH265,
-
- DisplayName("VP8")
- ShortName("VP8")
- VP8,
-
- DisplayName("VP9")
- ShortName("VP9")
- VP9
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Language.cs Deleted

@@ -1,67 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Language.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Represents a language.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// Represents a language.
- /// </summary>
- public class Language
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="Language"/> class.
- /// </summary>
- /// <param name="englishName">
- /// The english name.
- /// </param>
- /// <param name="nativeName">
- /// The native name.
- /// </param>
- /// <param name="code">
- /// The code.
- /// </param>
- public Language(string englishName, string nativeName, string code)
- {
- this.EnglishName = englishName;
- this.NativeName = nativeName;
- this.Code = code;
- }
-
- /// <summary>
- /// Gets the english name of the language.
- /// </summary>
- public string EnglishName { get; private set; }
-
- /// <summary>
- /// Gets the native name of the language.
- /// </summary>
- public string NativeName { get; private set; }
-
- /// <summary>
- /// Gets the language code.
- /// </summary>
- public string Code { get; private set; }
-
- /// <summary>
- /// Gets the display string for the language.
- /// </summary>
- public string Display
- {
- get
- {
- if (!string.IsNullOrEmpty(this.NativeName) && this.NativeName != this.EnglishName)
- {
- return this.EnglishName + " (" + this.NativeName + ")";
- }
-
- return this.EnglishName;
- }
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/PresetVersion.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Preview Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Preview/PreviewSettings.cs Deleted

@@ -1,81 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PreviewSettings.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The preview settings.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Preview
-{
- using Encoding;
-
- /// <summary>
- /// The preview settings.
- /// </summary>
- public class PreviewSettings
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="PreviewSettings"/> class.
- /// </summary>
- public PreviewSettings()
- {
- }
-
- /// <summary>
- /// Gets or sets the cropping.
- /// </summary>
- public Cropping Cropping { get; set; }
-
- /// <summary>
- /// Gets or sets the max width.
- /// </summary>
- public int MaxWidth { get; set; }
-
- /// <summary>
- /// Gets or sets the max height.
- /// </summary>
- public int MaxHeight { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether keep display aspect.
- /// </summary>
- public bool KeepDisplayAspect { get; set; }
-
- /// <summary>
- /// Gets or sets the title number.
- /// </summary>
- public int TitleNumber { get; set; }
-
- /// <summary>
- /// Gets or sets the anamorphic.
- /// </summary>
- public Anamorphic Anamorphic { get; set; }
-
- /// <summary>
- /// Gets or sets the modulus.
- /// </summary>
- public int? Modulus { get; set; }
-
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the pixel aspect x.
- /// </summary>
- public int PixelAspectX { get; set; }
-
- /// <summary>
- /// Gets or sets the pixel aspect y.
- /// </summary>
- public int PixelAspectY { get; set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Preview/RawPreviewData.cs Deleted

@@ -1,26 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RawPreviewData.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model.Preview
-{
- public class RawPreviewData
- {
- public RawPreviewData(byte rawBitmapData, int strideWidth, int strideHeight, int width, int height)
- {
- this.RawBitmapData = rawBitmapData;
- this.StrideWidth = strideWidth;
- this.StrideHeight = strideHeight;
- this.Width = width;
- this.Height = height;
- }
-
- public byte RawBitmapData { get; }
- public int StrideWidth { get; }
- public int StrideHeight { get; }
- public int Width { get; }
- public int Height { get; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/RangeLimits.cs Deleted

@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="RangeLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The range limits.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// The range limits.
- /// </summary>
- public class RangeLimits
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="RangeLimits"/> class.
- /// </summary>
- /// <param name="ascending">
- /// The ascending.
- /// </param>
- /// <param name="granularity">
- /// The granularity.
- /// </param>
- /// <param name="high">
- /// The high.
- /// </param>
- /// <param name="low">
- /// The low.
- /// </param>
- public RangeLimits(bool @ascending, float granularity, float high, float low)
- {
- this.Ascending = @ascending;
- this.Granularity = granularity;
- this.High = high;
- this.Low = low;
- }
-
- /// <summary>
- /// Gets a value indicating whether ascending.
- /// </summary>
- public bool Ascending { get; private set; }
-
- /// <summary>
- /// Gets the granularity.
- /// </summary>
- public float Granularity { get; private set; }
-
- /// <summary>
- /// Gets the high.
- /// </summary>
- public float High { get; private set; }
-
- /// <summary>
- /// Gets the low.
- /// </summary>
- public float Low { get; private set; }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/Size.cs Deleted

@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Size.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the Size type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// The size.
- /// </summary>
- public class Size
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="Size"/> class.
- /// </summary>
- /// <param name="width">
- /// The width.
- /// </param>
- /// <param name="height">
- /// The height.
- /// </param>
- public Size(int width, int height)
- {
- this.Width = width;
- this.Height = height;
- }
-
- /// <summary>
- /// Gets the height.
- /// </summary>
- public int Height { get; private set; }
-
- /// <summary>
- /// Gets the width.
- /// </summary>
- public int Width { get; private set; }
-
- /// <summary>
- /// Gets a value indicating whether is empty.
- /// </summary>
- public bool IsEmpty 
- {
- get
- {
- if (this.Width <= 0 && this.Height <= 0)
- {
- return true;
- }
- else
- {
- return false;
- }
- }
- }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/SourceVideoInfo.cs Deleted

@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceVideoInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The source framerate info.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// The source framerate info.
- /// </summary>
- public class SourceVideoInfo
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="SourceVideoInfo"/> class.
- /// </summary>
- /// <param name="resolution">
- /// The resolution.
- /// </param>
- /// <param name="parVal">
- /// The par val.
- /// </param>
- public SourceVideoInfo(Size resolution, Size parVal)
- {
- this.Resolution = resolution;
- this.ParVal = parVal;
- }
-
- /// <summary>
- /// Gets the resolution (width/height) of this Title
- /// </summary>
- public Size Resolution { get; private set; }
-
- /// <summary>
- /// Gets the pixel aspect ratio.
- /// </summary>
- public Size ParVal { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Model/VideoQualityLimits.cs Deleted

@@ -1,60 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VideoQualityLimits.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the VideoQualityLimits type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Model
-{
- /// <summary>
- /// Represents limits on video quality for a particular encoder.
- /// </summary>
- public class VideoQualityLimits
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="VideoQualityLimits"/> class.
- /// </summary>
- /// <param name="low">
- /// The low.
- /// </param>
- /// <param name="high">
- /// The high.
- /// </param>
- /// <param name="granularity">
- /// The granularity.
- /// </param>
- /// <param name="ascending">
- /// The ascending.
- /// </param>
- public VideoQualityLimits(float low, float high, float granularity, bool @ascending)
- {
- this.Low = low;
- this.High = high;
- this.Granularity = granularity;
- this.Ascending = @ascending;
- }
-
- /// <summary>
- /// Gets the inclusive lower limit for the quality.
- /// </summary>
- public float Low { get; private set; }
-
- /// <summary>
- /// Gets the inclusive upper limit for the quality.
- /// </summary>
- public float High { get; private set; }
-
- /// <summary>
- /// Gets the granularity for the quality.
- /// </summary>
- public float Granularity { get; private set; }
-
- /// <summary>
- /// Gets a value indicating whether the quality increases as the number increases.
- /// </summary>
- public bool Ascending { get; private set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Providers Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Providers/HbFunctionsProvider.cs Deleted

@@ -1,30 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HbFunctionsProvider.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Provides an instance of IHbFunctions for use by the GUI.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Providers
-{
- using HandBrake.Interop.Interop.HbLib.Wrappers;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- public class HbFunctionsProvider : IHbFunctionsProvider
- {
- private static IHbFunctions hbFunctions;
-
- public IHbFunctions GetHbFunctionsWrapper()
- {
- if (hbFunctions == null)
- {
- hbFunctions = new HbFunctionsDirect();
- }
-
- return hbFunctions;
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Providers/Interfaces Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Providers/Interfaces/IHbFunctionsProvider.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Model Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Model/HBConfiguration.cs Deleted

@@ -1,84 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HBConfiguration.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// HandBrakes Configuration options
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Model
-{
- public class HBConfiguration
- {
- public HBConfiguration()
- {
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether is dvd nav disabled.
- /// </summary>
- public bool IsDvdNavDisabled { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether disable quick sync decoding.
- /// </summary>
- public bool EnableQuickSyncDecoding { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether use qsv decode for non qsv enc.
- /// </summary>
- public bool UseQSVDecodeForNonQSVEnc { get; set; }
-
- /// <summary>
- /// Gets or sets the scaling mode.
- /// </summary>
- public VideoScaler ScalingMode { get; set; }
-
- /// <summary>
- /// Gets or sets the preview scan count.
- /// </summary>
- public int PreviewScanCount { get; set; }
-
- /// <summary>
- /// Gets or sets the verbosity.
- /// </summary>
- public int Verbosity { get; set; }
-
- /// <summary>
- /// Gets or sets the min scan duration.
- /// </summary>
- public int MinScanDuration { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether save log to copy directory.
- /// </summary>
- public bool SaveLogToCopyDirectory { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether save log with video.
- /// </summary>
- public bool SaveLogWithVideo { get; set; }
-
- /// <summary>
- /// Gets or sets the save log copy directory.
- /// </summary>
- public string SaveLogCopyDirectory { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether we use in-process or out-of-process encoding.
- /// </summary>
- public bool RemoteServiceEnabled { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating what port the worker process is to use.
- /// </summary>
- public int RemoteServicePort { get; set; }
-
- public bool EnableVceEncoder { get; set; }
-
- public bool EnableNvencEncoder { get; set; }
-
- public bool EnableQsvEncoder { get; set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Model/VideoScaler.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Utilities/SystemInfo.cs Deleted

@@ -1,188 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SystemInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The System Information.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Utilities
-{
- using System;
-
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- using Interop.HbLib;
-
- /// <summary>
- /// The System Information.
- /// </summary>
- public class SystemInfo
- {
- private static bool? isNvencH264Available; // Local cache to prevent log spam.
- private static bool? isNvencH265Available;
-
- private static IHbFunctions hbFunctions;
-
- static SystemInfo()
- {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
- }
-
- /// <summary>
- /// Gets a value indicating whether is qsv available.
- /// </summary>
- public static bool IsQsvAvailable
- {
- get
- {
- try
- {
- return hbFunctions.hb_qsv_available() != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- /// <summary>
- /// Gets a value indicating whether is qsv available.
- /// </summary>
- public static bool IsQsvAvailableH264
- {
- get
- {
- try
- {
- return (hbFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H264) != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- /// <summary>
- /// Gets a value indicating whether is qsv available.
- /// </summary>
- public static bool IsQsvAvailableH265
- {
- get
- {
- try
- {
- return (hbFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265) != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- public static bool IsQsvAvailableH26510bit
- {
- get
- {
- try
- {
- return (hbFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265_10BIT) != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- public static bool IsVceH264Available
- {
- get
- {
- try
- {
- return hbFunctions.hb_vce_h264_available() != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- public static bool IsVceH265Available
- {
- get
- {
- try
- {
- return hbFunctions.hb_vce_h265_available() != 0;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- public static bool IsNVEncH264Available
- {
- get
- {
- try
- {
- if (isNvencH264Available == null)
- {
- isNvencH264Available = hbFunctions.hb_nvenc_h264_available() != 0;
- }
- 
- return isNvencH264Available.Value;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
-
- public static bool IsNVEncH265Available
- {
- get
- {
- try
- {
- if (!IsNVEncH264Available)
- {
- return false;
- }
-
- if (isNvencH265Available == null)
- {
- isNvencH265Available = hbFunctions.hb_nvenc_h265_available() != 0;
- }
-
- return isNvencH265Available.Value;
- }
- catch (Exception)
- {
- // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
- return false;
- }
- }
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Utilities/VersionHelper.cs Deleted

@@ -1,81 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="VersionHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Version Utility
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Utilities
-{
- using System;
- using System.Runtime.InteropServices;
-
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- public class VersionHelper
- {
- private static IHbFunctions hbFunctions;
-
- static VersionHelper()
- {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
- }
-
- /// <summary>
- /// The get build.
- /// </summary>
- /// <returns>
- /// The <see cref="int"/>.
- /// </returns>
- public static string GetVersion()
- {
- return IsNightly() ? string.Format("Nightly {0} ({1})", Version, Build) : string.Format("{0} ({1})", Version, Build);
- }
-
- public static string GetVersionShort()
- {
- return string.Format("{0} {1}", Version, Build);
- }
-
- /// <summary>
- /// The is nightly.
- /// </summary>
- /// <returns>
- /// The <see cref="string"/>.
- /// </returns>
- public static bool IsNightly()
- {
- // 01 = Unofficial Builds. 00 = Official Tagged Releases.
- return Build.ToString().EndsWith("01");
- }
-
- /// <summary>
- /// Gets the HandBrake version string.
- /// </summary>
- public static string Version
- {
- get
- {
- var versionPtr = hbFunctions.hb_get_version(IntPtr.Zero); // Pointer isn't actually used.
- return Marshal.PtrToStringAnsi(versionPtr);
- }
- }
-
- /// <summary>
- /// Gets the HandBrake build number.
- /// </summary>
- public static int Build
- {
- get
- {
- return hbFunctions.hb_get_build(IntPtr.Zero);
- }
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/App.config Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Properties/AssemblyInfo.cs Deleted

@@ -1,45 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-assembly: AssemblyTitle("HandBrake.Worker")
-assembly: AssemblyDescription("HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder.")
-assembly: AssemblyConfiguration("")
-assembly: AssemblyCompany("HandBrake Team")
-assembly: AssemblyProduct("HandBrake.Worker")
-assembly: AssemblyCopyright("Copyright © 2003-2020 HandBrake Team")
-assembly: AssemblyTrademark("")
-assembly: AssemblyCulture("")
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-assembly: ComVisible(false)
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-assembly: Guid("f8370f37-b226-4830-aee7-6d7ae403e3d2")
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// assembly: AssemblyVersion("1.0.*")
-assembly: AssemblyVersion("1.4.0.0")
-assembly: AssemblyFileVersion("1.4.0.0")

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Registration Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Registration/ConnectionRegistrar.cs Deleted

@@ -1,53 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ConnectionRegistrar.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the ConnectionRegistrar type.
-// </summary>
-// <remarks>
-// To be clear, this is NOT a security service!
-// This service simply allows the UI to verify which worker process it is connected to.
-// </remarks>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Worker.Registration
-{
- using System;
- using System.Net;
-
- using HandBrake.Worker.Registration.Model;
- using HandBrake.Worker.Utilities;
-
- using Newtonsoft.Json;
-
- public class ConnectionRegistrar
- {
- private readonly JsonSerializerSettings jsonNetSettings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
- private string token;
-
- public ConnectionRegistrar()
- {
- }
-
- public string Pair(HttpListenerRequest request)
- {
- string tokenKey = HttpUtilities.GetRequestPostData(request);
-
-
- if (!string.IsNullOrEmpty(token))
- {
- return JsonConvert.SerializeObject(new ConnectionResult(false, null, "Already Paired"), Formatting.Indented, this.jsonNetSettings);
- }
-
- this.token = tokenKey;
-
- return JsonConvert.SerializeObject(new ConnectionResult(true, tokenKey, null), Formatting.Indented, this.jsonNetSettings);
- }
-
- public string GetToken(HttpListenerRequest request)
- { 
- return this.token;
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Registration/Model Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Registration/Model/ConnectionResult.cs Deleted

@@ -1,31 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="ConnectionResult.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the ConnectionResult type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Worker.Registration.Model
-{
- public class ConnectionResult
- {
- public ConnectionResult()
- {
- }
-
- public ConnectionResult(bool isSuccessfulConnection, string token, string error)
- {
- this.IsSuccessfulConnection = isSuccessfulConnection;
- this.Token = token;
- this.Error = error;
- }
-
- public bool IsSuccessfulConnection { get; set; }
- 
- public string Token { get; set; }
-
- public string Error { get; set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/HandBrakeAppX.jsproj Deleted

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>6e855245-e402-4c0f-bb0b-eeb63082f6ac</ProjectGuid>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0'">
- <VisualStudioVersion>14.0</VisualStudioVersion>
- </PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).Default.props" />
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).props" />
- <PropertyGroup>
- <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
- <TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
- <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
- <MinimumVisualStudioVersion>$(VersionNumberMajor).$(VersionNumberMinor)</MinimumVisualStudioVersion>
- <DefaultLanguage>en-US</DefaultLanguage>
- <PackageCertificateKeyFile>HandBrakeAppX_TemporaryKey.pfx</PackageCertificateKeyFile>
- <AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
- <AppxBundle>Always</AppxBundle>
- <AppxBundlePlatforms>x64</AppxBundlePlatforms>
- <PackageCertificateThumbprint>8A8FE309838B56D97D543F30728F515F64B2291A</PackageCertificateThumbprint>
- <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
- </PropertyGroup>
- <ItemGroup>
- <AppxManifest Include="package.appxmanifest">
- <SubType>Designer</SubType>
- </AppxManifest>
- <Content Include="images\LargeTile.scale-100.png" />
- <Content Include="images\LargeTile.scale-200.png" />
- <Content Include="images\SmallTile.scale-100.png" />
- <Content Include="images\SmallTile.scale-200.png" />
- <Content Include="images\splashscreen.scale-100.png" />
- <Content Include="images\splashscreen.scale-200.png" />
- <Content Include="images\Square150x150Logo.scale-100.png" />
- <Content Include="images\Square150x150Logo.scale-200.png" />
- <Content Include="images\Square44x44Logo.altform-unplated_targetsize-16.png" />
- <Content Include="images\Square44x44Logo.altform-unplated_targetsize-48.png" />
- <Content Include="images\Square44x44Logo.scale-100.png" />
- <Content Include="images\Square44x44Logo.scale-200.png" />
- <Content Include="images\Square44x44Logo.targetsize-16.png" />
- <Content Include="images\Square44x44Logo.targetsize-48.png" />
- <Content Include="images\storelogo.scale-100.png" />
- <Content Include="images\storelogo.scale-200.png" />
- <Content Include="images\Wide310x150Logo.scale-100.png" />
- <Content Include="images\Wide310x150Logo.scale-200.png" />
- <Content Include="win32\*.dll">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="win32\*.config">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="win32\*.exe">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- <Content Include="win32\Caliburn.Micro.Platform.Core.dll" />
- <Content Include="win32\Caliburn.Micro.Platform.dll" />
- <Content Include="win32\GongSolutions.Wpf.DragDrop.dll" />
- <Content Include="win32\HandBrake.Interop.dll" />
- <Content Include="win32\HandBrake.Interop.dll.config" />
- <Content Include="win32\HandBrake.exe" />
- <Content Include="win32\HandBrake.exe.config" />
- <Content Include="win32\hb.dll" />
- <Content Include="win32\Newtonsoft.Json.dll" />
- <Content Include="win32\Ookii.Dialogs.Wpf.dll" />
- <Content Include="win32\System.Windows.Interactivity.dll" />
- <None Include="HandBrakeAppX_TemporaryKey.pfx" />
- </ItemGroup>
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\$(WMSJSProjectDirectory)\Microsoft.VisualStudio.$(WMSJSProject).targets" />
- 
- <Target Name="BeforeBuild">
- <Exec Command="xcopy ..\HandBrakeWPF\bin\$(Platform)\$(Configuration)\*.exe win32 /I /Y" />
- <Exec Command="xcopy ..\HandBrakeWPF\bin\$(Platform)\$(Configuration)\*.dll win32 /I /Y" />
- <Exec Command="xcopy ..\HandBrakeWPF\bin\$(Platform)\$(Configuration)\*.config win32 /I /Y" />
- </Target>
- 
-</Project>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/HandBrakeAppX_TemporaryKey.pfx Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/LargeTile.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/LargeTile.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/SmallTile.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/SmallTile.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square150x150Logo.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-16.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.altform-unplated_targetsize-48.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-16.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Square44x44Logo.targetsize-48.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/Wide310x150Logo.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/splashscreen.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/splashscreen.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/storelogo.scale-100.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/images/storelogo.scale-200.png Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeAppX/package.appxmanifest Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" IgnorableNamespaces="uap mp rescap">
- <Identity Name="06bcfa84-a650-442c-9ecd-e64641a14f24" Version="1.1.7.0" Publisher="CN=HandBrake Unofficial" />
- <mp:PhoneIdentity PhoneProductId="06bcfa84-a650-442c-9ecd-e64641a14f24" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
- <Properties>
- <DisplayName>HandBrake</DisplayName>
- <PublisherDisplayName>HandBrake Team</PublisherDisplayName>
- <Logo>images\storelogo.png</Logo>
- </Properties>
- <Dependencies>
- <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.10586.0" MaxVersionTested="10.0.15063.0" />
- </Dependencies>
- <Resources>
- <Resource Language="x-generate" />
- </Resources>
- <Applications>
- <Application Id="App" Executable="win32\HandBrake.exe" EntryPoint="Windows.FullTrustApplication">
- <uap:VisualElements DisplayName="HandBrake" Description="HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs." BackgroundColor="transparent" Square150x150Logo="images\Square150x150Logo.png" Square44x44Logo="images\Square44x44Logo.png">
- <uap:DefaultTile Wide310x150Logo="images\Wide310x150Logo.png" ShortName="HandBrake" Square71x71Logo="images\SmallTile.png" Square310x310Logo="images\LargeTile.png">
- </uap:DefaultTile>
- <uap:SplashScreen Image="images\splashscreen.png" />
- </uap:VisualElements>
- </Application>
- </Applications>
- <Capabilities>
- <rescap:Capability Name="runFullTrust" />
- </Capabilities>
-</Package>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools/App.config Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools/HandBrakeTools.csproj Deleted

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{3BAEBAC7-9042-4863-876F-C550ADCA66DC}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>HandBrakeTools</RootNamespace>
- <AssemblyName>HandBrakeTools</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <Prefer32Bit>false</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup>
- <SignAssembly>false</SignAssembly>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- 
-</Project>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools/Program.cs Deleted

@@ -1,101 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Program.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// HandBrake Toolkit
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeTools
-{
- using System;
- using System.Diagnostics;
- using System.IO;
- using System.Security.Cryptography;
-
- public class Program
- {
- static void Main(string args)
- {
- if (args.Length == 0)
- {
- Console.WriteLine("Invalid Command. Either 'genkeys' or 'sign <filename>'");
- Console.Read();
- return;
- }
-
- string command = args0;
- string file = args.Length > 1 ? args1 : null;
- switch (command)
- {
- case "genkeys":
- GenKeyFiles();
- return;
- case "sign":
- string hash = SignDownload(file);
- Console.WriteLine(VerifyDownload(hash, file) ? "Passed Verification Test" : "Failed Verification Test");
- Console.WriteLine("Hash: " + hash);
- File.WriteAllText("file.hash", hash);
- return;
- }
-
- Console.WriteLine("Done.");
- Console.Read();
- }
-
- public static void GenKeyFiles()
- {
- RSACryptoServiceProvider provider = new RSACryptoServiceProvider { KeySize = 2048 };
-
- using (StreamWriter sw = new StreamWriter("private.key"))
- {
- sw.Write(provider.ToXmlString(true));
- }
-
- using (StreamWriter sw = new StreamWriter("public.key"))
- {
- sw.Write(provider.ToXmlString(false));
- }
- }
-
- public static string SignDownload(string updateFile)
- {
- RSACryptoServiceProvider provider = new RSACryptoServiceProvider();
- provider.FromXmlString(File.ReadAllText("private.key"));
- byte signedBytes = provider.SignData(File.ReadAllBytes(updateFile), "SHA256");
- return Convert.ToBase64String(signedBytes);
- }
-
- public static bool VerifyDownload(string signature, string updateFile)
- {
- // Sanity Checks
- if (!File.Exists(updateFile))
- {
- return false;
- }
-
- if (string.IsNullOrEmpty(signature))
- {
- return false;
- }
-
- // Fetch our Public Key
- string publicKey = File.ReadAllText("public.key");
-
- // Verify the file against the Signature. 
- try
- {
- byte file = File.ReadAllBytes(updateFile);
- RSACryptoServiceProvider verifyProfider = new RSACryptoServiceProvider();
- verifyProfider.FromXmlString(publicKey);
- return verifyProfider.VerifyData(file, "SHA256", Convert.FromBase64String(signature));
- }
- catch (Exception e)
- {
- Debug.WriteLine(e);
- return false;
- }
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools/Properties Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeTools/Properties/AssemblyInfo.cs Deleted

@@ -1,45 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="AssemblyInfo.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Assembly Info
-// </summary>
-// <auto-generated/>
-// --------------------------------------------------------------------------------------------------------------------
-
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-assembly: AssemblyTitle("HandBrake Toolkit")
-assembly: AssemblyDescription("The toolkit app has utility classes for signing and building HandBrake")
-assembly: AssemblyConfiguration("")
-assembly: AssemblyCompany("HandBrake Team")
-assembly: AssemblyProduct("HandBrake")
-assembly: AssemblyCopyright("Copyright © 2003-2020 HandBrake Team ")
-assembly: AssemblyTrademark("")
-assembly: AssemblyCulture("")
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components. If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-assembly: ComVisible(false)
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version 
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// assembly: AssemblyVersion("1.0.*")
-assembly: AssemblyVersion("1.1.0.0")
-assembly: NeutralResourcesLanguage("")
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Collections Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Collections/SerializableDictionary.cs Deleted

@@ -1,126 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SerializableDictionary.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// A Serializable Dictionary
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Collections
-{
- using System.Collections.Generic;
- using System.Collections.Specialized;
- using System.Xml.Serialization;
-
- /// <summary>
- /// A Serializable Dictionary
- /// </summary>
- /// <typeparam name="TKey">
- /// The Key Type
- /// </typeparam>
- /// <typeparam name="TValue">
- /// The Value Type
- /// </typeparam>
- XmlRoot("dictionary")
- public class SerializableDictionary<TKey, TValue> : Dictionary<TKey, TValue>, IXmlSerializable
- {
- #region IXmlSerializable Members
-
- /// <summary>
- /// Get the Schema
- /// </summary>
- /// <returns>
- /// Nothing. We don't use this.
- /// </returns>
- public System.Xml.Schema.XmlSchema GetSchema()
- {
- return null;
- }
-
- /// <summary>
- /// Deserialize some XML into a dictionary
- /// </summary>
- /// <param name="reader">
- /// The reader.
- /// </param>
- public void ReadXml(System.Xml.XmlReader reader)
- {
- XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
- XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
-
- bool wasEmpty = reader.IsEmptyElement;
- reader.Read();
-
- if (wasEmpty)
- return;
-
- while (reader.NodeType != System.Xml.XmlNodeType.EndElement)
- {
- reader.ReadStartElement("item");
-
- reader.ReadStartElement("key");
- TKey key = (TKey)keySerializer.Deserialize(reader);
- reader.ReadEndElement();
-
- reader.ReadStartElement("value");
- TValue value;
- if (reader.Name.Contains("ArrayOfString"))
- {
- XmlSerializer scSerializer = new XmlSerializer(typeof(StringCollection));
- value = (TValue)scSerializer.Deserialize(reader);
- }
- else
- {
- value = (TValue)valueSerializer.Deserialize(reader);
- }
- reader.ReadEndElement();
-
- this.Add(key, value);
-
- reader.ReadEndElement();
- reader.MoveToContent();
- }
- reader.ReadEndElement();
- }
-
- /// <summary>
- /// Write the Dictionary out to XML
- /// </summary>
- /// <param name="writer">
- /// The writer.
- /// </param>
- public void WriteXml(System.Xml.XmlWriter writer)
- {
- XmlSerializer keySerializer = new XmlSerializer(typeof(TKey));
- XmlSerializer valueSerializer = new XmlSerializer(typeof(TValue));
-
- foreach (TKey key in this.Keys)
- {
- writer.WriteStartElement("item");
-
- writer.WriteStartElement("key");
- keySerializer.Serialize(writer, key);
- writer.WriteEndElement();
-
- writer.WriteStartElement("value");
- TValue value = thiskey;
-
- if (value.GetType() == typeof(StringCollection))
- {
- XmlSerializer scSerializer = new XmlSerializer(typeof(StringCollection));
- scSerializer.Serialize(writer, value);
- writer.WriteEndElement();
- }
- else
- {
- valueSerializer.Serialize(writer, value);
- writer.WriteEndElement();
- }
-
- writer.WriteEndElement();
- }
- }
- #endregion
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/Loading.xaml Deleted

@@ -1,106 +0,0 @@
-<UserControl x:Class="HandBrakeWPF.Controls.Loading"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- Background="Transparent"
- Height="45"
- Width="45">
-
- <Viewbox Width="40" Height="40" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Grid Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center">
- <Canvas RenderTransformOrigin="0.5,0.5"
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
- Width="120"
- Height="120"
- Loaded="CanvasLoaded"
- Unloaded="CanvasUnloaded">
-
- <Ellipse x:Name="circle0"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="1.0" />
-
- <Ellipse x:Name="circle1"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.9" />
-
- <Ellipse x:Name="circle2"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.8" />
-
- <Ellipse x:Name="circle3"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.7" />
-
- <Ellipse x:Name="circle4"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.6" />
-
- <Ellipse x:Name="circle5"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.5" />
-
- <Ellipse x:Name="circle6"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.4" />
-
- <Ellipse x:Name="circle7"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.3" />
-
- <Ellipse x:Name="circle8"
- Width="20"
- Height="20"
- Canvas.Left="0"
- Canvas.Top="0"
- Stretch="Fill"
- Fill="DarkOrange"
- Opacity="0.2" />
-
- <Canvas.RenderTransform>
- <RotateTransform x:Name="rotate" Angle="0" />
- </Canvas.RenderTransform>
- </Canvas>
- </Grid>
- </Viewbox>
-</UserControl>
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/Loading.xaml.cs Deleted

@@ -1,157 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Loading.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Interaction logic for Loading.xaml
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Controls
-{
- using System;
- using System.Windows;
- using System.Windows.Controls;
- using System.Windows.Threading;
-
- /// <summary>
- /// Interaction logic for Loading.xaml
- /// </summary>
- public partial class Loading : UserControl
- {
- #region Fields
-
- /// <summary>
- /// Step
- /// </summary>
- private const double Step = Math.PI * 2 / 10.0;
-
- /// <summary>
- /// Timer for the spinning effect.
- /// </summary>
- private readonly DispatcherTimer timer;
-
- #endregion
-
- #region Constructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Loading"/> class.
- /// </summary>
- public Loading()
- {
- InitializeComponent();
-
- IsVisibleChanged += OnVisibleChanged;
-
- this.timer = new DispatcherTimer(DispatcherPriority.ContextIdle, Dispatcher)
- {
- Interval = new TimeSpan(0, 0, 0, 0, 75)
- };
- }
-
- #endregion
-
- /// <summary>
- /// Sets the position.
- /// </summary>
- /// <param name="ellipse">The ellipse.</param>
- /// <param name="offset">The offset.</param>
- /// <param name="posOffSet">The pos off set.</param>
- /// <param name="step">The step to change.</param>
- private static void SetPosition(DependencyObject ellipse, double offset, double posOffSet, double step)
- {
- ellipse.SetValue(Canvas.LeftProperty, 50 + (Math.Sin(offset + (posOffSet * step)) * 50));
- ellipse.SetValue(Canvas.TopProperty, 50 + (Math.Cos(offset + (posOffSet * step)) * 50));
- }
-
- /// <summary>
- /// Starts this instance.
- /// </summary>
- private void Start()
- {
- this.timer.Tick += this.OnTick;
- this.timer.Start();
- }
-
- /// <summary>
- /// Stops this instance.
- /// </summary>
- private void Stop()
- {
- this.timer.Stop();
- this.timer.Tick -= this.OnTick;
- }
-
- /// <summary>
- /// Run the Animation
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void OnTick(object sender, EventArgs e)
- {
- this.rotate.Angle = (this.rotate.Angle + 36) % 360;
- }
-
- /// <summary>
- /// Start and Stop the effect when the visibility changes
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void OnVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
- {
- if ((bool)e.NewValue)
- {
- Start();
- }
- else
- {
- Stop();
- }
- }
-
- /// <summary>
- /// Setup the Canvas
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void CanvasLoaded(object sender, RoutedEventArgs e)
- {
- SetPosition(this.circle0, Math.PI, 0.0, Step);
- SetPosition(this.circle1, Math.PI, 1.0, Step);
- SetPosition(this.circle2, Math.PI, 2.0, Step);
- SetPosition(this.circle3, Math.PI, 3.0, Step);
- SetPosition(this.circle4, Math.PI, 4.0, Step);
- SetPosition(this.circle5, Math.PI, 5.0, Step);
- SetPosition(this.circle6, Math.PI, 6.0, Step);
- SetPosition(this.circle7, Math.PI, 7.0, Step);
- SetPosition(this.circle8, Math.PI, 8.0, Step);
- }
-
- /// <summary>
- /// Stop when we unload this canvas
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void CanvasUnloaded(object sender, RoutedEventArgs e)
- {
- Stop();
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Queue/InlineQueueConverter.cs Deleted

@@ -1,46 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InlineQueueConverter.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// A Converter to handle the UI re-arrangement for in-line queue.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Converters.Queue
-{
- using System;
- using System.Globalization;
- using System.Windows;
- using System.Windows.Data;
-
- public class InlineQueueConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- // Parameter = True is Flipped logic.
- if (parameter is string && "true".Equals(parameter))
- {
- if (value is bool && (bool)value)
- {
- return new GridLength(1, GridUnitType.Star);
- }
-
- return GridLength.Auto;
- }
-
- // Parameter = False
- if (value is bool && (bool)value)
- {
- return GridLength.Auto;
- }
-
- return new GridLength(1, GridUnitType.Star);
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- return new GridLength(1, GridUnitType.Star);
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConveter.cs Deleted

@@ -1,96 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PictureSettingsDescConveter.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the PictureSettingsDescConveter type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Converters.Queue
-{
- using System;
- using System.Globalization;
- using System.Windows.Data;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrakeWPF.Services.Encode.Model;
-
- /// <summary>
- /// The picture settings desc conveter.
- /// </summary>
- public class PictureSettingsDescConveter : IValueConverter
- {
- /// <summary>
- /// Provides a textual description of the picture settings of an encode task.
- /// </summary>
- /// <param name="value">
- /// The value.
- /// </param>
- /// <param name="targetType">
- /// The target type.
- /// </param>
- /// <param name="parameter">
- /// The parameter.
- /// </param>
- /// <param name="culture">
- /// The culture.
- /// </param>
- /// <returns>
- /// The <see cref="object"/>.
- /// </returns>
- public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
- {
- EncodeTask task = value as EncodeTask;
- if (task != null)
- {
- string resolution = string.Empty;
- switch (task.Anamorphic)
- {
- case Anamorphic.Automatic:
- resolution = "Anamorphic: Automatic";
- break;
- case Anamorphic.Loose:
- resolution = "Anamorphic: Loose, Width: " + task.Width;
- break;
- case Anamorphic.Custom:
- resolution = "Anamorphic: Custom, Resolution: " + task.Width + "x" + task.Height;
- break;
- case Anamorphic.None:
- resolution = "Resolution: " + task.Width + "x" + task.Height;
- break;
- }
-
- return resolution + Environment.NewLine + "Crop Top: " + task.Cropping.Top + ", Bottom: " + task.Cropping.Bottom + ", Left: "
- + task.Cropping.Left + ", Right: " + task.Cropping.Right;
- }
-
- return string.Empty;
- }
-
- /// <summary>
- /// The convert back.
- /// </summary>
- /// <param name="value">
- /// The value.
- /// </param>
- /// <param name="targetType">
- /// The target type.
- /// </param>
- /// <param name="parameter">
- /// The parameter.
- /// </param>
- /// <param name="culture">
- /// The culture.
- /// </param>
- /// <returns>
- /// The <see cref="object"/>.
- /// </returns>
- /// <exception cref="NotImplementedException">
- /// Not Used
- /// </exception>
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
- {
- throw new NotImplementedException();
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/HandBrakeWPF.csproj.DotSettings Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/PictureSize.cs Deleted

@@ -1,217 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PictureSize.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the PictureSize type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Helpers
-{
- using Caliburn.Micro;
-
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- using HandBrakeWPF.Services.Interfaces;
-
- /// <summary>
- /// The picture size Helpers
- /// </summary>
- public class PictureSize
- {
- /// <summary>
- /// The picture settings job.
- /// </summary>
- public class PictureSettingsJob
- {
- /// <summary>
- /// Gets or sets the crop.
- /// </summary>
- public Cropping Crop { get; set; }
-
- /// <summary>
- /// Gets or sets the modulus.
- /// </summary>
- public int? Modulus { get; set; }
-
- /// <summary>
- /// Gets or sets the par w.
- /// </summary>
- public int ParW { get; set; }
-
- /// <summary>
- /// Gets or sets the par h.
- /// </summary>
- public int ParH { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether itu par.
- /// </summary>
- public bool ItuPar { get; set; }
-
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the anamorphic mode.
- /// </summary>
- public Anamorphic AnamorphicMode { get; set; }
-
- /// <summary>
- /// Gets or sets the max width.
- /// </summary>
- public int MaxWidth { get; set; }
-
- /// <summary>
- /// Gets or sets the max height.
- /// </summary>
- public int MaxHeight { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether keep display aspect.
- /// </summary>
- public bool KeepDisplayAspect { get; set; }
-
- /// <summary>
- /// Gets or sets the dar width.
- /// </summary>
- public int DarWidth { get; set; }
-
- /// <summary>
- /// Gets or sets the dar height.
- /// </summary>
- public int DarHeight { get; set; }
- }
-
- /// <summary>
- /// The picture settings title.
- /// </summary>
- public class PictureSettingsTitle
- {
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
- public int Width { get; set; }
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
- public int Height { get; set; }
-
- /// <summary>
- /// Gets or sets the par w.
- /// </summary>
- public int ParW { get; set; }
-
- /// <summary>
- /// Gets or sets the par h.
- /// </summary>
- public int ParH { get; set; }
-
- /// <summary>
- /// Gets or sets the aspect.
- /// </summary>
- public double Aspect { get; set; }
- }
-
- /// <summary>
- /// The anamorphic result.
- /// </summary>
- public class AnamorphicResult
- {
- /// <summary>
- /// Gets or sets the output width.
- /// </summary>
- public int OutputWidth { get; set; }
-
- /// <summary>
- /// Gets or sets the output height.
- /// </summary>
- public int OutputHeight { get; set; }
-
- /// <summary>
- /// Gets or sets the output par width.
- /// </summary>
- public double OutputParWidth { get; set; }
-
- /// <summary>
- /// Gets or sets the output par height.
- /// </summary>
- public double OutputParHeight { get; set; }
- }
-
- /// <summary>
- /// The keep setting.
- /// </summary>
- public enum KeepSetting
- {
- HB_KEEP_WIDTH = 0x01,
- HB_KEEP_HEIGHT = 0x02,
- HB_KEEP_DISPLAY_ASPECT = 0x04
- }
-
- /// <summary>
- /// The hb_set_anamorphic_size 2.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <param name="title">
- /// The title.
- /// </param>
- /// <param name="setting">
- /// The setting.
- /// </param>
- /// <returns>
- /// The <see cref="AnamorphicResult"/>.
- /// </returns>
- public static AnamorphicResult hb_set_anamorphic_size2(PictureSettingsJob job, PictureSettingsTitle title, KeepSetting setting)
- {
- int settingMode = (int)setting + (job.KeepDisplayAspect ? 0x04 : 0);
-
- hb_geometry_settings_s uiGeometry = new hb_geometry_settings_s
- {
- crop = new { job.Crop.Top, job.Crop.Bottom, job.Crop.Left, job.Crop.Right },
- itu_par = 0,
- keep = settingMode,
- maxWidth = job.MaxWidth,
- maxHeight = job.MaxHeight,
- mode = (int)job.AnamorphicMode,
- modulus = job.Modulus.HasValue ? job.Modulus.Value : 16,
- geometry = new hb_geometry_s { height = job.Height, width = job.Width, par = job.AnamorphicMode != Anamorphic.Custom ? new hb_rational_t { den = title.ParH, num = title.ParW } : new hb_rational_t { den = job.ParH, num = job.ParW } }
- };
-
- hb_geometry_s sourceGeometry = new hb_geometry_s
- {
- width = title.Width,
- height = title.Height,
- par = new hb_rational_t { den = title.ParH, num = title.ParW }
- };
-
- hb_geometry_s result = new hb_geometry_s();
-
- IHbFunctionsProvider provider = IoC.Get<IHbFunctionsProvider>(); // TODO make this method non static and remove IoC call.
- IHbFunctions hbFunctions = provider.GetHbFunctionsWrapper();
-
- hbFunctions.hb_set_anamorphic_size2(ref sourceGeometry, ref uiGeometry, ref result);
-
- int outputWidth = result.width;
- int outputHeight = result.height;
- int outputParWidth = result.par.num;
- int outputParHeight = result.par.den;
- return new AnamorphicResult { OutputWidth = outputWidth, OutputHeight = outputHeight, OutputParWidth = outputParWidth, OutputParHeight = outputParHeight };
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/TreeViewHelper.cs Deleted

@@ -1,93 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="TreeViewHelper.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Helper functions for handling <see cref="TimeSpan" /> structures
-// Based of https://social.technet.microsoft.com/wiki/contents/articles/18188.wpf-treeview-selecteditem-twoway-mvvm-plus-expand-to-selected-and-close-all-others.aspx
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-namespace HandBrakeWPF.Helpers
-{
- using System.Windows;
- using System.Windows.Controls;
-
- public class TreeViewHelper
- {
- public static object GetTreeViewSelectedItem(DependencyObject obj)
- {
- return (object)obj.GetValue(TreeViewSelectedItemProperty);
- }
-
- public static void SetTreeViewSelectedItem(DependencyObject obj, object value)
- {
- obj.SetValue(TreeViewSelectedItemProperty, value);
- }
-
- public static readonly DependencyProperty TreeViewSelectedItemProperty =
- DependencyProperty.RegisterAttached("TreeViewSelectedItem", typeof(object), typeof(TreeViewHelper), new PropertyMetadata(new object(), TreeViewSelectedItemChanged));
-
- private static void TreeViewSelectedItemChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
- {
- TreeView treeView = sender as TreeView;
- if (treeView == null)
- {
- return;
- }
-
- treeView.SelectedItemChanged -= TreeView_SelectedItemChanged;
- treeView.SelectedItemChanged += TreeView_SelectedItemChanged;
-
- TreeViewItem thisItem = treeView.ItemContainerGenerator.ContainerFromItem(e.NewValue) as TreeViewItem;
- if (thisItem != null)
- {
- thisItem.IsSelected = true;
- return;
- }
-
- for (int i = 0; i < treeView.Items.Count; i++)
- {
- if (SelectItem(e.NewValue, treeView.ItemContainerGenerator.ContainerFromIndex(i) as TreeViewItem))
- {
- return; // Break out the loop. We've found the item and expanded it's parent if necessary.
- }
- }
- }
-
- private static void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
- {
- TreeView treeView = sender as TreeView;
- SetTreeViewSelectedItem(treeView, e.NewValue);
- }
-
- private static bool SelectItem(object o, TreeViewItem parentItem)
- {
- if (parentItem == null)
- {
- return false;
- }
-
- bool found = false;
- foreach (var item in parentItem.Items)
- {
- if (item.Equals(o))
- {
- found = true;
- break;
- }
- }
-
- if (found)
- {
- bool isExpanded = parentItem.IsExpanded;
- if (!isExpanded)
- {
- parentItem.IsExpanded = true;
- parentItem.UpdateLayout();
- }
- }
-
- return found;
- }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Picture/PresetPictureSettingsMode.cs Deleted

@@ -1,30 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="PresetPictureSettingsMode.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Picture Settings Mode when adding presets
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Model.Picture
-{
- using HandBrake.Interop.Attributes;
-
- using HandBrakeWPF.Properties;
-
- /// <summary>
- /// Picture Settings Mode when adding presets
- /// </summary>
- public enum PresetPictureSettingsMode
- {
- DisplayName(typeof(Resources), "PresetPictureSettingsMode_None")
- None = 0,
-
- DisplayName(typeof(Resources), "PresetPictureSettingsMode_Custom")
- Custom = 1,
-
- DisplayName(typeof(Resources), "PresetPictureSettingsMode_SourceMaximum")
- SourceMaximum = 2,
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.zh.resx Deleted

@@ -1,2167 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- 
- <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="Video_EncoderExtraArgs" xml:space="preserve">
- <value>完整的编码器参数列表：
-{0}</value>
- </data>
- <data name="Video_x264FastDecode" xml:space="preserve">
- <value>减少解码器对CPU的占用。
-
-当你的设备无法流畅播放输出时选择此选项。（例如： 丢帧）</value>
- </data>
- <data name="Video_LosslessWarning" xml:space="preserve">
- <value>警告： RF 0 表示无损！</value>
- </data>
- <data name="Video_LosslessWarningTooltip" xml:space="preserve">
- <value>值为“0”表示无损，将导致文件大小大于原始源，除非源文件也是无损的。
-
-使用x264和x265时比例是对数的，较低的值对应于较高的质量。
-
-因此，即使值的小幅减少也会导致文件大小逐渐增大。</value>
- </data>
- <data name="AddPreset_PictureSizeMode" xml:space="preserve">
- <value>您可以选择使用此预设存储图像设置。有3种模式：
-None: 图像设置不存储在预设中。加载源时，它们将保持在源分辨率的范围内。这也会影响变形、模量、裁剪等。
-
-Custom: 您可以选择设置最大宽度和高度。这样做时，输出视频的宽度和高度不会超过设定值。保持宽高比将自动打开。
-Source Maximum: 始终在源分辨率下进行编码。</value>
- </data>
- <data name="About_GPL" xml:space="preserve">
- <value>版权所有 (C) 2003-2019 HandBrake 团队
-
-这个程序是免费软件；您可以依据自由软件基金会发布的
-GNU通用公共许可证的条款重新分发和/或修改它；无论你依据的是
-本授权的第2版，或（根据您的选择）任何更高版本。
-
-本程序是基于使用的目的而加以发布，但没有任何担保责任；甚至没有适销性或
-特定用途适用性的暗示性担保。有关更多详细信息，请参阅GNU通用公共许可证。
-
-您应已收到附随此程序的GNU通用公共许可证的副本；如果没有，请写信给自由软件基金会
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
- </data>
- <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
- <value>警告：自动文件命名选项未打开。请在设置中开启。</value>
- </data>
- <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
- <value>警告：您当前没有自动选择音频和字幕轨道的设置。您可以在选项中设置默认轨道选择行为。</value>
- </data>
- <data name="Presets_ResetComplete" xml:space="preserve">
- <value>内置的预设已被重置。</value>
- </data>
- <data name="Presets_ResetHeader" xml:space="preserve">
- <value>重置完成</value>
- </data>
- <data name="Video_HigherQuality" xml:space="preserve">
- <value>高质量 |</value>
- </data>
- <data name="Video_LowQuality" xml:space="preserve">
- <value>| 低质量</value>
- </data>
- <data name="Video_PlaceboQuality" xml:space="preserve">
- <value>最高质量 |</value>
- </data>
- <data name="Error" xml:space="preserve">
- <value>错误</value>
- </data>
- <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
- <value>警告：如果您希望为要列队的每个项目添加字幕，请确认您在字幕选项卡上正确设置了字幕默认设置。
- 
-你想继续吗？</value>
- </data>
- <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
- <value>在添加到队列之前，必须启用自动文件命名并在首选项中设置默认路径。</value>
- </data>
- <data name="Warning" xml:space="preserve">
- <value>警告</value>
- </data>
- <data name="AreYouSure" xml:space="preserve">
- <value>你确定吗？</value>
- </data>
- <data name="HandBrake_Title" xml:space="preserve">
- <value>HandBrake</value>
- </data>
- <data name="Main_AlreadyEncoding" xml:space="preserve">
- <value>HandBrake 已在进行编码。</value>
- </data>
- <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
- <value>队列中的作业具有相同的目标路径。请为此作业选择不同的路径。</value>
- </data>
- <data name="Main_JobsPending_addon" xml:space="preserve">
- <value> 等待工作 {0}</value>
- </data>
- <data name="Main_NewDefaultPreset" xml:space="preserve">
- <value>新的默认预设集：{0}</value>
- </data>
- <data name="Main_NewUpdate" xml:space="preserve">
- <value>有新的更新可用。转到“工具”菜单 &gt; “选项”安装</value>
- </data>
- <data name="Main_NoPresetSelected" xml:space="preserve">
- <value>未选择预设。</value>
- </data>
- <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
- <value>您无法修改内置预设。请选择一个您自己的预设。</value>
- </data>
- <data name="Main_PleaseSelectFolder" xml:space="preserve">
- <value>请选择一个文件夹。</value>
- </data>
- <data name="Main_PreparingToEncode" xml:space="preserve">
- <value>正在准备编码…</value>
- </data>
- <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
- <value>您无法导入与内置预设同名的预设。</value>
- </data>
- <data name="Main_PresetOverwriteWarning" xml:space="preserve">
- <value>预设 "{0}" 已经存在。你想覆盖它吗？</value>
- </data>
- <data name="Main_Presets" xml:space="preserve">
- <value>预设</value>
- </data>
- <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
- <value>您确定要更新所选预设吗？</value>
- </data>
- <data name="Main_PresetUpdated" xml:space="preserve">
- <value>预设现在已使用您当前的设置进行更新。</value>
- </data>
- <data name="Main_PresetUpdateNotification" xml:space="preserve">
- <value>HandBrake 已确认你的内置预设已过期... 现在将更新这些预设。
-您的自定义预设尚未更新，因此您可能需要通过删除和重新添加来重新创建这些预设。
-以前的 user_presets.xml 文件已备份。</value>
- </data>
- <data name="Main_QueueFinished" xml:space="preserve">
- <value>队列完成</value>
- </data>
- <data name="Main_ScanCancelled" xml:space="preserve">
- <value>扫描取消。</value>
- </data>
- <data name="Main_ScanCompleted" xml:space="preserve">
- <value>扫描完成</value>
- </data>
- <data name="Main_ScanFailed_NoReason" xml:space="preserve">
- <value>扫描失败：</value>
- </data>
- <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
- <value>扫描失败...有关详细信息，请参阅活动日志。</value>
- </data>
- <data name="Main_ScanningPleaseWait" xml:space="preserve">
- <value>正在扫描源，请稍候…</value>
- </data>
- <data name="Main_ScanningTitleXOfY" xml:space="preserve">
- <value>正在扫描标题 {0}/{1} ({2}%)</value>
- </data>
- <data name="Main_ScanSource" xml:space="preserve">
- <value>在开始编码之前，必须首先扫描源并设置作业。单击工具栏上的“添加源”按钮继续。</value>
- </data>
- <data name="Main_SelectPreset" xml:space="preserve">
- <value>请确保您已选择自己的预设。请注意，您无法导出内置预设。</value>
- </data>
- <data name="Main_SelectPresetForUpdate" xml:space="preserve">
- <value>请选择要更新的预设。</value>
- </data>
- <data name="Main_SelectSource" xml:space="preserve">
- <value>选择“源”以继续</value>
- </data>
- <data name="Main_XEncodesPending" xml:space="preserve">
- <value>{0} 等待编码</value>
- </data>
- <data name="Notice" xml:space="preserve">
- <value>注意</value>
- </data>
- <data name="Overwrite" xml:space="preserve">
- <value>是否覆盖？</value>
- </data>
- <data name="Question" xml:space="preserve">
- <value>问题</value>
- </data>
- <data name="State_Ready" xml:space="preserve">
- <value>准备就绪</value>
- </data>
- <data name="Updated" xml:space="preserve">
- <value>更新</value>
- </data>
- <data name="Preset_OldVersion_Header" xml:space="preserve">
- <value>预设版本</value>
- </data>
- <data name="Preset_OldVersion_Message" xml:space="preserve">
- <value>您尝试导入的预设来自不同版本的 HandBrake。
-可能无法从此预设中导入所有值。
-
-你要继续吗？</value>
- </data>
- <data name="Preset_UnableToImport_Header" xml:space="preserve">
- <value>无法导入预设！</value>
- </data>
- <data name="Preset_UnableToImport_Message" xml:space="preserve">
- <value>无法导入预设，因为它似乎已损坏或来自旧版本的 HandBrake。</value>
- </data>
- <data name="Main_SetDestination" xml:space="preserve">
- <value>在添加到队列之前，必须先为输出文件设置目标路径。</value>
- </data>
- <data name="Main_InvalidDestination" xml:space="preserve">
- <value>输入的目标路径包含非法字符，将不会更新。</value>
- </data>
- <data name="Preview" xml:space="preserve">
- <value>预览{0}</value>
- </data>
- <data name="Preview_Scaled" xml:space="preserve">
- <value>预览（缩放）</value>
- </data>
- <data name="PictureSettings_OutputResolution" xml:space="preserve">
- <value>输出：{0}</value>
- </data>
- <data name="Options_AdditionalFormatOptions" xml:space="preserve">
- <value>输出文件的格式。除了任何受支持的文件系统字符之外，您还可以使用以下占位符，这些占位符将在更改标题或扫描源时被替换。
-
-实时更新选项：{source} {title} {chapters} 
-非实时选项：{date} {time} {creation-date} {creation-time} {quality} {bitrate} （只有扫描新源、更改标题或章节时才会更改）</value>
- </data>
- <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
- <value>可用的附加选项: {source_path} 或 {source_folder_name} 或 {source}</value>
- </data>
- <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
- <value>您不能编码到与源文件具有相同路径和文件名的文件。请更新目标文件名，使其与源文件不匹配。</value>
- </data>
- <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
- <value>您的系统阻止了 HandBrake 启动Web浏览器。</value>
- </data>
- <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
- <value>您仍然可以直接访问网站的帮助页面：https://handbrake.fr</value>
- </data>
- <data name="Main_PresetImportFailed" xml:space="preserve">
- <value>无法导入所选预设。</value>
- </data>
- <data name="Main_PresetImportFailedSolution" xml:space="preserve">
- <value>预设可能已损坏，或者来自不受支持的旧版 HandBrake。
-必须在当前版本中重新创建旧版本的预设。</value>
- </data>
- <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
- <value>可以传递给视频编码器的其他高级参数。</value>
- </data>
- <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
- <value>None - 只有容器不支持的轨道才会被烧入。
-Foreign Audio Track - 如果可用，外语轨道将被烧入。
-First Track - 第一条轨道会被烧入。
-Foreign Audio Preferred, else First - 如果存在外语轨道，则会将其烧入，否则将选择第一条轨道。</value>
- </data>
- <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
- <value>WebM 字幕兼容性</value>
- </data>
- <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
- <value>HandBrake中的WebM格式仅支持内镶字幕。
-
-您应该更改字幕选择。
-
-如果继续，您未烧录的字幕将丢失。</value>
- </data>
- <data name="Main_ScanNoTitlesFound" xml:space="preserve">
- <value>找不到有效的源或标题。</value>
- </data>
- <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
- <value>HandBrake 不能对选定的来源进行编码，因为它没有找到一个可以编码的有效来源。
-这可能是由于以下原因之一：
-- 每个源标题的持续时间低于“首选项&gt;高级”中的“最小标题持续时间”阈值选项。
-- 源文件不是有效的视频文件，或者是HandBrake不支持的格式。
-- 源可以是受复制保护的或包括DRM。请注意，HandBrake不支持删除复制保护。
-
-活动日志可能包含更多信息。</value>
- </data>
- <data name="Main_QueueLabel" xml:space="preserve">
- <value>队列{0}</value>
- </data>
- <data name="Main_Start" xml:space="preserve">
- <value>开始编码</value>
- </data>
- <data name="Main_StartQueue" xml:space="preserve">
- <value>启动队列</value>
- </data>
- <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
- <value>不能删除默认预设。请先将另一个预设设置为默认值。</value>
- </data>
- <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
- <value>您确定要删除预设：</value>
- </data>
- <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>编码中：Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均FPS: {4:000.0}, 剩余时间：{5}, 已用时间：{6:d\:hh\:mm\:ss} {7}</value>
- </data>
- <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
- <value>预设必须有名称。请填写预设名称字段。</value>
- </data>
- <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
- <value>已存在具有此名称的预设。 你想覆盖它吗？</value>
- </data>
- <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
- <value>必须先扫描源才能使用“源最大值”选项。</value>
- </data>
- <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
- <value>必须为“自定义”选项填写自定义宽度或高度字段。</value>
- </data>
- <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
- <value>无法添加预设</value>
- </data>
- <data name="UnknownError" xml:space="preserve">
- <value>未知错误</value>
- </data>
- <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
- <value>音频默认值</value>
- </data>
- <data name="AudioViewModel_AudioTracks" xml:space="preserve">
- <value>音轨</value>
- </data>
- <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
- <value>选择行为</value>
- </data>
- <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
- <value>切换回轨道</value>
- </data>
- <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
- <value>无法保存章节标记文件！</value>
- </data>
- <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
- <value>章节标记名称不会保存在您的编码中。</value>
- </data>
- <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
- <value>以下操作 “{0}”将在{1}内发生。</value>
- </data>
- <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
- <value>如果问题仍然存在，请尝试重新启动 HandBrake。</value>
- </data>
- <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
- <value>没有关于此错误的更多信息。</value>
- </data>
- <data name="ErrorViewModel_UnknownError" xml:space="preserve">
- <value>出现未知错误。</value>
- </data>
- <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
- <value>有一个新的更新！请查看网站上的发行说明。</value>
- </data>
- <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
- <value>您的系统支持64位版本的 HandBrake！ 与32位版本相比，提供了性能和稳定性改进。
- 请查看网站上的发行说明。</value>
- </data>
- <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
- <value>目前没有新的更新。</value>
- </data>
- <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
- <value>更新已下载</value>
- </data>
- <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
- <value>更新服务不可用。您可以尝试从 https://handbrake.fr 下载更新</value>
- </data>
- <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
- <value>更新失败。您可以尝试从 https://handbrake.fr 下载更新</value>
- </data>
- <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
- <value>显示尺寸： {0}x{1}, PAR {2}x{3}</value>
- </data>
- <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
- <value>添加到队列中</value>
- </data>
- <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
- <value>没有在等待的编码</value>
- </data>
- <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
- <value>当前没有编码作业</value>
- </data>
- <data name="QueueViewModel_Queue" xml:space="preserve">
- <value>队列</value>
- </data>
- <data name="QueueViewModel_ClearQueueConfrimation" xml:space="preserve">
- <value>你确定要清除队列吗？</value>
- </data>
- <data name="Confirm" xml:space="preserve">
- <value>确认</value>
- </data>
- <data name="QueueViewModel_JobsPending" xml:space="preserve">
- <value>{0} 等待作业</value>
- </data>
- <data name="QueueViewModel_QueuePending" xml:space="preserve">
- <value>列队已暂停</value>
- </data>
- <data name="QueueViewModel_QueuePauseNotice" xml:space="preserve">
- <value>队列已暂停。当前正在运行的作业将运行完成，不会再启动其他作业。</value>
- </data>
- <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
- <value>您确定要删除所选作业吗？</value>
- </data>
- <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
- <value>此编码目前正在进行中。如果删除它，编码将停止。你确定要继续吗？</value>
- </data>
- <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
- <value>没有待处理的作业。</value>
- </data>
- <data name="QueueViewModel_EditConfrimation" xml:space="preserve">
- <value>是否确实要编辑此作业？它将从队列中删除并发送到主窗口。</value>
- </data>
- <data name="QueueViewModel_QueueReady" xml:space="preserve">
- <value>队列已就绪</value>
- </data>
- <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
- <value>队列未运行</value>
- </data>
- <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
- <value>队列已完成</value>
- </data>
- <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
- <value>上次列队的作业已完成</value>
- </data>
- <data name="QueueViewModel_QueueStarted" xml:space="preserve">
- <value>列队已开始</value>
- </data>
- <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
- <value>编码中：Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均FPS: {4:000.0}, 剩余时间：{5}, 已用时间：{6:d\:hh\:mm\:ss}</value>
- </data>
- <data name="ShellViewModel_CanClose" xml:space="preserve">
- <value>当前正在运行编码。退出 HandBrake 将停止此编码。
-你确定要退出 HandBrake 吗？</value>
- </data>
- <data name="StaticPreviewViewModel_Title" xml:space="preserve">
- <value>图片预览</value>
- </data>
- <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
- <value>无法删除以前的预览文件。您可能需要重新启动应用程序。</value>
- </data>
- <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
- <value>在创建预览之前，必须先扫描源并设置编码。</value>
- </data>
- <data name="StaticPreviewViewModel_UnableToFindVLC" xml:space="preserve">
- <value>无法检测到 VLC 播放器。
-请确保已安装 VLC 并且 HandBrake 选项中指定的目录是正确的。（请参阅：“工具菜单 &gt; 首选项 &gt; 常规”）</value>
- </data>
- <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
- <value>无法找到预览文件。文件已删除或编码失败。检查活动日志以获取详细信息。</value>
- </data>
- <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
- <value>Handbrake 已经在编码视频了！ 一次只能编码一个文件。</value>
- </data>
- <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
- <value>字幕默认值</value>
- </data>
- <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
- <value>字幕轨道</value>
- </data>
- <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
- <value>切换回轨道</value>
- </data>
- <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
- <value>选择行为</value>
- </data>
- <data name="PresetService_ArchiveFile" xml:space="preserve">
- <value>存档的文件：</value>
- </data>
- <data name="PresetService_UnableToLoad" xml:space="preserve">
- <value>无法加载预设。</value>
- </data>
- <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
- <value>HandBrake 无法加载您的预设文件。它可能来自较旧的不受支持的 HandBrake 版本或已损坏。
-
-您的旧预设文件已归档为：</value>
- </data>
- <data name="Main_QueueFinishedErrors" xml:space="preserve">
- <value> 有{0} 个错误或取消检测。</value>
- </data>
- <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
- <value>磁盘空间不足</value>
- </data>
- <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
- <value>警告，您的磁盘空间不足。如果空间不足，HandBrake 将无法完成此编码。</value>
- </data>
- <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
- <value>第{0}行无效。不会导入任何内容。</value>
- </data>
- <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
- <value>无法导入章节文件</value>
- </data>
- <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
- <value>章节文件中的所有行必须至少有2列数据</value>
- </data>
- <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
- <value>章节文件中的第一列只能包含大于零（0）的整数值</value>
- </data>
- <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
- <value>目前不支持类型为 '{0}' 的章节文件。</value>
- </data>
- <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
- <value>不支持的章节文件类型</value>
- </data>
- <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
- <value>源媒体的章节信息无效</value>
- </data>
- <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
- <value>媒体源的章节数和输入文件的章节数不匹配( {0} vs {1}).
-
-你依然要导入章节名吗？</value>
- </data>
- <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
- <value>媒体源的章节数和输入文件的章节数不匹配( {0} vs {1}).
-
-你依然要导入章节名吗？</value>
- </data>
- <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
- <value>源文件和输入文件的章节数不匹配</value>
- </data>
- <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
- <value>源媒体上各章的持续时长和输入文件中各章的持续时长相差很大。
-
-本章节文件很可能是从其他源媒体生成的。
-
-确实要导入章节名称吗？</value>
- </data>
- <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
- <value>源文件和输入文件的章节时长不匹配</value>
- </data>
- <data name="ScanService_ScanStopFailed" xml:space="preserve">
- <value>尝试停止扫描时发生了错误。请重启HandBrake。</value>
- </data>
- <data name="Presets_PresetForceReset" xml:space="preserve">
- <value>HandBrake 无法将预设文件升级为新版本格式。
-您的预设文件将被存档。您需要重新创建自己的预设。</value>
- </data>
- <data name="SettingService_SaveErrorReset" xml:space="preserve">
- <value>你所更改的任何设置可能会在下次HandBrake 启动时被重置。</value>
- </data>
- <data name="UserSettings_AnErrorOccured" xml:space="preserve">
- <value>尝试保存你的偏好设置时出现了问题。</value>
- </data>
- <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
- <value>警告，你的设置已被重置！</value>
- </data>
- <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
- <value>你的用户设置文件已损坏或不可访问。设置已经被恢复为默认。</value>
- </data>
- <data name="UserSettings_UnableToLoad" xml:space="preserve">
- <value>无法加载用户设置文件: {0}</value>
- </data>
- <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
- <value>你的用户设置文件似乎无法访问或已损坏。你可能需要删除它并让HandBrake 生成一份新的。</value>
- </data>
- <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
- <value>你选择的输出目录不存在或者没有写入文件的权限。</value>
- </data>
- <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
- <value>创建文件夹？</value>
- </data>
- <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
- <value>要写入的文件夹并不存在。你希望HandBrake创建该文件夹吗？
-{0}</value>
- </data>
- <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
- <value>无法启动目标目录。</value>
- </data>
- <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
- <value>请检查目标目录是否有效。</value>
- </data>
- <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
- <value>处理中 Pass {0}/{1}, (字幕扫描) {2:00.00}%, 扫描剩余时间：{3}, 已用时间：{4:d\:hh\:mm\:ss}</value>
- </data>
- <data name="NoAdditionalInformation" xml:space="preserve">
- <value>没有附加信息</value>
- </data>
- <data name="WindowTitleStatus" xml:space="preserve">
- <value>{0} - ({1}%, 已完成 {2} /{3} )</value>
- </data>
- <data name="TaskTrayStatusTitle" xml:space="preserve">
- <value>{1}%, 已完成 {2} / {3}
-剩余时间: {4}</value>
- </data>
- <data name="PauseOnLowDiskspace" xml:space="preserve">
- <value>队列已暂停。警告，您编码的驱动器磁盘空间不足。请释放一些空间，然后按开始继续。您还可以调整首选项中的最小空间级别。</value>
- </data>
- <data name="Main_QueuePaused" xml:space="preserve">
- <value>列队已暂停</value>
- </data>
- <data name="QueueViewModel_QueuePaused" xml:space="preserve">
- <value>列队已暂停</value>
- </data>
- <data name="Main_LowDiskspace" xml:space="preserve">
- <value>目标目录的磁盘空间不足。请在目标驱动器上释放一些磁盘空间。或者，您可以在“选项”中更改此警报触发的级别。</value>
- </data>
- <data name="Queue_UnableToResetJob" xml:space="preserve">
- <value>无法重置作业状态，因为它未处于错误或已完成状态</value>
- </data>
- <data name="Queue_UnableToRestoreFile" xml:space="preserve">
- <value>无法恢复队列文件。</value>
- </data>
- <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
- <value>文件可能损坏或是来自旧的不兼容版本的HandBrake</value>
- </data>
- <data name="Queue_AlreadyEncoding" xml:space="preserve">
- <value>HandBrake已经在编码文件中。</value>
- </data>
- <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
- <value>请停止当前编码。如果问题依然存在，请重启HandBrake。</value>
- </data>
- <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>编码中: Pass {0}/{1}, {2:00.00}%
-FPS: {3:000.0}, 平均FPS: {4:000.0}
-剩余时间: {5}, 已用时间: {6:d\:hh\:mm\:ss}</value>
- </data>
- <data name="StaticPreviewView_Title" xml:space="preserve">
- <value>预览 ({0}% 实际大小)</value>
- </data>
- <data name="OsBitnessWarning" xml:space="preserve">
- <value>HandBrake需要在64bit Windows 7或更高版本中运行。</value>
- </data>
- <data name="OsVersionWarning" xml:space="preserve">
- <value>HandBrake 需要Windows 7或更高版本才能运行。版本0.9.9 (XP)和版本0.10.5 (Vista)是支持这些版本的最后一个版本。</value>
- </data>
- <data name="Main_ContinueAddingToQueue" xml:space="preserve">
- <value>你希望继续尝试添加剩下的吗？</value>
- </data>
- <data name="Main_QueueOverwritePrompt" xml:space="preserve">
- <value>文件 '{0}' 已存在!
-你想要覆盖它吗?</value>
- </data>
- <data name="Clipboard_Unavailable" xml:space="preserve">
- <value>系统剪贴板目前无法使用。</value>
- </data>
- <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
- <value>这可能是由于另外的应用程序正监视或锁定了剪贴板。当剪贴板解锁后你才能继续使用它。</value>
- </data>
- <data name="AboutView_License" xml:space="preserve">
- <value>许可：</value>
- </data>
- <data name="AboutView_Version" xml:space="preserve">
- <value>版本：</value>
- </data>
- <data name="AddPresetView_AddNewCategory" xml:space="preserve">
- <value>-- 添加新类别 --</value>
- </data>
- <data name="AddPresetView_AddPreset" xml:space="preserve">
- <value>添加预设</value>
- </data>
- <data name="AddPresetView_Category" xml:space="preserve">
- <value>类别：</value>
- </data>
- <data name="AddPresetView_Description" xml:space="preserve">
- <value>描述：</value>
- </data>
- <data name="AddPresetView_Name" xml:space="preserve">
- <value>名字：</value>
- </data>
- <data name="AddPresetView_SavePictureSize" xml:space="preserve">
- <value>尺寸：</value>
- </data>
- <data name="AudioDefaultView_Behaviours" xml:space="preserve">
- <value>轨道源选择</value>
- </data>
- <data name="AudioView_AllowPassThruOf" xml:space="preserve">
- <value>允许通过：</value>
- </data>
- <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
- <value>配置在选择新标题或源视频时如何自动选择和配置音频轨道。</value>
- </data>
- <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
- <value>“自动通过” 行为：</value>
- </data>
- <data name="AudioView_Bitrate" xml:space="preserve">
- <value>比特率</value>
- </data>
- <data name="AudioView_Codec" xml:space="preserve">
- <value>编码</value>
- </data>
- <data name="AudioView_DRC" xml:space="preserve">
- <value>DRC</value>
- </data>
- <data name="AudioView_Gain" xml:space="preserve">
- <value>增益</value>
- </data>
- <data name="AudioView_Hide" xml:space="preserve">
- <value>隐藏</value>
- </data>
- <data name="AudioView_Mixdown" xml:space="preserve">
- <value>混音</value>
- </data>
- <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
- <value>后备编码器：</value>
- </data>
- <data name="AudioView_ReloadDefaults" xml:space="preserve">
- <value>重新加载</value>
- </data>
- <data name="AudioView_Samplerate" xml:space="preserve">
- <value>采样率</value>
- </data>
- <data name="AudioView_Show" xml:space="preserve">
- <value>显示</value>
- </data>
- <data name="AudioView_TrackName" xml:space="preserve">
- <value>轨道名称</value>
- </data>
- <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
- <value>轨道选择行为：</value>
- </data>
- <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
- <value>额外的轨道：</value>
- </data>
- <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
- <value>选择“Auto Passthru”作为音频编解码器时。</value>
- </data>
- <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
- <value>章节标记</value>
- </data>
- <data name="ChaptersView_ChapterName" xml:space="preserve">
- <value>章节名称</value>
- </data>
- <data name="ChaptersView_ChapterNumber" xml:space="preserve">
- <value>章节编号</value>
- </data>
- <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
- <value>创建章节标记</value>
- </data>
- <data name="ChaptersView_Duration" xml:space="preserve">
- <value>时长</value>
- </data>
- <data name="ChaptersView_Export" xml:space="preserve">
- <value>导出</value>
- </data>
- <data name="ChaptersView_Import" xml:space="preserve">
- <value>导入</value>
- </data>
- <data name="ChapterView_ExportNames" xml:space="preserve">
- <value>导出名称</value>
- </data>
- <data name="ChapterView_ImportNames" xml:space="preserve">
- <value>导入名称</value>
- </data>
- <data name="ChapterView_ResetChapterNames" xml:space="preserve">
- <value>重置章节名称</value>
- </data>
- <data name="CountdownAlterView_CancelAction" xml:space="preserve">
- <value>取消操作</value>
- </data>
- <data name="CountdownAlterView_Proceed" xml:space="preserve">
- <value>继续</value>
- </data>
- <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
- <value>完成操作时</value>
- </data>
- <data name="ErrorView_ErrorDetails" xml:space="preserve">
- <value>错误详情：</value>
- </data>
- <data name="FiltersView_Custom" xml:space="preserve">
- <value>自定义：</value>
- </data>
- <data name="FiltersView_Deblock" xml:space="preserve">
- <value>去块滤波</value>
- </data>
- <data name="FiltersView_Decomb" xml:space="preserve">
- <value>Decomb</value>
- </data>
- <data name="FiltersView_Deinterlace" xml:space="preserve">
- <value>反交错：</value>
- </data>
- <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
- <value>预设：</value>
- </data>
- <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
- <value>反交错预设</value>
- </data>
- <data name="FiltersView_Denoise" xml:space="preserve">
- <value>降噪：</value>
- </data>
- <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
- <value>降噪预设</value>
- </data>
- <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
- <value>降噪调节</value>
- </data>
- <data name="FiltersView_Detelecine" xml:space="preserve">
- <value>反胶卷过带：</value>
- </data>
- <data name="FiltersView_Filters" xml:space="preserve">
- <value>滤镜</value>
- </data>
- <data name="FiltersView_FlipVideo" xml:space="preserve">
- <value>翻转</value>
- </data>
- <data name="FiltersView_Grayscale" xml:space="preserve">
- <value>灰度</value>
- </data>
- <data name="FiltersView_InterlaceDetection" xml:space="preserve">
- <value>隔行扫描：</value>
- </data>
- <data name="FiltersView_Preset" xml:space="preserve">
- <value>预设：</value>
- </data>
- <data name="FiltersView_Rotate" xml:space="preserve">
- <value>旋转：</value>
- </data>
- <data name="FiltersView_Sharpen" xml:space="preserve">
- <value>锐化</value>
- </data>
- <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
- <value>锐化预设</value>
- </data>
- <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
- <value>锐化调节</value>
- </data>
- <data name="FiltersView_Tune" xml:space="preserve">
- <value>调节：</value>
- </data>
- <data name="Generic_Add" xml:space="preserve">
- <value>添加</value>
- </data>
- <data name="Generic_Cancel" xml:space="preserve">
- <value>取消</value>
- </data>
- <data name="Generic_Clear" xml:space="preserve">
- <value>清除</value>
- </data>
- <data name="Generic_Close" xml:space="preserve">
- <value>关闭</value>
- </data>
- <data name="Generic_CopyToClipboard" xml:space="preserve">
- <value>复制到剪贴板</value>
- </data>
- <data name="Generic_MoveLeft" xml:space="preserve">
- <value>左移</value>
- </data>
- <data name="Generic_MoveRight" xml:space="preserve">
- <value>右移</value>
- </data>
- <data name="Generic_Save" xml:space="preserve">
- <value>保存</value>
- </data>
- <data name="LogView_CopyClipboard" xml:space="preserve">
- <value>复制到剪贴板</value>
- </data>
- <data name="LogView_EncodeLog" xml:space="preserve">
- <value>编码日志</value>
- </data>
- <data name="LogView_OpenLogDir" xml:space="preserve">
- <value>打开日志目录</value>
- </data>
- <data name="LogView_ScanLog" xml:space="preserve">
- <value>扫描日志</value>
- </data>
- <data name="MainView_ActivityLog" xml:space="preserve">
- <value>活动日志</value>
- </data>
- <data name="MainView_AddAll" xml:space="preserve">
- <value>全部添加</value>
- </data>
- <data name="MainView_AddCurrent" xml:space="preserve">
- <value>添加当前</value>
- </data>
- <data name="MainView_AddSelection" xml:space="preserve">
- <value>添加选中</value>
- </data>
- <data name="MainView_AddToQueue" xml:space="preserve">
- <value>添加到队列中</value>
- </data>
- <data name="MainView_AdvancedTab" xml:space="preserve">
- <value>高级</value>
- </data>
- <data name="MainView_AlignAVStart" xml:space="preserve">
- <value>音视频起始对齐</value>
- </data>
- <data name="MainView_Angle" xml:space="preserve">
- <value>角度</value>
- </data>
- <data name="MainView_AudioTab" xml:space="preserve">
- <value>音频</value>
- </data>
- <data name="MainView_AudioTrackCount" xml:space="preserve">
- <value>音轨</value>
- </data>
- <data name="MainView_Browser" xml:space="preserve">
- <value>浏览</value>
- </data>
- <data name="MainView_ChaptersTab" xml:space="preserve">
- <value>章节</value>
- </data>
- <data name="MainView_Container" xml:space="preserve">
- <value>容器</value>
- </data>
- <data name="MainView_Destination" xml:space="preserve">
- <value>目标路径</value>
- </data>
- <data name="MainView_Duration" xml:space="preserve">
- <value>持续时间：</value>
- </data>
- <data name="MainView_File" xml:space="preserve">
- <value>保存为：</value>
- </data>
- <data name="MainView_FiltersTab" xml:space="preserve">
- <value>滤镜</value>
- </data>
- <data name="MainView_Format" xml:space="preserve">
- <value>格式：</value>
- </data>
- <data name="MainView_Help" xml:space="preserve">
- <value>帮助</value>
- </data>
- <data name="MainView_iPod5G" xml:space="preserve">
- <value>iPod 5代 支持</value>
- </data>
- <data name="MainView_MetaDataTab" xml:space="preserve">
- <value>元数据</value>
- </data>
- <data name="MainView_ModifiedPreset" xml:space="preserve">
- <value>(修改的)</value>
- </data>
- <data name="MainView_Muxing" xml:space="preserve">
- <value>开始合并：这可能需要一段时间…</value>
- </data>
- <data name="MainView_Options" xml:space="preserve">
- <value>选项</value>
- </data>
- <data name="MainView_OutputSettings" xml:space="preserve">
- <value>输出设置</value>
- </data>
- <data name="MainView_Pause" xml:space="preserve">
- <value>暂停</value>
- </data>
- <data name="MainView_PictureTab" xml:space="preserve">
- <value>尺寸</value>
- </data>
- <data name="MainView_PresetManage" xml:space="preserve">
- <value>重命名预设</value>
- </data>
- <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
- <value>预设选项上下文菜单</value>
- </data>
- <data name="MainView_PresetRemove" xml:space="preserve">
- <value>删除预设</value>
- </data>
- <data name="MainView_Presets" xml:space="preserve">
- <value>预设</value>
- </data>
- <data name="MainView_Preview" xml:space="preserve">
- <value>预览</value>
- </data>
- <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
- <value>编码中: {0}, {1:00.00}%, 剩余时间: {2}, {3}</value>
- </data>
- <data name="MainView_Range" xml:space="preserve">
- <value>范围：</value>
- </data>
- <data name="MainView_Reload" xml:space="preserve">
- <value>重新加载</value>
- </data>
- <data name="MainView_Remove" xml:space="preserve">
- <value>移除</value>
- </data>
- <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
- <value>重置内置预设</value>
- </data>
- <data name="MainView_SaveNewPreset" xml:space="preserve">
- <value>保存新预设</value>
- </data>
- <data name="MainView_Searching" xml:space="preserve">
- <value>正在寻找开始时间</value>
- </data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>选中的预设：</value>
- </data>
- <data name="MainView_SetDefault" xml:space="preserve">
- <value>设置为默认</value>
- </data>
- <data name="MainView_ShowPreview" xml:space="preserve">
- <value>预览</value>
- </data>
- <data name="MainView_ShowQueue" xml:space="preserve">
- <value>队列</value>
- </data>
- <data name="MainView_Source" xml:space="preserve">
- <value>源：</value>
- </data>
- <data name="MainView_SourceOpen" xml:space="preserve">
- <value>打开源</value>
- </data>
- <data name="MainView_StartEncode" xml:space="preserve">
- <value>开始编码</value>
- </data>
- <data name="MainView_StartQueue" xml:space="preserve">
- <value>启动队列</value>
- </data>
- <data name="MainView_Stop" xml:space="preserve">
- <value>停止</value>
- </data>
- <data name="MainView_StopEncode" xml:space="preserve">
- <value>停止编码</value>
- </data>
- <data name="MainView_StopEncodeConfirm" xml:space="preserve">
- <value>你确定要停止此编码吗？</value>
- </data>
- <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
- <value>请在导入字幕文件前选择一个要编码的源</value>
- </data>
- <data name="MainView_SubtitlesTab" xml:space="preserve">
- <value>字幕</value>
- </data>
- <data name="MainView_SubtitleTracksCount" xml:space="preserve">
- <value>字幕轨道</value>
- </data>
- <data name="MainView_SummaryTab" xml:space="preserve">
- <value>摘要</value>
- </data>
- <data name="MainView_through" xml:space="preserve">
- <value> - </value>
- </data>
- <data name="MainView_Title" xml:space="preserve">
- <value>标题：</value>
- </data>
- <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
- <value>更新选中的预设</value>
- </data>
- <data name="MainView_VideoTab" xml:space="preserve">
- <value>视频</value>
- </data>
- <data name="MainView_WebOptimized" xml:space="preserve">
- <value>网页优化</value>
- </data>
- <data name="ManagePresetView_ManagePreset" xml:space="preserve">
- <value>管理预设</value>
- </data>
- <data name="MetaDataView_Title" xml:space="preserve">
- <value>元数据</value>
- </data>
- <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
- <value>允许使用 Nvidia NVENC 编码器</value>
- </data>
- <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
- <value>允许使用 Intel QuickSync 编码器</value>
- </data>
- <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
- <value>允许使用 AMD VCE 编码器</value>
- </data>
- <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
- <value>输入的文件格式包含无效的字符。这些字符已被移除。</value>
- </data>
- <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
- <value>每个编码完成时都发出提示音</value>
- </data>
- <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
- <value>队列完成时发出提示音</value>
- </data>
- <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
- <value>在摘要栏中显示预览。</value>
- </data>
- <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
- <value>在应用程序标题栏中显示编码进度。</value>
- </data>
- <data name="Options_30DayLogClear" xml:space="preserve">
- <value>清理30天前的日志文件</value>
- </data>
- <data name="Options_About" xml:space="preserve">
- <value>关于 HandBrake</value>
- </data>
- <data name="Options_Advanced" xml:space="preserve">
- <value>高级</value>
- </data>
- <data name="Options_AdvancedOptions" xml:space="preserve">
- <value>高级选项</value>
- </data>
- <data name="Options_Arguments" xml:space="preserve">
- <value>参数：</value>
- </data>
- <data name="Options_AutomaticFileNaming" xml:space="preserve">
- <value>自动文件命名</value>
- </data>
- <data name="Options_AutoNameOutput" xml:space="preserve">
- <value>自动命名输出文件</value>
- </data>
- <data name="Options_CheckForUpdates" xml:space="preserve">
- <value>检查更新</value>
- </data>
- <data name="Options_ClearCompleted" xml:space="preserve">
- <value>每当编码完成时总是清除已完成的队列任务</value>
- </data>
- <data name="Options_ClearLogs" xml:space="preserve">
- <value>清理日志历史</value>
- </data>
- <data name="Options_CopyLogToDir" xml:space="preserve">
- <value>复制编码日志文件到指定位置：</value>
- </data>
- <data name="Options_CopyLogToEncDir" xml:space="preserve">
- <value>复制编码日志文件到编码视频所在位置</value>
- </data>
- <data name="Options_CurVersion" xml:space="preserve">
- <value>当前版本</value>
- </data>
- <data name="Options_Decoding" xml:space="preserve">
- <value>解码中</value>
- </data>
- <data name="Options_DefaultPath" xml:space="preserve">
- <value>默认路径：</value>
- </data>
- <data name="Options_DownloadUpdates" xml:space="preserve">
- <value>下载更新</value>
- </data>
- <data name="Options_DVD" xml:space="preserve">
- <value>DVD 读取中</value>
- </data>
- <data name="Options_DvdRead" xml:space="preserve">
- <value>禁止LibDVDNav。(将会使用livdvdread)</value>
- </data>
- <data name="Options_Encoding" xml:space="preserve">
- <value>编码中</value>
- </data>
- <data name="Options_Format" xml:space="preserve">
- <value>文件格式：</value>
- </data>
- <data name="Options_General" xml:space="preserve">
- <value>常规</value>
- </data>
- <data name="Options_Logging" xml:space="preserve">
- <value>日志记录</value>
- </data>
- <data name="Options_LogLevel" xml:space="preserve">
- <value>日志详细级别：</value>
- </data>
- <data name="Options_LogPath" xml:space="preserve">
- <value>日志文件路径：</value>
- </data>
- <data name="Options_LowDiskspaceSize" xml:space="preserve">
- <value>硬盘空间低于多少时暂停队列：</value>
- </data>
- <data name="Options_MinimiseTray" xml:space="preserve">
- <value>最小化到系统托盘(需要重启)</value>
- </data>
- <data name="Options_MinTitleScanLength" xml:space="preserve">
- <value>DVD和蓝光标题的最短持续时间"秒"。将跳过较短的标题：</value>
- </data>
- <data name="Options_MP4FileExtension" xml:space="preserve">
- <value>MP4 文件扩展名：</value>
- </data>
- <data name="Options_OnStartup" xml:space="preserve">
- <value>启动时</value>
- </data>
- <data name="Options_Output" xml:space="preserve">
- <value>输出文件</value>
- </data>
- <data name="Options_Path" xml:space="preserve">
- <value>路径：</value>
- </data>
- <data name="Options_PathToVLC" xml:space="preserve">
- <value>VLC Player程序路径</value>
- </data>
- <data name="Options_PreventSleep" xml:space="preserve">
- <value>在编码时防止系统进入睡眠状态</value>
- </data>
- <data name="Options_PreviewScanCount" xml:space="preserve">
- <value>要扫描的预览图片数：</value>
- </data>
- <data name="Options_PriorityLevel" xml:space="preserve">
- <value>优先级：</value>
- </data>
- <data name="Options_QsvDecode" xml:space="preserve">
- <value>如果可用，优先使用 Intel QuickSync 解码视频。</value>
- </data>
- <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
- <value>在没有使用QuickSync 编码器时使用QSV 解码器。(如 x265)</value>
- </data>
- <data name="Options_RemovePunctuation" xml:space="preserve">
- <value>移除常见的标点符号</value>
- </data>
- <data name="Options_ReplaceUnderscores" xml:space="preserve">
- <value>用空格替换下划线</value>
- </data>
- <data name="Options_ResetDoNothing" xml:space="preserve">
- <value>当应用重启时重置为“无操作”。</value>
- </data>
- <data name="Options_Scaler" xml:space="preserve">
- <value>选择缩放器：</value>
- </data>
- <data name="Options_Scaling" xml:space="preserve">
- <value>缩放</value>
- </data>
- <data name="Options_SendFileTo" xml:space="preserve">
- <value>发送文件至：</value>
- </data>
- <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
- <value>显示新的实验队列设计。</value>
- </data>
- <data name="Options_TitleCase" xml:space="preserve">
- <value>更改大写格式为词首字母大写</value>
- </data>
- <data name="Options_Updates" xml:space="preserve">
- <value>更新</value>
- </data>
- <data name="Options_UserInterface" xml:space="preserve">
- <value>用户界面</value>
- </data>
- <data name="Options_Version" xml:space="preserve">
- <value>版本：</value>
- </data>
- <data name="Options_Video" xml:space="preserve">
- <value>视频</value>
- </data>
- <data name="Options_VideoPreviewPath" xml:space="preserve">
- <value>此路径仅被用作视频预览功能。</value>
- </data>
- <data name="Options_ViewLogDirectory" xml:space="preserve">
- <value>查看日志目录</value>
- </data>
- <data name="Options_WhenDone" xml:space="preserve">
- <value>当完成时</value>
- </data>
- <data name="Options_x264" xml:space="preserve">
- <value>x264/5 设置</value>
- </data>
- <data name="Options_x264Granularity" xml:space="preserve">
- <value>固定质量模式的最小刻度：</value>
- </data>
- <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
- <value>变形：</value>
- </data>
- <data name="PictureSettingsView_Automatic" xml:space="preserve">
- <value>自动</value>
- </data>
- <data name="PictureSettingsView_Bottom" xml:space="preserve">
- <value>下</value>
- </data>
- <data name="PictureSettingsView_Cropping" xml:space="preserve">
- <value>裁剪</value>
- </data>
- <data name="PictureSettingsView_Custom" xml:space="preserve">
- <value>自定义</value>
- </data>
- <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
- <value>显示宽度：</value>
- </data>
- <data name="PictureSettingsView_Height" xml:space="preserve">
- <value>高度：</value>
- </data>
- <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>保持宽高比</value>
- </data>
- <data name="PictureSettingsView_Left" xml:space="preserve">
- <value>左</value>
- </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>系数：</value>
- </data>
- <data name="PictureSettingsView_Output" xml:space="preserve">
- <value>输出</value>
- </data>
- <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>标准：</value>
- </data>
- <data name="PictureSettingsView_Right" xml:space="preserve">
- <value>右</value>
- </data>
- <data name="PictureSettingsView_Size" xml:space="preserve">
- <value>大小：</value>
- </data>
- <data name="PictureSettingsView_Source" xml:space="preserve">
- <value>源：</value>
- </data>
- <data name="PictureSettingsView_Top" xml:space="preserve">
- <value>上</value>
- </data>
- <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>宽度：</value>
- </data>
- <data name="Preset_Custom" xml:space="preserve">
- <value>自定义</value>
- </data>
- <data name="Preset_Export" xml:space="preserve">
- <value>导出文件</value>
- </data>
- <data name="Preset_Import" xml:space="preserve">
- <value>导入文件</value>
- </data>
- <data name="Preset_Official" xml:space="preserve">
- <value>官方的</value>
- </data>
- <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
- <value>选择标题：</value>
- </data>
- <data name="QueueSelectionView_Title" xml:space="preserve">
- <value>添加到队列中</value>
- </data>
- <data name="QueueSelection_UsingPreset" xml:space="preserve">
- <value>选中的标题将会使用 "{0}" 预设添加</value>
- </data>
- <data name="QueueView_Advanced" xml:space="preserve">
- <value>高级：</value>
- </data>
- <data name="QueueView_Audio" xml:space="preserve">
- <value>音频：</value>
- </data>
- <data name="QueueView_ClearAll" xml:space="preserve">
- <value>清除全部</value>
- </data>
- <data name="QueueView_ClearCompleted" xml:space="preserve">
- <value>清除已完成的</value>
- </data>
- <data name="QueueView_ClearQueue" xml:space="preserve">
- <value>清除队列</value>
- </data>
- <data name="QueueView_ClearSelected" xml:space="preserve">
- <value>清除选中的</value>
- </data>
- <data name="QueueView_Delete" xml:space="preserve">
- <value>删除</value>
- </data>
- <data name="QueueView_Destination" xml:space="preserve">
- <value>目标路径：</value>
- </data>
- <data name="WhenDone_DoNothing" xml:space="preserve">
- <value>无操作</value>
- </data>
- <data name="QueueView_Duration" xml:space="preserve">
- <value>编码时间：</value>
- </data>
- <data name="QueueView_Edit" xml:space="preserve">
- <value>编辑</value>
- </data>
- <data name="QueueView_EndTime" xml:space="preserve">
- <value>结束时间：</value>
- </data>
- <data name="QueueView_Export" xml:space="preserve">
- <value>导出队列</value>
- </data>
- <data name="QueueView_FileSize" xml:space="preserve">
- <value>文件大小：</value>
- </data>
- <data name="WhenDone_Hibernate" xml:space="preserve">
- <value>休眠</value>
- </data>
- <data name="WhenDone_LockSystem" xml:space="preserve">
- <value>锁定系统</value>
- </data>
- <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
- <value>日志将在编码完成后可用。</value>
- </data>
- <data name="WhenDone_Logoff" xml:space="preserve">
- <value>登出</value>
- </data>
- <data name="QueueView_OpenDestDir" xml:space="preserve">
- <value>打开目标目录</value>
- </data>
- <data name="QueueView_OpenSourceDir" xml:space="preserve">
- <value>打开源目录</value>
- </data>
- <data name="QueueView_Options" xml:space="preserve">
- <value>选项</value>
- </data>
- <data name="QueueView_Pause" xml:space="preserve">
- <value>暂停队列</value>
- </data>
- <data name="QueueView_PausedDuration" xml:space="preserve">
- <value>暂停时常：</value>
- </data>
- <data name="QueueView_PictureSettings" xml:space="preserve">
- <value>图像设置：</value>
- </data>
- <data name="WhenDone_QuitHandBrake" xml:space="preserve">
- <value>退出HandBrake</value>
- </data>
- <data name="QueueView_ResetAllJobs" xml:space="preserve">
- <value>重试所有任务</value>
- </data>
- <data name="QueueView_ResetFailed" xml:space="preserve">
- <value>重试失败的</value>
- </data>
- <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
- <value>重置选中的任务</value>
- </data>
- <data name="QueueView_Reset" xml:space="preserve">
- <value>重置</value>
- </data>
- <data name="WhenDone_Shutdown" xml:space="preserve">
- <value>关机</value>
- </data>
- <data name="QueueView_Source" xml:space="preserve">
- <value>源：</value>
- </data>
- <data name="QueueView_Start" xml:space="preserve">
- <value>启动队列</value>
- </data>
- <data name="QueueView_StartTime" xml:space="preserve">
- <value>开始时间：</value>
- </data>
- <data name="QueueView_Statistics" xml:space="preserve">
- <value>统计数据</value>
- </data>
- <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
- <value>统计数据将在编码完成后可用。</value>
- </data>
- <data name="QueueView_Subtitles" xml:space="preserve">
- <value>字幕：</value>
- </data>
- <data name="QueueView_Summary" xml:space="preserve">
- <value>概要</value>
- </data>
- <data name="WhenDone_Suspend" xml:space="preserve">
- <value>睡眠</value>
- </data>
- <data name="QueueView_Video" xml:space="preserve">
- <value>视频：</value>
- </data>
- <data name="QueueView_WhenDone" xml:space="preserve">
- <value>当完成时：</value>
- </data>
- <data name="Shared_AddAllForSelected" xml:space="preserve">
- <value>添加所有剩余选中的语言</value>
- </data>
- <data name="Shared_AddAllRemaining" xml:space="preserve">
- <value>添加所有剩余的轨道</value>
- </data>
- <data name="Shared_AddNewTrack" xml:space="preserve">
- <value>添加新轨道</value>
- </data>
- <data name="Shared_AddTrack" xml:space="preserve">
- <value>添加轨道</value>
- </data>
- <data name="Shared_AvailableLanguages" xml:space="preserve">
- <value>可用的语言：</value>
- </data>
- <data name="Shared_ChooseLanguages" xml:space="preserve">
- <value>选择语言：</value>
- </data>
- <data name="Shared_ChosenLangages" xml:space="preserve">
- <value>选择语言：</value>
- </data>
- <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
- <value>配置默认行为</value>
- </data>
- <data name="Shared_ReloadDefaults" xml:space="preserve">
- <value>重新加载</value>
- </data>
- <data name="SourceSelection_ChooseDisc" xml:space="preserve">
- <value>选择要扫描的光盘</value>
- </data>
- <data name="SourceSelection_ChooseFile" xml:space="preserve">
- <value>选择要扫描的文件</value>
- </data>
- <data name="SourceSelection_ChooseFolder" xml:space="preserve">
- <value>选择要扫描的文件夹</value>
- </data>
- <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
- <value>视需要选择一个具体的标题：</value>
- </data>
- <data name="SourceSelection_ChooseVideo" xml:space="preserve">
- <value>然后选择你想编码的视频：</value>
- </data>
- <data name="SourceSelection_File" xml:space="preserve">
- <value>文件</value>
- </data>
- <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
- <value>文件夹(批量扫描)</value>
- </data>
- <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
- <value>打开DVD或蓝光驱动器</value>
- </data>
- <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
- <value>打开有一个或多个文件的文件夹。</value>
- </data>
- <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
- <value>恢复队列文件</value>
- </data>
- <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
- <value>以前的队列存档可用。</value>
- </data>
- <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
- <value>打开单个视频文件。</value>
- </data>
- <data name="SourceSelection_SourceSelection" xml:space="preserve">
- <value>选择源</value>
- </data>
- <data name="StaticPreviewView_Duration" xml:space="preserve">
- <value>时长：</value>
- </data>
- <data name="StaticPreviewView_LivePreview" xml:space="preserve">
- <value>实时预览</value>
- </data>
- <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
- <value>选择预览图片</value>
- </data>
- <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
- <value>使用系统默认视频播放器</value>
- </data>
- <data name="SubtitlesView_AddCC" xml:space="preserve">
- <value>添加隐藏式字幕（可用时）</value>
- </data>
- <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
- <value>添加“外部音频扫描”</value>
- </data>
- <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
- <value>烧录行为：</value>
- </data>
- <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
- <value>导入字幕</value>
- </data>
- <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
- <value>轨道选择行为：</value>
- </data>
- <data name="SubtitleView_AddAllCC" xml:space="preserve">
- <value>添加所有剩余的隐藏式字幕</value>
- </data>
- <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
- <value>选择新标题或源视频时自动选择和配置字幕轨道的方式。</value>
- </data>
- <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
- <value>额外的音频轨道</value>
- </data>
- <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
- <value>额外的字幕轨道</value>
- </data>
- <data name="SummaryView_Burned" xml:space="preserve">
- <value>已烧录</value>
- </data>
- <data name="SummaryView_Chapters" xml:space="preserve">
- <value>章节标记</value>
- </data>
- <data name="SummaryView_Deblock" xml:space="preserve">
- <value>去块滤波</value>
- </data>
- <data name="SummaryView_Detelecine" xml:space="preserve">
- <value>反胶卷过带</value>
- </data>
- <data name="SummaryView_display" xml:space="preserve">
- <value>显示</value>
- </data>
- <data name="SummaryView_Grayscale" xml:space="preserve">
- <value>灰度</value>
- </data>
- <data name="SummaryView_NoAudioTracks" xml:space="preserve">
- <value>没有音频轨道</value>
- </data>
- <data name="SummaryView_NoChapters" xml:space="preserve">
- <value>没有章节标记</value>
- </data>
- <data name="SummaryView_NoFilters" xml:space="preserve">
- <value>无滤镜</value>
- </data>
- <data name="SummaryView_NoSource" xml:space="preserve">
- <value>没有源</value>
- </data>
- <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
- <value>没有字幕轨</value>
- </data>
- <data name="SummaryView_NoTracks" xml:space="preserve">
- <value>无轨道</value>
- </data>
- <data name="SummaryView_PreviewInfo" xml:space="preserve">
- <value>预览 {0} / {1}</value>
- </data>
- <data name="SummaryView_Rotation" xml:space="preserve">
- <value>旋转</value>
- </data>
- <data name="SummaryView_storage" xml:space="preserve">
- <value>存储空间</value>
- </data>
- <data name="VideoView_2Pass" xml:space="preserve">
- <value>二次编码</value>
- </data>
- <data name="VideoView_AverageBitrate" xml:space="preserve">
- <value>平均码率(kbps)：</value>
- </data>
- <data name="VideoView_Codec" xml:space="preserve">
- <value>视频编解码器：</value>
- </data>
- <data name="VideoView_ConstantFramerate" xml:space="preserve">
- <value>固定帧率</value>
- </data>
- <data name="VideoView_ConstantQuality" xml:space="preserve">
- <value>固定质量：</value>
- </data>
- <data name="VideoView_EncoderLevel" xml:space="preserve">
- <value>编码器级别：</value>
- </data>
- <data name="VideoView_EncoderPreset" xml:space="preserve">
- <value>编码器预设：</value>
- </data>
- <data name="VideoView_EncoderProfile" xml:space="preserve">
- <value>编码器配置文件：</value>
- </data>
- <data name="VideoView_EncodeTune" xml:space="preserve">
- <value>编码器调优：</value>
- </data>
- <data name="VideoView_ExtraOptions" xml:space="preserve">
- <value>高级选项：</value>
- </data>
- <data name="VideoView_FastDecode" xml:space="preserve">
- <value>快速解码</value>
- </data>
- <data name="VideoView_Framerate" xml:space="preserve">
- <value>帧率 (FPS):</value>
- </data>
- <data name="VideoView_OptimiseVideo" xml:space="preserve">
- <value>优化视频：</value>
- </data>
- <data name="VideoView_PeakFramerate" xml:space="preserve">
- <value>峰值帧率</value>
- </data>
- <data name="VideoView_Quality" xml:space="preserve">
- <value>质量</value>
- </data>
- <data name="VideoView_TurboFirstPass" xml:space="preserve">
- <value>Turbo 一次通过</value>
- </data>
- <data name="VideoView_VariableFramerate" xml:space="preserve">
- <value>可变帧率</value>
- </data>
- <data name="VideoView_Video" xml:space="preserve">
- <value>视频</value>
- </data>
- <data name="OptionsView_Language" xml:space="preserve">
- <value>语言：</value>
- </data>
- <data name="Language_UseSystem" xml:space="preserve">
- <value>使用系统语言</value>
- </data>
- <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
- <value>关于 HandBrake</value>
- </data>
- <data name="SourceSelection_DropFileHere" xml:space="preserve">
- <value>或者将文件或文件夹拖放到这里...</value>
- </data>
- <data name="SourceSelection_Help" xml:space="preserve">
- <value>帮助</value>
- </data>
- <data name="Preferences" xml:space="preserve">
- <value>首选项</value>
- </data>
- <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
- <value>添加轨道</value>
- </data>
- <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
- <value>为每个轨道设置音频码器：</value>
- </data>
- <data name="AudioDefaultsView_Clear" xml:space="preserve">
- <value>清除</value>
- </data>
- <data name="SubtitlesView_BurnIn" xml:space="preserve">
- <value>烧入</value>
- </data>
- <data name="SubtitlesView_Default" xml:space="preserve">
- <value>默认</value>
- </data>
- <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
- <value>仅限强制</value>
- </data>
- <data name="MainView_About" xml:space="preserve">
- <value>_关于...</value>
- </data>
- <data name="MainView_ActivityLogMenu" xml:space="preserve">
- <value>_活动日志</value>
- </data>
- <data name="MainView_CheckForUpdates" xml:space="preserve">
- <value>_检查更新</value>
- </data>
- <data name="MainView_Exit" xml:space="preserve">
- <value>_退出</value>
- </data>
- <data name="MainView_ExportToFile" xml:space="preserve">
- <value>_导出到文件</value>
- </data>
- <data name="MainView_FileMenu" xml:space="preserve">
- <value>_文件</value>
- </data>
- <data name="MainView_HandBrakeDocs" xml:space="preserve">
- <value>_HandBrake 文档 (HTTPS)</value>
- </data>
- <data name="MainView_HelpMenu" xml:space="preserve">
- <value>_帮助</value>
- </data>
- <data name="MainView_ImportFromFile" xml:space="preserve">
- <value>_从文件导入</value>
- </data>
- <data name="MainView_PreferencesMenu" xml:space="preserve">
- <value>_首选项</value>
- </data>
- <data name="MainView_PresetsMenu" xml:space="preserve">
- <value>_预设</value>
- </data>
- <data name="MainView_QueueMenu" xml:space="preserve">
- <value>_队列</value>
- </data>
- <data name="MainView_ResetPresets" xml:space="preserve">
- <value>_重置内置预设</value>
- </data>
- <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
- <value>_将当前设置为默认值</value>
- </data>
- <data name="MainView_ShowPresetPanel" xml:space="preserve">
- <value>_显示预设面板</value>
- </data>
- <data name="MainView_ShowQueueMenu" xml:space="preserve">
- <value>_显示队列</value>
- </data>
- <data name="MainView_ToolsMenu" xml:space="preserve">
- <value>_工具</value>
- </data>
- <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
- <value>检查更新 ...</value>
- </data>
- <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
- <value>您确定要清除日志文件目录吗？</value>
- </data>
- <data name="OptionsView_ClearLogs" xml:space="preserve">
- <value>清除日志</value>
- </data>
- <data name="OptionsView_Downloading" xml:space="preserve">
- <value>正在下载...</value>
- </data>
- <data name="OptionsView_LogsCleared" xml:space="preserve">
- <value>HandBrake 的日志文件目录已被清除！</value>
- </data>
- <data name="OptionsView_Notice" xml:space="preserve">
- <value>注意</value>
- </data>
- <data name="OptionsView_PreparingUpdate" xml:space="preserve">
- <value>准备更新...</value>
- </data>
- <data name="OptionsView_SelectFolder" xml:space="preserve">
- <value>请选择一个文件夹。</value>
- </data>
- <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
- <value>单击“浏览”以设置默认位置</value>
- </data>
- <data name="MainView_Hide" xml:space="preserve">
- <value>隐藏</value>
- </data>
- <data name="MainView_Show" xml:space="preserve">
- <value>显示</value>
- </data>
- <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
- <value>“添加所有”至队列</value>
- </data>
- <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
- <value>“添加选中”至队列</value>
- </data>
- <data name="QueueView_PlayMediaFile" xml:space="preserve">
- <value>播放文件</value>
- </data>
- <data name="Options_ApplicaitonToolbar" xml:space="preserve">
- <value>应用程序工具栏</value>
- </data>
- <data name="Options_ShowToolbarAddAll" xml:space="preserve">
- <value>在工具栏中显示“添加所有至队列”</value>
- </data>
- <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
- <value>在工具栏中显示“添加选中至队列”</value>
- </data>
- <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
- <value>目前禁用硬件编码支持。 请确保您为此系统中的所有图形适配器运行最新的驱动程序。
-这不会对软件编码器产生任何影响。</value>
- </data>
- <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
- <value>请更正您的字幕设置然后再继续。</value>
- </data>
- <data name="Generic_Apply" xml:space="preserve">
- <value>应用</value>
- </data>
- <data name="Main_ResumeEncode" xml:space="preserve">
- <value>继续编码</value>
- </data>
- <data name="QueueView_Actions" xml:space="preserve">
- <value>活动</value>
- </data>
- <data name="QueueView_Import" xml:space="preserve">
- <value>导入列队</value>
- </data>
- <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>编码中: 当前进度 {0} / {1}, {2:00.00}%, 帧数: {3:000.0}, 平均帧数: {4:000.0}
-剩余时间: {5:hh\:mm\:ss}, 已用时间: {6:hh\:mm\:ss} {7}</value>
- </data>
- <data name="QueueView_DeleteSelected" xml:space="preserve">
- <value>删除所选</value>
- </data>
- <data name="Portable_TmpNotWritable" xml:space="preserve">
- <value>便携模式：无法创建TMP目录。请检查路径是否正确且可写。
-
- {0}</value>
- </data>
- <data name="Portable_StorageNotWritable" xml:space="preserve">
- <value>便携模式：无法创建存储目录。请检查路径是否正确且可写。
-
- {0}</value>
- </data>
- <data name="Portable_IniFileError" xml:space="preserve">
- <value>便携模式：无法读取 portable.ini。此文件可能存在错误。请使用 portable.ini.template 作为模版重试。</value>
- </data>
- <data name="Startup_InitFailed" xml:space="preserve">
- <value>HandBrake 无法初始化引擎。这通常是由过时的GPU驱动程序引起的。\n 请更新显卡驱动程序。</value>
- </data>
- <data name="OptionsView_FormatOptions" xml:space="preserve">
- <value>实时更新选项：{source} {title} {chapters} 
-非实时更新选项：{date} {time} {creation-date} {creation-time} {quality} {bitrate} （只有扫描新源、更改标题或章节时才会更改）</value>
- </data>
- <data name="OptionsView_PathOptions" xml:space="preserve">
- <value>可用的附加选项: {source_path} {source_folder_name} {source}</value>
- </data>
- <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
- <value>询问是否覆盖文件</value>
- </data>
- <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
- <value>自动重命名文件</value>
- </data>
- <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
- <value>覆盖文件</value>
- </data>
- <data name="Options_UIBehaviour" xml:space="preserve">
- <value>用户界面操作</value>
- </data>
- <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
- <value>文件覆盖操作</value>
- </data>
- <data name="Options_EncodeCompleted" xml:space="preserve">
- <value>编码完成</value>
- </data>
- <data name="Options_Notifications" xml:space="preserve">
- <value>通知</value>
- </data>
- <data name="Options_QueueCompleted" xml:space="preserve">
- <value>队列已完成</value>
- </data>
- <data name="Options_WhenDoneColon" xml:space="preserve">
- <value>当完成时：</value>
- </data>
- <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
- <value>文件名冲突操作</value>
- </data>
- <data name="CollisionBehaviour_Post" xml:space="preserve">
- <value>后缀</value>
- </data>
- <data name="CollisionBehaviour_Pre" xml:space="preserve">
- <value>前缀</value>
- </data>
- <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
- <value>添加编号</value>
- </data>
- <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
- <value>过滤器视图——去块效应滤波器预设</value>
- </data>
- <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
- <value>去块效应滤波器调整</value>
- </data>
- <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
- <value>编码器的选择将在“视频”选项卡上提供。</value>
- </data>
- <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
- <value>HandBrake 检测到多个未完成的队列文件。恢复这些文件将使 HandBrake 运行多个实例。 你想恢复所有未完成的工作吗？</value>
- </data>
- <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
- <value>HandBrake 检测到上次启动时队列中尚有未完成的项目。你想恢复这些项目吗？</value>
- </data>
- <data name="Queue_RecoveryPossible" xml:space="preserve">
- <value>有可恢复的队列</value>
- </data>
- <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
- <value>您的预设文件包含内置预设，但导入功能不支持导入内置预设。请使用“预设菜单 -&gt; 重置内置预设”来恢复标准预设。
-
-将导入所有支持的用户预设。</value>
- </data>
- <data name="Options_PromptBeforeAction" xml:space="preserve">
- <value>立即执行操作。（这将禁用60秒确认对话框）</value>
- </data>
- <data name="Browse" xml:space="preserve">
- <value>浏览</value>
- </data>
- <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
- <value>没有设置音频文件。请单击“浏览”以选择要播放的wav或mp3文件。</value>
- </data>
- <data name="OptionsView_Play" xml:space="preserve">
- <value>播放</value>
- </data>
- <data name="QueueView_ExportCLI" xml:space="preserve">
- <value>导出列队（仅限命令行界面）</value>
- </data>
- <data name="Options_DarkTheme" xml:space="preserve">
- <value>使用黑暗主题。（需要重启软件，仅支持 Windows 10）</value>
- </data>
- <data name="QueueView_NotAvailable" xml:space="preserve">
- <value>不可用</value>
- </data>
- <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
- <value>GB</value>
- </data>
- <data name="SystemService_ACMains" xml:space="preserve">
- <value>已检测到交流电源。正在恢复编码... ({0} %)</value>
- </data>
- <data name="SystemService_CriticalBattery" xml:space="preserve">
- <value>系统电量严重不足! ({0} %)</value>
- </data>
- <data name="SystemService_LowBatteryLog" xml:space="preserve">
- <value>系统电量不足！ ({0} %)。 为了保护系统已暂停编码。已将系统设为允许睡眠！</value>
- </data>
- <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
- <value>目标磁盘剩余存储容量少于 {0} GB。正在暂停编码...</value>
- </data>
- <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
- <value>配置自动音频选择</value>
- </data>
- <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
- <value>配置自动字幕选择</value>
- </data>
- <data name="Options_SystemOptions" xml:space="preserve">
- <value>系统</value>
- </data>
- <data name="MetadataView_Actors" xml:space="preserve">
- <value>演员：</value>
- </data>
- <data name="MetadataView_Comments" xml:space="preserve">
- <value>评论：</value>
- </data>
- <data name="MetadataView_Description" xml:space="preserve">
- <value>描述：</value>
- </data>
- <data name="MetadataView_Director" xml:space="preserve">
- <value>导演：</value>
- </data>
- <data name="MetadataView_Genre" xml:space="preserve">
- <value>类型：</value>
- </data>
- <data name="MetadataView_Plot" xml:space="preserve">
- <value>剧情：</value>
- </data>
- <data name="MetadataView_ReleaseDate" xml:space="preserve">
- <value>发行日期：</value>
- </data>
- <data name="MetadataView_TitleTag" xml:space="preserve">
- <value>标题：</value>
- </data>
- <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
- <value>预览旋转和翻转</value>
- </data>
- <data name="LogViewModel_Title" xml:space="preserve">
- <value>日志查看器</value>
- </data>
- <data name="MainView_Aspect" xml:space="preserve">
- <value>详情：</value>
- </data>
- <data name="MainView_Filters" xml:space="preserve">
- <value>滤镜：</value>
- </data>
- <data name="MainView_Size" xml:space="preserve">
- <value>大小：</value>
- </data>
- <data name="MainView_Tracks" xml:space="preserve">
- <value>轨道：</value>
- </data>
- <data name="OptionsTab_General" xml:space="preserve">
- <value>常规</value>
- </data>
- <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
- <value>点击“检查更新”检查新版本</value>
- </data>
- <data name="OptionsView_BackButton" xml:space="preserve">
- <value>&lt; 返回</value>
- </data>
- <data name="QueueView_CurrentlyPaused" xml:space="preserve">
- <value>目前已暂停</value>
- </data>
- <data name="Options_OutputFiles" xml:space="preserve">
- <value>输出文件</value>
- </data>
- <data name="PointToPointMode_Chapters" xml:space="preserve">
- <value>章节</value>
- </data>
- <data name="PointToPointMode_Frames" xml:space="preserve">
- <value>帧数</value>
- </data>
- <data name="PointToPointMode_Preview" xml:space="preserve">
- <value>预览</value>
- </data>
- <data name="PointToPointMode_Seconds" xml:space="preserve">
- <value>秒</value>
- </data>
- <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
- <value>所有匹配选中的语言</value>
- </data>
- <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
- <value>第一个匹配选中的语言</value>
- </data>
- <data name="SubtitleBehaviourModes_None" xml:space="preserve">
- <value>无</value>
- </data>
- <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
- <value>第一个轨道</value>
- </data>
- <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
- <value>外部音频优先，否则第一个优先</value>
- </data>
- <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
- <value>外部音轨</value>
- </data>
- <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
- <value>无</value>
- </data>
- <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
- <value>外部音频搜索</value>
- </data>
- <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
- <value>外部音频扫描</value>
- </data>
- <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
- <value>所有匹配选中的语言</value>
- </data>
- <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
- <value>使用所有轨道作为模板</value>
- </data>
- <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
- <value>第一个匹配选中的语言</value>
- </data>
- <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
- <value>使用首轨作为模板</value>
- </data>
- <data name="AudioBehaviourModes_None" xml:space="preserve">
- <value>无音频</value>
- </data>
- <data name="ChapterViewModel_Chapter" xml:space="preserve">
- <value>章节 {0}</value>
- </data>
- <data name="Mp4Behaviour_Auto" xml:space="preserve">
- <value>自动</value>
- </data>
- <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
- <value>始终使用 M4V</value>
- </data>
- <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
- <value>始终使用 MP4</value>
- </data>
- <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
- <value>自定义</value>
- </data>
- <data name="PresetPictureSettingsMode_None" xml:space="preserve">
- <value>无</value>
- </data>
- <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
- <value>始终使用源分辨率</value>
- </data>
- <data name="ProcessPriority_AboveNormal" xml:space="preserve">
- <value>高于标准</value>
- </data>
- <data name="ProcessPriority_BelowNormal" xml:space="preserve">
- <value>低于标准</value>
- </data>
- <data name="ProcessPriority_High" xml:space="preserve">
- <value>高</value>
- </data>
- <data name="ProcessPriority_Low" xml:space="preserve">
- <value>低</value>
- </data>
- <data name="ProcessPriority_Normal" xml:space="preserve">
- <value>标准</value>
- </data>
- <data name="UpdateCheck_Monthly" xml:space="preserve">
- <value>每月</value>
- </data>
- <data name="UpdateCheck_Weekly" xml:space="preserve">
- <value>每周</value>
- </data>
- <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
- <value>始终为生成的每个新名称使用默认路径。</value>
- </data>
-</root>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.zh.resx Deleted

@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- 
- <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="FilterView_Deblock" xml:space="preserve">
- <value>去块滤波减少了由低质量视频压缩引起的块效应。</value>
- </data>
- <data name="FilterView_DecombDeinterlace" xml:space="preserve">
- <value>选择Decomb滤镜或反交错滤镜选项。
-
-Decomb滤镜选择性的对出现交错扫描的单个帧进行去交错处理。
-这将保持非交错帧的质量。
-
-传统的反交错滤镜会对所有帧进行去交错处理。
-非交错的帧将遭受一些质量下降。</value>
- </data>
- <data name="FilterView_Denoise" xml:space="preserve">
- <value>降噪可以减少或消除图像的噪点。这可以提高压缩效率，以较小的文件创建更高质量的视频。
-过强的降噪设置可能会由于丢弃细节而损坏图像质量。
-
-NLMEans是一种高质量的降噪滤镜，速度快。在质量比速度更重要的地方使用。
-
-HQDN3D是一种自适应的低通滤镜，比NLMEans更快，但在保持细节方面效果较差。</value>
- </data>
- <data name="FilterView_Detelecine" xml:space="preserve">
- <value>反交错消除经过胶卷过带处理产生的梳状横纹，胶卷过带是将胶片帧率转换为电视帧率的过程。</value>
- </data>
- <data name="FilterView_Grayscale" xml:space="preserve">
- <value>灰度消除了视频的颜色分量。通常被称为黑白视频。</value>
- </data>
- <data name="MainView_Destination" xml:space="preserve">
- <value>目标路径，包括目录和文件名。这就是将创建新视频的位置，以及它的名称。</value>
- </data>
- <data name="MainView_IpodAtom" xml:space="preserve">
- <value>添加一个特殊的MP4标记，允许在大约2006年的老式iPod5代设备上播放。其他设置可能会影响兼容性。</value>
- </data>
- <data name="MainView_Mux" xml:space="preserve">
- <value>容器格式。视频，音频和其他轨道组合成这种类型的单个文件。 影响兼容性。</value>
- </data>
- <data name="MainView_Optimise" xml:space="preserve">
- <value>优化MP4以进行渐进式下载。编码之后，数据被重新组织和重写，以允许在网络上即时回放，而不需要下载整个文件。</value>
- </data>
- <data name="MainView_Range" xml:space="preserve">
- <value>源范围选择。 默认情况下，会选择所有章节并对整个源进行编码。</value>
- </data>
- <data name="MainView_Title" xml:space="preserve">
- <value>要编码的标题或视频剪辑。
-蓝光和DVD源通常有多个标题，通常时间最长的是正片。</value>
- </data>
- <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
- <value>变形允许任意存储尺寸，同时在回放期间保留原始高宽。
-
-None 禁用变形。视频存储尺寸和显示尺寸将相同。仅对与某些传统设备兼容有用。
-
-Auto 最大化存储分辨率，同时保留原始显示宽高比。（推荐）
-
-Loose 与Auto类似，但尝试保留存储宽高比。与Auto相比，这可能导致轻微的存储分辨率损失。
-
-Custom 允许手动设置所有参数。 用于纠正不正确的源显示高宽以及在后期制作中需要高级控制的专业人员。</value>
- </data>
- <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
- <value>自动参见视频周围的黑边。</value>
- </data>
- <data name="PictureSettingsView_CropBottom" xml:space="preserve">
- <value>从底部裁剪该视频。</value>
- </data>
- <data name="PictureSettingsView_CropLeft" xml:space="preserve">
- <value>从左侧裁剪该视频。</value>
- </data>
- <data name="PictureSettingsView_CropRight" xml:space="preserve">
- <value>从右侧裁剪该视频。</value>
- </data>
- <data name="PictureSettingsView_CropTop" xml:space="preserve">
- <value>从顶部裁剪该视频。</value>
- </data>
- <data name="PictureSettingsView_Height" xml:space="preserve">
- <value>这是视频将会被保存的高度。
-如果像素宽高比不为1:1则实际显示尺寸将有不同。</value>
- </data>
- <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
- <value>手动裁剪该视频。</value>
- </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>将存储尺寸与此值的倍数对齐。
-
-只有与某些设备兼容时才需要此设置。
-除非遇到兼容性问题，否则应使用2。</value>
- </data>
- <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>定义像素的形状。
-1:1 的比例定义正方形像素。其他值定义矩形形状。
-播放时将缩放图像以达到指定的效果。</value>
- </data>
- <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>这是视频将会被保存的宽度。
-如果像素宽高比不为1:1则实际显示尺寸将有不同。</value>
- </data>
- <data name="QueueView_DeleteJob" xml:space="preserve">
- <value>从队列中删除该任务。</value>
- </data>
- <data name="QueueView_ResetJobStatus" xml:space="preserve">
- <value>将作业状态重置为等待。</value>
- </data>
- <data name="QueueView_SendJobBack" xml:space="preserve">
- <value>把任务发送回主界面以编辑。</value>
- </data>
- <data name="Video_AvgBitrate" xml:space="preserve">
- <value>设置平均比码率。
-
-瞬时码率在任何时间点都可以更高或更低。
-但是长时间内的平均值将是此处设定的值。
-如果您需要限制瞬时码率，请查看 x264 的 vbv-bufsize 和 vbv-maxrate 设置。</value>
- </data>
- <data name="Video_ConstantFramerate" xml:space="preserve">
- <value>启用恒定帧速率输出。</value>
- </data>
- <data name="Video_Encoders" xml:space="preserve">
- <value>可用的视频编码器。</value>
- </data>
- <data name="Video_EncoderTune" xml:space="preserve">
- <value>调整设置以优化常见方案。
-
-这可以提高特定源特性或设置输出文件特性的效率。
-更改将在预设之后但在所有其他参数之前应用。</value>
- </data>
- <data name="Video_ExtraOpts" xml:space="preserve">
- <value>附加编码器设置。
-
-编码器选项列表以冒号分隔。</value>
- </data>
- <data name="Video_FastDecode" xml:space="preserve">
- <value>减少解码器对CPU的占用。
-
-当你的设备无法流畅播放输出时选择此选项。（例如： 丢帧）</value>
- </data>
- <data name="Video_Framerate" xml:space="preserve">
- <value>输出帧率。
-
-建议使用“与源视频相同”。如果源视频的帧速率可变，“与源视频相同”将保留它。</value>
- </data>
- <data name="Video_Level" xml:space="preserve">
- <value>设置并确保符合指定的级别。
-
-覆盖所有其他设置。</value>
- </data>
- <data name="Video_PeakFramerate" xml:space="preserve">
- <value>启用可变帧速率输出，峰值速率由帧速率设置决定。</value>
- </data>
- <data name="Video_Presets" xml:space="preserve">
- <value>调整编码器设置以权衡压缩效率与编码速度。
-
-这将建立默认编码器设置。
-Tunes, profiles, levels 和高级选项字符串将应用于此。
-您通常应该将此选项设置为可以承受的最慢速度，
-因为较慢的设置将导致更好的质量或更小的文件。</value>
- </data>
- <data name="Video_Profile" xml:space="preserve">
- <value>设置并确保符合指定的配置文件。
-
-覆盖所有其他设置。</value>
- </data>
- <data name="Video_Quality" xml:space="preserve">
- <value>设置所需的品质因子。
-编码器以固定的质量为目标。
-每个视频编码器使用的比例是不同的。
-
-x264的比例是对数的，较低的值对应于较高的质量。
-因此，即使值的小幅下降也会导致文件大小逐渐增大。
-值为“0”表示无损，并且将导致文件大小大于原始源，除非源文件也是无损的。
-建议值为：标准清晰度源为18至20，高清源为20至23。
-
-FFMpeg和Theora的比例更加线性。
-这些编码器没有无损模式。</value>
- </data>
- <data name="Video_TurboFirstPass" xml:space="preserve">
- <value>会加快 2 Pass 编码的第一遍的速度，而对画质的降低非常小。</value>
- </data>
- <data name="Video_TwoPass" xml:space="preserve">
- <value>执行 2 Pass 编码。
-
-'Bitrate' 选项是先决条件。这种方式可以精确的得到想要的平均码率。
-2pass代表需要做2次编码，第一遍编码先分析全片，得到一个stats文件和一个mbtree文件。
-第二遍编码以这两个文件作参考分配合理的码率。</value>
- </data>
- <data name="Video_VariableFramerate" xml:space="preserve">
- <value>允许可变帧率输出。
-
-某些播放器不兼容可变帧率。</value>
- </data>
- <data name="MainView_WhenDone" xml:space="preserve">
- <value>当 HandBrake 完成当前队列或编码时，它将执行此操作。</value>
- </data>
- <data name="MainView_Browse" xml:space="preserve">
- <value>浏览来为编码文件选择一个新的目标路径和文件名称。</value>
- </data>
- <data name="MainView_Angle" xml:space="preserve">
- <value>要编码的视频角度。仅适用于多角度DVD和蓝光。</value>
- </data>
- <data name="MainView_AddPreset" xml:space="preserve">
- <value>添加新预设。</value>
- </data>
- <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
- <value>添加额外的预设选项。</value>
- </data>
- <data name="MainView_Presets" xml:space="preserve">
- <value>预设是针对特定场景定制的一组编码设置。选择最符合你意图的一个。
-
-覆盖所有编码设置。在选择预置后，可以进一步调整设置。</value>
- </data>
- <data name="MainView_RemovePreset" xml:space="preserve">
- <value>移除选中的预设。</value>
- </data>
- <data name="SourceSelection_TitleSpecific" xml:space="preserve">
- <value>只扫描指定的标题。</value>
- </data>
- <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
- <value>自定义降噪参数。
- 
-NLMeans 语法: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
-
-NLMeans 默认值: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
-
-HQDN3D 语法: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
-
-HQDN3D 默认值: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
- </data>
- <data name="FilterView_DenoisePreset" xml:space="preserve">
- <value>降噪滤镜预设。 设置滤镜的强度。</value>
- </data>
- <data name="FilterView_DenoiseTune" xml:space="preserve">
- <value>降噪调优。进一步调整降噪预设以优化特定场景的设置。
- 
-- None 使用默认预设设置。
- 
-- Film 优化设置以用于大多数真人类型电影。
- 
-- Grain 只处理颜色通道。有助于减少或消除颜色噪点。
-
-- High Motion 通过避免对色彩通道进行时间处理来减少高运动场景中的颜色模糊。适用于体育和动作视频。
-
-- Animation 适用于CEL动画，如动画和卡通。
-
-- Tape 对于低细节模拟磁带源非常有用，例如VHS。其中Film不会产生理想的结果。
-
-- Sprite 适用于1-/4-/8-/16-bit的2D游戏。Sprite 不是为高清视频设计的。</value>
- </data>
- <data name="FilterView_Deinterlace" xml:space="preserve">
- <value>反交错从图像中删除梳状横纹。
-
-Yadif 是一种流行且快速的去交错算法。
-
-Decomb 在多种插值算法之间切换，以提高速度和质量。</value>
- </data>
- <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
- <value>自定义反交错参数。
- 
- Yadif 语法: mode=m:parity=p
- 
- Yadif 默认值: mode=3
- 
- Decomb 语法: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
- 
- Decomb 默认值: mode=7</value>
- </data>
- <data name="FilterView_DeinterlacePreset" xml:space="preserve">
- <value>反交错滤镜预设。
-
-Default 在速度和质量上都很好地平衡。
-
-Skip Spatial Check 让 Yadif 跳过纠正某些可避免的拉丝，以获得轻微的速度提升。
-
-EEDI2 为 Decomb 使用更慢、更高质量的插值算法。对于最难处理的来源很有用。
-
-Bob 运动物体边缘有锯齿，另外画面有闪烁、抖动感，文字、较细线条部分能明显感觉出来。</value>
- </data>
- <data name="FilterView_Flip" xml:space="preserve">
- <value>水平翻转（镜像）图像。</value>
- </data>
- <data name="FilterView_InterlaceDetection" xml:space="preserve">
- <value>隔行扫描检测，当启用时，允许解交错滤镜仅处理逐行扫描的帧。</value>
- </data>
- <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
- <value>自定义交错扫描检测参数。
- 
- 语法: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
- 
- 默认值: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
- </data>
- <data name="FilterView_Rotate" xml:space="preserve">
- <value>将图像顺时针旋转90度。</value>
- </data>
- <data name="MainView_Duration" xml:space="preserve">
- <value>所选源范围的持续时间（小时：分钟：秒）</value>
- </data>
- <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>保持宽高比，保持源视频的显示比例。 禁用此功能可能会导致图片拉伸或压缩。</value>
- </data>
- <data name="FilterView_CustomSharpenParams" xml:space="preserve">
- <value>自定义锐化参数。
-
-Unsharp 语法: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
-
-Unsharp 默认值: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
-
-Lapsharp 语法: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
-
-Lapsharp 默认值: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
- </data>
- <data name="FilterView_Sharpen" xml:space="preserve">
- <value>锐化增强图像中某一部的位细节，尤其是轮廓。过强的锐化设置可能会产生振铃效应和更多的噪点从而损害图像质量降低压缩效率。
-
-Unsharp 是一种通用的反锐化掩模滤镜。它通过将原图像进行模糊预处理，然后计算模糊图片和原始图像之间的差异来锐化。
-
-Lapsharp 使用近似拉普拉斯边缘滤镜的卷积核锐化，有时比反锐化掩模产生更高质量的效果。</value>
- </data>
- <data name="FilterView_SharpenPreset" xml:space="preserve">
- <value>锐化滤镜预设。 设置滤镜的强度。</value>
- </data>
- <data name="FilterView_SharpenTune" xml:space="preserve">
- <value>锐化调优。进一步调整锐化预设以优化特定场景的设置。
-
-None 使用默认预设设置。
-
-Unsharp 预设可用 Ultrafine, Fine, Medium, Coarse, 或 Very Coarse 等优化方案对锐化进行调整。根据输出图像的分辨率和细节的精细度来选择。
-
-Lapsharp 预设 Film 优化设置以用于大多数实时动作内容。Film 使用各向同性拉普拉斯内核来锐化所有边缘，并且亮度（亮度）信息比色度（颜色）信息更尖锐。
-
-Lapsharp 预设 Grain 优化类似 Film，但使用高斯各向同性拉普拉斯算子来减少对噪点和纹理的影响。
-
-Lapsharp 预设 Animation 优化适用于动画和卡通片等CEL动画。Animation与Film相同，但整体强度降低，以避免产生伪影。
-
-Lapsharp 预设 Sprite 优化适用于 1-/4-/8-/16-bit 2D游戏。Sprite使用4邻域拉普拉斯算子内核，比边缘检测算子更能增强垂直和水平边缘。</value>
- </data>
- <data name="MainView_AlignAVStart" xml:space="preserve">
- <value>通过插入空白帧或删除帧来对齐所有音频和视频流的初始时间戳。可以改善MP4音画不同步的问题。</value>
- </data>
- <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
- <value>预设控制选项。</value>
- </data>
- <data name="MainView_EndPoint" xml:space="preserve">
- <value>此范围的终点。</value>
- </data>
- <data name="MainView_StartPoint" xml:space="preserve">
- <value>此范围的起点。</value>
- </data>
- <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
- <value>启用时，自动名称系统将始终使用默认路径。
-禁用时，如果已填充，它将使用主窗口上“目标”框中的路径，否则将使用默认路径。</value>
- </data>
-</root>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/EncodeBase.cs Deleted

@@ -1,221 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeBase.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// A Base Class for the Encode Services.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Encode
-{
- using System;
- using System.Diagnostics;
- using System.Globalization;
- using System.IO;
-
- using HandBrake.Interop.Interop.EventArgs;
- using HandBrake.Interop.Model;
-
- using HandBrakeWPF.Services.Encode.Interfaces;
- using HandBrakeWPF.Utilities;
-
- using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
- using EncodeCompletedStatus = HandBrakeWPF.Services.Encode.Interfaces.EncodeCompletedStatus;
- using EncodeProgessStatus = HandBrakeWPF.Services.Encode.Interfaces.EncodeProgessStatus;
- using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
- using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
- using LogService = HandBrakeWPF.Services.Logging.LogService;
-
- /// <summary>
- /// A Base Class for the Encode Services.
- /// </summary>
- public class EncodeBase
- {
- private readonly ILog logService;
-
- public EncodeBase(ILog logService)
- {
- this.logService = logService;
- }
-
- #region Events
-
- /// <summary>
- /// Fires when a new QueueTask starts
- /// </summary>
- public event EventHandler EncodeStarted;
-
- /// <summary>
- /// Fires when a QueueTask finishes.
- /// </summary>
- public event EncodeCompletedStatus EncodeCompleted;
-
- /// <summary>
- /// Encode process has progressed
- /// </summary>
- public event EncodeProgessStatus EncodeStatusChanged;
-
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets or sets a value indicating whether IsEncoding.
- /// </summary>
- public bool IsEncoding { get; protected set; }
-
- #endregion
-
- #region Invoke Events
-
- /// <summary>
- /// Invoke the Encode Status Changed Event.
- /// </summary>
- /// <param name="e">
- /// The EncodeProgressEventArgs.
- /// </param>
- public void InvokeEncodeStatusChanged(EncodeProgressEventArgs e)
- {
- EncodeProgessStatus handler = this.EncodeStatusChanged;
- handler?.Invoke(this, e);
- }
-
- /// <summary>
- /// Invoke the Encode Completed Event
- /// </summary>
- /// <param name="e">
- /// The EncodeCompletedEventArgs.
- /// </param>
- public void InvokeEncodeCompleted(EncodeCompletedEventArgs e)
- {
- EncodeCompletedStatus handler = this.EncodeCompleted;
- handler?.Invoke(this, e);
- }
-
- /// <summary>
- /// Invoke the Encode Started Event
- /// </summary>
- /// <param name="e">
- /// The EventArgs.
- /// </param>
- public void InvokeEncodeStarted(System.EventArgs e)
- {
- EventHandler handler = this.EncodeStarted;
- handler?.Invoke(this, e);
- }
-
- #endregion
-
- #region Methods
-
- /// <summary>
- /// Save a copy of the log to the users desired location or a default location
- /// if this feature is enabled in options.
- /// </summary>
- /// <param name="destination">
- /// The Destination File Path
- /// </param>
- /// <param name="isPreview">
- /// The is Preview.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- public string ProcessLogs(string destination, bool isPreview, HBConfiguration configuration)
- {
- try
- {
- string logDir = DirectoryUtilities.GetLogDirectory();
- string encodeDestinationPath = Path.GetDirectoryName(destination);
- string destinationFile = Path.GetFileName(destination);
- string encodeLogFile = destinationFile + " " + DateTime.Now.ToString(CultureInfo.InvariantCulture).Replace("/", "-").Replace(":", "-") + ".txt";
- string logContent = this.logService.GetFullLog();
-
- // Make sure the log directory exists.
- if (!Directory.Exists(logDir))
- {
- Directory.CreateDirectory(logDir);
- }
-
- // Copy the Log to HandBrakes log folder in the users applciation data folder.
- this.WriteFile(logContent, Path.Combine(logDir, encodeLogFile));
-
- // Save a copy of the log file in the same location as the enocde.
- if (configuration.SaveLogWithVideo)
- {
- this.WriteFile(logContent, Path.Combine(encodeDestinationPath, encodeLogFile));
- }
-
- // Save a copy of the log file to a user specified location
- if (Directory.Exists(configuration.SaveLogCopyDirectory) && configuration.SaveLogToCopyDirectory)
- {
- this.WriteFile(logContent, Path.Combine(configuration.SaveLogCopyDirectory, encodeLogFile));
- }
-
- return Path.Combine(logDir, encodeLogFile);
- }
- catch (Exception exc)
- {
- Debug.WriteLine(exc); // This exception doesn't warrant user interaction, but it should be logged
- }
-
- return null;
- }
-
- /// <summary>
- /// Verify the Encode Destination path exists and if not, create it.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- /// <exception cref="Exception">
- /// If the creation fails, an exception is thrown.
- /// </exception>
- protected void VerifyEncodeDestinationPath(EncodeTask task)
- {
- // Make sure the path exists, attempt to create it if it doesn't
- try
- {
- string path = Directory.GetParent(task.Destination).ToString();
- if (!Directory.Exists(path))
- {
- Directory.CreateDirectory(path);
- }
- }
- catch (Exception exc)
- {
- throw new GeneralApplicationException(
- "Unable to create directory for the encoded output.", "Please verify that you have a valid path.", exc);
- }
- }
-
- /// <summary>
- /// The write file.
- /// </summary>
- /// <param name="content">
- /// The content.
- /// </param>
- /// <param name="fileName">
- /// The file name.
- /// </param>
- private void WriteFile(string content, string fileName)
- {
- try
- {
- using (StreamWriter fileWriter = new StreamWriter(fileName) { AutoFlush = true })
- {
- fileWriter.Write(content);
- }
- }
- catch (Exception exc)
- {
- Debug.WriteLine(exc);
- }
- }
-
- #endregion
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskImportFactory.cs Deleted

@@ -1,414 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="EncodeTaskImportFactory.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The encode factory.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Encode.Factories
-{
- using System;
- using System.Diagnostics;
- using System.Linq;
-
- using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.Json.Encode;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Model;
- using HandBrakeWPF.Extensions;
- using HandBrakeWPF.Services.Encode.Model.Models;
- using HandBrakeWPF.Services.Encode.Model.Models.Video;
- using HandBrakeWPF.Utilities;
-
- using AudioEncoder = Model.Models.AudioEncoder;
- using AudioEncoderRateType = Model.Models.AudioEncoderRateType;
- using AudioTrack = Model.Models.AudioTrack;
- using Chapter = HandBrake.Interop.Interop.Json.Encode.Chapter;
- using ChapterMarker = Model.Models.ChapterMarker;
- using EncodeTask = Model.EncodeTask;
- using OutputFormat = Model.Models.OutputFormat;
- using PointToPointMode = Model.Models.PointToPointMode;
- using SubtitleTrack = HandBrake.Interop.Interop.Json.Encode.SubtitleTrack;
-
- /// <summary>
- /// This factory takes the internal EncodeJob object and turns it into a set of JSON models
- /// that can be deserialized by libhb.
- /// </summary>
- internal class EncodeTaskImportFactory
- {
- /*
- * TODO
- * 1. Reconstruct the Config
- * 2. Reconstruct Queue State
- * 3. Update JSON API. See #1481
- */
-
- internal static EncodeTask Create(JsonEncodeObject job)
- {
- if (job == null)
- {
- return null;
- }
-
- EncodeTask task = new EncodeTask();
- ParseSource(task, job);
- ParseDestination(task, job);
- ParsePar(task, job);
- ParseVideo(task, job);
- ParseAudio(task, job);
- ParseSubtitle(task, job);
- ParseFilters(task, job);
- ParseMetaData(task, job);
-
- return task;
- }
-
- internal static HBConfiguration CreateConfig(JsonEncodeObject job)
- {
- // range.SeekPoints = configuration.PreviewScanCount;
- // video.QSV.Decode = SystemInfo.IsQsvAvailable && configuration.EnableQuickSyncDecoding;
- /*
- // The use of the QSV decoder is configurable for non QSV encoders.
- if (video.QSV.Decode && job.VideoEncoder != VideoEncoder.QuickSync && job.VideoEncoder != VideoEncoder.QuickSyncH265 && job.VideoEncoder != VideoEncoder.QuickSyncH26510b)
- {
- video.QSV.Decode = configuration.UseQSVDecodeForNonQSVEnc;
- }*/
-
- return new HBConfiguration();
- }
-
- private static void ParseSource(EncodeTask task, JsonEncodeObject job)
- {
- if (job?.Source == null)
- {
- return;
- }
-
- task.PointToPointMode = EnumHelper<PointToPointMode>.GetValue(job.Source.Range.Type);
-
- switch (task.PointToPointMode)
- {
- case PointToPointMode.Chapters:
- case PointToPointMode.Frames:
- task.StartPoint = job.Source.Range.Start.Value;
- task.EndPoint = job.Source.Range.End.Value;
- break;
- case PointToPointMode.Seconds:
- task.StartPoint = job.Source.Range.Start.Value / 90000;
- task.EndPoint = job.Source.Range.End.Value / 90000;
- break;
- }
-
- task.Source = job.Source.Path;
- task.Title = job.Source.Title;
- task.Angle = job.Source.Angle;
- }
-
- private static void ParseDestination(EncodeTask task, JsonEncodeObject job)
- {
- if (job.Destination == null)
- {
- return;
- }
-
- task.Destination = job.Destination.File;
- task.OptimizeMP4 = job.Destination.Mp4Options.Mp4Optimize;
- task.IPod5GSupport = job.Destination.Mp4Options.IpodAtom;
- task.AlignAVStart = job.Destination.AlignAVStart;
- task.OutputFormat = EnumHelper<OutputFormat>.GetValue(job.Destination.Mux);
-
- task.IncludeChapterMarkers = job.Destination.ChapterMarkers;
- int chapter = 0;
- foreach (Chapter item in job.Destination.ChapterList)
- {
- chapter = chapter + 1;
- task.ChapterNames.Add(new ChapterMarker(0, item.Name, TimeSpan.MinValue));
- }
- }
-
- private static void ParsePar(EncodeTask task, JsonEncodeObject job)
- {
- if (job.PAR == null)
- {
- return;
- }
-
- task.PixelAspectX = job.PAR.Num;
- task.PixelAspectY = job.PAR.Den;
- }
-
- private static void ParseVideo(EncodeTask task, JsonEncodeObject job)
- {
- task.VideoEncoder = EnumHelper<VideoEncoder>.GetValue(job.Video.Encoder);
- task.ExtraAdvancedArguments = job.Video.Options;
-
- HBVideoEncoder videoEncoder = HandBrakeEncoderHelpers.VideoEncoders.FirstOrDefault(e => e.ShortName == job.Video.Encoder);
- if (videoEncoder == null)
- {
- Debug.WriteLine("Video encoder is not supported on this system.");
- }
-
- task.VideoLevel = new VideoLevel(job.Video.Level, job.Video.Level);
- task.VideoPreset = new VideoPreset(job.Video.Preset, job.Video.Preset);
- task.VideoProfile = new VideoProfile(job.Video.Profile, job.Video.Profile);
-
- if (!string.IsNullOrEmpty(job.Video.Tune))
- {
- string splitTunes = job.Video.Tune.Split(',');
- foreach (string tune in splitTunes)
- {
- task.VideoTunes.Add(new VideoTune(tune, tune));
- }
- }
-
- if (job.Video.Quality.HasValue)
- {
- task.VideoEncodeRateType = VideoEncodeRateType.ConstantQuality;
- task.Quality = job.Video.Quality;
- }
-
- if (job.Video.Bitrate.HasValue)
- {
- task.VideoEncodeRateType = VideoEncodeRateType.AverageBitrate;
- task.TwoPass = job.Video.TwoPass;
- task.TurboFirstPass = job.Video.Turbo;
- task.VideoBitrate = job.Video.Bitrate;
- }
-
- // job.Video.ColorMatrixCode; Not currently supported in the GUI.
- }
-
- private static void ParseAudio(EncodeTask task, JsonEncodeObject job)
- {
- if (job.Audio == null)
- {
- return;
- }
-
- task.AllowedPassthruOptions.AudioAllowAACPass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.AacPassthru));
- task.AllowedPassthruOptions.AudioAllowAC3Pass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Ac3Passthrough));
- task.AllowedPassthruOptions.AudioAllowDTSHDPass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsHDPassthrough));
- task.AllowedPassthruOptions.AudioAllowDTSPass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsPassthrough));
- task.AllowedPassthruOptions.AudioAllowEAC3Pass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.EAc3Passthrough));
- task.AllowedPassthruOptions.AudioAllowFlacPass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.FlacPassthru));
- task.AllowedPassthruOptions.AudioAllowMP3Pass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Mp3Passthru));
- task.AllowedPassthruOptions.AudioAllowTrueHDPass = job.Audio.CopyMask.Contains(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.TrueHDPassthrough));
- task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(job.Audio.FallbackEncoder);
-
- foreach (HandBrake.Interop.Interop.Json.Encode.AudioTrack item in job.Audio.AudioList)
- {
- HBMixdown mixdown = HandBrakeEncoderHelpers.Mixdowns.FirstOrDefault(m => m.Id == item.Mixdown);
- HBRate sampleRate = HandBrakeEncoderHelpers.AudioSampleRates.FirstOrDefault(s => s.Rate == item.Samplerate);
-
- AudioTrack track = new AudioTrack();
- track.ScannedTrack = new Scan.Model.Audio(item.Track); // When adding to the queue, we don't need the full context. Editing queue will recovery this.
- track.Encoder = EnumHelper<AudioEncoder>.GetValue(item.Encoder);
- track.Gain = (int)item.Gain;
- track.MixDown = mixdown?.ShortName;
- track.TrackName = item.Name;
- track.SampleRate = sampleRate?.Rate ?? 48; // TODO this may not work. Check
- track.DRC = item.DRC;
-
- if (!track.IsPassthru && item.Bitrate.HasValue)
- {
- track.Bitrate = item.Bitrate.Value;
- track.EncoderRateType = AudioEncoderRateType.Bitrate;
- }
-
- if (!track.IsPassthru && item.Quality.HasValue)
- {
- track.Quality = item.Quality.Value;
- track.EncoderRateType = AudioEncoderRateType.Quality;
- }
-
- task.AudioTracks.Add(track);
- }
- }
-
- private static void ParseSubtitle(EncodeTask task, JsonEncodeObject job)
- {
- if (job.Subtitle == null)
- {
- return;
- }
-
- if (job.Subtitle.Search.Enable)
- {
- Model.Models.SubtitleTrack subtitleTrack = new Model.Models.SubtitleTrack();
- subtitleTrack.Burned = job.Subtitle.Search.Burn;
- subtitleTrack.Default = job.Subtitle.Search.Default;
- subtitleTrack.Forced = job.Subtitle.Search.Forced;
- subtitleTrack.SubtitleType = SubtitleType.ForeignAudioSearch;
- subtitleTrack.SourceTrack = new Scan.Model.Subtitle(0);
- task.SubtitleTracks.Add(subtitleTrack);
- }
-
- foreach (SubtitleTrack subtitle in job.Subtitle.SubtitleList)
- {
- if (subtitle.ID == 0) 
- {
- continue; // Foreign Audio Scan
- }
-
- Model.Models.SubtitleTrack subtitleTrack = new Model.Models.SubtitleTrack();
-
- subtitle.ID = subtitle.ID;
- subtitleTrack.Burned = subtitle.Burn;
- subtitleTrack.Default = subtitle.Default;
- subtitleTrack.Forced = subtitle.Forced;
-
- if (!string.IsNullOrEmpty(subtitle.Import.Filename))
- {
- subtitleTrack.SubtitleType = subtitle.Import.Filename.EndsWith("srt") ? SubtitleType.SRT : SubtitleType.SSA;
- subtitleTrack.SrtCharCode = subtitle.Import.Codeset;
- subtitleTrack.SrtFileName = subtitle.Import.Filename;
- subtitleTrack.SrtLangCode = subtitle.Import.Language;
- subtitleTrack.SrtLang = HandBrakeLanguagesHelper.Get(subtitleTrack.SrtLangCode).EnglishName;
- subtitleTrack.SrtOffset = subtitleTrack.SrtOffset;
- }
-
- task.SubtitleTracks.Add(null);
- }
- }
-
- private static void ParseFilters(EncodeTask task, JsonEncodeObject job)
- {
- // Crop scale
- Filter cropscaleFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_CROP_SCALE);
- if (cropscaleFilter != null)
- {
- var filterSettings = cropscaleFilter.Settings;
- int cropTop = filterSettings.Value<int>("crop-top");
- int cropBottom = filterSettings.Value<int>("crop-bottom");
- int cropLeft = filterSettings.Value<int>("crop-left");
- int cropRight = filterSettings.Value<int>("crop-right");
- int width = filterSettings.Value<int>("width");
- int height = filterSettings.Value<int>("height");
-
- task.Width = width;
- task.Height = height;
- task.Cropping.Top = cropTop;
- task.Cropping.Bottom = cropBottom;
- task.Cropping.Left = cropLeft;
- task.Cropping.Right = cropRight;
- }
-
- // Grayscale
- Filter grayscaleFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_GRAYSCALE);
- if (grayscaleFilter != null)
- {
- task.Grayscale = true;
- }
-
- // Rotate
- Filter rotationFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_ROTATE);
- if (rotationFilter != null)
- {
- var filterSettings = rotationFilter.Settings;
- task.Rotation = filterSettings.Value<int>("angle");
- task.FlipVideo = filterSettings.Value<string>("hflip") == "1";
- }
-
- // Deblock
- Filter deblockFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_DEBLOCK);
- if (deblockFilter != null)
- {
- var filterSettings = deblockFilter.Settings;
- task.DeblockPreset = null; // TODO Support Preset / Tune
- }
-
- // Sharpen
- Filter lapsharpFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_LAPSHARP);
- if (lapsharpFilter != null)
- { 
- var filterSettings = lapsharpFilter.Settings;
- task.Sharpen = Sharpen.LapSharp; // TODO Preset / Tune
- }
-
- Filter unsharpFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_UNSHARP);
- if (unsharpFilter != null)
- {
- var filterSettings = unsharpFilter.Settings;
- task.Sharpen = Sharpen.UnSharp; // TODO Preset / Tune
- }
-
- // Denoise
- Filter hqdn3dFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_HQDN3D);
- if (hqdn3dFilter != null)
- {
- var filterSettings = hqdn3dFilter.Settings;
- task.Denoise = Denoise.hqdn3d; // TODO Preset / Tune
- }
-
- Filter nlmeansFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_NLMEANS);
- if (nlmeansFilter != null)
- {
- var filterSettings = nlmeansFilter.Settings;
- task.Denoise = Denoise.NLMeans; // TODO Preset / Tune
- }
-
- // Detelecine
- Filter detelecineFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_DETELECINE);
- if (detelecineFilter != null)
- {
- var filterSettings = detelecineFilter.Settings;
- task.Detelecine = Detelecine.Default; // TODO Handle Custom
- }
-
- // Deinterlace
- Filter deinterlaceFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_DEINTERLACE);
- if (deinterlaceFilter != null)
- {
- var filterSettings = deinterlaceFilter.Settings;
- task.DeinterlaceFilter = DeinterlaceFilter.Yadif; // TODO Handle Preset / Custom
- }
-
- Filter decombFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_DECOMB);
- if (decombFilter != null)
- {
- var filterSettings = decombFilter.Settings;
- task.DeinterlaceFilter = DeinterlaceFilter.Decomb; // TODO Handle Preset / Custom
- }
-
- // Interlace Detection 
- Filter combDetect = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_COMB_DETECT);
- if (combDetect != null)
- {
- var filterSettings = combDetect.Settings;
- task.CombDetect = CombDetect.Default; // TODO Handle Preset / Custom
- }
-
- // Framerate
-
- Filter framerateFilter = job.Filters.FilterList.FirstOrDefault(f => f.ID == (int)hb_filter_ids.HB_FILTER_VFR);
- if (framerateFilter != null)
- {
- var filterSettings = framerateFilter.Settings;
- task.FramerateMode = (FramerateMode)filterSettings.Value<int>("mode"); // TODO numbers may not be in correct order.
- string rate = filterSettings.Value<string>("rate"); // TODO Handle Rate. num/den hb_video_framerate_get_from_name
- }
- }
-
- private static void ParseMetaData(EncodeTask task, JsonEncodeObject job)
- {
- if (job.Metadata == null)
- {
- return;
- }
-
- task.MetaData.Artist = job.Metadata.Artist;
- task.MetaData.Album = job.Metadata.Album;
- task.MetaData.AlbumArtist = job.Metadata.AlbumArtist;
- task.MetaData.Comment = job.Metadata.Comment;
- task.MetaData.Composer = job.Metadata.Composer;
- task.MetaData.Description = job.Metadata.Description;
- task.MetaData.Genre = job.Metadata.Genre;
- task.MetaData.LongDescription = job.Metadata.LongDescription;
- task.MetaData.Name = job.Metadata.Name;
- task.MetaData.ReleaseDate = job.Metadata.ReleaseDate;
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/QueueFactory.cs Deleted

@@ -1,70 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="QueueFactory.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the QueueFactory type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Encode.Factories
-{
- using System.Collections.Generic;
-
- using Caliburn.Micro;
-
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Json.Queue;
- using HandBrake.Interop.Interop.Providers.Interfaces;
- using HandBrake.Interop.Model;
-
- using HandBrakeWPF.Services.Encode.Model;
- using HandBrakeWPF.Services.Interfaces;
-
- using Newtonsoft.Json;
-
- /// <summary>
- /// The queue factory.
- /// </summary>
- public class QueueFactory
- {
- /// <summary>
- /// For a givent set of tasks, return the Queue JSON that can be used for the CLI.
- /// </summary>
- /// <param name="tasks">
- /// The tasks.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- /// <returns>
- /// The <see cref="string"/>.
- /// </returns>
- public static string GetQueueJson(List<EncodeTask> tasks, HBConfiguration configuration)
- {
- JsonSerializerSettings settings = new JsonSerializerSettings
- {
- NullValueHandling = NullValueHandling.Ignore,
- };
-
- IHbFunctionsProvider provider = IoC.Get<IHbFunctionsProvider>(); // TODO remove IoC call.
- IHbFunctions hbFunctions = provider.GetHbFunctionsWrapper();
-
- List<Task> queueJobs = new List<Task>();
- foreach (var item in tasks)
- {
- Task task = new Task { Job = EncodeTaskFactory.Create(item, configuration, hbFunctions) };
- queueJobs.Add(task);
- }
-
- return JsonConvert.SerializeObject(queueJobs, Formatting.Indented, settings);
- }
-
- public static List<Task> GetQueue(string content)
- {
- JsonSerializerSettings settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
- List<Task> tasks = JsonConvert.DeserializeObject<List<Task>>(content, settings);
- return tasks;
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTaskContainer.cs Deleted

@@ -1,42 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="QueueTaskContainer.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The queue task container.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Services.Queue.Model
-{
- /// <summary>
- /// The queue task container.
- /// </summary>
- public class QueueTaskContainer
- {
- /// <summary>
- /// Initializes a new instance of the <see cref="QueueTaskContainer"/> class.
- /// </summary>
- /// <param name="version">
- /// The version.
- /// </param>
- /// <param name="queuetask">
- /// The queuetask.
- /// </param>
- public QueueTaskContainer(int version, string queuetask)
- {
- Version = version;
- QueueTask = queuetask;
- }
-
- /// <summary>
- /// Gets or sets the version of the presets stored in this container.
- /// </summary>
- public int Version { get; set; }
-
- /// <summary>
- /// Gets or sets the presets. This is a serialised string.
- /// </summary>
- public string QueueTask { get; set; }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/UwpDetect.cs Deleted

@@ -1,48 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="UwpDetect.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Helper class to detect if we are running in a UWP container.
-// https://msdn.microsoft.com/en-us/library/windows/desktop/hh446599(v=vs.85).aspx
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Utilities
-{
- using System;
- using System.Runtime.InteropServices;
- using System.Text;
-
- public class UwpDetect
- {
- DllImport("kernel32.dll")
- static extern int GetCurrentPackageFullName(ref int length, MarshalAs(UnmanagedType.LPWStr) StringBuilder fullName);
-
- private const int APPMODEL_ERROR_NO_PACKAGE = 15700;
-
- public static bool IsUWP()
- {
- if (Environment.OSVersion.Version.Major == 6 && Environment.OSVersion.Version.Minor <= 1)
- {
- return false;
- }
-
- int length = 0;
- StringBuilder packageName = new StringBuilder(1024);
-
- int result = GetCurrentPackageFullName(ref length, packageName); // Only available in 6.2 or later.
- if (result == APPMODEL_ERROR_NO_PACKAGE)
- {
- return false;
- }
-
- if (packageName.ToString().Trim().Length > 0)
- {
- return true;
- }
-
- return false;
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/Win7.cs Deleted

@@ -1,80 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="Win7.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// A class implementing Windows 7 Specific features
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.Utilities
-{
- using System.Windows.Shell;
-
- /// <summary>
- /// A class implementing Windows 7 Specific features
- /// </summary>
- public class Win7
- {
- /// <summary>
- /// The Windows Taskbar
- /// </summary>
- public static TaskbarItemInfo WindowsTaskbar;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Win7"/> class.
- /// </summary>
- public Win7()
- {
- if (WindowsTaskbar == null)
- WindowsTaskbar = new TaskbarItemInfo();
- }
-
- /// <summary>
- /// Gets a value indicating whether is windows seven.
- /// </summary>
- public bool IsWindowsSeven
- {
- get
- {
- return true;
- }
- }
-
- /// <summary>
- /// The get task bar.
- /// </summary>
- /// <returns>
- /// The <see cref="TaskbarItemInfo"/>.
- /// </returns>
- public TaskbarItemInfo GetTaskBar()
- {
- return WindowsTaskbar;
- }
-
- /// <summary>
- /// Set the Task Bar Percentage.
- /// </summary>
- /// <param name="percentage">
- /// The percentage.
- /// </param>
- public void SetTaskBarProgress(int percentage)
- {
- // Update the taskbar progress indicator. The normal state shows a green progress bar.
- Caliburn.Micro.Execute.OnUIThread(
- () =>
- {
- WindowsTaskbar.ProgressState = TaskbarItemProgressState.Normal;
- WindowsTaskbar.ProgressValue = (double)percentage / 100;
- });
- }
-
- /// <summary>
- /// Disable Task Bar Progress
- /// </summary>
- public void SetTaskBarProgressToNoProgress()
- {
- Caliburn.Micro.Execute.OnUIThread(() => WindowsTaskbar.ProgressState = TaskbarItemProgressState.None);
- }
- }
-}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMiniViewModel.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/MiniViewModel.cs Deleted

@@ -1,209 +0,0 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="MiniViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// The mini view model.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrakeWPF.ViewModels
-{
- using System;
-
- using HandBrakeWPF.EventArgs;
- using HandBrakeWPF.Properties;
- using HandBrakeWPF.Services.Queue.Interfaces;
- using HandBrakeWPF.ViewModels.Interfaces;
-
- using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
- using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;
-
- /// <summary>
- /// The mini view model.
- /// </summary>
- public class MiniViewModel : ViewModelBase, IMiniViewModel
- {
- private readonly IEncode encodeService;
- private readonly IQueueService queueProcessor;
- private string queueStatus;
- private string progress;
- private string task;
- private string windowTitle;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="MiniViewModel"/> class.
- /// </summary>
- /// <param name="encodeService">
- /// The encode Service.
- /// </param>
- /// <param name="queueProcessor">
- /// The queue Processor.
- /// </param>
- public MiniViewModel(IEncode encodeService, IQueueService queueProcessor)
- {
- this.encodeService = encodeService;
- this.queueProcessor = queueProcessor;
-
- this.Task = "Ready";
- this.Progress = string.Empty;
- this.QueueStatus = string.Format("{0} jobs pending", this.queueProcessor.Count);
- }
-
- /// <summary>
- /// Gets or sets the task.
- /// </summary>
- public string Task
- {
- get
- {
- return this.task;
- }
- set
- {
- if (value == this.task)
- {
- return;
- }
- this.task = value;
- this.NotifyOfPropertyChange(() => this.Task);
- }
- }
-
- /// <summary>
- /// Gets or sets the progress.
- /// </summary>
- public string Progress
- {
- get
- {
- return this.progress;
- }
- set
- {
- if (value == this.progress)
- {
- return;
- }
- this.progress = value;
- this.NotifyOfPropertyChange(() => this.Progress);
- }
- }
-
- /// <summary>
- /// Gets or sets the queue status.
- /// </summary>
- public string QueueStatus
- {
- get
- {
- return this.queueStatus;
- }
- set
- {
- if (value == this.queueStatus)
- {
- return;
- }
- this.queueStatus = value;
- this.NotifyOfPropertyChange(() => this.QueueStatus);
- }
- }
-
- /// <summary>
- /// Gets or sets the window title.
- /// </summary>
- public string WindowTitle
- {
- get
- {
- return this.windowTitle;
- }
- set
- {
- if (value == this.windowTitle)
- {
- return;
- }
- this.windowTitle = value;
- this.NotifyOfPropertyChange(() => this.WindowTitle);
- }
- }
-
- /// <summary>
- /// The activate.
- /// </summary>
- public void Activate()
- {
- this.encodeService.EncodeStatusChanged += EncodeService_EncodeStatusChanged;
- this.queueProcessor.QueueChanged += QueueProcessor_QueueChanged;
- this.queueProcessor.QueueCompleted += QueueProcessor_QueueCompleted;
- this.WindowTitle = "Mini Status Display";
- }
-
- /// <summary>
- /// The tear down.
- /// </summary>
- public void Close()
- {
- this.encodeService.EncodeStatusChanged -= EncodeService_EncodeStatusChanged;
- this.queueProcessor.QueueChanged -= QueueProcessor_QueueChanged;
- this.queueProcessor.QueueCompleted -= QueueProcessor_QueueCompleted;
- this.TryClose();
- }
-
- /// <summary>
- /// The queue processor_ queue completed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void QueueProcessor_QueueCompleted(object sender, QueueCompletedEventArgs e)
- {
- this.Task = "Not Encoding.";
- this.Progress = string.Empty;
- this.QueueStatus = string.Format("{0} jobs pending", this.queueProcessor.Count);
- }
-
- /// <summary>
- /// The queue processor_ queue changed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void QueueProcessor_QueueChanged(object sender, EventArgs e)
- {
- this.QueueStatus = string.Format("{0} jobs pending", this.queueProcessor.Count);
- }
-
- /// <summary>
- /// The encode service_ encode status changed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void EncodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
- {
- this.Task = this.queueProcessor.LastProcessedJob.ScannedSourcePath;
-
- this.Progress =
- string.Format(Resources.MiniViewModel_EncodeStatusChanged_StatusLabel,
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- e.CurrentFrameRate,
- e.AverageFrameRate,
- e.EstimatedTimeLeft,
- e.ElapsedTime);
- }
- }
-}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/MiniView.xaml Deleted

@@ -1,35 +0,0 @@
-<Window x:Class="HandBrakeWPF.Views.MiniView"
- xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:cal="http://www.caliburnproject.org"
- AllowDrop="True"
- SnapsToDevicePixels="True"
- UseLayoutRounding="True"
- Width="300"
- Height="200"
- MinWidth="300"
- MinHeight="200"
- TextOptions.TextFormattingMode="Display" ShowActivated="True" ShowInTaskbar="True"
- WindowStyle="ToolWindow"
- x:Name="miniView"
- Title="{Binding Path=WindowTitle}"
- >
- 
- <Grid Margin="5,0,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <TextBlock Text="Status" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="5,0,10,5" Grid.Row="0" />
- 
- <TextBlock Text="{Binding Task}" Grid.Row="1" Margin="10,0,0,5" TextWrapping="WrapWithOverflow" />
- <TextBlock Text="{Binding Progress}" Grid.Row="2" Margin="10,0,0,5" TextWrapping="WrapWithOverflow" />
- <TextBlock Text="{Binding QueueStatus}" Grid.Row="3" Margin="10,0,0,0" TextWrapping="WrapWithOverflow" />
-
- <Button Content="Close" cal:Message.Attach="Event Click = Action Close" Grid.Row="5" HorizontalAlignment="Right" Margin="0,5,5,5" Padding="8,2" />
- </Grid>
-</Window>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/MiniView.xaml.cs Deleted

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/app.config Deleted

HandBrake-1.5.1.tar.xz/.github/ISSUE_TEMPLATE/bug_report.yml Added

@@ -0,0 +1,47 @@
+name: Bug Report
+description: Create a report to help us improve. On the next screen, please fill in the template provided in the post description.
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+       Please fill out the following details to submit a bug report:
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: Problem Description
+      description: Please describe your problem in as much detail as possible. Include any steps necessary to reproduce the problem. You can also include screenshots if desired. 
+    validations:
+      required: true
+  - type: textarea
+    id: activity-log
+    attributes:
+      label: Activity Log, Crash Log or any other details
+      description: An Activity Log is required for support. Please read https://handbrake.fr/docs/en/latest/help/activity-log.html for more information.
+      render: text
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: What Operating System are you running?
+      placeholder: e.g. Windows 10, macOS 11, Ubuntu 20.04
+    validations:
+      required: true
+  - type: input
+    id: hb-version
+    attributes:
+      label: What version of HandBrake are you running?
+      placeholder: e.g. 1.3.3, Nightly 10c4c78
+    validations:
+      required: true
+  - type: input
+    id: hb-download
+    attributes:
+      label: Where did you download HandBrake from?
+      placeholder: e.g. handbrake.fr, github, flathub etc.
+    validations:
+      required: false
+
+
+

HandBrake-1.5.1.tar.xz/.github/ISSUE_TEMPLATE/feature_request.yml Added

@@ -0,0 +1,43 @@
+name: Feature request
+description: Suggest an idea for this project. Please note, requesting third-party library updates is not required; we periodically update these in batches.
+labels: Enhancement
+body:
+  - type: markdown
+    attributes:
+      value: |
+       Please fill out the following fields with as much detail as possible:
+  - type: textarea
+    id: feature
+    attributes:
+      label: Description of the feature or enhancement you'd like to see in HandBrake
+    validations:
+      required: true
+  - type: input
+    id: os
+    attributes:
+      label: What Operating System are you running?
+      placeholder: e.g. Windows 10, macOS 11, Ubuntu 20.04
+    validations:
+      required: true
+  - type: input
+    id: hb-version
+    attributes:
+      label: What version of HandBrake are you running?
+      placeholder: e.g. 1.3.3, Nightly 10c4c78
+    validations:
+      required: false
+  - type: input
+    id: hb-download
+    attributes:
+      label: Where did you download HandBrake from?
+      placeholder: e.g. handbrake.fr, github, flathub etc.
+    validations:
+      required: false
+  - type: textarea
+    id: activity-log
+    attributes:
+      label: Activity Log, Crash Log or any other details
+      description: If the request is off the back of failure or unsupported file format, please post a log as it can help us track down what is missing. Please read https://handbrake.fr/docs/en/latest/help/activity-log.html for more information.
+      render: text
+    validations:
+      required: false

HandBrake-1.5.1.tar.xz/.github/ISSUE_TEMPLATE/translate_request.yml Added

@@ -0,0 +1,43 @@
+name: Translation Team request
+description: Request to join our Translation Team on Transifex.
+body:
+  - type: markdown
+    attributes:
+      value: |
+       Please fill out the following form to request Transifex account be added to the HandBrake translation teams.
+  - type: input
+    id: transifex-user
+    attributes:
+      label: Transifex username
+    validations:
+      required: true
+  - type: input
+    id: hb-lang
+    attributes:
+      label: Which Language would you like to translate
+      placeholder: e.g. French, German etc.
+    validations:
+      required: false
+  - type: checkboxes
+    id: os-choice
+    attributes:
+      label: Which Operating system do you wish to translate?
+      options:
+        - label: Windows
+          required: false
+        - label: macOS
+          required: false
+        - label: Linux (GTK)
+          required: false
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: Please confirm that
+      options:
+        - label: You agree to follow this project's Code of Conduct(https://github.com/HandBrake/HandBrake/blob/master/CODE_OF_CONDUCT.md)
+          required: true
+        - label: Our Community Rules(https://forum.handbrake.fr/app.php/rules)
+          required: true
+        - label: Our Translation Guidelines(https://github.com/HandBrake/HandBrake/blob/master/TRANSLATION.markdown)
+          required: true
+

HandBrake-1.5.1.tar.xz/.github/dependabot.yml Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/workflows/linux.yml -> HandBrake-1.5.1.tar.xz/.github/workflows/linux.yml Changed

@@ -3,33 +3,24 @@
 on: push, pull_request
 
 jobs:
-  handle_forks:
-    name: Forked Repo
-    runs-on: ubuntu-latest
-    if: github.repository != 'HandBrake/HandBrake'
-    steps:
-    - name: Print Warning
-      run: |
-        echo "Builds are disabled for forked repositories."      
-
   build:
     name: Build on Ubuntu
-    runs-on: ubuntu-latest
-    if: github.repository == 'HandBrake/HandBrake'
+    runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@master
-    
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+
     - name: Setup Environment
       run: |
         sudo apt-get update
-        sudo apt-get install autoconf automake build-essential cmake git libass-dev libbz2-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev libjansson-dev liblzma-dev libmp3lame-dev libnuma-dev 
-        sudo apt-get install libogg-dev libopus-dev libsamplerate-dev libspeex-dev libtheora-dev libtool libtool-bin libvorbis-dev libx264-dev libxml2-dev libvpx-dev m4 make nasm ninja-build patch pkg-config python tar yasm zlib1g-dev
-        sudo apt-get install python3-pip
-        sudo apt-get install python3-setuptools
+        sudo apt-get install autoconf automake build-essential libass-dev libbz2-dev libfontconfig1-dev libfreetype6-dev libfribidi-dev libharfbuzz-dev libjansson-dev liblzma-dev libmp3lame-dev libnuma-dev libturbojpeg0-dev 
+        sudo apt-get install libogg-dev libopus-dev libsamplerate-dev libspeex-dev libtheora-dev libtool libtool-bin libvorbis-dev libx264-dev libxml2-dev libvpx-dev make nasm ninja-build patch tar yasm zlib1g-dev appstream
         sudo pip3 install meson
         sudo apt-get install gstreamer1.0-libav intltool libappindicator-dev libdbus-glib-1-dev libglib2.0-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgtk-3-dev libgudev-1.0-dev libnotify-dev
         sudo apt-get install libva-dev libdrm-dev
-        
+
     - name: Build HandBrake Linux
       run: |
-        ./configure --launch-jobs=0 --disable-gtk-update-checks  --enable-qsv --launch
+        ./configure --disable-gtk-update-checks --enable-qsv
+        cd build
+        make -j 3

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/workflows/mac.yml -> HandBrake-1.5.1.tar.xz/.github/workflows/mac.yml Changed

@@ -3,25 +3,15 @@
 on: push, pull_request
 
 jobs:
-  handle_forks:
-    name: Forked Repo
-    runs-on: ubuntu-latest
-    if: github.repository != 'HandBrake/HandBrake'
-    steps:
-    - name: Print Warning
-      run: |
-        echo "Builds are disabled for forked repositories."      
-
   build:
     name: Build on macOS
-    runs-on: macOS-latest
-    if: github.repository == 'HandBrake/HandBrake'
+    runs-on: macos-11.0
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v2
 
     - name: Toolchain Cache
       id: mac-toolchain
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: /usr/local
         key: mac-toolchain
@@ -30,9 +20,16 @@
       if: steps.mac-toolchain.outputs.cache-hit != 'true'
       run: |
         scripts/mac-toolchain-build /usr/local
-        
+
     - name: Build HandBrake
       run: |
-        ./configure --launch-jobs=$(sysctl -n hw.ncpu) --launch
+        git submodule update --init --recursive
+        ./configure
         cd build
-        make pkg.create
+        make ub && make pkg.create
+
+    - name: Upload Assets
+      uses: actions/upload-artifact@v2
+      with:
+        name: HandBrake-macos
+        path: ./build/pkg

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/workflows/notify.yml -> HandBrake-1.5.1.tar.xz/.github/workflows/notify.yml Changed

@@ -1,5 +1,5 @@
 name: "Push Notification"
-on: 
+on:
   push:
   pull_request:
       types: opened, review_requested
@@ -14,19 +14,9 @@
         with:
           channel: "#handbrake"
           nickname: handbrake-bot
-          server: chat.freenode.net
+          server: irc.libera.chat
+          sasl_password: ${{ secrets.LIBERACHAT_PWD }}
           port: 6697
           tls: true
           message: |
-            COMMIT: ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} ${{ join(github.event.commits.*.message) }}     
-      - name: Handle Pull Request
-        uses: rectalogic/notify-irc@v1
-        if: github.event_name == 'pull_request' && github.repository == 'HandBrake/HandBrake'
-        with:
-          channel: "#handbrake"
-          nickname: handbrake-bot
-          server: chat.freenode.net
-          port: 6697
-          tls: true
-          message: |
-            PULL REQUEST: ${{ github.actor }} ${{ github.event.action }} a Pull Request ${{ github.event.pull_request.html_url }}
+            COMMIT: ${{ github.actor }} pushed ${{ github.event.ref }} ${{ github.event.compare }} ${{ join(github.event.commits.*.message) }}

HandBrake-1.5.1.tar.xz/.github/workflows/windows-arm.yml Added

@@ -0,0 +1,54 @@
+name: Windows Build (ARM)
+
+on: push, pull_request
+
+jobs:
+  build_mingw:
+    name: CLI / LibHB (ARM)
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+
+    - name: Environment Setup
+      run: |
+        sudo apt-get purge cmake -y
+        sudo apt-get install automake autoconf build-essential intltool libtool libtool-bin make nasm patch tar yasm zlib1g-dev ninja-build gzip pax cmake
+        sudo pip3 install meson
+
+    - name: Setup Toolchain
+      run: |
+        wget https://github.com/HandBrake/HandBrake-toolchains/releases/download/1.0/llvm-mingw-msvcrt.tar.gz
+        SHA=$(sha1sum llvm-mingw-msvcrt.tar.gz)
+        EXPECTED="ea5eaf2f67c4e0ca40a6d6889de51bb4ce9ca3c6  llvm-mingw-msvcrt.tar.gz"
+        if  "$SHA" == "$EXPECTED" ;
+        then
+            echo "Toolchain Verified. Extracting ..."
+            mkdir toolchains
+            mv llvm-mingw-msvcrt.tar.gz toolchains
+            cd toolchains
+            tar xvf llvm-mingw-msvcrt.tar.gz
+        else
+            echo "Toolchain Verification FAILED. Exiting!"
+            return -1
+        fi
+
+    - name: Build CLI and LibHB
+      run: |
+        export PATH="/home/runner/work/HandBrake/HandBrake/toolchains/llvm-mingw-msvcrt/bin:${PATH}"
+        export PATH=/usr/bin:$PATH
+        ./configure --cross=aarch64-w64-mingw32 --enable-mf --launch-jobs=0 --launch
+        cd build
+        make pkg.create.zip
+
+    - name: Upload HandBrakeCLI
+      uses: actions/upload-artifact@v2
+      with:
+        name: HandBrakeCLI
+        path: ./build/HandBrakeCLI.exe
+
+    - name: Upload LibHB
+      uses: actions/upload-artifact@v2
+      with:
+        name: LibHandBrake
+        path: ./build/libhb/hb.dll

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/.github/workflows/windows.yml -> HandBrake-1.5.1.tar.xz/.github/workflows/windows.yml Changed

@@ -3,80 +3,99 @@
 on: push, pull_request
 
 jobs:
-  handle_forks:
-    name: Forked Repo
-    runs-on: ubuntu-latest
-    if: github.repository != 'HandBrake/HandBrake'
-    steps:
-    - name: Print Warning
-      run: |
-        echo "Builds are disabled for forked repositories."      
-
   build_mingw:
     name: CLI / LibHB
-    runs-on: ubuntu-latest
-    if: github.repository == 'HandBrake/HandBrake'
+    runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@master
-    
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2
+
     - name: Environment Setup
       run: |
-        sudo apt-get install automake autoconf build-essential cmake curl gcc git intltool libtool libtool-bin m4 make nasm patch pkg-config python tar yasm zlib1g-dev ninja-build zip
-        sudo apt-get install bison bzip2 flex g++ gzip pax
-        sudo apt-get install python3-pip
-        sudo apt-get install python3-setuptools
+        sudo apt-get purge cmake -y
+        sudo apt-get install automake autoconf build-essential intltool libtool libtool-bin make nasm patch tar yasm zlib1g-dev ninja-build gzip pax cmake
         sudo pip3 install meson
-        
-    - name: Toolchain Cache
-      id: mingw-toolchain
-      uses: actions/cache@v1
-      with:
-        path: /home/runner/toolchains/
-        key: mingw-toolchain
-    
-    - name: Compile Toolchain
-      if: steps.mingw-toolchain.outputs.cache-hit != 'true'
+
+    - name: Setup Toolchain
       run: |
-        ./scripts/mingw-w64-build --disable-gdb x86_64 ~/toolchains
-        ./scripts/mingw-w64-build x86_64.clean
-        ./scripts/mingw-w64-build pkgclean
-        cd /home/runner/toolchains/
-        rm -rf build-mingw-w64-x86_64.noindex
-        rm -rf source.noindex
-        rm -rf pkg
-          
+        wget https://github.com/bradleysepos/mingw-w64-build/releases/download/9.2.0/mingw-w64-toolchain-9.2.0-linux-x86_64.tar.gz
+        SHA=$(sha1sum mingw-w64-toolchain-9.2.0-linux-x86_64.tar.gz)
+        EXPECTED="560ceb85cdf2783c68226d3761f865c42101c3f6  mingw-w64-toolchain-9.2.0-linux-x86_64.tar.gz"
+        if  "$SHA" == "$EXPECTED" ;
+        then
+            echo "Toolchain Verified. Extracting ..."
+            mkdir toolchains
+            mv mingw-w64-toolchain-9.2.0-linux-x86_64.tar.gz toolchains
+            cd toolchains
+            tar xvf mingw-w64-toolchain-9.2.0-linux-x86_64.tar.gz
+            cd mingw-w64-toolchain-9.2.0-linux-x86_64/mingw-w64-x86_64/
+            pwd
+        else
+            echo "Toolchain Verification FAILED. Exiting!"
+            return -1
+        fi
+
     - name: Build CLI and LibHB
       run: |
-        export PATH="/home/runner/toolchains/mingw-w64-x86_64/bin:${PATH}"
-        ./configure --cross=x86_64-w64-mingw32 --enable-qsv --enable-vce --enable-nvenc --launch-jobs=$(nproc) --launch
+        export PATH="/home/runner/work/HandBrake/HandBrake/toolchains/mingw-w64-toolchain-9.2.0-linux-x86_64/mingw-w64-x86_64/bin:${PATH}"
+        export PATH=/usr/bin:$PATH
+        ./configure --cross=x86_64-w64-mingw32 --enable-qsv --enable-vce --enable-nvenc --launch-jobs=0 --launch
         cd build
         make pkg.create.zip
 
+    - name: Upload HandBrakeCLI
+      uses: actions/upload-artifact@v2
+      with:
+        name: HandBrakeCLI
+        path: ./build/HandBrakeCLI.exe
+
+    - name: Upload LibHB
+      uses: actions/upload-artifact@v2
+      with:
+        name: LibHandBrake
+        path: ./build/libhb/hb.dll
+
   build_gui:
     name: Windows UI
-    runs-on: windows-latest
-    if: github.repository == 'HandBrake/HandBrake'
+    runs-on: windows-2022
     needs: build_mingw
+    env:
+      SigningCertificate: ${{ secrets.HandBrakeTeam_SignFile }}
+
     steps:
-    - uses: actions/checkout@master
-        
-    - name: Environment Setup
-      run: |
-        choco install wget
-        wget https://nsis.sourceforge.io/mediawiki/images/c/c9/Inetc.zip
-        mkdir plugins
-        move Inetc.zip plugins
-        cd plugins        
-        7z x Inetc.zip
-        dir
-  
-    - name: NuGet Restore
+    - uses: actions/checkout@v2
+
+    - name: Download LibHandBrake
+      uses: actions/download-artifact@v2
+      with:
+       name: LibHandBrake
+       path: win/CS/HandBrakeWPF/bin/publish
+
+    - name: Import the Signing Cert
       run: |
-         choco install nuget.commandline
-         cd win/CS/
-         nuget restore HandBrake.sln
-        
+        $ErrorView = "NormalView"
+        if (-NOT ($env:SigningCertificate -eq '')) {
+          $pfx_cert_byte = System.Convert::FromBase64String("${{ secrets.HandBrakeTeam_Pfx }}")
+          $currentDirectory = Get-Location
+          $certificatePath = Join-Path -Path $currentDirectory -ChildPath $env:SigningCertificate
+          $certPassword = ConvertTo-SecureString -String ${{ secrets.HandBrakeTeam_pfx_pwd }} -Force –AsPlainText
+          IO.File::WriteAllBytes("$certificatePath", $pfx_cert_byte)
+          cp $certificatePath win\cs\
+        }
+
     - name: Build Windows GUI
-      run: |      
-        $env:Path += ";C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin"
-        msbuild win\cs\build.xml /t:Nightly
+      run: |
+        $env:Path += ";C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin"
+        msbuild win\cs\build.xml /t:x64 /p:PfxFile=$env:SigningCertificate /p:PfxPwd=${{ secrets.HandBrakeTeam_pfx_pwd }} /p:SignTimestampServer=http://time.certum.pl/
+
+    - name: Upload HandBrake exe Installer
+      uses: actions/upload-artifact@v2
+      with:
+        name: HandBrake-x86_64-Win_GUI-EXE
+        path: win/CS/HandBrakeWPF/bin/publish/HandBrake-Nightly-x86_64-Win_GUI.exe
+
+    - name: Upload HandBrake msi Installer
+      uses: actions/upload-artifact@v2
+      with:
+        name:  HandBrake-x86_64-Win_GUI-MSI
+        path: win/CS/HandBrakeWPF/bin/publish/HandBrake-Nightly-x86_64-Win_GUI.msi

HandBrake-1.5.1.tar.xz/.gitignore Added

HandBrake-1.5.1.tar.xz/.gitmodules Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/AUTHORS.markdown -> HandBrake-1.5.1.tar.xz/AUTHORS.markdown Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/NEWS.markdown -> HandBrake-1.5.1.tar.xz/NEWS.markdown Changed

@@ -1,5 +1,453 @@
 # HandBrake News
 
+
+## Upgrade Notice
+
+Before updating HandBrake, please make sure there are no pending encodes in the queue, and be sure to make a backup of any custom presets and app preferences you have, as they may not be compatible with newer versions.
+
+Windows users, please make sure to install Microsoft .NET Desktop Runtime version 6.0.0 or later(https://dotnet.microsoft.com/en-us/download/dotnet/6.0). Read carefully: you need the **DESKTOP** runtime.
+
+
+## HandBrake 1.5.1
+
+This is a rebuild of 1.5.0 with no functional changes.
+
+#### Build system
+- Fixed an issue with the source tarball that broke Flathub Builds. 
+
+### Windows 
+- The Windows UI is now .NET 6.0 only. (.NET 5.0 is no longer additionally required)
+
+
+## HandBrake 1.5.0
+
+### All platforms
+
+#### Video
+
+- Fixed an issue on older Intel CPUs causing the CLI to fail to initialize (#3924)
+- Updated video engine to preserve chroma sample location information
+- Updated Intel Quick Sync to use the Intel oneAPI Video Processing Library (oneVPL)
+
+#### Audio
+
+- Fixed MP2 audio sources not utilizing the fallback encoder when pass through is disabled (#3863)
+- Fixed FFmpeg AAC audio encoder quality mode scale range (#1295)
+
+#### Subtitles
+
+- Fixed an issue with captions pass through durations (#3764)
+
+#### Build system
+
+- Fixed multiple potential race conditions in Flatpak build process
+- Updated mac-toolchain-build script with newer tool versions
+
+#### Third-party libraries
+
+- Updated libraries
+  - FFmpeg 4.4.1 (decoding and filters)
+  - FreeType 2.11.1 (subtitles)
+  - Fribidi 1.0.11 (subtitles)
+  - HarfBuzz 3.1.2 (subtitles)
+  - Jansson 2.14 (JSON architecture)
+  - libass 0.15.2 (subtitles)
+  - libdav1d 0.9.2 (AV1 decoding)
+  - libjpeg-turbo 2.1.2 (preview image compression)
+  - libogg 1.3.5 (Xiph codecs support)
+  - libvpx 1.11.0 (VP8/VP9 video encoding)
+  - zimg 3.0.3 (color conversion)
+
+### Linux
+
+- Fixed a filter settings issue that resulted in incorrect filters being added to jobs (#3910)
+- Updated Intel QSV Flatpak plugin to use Intel MediaSDK 21.3.5
+- Updated Flatpak dependencies
+  - Freedesktop Platform 21.08
+  - GNOME 41
+- Added Corsican (Corsu) translation
+- Updated translations
+  - Simplified Chinese (简体中文)
+  - Dutch (Nederlands)
+  - French (Français)
+  - Korean (한국어)
+  - Spanish (Español)
+  - Swedish (Svenska)
+- Miscellaneous bug fixes and improvements
+
+### Mac
+
+- Requires macOS 10.13 High Sierra or later
+- Fixed potential issues where encoding process could get stuck on efficiency cores in some cases
+- Fixed an issue with automatic naming not applying correctly
+- Fixed main window not being shown upon editing a job in the queue
+- Updated queue statistics tab to include average encoding speed and percent of original file size
+- Added "Move to top" and "Move to bottom" to the queue context menu
+- Added a stop breakpoint to the queue, set when stop after job is selected and may be reordered (#2572)
+- Added native support for the VideoToolbox API, enabling advanced features such as frame multi-pass, mastering display and content light metadata, and chroma location; the previous implementation via FFmpeg's libavcodec has been removed
+- Added Corsican (Corsu) translation
+- Updated translations
+  - Simplified Chinese (简体中文)
+  - French (Français)
+  - German (Deutsch)
+  - Italian (Italiano)
+  - Portuguese (Português)
+- Miscellaneous bug fixes and improvements
+
+### Windows
+
+- Requires Windows 10 or later and Microsoft .NET Desktop Runtime 6.0.0 or later
+- Fixed a potential crash when encoding using Intel QSV in 2-pass mode (#4026)
+- Fixed potential issues where encoding process could get stuck on efficiency cores in some cases
+- Fixed an issue with static preview not updating when switching between automatic and custom cropping modes (#3911)
+- Updated the toolbar preset dropdown to an overlay panel that utilizes a tree view which saves state
+- Updated UI with various improvements to layout, typography, and cosmetics
+- Updated queue statistics tab to include average encoding speed and content information
+- Updated automatic naming file format placeholders to be live options
+- Updated Send File To preference to set HB_SOURCE, HB_DESTINATION, and HB_EXIT_CODE environment variables, which can be used instead of arguments
+- Added new exit_code parameter to Send File To preference
+- Added "Move to top" and "Move to bottom" to the queue context menu
+- Added a stop breakpoint to the queue, set when stop after job is selected and may be reordered (#2572)
+- Added support for Windows 10/11 notifications, enable in Preferences > When Done
+- Added support for Right to Left UI rendering for languages that require it. This can be set in preferences
+- Added Traditional Chinese (正體中文) translation
+- Updated translations
+  - Simplified Chinese (简体中文) - includes fix for access keys in menus
+  - Corsican (Corsu)
+  - German (Deutsch)
+  - Italian (Italiano)
+  - Japanese (日本語)
+- Miscellaneous bug fixes and improvements
+
+
+## HandBrake 1.4.2
+
+### All platforms
+
+#### General
+- Improvements and fixes around colour bit-depth handling.
+- Fixed various issues where incorrect colour information could be written during muxing.
+
+#### Hardware Encoding
+- Fixed corrupted video output when decoding HDR10 content with QuickSync
+
+#### Subtitles
+- Fixed a slight subtitle colour shift issue when using libass
+
+### Mac
+- Fixed a build system errors that could cause failures linking libbluray 
+- Fixed incorrect documentation URL
+- Fixed a possible crash that can occur when applying a malformed preset.
+
+### Windows
+- Added "Preset" used to the Queue summary tab.
+- Added "Save New Preset" to the preset menu, and toolbar preset dropdown to make it easier to find. (#3783)
+- Added category headers to the presets menu when using the flat display mode.
+- Changed the log filename format back to start with the destination filename as it did with 1.3 (#3740)
+- Changed tab selection behaviour on queue when changing jobs. it will no longer reset to the first tab. (#3813)
+- Fixed a minor UI juddering effect on the queue task list when jobs start or finish (#3813)
+- Fixed calculation errors when using padding on the dimensions tab (#3802)
+- Fixed an issue where static preview wasn't live-updating when changes occurred (#3803)
+- Fixed a crash on the Audio Defaults screen whilst trying to add Tracks (#3785)
+- Fixed incorrect taskbar icon state when running multiple encodes (#3791)
+- Fixed an issue where "None" resolution limit was not honoured (#3872)
+- Fixed an issue with preset export. VideoTune was not written correctly (#3829)
+
+
+## HandBrake 1.4.1
+
+### All platforms
+
+#### General
+- Fixed a crash when using "Align AV" on Intel based systems. (#3683)
+- Fixed a crash when reading certain DVD's with missing VOB files
+
+#### Hardware Encoding
+- Fixed an issue with QuickSync accelerated Crop/Scale generating incorrect aspect ratios (#3236)
+- Fixed a crash after a subtitle scan when using the QuickSync encoder. (#3741)
+
+#### Subtitles
+- Backport some libass patches which should correct some issues with font and font-weight selections. (#3736)
+- Fixed an issue that could prevent 3rd party software handling HandBrake files with dvb subtitles.
+
+#### Command line interface
+- Fixed a regression that prevented upscaling when using -w and -h (#3746)
+
+### Linux
+- Added: flatpak permission to show bookmarks in file dialogs (#3748)
+
+### Mac
+- Fix an issue where the Quality Slider was being ignored when using the VideoToolbox encoder. (#3751)
+- Fixed an issue where incompatible hardware presets could be selected. 
+
+### Windows
+- Windows UI builds are now available for ARM64 devices. 
+- Added upgrade notices to the installer welcome page advising of .NET Desktop Runtime 5 requirements and to complete existing queue. (#3693)
+- Added support for software rendering which can be enabled to workaround issues with Variable Refresh Rate and 3rd party software causing rendering corruption (#3755)
+- Added a new preference to define how the preset toolbar button renders the preset list. (#3697)
+- Fixed a crash which would prevent all user settings from loading in some circumstances. 
+- Fixed "Reset Settings" button in preferences. Certain settings were not reset correctly. (#3726)
+- Fixed issues with the built-in updater that may cause it to fail to run the installer if the app was not running as admin.
+- Fixed an issue that required and app restart to apply changes to the max simultaneous encodes setting. 
+- Fixed an issue with Audio Defaults fallback encoder quality/bitrate/mixdown settings would not display correct values (#3739)
+- Fixed an with QSV multi-instance support where multiple Intel GPU's are used.
+
+
+## HandBrake 1.4.0
+
+### All platforms
+
+#### General
+- The HandBrake engine is now 10 and 12bit capable. Please note that not all filters support 10 and 12 bits. Using an 8bit filter will cause the pipeline to run at 8bit. Please see the documentation for more information.
+- HDR10 metadata will be passed through from the source file if present. 
+- Static Previews that are generated during file scans are now stored in compressed jpeg format (previously stored as YUV420).  Temporary disk space usage and disk writes are massively reduced. This uses libjpeg-turbo
+
+#### Filters
+- New Filter: Chroma Smooth
+- New Filter: Colourspace Selection. 
+- New Filter: Support for QuickSync hardware accelerated Crop/Scale when using full path.
+
+#### Hardware Encoding
+
+- New Encoder: Media Foundation
+  - For Windows based ARM64 devices powered by Qualcomm Chipsets. 
+- Updates to the AMD VCN encoder:
+  - Quality tuning for VCN's constrained vbr rate control mode. Results are the same or better than cqp mode, and bit rate is much more predictable.
+  - Included optimised H265 presets for 1080p and 4K content.
+- Updates to the Intel QuickSync encoder:
+  - Minor performance improvement by skipping VFR and Crop/Scale filters when they are not required. 
+  - Overhauled memory management including improved zero-copy support where software filters are not used which should also improve performance. 
+
+#### Audio
+- MP2 Audio Passthru support.
+
+#### Subtitles
+- New General purpose subtitle decoder
+  - Added support for DVB Subtitles (Passthru and Burn-In)
+  - Added support for EIA608 Closed Captions.
+  - Replaced current decoders for PGS, SRT and SSA  with those in ffmpeg. This should correct a number of rendering issues on Burn-In
+- Reduced default CC burn-in font-size.
+
+#### Third-party libraries
+- The following 3rd party libraries have changed:
+  - ffmpeg 4.4
+  - AMF 1.4.18 (AMD VCN encoding)
+  - nv-codec-headers 11.0.10.1 (Nvidia NVENC encoding)
+  - libmfx 1.34
+  - freetype 2.10.4
+  - fribidi 1.0.10
+  - harfbuzz 2.8.1
+  - jansson 2.13.1
+  - libass 0.15.1
+  - libbluray 1.3.0
+  - libdvdnav 6.1.1
+  - libdvdread 6.1.1
+  - dav1d 0.9.0
+  - libvorbis 1.3.7
+  - libvpx 1.10.0
+  - x264 161 r3043
+  - x265 3.5
+  - zimg and libjpeg-turbo are new dependencies. 
+
+### General UI Updates (Applies to Windows, macOS and Linux)
+- The "Dimensions" tab has been redesigned. 
+  - The Rotate and Flip filter has been moved from the filters tab.
+  - Added support for padding
+  - Added support to control the resolution limit.
+  - Added limited support for upscaling
+
+### Linux
+- Minor usability tweaks and fixes.
+- Added new translations (levels of completeness vary):
+  - Chinese (Taiwan)
+  - Hebrew
+  - Sinhala
+  - Slovenian
+- Updated existing translations (levels of completeness vary).
+
+### Mac
+- Support for Apple Silicon (macOS only)
+- Support for running multiple simultaneous jobs.
+- Support eyetv packages with .ts enclosed media file
+- Improved UI navigation
+  - Added two menu items to quickly switch between titles
+  - Improved undo/redo support
+  - Drag & drop import/export support in the presets popover
+- Preference Updates: 
+  - Added a preference to control whether the current edited preset should be re-applied when changing title
+- Improved Security Scoped Bookmarks management
+- Minor improvements and fixes for macOS 11
+- Updated Sparkle Updater library.
+- Added new translations:
+  - Brazilian Portuguese
+- Updated existing translations.
+
+### Windows
+- Please note, the Windows UI now requires  "Microsoft .NET 5 Desktop Runtime"
+- Windows 10 is now the minimum version supported. The app will still run on Windows 7 and 8.1 however you will receive a message noting that it is not supported (twice) after which it will continue to run. Please note some functionality may not work correctly on these older operating systems and no support will be provided.
+- Process Isolation
+  - When enabled, any encodes that are started are run under a separate "handbrake.worker.exe" process. 
+  - This protects the main UI from any crashes that could occur whilst processing a file and allows the queue to continue.
+  - Multiple jobs can be run simultaneously to improve CPU utilisation on high core count systems.
+- Audio Tab
+  - Minor improvement to the usability of auto-passthru. To prevent confusion, the "auto-passhtru" audio "encoder" option is now only available on the defaults screen and not the main audio tab. 
+- Queue Improvements
+  - Restored lost "Stop" functionality in the new queue design that landed in 1.3. 
+- Presets
+  - The legacy preset side panel has been removed. The presets button on the toolbar will now offer a "preset manager" and list the available for selection.
+  - The inline-preset view from 1.3 is now permanent. 
+- Installer Improvements
+  - Existing NSIS installer: Option to create a shortcut for "all users" as the last step. 
+  - An MSI based installed (mostly for system-admins) is now available to allow for easier deployments. Feedback welcome.
+- Preference Updates: 
+  - New Auto Name option: Always use the default path for each new source / title selected
+  - "Send File To" Arguments now supports "{source}" and "{destination}" replacement placeholders. 
+  - Added a preference to configure the "Pause on Low Battery" feature. 
+  - Check for Updates is now "opt-in" for new installs. 
+- UI Performance: Optimisations to allow better performance when handling large sets of files (1000+)
+- Added new translations (levels of completeness vary):
+  - Brazilian Portuguese
+  - Corsican
+  - Italian
+  - Japanese
+  - Persian (Iran)
+  - Thai
+  - Ukrainian
+- Updated existing translations (levels of completeness vary).
+- Miscellaneous bug fixes and improvements
+
+
+## HandBrake 1.3.3
+
+### All platforms
+
+#### General
+
+- Fixed ISO 639-2/B language codes not set correctly in MKV (affects Hebrew, Indonesian, Javanese, and Yiddish) (#2903)
+- Improved support for sources where pixel format cannot be quickly identified, e.g. due to delayed video track start (#2893)
+- Added logging to identify where hardware support is disabled
+- Miscellaneous bug fixes and improvements
+
+#### Video
+
+- Improved Intel QSV memory footprint by eliminating a buffer pool (#2675)
+- Improved Intel QSV H.265 memory buffer size as required by newer Intel Media SDK (#2862)
+- Fixed and improved Intel QSV in various situations, especially hardware decoding (#873, #2660, #2661, #2829)
+- Fixed full range video being not being identified as limited range after conversion where filters are used (#2859)
+
+#### Subtitles
+
+- Fixed handling of overlapping SSA import subtitles (791adbac)
+- Improved support for out-of-order SSA subtitles as allowed by specification (#2906)
+
+#### Command line interface
+
+- Fixed --preset failure unless full path is specified, e.g. --preset="Category Name/Preset Name" (#2838)
+
+#### Build system
+
+- Improved Flatpak to better conform to freedesktop metainfo standards
+- Improved Intel QSV Flatpak plugin build efficiency using cmake-ninja
+- Added a patch to fix cross compiling libdav1d using GCC 10.x (quality of life improvement)
+  - Official HandBrake 1.3.3 Windows release is built using GCC 9.x and is not directly affected by this issue
+
+#### Third-party libraries
+
+- Updated libraries
+  - FFmpeg 4.2.3 (decoding and filters)
+
+### Mac
+
+- Fixed preview layout not displaying properly on OS X 10.11 El Capitan
+- Fixed incorrect copyright year on About dialog (#2830)
+
+### Windows
+
+- Fixed a crash related to the dark theme (#2816)
+- Fixed a potential crash related to preview image memory allocation (#2871)
+- Fixed a potential crash due to certain actions causing no preset being selected (#2875)
+- Fixed missing E-AC-3 encoder option (#2855)
+- Fixed hardware encoder support unavailable in portable build (#2832)
+- Miscellaneous bug fixes and improvements
+
+
+## HandBrake 1.3.2
+
+### All platforms
+
+#### General
+
+- Fixed point to point end detection in certain scenarios (#2603)
+- Improved support for H.265 video in AVI container produced by some security cameras (#2622)
+- Added logging to identify problematic sources where container and video track pixel aspect ratios differ
+- Added logging to help debug potential JSON API issues
+
+#### Video
+
+- Fixed color range conversion being applied twice when scaling video (#2561)
+- Fixed incorrect identification of support for QSV HEVC encoder on older Intel hardware (#2558)
+- Added logging to identify automatic picture rotation
+- Miscellaneous bug fixes and improvements
+
+#### Audio
+
+- Fixed an upstream FFmpeg issue where passing through AAC ADTS audio could produce invalid MKV output in rare cases (error instead) (#2809)
+
+#### Filters
+
+- Fixed uninitialized memory in NLMeans prefilter leading to video corruption at bottom of picture (only affects custom settings) (#2576)
+- Fixed a crash in the Detelecine filter with out of bounds parameters (only affects custom settings) (#2560, #2804)
+
+#### Subtitles
+
+- Fixed burned in subtitles position offset where cropscale filter is not used (#2449)
+
+#### Command line interface
+
+- Fixed subtitles not being selected when specifying --all-subtitles without also specifying a non-empty --subtitle-lang-list
+
+#### Build system
+
+- Fixed building the GTK graphical interface for use on Windows (link ole32)
+- Updated Flatpak manifest creation script for compatibility with Python 3
+- Updated Flatpak runtime and numactl library versions, QSV plugin
+- Improved minimum version dependencies to facilitate building on systems with older automake and pkg-config
+- Added a workaround for an upstream libdav1d issue affecting installation on FreeBSD (#2662)
+- Miscellaneous bug fixes and improvements
+
+### Linux
+
+- Fixed point to point controls not accepting fractional seconds
+- Fixed updating presets with identical names in different categories
+- Improved parity with other platforms by allowing removal of preset categories (automatic after last preset in category is removed)
+- Improved parity with other platforms by showing title and chapter range on the queue summary tab
+
+### Mac
+
+- Fixed selection behavior new track audio mixdown set to DPL2 instead of stereo (#2641)
+- Fixed queued job failures related to removable drives by resolving security scoped resources as needed (#2566)
+
+### Windows
+
+- Fixed loading preset files with Unicode characters in path (#2427)
+- Fixed clear queue options to prevent them clearing active jobs (#2587)
+- Fixed main window status label not always reflecting the true count of queue jobs (#2538)
+- Fixed failure loading default settings which could cause various issues in the graphical interface (#2549)
+- Fixed preview images displaying incorrectly in some cases (anamorphic none, flip horizontal) (e9675bb, #2764)
+- Fixed various issues related to Auto Passthru, including fallback settings (#2619, #2627, #2611)
+- Fixed exported presets not importing correctly using the Mac graphical interface (#2531)
+- Fixed pause and resume not working correctly in some cases (#2647)
+- Fixed display of times greater than 24 hours (estimated time renaming, paused duration) (#2582, #2649)
+- Fixed various cosmetic issues in the graphical interface (#2645, #2646)
+- Improved display of long filenames in the queue (#2570)
+- Improved some UX stress cases related to the queue (#2632)
+- Improved error message when importing a preset specifying a nonexistent audio encoder (#2638)
+- Improved audio and subtitle languages behavior to preserve selected languages order where "any" is also selected (#2611)
+- Improved low disk space preferences and alerts (#2648)
+- Added a workaround for an upstream .NET issue causing tooltips to not render correctly in some cases (#2630)
+- Miscellaneous bug fixes and improvements
+
+
 ## HandBrake 1.3.1
 
 ### All platforms
@@ -222,7 +670,7 @@
 - Improved preferences layout
 - Improved auto naming collision behavior and file overwriting
 - Added preference to test selected notification sound
-- Added preference to perform when done action immmediately without countdown
+- Added preference to perform when done action immediately without countdown
 - Added preference to disable preview image on summary tab
 - Added hardware.enabled option to portable.ini
 - Added dark theme for Windows 10
@@ -673,7 +1121,7 @@
 - Added custom anamorphic to dimensions tab, it's back!
 - Improved static preview window still previews rendering
 - Improved audio selection behavior controls; dropdowns are now context aware and range limited with better defaults
-- Improved UI constency throughout
+- Improved UI consistency throughout
 - Many other bug fixes and improvements
 
 
@@ -1593,7 +2041,7 @@
 - Nested presets
 - Individual activity logs for each encode
 - Slow and slower deinterlacing and decomb work now in Windows
-- Added resizeable update window
+- Added resizable update window
 - Fixed parsing of non-DVD source audio formats
 - Restored Copy to Clipboard to the Activity Log Window, among other enhancements to it
 - Fixed bug with MKV presets showing up as .m4v
@@ -2021,7 +2469,7 @@
 - Added option for H.264 Baseline (suitable for iPods)
 - (Very) experimental queue support
 - Fixes for some DVD titles HandBrake would not recognize
-- Fixes audio gliches when encoding from LPCM tracks
+- Fixes audio glitches when encoding from LPCM tracks
 
 ## HandBrake 0.7.0-beta3

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/README.markdown -> HandBrake-1.5.1.tar.xz/README.markdown Changed

@@ -14,8 +14,6 @@
 
 Visit the HandBrake Community Forums(https://forum.handbrake.fr/).
 
-Chat on #handbrake on Freenode IRC(https://webchat.freenode.net/?channels=handbrake) (irc://irc.freenode.net/#handbrake).
-
 For information on HandBrake's community support channels, please see Community Support(https://handbrake.fr/docs/en/latest/help/community-support.html).
 
 Our community rules(https://forum.handbrake.fr/app.php/rules) and code of conduct(https://github.com/HandBrake/HandBrake/blob/master/CODE_OF_CONDUCT.md) apply to both our site and GitHub.
@@ -31,7 +29,7 @@
 
 We are now accepting translations via Transifex(https://www.transifex.com/HandBrakeProject/public) 
 
-Please read our Translations Guide(https://github.com/HandBrake/HandBrake/blob/master/CODE_OF_CONDUCT.md) and follow the instructions if you are interested in joining the translation effort.
+Please read our Translations Guide(https://github.com/HandBrake/HandBrake/blob/master/TRANSLATION.markdown) and follow the instructions if you are interested in joining the translation effort.
 
 
 ## Additional Information
@@ -39,4 +37,9 @@
 Authors(AUTHORS.markdown) 
 License(LICENSE) 
 News(NEWS.markdown) 
-Thanks(THANKS.markdown)
+
+## Special Thanks
+
+<a href="https://www.macstadium.com/"><img width="200" alt="MacStadium" src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png"></a>
+
+and to many others who have contributed! Thanks(THANKS.markdown)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/SECURITY.md -> HandBrake-1.5.1.tar.xz/SECURITY.md Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/THANKS.markdown -> HandBrake-1.5.1.tar.xz/THANKS.markdown Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/TRANSLATION.markdown -> HandBrake-1.5.1.tar.xz/TRANSLATION.markdown Changed

@@ -20,7 +20,7 @@
 
 ## Requesting a Language
 
-HandBrake is managed by a very small team of contributors and as such, we do not have the resources to support translations for every language that may be requested and keep all the user interfaces in sync. As such, we welcome anyone who is willing to help by submitting pull reuqests to keep the user interface language files in sync with the translations available on Transifex(https://www.transifex.com/HandBrakeProject/public/).
+HandBrake is managed by a very small team of contributors and as such, we do not have the resources to support translations for every language that may be requested and keep all the user interfaces in sync. As such, we welcome anyone who is willing to help by submitting pull requests to keep the user interface language files in sync with the translations available on Transifex(https://www.transifex.com/HandBrakeProject/public/).
 
 Languages that fall out of date or lack sufficient maintainers may be removed from the UI until such time they are in a suitable state.

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/amf/module.defs -> HandBrake-1.5.1.tar.xz/contrib/amf/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/bzip2/module.defs -> HandBrake-1.5.1.tar.xz/contrib/bzip2/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/fdk-aac/module.defs -> HandBrake-1.5.1.tar.xz/contrib/fdk-aac/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A01-qsv-scale-fix-green-stripes.patch Added

@@ -0,0 +1,59 @@
+From 69711704b99b9140e2be5e80d8eea94bc2b0eedf Mon Sep 17 00:00:00 2001
+Subject: PATCH 1/3 qsv scale interpolation method.
+
+---
+ libavfilter/vf_scale_qsv.c | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 2ac2373..3e6b516 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -70,6 +70,7 @@ enum var_name {
+ };
+ 
+ #define QSV_HAVE_SCALING_CONFIG  QSV_VERSION_ATLEAST(1, 19)
++#define QSV_HAVE_INTERPOLATION_METHOD QSV_VERSION_ATLEAST(1, 33)
+ 
+ typedef struct QSVScaleContext {
+     const AVClass *class;
+@@ -95,6 +96,7 @@ typedef struct QSVScaleContext {
+     mfxExtVPPScaling         scale_conf;
+ #endif
+     int                      mode;
++    int                      method;
+ 
+     mfxExtBuffer             *ext_buffers1 + QSV_HAVE_SCALING_CONFIG;
+     int                      num_ext_buf;
+@@ -411,6 +413,10 @@ static int init_out_session(AVFilterContext *ctx)
+     s->scale_conf.Header.BufferId     = MFX_EXTBUFF_VPP_SCALING;
+     s->scale_conf.Header.BufferSz     = sizeof(mfxExtVPPScaling);
+     s->scale_conf.ScalingMode         = s->mode;
++#if QSV_HAVE_INTERPOLATION_METHOD
++    s->scale_conf.InterpolationMethod = s->method;
++    av_log(ctx, AV_LOG_VERBOSE, "Interpolation method: %d\n", s->method);
++#endif
+     s->ext_bufferss->num_ext_buf++  = (mfxExtBuffer*)&s->scale_conf;
+     av_log(ctx, AV_LOG_VERBOSE, "Scaling mode: %d\n", s->mode);
+ #endif
+@@ -638,6 +644,17 @@ static const AVOption options = {
+     { "low_power", "",                      0,             AV_OPT_TYPE_CONST,  { .i64 = 1}, 0,   0,     FLAGS, "mode"},
+     { "hq",        "",                      0,             AV_OPT_TYPE_CONST,  { .i64 = 2}, 0,   0,     FLAGS, "mode"},
+ #endif
++#if QSV_HAVE_INTERPOLATION_METHOD
++    { "method",    "set interpolation method", OFFSET(method), AV_OPT_TYPE_INT,   { .i64 = MFX_INTERPOLATION_DEFAULT}, MFX_INTERPOLATION_DEFAULT, MFX_INTERPOLATION_ADVANCED, FLAGS, "method"},
++    { "nearest",   "nearest neighbor method",  0,              AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_NEAREST_NEIGHBOR}, INT_MIN, INT_MAX, FLAGS, "method"},
++    { "bilinear",  "bilinear method",          0,              AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_BILINEAR},  INT_MIN, INT_MAX, FLAGS, "method"},
++    { "advanced",  "advanced method",          0,              AV_OPT_TYPE_CONST, { .i64 = MFX_INTERPOLATION_ADVANCED},  INT_MIN, INT_MAX, FLAGS, "method"},
++#else
++    { "method",    "(not supported)",          OFFSET(method), AV_OPT_TYPE_INT,   { .i64 = 0}, 0, INT_MAX, FLAGS, "method"},
++    { "nearest",   "",                         0,              AV_OPT_TYPE_CONST, { .i64 = 1}, 0, 0, FLAGS, "method"},
++    { "bilinear",  "",                         0,              AV_OPT_TYPE_CONST, { .i64 = 2}, 0, 0, FLAGS, "method"},
++    { "advanced",  "",                         0,              AV_OPT_TYPE_CONST, { .i64 = 3}, 0, 0, FLAGS, "method"},
++#endif
+ 
+     { NULL },
+ };
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A02-qsv-interpolation.patch Added

@@ -0,0 +1,45 @@
+From 770d0175fb177bb2f0c48438a519e56717fabd25 Mon Sep 17 00:00:00 2001
+Subject: PATCH 2/3 qsv scale fix green stripes.
+
+---
+ libavfilter/vf_scale_qsv.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 3e6b516..247f145 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -276,7 +276,7 @@ static const mfxHandleType handle_types = {
+ MFX_HANDLE_D3D11_DEVICE,
+ };
+ 
+-static int init_out_session(AVFilterContext *ctx)
++static int init_out_session(AVFilterContext *ctx, int in_width, int in_height)
+ {
+ 
+ QSVScaleContext *s = ctx->priv;
+@@ -389,8 +389,11 @@ static int init_out_session(AVFilterContext *ctx)
+ sizeof(*s->mem_ids_in));
+ if (!s->mem_ids_in)
+ return AVERROR(ENOMEM);
+- for (i = 0; i < in_frames_hwctx->nb_surfaces; i++)
++ for (i = 0; i < in_frames_hwctx->nb_surfaces; i++) {
++ in_frames_hwctx->surfacesi.Info.CropW = in_width;
++ in_frames_hwctx->surfacesi.Info.CropH = in_height;
+ s->mem_ids_ini = in_frames_hwctx->surfacesi.Data.MemId;
++ }
+ s->nb_mem_ids_in = in_frames_hwctx->nb_surfaces;
+ 
+ s->mem_ids_out = av_mallocz_array(out_frames_hwctx->nb_surfaces,
+@@ -466,7 +469,7 @@ static int init_scale_session(AVFilterContext *ctx, int in_width, int in_height,
+ if (ret < 0)
+ return ret;
+ 
+- ret = init_out_session(ctx);
++ ret = init_out_session(ctx, in_width, in_height);
+ if (ret < 0)
+ return ret;
+ 
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A03-qsv-dx11-ffmpeg44.patch Added

@@ -0,0 +1,1271 @@
+From 0f9baa03710f00b6d37f6332a87425ab98103533 Mon Sep 17 00:00:00 2001
+Subject: PATCH 3/3 qsv dx11 ffmpeg44
+
+---
+ fftools/ffmpeg_opt.c | 6 +-
+ libavcodec/qsv.c | 52 ++--
+ libavcodec/qsv_internal.h | 2 +-
+ libavfilter/qsvvpp.c | 33 +--
+ libavfilter/vf_deinterlace_qsv.c | 40 +--
+ libavfilter/vf_scale_qsv.c | 54 ++--
+ libavutil/hwcontext_d3d11va.c | 65 ++++-
+ libavutil/hwcontext_d3d11va.h | 9 +
+ libavutil/hwcontext_qsv.c | 414 +++++++++++++++++++++++++------
+ 9 files changed, 522 insertions(+), 153 deletions(-)
+
+diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c
+index 807e783..5fc17ed 100644
+--- a/fftools/ffmpeg_opt.c
++++ b/fftools/ffmpeg_opt.c
+@@ -580,7 +580,11 @@ static int opt_init_hw_device(void *optctx, const char *opt, const char *arg)
+ printf("\n");
+ exit_program(0);
+ } else {
+- return hw_device_init_from_string(arg, NULL);
++ int err;
++ if (!arg)
++ return AVERROR(ENOMEM);
++ err = hw_device_init_from_string(arg, NULL);
++ return err;
+ }
+ }
+ 
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index 6e3154e..5eec689 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -36,6 +36,8 @@
+ #include "avcodec.h"
+ #include "qsv_internal.h"
+ 
++#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++
+ #if QSV_VERSION_ATLEAST(1, 12)
+ #include "mfx/mfxvp8.h"
+ #endif
+@@ -243,7 +245,9 @@ int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame)
+ int i;
+ for (i = 0; i < ctx->nb_mids; i++) {
+ QSVMid *mid = &ctx->midsi;
+- if (mid->handle == frame->surface.Data.MemId)
++ mfxHDLPair *pair = (mfxHDLPair*)frame->surface.Data.MemId;
++ if ((mid->handle_pair->first == pair->first) &&
++ (mid->handle_pair->second == pair->second))
+ return i;
+ }
+ return AVERROR_BUG;
+@@ -383,7 +387,11 @@ static int ff_qsv_set_display_handle(AVCodecContext *avctx, QSVSession *qs)
+ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
+ const char *load_plugins, int gpu_copy)
+ {
++#if CONFIG_D3D11VA
++ mfxIMPL impl = MFX_IMPL_AUTO_ANY | MFX_IMPL_VIA_D3D11;
++#else
+ mfxIMPL impl = MFX_IMPL_AUTO_ANY;
++#endif
+ mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } };
+ mfxInitParam init_par = { MFX_IMPL_AUTO_ANY };
+ 
+@@ -472,7 +480,7 @@ static AVBufferRef *qsv_create_mids(AVBufferRef *hw_frames_ref)
+ 
+ for (i = 0; i < nb_surfaces; i++) {
+ QSVMid *mid = &midsi;
+- mid->handle = frames_hwctx->surfacesi.Data.MemId;
++ mid->handle_pair = (mfxHDLPair*)frames_hwctx->surfacesi.Data.MemId;
+ mid->hw_frames_ref = hw_frames_ref1;
+ }
+ 
+@@ -649,7 +657,7 @@ static mfxStatus qsv_frame_lock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ goto fail;
+ 
+ qsv_mid->surf.Info = hw_frames_hwctx->surfaces0.Info;
+- qsv_mid->surf.Data.MemId = qsv_mid->handle;
++ qsv_mid->surf.Data.MemId = qsv_mid->handle_pair;
+ 
+ /* map the data to the system memory */
+ ret = av_hwframe_map(qsv_mid->locked_frame, qsv_mid->hw_frame,
+@@ -682,7 +690,13 @@ static mfxStatus qsv_frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ static mfxStatus qsv_frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ {
+ QSVMid *qsv_mid = (QSVMid*)mid;
+- *hdl = qsv_mid->handle;
++ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
++ mfxHDLPair *pair_src = (mfxHDLPair*)qsv_mid->handle_pair;
++
++ pair_dst->first = pair_src->first;
++
++ if (pair_src->second != (mfxMemId)MFX_INFINITE)
++ pair_dst->second = pair_src->second;
+ return MFX_ERR_NONE;
+ }
+ 
+@@ -690,16 +704,12 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
+ AVBufferRef *device_ref, const char *load_plugins,
+ int gpu_copy)
+ {
+- static const mfxHandleType handle_types = {
+- MFX_HANDLE_VA_DISPLAY,
+- MFX_HANDLE_D3D9_DEVICE_MANAGER,
+- MFX_HANDLE_D3D11_DEVICE,
+- };
+ AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)device_ref->data;
+ AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
+ mfxSession parent_session = device_hwctx->session;
+ mfxInitParam init_par = { MFX_IMPL_AUTO_ANY };
+ mfxHDL handle = NULL;
++ int hw_handle_supported = 0;
+ 
+ mfxSession session;
+ mfxVersion ver;
+@@ -707,7 +717,7 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
+ mfxHandleType handle_type;
+ mfxStatus err;
+ 
+- int i, ret;
++ int ret;
+ 
+ err = MFXQueryIMPL(parent_session, &impl);
+ if (err == MFX_ERR_NONE)
+@@ -716,13 +726,23 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
+ return ff_qsv_print_error(avctx, err,
+ "Error querying the session attributes");
+ 
+- for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
+- err = MFXVideoCORE_GetHandle(parent_session, handle_typesi, &handle);
+- if (err == MFX_ERR_NONE) {
+- handle_type = handle_typesi;
+- break;
++ if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_VA_DISPLAY;
++ hw_handle_supported = 1;
++ } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ hw_handle_supported = 1;
++ } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
++ hw_handle_supported = 1;
++ }
++
++ if (hw_handle_supported) {
++ err = MFXVideoCORE_GetHandle(parent_session, handle_type, &handle);
++ if (err != MFX_ERR_NONE) {
++ return ff_qsv_print_error(avctx, err,
++ "Error getting handle session");
+ }
+- handle = NULL;
+ }
+ if (!handle) {
+ av_log(avctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved "
+diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
+index 6b2fbbe..10b08f0 100644
+--- a/libavcodec/qsv_internal.h
++++ b/libavcodec/qsv_internal.h
+@@ -62,7 +62,7 @@
+ 
+ typedef struct QSVMid {
+ AVBufferRef *hw_frames_ref;
+- mfxHDL handle;
++ mfxHDLPair *handle_pair;
+ 
+ AVFrame *locked_frame;
+ AVFrame *hw_frame;
+diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
+index f216b3f..4ee9e89 100644
+--- a/libavfilter/qsvvpp.c
++++ b/libavfilter/qsvvpp.c
+@@ -36,6 +36,7 @@
+ MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET))
+ #define IS_OPAQUE_MEMORY(mode) (mode & MFX_MEMTYPE_OPAQUE_FRAME)
+ #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY)
++#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+ 
+ typedef struct QSVFrame {
+ AVFrame *frame;
+@@ -68,12 +69,6 @@ struct QSVVPPContext {
+ int nb_ext_buffers;
+ };
+ 
+-static const mfxHandleType handle_types = {
+- MFX_HANDLE_VA_DISPLAY,
+- MFX_HANDLE_D3D9_DEVICE_MANAGER,
+- MFX_HANDLE_D3D11_DEVICE,
+-};
+-
+ static const AVRational default_tb = { 1, 90000 };
+ 
+ static const struct {
+@@ -233,7 +228,13 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ 
+ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ {
+- *hdl = mid;
++ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
++ mfxHDLPair *pair_src = (mfxHDLPair*)mid;
++
++ pair_dst->first = pair_src->first;
++
++ if (pair_src->second != (mfxMemId)MFX_INFINITE)
++ pair_dst->second = pair_src->second;
+ return MFX_ERR_NONE;
+ }
+ 
+@@ -555,7 +556,7 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+ 
+ s->out_mem_mode = IS_OPAQUE_MEMORY(s->in_mem_mode) ?
+ MFX_MEMTYPE_OPAQUE_FRAME :
+- MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
++ MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_FROM_VPPOUT;
+ 
+ out_frames_ctx = (AVHWFramesContext *)out_frames_ref->data;
+ out_frames_hwctx = out_frames_ctx->hwctx;
+@@ -601,14 +602,18 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+ return AVERROR_UNKNOWN;
+ }
+ 
+- for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
+- ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_typesi, &handle);
+- if (ret == MFX_ERR_NONE) {
+- handle_type = handle_typesi;
+- break;
+- }
++ if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_VA_DISPLAY;
++ } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
++ } else {
++ av_log(avctx, AV_LOG_ERROR, "Error unsupported handle type\n");
++ return AVERROR_UNKNOWN;
+ }
+ 
++ ret = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle);
+ if (ret < 0)
+ return ff_qsvvpp_print_error(avctx, ret, "Error getting the session handle");
+ else if (ret > 0) {
+diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
+index 89a282f..3e3654a 100644
+--- a/libavfilter/vf_deinterlace_qsv.c
++++ b/libavfilter/vf_deinterlace_qsv.c
+@@ -42,6 +42,8 @@
+ #include "internal.h"
+ #include "video.h"
+ 
++#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++
+ enum {
+ QSVDEINT_MORE_OUTPUT = 1,
+ QSVDEINT_MORE_INPUT,
+@@ -157,16 +159,16 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ 
+ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ {
+- *hdl = mid;
++ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
++ mfxHDLPair *pair_src = (mfxHDLPair*)mid;
++
++ pair_dst->first = pair_src->first;
++
++ if (pair_src->second != (mfxMemId)MFX_INFINITE)
++ pair_dst->second = pair_src->second;
+ return MFX_ERR_NONE;
+ }
+ 
+-static const mfxHandleType handle_types = {
+- MFX_HANDLE_VA_DISPLAY,
+- MFX_HANDLE_D3D9_DEVICE_MANAGER,
+- MFX_HANDLE_D3D11_DEVICE,
+-};
+-
+ static int init_out_session(AVFilterContext *ctx)
+ {
+ 
+@@ -186,22 +188,26 @@ static int init_out_session(AVFilterContext *ctx)
+ int i;
+ 
+ /* extract the properties of the "master" session given to us */
+- err = MFXQueryIMPL(device_hwctx->session, &impl);
+- if (err == MFX_ERR_NONE)
+- err = MFXQueryVersion(device_hwctx->session, &ver);
+- if (err != MFX_ERR_NONE) {
++ err = MFXQueryIMPL(device_hwctx->session, &impl);
++ if (err == MFX_ERR_NONE)
++ err = MFXQueryVersion(device_hwctx->session, &ver);
++ if (err != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes\n");
+ return AVERROR_UNKNOWN;
+ }
+ 
+- for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
+- err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_typesi, &handle);
+- if (err == MFX_ERR_NONE) {
+- handle_type = handle_typesi;
+- break;
+- }
++ if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_VA_DISPLAY;
++ } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
++ } else {
++ av_log(ctx, AV_LOG_ERROR, "Error unsupported handle type\n");
++ return AVERROR_UNKNOWN;
+ }
+ 
++ err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle);
+ if (err < 0)
+ return ff_qsvvpp_print_error(ctx, err, "Error getting the session handle");
+ else if (err > 0) {
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 247f145..a0db47d 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -71,6 +71,7 @@ enum var_name {
+ 
+ #define QSV_HAVE_SCALING_CONFIG QSV_VERSION_ATLEAST(1, 19)
+ #define QSV_HAVE_INTERPOLATION_METHOD QSV_VERSION_ATLEAST(1, 33)
++#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+ 
+ typedef struct QSVScaleContext {
+ const AVClass *class;
+@@ -183,7 +184,7 @@ static int init_out_pool(AVFilterContext *ctx,
+ AVQSVFramesContext *out_frames_hwctx;
+ enum AVPixelFormat in_format;
+ enum AVPixelFormat out_format;
+- int i, ret;
++ int i, ret, out_alignment;
+ 
+ /* check that we have a hw context */
+ if (!ctx->inputs0->hw_frames_ctx) {
+@@ -202,13 +203,18 @@ static int init_out_pool(AVFilterContext *ctx,
+ out_frames_ctx = (AVHWFramesContext*)outlink->hw_frames_ctx->data;
+ out_frames_hwctx = out_frames_ctx->hwctx;
+ 
++ out_alignment = 16;
++ // TODO: select correct alignment for the output frame based on encoder in the pipeline
++ if (ctx->graph->opaque) {
++ out_alignment = (int)ctx->graph->opaque;
++ }
+ out_frames_ctx->format = AV_PIX_FMT_QSV;
+- out_frames_ctx->width = FFALIGN(out_width, 16);
+- out_frames_ctx->height = FFALIGN(out_height, 16);
++ out_frames_ctx->width = FFALIGN(out_width, out_alignment);
++ out_frames_ctx->height = FFALIGN(out_height, out_alignment);
+ out_frames_ctx->sw_format = out_format;
+ out_frames_ctx->initial_pool_size = 4;
+ 
+- out_frames_hwctx->frame_type = in_frames_hwctx->frame_type;
++ out_frames_hwctx->frame_type = in_frames_hwctx->frame_type | MFX_MEMTYPE_FROM_VPPOUT;
+ 
+ ret = ff_filter_init_hw_frames(ctx, outlink, 32);
+ if (ret < 0)
+@@ -266,16 +272,16 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ 
+ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ {
+- *hdl = mid;
++ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
++ mfxHDLPair *pair_src = (mfxHDLPair*)mid;
++
++ pair_dst->first = pair_src->first;
++
++ if (pair_src->second != (mfxMemId)MFX_INFINITE)
++ pair_dst->second = pair_src->second;
+ return MFX_ERR_NONE;
+ }
+ 
+-static const mfxHandleType handle_types = {
+- MFX_HANDLE_VA_DISPLAY,
+- MFX_HANDLE_D3D9_DEVICE_MANAGER,
+- MFX_HANDLE_D3D11_DEVICE,
+-};
+-
+ static int init_out_session(AVFilterContext *ctx, int in_width, int in_height)
+ {
+ 
+@@ -294,27 +300,31 @@ static int init_out_session(AVFilterContext *ctx, int in_width, int in_height)
+ mfxIMPL impl;
+ mfxVideoParam par;
+ mfxStatus err;
+- int i;
++ int ret, i;
+ 
+ s->num_ext_buf = 0;
+ 
+ /* extract the properties of the "master" session given to us */
+- err = MFXQueryIMPL(device_hwctx->session, &impl);
+- if (err == MFX_ERR_NONE)
+- err = MFXQueryVersion(device_hwctx->session, &ver);
+- if (err != MFX_ERR_NONE) {
++ ret = MFXQueryIMPL(device_hwctx->session, &impl);
++ if (ret == MFX_ERR_NONE)
++ ret = MFXQueryVersion(device_hwctx->session, &ver);
++ if (ret != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error querying the session attributes\n");
+ return AVERROR_UNKNOWN;
+ }
+ 
+- for (i = 0; i < FF_ARRAY_ELEMS(handle_types); i++) {
+- err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_typesi, &handle);
+- if (err == MFX_ERR_NONE) {
+- handle_type = handle_typesi;
+- break;
+- }
++ if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_VA_DISPLAY;
++ } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(impl)) {
++ handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
++ } else {
++ av_log(ctx, AV_LOG_ERROR, "Error unsupported handle type\n");
++ return AVERROR_UNKNOWN;
+ }
+ 
++ err = MFXVideoCORE_GetHandle(device_hwctx->session, handle_type, &handle);
+ if (err < 0)
+ return ff_qsvvpp_print_error(ctx, err, "Error getting the session handle");
+ else if (err > 0) {
+diff --git a/libavutil/hwcontext_d3d11va.c b/libavutil/hwcontext_d3d11va.c
+index 2a3549e..b4b39a0 100644
+--- a/libavutil/hwcontext_d3d11va.c
++++ b/libavutil/hwcontext_d3d11va.c
+@@ -72,7 +72,8 @@ static av_cold void load_functions(void)
+ }
+ 
+ typedef struct D3D11VAFramesContext {
+- int nb_surfaces_used;
++ size_t nb_surfaces;
++ size_t nb_surfaces_used;
+ 
+ DXGI_FORMAT format;
+ 
+@@ -112,6 +113,8 @@ static void d3d11va_frames_uninit(AVHWFramesContext *ctx)
+ if (s->staging_texture)
+ ID3D11Texture2D_Release(s->staging_texture);
+ s->staging_texture = NULL;
++
++ av_freep(&frames_hwctx->texture_infos);
+ }
+ 
+ static int d3d11va_frames_get_constraints(AVHWDeviceContext *ctx,
+@@ -152,8 +155,11 @@ static void free_texture(void *opaque, uint8_t *data)
+ av_free(data);
+ }
+ 
+-static AVBufferRef *wrap_texture_buf(ID3D11Texture2D *tex, int index)
++static AVBufferRef *wrap_texture_buf(AVHWFramesContext *ctx, ID3D11Texture2D *tex, int index)
+ {
++ D3D11VAFramesContext *s = ctx->internal->priv;
++ AVD3D11VAFramesContext *frames_hwctx = ctx->hwctx;
++
+ AVBufferRef *buf;
+ AVD3D11FrameDescriptor *desc = av_mallocz(sizeof(*desc));
+ if (!desc) {
+@@ -161,6 +167,10 @@ static AVBufferRef *wrap_texture_buf(ID3D11Texture2D *tex, int index)
+ return NULL;
+ }
+ 
++ frames_hwctx->texture_infoss->nb_surfaces_used.texture = tex;
++ frames_hwctx->texture_infoss->nb_surfaces_used.index = index;
++ s->nb_surfaces_used++;
++
+ desc->texture = tex;
+ desc->index = index;
+ 
+@@ -199,7 +209,7 @@ static AVBufferRef *d3d11va_alloc_single(AVHWFramesContext *ctx)
+ return NULL;
+ }
+ 
+- return wrap_texture_buf(tex, 0);
++ return wrap_texture_buf(ctx, tex, 0);
+ }
+ 
+ static AVBufferRef *d3d11va_pool_alloc(void *opaque, buffer_size_t size)
+@@ -220,7 +230,7 @@ static AVBufferRef *d3d11va_pool_alloc(void *opaque, buffer_size_t size)
+ }
+ 
+ ID3D11Texture2D_AddRef(hwctx->texture);
+- return wrap_texture_buf(hwctx->texture, s->nb_surfaces_used++);
++ return wrap_texture_buf(ctx, hwctx->texture, s->nb_surfaces_used);
+ }
+ 
+ static int d3d11va_frames_init(AVHWFramesContext *ctx)
+@@ -267,7 +277,7 @@ static int d3d11va_frames_init(AVHWFramesContext *ctx)
+ av_log(ctx, AV_LOG_ERROR, "User-provided texture has mismatching parameters\n");
+ return AVERROR(EINVAL);
+ }
+- } else if (texDesc.ArraySize > 0) {
++ } else if (!(texDesc.BindFlags & D3D11_BIND_RENDER_TARGET) && texDesc.ArraySize > 0) {
+ hr = ID3D11Device_CreateTexture2D(device_hwctx->device, &texDesc, NULL, &hwctx->texture);
+ if (FAILED(hr)) {
+ av_log(ctx, AV_LOG_ERROR, "Could not create the texture (%lx)\n", (long)hr);
+@@ -275,6 +285,12 @@ static int d3d11va_frames_init(AVHWFramesContext *ctx)
+ }
+ }
+ 
++ hwctx->texture_infos = av_mallocz_array(ctx->initial_pool_size, sizeof(*hwctx->texture_infos));
++ if (!hwctx->texture_infos)
++ return AVERROR(ENOMEM);
++
++ s->nb_surfaces = ctx->initial_pool_size;
++
+ ctx->internal->pool_internal = av_buffer_pool_init2(sizeof(AVD3D11FrameDescriptor),
+ ctx, d3d11va_pool_alloc, NULL);
+ if (!ctx->internal->pool_internal)
+@@ -517,9 +533,12 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
+ AVD3D11VADeviceContext *device_hwctx = ctx->hwctx;
+ 
+ HRESULT hr;
++ AVDictionaryEntry *e;
+ IDXGIAdapter *pAdapter = NULL;
+ ID3D10Multithread *pMultithread;
+ UINT creationFlags = D3D11_CREATE_DEVICE_VIDEO_SUPPORT;
++ int adapter = -1;
++ long int vendor_id = -1;
+ int is_debug = !!av_dict_get(opts, "debug", NULL, 0);
+ int ret;
+ 
+@@ -539,13 +558,45 @@ static int d3d11va_device_create(AVHWDeviceContext *ctx, const char *device,
+ return AVERROR_UNKNOWN;
+ }
+ 
++ e = av_dict_get(opts, "vendor", NULL, 0);
++ if (e) {
++ vendor_id = strtol(e->value, NULL, 0);
++ }
++
+ if (device) {
++ adapter = atoi(device);
++ }
++
++ if (adapter >= 0 || vendor_id != -1) {
+ IDXGIFactory2 *pDXGIFactory;
+ hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
+ if (SUCCEEDED(hr)) {
+- int adapter = atoi(device);
+- if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter)))
++ if (adapter < 0) {
++ int adapter_cnt = 0;
++ while (IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter_cnt++, &pAdapter) != DXGI_ERROR_NOT_FOUND) {
++ DXGI_ADAPTER_DESC adapter_desc;
++ hr = IDXGIAdapter2_GetDesc(pAdapter, &adapter_desc);
++ if (FAILED(hr)) {
++ av_log(ctx, AV_LOG_ERROR, "IDXGIAdapter2_GetDesc returned error with adapter id %d\n", adapter_cnt);
++ continue;
++ }
++
++ if (adapter_desc.VendorId == vendor_id) {
++ break;
++ }
++
++ if (adapter)
++ IDXGIAdapter_Release(pAdapter);
++ }
++ if (adapter_cnt < 0) {
++ av_log(ctx, AV_LOG_ERROR, "Failed to find d3d11va adapter by vendor id %ld\n", vendor_id);
++ IDXGIFactory2_Release(pDXGIFactory);
++ return AVERROR_UNKNOWN;
++ }
++ } else {
++ if (FAILED(IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter, &pAdapter)))
+ pAdapter = NULL;
++ }
+ IDXGIFactory2_Release(pDXGIFactory);
+ }
+ }
+diff --git a/libavutil/hwcontext_d3d11va.h b/libavutil/hwcontext_d3d11va.h
+index 9f91e9b..93978e8 100644
+--- a/libavutil/hwcontext_d3d11va.h
++++ b/libavutil/hwcontext_d3d11va.h
+@@ -164,6 +164,15 @@ typedef struct AVD3D11VAFramesContext {
+ * This field is ignored/invalid if a user-allocated texture is provided.
+ */
+ UINT MiscFlags;
++
++ /**
++ * In case if texture structure member above is not NULL contains the same texture
++ * pointer for all elements and different indexes into the array texture.
++ * In case if texture structure member above is NULL, all elements contains
++ * pointers to separate non-array textures and 0 indexes.
++ * This field is ignored/invalid if a user-allocated texture is provided.
++ */
++ AVD3D11FrameDescriptor *texture_infos;
+ } AVD3D11VAFramesContext;
+ 
+ #endif /* AVUTIL_HWCONTEXT_D3D11VA_H */
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index 30b0d81..6a771e4 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -27,9 +27,13 @@
+ #include <pthread.h>
+ #endif
+ 
++#define COBJMACROS
+ #if CONFIG_VAAPI
+ #include "hwcontext_vaapi.h"
+ #endif
++#if CONFIG_D3D11VA
++#include "hwcontext_d3d11va.h"
++#endif
+ #if CONFIG_DXVA2
+ #include "hwcontext_dxva2.h"
+ #endif
+@@ -48,6 +52,8 @@
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+ 
++#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++
+ typedef struct QSVDevicePriv {
+ AVBufferRef *child_device_ctx;
+ } QSVDevicePriv;
+@@ -74,6 +80,7 @@ typedef struct QSVFramesContext {
+ 
+ AVBufferRef *child_frames_ref;
+ mfxFrameSurface1 *surfaces_internal;
++ mfxHDLPair *handle_pairs_internal;
+ int nb_surfaces_used;
+ 
+ // used in the frame allocator for non-opaque surfaces
+@@ -85,20 +92,6 @@ typedef struct QSVFramesContext {
+ mfxExtBuffer *ext_buffers1;
+ } QSVFramesContext;
+ 
+-static const struct {
+- mfxHandleType handle_type;
+- enum AVHWDeviceType device_type;
+- enum AVPixelFormat pix_fmt;
+-} supported_handle_types = {
+-#if CONFIG_VAAPI
+- { MFX_HANDLE_VA_DISPLAY, AV_HWDEVICE_TYPE_VAAPI, AV_PIX_FMT_VAAPI },
+-#endif
+-#if CONFIG_DXVA2
+- { MFX_HANDLE_D3D9_DEVICE_MANAGER, AV_HWDEVICE_TYPE_DXVA2, AV_PIX_FMT_DXVA2_VLD },
+-#endif
+- { 0 },
+-};
+-
+ static const struct {
+ enum AVPixelFormat pix_fmt;
+ uint32_t fourcc;
+@@ -127,28 +120,33 @@ static uint32_t qsv_fourcc_from_pix_fmt(enum AVPixelFormat pix_fmt)
+ return 0;
+ }
+ 
++#if CONFIG_D3D11VA
++static uint32_t qsv_get_d3d11va_bind_flags(int mem_type)
++{
++ uint32_t bind_flags = 0;
++
++ if ((mem_type & MFX_MEMTYPE_VIDEO_MEMORY_ENCODER_TARGET) && (mem_type & MFX_MEMTYPE_INTERNAL_FRAME))
++ bind_flags = D3D11_BIND_DECODER | D3D11_BIND_VIDEO_ENCODER;
++ else
++ bind_flags = D3D11_BIND_DECODER;
++
++ if ((MFX_MEMTYPE_FROM_VPPOUT & mem_type) || (MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET & mem_type))
++ bind_flags = D3D11_BIND_RENDER_TARGET;
++
++ return bind_flags;
++}
++#endif
++
+ static int qsv_device_init(AVHWDeviceContext *ctx)
+ {
+ AVQSVDeviceContext *hwctx = ctx->hwctx;
+ QSVDeviceContext *s = ctx->internal->priv;
+ 
++ int hw_handle_supported = 0;
++ mfxHandleType handle_type;
++ enum AVHWDeviceType device_type;
++ enum AVPixelFormat pix_fmt;
+ mfxStatus err;
+- int i;
+-
+- for (i = 0; supported_handle_typesi.handle_type; i++) {
+- err = MFXVideoCORE_GetHandle(hwctx->session, supported_handle_typesi.handle_type,
+- &s->handle);
+- if (err == MFX_ERR_NONE) {
+- s->handle_type = supported_handle_typesi.handle_type;
+- s->child_device_type = supported_handle_typesi.device_type;
+- s->child_pix_fmt = supported_handle_typesi.pix_fmt;
+- break;
+- }
+- }
+- if (!s->handle) {
+- av_log(ctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved "
+- "from the session\n");
+- }
+ 
+ err = MFXQueryIMPL(hwctx->session, &s->impl);
+ if (err == MFX_ERR_NONE)
+@@ -158,6 +156,41 @@ static int qsv_device_init(AVHWDeviceContext *ctx)
+ return AVERROR_UNKNOWN;
+ }
+ 
++ if (MFX_IMPL_VIA_VAAPI == MFX_IMPL_VIA_MASK(s->impl)) {
++#if CONFIG_VAAPI
++ handle_type = MFX_HANDLE_VA_DISPLAY;
++ device_type = AV_HWDEVICE_TYPE_VAAPI;
++ pix_fmt = AV_PIX_FMT_VAAPI;
++ hw_handle_supported = 1;
++#endif
++ } else if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(s->impl)) {
++#if CONFIG_D3D11VA
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ device_type = AV_HWDEVICE_TYPE_D3D11VA;
++ pix_fmt = AV_PIX_FMT_D3D11;
++ hw_handle_supported = 1;
++#endif
++ } else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(s->impl)) {
++#if CONFIG_DXVA2
++ handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
++ device_type = AV_HWDEVICE_TYPE_DXVA2;
++ pix_fmt = AV_PIX_FMT_DXVA2_VLD;
++ hw_handle_supported = 1;
++#endif
++ }
++
++ if (hw_handle_supported) {
++ err = MFXVideoCORE_GetHandle(hwctx->session, handle_type, &s->handle);
++ if (err == MFX_ERR_NONE) {
++ s->handle_type = handle_type;
++ s->child_device_type = device_type;
++ s->child_pix_fmt = pix_fmt;
++ }
++ }
++ if (!s->handle) {
++ av_log(ctx, AV_LOG_VERBOSE, "No supported hw handle could be retrieved "
++ "from the session\n");
++ }
+ return 0;
+ }
+ 
+@@ -187,6 +220,7 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx)
+ av_freep(&s->mem_ids);
+ av_freep(&s->surface_ptrs);
+ av_freep(&s->surfaces_internal);
++ av_freep(&s->handle_pairs_internal);
+ av_buffer_unref(&s->child_frames_ref);
+ }
+ 
+@@ -202,6 +236,8 @@ static AVBufferRef *qsv_pool_alloc(void *opaque, buffer_size_t size)
+ 
+ if (s->nb_surfaces_used < hwctx->nb_surfaces) {
+ s->nb_surfaces_used++;
++ av_buffer_create((uint8_t*)(s->handle_pairs_internal + s->nb_surfaces_used - 1),
++ sizeof(*s->handle_pairs_internal), qsv_pool_release_dummy, NULL, 0);
+ return av_buffer_create((uint8_t*)(s->surfaces_internal + s->nb_surfaces_used - 1),
+ sizeof(*hwctx->surfaces), qsv_pool_release_dummy, NULL, 0);
+ }
+@@ -241,6 +277,13 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
+ child_device_hwctx->display = (VADisplay)device_priv->handle;
+ }
+ #endif
++#if CONFIG_D3D11VA
++ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
++ AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx;
++ ID3D11Device_AddRef((ID3D11Device*)device_priv->handle);
++ child_device_hwctx->device = (ID3D11Device*)device_priv->handle;
++ }
++#endif
+ #if CONFIG_DXVA2
+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
+ AVDXVA2DeviceContext *child_device_hwctx = child_device_ctx->hwctx;
+@@ -267,6 +310,16 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
+ child_frames_ctx->width = FFALIGN(ctx->width, 16);
+ child_frames_ctx->height = FFALIGN(ctx->height, 16);
+ 
++#if CONFIG_D3D11VA
++ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
++ AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
++ if (hwctx->frame_type == 0)
++ hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET;
++ if (hwctx->frame_type & MFX_MEMTYPE_SHARED_RESOURCE)
++ child_frames_hwctx->MiscFlags = D3D11_RESOURCE_MISC_SHARED;
++ child_frames_hwctx->BindFlags = qsv_get_d3d11va_bind_flags(hwctx->frame_type);
++ }
++#endif
+ #if CONFIG_DXVA2
+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
+ AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
+@@ -286,16 +339,41 @@ static int qsv_init_child_ctx(AVHWFramesContext *ctx)
+ #if CONFIG_VAAPI
+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_VAAPI) {
+ AVVAAPIFramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
+- for (i = 0; i < ctx->initial_pool_size; i++)
+- s->surfaces_internali.Data.MemId = child_frames_hwctx->surface_ids + i;
++ for (i = 0; i < ctx->initial_pool_size; i++) {
++ s->handle_pairs_internali.first = child_frames_hwctx->surface_ids + i;
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
++ }
+ hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
+ }
+ #endif
++#if CONFIG_D3D11VA
++ if (child_device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
++ AVD3D11VAFramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
++ for (i = 0; i < ctx->initial_pool_size; i++) {
++ s->handle_pairs_internali.first = (mfxMemId)child_frames_hwctx->texture_infosi.texture;
++ if(child_frames_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) {
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ } else {
++ s->handle_pairs_internali.second = (mfxMemId)child_frames_hwctx->texture_infosi.index;
++ }
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
++ }
++ if (child_frames_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) {
++ hwctx->frame_type |= MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET;
++ } else {
++ hwctx->frame_type |= MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
++ }
++ }
++#endif
+ #if CONFIG_DXVA2
+ if (child_device_ctx->type == AV_HWDEVICE_TYPE_DXVA2) {
+ AVDXVA2FramesContext *child_frames_hwctx = child_frames_ctx->hwctx;
+- for (i = 0; i < ctx->initial_pool_size; i++)
+- s->surfaces_internali.Data.MemId = (mfxMemId)child_frames_hwctx->surfacesi;
++ for (i = 0; i < ctx->initial_pool_size; i++) {
++ s->handle_pairs_internali.first = (mfxMemId)child_frames_hwctx->surfacesi;
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
++ }
+ if (child_frames_hwctx->surface_type == DXVA2_VideoProcessorRenderTarget)
+ hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET;
+ else
+@@ -360,6 +438,11 @@ static int qsv_init_pool(AVHWFramesContext *ctx, uint32_t fourcc)
+ return AVERROR(EINVAL);
+ }
+ 
++ s->handle_pairs_internal = av_mallocz_array(ctx->initial_pool_size,
++ sizeof(*s->handle_pairs_internal));
++ if (!s->handle_pairs_internal)
++ return AVERROR(ENOMEM);
++
+ s->surfaces_internal = av_mallocz_array(ctx->initial_pool_size,
+ sizeof(*s->surfaces_internal));
+ if (!s->surfaces_internal)
+@@ -433,7 +516,13 @@ static mfxStatus frame_unlock(mfxHDL pthis, mfxMemId mid, mfxFrameData *ptr)
+ 
+ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ {
+- *hdl = mid;
++ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
++ mfxHDLPair *pair_src = (mfxHDLPair*)mid;
++
++ pair_dst->first = pair_src->first;
++
++ if (pair_src->second != (mfxMemId)MFX_INFINITE)
++ pair_dst->second = pair_src->second;
+ return MFX_ERR_NONE;
+ }
+ 
+@@ -626,13 +715,26 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx,
+ sizeof(*dst_hwctx->surface_ids));
+ if (!dst_hwctx->surface_ids)
+ return AVERROR(ENOMEM);
+- for (i = 0; i < src_hwctx->nb_surfaces; i++)
+- dst_hwctx->surface_idsi =
+- *(VASurfaceID*)src_hwctx->surfacesi.Data.MemId;
++ for (i = 0; i < src_hwctx->nb_surfaces; i++) {
++ mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfacesi.Data.MemId;
++ dst_hwctx->surface_idsi = *(VASurfaceID*)pair->first;
++ }
+ dst_hwctx->nb_surfaces = src_hwctx->nb_surfaces;
+ }
+ break;
+ #endif
++#if CONFIG_D3D11VA
++ case AV_HWDEVICE_TYPE_D3D11VA:
++ {
++ AVD3D11VAFramesContext *dst_hwctx = dst_ctx->hwctx;
++ mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfacesi.Data.MemId;
++ dst_hwctx->texture = (ID3D11Texture2D*)pair->first;
++ if (src_hwctx->frame_type & MFX_MEMTYPE_SHARED_RESOURCE)
++ dst_hwctx->MiscFlags = D3D11_RESOURCE_MISC_SHARED;
++ dst_hwctx->BindFlags = qsv_get_d3d11va_bind_flags(src_hwctx->frame_type);
++ }
++ break;
++#endif
+ #if CONFIG_DXVA2
+ case AV_HWDEVICE_TYPE_DXVA2:
+ {
+@@ -641,9 +743,10 @@ static int qsv_frames_derive_from(AVHWFramesContext *dst_ctx,
+ sizeof(*dst_hwctx->surfaces));
+ if (!dst_hwctx->surfaces)
+ return AVERROR(ENOMEM);
+- for (i = 0; i < src_hwctx->nb_surfaces; i++)
+- dst_hwctx->surfacesi =
+- (IDirect3DSurface9*)src_hwctx->surfacesi.Data.MemId;
++ for (i = 0; i < src_hwctx->nb_surfaces; i++) {
++ mfxHDLPair *pair = (mfxHDLPair*)src_hwctx->surfacesi.Data.MemId;
++ dst_hwctx->surfacesi = (IDirect3DSurface9*)pair->first;
++ }
+ dst_hwctx->nb_surfaces = src_hwctx->nb_surfaces;
+ if (src_hwctx->frame_type == MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
+ dst_hwctx->surface_type = DXVA2_VideoDecoderRenderTarget;
+@@ -677,13 +780,27 @@ static int qsv_map_from(AVHWFramesContext *ctx,
+ switch (child_frames_ctx->device_ctx->type) {
+ #if CONFIG_VAAPI
+ case AV_HWDEVICE_TYPE_VAAPI:
+- child_data = (uint8_t*)(intptr_t)*(VASurfaceID*)surf->Data.MemId;
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
++ child_data = pair->first;
+ break;
++ }
++#endif
++#if CONFIG_D3D11VA
++ case AV_HWDEVICE_TYPE_D3D11VA:
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
++ child_data = pair->first;
++ break;
++ }
+ #endif
+ #if CONFIG_DXVA2
+ case AV_HWDEVICE_TYPE_DXVA2:
+- child_data = surf->Data.MemId;
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
++ child_data = pair->first;
+ break;
++ }
+ #endif
+ default:
+ return AVERROR(ENOSYS);
+@@ -697,7 +814,14 @@ static int qsv_map_from(AVHWFramesContext *ctx,
+ 
+ dst->width = src->width;
+ dst->height = src->height;
+- dst->data3 = child_data;
++
++ if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
++ mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
++ dst->data0 = pair->first;
++ dst->data1 = pair->second;
++ } else {
++ dst->data3 = child_data;
++ }
+ 
+ return 0;
+ }
+@@ -720,7 +844,14 @@ static int qsv_map_from(AVHWFramesContext *ctx,
+ dummy->format = child_frames_ctx->format;
+ dummy->width = src->width;
+ dummy->height = src->height;
+- dummy->data3 = child_data;
++
++ if (child_frames_ctx->device_ctx->type == AV_HWDEVICE_TYPE_D3D11VA) {
++ mfxHDLPair *pair = (mfxHDLPair*)surf->Data.MemId;
++ dummy->data0 = pair->first;
++ dummy->data1 = pair->second;
++ } else {
++ dummy->data3 = child_data;
++ }
+ 
+ ret = av_hwframe_map(dst, dummy, flags);
+ 
+@@ -978,35 +1109,81 @@ static int qsv_frames_derive_to(AVHWFramesContext *dst_ctx,
+ AVQSVFramesContext *dst_hwctx = dst_ctx->hwctx;
+ int i;
+ 
++ if (src_ctx->initial_pool_size == 0) {
++ av_log(dst_ctx, AV_LOG_ERROR, "Only fixed-size pools can be "
++ "mapped to QSV frames.\n");
++ return AVERROR(EINVAL);
++ }
++
+ switch (src_ctx->device_ctx->type) {
+ #if CONFIG_VAAPI
+ case AV_HWDEVICE_TYPE_VAAPI:
+ {
+ AVVAAPIFramesContext *src_hwctx = src_ctx->hwctx;
++ s->handle_pairs_internal = av_mallocz_array(src_ctx->initial_pool_size, sizeof(*s->handle_pairs_internal));
++ if (!s->handle_pairs_internal)
++ return AVERROR(ENOMEM);
+ s->surfaces_internal = av_mallocz_array(src_hwctx->nb_surfaces,
+ sizeof(*s->surfaces_internal));
+ if (!s->surfaces_internal)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < src_hwctx->nb_surfaces; i++) {
+ qsv_init_surface(dst_ctx, &s->surfaces_internali);
+- s->surfaces_internali.Data.MemId = src_hwctx->surface_ids + i;
++ s->handle_pairs_internali.first = src_hwctx->surface_ids + i;
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
+ }
+ dst_hwctx->nb_surfaces = src_hwctx->nb_surfaces;
+ dst_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
+ }
+ break;
+ #endif
++#if CONFIG_D3D11VA
++ case AV_HWDEVICE_TYPE_D3D11VA:
++ {
++ AVD3D11VAFramesContext *src_hwctx = src_ctx->hwctx;
++ s->handle_pairs_internal = av_mallocz_array(src_ctx->initial_pool_size, sizeof(*s->handle_pairs_internal));
++ if (!s->handle_pairs_internal)
++ return AVERROR(ENOMEM);
++ s->surfaces_internal = av_mallocz_array(src_ctx->initial_pool_size,
++ sizeof(*s->surfaces_internal));
++ if (!s->surfaces_internal)
++ return AVERROR(ENOMEM);
++ for (i = 0; i < src_ctx->initial_pool_size; i++) {
++ qsv_init_surface(dst_ctx, &s->surfaces_internali);
++ s->handle_pairs_internali.first = (mfxMemId)src_hwctx->texture_infosi.texture;
++ if (src_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) {
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ } else {
++ s->handle_pairs_internali.second = (mfxMemId)src_hwctx->texture_infosi.index;
++ }
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
++ }
++ dst_hwctx->nb_surfaces = src_ctx->initial_pool_size;
++ if (src_hwctx->BindFlags & D3D11_BIND_RENDER_TARGET) {
++ dst_hwctx->frame_type |= MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET;
++ } else {
++ dst_hwctx->frame_type |= MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
++ }
++ }
++ break;
++#endif
+ #if CONFIG_DXVA2
+ case AV_HWDEVICE_TYPE_DXVA2:
+ {
+ AVDXVA2FramesContext *src_hwctx = src_ctx->hwctx;
++ s->handle_pairs_internal = av_mallocz_array(src_ctx->initial_pool_size, sizeof(*s->handle_pairs_internal));
++ if (!s->handle_pairs_internal)
++ return AVERROR(ENOMEM);
+ s->surfaces_internal = av_mallocz_array(src_hwctx->nb_surfaces,
+ sizeof(*s->surfaces_internal));
+ if (!s->surfaces_internal)
+ return AVERROR(ENOMEM);
+ for (i = 0; i < src_hwctx->nb_surfaces; i++) {
+ qsv_init_surface(dst_ctx, &s->surfaces_internali);
+- s->surfaces_internali.Data.MemId = (mfxMemId)src_hwctx->surfacesi;
++ s->handle_pairs_internali.first = (mfxMemId)src_hwctx->surfacesi;
++ s->handle_pairs_internali.second = (mfxMemId)MFX_INFINITE;
++ s->surfaces_internali.Data.MemId = (mfxMemId)&s->handle_pairs_internali;
+ }
+ dst_hwctx->nb_surfaces = src_hwctx->nb_surfaces;
+ if (src_hwctx->surface_type == DXVA2_VideoProcessorRenderTarget)
+@@ -1029,21 +1206,44 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx,
+ AVFrame *dst, const AVFrame *src, int flags)
+ {
+ AVQSVFramesContext *hwctx = dst_ctx->hwctx;
+- int i, err;
++ int i, err, index = -1;
+ 
+- for (i = 0; i < hwctx->nb_surfaces; i++) {
++ for (i = 0; i < hwctx->nb_surfaces && index < 0; i++) {
++ switch(src->format) {
+ #if CONFIG_VAAPI
+- if (*(VASurfaceID*)hwctx->surfacesi.Data.MemId ==
+- (VASurfaceID)(uintptr_t)src->data3)
+- break;
++ case AV_PIX_FMT_VAAPI:
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfacesi.Data.MemId;
++ if (pair->first == src->data3) {
++ index = i;
++ break;
++ }
++ }
++#endif
++#if CONFIG_D3D11VA
++ case AV_PIX_FMT_D3D11:
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfacesi.Data.MemId;
++ if (pair->first == src->data0
++ && pair->second == src->data1) {
++ index = i;
++ break;
++ }
++ }
+ #endif
+ #if CONFIG_DXVA2
+- if ((IDirect3DSurface9*)hwctx->surfacesi.Data.MemId ==
+- (IDirect3DSurface9*)(uintptr_t)src->data3)
+- break;
++ case AV_PIX_FMT_DXVA2_VLD:
++ {
++ mfxHDLPair *pair = (mfxHDLPair*)hwctx->surfacesi.Data.MemId;
++ if (pair->first == src->data3) {
++ index = i;
++ break;
++ }
++ }
+ #endif
++ }
+ }
+- if (i >= hwctx->nb_surfaces) {
++ if (index < 0) {
+ av_log(dst_ctx, AV_LOG_ERROR, "Trying to map from a surface which "
+ "is not in the mapped frames context.\n");
+ return AVERROR(EINVAL);
+@@ -1056,7 +1256,7 @@ static int qsv_map_to(AVHWFramesContext *dst_ctx,
+ 
+ dst->width = src->width;
+ dst->height = src->height;
+- dst->data3 = (uint8_t*)&hwctx->surfacesi;
++ dst->data3 = (uint8_t*)&hwctx->surfacesindex;
+ 
+ return 0;
+ }
+@@ -1098,7 +1298,7 @@ static void qsv_device_free(AVHWDeviceContext *ctx)
+ av_freep(&priv);
+ }
+ 
+-static mfxIMPL choose_implementation(const char *device)
++static mfxIMPL choose_implementation(const char *device, enum AVHWDeviceType child_device_type)
+ {
+ static const struct {
+ const char *name;
+@@ -1127,6 +1327,10 @@ static mfxIMPL choose_implementation(const char *device)
+ impl = strtol(device, NULL, 0);
+ }
+ 
++ if ( (child_device_type == AV_HWDEVICE_TYPE_D3D11VA) && (impl != MFX_IMPL_SOFTWARE) ) {
++ impl |= MFX_IMPL_VIA_D3D11;
++ }
++
+ return impl;
+ }
+ 
+@@ -1153,6 +1357,15 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx,
+ }
+ break;
+ #endif
++#if CONFIG_D3D11VA
++ case AV_HWDEVICE_TYPE_D3D11VA:
++ {
++ AVD3D11VADeviceContext *child_device_hwctx = child_device_ctx->hwctx;
++ handle_type = MFX_HANDLE_D3D11_DEVICE;
++ handle = (mfxHDL)child_device_hwctx->device;
++ }
++ break;
++#endif
+ #if CONFIG_DXVA2
+ case AV_HWDEVICE_TYPE_DXVA2:
+ {
+@@ -1216,10 +1429,16 @@ static int qsv_device_derive(AVHWDeviceContext *ctx,
+ AVHWDeviceContext *child_device_ctx,
+ AVDictionary *opts, int flags)
+ {
+- return qsv_device_derive_from_child(ctx, MFX_IMPL_HARDWARE_ANY,
++ mfxIMPL impl;
++ impl = choose_implementation("hw_any", child_device_ctx->type);
++ return qsv_device_derive_from_child(ctx, impl,
+ child_device_ctx, flags);
+ }
+ 
++// TODO: fix global, need to pass somehow child device type
++// Mix of device types
++enum AVHWDeviceType g_child_device_type = AV_HWDEVICE_TYPE_NONE;
++
+ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
+ AVDictionary *opts, int flags)
+ {
+@@ -1239,25 +1458,70 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
+ ctx->user_opaque = priv;
+ ctx->free = qsv_device_free;
+ 
+- e = av_dict_get(opts, "child_device", NULL, 0);
++ if(g_child_device_type == AV_HWDEVICE_TYPE_NONE)
++ {
++ e = av_dict_get(opts, "child_device_type", NULL, 0);
++ if (e) {
++ child_device_type = av_hwdevice_find_type_by_name(e ? e->value : NULL);
++ if (child_device_type == AV_HWDEVICE_TYPE_NONE) {
++ av_log(ctx, AV_LOG_ERROR, "Unknown child device type "
++ "\"%s\".\n", e ? e->value : NULL);
++ return AVERROR(EINVAL);
++ }
++ } else if (CONFIG_VAAPI) {
++ child_device_type = AV_HWDEVICE_TYPE_VAAPI;
++ } else if (CONFIG_D3D11VA) {
++ child_device_type = AV_HWDEVICE_TYPE_D3D11VA;
++ } else if (CONFIG_DXVA2) {
++ child_device_type = AV_HWDEVICE_TYPE_DXVA2;
++ } else {
++ av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n");
++ return AVERROR(ENOSYS);
++ }
++ }
++ else
++ {
++ child_device_type = g_child_device_type;
++ }
++ g_child_device_type = child_device_type;
+ 
+ child_device_opts = NULL;
+- if (CONFIG_VAAPI) {
+- child_device_type = AV_HWDEVICE_TYPE_VAAPI;
+- // libmfx does not actually implement VAAPI properly, rather it
+- // depends on the specific behaviour of a matching iHD driver when
+- // used on recent Intel hardware. Set options to the VAAPI device
+- // creation so that we should pick a usable setup by default if
+- // possible, even when multiple devices and drivers are available.
+- av_dict_set(&child_device_opts, "kernel_driver", "i915", 0);
+- av_dict_set(&child_device_opts, "driver", "iHD", 0);
+- } else if (CONFIG_DXVA2)
+- child_device_type = AV_HWDEVICE_TYPE_DXVA2;
+- else {
+- av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n");
+- return AVERROR(ENOSYS);
++ switch (child_device_type) {
++#if CONFIG_VAAPI
++ case AV_HWDEVICE_TYPE_VAAPI:
++ {
++ // libmfx does not actually implement VAAPI properly, rather it
++ // depends on the specific behaviour of a matching iHD driver when
++ // used on recent Intel hardware. Set options to the VAAPI device
++ // creation so that we should pick a usable setup by default if
++ // possible, even when multiple devices and drivers are available.
++ av_dict_set(&child_device_opts, "kernel_driver", "i915", 0);
++ av_dict_set(&child_device_opts, "driver", "iHD", 0);
++ }
++ break;
++#endif
++#if CONFIG_D3D11VA
++ case AV_HWDEVICE_TYPE_D3D11VA:
++ {
++ e = av_dict_get(opts, "vendor", NULL, 0);
++ if(e)
++ av_dict_set(&child_device_opts, "vendor", e->value, 0);
++ }
++ break;
++#endif
++#if CONFIG_DXVA2
++ case AV_HWDEVICE_TYPE_DXVA2:
++ break;
++#endif
++ default:
++ {
++ av_log(ctx, AV_LOG_ERROR, "No supported child device type is enabled\n");
++ return AVERROR(ENOSYS);
++ }
++ break;
+ }
+ 
++ e = av_dict_get(opts, "child_device", NULL, 0);
+ ret = av_hwdevice_ctx_create(&priv->child_device_ctx, child_device_type,
+ e ? e->value : NULL, child_device_opts, 0);
+ 
+@@ -1267,7 +1531,7 @@ static int qsv_device_create(AVHWDeviceContext *ctx, const char *device,
+ 
+ child_device = (AVHWDeviceContext*)priv->child_device_ctx->data;
+ 
+- impl = choose_implementation(device);
++ impl = choose_implementation(device, child_device_type);
+ 
+ return qsv_device_derive_from_child(ctx, impl, child_device, 0);
+ }
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A04-configure-ensure-the-right-libmfx-version-is-used-wh.patch Added

@@ -0,0 +1,36 @@
+From 77a990202edc6f2b6a2bea02cdefb34f600fda20 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Wed, 3 Feb 2021 09:08:27 +0800
+Subject: PATCH 71/82 configure: ensure the right libmfx version is used when
+ running pkg-config
+
+Intel's oneVPL is a successor to MediaSDK, but removed some obsolete
+features of MediaSDK1, including OPAQUE memory, multi-frame encode and
+LA_EXT rate control mode etc, however these features are used in FFmpeg.
+In order to make sure user build FFmpeg against the right libmfx, this
+patch added a version check for libmfx and warning message for obsolete
+features
+
+1 https://spec.oneapi.com/versions/latest/elements/oneVPL/source/appendix/VPL_intel_media_sdk.html
+---
+ configure | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 63650e52ea60..b01ae9d49815 100755
+--- a/configure
++++ b/configure
+@@ -6377,7 +6377,9 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_
+ # Media SDK or Intel Media Server Studio, these don't come with
+ # pkg-config support. Instead, users should make sure that the build
+ # can find the libraries and headers through other means.
+-enabled libmfx && { check_pkg_config libmfx libmfx "mfx/mfxvideo.h" MFXInit ||
++enabled libmfx && { { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit &&
++ warn "Build FFmpeg against libmfx 1.x, obsolete features of libmfx such as\n"\
++ "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled"; } ||
+ { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
+ if enabled libmfx; then
+ check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9"
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A05-qsv-add-includedir-mfx-to-the-search-path-for-old-ve.patch Added

@@ -0,0 +1,321 @@
+From b293ddc43e7fd259c5a4b5c247d822efd3ed04ce Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Tue, 8 Sep 2020 11:17:27 +0800
+Subject: PATCH 72/82 qsv: add ${includedir}/mfx to the search path for old
+ versions of libmfx
+
+${includedir}/mfx has been added to Cflags in libmfx.pc for the current
+libmfx. We may add ${includedir}/mfx to the search path for old
+versions of libmfx so that we may include foo.h instead of mfx/foo.h
+
+After applying this change, we won't need to change #include to include
+the right header files when the mfx header files are installed to a new
+directory for a new version of libmfx. E.g. for libmfx 2.0 (oneVPL,
+https://github.com/oneapi-src/oneVPL), the header files will be
+installed in vpl directory
+
+If your libmfx comes without pkg-config support, this patch requires a
+small change to your environment setting (e.g. adding
+/opt/intel/mediasdk/include/mfx instead of /opt/intel/mediasdk/include
+to CFLAGS) so that the build can find the headers
+
+This is in preparation for oneVPL support
+---
+ configure | 16 +++++++++++-----
+ fftools/ffmpeg_qsv.c | 2 +-
+ libavcodec/qsv.c | 8 ++++----
+ libavcodec/qsv.h | 2 +-
+ libavcodec/qsv_internal.h | 2 +-
+ libavcodec/qsvdec.c | 2 +-
+ libavcodec/qsvenc.c | 2 +-
+ libavcodec/qsvenc.h | 2 +-
+ libavcodec/qsvenc_h264.c | 2 +-
+ libavcodec/qsvenc_hevc.c | 2 +-
+ libavcodec/qsvenc_jpeg.c | 2 +-
+ libavcodec/qsvenc_mpeg2.c | 2 +-
+ libavcodec/qsvenc_vp9.c | 2 +-
+ libavfilter/qsvvpp.h | 2 +-
+ libavfilter/vf_deinterlace_qsv.c | 2 +-
+ libavfilter/vf_scale_qsv.c | 2 +-
+ libavutil/hwcontext_opencl.c | 2 +-
+ libavutil/hwcontext_qsv.c | 2 +-
+ libavutil/hwcontext_qsv.h | 2 +-
+ 19 files changed, 32 insertions(+), 26 deletions(-)
+
+diff --git a/configure b/configure
+index b01ae9d49815..ecb0d53876bf 100755
+--- a/configure
++++ b/configure
+@@ -6377,12 +6377,18 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_
+ # Media SDK or Intel Media Server Studio, these don't come with
+ # pkg-config support. Instead, users should make sure that the build
+ # can find the libraries and headers through other means.
+-enabled libmfx && { { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit &&
+- warn "Build FFmpeg against libmfx 1.x, obsolete features of libmfx such as\n"\
+- "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled"; } ||
+- { require libmfx "mfx/mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
++enabled libmfx && { { { check_pkg_config libmfx "libmfx < 2.0" "mfxvideo.h" MFXInit ||
++# Some old versions of libmfx have the following settings in libmfx.pc:
++# includedir=/usr/include
++# Cflags: -I${includedir}
++# So add -I${includedir}/mfx to the include path
++ { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit &&
++ add_cflags -I$($pkg_config --variable=includedir libmfx)/mfx; } } &&
++ warn "Build FFmpeg against libmfx 1.x, obsolete features of libmfx such as\n"\
++ "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled"; } ||
++ { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
+ if enabled libmfx; then
+- check_cc MFX_CODEC_VP9 "mfx/mfxvp9.h mfx/mfxstructures.h" "MFX_CODEC_VP9"
++ check_cc MFX_CODEC_VP9 "mfxvp9.h mfxstructures.h" "MFX_CODEC_VP9"
+ fi
+ 
+ enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
+diff --git a/fftools/ffmpeg_qsv.c b/fftools/ffmpeg_qsv.c
+index 3862dc1e7dec..77ad4c9bbf89 100644
+--- a/fftools/ffmpeg_qsv.c
++++ b/fftools/ffmpeg_qsv.c
+@@ -16,7 +16,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ #include <stdlib.h>
+ 
+ #include "libavutil/dict.h"
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index 29f08b664113..ea14f11737cf 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -18,9 +18,9 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+ 
+-#include <mfx/mfxvideo.h>
+-#include <mfx/mfxplugin.h>
+-#include <mfx/mfxjpeg.h>
++#include <mfxvideo.h>
++#include <mfxplugin.h>
++#include <mfxjpeg.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
+@@ -39,7 +39,7 @@
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+ 
+ #if QSV_VERSION_ATLEAST(1, 12)
+-#include "mfx/mfxvp8.h"
++#include "mfxvp8.h"
+ #endif
+ 
+ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
+diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h
+index b77158ec2629..04ae0d6f3426 100644
+--- a/libavcodec/qsv.h
++++ b/libavcodec/qsv.h
+@@ -21,7 +21,7 @@
+ #ifndef AVCODEC_QSV_H
+ #define AVCODEC_QSV_H
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/buffer.h"
+ 
+diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
+index 707e5d6be046..dbef6f8bcda5 100644
+--- a/libavcodec/qsv_internal.h
++++ b/libavcodec/qsv_internal.h
+@@ -39,7 +39,7 @@
+ #include "libavutil/hwcontext_vaapi.h"
+ #endif
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/frame.h"
+ 
+diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
+index 9982303423c9..aeab5179711b 100644
+--- a/libavcodec/qsvdec.c
++++ b/libavcodec/qsvdec.c
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/fifo.h"
+diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
+index 3c06fece86b4..069dd7c61963 100644
+--- a/libavcodec/qsvenc.c
++++ b/libavcodec/qsvenc.c
+@@ -23,7 +23,7 @@
+ 
+ #include <string.h>
+ #include <sys/types.h>
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/hwcontext.h"
+diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
+index 99befefde1fb..3fa825eef32a 100644
+--- a/libavcodec/qsvenc.h
++++ b/libavcodec/qsvenc.h
+@@ -26,7 +26,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/avutil.h"
+ #include "libavutil/fifo.h"
+diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
+index 3a07b412d668..68555a073591 100644
+--- a/libavcodec/qsvenc_h264.c
++++ b/libavcodec/qsvenc_h264.c
+@@ -24,7 +24,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
+index 8c918081acb2..3bab882996c2 100644
+--- a/libavcodec/qsvenc_hevc.c
++++ b/libavcodec/qsvenc_hevc.c
+@@ -22,7 +22,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c
+index dd082692be55..ad8f09befe49 100644
+--- a/libavcodec/qsvenc_jpeg.c
++++ b/libavcodec/qsvenc_jpeg.c
+@@ -22,7 +22,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c
+index 525df99e5035..610bbf79c197 100644
+--- a/libavcodec/qsvenc_mpeg2.c
++++ b/libavcodec/qsvenc_mpeg2.c
+@@ -22,7 +22,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c
+index 9329990d11d6..0a382eb76d9d 100644
+--- a/libavcodec/qsvenc_vp9.c
++++ b/libavcodec/qsvenc_vp9.c
+@@ -22,7 +22,7 @@
+ #include <stdint.h>
+ #include <sys/types.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/opt.h"
+diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
+index e0f4c8f5bb4a..8c0cf3ed9525 100644
+--- a/libavfilter/qsvvpp.h
++++ b/libavfilter/qsvvpp.h
+@@ -24,6 +24,6 @@
+ #ifndef AVFILTER_QSVVPP_H
+ #define AVFILTER_QSVVPP_H
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "avfilter.h"
+diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
+index cd128c2dca45..b56f2afaf7fc 100644
+--- a/libavfilter/vf_deinterlace_qsv.c
++++ b/libavfilter/vf_deinterlace_qsv.c
+@@ -21,7 +21,7 @@
+ * deinterlace video filter - QSV
+ */
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 692592072c61..3170d97a41ff 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -21,7 +21,7 @@
+ * scale video filter - QSV
+ */
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include <stdio.h>
+ #include <string.h>
+diff --git a/libavutil/hwcontext_opencl.c b/libavutil/hwcontext_opencl.c
+index 964b783a8f56..320751a8e425 100644
+--- a/libavutil/hwcontext_opencl.c
++++ b/libavutil/hwcontext_opencl.c
+@@ -47,7 +47,7 @@
+ 
+ #if HAVE_OPENCL_VAAPI_INTEL_MEDIA
+ #if CONFIG_LIBMFX
+-#include <mfx/mfxstructures.h>
++#include <mfxstructures.h>
+ #endif
+ #include <va/va.h>
+ #include <CL/cl_va_api_media_sharing_intel.h>
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index 0306f908d84a..da92d089d042 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -19,7 +19,7 @@
+ #include <stdint.h>
+ #include <string.h>
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ #include "config.h"
+ 
+diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h
+index b98d611cfc40..42e34d0dda96 100644
+--- a/libavutil/hwcontext_qsv.h
++++ b/libavutil/hwcontext_qsv.h
+@@ -19,7 +19,7 @@
+ #ifndef AVUTIL_HWCONTEXT_QSV_H
+ #define AVUTIL_HWCONTEXT_QSV_H
+ 
+-#include <mfx/mfxvideo.h>
++#include <mfxvideo.h>
+ 
+ /**
+ * @file
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A06-qsv-load-user-plugin-for-MFX_VERSION-2.0.patch Added

@@ -0,0 +1,62 @@
+From 96d844ae57094e8ddb9d65f2f80175c46f0ed416 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Tue, 18 Aug 2020 15:20:38 +0800
+Subject: PATCH 73/82 qsv: load user plugin for MFX_VERSION < 2.0
+
+User plugin isn't supported for MFX_VERSION >= 2.012, this is in
+preparation for oneVPL Support
+
+1: https://spec.oneapi.com/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals
+2: https://github.com/oneapi-src/oneVPL
+---
+ libavcodec/qsv.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index ea14f11737cf..acf152e7d90a 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -19,7 +19,6 @@
+ */
+ 
+ #include <mfxvideo.h>
+-#include <mfxplugin.h>
+ #include <mfxjpeg.h>
+ 
+ #include <stdio.h>
+@@ -37,11 +36,16 @@
+ #include "qsv_internal.h"
+ 
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++#define QSV_HAVE_USER_PLUGIN !QSV_VERSION_ATLEAST(2, 0)
+ 
+ #if QSV_VERSION_ATLEAST(1, 12)
+ #include "mfxvp8.h"
+ #endif
+ 
++#if QSV_HAVE_USER_PLUGIN
++#include <mfxplugin.h>
++#endif
++
+ int ff_qsv_codec_id_to_mfx(enum AVCodecID codec_id)
+ {
+ switch (codec_id) {
+@@ -352,6 +356,7 @@ enum AVPictureType ff_qsv_map_pictype(int mfx_pic_type)
+ static int qsv_load_plugins(mfxSession session, const char *load_plugins,
+ void *logctx)
+ {
++#if QSV_HAVE_USER_PLUGIN
+ if (!load_plugins || !*load_plugins)
+ return 0;
+ 
+@@ -395,6 +400,7 @@ load_plugin_fail:
+ if (err < 0)
+ return err;
+ }
++#endif
+ 
+ return 0;
+ 
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A07-qsv-build-audio-related-code-when-MFX_VERSION-2.0.patch Added

@@ -0,0 +1,83 @@
+From f3be579974bf7492b222d4733869d5b5966898e1 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Tue, 18 Aug 2020 15:30:32 +0800
+Subject: PATCH 74/82 qsv: build audio related code when MFX_VERSION < 2.0
+
+Audio isn't supported for MFX_VERSION >= 2.012, this is in
+preparation for oneVPL support
+
+1: https://spec.oneapi.com/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals
+2: https://github.com/oneapi-src/oneVPL
+---
+ libavcodec/qsv.c | 5 +++++
+ libavfilter/qsvvpp.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index acf152e7d90a..3fcb21540403 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -37,6 +37,7 @@
+ 
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+ #define QSV_HAVE_USER_PLUGIN !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_AUDIO !QSV_VERSION_ATLEAST(2, 0)
+ 
+ #if QSV_VERSION_ATLEAST(1, 12)
+ #include "mfxvp8.h"
+@@ -150,8 +151,10 @@ static const struct {
+ { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" },
+ { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" },
+ { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" },
++#if QSV_HAVE_AUDIO
+ { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" },
+ { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" },
++#endif
+ 
+ { MFX_WRN_IN_EXECUTION, 0, "operation in execution" },
+ { MFX_WRN_DEVICE_BUSY, 0, "device busy" },
+@@ -161,7 +164,9 @@ static const struct {
+ { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" },
+ { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" },
+ { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" },
++#if QSV_HAVE_AUDIO
+ { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" },
++#endif
+ };
+ 
+ int ff_qsv_map_error(mfxStatus mfx_err, const char **desc)
+diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
+index deef9c29b52f..3241eaf0d99d 100644
+--- a/libavfilter/qsvvpp.c
++++ b/libavfilter/qsvvpp.c
+@@ -37,5 +37,6 @@
+ #define IS_OPAQUE_MEMORY(mode) (mode & MFX_MEMTYPE_OPAQUE_FRAME)
+ #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY)
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++#define QSV_HAVE_AUDIO !QSV_VERSION_ATLEAST(2, 0)
+
+ typedef struct QSVFrame {
+@@ -126,8 +126,10 @@ static const struct {
+ { MFX_ERR_INVALID_VIDEO_PARAM, AVERROR(EINVAL), "invalid video parameters" },
+ { MFX_ERR_UNDEFINED_BEHAVIOR, AVERROR_BUG, "undefined behavior" },
+ { MFX_ERR_DEVICE_FAILED, AVERROR(EIO), "device failed" },
++#if QSV_HAVE_AUDIO
+ { MFX_ERR_INCOMPATIBLE_AUDIO_PARAM, AVERROR(EINVAL), "incompatible audio parameters" },
+ { MFX_ERR_INVALID_AUDIO_PARAM, AVERROR(EINVAL), "invalid audio parameters" },
++#endif
+ 
+ { MFX_WRN_IN_EXECUTION, 0, "operation in execution" },
+ { MFX_WRN_DEVICE_BUSY, 0, "device busy" },
+@@ -137,7 +137,9 @@ static const struct {
+ { MFX_WRN_VALUE_NOT_CHANGED, 0, "value is saturated" },
+ { MFX_WRN_OUT_OF_RANGE, 0, "value out of range" },
+ { MFX_WRN_FILTER_SKIPPED, 0, "filter skipped" },
++#if QSV_HAVE_AUDIO
+ { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" },
++#endif
+ };
+ 
+ static int qsv_map_error(mfxStatus mfx_err, const char **desc)
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A08-qsvenc-don-t-support-multi-frame-encode-when-MFX_VER.patch Added

@@ -0,0 +1,31 @@
+From 6e1d8cfc738d76b2d6e5c72af9d03795bffa4ec8 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Wed, 19 Aug 2020 12:41:16 +0800
+Subject: PATCH 75/82 qsvenc: don't support multi-frame encode when
+ MFX_VERSION >= 2.0
+
+Multi-frame encode isn't supported for MFX_VERSION >= 2.012, this is
+in preparation for oneVPL support
+
+1: https://spec.oneapi.com/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals
+2: https://github.com/oneapi-src/oneVPL
+---
+ libavcodec/qsvenc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
+index 3fa825eef32a..c18c043ab869 100644
+--- a/libavcodec/qsvenc.h
++++ b/libavcodec/qsvenc.h
+@@ -65,7 +65,7 @@
+ #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 28)
+ #define QSV_HAVE_VCM 0
+ #define QSV_HAVE_QVBR QSV_VERSION_ATLEAST(1, 28)
+-#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25)
++#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) && !QSV_VERSION_ATLEAST(2, 0)
+ #endif
+ 
+ #if !QSV_HAVE_LA_DS
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A09-qsvenc-don-t-support-MFX_RATECONTROL_LA_EXT-when-MFX.patch Added

@@ -0,0 +1,31 @@
+From de4a952c6dd2b8ff713bbd60343826958418e996 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Wed, 19 Aug 2020 12:49:14 +0800
+Subject: PATCH 76/82 qsvenc: don't support MFX_RATECONTROL_LA_EXT when
+ MFX_VERSION >= 2.0
+
+MFX_RATECONTROL_LA_EXT isn't supported for MFX_VERSION >= 2.012,
+this is in preparation for oneVPL support
+
+1: https://spec.oneapi.com/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals
+2: https://github.com/oneapi-src/oneVPL
+---
+ libavcodec/qsvenc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
+index 069dd7c61963..5d0fa129cab1 100644
+--- a/libavcodec/qsvenc.c
++++ b/libavcodec/qsvenc.c
+@@ -103,7 +103,7 @@ static const struct {
+ #if QSV_HAVE_VCM
+ { MFX_RATECONTROL_VCM, "VCM" },
+ #endif
+-#if QSV_VERSION_ATLEAST(1, 10)
++#if QSV_VERSION_ATLEAST(1, 10) && !QSV_VERSION_ATLEAST(2, 0)
+ { MFX_RATECONTROL_LA_EXT, "LA_EXT" },
+ #endif
+ #if QSV_HAVE_LA_HRD
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A10-qsv-don-t-support-OPAQUE-memory-when-MFX_VERSION-2.0.patch Added

@@ -0,0 +1,326 @@
+From ca2bf257cdb0441a805b161d80453d1d3834fcd0 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Wed, 19 Aug 2020 09:43:12 +0800
+Subject: PATCH 77/82 qsv: don't support OPAQUE memory when MFX_VERSION >=
+ 2.0
+
+OPAQUE memory isn't supported for MFX_VERSION >= 2.012, this is in
+preparation for oneVPL support
+
+1: https://spec.oneapi.com/versions/latest/elements/oneVPL/source/VPL_intel_media_sdk.html#msdk-full-name-feature-removals
+2: https://github.com/oneapi-src/oneVPL
+---
+ libavcodec/qsv.c | 4 ++
+ libavcodec/qsv.h | 2 +
+ libavcodec/qsv_internal.h | 2 +
+ libavcodec/qsvdec.c | 9 ++++
+ libavcodec/qsvenc.c | 21 +++++++++
+ libavcodec/qsvenc.h | 2 +
+ libavfilter/qsvvpp.c | 26 ++++++++++-
+ libavfilter/qsvvpp.h | 4 ++
+ libavfilter/vf_deinterlace_qsv.c | 56 +++++++++++++-----------
+ libavfilter/vf_scale_qsv.c | 74 ++++++++++++++++++--------------
+ libavutil/hwcontext_qsv.c | 56 +++++++++++++++++-------
+ 11 files changed, 182 insertions(+), 74 deletions(-)
+
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index 3fcb21540403..a53b06b5c4df 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -102,10 +102,14 @@ static const struct {
+ } qsv_iopatterns = {
+ {MFX_IOPATTERN_IN_VIDEO_MEMORY, "input is video memory surface" },
+ {MFX_IOPATTERN_IN_SYSTEM_MEMORY, "input is system memory surface" },
++#if QSV_HAVE_OPAQUE
+ {MFX_IOPATTERN_IN_OPAQUE_MEMORY, "input is opaque memory surface" },
++#endif
+ {MFX_IOPATTERN_OUT_VIDEO_MEMORY, "output is video memory surface" },
+ {MFX_IOPATTERN_OUT_SYSTEM_MEMORY, "output is system memory surface" },
++#if QSV_HAVE_OPAQUE
+ {MFX_IOPATTERN_OUT_OPAQUE_MEMORY, "output is opaque memory surface" },
++#endif
+ };
+ 
+ int ff_qsv_print_iopattern(void *log_ctx, int mfx_iopattern,
+diff --git a/libavcodec/qsv.h b/libavcodec/qsv.h
+index 04ae0d6f3426..c156b08d0737 100644
+--- a/libavcodec/qsv.h
++++ b/libavcodec/qsv.h
+@@ -61,6 +61,8 @@ typedef struct AVQSVContext {
+ * required by the encoder and the user-provided value nb_opaque_surfaces.
+ * The array of the opaque surfaces will be exported to the caller through
+ * the opaque_surfaces field.
++ *
++ * The caller must set this field to zero for oneVPL (MFX_VERSION >= 2.0)
+ */
+ int opaque_alloc;
+ 
+diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
+index dbef6f8bcda5..7b0ee8cf203b 100644
+--- a/libavcodec/qsv_internal.h
++++ b/libavcodec/qsv_internal.h
+@@ -60,6 +60,8 @@
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
+ 
++#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
++
+ typedef struct QSVMid {
+ AVBufferRef *hw_frames_ref;
+ mfxHDLPair *handle_pair;
+diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
+index aeab5179711b..93786c0d77cd 100644
+--- a/libavcodec/qsvdec.c
++++ b/libavcodec/qsvdec.c
+@@ -169,7 +169,11 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses
+ 
+ ret = ff_qsv_init_session_frames(avctx, &q->internal_qs.session,
+ &q->frames_ctx, q->load_plugins,
++#if QSV_HAVE_OPAQUE
+ q->iopattern == MFX_IOPATTERN_OUT_OPAQUE_MEMORY,
++#else
++ 0,
++#endif
+ q->gpu_copy);
+ if (ret < 0) {
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+@@ -253,10 +257,15 @@ static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixel
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+ 
+ if (!iopattern) {
++#if QSV_HAVE_OPAQUE
+ if (frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME)
+ iopattern = MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+ else if (frames_hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
+ iopattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
++#else
++ if (frames_hwctx->frame_type & MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET)
++ iopattern = MFX_IOPATTERN_OUT_VIDEO_MEMORY;
++#endif
+ }
+ }
+ 
+diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
+index 5d0fa129cab1..0cb0e1e5f138 100644
+--- a/libavcodec/qsvenc.c
++++ b/libavcodec/qsvenc.c
+@@ -1062,6 +1062,7 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q)
+ return 0;
+ }
+ 
++#if QSV_HAVE_OPAQUE
+ static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q)
+ {
+ AVQSVContext *qsv = avctx->hwaccel_context;
+@@ -1098,6 +1099,7 @@ static int qsv_init_opaque_alloc(AVCodecContext *avctx, QSVEncContext *q)
+ 
+ return 0;
+ }
++#endif
+ 
+ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q)
+ {
+@@ -1113,7 +1115,11 @@ static int qsvenc_init_session(AVCodecContext *avctx, QSVEncContext *q)
+ 
+ ret = ff_qsv_init_session_frames(avctx, &q->internal_qs.session,
+ &q->frames_ctx, q->load_plugins,
++#if QSV_HAVE_OPAQUE
+ q->param.IOPattern == MFX_IOPATTERN_IN_OPAQUE_MEMORY,
++#else
++ 0,
++#endif
+ MFX_GPUCOPY_OFF);
+ if (ret < 0) {
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+@@ -1175,11 +1181,17 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+ 
+ if (!iopattern) {
++#if QSV_HAVE_OPAQUE
+ if (frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME)
+ iopattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY;
+ else if (frames_hwctx->frame_type &
+ (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET))
+ iopattern = MFX_IOPATTERN_IN_VIDEO_MEMORY;
++#else
++ if (frames_hwctx->frame_type &
++ (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET))
++ iopattern = MFX_IOPATTERN_IN_VIDEO_MEMORY;
++#endif
+ }
+ }
+ 
+@@ -1253,9 +1265,16 @@ int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q)
+ "Error querying (IOSurf) the encoding parameters");
+ 
+ if (opaque_alloc) {
++#if QSV_HAVE_OPAQUE
+ ret = qsv_init_opaque_alloc(avctx, q);
+ if (ret < 0)
+ return ret;
++#else
++ av_log(avctx, AV_LOG_ERROR, "User is requesting to allocate OPAQUE surface, "
++ "however libmfx %d.%d doesn't support OPAQUE memory.\n",
++ q->ver.Major, q->ver.Minor);
++ return AVERROR_UNKNOWN;
++#endif
+ }
+ 
+ ret = MFXVideoENCODE_Init(q->session, &q->param);
+@@ -1778,8 +1797,10 @@ int ff_qsv_enc_close(AVCodecContext *avctx, QSVEncContext *q)
+ av_fifo_free(q->async_fifo);
+ q->async_fifo = NULL;
+ 
++#if QSV_HAVE_OPAQUE
+ av_freep(&q->opaque_surfaces);
+ av_buffer_unref(&q->opaque_alloc_buf);
++#endif
+ 
+ av_freep(&q->extparam);
+ 
+diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
+index c18c043ab869..3c98bd27eeb4 100644
+--- a/libavcodec/qsvenc.h
++++ b/libavcodec/qsvenc.h
+@@ -138,9 +138,11 @@ typedef struct QSVEncContext {
+ mfxExtVP9Param extvp9param;
+ #endif
+ 
++#if QSV_HAVE_OPAQUE
+ mfxExtOpaqueSurfaceAlloc opaque_alloc;
+ mfxFrameSurface1 **opaque_surfaces;
+ AVBufferRef *opaque_alloc_buf;
++#endif
+ 
+ mfxExtBuffer *extparam_internal2 + QSV_HAVE_CO2 + QSV_HAVE_CO3 + (QSV_HAVE_MF * 2);
+ int nb_extparam_internal;
+diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
+index 8c0cf3ed9525..e04115ca4bb5 100644
+--- a/libavfilter/qsvvpp.h
++++ b/libavfilter/qsvvpp.h
+@@ -39,6 +39,8 @@
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
+ 
++#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
++
+ typedef struct QSVVPPContext QSVVPPContext;
+ 
+ typedef struct QSVVPPCrop {
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 3170d97a41ff..7f957a9f7937 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -90,7 +90,9 @@ typedef struct QSVScaleContext {
+ mfxFrameSurface1 **surface_ptrs_out;
+ int nb_surface_ptrs_out;
+ 
++#if QSV_HAVE_OPAQUE
+ mfxExtOpaqueSurfaceAlloc opaque_alloc;
++#endif
+ 
+ #if QSV_HAVE_SCALING_CONFIG
+ mfxExtVPPScaling scale_conf;
+@@ -285,7 +287,7 @@ static int init_out_session(AVFilterContext *ctx)
+ AVQSVFramesContext *out_frames_hwctx = out_frames_ctx->hwctx;
+ AVQSVDeviceContext *device_hwctx = in_frames_ctx->device_ctx->hwctx;
+ 
+- int opaque = !!(in_frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++ int opaque = 0;
+ 
+ mfxHDL handle = NULL;
+ mfxHandleType handle_type;
+@@ -295,6 +297,9 @@ static int init_out_session(AVFilterContext *ctx)
+ mfxStatus err;
+ int ret, i;
+ 
++#if QSV_HAVE_OPAQUE
++ opaque = !!(in_frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++#endif
+ s->num_ext_buf = 0;
+ 
+ /* extract the properties of the "master" session given to us */
+@@ -348,38 +353,7 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ memset(&par, 0, sizeof(par));
+ 
+- if (opaque) {
+- s->surface_ptrs_in = av_mallocz_array(in_frames_hwctx->nb_surfaces,
+- sizeof(*s->surface_ptrs_in));
+- if (!s->surface_ptrs_in)
+- return AVERROR(ENOMEM);
+- for (i = 0; i < in_frames_hwctx->nb_surfaces; i++)
+- s->surface_ptrs_ini = in_frames_hwctx->surfaces + i;
+- s->nb_surface_ptrs_in = in_frames_hwctx->nb_surfaces;
+-
+- s->surface_ptrs_out = av_mallocz_array(out_frames_hwctx->nb_surfaces,
+- sizeof(*s->surface_ptrs_out));
+- if (!s->surface_ptrs_out)
+- return AVERROR(ENOMEM);
+- for (i = 0; i < out_frames_hwctx->nb_surfaces; i++)
+- s->surface_ptrs_outi = out_frames_hwctx->surfaces + i;
+- s->nb_surface_ptrs_out = out_frames_hwctx->nb_surfaces;
+-
+- s->opaque_alloc.In.Surfaces = s->surface_ptrs_in;
+- s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs_in;
+- s->opaque_alloc.In.Type = in_frames_hwctx->frame_type;
+-
+- s->opaque_alloc.Out.Surfaces = s->surface_ptrs_out;
+- s->opaque_alloc.Out.NumSurface = s->nb_surface_ptrs_out;
+- s->opaque_alloc.Out.Type = out_frames_hwctx->frame_type;
+-
+- s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+- s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
+-
+- s->ext_bufferss->num_ext_buf++ = (mfxExtBuffer*)&s->opaque_alloc;
+-
+- par.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+- } else {
++ if (!opaque) {
+ mfxFrameAllocator frame_allocator = {
+ .pthis = ctx,
+ .Alloc = frame_alloc,
+@@ -411,6 +385,40 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ par.IOPattern = MFX_IOPATTERN_IN_VIDEO_MEMORY | MFX_IOPATTERN_OUT_VIDEO_MEMORY;
+ }
++#if QSV_HAVE_OPAQUE
++ else {
++ s->surface_ptrs_in = av_mallocz_array(in_frames_hwctx->nb_surfaces,
++ sizeof(*s->surface_ptrs_in));
++ if (!s->surface_ptrs_in)
++ return AVERROR(ENOMEM);
++ for (i = 0; i < in_frames_hwctx->nb_surfaces; i++)
++ s->surface_ptrs_ini = in_frames_hwctx->surfaces + i;
++ s->nb_surface_ptrs_in = in_frames_hwctx->nb_surfaces;
++
++ s->surface_ptrs_out = av_mallocz_array(out_frames_hwctx->nb_surfaces,
++ sizeof(*s->surface_ptrs_out));
++ if (!s->surface_ptrs_out)
++ return AVERROR(ENOMEM);
++ for (i = 0; i < out_frames_hwctx->nb_surfaces; i++)
++ s->surface_ptrs_outi = out_frames_hwctx->surfaces + i;
++ s->nb_surface_ptrs_out = out_frames_hwctx->nb_surfaces;
++
++ s->opaque_alloc.In.Surfaces = s->surface_ptrs_in;
++ s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs_in;
++ s->opaque_alloc.In.Type = in_frames_hwctx->frame_type;
++
++ s->opaque_alloc.Out.Surfaces = s->surface_ptrs_out;
++ s->opaque_alloc.Out.NumSurface = s->nb_surface_ptrs_out;
++ s->opaque_alloc.Out.Type = out_frames_hwctx->frame_type;
++
++ s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
++ s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
++
++ s->ext_bufferss->num_ext_buf++ = (mfxExtBuffer*)&s->opaque_alloc;
++
++ par.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
++ }
++#endif
+ 
+ #if QSV_HAVE_SCALING_CONFIG
+ memset(&s->scale_conf, 0, sizeof(mfxExtVPPScaling));
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A11-qsv-opaque-deinterlace.patch Added

@@ -0,0 +1,94 @@
+diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
+index 2dc526eec9..82a2798cd7 100644
+--- a/libavfilter/vf_deinterlace_qsv.c
++++ b/libavfilter/vf_deinterlace_qsv.c
+@@ -70,7 +70,9 @@ typedef struct QSVDeintContext {
+ mfxFrameSurface1 **surface_ptrs;
+ int nb_surface_ptrs;
+ 
++#if QSV_HAVE_OPAQUE
+ mfxExtOpaqueSurfaceAlloc opaque_alloc;
++#endif
+ mfxExtVPPDeinterlacing deint_conf;
+ mfxExtBuffer *ext_buffers2;
+ int num_ext_buffers;
+@@ -177,7 +179,7 @@ static int init_out_session(AVFilterContext *ctx)
+ AVQSVFramesContext *hw_frames_hwctx = hw_frames_ctx->hwctx;
+ AVQSVDeviceContext *device_hwctx = hw_frames_ctx->device_ctx->hwctx;
+ 
+- int opaque = !!(hw_frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++ int ret, opaque = 0;
+ 
+ mfxHDL handle = NULL;
+ mfxHandleType handle_type;
+@@ -187,6 +189,9 @@ static int init_out_session(AVFilterContext *ctx)
+ mfxStatus err;
+ int i;
+ 
++#if QSV_HAVE_OPAQUE
++ opaque = !!(hw_frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++#endif
+ /* extract the properties of the "master" session given to us */
+ err = MFXQueryIMPL(device_hwctx->session, &impl);
+ if (err == MFX_ERR_NONE)
+@@ -245,28 +250,7 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ s->ext_bufferss->num_ext_buffers++ = (mfxExtBuffer *)&s->deint_conf;
+ 
+- if (opaque) {
+- s->surface_ptrs = av_mallocz_array(hw_frames_hwctx->nb_surfaces,
+- sizeof(*s->surface_ptrs));
+- if (!s->surface_ptrs)
+- return AVERROR(ENOMEM);
+- for (i = 0; i < hw_frames_hwctx->nb_surfaces; i++)
+- s->surface_ptrsi = hw_frames_hwctx->surfaces + i;
+- s->nb_surface_ptrs = hw_frames_hwctx->nb_surfaces;
+-
+- s->opaque_alloc.In.Surfaces = s->surface_ptrs;
+- s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs;
+- s->opaque_alloc.In.Type = hw_frames_hwctx->frame_type;
+-
+- s->opaque_alloc.Out = s->opaque_alloc.In;
+-
+- s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+- s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
+-
+- s->ext_bufferss->num_ext_buffers++ = (mfxExtBuffer *)&s->opaque_alloc;
+-
+- par.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
+- } else {
++ if (!opaque) {
+ mfxFrameAllocator frame_allocator = {
+ .pthis = ctx,
+ .Alloc = frame_alloc,
+@@ -290,6 +274,30 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ par.IOPattern = MFX_IOPATTERN_IN_VIDEO_MEMORY | MFX_IOPATTERN_OUT_VIDEO_MEMORY;
+ }
++#if QSV_HAVE_OPAQUE
++ else {
++ s->surface_ptrs = av_mallocz_array(hw_frames_hwctx->nb_surfaces,
++ sizeof(*s->surface_ptrs));
++ if (!s->surface_ptrs)
++ return AVERROR(ENOMEM);
++ for (i = 0; i < hw_frames_hwctx->nb_surfaces; i++)
++ s->surface_ptrsi = hw_frames_hwctx->surfaces + i;
++ s->nb_surface_ptrs = hw_frames_hwctx->nb_surfaces;
++
++ s->opaque_alloc.In.Surfaces = s->surface_ptrs;
++ s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs;
++ s->opaque_alloc.In.Type = hw_frames_hwctx->frame_type;
++
++ s->opaque_alloc.Out = s->opaque_alloc.In;
++
++ s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
++ s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
++
++ s->ext_bufferss->num_ext_buffers++ = (mfxExtBuffer *)&s->opaque_alloc;
++
++ par.IOPattern = MFX_IOPATTERN_IN_OPAQUE_MEMORY | MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
++ }
++#endif
+ 
+ par.ExtParam = s->ext_buffers;
+ par.NumExtParam = s->num_ext_buffers;

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A12-qsv-opaque-vpp.patch Added

@@ -0,0 +1,125 @@
+diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
+index 531e7c3cad..88392a5bc3 100644
+--- a/libavfilter/qsvvpp.c
++++ b/libavfilter/qsvvpp.c
+@@ -34,7 +34,9 @@
+ 
+ #define IS_VIDEO_MEMORY(mode)  (mode & (MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | \
+                                         MFX_MEMTYPE_VIDEO_MEMORY_PROCESSOR_TARGET))
++#if QSV_HAVE_OPAQUE
+ #define IS_OPAQUE_MEMORY(mode) (mode & MFX_MEMTYPE_OPAQUE_FRAME)
++#endif
+ #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY)
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+ #define QSV_HAVE_AUDIO          !QSV_VERSION_ATLEAST(2, 0)
+@@ -64,10 +64,12 @@ struct QSVVPPContext {
+     mfxFrameSurface1  **surface_ptrs_in;
+     mfxFrameSurface1  **surface_ptrs_out;
+
++#if QSV_HAVE_OPAQUE
+     /* MFXVPP extern parameters */
+     mfxExtOpaqueSurfaceAlloc opaque_alloc;
+     mfxExtBuffer      **ext_buffers;
+     int                 nb_ext_buffers;
++#endif
+ };
+
+ static const AVRational default_tb = { 1, 90000 };
+@@ -78,10 +80,14 @@ static const struct {
+ } qsv_iopatterns = {
+     {MFX_IOPATTERN_IN_VIDEO_MEMORY,     "input is video memory surface"         },
+     {MFX_IOPATTERN_IN_SYSTEM_MEMORY,    "input is system memory surface"        },
++#if QSV_HAVE_OPAQUE
+     {MFX_IOPATTERN_IN_OPAQUE_MEMORY,    "input is opaque memory surface"        },
++#endif
+     {MFX_IOPATTERN_OUT_VIDEO_MEMORY,    "output is video memory surface"        },
+     {MFX_IOPATTERN_OUT_SYSTEM_MEMORY,   "output is system memory surface"       },
++#if QSV_HAVE_OPAQUE
+     {MFX_IOPATTERN_OUT_OPAQUE_MEMORY,   "output is opaque memory surface"       },
++#endif
+ };
+ 
+ int ff_qsvvpp_print_iopattern(void *log_ctx, int mfx_iopattern,
+@@ -559,10 +565,13 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+         if (!out_frames_ref)
+             return AVERROR(ENOMEM);
+ 
++#if QSV_HAVE_OPAQUE
+         s->out_mem_mode = IS_OPAQUE_MEMORY(s->in_mem_mode) ?
+                           MFX_MEMTYPE_OPAQUE_FRAME :
+                           MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_FROM_VPPOUT;
+-
++#else
++        s->out_mem_mode = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET | MFX_MEMTYPE_FROM_VPPOUT;
++#endif
+         out_frames_ctx   = (AVHWFramesContext *)out_frames_ref->data;
+         out_frames_hwctx = out_frames_ctx->hwctx;
+ 
+@@ -647,6 +656,7 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+             return AVERROR_UNKNOWN;
+     }
+ 
++#if QSV_HAVE_OPAQUE
+     if (IS_OPAQUE_MEMORY(s->in_mem_mode) || IS_OPAQUE_MEMORY(s->out_mem_mode)) {
+         s->opaque_alloc.In.Surfaces   = s->surface_ptrs_in;
+         s->opaque_alloc.In.NumSurface = s->nb_surface_ptrs_in;
+@@ -658,7 +668,9 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+ 
+         s->opaque_alloc.Header.BufferId = MFX_EXTBUFF_OPAQUE_SURFACE_ALLOCATION;
+         s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
+-    } else if (IS_VIDEO_MEMORY(s->in_mem_mode) || IS_VIDEO_MEMORY(s->out_mem_mode)) {
++    } else
++#endif
++    if (IS_VIDEO_MEMORY(s->in_mem_mode) || IS_VIDEO_MEMORY(s->out_mem_mode)) {
+         mfxFrameAllocator frame_allocator = {
+             .pthis  = s,
+             .Alloc  = frame_alloc,
+@@ -730,6 +742,7 @@ int ff_qsvvpp_create(AVFilterContext *avctx, QSVVPPContext **vpp, QSVVPPParam *p
+         goto failed;
+     }
+ 
++#if QSV_HAVE_OPAQUE
+     if (IS_OPAQUE_MEMORY(s->in_mem_mode) || IS_OPAQUE_MEMORY(s->out_mem_mode)) {
+         s->nb_ext_buffers = param->num_ext_buf + 1;
+         s->ext_buffers = av_mallocz_array(s->nb_ext_buffers, sizeof(*s->ext_buffers));
+@@ -747,6 +760,10 @@ int ff_qsvvpp_create(AVFilterContext *avctx, QSVVPPContext **vpp, QSVVPPParam *p
+         s->vpp_param.NumExtParam = param->num_ext_buf;
+         s->vpp_param.ExtParam    = param->ext_buf;
+     }
++#else
++    s->vpp_param.NumExtParam = param->num_ext_buf;
++    s->vpp_param.ExtParam    = param->ext_buf;
++#endif
+ 
+     s->vpp_param.AsyncDepth = 1;
+ 
+@@ -754,15 +771,19 @@ int ff_qsvvpp_create(AVFilterContext *avctx, QSVVPPContext **vpp, QSVVPPParam *p
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_IN_SYSTEM_MEMORY;
+     else if (IS_VIDEO_MEMORY(s->in_mem_mode))
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_IN_VIDEO_MEMORY;
++#if QSV_HAVE_OPAQUE
+     else if (IS_OPAQUE_MEMORY(s->in_mem_mode))
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_IN_OPAQUE_MEMORY;
++#endif
+ 
+     if (IS_SYSTEM_MEMORY(s->out_mem_mode))
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
+     else if (IS_VIDEO_MEMORY(s->out_mem_mode))
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_OUT_VIDEO_MEMORY;
++#if QSV_HAVE_OPAQUE
+     else if (IS_OPAQUE_MEMORY(s->out_mem_mode))
+         s->vpp_param.IOPattern |= MFX_IOPATTERN_OUT_OPAQUE_MEMORY;
++#endif
+ 
+     /* Print input memory mode */
+     ff_qsvvpp_print_iopattern(avctx, s->vpp_param.IOPattern & 0x0F, "VPP");
+@@ -801,7 +822,9 @@ int ff_qsvvpp_free(QSVVPPContext **vpp)
+     clear_frame_list(&s->out_frame_list);
+     av_freep(&s->surface_ptrs_in);
+     av_freep(&s->surface_ptrs_out);
++#if QSV_HAVE_OPAQUE
+     av_freep(&s->ext_buffers);
++#endif
+     av_freep(&s->frame_infos);
+     av_freep(vpp);
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A13-qsv-opaque-hwcontext_qsv.patch Added

@@ -0,0 +1,153 @@
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index f08be6a2df..947cc20683 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -53,6 +53,7 @@
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+ 
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
++#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
+ 
+ typedef struct QSVDevicePriv {
+ AVBufferRef *child_device_ctx;
+@@ -85,11 +86,13 @@ typedef struct QSVFramesContext {
+ 
+ // used in the frame allocator for non-opaque surfaces
+ mfxMemId *mem_ids;
++#if QSV_HAVE_OPAQUE
+ // used in the opaque alloc request for opaque surfaces
+ mfxFrameSurface1 **surface_ptrs;
+ 
+ mfxExtOpaqueSurfaceAlloc opaque_alloc;
+ mfxExtBuffer *ext_buffers1;
++#endif
+ } QSVFramesContext;
+ 
+ static const struct {
+@@ -218,7 +221,9 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx)
+ #endif
+ 
+ av_freep(&s->mem_ids);
++#if QSV_HAVE_OPAQUE
+ av_freep(&s->surface_ptrs);
++#endif
+ av_freep(&s->surfaces_internal);
+ av_freep(&s->handle_pairs_internal);
+ av_buffer_unref(&s->child_frames_ref);
+@@ -454,11 +459,17 @@ static int qsv_init_pool(AVHWFramesContext *ctx, uint32_t fourcc)
+ return ret;
+ }
+ 
++#if QSV_HAVE_OPAQUE
+ if (!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME)) {
+ ret = qsv_init_child_ctx(ctx);
+ if (ret < 0)
+ return ret;
+ }
++#else
++ ret = qsv_init_child_ctx(ctx);
++ if (ret < 0)
++ return ret;
++#endif
+ 
+ ctx->internal->pool_internal = av_buffer_pool_init2(sizeof(mfxFrameSurface1),
+ ctx, qsv_pool_alloc, NULL);
+@@ -529,10 +540,9 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ mfxSession *session, int upload)
+ {
+- QSVFramesContext *s = ctx->internal->priv;
+ AVQSVFramesContext *frames_hwctx = ctx->hwctx;
+ QSVDeviceContext *device_priv = ctx->device_ctx->internal->priv;
+- int opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++ int opaque = 0;
+ 
+ mfxFrameAllocator frame_allocator = {
+ .pthis = ctx,
+@@ -546,6 +556,11 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ mfxVideoParam par;
+ mfxStatus err;
+ 
++#if QSV_HAVE_OPAQUE
++ QSVFramesContext *s = ctx->internal->priv;
++ opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++#endif
++
+ err = MFXInit(device_priv->impl, &device_priv->ver, session);
+ if (err != MFX_ERR_NONE) {
+ av_log(ctx, AV_LOG_ERROR, "Error initializing an internal session\n");
+@@ -560,6 +575,11 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ }
+ 
+ if (!opaque) {
++ par.IOPattern = upload ? MFX_IOPATTERN_OUT_VIDEO_MEMORY :
++ MFX_IOPATTERN_IN_VIDEO_MEMORY;
++ }
++#if QSV_HAVE_OPAQUE
++ else {
+ err = MFXVideoCORE_SetFrameAllocator(*session, &frame_allocator);
+ if (err != MFX_ERR_NONE)
+ return AVERROR_UNKNOWN;
+@@ -572,10 +592,8 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ par.NumExtParam = FF_ARRAY_ELEMS(s->ext_buffers);
+ par.IOPattern = upload ? MFX_IOPATTERN_OUT_OPAQUE_MEMORY :
+ MFX_IOPATTERN_IN_OPAQUE_MEMORY;
+- } else {
+- par.IOPattern = upload ? MFX_IOPATTERN_OUT_VIDEO_MEMORY :
+- MFX_IOPATTERN_IN_VIDEO_MEMORY;
+ }
++#endif
+ 
+ par.IOPattern |= upload ? MFX_IOPATTERN_IN_SYSTEM_MEMORY :
+ MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
+@@ -607,11 +625,15 @@ static int qsv_frames_init(AVHWFramesContext *ctx)
+ QSVFramesContext *s = ctx->internal->priv;
+ AVQSVFramesContext *frames_hwctx = ctx->hwctx;
+ 
+- int opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++ int opaque = 0;
+ 
+ uint32_t fourcc;
+ int i, ret;
+ 
++#if QSV_HAVE_OPAQUE
++ opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
++#endif
++
+ fourcc = qsv_fourcc_from_pix_fmt(ctx->sw_format);
+ if (!fourcc) {
+ av_log(ctx, AV_LOG_ERROR, "Unsupported pixel format\n");
+@@ -626,7 +648,16 @@ static int qsv_frames_init(AVHWFramesContext *ctx)
+ }
+ }
+ 
+- if (opaque) {
++ if (!opaque) {
++ s->mem_ids = av_mallocz_array(frames_hwctx->nb_surfaces, sizeof(*s->mem_ids));
++ if (!s->mem_ids)
++ return AVERROR(ENOMEM);
++
++ for (i = 0; i < frames_hwctx->nb_surfaces; i++)
++ s->mem_idsi = frames_hwctx->surfacesi.Data.MemId;
++ }
++#if QSV_HAVE_OPAQUE
++ else {
+ s->surface_ptrs = av_mallocz_array(frames_hwctx->nb_surfaces,
+ sizeof(*s->surface_ptrs));
+ if (!s->surface_ptrs)
+@@ -645,14 +676,8 @@ static int qsv_frames_init(AVHWFramesContext *ctx)
+ s->opaque_alloc.Header.BufferSz = sizeof(s->opaque_alloc);
+ 
+ s->ext_buffers0 = (mfxExtBuffer*)&s->opaque_alloc;
+- } else {
+- s->mem_ids = av_mallocz_array(frames_hwctx->nb_surfaces, sizeof(*s->mem_ids));
+- if (!s->mem_ids)
+- return AVERROR(ENOMEM);
+-
+- for (i = 0; i < frames_hwctx->nb_surfaces; i++)
+- s->mem_idsi = frames_hwctx->surfacesi.Data.MemId;
+ }
++#endif
+ 
+ s->session_download = NULL;
+ s->session_upload = NULL;

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A14-configure-check-mfxdefs.h-instead-of-mfxvp9.h-for-MF.patch Added

@@ -0,0 +1,33 @@
+From 9bd8ea3fff18bf4eb6c920577e56603f66504cad Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Fri, 19 Feb 2021 08:51:35 +0800
+Subject: PATCH 78/82 configure: check mfxdefs.h instead of mfxvp9.h for
+ MFX_CODEC_VP9
+
+The VP9 related definitions in mfxvp9.h were wrapped by the
+MFX_VERSION_NEXT, this means the definitions have never been used in a
+public release. In addition, mfxdefs.h was included in mfxvp9.h, so we
+may check mfxdefs.h directly
+
+This is in preparation for oneVPL support because mfxvp9.h was removed
+from oneVPL
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index ecb0d53876bf..62e00240353b 100755
+--- a/configure
++++ b/configure
+@@ -6388,7 +6388,7 @@ enabled libmfx && { { { check_pkg_config libmfx "libmfx < 2.0" "mfxvi
+ "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled"; } ||
+ { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
+ if enabled libmfx; then
+- check_cc MFX_CODEC_VP9 "mfxvp9.h mfxstructures.h" "MFX_CODEC_VP9"
++ check_cc MFX_CODEC_VP9 "mfxdefs.h mfxstructures.h" "MFX_CODEC_VP9"
+ fi
+ 
+ enabled libmodplug && require_pkg_config libmodplug libmodplug libmodplug/modplug.h ModPlug_Load
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A15-configure-allow-user-to-build-FFmpeg-against-oneVPL.patch Added

@@ -0,0 +1,71 @@
+From fbac4a1ce1777f54c6f488a64b075c0d6544b812 Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Wed, 3 Feb 2021 14:49:46 +0800
+Subject: PATCH 79/82 configure: allow user to build FFmpeg against oneVPL
+
+--enable-libvpl: build Intel oneVPL code via libvpl
+
+The version 2.2 of oneVPL is required, --enable-libvpl will take effect
+when both --enable-libvpl and --enable-libmfx are specified.
+---
+ configure | 26 ++++++++++++++++++++------
+ 1 file changed, 20 insertions(+), 6 deletions(-)
+
+diff --git a/configure b/configure
+index 6dc78c7e7f..a3ab4b6dcf 100755
+--- a/configure
++++ b/configure
+@@ -337,6 +337,7 @@ External library support:
+ --disable-ffnvcodec disable dynamically linked Nvidia code autodetect
+ --enable-libdrm enable DRM code (Linux) no
+ --enable-libmfx enable Intel MediaSDK (AKA Quick Sync Video) code via libmfx no
++ --enable-libvpl enable Intel oneVPL code via libvpl no
+ --enable-libnpp enable Nvidia Performance Primitives-based code no
+ --enable-mmal enable Broadcom Multi-Media Abstraction Layer (Raspberry Pi) via MMAL no
+ --disable-nvdec disable Nvidia video decoding acceleration (via hwaccel) autodetect
+@@ -1893,6 +1894,7 @@ HWACCEL_LIBRARY_NONFREE_LIST="
+ HWACCEL_LIBRARY_LIST="
+ $HWACCEL_LIBRARY_NONFREE_LIST
+ libmfx
++ libvpl
+ mmal
+ omx
+ opencl
+@@ -6413,16 +6415,28 @@ enabled liblensfun && require_pkg_config liblensfun lensfun lensfun.h lf_
+ # Media SDK or Intel Media Server Studio, these don't come with
+ # pkg-config support. Instead, users should make sure that the build
+ # can find the libraries and headers through other means.
+-enabled libmfx && { { { check_pkg_config libmfx "libmfx < 2.0" "mfxvideo.h" MFXInit ||
++
++if enabled libvpl; then
++ if ! enabled libmfx; then
++ enabled libmfx
++ fi
++ check_pkg_config libmfx "vpl >= 2.2" "mfxvideo.h" MFXInit && \
++ warn "Build FFmpeg against oneVPL, OPAQUE memory, multi-frame encode\n"\
++ " and LA_EXT rate control mode in FFmpeg QSV won't be supported." ||
++ die "ERROR: libvpl not found"
++elif enabled libmfx; then
++ { check_pkg_config libmfx "libmfx < 2.0" "mfxvideo.h" MFXInit || \
+ # Some old versions of libmfx have the following settings in libmfx.pc:
+ # includedir=/usr/include
+ # Cflags: -I${includedir}
+ # So add -I${includedir}/mfx to the include path
+- { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit &&
+- add_cflags -I$($pkg_config --variable=includedir libmfx)/mfx; } } &&
+- warn "Build FFmpeg against libmfx 1.x, obsolete features of libmfx such as\n"\
+- "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled"; } ||
+- { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; } }
++ { check_pkg_config libmfx "libmfx < 2.0" "mfx/mfxvideo.h" MFXInit && \
++ add_cflags -I$($pkg_config --variable=includedir libmfx)/mfx; } } && \
++ warn "Build FFmpeg against libmfx 1.x, obsolete features of libmfx such as\n"\
++ "OPAQUE memory, multi-frame encode and LA_EXT rate control mode are enabled" || \
++ { require libmfx "mfxvideo.h" MFXInit "-llibmfx $advapi32_extralibs" && warn "using libmfx without pkg-config"; }
++fi
++
+ if enabled libmfx; then
+ check_cc MFX_CODEC_VP9 "mfxdefs.h mfxstructures.h" "MFX_CODEC_VP9"
+ fi
+-- 
+2.25.1
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A16-qsv-add-macro-QSV_ONEVPL-for-the-oneVPL-SDK.patch Added

@@ -0,0 +1,113 @@
+From 1c1d9550fd0672992aa3535579055e5a87da7daf Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Mon, 4 Jan 2021 10:45:48 +0800
+Subject: PATCH 80/82 qsv: add macro QSV_ONEVPL for the oneVPL SDK
+
+---
+ libavcodec/qsv.c | 4 ++--
+ libavcodec/qsv_internal.h | 3 ++-
+ libavcodec/qsvenc.c | 2 +-
+ libavcodec/qsvenc.h | 2 +-
+ libavfilter/qsvvpp.c | 2 +-
+ libavfilter/qsvvpp.h | 3 ++-
+ libavutil/hwcontext_qsv.c | 3 ++-
+ 7 files changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index a53b06b5c4df..cb976419d17a 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -36,8 +36,8 @@
+ #include "qsv_internal.h"
+ 
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+-#define QSV_HAVE_USER_PLUGIN !QSV_VERSION_ATLEAST(2, 0)
+-#define QSV_HAVE_AUDIO !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_USER_PLUGIN !QSV_ONEVPL
++#define QSV_HAVE_AUDIO !QSV_ONEVPL
+ 
+ #if QSV_VERSION_ATLEAST(1, 12)
+ #include "mfxvp8.h"
+diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
+index 7b0ee8cf203b..f20769493b79 100644
+--- a/libavcodec/qsv_internal.h
++++ b/libavcodec/qsv_internal.h
+@@ -65,7 +65,8 @@
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
+ 
+-#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_OPAQUE !QSV_ONEVPL
+ 
+ typedef struct QSVMid {
+ AVBufferRef *hw_frames_ref;
+diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
+index 0cb0e1e5f138..356db740b0df 100644
+--- a/libavcodec/qsvenc.c
++++ b/libavcodec/qsvenc.c
+@@ -103,7 +103,7 @@ static const struct {
+ #if QSV_HAVE_VCM
+ { MFX_RATECONTROL_VCM, "VCM" },
+ #endif
+-#if QSV_VERSION_ATLEAST(1, 10) && !QSV_VERSION_ATLEAST(2, 0)
++#if QSV_VERSION_ATLEAST(1, 10) && !QSV_ONEVPL
+ { MFX_RATECONTROL_LA_EXT, "LA_EXT" },
+ #endif
+ #if QSV_HAVE_LA_HRD
+diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
+index 3c98bd27eeb4..22e27ce7b4a4 100644
+--- a/libavcodec/qsvenc.h
++++ b/libavcodec/qsvenc.h
+@@ -65,7 +65,7 @@
+ #define QSV_HAVE_ICQ QSV_VERSION_ATLEAST(1, 28)
+ #define QSV_HAVE_VCM 0
+ #define QSV_HAVE_QVBR QSV_VERSION_ATLEAST(1, 28)
+-#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) && !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_MF QSV_VERSION_ATLEAST(1, 25) && !QSV_ONEVPL
+ #endif
+ 
+ #if !QSV_HAVE_LA_DS
+diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
+index 203181cf4019..4d05e6aeda59 100644
+--- a/libavfilter/qsvvpp.c
++++ b/libavfilter/qsvvpp.c
+@@ -39,6 +39,6 @@
+ #endif
+ #define IS_SYSTEM_MEMORY(mode) (mode & MFX_MEMTYPE_SYSTEM_MEMORY)
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+-#define QSV_HAVE_AUDIO !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_AUDIO !QSV_ONEVPL
+ 
+ typedef struct QSVFrame {
+diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
+index e04115ca4bb5..67c351f2977b 100644
+--- a/libavfilter/qsvvpp.h
++++ b/libavfilter/qsvvpp.h
+@@ -39,6 +39,7 @@
+ ((MFX_VERSION.Major > (MAJOR)) || \
+ (MFX_VERSION.Major == (MAJOR) && MFX_VERSION.Minor >= (MINOR)))
+ 
+-#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_OPAQUE !QSV_ONEVPL
+ 
+ typedef struct QSVVPPContext QSVVPPContext;
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index bbc56b87cbce..d4fe8c9b23de 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -52,8 +52,9 @@
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+ 
+ #define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+-#define QSV_HAVE_OPAQUE !QSV_VERSION_ATLEAST(2, 0)
++#define QSV_ONEVPL QSV_VERSION_ATLEAST(2, 0)
++#define QSV_HAVE_OPAQUE !QSV_ONEVPL
+ 
+ typedef struct QSVDevicePriv {
+ AVBufferRef *child_device_ctx;
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A17-qsv-use-a-new-method-to-create-mfx-session-when-usin.patch Added

@@ -0,0 +1,603 @@
+From 23ad4fc96178a11c03cb01a6c33cf761277921fe Mon Sep 17 00:00:00 2001
+From: Haihao Xiang <haihao.xiang@intel.com>
+Date: Mon, 4 Jan 2021 10:46:14 +0800
+Subject: PATCH 81/82 qsv: use a new method to create mfx session when using
+ the oneVPL SDK
+
+In oneVPL, MFXLoad() and MFXCreateSession() are required to create a
+workable mfx session1
+
+1 https://spec.oneapi.com/versions/latest/elements/oneVPL/source/programming_guide/VPL_prg_session.html#onevpl-dispatcher
+---
+ libavcodec/qsv.c | 191 +++++++++++++++++++---
+ libavcodec/qsv_internal.h | 1 +
+ libavcodec/qsvdec.c | 4 +
+ libavcodec/qsvenc.h | 3 +
+ libavcodec/qsvenc_h264.c | 1 -
+ libavcodec/qsvenc_hevc.c | 1 -
+ libavcodec/qsvenc_jpeg.c | 1 -
+ libavcodec/qsvenc_mpeg2.c | 1 -
+ libavcodec/qsvenc_vp9.c | 1 -
+ libavfilter/qsvvpp.c | 107 +++++++++++--
+ libavfilter/qsvvpp.h | 5 +
+ libavfilter/vf_deinterlace_qsv.c | 12 +-
+ libavfilter/vf_scale_qsv.c | 10 +-
+ libavutil/hwcontext_qsv.h | 16 ++
+ 15 files changed, 532 insertions(+), 87 deletions(-)
+
+diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
+index cb976419d17a..f110ae943bbb 100644
+--- a/libavcodec/qsv.c
++++ b/libavcodec/qsv.c
+@@ -448,6 +448,164 @@ static int ff_qsv_set_display_handle(AVCodecContext *avctx, QSVSession *qs)
+ }
+ #endif //AVCODEC_QSV_LINUX_SESSION_HANDLE
+ 
++#if QSV_ONEVPL
++
++static int qsv_create_mfx_session(AVCodecContext *avctx,
++ mfxIMPL implementation,
++ mfxVersion *pver,
++ int gpu_copy,
++ mfxSession *psession,
++ mfxLoader *ploader)
++{
++ mfxStatus sts;
++ mfxLoader loader = NULL;
++ mfxSession session = NULL;
++ mfxConfig cfg;
++ mfxVariant impl_value;
++ uint32_t impl_idx = 0;
++
++ *psession = NULL;
++
++ /* Don't create a new MFX loader if the input loader is valid */
++ if (*ploader == NULL) {
++ av_log(avctx, AV_LOG_VERBOSE,
++ "Use the Intel oneVPL SDK to create MFX session, the required "
++ "implementation version is %d.%d\n",
++ pver->Major, pver->Minor);
++
++ loader = MFXLoad();
++
++ if (!loader) {
++ av_log(avctx, AV_LOG_ERROR, "Error creating a MFX loader\n");
++ goto fail;
++ }
++
++ /* Create configurations for implementation */
++ cfg = MFXCreateConfig(loader);
++
++ if (!cfg) {
++ av_log(avctx, AV_LOG_ERROR, "Error creating a MFX configurations\n");
++ goto fail;
++ }
++
++ impl_value.Type = MFX_VARIANT_TYPE_U32;
++ impl_value.Data.U32 = (implementation == MFX_IMPL_SOFTWARE) ?
++ MFX_IMPL_TYPE_SOFTWARE : MFX_IMPL_TYPE_HARDWARE;
++ sts = MFXSetConfigFilterProperty(cfg,
++ (const mfxU8 *)"mfxImplDescription.Impl", impl_value);
++
++ if (sts != MFX_ERR_NONE) {
++ av_log(avctx, AV_LOG_ERROR, "Error adding a MFX configuration "
++ "property: %d\n", sts);
++ goto fail;
++ }
++
++ impl_value.Type = MFX_VARIANT_TYPE_U32;
++ impl_value.Data.U32 = pver->Version;
++ sts = MFXSetConfigFilterProperty(cfg,
++ (const mfxU8 *)"mfxImplDescription.ApiVersion.Version",
++ impl_value);
++
++ if (sts != MFX_ERR_NONE) {
++ av_log(avctx, AV_LOG_ERROR, "Error adding a MFX configuration "
++ "property: %d\n", sts);
++ goto fail;
++ }
++ } else {
++ av_log(avctx, AV_LOG_VERBOSE,
++ "Use the Intel oneVPL SDK to create MFX session with the specified MFX loader\n");
++
++ loader = *ploader;
++ }
++
++ while (1) {
++ /* Enumerate all implementations */
++ mfxImplDescription *impl_desc;
++
++ sts = MFXEnumImplementations(loader, impl_idx,
++ MFX_IMPLCAPS_IMPLDESCSTRUCTURE,
++ (mfxHDL *)&impl_desc);
++
++ /* Failed to find an available implementation */
++ if (sts == MFX_ERR_NOT_FOUND)
++ break;
++ else if (sts < 0) {
++ impl_idx++;
++ continue;
++ }
++
++ sts = MFXCreateSession(loader, impl_idx, &session);
++ MFXDispReleaseImplDescription(loader, impl_desc);
++
++ if (sts == MFX_ERR_NONE)
++ break;
++
++ impl_idx++;
++ }
++
++ if (sts != MFX_ERR_NONE) {
++ av_log(avctx, AV_LOG_ERROR, "Error creating a MFX session: %d.\n", sts);
++ goto fail;
++ }
++
++ *psession = session;
++
++ if (!*ploader)
++ *ploader = loader;
++
++ return 0;
++
++fail:
++ if (!*ploader && loader)
++ MFXUnload(loader);
++
++ return AVERROR_UNKNOWN;
++}
++
++#else
++
++static int qsv_create_mfx_session(AVCodecContext *avctx,
++ mfxIMPL implementation,
++ mfxVersion *pver,
++ int gpu_copy,
++ mfxSession *psession,
++ mfxLoader *ploader)
++{
++ mfxInitParam init_par = { MFX_IMPL_AUTO_ANY };
++ mfxSession session = NULL;
++ mfxStatus sts;
++
++ av_log(avctx, AV_LOG_VERBOSE,
++ "Use the Intel Media SDK to create MFX session, the required "
++ "implementation version is %d.%d\n",
++ pver->Major, pver->Minor);
++
++ *psession = NULL;
++ *ploader = NULL;
++
++#if QSV_VERSION_ATLEAST(1, 16)
++ init_par.GPUCopy = gpu_copy;
++#endif
++ init_par.Implementation = implementation;
++ init_par.Version = *pver;
++ sts = MFXInitEx(init_par, &session);
++
++ if (sts < 0)
++ return ff_qsv_print_error(avctx, sts,
++ "Error initializing a MFX session");
++ else if (sts > 0) {
++ ff_qsv_print_warning(avctx, sts,
++ "Warning in MFX initialization");
++ return AVERROR_UNKNOWN;
++ }
++
++ *psession = session;
++
++ return 0;
++}
++
++#endif
++
+ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
+ const char *load_plugins, int gpu_copy)
+ {
+@@ -457,20 +615,13 @@ int ff_qsv_init_internal_session(AVCodecContext *avctx, QSVSession *qs,
+ mfxIMPL impl = MFX_IMPL_AUTO_ANY;
+ #endif
+ mfxVersion ver = { { QSV_VERSION_MINOR, QSV_VERSION_MAJOR } };
+- mfxInitParam init_par = { MFX_IMPL_AUTO_ANY };
+ 
+ const char *desc;
+- int ret;
++ int ret = qsv_create_mfx_session(avctx, impl, &ver, gpu_copy, &qs->session,
++ &qs->loader);
+ 
+-#if QSV_VERSION_ATLEAST(1, 16)
+- init_par.GPUCopy = gpu_copy;
+-#endif
+- init_par.Implementation = impl;
+- init_par.Version = ver;
+- ret = MFXInitEx(init_par, &qs->session);
+- if (ret < 0)
+- return ff_qsv_print_error(avctx, ret,
+- "Error initializing an internal MFX session");
++ if (ret)
++ return ret;
+ 
+ #ifdef AVCODEC_QSV_LINUX_SESSION_HANDLE
+ ret = ff_qsv_set_display_handle(avctx, qs);
+@@ -771,7 +922,7 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
+ AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)device_ref->data;
+ AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
+ mfxSession parent_session = device_hwctx->session;
+- mfxInitParam init_par = { MFX_IMPL_AUTO_ANY };
++ mfxLoader loader = device_hwctx->loader;
+ mfxHDL handle = NULL;
+ int hw_handle_supported = 0;
+ 
+@@ -812,15 +963,11 @@ int ff_qsv_init_session_device(AVCodecContext *avctx, mfxSession *psession,
+ "from the session\n");
+ }
+ 
+-#if QSV_VERSION_ATLEAST(1, 16)
+- init_par.GPUCopy = gpu_copy;
+-#endif
+- init_par.Implementation = impl;
+- init_par.Version = ver;
+- err = MFXInitEx(init_par, &session);
+- if (err != MFX_ERR_NONE)
+- return ff_qsv_print_error(avctx, err,
+- "Error initializing a child MFX session");
++ ret = qsv_create_mfx_session(avctx, impl, &ver, gpu_copy, &session,
++ &loader);
++
++ if (ret)
++ return ret;
+ 
+ if (handle) {
+ err = MFXVideoCORE_SetHandle(session, handle_type, handle);
+@@ -897,7 +1044,9 @@ int ff_qsv_close_internal_session(QSVSession *qs)
+ {
+ if (qs->session) {
+ MFXClose(qs->session);
++ MFXUnload(qs->loader);
+ qs->session = NULL;
++ qs->loader = NULL;
+ }
+ #ifdef AVCODEC_QSV_LINUX_SESSION_HANDLE
+ av_buffer_unref(&qs->va_device_ref);
+diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
+index f20769493b79..9d0d76aa4dc3 100644
+--- a/libavcodec/qsv_internal.h
++++ b/libavcodec/qsv_internal.h
+@@ -92,6 +92,7 @@ typedef struct QSVFrame {
+ 
+ typedef struct QSVSession {
+ mfxSession session;
++ mfxLoader loader;
+ #ifdef AVCODEC_QSV_LINUX_SESSION_HANDLE
+ AVBufferRef *va_device_ref;
+ AVHWDeviceContext *va_device_ctx;
+diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
+index 93786c0d77cd..1ba719701bb2 100644
+--- a/libavcodec/qsvdec.c
++++ b/libavcodec/qsvdec.c
+@@ -159,7 +159,9 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses
+ } else if (hw_frames_ref) {
+ if (q->internal_qs.session) {
+ MFXClose(q->internal_qs.session);
++ MFXUnload(q->internal_qs.loader);
+ q->internal_qs.session = NULL;
++ q->internal_qs.loader = NULL;
+ }
+ av_buffer_unref(&q->frames_ctx.hw_frames_ctx);
+ 
+@@ -184,7 +186,9 @@ static int qsv_init_session(AVCodecContext *avctx, QSVContext *q, mfxSession ses
+ } else if (hw_device_ref) {
+ if (q->internal_qs.session) {
+ MFXClose(q->internal_qs.session);
++ MFXUnload(q->internal_qs.loader);
+ q->internal_qs.session = NULL;
++ q->internal_qs.loader = NULL;
+ }
+ 
+ ret = ff_qsv_init_session_device(avctx, &q->internal_qs.session,
+diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
+index 22e27ce7b4a4..ea906c699af4 100644
+--- a/libavcodec/qsvenc.h
++++ b/libavcodec/qsvenc.h
+@@ -28,6 +28,9 @@
+ 
+ #include <mfxvideo.h>
+ 
++#include "libavutil/common.h"
++#include "libavutil/hwcontext.h"
++#include "libavutil/hwcontext_qsv.h"
+ #include "libavutil/avutil.h"
+ #include "libavutil/fifo.h"
+ 
+diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
+index 68555a073591..06abc5fc657a 100644
+--- a/libavcodec/qsvenc_h264.c
++++ b/libavcodec/qsvenc_h264.c
+@@ -32,7 +32,6 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "qsv.h"
+-#include "qsv_internal.h"
+ #include "qsvenc.h"
+ #include "atsc_a53.h"
+ 
+diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
+index 3bab882996c2..366830958d2c 100644
+--- a/libavcodec/qsvenc_hevc.c
++++ b/libavcodec/qsvenc_hevc.c
+@@ -35,7 +35,6 @@
+ #include "h2645_parse.h"
+ #include "internal.h"
+ #include "qsv.h"
+-#include "qsv_internal.h"
+ #include "qsvenc.h"
+ 
+ enum LoadPlugin {
+diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c
+index ad8f09befe49..f473b1ddbc7a 100644
+--- a/libavcodec/qsvenc_jpeg.c
++++ b/libavcodec/qsvenc_jpeg.c
+@@ -30,7 +30,6 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "qsv.h"
+-#include "qsv_internal.h"
+ #include "qsvenc.h"
+ 
+ typedef struct QSVMJPEGEncContext {
+diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c
+index 610bbf79c197..0e2a51811c0a 100644
+--- a/libavcodec/qsvenc_mpeg2.c
++++ b/libavcodec/qsvenc_mpeg2.c
+@@ -30,7 +30,6 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "qsv.h"
+-#include "qsv_internal.h"
+ #include "qsvenc.h"
+ 
+ typedef struct QSVMpeg2EncContext {
+diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c
+index 0a382eb76d9d..9d88b03bbfa9 100644
+--- a/libavcodec/qsvenc_vp9.c
++++ b/libavcodec/qsvenc_vp9.c
+@@ -30,7 +30,6 @@
+ #include "avcodec.h"
+ #include "internal.h"
+ #include "qsv.h"
+-#include "qsv_internal.h"
+ #include "qsvenc.h"
+ 
+ typedef struct QSVVP9EncContext {
+diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c
+index 4d05e6aeda59..66df750e9da1 100644
+--- a/libavfilter/qsvvpp.c
++++ b/libavfilter/qsvvpp.c
+@@ -23,8 +23,6 @@
+ 
+ #include "libavutil/common.h"
+ #include "libavutil/mathematics.h"
+-#include "libavutil/hwcontext.h"
+-#include "libavutil/hwcontext_qsv.h"
+ #include "libavutil/time.h"
+ #include "libavutil/pixdesc.h"
+ 
+@@ -608,13 +606,11 @@ static int init_vpp_session(AVFilterContext *avctx, QSVVPPContext *s)
+ }
+ 
+ /* create a "slave" session with those same properties, to be used for vpp */
+- ret = MFXInit(impl, &ver, &s->session);
+- if (ret < 0)
+- return ff_qsvvpp_print_error(avctx, ret, "Error initializing a session");
+- else if (ret > 0) {
+- ff_qsvvpp_print_warning(avctx, ret, "Warning in session initialization");
+- return AVERROR_UNKNOWN;
+- }
++ ret = ff_qsvvpp_create_mfx_session(avctx, device_hwctx->loader, impl, &ver,
++ &s->session);
++
++ if (ret)
++ return ret;
+ 
+ if (handle) {
+ ret = MFXVideoCORE_SetHandle(s->session, handle_type, handle);
+@@ -910,3 +906,96 @@ int ff_qsvvpp_filter_frame(QSVVPPContext *s, AVFilterLink *inlink, AVFrame *picr
+ 
+ return ret;
+ }
++
++#if QSV_ONEVPL
++
++int ff_qsvvpp_create_mfx_session(void *ctx,
++ mfxLoader loader,
++ mfxIMPL implementation,
++ mfxVersion *pver,
++ mfxSession *psession)
++{
++ mfxStatus sts;
++ mfxSession session = NULL;
++ uint32_t impl_idx = 0;
++
++ av_log(ctx, AV_LOG_VERBOSE,
++ "Use the Intel oneVPL SDK to create MFX session with the specified MFX loader\n");
++
++ if (!loader) {
++ av_log(ctx, AV_LOG_ERROR, "Invalid MFX Loader handle\n");
++ return AVERROR(EINVAL);
++ }
++
++ while (1) {
++ /* Enumerate all implementations */
++ mfxImplDescription *impl_desc;
++
++ sts = MFXEnumImplementations(loader, impl_idx,
++ MFX_IMPLCAPS_IMPLDESCSTRUCTURE,
++ (mfxHDL *)&impl_desc);
++
++ /* Failed to find an available implementation */
++ if (sts == MFX_ERR_NOT_FOUND)
++ break;
++ else if (sts != MFX_ERR_NONE) {
++ impl_idx++;
++ continue;
++ }
++
++ sts = MFXCreateSession(loader, impl_idx, &session);
++ MFXDispReleaseImplDescription(loader, impl_desc);
++
++ if (sts == MFX_ERR_NONE)
++ break;
++
++ impl_idx++;
++ }
++
++ if (sts < 0)
++ return ff_qsvvpp_print_error(ctx, sts,
++ "Error creating a MFX session");
++ else if (sts > 0) {
++ ff_qsvvpp_print_warning(ctx, sts,
++ "Warning in MFX session creation");
++ return AVERROR_UNKNOWN;
++ }
++
++ *psession = session;
++
++ return 0;
++}
++
++#else
++
++int ff_qsvvpp_create_mfx_session(void *ctx,
++ mfxLoader loader,
++ mfxIMPL implementation,
++ mfxVersion *pver,
++ mfxSession *psession)
++{
++ mfxSession session = NULL;
++ mfxStatus sts;
++
++ av_log(ctx, AV_LOG_VERBOSE,
++ "Use the Intel Media SDK to create MFX session, API version is "
++ "%d.%d, the required implementation version is %d.%d\n",
++ MFX_VERSION_MAJOR, MFX_VERSION_MINOR, pver->Major, pver->Minor);
++
++ *psession = NULL;
++ sts = MFXInit(implementation, pver, &session);
++
++ if (sts < 0)
++ return ff_qsvvpp_print_error(ctx, sts,
++ "Error initializing an MFX session");
++ else if (sts > 0) {
++ ff_qsvvpp_print_warning(ctx, sts, "Warning in MFX session initialization");
++ return AVERROR_UNKNOWN;
++ }
++
++ *psession = session;
++
++ return 0;
++}
++
++#endif
+diff --git a/libavfilter/qsvvpp.h b/libavfilter/qsvvpp.h
+index 67c351f2977b..d1c12be25b18 100644
+--- a/libavfilter/qsvvpp.h
++++ b/libavfilter/qsvvpp.h
+@@ -28,5 +28,7 @@
+ 
+ #include "avfilter.h"
++#include "libavutil/hwcontext.h"
++#include "libavutil/hwcontext_qsv.h"
+ 
+ #define FF_INLINK_IDX(link) ((int)((link)->dstpad - (link)->dst->input_pads))
+ #define FF_OUTLINK_IDX(link) ((int)((link)->srcpad - (link)->src->output_pads))
+@@ -122,4 +124,7 @@ int ff_qsvvpp_print_error(void *log_ctx, mfxStatus err,
+ int ff_qsvvpp_print_warning(void *log_ctx, mfxStatus err,
+ const char *warning_string);
+ 
++int ff_qsvvpp_create_mfx_session(void *ctx, mfxLoader loader, mfxIMPL implementation,
++ mfxVersion *pver, mfxSession *psession);
++
+ #endif /* AVFILTER_QSVVPP_H */
+diff --git a/libavfilter/vf_deinterlace_qsv.c b/libavfilter/vf_deinterlace_qsv.c
+index b31a49a0f66a..03e253ab28f3 100644
+--- a/libavfilter/vf_deinterlace_qsv.c
++++ b/libavfilter/vf_deinterlace_qsv.c
+@@ -213,13 +213,11 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ /* create a "slave" session with those same properties, to be used for
+ * actual deinterlacing */
+- err = MFXInit(impl, &ver, &s->session);
+- if (err < 0)
+- return ff_qsvvpp_print_error(ctx, err, "Error initializing a session for deinterlacing");
+- else if (err > 0) {
+- ff_qsvvpp_print_warning(ctx, err, "Warning in session initialization");
+- return AVERROR_UNKNOWN;
+- }
++ ret = ff_qsvvpp_create_mfx_session(ctx, device_hwctx->loader, impl, &ver,
++ &s->session);
++
++ if (ret)
++ return ret;
+ 
+ if (handle) {
+ err = MFXVideoCORE_SetHandle(s->session, handle_type, handle);
+diff --git a/libavfilter/vf_scale_qsv.c b/libavfilter/vf_scale_qsv.c
+index 7f957a9f7937..b5cfc5cbcf65 100644
+--- a/libavfilter/vf_scale_qsv.c
++++ b/libavfilter/vf_scale_qsv.c
+@@ -333,11 +333,11 @@ static int init_out_session(AVFilterContext *ctx)
+ 
+ /* create a "slave" session with those same properties, to be used for
+ * actual scaling */
+- err = MFXInit(impl, &ver, &s->session);
+- if (err != MFX_ERR_NONE) {
+- av_log(ctx, AV_LOG_ERROR, "Error initializing a session for scaling\n");
+- return AVERROR_UNKNOWN;
+- }
++ ret = ff_qsvvpp_create_mfx_session(ctx, device_hwctx->loader, impl, &ver,
++ &s->session);
++
++ if (ret)
++ return ret;
+ 
+ if (handle) {
+ err = MFXVideoCORE_SetHandle(s->session, handle_type, handle);
+diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h
+index 42e34d0dda96..65415d3d8c4c 100644
+--- a/libavutil/hwcontext_qsv.h
++++ b/libavutil/hwcontext_qsv.h
+@@ -19,8 +19,23 @@
+ #ifndef AVUTIL_HWCONTEXT_QSV_H
+ #define AVUTIL_HWCONTEXT_QSV_H
+ 
++#include <mfxdefs.h>
+ #include <mfxvideo.h>
+ 
++#if (MFX_VERSION_MAJOR < 2)
++
++typedef void * mfxLoader;
++
++static av_always_inline void MFXUnload (mfxLoader mfxloader)
++{
++}
++
++#else
++
++#include <mfxdispatcher.h>
++
++#endif
++
+ /**
+ * @file
+ * An API-specific header for AV_HWDEVICE_TYPE_QSV.
+@@ -33,6 +48,7 @@
+ * This struct is allocated as AVHWDeviceContext.hwctx
+ */
+ typedef struct AVQSVDeviceContext {
++ mfxLoader loader;
+ mfxSession session;
+ } AVQSVDeviceContext;
+ 
+-- 
+2.25.4
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A18-qsv-new-method-hwcontext_qsv.patch Added

@@ -0,0 +1,380 @@
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index cd85d67aba..f06bb855c3 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -72,8 +72,10 @@ typedef struct QSVDeviceContext {
+ 
+ typedef struct QSVFramesContext {
+     mfxSession session_download;
++    mfxLoader loader_download;
+     int session_download_init;
+     mfxSession session_upload;
++    mfxLoader loader_upload;
+     int session_upload_init;
+ #if HAVE_PTHREADS
+     pthread_mutex_t session_lock;
+@@ -205,15 +207,19 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx)
+     if (s->session_download) {
+         MFXVideoVPP_Close(s->session_download);
+         MFXClose(s->session_download);
++        MFXUnload(s->loader_download);
+     }
+     s->session_download = NULL;
++    s->loader_download = NULL;
+     s->session_download_init = 0;
+ 
+     if (s->session_upload) {
+         MFXVideoVPP_Close(s->session_upload);
+         MFXClose(s->session_upload);
++        MFXUnload(s->loader_upload);
+     }
+     s->session_upload = NULL;
++    s->loader_upload = NULL;
+     s->session_upload_init = 0;
+ 
+ #if HAVE_PTHREADS
+@@ -538,8 +544,186 @@ static mfxStatus frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
+     return MFX_ERR_NONE;
+ }
+ 
++#if QSV_ONEVPL
++
++static int qsv_create_mfx_session(void *ctx,
++                                  mfxIMPL implementation,
++                                  mfxVersion *pver,
++                                  mfxSession *psession,
++                                  mfxLoader *ploader)
++{
++    mfxStatus sts;
++    mfxLoader loader = NULL;
++    mfxSession session = NULL;
++    mfxConfig cfg;
++    mfxVersion ver;
++    mfxVariant impl_value;
++    uint32_t impl_idx = 0;
++
++    av_log(ctx, AV_LOG_VERBOSE,
++           "Use the Intel oneVPL SDK to create MFX session, API version is "
++           "%d.%d, the required implementation version is %d.%d\n",
++           MFX_VERSION_MAJOR, MFX_VERSION_MINOR, pver->Major, pver->Minor);
++
++    *psession = NULL;
++    *ploader = NULL;
++    loader = MFXLoad();
++
++    if (!loader) {
++        av_log(ctx, AV_LOG_ERROR, "Error creating a MFX loader\n");
++        goto fail;
++    }
++
++    /* Create configurations for implementation */
++    cfg = MFXCreateConfig(loader);
++
++    if (!cfg) {
++        av_log(ctx, AV_LOG_ERROR, "Error creating a MFX configuration\n");
++        goto fail;
++    }
++
++    impl_value.Type = MFX_VARIANT_TYPE_U32;
++    impl_value.Data.U32 = (implementation == MFX_IMPL_SOFTWARE) ?
++        MFX_IMPL_TYPE_SOFTWARE : MFX_IMPL_TYPE_HARDWARE;
++    sts = MFXSetConfigFilterProperty(cfg,
++                                     (const mfxU8 *)"mfxImplDescription.Impl", impl_value);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration "
++               "property: %d.\n", sts);
++        goto fail;
++    }
++
++    impl_value.Type = MFX_VARIANT_TYPE_U32;
++    impl_value.Data.U32 = pver->Version;
++    sts = MFXSetConfigFilterProperty(cfg,
++                                     (const mfxU8 *)"mfxImplDescription.ApiVersion.Version",
++                                     impl_value);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration "
++               "property: %d.\n", sts);
++        goto fail;
++    }
++
++    while (1) {
++        /* Enumerate all implementations */
++        mfxImplDescription *impl_desc;
++
++        sts = MFXEnumImplementations(loader, impl_idx,
++                                     MFX_IMPLCAPS_IMPLDESCSTRUCTURE,
++                                     (mfxHDL *)&impl_desc);
++
++        /* Failed to find an available implementation */
++        if (sts == MFX_ERR_NOT_FOUND)
++            break;
++        else if (sts != MFX_ERR_NONE) {
++            impl_idx++;
++            continue;
++        }
++
++        sts = MFXCreateSession(loader, impl_idx, &session);
++        MFXDispReleaseImplDescription(loader, impl_desc);
++
++        if (sts == MFX_ERR_NONE)
++            break;
++
++        impl_idx++;
++    }
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error creating a MFX session: %d.\n", sts);
++        goto fail;
++    }
++
++    sts = MFXQueryVersion(session, &ver);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error querying a MFX session: %d.\n", sts);
++        goto fail;
++    }
++
++    av_log(ctx, AV_LOG_VERBOSE, "Initialize MFX session: implementation "
++           "version is %d.%d\n", ver.Major, ver.Minor);
++
++    *psession = session;
++    *ploader = loader;
++
++    return 0;
++
++fail:
++    if (session)
++        MFXClose(session);
++
++    MFXUnload(loader);
++
++    return AVERROR_UNKNOWN;
++}
++
++#else
++
++static int qsv_create_mfx_session(void *ctx,
++                                  mfxIMPL implementation,
++                                  mfxVersion *pver,
++                                  mfxSession *psession,
++                                  mfxLoader *ploader)
++{
++    mfxVersion ver;
++    mfxStatus sts;
++    mfxSession session = NULL;
++
++    av_log(ctx, AV_LOG_VERBOSE,
++           "Use the Intel Media SDK to create MFX session, API version is "
++           "%d.%d, the required implementation version is %d.%d\n",
++           MFX_VERSION_MAJOR, MFX_VERSION_MINOR, pver->Major, pver->Minor);
++
++    *ploader = NULL;
++    *psession = NULL;
++    ver = *pver;
++    sts = MFXInit(implementation, &ver, &session);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error initializing an MFX session: "
++               "%d.\n", sts);
++        goto fail;
++    }
++
++    sts = MFXQueryVersion(session, &ver);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error querying an MFX session: "
++               "%d.\n", sts);
++        goto fail;
++    }
++
++    av_log(ctx, AV_LOG_VERBOSE, "Initialize MFX session: implementation "
++           "version is %d.%d\n", ver.Major, ver.Minor);
++
++    MFXClose(session);
++    sts = MFXInit(implementation, &ver, &session);
++
++    if (sts != MFX_ERR_NONE) {
++        av_log(ctx, AV_LOG_ERROR, "Error initializing an MFX session: "
++               "%d.\n", sts);
++        goto fail;
++    }
++
++    *psession = session;
++
++    return 0;
++
++fail:
++    if (session)
++        MFXClose(session);
++
++    return AVERROR_UNKNOWN;
++}
++
++#endif
++
+ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+-                                     mfxSession *session, int upload)
++                                     mfxSession *session, mfxLoader *loader,
++                                     int upload)
+ {
+     AVQSVFramesContext *frames_hwctx = ctx->hwctx;
+     QSVDeviceContext   *device_priv  = ctx->device_ctx->internal->priv;
+@@ -556,23 +740,26 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ 
+     mfxVideoParam par;
+     mfxStatus err;
++    int ret = AVERROR_UNKNOWN;
+ 
+ #if QSV_HAVE_OPAQUE
+     QSVFramesContext              *s = ctx->internal->priv;
+     opaque = !!(frames_hwctx->frame_type & MFX_MEMTYPE_OPAQUE_FRAME);
+ #endif
+ 
+-    err = MFXInit(device_priv->impl, &device_priv->ver, session);
+-    if (err != MFX_ERR_NONE) {
+-        av_log(ctx, AV_LOG_ERROR, "Error initializing an internal session\n");
+-        return AVERROR_UNKNOWN;
+-    }
++    ret = qsv_create_mfx_session(ctx, device_priv->impl, &device_priv->ver,
++                                 session, loader);
++
++    if (ret)
++        goto fail;
+ 
+     if (device_priv->handle) {
+         err = MFXVideoCORE_SetHandle(*session, device_priv->handle_type,
+                                      device_priv->handle);
+-        if (err != MFX_ERR_NONE)
+-            return AVERROR_UNKNOWN;
++        if (err != MFX_ERR_NONE) {
++            ret = AVERROR_UNKNOWN;
++            goto fail;
++        }
+     }
+ 
+     if (!opaque) {
+@@ -582,8 +769,10 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+ #if QSV_HAVE_OPAQUE
+     else {
+         err = MFXVideoCORE_SetFrameAllocator(*session, &frame_allocator);
+-        if (err != MFX_ERR_NONE)
+-            return AVERROR_UNKNOWN;
++        if (err != MFX_ERR_NONE) {
++            ret = AVERROR_UNKNOWN;
++            goto fail;
++        }
+     }
+ 
+     memset(&par, 0, sizeof(par));
+@@ -614,11 +803,22 @@ static int qsv_init_internal_session(AVHWFramesContext *ctx,
+     if (err != MFX_ERR_NONE) {
+         av_log(ctx, AV_LOG_VERBOSE, "Error opening the internal VPP session."
+                "Surface upload/download will not be possible\n");
+-        MFXClose(*session);
+-        *session = NULL;
++
++        ret = AVERROR_UNKNOWN;
++        goto fail;
+     }
+ 
+     return 0;
++
++fail:
++    if (*session)
++        MFXClose(*session);
++
++    MFXUnload(*loader);
++    *session = NULL;
++    *loader = NULL;
++
++    return ret;
+ }
+ 
+ static int qsv_frames_init(AVHWFramesContext *ctx)
+@@ -683,6 +883,9 @@ static int qsv_frames_init(AVHWFramesContext *ctx)
+     s->session_download = NULL;
+     s->session_upload   = NULL;
+ 
++    s->loader_download = NULL;
++    s->loader_upload = NULL;
++
+     s->session_download_init = 0;
+     s->session_upload_init   = 0;
+ 
+@@ -980,7 +1183,8 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
+         if (pthread_mutex_trylock(&s->session_lock) == 0) {
+ #endif
+             if (!s->session_download_init) {
+-                ret = qsv_init_internal_session(ctx, &s->session_download, 0);
++                ret = qsv_init_internal_session(ctx, &s->session_download,
++                                                &s->loader_download, 0);
+                 if (s->session_download)
+                     s->session_download_init = 1;
+             }
+@@ -1054,7 +1258,8 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
+         if (pthread_mutex_trylock(&s->session_lock) == 0) {
+ #endif
+             if (!s->session_upload_init) {
+-                ret = qsv_init_internal_session(ctx, &s->session_upload, 1);
++                ret = qsv_init_internal_session(ctx, &s->session_upload,
++                                                &s->loader_upload, 1);
+                 if (s->session_upload)
+                     s->session_upload_init = 1;
+             }
+@@ -1320,6 +1525,7 @@ static void qsv_device_free(AVHWDeviceContext *ctx)
+     if (hwctx->session)
+         MFXClose(hwctx->session);
+ 
++    MFXUnload(hwctx->loader);
+     av_buffer_unref(&priv->child_device_ctx);
+     av_freep(&priv);
+ }
+@@ -1406,34 +1612,10 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx,
+         goto fail;
+     }
+ 
+-    err = MFXInit(implementation, &ver, &hwctx->session);
+-    if (err != MFX_ERR_NONE) {
+-        av_log(ctx, AV_LOG_ERROR, "Error initializing an MFX session: "
+-               "%d.\n", err);
+-        ret = AVERROR_UNKNOWN;
+-        goto fail;
+-    }
+-
+-    err = MFXQueryVersion(hwctx->session, &ver);
+-    if (err != MFX_ERR_NONE) {
+-        av_log(ctx, AV_LOG_ERROR, "Error querying an MFX session: %d.\n", err);
+-        ret = AVERROR_UNKNOWN;
+-        goto fail;
+-    }
+-
+-    av_log(ctx, AV_LOG_VERBOSE,
+-           "Initialize MFX session: API version is %d.%d, implementation version is %d.%d\n",
+-           MFX_VERSION_MAJOR, MFX_VERSION_MINOR, ver.Major, ver.Minor);
+-
+-    MFXClose(hwctx->session);
+-
+-    err = MFXInit(implementation, &ver, &hwctx->session);
+-    if (err != MFX_ERR_NONE) {
+-        av_log(ctx, AV_LOG_ERROR,
+-               "Error initializing an MFX session: %d.\n", err);
+-        ret = AVERROR_UNKNOWN;
++    ret = qsv_create_mfx_session(ctx, implementation, &ver, &hwctx->session,
++                                 &hwctx->loader);
++    if (ret)
+         goto fail;
+-    }
+ 
+     err = MFXVideoCORE_SetHandle(hwctx->session, handle_type, handle);
+     if (err != MFX_ERR_NONE) {
+@@ -1448,6 +1630,8 @@ static int qsv_device_derive_from_child(AVHWDeviceContext *ctx,
+ fail:
+     if (hwctx->session)
+         MFXClose(hwctx->session);
++
++    MFXUnload(hwctx->loader);
+     return ret;
+ }
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A19-qsv-fix-session-for-d3d11-device.patch Added

@@ -0,0 +1,50 @@
+From 236f6ce846060505dffc1d0e75c8d15f92c69520 Mon Sep 17 00:00:00 2001
+From: galinart <artem.galin@intel.com>
+Date: Thu, 3 Jun 2021 02:42:08 +0100
+Subject: PATCH qsv: fix session for d3d11 device
+
+---
+ libavutil/hwcontext_qsv.c | 27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c
+index d323678ecd..85a9ae3bb4 100644
+--- a/libavutil/hwcontext_qsv.c
++++ b/libavutil/hwcontext_qsv.c
+@@ -594,6 +594,33 @@ static int qsv_create_mfx_session(void *ctx,
+ goto fail;
+ }
+ 
++ if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(implementation))
++ {
++ impl_value.Type = MFX_VARIANT_TYPE_U32;
++ impl_value.Data.U32 = MFX_ACCEL_MODE_VIA_D3D11;
++ sts = MFXSetConfigFilterProperty(cfg,
++ (const mfxU8 *)"mfxImplDescription.AccelerationMode", impl_value);
++
++ if (sts != MFX_ERR_NONE) {
++ av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration"
++ "MFX_ACCEL_MODE_VIA_D3D11 property: %d.\n", sts);
++ goto fail;
++ }
++ }
++ else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(implementation))
++ {
++ impl_value.Type = MFX_VARIANT_TYPE_U32;
++ impl_value.Data.U32 = MFX_ACCEL_MODE_VIA_D3D9;
++ sts = MFXSetConfigFilterProperty(cfg,
++ (const mfxU8 *)"mfxImplDescription.AccelerationMode", impl_value);
++
++ if (sts != MFX_ERR_NONE) {
++ av_log(ctx, AV_LOG_ERROR, "Error adding a MFX configuration"
++ "MFX_ACCEL_MODE_VIA_D3D9 property: %d.\n", sts);
++ goto fail;
++ }
++ }
++
+ impl_value.Type = MFX_VARIANT_TYPE_U32;
+ impl_value.Data.U32 = pver->Version;
+ sts = MFXSetConfigFilterProperty(cfg,
+-- 
+2.25.1
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A20-mov-read-name-track-tag-written-by-movenc.patch Added

@@ -0,0 +1,65 @@
+From 228b17a1f5f4d3d82c5beca4fc57016c3d582c64 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Fri, 21 May 2021 14:12:07 +0200
+Subject: PATCH 1/5 PATCH 1/3 mov: read 'name' track tag written by movenc
+
+---
+ libavformat/mov.c | 26 +++++++++++++++++---------
+ 1 file changed, 17 insertions(+), 9 deletions(-)
+
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index 38a7058..1546867 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -308,6 +308,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ int (*parse)(MOVContext*, AVIOContext*, unsigned, const char*) = NULL;
+ int raw = 0;
+ int num = 0;
++ AVDictionary *metadata;
+ 
+ switch (atom.type) {
+ case MKTAG( '@','P','R','M'): key = "premiere_version"; raw = 1; break;
+@@ -340,6 +341,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ return mov_metadata_loci(c, pb, atom.size);
+ case MKTAG( 'm','a','n','u'): key = "make"; break;
+ case MKTAG( 'm','o','d','l'): key = "model"; break;
++ case MKTAG( 'n','a','m','e'): key = "title"; raw = 1; break;
+ case MKTAG( 'p','c','s','t'): key = "podcast";
+ parse = mov_metadata_int8_no_padding; break;
+ case MKTAG( 'p','g','a','p'): key = "gapless_playback";
+@@ -515,17 +517,23 @@ retry:
+ }
+ strstr_size = 0;
+ }
+- c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
+- av_dict_set(&c->fc->metadata, key, str, 0);
++ if (c->trak_index < 0) {
++ metadata = c->fc->metadata;
++ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
++ if (!strcmp(key, "encoder")) {
++ int major, minor, micro;
++ if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, &micro) == 3) {
++ c->handbrake_version = 1000000*major + 1000*minor + micro;
++ }
++ }
++ }
++ else {
++ metadata = c->fc->streamsc->trak_index->metadata;
++ }
++ av_dict_set(&metadata, key, str, 0);
+ if (*language && strcmp(language, "und")) {
+ snprintf(key2, sizeof(key2), "%s-%s", key, language);
+- av_dict_set(&c->fc->metadata, key2, str, 0);
+- }
+- if (!strcmp(key, "encoder")) {
+- int major, minor, micro;
+- if (sscanf(str, "HandBrake %d.%d.%d", &major, &minor, &micro) == 3) {
+- c->handbrake_version = 1000000*major + 1000*minor + micro;
+- }
++ av_dict_set(&metadata, key2, str, 0);
+ }
+ }
+ 
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A21-movenc-write-3gpp-track-titl-tag.patch Added

@@ -0,0 +1,126 @@
+From 30c0d2b9b6a62749d7f65a783e6d2131b888d9cc Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Fri, 21 May 2021 14:12:25 +0200
+Subject: PATCH 2/5 PATCH 2/3 movenc: write 3gpp track 'titl' tag
+
+Apple software used to use 'name' raw tag for track titles. When they
+rewrote everything with AVFoundation, they switched to using 3gpp 'titl'
+tag for track titles and 'name' no longer works.
+---
+ libavformat/movenc.c | 78 +++++++++++++++++++++++---------------------
+ 1 file changed, 40 insertions(+), 38 deletions(-)
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index bade57d..6ccd2ea 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -3309,6 +3309,35 @@ static int mov_write_udta_sdp(AVIOContext *pb, MOVTrack *track)
+ return len + 24;
+ }
+ 
++static uint16_t language_code(const char *str)
++{
++ return (((str0 - 0x60) & 0x1F) << 10) +
++ (((str1 - 0x60) & 0x1F) << 5) +
++ (( str2 - 0x60) & 0x1F);
++}
++
++static int mov_write_3gp_udta_tag(AVIOContext *pb, AVDictionary *metadata,
++ const char *tag, const char *str)
++{
++ int64_t pos = avio_tell(pb);
++ AVDictionaryEntry *t = av_dict_get(metadata, str, NULL, 0);
++ if (!t || !utf8len(t->value))
++ return 0;
++ avio_wb32(pb, 0); /* size */
++ ffio_wfourcc(pb, tag); /* type */
++ avio_wb32(pb, 0); /* version + flags */
++ if (!strcmp(tag, "yrrc"))
++ avio_wb16(pb, atoi(t->value));
++ else {
++ avio_wb16(pb, language_code("eng")); /* language */
++ avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
++ if (!strcmp(tag, "albm") &&
++ (t = av_dict_get(metadata, "track", NULL, 0)))
++ avio_w8(pb, atoi(t->value));
++ }
++ return update_size(pb, pos);
++}
++
+ static int mov_write_track_metadata(AVIOContext *pb, AVStream *st,
+ const char *tag, const char *str)
+ {
+@@ -3337,8 +3366,10 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
+ if (ret < 0)
+ return ret;
+ 
+- if (mov->mode & (MODE_MP4|MODE_MOV))
++ if (mov->mode & (MODE_MP4|MODE_MOV)) {
+ mov_write_track_metadata(pb_buf, st, "name", "title");
++ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
++ }
+ 
+ if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) {
+ avio_wb32(pb, size + 8);
+@@ -3913,35 +3944,6 @@ static int ascii_to_wc(AVIOContext *pb, const uint8_t *b)
+ return 0;
+ }
+ 
+-static uint16_t language_code(const char *str)
+-{
+- return (((str0 - 0x60) & 0x1F) << 10) +
+- (((str1 - 0x60) & 0x1F) << 5) +
+- (( str2 - 0x60) & 0x1F);
+-}
+-
+-static int mov_write_3gp_udta_tag(AVIOContext *pb, AVFormatContext *s,
+- const char *tag, const char *str)
+-{
+- int64_t pos = avio_tell(pb);
+- AVDictionaryEntry *t = av_dict_get(s->metadata, str, NULL, 0);
+- if (!t || !utf8len(t->value))
+- return 0;
+- avio_wb32(pb, 0); /* size */
+- ffio_wfourcc(pb, tag); /* type */
+- avio_wb32(pb, 0); /* version + flags */
+- if (!strcmp(tag, "yrrc"))
+- avio_wb16(pb, atoi(t->value));
+- else {
+- avio_wb16(pb, language_code("eng")); /* language */
+- avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
+- if (!strcmp(tag, "albm") &&
+- (t = av_dict_get(s->metadata, "track", NULL, 0)))
+- avio_w8(pb, atoi(t->value));
+- }
+- return update_size(pb, pos);
+-}
+-
+ static int mov_write_chpl_tag(AVIOContext *pb, AVFormatContext *s)
+ {
+ int64_t pos = avio_tell(pb);
+@@ -3980,14 +3982,14 @@ static int mov_write_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
+ return ret;
+ 
+ if (mov->mode & MODE_3GP) {
+- mov_write_3gp_udta_tag(pb_buf, s, "perf", "artist");
+- mov_write_3gp_udta_tag(pb_buf, s, "titl", "title");
+- mov_write_3gp_udta_tag(pb_buf, s, "auth", "author");
+- mov_write_3gp_udta_tag(pb_buf, s, "gnre", "genre");
+- mov_write_3gp_udta_tag(pb_buf, s, "dscp", "comment");
+- mov_write_3gp_udta_tag(pb_buf, s, "albm", "album");
+- mov_write_3gp_udta_tag(pb_buf, s, "cprt", "copyright");
+- mov_write_3gp_udta_tag(pb_buf, s, "yrrc", "date");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "perf", "artist");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "titl", "title");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "auth", "author");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "gnre", "genre");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "dscp", "comment");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "albm", "album");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "cprt", "copyright");
++ mov_write_3gp_udta_tag(pb_buf, s->metadata, "yrrc", "date");
+ mov_write_loci_tag(s, pb_buf);
+ } else if (mov->mode == MODE_MOV && !(mov->flags & FF_MOV_FLAG_USE_MDTA)) { // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
+ mov_write_string_metadata(s, pb_buf, "\251ART", "artist", 0);
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A22-mov-read-3gpp-udta-tags.patch Added

@@ -0,0 +1,160 @@
+From aee54de382b07ec1dcfc98f003e4ca9dcc3277af Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Fri, 21 May 2021 14:16:09 +0200
+Subject: PATCH 3/5 PATCH 3/3 mov: read 3gpp udta tags
+
+---
+ libavformat/mov.c | 110 ++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 107 insertions(+), 3 deletions(-)
+
+diff --git a/libavformat/mov.c b/libavformat/mov.c
+index 1546867..d5bf31c 100644
+--- a/libavformat/mov.c
++++ b/libavformat/mov.c
+@@ -52,6 +52,7 @@
+ #include "libavcodec/mpegaudiodecheader.h"
+ #include "libavcodec/mlp_parse.h"
+ #include "avformat.h"
++#include "avlanguage.h"
+ #include "internal.h"
+ #include "avio_internal.h"
+ #include "riff.h"
+@@ -297,6 +298,82 @@ static int mov_metadata_hmmt(MOVContext *c, AVIOContext *pb, unsigned len)
+ return 0;
+ }
+ 
++static int mov_read_3gp_udta_tag(MOVContext *c, AVIOContext *pb, MOVAtom atom)
++{
++ const char *key;
++ AVDictionary *metadata;
++ uint16_t langcode = 0;
++ char key232, language4 = {0};
++ uint32_t str_size, version;
++ char *str;
++
++ if (atom.size < 6)
++ return AVERROR_INVALIDDATA;
++
++ switch (atom.type) {
++ case MKTAG( 'a','l','b','m'): key = "album"; break;
++ case MKTAG( 'a','u','t','h'): key = "author"; break;
++ case MKTAG( 'c','p','r','t'): key = "copyright"; break;
++ case MKTAG( 'd','s','c','p'): key = "comment"; break;
++ case MKTAG( 'g','n','r','e'): key = "genre"; break;
++ case MKTAG( 'p','e','r','f'): key = "artist"; break;
++ case MKTAG( 't','i','t','l'): key = "title"; break;
++ case MKTAG( 'y','r','r','c'): key = "date"; break;
++ default: return 0;
++ }
++
++ version = avio_rb32(pb); // version + flags
++ if (version != 0)
++ return AVERROR_INVALIDDATA;
++
++ if (MKTAG( 'y','r','r','c') == atom.type) {
++ int year;
++ year = avio_rb16(pb);
++ str = av_asprintf("%d", year);
++ if (!str)
++ return AVERROR(ENOMEM);
++ } else {
++ int ret;
++ const char *tmp;
++ langcode = avio_rb16(pb);
++ ff_mov_lang_to_iso639(langcode, language);
++ tmp = ff_convert_lang_to(language, AV_LANG_ISO639_2_BIBL);
++ if (!tmp)
++ return AVERROR_INVALIDDATA;
++
++ str_size = atom.size - 6;
++ if (str_size <= 0 || str_size >= INT_MAX/2)
++ return AVERROR_INVALIDDATA;
++
++ str = av_mallocz(str_size + 1);
++ if (!str)
++ return AVERROR(ENOMEM);
++
++ ret = ffio_read_size(pb, str, str_size);
++ if (ret < 0) {
++ av_free(str);
++ return ret;
++ }
++ strstr_size = 0;
++ }
++
++ if (c->trak_index < 0) {
++ metadata = c->fc->metadata;
++ c->fc->event_flags |= AVFMT_EVENT_FLAG_METADATA_UPDATED;
++ }
++ else {
++ metadata = c->fc->streamsc->trak_index->metadata;
++ }
++ av_dict_set(&metadata, key, str, 0);
++ if (*language && strcmp(language, "und")) {
++ snprintf(key2, sizeof(key2), "%s-%s", key, language);
++ av_dict_set(&metadata, key2, str, 0);
++ }
++
++ av_freep(&str);
++ return 0;
++}
++
+ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ {
+ char tmp_keyAV_FOURCC_MAX_STRING_SIZE = {0};
+@@ -322,15 +399,33 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ case MKTAG( 'c','a','t','g'): key = "category"; break;
+ case MKTAG( 'c','p','i','l'): key = "compilation";
+ parse = mov_metadata_int8_no_padding; break;
+- case MKTAG( 'c','p','r','t'): key = "copyright"; break;
++ case MKTAG( 'c','p','r','t'):
++ key = "copyright";
++ if (!c->itunes_metadata) {
++ int64_t pos = avio_tell(pb);
++ int ret = mov_read_3gp_udta_tag(c, pb, atom);
++ if (ret != AVERROR_INVALIDDATA)
++ return ret;
++ avio_seek(pb, pos, SEEK_SET);
++ }
++ break;
+ case MKTAG( 'd','e','s','c'): key = "description"; break;
+ case MKTAG( 'd','i','s','k'): key = "disc";
+ parse = mov_metadata_track_or_disc_number; break;
+ case MKTAG( 'e','g','i','d'): key = "episode_uid";
+ parse = mov_metadata_int8_no_padding; break;
+ case MKTAG( 'F','I','R','M'): key = "firmware"; raw = 1; break;
+- case MKTAG( 'g','n','r','e'): key = "genre";
+- parse = mov_metadata_gnre; break;
++ case MKTAG( 'g','n','r','e'):
++ key = "genre";
++ parse = mov_metadata_gnre;
++ if (!c->itunes_metadata) {
++ int64_t pos = avio_tell(pb);
++ int ret = mov_read_3gp_udta_tag(c, pb, atom);
++ if (ret != AVERROR_INVALIDDATA)
++ return ret;
++ avio_seek(pb, pos, SEEK_SET);
++ }
++ break;
+ case MKTAG( 'h','d','v','d'): key = "hd_video";
+ parse = mov_metadata_int8_no_padding; break;
+ case MKTAG( 'H','M','M','T'):
+@@ -401,6 +496,15 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
+ case MKTAG(0xa9,'w','r','n'): key = "warning"; break;
+ case MKTAG(0xa9,'w','r','t'): key = "composer"; break;
+ case MKTAG(0xa9,'x','y','z'): key = "location"; break;
++ case MKTAG( 'a','l','b','m'):
++ case MKTAG( 'a','u','t','h'):
++ case MKTAG( 'd','s','c','p'):
++ case MKTAG( 'p','e','r','f'):
++ case MKTAG( 't','i','t','l'):
++ case MKTAG( 'y','r','r','c'):
++ if (!c->itunes_metadata) {
++ return mov_read_3gp_udta_tag(c, pb, atom);
++ }
+ }
+ retry:
+ if (c->itunes_metadata && atom.size > 8) {
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A23-movenc-write-3gpp-track-names-tags-for-all-available.patch Added

@@ -0,0 +1,67 @@
+From 6b0af19512ba8f4619ac85c953470c8126aeb6e1 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Fri, 21 May 2021 14:18:17 +0200
+Subject: PATCH 4/5 PATCH movenc: write 3gpp track names tags for all
+ available languages
+
+Metadata keys can have a language suffix. Iterate through all language
+variations of the metadata key.
+---
+ libavformat/movenc.c | 26 ++++++++++++++++++++++++--
+ 1 file changed, 24 insertions(+), 2 deletions(-)
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index 6ccd2ea..44db8e1 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -26,6 +26,7 @@
+ 
+ #include "movenc.h"
+ #include "avformat.h"
++#include "avlanguage.h"
+ #include "avio_internal.h"
+ #include "riff.h"
+ #include "avio.h"
+@@ -3329,7 +3330,15 @@ static int mov_write_3gp_udta_tag(AVIOContext *pb, AVDictionary *metadata,
+ if (!strcmp(tag, "yrrc"))
+ avio_wb16(pb, atoi(t->value));
+ else {
+- avio_wb16(pb, language_code("eng")); /* language */
++ int lang = 0, len;
++ len = strlen(t->key);
++ if (t->keylen - 4 == '-') {
++ lang = ff_mov_iso639_to_lang(&t->keylen - 3, 1);
++ }
++ if (!lang)
++ lang = ff_mov_iso639_to_lang("und", 1);
++
++ avio_wb16(pb, lang); /* language */
+ avio_write(pb, t->value, strlen(t->value) + 1); /* UTF8 string value */
+ if (!strcmp(tag, "albm") &&
+ (t = av_dict_get(metadata, "track", NULL, 0)))
+@@ -3367,8 +3376,21 @@ static int mov_write_track_udta_tag(AVIOContext *pb, MOVMuxContext *mov,
+ return ret;
+ 
+ if (mov->mode & (MODE_MP4|MODE_MOV)) {
++ AVDictionaryEntry *t = NULL;
++ int und = 0;
++
+ mov_write_track_metadata(pb_buf, st, "name", "title");
+- mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
++ while ((t = av_dict_get(st->metadata, "title-", t, AV_DICT_IGNORE_SUFFIX))) {
++ int len = strlen(t->key);
++ if (len == 10 &&
++ ff_convert_lang_to(&t->keylen - 3, AV_LANG_ISO639_2_BIBL)) {
++ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", t->key);
++ if (!strcmp("und", &t->keylen - 3))
++ und = 1;
++ }
++ }
++ if (!und)
++ mov_write_3gp_udta_tag(pb_buf, st->metadata, "titl", "title");
+ }
+ 
+ if ((size = avio_get_dyn_buf(pb_buf, &buf)) > 0) {
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A24-FFmpeg-devel-amfenc-Add-support-for-pict_type-field.patch Added

@@ -0,0 +1,82 @@
+From patchwork Mon Jan 14 19:02:20 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: FFmpeg-devel amfenc: Add support for pict_type field
+From: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
+X-Patchwork-Id: 11748
+Message-Id: <20190114190220.16236-1-info@xaymar.com>
+To: ffmpeg-devel@ffmpeg.org
+Cc: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
+Date: Mon, 14 Jan 2019 20:02:20 +0100
+
+Adds support for the pict_type field in AVFrame to amf_h264 and amf_h265 simultaneously. This field is needed in cases where the application wishes to override the frame type with another one, such as forcefully inserting a key frame for chapter markers or similar.
+
+Additionally this abuses AV_PICTURE_TYPE_S for marking Skip frames, a special type of frame in AVC, SVC and HEVC which is a flag for the decoder to repeat the last frame.
+
+Signed-off-by: Michael Fabian 'Xaymar' Dirks <info@xaymar.com>
+---
+ libavcodec/amfenc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 47 insertions(+)
+
+diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c
+index fb23ed7..e754804 100644
+--- a/libavcodec/amfenc.c
++++ b/libavcodec/amfenc.c
+@@ -699,6 +699,53 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt)
+ break;
+ }
+ 
++ // Override Picture Type for Frame
++ if (avctx->codec->id == AV_CODEC_ID_H264) {
++ switch (frame->pict_type) {
++ case AV_PICTURE_TYPE_I:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_I);
++ break;
++ case AV_PICTURE_TYPE_P:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_P);
++ break;
++ case AV_PICTURE_TYPE_B:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_B);
++ break;
++ case AV_PICTURE_TYPE_S:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_SKIP);
++ break;
++ default:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_NONE);
++ break;
++ }
++ // Keyframe overrides previous assignment.
++ if (frame->key_frame) {
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_PICTURE_TYPE_IDR);
++ }
++ } else if (avctx->codec->id == AV_CODEC_ID_HEVC) {
++ switch (frame->pict_type) {
++ case AV_PICTURE_TYPE_I:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_I);
++ break;
++ case AV_PICTURE_TYPE_P:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_P);
++ break;
++ case AV_PICTURE_TYPE_B:
++ av_log(ctx, AV_LOG_WARNING, "Ignoring B-Frame, unsupported by AMD AMF H.265 Encoder.");
++ break;
++ case AV_PICTURE_TYPE_S:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_SKIP);
++ break;
++ default:
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_NONE);
++ break;
++ }
++ // Keyframe overrides previous assignment.
++ if (frame->key_frame) {
++ AMF_ASSIGN_PROPERTY_INT64(res, surface, AMF_VIDEO_ENCODER_HEVC_FORCE_PICTURE_TYPE, AMF_VIDEO_ENCODER_HEVC_PICTURE_TYPE_IDR);
++ }
++ }
++
+ // submit surface
+ res = ctx->encoder->pVtbl->SubmitInput(ctx->encoder, (AMFData*)surface);
+ if (res == AMF_INPUT_FULL) { // handle full queue
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A25-dvdsubdec-fix-processing-of-partial-packets.patch Added

@@ -0,0 +1,49 @@
+From b5846bbdf2bea0ec40ab68fbb5440e17a9390f65 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Wed, 11 Dec 2019 14:10:09 -0800
+Subject: PATCH dvdsubdec: fix processing of partial packets
+
+Wait for a complete dvd subtitle before processing.
+
+If the input packet is large enough to start processing, but does not
+contain complete data, unfinished results are emitted and the following
+input packet causes an error because the stream is no longer in sync
+with the decoder.
+---
+ libavcodec/dvdsubdec.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
+index 741ea9fd1e..c0c9962bad 100644
+--- a/libavcodec/dvdsubdec.c
++++ b/libavcodec/dvdsubdec.c
+@@ -232,7 +232,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
+ int64_t offset1, offset2;
+ 
+ if (buf_size < 10)
+- return -1;
++ return AVERROR(EAGAIN);
+ 
+ if (AV_RB16(buf) == 0) { /* HD subpicture with 4-byte offsets */
+ big_offsets = 1;
+@@ -247,12 +247,12 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
+ size = READ_OFFSET(buf + (big_offsets ? 2 : 0));
+ cmd_pos = READ_OFFSET(buf + cmd_pos);
+ 
+- if (cmd_pos < 0 || cmd_pos > buf_size - 2 - offset_size) {
+- if (cmd_pos > size) {
+- av_log(ctx, AV_LOG_ERROR, "Discarding invalid packet\n");
+- return 0;
+- }
++ if (buf_size < size)
+ return AVERROR(EAGAIN);
++
++ if (cmd_pos < 0 || cmd_pos > size) {
++ av_log(ctx, AV_LOG_ERROR, "Discarding invalid packet\n");
++ return AVERROR_INVALIDDATA;
+ }
+ 
+ while (cmd_pos > 0 && cmd_pos < buf_size - 2 - offset_size) {
+-- 
+2.23.0
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A26-ccaption_dec-return-number-of-bytes-used.patch Added

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A27-dvdsubdec-return-number-of-bytes-used.patch Added

@@ -0,0 +1,31 @@
+From a8b24f214429667d2f7c784ecfe93b81fc61f818 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Sun, 15 Dec 2019 11:49:25 -0800
+Subject: PATCH dvdsubdec: return number of bytes used
+
+Documentation says avcodec_decode_subtitle2 returns the number of bytes
+used.
+---
+ libavcodec/dvdsubdec.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
+index c0c9962bad..9220285877 100644
+--- a/libavcodec/dvdsubdec.c
++++ b/libavcodec/dvdsubdec.c
+@@ -591,7 +591,11 @@ static int dvdsub_decode(AVCodecContext *avctx,
+ is_menu = decode_dvd_subtitles(ctx, sub, buf, buf_size);
+ if (is_menu == AVERROR(EAGAIN)) {
+ *data_size = 0;
+- return appended ? 0 : append_to_cached_buf(avctx, buf, buf_size);
++ int ret = appended ? 0 : append_to_cached_buf(avctx, buf, buf_size);
++ if (ret < 0) {
++ return ret;
++ }
++ return buf_size;
+ }
+ 
+ if (is_menu < 0) {
+-- 
+2.23.0
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A28-dvdsubdec-use-pts-of-initial-packet.patch Added

@@ -0,0 +1,73 @@
+From b83dae62884a79b4e673edaeac86923fb9700701 Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins@jetheaddev.com>
+Date: Sun, 15 Dec 2019 11:58:52 -0800
+Subject: PATCH dvdsubdec: use pts of initial packet
+
+When the source is DVD, only the initial packet of a subtitle that spans
+multiple packets will have a pts value.
+---
+ libavcodec/dvdsubdec.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
+index 9220285877..49007383c3 100644
+--- a/libavcodec/dvdsubdec.c
++++ b/libavcodec/dvdsubdec.c
+@@ -43,6 +43,7 @@ typedef struct DVDSubContext
+ int buf_size;
+ int forced_subs_only;
+ uint8_t used_color256;
++ int64_t pts;
+ #ifdef DEBUG
+ int sub_id;
+ #endif
+@@ -577,10 +578,13 @@ static int dvdsub_decode(AVCodecContext *avctx,
+ int appended = 0;
+ int is_menu;
+ 
++ if (ctx->pts == AV_NOPTS_VALUE && sub->pts != AV_NOPTS_VALUE)
++ ctx->pts = sub->pts;
+ if (ctx->buf_size) {
+ int ret = append_to_cached_buf(avctx, buf, buf_size);
+ if (ret < 0) {
+ *data_size = 0;
++ ctx->pts = AV_NOPTS_VALUE;
+ return ret;
+ }
+ buf = ctx->buf;
+@@ -593,6 +597,7 @@ static int dvdsub_decode(AVCodecContext *avctx,
+ *data_size = 0;
+ int ret = appended ? 0 : append_to_cached_buf(avctx, buf, buf_size);
+ if (ret < 0) {
++ ctx->pts = AV_NOPTS_VALUE;
+ return ret;
+ }
+ return buf_size;
+@@ -604,6 +609,7 @@ static int dvdsub_decode(AVCodecContext *avctx,
+ reset_rects(sub);
+ *data_size = 0;
+ 
++ ctx->pts = AV_NOPTS_VALUE;
+ return buf_size;
+ }
+ if (!is_menu && find_smallest_bounding_rectangle(ctx, sub) == 0)
+@@ -627,6 +633,8 @@ static int dvdsub_decode(AVCodecContext *avctx,
+ 
+ ctx->buf_size = 0;
+ *data_size = 1;
++ sub->pts = ctx->pts;
++ ctx->pts = AV_NOPTS_VALUE;
+ return buf_size;
+ }
+ 
+@@ -761,6 +769,7 @@ static av_cold int dvdsub_init(AVCodecContext *avctx)
+ av_log(avctx, AV_LOG_DEBUG, " 0x%06"PRIx32, ctx->palettei);
+ av_log(avctx, AV_LOG_DEBUG, "\n");
+ }
++ ctx->pts = AV_NOPTS_VALUE;
+ 
+ return 1;
+ }
+-- 
+2.23.0
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A29-matroskaenc-aac-extradata-updated.patch Added

@@ -0,0 +1,24 @@
+Updated version of patch by John Stebbins <jstebbins@jetheaddev.com>
+PATCH avformat/matroskaenc: return error if aac extradata changes
+extradata changing would result in an invalid stream.
+also, as the code was written, rewriting extradata was corrupting the
+track header resulting in an invalid file.
+--- ffmpeg/libavformat/matroskaenc.c.orig	2020-06-18 01:03:40.000000000 -0400
++++ ffmpeg/libavformat/matroskaenc.c	2020-06-18 01:30:46.000000000 -0400
+@@ -2193,6 +2193,16 @@
+ case AV_CODEC_ID_AAC:
+ if (side_data_size && mkv->track.bc) {
+ int filler, output_sample_rate = 0;
++ if (par->extradata && par->extradata_size) {
++ if (par->extradata_size != side_data_size ||
++ memcmp(par->extradata, side_data, side_data_size)) {
++ av_log(s, AV_LOG_ERROR, "Error, AAC extradata changed mid-stream.\n");
++ return AVERROR(EINVAL);
++ } else {
++ // Already written
++ break;
++ }
++ }
+ ret = get_aac_sample_rates(s, mkv, side_data, side_data_size,
+ &track->sample_rate, &output_sample_rate);
+ if (ret < 0)

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A30-ccaption_dec-fix-pts-in-real_time-mode.patch Added

@@ -0,0 +1,36 @@
+From 431bccd62ff1bcdf622b1379bc6670fb5a9040f7 Mon Sep 17 00:00:00 2001
+From: Damiano Galassi <damiog@gmail.com>
+Date: Sun, 5 Dec 2021 11:54:07 +0100
+Subject: PATCH ccaption_dec: fix pts in real_time mode.
+
+end_display_time and pts changes should be performed only in non real_time mode.
+---
+ libavcodec/ccaption_dec.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/libavcodec/ccaption_dec.c b/libavcodec/ccaption_dec.c
+index a208e19..aff59bc 100644
+--- a/libavcodec/ccaption_dec.c
++++ b/libavcodec/ccaption_dec.c
+@@ -876,12 +876,14 @@ static int decode(AVCodecContext *avctx, void *data, int *got_sub, AVPacket *avp
+ 
+ if (ctx->bufferbidx.str0 || ctx->real_time) {
+ ff_dlog(ctx, "cdp writing data (%s)\n", ctx->bufferbidx.str);
+- start_time = ctx->buffer_time0;
+- sub->pts = start_time;
+- end_time = ctx->buffer_time1;
+- if (!ctx->real_time)
++
++ if (!ctx->real_time) {
++ start_time = ctx->buffer_time0;
++ sub->pts = start_time;
++ end_time = ctx->buffer_time1;
+ sub->end_display_time = av_rescale_q(end_time - start_time,
+ AV_TIME_BASE_Q, ms_tb);
++ }
+ else
+ sub->end_display_time = -1;
+ ret = ff_ass_add_rect(sub, ctx->bufferbidx.str, ctx->readorder++, 0, NULL, NULL);
+-- 
+2.30.1 (Apple Git-130)
+

HandBrake-1.5.1.tar.xz/contrib/ffmpeg/A32-qsv-fix-decode-10bit-hdr.patch Added

@@ -0,0 +1,28 @@
+diff --git a/libavcodec/hevc_mp4toannexb_bsf.c b/libavcodec/hevc_mp4toannexb_bsf.c
+index 790dfb0394..3b3732bbd0 100644
+--- a/libavcodec/hevc_mp4toannexb_bsf.c
++++ b/libavcodec/hevc_mp4toannexb_bsf.c
+@@ -121,7 +121,7 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out)
+ HEVCBSFContext *s = ctx->priv_data;
+ AVPacket *in;
+ GetByteContext gb;
+-
++ int has_sps = 0, has_pps = 0;
+ int got_irap = 0;
+ int i, ret = 0;
+ 
+@@ -155,10 +155,13 @@ static int hevc_mp4toannexb_filter(AVBSFContext *ctx, AVPacket *out)
+ }
+ 
+ nalu_type = (bytestream2_peek_byte(&gb) >> 1) & 0x3f;
++ has_sps = (has_sps || nalu_type == HEVC_NAL_SPS);
++ has_pps = (has_pps || nalu_type == HEVC_NAL_PPS);
+ 
+ /* prepend extradata to IRAP frames */
+ is_irap = nalu_type >= 16 && nalu_type <= 23;
+- add_extradata = is_irap && !got_irap;
++ /* ignore the extradata if IRAP frame has sps and pps */
++ add_extradata = is_irap && !got_irap && !(has_sps && has_pps);
+ extra_size = add_extradata * ctx->par_out->extradata_size;
+ got_irap |= is_irap;
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/ffmpeg/module.defs -> HandBrake-1.5.1.tar.xz/contrib/ffmpeg/module.defs Changed

@@ -1,6 +1,6 @@
-__deps__ := BZIP2 ZLIB FDKAAC LIBDAV1D LIBVPX LAME LIBOPUS LIBSPEEX XZ
+__deps__ := BZIP2 ZLIB FDKAAC LIBDAV1D LIBVPX LAME LIBOPUS LIBSPEEX XZ ZIMG
 ifeq (1,$(FEATURE.qsv))
-__deps__ += LIBMFX
+__deps__ += LIBVPL
 endif
 ifeq (1,$(FEATURE.vce))
 __deps__ += AMF
@@ -12,9 +12,9 @@
 $(eval $(call import.MODULE.defs,FFMPEG,ffmpeg,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FFMPEG))
 
-FFMPEG.FETCH.url    = https://download.handbrake.fr/handbrake/contrib/ffmpeg-4.2.2.tar.bz2
-FFMPEG.FETCH.url   += https://ffmpeg.org/releases/ffmpeg-4.2.2.tar.bz2
-FFMPEG.FETCH.sha256 = b620d187c26f76ca19e74210a0336c3b8380b97730df5cdf45f3e69e89000e5c
+FFMPEG.FETCH.url    = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/ffmpeg-4.4.1.tar.bz2
+FFMPEG.FETCH.url   += https://ffmpeg.org/releases/ffmpeg-4.4.1.tar.bz2
+FFMPEG.FETCH.sha256 = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42
 
 FFMPEG.CONFIGURE.deps  =
 FFMPEG.CONFIGURE.host  =
@@ -34,6 +34,7 @@
     --disable-avdevice \
     --disable-muxers \
     --disable-network \
+    --enable-libzimg \
     --disable-hwaccels \
     --disable-vdpau \
     --disable-encoders \
@@ -58,7 +59,7 @@
     --enable-libdav1d \
     --enable-decoder=libdav1d \
     --cc="$(FFMPEG.GCC.gcc)" \
-    --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)"
+    --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(FFMPEG.GCC.args.extra-ldflags)"
 
 ifeq (size-aggressive,$(GCC.O))
 FFMPEG.CONFIGURE.extra += \
@@ -88,12 +89,16 @@
     --enable-muxer=ipod
 
 ifeq (darwin,$(HOST.system))
-    FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage \
-        --enable-encoder=h264_videotoolbox \
-        --enable-encoder=hevc_videotoolbox
+    FFMPEG.CONFIGURE.extra += --disable-audiotoolbox --disable-coreimage
 
     ifeq (x86_64,$(HOST.arch))
         FFMPEG.CONFIGURE.extra += --arch=x86_64
+    else ifeq (arm64,$(HOST.arch))
+        FFMPEG.CONFIGURE.extra += --arch=arm64
+    endif
+
+    ifeq (1,$(HOST.cross))
+        FFMPEG.CONFIGURE.extra += --enable-cross-compile
     endif
 endif
 
@@ -105,8 +110,14 @@
         --target-os=mingw32 \
         --arch=$(HOST.machine) \
         --cross-prefix=$(HOST.cross.prefix) \
-        --pkg-config=$(PKGCONFIG.exe)
+        --pkg-config=$(PKGCONFIG.exe) \
+        --pkg-config-flags="--static"
     FFMPEG.GCC.args.extra += -fno-common
+    FFMPEG.GCC.args.extra-ldflags = -static-libgcc -static-libstdc++ -static
+else ifeq (darwin,$(HOST.system))
+    FFMPEG.GCC.args.extra-ldflags = -lc++
+else
+    FFMPEG.CONFIGURE.extra += --extra-libs="-lm -lstdc++"
 endif
 
 ifneq (none,$(FFMPEG.GCC.g))
@@ -126,7 +137,7 @@
 endif
 
 ifeq (1,$(FEATURE.qsv))
-  FFMPEG.CONFIGURE.extra += --enable-libmfx
+  FFMPEG.CONFIGURE.extra += --enable-libvpl
 endif
 
 ifeq (1,$(FEATURE.vce))
@@ -135,11 +146,17 @@
 
 ifeq (1,$(FEATURE.nvenc))
 FFMPEG.CONFIGURE.extra += \
-     --enable-nvenc \
+     --enable-ffnvcodec \
      --enable-encoder=h264_nvenc \
      --enable-encoder=hevc_nvenc
 endif
 
+ifeq (1,$(FEATURE.mf))
+FFMPEG.CONFIGURE.extra += \
+      --enable-encoder=h264_mf \
+      --enable-encoder=hevc_mf
+endif
+
 ## enable compile verbosity
 FFMPEG.BUILD.extra = V=1

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/freetype/P00-mingw-lib.patch -> HandBrake-1.5.1.tar.xz/contrib/freetype/P00-mingw-lib.patch Changed

@@ -1,24 +1,15 @@
-diff -ur freetype-2.10.1.orig/builds/unix/ftconfig.in freetype-2.10.1/builds/unix/ftconfig.in
---- freetype-2.10.1.orig/builds/unix/ftconfig.in	2019-02-23 04:06:06.000000000 -0500
-+++ freetype-2.10.1/builds/unix/ftconfig.in	2019-10-13 16:10:52.000000000 -0400
-@@ -488,7 +488,7 @@
- #ifdef FT2_BUILD_LIBRARY
+diff -ur freetype-2.10.4.orig/include/freetype/config/public-macros.h freetype-2.10.4/include/freetype/config/public-macros.h
+--- freetype-2.10.4.orig/include/freetype/config/public-macros.h	2020-08-27 02:17:20.000000000 -0400
++++ freetype-2.10.4/include/freetype/config/public-macros.h	2020-11-09 19:51:44.000000000 -0500
+@@ -66,9 +66,9 @@
+ #if defined( _WIN32 )
  
- #if defined( _WIN32 ) && defined( DLL_EXPORT )
--#define FT_EXPORT( x )  __declspec( dllexport )  x
-+#define FT_EXPORT( x )  x
- #elif defined( __GNUC__ ) && __GNUC__ >= 4
- #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
- #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550
-diff -ur freetype-2.10.1.orig/include/freetype/config/ftconfig.h freetype-2.10.1/include/freetype/config/ftconfig.h
---- freetype-2.10.1.orig/include/freetype/config/ftconfig.h	2019-02-23 04:06:06.000000000 -0500
-+++ freetype-2.10.1/include/freetype/config/ftconfig.h	2019-10-13 16:12:48.000000000 -0400
-@@ -460,7 +460,7 @@
- #ifdef FT2_BUILD_LIBRARY
+ #if defined( FT2_BUILD_LIBRARY ) && defined( DLL_EXPORT )
+-#define FT_PUBLIC_FUNCTION_ATTRIBUTE  __declspec( dllexport )
++#define FT_PUBLIC_FUNCTION_ATTRIBUTE
+ #elif defined( DLL_IMPORT )
+-#define FT_PUBLIC_FUNCTION_ATTRIBUTE  __declspec( dllimport )
++#define FT_PUBLIC_FUNCTION_ATTRIBUTE
+ #endif
  
- #if defined( _WIN32 ) && defined( DLL_EXPORT )
--#define FT_EXPORT( x )  __declspec( dllexport )  x
-+#define FT_EXPORT( x )  x
- #elif defined( __GNUC__ ) && __GNUC__ >= 4
- #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
- #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550
+   /* gcc, clang */

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/freetype/module.defs -> HandBrake-1.5.1.tar.xz/contrib/freetype/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/fribidi/P00-mingw-lib.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/fribidi/module.defs -> HandBrake-1.5.1.tar.xz/contrib/fribidi/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/harfbuzz/P00-mingw-emmintrin.patch -> HandBrake-1.5.1.tar.xz/contrib/harfbuzz/P00-mingw-emmintrin.patch Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/harfbuzz/module.defs -> HandBrake-1.5.1.tar.xz/contrib/harfbuzz/module.defs Changed

@@ -3,9 +3,9 @@
 $(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,HARFBUZZ))
 
-HARFBUZZ.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/harfbuzz-2.6.4.tar.xz
-HARFBUZZ.FETCH.url    += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
-HARFBUZZ.FETCH.sha256  = 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12
+HARFBUZZ.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/harfbuzz-3.1.2.tar.xz
+HARFBUZZ.FETCH.url    += https://github.com/harfbuzz/harfbuzz/releases/download/3.1.2/harfbuzz-3.1.2.tar.xz
+HARFBUZZ.FETCH.sha256  = 4056b1541dd8bbd8ec29207fe30e568805c0705515632d7fec53a94399bc7945
 
 HARFBUZZ.build_dir             = build
 HARFBUZZ.CONFIGURE.exe         = cmake
@@ -36,8 +36,12 @@
                                     -DHB_HAVE_GRAPHITE2=OFF \
                                     -DHB_HAVE_ICU=OFF \
                                     -DHB_HAVE_UNISCRIBE=OFF
+        HARFBUZZ.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.host)"
+    else ifeq ($(HOST.system),darwin)
+        HARFBUZZ.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.host)"
+    else
+        HARFBUZZ.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(HARFBUZZ.CONFIGURE.host)"
     endif
-    HARFBUZZ.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(HARFBUZZ.CONFIGURE.host)"
     HARFBUZZ.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.build)"
 else
     HARFBUZZ.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(HARFBUZZ.CONFIGURE.host)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/jansson/module.defs -> HandBrake-1.5.1.tar.xz/contrib/jansson/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/lame/P00-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/lame/module.defs -> HandBrake-1.5.1.tar.xz/contrib/lame/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libass/A00-fribidi-include.patch -> HandBrake-1.5.1.tar.xz/contrib/libass/A00-fribidi-include.patch Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libass/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libass/module.defs Changed

@@ -7,15 +7,17 @@
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/libass-0.14.0.tar.gz
-LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz
-LIBASS.FETCH.sha256  = 8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf
+LIBASS.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libass-0.15.2.tar.gz
+LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.15.2/libass-0.15.2.tar.gz
+LIBASS.FETCH.sha256  = 1b2a54dda819ef84fa2dee3069cf99748a886363d2adb630fde87fe046e2d1d5
 
-# Tell configure where to find our version of freetype
+# Tell configure where to find our versions of these libs
 LIBASS.CONFIGURE.extra = \
-    --enable-asm --enable-harfbuzz \
+    --enable-asm \
+    HARFBUZZ_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lharfbuzz" \
+    HARFBUZZ_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/harfbuzz" \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
-    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
+    FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2"
 
 ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
     # Tell configure where to find our version of fontconfig

HandBrake-1.5.1.tar.xz/contrib/libbluray/P04-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libbluray/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libbluray/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libdav1d/A00-add-cross-file.patch -> HandBrake-1.5.1.tar.xz/contrib/libdav1d/A00-add-cross-file.patch Changed

HandBrake-1.5.1.tar.xz/contrib/libdav1d/A01-disable-cross-posix-memalign.patch Added

HandBrake-1.5.1.tar.xz/contrib/libdav1d/A99-pkgconfig-location.patch Added

HandBrake-1.5.1.tar.xz/contrib/libdav1d/P00-darwin-add-applesi-cross-file.patch Added

HandBrake-1.5.1.tar.xz/contrib/libdav1d/P02-darwin-cross-file.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libdav1d/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libdav1d/module.defs Changed

@@ -1,9 +1,9 @@
 $(eval $(call import.MODULE.defs,LIBDAV1D,libdav1d,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,LIBDAV1D))
 
-LIBDAV1D.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/dav1d-0.5.1.tar.bz2
-LIBDAV1D.FETCH.url    += https://code.videolan.org/videolan/dav1d/-/archive/0.5.1/dav1d-0.5.1.tar.bz2
-LIBDAV1D.FETCH.sha256  = 0214d201a338e8418f805b68f9ad277e33d79c18594dee6eaf6dcd74db2674a9
+LIBDAV1D.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.9.2.tar.bz2
+LIBDAV1D.FETCH.url    += https://code.videolan.org/videolan/dav1d/-/archive/0.9.2/dav1d-0.9.2.tar.bz2
+LIBDAV1D.FETCH.sha256  = 0d198c4fe63fe7f0395b1b17de75b21c8c4508cd3204996229355759efa30ef8
 
 LIBDAV1D.build_dir     = build/
 
@@ -13,12 +13,28 @@
 LIBDAV1D.CONFIGURE.host   =
 LIBDAV1D.CONFIGURE.build  =
 LIBDAV1D.CONFIGURE.static = -Ddefault_library=static
-LIBDAV1D.CONFIGURE.extra  = --libdir=$(call fn.ABSOLUTE,$(CONTRIB.build/))lib/ --buildtype=release \
-                            -Denable_tools=false -Denable_tests=false
+LIBDAV1D.CONFIGURE.extra  = --libdir=$(call fn.ABSOLUTE,$(CONTRIB.build/))lib/ \
+                            -Denable_tools=false -Denable_tests=false -Denable_avx512=false
 LIBDAV1D.CONFIGURE.env    =
 
+ifneq (none,$(LIBDAV1D.GCC.g))
+    LIBDAV1D.CONFIGURE.extra += --buildtype=debug
+    ifeq (none,$(LIBDAV1D.GCC.O))
+        LIBDAV1D.CONFIGURE.extra += --optimization=g
+    endif
+else
+    LIBDAV1D.CONFIGURE.extra += --buildtype=release
+    ifneq (,$(filter $(LIBDAV1D.GCC.O),size size-aggressive))
+        LIBDAV1D.CONFIGURE.extra += --optimization=s
+    endif
+endif
+
+ifeq (darwin,$(HOST.system))
+        LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))/$(HOST.machine)-darwin-gcc.meson -Dc_args="-arch $(HOST.machine)"
+endif
+
 ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
-    LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))x86_64-w64-mingw32.meson
+    LIBDAV1D.CONFIGURE.extra += --cross-file=$(call fn.ABSOLUTE,$(LIBDAV1D.EXTRACT.dir/))$(HOST.machine)-w64-mingw32.meson
 endif
 
 LIBDAV1D.BUILD.make       = $(NINJA.exe)

HandBrake-1.5.1.tar.xz/contrib/libdvdnav/P01-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libdvdnav/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libdvdnav/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libdvdread/A01-macOS-hardened-runtime-dlopen.patch -> HandBrake-1.5.1.tar.xz/contrib/libdvdread/A01-macOS-hardened-runtime-dlopen.patch Changed

HandBrake-1.5.1.tar.xz/contrib/libdvdread/P01-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libdvdread/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libdvdread/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libgnurx/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libgnurx/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libiconv/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libiconv/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/libjpeg-turbo Added

HandBrake-1.5.1.tar.xz/contrib/libjpeg-turbo/module.defs Added

@@ -0,0 +1,57 @@
+$(eval $(call import.MODULE.defs,LIBJPEGTURBO,libjpeg-turbo))
+$(eval $(call import.CONTRIB.defs,LIBJPEGTURBO))
+
+LIBJPEGTURBO.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libjpeg-turbo-2.1.2.tar.gz
+LIBJPEGTURBO.FETCH.url    += https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/2.1.2.tar.gz
+LIBJPEGTURBO.FETCH.sha256  = e7fdc8a255c45bc8fbd9aa11c1a49c23092fcd7379296aeaeb14d3343a3d1bed
+
+LIBJPEGTURBO.build_dir             = build
+LIBJPEGTURBO.CONFIGURE.exe         = cmake
+LIBJPEGTURBO.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(LIBJPEGTURBO.CONFIGURE.prefix)"
+LIBJPEGTURBO.CONFIGURE.deps        =
+LIBJPEGTURBO.CONFIGURE.static      =
+LIBJPEGTURBO.CONFIGURE.shared      = -DENABLE_SHARED=OFF
+
+ifeq (size-aggressive,$(GCC.O))
+    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
+endif
+
+ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
+    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
+else
+    ifneq (none,$(LIBJPEGTURBO.GCC.g))
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
+    else
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release
+    endif
+endif
+
+ifeq (darwin,$(HOST.system))
+    LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
+endif
+
+ifeq (1,$(HOST.cross))
+    ifeq (mingw,$(HOST.system))
+        LIBJPEGTURBO.CONFIGURE.extra += -DWIN32=ON -DMINGW=ON
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(LIBJPEGTURBO.GCC.gcc)
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(LIBJPEGTURBO.GCC.gxx)
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBJPEGTURBO.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
+        LIBJPEGTURBO.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.host)"
+    else ifeq ($(HOST.system),darwin)
+        LIBJPEGTURBO.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.host)"
+        LIBJPEGTURBO.CONFIGURE.args.host  = -DCMAKE_OSX_ARCHITECTURES="$(HOST.machine)"
+    else
+        LIBJPEGTURBO.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(LIBJPEGTURBO.CONFIGURE.host)"
+    endif
+    LIBJPEGTURBO.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.build)"
+else
+    LIBJPEGTURBO.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(LIBJPEGTURBO.CONFIGURE.host)"
+endif
+
+## find CMakeLists.txt
+LIBJPEGTURBO.CONFIGURE.extra += "$(call fn.ABSOLUTE,$(LIBJPEGTURBO.EXTRACT.dir/))"

HandBrake-1.5.1.tar.xz/contrib/libjpeg-turbo/module.rules Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libmfx/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libmfx/module.defs Changed

@@ -1,11 +1,11 @@
 $(eval $(call import.MODULE.defs,LIBMFX,libmfx))
 $(eval $(call import.CONTRIB.defs,LIBMFX))
 
-LIBMFX.FETCH.url       = https://download.handbrake.fr/contrib/mfx_dispatch-c200d83.tar.gz
-LIBMFX.FETCH.url      += https://github.com/lu-zero/mfx_dispatch/archive/c200d833e25a91e3e49d69890dac1ffa3486cbe9.tar.gz
-LIBMFX.FETCH.sha256    = ec1da009e7c77fcc3e45ff665b30c9390437cd920f2951ccabf3d79e8d5703a9
-LIBMFX.FETCH.basename  = mfx_dispatch-c200d83.tar.gz
-LIBMFX.EXTRACT.tarbase = mfx_dispatch-c200d833e25a91e3e49d69890dac1ffa3486cbe9
+LIBMFX.FETCH.url       = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/mfx_dispatch-1.35.tar.gz
+LIBMFX.FETCH.url      += https://github.com/lu-zero/mfx_dispatch/archive/1.35.tar.gz
+LIBMFX.FETCH.sha256    = 0790ff82158837124150ab4034db37433a92caac0f145f249d2f194d8ccba3ca
+LIBMFX.FETCH.basename  = mfx_dispatch-1.35.tar.gz
+LIBMFX.EXTRACT.tarbase = mfx_dispatch-1.35
 
 LIBMFX.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libogg/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libogg/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libopus/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libopus/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/libspeex/P00-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libspeex/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libspeex/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libtheora/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libtheora/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libvorbis/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libvorbis/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/libvpl Added

HandBrake-1.5.1.tar.xz/contrib/libvpl/module.defs Added

@@ -0,0 +1,51 @@
+$(eval $(call import.MODULE.defs,LIBVPL,libvpl))
+$(eval $(call import.CONTRIB.defs,LIBVPL))
+
+LIBVPL.FETCH.url       = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/oneVPL-2021.6.0.tar.gz
+LIBVPL.FETCH.url      += https://github.com/oneapi-src/oneVPL/archive/refs/tags/v2021.6.0.tar.gz
+LIBVPL.FETCH.sha256    = c83590c4b0d12c4a48f4cbf4b6e8d595bf1f6f96bb262d21457793d19f7b2b6a
+LIBVPL.FETCH.basename  = oneVPL-2021.6.0.tar.gz
+LIBVPL.EXTRACT.tarbase = oneVPL-2021.6.0
+
+LIBVPL.build_dir             = build
+LIBVPL.CONFIGURE.exe         = cmake
+LIBVPL.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(LIBVPL.CONFIGURE.prefix)" -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF
+LIBVPL.CONFIGURE.deps        =
+LIBVPL.CONFIGURE.static      =
+LIBVPL.CONFIGURE.shared      =
+LIBVPL.CONFIGURE.extra       =
+
+ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
+    LIBVPL.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
+else
+    ifneq (none,$(LIBVPL.GCC.g))
+        LIBVPL.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Debug
+    else
+        LIBVPL.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=Release
+    endif
+endif
+
+ifeq (1,$(HOST.cross))
+    ifeq (mingw,$(HOST.system))
+        LIBVPL.CONFIGURE.extra += -DWIN32=ON
+        LIBVPL.CONFIGURE.extra += -DCMAKE_SYSTEM_NAME=Windows
+        LIBVPL.CONFIGURE.extra += -DCMAKE_C_COMPILER=$(LIBVPL.GCC.gcc)
+        LIBVPL.CONFIGURE.extra += -DCMAKE_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBVPL.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBVPL.CONFIGURE.extra += -DCMAKE_CXX_COMPILER=$(LIBVPL.GCC.gxx)
+        LIBVPL.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBVPL.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
+        LIBVPL.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
+    else ifeq ($(HOST.system),darwin)
+        LIBVPL.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(LIBVPL.CONFIGURE.host)"
+    else
+        LIBVPL.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(LIBVPL.CONFIGURE.host)"
+    endif
+    LIBVPL.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(LIBVPL.CONFIGURE.build)"
+    LIBVPL.CONFIGURE.extra     += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
+else
+    LIBVPL.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(LIBVPL.CONFIGURE.host)"
+endif
+
+## find CMakeLists.txt
+LIBVPL.CONFIGURE.extra += "$(call fn.ABSOLUTE,$(LIBVPL.EXTRACT.dir/))"
\ No newline at end of file

HandBrake-1.5.1.tar.xz/contrib/libvpl/module.rules Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libvpx/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libvpx/module.defs Changed

@@ -1,9 +1,9 @@
 $(eval $(call import.MODULE.defs,LIBVPX,libvpx))
 $(eval $(call import.CONTRIB.defs,LIBVPX))
 
-LIBVPX.FETCH.url     = https://download.handbrake.fr/contrib/libvpx-1.8.1.tar.gz
-LIBVPX.FETCH.url    += https://github.com/webmproject/libvpx/archive/v1.8.1.tar.gz
-LIBVPX.FETCH.sha256  = df19b8f24758e90640e1ab228ab4a4676ec3df19d23e4593375e6f3847dee03e
+LIBVPX.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libvpx-1.11.0.tar.gz
+LIBVPX.FETCH.url    += https://github.com/webmproject/libvpx/archive/refs/tags/v1.11.0.tar.gz
+LIBVPX.FETCH.sha256  = 965e51c91ad9851e2337aebcc0f517440c637c506f3a03948062e3d5ea129a83
 
 LIBVPX.CONFIGURE.args.host =
 LIBVPX.CONFIGURE.deps  =
@@ -18,13 +18,17 @@
     --disable-unit-tests
 
 ifeq (1,$(HOST.cross))
-    LIBVPX.CONFIGURE.env.CROSS  = CROSS="$(HOST.spec)-"
     LIBVPX.CONFIGURE.args.build =
-    LIBVPX.CONFIGURE.extra += --enable-static-msvcrt
-    ifeq (i686,$(HOST.machine))
-        LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc
-    else ifeq (x86_64,$(HOST.machine))
-        LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc
+    ifneq ($(HOST.system),darwin)
+        LIBVPX.CONFIGURE.env.CROSS  = CROSS="$(HOST.spec)-"
+        LIBVPX.CONFIGURE.extra += --enable-static-msvcrt
+        ifeq (i686,$(HOST.machine))
+            LIBVPX.CONFIGURE.extra += --target=x86-win32-gcc
+        else ifeq (x86_64,$(HOST.machine))
+            LIBVPX.CONFIGURE.extra += --target=x86_64-win64-gcc
+        else ifeq (aarch64,$(HOST.machine))
+            LIBVPX.CONFIGURE.extra += --target=arm64-win64-gcc
+        endif
     endif
 endif
 
@@ -34,8 +38,10 @@
     endif
 endif
 
-ifeq (0-darwin,$(HOST.cross)-$(BUILD.system))
-    ifeq (x86_64,$(BUILD.machine))
+ifeq (darwin,$(HOST.system))
+    ifeq (arm64,$(HOST.machine))
+        LIBVPX.CONFIGURE.extra += --target=arm64-darwin20-gcc
+    else ifeq (x86_64,$(HOST.machine))
         LIBVPX.CONFIGURE.extra += --target=x86_64-darwin14-gcc
     endif
 endif

HandBrake-1.5.1.tar.xz/contrib/libxml2/P00-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/libxml2/module.defs -> HandBrake-1.5.1.tar.xz/contrib/libxml2/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/nvenc/module.defs -> HandBrake-1.5.1.tar.xz/contrib/nvenc/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x264/A00-version-string.patch -> HandBrake-1.5.1.tar.xz/contrib/x264/A00-version-string.patch Changed

HandBrake-1.5.1.tar.xz/contrib/x264/A01-threads-priority.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x264/module.defs -> HandBrake-1.5.1.tar.xz/contrib/x264/module.defs Changed

@@ -1,9 +1,8 @@
 $(eval $(call import.MODULE.defs,X264,x264))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url     = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20180925-2245.tar.bz2
-X264.FETCH.url    += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180925-2245.tar.bz2
-X264.FETCH.sha256  = 207c668e5b149dae04648b74f1008ab457e57ea89ea96712eebe52a79884ca7c
+X264.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x264-snapshot-20210613-3065.tar.gz
+X264.FETCH.sha256  = 8bacc5c25e52360d0772fde167f54b97b78a1876c9600be86bb9c1db3aef6adc
 
 X264.GCC.args.c_std =
 
@@ -14,9 +13,18 @@
 
 ifeq (1,$(HOST.cross))
     X264.CONFIGURE.build  =
-    X264.CONFIGURE.extra += --cross-prefix=$(HOST.spec)-
+    ifneq ($(HOST.system),darwin)
+        X264.CONFIGURE.extra += --cross-prefix=$(HOST.spec)-
+    endif
     X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
     X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"
+    ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
+        X264.CONFIGURE.extra += --extra-asflags="-arch $(HOST.arch)"
+    endif
+endif
+
+ifeq (arm64-darwin,$(HOST.machine)-$(HOST.system))
+    X264.CONFIGURE.extra += --host=arm64-apple-darwin
 endif
 
 ifeq (1,$(FEATURE.flatpak))

HandBrake-1.5.1.tar.xz/contrib/x265/A00-darwin-Revert-Add-aarch64-support-Part-2.patch Added

@@ -0,0 +1,728 @@
+From f554daa098526e91c6440d29b1ddc213bd01ad0f Mon Sep 17 00:00:00 2001
+From: Damiano Galassi <damiog@gmail.com>
+Date: Tue, 26 Jan 2021 19:40:27 +0100
+Subject: PATCH Revert "Add aarch64 support - Part 2"
+
+This reverts commit ec7396adaa6afd2c8aab1918cfe4bb6e384740c3.
+---
+ build/aarch64-linux/crosscompile.cmake | 15 --
+ build/aarch64-linux/make-Makefiles.bash | 4 -
+ source/CMakeLists.txt | 38 +---
+ source/common/CMakeLists.txt | 35 +--
+ source/common/arm/asm-primitives.cpp | 291 ++++++++++++------------
+ source/common/cpu.cpp | 4 -
+ source/common/pixel.cpp | 9 -
+ source/common/primitives.h | 11 -
+ source/test/CMakeLists.txt | 16 +-
+ source/test/testbench.cpp | 16 --
+ source/test/testharness.h | 5 -
+ 11 files changed, 170 insertions(+), 274 deletions(-)
+ delete mode 100644 build/aarch64-linux/crosscompile.cmake
+ delete mode 100644 build/aarch64-linux/make-Makefiles.bash
+
+diff --git a/build/aarch64-linux/crosscompile.cmake b/build/aarch64-linux/crosscompile.cmake
+deleted file mode 100644
+index 41c8217f2..000000000
+--- a/build/aarch64-linux/crosscompile.cmake
++++ /dev/null
+@@ -1,15 +0,0 @@
+-# CMake toolchain file for cross compiling x265 for aarch64
+-# This feature is only supported as experimental. Use with caution.
+-# Please report bugs on bitbucket
+-# Run cmake with: cmake -DCMAKE_TOOLCHAIN_FILE=crosscompile.cmake -G "Unix Makefiles" ../../source && ccmake ../../source
+-
+-set(CROSS_COMPILE_ARM 1)
+-set(CMAKE_SYSTEM_NAME Linux)
+-set(CMAKE_SYSTEM_PROCESSOR aarch64)
+-
+-# specify the cross compiler
+-set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc)
+-set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++)
+-
+-# specify the target environment
+-SET(CMAKE_FIND_ROOT_PATH /usr/aarch64-linux-gnu)
+diff --git a/build/aarch64-linux/make-Makefiles.bash b/build/aarch64-linux/make-Makefiles.bash
+deleted file mode 100644
+index c9582da0a..000000000
+--- a/build/aarch64-linux/make-Makefiles.bash
++++ /dev/null
+@@ -1,4 +0,0 @@
+-#!/bin/bash
+-# Run this from within a bash shell
+-
+-cmake -DCMAKE_TOOLCHAIN_FILE="crosscompile.cmake" -G "Unix Makefiles" ../../source && ccmake ../../source
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index 95218f5dc..2ed5c24e3 100755
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+ # System architecture detection
+ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+-set(ARM_ALIASES armv6l armv7l aarch64)
++set(ARM_ALIASES armv6l armv7l)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+@@ -70,15 +70,9 @@ elseif(ARMMATCH GREATER "-1")
+ else()
+ set(CROSS_COMPILE_ARM 0)
+ endif()
++ message(STATUS "Detected ARM target processor")
+ set(ARM 1)
+- if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
+- message(STATUS "Detected ARM64 target processor")
+- set(ARM64 1)
+- add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=1 -DHAVE_ARMV6=0)
+- else()
+- message(STATUS "Detected ARM target processor")
+- add_definitions(-DX265_ARCH_ARM=1 -DX265_ARCH_ARM64=0 -DHAVE_ARMV6=1)
+- endif()
++ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
+ else()
+ message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
+ message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
+@@ -239,24 +233,14 @@ if(GCC)
+ endif()
+ endif()
+ if(ARM AND CROSS_COMPILE_ARM)
+- if(ARM64)
+- set(ARM_ARGS -fPIC)
+- else()
+- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+- endif()
+- message(STATUS "cross compile arm")
++ set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
+ elseif(ARM)
+- if(ARM64)
+- set(ARM_ARGS -fPIC)
++ find_package(Neon)
++ if(CPU_HAS_NEON)
++ set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
+ add_definitions(-DHAVE_NEON)
+ else()
+- find_package(Neon)
+- if(CPU_HAS_NEON)
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
+- add_definitions(-DHAVE_NEON)
+- else()
+- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+- endif()
++ set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+ endif()
+ endif()
+ add_definitions(${ARM_ARGS})
+@@ -536,11 +520,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
+ # compile ARM arch asm files here
+ enable_language(ASM)
+ foreach(ASM ${ARM_ASMS})
+- if(ARM64)
+- set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/aarch64/${ASM})
+- else()
+- set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
+- endif()
++ set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
+ list(APPEND ASM_SRCS ${ASM_SRC})
+ list(APPEND ASM_OBJS ${ASM}.${SUFFIX})
+ add_custom_command(
+diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
+index 12b643ad5..c34064b2f 100644
+--- a/source/common/CMakeLists.txt
++++ b/source/common/CMakeLists.txt
+@@ -14,7 +14,7 @@ if(EXTRA_LIB)
+ endif(EXTRA_LIB)
+ 
+ if(ENABLE_ASSEMBLY)
+- set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1)
++ set_source_files_properties(threading.cpp primitives.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1)
+ list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1")
+ endif(ENABLE_ASSEMBLY)
+ 
+@@ -84,33 +84,16 @@ if(ENABLE_ASSEMBLY AND X86)
+ endif(ENABLE_ASSEMBLY AND X86)
+ 
+ if(ENABLE_ASSEMBLY AND (ARM OR CROSS_COMPILE_ARM))
+- if(ARM64)
+- if(GCC AND (CMAKE_CXX_FLAGS_RELEASE MATCHES "-O3"))
+- message(STATUS "Detected CXX compiler using -O3 optimization level")
+- add_definitions(-DAUTO_VECTORIZE=1)
+- endif()
+- set(C_SRCS asm-primitives.cpp pixel.h ipfilter8.h)
+-
+- # add ARM assembly/intrinsic files here
+- set(A_SRCS asm.S mc-a.S sad-a.S pixel-util.S ipfilter8.S)
+- set(VEC_PRIMITIVES)
+-
+- set(ARM_ASMS "${A_SRCS}" CACHE INTERNAL "ARM Assembly Sources")
+- foreach(SRC ${C_SRCS})
+- set(ASM_PRIMITIVES ${ASM_PRIMITIVES} aarch64/${SRC})
+- endforeach()
+- else()
+- set(C_SRCS asm-primitives.cpp pixel.h mc.h ipfilter8.h blockcopy8.h dct8.h loopfilter.h)
++ set(C_SRCS asm-primitives.cpp pixel.h mc.h ipfilter8.h blockcopy8.h dct8.h loopfilter.h)
+ 
+- # add ARM assembly/intrinsic files here
+- set(A_SRCS asm.S cpu-a.S mc-a.S sad-a.S pixel-util.S ssd-a.S blockcopy8.S ipfilter8.S dct-a.S)
+- set(VEC_PRIMITIVES)
++ # add ARM assembly/intrinsic files here
++ set(A_SRCS asm.S cpu-a.S mc-a.S sad-a.S pixel-util.S ssd-a.S blockcopy8.S ipfilter8.S dct-a.S)
++ set(VEC_PRIMITIVES)
+ 
+- set(ARM_ASMS "${A_SRCS}" CACHE INTERNAL "ARM Assembly Sources")
+- foreach(SRC ${C_SRCS})
+- set(ASM_PRIMITIVES ${ASM_PRIMITIVES} arm/${SRC})
+- endforeach()
+- endif()
++ set(ARM_ASMS "${A_SRCS}" CACHE INTERNAL "ARM Assembly Sources")
++ foreach(SRC ${C_SRCS})
++ set(ASM_PRIMITIVES ${ASM_PRIMITIVES} arm/${SRC})
++ endforeach()
+ source_group(Assembly FILES ${ASM_PRIMITIVES})
+ endif(ENABLE_ASSEMBLY AND (ARM OR CROSS_COMPILE_ARM))
+ 
+diff --git a/source/common/arm/asm-primitives.cpp b/source/common/arm/asm-primitives.cpp
+index 7f11503f9..422217845 100644
+--- a/source/common/arm/asm-primitives.cpp
++++ b/source/common/arm/asm-primitives.cpp
+@@ -5,7 +5,6 @@
+ * Praveen Kumar Tiwari <praveen@multicorewareinc.com>
+ * Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>
+ * Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>
+- * Hongbin Liu<liuhongbin1@huawei.com>
+ *
+ * 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
+@@ -49,77 +48,77 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.ssim_4x4x2_core = PFX(ssim_4x4x2_core_neon);
+ 
+ // addAvg
+- p.puLUMA_4x4.addAvgNONALIGNED = PFX(addAvg_4x4_neon);
+- p.puLUMA_4x8.addAvgNONALIGNED = PFX(addAvg_4x8_neon);
+- p.puLUMA_4x16.addAvgNONALIGNED = PFX(addAvg_4x16_neon);
+- p.puLUMA_8x4.addAvgNONALIGNED = PFX(addAvg_8x4_neon);
+- p.puLUMA_8x8.addAvgNONALIGNED = PFX(addAvg_8x8_neon);
+- p.puLUMA_8x16.addAvgNONALIGNED = PFX(addAvg_8x16_neon);
+- p.puLUMA_8x32.addAvgNONALIGNED = PFX(addAvg_8x32_neon);
+- p.puLUMA_12x16.addAvgNONALIGNED = PFX(addAvg_12x16_neon);
+- p.puLUMA_16x4.addAvgNONALIGNED = PFX(addAvg_16x4_neon);
+- p.puLUMA_16x8.addAvgNONALIGNED = PFX(addAvg_16x8_neon);
+- p.puLUMA_16x12.addAvgNONALIGNED = PFX(addAvg_16x12_neon);
+- p.puLUMA_16x16.addAvgNONALIGNED = PFX(addAvg_16x16_neon);
+- p.puLUMA_16x32.addAvgNONALIGNED = PFX(addAvg_16x32_neon);
+- p.puLUMA_16x64.addAvgNONALIGNED = PFX(addAvg_16x64_neon);
+- p.puLUMA_24x32.addAvgNONALIGNED = PFX(addAvg_24x32_neon);
+- p.puLUMA_32x8.addAvgNONALIGNED = PFX(addAvg_32x8_neon);
+- p.puLUMA_32x16.addAvgNONALIGNED = PFX(addAvg_32x16_neon);
+- p.puLUMA_32x24.addAvgNONALIGNED = PFX(addAvg_32x24_neon);
+- p.puLUMA_32x32.addAvgNONALIGNED = PFX(addAvg_32x32_neon);
+- p.puLUMA_32x64.addAvgNONALIGNED = PFX(addAvg_32x64_neon);
+- p.puLUMA_48x64.addAvgNONALIGNED = PFX(addAvg_48x64_neon);
+- p.puLUMA_64x16.addAvgNONALIGNED = PFX(addAvg_64x16_neon);
+- p.puLUMA_64x32.addAvgNONALIGNED = PFX(addAvg_64x32_neon);
+- p.puLUMA_64x48.addAvgNONALIGNED = PFX(addAvg_64x48_neon);
+- p.puLUMA_64x64.addAvgNONALIGNED = PFX(addAvg_64x64_neon);
++ p.puLUMA_4x4.addAvg = PFX(addAvg_4x4_neon);
++ p.puLUMA_4x8.addAvg = PFX(addAvg_4x8_neon);
++ p.puLUMA_4x16.addAvg = PFX(addAvg_4x16_neon);
++ p.puLUMA_8x4.addAvg = PFX(addAvg_8x4_neon);
++ p.puLUMA_8x8.addAvg = PFX(addAvg_8x8_neon);
++ p.puLUMA_8x16.addAvg = PFX(addAvg_8x16_neon);
++ p.puLUMA_8x32.addAvg = PFX(addAvg_8x32_neon);
++ p.puLUMA_12x16.addAvg = PFX(addAvg_12x16_neon);
++ p.puLUMA_16x4.addAvg = PFX(addAvg_16x4_neon);
++ p.puLUMA_16x8.addAvg = PFX(addAvg_16x8_neon);
++ p.puLUMA_16x12.addAvg = PFX(addAvg_16x12_neon);
++ p.puLUMA_16x16.addAvg = PFX(addAvg_16x16_neon);
++ p.puLUMA_16x32.addAvg = PFX(addAvg_16x32_neon);
++ p.puLUMA_16x64.addAvg = PFX(addAvg_16x64_neon);
++ p.puLUMA_24x32.addAvg = PFX(addAvg_24x32_neon);
++ p.puLUMA_32x8.addAvg = PFX(addAvg_32x8_neon);
++ p.puLUMA_32x16.addAvg = PFX(addAvg_32x16_neon);
++ p.puLUMA_32x24.addAvg = PFX(addAvg_32x24_neon);
++ p.puLUMA_32x32.addAvg = PFX(addAvg_32x32_neon);
++ p.puLUMA_32x64.addAvg = PFX(addAvg_32x64_neon);
++ p.puLUMA_48x64.addAvg = PFX(addAvg_48x64_neon);
++ p.puLUMA_64x16.addAvg = PFX(addAvg_64x16_neon);
++ p.puLUMA_64x32.addAvg = PFX(addAvg_64x32_neon);
++ p.puLUMA_64x48.addAvg = PFX(addAvg_64x48_neon);
++ p.puLUMA_64x64.addAvg = PFX(addAvg_64x64_neon);
+ 
+ // chroma addAvg
+- p.chromaX265_CSP_I420.puCHROMA_420_4x2.addAvgNONALIGNED = PFX(addAvg_4x2_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_4x4.addAvgNONALIGNED = PFX(addAvg_4x4_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_4x8.addAvgNONALIGNED = PFX(addAvg_4x8_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_4x16.addAvgNONALIGNED = PFX(addAvg_4x16_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_6x8.addAvgNONALIGNED = PFX(addAvg_6x8_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x2.addAvgNONALIGNED = PFX(addAvg_8x2_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x4.addAvgNONALIGNED = PFX(addAvg_8x4_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x6.addAvgNONALIGNED = PFX(addAvg_8x6_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x8.addAvgNONALIGNED = PFX(addAvg_8x8_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x16.addAvgNONALIGNED = PFX(addAvg_8x16_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_8x32.addAvgNONALIGNED = PFX(addAvg_8x32_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_12x16.addAvgNONALIGNED = PFX(addAvg_12x16_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_16x4.addAvgNONALIGNED = PFX(addAvg_16x4_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_16x8.addAvgNONALIGNED = PFX(addAvg_16x8_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_16x12.addAvgNONALIGNED = PFX(addAvg_16x12_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_16x16.addAvgNONALIGNED = PFX(addAvg_16x16_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_16x32.addAvgNONALIGNED = PFX(addAvg_16x32_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_24x32.addAvgNONALIGNED = PFX(addAvg_24x32_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_32x8.addAvgNONALIGNED = PFX(addAvg_32x8_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_32x16.addAvgNONALIGNED = PFX(addAvg_32x16_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_32x24.addAvgNONALIGNED = PFX(addAvg_32x24_neon);
+- p.chromaX265_CSP_I420.puCHROMA_420_32x32.addAvgNONALIGNED = PFX(addAvg_32x32_neon);
+-
+- p.chromaX265_CSP_I422.puCHROMA_422_4x8.addAvgNONALIGNED = PFX(addAvg_4x8_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_4x16.addAvgNONALIGNED = PFX(addAvg_4x16_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_4x32.addAvgNONALIGNED = PFX(addAvg_4x32_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_6x16.addAvgNONALIGNED = PFX(addAvg_6x16_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x4.addAvgNONALIGNED = PFX(addAvg_8x4_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x8.addAvgNONALIGNED = PFX(addAvg_8x8_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x12.addAvgNONALIGNED = PFX(addAvg_8x12_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x16.addAvgNONALIGNED = PFX(addAvg_8x16_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x32.addAvgNONALIGNED = PFX(addAvg_8x32_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_8x64.addAvgNONALIGNED = PFX(addAvg_8x64_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_12x32.addAvgNONALIGNED = PFX(addAvg_12x32_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_16x8.addAvgNONALIGNED = PFX(addAvg_16x8_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_16x16.addAvgNONALIGNED = PFX(addAvg_16x16_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_16x24.addAvgNONALIGNED = PFX(addAvg_16x24_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_16x32.addAvgNONALIGNED = PFX(addAvg_16x32_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_16x64.addAvgNONALIGNED = PFX(addAvg_16x64_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_24x64.addAvgNONALIGNED = PFX(addAvg_24x64_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_32x16.addAvgNONALIGNED = PFX(addAvg_32x16_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_32x32.addAvgNONALIGNED = PFX(addAvg_32x32_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_32x48.addAvgNONALIGNED = PFX(addAvg_32x48_neon);
+- p.chromaX265_CSP_I422.puCHROMA_422_32x64.addAvgNONALIGNED = PFX(addAvg_32x64_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_4x2.addAvg = PFX(addAvg_4x2_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_4x4.addAvg = PFX(addAvg_4x4_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_4x8.addAvg = PFX(addAvg_4x8_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_4x16.addAvg = PFX(addAvg_4x16_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_6x8.addAvg = PFX(addAvg_6x8_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x2.addAvg = PFX(addAvg_8x2_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x4.addAvg = PFX(addAvg_8x4_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x6.addAvg = PFX(addAvg_8x6_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x8.addAvg = PFX(addAvg_8x8_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x16.addAvg = PFX(addAvg_8x16_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_8x32.addAvg = PFX(addAvg_8x32_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_12x16.addAvg = PFX(addAvg_12x16_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_16x4.addAvg = PFX(addAvg_16x4_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_16x8.addAvg = PFX(addAvg_16x8_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_16x12.addAvg = PFX(addAvg_16x12_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_16x16.addAvg = PFX(addAvg_16x16_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_16x32.addAvg = PFX(addAvg_16x32_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_24x32.addAvg = PFX(addAvg_24x32_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_32x8.addAvg = PFX(addAvg_32x8_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_32x16.addAvg = PFX(addAvg_32x16_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_32x24.addAvg = PFX(addAvg_32x24_neon);
++ p.chromaX265_CSP_I420.puCHROMA_420_32x32.addAvg = PFX(addAvg_32x32_neon);
++
++ p.chromaX265_CSP_I422.puCHROMA_422_4x8.addAvg = PFX(addAvg_4x8_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_4x16.addAvg = PFX(addAvg_4x16_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_4x32.addAvg = PFX(addAvg_4x32_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_6x16.addAvg = PFX(addAvg_6x16_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x4.addAvg = PFX(addAvg_8x4_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x8.addAvg = PFX(addAvg_8x8_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x12.addAvg = PFX(addAvg_8x12_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x16.addAvg = PFX(addAvg_8x16_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x32.addAvg = PFX(addAvg_8x32_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_8x64.addAvg = PFX(addAvg_8x64_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_12x32.addAvg = PFX(addAvg_12x32_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_16x8.addAvg = PFX(addAvg_16x8_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_16x16.addAvg = PFX(addAvg_16x16_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_16x24.addAvg = PFX(addAvg_16x24_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_16x32.addAvg = PFX(addAvg_16x32_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_16x64.addAvg = PFX(addAvg_16x64_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_24x64.addAvg = PFX(addAvg_24x64_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_32x16.addAvg = PFX(addAvg_32x16_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_32x32.addAvg = PFX(addAvg_32x32_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_32x48.addAvg = PFX(addAvg_32x48_neon);
++ p.chromaX265_CSP_I422.puCHROMA_422_32x64.addAvg = PFX(addAvg_32x64_neon);
+ 
+ // quant
+ p.quant = PFX(quant_neon);
+@@ -403,7 +402,7 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.scale2D_64to32 = PFX(scale2D_64to32_neon);
+ 
+ // scale1D_128to64
+- p.scale1D_128to64NONALIGNED = PFX(scale1D_128to64_neon);
++ p.scale1D_128to64 = PFX(scale1D_128to64_neon);
+ 
+ // copy_count
+ p.cuBLOCK_4x4.copy_cnt = PFX(copy_cnt_4_neon);
+@@ -412,37 +411,37 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.cuBLOCK_32x32.copy_cnt = PFX(copy_cnt_32_neon);
+ 
+ // filterPixelToShort
+- p.puLUMA_4x4.convert_p2sNONALIGNED = PFX(filterPixelToShort_4x4_neon);
+- p.puLUMA_4x8.convert_p2sNONALIGNED = PFX(filterPixelToShort_4x8_neon);
+- p.puLUMA_4x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_4x16_neon);
+- p.puLUMA_8x4.convert_p2sNONALIGNED = PFX(filterPixelToShort_8x4_neon);
+- p.puLUMA_8x8.convert_p2sNONALIGNED = PFX(filterPixelToShort_8x8_neon);
+- p.puLUMA_8x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_8x16_neon);
+- p.puLUMA_8x32.convert_p2sNONALIGNED = PFX(filterPixelToShort_8x32_neon);
+- p.puLUMA_12x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_12x16_neon);
+- p.puLUMA_16x4.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x4_neon);
+- p.puLUMA_16x8.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x8_neon);
+- p.puLUMA_16x12.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x12_neon);
+- p.puLUMA_16x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x16_neon);
+- p.puLUMA_16x32.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x32_neon);
+- p.puLUMA_16x64.convert_p2sNONALIGNED = PFX(filterPixelToShort_16x64_neon);
+- p.puLUMA_24x32.convert_p2sNONALIGNED = PFX(filterPixelToShort_24x32_neon);
+- p.puLUMA_32x8.convert_p2sNONALIGNED = PFX(filterPixelToShort_32x8_neon);
+- p.puLUMA_32x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_32x16_neon);
+- p.puLUMA_32x24.convert_p2sNONALIGNED = PFX(filterPixelToShort_32x24_neon);
+- p.puLUMA_32x32.convert_p2sNONALIGNED = PFX(filterPixelToShort_32x32_neon);
+- p.puLUMA_32x64.convert_p2sNONALIGNED = PFX(filterPixelToShort_32x64_neon);
+- p.puLUMA_48x64.convert_p2sNONALIGNED = PFX(filterPixelToShort_48x64_neon);
+- p.puLUMA_64x16.convert_p2sNONALIGNED = PFX(filterPixelToShort_64x16_neon);
+- p.puLUMA_64x32.convert_p2sNONALIGNED = PFX(filterPixelToShort_64x32_neon);
+- p.puLUMA_64x48.convert_p2sNONALIGNED = PFX(filterPixelToShort_64x48_neon);
+- p.puLUMA_64x64.convert_p2sNONALIGNED = PFX(filterPixelToShort_64x64_neon);
++ p.puLUMA_4x4.convert_p2s = PFX(filterPixelToShort_4x4_neon);
++ p.puLUMA_4x8.convert_p2s = PFX(filterPixelToShort_4x8_neon);
++ p.puLUMA_4x16.convert_p2s = PFX(filterPixelToShort_4x16_neon);
++ p.puLUMA_8x4.convert_p2s = PFX(filterPixelToShort_8x4_neon);
++ p.puLUMA_8x8.convert_p2s = PFX(filterPixelToShort_8x8_neon);
++ p.puLUMA_8x16.convert_p2s = PFX(filterPixelToShort_8x16_neon);
++ p.puLUMA_8x32.convert_p2s = PFX(filterPixelToShort_8x32_neon);
++ p.puLUMA_12x16.convert_p2s = PFX(filterPixelToShort_12x16_neon);
++ p.puLUMA_16x4.convert_p2s = PFX(filterPixelToShort_16x4_neon);
++ p.puLUMA_16x8.convert_p2s = PFX(filterPixelToShort_16x8_neon);
++ p.puLUMA_16x12.convert_p2s = PFX(filterPixelToShort_16x12_neon);
++ p.puLUMA_16x16.convert_p2s = PFX(filterPixelToShort_16x16_neon);
++ p.puLUMA_16x32.convert_p2s = PFX(filterPixelToShort_16x32_neon);
++ p.puLUMA_16x64.convert_p2s = PFX(filterPixelToShort_16x64_neon);
++ p.puLUMA_24x32.convert_p2s = PFX(filterPixelToShort_24x32_neon);
++ p.puLUMA_32x8.convert_p2s = PFX(filterPixelToShort_32x8_neon);
++ p.puLUMA_32x16.convert_p2s = PFX(filterPixelToShort_32x16_neon);
++ p.puLUMA_32x24.convert_p2s = PFX(filterPixelToShort_32x24_neon);
++ p.puLUMA_32x32.convert_p2s = PFX(filterPixelToShort_32x32_neon);
++ p.puLUMA_32x64.convert_p2s = PFX(filterPixelToShort_32x64_neon);
++ p.puLUMA_48x64.convert_p2s = PFX(filterPixelToShort_48x64_neon);
++ p.puLUMA_64x16.convert_p2s = PFX(filterPixelToShort_64x16_neon);
++ p.puLUMA_64x32.convert_p2s = PFX(filterPixelToShort_64x32_neon);
++ p.puLUMA_64x48.convert_p2s = PFX(filterPixelToShort_64x48_neon);
++ p.puLUMA_64x64.convert_p2s = PFX(filterPixelToShort_64x64_neon);
+ 
+ // Block_fill
+- p.cuBLOCK_4x4.blockfill_sNONALIGNED = PFX(blockfill_s_4x4_neon);
+- p.cuBLOCK_8x8.blockfill_sNONALIGNED = PFX(blockfill_s_8x8_neon);
+- p.cuBLOCK_16x16.blockfill_sNONALIGNED = PFX(blockfill_s_16x16_neon);
+- p.cuBLOCK_32x32.blockfill_sNONALIGNED = PFX(blockfill_s_32x32_neon);
++ p.cuBLOCK_4x4.blockfill_s = PFX(blockfill_s_4x4_neon);
++ p.cuBLOCK_8x8.blockfill_s = PFX(blockfill_s_8x8_neon);
++ p.cuBLOCK_16x16.blockfill_s = PFX(blockfill_s_16x16_neon);
++ p.cuBLOCK_32x32.blockfill_s = PFX(blockfill_s_32x32_neon);
+ 
+ // Blockcopy_ss
+ p.cuBLOCK_4x4.copy_ss = PFX(blockcopy_ss_4x4_neon);
+@@ -496,21 +495,21 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.chromaX265_CSP_I422.cuBLOCK_422_32x64.copy_sp = PFX(blockcopy_sp_32x64_neon);
+ 
+ // pixel_add_ps
+- p.cuBLOCK_4x4.add_psNONALIGNED = PFX(pixel_add_ps_4x4_neon);
+- p.cuBLOCK_8x8.add_psNONALIGNED = PFX(pixel_add_ps_8x8_neon);
+- p.cuBLOCK_16x16.add_psNONALIGNED = PFX(pixel_add_ps_16x16_neon);
+- p.cuBLOCK_32x32.add_psNONALIGNED = PFX(pixel_add_ps_32x32_neon);
+- p.cuBLOCK_64x64.add_psNONALIGNED = PFX(pixel_add_ps_64x64_neon);
++ p.cuBLOCK_4x4.add_ps = PFX(pixel_add_ps_4x4_neon);
++ p.cuBLOCK_8x8.add_ps = PFX(pixel_add_ps_8x8_neon);
++ p.cuBLOCK_16x16.add_ps = PFX(pixel_add_ps_16x16_neon);
++ p.cuBLOCK_32x32.add_ps = PFX(pixel_add_ps_32x32_neon);
++ p.cuBLOCK_64x64.add_ps = PFX(pixel_add_ps_64x64_neon);
+ 
+ // chroma add_ps
+- p.chromaX265_CSP_I420.cuBLOCK_420_4x4.add_psNONALIGNED = PFX(pixel_add_ps_4x4_neon);
+- p.chromaX265_CSP_I420.cuBLOCK_420_8x8.add_psNONALIGNED = PFX(pixel_add_ps_8x8_neon);
+- p.chromaX265_CSP_I420.cuBLOCK_420_16x16.add_psNONALIGNED = PFX(pixel_add_ps_16x16_neon);
+- p.chromaX265_CSP_I420.cuBLOCK_420_32x32.add_psNONALIGNED = PFX(pixel_add_ps_32x32_neon);
+- p.chromaX265_CSP_I422.cuBLOCK_422_4x8.add_psNONALIGNED = PFX(pixel_add_ps_4x8_neon);
+- p.chromaX265_CSP_I422.cuBLOCK_422_8x16.add_psNONALIGNED = PFX(pixel_add_ps_8x16_neon);
+- p.chromaX265_CSP_I422.cuBLOCK_422_16x32.add_psNONALIGNED = PFX(pixel_add_ps_16x32_neon);
+- p.chromaX265_CSP_I422.cuBLOCK_422_32x64.add_psNONALIGNED = PFX(pixel_add_ps_32x64_neon);
++ p.chromaX265_CSP_I420.cuBLOCK_420_4x4.add_ps = PFX(pixel_add_ps_4x4_neon);
++ p.chromaX265_CSP_I420.cuBLOCK_420_8x8.add_ps = PFX(pixel_add_ps_8x8_neon);
++ p.chromaX265_CSP_I420.cuBLOCK_420_16x16.add_ps = PFX(pixel_add_ps_16x16_neon);
++ p.chromaX265_CSP_I420.cuBLOCK_420_32x32.add_ps = PFX(pixel_add_ps_32x32_neon);
++ p.chromaX265_CSP_I422.cuBLOCK_422_4x8.add_ps = PFX(pixel_add_ps_4x8_neon);
++ p.chromaX265_CSP_I422.cuBLOCK_422_8x16.add_ps = PFX(pixel_add_ps_8x16_neon);
++ p.chromaX265_CSP_I422.cuBLOCK_422_16x32.add_ps = PFX(pixel_add_ps_16x32_neon);
++ p.chromaX265_CSP_I422.cuBLOCK_422_32x64.add_ps = PFX(pixel_add_ps_32x64_neon);
+ 
+ // cpy2Dto1D_shr
+ p.cuBLOCK_4x4.cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_4x4_neon);
+@@ -519,10 +518,10 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.cuBLOCK_32x32.cpy2Dto1D_shr = PFX(cpy2Dto1D_shr_32x32_neon);
+ 
+ // ssd_s
+- p.cuBLOCK_4x4.ssd_sNONALIGNED = PFX(pixel_ssd_s_4x4_neon);
+- p.cuBLOCK_8x8.ssd_sNONALIGNED = PFX(pixel_ssd_s_8x8_neon);
+- p.cuBLOCK_16x16.ssd_sNONALIGNED = PFX(pixel_ssd_s_16x16_neon);
+- p.cuBLOCK_32x32.ssd_sNONALIGNED = PFX(pixel_ssd_s_32x32_neon);
++ p.cuBLOCK_4x4.ssd_s = PFX(pixel_ssd_s_4x4_neon);
++ p.cuBLOCK_8x8.ssd_s = PFX(pixel_ssd_s_8x8_neon);
++ p.cuBLOCK_16x16.ssd_s = PFX(pixel_ssd_s_16x16_neon);
++ p.cuBLOCK_32x32.ssd_s = PFX(pixel_ssd_s_32x32_neon);
+ 
+ // sse_ss
+ p.cuBLOCK_4x4.sse_ss = PFX(pixel_sse_ss_4x4_neon);
+@@ -549,10 +548,10 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.chromaX265_CSP_I422.cuBLOCK_422_32x64.sub_ps = PFX(pixel_sub_ps_32x64_neon);
+ 
+ // calc_Residual
+- p.cuBLOCK_4x4.calcresidualNONALIGNED = PFX(getResidual4_neon);
+- p.cuBLOCK_8x8.calcresidualNONALIGNED = PFX(getResidual8_neon);
+- p.cuBLOCK_16x16.calcresidualNONALIGNED = PFX(getResidual16_neon);
+- p.cuBLOCK_32x32.calcresidualNONALIGNED = PFX(getResidual32_neon);
++ p.cuBLOCK_4x4.calcresidual = PFX(getResidual4_neon);
++ p.cuBLOCK_8x8.calcresidual = PFX(getResidual8_neon);
++ p.cuBLOCK_16x16.calcresidual = PFX(getResidual16_neon);
++ p.cuBLOCK_32x32.calcresidual = PFX(getResidual32_neon);
+ 
+ // sse_pp
+ p.cuBLOCK_4x4.sse_pp = PFX(pixel_sse_pp_4x4_neon);
+@@ -723,31 +722,31 @@ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
+ p.puLUMA_64x64.sad_x4 = PFX(sad_x4_64x64_neon);
+ 
+ // pixel_avg_pp
+- p.puLUMA_4x4.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_4x4_neon);
+- p.puLUMA_4x8.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_4x8_neon);
+- p.puLUMA_4x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_4x16_neon);
+- p.puLUMA_8x4.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_8x4_neon);
+- p.puLUMA_8x8.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_8x8_neon);
+- p.puLUMA_8x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_8x16_neon);
+- p.puLUMA_8x32.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_8x32_neon);
+- p.puLUMA_12x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_12x16_neon);
+- p.puLUMA_16x4.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x4_neon);
+- p.puLUMA_16x8.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x8_neon);
+- p.puLUMA_16x12.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x12_neon);
+- p.puLUMA_16x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x16_neon);
+- p.puLUMA_16x32.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x32_neon);
+- p.puLUMA_16x64.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_16x64_neon);
+- p.puLUMA_24x32.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_24x32_neon);
+- p.puLUMA_32x8.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_32x8_neon);
+- p.puLUMA_32x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_32x16_neon);
+- p.puLUMA_32x24.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_32x24_neon);
+- p.puLUMA_32x32.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_32x32_neon);
+- p.puLUMA_32x64.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_32x64_neon);
+- p.puLUMA_48x64.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_48x64_neon);
+- p.puLUMA_64x16.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_64x16_neon);
+- p.puLUMA_64x32.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_64x32_neon);
+- p.puLUMA_64x48.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_64x48_neon);
+- p.puLUMA_64x64.pixelavg_ppNONALIGNED = PFX(pixel_avg_pp_64x64_neon);
++ p.puLUMA_4x4.pixelavg_pp = PFX(pixel_avg_pp_4x4_neon);
++ p.puLUMA_4x8.pixelavg_pp = PFX(pixel_avg_pp_4x8_neon);
++ p.puLUMA_4x16.pixelavg_pp = PFX(pixel_avg_pp_4x16_neon);
++ p.puLUMA_8x4.pixelavg_pp = PFX(pixel_avg_pp_8x4_neon);
++ p.puLUMA_8x8.pixelavg_pp = PFX(pixel_avg_pp_8x8_neon);
++ p.puLUMA_8x16.pixelavg_pp = PFX(pixel_avg_pp_8x16_neon);
++ p.puLUMA_8x32.pixelavg_pp = PFX(pixel_avg_pp_8x32_neon);
++ p.puLUMA_12x16.pixelavg_pp = PFX(pixel_avg_pp_12x16_neon);
++ p.puLUMA_16x4.pixelavg_pp = PFX(pixel_avg_pp_16x4_neon);
++ p.puLUMA_16x8.pixelavg_pp = PFX(pixel_avg_pp_16x8_neon);
++ p.puLUMA_16x12.pixelavg_pp = PFX(pixel_avg_pp_16x12_neon);
++ p.puLUMA_16x16.pixelavg_pp = PFX(pixel_avg_pp_16x16_neon);
++ p.puLUMA_16x32.pixelavg_pp = PFX(pixel_avg_pp_16x32_neon);
++ p.puLUMA_16x64.pixelavg_pp = PFX(pixel_avg_pp_16x64_neon);
++ p.puLUMA_24x32.pixelavg_pp = PFX(pixel_avg_pp_24x32_neon);
++ p.puLUMA_32x8.pixelavg_pp = PFX(pixel_avg_pp_32x8_neon);
++ p.puLUMA_32x16.pixelavg_pp = PFX(pixel_avg_pp_32x16_neon);
++ p.puLUMA_32x24.pixelavg_pp = PFX(pixel_avg_pp_32x24_neon);
++ p.puLUMA_32x32.pixelavg_pp = PFX(pixel_avg_pp_32x32_neon);
++ p.puLUMA_32x64.pixelavg_pp = PFX(pixel_avg_pp_32x64_neon);
++ p.puLUMA_48x64.pixelavg_pp = PFX(pixel_avg_pp_48x64_neon);
++ p.puLUMA_64x16.pixelavg_pp = PFX(pixel_avg_pp_64x16_neon);
++ p.puLUMA_64x32.pixelavg_pp = PFX(pixel_avg_pp_64x32_neon);
++ p.puLUMA_64x48.pixelavg_pp = PFX(pixel_avg_pp_64x48_neon);
++ p.puLUMA_64x64.pixelavg_pp = PFX(pixel_avg_pp_64x64_neon);
+ 
+ // planecopy
+ p.planecopy_cp = PFX(pixel_planecopy_cp_neon);
+diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp
+index 2eacfe4a9..26c82ea50 100644
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -5,8 +5,6 @@
+ * Laurent Aimar <fenrir@via.ecp.fr>
+ * Fiona Glaser <fiona@x264.com>
+ * Steve Borho <steve@borho.org>
+- * Hongbin Liu <liuhongbin1@huawei.com>
+- * Yimeng Su <yimeng.su@huawei.com>
+ *
+ * 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
+@@ -369,8 +367,6 @@ uint32_t cpu_detect(bool benableavx512)
+ flags |= PFX(cpu_fast_neon_mrc_test)() ? X265_CPU_FAST_NEON_MRC : 0;
+ #endif
+ // TODO: write dual issue test? currently it's A8 (dual issue) vs. A9 (fast mrc)
+-#elif X265_ARCH_ARM64
+- flags |= X265_CPU_NEON;
+ #endif // if HAVE_ARMV6
+ return flags;
+ }
+diff --git a/source/common/pixel.cpp b/source/common/pixel.cpp
+index e4f890cd5..99b84449c 100644
+--- a/source/common/pixel.cpp
++++ b/source/common/pixel.cpp
+@@ -5,7 +5,6 @@
+ * Mandar Gurav <mandar@multicorewareinc.com>
+ * Mahesh Pittala <mahesh@multicorewareinc.com>
+ * Min Chen <min.chen@multicorewareinc.com>
+- * Hongbin Liu<liuhongbin1@huawei.com>
+ *
+ * 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
+@@ -266,10 +265,6 @@ int satd4(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t s
+ {
+ int satd = 0;
+ 
+-#if ENABLE_ASSEMBLY && X265_ARCH_ARM64
+- pixelcmp_t satd_4x4 = x265_pixel_satd_4x4_neon;
+-#endif
+-
+ for (int row = 0; row < h; row += 4)
+ for (int col = 0; col < w; col += 4)
+ satd += satd_4x4(pix1 + row * stride_pix1 + col, stride_pix1,
+@@ -284,10 +279,6 @@ int satd8(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t s
+ {
+ int satd = 0;
+ 
+-#if ENABLE_ASSEMBLY && X265_ARCH_ARM64
+- pixelcmp_t satd_8x4 = x265_pixel_satd_8x4_neon;
+-#endif
+-
+ for (int row = 0; row < h; row += 4)
+ for (int col = 0; col < w; col += 8)
+ satd += satd_8x4(pix1 + row * stride_pix1 + col, stride_pix1,
+diff --git a/source/common/primitives.h b/source/common/primitives.h
+index 0b52f84de..5c64952fb 100644
+--- a/source/common/primitives.h
++++ b/source/common/primitives.h
+@@ -8,8 +8,6 @@
+ * Rajesh Paulraj <rajesh@multicorewareinc.com>
+ * Praveen Kumar Tiwari <praveen@multicorewareinc.com>
+ * Min Chen <chenm003@163.com>
+- * Hongbin Liu<liuhongbin1@huawei.com>
+- * Yimeng Su <yimeng.su@huawei.com>
+ *
+ * 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
+@@ -469,9 +467,6 @@ void setupCPrimitives(EncoderPrimitives &p);
+ void setupInstrinsicPrimitives(EncoderPrimitives &p, int cpuMask);
+ void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask);
+ void setupAliasPrimitives(EncoderPrimitives &p);
+-#if X265_ARCH_ARM64
+-void setupAliasCPrimitives(EncoderPrimitives &cp, EncoderPrimitives &asmp, int cpuMask);
+-#endif
+ #if HAVE_ALTIVEC
+ void setupPixelPrimitives_altivec(EncoderPrimitives &p);
+ void setupDCTPrimitives_altivec(EncoderPrimitives &p);
+@@ -486,10 +481,4 @@ extern const char* PFX(version_str);
+ extern const char* PFX(build_info_str);
+ #endif
+ 
+-#if ENABLE_ASSEMBLY && X265_ARCH_ARM64
+-extern "C" {
+-#include "aarch64/pixel-util.h"
+-}
+-#endif
+-
+ #endif // ifndef X265_PRIMITIVES_H
+diff --git a/source/test/CMakeLists.txt b/source/test/CMakeLists.txt
+index 9abaf31ff..260195f53 100644
+--- a/source/test/CMakeLists.txt
++++ b/source/test/CMakeLists.txt
+@@ -23,15 +23,13 @@ endif(X86)
+ 
+ # add ARM assembly files
+ if(ARM OR CROSS_COMPILE_ARM)
+- if(NOT ARM64)
+- enable_language(ASM)
+- set(NASM_SRC checkasm-arm.S)
+- add_custom_command(
+- OUTPUT checkasm-arm.obj
+- COMMAND ${CMAKE_CXX_COMPILER}
+- ARGS ${NASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-arm.S -o checkasm-arm.obj
+- DEPENDS checkasm-arm.S)
+- endif()
++ enable_language(ASM)
++ set(NASM_SRC checkasm-arm.S)
++ add_custom_command(
++ OUTPUT checkasm-arm.obj
++ COMMAND ${CMAKE_CXX_COMPILER}
++ ARGS ${NASM_FLAGS} ${CMAKE_CURRENT_SOURCE_DIR}/checkasm-arm.S -o checkasm-arm.obj
++ DEPENDS checkasm-arm.S)
+ endif(ARM OR CROSS_COMPILE_ARM)
+ 
+ # add PowerPC assembly files
+diff --git a/source/test/testbench.cpp b/source/test/testbench.cpp
+index 8db8c0c25..ac14f9710 100644
+--- a/source/test/testbench.cpp
++++ b/source/test/testbench.cpp
+@@ -5,7 +5,6 @@
+ * Mandar Gurav <mandar@multicorewareinc.com>
+ * Mahesh Pittala <mahesh@multicorewareinc.com>
+ * Min Chen <chenm003@163.com>
+- * Yimeng Su <yimeng.su@huawei.com>
+ *
+ * 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
+@@ -209,14 +208,6 @@ int main(int argc, char *argv)
+ EncoderPrimitives asmprim;
+ memset(&asmprim, 0, sizeof(asmprim));
+ setupAssemblyPrimitives(asmprim, test_archi.flag);
+-
+-#if X265_ARCH_ARM64
+- /* Temporary workaround because luma_vsp assembly primitive has not been completed
+- * but interp_8tap_hv_pp_cpu uses mixed C primitive and assembly primitive.
+- * Otherwise, segment fault occurs. */
+- setupAliasCPrimitives(cprim, asmprim, test_archi.flag);
+-#endif
+-
+ setupAliasPrimitives(asmprim);
+ memcpy(&primitives, &asmprim, sizeof(EncoderPrimitives));
+ for (size_t h = 0; h < sizeof(harness) / sizeof(TestHarness*); h++)
+@@ -241,13 +232,6 @@ int main(int argc, char *argv)
+ #endif
+ setupAssemblyPrimitives(optprim, cpuid);
+ 
+-#if X265_ARCH_ARM64
+- /* Temporary workaround because luma_vsp assembly primitive has not been completed
+- * but interp_8tap_hv_pp_cpu uses mixed C primitive and assembly primitive.
+- * Otherwise, segment fault occurs. */
+- setupAliasCPrimitives(cprim, optprim, cpuid);
+-#endif
+-
+ /* Note that we do not setup aliases for performance tests, that would be
+ * redundant. The testbench only verifies they are correctly aliased */
+ 
+diff --git a/source/test/testharness.h b/source/test/testharness.h
+index 6e680953f..771551583 100644
+--- a/source/test/testharness.h
++++ b/source/test/testharness.h
+@@ -3,7 +3,6 @@
+ *
+ * Authors: Steve Borho <steve@borho.org>
+ * Min Chen <chenm003@163.com>
+- * Yimeng Su <yimeng.su@huawei.com>
+ *
+ * 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
+@@ -82,15 +81,11 @@ static inline uint32_t __rdtsc(void)
+ #if X265_ARCH_X86
+ asm volatile("rdtsc" : "=a" (a) ::"edx");
+ #elif X265_ARCH_ARM
+-#if X265_ARCH_ARM64
+- asm volatile("mrs %0, cntvct_el0" : "=r"(a));
+-#else
+ // TOD-DO: verify following inline asm to get cpu Timestamp Counter for ARM arch
+ // asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(a));
+ 
+ // TO-DO: replace clock() function with appropriate ARM cpu instructions
+ a = clock();
+-#endif
+ #endif
+ return a;
+ }
+-- 
+2.24.3 (Apple Git-128)
+

HandBrake-1.5.1.tar.xz/contrib/x265/A01-darwin-neon-support-for-arm64.patch Added

@@ -0,0 +1,5121 @@
+diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
+index c019c2e..005a409 100644
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -38,14 +38,20 @@ configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
+ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
+ 
+ # System architecture detection
+-string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
++if (APPLE)
++ string(TOLOWER "${CMAKE_OSX_ARCHITECTURES}" SYSPROC)
++else()
++ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
++endif()
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+ set(ARM_ALIASES armv6l armv7l)
++set(ARM64_ALIASES arm64 arm64e aarch64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH)
++list(FIND ARM64_ALIASES "${SYSPROC}" ARM64MATCH)
+ set(POWER_ALIASES ppc64 ppc64le)
+ list(FIND POWER_ALIASES "${SYSPROC}" POWERMATCH)
+-if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
++if(X86MATCH GREATER "-1")
+ set(X86 1)
+ add_definitions(-DX265_ARCH_X86=1)
+ if(CMAKE_CXX_FLAGS STREQUAL "-m32")
+@@ -73,6 +79,15 @@ elseif(ARMMATCH GREATER "-1")
+ message(STATUS "Detected ARM target processor")
+ set(ARM 1)
+ add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
++elseif(ARM64MATCH GREATER "-1")
++ if(CROSS_COMPILE_ARM64)
++ message(STATUS "Cross compiling for ARM64 arch")
++ else()
++ set(CROSS_COMPILE_ARM64 0)
++ endif()
++ message(STATUS "Detected ARM64 target processor")
++ set(ARM64 1)
++ add_definitions(-DX265_ARCH_ARM64=1 -DHAVE_NEON)
+ else()
+ message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
+ message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
+@@ -241,6 +256,9 @@ if(GCC)
+ set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
+ endif()
+ endif()
++ if(ARM64 OR CROSS_COMPILE_ARM64)
++ add_definitions(-DHAVE_NEON)
++ endif()
+ add_definitions(${ARM_ARGS})
+ if(FPROFILE_GENERATE)
+ if(INTEL_CXX)
+@@ -332,7 +350,7 @@ if(GCC)
+ endif(GCC)
+ 
+ find_package(Nasm)
+-if(ARM OR CROSS_COMPILE_ARM)
++if(ARM OR CROSS_COMPILE_ARM OR ARM64 OR CROSS_COMPILE_ARM64)
+ option(ENABLE_ASSEMBLY "Enable use of assembly coded primitives" ON)
+ elseif(NASM_FOUND AND X86)
+ if (NASM_VERSION_STRING VERSION_LESS "2.13.0")
+@@ -527,6 +545,19 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
+ ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
+ DEPENDS ${ASM_SRC})
+ endforeach()
++ elseif(ARM64 OR CROSS_COMPILE_ARM64)
++ # compile ARM arch asm files here
++ enable_language(ASM)
++ foreach(ASM ${ARM_ASMS})
++ set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm64/${ASM})
++ list(APPEND ASM_SRCS ${ASM_SRC})
++ list(APPEND ASM_OBJS ${ASM}.${SUFFIX})
++ add_custom_command(
++ OUTPUT ${ASM}.${SUFFIX}
++ COMMAND ${CMAKE_CXX_COMPILER}
++ ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX}
++ DEPENDS ${ASM_SRC})
++ endforeach()
+ elseif(X86)
+ # compile X86 arch asm files here
+ foreach(ASM ${MSVC_ASMS})
+diff --git a/source/common/CMakeLists.txt b/source/common/CMakeLists.txt
+index c70bb10..3c179f3 100644
+--- a/source/common/CMakeLists.txt
++++ b/source/common/CMakeLists.txt
+@@ -97,6 +97,22 @@ if(ENABLE_ASSEMBLY AND (ARM OR CROSS_COMPILE_ARM))
+ source_group(Assembly FILES ${ASM_PRIMITIVES})
+ endif(ENABLE_ASSEMBLY AND (ARM OR CROSS_COMPILE_ARM))
+ 
++
++if(ENABLE_ASSEMBLY AND (ARM64 OR CROSS_COMPILE_ARM64))
++ set(C_SRCS asm-primitives.cpp pixel-prim.h pixel-prim.cpp filter-prim.h filter-prim.cpp dct-prim.h dct-prim.cpp loopfilter-prim.cpp loopfilter-prim.h intrapred-prim.cpp arm64-utils.cpp arm64-utils.h)
++ enable_language(ASM)
++ # add ARM assembly/intrinsic files here
++ #set(A_SRCS )
++ #set(VEC_PRIMITIVES)
++
++ #set(ARM64_ASMS "${A_SRCS}" CACHE INTERNAL "ARM64 Assembly Sources")
++ foreach(SRC ${C_SRCS})
++ set(ASM_PRIMITIVES ${ASM_PRIMITIVES} arm64/${SRC})
++ endforeach()
++ source_group(Assembly FILES ${ASM_PRIMITIVES})
++endif(ENABLE_ASSEMBLY AND (ARM64 OR CROSS_COMPILE_ARM64))
++
++
+ if(POWER)
+ set_source_files_properties(version.cpp PROPERTIES COMPILE_FLAGS -DX265_VERSION=${X265_VERSION})
+ if(ENABLE_ALTIVEC)
+diff --git a/source/common/arm64/arm64-utils.cpp b/source/common/arm64/arm64-utils.cpp
+new file mode 100644
+index 0000000..4291acc
+--- /dev/null
++++ b/source/common/arm64/arm64-utils.cpp
+@@ -0,0 +1,290 @@
++#include "common.h"
++#include "x265.h"
++#include "arm64-utils.h"
++#include <arm_neon.h>
++
++#define COPY_16(d,s) *(uint8x16_t *)(d) = *(uint8x16_t *)(s)
++namespace X265_NS {
++
++
++
++void transpose8x8(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride)
++{
++ uint8x8_t a0,a1,a2,a3,a4,a5,a6,a7;
++ uint8x8_t b0,b1,b2,b3,b4,b5,b6,b7;
++
++ a0 = *(uint8x8_t *)(src + 0*sstride);
++ a1 = *(uint8x8_t *)(src + 1*sstride);
++ a2 = *(uint8x8_t *)(src + 2*sstride);
++ a3 = *(uint8x8_t *)(src + 3*sstride);
++ a4 = *(uint8x8_t *)(src + 4*sstride);
++ a5 = *(uint8x8_t *)(src + 5*sstride);
++ a6 = *(uint8x8_t *)(src + 6*sstride);
++ a7 = *(uint8x8_t *)(src + 7*sstride);
++
++ b0 = vtrn1_u32(a0,a4);
++ b1 = vtrn1_u32(a1,a5);
++ b2 = vtrn1_u32(a2,a6);
++ b3 = vtrn1_u32(a3,a7);
++ b4 = vtrn2_u32(a0,a4);
++ b5 = vtrn2_u32(a1,a5);
++ b6 = vtrn2_u32(a2,a6);
++ b7 = vtrn2_u32(a3,a7);
++
++ a0 = vtrn1_u16(b0,b2);
++ a1 = vtrn1_u16(b1,b3);
++ a2 = vtrn2_u16(b0,b2);
++ a3 = vtrn2_u16(b1,b3);
++ a4 = vtrn1_u16(b4,b6);
++ a5 = vtrn1_u16(b5,b7);
++ a6 = vtrn2_u16(b4,b6);
++ a7 = vtrn2_u16(b5,b7);
++
++ b0 = vtrn1_u8(a0,a1);
++ b1 = vtrn2_u8(a0,a1);
++ b2 = vtrn1_u8(a2,a3);
++ b3 = vtrn2_u8(a2,a3);
++ b4 = vtrn1_u8(a4,a5);
++ b5 = vtrn2_u8(a4,a5);
++ b6 = vtrn1_u8(a6,a7);
++ b7 = vtrn2_u8(a6,a7);
++
++ *(uint8x8_t *)(dst + 0*dstride) = b0;
++ *(uint8x8_t *)(dst + 1*dstride) = b1;
++ *(uint8x8_t *)(dst + 2*dstride) = b2;
++ *(uint8x8_t *)(dst + 3*dstride) = b3;
++ *(uint8x8_t *)(dst + 4*dstride) = b4;
++ *(uint8x8_t *)(dst + 5*dstride) = b5;
++ *(uint8x8_t *)(dst + 6*dstride) = b6;
++ *(uint8x8_t *)(dst + 7*dstride) = b7;
++}
++
++
++
++
++
++
++void transpose16x16(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride)
++{
++ uint16x8_t a0,a1,a2,a3,a4,a5,a6,a7,a8,a9,aA,aB,aC,aD,aE,aF;
++ uint16x8_t b0,b1,b2,b3,b4,b5,b6,b7,b8,b9,bA,bB,bC,bD,bE,bF;
++ uint16x8_t c0,c1,c2,c3,c4,c5,c6,c7,c8,c9,cA,cB,cC,cD,cE,cF;
++ uint16x8_t d0,d1,d2,d3,d4,d5,d6,d7,d8,d9,dA,dB,dC,dD,dE,dF;
++ 
++ a0 = *(uint16x8_t *)(src + 0*sstride);
++ a1 = *(uint16x8_t *)(src + 1*sstride);
++ a2 = *(uint16x8_t *)(src + 2*sstride);
++ a3 = *(uint16x8_t *)(src + 3*sstride);
++ a4 = *(uint16x8_t *)(src + 4*sstride);
++ a5 = *(uint16x8_t *)(src + 5*sstride);
++ a6 = *(uint16x8_t *)(src + 6*sstride);
++ a7 = *(uint16x8_t *)(src + 7*sstride);
++ a8 = *(uint16x8_t *)(src + 8*sstride);
++ a9 = *(uint16x8_t *)(src + 9*sstride);
++ aA = *(uint16x8_t *)(src + 10*sstride);
++ aB = *(uint16x8_t *)(src + 11*sstride);
++ aC = *(uint16x8_t *)(src + 12*sstride);
++ aD = *(uint16x8_t *)(src + 13*sstride);
++ aE = *(uint16x8_t *)(src + 14*sstride);
++ aF = *(uint16x8_t *)(src + 15*sstride);
++
++ b0 = vtrn1q_u64(a0, a8);
++ b1 = vtrn1q_u64(a1, a9);
++ b2 = vtrn1q_u64(a2, aA);
++ b3 = vtrn1q_u64(a3, aB);
++ b4 = vtrn1q_u64(a4, aC);
++ b5 = vtrn1q_u64(a5, aD);
++ b6 = vtrn1q_u64(a6, aE);
++ b7 = vtrn1q_u64(a7, aF);
++ b8 = vtrn2q_u64(a0, a8);
++ b9 = vtrn2q_u64(a1, a9);
++ bA = vtrn2q_u64(a2, aA);
++ bB = vtrn2q_u64(a3, aB);
++ bC = vtrn2q_u64(a4, aC);
++ bD = vtrn2q_u64(a5, aD);
++ bE = vtrn2q_u64(a6, aE);
++ bF = vtrn2q_u64(a7, aF);
++
++ c0 = vtrn1q_u32(b0, b4);
++ c1 = vtrn1q_u32(b1, b5);
++ c2 = vtrn1q_u32(b2, b6);
++ c3 = vtrn1q_u32(b3, b7);
++ c4 = vtrn2q_u32(b0, b4);
++ c5 = vtrn2q_u32(b1, b5);
++ c6 = vtrn2q_u32(b2, b6);
++ c7 = vtrn2q_u32(b3, b7);
++ c8 = vtrn1q_u32(b8, bC);
++ c9 = vtrn1q_u32(b9, bD);
++ cA = vtrn1q_u32(bA, bE);
++ cB = vtrn1q_u32(bB, bF);
++ cC = vtrn2q_u32(b8, bC);
++ cD = vtrn2q_u32(b9, bD);
++ cE = vtrn2q_u32(bA, bE);
++ cF = vtrn2q_u32(bB, bF);
++ 
++ d0 = vtrn1q_u16(c0, c2);
++ d1 = vtrn1q_u16(c1, c3);
++ d2 = vtrn2q_u16(c0, c2);
++ d3 = vtrn2q_u16(c1, c3);
++ d4 = vtrn1q_u16(c4, c6);
++ d5 = vtrn1q_u16(c5, c7);
++ d6 = vtrn2q_u16(c4, c6);
++ d7 = vtrn2q_u16(c5, c7);
++ d8 = vtrn1q_u16(c8, cA);
++ d9 = vtrn1q_u16(c9, cB);
++ dA = vtrn2q_u16(c8, cA);
++ dB = vtrn2q_u16(c9, cB);
++ dC = vtrn1q_u16(cC, cE);
++ dD = vtrn1q_u16(cD, cF);
++ dE = vtrn2q_u16(cC, cE);
++ dF = vtrn2q_u16(cD, cF);
++ 
++ *(uint16x8_t *)(dst + 0*dstride) = vtrn1q_u8(d0, d1);
++ *(uint16x8_t *)(dst + 1*dstride) = vtrn2q_u8(d0, d1);
++ *(uint16x8_t *)(dst + 2*dstride) = vtrn1q_u8(d2, d3);
++ *(uint16x8_t *)(dst + 3*dstride) = vtrn2q_u8(d2, d3);
++ *(uint16x8_t *)(dst + 4*dstride) = vtrn1q_u8(d4, d5);
++ *(uint16x8_t *)(dst + 5*dstride) = vtrn2q_u8(d4, d5);
++ *(uint16x8_t *)(dst + 6*dstride) = vtrn1q_u8(d6, d7);
++ *(uint16x8_t *)(dst + 7*dstride) = vtrn2q_u8(d6, d7);
++ *(uint16x8_t *)(dst + 8*dstride) = vtrn1q_u8(d8, d9);
++ *(uint16x8_t *)(dst + 9*dstride) = vtrn2q_u8(d8, d9);
++ *(uint16x8_t *)(dst + 10*dstride) = vtrn1q_u8(dA, dB);
++ *(uint16x8_t *)(dst + 11*dstride) = vtrn2q_u8(dA, dB);
++ *(uint16x8_t *)(dst + 12*dstride) = vtrn1q_u8(dC, dD);
++ *(uint16x8_t *)(dst + 13*dstride) = vtrn2q_u8(dC, dD);
++ *(uint16x8_t *)(dst + 14*dstride) = vtrn1q_u8(dE, dF);
++ *(uint16x8_t *)(dst + 15*dstride) = vtrn2q_u8(dE, dF);
++
++ 
++}
++
++
++void transpose32x32(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride)
++{
++ //assumption: there is no partial overlap
++ transpose16x16(dst,src,dstride,sstride);
++ transpose16x16(dst+16*dstride+16,src+16*sstride+16,dstride,sstride);
++ if (dst == src)
++ {
++ uint8_t tmp16*16 __attribute__((aligned(64)));
++ transpose16x16(tmp,src + 16,16,sstride);
++ transpose16x16(dst + 16, src + 16*sstride,dstride,sstride);
++ for (int i=0;i<16;i++) COPY_16(dst+(16 + i)*dstride,tmp + 16*i);
++ }
++ else
++ {
++ transpose16x16(dst+16*dstride,src + 16,dstride,sstride);
++ transpose16x16(dst + 16, src + 16*sstride,dstride,sstride);
++ }
++ 
++}
++
++
++
++void transpose8x8(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride)
++{
++ uint16x8_t a0,a1,a2,a3,a4,a5,a6,a7;
++ uint16x8_t b0,b1,b2,b3,b4,b5,b6,b7;
++
++ a0 = *(uint16x8_t *)(src + 0*sstride);
++ a1 = *(uint16x8_t *)(src + 1*sstride);
++ a2 = *(uint16x8_t *)(src + 2*sstride);
++ a3 = *(uint16x8_t *)(src + 3*sstride);
++ a4 = *(uint16x8_t *)(src + 4*sstride);
++ a5 = *(uint16x8_t *)(src + 5*sstride);
++ a6 = *(uint16x8_t *)(src + 6*sstride);
++ a7 = *(uint16x8_t *)(src + 7*sstride);
++
++ b0 = vtrn1q_u64(a0,a4);
++ b1 = vtrn1q_u64(a1,a5);
++ b2 = vtrn1q_u64(a2,a6);
++ b3 = vtrn1q_u64(a3,a7);
++ b4 = vtrn2q_u64(a0,a4);
++ b5 = vtrn2q_u64(a1,a5);
++ b6 = vtrn2q_u64(a2,a6);
++ b7 = vtrn2q_u64(a3,a7);
++
++ a0 = vtrn1q_u32(b0,b2);
++ a1 = vtrn1q_u32(b1,b3);
++ a2 = vtrn2q_u32(b0,b2);
++ a3 = vtrn2q_u32(b1,b3);
++ a4 = vtrn1q_u32(b4,b6);
++ a5 = vtrn1q_u32(b5,b7);
++ a6 = vtrn2q_u32(b4,b6);
++ a7 = vtrn2q_u32(b5,b7);
++
++ b0 = vtrn1q_u16(a0,a1);
++ b1 = vtrn2q_u16(a0,a1);
++ b2 = vtrn1q_u16(a2,a3);
++ b3 = vtrn2q_u16(a2,a3);
++ b4 = vtrn1q_u16(a4,a5);
++ b5 = vtrn2q_u16(a4,a5);
++ b6 = vtrn1q_u16(a6,a7);
++ b7 = vtrn2q_u16(a6,a7);
++
++ *(uint16x8_t *)(dst + 0*dstride) = b0;
++ *(uint16x8_t *)(dst + 1*dstride) = b1;
++ *(uint16x8_t *)(dst + 2*dstride) = b2;
++ *(uint16x8_t *)(dst + 3*dstride) = b3;
++ *(uint16x8_t *)(dst + 4*dstride) = b4;
++ *(uint16x8_t *)(dst + 5*dstride) = b5;
++ *(uint16x8_t *)(dst + 6*dstride) = b6;
++ *(uint16x8_t *)(dst + 7*dstride) = b7;
++}
++
++void transpose16x16(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride)
++{
++ //assumption: there is no partial overlap
++ transpose8x8(dst,src,dstride,sstride);
++ transpose8x8(dst+8*dstride+8,src+8*sstride+8,dstride,sstride);
++
++ if (dst == src)
++ {
++ uint16_t tmp8*8;
++ transpose8x8(tmp,src + 8,8,sstride);
++ transpose8x8(dst + 8, src + 8*sstride,dstride,sstride);
++ for (int i=0;i<8;i++) COPY_16(dst+(8 + i)*dstride,tmp + 8*i);
++ }
++ else
++ {
++ transpose8x8(dst+8*dstride,src + 8,dstride,sstride);
++ transpose8x8(dst + 8, src + 8*sstride,dstride,sstride);
++ }
++ 
++}
++
++
++
++void transpose32x32(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride)
++{
++ //assumption: there is no partial overlap
++ for (int i=0;i<4;i++)
++ {
++ transpose8x8(dst+i*8*(1+dstride),src+i*8*(1+sstride),dstride,sstride);
++ for (int j=i+1;j<4;j++)
++ {
++ if (dst == src)
++ {
++ uint16_t tmp8*8 __attribute__((aligned(64)));
++ transpose8x8(tmp,src + 8*i + 8*j*sstride,8,sstride);
++ transpose8x8(dst + 8*i + 8*j*dstride, src + 8*j + 8*i*sstride,dstride,sstride);
++ for (int k=0;k<8;k++) COPY_16(dst+ 8*j + (8*i+k)*dstride,tmp + 8*k);
++ }
++ else
++ {
++ transpose8x8(dst + 8*(j + i*dstride),src + 8*(i + j*sstride),dstride,sstride);
++ transpose8x8(dst + 8*(i + j*dstride),src + 8*(j + i*sstride),dstride,sstride);
++ }
++ 
++ }
++ }
++}
++
++
++
++
++}
++
++
++
+diff --git a/source/common/arm64/arm64-utils.h b/source/common/arm64/arm64-utils.h
+new file mode 100644
+index 0000000..bf1d346
+--- /dev/null
++++ b/source/common/arm64/arm64-utils.h
+@@ -0,0 +1,14 @@
++#ifndef __ARM64_UTILS_H__
++#define __ARM64_UTILS_H__
++
++
++namespace X265_NS {
++void transpose8x8(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride);
++void transpose16x16(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride);
++void transpose32x32(uint8_t* dst, const uint8_t* src, intptr_t dstride, intptr_t sstride);
++void transpose8x8(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride);
++void transpose16x16(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride);
++void transpose32x32(uint16_t* dst, const uint16_t* src, intptr_t dstride, intptr_t sstride);
++}
++
++#endif
+diff --git a/source/common/arm64/asm-primitives.cpp b/source/common/arm64/asm-primitives.cpp
+new file mode 100644
+index 0000000..f7a8a70
+--- /dev/null
++++ b/source/common/arm64/asm-primitives.cpp
+@@ -0,0 +1,53 @@
++/*****************************************************************************
++ * Copyright (C) 2013-2017 MulticoreWare, Inc
++ *
++ * Authors: Steve Borho <steve@borho.org>
++ * Praveen Kumar Tiwari <praveen@multicorewareinc.com>
++ * Min Chen <chenm003@163.com> <min.chen@multicorewareinc.com>
++ * Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>
++ *
++ * 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.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
++ *
++ * This program is also available under a commercial proprietary license.
++ * For more information, contact us at license @ x265.com.
++ *****************************************************************************/
++
++#include "common.h"
++#include "primitives.h"
++#include "x265.h"
++#include "cpu.h"
++
++#include "pixel-prim.h"
++#include "filter-prim.h"
++#include "dct-prim.h"
++#include "loopfilter-prim.h"
++#include "intrapred-prim.h"
++
++namespace X265_NS {
++// private x265 namespace
++
++void setupAssemblyPrimitives(EncoderPrimitives &p, int cpuMask)
++{
++ if (cpuMask & X265_CPU_NEON)
++ {
++ setupPixelPrimitives_neon(p);
++ setupFilterPrimitives_neon(p);
++ setupDCTPrimitives_neon(p);
++ setupLoopFilterPrimitives_neon(p);
++ setupIntraPrimitives_neon(p);
++ }
++}
++
++} // namespace X265_NS
+diff --git a/source/common/arm64/dct-prim.cpp b/source/common/arm64/dct-prim.cpp
+new file mode 100644
+index 0000000..5160293
+--- /dev/null
++++ b/source/common/arm64/dct-prim.cpp
+@@ -0,0 +1,933 @@
++#include "dct-prim.h"
++
++
++#if HAVE_NEON
++
++#include <arm_neon.h>
++
++
++namespace {
++using namespace X265_NS;
++
++
++static int16x8_t rev16(const int16x8_t a)
++{
++ static const int8x16_t tbl = {14,15,12,13,10,11,8,9,6,7,4,5,2,3,0,1};
++ return vqtbx1q_u8(a,a,tbl);
++}
++
++static int32x4_t rev32(const int32x4_t a)
++{
++ static const int8x16_t tbl = {12,13,14,15,8,9,10,11,4,5,6,7,0,1,2,3};
++ return vqtbx1q_u8(a,a,tbl);
++}
++ 
++static void transpose_4x4x16(int16x4_t& x0,int16x4_t& x1,int16x4_t& x2,int16x4_t& x3)
++{
++ int16x4_t s0,s1,s2,s3;
++ s0 = vtrn1_s32(x0,x2);
++ s1 = vtrn1_s32(x1,x3);
++ s2 = vtrn2_s32(x0,x2);
++ s3 = vtrn2_s32(x1,x3);
++ 
++ x0 = vtrn1_s16(s0,s1);
++ x1 = vtrn2_s16(s0,s1);
++ x2 = vtrn1_s16(s2,s3);
++ x3 = vtrn2_s16(s2,s3);
++}
++
++
++
++static int scanPosLast_opt(const uint16_t *scan, const coeff_t *coeff, uint16_t *coeffSign, uint16_t *coeffFlag, uint8_t *coeffNum, int numSig, const uint16_t* /*scanCG4x4*/, const int /*trSize*/)
++{
++
++ // This is an optimized function for scanPosLast, which removes the rmw dependency, once integrated into mainline x265, should replace reference implementation
++ // For clarity, left the original reference code in comments
++ int scanPosLast = 0;
++ 
++ uint16_t cSign = 0;
++ uint16_t cFlag = 0;
++ uint8_t cNum = 0;
++ 
++ uint32_t prevcgIdx = 0;
++ do
++ {
++ const uint32_t cgIdx = (uint32_t)scanPosLast >> MLS_CG_SIZE;
++
++ const uint32_t posLast = scanscanPosLast;
++
++ const int curCoeff = coeffposLast;
++ const uint32_t isNZCoeff = (curCoeff != 0);
++ /*
++ NOTE: the new algorithm is complicated, so I keep reference code here
++ uint32_t posy = posLast >> log2TrSize;
++ uint32_t posx = posLast - (posy << log2TrSize);
++ uint32_t blkIdx0 = ((posy >> MLS_CG_LOG2_SIZE) << codingParameters.log2TrSizeCG) + (posx >> MLS_CG_LOG2_SIZE);
++ const uint32_t blkIdx = ((posLast >> (2 * MLS_CG_LOG2_SIZE)) & ~maskPosXY) + ((posLast >> MLS_CG_LOG2_SIZE) & maskPosXY);
++ sigCoeffGroupFlag64 |= ((uint64_t)isNZCoeff << blkIdx);
++ */
++
++ // get L1 sig map
++ numSig -= isNZCoeff;
++
++ if (scanPosLast % (1<<MLS_CG_SIZE) == 0)
++ {
++ coeffSignprevcgIdx = cSign;
++ coeffFlagprevcgIdx = cFlag;
++ coeffNumprevcgIdx = cNum;
++ cSign = 0;
++ cFlag = 0;
++ cNum = 0;
++ }
++ // TODO: optimize by instruction BTS
++ cSign += (uint16_t)(((curCoeff < 0) ? 1 : 0) << cNum);
++ cFlag = (cFlag << 1) + (uint16_t)isNZCoeff;
++ cNum += (uint8_t)isNZCoeff;
++ prevcgIdx = cgIdx;
++ scanPosLast++;
++ }
++ while (numSig > 0);
++
++ coeffSignprevcgIdx = cSign;
++ coeffFlagprevcgIdx = cFlag;
++ coeffNumprevcgIdx = cNum;
++ return scanPosLast - 1;
++}
++
++
++#if (MLS_CG_SIZE == 4)
++template<int log2TrSize>
++static void nonPsyRdoQuant_neon(int16_t *m_resiDctCoeff, int64_t *costUncoded, int64_t *totalUncodedCost, int64_t *totalRdCost, uint32_t blkPos)
++{
++ const int transformShift = MAX_TR_DYNAMIC_RANGE - X265_DEPTH - log2TrSize; /* Represents scaling through forward transform */
++ const int scaleBits = SCALE_BITS - 2 * transformShift;
++ const uint32_t trSize = 1 << log2TrSize;
++
++ int64x2_t vcost_sum_0 = vdupq_n_s64(0);
++ int64x2_t vcost_sum_1 = vdupq_n_s64(0);
++ for (int y = 0; y < MLS_CG_SIZE; y++)
++ {
++ int16x4_t in = *(int16x4_t *)&m_resiDctCoeffblkPos;
++ int32x4_t mul = vmull_s16(in,in);
++ int64x2_t cost0, cost1;
++ cost0 = vshll_n_s32(vget_low_s32(mul),scaleBits);
++ cost1 = vshll_high_n_s32(mul,scaleBits);
++ *(int64x2_t *)&costUncodedblkPos+0 = cost0;
++ *(int64x2_t *)&costUncodedblkPos+2 = cost1;
++ vcost_sum_0 = vaddq_s64(vcost_sum_0,cost0);
++ vcost_sum_1 = vaddq_s64(vcost_sum_1,cost1);
++ blkPos += trSize;
++ }
++ int64_t sum = vaddvq_s64(vaddq_s64(vcost_sum_0,vcost_sum_1));
++ *totalUncodedCost += sum;
++ *totalRdCost += sum;
++}
++
++template<int log2TrSize>
++static void psyRdoQuant_neon(int16_t *m_resiDctCoeff, int16_t *m_fencDctCoeff, int64_t *costUncoded, int64_t *totalUncodedCost, int64_t *totalRdCost, int64_t *psyScale, uint32_t blkPos)
++{
++ const int transformShift = MAX_TR_DYNAMIC_RANGE - X265_DEPTH - log2TrSize; /* Represents scaling through forward transform */
++ const int scaleBits = SCALE_BITS - 2 * transformShift;
++ const uint32_t trSize = 1 << log2TrSize;
++ //using preprocessor to bypass clang bug
++ const int max = X265_MAX(0, (2 * transformShift + 1));
++
++ int64x2_t vcost_sum_0 = vdupq_n_s64(0);
++ int64x2_t vcost_sum_1 = vdupq_n_s64(0);
++ int32x4_t vpsy = vdupq_n_s32(*psyScale);
++ for (int y = 0; y < MLS_CG_SIZE; y++)
++ {
++ int32x4_t signCoef = vmovl_s16(*(int16x4_t *)&m_resiDctCoeffblkPos);
++ int32x4_t predictedCoef = vsubq_s32(vmovl_s16(*(int16x4_t *)&m_fencDctCoeffblkPos),signCoef);
++ int64x2_t cost0, cost1;
++ cost0 = vmull_s32(vget_low_s32(signCoef),vget_low_s32(signCoef));
++ cost1 = vmull_high_s32(signCoef,signCoef);
++ cost0 = vshlq_n_s64(cost0,scaleBits);
++ cost1 = vshlq_n_s64(cost1,scaleBits);
++ int64x2_t neg0 = vmull_s32(vget_low_s32(predictedCoef),vget_low_s32(vpsy));
++ int64x2_t neg1 = vmull_high_s32(predictedCoef,vpsy);
++ if (max > 0) {
++ int64x2_t shift = vdupq_n_s64(-max);
++ neg0 = vshlq_s64(neg0,shift);
++ neg1 = vshlq_s64(neg1,shift);
++ }
++ cost0 = vsubq_s64(cost0,neg0);
++ cost1 = vsubq_s64(cost1,neg1);
++ *(int64x2_t *)&costUncodedblkPos+0 = cost0;
++ *(int64x2_t *)&costUncodedblkPos+2 = cost1;
++ vcost_sum_0 = vaddq_s64(vcost_sum_0,cost0);
++ vcost_sum_1 = vaddq_s64(vcost_sum_1,cost1);
++ 
++ blkPos += trSize;
++ }
++ int64_t sum = vaddvq_s64(vaddq_s64(vcost_sum_0,vcost_sum_1));
++ *totalUncodedCost += sum;
++ *totalRdCost += sum;
++}
++
++#else
++ #error "MLS_CG_SIZE must be 4 for neon version"
++#endif
++
++
++
++template<int trSize>
++int count_nonzero_neon(const int16_t* quantCoeff)
++{
++ X265_CHECK(((intptr_t)quantCoeff & 15) == 0, "quant buffer not aligned\n");
++ int count = 0;
++ int16x8_t vcount = vdupq_n_s16(0);
++ const int numCoeff = trSize * trSize;
++ int i = 0;
++ for (; (i + 8) <= numCoeff; i+=8)
++ {
++ int16x8_t in = *(int16x8_t*)&quantCoeffi;
++ vcount = vaddq_s16(vcount,vtstq_s16(in,in));
++ }
++ for (; i < numCoeff; i++)
++ {
++ count += quantCoeffi != 0;
++ }
++
++ return count - vaddvq_s16(vcount);
++}
++
++template<int trSize>
++uint32_t copy_count_neon(int16_t* coeff, const int16_t* residual, intptr_t resiStride)
++{
++ uint32_t numSig = 0;
++ int16x8_t vcount = vdupq_n_s16(0);
++ for (int k = 0; k < trSize; k++)
++ {
++ int j = 0;
++ for (; (j + 8) <= trSize; j+=8)
++ {
++ int16x8_t in = *(int16x8_t*)&residualj;
++ *(int16x8_t*)&coeffj = in;
++ vcount = vaddq_s16(vcount,vtstq_s16(in,in));
++ }
++ for (; j < trSize; j++)
++ {
++ coeffj = residualj;
++ numSig += (residualj != 0);
++ }
++ residual += resiStride;
++ coeff += trSize;
++ }
++
++ return numSig - vaddvq_s16(vcount);
++}
++
++
++static void partialButterfly16(const int16_t* src, int16_t* dst, int shift, int line)
++{
++ int j, k;
++ int32x4_t E2, O2;
++ int32x4_t EE, EO;
++ int32x2_t EEE, EEO;
++ const int add = 1 << (shift - 1);
++ const int32x4_t _vadd = {add,0};
++ 
++ for (j = 0; j < line; j++)
++ {
++ int16x8_t in0 = *(int16x8_t *)src;
++ int16x8_t in1 = rev16(*(int16x8_t *)&src8);
++ 
++ E0 = vaddl_s16(vget_low_s16(in0),vget_low_s16(in1));
++ O0 = vsubl_s16(vget_low_s16(in0),vget_low_s16(in1));
++ E1 = vaddl_high_s16(in0,in1);
++ O1 = vsubl_high_s16(in0,in1);
++
++ for (k = 1; k < 16; k += 2)
++ {
++ int32x4_t c0 = vmovl_s16(*(int16x4_t *)&g_t16k0);
++ int32x4_t c1 = vmovl_s16(*(int16x4_t *)&g_t16k4);
++ 
++ int32x4_t res = _vadd;
++ res = vmlaq_s32(res,c0,O0);
++ res = vmlaq_s32(res,c1,O1);
++ dstk * line = (int16_t)(vaddvq_s32(res) >> shift);
++ }
++
++ /* EE and EO */
++ EE = vaddq_s32(E0,rev32(E1));
++ EO = vsubq_s32(E0,rev32(E1));
++ 
++ for (k = 2; k < 16; k += 4)
++ {
++ int32x4_t c0 = vmovl_s16(*(int16x4_t *)&g_t16k0);
++ int32x4_t res = _vadd;
++ res = vmlaq_s32(res,c0,EO);
++ dstk * line = (int16_t)(vaddvq_s32(res) >> shift);
++ }
++
++ /* EEE and EEO */
++ EEE0 = EE0 + EE3;
++ EEO0 = EE0 - EE3;
++ EEE1 = EE1 + EE2;
++ EEO1 = EE1 - EE2;
++ 
++ dst0 = (int16_t)((g_t1600 * EEE0 + g_t1601 * EEE1 + add) >> shift);
++ dst8 * line = (int16_t)((g_t1680 * EEE0 + g_t1681 * EEE1 + add) >> shift);
++ dst4 * line = (int16_t)((g_t1640 * EEO0 + g_t1641 * EEO1 + add) >> shift);
++ dst12 * line = (int16_t)((g_t16120 * EEO0 + g_t16121 * EEO1 + add) >> shift);
++ 
++ 
++ src += 16;
++ dst++;
++ }
++}
++
++ 
++static void partialButterfly32(const int16_t* src, int16_t* dst, int shift, int line)
++{
++ int j, k;
++ const int add = 1 << (shift - 1);
++ 
++ 
++ for (j = 0; j < line; j++)
++ {
++ int32x4_t VE4, VO0,VO1,VO2,VO3;
++ int32x4_t VEE2, VEO2;
++ int32x4_t VEEE, VEEO;
++ int EEEE2, EEEO2;
++
++ int16x8x4_t inputs;
++ inputs = *(int16x8x4_t *)&src0;
++ int16x8x4_t in_rev;
++ 
++ in_rev.val1 = rev16(inputs.val2);
++ in_rev.val0 = rev16(inputs.val3);
++ 
++ VE0 = vaddl_s16(vget_low_s16(inputs.val0),vget_low_s16(in_rev.val0));
++ VE1 = vaddl_high_s16(inputs.val0,in_rev.val0);
++ VO0 = vsubl_s16(vget_low_s16(inputs.val0),vget_low_s16(in_rev.val0));
++ VO1 = vsubl_high_s16(inputs.val0,in_rev.val0);
++ VE2 = vaddl_s16(vget_low_s16(inputs.val1),vget_low_s16(in_rev.val1));
++ VE3 = vaddl_high_s16(inputs.val1,in_rev.val1);
++ VO2 = vsubl_s16(vget_low_s16(inputs.val1),vget_low_s16(in_rev.val1));
++ VO3 = vsubl_high_s16(inputs.val1,in_rev.val1);
++
++ for (k = 1; k < 32; k += 2)
++ {
++ int32x4_t c0 = vmovl_s16(*(int16x4_t *)&g_t32k0);
++ int32x4_t c1 = vmovl_s16(*(int16x4_t *)&g_t32k4);
++ int32x4_t c2 = vmovl_s16(*(int16x4_t *)&g_t32k8);
++ int32x4_t c3 = vmovl_s16(*(int16x4_t *)&g_t32k12);
++ int32x4_t s = vmulq_s32(c0,VO0);
++ s = vmlaq_s32(s,c1,VO1);
++ s = vmlaq_s32(s,c2,VO2);
++ s = vmlaq_s32(s,c3,VO3);
++ 
++ dstk * line = (int16_t)((vaddvq_s32(s) + add) >> shift);
++ 
++ }
++ 
++ int32x4_t rev_VE2;
++ 
++ 
++ rev_VE0 = rev32(VE3);
++ rev_VE1 = rev32(VE2);
++ 
++ /* EE and EO */
++ for (k = 0; k < 2; k++)
++ {
++ VEEk = vaddq_s32(VEk,rev_VEk);
++ VEOk = vsubq_s32(VEk,rev_VEk);
++ }
++ for (k = 2; k < 32; k += 4)
++ {
++ int32x4_t c0 = vmovl_s16(*(int16x4_t *)&g_t32k0);
++ int32x4_t c1 = vmovl_s16(*(int16x4_t *)&g_t32k4);
++ int32x4_t s = vmulq_s32(c0,VEO0);
++ s = vmlaq_s32(s,c1,VEO1);
++ 
++ dstk * line = (int16_t)((vaddvq_s32(s) + add) >> shift);
++ 
++ }
++ 
++ int32x4_t tmp = rev32(VEE1);
++ VEEE = vaddq_s32(VEE0,tmp);
++ VEEO = vsubq_s32(VEE0,tmp);
++ for (k = 4; k < 32; k += 8)
++ {
++ int32x4_t c = vmovl_s16(*(int16x4_t *)&g_t32k0);
++ int32x4_t s = vmulq_s32(c,VEEO);
++ 
++ dstk * line = (int16_t)((vaddvq_s32(s) + add) >> shift);
++ }
++ 
++ /* EEEE and EEEO */
++ EEEE0 = VEEE0 + VEEE3;
++ EEEO0 = VEEE0 - VEEE3;
++ EEEE1 = VEEE1 + VEEE2;
++ EEEO1 = VEEE1 - VEEE2;
++ 
++ dst0 = (int16_t)((g_t3200 * EEEE0 + g_t3201 * EEEE1 + add) >> shift);
++ dst16 * line = (int16_t)((g_t32160 * EEEE0 + g_t32161 * EEEE1 + add) >> shift);
++ dst8 * line = (int16_t)((g_t3280 * EEEO0 + g_t3281 * EEEO1 + add) >> shift);
++ dst24 * line = (int16_t)((g_t32240 * EEEO0 + g_t32241 * EEEO1 + add) >> shift);
++ 
++ 
++ 
++ src += 32;
++ dst++;
++ }
++}
++
++static void partialButterfly8(const int16_t* src, int16_t* dst, int shift, int line)
++{
++ int j, k;
++ int E4, O4;
++ int EE2, EO2;
++ int add = 1 << (shift - 1);
++
++ for (j = 0; j < line; j++)
++ {
++ /* E and O*/
++ for (k = 0; k < 4; k++)
++ {
++ Ek = srck + src7 - k;
++ Ok = srck - src7 - k;
++ }
++
++ /* EE and EO */
++ EE0 = E0 + E3;
++ EO0 = E0 - E3;
++ EE1 = E1 + E2;
++ EO1 = E1 - E2;
++
++ dst0 = (int16_t)((g_t800 * EE0 + g_t801 * EE1 + add) >> shift);
++ dst4 * line = (int16_t)((g_t840 * EE0 + g_t841 * EE1 + add) >> shift);
++ dst2 * line = (int16_t)((g_t820 * EO0 + g_t821 * EO1 + add) >> shift);
++ dst6 * line = (int16_t)((g_t860 * EO0 + g_t861 * EO1 + add) >> shift);
++
++ dstline = (int16_t)((g_t810 * O0 + g_t811 * O1 + g_t812 * O2 + g_t813 * O3 + add) >> shift);
++ dst3 * line = (int16_t)((g_t830 * O0 + g_t831 * O1 + g_t832 * O2 + g_t833 * O3 + add) >> shift);
++ dst5 * line = (int16_t)((g_t850 * O0 + g_t851 * O1 + g_t852 * O2 + g_t853 * O3 + add) >> shift);
++ dst7 * line = (int16_t)((g_t870 * O0 + g_t871 * O1 + g_t872 * O2 + g_t873 * O3 + add) >> shift);
++
++ src += 8;
++ dst++;
++ }
++}
++
++static void partialButterflyInverse4(const int16_t* src, int16_t* dst, int shift, int line)
++{
++ int j;
++ int E2, O2;
++ int add = 1 << (shift - 1);
++
++ for (j = 0; j < line; j++)
++ {
++ /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
++ O0 = g_t410 * srcline + g_t430 * src3 * line;
++ O1 = g_t411 * srcline + g_t431 * src3 * line;
++ E0 = g_t400 * src0 + g_t420 * src2 * line;
++ E1 = g_t401 * src0 + g_t421 * src2 * line;
++
++ /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
++ dst0 = (int16_t)(x265_clip3(-32768, 32767, (E0 + O0 + add) >> shift));
++ dst1 = (int16_t)(x265_clip3(-32768, 32767, (E1 + O1 + add) >> shift));
++ dst2 = (int16_t)(x265_clip3(-32768, 32767, (E1 - O1 + add) >> shift));
++ dst3 = (int16_t)(x265_clip3(-32768, 32767, (E0 - O0 + add) >> shift));
++
++ src++;
++ dst += 4;
++ }
++}
++
++ 
++ 
++static void partialButterflyInverse16_neon(const int16_t* src, int16_t* orig_dst, int shift, int line)
++{
++#define FMAK(x,l) sl = vmlal_lane_s16(sl,*(int16x4_t*)&src(x)*line,*(int16x4_t *)&g_t16xk,l)
++#define MULK(x,l) vmull_lane_s16(*(int16x4_t*)&srcx*line,*(int16x4_t *)&g_t16xk,l);
++#define ODD3_15(k) FMAK(3,k);FMAK(5,k);FMAK(7,k);FMAK(9,k);FMAK(11,k);FMAK(13,k);FMAK(15,k);
++#define EVEN6_14_STEP4(k) FMAK(6,k);FMAK(10,k);FMAK(14,k);
++
++
++ int j, k;
++ int32x4_t E8, O8;
++ int32x4_t EE4, EO4;
++ int32x4_t EEE2, EEO2;
++ const int add = 1 << (shift - 1);
++
++ 
++#pragma unroll(4)
++ for (j = 0; j < line; j+=4)
++ {
++ /* Utilizing symmetry properties to the maximum to minimize the number of multiplications */
++ 
++#pragma unroll(2)
++ for (k=0;k<2;k++) {
++ int32x4_t s;
++ s = vmull_s16(vdup_n_s16(g_t164k),*(int16x4_t*)&src4*line);;
++ EEOk = vmlal_s16(s,vdup_n_s16(g_t1612k),*(int16x4_t*)&src(12)*line);
++ s = vmull_s16(vdup_n_s16(g_t160k),*(int16x4_t*)&src0*line);;
++ EEEk = vmlal_s16(s,vdup_n_s16(g_t168k),*(int16x4_t*)&src(8)*line);
++ }
++ 
++ /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
++ EE0 = vaddq_s32(EEE0 , EEO0);
++ EE2 = vsubq_s32(EEE1 , EEO1);
++ EE1 = vaddq_s32(EEE1 , EEO1);
++ EE3 = vsubq_s32(EEE0 , EEO0);
++
++
++#pragma unroll(1)
++ for (k = 0; k < 4; k+=4)
++ {
++ int32x4_t s4;
++ s0 = MULK(2,0);
++ s1 = MULK(2,1);
++ s2 = MULK(2,2);
++ s3 = MULK(2,3);
++ 
++ EVEN6_14_STEP4(0);
++ EVEN6_14_STEP4(1);
++ EVEN6_14_STEP4(2);
++ EVEN6_14_STEP4(3);
++ 
++ EOk = s0;
++ EOk+1 = s1;
++ EOk+2 = s2;
++ EOk+3 = s3;
++ }
++ 
++
++ 
++ static const int32x4_t min = vdupq_n_s32(-32768);
++ static const int32x4_t max = vdupq_n_s32(32767);
++ const int32x4_t minus_shift = vdupq_n_s32(-shift);
++
++#pragma unroll(4)
++ for (k = 0; k < 4; k++)
++ {
++ Ek = vaddq_s32(EEk , EOk);
++ Ek + 4 = vsubq_s32(EE3 - k , EO3 - k);
++ }
++ 
++#pragma unroll(2)
++ for (k = 0; k < 8; k+=4)
++ {
++ int32x4_t s4;
++ s0 = MULK(1,0);
++ s1 = MULK(1,1);
++ s2 = MULK(1,2);
++ s3 = MULK(1,3);
++ ODD3_15(0);
++ ODD3_15(1);
++ ODD3_15(2);
++ ODD3_15(3);
++ Ok = s0;
++ Ok+1 = s1;
++ Ok+2 = s2;
++ Ok+3 = s3;
++ int32x4_t t;
++ int16x4_t x0,x1,x2,x3;
++ 
++ Ek = vaddq_s32(vdupq_n_s32(add),Ek);
++ t = vaddq_s32(Ek,Ok);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x0 = vmovn_s32(t);
++
++ Ek+1 = vaddq_s32(vdupq_n_s32(add),Ek+1);
++ t = vaddq_s32(Ek+1,Ok+1);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x1 = vmovn_s32(t);
++
++ Ek+2 = vaddq_s32(vdupq_n_s32(add),Ek+2);
++ t = vaddq_s32(Ek+2,Ok+2);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x2 = vmovn_s32(t);
++
++ Ek+3 = vaddq_s32(vdupq_n_s32(add),Ek+3);
++ t = vaddq_s32(Ek+3,Ok+3);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x3 = vmovn_s32(t);
++ 
++ transpose_4x4x16(x0,x1,x2,x3);
++ *(int16x4_t*)&orig_dst0*16+k = x0;
++ *(int16x4_t*)&orig_dst1*16+k = x1;
++ *(int16x4_t*)&orig_dst2*16+k = x2;
++ *(int16x4_t*)&orig_dst3*16+k = x3;
++ }
++
++
++#pragma unroll(2)
++ for (k = 0; k < 8; k+=4)
++ {
++ int32x4_t t;
++ int16x4_t x0,x1,x2,x3;
++ 
++ t = vsubq_s32(E7-k,O7-k);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x0 = vmovn_s32(t);
++ 
++ t = vsubq_s32(E6-k,O6-k);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x1 = vmovn_s32(t);
++ 
++ t = vsubq_s32(E5-k,O5-k);
++ 
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x2 = vmovn_s32(t);
++ 
++ t = vsubq_s32(E4-k,O4-k);
++ t = vshlq_s32(t,minus_shift);
++ t = vmaxq_s32(t,min);
++ t = vminq_s32(t,max);
++ x3 = vmovn_s32(t);
++ 
++ transpose_4x4x16(x0,x1,x2,x3);
++ *(int16x4_t*)&orig_dst0*16+k+8 = x0;
++ *(int16x4_t*)&orig_dst1*16+k+8 = x1;
++ *(int16x4_t*)&orig_dst2*16+k+8 = x2;
++ *(int16x4_t*)&orig_dst3*16+k+8 = x3;
++ }
++ orig_dst += 4*16;
++ src+=4;
++ }
++ 
++#undef MUL
++#undef FMA
++#undef FMAK
++#undef MULK
++#undef ODD3_15
++#undef EVEN6_14_STEP4
++
++ 
++}
++
++
++
++static void partialButterflyInverse32_neon(const int16_t* src, int16_t* orig_dst, int shift, int line)
++{
++#define MUL(x) vmull_s16(vdup_n_s16(g_t32xk),*(int16x4_t*)&srcx*line);
++#define FMA(x) s = vmlal_s16(s,vdup_n_s16(g_t32xk),*(int16x4_t*)&src(x)*line)
++#define FMAK(x,l) sl = vmlal_lane_s16(sl,*(int16x4_t*)&src(x)*line,*(int16x4_t *)&g_t32xk,l)
++#define MULK(x,l) vmull_lane_s16(*(int16x4_t*)&srcx*line,*(int16x4_t *)&g_t32xk,l);
++#define ODD31(k) FMAK(3,k);FMAK(5,k);FMAK(7,k);FMAK(9,k);FMAK(11,k);FMAK(13,k);FMAK(15,k);FMAK(17,k);FMAK(19,k);FMAK(21,k);FMAK(23,k);FMAK(25,k);FMAK(27,k);FMAK(29,k);FMAK(31,k);
++
++#define ODD15(k) FMAK(6,k);FMAK(10,k);FMAK(14,k);FMAK(18,k);FMAK(22,k);FMAK(26,k);FMAK(30,k);
++#define ODD7(k) FMAK(12,k);FMAK(20,k);FMAK(28,k);
++
++
++ int j, k;
++ int32x4_t E16, O16;
++ int32x4_t EE8, EO8;
++ int32x4_t EEE4, EEO4;
++ int32x4_t EEEE2, EEEO2;
++ int16x4_t dst32;
++ int add = 1 << (shift - 1);
++ 
++#pragma unroll (8)
++ for (j = 0; j < line; j+=4)
++ {
++#pragma unroll (4)
++ for (k = 0; k < 16; k+=4)
++ {
++ int32x4_t s4;
++ s0 = MULK(1,0);
++ s1 = MULK(1,1);
++ s2 = MULK(1,2);
++ s3 = MULK(1,3);
++ ODD31(0);
++ ODD31(1);
++ ODD31(2);
++ ODD31(3);
++ Ok = s0;
++ Ok+1 = s1;
++ Ok+2 = s2;
++ Ok+3 = s3;
++ 
++ 
++ }
++ 
++ 
++#pragma unroll (2)
++ for (k = 0; k < 8; k+=4)
++ {
++ int32x4_t s4;
++ s0 = MULK(2,0);
++ s1 = MULK(2,1);
++ s2 = MULK(2,2);
++ s3 = MULK(2,3);
++ 
++ ODD15(0);
++ ODD15(1);
++ ODD15(2);
++ ODD15(3);
++ 
++ EOk = s0;
++ EOk+1 = s1;
++ EOk+2 = s2;
++ EOk+3 = s3;
++ }
++ 
++ 
++ for (k = 0; k < 4; k+=4)
++ {
++ int32x4_t s4;
++ s0 = MULK(4,0);
++ s1 = MULK(4,1);
++ s2 = MULK(4,2);
++ s3 = MULK(4,3);
++ 
++ ODD7(0);
++ ODD7(1);
++ ODD7(2);
++ ODD7(3);
++ 
++ EEOk = s0;
++ EEOk+1 = s1;
++ EEOk+2 = s2;
++ EEOk+3 = s3;
++ }
++ 
++#pragma unroll (2)
++ for (k=0;k<2;k++) {
++ int32x4_t s;
++ s = MUL(8);
++ EEEOk = FMA(24);
++ s = MUL(0);
++ EEEEk = FMA(16);
++ }
++ /* Combining even and odd terms at each hierarchy levels to calculate the final spatial domain vector */
++ EEE0 = vaddq_s32(EEEE0,EEEO0);
++ EEE3 = vsubq_s32(EEEE0,EEEO0);
++ EEE1 = vaddq_s32(EEEE1,EEEO1);
++ EEE2 = vsubq_s32(EEEE1,EEEO1);
++ 
++#pragma unroll (4)
++ for (k = 0; k < 4; k++)
++ {
++ EEk = vaddq_s32(EEEk,EEOk);
++ EEk + 4 = vsubq_s32((EEE3 - k), (EEO3 - k));
++ }
++ 
++#pragma unroll (8)
++ for (k = 0; k < 8; k++)
++ {
++ Ek = vaddq_s32(EEk,EOk);
++ Ek + 8 = vsubq_s32((EE7 - k),(EO7 - k));
++ }
++ 
++ static const int32x4_t min = vdupq_n_s32(-32768);
++ static const int32x4_t max = vdupq_n_s32(32767);
++ 
++ 
++ 
++#pragma unroll (16)
++ for (k = 0; k < 16; k++)
++ {
++ int32x4_t adde = vaddq_s32(vdupq_n_s32(add),Ek);
++ int32x4_t s = vaddq_s32(adde,Ok);
++ s = vshlq_s32(s,vdupq_n_s32(-shift));
++ s = vmaxq_s32(s,min);
++ s = vminq_s32(s,max);
++ 
++ 
++ 
++ dstk = vmovn_s32(s);
++ adde = vaddq_s32(vdupq_n_s32(add),(E15-k));
++ s =vsubq_s32(adde,(O15-k));
++ s = vshlq_s32(s,vdupq_n_s32(-shift));
++ s = vmaxq_s32(s,min);
++ s = vminq_s32(s,max);
++ 
++ dstk+16 = vmovn_s32(s);
++ }
++ 
++
++#pragma unroll (8)
++ for (k = 0; k < 32; k+=4)
++ {
++ int16x4_t x0 = dstk+0;
++ int16x4_t x1 = dstk+1;
++ int16x4_t x2 = dstk+2;
++ int16x4_t x3 = dstk+3;
++ transpose_4x4x16(x0,x1,x2,x3);
++ *(int16x4_t*)&orig_dst0*32+k = x0;
++ *(int16x4_t*)&orig_dst1*32+k = x1;
++ *(int16x4_t*)&orig_dst2*32+k = x2;
++ *(int16x4_t*)&orig_dst3*32+k = x3;
++ }
++ orig_dst += 4*32;
++ src += 4;
++ }
++#undef MUL
++#undef FMA
++#undef FMAK
++#undef MULK
++#undef ODD31
++#undef ODD15
++#undef ODD7
++
++}
++
++
++static void dct8_neon(const int16_t* src, int16_t* dst, intptr_t srcStride)
++{
++ const int shift_1st = 2 + X265_DEPTH - 8;
++ const int shift_2nd = 9;
++
++ ALIGN_VAR_32(int16_t, coef8 * 8);
++ ALIGN_VAR_32(int16_t, block8 * 8);
++
++ for (int i = 0; i < 8; i++)
++ {
++ memcpy(&blocki * 8, &srci * srcStride, 8 * sizeof(int16_t));
++ }
++
++ partialButterfly8(block, coef, shift_1st, 8);
++ partialButterfly8(coef, dst, shift_2nd, 8);
++}
++
++static void dct16_neon(const int16_t* src, int16_t* dst, intptr_t srcStride)
++{
++ const int shift_1st = 3 + X265_DEPTH - 8;
++ const int shift_2nd = 10;
++
++ ALIGN_VAR_32(int16_t, coef16 * 16);
++ ALIGN_VAR_32(int16_t, block16 * 16);
++
++ for (int i = 0; i < 16; i++)
++ {
++ memcpy(&blocki * 16, &srci * srcStride, 16 * sizeof(int16_t));
++ }
++
++ partialButterfly16(block, coef, shift_1st, 16);
++ partialButterfly16(coef, dst, shift_2nd, 16);
++}
++
++static void dct32_neon(const int16_t* src, int16_t* dst, intptr_t srcStride)
++{
++ const int shift_1st = 4 + X265_DEPTH - 8;
++ const int shift_2nd = 11;
++
++ ALIGN_VAR_32(int16_t, coef32 * 32);
++ ALIGN_VAR_32(int16_t, block32 * 32);
++
++ for (int i = 0; i < 32; i++)
++ {
++ memcpy(&blocki * 32, &srci * srcStride, 32 * sizeof(int16_t));
++ }
++
++ partialButterfly32(block, coef, shift_1st, 32);
++ partialButterfly32(coef, dst, shift_2nd, 32);
++}
++
++static void idct4_neon(const int16_t* src, int16_t* dst, intptr_t dstStride)
++{
++ const int shift_1st = 7;
++ const int shift_2nd = 12 - (X265_DEPTH - 8);
++
++ ALIGN_VAR_32(int16_t, coef4 * 4);
++ ALIGN_VAR_32(int16_t, block4 * 4);
++
++ partialButterflyInverse4(src, coef, shift_1st, 4); // Forward DST BY FAST ALGORITHM, block input, coef output
++ partialButterflyInverse4(coef, block, shift_2nd, 4); // Forward DST BY FAST ALGORITHM, coef input, coeff output
++
++ for (int i = 0; i < 4; i++)
++ {
++ memcpy(&dsti * dstStride, &blocki * 4, 4 * sizeof(int16_t));
++ }
++}
++
++static void idct16_neon(const int16_t* src, int16_t* dst, intptr_t dstStride)
++{
++ const int shift_1st = 7;
++ const int shift_2nd = 12 - (X265_DEPTH - 8);
++
++ ALIGN_VAR_32(int16_t, coef16 * 16);
++ ALIGN_VAR_32(int16_t, block16 * 16);
++
++ partialButterflyInverse16_neon(src, coef, shift_1st, 16);
++ partialButterflyInverse16_neon(coef, block, shift_2nd, 16);
++
++ for (int i = 0; i < 16; i++)
++ {
++ memcpy(&dsti * dstStride, &blocki * 16, 16 * sizeof(int16_t));
++ }
++}
++
++static void idct32_neon(const int16_t* src, int16_t* dst, intptr_t dstStride)
++{
++ const int shift_1st = 7;
++ const int shift_2nd = 12 - (X265_DEPTH - 8);
++
++ ALIGN_VAR_32(int16_t, coef32 * 32);
++ ALIGN_VAR_32(int16_t, block32 * 32);
++
++ partialButterflyInverse32_neon(src, coef, shift_1st, 32);
++ partialButterflyInverse32_neon(coef, block, shift_2nd, 32);
++
++ for (int i = 0; i < 32; i++)
++ {
++ memcpy(&dsti * dstStride, &blocki * 32, 32 * sizeof(int16_t));
++ }
++}
++
++
++
++}
++
++namespace X265_NS {
++// x265 private namespace
++void setupDCTPrimitives_neon(EncoderPrimitives& p) {
++ p.cuBLOCK_4x4.nonPsyRdoQuant = nonPsyRdoQuant_neon<2>;
++ p.cuBLOCK_8x8.nonPsyRdoQuant = nonPsyRdoQuant_neon<3>;
++ p.cuBLOCK_16x16.nonPsyRdoQuant = nonPsyRdoQuant_neon<4>;
++ p.cuBLOCK_32x32.nonPsyRdoQuant = nonPsyRdoQuant_neon<5>;
++ p.cuBLOCK_4x4.psyRdoQuant = psyRdoQuant_neon<2>;
++ p.cuBLOCK_8x8.psyRdoQuant = psyRdoQuant_neon<3>;
++ p.cuBLOCK_16x16.psyRdoQuant = psyRdoQuant_neon<4>;
++ p.cuBLOCK_32x32.psyRdoQuant = psyRdoQuant_neon<5>;
++ p.cuBLOCK_8x8.dct = dct8_neon;
++ p.cuBLOCK_16x16.dct = dct16_neon;
++ p.cuBLOCK_32x32.dct = dct32_neon;
++ p.cuBLOCK_4x4.idct = idct4_neon;
++ p.cuBLOCK_16x16.idct = idct16_neon;
++ p.cuBLOCK_32x32.idct = idct32_neon;
++ p.cuBLOCK_4x4.count_nonzero = count_nonzero_neon<4>;
++ p.cuBLOCK_8x8.count_nonzero = count_nonzero_neon<8>;
++ p.cuBLOCK_16x16.count_nonzero = count_nonzero_neon<16>;
++ p.cuBLOCK_32x32.count_nonzero = count_nonzero_neon<32>;
++
++ p.cuBLOCK_4x4.copy_cnt = copy_count_neon<4>;
++ p.cuBLOCK_8x8.copy_cnt = copy_count_neon<8>;
++ p.cuBLOCK_16x16.copy_cnt = copy_count_neon<16>;
++ p.cuBLOCK_32x32.copy_cnt = copy_count_neon<32>;
++ p.cuBLOCK_4x4.psyRdoQuant_1p = nonPsyRdoQuant_neon<2>;
++ p.cuBLOCK_4x4.psyRdoQuant_2p = psyRdoQuant_neon<2>;
++ p.cuBLOCK_8x8.psyRdoQuant_1p = nonPsyRdoQuant_neon<3>;
++ p.cuBLOCK_8x8.psyRdoQuant_2p = psyRdoQuant_neon<3>;
++ p.cuBLOCK_16x16.psyRdoQuant_1p = nonPsyRdoQuant_neon<4>;
++ p.cuBLOCK_16x16.psyRdoQuant_2p = psyRdoQuant_neon<4>;
++ p.cuBLOCK_32x32.psyRdoQuant_1p = nonPsyRdoQuant_neon<5>;
++ p.cuBLOCK_32x32.psyRdoQuant_2p = psyRdoQuant_neon<5>;
++ 
++ p.scanPosLast =scanPosLast_opt;
++
++}
++};
++
++
++
++#endif
+diff --git a/source/common/arm64/dct-prim.h b/source/common/arm64/dct-prim.h
+new file mode 100644
+index 0000000..598bb33
+--- /dev/null
++++ b/source/common/arm64/dct-prim.h
+@@ -0,0 +1,18 @@
++#ifndef __DCT_PRIM_NEON_H__
++#define __DCT_PRIM_NEON_H__
++
++
++#include "common.h"
++#include "primitives.h"
++#include "contexts.h" // costCoeffNxN_c
++#include "threading.h" // CLZ
++
++namespace X265_NS {
++// x265 private namespace
++void setupDCTPrimitives_neon(EncoderPrimitives& p);
++};
++
++
++
++#endif
++
+diff --git a/source/common/arm64/filter-prim.cpp b/source/common/arm64/filter-prim.cpp
+new file mode 100644
+index 0000000..d22489c
+--- /dev/null
++++ b/source/common/arm64/filter-prim.cpp
+@@ -0,0 +1,797 @@
++
++#if HAVE_NEON
++
++#include "filter-prim.h"
++#include <arm_neon.h>
++
++namespace {
++
++using namespace X265_NS;
++
++
++template<int width, int height>
++void filterPixelToShort_neon(const pixel* src, intptr_t srcStride, int16_t* dst, intptr_t dstStride)
++{
++ const int shift = IF_INTERNAL_PREC - X265_DEPTH;
++ int row, col;
++ const int16x8_t off = vdupq_n_s16(IF_INTERNAL_OFFS);
++ for (row = 0; row < height; row++)
++ {
++ 
++ for (col = 0; col < width; col+=8)
++ {
++ int16x8_t in;
++ 
++#if HIGH_BIT_DEPTH
++ in = *(int16x8_t *)&srccol;
++#else
++ in = vmovl_u8(*(uint8x8_t *)&srccol);
++#endif
++ 
++ int16x8_t tmp = vshlq_n_s16(in,shift);
++ tmp = vsubq_s16(tmp,off);
++ *(int16x8_t *)&dstcol = tmp;
++ 
++ }
++
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++
++template<int N, int width, int height>
++void interp_horiz_pp_neon(const pixel* src, intptr_t srcStride, pixel* dst, intptr_t dstStride, int coeffIdx)
++{
++ const int16_t* coeff = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ int headRoom = IF_FILTER_PREC;
++ int offset = (1 << (headRoom - 1));
++ uint16_t maxVal = (1 << X265_DEPTH) - 1;
++ int cStride = 1;
++
++ src -= (N / 2 - 1) * cStride;
++ int16x8_t vc;
++ vc = *(int16x8_t *)coeff;
++ int16x4_t low_vc = vget_low_s16(vc);
++ int16x4_t high_vc = vget_high_s16(vc);
++
++ const int32x4_t voffset = vdupq_n_s32(offset);
++ const int32x4_t vhr = vdupq_n_s32(-headRoom);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int32x4_t vsum1,vsum2;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++#if HIGH_BIT_DEPTH
++ inputi = *(int16x8_t *)&srccol+i;
++#else
++ inputi = vmovl_u8(*(uint8x8_t *)&srccol+i);
++#endif
++ }
++ vsum1 = voffset;
++ vsum2 = voffset;
++ 
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input0),low_vc,0);
++ vsum2 = vmlal_high_lane_s16(vsum2,input0,low_vc,0);
++ 
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input1),low_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input1,low_vc,1);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input2),low_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input2,low_vc,2);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input3),low_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input3,low_vc,3);
++
++ if (N == 8)
++ {
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input4),high_vc,0);
++ vsum2 = vmlal_high_lane_s16(vsum2,input4,high_vc,0);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input5),high_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input5,high_vc,1);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input6),high_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input6,high_vc,2);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input7),high_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input7,high_vc,3);
++ 
++ }
++ 
++ vsum1 = vshlq_s32(vsum1, vhr);
++ vsum2 = vshlq_s32(vsum2, vhr);
++ 
++ int16x8_t vsum = vuzp1q_s16(vsum1,vsum2);
++ vsum = vminq_s16(vsum,vdupq_n_s16(maxVal));
++ vsum = vmaxq_s16(vsum,vdupq_n_s16(0));
++#if HIGH_BIT_DEPTH
++ *(int16x8_t *)&dstcol = vsum;
++#else
++ uint8x16_t usum = vuzp1q_u8(vsum,vsum);
++ *(uint8x8_t *)&dstcol = vget_low_u8(usum);
++#endif
++ 
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++#if HIGH_BIT_DEPTH
++
++template<int N, int width, int height>
++void interp_horiz_ps_neon(const uint16_t * src, intptr_t srcStride, int16_t* dst, intptr_t dstStride, int coeffIdx, int isRowExt)
++{
++ const int16_t* coeff = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ const int headRoom = IF_INTERNAL_PREC - X265_DEPTH;
++ const int shift = IF_FILTER_PREC - headRoom;
++ const int offset = (unsigned)-IF_INTERNAL_OFFS << shift;
++
++ int blkheight = height;
++ src -= N / 2 - 1;
++
++ if (isRowExt)
++ {
++ src -= (N / 2 - 1) * srcStride;
++ blkheight += N - 1;
++ }
++ int32x4_t vc0 = vmovl_s16(*(int16x4_t *)coeff);
++ int32x4_t vc1;
++ 
++ if (N ==8) {
++ vc1 = vmovl_s16(*(int16x4_t *)(coeff + 4));
++ }
++ 
++ const int32x4_t voffset = vdupq_n_s32(offset);
++ const int32x4_t vhr = vdupq_n_s32(-shift);
++ 
++ int row, col;
++ for (row = 0; row < blkheight; row++)
++ {
++ for (col = 0; col < width; col+=4)
++ {
++ int32x4_t vsum;
++ 
++ int32x4_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_s16(*(int16x4_t *)&srccol+i);
++ }
++ vsum = voffset;
++ vsum = vmlaq_laneq_s32(vsum,(input0),vc0,0);
++ vsum = vmlaq_laneq_s32(vsum,(input1),vc0,1);
++ vsum = vmlaq_laneq_s32(vsum,(input2),vc0,2);
++ vsum = vmlaq_laneq_s32(vsum,(input3),vc0,3);
++
++
++ if (N == 8)
++ {
++ vsum = vmlaq_laneq_s32(vsum,(input4),vc1,0);
++ vsum = vmlaq_laneq_s32(vsum,(input5),vc1,1);
++ vsum = vmlaq_laneq_s32(vsum,(input6),vc1,2);
++ vsum = vmlaq_laneq_s32(vsum,(input7),vc1,3);
++ 
++ }
++ 
++ vsum = vshlq_s32(vsum, vhr);
++ *(int16x4_t *)&dstcol = vmovn_u32(vsum);
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++ }
++
++
++#else
++
++template<int N, int width, int height>
++void interp_horiz_ps_neon(const uint8_t* src, intptr_t srcStride, int16_t* dst, intptr_t dstStride, int coeffIdx, int isRowExt)
++{
++ const int16_t* coeff = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ const int headRoom = IF_INTERNAL_PREC - X265_DEPTH;
++ const int shift = IF_FILTER_PREC - headRoom;
++ const int offset = (unsigned)-IF_INTERNAL_OFFS << shift;
++
++ int blkheight = height;
++ src -= N / 2 - 1;
++
++ if (isRowExt)
++ {
++ src -= (N / 2 - 1) * srcStride;
++ blkheight += N - 1;
++ }
++ int16x8_t vc;
++ vc = *(int16x8_t *)coeff;
++
++ const int16x8_t voffset = vdupq_n_s16(offset);
++ const int16x8_t vhr = vdupq_n_s16(-shift);
++ 
++ int row, col;
++ for (row = 0; row < blkheight; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int16x8_t vsum;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_u8(*(uint8x8_t *)&srccol+i);
++ }
++ vsum = voffset;
++ vsum = vmlaq_laneq_s16(vsum,(input0),vc,0);
++ vsum = vmlaq_laneq_s16(vsum,(input1),vc,1);
++ vsum = vmlaq_laneq_s16(vsum,(input2),vc,2);
++ vsum = vmlaq_laneq_s16(vsum,(input3),vc,3);
++
++
++ if (N == 8)
++ {
++ vsum = vmlaq_laneq_s16(vsum,(input4),vc,4);
++ vsum = vmlaq_laneq_s16(vsum,(input5),vc,5);
++ vsum = vmlaq_laneq_s16(vsum,(input6),vc,6);
++ vsum = vmlaq_laneq_s16(vsum,(input7),vc,7);
++ 
++ }
++ 
++ vsum = vshlq_s16(vsum, vhr);
++ *(int16x8_t *)&dstcol = vsum;
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++ }
++
++#endif
++
++
++template<int N, int width, int height>
++void interp_vert_ss_neon(const int16_t* src, intptr_t srcStride, int16_t* dst, intptr_t dstStride, int coeffIdx)
++{
++ const int16_t* c = (N == 8 ? g_lumaFiltercoeffIdx : g_chromaFiltercoeffIdx);
++ int shift = IF_FILTER_PREC;
++ src -= (N / 2 - 1) * srcStride;
++ int16x8_t vc;
++ vc = *(int16x8_t *)c;
++ int16x4_t low_vc = vget_low_s16(vc);
++ int16x4_t high_vc = vget_high_s16(vc);
++
++ const int32x4_t vhr = vdupq_n_s32(-shift);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int32x4_t vsum1,vsum2;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = *(int16x8_t *)&srccol+i*srcStride;
++ }
++ 
++ vsum1 = vmull_lane_s16(vget_low_s16(input0),low_vc,0);
++ vsum2 = vmull_high_lane_s16(input0,low_vc,0);
++ 
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input1),low_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input1,low_vc,1);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input2),low_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input2,low_vc,2);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input3),low_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input3,low_vc,3);
++
++ if (N == 8)
++ {
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input4),high_vc,0);
++ vsum2 = vmlal_high_lane_s16(vsum2,input4,high_vc,0);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input5),high_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input5,high_vc,1);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input6),high_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input6,high_vc,2);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input7),high_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input7,high_vc,3);
++ 
++ }
++ 
++ vsum1 = vshlq_s32(vsum1, vhr);
++ vsum2 = vshlq_s32(vsum2, vhr);
++ 
++ int16x8_t vsum = vuzp1q_s16(vsum1,vsum2);
++ *(int16x8_t *)&dstcol = vsum;
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++
++}
++
++
++#if HIGH_BIT_DEPTH
++
++template<int N, int width, int height>
++void interp_vert_pp_neon(const uint16_t* src, intptr_t srcStride, uint16_t* dst, intptr_t dstStride, int coeffIdx)
++{
++ 
++ const int16_t* c = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ int shift = IF_FILTER_PREC;
++ int offset = 1 << (shift - 1);
++ const uint16_t maxVal = (1 << X265_DEPTH) - 1;
++
++ src -= (N / 2 - 1) * srcStride;
++ int16x8_t vc;
++ vc = *(int16x8_t *)c;
++ int32x4_t low_vc = vmovl_s16(vget_low_s16(vc));
++ int32x4_t high_vc = vmovl_s16(vget_high_s16(vc));
++
++ const int32x4_t voffset = vdupq_n_s32(offset);
++ const int32x4_t vhr = vdupq_n_s32(-shift);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=4)
++ {
++ int32x4_t vsum;
++ 
++ int32x4_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_u16(*(uint16x4_t *)&srccol+i*srcStride);
++ }
++ vsum = voffset;
++ 
++ vsum = vmlaq_laneq_s32(vsum,(input0),low_vc,0);
++ vsum = vmlaq_laneq_s32(vsum,(input1),low_vc,1);
++ vsum = vmlaq_laneq_s32(vsum,(input2),low_vc,2);
++ vsum = vmlaq_laneq_s32(vsum,(input3),low_vc,3);
++
++ if (N == 8)
++ {
++ vsum = vmlaq_laneq_s32(vsum,(input4),high_vc,0);
++ vsum = vmlaq_laneq_s32(vsum,(input5),high_vc,1);
++ vsum = vmlaq_laneq_s32(vsum,(input6),high_vc,2);
++ vsum = vmlaq_laneq_s32(vsum,(input7),high_vc,3);
++ }
++ 
++ vsum = vshlq_s32(vsum, vhr);
++ vsum = vminq_s32(vsum,vdupq_n_s32(maxVal));
++ vsum = vmaxq_s32(vsum,vdupq_n_s32(0));
++ *(uint16x4_t *)&dstcol = vmovn_u32(vsum);
++ }
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++
++
++
++#else
++
++template<int N, int width, int height>
++void interp_vert_pp_neon(const uint8_t* src, intptr_t srcStride, uint8_t* dst, intptr_t dstStride, int coeffIdx)
++{
++ 
++ const int16_t* c = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ int shift = IF_FILTER_PREC;
++ int offset = 1 << (shift - 1);
++ const uint16_t maxVal = (1 << X265_DEPTH) - 1;
++
++ src -= (N / 2 - 1) * srcStride;
++ int16x8_t vc;
++ vc = *(int16x8_t *)c;
++
++ const int16x8_t voffset = vdupq_n_s16(offset);
++ const int16x8_t vhr = vdupq_n_s16(-shift);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int16x8_t vsum;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_u8(*(uint8x8_t *)&srccol+i*srcStride);
++ }
++ vsum = voffset;
++ 
++ vsum = vmlaq_laneq_s16(vsum,(input0),vc,0);
++ vsum = vmlaq_laneq_s16(vsum,(input1),vc,1);
++ vsum = vmlaq_laneq_s16(vsum,(input2),vc,2);
++ vsum = vmlaq_laneq_s16(vsum,(input3),vc,3);
++
++ if (N == 8)
++ {
++ vsum = vmlaq_laneq_s16(vsum,(input4),vc,4);
++ vsum = vmlaq_laneq_s16(vsum,(input5),vc,5);
++ vsum = vmlaq_laneq_s16(vsum,(input6),vc,6);
++ vsum = vmlaq_laneq_s16(vsum,(input7),vc,7);
++
++ }
++ 
++ vsum = vshlq_s16(vsum, vhr);
++ 
++ vsum = vminq_s16(vsum,vdupq_n_s16(maxVal));
++ vsum = vmaxq_s16(vsum,vdupq_n_s16(0));
++ uint8x16_t usum = vuzp1q_u8(vsum,vsum);
++ *(uint8x8_t *)&dstcol = vget_low_u8(usum);
++ 
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++
++#endif
++
++
++#if HIGH_BIT_DEPTH
++
++template<int N, int width, int height>
++void interp_vert_ps_neon(const uint16_t* src, intptr_t srcStride, int16_t* dst, intptr_t dstStride, int coeffIdx)
++{
++ const int16_t* c = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ int headRoom = IF_INTERNAL_PREC - X265_DEPTH;
++ int shift = IF_FILTER_PREC - headRoom;
++ int offset = (unsigned)-IF_INTERNAL_OFFS << shift;
++ src -= (N / 2 - 1) * srcStride;
++
++ int16x8_t vc;
++ vc = *(int16x8_t *)c;
++ int32x4_t low_vc = vmovl_s16(vget_low_s16(vc));
++ int32x4_t high_vc = vmovl_s16(vget_high_s16(vc));
++
++ const int32x4_t voffset = vdupq_n_s32(offset);
++ const int32x4_t vhr = vdupq_n_s32(-shift);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=4)
++ {
++ int16x8_t vsum;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_u16(*(uint16x4_t *)&srccol+i*srcStride);
++ }
++ vsum = voffset;
++ 
++ vsum = vmlaq_laneq_s32(vsum,(input0),low_vc,0);
++ vsum = vmlaq_laneq_s32(vsum,(input1),low_vc,1);
++ vsum = vmlaq_laneq_s32(vsum,(input2),low_vc,2);
++ vsum = vmlaq_laneq_s32(vsum,(input3),low_vc,3);
++
++ if (N == 8)
++ {
++ int16x8_t vsum1 = vmulq_laneq_s32((input4),high_vc,0);
++ vsum1 = vmlaq_laneq_s32(vsum1,(input5),high_vc,1);
++ vsum1 = vmlaq_laneq_s32(vsum1,(input6),high_vc,2);
++ vsum1 = vmlaq_laneq_s32(vsum1,(input7),high_vc,3);
++ vsum = vaddq_s32(vsum,vsum1);
++ }
++ 
++ vsum = vshlq_s32(vsum, vhr);
++ 
++ *(uint16x4_t *)&dstcol = vmovn_s32(vsum);
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++#else
++
++template<int N, int width, int height>
++void interp_vert_ps_neon(const uint8_t* src, intptr_t srcStride, int16_t* dst, intptr_t dstStride, int coeffIdx)
++{
++ const int16_t* c = (N == 4) ? g_chromaFiltercoeffIdx : g_lumaFiltercoeffIdx;
++ int headRoom = IF_INTERNAL_PREC - X265_DEPTH;
++ int shift = IF_FILTER_PREC - headRoom;
++ int offset = (unsigned)-IF_INTERNAL_OFFS << shift;
++ src -= (N / 2 - 1) * srcStride;
++
++ int16x8_t vc;
++ vc = *(int16x8_t *)c;
++
++ const int16x8_t voffset = vdupq_n_s16(offset);
++ const int16x8_t vhr = vdupq_n_s16(-shift);
++ 
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int16x8_t vsum;
++ 
++ int16x8_t inputN;
++ 
++ for (int i=0;i<N;i++)
++ {
++ inputi = vmovl_u8(*(uint8x8_t *)&srccol+i*srcStride);
++ }
++ vsum = voffset;
++ 
++ vsum = vmlaq_laneq_s16(vsum,(input0),vc,0);
++ vsum = vmlaq_laneq_s16(vsum,(input1),vc,1);
++ vsum = vmlaq_laneq_s16(vsum,(input2),vc,2);
++ vsum = vmlaq_laneq_s16(vsum,(input3),vc,3);
++
++ if (N == 8)
++ {
++ int16x8_t vsum1 = vmulq_laneq_s16((input4),vc,4);
++ vsum1 = vmlaq_laneq_s16(vsum1,(input5),vc,5);
++ vsum1 = vmlaq_laneq_s16(vsum1,(input6),vc,6);
++ vsum1 = vmlaq_laneq_s16(vsum1,(input7),vc,7);
++ vsum = vaddq_s16(vsum,vsum1);
++ }
++ 
++ vsum = vshlq_s32(vsum, vhr);
++ *(int16x8_t *)&dstcol = vsum;
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++#endif
++
++
++
++template<int N, int width, int height>
++void interp_vert_sp_neon(const int16_t* src, intptr_t srcStride, pixel* dst, intptr_t dstStride, int coeffIdx)
++{
++ int headRoom = IF_INTERNAL_PREC - X265_DEPTH;
++ int shift = IF_FILTER_PREC + headRoom;
++ int offset = (1 << (shift - 1)) + (IF_INTERNAL_OFFS << IF_FILTER_PREC);
++ uint16_t maxVal = (1 << X265_DEPTH) - 1;
++ const int16_t* coeff = (N == 8 ? g_lumaFiltercoeffIdx : g_chromaFiltercoeffIdx);
++
++ src -= (N / 2 - 1) * srcStride;
++
++ int16x8_t vc;
++ vc = *(int16x8_t *)coeff;
++ int16x4_t low_vc = vget_low_s16(vc);
++ int16x4_t high_vc = vget_high_s16(vc);
++
++ const int32x4_t voffset = vdupq_n_s32(offset);
++ const int32x4_t vhr = vdupq_n_s32(-shift);
++
++ int row, col;
++ for (row = 0; row < height; row++)
++ {
++ for (col = 0; col < width; col+=8)
++ {
++ int32x4_t vsum1,vsum2;
++
++ int16x8_t inputN;
++
++ for (int i=0;i<N;i++)
++ {
++ inputi = *(int16x8_t *)&srccol+i*srcStride;
++ }
++ vsum1 = voffset;
++ vsum2 = voffset;
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input0),low_vc,0);
++ vsum2 = vmlal_high_lane_s16(vsum2,input0,low_vc,0);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input1),low_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input1,low_vc,1);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input2),low_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input2,low_vc,2);
++
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input3),low_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input3,low_vc,3);
++
++ if (N == 8)
++ {
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input4),high_vc,0);
++ vsum2 = vmlal_high_lane_s16(vsum2,input4,high_vc,0);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input5),high_vc,1);
++ vsum2 = vmlal_high_lane_s16(vsum2,input5,high_vc,1);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input6),high_vc,2);
++ vsum2 = vmlal_high_lane_s16(vsum2,input6,high_vc,2);
++ vsum1 = vmlal_lane_s16(vsum1,vget_low_s16(input7),high_vc,3);
++ vsum2 = vmlal_high_lane_s16(vsum2,input7,high_vc,3);
++ }
++
++ vsum1 = vshlq_s32(vsum1, vhr);
++ vsum2 = vshlq_s32(vsum2, vhr);
++
++ int16x8_t vsum = vuzp1q_s16(vsum1,vsum2);
++ vsum = vminq_s16(vsum,vdupq_n_s16(maxVal));
++ vsum = vmaxq_s16(vsum,vdupq_n_s16(0));
++#if HIGH_BIT_DEPTH
++ *(int16x8_t *)&dstcol = vsum;
++#else
++ uint8x16_t usum = vuzp1q_u8(vsum,vsum);
++ *(uint8x8_t *)&dstcol = vget_low_u8(usum);
++#endif
++
++ }
++ 
++ src += srcStride;
++ dst += dstStride;
++ }
++}
++
++
++
++
++
++
++template<int N, int width, int height>
++void interp_hv_pp_neon(const pixel* src, intptr_t srcStride, pixel* dst, intptr_t dstStride, int idxX, int idxY)
++{
++ ALIGN_VAR_32(int16_t, immedwidth * (height + N - 1));
++
++ interp_horiz_ps_neon<N, width, height>(src, srcStride, immed, width, idxX, 1);
++ interp_vert_sp_neon<N,width,height>(immed + (N / 2 - 1) * width, width, dst, dstStride, idxY);
++}
++
++
++
++}
++
++
++
++
++namespace X265_NS {
++ #define CHROMA_420(W, H) \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_hpp = interp_horiz_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_hps = interp_horiz_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_vpp = interp_vert_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_vps = interp_vert_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_vsp = interp_vert_sp_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.filter_vss = interp_vert_ss_neon<4, W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.p2sNONALIGNED = filterPixelToShort_neon<W, H>;\
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.p2sALIGNED = filterPixelToShort_neon<W, H>;
++
++ #define CHROMA_422(W, H) \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_hpp = interp_horiz_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_hps = interp_horiz_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_vpp = interp_vert_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_vps = interp_vert_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_vsp = interp_vert_sp_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.filter_vss = interp_vert_ss_neon<4, W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.p2sNONALIGNED = filterPixelToShort_neon<W, H>;\
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.p2sALIGNED = filterPixelToShort_neon<W, H>;
++
++ #define CHROMA_444(W, H) \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_hpp = interp_horiz_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_hps = interp_horiz_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_vpp = interp_vert_pp_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_vps = interp_vert_ps_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_vsp = interp_vert_sp_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.filter_vss = interp_vert_ss_neon<4, W, H>; \
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.p2sNONALIGNED = filterPixelToShort_neon<W, H>;\
++ p.chromaX265_CSP_I444.puLUMA_ ## W ## x ## H.p2sALIGNED = filterPixelToShort_neon<W, H>;
++
++ #define LUMA(W, H) \
++ p.puLUMA_ ## W ## x ## H.luma_hpp = interp_horiz_pp_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_hps = interp_horiz_ps_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_vpp = interp_vert_pp_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_vps = interp_vert_ps_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_vsp = interp_vert_sp_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_vss = interp_vert_ss_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.luma_hvpp = interp_hv_pp_neon<8, W, H>; \
++ p.puLUMA_ ## W ## x ## H.convert_p2sNONALIGNED = filterPixelToShort_neon<W, H>;\
++ p.puLUMA_ ## W ## x ## H.convert_p2sALIGNED = filterPixelToShort_neon<W, H>;
++
++ 
++void setupFilterPrimitives_neon(EncoderPrimitives &p)
++{
++ 
++ // All neon functions assume width of multiple of 8, (2,4,12 variants are not optimized)
++ 
++ LUMA(8, 8);
++ LUMA(8, 4);
++ LUMA(16, 16);
++ CHROMA_420(8, 8);
++ LUMA(16, 8);
++ CHROMA_420(8, 4);
++ LUMA(8, 16);
++ LUMA(16, 12);
++ CHROMA_420(8, 6);
++ LUMA(16, 4);
++ CHROMA_420(8, 2);
++ LUMA(32, 32);
++ CHROMA_420(16, 16);
++ LUMA(32, 16);
++ CHROMA_420(16, 8);
++ LUMA(16, 32);
++ CHROMA_420(8, 16);
++ LUMA(32, 24);
++ CHROMA_420(16, 12);
++ LUMA(24, 32);
++ LUMA(32, 8);
++ CHROMA_420(16, 4);
++ LUMA(8, 32);
++ LUMA(64, 64);
++ CHROMA_420(32, 32);
++ LUMA(64, 32);
++ CHROMA_420(32, 16);
++ LUMA(32, 64);
++ CHROMA_420(16, 32);
++ LUMA(64, 48);
++ CHROMA_420(32, 24);
++ LUMA(48, 64);
++ CHROMA_420(24, 32);
++ LUMA(64, 16);
++ CHROMA_420(32, 8);
++ LUMA(16, 64);
++ CHROMA_420(8, 32);
++ CHROMA_422(8, 16);
++ CHROMA_422(8, 8);
++ CHROMA_422(8, 12);
++ CHROMA_422(8, 4);
++ CHROMA_422(16, 32);
++ CHROMA_422(16, 16);
++ CHROMA_422(8, 32);
++ CHROMA_422(16, 24);
++ CHROMA_422(16, 8);
++ CHROMA_422(32, 64);
++ CHROMA_422(32, 32);
++ CHROMA_422(16, 64);
++ CHROMA_422(32, 48);
++ CHROMA_422(24, 64);
++ CHROMA_422(32, 16);
++ CHROMA_422(8, 64);
++ CHROMA_444(8, 8);
++ CHROMA_444(8, 4);
++ CHROMA_444(16, 16);
++ CHROMA_444(16, 8);
++ CHROMA_444(8, 16);
++ CHROMA_444(16, 12);
++ CHROMA_444(16, 4);
++ CHROMA_444(32, 32);
++ CHROMA_444(32, 16);
++ CHROMA_444(16, 32);
++ CHROMA_444(32, 24);
++ CHROMA_444(24, 32);
++ CHROMA_444(32, 8);
++ CHROMA_444(8, 32);
++ CHROMA_444(64, 64);
++ CHROMA_444(64, 32);
++ CHROMA_444(32, 64);
++ CHROMA_444(64, 48);
++ CHROMA_444(48, 64);
++ CHROMA_444(64, 16);
++ CHROMA_444(16, 64);
++
++}
++
++};
++
++
++#endif
++
++
+diff --git a/source/common/arm64/filter-prim.h b/source/common/arm64/filter-prim.h
+new file mode 100644
+index 0000000..30b7bca
+--- /dev/null
++++ b/source/common/arm64/filter-prim.h
+@@ -0,0 +1,20 @@
++#ifndef _FILTER_PRIM_ARM64_H__
++#define _FILTER_PRIM_ARM64_H__
++
++
++#include "common.h"
++#include "slicetype.h" // LOWRES_COST_MASK
++#include "primitives.h"
++#include "x265.h"
++
++
++namespace X265_NS {
++ 
++ 
++void setupFilterPrimitives_neon(EncoderPrimitives &p);
++
++};
++
++
++#endif
++
+diff --git a/source/common/arm64/intrapred-prim.cpp b/source/common/arm64/intrapred-prim.cpp
+new file mode 100644
+index 0000000..f4bd9aa
+--- /dev/null
++++ b/source/common/arm64/intrapred-prim.cpp
+@@ -0,0 +1,266 @@
++/*****************************************************************************
++ * Copyright (C) 2013-2017 MulticoreWare, Inc
++ *
++ * Authors: Min Chen <chenm003@163.com>
++ *
++ * 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.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
++ *
++ * This program is also available under a commercial proprietary license.
++ * For more information, contact us at license @ x265.com.
++ *****************************************************************************/
++
++
++#include "common.h"
++#include "primitives.h"
++
++
++#if 1
++#include "arm64-utils.h"
++#include <arm_neon.h>
++
++using namespace X265_NS;
++
++namespace {
++
++
++
++template<int width>
++void intra_pred_ang_neon(pixel* dst, intptr_t dstStride, const pixel *srcPix0, int dirMode, int bFilter)
++{
++ int width2 = width << 1;
++ // Flip the neighbours in the horizontal case.
++ int horMode = dirMode < 18;
++ pixel neighbourBuf129;
++ const pixel *srcPix = srcPix0;
++
++ if (horMode)
++ {
++ neighbourBuf0 = srcPix0;
++ //for (int i = 0; i < width << 1; i++)
++ //{
++ // neighbourBuf1 + i = srcPixwidth2 + 1 + i;
++ // neighbourBufwidth2 + 1 + i = srcPix1 + i;
++ //}
++ memcpy(&neighbourBuf1,&srcPixwidth2+1,sizeof(pixel)*(width << 1));
++ memcpy(&neighbourBufwidth2 + 1,&srcPix1,sizeof(pixel)*(width << 1));
++ srcPix = neighbourBuf;
++ }
++
++ // Intra prediction angle and inverse angle tables.
++ const int8_t angleTable17 = { -32, -26, -21, -17, -13, -9, -5, -2, 0, 2, 5, 9, 13, 17, 21, 26, 32 };
++ const int16_t invAngleTable8 = { 4096, 1638, 910, 630, 482, 390, 315, 256 };
++
++ // Get the prediction angle.
++ int angleOffset = horMode ? 10 - dirMode : dirMode - 26;
++ int angle = angleTable8 + angleOffset;
++
++ // Vertical Prediction.
++ if (!angle)
++ {
++ for (int y = 0; y < width; y++) {
++ memcpy(&dsty * dstStride,srcPix + 1,sizeof(pixel)*width);
++ }
++ if (bFilter)
++ {
++ int topLeft = srcPix0, top = srcPix1;
++ for (int y = 0; y < width; y++)
++ dsty * dstStride = x265_clip((int16_t)(top + ((srcPixwidth2 + 1 + y - topLeft) >> 1)));
++ }
++ }
++ else // Angular prediction.
++ {
++ // Get the reference pixels. The reference base is the first pixel to the top (neighbourBuf1).
++ pixel refBuf64;
++ const pixel *ref;
++
++ // Use the projected left neighbours and the top neighbours.
++ if (angle < 0)
++ {
++ // Number of neighbours projected.
++ int nbProjected = -((width * angle) >> 5) - 1;
++ pixel *ref_pix = refBuf + nbProjected + 1;
++
++ // Project the neighbours.
++ int invAngle = invAngleTable- angleOffset - 1;
++ int invAngleSum = 128;
++ for (int i = 0; i < nbProjected; i++)
++ {
++ invAngleSum += invAngle;
++ ref_pix- 2 - i = srcPixwidth2 + (invAngleSum >> 8);
++ }
++
++ // Copy the top-left and top pixels.
++ //for (int i = 0; i < width + 1; i++)
++ //ref_pix-1 + i = srcPixi;
++ 
++ memcpy(&ref_pix-1,srcPix,(width+1)*sizeof(pixel));
++ ref = ref_pix;
++ }
++ else // Use the top and top-right neighbours.
++ ref = srcPix + 1;
++
++ // Pass every row.
++ int angleSum = 0;
++ for (int y = 0; y < width; y++)
++ {
++ angleSum += angle;
++ int offset = angleSum >> 5;
++ int fraction = angleSum & 31;
++
++ if (fraction) // Interpolate
++ {
++ if (width >= 8 && sizeof(pixel) == 1)
++ {
++ const int16x8_t f0 = vdupq_n_s16(32-fraction);
++ const int16x8_t f1 = vdupq_n_s16(fraction);
++ for (int x = 0;x<width;x+=8) {
++ uint8x8_t in0 = *(uint8x8_t *)&refoffset + x;
++ uint8x8_t in1 = *(uint8x8_t *)&refoffset+ x + 1;
++ int16x8_t lo = vmlaq_s16(vdupq_n_s16(16),vmovl_u8(in0),f0);
++ lo = vmlaq_s16(lo,vmovl_u8(in1),f1);
++ lo = vshrq_n_s16(lo,5);
++ *(uint8x8_t *)&dsty * dstStride + x = vmovn_u16(lo);
++ }
++ }
++ else if (width >= 4 && sizeof(pixel) == 2)
++ {
++ const int32x4_t f0 = vdupq_n_s32(32-fraction);
++ const int32x4_t f1 = vdupq_n_s32(fraction);
++ for (int x = 0;x<width;x+=4) {
++ uint16x4_t in0 = *(uint16x4_t *)&refoffset + x;
++ uint16x4_t in1 = *(uint16x4_t *)&refoffset+ x + 1;
++ int32x4_t lo = vmlaq_s32(vdupq_n_s32(16),vmovl_u16(in0),f0);
++ lo = vmlaq_s32(lo,vmovl_u16(in1),f1);
++ lo = vshrq_n_s32(lo,5);
++ *(uint16x4_t *)&dsty * dstStride + x = vmovn_u32(lo);
++ }
++ }
++ else {
++ for (int x = 0; x < width; x++)
++ dsty * dstStride + x = (pixel)(((32 - fraction) * refoffset + x + fraction * refoffset + x + 1 + 16) >> 5);
++ }
++ }
++ else // Copy.
++ {
++ memcpy(&dsty * dstStride,&refoffset,sizeof(pixel)*width);
++ }
++ }
++ }
++
++ // Flip for horizontal.
++ if (horMode)
++ {
++ if (width == 8) transpose8x8(dst,dst,dstStride,dstStride);
++ else if (width == 16) transpose16x16(dst,dst,dstStride,dstStride);
++ else if (width == 32) transpose32x32(dst,dst,dstStride,dstStride);
++ else {
++ for (int y = 0; y < width - 1; y++)
++ {
++ for (int x = y + 1; x < width; x++)
++ {
++ pixel tmp = dsty * dstStride + x;
++ dsty * dstStride + x = dstx * dstStride + y;
++ dstx * dstStride + y = tmp;
++ }
++ }
++ }
++ }
++}
++
++template<int log2Size>
++void all_angs_pred_neon(pixel *dest, pixel *refPix, pixel *filtPix, int bLuma)
++{
++ const int size = 1 << log2Size;
++ for (int mode = 2; mode <= 34; mode++)
++ {
++ pixel *srcPix = (g_intraFilterFlagsmode & size ? filtPix : refPix);
++ pixel *out = dest + ((mode - 2) << (log2Size * 2));
++
++ intra_pred_ang_neon<size>(out, size, srcPix, mode, bLuma);
++
++ // Optimize code don't flip buffer
++ bool modeHor = (mode < 18);
++
++ // transpose the block if this is a horizontal mode
++ if (modeHor)
++ {
++ if (size == 8) transpose8x8(out,out,size,size);
++ else if (size == 16) transpose16x16(out,out,size,size);
++ else if (size == 32) transpose32x32(out,out,size,size);
++ else {
++ for (int k = 0; k < size - 1; k++)
++ {
++ for (int l = k + 1; l < size; l++)
++ {
++ pixel tmp = outk * size + l;
++ outk * size + l = outl * size + k;
++ outl * size + k = tmp;
++ }
++ }
++ }
++ }
++ }
++}
++}
++
++namespace X265_NS {
++// x265 private namespace
++
++void setupIntraPrimitives_neon(EncoderPrimitives& p)
++{
++// p.cuBLOCK_4x4.intra_filter = intraFilter<4>;
++// p.cuBLOCK_8x8.intra_filter = intraFilter<8>;
++// p.cuBLOCK_16x16.intra_filter = intraFilter<16>;
++// p.cuBLOCK_32x32.intra_filter = intraFilter<32>;
++
++// p.cuBLOCK_4x4.intra_predPLANAR_IDX = planar_pred_neon<2>;
++// p.cuBLOCK_8x8.intra_predPLANAR_IDX = planar_pred_neon<3>;
++// p.cuBLOCK_16x16.intra_predPLANAR_IDX = planar_pred_neon<4>;
++// p.cuBLOCK_32x32.intra_predPLANAR_IDX = planar_pred_neon<5>;
++//
++// p.cuBLOCK_4x4.intra_predDC_IDX = intra_pred_dc_neon<4>;
++// p.cuBLOCK_8x8.intra_predDC_IDX = intra_pred_dc_neon<8>;
++// p.cuBLOCK_16x16.intra_predDC_IDX = intra_pred_dc_neon<16>;
++// p.cuBLOCK_32x32.intra_predDC_IDX = intra_pred_dc_neon<32>;
++
++ for (int i = 2; i < NUM_INTRA_MODE; i++)
++ {
++ p.cuBLOCK_4x4.intra_predi = intra_pred_ang_neon<4>;
++ p.cuBLOCK_8x8.intra_predi = intra_pred_ang_neon<8>;
++ p.cuBLOCK_16x16.intra_predi = intra_pred_ang_neon<16>;
++ p.cuBLOCK_32x32.intra_predi = intra_pred_ang_neon<32>;
++ }
++
++ p.cuBLOCK_4x4.intra_pred_allangs = all_angs_pred_neon<2>;
++ p.cuBLOCK_8x8.intra_pred_allangs = all_angs_pred_neon<3>;
++ p.cuBLOCK_16x16.intra_pred_allangs = all_angs_pred_neon<4>;
++ p.cuBLOCK_32x32.intra_pred_allangs = all_angs_pred_neon<5>;
++}
++}
++
++
++
++#else
++
++namespace X265_NS {
++// x265 private namespace
++void setupIntraPrimitives_neon(EncoderPrimitives& p)
++{}
++}
++
++#endif
++
++
++
+diff --git a/source/common/arm64/intrapred-prim.h b/source/common/arm64/intrapred-prim.h
+new file mode 100644
+index 0000000..fd7a471
+--- /dev/null
++++ b/source/common/arm64/intrapred-prim.h
+@@ -0,0 +1,14 @@
++#ifndef INTRAPRED_PRIM_H__
++
++#if defined(__aarch64__)
++
++namespace X265_NS {
++// x265 private namespace
++
++void setupIntraPrimitives_neon(EncoderPrimitives& p);
++}
++
++#endif
++
++#endif
++
+diff --git a/source/common/arm64/loopfilter-prim.cpp b/source/common/arm64/loopfilter-prim.cpp
+new file mode 100644
+index 0000000..285a089
+--- /dev/null
++++ b/source/common/arm64/loopfilter-prim.cpp
+@@ -0,0 +1,305 @@
++/*****************************************************************************
++* Copyright (C) 2013-2017 MulticoreWare, Inc
++*
++* Authors: Praveen Kumar Tiwari <praveen@multicorewareinc.com>
++* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>
++* Min Chen <chenm003@163.com>
++*
++* 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.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program; if not, write to the Free Software
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
++*
++* This program is also available under a commercial proprietary license.
++* For more information, contact us at license @ x265.com.
++*****************************************************************************/
++#include "loopfilter-prim.h"
++
++#define PIXEL_MIN 0
++
++
++
++#if !(HIGH_BIT_DEPTH) && defined(HAVE_NEON)
++#include<arm_neon.h>
++
++namespace {
++
++
++/* get the sign of input variable (TODO: this is a dup, make common) */
++static inline int8_t signOf(int x)
++{
++ return (x >> 31) | ((int)((((uint32_t)-x)) >> 31));
++}
++
++static inline int8x8_t sign_diff_neon(const uint8x8_t in0, const uint8x8_t in1)
++{
++ int16x8_t in = vsubl_u8(in0,in1);
++ return vmovn_s16(vmaxq_s16(vminq_s16(in,vdupq_n_s16(1)),vdupq_n_s16(-1)));
++}
++
++static void calSign_neon(int8_t *dst, const pixel *src1, const pixel *src2, const int endX)
++{
++ int x = 0;
++ for (; (x + 8) <= endX; x += 8) {
++ *(int8x8_t *)&dstx = sign_diff_neon(*(uint8x8_t *)&src1x,*(uint8x8_t *)&src2x);
++ }
++
++ for (; x < endX; x++)
++ dstx = signOf(src1x - src2x);
++}
++
++static void processSaoCUE0_neon(pixel * rec, int8_t * offsetEo, int width, int8_t* signLeft, intptr_t stride)
++{
++
++ 
++ int y;
++ int8_t signRight, signLeft0;
++ int8_t edgeType;
++
++ for (y = 0; y < 2; y++)
++ {
++ signLeft0 = signLefty;
++ int x = 0;
++
++ if (width >= 8) {
++ int8x8_t vsignRight;
++ int8x8x2_t shifter;
++ shifter.val10 = signLeft0;
++ static const int8x8_t index = {8,0,1,2,3,4,5,6};
++ int8x8_t tbl = *(int8x8_t *)offsetEo;
++ for (; (x+8) <= width; x+=8)
++ {
++ uint8x8_t in = *(uint8x8_t *)&recx;
++ vsignRight = sign_diff_neon(in,*(uint8x8_t *)&recx+1);
++ shifter.val0 = vneg_s8(vsignRight);
++ int8x8_t tmp = shifter.val0;
++ int8x8_t edge = vtbl2_s8(shifter,index);
++ int8x8_t vedgeType = vadd_s8(vadd_s8(vsignRight,edge),vdup_n_s8(2));
++ shifter.val10 = tmp7;
++ int16x8_t t1 = vmovl_s8(vtbl1_s8(tbl,vedgeType));
++ t1 = vaddw_u8(t1,in);
++ t1 = vmaxq_s16(t1,vdupq_n_s16(0));
++ t1 = vminq_s16(t1,vdupq_n_s16(255));
++ *(uint8x8_t *)&recx = vmovn_u16(t1);
++ }
++ signLeft0 = shifter.val10;
++ }
++ for (; x < width; x++)
++ {
++ signRight = ((recx - recx + 1) < 0) ? -1 : ((recx - recx + 1) > 0) ? 1 : 0;
++ edgeType = signRight + signLeft0 + 2;
++ signLeft0 = -signRight;
++ recx = x265_clip(recx + offsetEoedgeType);
++ }
++ rec += stride;
++ }
++}
++
++static void processSaoCUE1_neon(pixel* rec, int8_t* upBuff1, int8_t* offsetEo, intptr_t stride, int width)
++{
++ int x = 0;
++ int8_t signDown;
++ int edgeType;
++
++ if (width >= 8) {
++ int8x8_t tbl = *(int8x8_t *)offsetEo;
++ for (; (x+8) <= width; x+=8)
++ {
++ uint8x8_t in0 = *(uint8x8_t *)&recx;
++ uint8x8_t in1 = *(uint8x8_t *)&recx+stride;
++ int8x8_t vsignDown = sign_diff_neon(in0,in1);
++ int8x8_t vedgeType = vadd_s8(vadd_s8(vsignDown,*(int8x8_t *)&upBuff1x),vdup_n_s8(2));
++ *(int8x8_t *)&upBuff1x = vneg_s8(vsignDown);
++ int16x8_t t1 = vmovl_s8(vtbl1_s8(tbl,vedgeType));
++ t1 = vaddw_u8(t1,in0);
++ *(uint8x8_t *)&recx = vqmovun_s16(t1);
++ }
++ }
++ for (; x < width; x++)
++ {
++ signDown = signOf(recx - recx + stride);
++ edgeType = signDown + upBuff1x + 2;
++ upBuff1x = -signDown;
++ recx = x265_clip(recx + offsetEoedgeType);
++ }
++}
++
++static void processSaoCUE1_2Rows_neon(pixel* rec, int8_t* upBuff1, int8_t* offsetEo, intptr_t stride, int width)
++{
++ int y;
++ int8_t signDown;
++ int edgeType;
++
++ for (y = 0; y < 2; y++)
++ {
++ int x=0;
++ if (width >= 8) {
++ int8x8_t tbl = *(int8x8_t *)offsetEo;
++ for (; (x+8) <= width; x+=8)
++ {
++ uint8x8_t in0 = *(uint8x8_t *)&recx;
++ uint8x8_t in1 = *(uint8x8_t *)&recx+stride;
++ int8x8_t vsignDown = sign_diff_neon(in0,in1);
++ int8x8_t vedgeType = vadd_s8(vadd_s8(vsignDown,*(int8x8_t *)&upBuff1x),vdup_n_s8(2));
++ *(int8x8_t *)&upBuff1x = vneg_s8(vsignDown);
++ int16x8_t t1 = vmovl_s8(vtbl1_s8(tbl,vedgeType));
++ t1 = vaddw_u8(t1,in0);
++ t1 = vmaxq_s16(t1,vdupq_n_s16(0));
++ t1 = vminq_s16(t1,vdupq_n_s16(255));
++ *(uint8x8_t *)&recx = vmovn_u16(t1);
++
++ }
++ }
++ for (; x < width; x++)
++ {
++ signDown = signOf(recx - recx + stride);
++ edgeType = signDown + upBuff1x + 2;
++ upBuff1x = -signDown;
++ recx = x265_clip(recx + offsetEoedgeType);
++ }
++ rec += stride;
++ }
++}
++
++static void processSaoCUE2_neon(pixel * rec, int8_t * bufft, int8_t * buff1, int8_t * offsetEo, int width, intptr_t stride)
++{
++ int x;
++ 
++ if (abs(buff1-bufft) < 16)
++ {
++ for (x = 0; x < width; x++)
++ {
++ int8_t signDown = signOf(recx - recx + stride + 1);
++ int edgeType = signDown + buff1x + 2;
++ bufftx + 1 = -signDown;
++ recx = x265_clip(recx + offsetEoedgeType);;
++ }
++ }
++ else
++ {
++ int8x8_t tbl = *(int8x8_t *)offsetEo;
++ x=0;
++ for (; (x + 8) <= width; x+=8)
++ {
++ uint8x8_t in0 = *(uint8x8_t *)&recx;
++ uint8x8_t in1 = *(uint8x8_t *)&recx+stride+1;
++ int8x8_t vsignDown = sign_diff_neon(in0,in1);
++ int8x8_t vedgeType = vadd_s8(vadd_s8(vsignDown,*(int8x8_t *)&buff1x),vdup_n_s8(2));
++ *(int8x8_t *)&bufftx+1 = vneg_s8(vsignDown);
++ int16x8_t t1 = vmovl_s8(vtbl1_s8(tbl,vedgeType));
++ t1 = vaddw_u8(t1,in0);
++ t1 = vmaxq_s16(t1,vdupq_n_s16(0));
++ t1 = vminq_s16(t1,vdupq_n_s16(255));
++ *(uint8x8_t *)&recx = vmovn_u16(t1);
++ }
++ for (; x < width; x++)
++ {
++ int8_t signDown = signOf(recx - recx + stride + 1);
++ int edgeType = signDown + buff1x + 2;
++ bufftx + 1 = -signDown;
++ recx = x265_clip(recx + offsetEoedgeType);;
++ }
++
++ }
++}
++ 
++
++static void processSaoCUE3_neon(pixel *rec, int8_t *upBuff1, int8_t *offsetEo, intptr_t stride, int startX, int endX)
++{
++ int8_t signDown;
++ int8_t edgeType;
++ int8x8_t tbl = *(int8x8_t *)offsetEo;
++
++ int x = startX + 1;
++ for (; (x+8) <= endX; x+=8 )
++ {
++ uint8x8_t in0 = *(uint8x8_t *)&recx;
++ uint8x8_t in1 = *(uint8x8_t *)&recx+stride;
++ int8x8_t vsignDown = sign_diff_neon(in0,in1);
++ int8x8_t vedgeType = vadd_s8(vadd_s8(vsignDown,*(int8x8_t *)&upBuff1x),vdup_n_s8(2));
++ *(int8x8_t *)&upBuff1x-1 = vneg_s8(vsignDown);
++ int16x8_t t1 = vmovl_s8(vtbl1_s8(tbl,vedgeType));
++ t1 = vaddw_u8(t1,in0);
++ t1 = vmaxq_s16(t1,vdupq_n_s16(0));
++ t1 = vminq_s16(t1,vdupq_n_s16(255));
++ *(uint8x8_t *)&recx = vmovn_u16(t1);
++
++ }
++ for (; x < endX; x++)
++ {
++ signDown = signOf(recx - recx + stride);
++ edgeType = signDown + upBuff1x + 2;
++ upBuff1x - 1 = -signDown;
++ recx = x265_clip(recx + offsetEoedgeType);
++ }
++}
++
++static void processSaoCUB0_neon(pixel* rec, const int8_t* offset, int ctuWidth, int ctuHeight, intptr_t stride)
++{
++ #define SAO_BO_BITS 5
++ const int boShift = X265_DEPTH - SAO_BO_BITS;
++ int x, y;
++ int8x8x4_t table;
++ table = *(int8x8x4_t *)offset;
++ 
++ for (y = 0; y < ctuHeight; y++)
++ {
++ 
++ for (x = 0; (x+8) <= ctuWidth; x+=8)
++ {
++ int8x8_t in = *(int8x8_t*)&recx;
++ int8x8_t offsets = vtbl4_s8(table,vshr_n_u8(in,boShift));
++ int16x8_t tmp = vmovl_s8(offsets);
++ tmp = vaddw_u8(tmp,in);
++ tmp = vmaxq_s16(tmp,vdupq_n_s16(0));
++ tmp = vminq_s16(tmp,vdupq_n_s16(255));
++ *(uint8x8_t *)&recx = vmovn_u16(tmp);
++ }
++ for (; x < ctuWidth; x++)
++ {
++ recx = x265_clip(recx + offsetrecx >> boShift);
++ }
++ rec += stride;
++ }
++}
++
++}
++
++
++
++namespace X265_NS {
++void setupLoopFilterPrimitives_neon(EncoderPrimitives &p)
++{
++ p.saoCuOrgE0 = processSaoCUE0_neon;
++ p.saoCuOrgE1 = processSaoCUE1_neon;
++ p.saoCuOrgE1_2Rows = processSaoCUE1_2Rows_neon;
++ p.saoCuOrgE20 = processSaoCUE2_neon;
++ p.saoCuOrgE21 = processSaoCUE2_neon;
++ p.saoCuOrgE30 = processSaoCUE3_neon;
++ p.saoCuOrgE31 = processSaoCUE3_neon;
++ p.saoCuOrgB0 = processSaoCUB0_neon;
++ p.sign = calSign_neon;
++
++}
++
++#else //HIGH_BIT_DEPTH
++
++
++namespace X265_NS {
++void setupLoopFilterPrimitives_neon(EncoderPrimitives &)
++{
++}
++
++#endif
++
++
++}
+diff --git a/source/common/arm64/loopfilter-prim.h b/source/common/arm64/loopfilter-prim.h
+new file mode 100644
+index 0000000..f652d1f
+--- /dev/null
++++ b/source/common/arm64/loopfilter-prim.h
+@@ -0,0 +1,43 @@
++#ifndef _LOOPFILTER_NEON_H__
++#define _LOOPFILTER_NEON_H__
++
++
++/*****************************************************************************
++* Copyright (C) 2013-2017 MulticoreWare, Inc
++*
++* Authors: Praveen Kumar Tiwari <praveen@multicorewareinc.com>
++* Dnyaneshwar Gorade <dnyaneshwar@multicorewareinc.com>
++* Min Chen <chenm003@163.com>
++*
++* 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.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++* GNU General Public License for more details.
++*
++* You should have received a copy of the GNU General Public License
++* along with this program; if not, write to the Free Software
++* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
++*
++* This program is also available under a commercial proprietary license.
++* For more information, contact us at license @ x265.com.
++*****************************************************************************/
++
++
++
++#include "common.h"
++#include "primitives.h"
++
++#define PIXEL_MIN 0
++
++namespace X265_NS {
++void setupLoopFilterPrimitives_neon(EncoderPrimitives &p);
++
++};
++
++
++#endif
+diff --git a/source/common/arm64/pixel-prim.cpp b/source/common/arm64/pixel-prim.cpp
+new file mode 100644
+index 0000000..5e252b7
+--- /dev/null
++++ b/source/common/arm64/pixel-prim.cpp
+@@ -0,0 +1,1940 @@
++#include "common.h"
++#include "slicetype.h" // LOWRES_COST_MASK
++#include "primitives.h"
++#include "x265.h"
++
++#include "pixel-prim.h"
++#include "arm64-utils.h"
++#if HAVE_NEON
++
++#include <arm_neon.h>
++
++using namespace X265_NS;
++
++
++
++namespace {
++
++
++/* SATD SA8D variants - based on x264 */
++static inline void SUMSUB_AB(int16x8_t& sum, int16x8_t& sub, const int16x8_t a, const int16x8_t b)
++{
++ sum = vaddq_s16(a,b);
++ sub = vsubq_s16(a,b);
++}
++
++static inline void transpose_8h(int16x8_t& t1, int16x8_t& t2, const int16x8_t s1, const int16x8_t s2)
++{
++ t1 = vtrn1q_s16(s1, s2);
++ t2 = vtrn2q_s16(s1, s2);
++}
++
++static inline void transpose_4s(int16x8_t& t1, int16x8_t& t2, const int16x8_t s1, const int16x8_t s2)
++{
++ t1 = vtrn1q_s32(s1, s2);
++ t2 = vtrn2q_s32(s1, s2);
++}
++
++#if (X265_DEPTH <= 10)
++static inline void transpose_2d(int16x8_t& t1, int16x8_t& t2, const int16x8_t s1, const int16x8_t s2)
++{
++ t1 = vtrn1q_s64(s1, s2);
++ t2 = vtrn2q_s64(s1, s2);
++}
++#endif
++
++
++static inline void SUMSUB_ABCD(int16x8_t& s1, int16x8_t& d1, int16x8_t& s2, int16x8_t& d2,
++ int16x8_t a,int16x8_t b,int16x8_t c,int16x8_t d)
++{
++ SUMSUB_AB(s1,d1,a,b);
++ SUMSUB_AB(s2,d2,c,d);
++}
++
++static inline void HADAMARD4_V(int16x8_t& r1,int16x8_t& r2,int16x8_t& r3,int16x8_t& r4,
++ int16x8_t& t1,int16x8_t& t2,int16x8_t& t3,int16x8_t& t4)
++{
++ SUMSUB_ABCD(t1, t2, t3, t4, r1, r2, r3, r4);
++ SUMSUB_ABCD(r1, r3, r2, r4, t1, t3, t2, t4);
++}
++
++
++static int _satd_4x8_8x4_end_neon(int16x8_t v0,int16x8_t v1,int16x8_t v2, int16x8_t v3)
++ 
++{
++ 
++ int16x8_t v4,v5,v6,v7,v16,v17,v18,v19;
++
++ 
++ SUMSUB_AB (v16, v17, v0, v1);
++ SUMSUB_AB (v18, v19, v2, v3);
++
++ SUMSUB_AB (v4 , v6 , v16, v18);
++ SUMSUB_AB (v5 , v7 , v17, v19);
++
++ v0 = vtrn1q_s16(v4, v5);
++ v1 = vtrn2q_s16(v4, v5);
++ v2 = vtrn1q_s16(v6, v7);
++ v3 = vtrn2q_s16(v6, v7);
++
++ SUMSUB_AB (v16, v17, v0, v1);
++ SUMSUB_AB (v18, v19, v2, v3);
++
++ v0 = vtrn1q_s32(v16, v18);
++ v1 = vtrn2q_s32(v16, v18);
++ v2 = vtrn1q_s32(v17, v19);
++ v3 = vtrn2q_s32(v17, v19);
++
++ v0 = vabsq_s16(v0);
++ v1 = vabsq_s16(v1);
++ v2 = vabsq_s16(v2);
++ v3 = vabsq_s16(v3);
++ 
++ v0 = vmaxq_u16(v0, v1);
++ v1 = vmaxq_u16(v2, v3);
++
++ v0 = vaddq_u16(v0, v1);
++ return vaddlvq_u16(v0);
++}
++
++static inline int _satd_4x4_neon(int16x8_t v0, int16x8_t v1)
++{
++ int16x8_t v2,v3;
++ SUMSUB_AB (v2, v3, v0, v1);
++
++ v0 = vzip1q_s64(v2,v3);
++ v1 = vzip2q_s64(v2,v3);
++ SUMSUB_AB (v2, v3, v0, v1);
++
++ v0 = vtrn1q_s16(v2,v3);
++ v1 = vtrn2q_s16(v2,v3);
++ SUMSUB_AB (v2, v3, v0, v1);
++
++ v0 = vtrn1q_s32(v2,v3);
++ v1 = vtrn2q_s32(v2,v3);
++
++ v0 = vabsq_s16(v0);
++ v1 = vabsq_s16(v1);
++ v0 = vmaxq_u16(v0, v1);
++ 
++ return vaddlvq_s16(v0);
++}
++
++static void _satd_8x4v_8x8h_neon(int16x8_t& v0,int16x8_t& v1, int16x8_t&v2,int16x8_t& v3,int16x8_t& v20,int16x8_t& v21, int16x8_t&v22,int16x8_t& v23)
++{
++ int16x8_t v16,v17,v18,v19,v4,v5,v6,v7;
++ 
++ SUMSUB_AB(v16, v18, v0, v2);
++ SUMSUB_AB(v17, v19, v1, v3);
++
++ HADAMARD4_V (v20, v21, v22, v23, v0, v1, v2, v3);
++
++ transpose_8h( v0, v1, v16, v17);
++ transpose_8h( v2, v3, v18, v19);
++ transpose_8h( v4, v5, v20, v21);
++ transpose_8h( v6, v7, v22, v23);
++
++ SUMSUB_AB (v16, v17, v0, v1);
++ SUMSUB_AB (v18, v19, v2, v3);
++ SUMSUB_AB (v20, v21, v4, v5);
++ SUMSUB_AB (v22, v23, v6, v7);
++
++ transpose_4s( v0, v2, v16, v18);
++ transpose_4s( v1, v3, v17, v19);
++ transpose_4s( v4, v6, v20, v22);
++ transpose_4s( v5, v7, v21, v23);
++
++ v0 = vabsq_s16(v0);
++ v1 = vabsq_s16(v1);
++ v2 = vabsq_s16(v2);
++ v3 = vabsq_s16(v3);
++ v4 = vabsq_s16(v4);
++ v5 = vabsq_s16(v5);
++ v6 = vabsq_s16(v6);
++ v7 = vabsq_s16(v7);
++
++ v0 = vmaxq_u16(v0,v2);
++ v1 = vmaxq_u16(v1,v3);
++ v2 = vmaxq_u16(v4,v6);
++ v3 = vmaxq_u16(v5,v7);
++
++}
++
++#if HIGH_BIT_DEPTH
++
++#if (X265_DEPTH > 10)
++static inline void transpose_2d(int32x4_t& t1, int32x4_t& t2, const int32x4_t s1, const int32x4_t s2)
++{
++ t1 = vtrn1q_s64(s1, s2);
++ t2 = vtrn2q_s64(s1, s2);
++}
++
++static inline void ISUMSUB_AB(int32x4_t& sum, int32x4_t& sub, const int32x4_t a, const int32x4_t b)
++{
++ sum = vaddq_s32(a,b);
++ sub = vsubq_s32(a,b);
++}
++
++static inline void ISUMSUB_AB_FROM_INT16(int32x4_t& suml, int32x4_t& sumh, int32x4_t& subl, int32x4_t& subh, const int16x8_t a, const int16x8_t b)
++{
++ suml = vaddl_s16(vget_low_s16(a),vget_low_s16(b));
++ sumh = vaddl_high_s16(a,b);
++ subl = vsubl_s16(vget_low_s16(a),vget_low_s16(b));
++ subh = vsubl_high_s16(a, b);
++}
++
++#endif
++
++static inline void _sub_8x8_fly(const uint16_t* pix1, intptr_t stride_pix1, const uint16_t* pix2, intptr_t stride_pix2,
++ int16x8_t& v0,int16x8_t& v1, int16x8_t& v2,int16x8_t& v3,
++ int16x8_t& v20,int16x8_t& v21, int16x8_t& v22,int16x8_t& v23)
++{
++ uint16x8_t r0,r1,r2,r3;
++ uint16x8_t t0,t1,t2,t3;
++ int16x8_t v16,v17;
++ int16x8_t v18,v19;
++ 
++ r0 = *(uint16x8_t*)(pix1 + 0*stride_pix1);
++ r1 = *(uint16x8_t*)(pix1 + 1*stride_pix1);
++ r2 = *(uint16x8_t*)(pix1 + 2*stride_pix1);
++ r3 = *(uint16x8_t*)(pix1 + 3*stride_pix1);
++
++ t0 = *(uint16x8_t*)(pix2 + 0*stride_pix2);
++ t1 = *(uint16x8_t*)(pix2 + 1*stride_pix2);
++ t2 = *(uint16x8_t*)(pix2 + 2*stride_pix2);
++ t3 = *(uint16x8_t*)(pix2 + 3*stride_pix2);
++
++ v16 = vsubq_u16(r0,t0);
++ v17 = vsubq_u16(r1,t1);
++ v18 = vsubq_u16(r2,t2);
++ v19 = vsubq_u16(r3,t3);
++
++ r0 = *(uint16x8_t*)(pix1 + 4*stride_pix1);
++ r1 = *(uint16x8_t*)(pix1 + 5*stride_pix1);
++ r2 = *(uint16x8_t*)(pix1 + 6*stride_pix1);
++ r3 = *(uint16x8_t*)(pix1 + 7*stride_pix1);
++
++ t0 = *(uint16x8_t*)(pix2 + 4*stride_pix2);
++ t1 = *(uint16x8_t*)(pix2 + 5*stride_pix2);
++ t2 = *(uint16x8_t*)(pix2 + 6*stride_pix2);
++ t3 = *(uint16x8_t*)(pix2 + 7*stride_pix2);
++ 
++ v20 = vsubq_u16(r0,t0);
++ v21 = vsubq_u16(r1,t1);
++ v22 = vsubq_u16(r2,t2);
++ v23 = vsubq_u16(r3,t3);
++
++ SUMSUB_AB (v0, v1, v16, v17);
++ SUMSUB_AB (v2, v3, v18, v19);
++ 
++}
++
++
++
++
++static void _satd_16x4_neon(const uint16_t* pix1, intptr_t stride_pix1, const uint16_t* pix2, intptr_t stride_pix2,
++ int16x8_t& v0,int16x8_t&v1, int16x8_t&v2,int16x8_t&v3)
++{
++ uint8x16_t r0,r1,r2,r3;
++ uint8x16_t t0,t1,t2,t3;
++ int16x8_t v16,v17,v20,v21;
++ int16x8_t v18,v19,v22,v23;
++ 
++ r0 = *(int16x8_t*)(pix1 + 0*stride_pix1);
++ r1 = *(int16x8_t*)(pix1 + 1*stride_pix1);
++ r2 = *(int16x8_t*)(pix1 + 2*stride_pix1);
++ r3 = *(int16x8_t*)(pix1 + 3*stride_pix1);
++
++ t0 = *(int16x8_t*)(pix2 + 0*stride_pix2);
++ t1 = *(int16x8_t*)(pix2 + 1*stride_pix2);
++ t2 = *(int16x8_t*)(pix2 + 2*stride_pix2);
++ t3 = *(int16x8_t*)(pix2 + 3*stride_pix2);
++ 
++ 
++ v16 = vsubq_u16((r0),(t0) );
++ v17 = vsubq_u16((r1),(t1) );
++ v18 = vsubq_u16((r2),(t2) );
++ v19 = vsubq_u16((r3),(t3) );
++
++ r0 = *(int16x8_t*)(pix1 + 0*stride_pix1 + 8);
++ r1 = *(int16x8_t*)(pix1 + 1*stride_pix1 + 8);
++ r2 = *(int16x8_t*)(pix1 + 2*stride_pix1 + 8);
++ r3 = *(int16x8_t*)(pix1 + 3*stride_pix1 + 8);
++
++ t0 = *(int16x8_t*)(pix2 + 0*stride_pix2 + 8);
++ t1 = *(int16x8_t*)(pix2 + 1*stride_pix2 + 8);
++ t2 = *(int16x8_t*)(pix2 + 2*stride_pix2 + 8);
++ t3 = *(int16x8_t*)(pix2 + 3*stride_pix2 + 8);
++
++ 
++ v20 = vsubq_u16(r0,t0);
++ v21 = vsubq_u16(r1,t1);
++ v22 = vsubq_u16(r2,t2);
++ v23 = vsubq_u16(r3,t3);
++
++ SUMSUB_AB (v0, v1, v16, v17);
++ SUMSUB_AB (v2, v3, v18, v19);
++ 
++ _satd_8x4v_8x8h_neon(v0,v1,v2,v3,v20,v21,v22,v23);
++ 
++}
++
++
++int pixel_satd_4x4_neon(const uint16_t* pix1, intptr_t stride_pix1, const uint16_t* pix2, intptr_t stride_pix2)
++{
++ uint64x2_t t0,t1,r0,r1;
++ t00 = *(uint64_t *)(pix1 + 0*stride_pix1);
++ t10 = *(uint64_t *)(pix1 + 1*stride_pix1);
++ t01 = *(uint64_t *)(pix1 + 2*stride_pix1);
++ t11 = *(uint64_t *)(pix1 + 3*stride_pix1);
++
++ r00 = *(uint64_t *)(pix2 + 0*stride_pix1);
++ r10 = *(uint64_t *)(pix2 + 1*stride_pix2);
++ r01 = *(uint64_t *)(pix2 + 2*stride_pix2);
++ r11 = *(uint64_t *)(pix2 + 3*stride_pix2);
++ 
++ return _satd_4x4_neon(vsubq_u16(t0,r0), vsubq_u16(r1,t1));
++}
++
++
++
++
++
++
++int pixel_satd_8x4_neon(const uint16_t* pix1, intptr_t stride_pix1, const uint16_t* pix2, intptr_t stride_pix2)
++{
++ uint16x8_t i0,i1,i2,i3,i4,i5,i6,i7;
++ 
++ i0 = *(uint16x8_t *)(pix1 + 0*stride_pix1);
++ i1 = *(uint16x8_t *)(pix2 + 0*stride_pix2);
++ i2 = *(uint16x8_t *)(pix1 + 1*stride_pix1);
++ i3 = *(uint16x8_t *)(pix2 + 1*stride_pix2);
++ i4 = *(uint16x8_t *)(pix1 + 2*stride_pix1);
++ i5 = *(uint16x8_t *)(pix2 + 2*stride_pix2);
++ i6 = *(uint16x8_t *)(pix1 + 3*stride_pix1);
++ i7 = *(uint16x8_t *)(pix2 + 3*stride_pix2);
++
++ int16x8_t v0 = vsubq_u16(i0,i1);
++ int16x8_t v1 = vsubq_u16(i2,i3);
++ int16x8_t v2 = vsubq_u16(i4,i5);
++ int16x8_t v3 = vsubq_u16(i6,i7);
++
++ return _satd_4x8_8x4_end_neon(v0,v1,v2,v3);
++}
++
++
++int pixel_satd_16x16_neon(const uint16_t* pix1, intptr_t stride_pix1, const uint16_t* pix2, intptr_t stride_pix2)
++{
++ int32x4_t v30 = vdupq_n_u32(0),v31= vdupq_n_u32(0);
++ int16x8_t v0,v1,v2,v3;
++ 
++ _satd_16x4_neon(pix1,stride_pix1,pix2,stride_pix2,v0,v1,v2,v3);
++ v30 = vpadalq_u16(v30,v0);
++ v30 = vpadalq_u16(v30,v1);
++ v31 = vpadalq_u16(v31,v2);
++ v31 = vpadalq_u16(v31,v3);
++
++ _satd_16x4_neon(pix1 + 4*stride_pix1,stride_pix1,pix2+4*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v30 = vpadalq_u16(v30,v0);
++ v30 = vpadalq_u16(v30,v1);
++ v31 = vpadalq_u16(v31,v2);
++ v31 = vpadalq_u16(v31,v3);
++
++ _satd_16x4_neon(pix1 + 8*stride_pix1,stride_pix1,pix2+8*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v30 = vpadalq_u16(v30,v0);
++ v30 = vpadalq_u16(v30,v1);
++ v31 = vpadalq_u16(v31,v2);
++ v31 = vpadalq_u16(v31,v3);
++
++ _satd_16x4_neon(pix1 + 12*stride_pix1,stride_pix1,pix2+12*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v30 = vpadalq_u16(v30,v0);
++ v30 = vpadalq_u16(v30,v1);
++ v31 = vpadalq_u16(v31,v2);
++ v31 = vpadalq_u16(v31,v3);
++
++ return vaddvq_s32(vaddq_s32(v30,v31));
++ 
++}
++
++#else //HIGH_BIT_DEPTH
++
++static void _satd_16x4_neon(const uint8_t* pix1, intptr_t stride_pix1, const uint8_t* pix2, intptr_t stride_pix2,
++ int16x8_t& v0,int16x8_t&v1, int16x8_t&v2,int16x8_t&v3)
++{
++ uint8x16_t r0,r1,r2,r3;
++ uint8x16_t t0,t1,t2,t3;
++ int16x8_t v16,v17,v20,v21;
++ int16x8_t v18,v19,v22,v23;
++ 
++ r0 = *(uint8x16_t*)(pix1 + 0*stride_pix1);
++ r1 = *(uint8x16_t*)(pix1 + 1*stride_pix1);
++ r2 = *(uint8x16_t*)(pix1 + 2*stride_pix1);
++ r3 = *(uint8x16_t*)(pix1 + 3*stride_pix1);
++
++ t0 = *(uint8x16_t*)(pix2 + 0*stride_pix2);
++ t1 = *(uint8x16_t*)(pix2 + 1*stride_pix2);
++ t2 = *(uint8x16_t*)(pix2 + 2*stride_pix2);
++ t3 = *(uint8x16_t*)(pix2 + 3*stride_pix2);
++
++ 
++ 
++ v16 = vsubl_u8(vget_low_u8(r0),vget_low_u8(t0) );
++ v20 = vsubl_high_u8(r0,t0);
++ v17 = vsubl_u8(vget_low_u8(r1),vget_low_u8(t1) );
++ v21 = vsubl_high_u8(r1,t1);
++ v18 = vsubl_u8(vget_low_u8(r2),vget_low_u8(t2) );
++ v22 = vsubl_high_u8(r2,t2);
++ v19 = vsubl_u8(vget_low_u8(r3),vget_low_u8(t3) );
++ v23 = vsubl_high_u8(r3,t3);
++
++ SUMSUB_AB (v0, v1, v16, v17);
++ SUMSUB_AB (v2, v3, v18, v19);
++ 
++ _satd_8x4v_8x8h_neon(v0,v1,v2,v3,v20,v21,v22,v23);
++ 
++}
++
++
++static inline void _sub_8x8_fly(const uint8_t* pix1, intptr_t stride_pix1, const uint8_t* pix2, intptr_t stride_pix2,
++ int16x8_t& v0,int16x8_t& v1, int16x8_t& v2,int16x8_t& v3,
++ int16x8_t& v20,int16x8_t& v21, int16x8_t& v22,int16x8_t& v23)
++{
++ uint8x8_t r0,r1,r2,r3;
++ uint8x8_t t0,t1,t2,t3;
++ int16x8_t v16,v17;
++ int16x8_t v18,v19;
++ 
++ r0 = *(uint8x8_t*)(pix1 + 0*stride_pix1);
++ r1 = *(uint8x8_t*)(pix1 + 1*stride_pix1);
++ r2 = *(uint8x8_t*)(pix1 + 2*stride_pix1);
++ r3 = *(uint8x8_t*)(pix1 + 3*stride_pix1);
++
++ t0 = *(uint8x8_t*)(pix2 + 0*stride_pix2);
++ t1 = *(uint8x8_t*)(pix2 + 1*stride_pix2);
++ t2 = *(uint8x8_t*)(pix2 + 2*stride_pix2);
++ t3 = *(uint8x8_t*)(pix2 + 3*stride_pix2);
++
++ v16 = vsubl_u8(r0,t0);
++ v17 = vsubl_u8(r1,t1);
++ v18 = vsubl_u8(r2,t2);
++ v19 = vsubl_u8(r3,t3);
++
++ r0 = *(uint8x8_t*)(pix1 + 4*stride_pix1);
++ r1 = *(uint8x8_t*)(pix1 + 5*stride_pix1);
++ r2 = *(uint8x8_t*)(pix1 + 6*stride_pix1);
++ r3 = *(uint8x8_t*)(pix1 + 7*stride_pix1);
++
++ t0 = *(uint8x8_t*)(pix2 + 4*stride_pix2);
++ t1 = *(uint8x8_t*)(pix2 + 5*stride_pix2);
++ t2 = *(uint8x8_t*)(pix2 + 6*stride_pix2);
++ t3 = *(uint8x8_t*)(pix2 + 7*stride_pix2);
++ 
++ v20 = vsubl_u8(r0,t0);
++ v21 = vsubl_u8(r1,t1);
++ v22 = vsubl_u8(r2,t2);
++ v23 = vsubl_u8(r3,t3);
++
++
++ SUMSUB_AB (v0, v1, v16, v17);
++ SUMSUB_AB (v2, v3, v18, v19);
++ 
++}
++
++int pixel_satd_4x4_neon(const uint8_t* pix1, intptr_t stride_pix1, const uint8_t* pix2, intptr_t stride_pix2)
++{
++ uint32x2_t t0,t1,r0,r1;
++ t00 = *(uint32_t *)(pix1 + 0*stride_pix1);
++ t10 = *(uint32_t *)(pix1 + 1*stride_pix1);
++ t01 = *(uint32_t *)(pix1 + 2*stride_pix1);
++ t11 = *(uint32_t *)(pix1 + 3*stride_pix1);
++
++ r00 = *(uint32_t *)(pix2 + 0*stride_pix1);
++ r10 = *(uint32_t *)(pix2 + 1*stride_pix2);
++ r01 = *(uint32_t *)(pix2 + 2*stride_pix2);
++ r11 = *(uint32_t *)(pix2 + 3*stride_pix2);
++ 
++ return _satd_4x4_neon(vsubl_u8(t0,r0), vsubl_u8(r1,t1));
++}
++
++
++int pixel_satd_8x4_neon(const uint8_t* pix1, intptr_t stride_pix1, const uint8_t* pix2, intptr_t stride_pix2)
++{
++ uint8x8_t i0,i1,i2,i3,i4,i5,i6,i7;
++ 
++ i0 = *(uint8x8_t *)(pix1 + 0*stride_pix1);
++ i1 = *(uint8x8_t *)(pix2 + 0*stride_pix2);
++ i2 = *(uint8x8_t *)(pix1 + 1*stride_pix1);
++ i3 = *(uint8x8_t *)(pix2 + 1*stride_pix2);
++ i4 = *(uint8x8_t *)(pix1 + 2*stride_pix1);
++ i5 = *(uint8x8_t *)(pix2 + 2*stride_pix2);
++ i6 = *(uint8x8_t *)(pix1 + 3*stride_pix1);
++ i7 = *(uint8x8_t *)(pix2 + 3*stride_pix2);
++
++ int16x8_t v0 = vsubl_u8(i0,i1);
++ int16x8_t v1 = vsubl_u8(i2,i3);
++ int16x8_t v2 = vsubl_u8(i4,i5);
++ int16x8_t v3 = vsubl_u8(i6,i7);
++
++ return _satd_4x8_8x4_end_neon(v0,v1,v2,v3);
++}
++
++int pixel_satd_16x16_neon(const uint8_t* pix1, intptr_t stride_pix1, const uint8_t* pix2, intptr_t stride_pix2)
++{
++ int16x8_t v30,v31;
++ int16x8_t v0,v1,v2,v3;
++ 
++ _satd_16x4_neon(pix1,stride_pix1,pix2,stride_pix2,v0,v1,v2,v3);
++ v30 = vaddq_s16(v0,v1);
++ v31 = vaddq_s16(v2,v3);
++ 
++ _satd_16x4_neon(pix1 + 4*stride_pix1,stride_pix1,pix2+4*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v0 = vaddq_s16(v0,v1);
++ v1 = vaddq_s16(v2,v3);
++ v30 = vaddq_s16(v30, v0);
++ v31 = vaddq_s16(v31, v1);
++
++ _satd_16x4_neon(pix1 + 8*stride_pix1,stride_pix1,pix2+8*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v0 = vaddq_s16(v0,v1);
++ v1 = vaddq_s16(v2,v3);
++ v30 = vaddq_s16(v30, v0);
++ v31 = vaddq_s16(v31, v1);
++
++ _satd_16x4_neon(pix1 + 12*stride_pix1,stride_pix1,pix2+12*stride_pix2,stride_pix2,v0,v1,v2,v3);
++ v0 = vaddq_s16(v0,v1);
++ v1 = vaddq_s16(v2,v3);
++ v30 = vaddq_s16(v30, v0);
++ v31 = vaddq_s16(v31, v1);
++
++ int32x4_t sum0 = vpaddlq_u16(v30);
++ int32x4_t sum1 = vpaddlq_u16(v31);
++ sum0 = vaddq_s32(sum0,sum1);
++ return vaddvq_s32(sum0);
++ 
++}
++#endif //HIGH_BIT_DEPTH
++
++
++static inline void _sa8d_8x8_neon_end(int16x8_t& v0,int16x8_t& v1,int16x8_t v2,int16x8_t v3,
++ int16x8_t v20,int16x8_t v21,int16x8_t v22,int16x8_t v23)
++{
++ int16x8_t v16,v17,v18,v19;
++ int16x8_t v4,v5,v6,v7;
++ 
++ SUMSUB_AB (v16, v18, v0, v2);
++ SUMSUB_AB (v17, v19, v1, v3);
++
++ HADAMARD4_V (v20, v21, v22, v23, v0, v1, v2, v3);
++
++ SUMSUB_AB (v0, v16, v16, v20);
++ SUMSUB_AB (v1, v17, v17, v21);
++ SUMSUB_AB (v2, v18, v18, v22);
++ SUMSUB_AB (v3, v19, v19, v23);
++
++ transpose_8h (v20, v21, v16, v17);
++ transpose_8h (v4, v5, v0, v1);
++ transpose_8h (v22, v23, v18, v19);
++ transpose_8h (v6, v7, v2, v3);
++ 
++#if (X265_DEPTH <= 10)
++
++ int16x8_t v24,v25;
++
++ SUMSUB_AB (v2, v3, v20, v21);
++ SUMSUB_AB (v24, v25, v4, v5);
++ SUMSUB_AB (v0, v1, v22, v23);
++ SUMSUB_AB (v4, v5, v6, v7);
++
++ transpose_4s (v20, v22, v2, v0);
++ transpose_4s (v21, v23, v3, v1);
++ transpose_4s (v16, v18, v24, v4);
++ transpose_4s (v17, v19, v25, v5);
++
++ SUMSUB_AB (v0, v2, v20, v22);
++ SUMSUB_AB (v1, v3, v21, v23);
++ SUMSUB_AB (v4, v6, v16, v18);
++ SUMSUB_AB (v5, v7, v17, v19);
++
++ transpose_2d (v16, v20, v0, v4);
++ transpose_2d (v17, v21, v1, v5);
++ transpose_2d (v18, v22, v2, v6);
++ transpose_2d (v19, v23, v3, v7);
++
++ 
++ v16 = vabsq_s16(v16);
++ v17 = vabsq_s16(v17);
++ v18 = vabsq_s16(v18);
++ v19 = vabsq_s16(v19);
++ v20 = vabsq_s16(v20);
++ v21 = vabsq_s16(v21);
++ v22 = vabsq_s16(v22);
++ v23 = vabsq_s16(v23);
++
++ v16 = vmaxq_u16(v16,v20);
++ v17 = vmaxq_u16(v17,v21);
++ v18 = vmaxq_u16(v18,v22);
++ v19 = vmaxq_u16(v19,v23);
++
++#if HIGH_BIT_DEPTH
++ v0 = vpaddlq_u16(v16);
++ v1 = vpaddlq_u16(v17);
++ v0 = vpadalq_u16(v0,v18);
++ v1 = vpadalq_u16(v1,v19);
++ 
++#else //HIGH_BIT_DEPTH
++ 
++ v0 = vaddq_u16(v16,v17);
++ v1 = vaddq_u16(v18,v19);
++
++#endif //HIGH_BIT_DEPTH
++ 
++#else // HIGH_BIT_DEPTH 12 bit only, switching math to int32, each int16x8 is up-convreted to 2 int32x4 (low and high)
++
++ int32x4_t v2l,v2h,v3l,v3h,v24l,v24h,v25l,v25h,v0l,v0h,v1l,v1h;
++ int32x4_t v22l,v22h,v23l,v23h;
++ int32x4_t v4l,v4h,v5l,v5h;
++ int32x4_t v6l,v6h,v7l,v7h;
++ int32x4_t v16l,v16h,v17l,v17h;
++ int32x4_t v18l,v18h,v19l,v19h;
++ int32x4_t v20l,v20h,v21l,v21h;
++
++ ISUMSUB_AB_FROM_INT16(v2l, v2h, v3l, v3h, v20, v21);
++ ISUMSUB_AB_FROM_INT16(v24l, v24h, v25l, v25h, v4, v5);
++
++ v22l = vmovl_s16(vget_low_s16(v22));
++ v22h = vmovl_high_s16(v22);
++ v23l = vmovl_s16(vget_low_s16(v23));
++ v23h = vmovl_high_s16(v23);
++ 
++ ISUMSUB_AB(v0l, v1l, v22l, v23l);
++ ISUMSUB_AB(v0h, v1h, v22h, v23h);
++
++ v6l = vmovl_s16(vget_low_s16(v6));
++ v6h = vmovl_high_s16(v6);
++ v7l = vmovl_s16(vget_low_s16(v7));
++ v7h = vmovl_high_s16(v7);
++
++ ISUMSUB_AB (v4l, v5l, v6l, v7l);
++ ISUMSUB_AB (v4h, v5h, v6h, v7h);
++
++ transpose_2d (v20l, v22l, v2l, v0l);
++ transpose_2d (v21l, v23l, v3l, v1l);
++ transpose_2d (v16l, v18l, v24l, v4l);
++ transpose_2d (v17l, v19l, v25l, v5l);
++
++ transpose_2d (v20h, v22h, v2h, v0h);
++ transpose_2d (v21h, v23h, v3h, v1h);
++ transpose_2d (v16h, v18h, v24h, v4h);
++ transpose_2d (v17h, v19h, v25h, v5h);
++
++ ISUMSUB_AB (v0l, v2l, v20l, v22l);
++ ISUMSUB_AB (v1l, v3l, v21l, v23l);
++ ISUMSUB_AB (v4l, v6l, v16l, v18l);
++ ISUMSUB_AB (v5l, v7l, v17l, v19l);
++
++ ISUMSUB_AB (v0h, v2h, v20h, v22h);
++ ISUMSUB_AB (v1h, v3h, v21h, v23h);
++ ISUMSUB_AB (v4h, v6h, v16h, v18h);
++ ISUMSUB_AB (v5h, v7h, v17h, v19h);
++
++ v16l = v0l;
++ v16h = v4l;
++ v20l = v0h;
++ v20h = v4h;
++ 
++ v17l = v1l;
++ v17h = v5l;
++ v21l = v1h;
++ v21h = v5h;
++ 
++ v18l = v2l;
++ v18h = v6l;
++ v22l = v2h;
++ v22h = v6h;
++ 
++ v19l = v3l;
++ v19h = v7l;
++ v23l = v3h;
++ v23h = v7h;
++
++ v16l = vabsq_s32(v16l);
++ v17l = vabsq_s32(v17l);
++ v18l = vabsq_s32(v18l);
++ v19l = vabsq_s32(v19l);
++ v20l = vabsq_s32(v20l);
++ v21l = vabsq_s32(v21l);
++ v22l = vabsq_s32(v22l);
++ v23l = vabsq_s32(v23l);
++
++ v16h = vabsq_s32(v16h);
++ v17h = vabsq_s32(v17h);
++ v18h = vabsq_s32(v18h);
++ v19h = vabsq_s32(v19h);
++ v20h = vabsq_s32(v20h);
++ v21h = vabsq_s32(v21h);
++ v22h = vabsq_s32(v22h);
++ v23h = vabsq_s32(v23h);
++
++ v16l = vmaxq_u32(v16l,v20l);
++ v17l = vmaxq_u32(v17l,v21l);
++ v18l = vmaxq_u32(v18l,v22l);
++ v19l = vmaxq_u32(v19l,v23l);
++
++ v16h = vmaxq_u32(v16h,v20h);
++ v17h = vmaxq_u32(v17h,v21h);
++ v18h = vmaxq_u32(v18h,v22h);
++ v19h = vmaxq_u32(v19h,v23h);
++
++ v16l = vaddq_u32(v16l,v16h);
++ v17l = vaddq_u32(v17l,v17h);
++ v18l = vaddq_u32(v18l,v18h);
++ v19l = vaddq_u32(v19l,v19h);
++
++ v0 = vaddq_u32(v16l, v17l);
++ v1 = vaddq_u32(v18l,v19l);
++ 
++ 
++#endif
++ 
++}
++
++
++
++static inline void _satd_8x8_neon(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2,
++ int16x8_t& v0,int16x8_t&v1, int16x8_t&v2,int16x8_t&v3)
++{
++ 
++ int16x8_t v20,v21,v22,v23;
++ _sub_8x8_fly(pix1,stride_pix1,pix2,stride_pix2,v0,v1,v2,v3,v20,v21,v22,v23);
++ _satd_8x4v_8x8h_neon(v0,v1,v2,v3,v20,v21,v22,v23);
++ 
++}
++
++
++
++int pixel_satd_8x8_neon(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int16x8_t v30,v31;
++ int16x8_t v0,v1,v2,v3;
++ 
++ _satd_8x8_neon(pix1,stride_pix1,pix2,stride_pix2,v0,v1,v2,v3);
++#if !(HIGH_BIT_DEPTH)
++ v30 = vaddq_u16(v0,v1);
++ v31 = vaddq_u16(v2,v3);
++ 
++ uint16x8_t sum = vaddq_u16(v30,v31);
++ return vaddvq_s32(vpaddlq_u16(sum));
++#else
++ 
++ v30 = vaddq_u16(v0,v1);
++ v31 = vaddq_u16(v2,v3);
++
++ int32x4_t sum = vpaddlq_u16(v30);
++ sum = vpadalq_u16(sum, v31);
++ return vaddvq_s32(sum);
++#endif
++}
++
++
++int pixel_sa8d_8x8_neon(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int16x8_t v0,v1,v2,v3;
++ int16x8_t v20,v21,v22,v23;
++ 
++ _sub_8x8_fly(pix1, stride_pix1, pix2, stride_pix2, v0, v1, v2, v3, v20, v21, v22, v23);
++ _sa8d_8x8_neon_end(v0, v1, v2, v3, v20, v21, v22, v23);
++
++#if HIGH_BIT_DEPTH
++//#if 1//HIGH_BIT_DEPTH
++ int32x4_t s = vaddq_u32(v0,v1);
++ return (vaddvq_u32(s) + 1) >> 1;
++#else
++ return (vaddlvq_s16(vaddq_u16(v0, v1)) + 1) >> 1;
++#endif
++}
++
++
++
++
++
++int pixel_sa8d_16x16_neon(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int16x8_t v0,v1,v2,v3;
++ int16x8_t v20,v21,v22,v23;
++ int32x4_t v30,v31;
++ 
++ _sub_8x8_fly(pix1, stride_pix1, pix2, stride_pix2, v0, v1, v2, v3, v20, v21, v22, v23);
++ _sa8d_8x8_neon_end(v0, v1, v2, v3, v20, v21, v22, v23);
++
++#if !(HIGH_BIT_DEPTH)
++ v30 = vpaddlq_u16(v0);
++ v31 = vpaddlq_u16(v1);
++#else
++ v30 = vaddq_s32(v0,v1);
++#endif
++ 
++ _sub_8x8_fly(pix1 + 8, stride_pix1, pix2 + 8, stride_pix2, v0, v1, v2, v3, v20, v21, v22, v23);
++ _sa8d_8x8_neon_end(v0, v1, v2, v3, v20, v21, v22, v23);
++
++#if !(HIGH_BIT_DEPTH)
++ v30 = vpadalq_u16(v30,v0);
++ v31 = vpadalq_u16(v31,v1);
++#else
++ v31 = vaddq_s32(v0,v1);
++#endif
++
++
++ _sub_8x8_fly(pix1 + 8*stride_pix1, stride_pix1, pix2 + 8*stride_pix2, stride_pix2, v0, v1, v2, v3, v20, v21, v22, v23);
++ _sa8d_8x8_neon_end(v0, v1, v2, v3, v20, v21, v22, v23);
++
++#if !(HIGH_BIT_DEPTH)
++ v30 = vpadalq_u16(v30,v0);
++ v31 = vpadalq_u16(v31,v1);
++#else
++ v30 = vaddq_s32(v30,v0);
++ v31 = vaddq_s32(v31,v1);
++#endif
++
++ _sub_8x8_fly(pix1 + 8*stride_pix1 + 8, stride_pix1, pix2 + 8*stride_pix2 + 8, stride_pix2, v0, v1, v2, v3, v20, v21, v22, v23);
++ _sa8d_8x8_neon_end(v0, v1, v2, v3, v20, v21, v22, v23);
++
++#if !(HIGH_BIT_DEPTH)
++ v30 = vpadalq_u16(v30,v0);
++ v31 = vpadalq_u16(v31,v1);
++#else
++ v30 = vaddq_s32(v30,v0);
++ v31 = vaddq_s32(v31,v1);
++#endif
++
++ v30 = vaddq_u32(v30,v31);
++ 
++ return (vaddvq_u32(v30) + 1) >> 1;
++}
++
++
++
++
++
++
++
++
++template<int size>
++void blockfill_s_neon(int16_t* dst, intptr_t dstride, int16_t val)
++{
++ for (int y = 0; y < size; y++) {
++ int x = 0;
++ int16x8_t v = vdupq_n_s16(val);
++ for (; (x + 8) <= size; x+=8) {
++ *(int16x8_t*)&dsty * dstride + x = v;
++ }
++ for (; x < size; x++) {
++ dsty * dstride + x = val;
++ }
++ }
++}
++
++template<int lx, int ly>
++int sad_pp_neon(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int sum = 0;
++
++
++ for (int y = 0; y < ly; y++)
++ {
++#if HIGH_BIT_DEPTH
++ int x=0;
++ uint16x8_t vsum16_1 = vdupq_n_u16(0);
++ for (; (x + 8) <= lx; x+=8) {
++ uint16x8_t p1 = *(uint16x8_t*)&pix1x;
++ uint16x8_t p2 = *(uint16x8_t*)&pix2x;
++ vsum16_1 = vabaq_s16(vsum16_1,p1,p2);
++ 
++ }
++ if (lx & 4) {
++ uint16x4_t p1 = *(uint16x4_t*)&pix1x;
++ uint16x4_t p2 = *(uint16x4_t*)&pix2x;
++ sum += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p2));
++ x += 4;
++ }
++ if (lx >= 4) {
++ sum += vaddlvq_s16(vsum16_1);
++ }
++
++#else
++
++ int x=0;
++ uint16x8_t vsum16_1 = vdupq_n_u16(0);
++ uint16x8_t vsum16_2 = vdupq_n_u16(0);
++
++ for (; (x + 16) <= lx; x+=16) {
++ uint8x16_t p1 = *(uint8x16_t*)&pix1x;
++ uint8x16_t p2 = *(uint8x16_t*)&pix2x;
++ vsum16_1 = vabal_u8(vsum16_1,vget_low_u8(p1),vget_low_u8(p2));
++ vsum16_2 = vabal_high_u8(vsum16_2,p1,p2);
++ }
++ if (lx & 8) {
++ uint8x8_t p1 = *(uint8x8_t*)&pix1x;
++ uint8x8_t p2 = *(uint8x8_t*)&pix2x;
++ vsum16_1 = vabal_u8(vsum16_1,p1,p2);
++ x += 8;
++ }
++ if (lx & 4) {
++ uint32x2_t p1 = vdup_n_u32(0);
++ p10 = *(uint32_t*)&pix1x;
++ uint32x2_t p2 = vdup_n_u32(0);
++ p20 = *(uint32_t*)&pix2x;
++ vsum16_1 = vabal_u8(vsum16_1,p1,p2);
++ x += 4;
++ }
++ if (lx >= 16) {
++ vsum16_1 = vaddq_u16(vsum16_1,vsum16_2);
++ }
++ if (lx >= 4) {
++ sum += vaddvq_u16(vsum16_1);
++ }
++
++#endif
++ if (lx & 3) for (; x < lx; x++) {
++ sum += abs(pix1x - pix2x);
++ }
++ 
++ pix1 += stride_pix1;
++ pix2 += stride_pix2;
++ }
++
++ return sum;
++}
++
++template<int lx, int ly>
++void sad_x3_neon(const pixel* pix1, const pixel* pix2, const pixel* pix3, const pixel* pix4, intptr_t frefstride, int32_t* res)
++{
++ res0 = 0;
++ res1 = 0;
++ res2 = 0;
++ for (int y = 0; y < ly; y++)
++ {
++ int x = 0;
++ uint16x8_t vsum16_0 = vdupq_n_u16(0);
++ uint16x8_t vsum16_1 = vdupq_n_u16(0);
++ uint16x8_t vsum16_2 = vdupq_n_u16(0);
++#if HIGH_BIT_DEPTH
++ for (; (x + 8) <= lx; x+=8) {
++ uint16x8_t p1 = *(uint16x8_t*)&pix1x;
++ uint16x8_t p2 = *(uint16x8_t*)&pix2x;
++ uint16x8_t p3 = *(uint16x8_t*)&pix3x;
++ uint16x8_t p4 = *(uint16x8_t*)&pix4x;
++ vsum16_0 = vabaq_s16(vsum16_0,p1,p2);
++ vsum16_1 = vabaq_s16(vsum16_1,p1,p3);
++ vsum16_2 = vabaq_s16(vsum16_2,p1,p4);
++
++ }
++ if (lx & 4) {
++ uint16x4_t p1 = *(uint16x4_t*)&pix1x;
++ uint16x4_t p2 = *(uint16x4_t*)&pix2x;
++ uint16x4_t p3 = *(uint16x4_t*)&pix3x;
++ uint16x4_t p4 = *(uint16x4_t*)&pix4x;
++ res0 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p2));
++ res1 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p3));
++ res2 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p4));
++ x += 4;
++ }
++ if (lx >= 4) {
++ res0 += vaddlvq_s16(vsum16_0);
++ res1 += vaddlvq_s16(vsum16_1);
++ res2 += vaddlvq_s16(vsum16_2);
++ }
++#else
++ 
++ for (; (x + 16) <= lx; x+=16) {
++ uint8x16_t p1 = *(uint8x16_t*)&pix1x;
++ uint8x16_t p2 = *(uint8x16_t*)&pix2x;
++ uint8x16_t p3 = *(uint8x16_t*)&pix3x;
++ uint8x16_t p4 = *(uint8x16_t*)&pix4x;
++ vsum16_0 = vabal_u8(vsum16_0,vget_low_u8(p1),vget_low_u8(p2));
++ vsum16_0 = vabal_high_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,vget_low_u8(p1),vget_low_u8(p3));
++ vsum16_1 = vabal_high_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,vget_low_u8(p1),vget_low_u8(p4));
++ vsum16_2 = vabal_high_u8(vsum16_2,p1,p4);
++ }
++ if (lx & 8) {
++ uint8x8_t p1 = *(uint8x8_t*)&pix1x;
++ uint8x8_t p2 = *(uint8x8_t*)&pix2x;
++ uint8x8_t p3 = *(uint8x8_t*)&pix3x;
++ uint8x8_t p4 = *(uint8x8_t*)&pix4x;
++ vsum16_0 = vabal_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,p1,p4);
++ x += 8;
++ }
++ if (lx & 4) {
++ uint32x2_t p1 = vdup_n_u32(0);
++ p10 = *(uint32_t*)&pix1x;
++ uint32x2_t p2 = vdup_n_u32(0);
++ p20 = *(uint32_t*)&pix2x;
++ uint32x2_t p3 = vdup_n_u32(0);
++ p30 = *(uint32_t*)&pix3x;
++ uint32x2_t p4 = vdup_n_u32(0);
++ p40 = *(uint32_t*)&pix4x;
++ vsum16_0 = vabal_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,p1,p4);
++ x += 4;
++ }
++ if (lx >= 4) {
++ res0 += vaddvq_u16(vsum16_0);
++ res1 += vaddvq_u16(vsum16_1);
++ res2 += vaddvq_u16(vsum16_2);
++ }
++
++#endif
++ if (lx & 3) for (; x < lx; x++)
++ {
++ res0 += abs(pix1x - pix2x);
++ res1 += abs(pix1x - pix3x);
++ res2 += abs(pix1x - pix4x);
++ }
++
++ pix1 += FENC_STRIDE;
++ pix2 += frefstride;
++ pix3 += frefstride;
++ pix4 += frefstride;
++ }
++}
++
++template<int lx, int ly>
++void sad_x4_neon(const pixel* pix1, const pixel* pix2, const pixel* pix3, const pixel* pix4, const pixel* pix5, intptr_t frefstride, int32_t* res)
++{
++ res0 = 0;
++ res1 = 0;
++ res2 = 0;
++ res3 = 0;
++ for (int y = 0; y < ly; y++)
++ {
++ int x=0;
++ uint16x8_t vsum16_0 = vdupq_n_u16(0);
++ uint16x8_t vsum16_1 = vdupq_n_u16(0);
++ uint16x8_t vsum16_2 = vdupq_n_u16(0);
++ uint16x8_t vsum16_3 = vdupq_n_u16(0);
++#if HIGH_BIT_DEPTH
++ for (; (x + 8) <= lx; x+=8) {
++ uint16x8_t p1 = *(uint16x8_t*)&pix1x;
++ uint16x8_t p2 = *(uint16x8_t*)&pix2x;
++ uint16x8_t p3 = *(uint16x8_t*)&pix3x;
++ uint16x8_t p4 = *(uint16x8_t*)&pix4x;
++ uint16x8_t p5 = *(uint16x8_t*)&pix5x;
++ vsum16_0 = vabaq_s16(vsum16_0,p1,p2);
++ vsum16_1 = vabaq_s16(vsum16_1,p1,p3);
++ vsum16_2 = vabaq_s16(vsum16_2,p1,p4);
++ vsum16_3 = vabaq_s16(vsum16_3,p1,p5);
++
++ }
++ if (lx & 4) {
++ uint16x4_t p1 = *(uint16x4_t*)&pix1x;
++ uint16x4_t p2 = *(uint16x4_t*)&pix2x;
++ uint16x4_t p3 = *(uint16x4_t*)&pix3x;
++ uint16x4_t p4 = *(uint16x4_t*)&pix4x;
++ uint16x4_t p5 = *(uint16x4_t*)&pix5x;
++ res0 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p2));
++ res1 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p3));
++ res2 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p4));
++ res3 += vaddlv_s16(vaba_s16(vdup_n_s16(0),p1,p5));
++ x += 4;
++ }
++ if (lx >= 4) {
++ res0 += vaddlvq_s16(vsum16_0);
++ res1 += vaddlvq_s16(vsum16_1);
++ res2 += vaddlvq_s16(vsum16_2);
++ res3 += vaddlvq_s16(vsum16_3);
++ }
++
++#else
++ 
++ for (; (x + 16) <= lx; x+=16) {
++ uint8x16_t p1 = *(uint8x16_t*)&pix1x;
++ uint8x16_t p2 = *(uint8x16_t*)&pix2x;
++ uint8x16_t p3 = *(uint8x16_t*)&pix3x;
++ uint8x16_t p4 = *(uint8x16_t*)&pix4x;
++ uint8x16_t p5 = *(uint8x16_t*)&pix5x;
++ vsum16_0 = vabal_u8(vsum16_0,vget_low_u8(p1),vget_low_u8(p2));
++ vsum16_0 = vabal_high_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,vget_low_u8(p1),vget_low_u8(p3));
++ vsum16_1 = vabal_high_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,vget_low_u8(p1),vget_low_u8(p4));
++ vsum16_2 = vabal_high_u8(vsum16_2,p1,p4);
++ vsum16_3 = vabal_u8(vsum16_3,vget_low_u8(p1),vget_low_u8(p5));
++ vsum16_3 = vabal_high_u8(vsum16_3,p1,p5);
++ }
++ if (lx & 8) {
++ uint8x8_t p1 = *(uint8x8_t*)&pix1x;
++ uint8x8_t p2 = *(uint8x8_t*)&pix2x;
++ uint8x8_t p3 = *(uint8x8_t*)&pix3x;
++ uint8x8_t p4 = *(uint8x8_t*)&pix4x;
++ uint8x8_t p5 = *(uint8x8_t*)&pix5x;
++ vsum16_0 = vabal_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,p1,p4);
++ vsum16_3 = vabal_u8(vsum16_3,p1,p5);
++ x += 8;
++ }
++ if (lx & 4) {
++ uint32x2_t p1 = vdup_n_u32(0);
++ p10 = *(uint32_t*)&pix1x;
++ uint32x2_t p2 = vdup_n_u32(0);
++ p20 = *(uint32_t*)&pix2x;
++ uint32x2_t p3 = vdup_n_u32(0);
++ p30 = *(uint32_t*)&pix3x;
++ uint32x2_t p4 = vdup_n_u32(0);
++ p40 = *(uint32_t*)&pix4x;
++ uint32x2_t p5 = vdup_n_u32(0);
++ p50 = *(uint32_t*)&pix5x;
++ vsum16_0 = vabal_u8(vsum16_0,p1,p2);
++ vsum16_1 = vabal_u8(vsum16_1,p1,p3);
++ vsum16_2 = vabal_u8(vsum16_2,p1,p4);
++ vsum16_3 = vabal_u8(vsum16_3,p1,p5);
++ x += 4;
++ }
++ if (lx >= 4) {
++ res0 += vaddvq_u16(vsum16_0);
++ res1 += vaddvq_u16(vsum16_1);
++ res2 += vaddvq_u16(vsum16_2);
++ res3 += vaddvq_u16(vsum16_3);
++ }
++
++#endif
++ if (lx & 3) for (; x < lx; x++)
++ {
++ res0 += abs(pix1x - pix2x);
++ res1 += abs(pix1x - pix3x);
++ res2 += abs(pix1x - pix4x);
++ res3 += abs(pix1x - pix5x);
++ }
++
++ pix1 += FENC_STRIDE;
++ pix2 += frefstride;
++ pix3 += frefstride;
++ pix4 += frefstride;
++ pix5 += frefstride;
++ }
++}
++
++
++template<int lx, int ly, class T1, class T2>
++sse_t sse_neon(const T1* pix1, intptr_t stride_pix1, const T2* pix2, intptr_t stride_pix2)
++{
++ sse_t sum = 0;
++
++ int32x4_t vsum1 = vdupq_n_s32(0);
++ int32x4_t vsum2 = vdupq_n_s32(0);
++ for (int y = 0; y < ly; y++)
++ {
++ int x = 0;
++ for (; (x+8) <= lx; x+=8)
++ {
++ int16x8_t tmp;
++ if (sizeof(T1) == 2 && sizeof(T2) == 2) {
++ tmp = vsubq_s16(*(int16x8_t *)&pix1x,*(int16x8_t *)&pix2x);
++ } else if (sizeof(T1) == 1 && sizeof(T2) == 1){
++ tmp = vsubl_u8(*(uint8x8_t *)&pix1x,*(uint8x8_t *)&pix2x);
++ }
++ else {
++ X265_CHECK(false,"unsupported sse");
++ }
++ vsum1 = vmlal_s16(vsum1,vget_low_s16(tmp),vget_low_s16(tmp));
++ vsum2 = vmlal_high_s16(vsum2,tmp,tmp);
++ }
++ for (; x < lx; x++)
++ {
++ int tmp = pix1x - pix2x;
++ sum += (tmp * tmp);
++ }
++ 
++ if (sizeof(T1) == 2 && sizeof(T2) == 2)
++ {
++ int32x4_t vsum = vaddq_u32(vsum1,vsum2);;
++ sum += vaddvq_u32(vsum);
++ vsum1 = vsum2 = vdupq_n_u16(0);
++ }
++
++ pix1 += stride_pix1;
++ pix2 += stride_pix2;
++ }
++ int32x4_t vsum = vaddq_u32(vsum1,vsum2);
++
++ return sum + vaddvq_u32(vsum);
++}
++
++
++template<int bx, int by>
++void blockcopy_ps_neon(int16_t* a, intptr_t stridea, const pixel* b, intptr_t strideb)
++{
++ for (int y = 0; y < by; y++)
++ {
++ int x= 0;
++ for (; (x + 8) <= bx; x+=8)
++ {
++#if HIGH_BIT_DEPTH
++ *(int16x8_t *)&ax = *(int16x8_t *)&bx;
++#else
++ *(int16x8_t *)&ax = vmovl_u8(*(int8x8_t *)&bx);
++#endif
++ }
++ for (; x < bx; x++) {
++ ax = (int16_t)bx;
++ }
++ 
++ a += stridea;
++ b += strideb;
++ }
++}
++
++
++template<int bx, int by>
++void blockcopy_pp_neon(pixel* a, intptr_t stridea, const pixel* b, intptr_t strideb)
++{
++ for (int y = 0; y < by; y++)
++ {
++ int x = 0;
++#if HIGH_BIT_DEPTH
++ for (; (x + 8) <= bx; x+=8)
++ {
++ *(int16x8_t *)&ax = *(int16x8_t *)&bx;
++ }
++ if (bx & 4)
++ {
++ *(uint64_t *)&ax = *(uint64_t *)&bx;
++ x += 4;
++ }
++#else
++ for (; (x + 16) <= bx; x+=16)
++ {
++ *(uint8x16_t *)&ax = *(uint8x16_t *)&bx;
++ }
++ if (bx & 8)
++ {
++ *(uint8x8_t *)&ax = *(uint8x8_t *)&bx;
++ x += 8;
++ }
++ if (bx & 4)
++ {
++ *(uint32_t *)&ax = *(uint32_t *)&bx;
++ x += 4;
++ }
++#endif
++ for (; x < bx; x++) {
++ ax = bx;
++ }
++
++ a += stridea;
++ b += strideb;
++ }
++}
++
++
++template<int bx, int by>
++void pixel_sub_ps_neon(int16_t* a, intptr_t dstride, const pixel* b0, const pixel* b1, intptr_t sstride0, intptr_t sstride1)
++{
++ for (int y = 0; y < by; y++)
++ {
++ int x = 0;
++ for (; (x + 8) <= bx; x+=8) {
++#if HIGH_BIT_DEPTH
++ *(int16x8_t *)&ax = vsubq_s16(*(int16x8_t *)&b0x, *(int16x8_t *)&b1x);
++#else
++ *(int16x8_t *)&ax = vsubl_u8(*(uint8x8_t *)&b0x, *(uint8x8_t *)&b1x);
++#endif
++ }
++ for (; x < bx; x++)
++ ax = (int16_t)(b0x - b1x);
++
++ b0 += sstride0;
++ b1 += sstride1;
++ a += dstride;
++ }
++}
++
++template<int bx, int by>
++void pixel_add_ps_neon(pixel* a, intptr_t dstride, const pixel* b0, const int16_t* b1, intptr_t sstride0, intptr_t sstride1)
++{
++ for (int y = 0; y < by; y++)
++ {
++ int x = 0;
++ for (; (x + 8) <= bx; x+=8) {
++ int16x8_t t;
++ int16x8_t b1e = *(int16x8_t *)&b1x;
++ int16x8_t b0e;
++#if HIGH_BIT_DEPTH
++ b0e = *(int16x8_t *)&b0x;
++ t = vaddq_s16(b0e,b1e);
++ t = vminq_s16(t,vdupq_n_s16((1 << X265_DEPTH) - 1));
++ t = vmaxq_s16(t,vdupq_n_s16(0));
++ *(int16x8_t *)&ax = t;
++#else
++ b0e = vmovl_u8(*(uint8x8_t *)&b0x);
++ t = vaddq_s16(b0e,b1e);
++ *(uint8x8_t *)&ax = vqmovun_s16(t);
++#endif
++ }
++ for (; x < bx; x++)
++ ax = (int16_t)x265_clip(b0x + b1x);
++
++ b0 += sstride0;
++ b1 += sstride1;
++ a += dstride;
++ }
++}
++
++template<int bx, int by>
++void addAvg_neon(const int16_t* src0, const int16_t* src1, pixel* dst, intptr_t src0Stride, intptr_t src1Stride, intptr_t dstStride)
++{
++
++ const int shiftNum = IF_INTERNAL_PREC + 1 - X265_DEPTH;
++ const int offset = (1 << (shiftNum - 1)) + 2 * IF_INTERNAL_OFFS;
++
++ const int32x4_t addon = vdupq_n_s32(offset);
++ for (int y = 0; y < by; y++)
++ {
++ int x = 0;
++ 
++ for (; (x + 8) <= bx; x += 8)
++ {
++ int16x8_t in0 = *(int16x8_t*)&src0x;
++ int16x8_t in1 = *(int16x8_t*)&src1x;
++ int32x4_t t1 = vaddl_s16(vget_low_s16(in0),vget_low_s16(in1));
++ int32x4_t t2 = vaddl_high_s16(in0,in1);
++ t1 = vaddq_s32(t1,addon);
++ t2 = vaddq_s32(t2,addon);
++ t1 = vshrq_n_s32(t1,shiftNum);
++ t2 = vshrq_n_s32(t2,shiftNum);
++ int16x8_t t = vuzp1q_s16(t1,t2);
++#if HIGH_BIT_DEPTH
++ t = vminq_s16(t,vdupq_n_s16((1 << X265_DEPTH) - 1));
++ t = vmaxq_s16(t,vdupq_n_s16(0));
++ *(int16x8_t *)&dstx = t;
++#else
++ *(uint8x8_t *)&dstx = vqmovun_s16(t);
++#endif
++ }
++ for (; x < bx; x += 2)
++ {
++ dstx + 0 = x265_clip((src0x + 0 + src1x + 0 + offset) >> shiftNum);
++ dstx + 1 = x265_clip((src0x + 1 + src1x + 1 + offset) >> shiftNum);
++ }
++
++ src0 += src0Stride;
++ src1 += src1Stride;
++ dst += dstStride;
++ }
++}
++
++template<int lx, int ly>
++void pixelavg_pp_neon(pixel* dst, intptr_t dstride, const pixel* src0, intptr_t sstride0, const pixel* src1, intptr_t sstride1, int)
++{
++ for (int y = 0; y < ly; y++)
++ {
++ int x = 0;
++ for (; (x+8) <= lx; x+=8) {
++#if HIGH_BIT_DEPTH
++ int16x8_t in0 = *(int16x8_t *)&src0x;
++ int16x8_t in1 = *(int16x8_t *)&src1x;
++ int16x8_t t = vaddq_s16(in0,in1);
++ t = vaddq_s16(t,vdupq_n_s16(1));
++ t = vshrq_n_s16(t,1);
++ *(int16x8_t *)&dstx = t;
++#else
++ int16x8_t in0 = vmovl_u8(*(uint8x8_t *)&src0x);
++ int16x8_t in1 = vmovl_u8(*(uint8x8_t *)&src1x);
++ int16x8_t t = vaddq_s16(in0,in1);
++ t = vaddq_s16(t,vdupq_n_s16(1));
++ t = vshrq_n_s16(t,1);
++ *(uint8x8_t *)&dstx = vmovn_u16(t);
++#endif
++ }
++ for (; x < lx; x++)
++ dstx = (src0x + src1x + 1) >> 1;
++
++ src0 += sstride0;
++ src1 += sstride1;
++ dst += dstride;
++ }
++}
++
++
++template<int size>
++void cpy1Dto2D_shl_neon(int16_t* dst, const int16_t* src, intptr_t dstStride, int shift)
++{
++ X265_CHECK((((intptr_t)dst | (dstStride * sizeof(*dst))) & 15) == 0 || size == 4, "dst alignment error\n");
++ X265_CHECK(((intptr_t)src & 15) == 0, "src alignment error\n");
++ X265_CHECK(shift >= 0, "invalid shift\n");
++
++ for (int i = 0; i < size; i++)
++ {
++ int j = 0;
++ for (; (j+8) <= size; j+=8)
++ {
++ *(int16x8_t *)&dstj = vshlq_s16(*(int16x8_t*)&srcj,vdupq_n_s16(shift));
++ }
++ for (; j < size; j++)
++ {
++ dstj = srcj << shift;
++ }
++ src += size;
++ dst += dstStride;
++ }
++}
++
++
++template<int size>
++uint64_t pixel_var_neon(const uint8_t* pix, intptr_t i_stride)
++{
++ uint32_t sum = 0, sqr = 0;
++
++ int32x4_t vsqr = vdupq_n_s32(0);
++ for (int y = 0; y < size; y++)
++ {
++ int x = 0;
++ int16x8_t vsum = vdupq_n_s16(0);
++ for (; (x + 8) <= size; x+=8)
++ {
++ int16x8_t in;
++ in = vmovl_u8(*(uint8x8_t*)&pixx);
++ vsum = vaddq_u16(vsum,in);
++ vsqr = vmlal_s16(vsqr,vget_low_s16(in),vget_low_s16(in));
++ vsqr = vmlal_high_s16(vsqr,in,in);
++ }
++ for (; x < size; x++)
++ {
++ sum += pixx;
++ sqr += pixx * pixx;
++ }
++ sum += vaddvq_s16(vsum);
++
++ pix += i_stride;
++ }
++ sqr += vaddvq_u32(vsqr);
++ return sum + ((uint64_t)sqr << 32);
++}
++
++template<int blockSize>
++void getResidual_neon(const pixel* fenc, const pixel* pred, int16_t* residual, intptr_t stride)
++{
++ for (int y = 0; y < blockSize; y++)
++ {
++ int x = 0;
++ for (; (x + 8) < blockSize; x+=8) {
++ int16x8_t vfenc,vpred;
++#if HIGH_BIT_DEPTH
++ vfenc = *(int16x8_t *)&fencx;
++ vpred = *(int16x8_t *)&predx;
++#else
++ vfenc = vmovl_u8(*(uint8x8_t *)&fencx);
++ vpred = vmovl_u8(*(uint8x8_t *)&predx);
++#endif
++ *(int16x8_t*)&residualx = vsubq_s16(vfenc,vpred);
++ }
++ for (; x < blockSize; x++) {
++ residualx = static_cast<int16_t>(fencx) - static_cast<int16_t>(predx);
++ }
++ fenc += stride;
++ residual += stride;
++ pred += stride;
++ }
++}
++
++#if 1//!(HIGH_BIT_DEPTH)
++template<int size>
++int psyCost_pp_neon(const pixel* source, intptr_t sstride, const pixel* recon, intptr_t rstride)
++{
++ static pixel zeroBuf8 /* = { 0 } */;
++
++ if (size)
++ {
++ int dim = 1 << (size + 2);
++ uint32_t totEnergy = 0;
++ for (int i = 0; i < dim; i += 8)
++ {
++ for (int j = 0; j < dim; j+= 8)
++ {
++ /* AC energy, measured by sa8d (AC + DC) minus SAD (DC) */
++ int sourceEnergy = pixel_sa8d_8x8_neon(source + i * sstride + j, sstride, zeroBuf, 0) -
++ (sad_pp_neon<8, 8>(source + i * sstride + j, sstride, zeroBuf, 0) >> 2);
++ int reconEnergy = pixel_sa8d_8x8_neon(recon + i * rstride + j, rstride, zeroBuf, 0) -
++ (sad_pp_neon<8, 8>(recon + i * rstride + j, rstride, zeroBuf, 0) >> 2);
++
++ totEnergy += abs(sourceEnergy - reconEnergy);
++ }
++ }
++ return totEnergy;
++ }
++ else
++ {
++ /* 4x4 is too small for sa8d */
++ int sourceEnergy = pixel_satd_4x4_neon(source, sstride, zeroBuf, 0) - (sad_pp_neon<4, 4>(source, sstride, zeroBuf, 0) >> 2);
++ int reconEnergy = pixel_satd_4x4_neon(recon, rstride, zeroBuf, 0) - (sad_pp_neon<4, 4>(recon, rstride, zeroBuf, 0) >> 2);
++ return abs(sourceEnergy - reconEnergy);
++ }
++}
++
++
++template<int w, int h>
++// Calculate sa8d in blocks of 8x8
++int sa8d8(const pixel* pix1, intptr_t i_pix1, const pixel* pix2, intptr_t i_pix2)
++{
++ int cost = 0;
++
++ for (int y = 0; y < h; y += 8)
++ for (int x = 0; x < w; x += 8)
++ cost += pixel_sa8d_8x8_neon(pix1 + i_pix1 * y + x, i_pix1, pix2 + i_pix2 * y + x, i_pix2);
++
++ return cost;
++}
++
++template<int w, int h>
++// Calculate sa8d in blocks of 16x16
++int sa8d16(const pixel* pix1, intptr_t i_pix1, const pixel* pix2, intptr_t i_pix2)
++{
++ int cost = 0;
++
++ for (int y = 0; y < h; y += 16)
++ for (int x = 0; x < w; x += 16)
++ cost += pixel_sa8d_16x16_neon(pix1 + i_pix1 * y + x, i_pix1, pix2 + i_pix2 * y + x, i_pix2);
++
++ return cost;
++}
++#endif
++
++template<int size>
++void cpy2Dto1D_shl_neon(int16_t* dst, const int16_t* src, intptr_t srcStride, int shift)
++{
++ X265_CHECK(((intptr_t)dst & 15) == 0, "dst alignment error\n");
++ X265_CHECK((((intptr_t)src | (srcStride * sizeof(*src))) & 15) == 0 || size == 4, "src alignment error\n");
++ X265_CHECK(shift >= 0, "invalid shift\n");
++
++ for (int i = 0; i < size; i++)
++ {
++ for (int j = 0; j < size; j++)
++ dstj = srcj << shift;
++
++ src += srcStride;
++ dst += size;
++ }
++}
++
++
++#if 1//!(HIGH_BIT_DEPTH)
++template<int w, int h>
++// calculate satd in blocks of 4x4
++int satd4(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int satd = 0;
++
++ for (int row = 0; row < h; row += 4)
++ for (int col = 0; col < w; col += 4)
++ satd += pixel_satd_4x4_neon(pix1 + row * stride_pix1 + col, stride_pix1,
++ pix2 + row * stride_pix2 + col, stride_pix2);
++
++ return satd;
++}
++
++template<int w, int h>
++// calculate satd in blocks of 8x4
++int satd8(const pixel* pix1, intptr_t stride_pix1, const pixel* pix2, intptr_t stride_pix2)
++{
++ int satd = 0;
++
++ if (((w | h) & 15) == 0)
++ {
++ for (int row = 0; row < h; row += 16)
++ for (int col = 0; col < w; col += 16)
++ satd += pixel_satd_16x16_neon(pix1 + row * stride_pix1 + col, stride_pix1,
++ pix2 + row * stride_pix2 + col, stride_pix2);
++
++ }
++ else
++ if (((w | h) & 7) == 0)
++ {
++ for (int row = 0; row < h; row += 8)
++ for (int col = 0; col < w; col += 8)
++ satd += pixel_satd_8x8_neon(pix1 + row * stride_pix1 + col, stride_pix1,
++ pix2 + row * stride_pix2 + col, stride_pix2);
++
++ }
++ else
++ {
++ for (int row = 0; row < h; row += 4)
++ for (int col = 0; col < w; col += 8)
++ satd += pixel_satd_8x4_neon(pix1 + row * stride_pix1 + col, stride_pix1,
++ pix2 + row * stride_pix2 + col, stride_pix2);
++ }
++
++ return satd;
++}
++#endif
++
++
++template<int blockSize>
++void transpose_neon(pixel* dst, const pixel* src, intptr_t stride)
++{
++ for (int k = 0; k < blockSize; k++)
++ for (int l = 0; l < blockSize; l++)
++ dstk * blockSize + l = srcl * stride + k;
++}
++
++
++template<>
++void transpose_neon<8>(pixel* dst, const pixel* src, intptr_t stride)
++{
++ transpose8x8(dst,src,8,stride);
++}
++
++template<>
++void transpose_neon<16>(pixel* dst, const pixel* src, intptr_t stride)
++{
++ transpose16x16(dst,src,16,stride);
++}
++
++template<>
++void transpose_neon<32>(pixel* dst, const pixel* src, intptr_t stride)
++{
++ transpose32x32(dst,src,32,stride);
++}
++
++
++template<>
++void transpose_neon<64>(pixel* dst, const pixel* src, intptr_t stride)
++{
++ transpose32x32(dst,src,64,stride);
++ transpose32x32(dst+32*64+32,src+32*stride+32,64,stride);
++ transpose32x32(dst+32*64,src+32,64,stride);
++ transpose32x32(dst+32,src+32*stride,64,stride);
++}
++
++
++template<int size>
++sse_t pixel_ssd_s_neon(const int16_t* a, intptr_t dstride)
++{
++ sse_t sum = 0;
++ 
++ 
++ int32x4_t vsum = vdupq_n_s32(0);
++
++ for (int y = 0; y < size; y++)
++ {
++ int x = 0;
++ 
++ for (; (x + 8) <= size; x+=8) {
++ int16x8_t in = *(int16x8_t*)&ax;
++ vsum = vmlal_s16(vsum,vget_low_s16(in),vget_low_s16(in));
++ vsum = vmlal_high_s16(vsum,(in),(in));
++ }
++ for (; x < size; x++) {
++ sum += ax * ax;
++ }
++
++ a += dstride;
++ }
++ return sum + vaddvq_s32(vsum);
++}
++
++
++};
++
++
++
++
++namespace X265_NS {
++ 
++ 
++void setupPixelPrimitives_neon(EncoderPrimitives &p)
++{
++ #define LUMA_PU(W, H) \
++ p.puLUMA_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.addAvgNONALIGNED = addAvg_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.addAvgALIGNED = addAvg_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.sad = sad_pp_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.sad_x3 = sad_x3_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.sad_x4 = sad_x4_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.pixelavg_ppNONALIGNED = pixelavg_pp_neon<W, H>; \
++ p.puLUMA_ ## W ## x ## H.pixelavg_ppALIGNED = pixelavg_pp_neon<W, H>;
++ 
++#if !(HIGH_BIT_DEPTH)
++
++#define LUMA_CU(W, H) \
++ p.cuBLOCK_ ## W ## x ## H.sub_ps = pixel_sub_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.add_psNONALIGNED = pixel_add_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.add_psALIGNED = pixel_add_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.copy_ps = blockcopy_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.blockfill_sNONALIGNED = blockfill_s_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.blockfill_sALIGNED = blockfill_s_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy2Dto1D_shl = cpy2Dto1D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy1Dto2D_shlNONALIGNED = cpy1Dto2D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy1Dto2D_shlALIGNED = cpy1Dto2D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.psy_cost_pp = psyCost_pp_neon<BLOCK_ ## W ## x ## H>; \
++ p.cuBLOCK_ ## W ## x ## H.transpose = transpose_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.var = pixel_var_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.calcresidualNONALIGNED = getResidual_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.calcresidualALIGNED = getResidual_neon<W>; \
++
++#else
++ 
++ #define LUMA_CU(W, H) \
++ p.cuBLOCK_ ## W ## x ## H.sub_ps = pixel_sub_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.add_psNONALIGNED = pixel_add_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.add_psALIGNED = pixel_add_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.copy_ps = blockcopy_ps_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.cuBLOCK_ ## W ## x ## H.blockfill_sNONALIGNED = blockfill_s_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.blockfill_sALIGNED = blockfill_s_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy2Dto1D_shl = cpy2Dto1D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy1Dto2D_shlNONALIGNED = cpy1Dto2D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.cpy1Dto2D_shlALIGNED = cpy1Dto2D_shl_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.psy_cost_pp = psyCost_pp_neon<BLOCK_ ## W ## x ## H>; \
++ p.cuBLOCK_ ## W ## x ## H.transpose = transpose_neon<W>; \
++ /*p.cuBLOCK_ ## W ## x ## H.var = pixel_var_neon<W>;*/ \
++ p.cuBLOCK_ ## W ## x ## H.calcresidualNONALIGNED = getResidual_neon<W>; \
++ p.cuBLOCK_ ## W ## x ## H.calcresidualALIGNED = getResidual_neon<W>; \
++
++ 
++ 
++#endif
++ 
++ 
++ LUMA_PU(4, 4);
++ LUMA_PU(8, 8);
++ LUMA_PU(16, 16);
++ LUMA_PU(32, 32);
++ LUMA_PU(64, 64);
++ LUMA_PU(4, 8);
++ LUMA_PU(8, 4);
++ LUMA_PU(16, 8);
++ LUMA_PU(8, 16);
++ LUMA_PU(16, 12);
++ LUMA_PU(12, 16);
++ LUMA_PU(16, 4);
++ LUMA_PU(4, 16);
++ LUMA_PU(32, 16);
++ LUMA_PU(16, 32);
++ LUMA_PU(32, 24);
++ LUMA_PU(24, 32);
++ LUMA_PU(32, 8);
++ LUMA_PU(8, 32);
++ LUMA_PU(64, 32);
++ LUMA_PU(32, 64);
++ LUMA_PU(64, 48);
++ LUMA_PU(48, 64);
++ LUMA_PU(64, 16);
++ LUMA_PU(16, 64);
++
++ p.puLUMA_4x4.satd = pixel_satd_4x4_neon;
++ p.puLUMA_8x8.satd = satd8<8, 8>;
++ p.puLUMA_8x4.satd = pixel_satd_8x4_neon;
++ p.puLUMA_4x8.satd = satd4<4, 8>;
++ p.puLUMA_16x16.satd = satd8<16, 16>;
++ p.puLUMA_16x8.satd = satd8<16, 8>;
++ p.puLUMA_8x16.satd = satd8<8, 16>;
++ p.puLUMA_16x12.satd = satd8<16, 12>;
++ p.puLUMA_12x16.satd = satd4<12, 16>;
++ p.puLUMA_16x4.satd = satd8<16, 4>;
++ p.puLUMA_4x16.satd = satd4<4, 16>;
++ p.puLUMA_32x32.satd = satd8<32, 32>;
++ p.puLUMA_32x16.satd = satd8<32, 16>;
++ p.puLUMA_16x32.satd = satd8<16, 32>;
++ p.puLUMA_32x24.satd = satd8<32, 24>;
++ p.puLUMA_24x32.satd = satd8<24, 32>;
++ p.puLUMA_32x8.satd = satd8<32, 8>;
++ p.puLUMA_8x32.satd = satd8<8, 32>;
++ p.puLUMA_64x64.satd = satd8<64, 64>;
++ p.puLUMA_64x32.satd = satd8<64, 32>;
++ p.puLUMA_32x64.satd = satd8<32, 64>;
++ p.puLUMA_64x48.satd = satd8<64, 48>;
++ p.puLUMA_48x64.satd = satd8<48, 64>;
++ p.puLUMA_64x16.satd = satd8<64, 16>;
++ p.puLUMA_16x64.satd = satd8<16, 64>;
++
++ 
++ LUMA_CU(4, 4);
++ LUMA_CU(8, 8);
++ LUMA_CU(16, 16);
++ LUMA_CU(32, 32);
++ LUMA_CU(64, 64);
++
++
++ p.cuBLOCK_4x4.sa8d = pixel_satd_4x4_neon;
++ p.cuBLOCK_8x8.sa8d = pixel_sa8d_8x8_neon;
++ p.cuBLOCK_16x16.sa8d = pixel_sa8d_16x16_neon;
++ p.cuBLOCK_32x32.sa8d = sa8d16<32, 32>;
++ p.cuBLOCK_64x64.sa8d = sa8d16<64, 64>;
++
++ 
++ #define CHROMA_PU_420(W, H) \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.addAvgNONALIGNED = addAvg_neon<W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.addAvgALIGNED = addAvg_neon<W, H>; \
++ p.chromaX265_CSP_I420.puCHROMA_420_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++
++
++ CHROMA_PU_420(4, 4);
++ CHROMA_PU_420(8, 8);
++ CHROMA_PU_420(16, 16);
++ CHROMA_PU_420(32, 32);
++ CHROMA_PU_420(4, 2);
++ CHROMA_PU_420(8, 4);
++ CHROMA_PU_420(4, 8);
++ CHROMA_PU_420(8, 6);
++ CHROMA_PU_420(6, 8);
++ CHROMA_PU_420(8, 2);
++ CHROMA_PU_420(2, 8);
++ CHROMA_PU_420(16, 8);
++ CHROMA_PU_420(8, 16);
++ CHROMA_PU_420(16, 12);
++ CHROMA_PU_420(12, 16);
++ CHROMA_PU_420(16, 4);
++ CHROMA_PU_420(4, 16);
++ CHROMA_PU_420(32, 16);
++ CHROMA_PU_420(16, 32);
++ CHROMA_PU_420(32, 24);
++ CHROMA_PU_420(24, 32);
++ CHROMA_PU_420(32, 8);
++ CHROMA_PU_420(8, 32);
++
++ 
++
++ p.chromaX265_CSP_I420.puCHROMA_420_2x2.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_4x4.satd = pixel_satd_4x4_neon;
++ p.chromaX265_CSP_I420.puCHROMA_420_8x8.satd = satd8<8, 8>;
++ p.chromaX265_CSP_I420.puCHROMA_420_16x16.satd = satd8<16, 16>;
++ p.chromaX265_CSP_I420.puCHROMA_420_32x32.satd = satd8<32, 32>;
++
++ p.chromaX265_CSP_I420.puCHROMA_420_4x2.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_2x4.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_8x4.satd = pixel_satd_8x4_neon;
++ p.chromaX265_CSP_I420.puCHROMA_420_4x8.satd = satd4<4, 8>;
++ p.chromaX265_CSP_I420.puCHROMA_420_16x8.satd = satd8<16, 8>;
++ p.chromaX265_CSP_I420.puCHROMA_420_8x16.satd = satd8<8, 16>;
++ p.chromaX265_CSP_I420.puCHROMA_420_32x16.satd = satd8<32, 16>;
++ p.chromaX265_CSP_I420.puCHROMA_420_16x32.satd = satd8<16, 32>;
++
++ p.chromaX265_CSP_I420.puCHROMA_420_8x6.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_6x8.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_8x2.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_2x8.satd = NULL;
++ p.chromaX265_CSP_I420.puCHROMA_420_16x12.satd = satd4<16, 12>;
++ p.chromaX265_CSP_I420.puCHROMA_420_12x16.satd = satd4<12, 16>;
++ p.chromaX265_CSP_I420.puCHROMA_420_16x4.satd = satd4<16, 4>;
++ p.chromaX265_CSP_I420.puCHROMA_420_4x16.satd = satd4<4, 16>;
++ p.chromaX265_CSP_I420.puCHROMA_420_32x24.satd = satd8<32, 24>;
++ p.chromaX265_CSP_I420.puCHROMA_420_24x32.satd = satd8<24, 32>;
++ p.chromaX265_CSP_I420.puCHROMA_420_32x8.satd = satd8<32, 8>;
++ p.chromaX265_CSP_I420.puCHROMA_420_8x32.satd = satd8<8, 32>;
++
++ 
++ #define CHROMA_CU_420(W, H) \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.sse_pp = sse_neon<W, H, pixel, pixel>; \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.copy_ps = blockcopy_ps_neon<W, H>; \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.sub_ps = pixel_sub_ps_neon<W, H>; \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.add_psNONALIGNED = pixel_add_ps_neon<W, H>; \
++ p.chromaX265_CSP_I420.cuBLOCK_420_ ## W ## x ## H.add_psALIGNED = pixel_add_ps_neon<W, H>;
++
++
++ CHROMA_CU_420(4, 4)
++ CHROMA_CU_420(8, 8)
++ CHROMA_CU_420(16, 16)
++ CHROMA_CU_420(32, 32)
++
++
++ p.chromaX265_CSP_I420.cuBLOCK_8x8.sa8d = p.chromaX265_CSP_I420.puCHROMA_420_4x4.satd;
++ p.chromaX265_CSP_I420.cuBLOCK_16x16.sa8d = sa8d8<8, 8>;
++ p.chromaX265_CSP_I420.cuBLOCK_32x32.sa8d = sa8d16<16, 16>;
++ p.chromaX265_CSP_I420.cuBLOCK_64x64.sa8d = sa8d16<32, 32>;
++
++ 
++ #define CHROMA_PU_422(W, H) \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.addAvgNONALIGNED = addAvg_neon<W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.addAvgALIGNED = addAvg_neon<W, H>; \
++ p.chromaX265_CSP_I422.puCHROMA_422_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++
++
++ CHROMA_PU_422(4, 8);
++ CHROMA_PU_422(8, 16);
++ CHROMA_PU_422(16, 32);
++ CHROMA_PU_422(32, 64);
++ CHROMA_PU_422(4, 4);
++ CHROMA_PU_422(2, 8);
++ CHROMA_PU_422(8, 8);
++ CHROMA_PU_422(4, 16);
++ CHROMA_PU_422(8, 12);
++ CHROMA_PU_422(6, 16);
++ CHROMA_PU_422(8, 4);
++ CHROMA_PU_422(2, 16);
++ CHROMA_PU_422(16, 16);
++ CHROMA_PU_422(8, 32);
++ CHROMA_PU_422(16, 24);
++ CHROMA_PU_422(12, 32);
++ CHROMA_PU_422(16, 8);
++ CHROMA_PU_422(4, 32);
++ CHROMA_PU_422(32, 32);
++ CHROMA_PU_422(16, 64);
++ CHROMA_PU_422(32, 48);
++ CHROMA_PU_422(24, 64);
++ CHROMA_PU_422(32, 16);
++ CHROMA_PU_422(8, 64);
++
++
++ p.chromaX265_CSP_I422.puCHROMA_422_2x4.satd = NULL;
++ p.chromaX265_CSP_I422.puCHROMA_422_4x8.satd = satd4<4, 8>;
++ p.chromaX265_CSP_I422.puCHROMA_422_8x16.satd = satd8<8, 16>;
++ p.chromaX265_CSP_I422.puCHROMA_422_16x32.satd = satd8<16, 32>;
++ p.chromaX265_CSP_I422.puCHROMA_422_32x64.satd = satd8<32, 64>;
++
++ p.chromaX265_CSP_I422.puCHROMA_422_4x4.satd = pixel_satd_4x4_neon;
++ p.chromaX265_CSP_I422.puCHROMA_422_2x8.satd = NULL;
++ p.chromaX265_CSP_I422.puCHROMA_422_8x8.satd = satd8<8, 8>;
++ p.chromaX265_CSP_I422.puCHROMA_422_4x16.satd = satd4<4, 16>;
++ p.chromaX265_CSP_I422.puCHROMA_422_16x16.satd = satd8<16, 16>;
++ p.chromaX265_CSP_I422.puCHROMA_422_8x32.satd = satd8<8, 32>;
++ p.chromaX265_CSP_I422.puCHROMA_422_32x32.satd = satd8<32, 32>;
++ p.chromaX265_CSP_I422.puCHROMA_422_16x64.satd = satd8<16, 64>;
++
++ p.chromaX265_CSP_I422.puCHROMA_422_8x12.satd = satd4<8, 12>;
++ p.chromaX265_CSP_I422.puCHROMA_422_6x16.satd = NULL;
++ p.chromaX265_CSP_I422.puCHROMA_422_8x4.satd = satd4<8, 4>;
++ p.chromaX265_CSP_I422.puCHROMA_422_2x16.satd = NULL;
++ p.chromaX265_CSP_I422.puCHROMA_422_16x24.satd = satd8<16, 24>;
++ p.chromaX265_CSP_I422.puCHROMA_422_12x32.satd = satd4<12, 32>;
++ p.chromaX265_CSP_I422.puCHROMA_422_16x8.satd = satd8<16, 8>;
++ p.chromaX265_CSP_I422.puCHROMA_422_4x32.satd = satd4<4, 32>;
++ p.chromaX265_CSP_I422.puCHROMA_422_32x48.satd = satd8<32, 48>;
++ p.chromaX265_CSP_I422.puCHROMA_422_24x64.satd = satd8<24, 64>;
++ p.chromaX265_CSP_I422.puCHROMA_422_32x16.satd = satd8<32, 16>;
++ p.chromaX265_CSP_I422.puCHROMA_422_8x64.satd = satd8<8, 64>;
++
++ 
++ #define CHROMA_CU_422(W, H) \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.sse_pp = sse_neon<W, H, pixel, pixel>; \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.copy_pp = blockcopy_pp_neon<W, H>; \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.copy_ps = blockcopy_ps_neon<W, H>; \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.sub_ps = pixel_sub_ps_neon<W, H>; \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.add_psNONALIGNED = pixel_add_ps_neon<W, H>; \
++ p.chromaX265_CSP_I422.cuBLOCK_422_ ## W ## x ## H.add_psALIGNED = pixel_add_ps_neon<W, H>;
++
++
++ CHROMA_CU_422(4, 8)
++ CHROMA_CU_422(8, 16)
++ CHROMA_CU_422(16, 32)
++ CHROMA_CU_422(32, 64)
++
++ p.chromaX265_CSP_I422.cuBLOCK_8x8.sa8d = p.chromaX265_CSP_I422.puCHROMA_422_4x8.satd;
++ p.chromaX265_CSP_I422.cuBLOCK_16x16.sa8d = sa8d8<8, 16>;
++ p.chromaX265_CSP_I422.cuBLOCK_32x32.sa8d = sa8d16<16, 32>;
++ p.chromaX265_CSP_I422.cuBLOCK_64x64.sa8d = sa8d16<32, 64>;
++
++ 
++}
++ 
++ 
++}
++
++
++#endif
++
+diff --git a/source/common/arm64/pixel-prim.h b/source/common/arm64/pixel-prim.h
+new file mode 100644
+index 0000000..fd3509d
+--- /dev/null
++++ b/source/common/arm64/pixel-prim.h
+@@ -0,0 +1,22 @@
++#ifndef PIXEL_PRIM_NEON_H__
++#define PIXEL_PRIM_NEON_H__
++
++#include "common.h"
++#include "slicetype.h" // LOWRES_COST_MASK
++#include "primitives.h"
++#include "x265.h"
++
++
++
++namespace X265_NS {
++ 
++ 
++ 
++void setupPixelPrimitives_neon(EncoderPrimitives &p);
++ 
++ 
++}
++
++
++#endif
++
+diff --git a/source/common/arm64/pixel.h b/source/common/arm64/pixel.h
+new file mode 100644
+index 0000000..e356e6c
+--- /dev/null
++++ b/source/common/arm64/pixel.h
+@@ -0,0 +1,134 @@
++/*****************************************************************************
++ * pixel.h: aarch64 pixel metrics
++ *****************************************************************************
++ * Copyright (C) 2009-2019 x265 project
++ *
++ * Authors: David Conrad <lessen42@gmail.com>
++ * Janne Grunau <janne-x265@jannau.net>
++ *
++ * 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.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA.
++ *
++ * This program is also available under a commercial proprietary license.
++ * For more information, contact us at licensing@x265.com.
++ *****************************************************************************/
++
++#ifndef x265_AARCH64_PIXEL_H
++#define x265_AARCH64_PIXEL_H
++
++#define x265_pixel_sad_16x16_neon x265_template(pixel_sad_16x16_neon)
++#define x265_pixel_sad_16x8_neon x265_template(pixel_sad_16x8_neon)
++#define x265_pixel_sad_4x16_neon x265_template(pixel_sad_4x16_neon)
++#define x265_pixel_sad_4x4_neon x265_template(pixel_sad_4x4_neon)
++#define x265_pixel_sad_4x8_neon x265_template(pixel_sad_4x8_neon)
++#define x265_pixel_sad_8x16_neon x265_template(pixel_sad_8x16_neon)
++#define x265_pixel_sad_8x4_neon x265_template(pixel_sad_8x4_neon)
++#define x265_pixel_sad_8x8_neon x265_template(pixel_sad_8x8_neon)
++#define x265_pixel_sad_x3_16x16_neon x265_template(pixel_sad_x3_16x16_neon)
++#define x265_pixel_sad_x3_16x8_neon x265_template(pixel_sad_x3_16x8_neon)
++#define x265_pixel_sad_x3_4x4_neon x265_template(pixel_sad_x3_4x4_neon)
++#define x265_pixel_sad_x3_4x8_neon x265_template(pixel_sad_x3_4x8_neon)
++#define x265_pixel_sad_x3_8x16_neon x265_template(pixel_sad_x3_8x16_neon)
++#define x265_pixel_sad_x3_8x4_neon x265_template(pixel_sad_x3_8x4_neon)
++#define x265_pixel_sad_x3_8x8_neon x265_template(pixel_sad_x3_8x8_neon)
++#define x265_pixel_sad_x4_16x16_neon x265_template(pixel_sad_x4_16x16_neon)
++#define x265_pixel_sad_x4_16x8_neon x265_template(pixel_sad_x4_16x8_neon)
++#define x265_pixel_sad_x4_4x4_neon x265_template(pixel_sad_x4_4x4_neon)
++#define x265_pixel_sad_x4_4x8_neon x265_template(pixel_sad_x4_4x8_neon)
++#define x265_pixel_sad_x4_8x16_neon x265_template(pixel_sad_x4_8x16_neon)
++#define x265_pixel_sad_x4_8x4_neon x265_template(pixel_sad_x4_8x4_neon)
++#define x265_pixel_sad_x4_8x8_neon x265_template(pixel_sad_x4_8x8_neon)
++#define x265_pixel_satd_16x16_neon x265_template(pixel_satd_16x16_neon)
++#define x265_pixel_satd_16x8_neon x265_template(pixel_satd_16x8_neon)
++#define x265_pixel_satd_4x16_neon x265_template(pixel_satd_4x16_neon)
++#define x265_pixel_satd_4x4_neon x265_template(pixel_satd_4x4_neon)
++#define x265_pixel_satd_4x8_neon x265_template(pixel_satd_4x8_neon)
++#define x265_pixel_satd_8x16_neon x265_template(pixel_satd_8x16_neon)
++#define x265_pixel_satd_8x4_neon x265_template(pixel_satd_8x4_neon)
++#define x265_pixel_satd_8x8_neon x265_template(pixel_satd_8x8_neon)
++#define x265_pixel_ssd_16x16_neon x265_template(pixel_ssd_16x16_neon)
++#define x265_pixel_ssd_16x8_neon x265_template(pixel_ssd_16x8_neon)
++#define x265_pixel_ssd_4x16_neon x265_template(pixel_ssd_4x16_neon)
++#define x265_pixel_ssd_4x4_neon x265_template(pixel_ssd_4x4_neon)
++#define x265_pixel_ssd_4x8_neon x265_template(pixel_ssd_4x8_neon)
++#define x265_pixel_ssd_8x16_neon x265_template(pixel_ssd_8x16_neon)
++#define x265_pixel_ssd_8x4_neon x265_template(pixel_ssd_8x4_neon)
++#define x265_pixel_ssd_8x8_neon x265_template(pixel_ssd_8x8_neon)
++#define DECL_PIXELS( ret, name, suffix, args ) \
++ ret x265_pixel_##name##_16x16_##suffix args;\
++ ret x265_pixel_##name##_16x8_##suffix args;\
++ ret x265_pixel_##name##_8x16_##suffix args;\
++ ret x265_pixel_##name##_8x8_##suffix args;\
++ ret x265_pixel_##name##_8x4_##suffix args;\
++ ret x265_pixel_##name##_4x16_##suffix args;\
++ ret x265_pixel_##name##_4x8_##suffix args;\
++ ret x265_pixel_##name##_4x4_##suffix args;\
++
++#define DECL_X1( name, suffix ) \
++ DECL_PIXELS( int, name, suffix, ( uint8_t *, intptr_t, uint8_t *, intptr_t ) )
++
++#define DECL_X4( name, suffix ) \
++ DECL_PIXELS( void, name##_x3, suffix, ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int * ) )\
++ DECL_PIXELS( void, name##_x4, suffix, ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int * ) )
++
++DECL_X1( sad, neon )
++DECL_X4( sad, neon )
++DECL_X1( satd, neon )
++DECL_X1( ssd, neon )
++
++
++#define x265_pixel_ssd_nv12_core_neon x265_template(pixel_ssd_nv12_core_neon)
++void x265_pixel_ssd_nv12_core_neon( uint8_t *, intptr_t, uint8_t *, intptr_t, int, int, uint64_t *, uint64_t * );
++
++#define x265_pixel_vsad_neon x265_template(pixel_vsad_neon)
++int x265_pixel_vsad_neon( uint8_t *, intptr_t, int );
++
++#define x265_pixel_sa8d_8x8_neon x265_template(pixel_sa8d_8x8_neon)
++int x265_pixel_sa8d_8x8_neon ( uint8_t *, intptr_t, uint8_t *, intptr_t );
++#define x265_pixel_sa8d_16x16_neon x265_template(pixel_sa8d_16x16_neon)
++int x265_pixel_sa8d_16x16_neon( uint8_t *, intptr_t, uint8_t *, intptr_t );
++#define x265_pixel_sa8d_satd_16x16_neon x265_template(pixel_sa8d_satd_16x16_neon)
++uint64_t x265_pixel_sa8d_satd_16x16_neon( uint8_t *, intptr_t, uint8_t *, intptr_t );
++
++#define x265_pixel_var_8x8_neon x265_template(pixel_var_8x8_neon)
++uint64_t x265_pixel_var_8x8_neon ( uint8_t *, intptr_t );
++#define x265_pixel_var_8x16_neon x265_template(pixel_var_8x16_neon)
++uint64_t x265_pixel_var_8x16_neon ( uint8_t *, intptr_t );
++#define x265_pixel_var_16x16_neon x265_template(pixel_var_16x16_neon)
++uint64_t x265_pixel_var_16x16_neon( uint8_t *, intptr_t );
++#define x265_pixel_var2_8x8_neon x265_template(pixel_var2_8x8_neon)
++int x265_pixel_var2_8x8_neon ( uint8_t *, uint8_t *, int * );
++#define x265_pixel_var2_8x16_neon x265_template(pixel_var2_8x16_neon)
++int x265_pixel_var2_8x16_neon( uint8_t *, uint8_t *, int * );
++
++#define x265_pixel_hadamard_ac_8x8_neon x265_template(pixel_hadamard_ac_8x8_neon)
++uint64_t x265_pixel_hadamard_ac_8x8_neon ( uint8_t *, intptr_t );
++#define x265_pixel_hadamard_ac_8x16_neon x265_template(pixel_hadamard_ac_8x16_neon)
++uint64_t x265_pixel_hadamard_ac_8x16_neon ( uint8_t *, intptr_t );
++#define x265_pixel_hadamard_ac_16x8_neon x265_template(pixel_hadamard_ac_16x8_neon)
++uint64_t x265_pixel_hadamard_ac_16x8_neon ( uint8_t *, intptr_t );
++#define x265_pixel_hadamard_ac_16x16_neon x265_template(pixel_hadamard_ac_16x16_neon)
++uint64_t x265_pixel_hadamard_ac_16x16_neon( uint8_t *, intptr_t );
++
++#define x265_pixel_ssim_4x4x2_core_neon x265_template(pixel_ssim_4x4x2_core_neon)
++void x265_pixel_ssim_4x4x2_core_neon( const uint8_t *, intptr_t,
++ const uint8_t *, intptr_t,
++ int sums24 );
++#define x265_pixel_ssim_end4_neon x265_template(pixel_ssim_end4_neon)
++float x265_pixel_ssim_end4_neon( int sum054, int sum154, int width );
++
++#define x265_pixel_asd8_neon x265_template(pixel_asd8_neon)
++int x265_pixel_asd8_neon( uint8_t *, intptr_t, uint8_t *, intptr_t, int );
++
++#endif
+diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp
+index b01575c..544dd4b 100644
+--- a/source/common/cpu.cpp
++++ b/source/common/cpu.cpp
+@@ -102,7 +102,8 @@ const cpu_name_t cpu_names =
+ { "ARMv6", X265_CPU_ARMV6 },
+ { "NEON", X265_CPU_NEON },
+ { "FastNeonMRC", X265_CPU_FAST_NEON_MRC },
+-
++#elif X265_ARCH_ARM64
++ { "NEON", X265_CPU_NEON },
+ #elif X265_ARCH_POWER8
+ { "Altivec", X265_CPU_ALTIVEC },
+ 
+@@ -370,6 +371,18 @@ uint32_t cpu_detect(bool benableavx512)
+ #endif // if HAVE_ARMV6
+ return flags;
+ }
++#elif X265_ARCH_ARM64
++
++uint32_t cpu_detect(bool benableavx512)
++{
++ int flags = 0;
++
++#if HAVE_NEON
++ flags |= X265_CPU_NEON;
++#endif
++
++ return flags;
++}
+ 
+ #elif X265_ARCH_POWER8
+ 
+diff --git a/source/test/testharness.h b/source/test/testharness.h
+index 3c250b9..79999f4 100644
+--- a/source/test/testharness.h
++++ b/source/test/testharness.h
+@@ -63,7 +63,6 @@ protected:
+ 
+ uint64_t m_rand;
+ };
+-
+ #ifdef _MSC_VER
+ #include <intrin.h>
+ #elif HAVE_RDTSC
+@@ -72,7 +71,7 @@ protected:
+ #include <x86intrin.h>
+ #elif ( !defined(__APPLE__) && defined (__GNUC__) && defined(__ARM_NEON__))
+ #include <arm_neon.h>
+-#elif defined(__GNUC__) && (!defined(__clang__) || __clang_major__ < 4)
++#else
+ /* fallback for older GCC/MinGW */
+ static inline uint32_t __rdtsc(void)
+ {
+@@ -84,6 +83,12 @@ static inline uint32_t __rdtsc(void)
+ // TOD-DO: verify following inline asm to get cpu Timestamp Counter for ARM arch
+ // asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(a));
+ 
++ // TO-DO: replace clock() function with appropriate ARM cpu instructions
++ a = clock();
++#elif X265_ARCH_ARM64
++ // TOD-DO: verify following inline asm to get cpu Timestamp Counter for ARM arch
++ // asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(a));
++
+ // TO-DO: replace clock() function with appropriate ARM cpu instructions
+ a = clock();
+ #endif
+@@ -135,7 +140,7 @@ int PFX(stack_pagealign)(int (*func)(), int align);
+ * needs an explicit asm check because it only sometimes crashes in normal use. */
+ intptr_t PFX(checkasm_call)(intptr_t (*func)(), int *ok, ...);
+ float PFX(checkasm_call_float)(float (*func)(), int *ok, ...);
+-#elif X265_ARCH_ARM == 0
++#elif (X265_ARCH_ARM == 0 && X265_ARCH_ARM64 == 0)
+ #define PFX(stack_pagealign)(func, align) func()
+ #endif
+ 
+-- 
+2.24.3 (Apple Git-128)
+

HandBrake-1.5.1.tar.xz/contrib/x265/A02-threads-priority.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265/module.defs -> HandBrake-1.5.1.tar.xz/contrib/x265/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_10bit/module.defs -> HandBrake-1.5.1.tar.xz/contrib/x265_10bit/module.defs Changed

@@ -2,11 +2,9 @@
 $(eval $(call import.MODULE.defs,X265_10,x265_10,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_10))
 
-X265_10.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
-X265_10.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
-X265_10.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
-X265_10.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
-X265_10.EXTRACT.tarbase = x265_3.2.1
+X265_10.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz
+X265_10.FETCH.url    += https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+X265_10.FETCH.sha256  = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
 
 # Silence "warning: overriding recipe for target" messages
 X265_10.FETCH.target =
@@ -17,7 +15,7 @@
 X265_10.CONFIGURE.deps        =
 X265_10.CONFIGURE.static      =
 X265_10.CONFIGURE.shared      = -DENABLE_SHARED=OFF
-X265_10.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF
+X265_10.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy -DCMAKE_CXX_FLAGS=-flax-vector-conversions
 
 ifneq (1,$(FEATURE.numa))
     X265_10.CONFIGURE.extra  += -DENABLE_LIBNUMA=OFF
@@ -27,6 +25,10 @@
     X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
+ifeq (darwin,$(HOST.system))
+    X265_10.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
+endif
+
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
     X265_10.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
 else
@@ -37,6 +39,10 @@
     endif
 endif
 
+ifeq (aarch64,$(HOST.machine))
+    X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS=-flax-vector-conversions
+endif
+
 ifeq (1,$(HOST.cross))
     ifeq (mingw,$(HOST.system))
         X265_10.CONFIGURE.extra += -DWIN32=ON
@@ -48,9 +54,14 @@
         X265_10.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_10.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_10.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
+        X265_10.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)"
+    else ifeq ($(HOST.system),darwin)
+        X265_10.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)"
+    else
+        X265_10.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)"
     endif
-    X265_10.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)"
     X265_10.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.build)"
+    X265_10.CONFIGURE.extra     += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
 else
     X265_10.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)"
 endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_12bit/module.defs -> HandBrake-1.5.1.tar.xz/contrib/x265_12bit/module.defs Changed

@@ -2,11 +2,9 @@
 $(eval $(call import.MODULE.defs,X265_12,x265_12,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_12))
 
-X265_12.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
-X265_12.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
-X265_12.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
-X265_12.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
-X265_12.EXTRACT.tarbase = x265_3.2.1
+X265_12.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz
+X265_12.FETCH.url    += https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+X265_12.FETCH.sha256  = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
 
 # Silence "warning: overriding recipe for target" messages
 X265_12.FETCH.target =
@@ -17,7 +15,7 @@
 X265_12.CONFIGURE.deps        =
 X265_12.CONFIGURE.static      =
 X265_12.CONFIGURE.shared      = -DENABLE_SHARED=OFF
-X265_12.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DMAIN12=ON
+X265_12.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DMAIN12=ON -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy -DCMAKE_CXX_FLAGS=-flax-vector-conversions
 
 ifneq (1,$(FEATURE.numa))
     X265_12.CONFIGURE.extra  += -DENABLE_LIBNUMA=OFF
@@ -27,6 +25,10 @@
     X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
+ifeq (darwin,$(HOST.system))
+    X265_12.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
+endif
+
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
     X265_12.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
 else
@@ -37,6 +39,10 @@
     endif
 endif
 
+ifeq (aarch64,$(HOST.machine))
+    X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS=-flax-vector-conversions
+endif
+
 ifeq (1,$(HOST.cross))
     ifeq (mingw,$(HOST.system))
         X265_12.CONFIGURE.extra += -DWIN32=ON
@@ -48,9 +54,14 @@
         X265_12.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_12.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_12.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
+        X265_12.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.host)"
+    else ifeq ($(HOST.system),darwin)
+        X265_12.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.host)"
+    else
+        X265_12.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_12.CONFIGURE.host)"
     endif
-    X265_12.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_12.CONFIGURE.host)"
     X265_12.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.build)"
+    X265_12.CONFIGURE.extra     += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
 else
     X265_12.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.host)"
 endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/x265_8bit/module.defs -> HandBrake-1.5.1.tar.xz/contrib/x265_8bit/module.defs Changed

@@ -2,11 +2,9 @@
 $(eval $(call import.MODULE.defs,X265_8,x265_8,$(__deps__),x265))
 $(eval $(call import.CONTRIB.defs,X265_8))
 
-X265_8.FETCH.url     = https://download.handbrake.fr/contrib/x265_3.2.1.tar.gz
-X265_8.FETCH.url    += https://bitbucket.org/multicoreware/x265/downloads/x265_3.2.1.tar.gz
-X265_8.FETCH.url    += https://download.videolan.org/pub/videolan/x265/x265_3.2.1.tar.gz
-X265_8.FETCH.sha256  = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
-X265_8.EXTRACT.tarbase = x265_3.2.1
+X265_8.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/x265_3.5.tar.gz
+X265_8.FETCH.url    += https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+X265_8.FETCH.sha256  = e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
 
 X265_8.build_dir             = 8bit
 X265_8.CONFIGURE.exe         = cmake
@@ -14,7 +12,7 @@
 X265_8.CONFIGURE.deps        =
 X265_8.CONFIGURE.static      =
 X265_8.CONFIGURE.shared      = -DENABLE_SHARED=OFF
-X265_8.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON
+X265_8.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy -DCMAKE_CXX_FLAGS=-flax-vector-conversions
 
 ifneq (1,$(FEATURE.numa))
     X265_8.CONFIGURE.extra  += -DENABLE_LIBNUMA=OFF
@@ -24,6 +22,10 @@
     X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS_MINSIZEREL="-Oz -DNDEBUG" -DCMAKE_C_FLAGS_MINSIZEREL="-Oz -DNDEBUG"
 endif
 
+ifeq (darwin,$(HOST.system))
+    X265_8.CONFIGURE.extra += -DCMAKE_OSX_ARCHITECTURES=$(HOST.machine)
+endif
+
 ifeq ($(GCC.O),$(filter $(GCC.O),size size-aggressive))
     X265_8.CONFIGURE.extra += -DCMAKE_BUILD_TYPE=MinSizeRel
 else
@@ -34,6 +36,11 @@
     endif
 endif
 
+ifeq (aarch64,$(HOST.machine))
+    X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS=-flax-vector-conversions
+endif
+
+X265_8.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)"
 ifeq (1,$(HOST.cross))
     ifeq (mingw,$(HOST.system))
         X265_8.CONFIGURE.extra += -DWIN32=ON
@@ -45,11 +52,10 @@
         X265_8.CONFIGURE.extra += -DCMAKE_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_8.CONFIGURE.extra += -DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS="-static-libgcc -static-libstdc++ -static"
         X265_8.CONFIGURE.extra += -DCMAKE_RC_COMPILER=$(HOST.cross.prefix)windres
+        X265_8.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)"
     endif
-    X265_8.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265_8.CONFIGURE.host)"
     X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)"
-else
-    X265_8.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)"
+    X265_8.CONFIGURE.extra     += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
 endif
 
 ## find CMakeLists.txt

HandBrake-1.5.1.tar.xz/contrib/xz/P00-darwin-applesi-cross.patch Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/xz/module.defs -> HandBrake-1.5.1.tar.xz/contrib/xz/module.defs Changed

HandBrake-1.5.1.tar.xz/contrib/zimg Added

HandBrake-1.5.1.tar.xz/contrib/zimg/P00-mingw-build-fix.patch Added

HandBrake-1.5.1.tar.xz/contrib/zimg/module.defs Added

HandBrake-1.5.1.tar.xz/contrib/zimg/module.rules Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/contrib/zlib/module.defs -> HandBrake-1.5.1.tar.xz/contrib/zlib/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/Makefile.am -> HandBrake-1.5.1.tar.xz/gtk/Makefile.am Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/configure.ac -> HandBrake-1.5.1.tar.xz/gtk/configure.ac Changed

@@ -36,26 +36,26 @@
 # introduce the optional configure parameter for the path of libXXX.a
 AC_ARG_WITH(hb,
 	AC_HELP_STRING(
-	    --with-hb=prefix,
-	    try this for the hb-library prefix install directory
-	  ),
-	  hb_PATHSET=1,
-	  hb_PATHSET=0
+		--with-hb=prefix,
+		try this for the hb-library prefix install directory
+	),
+	hb_PATHSET=1,
+	hb_PATHSET=0
 )
 
-if test  $hb_PATHSET = 1 ; then
-    case ${with_hb} in
-    /*)
+if test $hb_PATHSET = 1 ; then
+	case ${with_hb} in
+	/*)
 		HBINC="-I$with_hb/libhb -I$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS -L$with_hb/libhb -L$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, "$with_hb")
-        ;;
-    *)
+		;;
+	*)
 		HBINC='-I$(top_srcdir)/'"$with_hb/libhb "'-I$(top_srcdir)/'"$with_hb/contrib/include"
 		LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"$with_hb/libhb "'-L$(top_srcdir)/'"$with_hb/contrib/lib"
 		AC_SUBST(HB_DIR, '$(top_srcdir)/'"$with_hb")
-        ;;
-    esac
+		;;
+	esac
 else
 	HBINC='-I$(top_srcdir)/'"../libhb "'-I$(top_srcdir)/'"../contrib/include"
 	LDFLAGS="$LDFLAGS "'-L$(top_srcdir)/'"../libhb "'-L$(top_srcdir)/'"../contrib/lib"
@@ -90,6 +90,10 @@
 	AS_HELP_STRING(--enable-qsv, enable QSV encoder),
 	use_qsv=yes, use_qsv=no)
 
+AC_ARG_ENABLE(mf,
+	AS_HELP_STRING(--enable-mf, enable MediaFoundation encoder),
+	use_mf=yes, use_mf=no)
+
 AC_ARG_ENABLE(gst,
 	AS_HELP_STRING(--disable-gst, disable gstreamer (live preview)),
 	gst_disable=yes, gst_disable=no)
@@ -109,7 +113,7 @@
 
 
 dnl ***************************************************************************
-dnl Internatinalization
+dnl Internationalization
 dnl ***************************************************************************
 GETTEXT_PACKAGE=ghb
 AC_SUBST(GETTEXT_PACKAGE)
@@ -120,18 +124,18 @@
 AC_SYS_LARGEFILE
 
 case $host in
-  *-*-mingw*)
-    GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0"
-	mingw_flag=yes
-    ;;
-  *)
-    case "$host_os" in
-	linux*)
-	  ;;
-    esac
-    GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0"
-	mingw_flag=no
-    ;;
+	*-*-mingw*)
+		GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0"
+		mingw_flag=yes
+		;;
+	*)
+		case "$host_os" in
+			linux*)
+				;;
+		esac
+		GHB_PACKAGES="gthread-2.0 gio-2.0 gmodule-2.0"
+		mingw_flag=no
+		;;
 esac
 
 PKG_PROG_PKG_CONFIG
@@ -139,13 +143,13 @@
 HAVE_GTK_400=0
 HAVE_GTK_316=0
 if test "x$use_gtk4" = "xyes" ; then
-    PKG_CHECK_MODULES(gtk, gtk4 >= 3.92, HAVE_GTK_400=1, HAVE_GTK_400=0)
+	PKG_CHECK_MODULES(gtk, gtk4 >= 3.92, HAVE_GTK_400=1, HAVE_GTK_400=0)
 else
-    PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.16, HAVE_GTK_316=1, HAVE_GTK_316=0)
+	PKG_CHECK_MODULES(gtk, gtk+-3.0 >= 3.16, HAVE_GTK_316=1, HAVE_GTK_316=0)
 fi
 
 if test "$HAVE_GTK_316" -eq 0 -a "$HAVE_GTK_400" -eq 0 ; then
-    AC_MSG_ERROR("GTK 3.16 or above is required)
+	AC_MSG_ERROR("GTK 3.16 or above is required)
 fi
 HB_LIBS="$HB_LIBS $gtk_LIBS"
 HB_CPPFLAGS="$HB_CPPFLAGS $gtk_CFLAGS"
@@ -158,8 +162,8 @@
 pkg_gudev="gudev-1.0"
 PKG_CHECK_MODULES(gudev, $pkg_gudev, have_gudev=yes, have_gudev=no)
 if test "x$have_gudev" = "xyes" ; then
-    HB_LIBS="$HB_LIBS $gudev_LIBS"
-    HB_CPPFLAGS="$HB_CPPFLAGS $gudev_CFLAGS"
+	HB_LIBS="$HB_LIBS $gudev_LIBS"
+	HB_CPPFLAGS="$HB_CPPFLAGS $gudev_CFLAGS"
 
 	CXXFLAGS="$CXXFLAGS -D_HAVE_GUDEV"
 	CFLAGS="$CFLAGS -D_HAVE_GUDEV"
@@ -167,13 +171,13 @@
 
 GST1_MODULES="gstreamer-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 gstreamer-pbutils-1.0"
 if test "x$gst_disable" = "xno" ; then
-    PKG_CHECK_MODULES(gstreamer1, $GST1_MODULES, use_gst1=yes, use_gst1=no)
-    if test "x$use_gst1" = "xyes" ; then
-        HB_LIBS="$HB_LIBS $gstreamer1_LIBS"
-        HB_CPPFLAGS="$HB_CPPFLAGS $gstreamer1_CFLAGS"
-    else
-        gst_disable="yes"
-    fi
+	PKG_CHECK_MODULES(gstreamer1, $GST1_MODULES, use_gst1=yes, use_gst1=no)
+	if test "x$use_gst1" = "xyes" ; then
+		HB_LIBS="$HB_LIBS $gstreamer1_LIBS"
+		HB_CPPFLAGS="$HB_CPPFLAGS $gstreamer1_CFLAGS"
+	else
+		gst_disable="yes"
+	fi
 fi
 
 if test "x$gst_disable" = "xno" ; then
@@ -182,14 +186,14 @@
 fi
 
 if test "x$update_checks" = "xyes" ; then
-    PKG_CHECK_MODULES(webkitgtk, webkitgtk-3.0, use_webkitgtk=yes, use_webkitgtk=no)
-    if test "x$use_webkitgtk" = "xyes" ; then
-        HB_LIBS="$HB_LIBS $webkitgtk_LIBS"
-        HB_CPPFLAGS="$HB_CPPFLAGS $webkitgtk_CFLAGS"
-    else
-        update_checks="no"
-        CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
-    fi
+	PKG_CHECK_MODULES(webkitgtk, webkitgtk-3.0, use_webkitgtk=yes, use_webkitgtk=no)
+	if test "x$use_webkitgtk" = "xyes" ; then
+		HB_LIBS="$HB_LIBS $webkitgtk_LIBS"
+		HB_CPPFLAGS="$HB_CPPFLAGS $webkitgtk_CFLAGS"
+	else
+		update_checks="no"
+		CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
+	fi
 else
 	CFLAGS="$CFLAGS -D_NO_UPDATE_CHECK"
 fi
@@ -199,73 +203,74 @@
 
 AM_CONDITIONAL(MINGW, test "x$mingw_flag" = "xyes")
 
-HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma"
+HB_LIBS="$HB_LIBS -lhandbrake -lavformat -lavfilter -lavcodec -lavutil -ldav1d -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -lturbojpeg -llzma -lzimg"
 HB_CPPFLAGS="$HB_CPPFLAGS $HBINC"
 
 PKG_CHECK_MODULES(x264, x264, sys_x264=yes, sys_x264=no)
 if test "x$sys_x264" = "xyes" ; then
-    HB_LIBS="$HB_LIBS $x264_LIBS"
-    HB_CPPFLAGS="$HB_CPPFLAGS $x264_CFLAGS"
+	HB_LIBS="$HB_LIBS $x264_LIBS"
+	HB_CPPFLAGS="$HB_CPPFLAGS $x264_CFLAGS"
 else
-    # Assume it's built as a libhandbrake contrib package
-    HB_LIBS="$HB_LIBS -lx264"
+	# Assume it's built as a libhandbrake contrib package
+	HB_LIBS="$HB_LIBS -lx264"
 fi
 
 if test "x$use_fdk_aac" = "xyes" ; then
-    HB_LIBS="$HB_LIBS -lfdk-aac"
+	HB_LIBS="$HB_LIBS -lfdk-aac"
 fi
 
 if test "x$use_x265" = "xyes" ; then
-    HB_LIBS="$HB_LIBS -lx265"
+	HB_LIBS="$HB_LIBS -lx265"
 fi
 
 if test "x$use_qsv" = "xyes" ; then
-    HB_LIBS="$HB_LIBS -lmfx"
+	HB_LIBS="$HB_LIBS -lvpl"
 fi
 
 case $host in
-  *-*-mingw*)
-    if test "x$use_libdl" = "xyes" ; then
-		HB_LIBS="$HB_LIBS -ldl"
-	fi
-    if test "x$use_libpthread" = "xyes" ; then
+	*-*-mingw*)
+		if test "x$use_libdl" = "xyes" ; then
+			HB_LIBS="$HB_LIBS -ldl"
+		fi
+		if test "x$use_libpthread" = "xyes" ; then
+			HB_LIBS="$HB_LIBS -lpthread"
+		fi
+		HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid -lole32"
+		if test "x$use_mf" = "xyes" ; then
+			HB_LIBS="$HB_LIBS -lmfplat -lstrmiids"
+		fi
+		;;
+	*-*-freebsd*)
 		HB_LIBS="$HB_LIBS -lpthread"
-    else
-        HB_LIBS="$HB_LIBS -lpthreadGC2"
-	fi
-    HB_LIBS="$HB_LIBS -lbcrypt -lregex -luuid"
-    ;;
-  *-*-freebsd*)
-    HB_LIBS="$HB_LIBS -lpthread"
-    if test "x$use_qsv" = "xyes" ; then
-        HB_LIBS="$HB_LIBS -lva -lva-drm"
-    fi
-    ;;
-  *-*-netbsd*)
-    HB_LIBS="$HB_LIBS -pthread"
-    ;;
-  *-*-linux*)
-    if test "x$use_qsv" = "xyes" ; then
-        HB_LIBS="$HB_LIBS -lva -lva-drm"
-    fi
-    if test "x$use_x265" = "xyes" ; then
-    if test "x$use_numa" = "xyes" ; then
-        HB_LIBS="$HB_LIBS -lnuma"
-    fi
-    fi
-    HB_LIBS="$HB_LIBS -ldl -lpthread"
-    ;;
-  *)
-    HB_LIBS="$HB_LIBS -ldl -lpthread"
-    ;;
+		if test "x$use_qsv" = "xyes" ; then
+			HB_LIBS="$HB_LIBS -lva -lva-drm"
+		fi
+		;;
+	*-*-netbsd*)
+		HB_LIBS="$HB_LIBS -pthread"
+		;;
+	*-*-linux*)
+		if test "x$use_qsv" = "xyes" ; then
+			HB_LIBS="$HB_LIBS -lva -lva-drm"
+		fi
+		if test "x$use_x265" = "xyes" ; then
+			if test "x$use_numa" = "xyes" ; then
+				HB_LIBS="$HB_LIBS -lnuma"
+			fi
+		fi
+		HB_LIBS="$HB_LIBS -ldl -lpthread"
+		;;
+	*)
+		HB_LIBS="$HB_LIBS -ldl -lpthread"
+		;;
 esac
 
 AM_CONDITIONAL(GHB_FLATPAK, test "$use_flatpak" = "yes")
 
 if test "x$PYTHON" != "x" ; then
-    HB_PYTHON="$PYTHON"
+	HB_PYTHON="$PYTHON"
 else
-    HB_PYTHON="python2"
+	HB_PYTHON="python2"
 fi
 
 AC_SUBST(HB_PYTHON)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/module.defs -> HandBrake-1.5.1.tar.xz/gtk/module.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/LINGUAS -> HandBrake-1.5.1.tar.xz/gtk/po/LINGUAS Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/POTFILES.in -> HandBrake-1.5.1.tar.xz/gtk/po/POTFILES.in Changed

HandBrake-1.5.1.tar.xz/gtk/po/co.po Added

@@ -0,0 +1,3569 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Patriccollu di Santa Maria è Sichè <Patrick.Santa-Maria@laposte.net>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ghb 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
+"PO-Revision-Date: 2018-10-10 18:14+0000\n"
+"Last-Translator: Patriccollu di Santa Maria è Sichè <Patrick.Santa-Maria@laposte.net>, 2021\n"
+"Language-Team: Corsican (https://www.transifex.com/HandBrakeProject/teams/92423/co/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: co\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/ghb3.ui:23
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+"Affissà i sottutituli sopra a video.\n"
+"\n"
+"I sottutituli facenu parte di a video è ùn pudenu micca esse disattivati."
+
+#: src/ghb3.ui:26
+msgid "Burned In"
+msgstr "Intarsiati"
+
+#: src/ghb3.ui:32 src/ghb3.ui:9122
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+"Definisce a traccia di sottutituli predefinita.\n"
+"\n"
+"A maiò parte di i lettori affisseranu sta traccia\n"
+"di sottutituli durante a lettura di a video.\n"
+"\n"
+"Ghjè una manera di creà una traccia « sfurzata »\n"
+"in u vostru schedariu d’esciuta."
+
+#: src/ghb3.ui:39
+msgid "Default"
+msgstr "Predefinitu"
+
+#: src/ghb3.ui:45 src/ghb3.ui:9084
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+"Impiegà solu i sottutituli marcati cum’è « sfurzati »\n"
+"in a traccia di sottutituli di a fonte.\n"
+"\n"
+"Da bona regula, i sottutituli « sfurzati » sò impiegati\n"
+"per affissà sottutituli durante una scena induve\n"
+"qualchissia parla una lingua straniera."
+
+#: src/ghb3.ui:51
+msgid "Forced Only"
+msgstr "Sfurzati solu"
+
+#: src/ghb3.ui:57
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+"Aghjunghje (o suttrae) un staccamentu (in milli-\n"
+"seconde) à u principiu di a traccia di sottutituli SRT.\n"
+"\n"
+"Aspessu, u principu d’un schedariu esternu SRT\n"
+"ùn currisponde micca à u principiu di a video.\n"
+"Què permette di sincrunizà i schedarii."
+
+#: src/ghb3.ui:63
+msgid "SRT Offset"
+msgstr "Staccamentu SRT"
+
+#: src/ghb3.ui:69
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Scan\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+"A traccia di sottutituli di a fonte\n"
+"\n"
+"Pudete sceglie tuttu sottutitulu ricun-\n"
+"nisciutu in u vostru schedariu di fonte.\n"
+"\n"
+"Di più, ci hè l’ozzione speciale di traccia\n"
+"« Analisa audio straniera ». St’ozzione\n"
+"aghjunghjerà un passeghju cumplementariu di \n"
+"cudificazione per circà sottutituli chì cur-\n"
+"rispondenu à una scena in lingua straniera. Hè ricumandatu d’impiegà st’ozzione cù\n"
+"l’altra ozzione « Sfurzati »."
+
+#: src/ghb3.ui:80
+msgid "Track"
+msgstr "Traccia"
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Apre u cartulare di fonte"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Apre u cartulare di destinazione"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Apre u cartulare di i ghjurnali di cudificazione"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Apre u ghjurnale di cudificazione"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Reinizià i travagli fiaschi"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Reinizià tutti i travagli"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Squassà i travagli compii"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Squassà tutti i travagli"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Impurtà una fila d’attesa"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Espurtà a fila d’attesa"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Prerigature HandBrake"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr "_Prerigature"
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr "_Sceglie predefinitu"
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr "_Arregistrà"
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr "Arregistrà cù u _nome"
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr "_Rinumà"
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr "_Squassà"
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr "_Impurtà"
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr "_Espurtà"
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr "Rimette d’_origine e prerigature integrate"
+
+#: src/ghb3.ui:304
+msgid "Presets List"
+msgstr "Lista di e prerigature"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "Fila d’attesa HandBrake"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Fila d’attesa"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 travagli in attesa"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Principià a cudificazione"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Principià"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Interrompe a cudificazione"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Ozzioni"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Quandu hè compiu :"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Reinizià"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Marcà l’elementu selezziunatu di a fila cum’è in attesa\n"
+"Rimette in attesa u travagliu di a fila è prontu à esse lanciatu torna."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Mudificà"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Azzioni"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Prerigatura :"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Fonte :"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titulu :"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Destinazione :"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensioni :"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video :"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio :"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Sottutituli :"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Riassuntu"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Passu :"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Ora di principiu :"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Ora di fine :"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Durata di l’interruzzione :"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Durata di cudificazione :"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Dimensione di schedariu :"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Statu :"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Ghjurnale d’attività"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Ghjurnale d’attività HandBrake"
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr "Apprupositu d’HandBrake"
+
+#: src/ghb3.ui:1716
+msgid ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , HandBrake Devs"
+msgstr ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , Sviluppatori HandBrake"
+
+#: src/ghb3.ui:1718
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+"HandBrake hè un trascudificatore di video multipiattaforma è « multithread »"
+" sottu a licenza GPL."
+
+#: src/ghb3.ui:1720
+msgid "https://handbrake.fr"
+msgstr "https://handbrake.fr"
+
+#: src/ghb3.ui:1721
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"HandBrake hè un prugramma liberu ; pudete ridistribuiscelu è/o mudificalu dapervoi secondu i termi di a versione 2 di a Licenza Publica Generale GNU, tale chì publicata da a Free Software Foundation.\n"
+"\n"
+"HandBrake hè distribuitu cù a sperenza d’esse ghjuvevule, ma SENZA NISUNA ASSICURANZA ; senza manc’una assicuranza di CUMMERCIALISAZIONE o di CURRISPUNDENZA À UN IMPIEGU PARTICULARE. Fighjate a licenza GNU General Public License per sapene di più.\n"
+"\n"
+"Duveriate avè ricevutu una copia di a licenza GNU General Public License cù Glade ; osinnò, ci vole à scrive à : Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/ghb3.ui:1907
+msgid "HandBrake"
+msgstr "HandBrake"
+
+#: src/ghb3.ui:1930
+msgid "_File"
+msgstr "_Schedariu"
+
+#: src/ghb3.ui:1938
+msgid "Open _Source"
+msgstr "Apre a_fonte"
+
+#: src/ghb3.ui:1947
+msgid "Open Single _Title"
+msgstr "Apre u _titulu solu"
+
+#: src/ghb3.ui:1956
+msgid "Set _Destination"
+msgstr "Definisce a _destinazione"
+
+#: src/ghb3.ui:1971
+msgid "_Preferences"
+msgstr "_Preferenze"
+
+#: src/ghb3.ui:1986
+msgid "_Quit"
+msgstr "_Esce"
+
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
+msgid "_Queue"
+msgstr "_Fila d’attesa"
+
+#: src/ghb3.ui:2009
+msgid "_Add"
+msgstr "_Aghjunghje"
+
+#: src/ghb3.ui:2018
+msgid "Add _Multiple"
+msgstr "Aghjunghje _parechje"
+
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
+msgid "_Start Encoding"
+msgstr "_Principià a cudificazione"
+
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
+msgid "_Pause Encoding"
+msgstr "_Interrompe a cudificazione"
+
+#: src/ghb3.ui:2045
+msgid "S_ave Queue"
+msgstr "_Arregistrà a fila d’attesa"
+
+#: src/ghb3.ui:2054
+msgid "_Load Queue File"
+msgstr "_Caricà u schedariu di fila d’attesa"
+
+#: src/ghb3.ui:2069
+msgid "_View"
+msgstr "_Fighjà"
+
+#: src/ghb3.ui:2077
+msgid "HandBrake For _Dumbies"
+msgstr "HandBrake per i baulli"
+
+#: src/ghb3.ui:2086
+msgid "Presets _List"
+msgstr "_Lista di e prerigature"
+
+#: src/ghb3.ui:2104
+msgid "_Preview"
+msgstr "Fi_ghjulata"
+
+#: src/ghb3.ui:2113
+msgid "_Activity Window"
+msgstr "_Finestra d’attività"
+
+#: src/ghb3.ui:2229
+msgid "_Help"
+msgstr "Ai_utu"
+
+#: src/ghb3.ui:2237
+msgid "_About"
+msgstr "_Apprupositu"
+
+#: src/ghb3.ui:2246
+msgid "_Guide"
+msgstr "_Guida"
+
+#: src/ghb3.ui:2284 src/callbacks.c:4123
+msgid "Choose Video Source"
+msgstr "Sceglie a video di fonte"
+
+#: src/ghb3.ui:2286 src/callbacks.c:4122
+msgid "Open Source"
+msgstr "Apre una fonte"
+
+#: src/ghb3.ui:2309
+msgid "Add to Queue"
+msgstr "Aghjunghje à a fila d’attesa"
+
+#: src/ghb3.ui:2311
+msgid "Add To Queue"
+msgstr "Aghjunghje à a fila d’attesa"
+
+#: src/ghb3.ui:2366
+msgid "Show Presets Window"
+msgstr "Affissà a finestra di e prerigature"
+
+#: src/ghb3.ui:2368
+msgid "Presets"
+msgstr "Prerigature"
+
+#: src/ghb3.ui:2381
+msgid "Show Preview Window"
+msgstr "Affissà a finestra di fighjulata"
+
+#: src/ghb3.ui:2383
+msgid "Preview"
+msgstr "Fighjulata"
+
+#: src/ghb3.ui:2396
+msgid "Show Queue"
+msgstr "Affissà a fila d’attesa"
+
+#: src/ghb3.ui:2398 src/callbacks.c:4567
+msgid "Queue"
+msgstr "Fila d’attesa"
+
+#: src/ghb3.ui:2411
+msgid "Show Activity Window"
+msgstr "Affissà a finestra d’attività"
+
+#: src/ghb3.ui:2413
+msgid "Activity"
+msgstr "Attività"
+
+#: src/ghb3.ui:2443
+msgid "Source:"
+msgstr "Fonte :"
+
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
+msgid "None"
+msgstr "Nisunu"
+
+#: src/ghb3.ui:2514 src/callbacks.c:4095
+msgid "Scanning..."
+msgstr "Verificazione…"
+
+#: src/ghb3.ui:2548
+msgid "Title:"
+msgstr "Titulu :"
+
+#: src/ghb3.ui:2576
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+"Definisce u titulu à cudificà.\n"
+"Osinnò, u titulu u più longu hè sceltu.\n"
+"Ghjè aspessu u titulu d’un DVD."
+
+#: src/ghb3.ui:2598
+msgid "No Titles"
+msgstr "Alcunu titulu"
+
+#: src/ghb3.ui:2616
+msgid "Angle:"
+msgstr "Angulu :"
+
+#: src/ghb3.ui:2628
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr "Per i DVD cù anguli multiple, selezziunate l’anguli à cudificà."
+
+#: src/ghb3.ui:2644
+msgid "Range:"
+msgstr "Stesa :"
+
+#: src/ghb3.ui:2655
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+"Stesa di u titulu à cudificà. Si pò agisce di capituli, di seconde, o di "
+"fiure."
+
+#: src/ghb3.ui:2668
+msgid "Set the first chapter to encode."
+msgstr "Definisce u primu capitulu à cudificà."
+
+#: src/ghb3.ui:2683
+msgid "-"
+msgstr "-"
+
+#: src/ghb3.ui:2695
+msgid "Set the last chapter to encode."
+msgstr "Definisce l’ultimu capitulu à cudificà."
+
+#: src/ghb3.ui:2720
+msgid "Preset:"
+msgstr "Prerigatura :"
+
+#: src/ghb3.ui:2756
+msgid "Choose Preset"
+msgstr "Sceglie a prerigatura"
+
+#: src/ghb3.ui:2787
+msgid "Modified"
+msgstr "Mudificata"
+
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
+msgid "Reload"
+msgstr "Ricaricà"
+
+#: src/ghb3.ui:2799
+msgid ""
+"Reload the settings for the currently selected preset.\n"
+"Modifications will be discarded."
+msgstr ""
+"Ricaricà e preferenze per a prerigatura attualmente selezziunata.\n"
+"I cambiamenti seranu persi."
+
+#: src/ghb3.ui:2811
+msgid "Save New Preset"
+msgstr "Arregistrà a nova prerigatura"
+
+#: src/ghb3.ui:2814
+msgid "Save the current settings to a new Preset."
+msgstr "Arregistrà e preferenze attuale in una nova prerigatura."
+
+#: src/ghb3.ui:2896
+msgid "Format:"
+msgstr "Furmatu :"
+
+#: src/ghb3.ui:2914
+msgid "Format to mux encoded tracks to."
+msgstr "Furmatu ver di e traccie cudificate in mux."
+
+#: src/ghb3.ui:2926 src/queuehandler.c:290
+msgid "Web Optimized"
+msgstr "Megliuratu per u Web"
+
+#: src/ghb3.ui:2931
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+"Meglireghja l’accunciamentu di u schedariu MP4 per un scaricamentu prugressivu.\n"
+"Què permette à u lettore di principià a lettura nanzu a fine di u scaricamentu."
+
+#: src/ghb3.ui:2947
+msgid "Align A/V Start"
+msgstr "Alineà u principiu di l’audio/video"
+
+#: src/ghb3.ui:2952
+msgid ""
+"Aligns the initial timestamps of all audio and video streams by\n"
+"inserting blank frames or dropping frames. May improve audio/video\n"
+"sync for broken players that do not honor MP4 edit lists."
+msgstr ""
+"Alineeghja e stampiglie iniziale di tutti i flussi audio è video\n"
+"framittendu fiure viote o squassendu fiure. Què pò megliurà a\n"
+"sincrunizazione audio/video per i lettori disfunziunendu chì ùn\n"
+"rispettanu micca e liste di mudificazioni MP4."
+
+#: src/ghb3.ui:2969
+msgid "iPod 5G Support"
+msgstr "Ghjestione di l’iPod 5G"
+
+#: src/ghb3.ui:2974
+msgid "Add iPod Atom needed by some older iPods."
+msgstr "Aghjunghje l’iPod Atom richiestu per certi iPod anziani."
+
+#: src/ghb3.ui:2996
+msgid "Duration:"
+msgstr "Durata :"
+
+#: src/ghb3.ui:3014
+msgid "hh:mm:ss"
+msgstr "oo:mm:ss"
+
+#: src/ghb3.ui:3029
+msgid "Tracks:"
+msgstr "Traccie :"
+
+#: src/ghb3.ui:3069
+msgid "Filters:"
+msgstr "Filtri :"
+
+#: src/ghb3.ui:3109
+msgid "Size:"
+msgstr "Dimensione :"
+
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
+msgid "--"
+msgstr "--"
+
+#: src/ghb3.ui:3227
+msgid "Auto Crop"
+msgstr "Runzicatura autumatica"
+
+#: src/ghb3.ui:3232
+msgid "Automatically crop black borders around edges of the video."
+msgstr "Runzicà autumaticamente i bordi neri intornu à a video."
+
+#: src/ghb3.ui:3246
+msgid "Loose Crop"
+msgstr "Runzicatura flessibile"
+
+#: src/ghb3.ui:3250
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+"Quandu e preferenze di a fiura richiedenu chì e\n"
+"so dimensioni sianu attundate à un multipulu di\n"
+"pixel, sta preferenza runzicherà qualchì pixel\n"
+"cumplementariu invece di fà una runzicatura esatta\n"
+"è di mette à a scala fin’à u multipulu richiestu."
+
+#: src/ghb3.ui:3272
+msgid "Left Crop"
+msgstr "Runzicatura à manca"
+
+#: src/ghb3.ui:3289
+msgid "Top Crop"
+msgstr "Runzicatura insù"
+
+#: src/ghb3.ui:3306
+msgid "Bottom Crop"
+msgstr "Runzicatura inghjò"
+
+#: src/ghb3.ui:3323
+msgid "Right Crop"
+msgstr "Runzicatura à dritta"
+
+#: src/ghb3.ui:3340
+msgid "Crop Dimensions:"
+msgstr "Dimensioni di a runzicatura :"
+
+#: src/ghb3.ui:3376
+msgid "Cropping"
+msgstr "Runzicatura"
+
+#: src/ghb3.ui:3411
+msgid "Optimal for source"
+msgstr "Ottimale per a fonte"
+
+#: src/ghb3.ui:3415
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+"St’ozzione selezziuneghja a risuluzione per un allucamentu ottimale.\n"
+"Serà a risuluzione chì s’avvicinerà u più à quella di a fonte dopu a runzicatura."
+
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
+msgid "Width:"
+msgstr "Larghezza :"
+
+#: src/ghb3.ui:3448
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+"Ghjè a larghezza cù quella a video serà arregistrata.\n"
+"E vere dimensioni d’affisera seranu sfarente s’è u raportu larghezza/altezza ùn hè micca 1:1."
+
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
+msgid "Height:"
+msgstr "Altezza :"
+
+#: src/ghb3.ui:3481
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+"Ghjè l’altezza impiegata per l’allucamentu di a video.\n"
+"E vere dimensioni d’affisera seranu sfarente s’è u raportu larghezza/altezza ùn hè micca 1:1."
+
+#: src/ghb3.ui:3511
+msgid "Anamorphic:"
+msgstr "Anamorficu :"
+
+#: src/ghb3.ui:3526
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Use a pixel aspect ratio that is as\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
+"Automatic - Use a pixel aspect ratio that maximizes\n"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
+msgstr ""
+"Modi anamorfichi :\n"
+"<tt>\n"
+"Alcunu - Sfurzà un raportu larghezza/altezza di pixel di 1:1.\n"
+"Soffice - Impiegà un raportu larghezza/altezza di\n"
+" pixel chì hè u più vicinu di quellu di a video di a\n"
+" fonte è cunservendu u raportu d’affissera d’origine\n"
+" Autumaticu - Impiegà un raportu larghezza/altezza di\n"
+" pixel chì megliureghja a risuluzione d’allucamentu è\n"
+" cunservendu u raportu d’affissera d’origine</tt>"
+
+#: src/ghb3.ui:3550
+msgid "Alignment:"
+msgstr "Aliniamentu :"
+
+#: src/ghb3.ui:3565
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+"Alineà e dimensioni d’allucamentu nant’à multipli di stu valore.\n"
+"\n"
+"Sta preferenza hè di primura per a cumpatibilità cù certi apparechji.\n"
+"Duveriate impiegà 2 quandu ùn avete micca prublemi di cumpatibilità."
+
+#: src/ghb3.ui:3590
+msgid "Storage Geometry"
+msgstr "Geometria d’allucamentu"
+
+#: src/ghb3.ui:3625
+msgid "Keep Aspect"
+msgstr "Cunservà l’aspettu"
+
+#: src/ghb3.ui:3630
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+"Attivà st’ozzione per cunservà l’aspettu originale d’affissera di a fonte."
+
+#: src/ghb3.ui:3663
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+"Ghjè a larghezza d’affissera : Ghjè u risultatu di messa à a scala di e "
+"dimensioni di memoria secondu à l’aspettu di pixel."
+
+#: src/ghb3.ui:3724
+msgid "Pixel Aspect:"
+msgstr "Aspettu di fiura (pixel) :"
+
+#: src/ghb3.ui:3739
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+"U furmatu pixel definisce a forma, a larghezza è l’altezza di i punti elementarii d’una fiura (pixel).\n"
+"\n"
+"Un raportu 1:1 definisce un pixel quadratu. D’altri valori definiscenu forme rettangulare.\n"
+"I lettori cambieranu e dimensioni di a fiura per currisponde à l’aspettu specificatu."
+
+#: src/ghb3.ui:3759
+msgid ":"
+msgstr ":"
+
+#: src/ghb3.ui:3774
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+"U furmatu pixel definisce a forma, a larghezza è l’altezza di i punti elementarii d’una fiura (pixel).\n"
+"Un raportu 1:1 definisce un pixel quadratu. D’altri valori definiscenu forme rettangulare.\n"
+"I lettori cambieranu e dimensioni di a fiura per currisponde à l’aspettu specificatu."
+
+#: src/ghb3.ui:3794
+msgid "Display Aspect:"
+msgstr "Aspettu d’affissera :"
+
+#: src/ghb3.ui:3809
+msgid "--:--"
+msgstr "--:--"
+
+#: src/ghb3.ui:3830
+msgid "Display Geometry"
+msgstr "Geometria d’affissera"
+
+#: src/ghb3.ui:3848
+msgid "Dimensions"
+msgstr "Dimensioni"
+
+#: src/ghb3.ui:3876
+msgid "Detelecine:"
+msgstr "Detelesinema :"
+
+#: src/ghb3.ui:3892
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+"Stu filtru caccia l’effetti parassiti di « pettinera » chì sò u risultatu di u telesinema.\n"
+"\n"
+"U telesinema hè u prucessu chì adatteghja a cadenza di fiura di filmi di 24 fps ver di quella di e video NTSC à 30 fps."
+
+#: src/ghb3.ui:3907
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+"Furmatu persunalizatu di catena di filtru di detelesinema\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+
+#: src/ghb3.ui:3935
+msgid "Interlace Detection:"
+msgstr "Abbentata di l’intricciamentu :"
+
+#: src/ghb3.ui:3951
+msgid ""
+"This filter detects interlaced frames.\n"
+"\n"
+"If a deinterlace filter is enabled, only frames that this filter finds\n"
+"to be interlaced will be deinterlaced."
+msgstr ""
+"Stu filtru abbenteghja e fiure intricciate.\n"
+"\n"
+"S’è un filtru di disintricciamentu hè attivatu, solu e fiure scuperte da stu filtru cum’è essendu intricciate seranu disintricciate."
+
+#: src/ghb3.ui:3967
+msgid ""
+"Custom interlace detection filter string format\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+msgstr ""
+"Furmatu persunalizatu di catena di filtru d’abbentata di l’intricciamentu\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+
+#: src/ghb3.ui:3996
+msgid "Deinterlace:"
+msgstr "Disintricciamentu :"
+
+#: src/ghb3.ui:4012
+msgid ""
+"Choose decomb or deinterlace filter.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+"Sciglite u filtru di dipettinera o disintricciamentu.\n"
+"\n"
+"U filtru di dipettinera accetta cudificazioni numerose d’interpolazione.\n"
+"U filtru di disintricciament hè un disintricciatore YADIF classicu.\n"
+
+#: src/ghb3.ui:4031
+msgid "Deinterlace Preset:"
+msgstr "Prerigatura di disintricciamentu :"
+
+#: src/ghb3.ui:4047
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+"Sciglite l’ozzioni di filtru dipettinera o disintricciamentu.\n"
+"\n"
+"U filtru di dipettinera accetta cudificazioni numerose d’interpolazione.\n"
+"U filtru di disintricciament hè un disintricciatore YADIF classicu.\n"
+
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Filtru di sblucchime :"
+
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+"U filtru di sblucchime caccia un tipu classicu d’effetti parassiti di cumpressione.\n"
+"S’è a vostra fonte fà vede certi effetti parassiti di bloccu, stu filtru pò aiutà à nettalli."
+
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Rigatura di sblucchime :"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Furmatu persunalizatu di catena di filtru di sblucchime\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
+msgid "Denoise Filter:"
+msgstr "Filtru di riduzzione di trostu :"
+
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+"U filtru di riduzzione di trostu riduce o caccia l’aspettu di rumore è di granellu d’un filmu.\n"
+"U granellu d’un filmu è l’altri tipi di trostu d’alta frequenza sò difficiule à cumprime.\n"
+"L’impiegu di stu filtru nant’à quelle fonti permette di riduce a dimensione di i schedarii."
+
+#: src/ghb3.ui:4213
+msgid "Denoise Preset:"
+msgstr "Prerigatura di riduzzione di trostu :"
+
+#: src/ghb3.ui:4246
+msgid "Denoise Tune:"
+msgstr "Rigatura di riduzzione di trostu :"
+
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+"Furmatu persunalizatu di catena di filtru di riduzzione di trostu\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+
+#: src/ghb3.ui:4305
+msgid "Sharpen Filter:"
+msgstr "Filtru d’arrutata :"
+
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
+msgid ""
+"Sharpen filtering enhances edges and other\n"
+"high frequency components in the video."
+msgstr ""
+"U filtru d’arrutata amendeghja i bordi è\n"
+"l’altri cumpunenti d’alta frequenza in u filmu."
+
+#: src/ghb3.ui:4337
+msgid "Sharpen Preset:"
+msgstr "Prerigatura d’arrutata :"
+
+#: src/ghb3.ui:4369
+msgid "Sharpen Tune:"
+msgstr "Rigatura d’arrutata :"
+
+#: src/ghb3.ui:4427
+msgid "Rotate Filter:"
+msgstr "Filtru di rutazione :"
+
+#: src/ghb3.ui:4443
+msgid "Rotate the video clockwise in 90 degree increments."
+msgstr "Rutazione di u filmu di 90 gradi in u sensu orariu."
+
+#: src/ghb3.ui:4457
+msgid "Grayscale"
+msgstr "Scala di grisgiu"
+
+#: src/ghb3.ui:4462
+msgid "If enabled, filter colour components out of video."
+msgstr "Attivà st’ozzione per filtrà i cumpunenti di culore di u filmu."
+
+#: src/ghb3.ui:4473
+msgid "Filters"
+msgstr "Filtri"
+
+#: src/ghb3.ui:4504
+msgid "Video Encoder:"
+msgstr "Cudificatore video :"
+
+#: src/ghb3.ui:4518
+msgid "Available video encoders."
+msgstr "Cudificatori video dispunibule."
+
+#: src/ghb3.ui:4534
+msgid "Framerate:"
+msgstr "Frequenza di fiure :"
+
+#: src/ghb3.ui:4549
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+"Frequenza di fiure d’esciuta.\n"
+"\n"
+"« Listessa chì a fonte » hè ricumandatu. S’è a vostra video di fonte hà una frequenza di fiure variabile, st’ozzione a preserverà."
+
+#: src/ghb3.ui:4564
+msgid "Constant Framerate"
+msgstr "Frequenza di fiure custente"
+
+#: src/ghb3.ui:4569
+msgid "Enables constant framerate output."
+msgstr "Attiveghja una frequenza di fiure custente in esciuta."
+
+#: src/ghb3.ui:4583
+msgid "Peak Framerate (VFR)"
+msgstr "Frequenza di fiure di cresta (VFR)"
+
+#: src/ghb3.ui:4588
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+"Attiveghja una frequenza di fiure d’esciuta variabile cù una frequenza di cresta determinata da a preferenza di a frequenza di fiure.\n"
+"\n"
+"VFR ùn hè micca cumpatibile cù certi lettori."
+
+#: src/ghb3.ui:4606
+msgid "Variable Framerate"
+msgstr "Frequenza di fiure variabile (VFR)"
+
+#: src/ghb3.ui:4611
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+"Attiveghja una frequenza di fiure variabile in esciuta.\n"
+"\n"
+"VFR ùn hè micca cumpatibile cù certi lettori."
+
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+"Definisce u fattore di qualità pregatu.\n"
+"U cudificatore sibuleghja una certa qualità.\n"
+"A scala impiegata da ogni cudificatore hè sfarenta.\n"
+"\n"
+"A scala di x264 hè logaritmica, è valori più chjuchi currispondenu à una\n"
+"qualità più maiò.\n"
+"Dunque, chjuchi aumenti di valore aumentanu prugressi-\n"
+"vamente a dimensione di u schedariu d’esciuta. Un valore à 0 vole dì\n"
+"senza perdita è per què, u schedariu d’esciuta serà più maiò chì quellu\n"
+"di a fonte, for di s’è a fonte era dinù senza perdita.\n"
+"\n"
+"A scala di FFMpeg è Theora hè più lineare.\n"
+"Sti cudificatori ùn anu micca di modu senza perdita."
+
+#: src/ghb3.ui:4674
+msgid "Constant Quality:"
+msgstr "Qualità custente :"
+
+#: src/ghb3.ui:4705
+msgid "Bitrate (kbps): "
+msgstr "Flussu binariu (kbps) : "
+
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+"Definisce u flussu medianu.\n"
+"\n"
+"U flussu istantaneu pò esse assai più altu o assai più bassu à ogni stonda.\n"
+"Ma a mediana, nant’à una longa durata, serà u valore definitu quì. S’ella hè bisognu\n"
+"di limità u flussu istantaneu, fighjate e preferenze vbv-bufsize è vbv-maxrate di u x264."
+
+#: src/ghb3.ui:4749
+msgid "2-Pass Encoding"
+msgstr "Cudificazione à 2 passi"
+
+#: src/ghb3.ui:4754
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+"Face una cudificazione à 2 passi.\n"
+"\n"
+"L’ozzione « Flussu » hè prerichiesta. Durante u primu passu, e statistiche\n"
+"sò cullettate. Dopu, à u secondu passu, ste statistiche sò impiegate per fà\n"
+"a scelta di l’allucamentu di u flussu."
+
+#: src/ghb3.ui:4772
+msgid "Turbo First Pass"
+msgstr "Primu passu Turbo"
+
+#: src/ghb3.ui:4777
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+"Durante u primu passu d’una cudificazione à 2 passi, impiegate preferenze "
+"chì acceleranu u trattamentu."
+
+#: src/ghb3.ui:4839
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+"Adatteghja e preferenze di u cudificatore per bilancià trà a faccindaghjine di a cumpressione è a vitezza di cudificazione.\n"
+"\n"
+"Què definisce e vostre preferenze predefinite di cudificatore.\n"
+"Rigature, prufili, livelli è catene addiziunale d’ozzioni seranu appiecati à st’operazione.\n"
+"Di regula, duveriate definisce st’ozzione à u valore u più lentu chì\n"
+"vo siate capace d’accettà, perchè preferenze più lente vi danu una\n"
+"più bella qualità o schedarii più chjuchi."
+
+#: src/ghb3.ui:4865
+msgid "Tune:"
+msgstr "Rigatura :"
+
+#: src/ghb3.ui:4882
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve efficiency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+"Preferenze di rigatura per megliurà i scenarii classichi.\n"
+"\n"
+"Què pò megliurà a faccindaghjine di certe caratteristiche di a fonte\n"
+"o di e caratteristiche definite di u schedariu d’esciuta. I cambiamenti\n"
+"seranu appiecati dopu a prerigatura ma nanzu tutti l’altre preferenze."
+
+#: src/ghb3.ui:4898
+msgid "Fast Decode"
+msgstr "Discudificazione rapida"
+
+#: src/ghb3.ui:4903
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+"Riduce l’impiegu CPU di u discudificatore.\n"
+"\n"
+"Attivate st’ozzione s’è u vostru apparechju ùn leghje micca bè u schedariu d’esciuta (perdita di fiure)."
+
+#: src/ghb3.ui:4921
+msgid "Zero Latency"
+msgstr "Cumportu d’attesa à zeru"
+
+#: src/ghb3.ui:4925
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+"Impuculisce u cumportu d’attesa trà a fonte di u cudificatore è l’esciuta di u discudificatore.\n"
+"\n"
+"Ghjè ghjuvevule per a diffusione è a lettura di cuntinuu di i flussi.\n"
+"\n"
+"Cum’è HandBrake ùn hè micca adattatu à a diffusione da flussi\n"
+"in direttu, st’ozzione hè di pocu valore quì."
+
+#: src/ghb3.ui:4949
+msgid "Profile:"
+msgstr "Prufilu :"
+
+#: src/ghb3.ui:4966
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+"Definisce è assicureghja a cunfurmità cù u prufilu specificatu.\n"
+"\n"
+"Supraneghja tutte l’altre preferenze."
+
+#: src/ghb3.ui:4984
+msgid "Level:"
+msgstr "Livellu :"
+
+#: src/ghb3.ui:5001
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+"Definisce è assicureghja a cunfurmità cù u livellu specificatu.\n"
+"\n"
+"Supraneghja tutte l’altre preferenze."
+
+#: src/ghb3.ui:5026
+msgid "More Settings:"
+msgstr "Altre preferenze :"
+
+#: src/ghb3.ui:5044
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+"Preferenze addiziunale di u cudificatore.\n"
+"\n"
+"Lista d’ozzioni di u cudificatore staccate da dui punti."
+
+#: src/ghb3.ui:5078 src/main.c:1155
+msgid "Video"
+msgstr "Video"
+
+#. Add Button
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
+msgid "Add"
+msgstr "Aghjunghje"
+
+#: src/ghb3.ui:5146
+msgid "Add new audio settings to the list"
+msgstr "Aghjunghje nove preferenze audio à a lista"
+
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
+msgid "Add All"
+msgstr "Tuttu aghjunghje"
+
+#: src/ghb3.ui:5158
+msgid "Add all audio tracks to the list"
+msgstr "Aghjunghje tutte e traccie audio à a lista"
+
+#: src/ghb3.ui:5171
+msgid "Reload all audio settings from defaults"
+msgstr "Ricaricà tutte e predefinizioni di e preferenze audio"
+
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Lista di e traccie"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
+msgid "Selection Behavior:"
+msgstr "Cumpurtamentu di a selezzione :"
+
+#: src/ghb3.ui:5261
+msgid "Choose which audio tracks of the source media are used."
+msgstr "Sciglite in u media di fonte chì traccie audio à impiegà."
+
+#: src/ghb3.ui:5322
+msgid ""
+"Create a list of languages you would like to select audio for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior."
+msgstr ""
+"Create une lista di e lingue per chì ci vole à selezziunà l’audio.\n"
+"E traccie currispundente à ste lingue seranu selezziunate secondu à u cumpurtamentu di selezzione."
+
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
+msgid "Remove"
+msgstr "Caccià"
+
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
+msgid "Available Languages"
+msgstr "Lingue dispunibule"
+
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
+msgid "Selected Languages"
+msgstr "Lingue selezziunate"
+
+#: src/ghb3.ui:5400
+msgid "Use only first encoder for secondary audio"
+msgstr "Impiegà solu u primu cudificatore per a traccia audio secundaria"
+
+#: src/ghb3.ui:5405
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+"Solu a traccia audio principale sera cudificata cù a lista sana di i cudificatori.\n"
+"Tutte l’altre traccie audio secundarie d’esciuta seranu cudificate solu cù u primu cudificatore."
+
+#: src/ghb3.ui:5441
+msgid "Auto Passthru:"
+msgstr "Ricopia autumatica :"
+
+#: src/ghb3.ui:5452
+msgid "MP3"
+msgstr "MP3"
+
+#: src/ghb3.ui:5457
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu MP3.\n"
+"Què permette di selezziunà a ricopia MP3 quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5473
+msgid "AAC"
+msgstr "AAC"
+
+#: src/ghb3.ui:5478
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu AAC.\n"
+"Què permette di selezziunà a ricopia AAC quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5494
+msgid "AC-3"
+msgstr "AC-3"
+
+#: src/ghb3.ui:5499
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu AC-3.\n"
+"Què permette di selezziunà a ricopia AC-3 quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5515
+msgid "DTS"
+msgstr "DTS"
+
+#: src/ghb3.ui:5520
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu DTS.\n"
+"Què permette di selezziunà a ricopia DTS quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5536
+msgid "DTS-HD"
+msgstr "DTS-HD"
+
+#: src/ghb3.ui:5541
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu DTS-HD.\n"
+"Què permette di selezziunà a ricopia DTS-HD quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5557
+msgid "EAC-3"
+msgstr "EAC-3"
+
+#: src/ghb3.ui:5562
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu EAC-3.\n"
+"Què permette di selezziunà a ricopia EAC-3 quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5578
+msgid "TrueHD"
+msgstr "TrueHD"
+
+#: src/ghb3.ui:5583
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu TrueHD.\n"
+"Què permette di selezziunà a ricopia TrueHD quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5599
+msgid "FLAC"
+msgstr "FLAC"
+
+#: src/ghb3.ui:5604
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+"Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu FLAC.\n"
+"Què permette di selezziunà a ricopia FLAC quandu l’ozzione di ricopia autumatica hè attivata."
+
+#: src/ghb3.ui:5637
+msgid "Passthru Fallback:"
+msgstr "In casu di fiascu di a ricopia :"
+
+#: src/ghb3.ui:5649
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+"Definisce u cudecu audio à impiegà per a cudificazione quandu ùn si pò truvà"
+" una traccia cumpatibile per a ricopia audio."
+
+#: src/ghb3.ui:5678
+msgid "Audio Encoder Settings:"
+msgstr "Preferenze di cudificazione audio :"
+
+#: src/ghb3.ui:5679
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+"Ogni traccia di fonte selezziunata serà cudificata cù tutti i cudificatori "
+"selezziunati"
+
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
+msgid "Encoder"
+msgstr "Cudificatore"
+
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
+msgid "Bitrate/Quality"
+msgstr "Flussu binariu/Qualità"
+
+#: src/ghb3.ui:5726
+msgid "Mixdown"
+msgstr "Mischiera"
+
+#: src/ghb3.ui:5737
+msgid "Samplerate"
+msgstr "Frequenza di campiunariu"
+
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
+msgid "Gain"
+msgstr "Guadagnu"
+
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
+msgid "DRC"
+msgstr "DRC"
+
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Selezzione di traccia"
+
+#: src/ghb3.ui:5808
+msgid "Audio"
+msgstr "Audio"
+
+#: src/ghb3.ui:5876
+msgid "Add new subtitle settings to the list"
+msgstr "Aghjunghje nove preferenze di sottutitulu à a lista"
+
+#: src/ghb3.ui:5888
+msgid "Add all subtitle tracks to the list"
+msgstr "Aghjunghje tutte e traccie di sottutitulu à a lista"
+
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
+msgid "Foreign Audio Scan"
+msgstr "Analisa di traccia audio straniera"
+
+#: src/ghb3.ui:5900
+msgid ""
+"Add an extra pass to the encode which searches\n"
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
+msgstr ""
+"Aghjunghje un passeghju cumplementariu à a\n"
+"cudificazione per circà sottutituli chì\n"
+"currispondenu à una scena in lingua straniera."
+
+#: src/ghb3.ui:5915
+msgid "Reload all subtitle settings from defaults"
+msgstr "Ricaricà tutte e predefinizioni di e preferenze di sottutitulu"
+
+#: src/ghb3.ui:6009
+msgid "Choose which subtitle tracks of the source media are used."
+msgstr "Sciglite in u media di fonte chì traccie di sottutitulu à impiegà."
+
+#: src/ghb3.ui:6074
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+"Create une lista di e lingue per chì ci vole à selezziunà i sottutituli.\n"
+"E traccie currispundente à ste lingue seranu selezziunate secondu à u cumpurtamentu di selezzione.\n"
+"\n"
+"A prima lingua di sta lista hè a vostra lingua preferita è serà impiegata per deter-\n"
+"minà e preferenze di selezzione di sottutitulu quandu ci hè audio in lingua straniera."
+
+#: src/ghb3.ui:6155
+msgid "Preferred Language: None"
+msgstr "Lingua preferita : Nisuna"
+
+#: src/ghb3.ui:6182
+msgid "Add Foreign Audio Scan Pass"
+msgstr "Aghjunghje un passu d’analisa di traccia audio straniera"
+
+#: src/ghb3.ui:6187
+msgid ""
+"Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+"Aghjunghje« Analisa di traccia audio straniera » quandu a traccia audio predefinita hè in a vostra lingua preferita.\n"
+"Stu passu ricerca e corte sequenze di traccia audio straniera per pruvedele sottutituli.\n"
+"\n"
+"St'ozzione richiede chì una lingua sia definita in a lista di e lingue selezziunate."
+
+#: src/ghb3.ui:6202
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+"Aghjunghje una traccia di sottutitulu s’è a lingua predefinita di l’audio hè"
+" straniera"
+
+#: src/ghb3.ui:6207
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle track.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+"Quandu a traccia audio predefinita ùn hè micca in a vostra lingua preferita, aghjunghje una traccia di sottutitulu.\n"
+"\n"
+"St'ozzione richiede chì una lingua sia definita in a lista di e lingue selezziunate."
+
+#: src/ghb3.ui:6221
+msgid "Add Closed Captions when available"
+msgstr "Aghjunghje e legende chjose (CC) s’elle sò dispunibule"
+
+#: src/ghb3.ui:6226
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track"
+msgstr ""
+"E legende chjose sò sottutituli di testu chì ponu esse aghjunti à tuttu "
+"furmatu di cuntenente tale una traccia di sottutituli incavalcati"
+
+#: src/ghb3.ui:6247
+msgid "Burn-In Behavior*:"
+msgstr "Cumpurtamentu d’intarsiatura* :"
+
+#: src/ghb3.ui:6259
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+"Definisce u cumpurtamentu d’un sottutitulu d’« intarsiatura ».\n"
+"\n"
+"I sottutituli intarsiati facenu parte di a video è ùn ponu micca esse disattivati durante a lettura.\n"
+"Solu una traccia di sottutitulu pò esse intarsiata ! In casu di cunflittu, ghjè a prima scelta chì supraneghja."
+
+#: src/ghb3.ui:6286
+msgid "Burn-In for deficient players*:"
+msgstr "Intarsiatura per i lettori deficienti* :"
+
+#: src/ghb3.ui:6295
+msgid "DVD Subtitles"
+msgstr "Sottutituli DVD"
+
+#: src/ghb3.ui:6300
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+"Impruntà a prima traccia di sottutitulu selezziunata di u DVD. Tutte l’altre traccie di sottutitulu di u DVD seranu scartate.\n"
+"Impiegà st’ozzione s’è u vostru prugramma di lettura o s’è u vostru apparechju ùn accetta micca i sottutituli DVD.\n"
+"\n"
+"Solu una traccia di sottutitulu pò esse intarsiata ! In casu di cunflittu, ghjè a prima scelta chì supraneghja."
+
+#: src/ghb3.ui:6314
+msgid "Blu-ray Subtitles"
+msgstr "Sottutituli Blu-ray"
+
+#: src/ghb3.ui:6319
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+"Impruntà a prima traccia di sottutitulu selezziunata di u Blu-ray. Tutte l’altre traccie di sottutitulu di u Blu-ray seranu scartate.\n"
+"Impiegà st’ozzione s’è u vostru prugramma di lettura o s’è u vostru apparechju ùn accetta micca i sottutituli Blu-ray.\n"
+"\n"
+"Solu una traccia di sottutitulu pò esse intarsiata ! In casu di cunflittu, ghjè a prima scelta chì supraneghja."
+
+#: src/ghb3.ui:6341
+msgid ""
+"* Only one of the above subtitle burn options will be applied, "
+"starting with the top."
+msgstr ""
+"* Sola una di st’ozzioni d’intarsiatura di sottutitulu insù serà "
+"appiecata, principiendu da l’altu."
+
+#: src/ghb3.ui:6342
+msgid ""
+"Only one subtitle track can be burned! Since conflicts can occur, the first "
+"chosen wins."
+msgstr ""
+"Solu una traccia di sottutitulu pò esse intarsiata ! In casu di cunflittu, "
+"ghjè a prima scelta chì supraneghja."
+
+#: src/ghb3.ui:6366
+msgid "Subtitles"
+msgstr "Sottutituli"
+
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr "Marcatori di capitulu"
+
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr "Aghjunghje marcatori di capitulu à u schedariu d’esciuta."
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Indice"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Durata"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titulu"
+
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr "Capituli"
+
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr "Attori :"
+
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr "Direttore :"
+
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr "Data d’esciuta :"
+
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr "Cummentu :"
+
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr "Generu :"
+
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr "Discrizzione :"
+
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr "Scenariu :"
+
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr "Etichette"
+
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr "Arregistrà cum’è :"
+
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr "Nome di schedariu di destinazione per a vostra cudificazione."
+
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr "In :"
+
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr "Cartulare di destinazione per a vostra cudificazione."
+
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr "Cartulare di destinazione"
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr "Abbandunà"
+
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr "Vai"
+
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr "Tuttu selezziunà"
+
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr "Marcà tutti i tituli per esse aghjunti à a fila d’attesa"
+
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr "Tuttu viutà"
+
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr "Caccià e marche da tutti i tituli"
+
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr "I schedarii di destinazione sò valevule. Nisunu duppione trovu."
+
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr "Cuntrollà autumaticamente i rinnovi"
+
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr "Quandu tutte e cudificazioni sò compie"
+
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+"Impiegà a scelta autumatica di u nome (cù un nome di fonte mudificatu)"
+
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+"Creà u nome di u schedariu di destinazione da quellu di a fonte o da u nome "
+"di vulume"
+
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr "Mudellu di a scelta autumatica di u nome"
+
+#: src/ghb3.ui:7310
+msgid ""
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
+msgstr ""
+"Ozzioni dispunibule : {source} {title} {preset} {chapters} {date} {time} "
+"{creation-date} {creation-time} {quality} {bitrate}"
+
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+"Impiegà un’estensione di schedariu cumpatibile iPod/iTunes (.m4v) per i MP4"
+
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr "Numeru d’apprezzazioni"
+
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filtrazione di i tituli corti di DVD è Blu-ray (seconde)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+"Squassà l’elementi compii di a fila d’attesa quandu una cudificazione si "
+"pianta"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"Di regula, i travagli compii stanu in a fila d’attesa è sò marcati cum’è compii.\n"
+"Attivà st’ozzione per chì a fila d’attesa si vioti autumaticamente cacciendu i travagli compii."
+
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr "Generale"
+
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr "Granularità frazziunale di qualità custente"
+
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "Impiegà dvdnav (piuttostu chì libdvdread)"
+
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr "Cuttighjà u spaziu liberu di u discu di destinazione"
+
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr ""
+"Interrompe a cudificazione s’è u spaziu liberu di u discu fala sottu una "
+"limita"
+
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr "Limita in Mo"
+
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+"Piazzà i ghjurnali di messaghji di cudificazione in u listessu locu chì u "
+"filmu"
+
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr "Livellu di verbusità di u ghjurnale d’attività"
+
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr "Durata di vita di u ghjurnale d’attività"
+
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr "Riduce l’alta definizione di l’apprezzazioni"
+
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr "Analizà autumaticamente u DVD à u so caricamentu"
+
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Analisa di u DVD quandu un discu hè caricatu"
+
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
+msgstr "Dimensione di a grafia di a finestra d’attività"
+
+#: src/ghb3.ui:7767
+msgid "Use the same settings for all titles in a batch"
+msgstr ""
+"Impiegà e listesse preferenze per tutti i tituli in un trattamentu da lottu"
+
+#: src/ghb3.ui:7771
+msgid ""
+"When checked, every title will use the same settings when adding a\n"
+"batch of titles to the queue.\n"
+"\n"
+"Uncheck this if you want to allow changing each title's settings independently."
+msgstr ""
+"Quandu st’ozzione hè attiva, ogni titulu impiegerà e listesse preferenze\n"
+"à l’aghjuntu d’un lottu di tituli à a fila d’attesa.\n"
+"\n"
+"Disattivatela per permette u cambiamentu di e preferenze d’ogni titulu indipendentemente."
+
+#: src/ghb3.ui:7799
+msgid "Allow Tweaks"
+msgstr "Permette l’adattazioni"
+
+#: src/ghb3.ui:7815
+msgid "Allow HandBrake For Dummies"
+msgstr "Permette HandBrake per i principianti"
+
+#: src/ghb3.ui:7843
+msgid "Advanced"
+msgstr "Espertu"
+
+#: src/ghb3.ui:7921
+msgid "Rename Preset"
+msgstr "Prerigatura di cambiamentu di nome"
+
+#: src/ghb3.ui:7941
+msgid "Name:"
+msgstr "Nome :"
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Discrizzione"
+
+#: src/ghb3.ui:8079
+msgid "Category:"
+msgstr "Categuria :"
+
+#: src/ghb3.ui:8094
+msgid "Set the category that this preset will be shown under."
+msgstr "Definisce a categuria sottu quella sta prerigatura serà affissata."
+
+#: src/ghb3.ui:8110
+msgid "Category Name:"
+msgstr "Nome di a categuria :"
+
+#: src/ghb3.ui:8143
+msgid "Preset Name:"
+msgstr "Nome di a prerigatura :"
+
+#: src/ghb3.ui:8177
+msgid "Default Preset"
+msgstr "Prerigatura predefinita"
+
+#: src/ghb3.ui:8182
+msgid "Make this the default Preset when HandBrake starts"
+msgstr ""
+"Definisce sta prerigatura cum’è predefinita quandu HandBrake si lancia"
+
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Dimensioni"
+
+#: src/ghb3.ui:8234
+msgid "Maximum Width:"
+msgstr "Larghezza massima :"
+
+#: src/ghb3.ui:8239
+msgid "Enable maximum width limit."
+msgstr "Permette una limita di larghezza massima."
+
+#: src/ghb3.ui:8257
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+"Ghjè a larghezza massima cù quella a video serà arregistrata.\n"
+"\n"
+"Quandu una nova fonte hè caricata, stu valore hè impiegatu s’è a larghezza di a fonte hè più maiò.\n"
+"Definisce à 0, vole si dì chì ùn ci hè micca larghezza massima."
+
+#: src/ghb3.ui:8274
+msgid "Maximum Height:"
+msgstr "Altezza massima :"
+
+#: src/ghb3.ui:8279
+msgid "Enable maximum height limit."
+msgstr "Permette una limita d’altezza massima."
+
+#: src/ghb3.ui:8297
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+"Ghjè l’altezza massima cù quella a video serà arregistrata.\n"
+"\n"
+"Quandu una nova fonte hè caricata, stu valore hè impiegatu s’è l’altezza di a fonte hè più maiò.\n"
+"Definisce à 0, vole si dì chì ùn ci hè micca altezza massima."
+
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Fighjulata HandBrake"
+
+#: src/ghb3.ui:8427
+msgid "Select preview frames."
+msgstr "Selezziunà e sequenze di a fighjulata."
+
+#: src/ghb3.ui:8449
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+"Cudificà è leghje una corta sequenza di video principiendu à a pusizione "
+"attuale di fighjulata."
+
+#: src/ghb3.ui:8520
+msgid "Duration:"
+msgstr "Durata :"
+
+#: src/ghb3.ui:8532
+msgid "Set the duration of the live preview in seconds."
+msgstr "Definisce a durata in seconde di a fighjulata diretta."
+
+#: src/ghb3.ui:8548
+msgid "Show Crop"
+msgstr "Affissà a runzicatura"
+
+#: src/ghb3.ui:8552
+msgid "Show Cropped area of the preview"
+msgstr "Affissà l’area di runzicatura nant’à a fighjulata"
+
+#: src/ghb3.ui:8563
+msgid "Source Resolution"
+msgstr "Risuluzione di a fonte"
+
+#: src/ghb3.ui:8567
+msgid "Reset preview window to the source video's resolution"
+msgstr "Reinizià a finestra di fighjulata à a risuluzione di a video di fonte"
+
+#: src/ghb3.ui:8599
+msgid "_Cancel"
+msgstr "_Abbandunà"
+
+#: src/ghb3.ui:8611
+msgid "_Open"
+msgstr "_Apre"
+
+#: src/ghb3.ui:8645
+msgid "Title Number:"
+msgstr "Numeru di titulu :"
+
+#: src/ghb3.ui:8681
+msgid "Detected DVD devices:"
+msgstr "Lettori DVD abbentati :"
+
+#: src/ghb3.ui:8791
+msgid "Import SRT"
+msgstr "Impurtà SRT"
+
+#: src/ghb3.ui:8796
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+"Attivà e preferenze per l’impurtazione di schedarii di sottutitulu SRT"
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Impurtà SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+"Attivà e preferenze per l’impurtazione di schedarii di sottutitulu SSA"
+
+#: src/ghb3.ui:8824
+msgid "Embedded Subtitle List"
+msgstr "Lista di i sottutituli incurpurati"
+
+#: src/ghb3.ui:8829
+msgid "Enable settings to select embedded subtitles"
+msgstr "Attivà e preferenze per selezziunà i sottutituli incurpurati"
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Traccia di fonte"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Lista di e traccie di sottutitulu dispunibule per a vostra fonte."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Nome di a traccia :"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Definisce u nome di a traccia di sottutitulu.\n"
+"\n"
+"I lettori ponu impiegallu in a lista di selezzione di sottutitulu."
+
+#: src/ghb3.ui:8934
+msgid "Language"
+msgstr "Lingua"
+
+#: src/ghb3.ui:8948
+msgid "Character Code"
+msgstr "Codice di caratteru"
+
+#: src/ghb3.ui:8962
+msgid "File:"
+msgstr "Schedariu :"
+
+#: src/ghb3.ui:8977
+msgid "Offset (ms)"
+msgstr "Staccamentu (ms)"
+
+#: src/ghb3.ui:8992
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+"Definisce a lingua di stu sottutitulu.\n"
+"Stu valore serà impiegatu da i lettori in u listinu di i sottutituli."
+
+#: src/ghb3.ui:9010
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+"Definisce u codice di caratteru impiegatu à l’impurtazione di u schedariu SRT.\n"
+"\n"
+"SRT ghjunghje cù tutte e pussibilità di codici di caratteru.\n"
+"Traducemu u codice di caratteru in UTF-8.\n"
+"Avemu bisognu di u codice di caratteru di a fonte per fà sta traduzzione."
+
+#: src/ghb3.ui:9034
+msgid "Select the SRT file to import."
+msgstr "Selezziunà u schedariu SRT à impurtà."
+
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Impurtà u schedariu"
+
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+"Adattà u staccamentu in milliseconde trà e stampiglie di video è di SRT"
+
+#: src/ghb3.ui:9079
+msgid "Forced Subtitles Only"
+msgstr "Solu sottutituli sfurzati"
+
+#: src/ghb3.ui:9100
+msgid "Burn into video"
+msgstr "Intarsià in a video"
+
+#: src/ghb3.ui:9105
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+"Affissà i sottutituli sopra a video.\n"
+"I sottutituli facenu parte di a video è ùn pudenu micca esse disattivati."
+
+#: src/ghb3.ui:9117
+msgid "Set Default Track"
+msgstr "Sceglie a traccia predefinita"
+
+#: src/ghb3.ui:9215
+msgid "List of audio tracks available from your source."
+msgstr "Lista di e traccie di sottutitulu dispunibule per a vostra fonte."
+
+#: src/ghb3.ui:9245
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+"Definisce u nome di a traccia audio.\n"
+"\n"
+"I lettori ponu impiegallu in a lista di selezzione audio."
+
+#: src/ghb3.ui:9308
+msgid "Mix"
+msgstr "Mischju"
+
+#: src/ghb3.ui:9321
+msgid "Sample Rate"
+msgstr "Frequenza di campiunariu"
+
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+"Stesa dinamica di cumpressione : Accumudà a stesa dinamica di a traccia audio d’esciuta.\n"
+"\n"
+"Per a fonte audio chì hà una stesa dinamica larga (sequenze assai forte è assai debule), DRC\n"
+"vi permette di « cumprime » a stesa addulciscendu i soni forti è rinfurzendu i soni debule."
+
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
+msgid "Set the audio codec to encode this track with."
+msgstr "Definisce u cudecu audio per cudificà sta traccia."
+
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
+msgid "Bitrate"
+msgstr "Flussu binariu"
+
+#: src/ghb3.ui:9399
+msgid "Enable bitrate setting"
+msgstr "Attivà a preferenza di flussu binariu"
+
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
+msgid "Quality"
+msgstr "Qualità"
+
+#: src/ghb3.ui:9414
+msgid "Enable quality setting"
+msgstr "Attivà a preferenza di qualità"
+
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
+msgid "Set the bitrate to encode this track with."
+msgstr "Definisce u flussu binariu per cudificà sta traccia."
+
+#: src/ghb3.ui:9455
+msgid ""
+"Quality: For output codec's that support it, adjust the quality of "
+"the output."
+msgstr ""
+"Qualità : Per i cudechi d’esciuta chì l’accettanu, què permette "
+"d’accumudà a qualità di l’esciuta."
+
+#: src/ghb3.ui:9477
+msgid "00.0"
+msgstr "00.0"
+
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
+msgid "Set the mixdown of the output audio track."
+msgstr "Definisce a mischiera di a traccia audio d’esciuta."
+
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
+msgid "Set the sample rate of the output audio track."
+msgstr "Definisce a frequenza di campiunariu di a traccia audio d’esciuta."
+
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+"Guadagnu audio : Per accumudata l’amplificazione o l’attenuazione di "
+"a traccia audio d’esciuta."
+
+#. Audio Gain Label
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
+msgid "0dB"
+msgstr "0 dB"
+
+#. Audio DRC Label
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
+msgid "Off"
+msgstr "Fermata"
+
+#: src/ghb3.ui:9644
+msgid "Skip This Version"
+msgstr "Ignurà sta versione"
+
+#: src/ghb3.ui:9652
+msgid "Remind Me Later"
+msgstr "Rammintatemi un altra volta"
+
+#: src/ghb3.ui:9721
+msgid "A new version of HandBrake is available!"
+msgstr "Una nova versione d’HandBrake hè dispunibule !"
+
+#: src/ghb3.ui:9737
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx hè dispunibule avà (avete yyy)."
+
+#: src/ghb3.ui:9765
+msgid "Release Notes"
+msgstr "Annutazioni di versione"
+
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
+#, c-format
+msgid "%ddB"
+msgstr "%d dB"
+
+#: src/audiohandler.c:726
+msgid "Quality: "
+msgstr "Qualità : "
+
+#: src/audiohandler.c:733
+#, c-format
+msgid "Bitrate: %dkbps\n"
+msgstr "Flussu binariu : %dkbps\n"
+
+#: src/audiohandler.c:745
+#, c-format
+msgid "%.4gkHz"
+msgstr "%.4g kHz"
+
+#: src/audiohandler.c:760
+#, c-format
+msgid "%d - %s (%.4gkHz)"
+msgstr "%d - %s (%.4g kHz)"
+
+#: src/audiohandler.c:765
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "Flussu binariu : %.4gkbps"
+
+#: src/audiohandler.c:771
+msgid "Passthrough"
+msgstr "Ricopia"
+
+#: src/audiohandler.c:780
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+"%sGuadagnu : %s\n"
+"DRC : %s\n"
+"Nome di a traccia : %s"
+
+#: src/audiohandler.c:785
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s"
+msgstr ""
+"%sGuadagnu : %s\n"
+"DRC : %s"
+
+#: src/audiohandler.c:1746
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+"Aghjunghje un cudificatore audio.\n"
+"Ogni traccia di fonte selezziunata serà cudificata cù tutti i cudificatori selezziunati."
+
+#: src/audiohandler.c:1826
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+"Qualità audio : Per i cudificatori chì l’accettanu, què permette "
+"d’accumudà a qualità di l’esciuta."
+
+#: src/audiohandler.c:1946
+msgid "Remove this audio encoder"
+msgstr "Caccià stu cudificatore audio"
+
+#: src/callbacks.c:793 src/callbacks.c:2144
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "L’esce d’HandBrake pianterà sta cudificazione.\n"
+
+#: src/callbacks.c:1378
+msgid "Not Selected"
+msgstr "Micca selezziunatu"
+
+#. This needs to be in scanning and working since scanning
+#. happens fast enough that it can be missed
+#: src/callbacks.c:1711 src/callbacks.c:4182
+msgid "Scanning ..."
+msgstr "Esplurazione…"
+
+#: src/callbacks.c:1747 src/callbacks.c:1748
+msgid "Stop Scan"
+msgstr "Piantà l’esplurazione"
+
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
+msgid "No Title Found"
+msgstr "Nisunu titulu trovu"
+
+#: src/callbacks.c:2736
+msgid "New Video"
+msgstr "Nova video"
+
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+"%s\n"
+"\n"
+"%s in %d seconde…"
+
+#: src/callbacks.c:3666 src/callbacks.c:3708
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+"%sU vostru filmu serà persu s’è vo ùn cuntinuate micca a cudificazione."
+
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
+msgid "Cancel Current and Stop"
+msgstr "Abbandunà l’attuale è piantà"
+
+#: src/callbacks.c:3670
+msgid "Cancel Current, Start Next"
+msgstr "Abbandunà l’attuale, principià u seguente"
+
+#: src/callbacks.c:3671
+msgid "Finish Current, then Stop"
+msgstr "Compie l’attuale eppò piantà"
+
+#: src/callbacks.c:3672 src/callbacks.c:3712
+msgid "Continue Encoding"
+msgstr "Cuntinuà a cudificazione"
+
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr "%d cudificazione in attesa"
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d cudificazioni in attesa"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
+#, c-format
+msgid "job %d of %d, "
+msgstr "travagliu %d nant’à %d, "
+
+#: src/callbacks.c:3961
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr "passu %d (analisa di i sottutituli) nant’à %d, "
+
+#: src/callbacks.c:3966
+#, c-format
+msgid "pass %d of %d, "
+msgstr "passu %d nant’à %d, "
+
+#: src/callbacks.c:3979
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+"Cudificazione : %s%s%.2f %% (%.2f fps, mez. %.2f fps, tras. %02dh%02dm%02ds)"
+
+#: src/callbacks.c:3989 src/callbacks.c:4029
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr "Cudificazione : %s%s%.2f %% (tras. %02dh%02dm%02ds)"
+
+#: src/callbacks.c:3999 src/callbacks.c:4038
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr "Cudificazione : %s%s%.2f %%"
+
+#: src/callbacks.c:4025
+msgid "Searching for start time, "
+msgstr "Ricerca di l’ora di principiu, "
+
+#: src/callbacks.c:4100
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr "Esplurazione di u titulu %d nant’à %d…"
+
+#: src/callbacks.c:4104
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr "Esplurazione di u titulu %d nant’à %d fighjulata %d…"
+
+#: src/callbacks.c:4193
+msgid "Paused"
+msgstr "In pausa"
+
+#: src/callbacks.c:4224
+msgid "Encode Done!"
+msgstr "Cudificazione compia !"
+
+#: src/callbacks.c:4228
+msgid "Encode Canceled."
+msgstr "Cudificazione abbandunata."
+
+#: src/callbacks.c:4233
+msgid "Encode Failed."
+msgstr "Cudificazione fiasca."
+
+#: src/callbacks.c:4275
+msgid "Muxing: This may take a while..."
+msgstr "Mischiu multiple : Què pò piglià qualchì tempu…"
+
+#: src/callbacks.c:4877
+msgid "Scan this DVD source"
+msgstr "Analizà sta fonte di DVD"
+
+#: src/callbacks.c:5265
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "HandBrake %s/%s hè dispunibule avà (avete %s/%d)."
+
+#: src/callbacks.c:5446
+msgid "Encode Complete"
+msgstr "Cudificazione compia"
+
+#: src/callbacks.c:5448
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr "Punite stu bichjeru ; A vostra fila d’attesa HandBrake hè compia !"
+
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
+msgid "Your encode is complete."
+msgstr "A vostra cudificazione hè compia."
+
+#: src/callbacks.c:5462
+msgid "Shutting down the computer"
+msgstr "Piantata di l’urdinatore"
+
+#: src/callbacks.c:5472
+msgid "Putting computer to sleep"
+msgstr "Messa in veghja di l’urdinatore"
+
+#: src/callbacks.c:5480
+msgid "Quitting Handbrake"
+msgstr "Esciuta d’Handbrake"
+
+#: src/hb-backend.c:60 src/hb-backend.c:85
+msgid "First Track Matching Selected Languages"
+msgstr "Prima traccia chì currisponde à e lingue selezziunate"
+
+#: src/hb-backend.c:61 src/hb-backend.c:86
+msgid "All Tracks Matching Selected Languages"
+msgstr "Tutte e traccie chì currispondenu à e lingue selezziunate"
+
+#: src/hb-backend.c:72
+msgid "Foreign Audio Subtitle Track"
+msgstr "Traccia di sottutitulu audio straniera"
+
+#: src/hb-backend.c:73
+msgid "First Selected Track"
+msgstr "Prima traccia selezziunata"
+
+#: src/hb-backend.c:74
+msgid "Foreign Audio, then First Selected Track"
+msgstr "Traccia audio straniera eppò a prima traccia selezziunata"
+
+#: src/hb-backend.c:96
+msgid "Chapters:"
+msgstr "Capituli :"
+
+#: src/hb-backend.c:97
+msgid "Seconds:"
+msgstr "Seconde :"
+
+#: src/hb-backend.c:98
+msgid "Frames:"
+msgstr "Fiure :"
+
+#: src/hb-backend.c:108
+msgid "Do Nothing"
+msgstr "Ùn fà nunda"
+
+#: src/hb-backend.c:109
+msgid "Show Notification"
+msgstr "Affissà a nutificazione"
+
+#: src/hb-backend.c:110
+msgid "Quit Handbrake"
+msgstr "Esce d’Handbrake"
+
+#: src/hb-backend.c:111
+msgid "Put Computer To Sleep"
+msgstr "Mette l’urdinatore in veghja"
+
+#: src/hb-backend.c:112
+msgid "Shutdown Computer"
+msgstr "Spenghje l’urdinatore"
+
+#: src/hb-backend.c:123 src/hb-backend.c:252
+msgid "Automatic"
+msgstr "Autumaticu"
+
+#: src/hb-backend.c:124
+msgid "Loose"
+msgstr "Flessibile"
+
+#: src/hb-backend.c:125 src/hb-backend.c:337
+msgid "Custom"
+msgstr "Persunalizatu"
+
+#: src/hb-backend.c:161
+msgid "Week"
+msgstr "Settimana"
+
+#: src/hb-backend.c:162
+msgid "Month"
+msgstr "Mese"
+
+#: src/hb-backend.c:163
+msgid "Year"
+msgstr "Annu"
+
+#: src/hb-backend.c:164
+msgid "Immortal"
+msgstr "Ab eternu"
+
+#: src/hb-backend.c:174
+msgid "Never"
+msgstr "Mai"
+
+#: src/hb-backend.c:175
+msgid "Daily"
+msgstr "Ghjurnalieru"
+
+#: src/hb-backend.c:176
+msgid "Weekly"
+msgstr "Settimanale"
+
+#: src/hb-backend.c:177
+msgid "Monthly"
+msgstr "Misincu"
+
+#: src/hb-backend.c:201
+msgid "Decomb"
+msgstr "Dipettinera"
+
+#: src/hb-backend.c:202
+msgid "Yadif"
+msgstr "Yadif"
+
+#: src/hb-backend.c:213
+msgid "NLMeans"
+msgstr "NLMeans"
+
+#: src/hb-backend.c:214
+msgid "HQDN3D"
+msgstr "HQDN3D"
+
+#: src/hb-backend.c:225
+msgid "Unsharp"
+msgstr "Unsharp"
+
+#: src/hb-backend.c:226
+msgid "Lapsharp"
+msgstr "Lapsharp"
+
+#: src/hb-backend.c:237
+msgid "90 Degrees"
+msgstr "90 Gradi"
+
+#: src/hb-backend.c:238
+msgid "180 Degrees"
+msgstr "180 Gradi"
+
+#: src/hb-backend.c:239
+msgid "270 Degrees"
+msgstr "270 Gradi"
+
+#: src/hb-backend.c:250
+msgid "Spatial"
+msgstr "Spaciale"
+
+#: src/hb-backend.c:251
+msgid "Temporal"
+msgstr "Tempurale"
+
+#: src/hb-backend.c:263
+msgid "Fast"
+msgstr "Rapidu"
+
+#: src/hb-backend.c:264
+msgid "Optimal"
+msgstr "Ottimale"
+
+#: src/hb-backend.c:275
+msgid "Strict"
+msgstr "Severu"
+
+#: src/hb-backend.c:276
+msgid "Normal"
+msgstr "Nurmale"
+
+#: src/hb-backend.c:287
+msgid "Simple"
+msgstr "Simplice"
+
+#: src/hb-backend.c:288
+msgid "Smart"
+msgstr "Astutu"
+
+#: src/hb-backend.c:298
+msgid "Diamond"
+msgstr "Lusanga"
+
+#: src/hb-backend.c:299
+msgid "Hexagon"
+msgstr "Esagunu"
+
+#: src/hb-backend.c:300
+msgid "Uneven Multi-Hexagon"
+msgstr "Esaguni mutiple disuguali"
+
+#: src/hb-backend.c:301
+msgid "Exhaustive"
+msgstr "Cumpletu"
+
+#: src/hb-backend.c:302
+msgid "Hadamard Exhaustive"
+msgstr "Hadamard cumpletu"
+
+#: src/hb-backend.c:312
+msgid "0: SAD, no subpel"
+msgstr "0: SAD, nisunu subpel"
+
+#: src/hb-backend.c:313
+msgid "1: SAD, qpel"
+msgstr "1: SAD, qpel"
+
+#: src/hb-backend.c:314
+msgid "2: SATD, qpel"
+msgstr "2: SATD, qpel"
+
+#: src/hb-backend.c:315
+msgid "3: SATD: multi-qpel"
+msgstr "3: SATD: multi-qpel"
+
+#: src/hb-backend.c:316
+msgid "4: SATD, qpel on all"
+msgstr "4: SATD, qpel per tutti"
+
+#: src/hb-backend.c:317
+msgid "5: SATD, multi-qpel on all"
+msgstr "5: SATD, multi-qpel per tutti"
+
+#: src/hb-backend.c:318
+msgid "6: RD in I/P-frames"
+msgstr "6: RD in e sequenze I/P"
+
+#: src/hb-backend.c:319
+msgid "7: RD in all frames"
+msgstr "7: RD in tutte e sequenze"
+
+#: src/hb-backend.c:320
+msgid "8: RD refine in I/P-frames"
+msgstr "8: RD refine in e sequenze I/P"
+
+#: src/hb-backend.c:321
+msgid "9: RD refine in all frames"
+msgstr "9: RD refine in tutte e sequenze"
+
+#: src/hb-backend.c:322
+msgid "10: QPRD in all frames"
+msgstr "10: QPRD in tutte e sequenze"
+
+#: src/hb-backend.c:323
+msgid "11: No early terminations in analysis"
+msgstr "11: Nisuna fine primaticcia in l’analisa"
+
+#: src/hb-backend.c:333
+msgid "Most"
+msgstr "A maiò parte"
+
+#: src/hb-backend.c:335
+msgid "Some"
+msgstr "Certi"
+
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Tuttu"
+
+#: src/hb-backend.c:348
+msgid "Encode only"
+msgstr "Cudificazione solu"
+
+#: src/hb-backend.c:349
+msgid "Always"
+msgstr "Sempre"
+
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
+msgid "Same as source"
+msgstr "Listessa chì a fonte"
+
+#: src/hb-backend.c:1499
+msgid "(NTSC Film)"
+msgstr "(Filmu NTSC)"
+
+#: src/hb-backend.c:1503
+msgid "(PAL Film/Video)"
+msgstr "(Filmu/Video PAL)"
+
+#: src/hb-backend.c:1507
+msgid "(NTSC Video)"
+msgstr "(Video NTSC)"
+
+#: src/hb-backend.c:2074
+#, c-format
+msgid "%s - (%05d.MPLS)"
+msgstr "%s - (%05d.MPLS)"
+
+#: src/hb-backend.c:2224
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - %s"
+msgstr "%3d - %02dh%02dm%02ds - %s"
+
+#: src/hb-backend.c:2243
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+
+#: src/hb-backend.c:2249
+#, c-format
+msgid "%3d - (%05d.MPLS)"
+msgstr "%3d - (%05d.MPLS)"
+
+#: src/hb-backend.c:2255
+#, c-format
+msgid "%3d - %02dh%02dm%02ds"
+msgstr "%3d - %02dh%02dm%02ds"
+
+#: src/hb-backend.c:2289
+msgid "No Titles"
+msgstr "Nisunu titulu"
+
+#. No audio. set some default
+#: src/hb-backend.c:2574
+msgid "No Audio"
+msgstr "Nisunu audio"
+
+#: src/hb-backend.c:4170
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule di detelesinema :\n"
+"\n"
+"Prerigatura :\t%s\n"
+"Persunaliz. :\t%s\n"
+
+#: src/hb-backend.c:4177
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule di detelesinema :\n"
+"\n"
+"Prerigatura :\t%s\n"
+
+#: src/hb-backend.c:4203
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule d’abbentata di pettinera :\n"
+"\n"
+"Prerigatura :\t%s\n"
+"Persunaliz. :\t%s\n"
+
+#: src/hb-backend.c:4210
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule d’abbentata di pettinera :\n"
+"\n"
+"Prerigatura :\t%s\n"
+
+#: src/hb-backend.c:4239
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule di disintricciamentu :\n"
+"\n"
+"Filtru :\t%s\n"
+"Prerigatura :\t%s\n"
+"Persunaliz. :\t%s\n"
+
+#: src/hb-backend.c:4248
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule di disintricciamentu :\n"
+"\n"
+"Filtru :\t%s\n"
+"Prerigatura :\t%s\n"
+
+#: src/hb-backend.c:4277
+#, c-format
+msgid ""
+"Invalid Denoise Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule di riduzzione di trostu :\n"
+"\n"
+"Filtru :\t%s\n"
+"Prerigatura :\t%s\n"
+"Rigatura :\t%s\n"
+"Persunaliz. :\t%s\n"
+
+#: src/hb-backend.c:4305
+#, c-format
+msgid ""
+"Invalid Sharpen Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"Preferenze inaccettevule d’arrutata :\n"
+"\n"
+"Filtru :\t%s\n"
+"Prerigatura :\t%s\n"
+"Rigatura :\t%s\n"
+"Persunaliz. :\t%s\n"
+
+#: src/hb-backend.c:4339
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+"Theora ùn hè micca accettatu in i cuntenenti MP4.\n"
+"\n"
+"Ci vuleria à sceglie un altru cudecu video o un cuntenente sfarente.\n"
+"S’è vo cuntinuate, FFMPEG serà sceltu per voi."
+
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"Solu VP8 o VP9 hè accettatu in u cuntenente WebM.\n"
+"\n"
+"Ci vuleria à sceglie un altru cudecu video o un cuntenente sfarente.\n"
+"S’è vo cuntinuate, unu serà sceltu per voi."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr "Cuntinuà"
+
+#. No valid title, stop right there
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
+msgid "No title found.\n"
+msgstr "Nisunu titulu trovu.\n"
+
+#: src/hb-backend.c:4411
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"Solu un sottutitulu pò esse intarsiatu in a video.\n"
+"\n"
+"Ci vuleria à cambià e vostre selezzione di sottutituli.\n"
+"S’è vo cuntinuate, certi sottutituli seranu persi."
+
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"WebM in HandBrake accetta solu i sottutituli intarsiati.\n"
+"\n"
+"Ci vuleria à cambià e vostre selezzione di sottutituli.\n"
+"S’è vo cuntinuate, certi sottutituli seranu persi."
+
+#: src/hb-backend.c:4451
+msgid ""
+"SRT file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+"U schedariu SRT ùn esiste micca o ùn hè micca nurmale.\n"
+"\n"
+"Ci vuleria à sceglie un schedariu accettevule.\n"
+"S’è vo cuntinuate, stu sottutitulu serà ignuratu."
+
+#: src/hb-backend.c:4512
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"A fonte ùn acceta micca a ricopia.\n"
+"\n"
+"Ci vuleria à sceglie un cudecu audio sfarente.\n"
+"S’è vo cuntinuate, unu serà sceltu per voi."
+
+#: src/hb-backend.c:4567
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"%s ùn hè micca accettatu in u cuntenente %s.\n"
+"\n"
+"Ci vuleria à sceglie un cudecu audio sfarente.\n"
+"S’è vo cuntinuate, unu serà sceltu per voi."
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Impussibule di creà %s.</big>\n"
+"\n"
+"Sbagliu internu. Ùn si pò micca determinà a discrizzione di l’interfaccia di l’utilizatore.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Infurmazione di a traccia"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Nome di a prerigatura"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "L’apparechju o u schedariu à cudificà"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "I valori di prerigatura à impiegà per a cudificazione"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Troppu di « spam »"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "U chjassu per supranà u cartulare di cunfigurazione di l’utilizatore"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Apre una cunsola per i risultati di spannatura"
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr ""
+"ghb_presets_menu_init : Impussibule di truvà u cartulare di e prerigature."
+
+#: src/presets.c:1388
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+"Impussibule di truvà u cartulare « genitore » quandu s’aghjunghje un "
+"« zitellu »."
+
+#: src/presets.c:1848
+msgid ""
+"Presets found are newer than what is supported by this version of HandBrake!\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+"E prerigature truve sò più recente chì quelle chì sò accettate da sta versione di HandBrake !\n"
+"\n"
+"Vulete cuntinuà ?"
+
+#: src/presets.c:1851
+msgid "Get me out of here!"
+msgstr "Lasciatemi scappà !"
+
+#: src/presets.c:1851
+msgid "Load backup presets"
+msgstr "Caricà e prerigature di salvaguardia"
+
+#: src/presets.c:1997
+msgid "All (*)"
+msgstr "Tutti (*)"
+
+#: src/presets.c:2002
+msgid "Presets (*.json)"
+msgstr "Prerigature (*.json)"
+
+#: src/presets.c:2008
+msgid "Legacy Presets (*.plist)"
+msgstr "Prerigature anziane (*.plist)"
+
+#: src/presets.c:2104
+msgid "Export Preset"
+msgstr "Espurtà a prerigatura"
+
+#: src/presets.c:2445
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+"Cunfirmà a squassatura di %s:\n"
+"\n"
+"%s"
+
+#: src/presets.c:2446
+msgid "folder"
+msgstr "cartulare"
+
+#: src/presets.c:2446
+msgid "preset"
+msgstr "prerigatura"
+
+#: src/preview.c:487
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+"Modulu d’estensione GStreamer mancante\n"
+"Audio o video puderianu ùn esse micca letti cum’è previstu\n"
+"\n"
+"%s"
+
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr "%s (mudificatu)"
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Aliniamentu A/V"
+
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
+
+#: src/queuehandler.c:327
+#, c-format
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d Runzicatura\n"
+"%dx%d Allucamentu, %dx%d Affissera\n"
+"%d:%d Prupurzioni di pixel\n"
+"%s Prupurzioni d’affissera"
+
+#: src/queuehandler.c:358
+#, c-format
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Flussu binariu %dkbps"
+
+#: src/queuehandler.c:363
+#, c-format
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Flussu binariu %dkbps (2 passi)"
+
+#: src/queuehandler.c:370
+#, c-format
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Qualità custente %.4g(%s)"
+
+#: src/queuehandler.c:403
+#, c-format
+msgid "%sPreset %s"
+msgstr "%sPrerigatura %s"
+
+#: src/queuehandler.c:408
+#, c-format
+msgid "%sTune %s"
+msgstr "%sRigatura %s"
+
+#: src/queuehandler.c:413
+#, c-format
+msgid "%sProfile %s"
+msgstr "%sPrufilu %s"
+
+#: src/queuehandler.c:418
+#, c-format
+msgid "%sLevel %s"
+msgstr "%sLivellu %s"
+
+#: src/queuehandler.c:435
+#, c-format
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Frequenza di fiure custente %s fps"
+
+#: src/queuehandler.c:439
+#, c-format
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"Frequenza di fiure di cresta %s fps (forse più bassa)"
+
+#: src/queuehandler.c:444
+#, c-format
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Frequenza di fiure variabile %s fps"
+
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", sfurzatu solu"
+
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", Intarsiatu"
+
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", predefinitu"
+
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Compiu"
+
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Abbandunatu"
+
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Fiascu"
+
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "In attesa"
+
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
+#, c-format
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d ghjornu %02d:%02d:%02d"
+
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
+#, c-format
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d ghjorni %02d:%02d:%02d"
+
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "o"
+
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "Ko"
+
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "Mo"
+
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "Go"
+
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Indispunibule"
+
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Ricerca di traccia audio straniera"
+
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Cudificà"
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Primu passu di cudificazione (analisa)"
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Secondu passu di cudificazione (finale)"
+
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Sbagliu"
+
+#: src/queuehandler.c:1177
+#, c-format
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"passu %d nant’à %d\n"
+"%s"
+
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Esplurazione di titulu"
+
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Cudificazione interrotta"
+
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Cudificazione in corsu"
+
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Scunnisciutu"
+
+#: src/queuehandler.c:1770
+#, c-format
+msgid ""
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
+"Destination: %s\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+"%sU sistema di schedariu di destinazione hè guasi pienu : %<PRId64> Mo liberu.\n"
+"Destinazione : %s\n"
+"A cudificazione pò esse incumpleta s’è vo fate què.\n"
+
+#: src/queuehandler.c:1775
+msgid "Resume, I've fixed the problem"
+msgstr "Ripiglià, aghju currettu u penseru"
+
+#: src/queuehandler.c:1776
+msgid "Resume, Don't tell me again"
+msgstr "Ripiglià, ùn ditemilu più"
+
+#: src/queuehandler.c:1830
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+"Destinazione  %s\n"
+"\n"
+"Un altru travagliu in fila d’attesa hà impiegatu a listessa destinazione.\n"
+"Vulete rimpiazzallu ?"
+
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
+msgid "Overwrite"
+msgstr "Rimpiazzà"
+
+#: src/queuehandler.c:1848
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+"Destinazione : %s\n"
+"\n"
+"Què ùn hè micca un cartulare accettevule."
+
+#: src/queuehandler.c:1862
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+"Destinazione : %s\n"
+"\n"
+"Ùn si pò micca leghje o scrive in stu cartulare."
+
+#: src/queuehandler.c:1876
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+"Destinazione  %s\n"
+"\n"
+"U schedariu esiste dighjà.\n"
+"Vulete rimpiazzallu ?"
+
+#: src/queuehandler.c:2189
+msgid "Select this title for adding to the queue.\n"
+msgstr "Selezziunà stu titulu per aghjunghjelu à a fila d’attesa.\n"
+
+#. Title label
+#: src/queuehandler.c:2197
+msgid "No Title"
+msgstr "Nisunu titulu"
+
+#: src/queuehandler.c:2207
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+"Ci hè un altru titulu cù u listessu nome di schedariu di destinazione.\n"
+"Stu titulu ùn serà micca aghjuntu à a fila d’attesa for chè vo\n"
+"cambiate u nome di schedariu d’esciuta.\n"
+
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
+msgid "Stop"
+msgstr "Piantà"
+
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
+msgid "Stop Encoding"
+msgstr "Piantà a cudificazione"
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "_Piantà a cudificazione"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
+msgstr "Ripiglià"
+
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
+msgstr "Ripiglià a cudificazione"
+
+#: src/queuehandler.c:2434
+msgid "_Resume Encoding"
+msgstr "_Ripiglià a cudificazione"
+
+#: src/queuehandler.c:3065
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+"Una cudificazione hè in corsu. Chì vulete fa ?\n"
+"\n"
+
+#: src/subtitlehandler.c:1379
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "Lingua preferita : %s"
+
+#: src/subtitlehandler.c:1393
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+"Aghjunghje a traccia di sottutitulu %s s’è l’audio predefinitu ùn hè micca "
+"%s"
+
+#: src/subtitlehandler.c:1398
+msgid "Add subtitle track if default audio is not your preferred language"
+msgstr ""
+"Aghjunghje a traccia di sottutitulu s’è l’audio predefinitu ùn hè micca a "
+"vostra lingua preferita"
+
+#: src/videohandler.c:202
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+"%s\n"
+"\n"
+"Ozzioni spiegate :\n"
+"« %s »"
+
+#: src/videohandler.c:205
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+"%s\n"
+"\n"
+"Ozzioni spiegate :\n"
+"\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Avertimentu : senza perdita)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/de.po -> HandBrake-1.5.1.tar.xz/gtk/po/de.po Changed

@@ -1,20 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Nomis101 <Nomis101@web.de>, 2019
-# Bernhard Rader <b.rader@gmx.at> 2018
+# Nomis101 <Nomis101@web.de>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Nomis101 <Nomis101@web.de>, 2019\n"
+"Last-Translator: Nomis101 <Nomis101@web.de>, 2021\n"
 "Language-Team: German (https://www.transifex.com/HandBrakeProject/teams/92423/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +21,7 @@
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +30,11 @@
 "Den Untertitel über dem Video rendern.\n"
 "Der Untertitel wird Teil des Videos und kann nicht deaktiviert werden."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Eingebrannt"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -51,11 +50,11 @@
 "Dies ist nützlich, um eine „erzwungene“ Spur in der Ausgabe\n"
 "zu erzeugen."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -71,11 +70,11 @@
 "in Szenen verwendet, in denen eine\n"
 "fremde Sprache gesprochen wird."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Nur erzwungene"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -91,11 +90,11 @@
 "nicht mit dem Video synchron.\n"
 "Mit dieser Einstellung kann dies korrigiert werden."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT-Versatz"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -119,55 +118,235 @@
 "Sprache gesprochen wird. Diese Option ist in\n"
 "Verbindung mit der „erzwungen“ Option empfehlenswert."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Spur"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Pfad der Quelle öffnen"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Ausgabeverzeichnis öffnen"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Verzeichnis des Encodierlogs öffnen"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Encodierlog öffnen"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Fehlgeschlagene Aufgaben zurücksetzen"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Alle Aufgaben zurücksetzen"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Fertiggestellte Aufgaben bereinigen"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Alle Aufgaben bereinigen"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Warteschlange importieren"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Warteschlange exportieren"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "HandBrake-Voreinstellungen"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "Voreinstellungen"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Setze Standard"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Speichern _als"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Löschen"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importieren"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exportieren"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "Offizielle _Voreinstellungen zurücksetzen"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Liste der Voreinstellungen"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "HandBrake-Warteschlange"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Warteschlange"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 Aufgaben anstehend"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Encodierung starten"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Start"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Encodierung pausieren"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pause"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Einstellungen"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Wenn fertig:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Zurücksetzen"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Markiere den ausgewählten Warteschlangeneintrag als bevorstehend.\n"
+"Setzt die Warteschlangenaufgabe als bevorstehend und bereit zum Neustart zurück."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Aktionen"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Voreinstellung:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Quelle:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Ausgabe:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Bildgröße:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Untertitel:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Übersicht"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Durchgang:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Startzeit:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Endzeit:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Angehalten:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Encodierung:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Dateigröße:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistik"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Aktivitätsprotokoll"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "HandBrake Aktivitätsprotokoll"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Über HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -175,202 +354,197 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake ist ein GPL lizenzierter, multiplattform, multithreaded "
 "Videotranscoder."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"Copyright (C) 2003–2019 Das HandBrake-TeamDieses Programm ist freie Software; es kann unter den Bedingungen der GNU General Public License, wie sie von der Free Software Foundation veröffentlicht wurde, weitergeben und/oder verändert werden; entweder Version 2 der Lizenz oder (nach eigener Wahl) jede spätere Version. \n"
-"Dieses Programm wird in der Hoffnung verteilt, dass es nützlich sein wird, aber OHNE JEGLICHE GEWÄHRLEISTUNG; auch ohne die stillschweigende Gewährleistung der MARKTREIFE oder Tauglichkeit für einen bestimmten Zweck. Weitere Informationen finden Sie in der GNU General Public License.\n"
-"\n"
-"Sie sollten eine Kopie der GNU General Public License zusammen mit diesem Programm erhalten haben; wenn nicht, schreiben Sie an die Free SoftwareFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Dieses Programm ist freie Software; es kann unter\n"
+"den Bedingungen der GNU General Public License, wie sie von\n"
+"der Free Software Foundation veröffentlicht wurde, weitergeben\n"
+"und/oder verändert werden; entweder Version 2 der Lizenz oder\n"
+"(nach eigener Wahl) jede spätere Version. \n"
+"\n"
+"Dieses Programm wird in der Hoffnung verteilt, dass es nützlich\n"
+"sein wird, aber OHNE JEGLICHE GEWÄHRLEISTUNG; auch ohne\n"
+"die stillschweigende Gewährleistung der MARKTREIFE oder\n"
+"Tauglichkeit für einen bestimmten Zweck. Weitere Informationen\n"
+"finden Sie in der GNU General Public License. \n"
+"\n"
+"Sie sollten eine Kopie der GNU General Public License\n"
+"zusammen mit diesem Programm erhalten haben; wenn\n"
+"nicht, schreiben Sie an die Free SoftwareFoundation, Inc., 51\n"
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Datei"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Öffne _Quelldateien"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Öffne _Einzeldatei"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Speicherort _wählen"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Warteschlange"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Mehrere _Hinzufügen"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "Encoding _Starten"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "Encoding _Pausieren"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "Warteschlange speichern"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Warteschlangendatei laden"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Ansicht"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake für _Dummies"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Voreinstellungen _Liste"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Aktivitätsfenster"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Über"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guide"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Videoquelldatei auswählen"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Quelle öffnen"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Zur Warteschlange hinzufügen"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Zur Warteschlange hinzufügen"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Encodierung starten"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Start"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Encodierung pausieren"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Voreinstellungsfenster zeigen"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Voreinstellungen"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Vorschaufenster anzeigen"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Vorschau"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Warteschlange anzeigen"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Aktivitätsfenster zeigen"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Quelle:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Nichts"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Überprüfen …"
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -380,57 +554,57 @@
 "Standardmäßig wird der längste Titel ausgewählt.\n"
 "Dies ist oft der Feature-Titel einer DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Keine Titel"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Winkel:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "Wähle für DVD's mit mehreren Blickwinkeln den gewünschten aus."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Bereich:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Dauer des Titels zum encodieren. Kann in Kapitel, Sekunden oder Einzelbilder"
 " angegeben werden."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Das erste Kapitel zum Encodieren festlegen."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Das letzte Kapitel zum Encodieren festlegen."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Voreinstellung:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Voreinstellung auswählen"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Geändert"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Neu laden"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -438,27 +612,27 @@
 "Lade die Einstellungen für die aktuell ausgewählte Voreinstellung neu.\n"
 "Änderungen werden verworfen."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Neue Voreinstellung speichern"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Speichere die aktuellen Einstellungen in einer neuen Voreinstellung."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Format in das die Spuren gemultiplext werden."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Web-optimiert"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -466,11 +640,11 @@
 "Optimiert MP4 für den schrittweißen Download. \n"
 "Nach der Encodierung werden die Daten so umgeschrieben, dass ein direktes Abspielen übers Internet ermöglicht wird ohne den gesamten Film herunterladen zu müssen."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "A/V synchron"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -482,55 +656,51 @@
 "bei manchen defekten Abspielgeräten verbessern, die keine \n"
 "MP4-Bearbeitungslisten berücksichtigen."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G-Unterstützung"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Das von einigen älteren iPods benötigte iPod-Atom hinzufügen."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Dauer:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Spuren:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filter:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Größe:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Übersicht"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Automatisch beschneiden"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Automatisch schwarze Ränder im Video entfernen."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Freies Beschneiden"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -544,35 +714,35 @@
 "anstatt die genaue Anzahl zu beschneiden und dann\n"
 "das Bild zum richtigen Verhältnis zu skalieren."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Links beschneiden"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Oben beschneiden"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Unten beschneiden"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Rechts beschneiden"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Format beschneiden:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Beschneiden"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Optimal für Quelle"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -580,11 +750,11 @@
 "Wählt die optimale Auflösung falls aktiviert.\n"
 "Diese wird möglichst der Auflösung der Quelldatei angepasst."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Breite:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -592,11 +762,11 @@
 "Dies ist die Breite mit dem das Video gespeichert wird.\n"
 "Die Anzeigedimension variiert, falls das Pixel-Bildformat ungleich 1:1 ist."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Höhe:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -604,38 +774,39 @@
 "Dies ist die Höhe mit dem das Video gespeichert wird.\n"
 "Die Anzeigedimension variiert, falls das Pixel-Bildformat ungleich 1:1 ist."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamorph:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Anamorphischer Modus:\n"
+"Anamorpher Modi:\n"
 "<tt>\n"
-"Kein - Erzwingt das Bildformat von 1:1.\n"
-"Loose - Verwende ein Bildformat das möglichst\n"
-" nahe dem der Quelldatei ist und das originale\n"
-" Bildformat der Anzeige beibehält.\n"
-"Automatisch - Verwende ein Bildformat welches die\n"
-" Auflösung maximiert und dabei das originale\n"
-" Bildformat der Anzeige beibehält.</tt>"
+"Keine - Pixel-Seitenverhältnis auf 1:1 erzwingen.\n"
+"Loose - Verwenden Sie ein Pixel-Seitenverhältnis, \n"
+"das dem Pixel-Seitenverhältnis des Quellvideos so \n"
+"nahe wie möglich kommt, wobei das ursprüngliche \n"
+"Anzeige-Seitenverhältnis erhalten bleibt\n"
+"Automatisch - Verwenden Sie ein Pixel-Seitenverhältnis, das die\n"
+"Speicherauflösung unter Beibehaltung des ursprünglichen\n"
+"Anzeige-Seitenverhältnis</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Ausrichtung:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -647,20 +818,20 @@
 "Diese Einstellung ist nur wichtig für die Kompatibilität zu bestimmten\n"
 "Geräten. Es sollte 2 verwendet werden, es sei denn, es gibt Kompatibilitätsprobleme."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Geometrie"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Bildformat erhalten"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr "Falls aktiviert, wird das Bildformat der Quelldatei beibehalten."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -668,11 +839,11 @@
 "Dies ist die Bildschirmbreite. Sie ist das Resultat der Skalierung der "
 "Dimensionen mit dem Seitenverhältnis."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Pixel-Bildformat:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -684,11 +855,11 @@
 "Ein 1:1-Verhältnis definiert einen quadratischen Pixel. Andere Werte definieren rechteckige.\n"
 "Abspieler skalieren dann wieder das Bild um den spezifizierten Wert zu erreichen."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -698,27 +869,27 @@
 "Ein 1:1-Verhältnis definiert einen quadratischen Pixel. Andere Werte definieren rechteckige.\n"
 "Abspieler skalieren dann wieder das Bild um den spezifizierten Wert zu erreichen."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Bildformat:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Bildschirmgeometrie"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensionen"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Detelecine:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -728,7 +899,7 @@
 "\n"
 "Telecining ist ein Prozess um Filme mit einer Bildfrequenz von 24 BpS in NTSC mit einer Bildfrequenz von 30 BpS zu konvertieren."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -738,11 +909,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Interlace-Erkennung:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -753,7 +924,7 @@
 "\n"
 "Falls ein Deinterlace-Filter aktiviert ist, werden nur Einzelbilder die von diesem Filter als Interlaced erkannt werden deinterlaced."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -765,11 +936,11 @@
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Deinterlace:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -781,11 +952,11 @@
 "Der Decomb-Filter unterstützt eine Vielzahl an Interpolationsalgorithmen.\n"
 "Der Deinterlace-Filter ist ein klassischer YADIF-Deinterlacer.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Deinterlace-Voreinstellung:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -797,11 +968,11 @@
 "Der Decomb-Filter unterstützt eine Vielzahl an Interpolationsalgorithmen.\n"
 "Der Deinterlace-Filter ist ein klassischer YADIF-Deinterlacer.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Deblock-Filter:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -809,11 +980,25 @@
 "Der Deblockfilter entfernt die bekannte Form der Kompressionsartefakte.\n"
 "Wenn die Quelle Blockartefakte zeigt, könnte der Filter hilfreich sein."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Deblock-Einstellungen:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Benutzerdefiniertes Deblock-Filter Stringformat\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Entrauschfilter:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -823,15 +1008,15 @@
 "Filmkrisel und andere Formen von hochfrequentem Rauschen sind schwer zu komprimieren.\n"
 "Durch Benutzung dieses Filters auf solche Quellen, können die resultierenden Dateien kleiner werden."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Entrauschvoreinstellung:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Entrauschabstimmung:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -841,11 +1026,11 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Schärfefilter:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -853,47 +1038,47 @@
 "Schärfefilter hebt Kanten und andere \n"
 "hochfrequente Komponenten im Video hervor."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Schärfe-Voreinstellung:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Schärfeabstimmung:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Rotationsfilter:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Rotiere das Video im Uhrzeigersinn in 90 Grad-Schritten."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Graustufen"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Filtert Farbkomponenten aus dem Video, falls aktiviert."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filter"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Videoencoder:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Verfügbare Videoencoder."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Bildfrequenz:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -906,19 +1091,19 @@
 "„Wie die Quelle“ ist empfohlen. Falls das Quellvideo eine\n"
 "variable Bildfrequenz hat, wird diese Einstellung diese beibehalten."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Konstante Bildfrequenz:"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Aktiviert eine konstante Bildfrequenz der Ausgabe"
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Maximale Bildfrequenz (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -930,11 +1115,11 @@
 "\n"
 "VFR ist nicht kompatibel mit manchen Abspielern."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Variable Bildfrequenz:"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -943,7 +1128,7 @@
 "Aktiviert variable Bildfrequenz.\n"
 "VFR ist mit manchen Abspielern nicht kompatibel."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -971,15 +1156,15 @@
 "FFmpeg's und Theora's Skalen sind eher linear.\n"
 "Diese Encoder haben keinen verlustfreien Modus."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Konstante Qualität:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Bitrate (kbps):"
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -992,11 +1177,11 @@
 "Die Durchschnittsrate über einen langen Zeitraum kann jedoch hier gesetzt werden.\n"
 "Falls die Bitrate unbedingt eingehalten werden muss, kann x264's vbv-bufsize und vbv-maxrate verwendet werden."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Encodierung in zwei Durchgängen"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1009,11 +1194,11 @@
 "Die Bitrate muss hierfür angegeben werden. Im ersten Durchgang werden Statistiken über das Video erhoben. \n"
 "Im zweiten Durchgang werden diese Statistiken verwendet, um Entscheidungen über die Zuweisungen der Bitrate zu treffen."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Ersten Durchgang beschleunigen"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1021,43 +1206,27 @@
 "Verwende während des ersten Durchgangs einer Encodierung in zwei Durchgängen"
 " Einstellungen um die Verarbeitung zu beschleunigen. "
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Verwende Erweiterte Optionen"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Verwende das Erweiterte Optionen Tab für x264-Einstellungen.\n"
-"Verwendung auf eigene Gefahr!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Voreinstellung:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"Verändert die Kodierereinstellungen zum Vorteil von der Kompressionseffizienz, ist aber langsamer.\n"
+"Passt die Encoder-Einstellungen an, um die Komprimierungseffizienz gegen die Codierungsgeschwindigkeit abzuwägen.\n"
 "\n"
-"Dies richtet den Enkodierer, Abstimmung, Profile, Level und erweiterten Optionen passend dazu ein.\n"
-"Diese Einstellung sollte so langsam wie möglich eingestellt werden.\n"
-"Langsamere Einstellungen sorgen für bessere Qualität oder kleinere Dateien."
+"Dies legt die Standard-Encoder-Einstellungen fest.\n"
+"Abstimmungen, Profile, Pegel und zusätzliche Optionszeichenfolgen werden hierauf angewendet.\n"
+"Sie sollten diese Option generell auf die langsamste Einstellung einstellen, die vertretbar ist, da langsamere\n"
+"Einstellungen zu einer besseren Qualität oder kleineren Dateien führen."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Abstimmung:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1069,11 +1238,11 @@
 "\n"
 "Dies kann die Kodierung effizenter machen oder für bessere Qualität sorgen. Diese Veränderungen werden nach den Voreinstellungen gemacht, aber vor allen anderen Parametern."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Schnelle Decodierung"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1082,11 +1251,11 @@
 "Die schnelle Decodierung benutzt Einstellungen um die Prozessorauslastung beim Abspielen des encodierten Videos zu reduzieren. \n"
 "Nützlich bei leistungsschwachen Abspielgeräten, bei denen das Video sonst nicht ruckelfrei läuft."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Keine Latenz"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1099,11 +1268,11 @@
 "Dies ist nützlich für die Übertragung von Livestreams.\n"
 "Da HandBrake jedoch nicht für Livestreams nützlich ist, bringt diese Einstellung wenig."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1113,11 +1282,11 @@
 "\n"
 "Überschreibt alle anderen Einstellungen."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Level:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1127,11 +1296,11 @@
 "\n"
 "Überschreibt alle anderen Einstellungen."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Mehr Einstellungen:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1141,56 +1310,45 @@
 "\n"
 "Liste von Kodiereroptionen, getrennt durch Doppelpunkte."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Spurliste"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Zeige Tonspuren der Ausgabe"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Spurauswahl"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Optionen zur Auswahl der Quellspur anzeigen"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Füge neue Audioeinstellungen der Liste hinzu"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Alle hinzufügen"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Füge alle Tonspuren der Liste hinzu"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Lade alle Audioeinstellungen vom Standard neu"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Spurliste"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Auswahlverhalten:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Wähle die zu verwendenen Tonspuren aus der Quelldatei aus."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1198,135 +1356,135 @@
 "Erstellen Sie eine Liste der Sprachen, für die Sie Audio auswählen möchten.\n"
 "Spuren, die diesen Sprachen entsprechen, werden mit dem gewählten Auswahlverhalten ausgewählt."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Verfügbare Sprachen"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Ausgewählte Sprachen"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Nur ersten Encoder für sekundäres Audio verwenden"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
-"Nur die erste Tonspur wird mit der vollen Liste der Optionen konvertiert.\n"
-"Die restlichen Tracks werden nur mit dem ersten Eintrag der Liste kodiert."
+"Nur die primäre Audiospur wird mit der vollständigen Encoderliste kodiert.\n"
+"Alle anderen sekundären Audioausgangsspuren werden nur mit dem ersten Encoder kodiert."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Automatisches Passthru:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät MP3 unterstützt.\n"
-"Dies erlaubt MP3-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät MP3 unterstützt.\n"
+"Dies ermöglicht die Auswahl von MP3-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät AAC unterstützt.\n"
-"Dies erlaubt AAC-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät AAC unterstützt.\n"
+"Dies ermöglicht die Auswahl von AAC-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät AC-3 unterstützt.\n"
-"Dies erlaubt AC-3-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät AC-3 unterstützt.\n"
+"Dies ermöglicht die Auswahl von AC-3-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät DTS unterstützt.\n"
-"Dies erlaubt DTS-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät DTS unterstützt.\n"
+"Dies ermöglicht die Auswahl von DTS-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät DTS-HD unterstützt.\n"
-"Dies erlaubt DTS-HD-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät DTS-HD unterstützt.\n"
+"Dies ermöglicht die Auswahl von DTS-HD-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät EAC-3 unterstützt.\n"
-"Dies erlaubt EAC-3-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät EAC-3 unterstützt.\n"
+"Dies ermöglicht die Auswahl von EAC-3-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät TrueHD unterstützt.\n"
-"Dies erlaubt TrueHD-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät TrueHD unterstützt.\n"
+"Dies ermöglicht die Auswahl von TrueHD-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Sollte aktiviert werden, falls das Gerät FLAC unterstützt.\n"
-"Dies erlaubt FLAC-Passthru wenn automatische Passthru-Auswahl aktiviert ist."
+"Aktivieren Sie dies, wenn das Wiedergabegerät FLAC unterstützt.\n"
+"Dies ermöglicht die Auswahl von FLAC-Passthru, wenn die automatische Passthru-Auswahl aktiviert ist."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Passthru-Fallback:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1334,78 +1492,79 @@
 "Setzt einen Audiocodec falls eine geeignete Audio Spur bei Audio-Passthru "
 "nicht gefunden wurde."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Audioencoder-Einstellungen:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Jede ausgewählte Quellspur wird mit allen ausgewählten Encodern kodiert."
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Encoder:"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Bitrate/Qualität"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Abmischung"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Abtastrate"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Verstärkung"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Spurauswahl"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Zeige Untertitelspuren der Ausgabe"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Füge neue Untertitel-Einstellungen der Liste hinzu"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Füge alle Untertitelspuren der Liste hinzu"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Fremdsprachentonsuche"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Füge einen Extra-Durchlauf zur Suche nach Untertiteln,\n"
-"welche Untertitel für Sequenzen in einer Fremdsprache enthält."
+"Fügen Sie der Codierung einen zusätzlichen Durchgang hinzu, der\n"
+"nach Untertitelkandidaten sucht, die Untertitel für\n"
+"Segmente des Tons, die in einer Fremdsprache sind, untertiteln."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Lade alle Untertiteleinstellungen von den Standardeinstellungen neu"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Wähle die zu verwendenden Untertitelspuren der Quelldatei aus"
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1419,46 +1578,46 @@
 "Die erste Sprache in dieser Liste ist Ihre „bevorzugte“ Sprache und wird verwendet\n"
 "zum Bestimmen der Einstellungen für die Untertitelauswahl bei Fremdsprachenton."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Bevorzugte Sprache: Keine"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Fremdsprachentonsuche hinzufügen"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Füge „Fremdsprachentonsuche“ ein, wenn die Standardspur die bevorzugte Sprache ist.\n"
-"Diese Suche sucht kurze fremdsprachige Sequenzen und fügt dort einen Untertitel ein.\n"
+"Fügt eine \"Fremdsprachentonsuche\" hinzu, wenn die Standard-Tonspur Ihre bevorzugte Sprache ist.\n"
+"Dieser Suchlauf findet kurze Sequenzen mit fremdsprachigem Ton und stellt Untertitel bereit.\n"
 "\n"
-"Diese Option benötigt eine Sprache, welche in der „gewählte Sprachen“ Liste gesetzt wurde."
+"Für diese Option muss eine Sprache in der Liste Ausgewählte Sprachen eingestellt sein."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 "Füge eine Untertitelspur hinzu falls die Standardspur fremdsprachig ist"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Fügt eine Untertitelspur hinzu, falls die Standardtonspur nicht in der bevorzugten Sprache ist.\n"
+"Wenn die Standard-Audiospur nicht Ihre bevorzugte Sprache ist, fügen Sie eine Untertitelspur hinzu.\n"
 "\n"
-"Diese Option benötigt eine Sprache welche in der „gewählten Sprachen“ Liste gesetzt wurde."
+"Für diese Option muss eine Sprache in der Liste Ausgewählte Sprachen eingestellt sein."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Closed Captions hinzufügen falls verfügbar"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1466,59 +1625,59 @@
 "Closed Captions sind Untertitel welche jedem beliebigen Container "
 "hinzugefügt werden können."
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Einbrennverhalten*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Setzt das Verhalten der eingebrannten Untertitel.\n"
+"Legen Sie das Verhalten des Untertitels \"Einbrennen\" fest.\n"
 "\n"
-"Eingebrannte Untertitel sind Teil des Videos und können nicht mehr deaktiviert werden.\n"
-"Nur eine Untertitelspur kann eingebrannt werden! Wenn Konflikte auftreten, wird nur die Erste verwendet."
+"Eingebrannte Untertitel sind Teil des Videos und können während der Wiedergabe nicht deaktiviert werden. \n"
+"Es kann nur eine Untertitelspur eingebrannt werden! Da es zu Konflikten kommen kann, wird die zuerst gewählte bevorzugt."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Einbrennen für fehlerhafte Abspieler*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD-Untertitel"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Brenne den ersten gewählten DVD-Untertitel ein. Alle anderen DVD-Untertitelspuren werden verworfen.\n"
-"Nutze diese Option wenn die Software oder das Gerät keine DVD-Untertitel unterstützt.\n"
+"Brennen Sie die erste ausgewählte DVD-Untertitelspur. Alle anderen DVD-Untertitelspuren werden verworfen.\n"
+"Verwenden Sie diese Option, wenn Ihre Player-Software oder Ihr Gerät keine DVD-Untertitel unterstützt.\n"
 "\n"
-"Nur eine Untertitelspur kann eingebrannt werden! Wenn Konflikte auftreten, wird nur die Erste verwendet."
+"Es kann nur eine Untertitelspur eingebrannt werden! Da es zu Konflikten kommen kann, wird die zuerst gewählte bevorzugt."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Blu-ray-Untertitel"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Brenne den ersten gewählten Blu-ray Untertitel ein. Alle anderen Blu-ray Untertitelspuren werden verworfen.\n"
-"Nutze diese Option wenn deine Software oder Gerät keine Blu-ray Untertitel unterstützt.\n"
+"Brennen Sie die erste ausgewählte Blu-ray-Untertitelspur. Alle anderen Blu-ray-Untertitelspuren werden verworfen.\n"
+"Verwenden Sie diese Option, wenn Ihre Player-Software oder Ihr Gerät keine Blu-ray-Untertitel unterstützt.\n"
 "\n"
-"Nur eine Untertitelspur kann eingebrannt werden! Wenn Konflikte auftreten, wird nur die Erste verwendet."
+"Es kann nur eine Untertitelspur eingebrannt werden! Da es zu Konflikten kommen kann, wird die zuerst gewählte bevorzugt."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1526,7 +1685,7 @@
 "* Nur eine der oben angegebenen Untertiteleinbrennoptionen wird "
 "angewendet, beginnend mit der ersten."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1534,714 +1693,241 @@
 "Nur eine Untertitelspur kann eingebrannt werden! Wenn Konflikte auftreten, "
 "wird nur die Erste verwendet."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Referenzbilder:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Geeignete Werte sind ~1-6. Je höher der Wert, desto höher ist die Kompression, aber auch der Rechenaufwand.\n"
-"Animationen neigen mehr von Referenz-Einzelbilder zu profitieren, als Filmmaterial.\n"
-"\n"
-"Beachte das viele Hardware-Komponenten in der Anzahl der unterstützten\n"
-"Referenz-Einzelbilder limitiert sind, wenn man also für ein Standalone-Gerät oder ein Handheld\n"
-" kodiert, solltest diese Einstellung unangetastet gelassen werden, außer man weis, was man tut."
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Maximum B-Frames:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Geiegnete Werte sind ~2-5. Dieser Wert spezifiziert die maximale Anzahl an sequentiellen B-Frames, welche der Encoder nutzen kann.\n"
-"\n"
-"Eine große Anzahl hat nur einen signifikanten Effekt, wenn Adaptive-B-Bilder auf „Optimal“ gestellt wurde.\n"
-"Animationen als Quelle und B-Pyramiden vergrößern auch die Effektivität größerer Werte.\n"
-"\n"
-"Das Basisprofil, wie auch iPods und ähnliche Geräte erfordern einen Wert von 0 (aus). "
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Pyramidenförmige B-Frames:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-Pyramiden vergrößern die Kompression durch Erstellen von pyramidenförmigen\n"
-"Strukturen (daher der Name) aus B-Frames. Dies erlaubt den B-Bildern sich auf sich gegenseitig zu beziehen um die Kompression zu steigern.\n"
-"\n"
-"Erfordert einen maximalen B-Frames-Wert größer als 1; Optional sind adaptive B-Frames für optimale Kompression stark empfohlen."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Gewichtete P-Frames:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Vollzieht zusätzliche Analysen um über gewichtete Parameter jedes Bildes zu entscheiden.\n"
-"\n"
-"Dies verstärkt die Kompression im Allgemeinen etwas und verbessert die Qualität von Überblendungen gewaltig.\n"
-"\n"
-"Das Basis-Profile, iPods und ähnliche Geräte, erfordern es die gewichtete P-Bilder Vorhersage auszuschalten. \n"
-"Beachte das andere Geräte die das Haupt-Profil unterstützen, auch mit dieser Funktion Probleme haben könnten.\n"
-"Zum Beispiel unterstützt der Apple TV diese Funktion nicht."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8-Transformation"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"Die 8x8-Transformation ist die im Einzelnen hilfreichste Funktion von x264 im Kompression-zu-Geschwíndigkeits-Verhältnis.\n"
-"\n"
-"Es verstärkt die Kompression um mindestens 5% bei minimalen\n"
-"Geschwindigkeitseinbußen und ergibt möglicherweise einen ungewöhnlich hohen Qualitätsvorteil \n"
-"verglichen mit dem Kompressionsanstieg. Jedoch erfordert es das High-Profil das viele Geräte möglicherweise nicht unterstützen."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "CABAC-Entropiekodierung"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"Nachdem der Encoder seine Arbeit getan hat, müssen noch einige \n"
-"Daten verlustfrei komprimiert werden, ähnlich wie ZIP oder RAR. H.264\n"
-"stellt dafür zwei Optionen bereit: CAVLC und CABAC. CABAC kodiert sehr \n"
-"viel langsamer, komprimiert aber viel besser (10-30%), speziell bei kleinen Bitraten.\n"
-"\n"
-"Wenn die Prozessorleistung beim Abspielen minimieren werden soll, diese Option deaktivieren.\n"
-"Das Basis-Profil, welches für iPods und ähnliche Geräte wichtig ist, benötigt CAVLC."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Kodierungsfeatures"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Bewegungsabschätzungsverfahren:"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Kontrolliert die Bewegungsschätzungsmethode.\n"
-"\n"
-"Die Bewegungsschätzung untersucht, wie jeder Pixelblock im Bild bewegt wurde.\n"
-"Eine bessere Bewegungssuche verbessert die Kompression auf Kosten der Geschwindigkeit.\n"
-"\n"
-"Diamant: Führt durch Nutzung der Diamant-Vorlage eine extrem schnelle und simple Suche durch.\n"
-"Haxagon: Führt durch Nutzung der Hexagon-Vorlage eine etwas effektivere und langsamere Suche durch.\n"
-"Ungleiche Multi-Hex: Führt eine weite Suche mit mehreren Vorlagen nach complexen Bewegungen durch.\n"
-"Vollständig: Führt eine „flache“ Suche jedes Pixels in einem großen Bereich durch. Signifikant langsamer und nur spärlicher Kompressionsgewinn.\n"
-"Vollständig umgewandelt: Wie vollständig, aber mit genaueren Entscheidungen. Noch langsamer mit noch kleineren Vorteilen."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Teilbildpunkt-Bewegungsvorhersage &amp; Modus:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Diese Einstellung kontrolliert alle Unterpixelgenauen Bewegungsvorhersagen und Bewegungsvorhersagemethoden.\n"
-"\n"
-"Die Unterpixel-Bewegungsvorhersage filtert Bewegungen jenseits von einfacher Pixel-Genauigkeit und verbessert die Kompression.\n"
-"Die Formentscheidung bestimmt, wie jeder Block von einem Bild kodiert wird. Dies ist eine sehr wichtige Entscheidung.\n"
-"SAD ist die schnellste Methode, gefolgt von SATD, RD, RD Filterung und dem langsamsten: QPRD.\n"
-"6 oder höher ist streng empfohlen: Psy-RD, eine sehr machtvolle psy Optimierung, welche hilft die Qualität zu sichern, benötigt RD.\n"
-"11 deaktiviert alle frühen Beendigungen in der Analyse.\n"
-"10 und 11, die stärksten und langsamsten Optionen, benötigen adaptive Quantisierung (AQ-Modus > 0) und trellis 2 (immer)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Bewegungsabschätzungsreichweite:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"Dies ist die Distanz in der x264 nach dem Erkennen einer Bewegung\n"
-"nach der nächsten Bewegung sucht.\n"
-"\n"
-"Der Standard passt zu den meisten Inhalten, aber für extrem bewegungsreiche Videos, speziell in HD Auflösung, kann der Vorteil\n"
-"größer als der Nachteil sein"
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Adaptiver Direktmodus:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 erlaubt zwei verschiedene Vorhersagemodelle, in B-Bildern, räumlich oder zeitlich.\n"
-"\n"
-"Räumlich, der Standard, ist meistens besser, aber zeitlich kann manchmal nützlich sein.\n"
-"x264 kann, auf Kosten von Schnelligkeit (und für geringe Verbesserung der Kompression),\n"
-"entscheiden, welches für jedes Bild besser ist."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Adaptive B-Frames:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 hat eine Anzahl von Algorithmen um zu entscheiden, wann ein B-Bild benutzt werden soll und wie viele es sein sollen.\n"
-"\n"
-"Der schnelle Modus nimmt ungefähr den gleichen Zeitabstand, ungeachtet wie viele B-Bilder man einträgt.\n"
-"Obwohl die Methode schnell ist, sind die Ergebnisse oft suboptimal.\n"
-"\n"
-"Der optimale Modus wird langsamer, je mehr B-Bilder als Maximum eingetragen werden, \n"
-"sorgt aber für bessere Ergebnisse, speziell wenn B-Pyramiden verwendet werden."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Partitionen:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"Die Mode Decision sammelt einige Informationen um eine Entscheidung zu treffen:\n"
-"Diese Optionen entscheidet, welche dies sind.\n"
-"\n"
-"Weniger Partitionen, die geprüft werden müssen, sorgen für schnellere Kodierung, \n"
-"aber auch für schlechtere Entscheidungen, meistens sorgt einer der Entscheidungen, \n"
-"die man abgeschaltet hat, für die besten Ergebnisse"
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Trellis:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Trellis verändert die Rundung von Transformationskoeffizienten um\n"
-"3-5% mehr Kompression zu lasten der Geschwindigkeit zu erreichen.\n"
-"\n"
-"„Immer“ verwendet Trellis nicht nur während des Hauptkodierungsprozesses,\n"
-"sondern auch während der Analyse was die Kompression weiter erhöht,\n"
-"jedoch resultiert dies in einem noch größeren Geschwindigkeitsverlust.\n"
-"\n"
-"Trellis kostet mehr Geschwindigkeit bei höheren Bitraten und benötigt CABAC."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analyse"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Adaptive Quantisierungsstärke:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"Adaptive Quantisierung kontrolliert wie stark der Encoder Bits im Bild verteilt.\n"
-"\n"
-"Höhere Werte nehmen mehr Bits von Ecken und komplexen Bereichen um Bereiche mit feineren Details zu verbessern."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Psychovisual Rate Distortion:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"Psychovisual rate-distortion Optimierung verwendet die Charakteristika\n"
-"der menschlichen Sicht um wahrnehmbares Detail und Schärfe dramatisch\n"
-"zu verbessern.\n"
-"Der Effekt kann minimiert oder verstärkt werden indem die Stärke angepasst wird.\n"
-"Da es ein RD Algorithmus ist, benötigt es einen Mindestwert von „6“ für die Mode Decision."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Psychovisuelles Trellis:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Psychovisueller Trellis ist ein experimentaler Algorithmus um den\n"
-"Schärfe- und Detailerhalt über den vom Psychovisuellem RD weiter zu erhöhen.\n"
-"\n"
-"Empfohlene Werte befinden sich um 0.2, obwohl höhere Werte bei sehr \n"
-"rauschigem Video oder niedrigen Bitraten helfen können. Nicht empfohlen\n"
-"für cel Animation und andere Scharfkantige Grafiken."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Deblocking: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"H.264-Entblockungsfilter.\n"
-"h.264 hat einen eingebauten Entblockungsfilter, der verblockte Artefakte glättet nachdem jedes Bild dekodiert wurde. Dies verbessert nicht nur die visuelle\n"
-"Qualität, sondern verbessert die Kompression auch signifikant. Der Filter verbraucht viel Prozessorleistung,\n"
-"deshalb solltest man diese Option abschalten wenn man die Prozessorleistung beim Abspielen verringern will.\n"
-"\n"
-"Der Entblockungsfilter hat zwei anpassbare Parameter, „Stärke“ (Alpha) und „Grenzwert“ (Beta).\n"
-"Erstere kontrolliert wie stark (oder schwach) die Entblockung ist, während letztere Option\n"
-"kontrolliert, auf wie viele (oder wenige) Kanten es angewendet wird. Ein kleinerer Wert meint weniger Entblockung.\n"
-"Der Standardwert ist 0 (normale Stärke) für alle Parameter."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Keine DCT-Dezimierung"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"x264 nullt normalerweise fast-leere Datenblocks um Bits für bessere\n"
-"Zwecke im Video zu sparen. Manchmal kann dies kleine negative\n"
-"Effekte auf die Beibehaltung von feinen Körnungen haben.\n"
-"\n"
-"Diese Option unberührt lassen, es sei denn man hat Probleme \n"
-"mit Banding oder ähnliche Probleme bei denen es schwer ist \n"
-"feines Rauschen zu erhalten. "
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psychovisuell"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"Die ausgewählten Optionen erscheinen hier.\n"
-"Diese können bearbeitet werden und es können zusätzliche Optionen hinzugefügt werden.\n"
-"\n"
-"Standardwerte werden nicht angezeigt. Diese sind:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "Derzeitiger x264 erweiterte Optionen String"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Erweiterte Videoeinstellungen"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Kapitelmarkierungen"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Füge Kapitel Markierungen der Ausgabedatei hinzu."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Index"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Dauer"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titel"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Kapitel"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Schauspieler:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Regisseur:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Erscheinungsdatum:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Genre:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Handlung:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Tags"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Einstellungen"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Markiere den ausgewählten Warteschlangeneintrag als bevorstehend.\n"
-"Setzt die Warteschlangenaufgabe als bevorstehend und bereit zum Neustart zurück."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Alle neu laden"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Markiere alle Warteschlangeneinträge als abevorstehend.\n"
-"Setzt alle Warteschlangenaufgabe als abevorstehend und bereit zum Neustart zurück."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Alle löschen"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Lösche alle Einträge aus der Warteschlange"
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Warteschlange speichern"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Sichere die aktuelle Warteschlange von Encodierungsaufgabe in eine Datei.\n"
-"Diese Datei kann zu einem späteren Zeitpunkt neu geladen werden \n"
-"um die Aufgabe zu bearbeiten oder den Kodiervorgang neu zu starten."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Warteschlangendatei laden"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Lade eine zuvor gespeicherte Warteschlangendatei."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Speichern als:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Dateiname für die Ausgabe."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "In:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Speicherort für das encodierte Video."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Speicherort"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "OK"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Markiere alle Titel zum Hinzufügen zur Warteschlange"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Alles löschen"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Alle Titel demarkieren"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "Ausgabedateien Ok. Keine Duplikate erkannt."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Automatisch nach Updates suchen"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Wenn alle Encodierungen abgeschlossen sind"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 "Verwende automatische Benennung (verwendet modifizierten Quelldateinamen)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr "Zieldateiname aus Quelldateiname oder Datenträgerbezeichnung erzeugen"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Template für die automatische Benennung"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"Verfügbare Optionen: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Verfügbare Optionen: {source-path} {source} {title} {preset} {chapters} "
+"{date} {time} {creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "Verwende iPod/iTunes freundliche (.m4v) Dateiendungen für MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Anzahl der Vorschauen"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Kurze Titel filtern (Sekunden)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Kurze DVD- und Blu-ray-Titel entfernen (Sekunden)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+"Löschen abgeschlossener Warteschlangenelemente nach Abschluss einer "
+"Encodierung"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"Standardmäßig verbleiben abgeschlossene Aufgaben in der Warteschlange und\n"
+"werden als solche markiert. Aktiviere diese Option, falls abgeschlossene Aufgaben aus der Warteschlange entfernt werden sollen."
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Schrittweite für den Faktor der konstanten Qualität"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Verwende dvdnav (anstatt libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Überwache den freien Speicherplatz auf dem Zielmedium"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 "Pausiere die Kodierung falls der freie Speicherplatz unter das Limit fällt"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB-Limit"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 "Speichere individuelle Kodierungsprotokolle an selbem Speicherort wie das "
 "Video"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Aktivitätsprotokoll-Ausführlichkeitsstufe"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Aktivitätsprotokoll-Speicherdauer"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Skaliere High Definition-Vorschau herunter"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Überprüfe DVD beim Laden automatisch"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Überprüft eine DVD wenn eine neue Disc geladen wird"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Schriftgröße des Aktivitätsfensters"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Den erweiterten Videooptionen-Tab nicht anzeigen"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Verwende erweiterte Videooptionen auf eigene Gefahr.\n"
-"Wir empfehlen stattdessen die vorhandenen Einstellungen im Video-Tab."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Entferne abgeschlossene Aufgaben aus der Warteschlange"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"Standardmäßig verbleiben abgeschlossene Aufgaben in der Warteschlange und\n"
-"werden als solche markiert. Aktiviere diese Option, falls abgeschlossene Aufgaben aus der Warteschlange entfernt werden sollen."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Verwende dieselben Einstellungen für alle Titel in einem Batch"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2252,72 +1938,68 @@
 "\n"
 "Deaktiviere diese Option, falls für jeden Titel eigene Einstellungen festgelegt werden sollen."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Erlaube Optimierungen"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Erlaube HandBrake für Dummies"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Ordnername:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Voreinstellung umbenennen"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Beschreibung"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Kategorie:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 "Wähle die Kategorie unter der diese Voreinstellung angezeigt werden soll."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Kategoriename:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Voreinstellungsname:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Standard-Voreinstellung"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Setze dies als Standard-Voreinstellung wenn HandBrake startet"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Benutzerdefinierte Bilddimensionen"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Bildgröße"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Maximale Breite:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Aktiviere Limit für maximale Breite."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2330,15 +2012,15 @@
 "falls die Breite der Quelldatei größer ist.\n"
 "Ein Wert von 0 deaktiviert diese Einstellung."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Maximale Höhe:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Aktiviere Limit für maximale Höhe."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2351,11 +2033,15 @@
 "falls die Höhe der Quelldatei größer ist.\n"
 "Ein Wert von 0 deaktiviert diese Einstellung."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "HandBrake Vorschau"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Wähle Einzelbilder für die Vorschau aus."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2363,79 +2049,109 @@
 "Encodiere und spiele eine kurze Sequenz des Videos ab, beginnend mit der "
 "aktuellen Vorschauposition."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Dauer:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Setze die Dauer der Live-Vorschau in Sekunden."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Zeige Beschnitt"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Zeige beschnittene Teile der Vorschau"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Quelldatei-Auflösung"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Setze das Vorschaufenster auf die Auflösung der Quelldatei zurück"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "Abbrechen"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "Öffnen"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Titelnummer:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Erkannte DVD-Geräte:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importiere SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Aktiviere Einstellung zum Import einer SRT Untertiteldatei"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "SSA importieren"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Einstellungen zum Import von SSA-Untertiteln aktivieren"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Eingebettete Untertitelliste"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Aktiviere Einstellung zum Selektieren von eingebetteten Untertiteln"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Quelldateispur"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Liste der verfügbaren Untertitelspuren der Quelldatei."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Spurname:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Stellen Sie den Namen der Untertitelspur ein.\n"
+"\n"
+"Wiedergabegeräte können dies in der Untertitel-Auswahlliste verwenden."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Sprache"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Character Code"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Datei:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Versatz (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2443,7 +2159,7 @@
 "Setz die Sprache des Untertitels.\n"
 "Dieser Wert wird von Abspielern in Untertitelmenüs verwendet."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2457,36 +2173,28 @@
 "Wir übersetzen das Character Set zu UTF-8.\n"
 "Das Character Set der Quelle wird für diese Operation benötigt."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Wähle die zu importierende SRT-Datei."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "SRT-Datei"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Datei importieren"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 "Einstellen des Versatz in Millisekunden zwischen Video- und SRT-Zeitstempel"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Spur"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Liste der verfügbaren Untertitelspuren der Quelldatei."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Nur erzwungene Untertitel"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Ins Video brennen"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2494,23 +2202,15 @@
 "Render den Untertitel über dem Video.\n"
 "Der Untertitel wird Teil des Videos und kann nicht deaktiviert werden."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Setze Standardspur"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Quelldateispur"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Liste von verfügbaren Tonspuren der Quelldatei."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Spurname:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2520,15 +2220,15 @@
 "\n"
 "Abspieler können dies in der Tonauswahlliste verwenden."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Mischung"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Abtastrate"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2541,31 +2241,31 @@
 "erlaubt DRC diesen Umfang zu komprimieren indem laute Geräusche\n"
 "leiser und leise Geräusche lauter gemacht werden."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Setze den Audiocodec mit dem diese Spur kodiert werden soll."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Aktiviere Einstellungen für die Bitrate"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Qualität"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Aktiviere Einstellungen für die Qualität"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Setz die Bitrate für diese Spur."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
@@ -2573,19 +2273,19 @@
 "Qualität: Verändere die Qualität der Ausgabe für Codecs die es "
 "unterstützen."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Lege die Abmischung der Ausgabetonspur fest."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Lege die Abtastrate der Ausgabetonspur fest."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2594,186 +2294,73 @@
 "Tonspur ein."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Aus"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Diese Version überspringen"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Erinnere mich später"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "Eine neue Version von HandBrake ist verfügbar!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx ist jetzt verfügbar (installierte Version ist yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Versionshinweise"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Videotranscoder"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake ist ein Werkzeug zur Konvertierung von Videos aus nahezu jedem "
-"Format in eine Auswahl moderner, weit verbreiteter Codecs."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Gründe, warum Sie Handbremse lieben werden:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Konvertiert Videodateien aus nahezu jedem Format"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Kostenlos und Open Source"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multi-Platform (Windows, Mac und Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Hauptfenster und Einstellungs-Übersicht"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Videoauflösung- und Beschneidung-Einstellungen"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Einstellungen des Videoencoders"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Einstellungen der Tonspurenauswahl"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Kapiteltitel-Editierung"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Kann %s nicht erstellen.</big>\n"
-"\n"
-"Interner Error. UI Beschreibung konnte nicht geparsed werden.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Index"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Dauer"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Aufgabeninformation"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Spurinformation"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Voreinstellungsname:"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "Das Gerät oder die Datei zum encodieren"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Die Voreinstellungen die zum Kodieren verwendet werden sollen"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Viel Spam"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "Der Pfad zum Überschreiben des Benutzerkonfigurationsordners"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Öffne eine Konsole für Debug-Ausgaben"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Alle"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Qualität:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Bitrate: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Bitrate: %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Passthru"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2784,7 +2371,7 @@
 "DRC: %s\n"
 "Spurname: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2793,7 +2380,7 @@
 "%sVerstärkung: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2801,7 +2388,7 @@
 "Füge einen Audioencoder hinzu.\n"
 "Jede ausgewählte Quellspur wird mit allen ausgewählten Encodern kodiert."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2809,39 +2396,39 @@
 "Audioqualität:\n"
 "Verändert die Qualität der Ausgabe für Encoder die es unterstützen."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Entferne diesen Audioencodierer"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Das Schließen von HandBrake wird den Kodiervorgang abbrechen.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Nicht ausgewählt"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Überprüfen …"
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Überprüfen stoppen"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Kein Titel gefunden"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Neues Video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2852,440 +2439,439 @@
 "\n"
 "%s in %d Sekunden …"
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr ""
 "%s Der Film geht verloren falls nicht mit dem Encodieren fortgefahren wird."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Momentanes abbrechen und stoppen"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Breche aktuelle Aufgabe ab, starte nächsten"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Momentanes fertigstellen, dann stoppen"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Encodieren fortsetzen"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d Encodierung(en) ausstehend"
+msgid "%d encode pending"
+msgstr "%d Encodierung ausstehend"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d Encodierungen ausstehend"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "Aufgabe %d von %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "Durchgang %d (Untertitelüberprüfung) von %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "Durchgang %d von %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 "Encodierung: %s%s%.2f %% (%.2f BpS, avg %.2f BpS, ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Encodierung: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Encodierung: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Suche Startzeit,"
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Überprüfe Titel %d von %d …"
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Überprüfe Titel %d von %d Vorschau %d …"
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pausiert"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Encodierung abgeschlossen!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Encodierung abgebrochen."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Encodierung fehlgeschlagen."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Multiplexen: Dies kann eine Weile dauern …"
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Überprüfe diese DVD-Quelle"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Warnung: verlustlos)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s ist nun verfügbar (aktuell %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Encodierung abgeschlossen"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "Stellen Sie den Cocktail ab, die HandBrake-Warteschlange ist fertig!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Die Encodierung ist abgeschlossen."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Fahre den Computer herunter"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Versetze Computer in Ruhezustand"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "HandBrake wird geschlossen"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Erste Spur mit den ausgewählten Sprachen"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Alle Spuren mit den ausgwählten Sprachen"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Fremdsprachige Audiountertitelspur"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Erste ausgewählte Spur"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Fremdsprachiges Audio, dann erste gewählte Spur"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Kapitel:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Sekunden:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Einzelbilder:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Nichts machen"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Zeige Benachrichtigung"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "HandBrake beenden"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Versetze Computer in Ruhezustand"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Computer herunterfahren"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Loose"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Woche"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Monat"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Jahr"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Unsterblich"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Niemals"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Täglich"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Wöchentlich"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Monatlich"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Unscharf maskieren"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Lapsharp"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 Grad"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 Grad"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 Grad"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Räumlich"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Zeitlich"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Schnell"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optimal"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Strikt"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Simpel"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Intelligent"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Sechseckig"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Unebenes Multi-Hexagon"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Erschöpfend"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Hadamard erschöpfend"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, keine subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel auf alles"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel auf alles"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD in I/P-frames"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD in allen Einzelbildern"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD filtern in I/P-Frames"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD filtern in allen Einzelbildern"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD in allen Einzelbildern"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: Keine vorzeitigen Abbrüche in der Analyse"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Meisten"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Manche"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Alle"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Nur Encodieren"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Immer"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Wie die Quelle"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC-Film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL-Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC-Video)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Keine Titel"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Kein Audio"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Irgendeine"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3298,7 +2884,7 @@
 "Voreinstellung:\t%s\n"
 "Benutzerdefiniert:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3309,7 +2895,7 @@
 "\n"
 "Voreinstellung:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3322,7 +2908,7 @@
 "Voreinstellung:\t%s\n"
 "Benutzerdefiniert:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3333,7 +2919,7 @@
 "\n"
 "Voreinstellung:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3348,7 +2934,7 @@
 "Voreinstellung:\t%s\n"
 "Benutzerdefiniert:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3361,7 +2947,7 @@
 "Filter:\t%s\n"
 "Voreinstellung:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3378,7 +2964,7 @@
 "Angepasst:\t%s\n"
 "Benutzerdefiniert:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3395,8 +2981,7 @@
 "Angepasst:\t%s\n"
 "Benutzerdefiniert:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3408,18 +2993,29 @@
 "Du solltest einen anderen Video Codec oder Container auswählen.\n"
 "Falls du fortfährst, wird FFMPEG für dich ausgewählt."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"Im WebM-Container wird nur VP8 oder VP9 unterstützt.\n"
+"\n"
+"Sie sollten einen anderen Video-Codec oder Container wählen.\n"
+"Wenn Sie fortfahren, wird einer für Sie ausgewählt."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Fortfahren"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Kein Titel gefunden.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3431,8 +3027,19 @@
 "Du solltest deine Untertitelauswahl ändern.\n"
 "Falls fortgefahren wird, gehen manche Untertitel verloren."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"WebM in HandBrake unterstützt nur eingebrannte Untertitel.\n"
+"\n"
+"Sie sollten Ihre Untertitel-Auswahl ändern.\n"
+"Wenn Sie fortfahren, werden einige Untertitel verloren gehen."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3444,8 +3051,7 @@
 "Es sollte eine gültige Datei ausgewählt werden.\n"
 "Falls fortgefahren wird, wird dieser Untertitel ignoriert."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3457,7 +3063,7 @@
 "Es sollte ein anderer Audiocodec ausgewählt werden.\n"
 "Falls fortgefahren wird, wird einer ausgewählt."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3470,17 +3076,57 @@
 "Es sollte ein anderer Audiocodec ausgewählt werden.\n"
 "Falls fortgefahren wird, wird einer ausgewählt."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Kann %s nicht erstellen.</big>\n"
+"\n"
+"Interner Error. UI Beschreibung konnte nicht geparsed werden.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Spurinformation"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Voreinstellungsname:"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Das Gerät oder die Datei zum encodieren"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Die Voreinstellungen die zum Kodieren verwendet werden sollen"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Viel Spam"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "Der Pfad zum Überschreiben des Benutzerkonfigurationsordners"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Öffne eine Konsole für Debug-Ausgaben"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 "ghb_presets_menu_init: Voreinstellungen Ordner konnte nicht gefunden werden."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "Übergeordneter Ordner konnte beim Hinzufügen nicht gefunden werden"
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3490,31 +3136,31 @@
 "\n"
 "Soll fortgefahren werden?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Bring mich hier raus!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Lade Backup-Voreinstellungen"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Alle (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Voreinstellungen (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Veraltete Voreinstellungen (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Exportiere Voreinstellung"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3525,15 +3171,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "ordner"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "voreinstellung"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3546,267 +3192,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Sekunden"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Einzelbilder"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (Titel %d, %s %d bis %d, 2 Video-Durchgänge) -->"
-" %s"
+msgid "%s (Modified)"
+msgstr "%s (Modifiziert)"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (Titel %d, %s %d bis %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "A/V angleichen"
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Modifizierte Voreinstellung basierend auf: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Voreinstellung: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d Beschnitt\n"
+"%dx%d Original, %dx%d Anzeige\n"
+"%d:%d Pixelseitenverhältnis\n"
+"%s Displayseitenverhältnis"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Format: %s Container\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Container-Optionen:"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Bitrate %dkbps"
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sKapitelmarkierungen"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Bitrate %dkbps (2 Pass)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G Support"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Konstante Qualität %.4g(%s)"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sWeb-optimiert"
+msgid "%sPreset %s"
+msgstr "%sVoreinstellung %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Ziel: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Bildformat erhalten)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Bildformat verloren)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorphisch)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Benutzerdefiniert Anamorph)"
+msgid "%sTune %s"
+msgstr "%sEinstellung %s"
 
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Bild: "
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Quelle: %d x %d, Ausgabe %d x %d %s, Zuschneiden %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr "%sProfil %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Display %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filter:"
+msgid "%sLevel %s"
+msgstr "%sLevel %s"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Konstante Bildfrequenz %s BpS"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"Spitzen-Bildfrequenz %s BpS (kann geringer sein)"
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sEntrauschen %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Variable Bildfrequenz %s BpS"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", nur erzwungene"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sGraustufen"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", eingebrannt"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", Standard"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(konstant)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Fertiggestellt"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(variabel)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Abgebrochen"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Bildfrequenz: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Fehlgeschlagen"
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Bildfrequenz: Maximal %s (kann niedriger sein)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "Anstehend"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Bildfrequenz: %s (konstante Bildfrequenz)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Error"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Bitrate:"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d Tag %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "Turbo erster Durchgang: Ein\n"
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Video Optionen: Voreinstellung: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Tage %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Abstimmung: "
-
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Profil: %s"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Level: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "kB"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Erweiterte Optionen: %s\n"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Audio: "
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Tonspuren: %d"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Nicht verfügbar"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Bitrate: %d"
-
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Encoder: %s"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Fremdsprachentonsuche"
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> Encoder: %s, Abmischung: %s, Abtastrate: %s, %s"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Encodierung"
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Encode Erster Durchgang (Analyse)"
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Encode Zweiter Durchgang (Final)"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Untertitel: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Error"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Untertitelspuren: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"Durchgang %d von %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Nur erzwungene)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Titel überprüfen"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr "(Einbrennen)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Encodierung pausiert"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr "(Standard)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Encodierung in Bearbeitung"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Versetzung (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sDas Zieldateisystem ist fast voll: %<PRIu64>MB frei.\n"
+"%s Das Zielverzeichnis ist fast voll: %<PRId64> MB frei.\n"
 "Ziel: %s\n"
-"Encodierung kann unvollständig sein falls fortgefahren wird.\n"
+"Encodierung möglicherweise unvollständig wenn fortgefahren wird.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Fortsetzen, das Problem ist gelöst."
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Fortsetzen, nicht mehr erinnern"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3819,11 +3419,11 @@
 "Eine andere Warteschlangenaufgabe hat dasselbe Ziel spezifiziert.\n"
 "Soll überschrieben werden?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3834,7 +3434,7 @@
 "\n"
 "Dies ist kein gültiger Ordner."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3845,7 +3445,7 @@
 "\n"
 "Kann Ordner nicht lesen oder schreiben."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3858,16 +3458,16 @@
 "Datei existiert bereits.\n"
 "Soll überschrieben werden?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Wähle diesen Titel zum Hinzufügen zur Warteschlange aus.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Kein Titel"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3877,31 +3477,31 @@
 "Dieser Titel wird nicht zur Warteschlange hinzugefügt solange der\n"
 "Dateiname nicht geändert wird.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Stop"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Encodierung stoppen"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "S_toppe Kodierung"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Kodierung fortsetzen"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "S_toppe Kodierung"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "Kodierung fortsetzen"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3909,25 +3509,23 @@
 "Es wird gerade kodiert. Was soll getan werden?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Bevorzugte Sprache: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Füge %s Untertitelspur hinzu falls Standardaudio nicht %s ist"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Untertitelspur hinzufügen, wenn Standardaudio nicht die bevorzugte Sprache "
 "ist."
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3940,8 +3538,7 @@
 "Erweiterte Optionen:\n"
 "„%s“"
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3953,3 +3550,8 @@
 "\n"
 "Erweiterte Optionen:\n"
 "„“"
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Warnung: verlustlos)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/es.po -> HandBrake-1.5.1.tar.xz/gtk/po/es.po Changed

@@ -1,19 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Casper casper, 2019
+# Casper, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Casper casper, 2019\n"
+"Last-Translator: Casper, 2021\n"
 "Language-Team: Spanish (https://www.transifex.com/HandBrakeProject/teams/92423/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +31,11 @@
 "\n"
 "El subtítulo será parte del video y no podrá ser deshabilitado."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Incrustado en"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +53,11 @@
 "Esto es útil para crear una pista \"forzada\"\n"
 "en su salida."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +73,11 @@
 "Subtítulos durante las escenas donde alguien está hablando.\n"
 "un idioma extranjero."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Solo Forzado"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +93,11 @@
 "No coincide con el inicio del video.\n"
 "Esta configuración le permite sincronizar los archivos."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "Desplazamiento SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -123,257 +123,420 @@
 "del idioma extranjero. Esta opción se usa mejor en\n"
 "conjuntamente con la opción \"Forzado\"."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Pista"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Abrir directorio de origen"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Abrir directorio de destino"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Abrir directorio de registro de codificación"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Abrir registro de codificación"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Restablecer trabajos fallados"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Restablecer todos los trabajos"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Limpiar trabajos completados"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Limpiar todos los trabajos"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Importar Cola"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Exportar Cola"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Preajustes de HandBrake"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Preajustes"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Establecer _por defecto"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Guardar"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Guardar _como"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Borrar"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importar"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exportar"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "Restablecer _PreAjustes"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Lista de Preajustes"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "Cola de HandBrake"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Cola"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 trabajos pendientes"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Iniciar Codificacion"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Iniciar"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Pausar Codificacion"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Opciones"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Cuando termine:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Restablecer"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Marca la codificación de la cola seleccionada como pendiente.\n"
+"Restablece el trabajo en cola a pendiente y listo para volver a ejecutarse."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Editar"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Acciones"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Preset:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Origen:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titulo:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Destino:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensiones:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Subtitulos:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Resumen"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Pasada:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Tiempo Inicial:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Tiempo Final:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Duracion de la pausa:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Tiempo de codificación:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Tamaño de archivo:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Estadísticas"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Registro de actividad"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Registro de actividad de Handbrake"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Acerca de HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 msgstr "Copyright © 2008 - John StebbinsCopyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake es un transcodificador de video multiproceso y multiplataforma con"
 " licencia GPL."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake es software libre; puede redistribuirlo y / o modificarlo según los términos de la Licencia Pública General de GNU publicada por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (a su elección) cualquier versión posterior.\n"
+"HandBrake es un software gratuito; puede redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License versión 2, según lo publicado por la Free Software Foundation.\n"
 "\n"
-"HandBrake se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA; sin ni siquiera la garantía implícita de COMERCIABILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública General de GNU para más detalles.\n"
+"HandBrake se distribuye con la esperanza de que sea útil, pero SIN NINGUNA GARANTÍA; incluso sin la garantía implícita de COMERCIABILIDAD o APTITUD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia pública general GNU para obtener más detalles.\n"
 "\n"
-"Debería haber recibido una copia de la Licencia Pública General de GNU junto con Glade; Si no, escriba a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, EE. UU."
+"Debería haber recibido una copia de la Licencia Pública General GNU junto con Glade; de lo contrario, escriba a Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, EE. UU."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Archivo"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Abrir _Fuente"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Abrir unico _titulo"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Seleccionar _Destino"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Cola"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Añadir"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Añadir _Multiple"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Iniciar Codificacion"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Pausar Codificacion"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "G_uardar cola"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Cargar archivo de cola"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Ver"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake para los _Dumbies"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Lista de _Preajustes"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Vista previa"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Ventana de actividad"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Acerca"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guia"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Escoja fuente de video"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Abrir Fuente"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Añadir a la cola"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Añadir a la Cola"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Iniciar Codificacion"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Iniciar"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Pausar Codificacion"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pausa"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Mostrar ventana de Preajustes"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Preajustes"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Mostrar ventana de vista previa"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Vista previa"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Mostrar Cola"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Cola"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Mostrar Ventana de actividad"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Actividad"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Fuente:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Escaneando..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titulo"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -383,57 +546,57 @@
 "Por defecto se elige el título más largo.\n"
 "Este es a menudo el título de la característica de un DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Sin Titulos"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Angulo:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 "Para DVD de múltiples ángulos, seleccione el ángulo deseado para codificar."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Rango:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Rango de título a codificar. Pueden ser capítulos, segundos, o fotogramas."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Establece el primer capítulo a codificar."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Establecer el último capítulo a codificar."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Preset:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Elegir preset"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Recargar"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -441,27 +604,27 @@
 "Recarga la configuración del preajuste seleccionado actualmente.\n"
 "Las modificaciones serán descartadas."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Guardar Nuevo Preajuste"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Guarda la configuración actual en un nuevo Preajuste."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Selecciona el formato contenedor de las pistas codificadas."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Optimizado web"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -469,11 +632,11 @@
 "Optimizar el diseño del archivo MP4 para la descarga progresiva.\n"
 "Esto permite que un reproductor inicie la reproducción antes de descargar todo el archivo."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Alinear A/V Iniciar"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -483,56 +646,52 @@
 "Insertar fotogramas en blanco o soltar fotogramas. Puede mejorar audio/video\n"
 "Sincronización para reproductores rotos que no cumplen con las listas de edición de MP4."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Soporte para iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Agrega el iPod Atom que necesitan algunos iPods más antiguos."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Duracion:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Pistas:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtros:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Tamaño:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Resumen"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Recorte automatico"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr ""
 "Recorta automáticamente los bordes negros alrededor de los bordes del video."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Recorte Libre"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -546,35 +705,35 @@
 "en lugar de hacer un recorte exacto y luego escalar\n"
 "al múltiplo requerido."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Recorte Izquierdo"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Recorte Arriba"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Recorte Abajo"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Recorte Derecho"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Dimensiones del Recorte:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Recorte"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Dimensiones optimas"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -582,11 +741,11 @@
 "Si está habilitado, seleccione la resolución de almacenamiento 'Optima'.\n"
 "Esta será la resolución que más se acerque a la resolución de origen después del recorte."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Anchura:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -594,11 +753,11 @@
 "Este es el ancho en el que se almacenará el video.\n"
 "Las dimensiones de visualización reales diferirán si la relación de aspecto de píxeles no es 1: 1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -606,39 +765,38 @@
 "Esta es la altura en la que se almacenará el video.\n"
 "Las dimensiones de visualización reales diferirán si la relación de aspecto de píxeles no es 1: 1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamórfico:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 "Modos anamórficos:\n"
 "<tt>\n"
-"Ninguno: Fuerza la relación de aspecto de píxeles a 1: 1.\n"
-"Libre: Use una relación de aspecto de píxeles lo más\n"
-"cercana posible a la relación de aspecto de píxeles \n"
-"de video de la fuente, al tiempo que conserva la\n"
-"relación de aspecto de la pantalla original \n"
-"Automático: Use una relación de aspecto de píxeles que maximize\n"
-"la resolución de almacenamiento mientras preserva la\n"
-"relación de aspecto de visualización original</tt>"
+"Ninguno - Forzar la relación de aspecto de píxeles a 1: 1.\n"
+"Suelto - Use una relación de aspecto de píxeles que sea\n"
+"lo más cercana posible del píxel de vídeo de origen\n"
+"mientras conserva la relación de aspecto de la pantalla original\n"
+"Automático - Use una relación de aspecto de píxeles que maximice\n"
+" la resolución de almacenamiento al tiempo que conserva\n"
+" la relación de aspecto de la pantalla original</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Alineamiento:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -650,22 +808,22 @@
 "Esta configuración solo es necesaria para la compatibilidad con algunos dispositivos.\n"
 "Debe usar 2 a menos que experimente problemas de compatibilidad."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Geometría de almacenamiento"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Mantener aspecto"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 "Si está habilitado, se mantendrá el aspecto de visualización original de la "
 "fuente."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -673,11 +831,11 @@
 "Este es el ancho de la pantalla. Es el resultado de escalar las dimensiones "
 "de almacenamiento por el aspecto de píxel."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Aspecto del píxel:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -689,11 +847,11 @@
 "Una proporción de 1: 1 define un píxel cuadrado. Otros valores definen formas rectangulares.\n"
 "Los reproductores escalarán la imagen para lograr el aspecto especificado."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -703,27 +861,27 @@
 "Una proporción de 1: 1 define un píxel cuadrado. Otros valores definen formas rectangulares.\n"
 "Los reproductores escalarán la imagen para lograr el aspecto especificado."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Aspecto de visualización:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Mostrar geometría"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensiones"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Destelecinado:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -733,7 +891,7 @@
 "\n"
 "Telecinado es un proceso que ajusta las tasas de cuadros de la película que son de 24 fps a las tasas de cuadros de video NTSC que son de 30 fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -743,11 +901,11 @@
 "\n"
 "JunkLeft: JunkRight: JunkTop: JunkBottom: StrictBreaks: MetricPlane: Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Detección de entrelazado:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -759,7 +917,7 @@
 "Si se habilita un filtro de desentrelazado, solo se desentrelazarán los \n"
 "cuadros que este filtro encuentre entrelazado."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -771,11 +929,11 @@
 "Modo: Métrica espacial: Trilla de movimiento: Trilla espacial: Modo de filtro de máscara:\n"
 "Trilla del bloque: Ancho del bloque: Altura del bloque"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Desentrelazado:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -787,11 +945,11 @@
 "El filtro de despeinado admite una variedad de algoritmos de interpolación.\n"
 "El filtro de desentrelazado es un desentrelazador clásico de YADIF.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Desentrelazado predefinido:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -803,11 +961,11 @@
 "El filtro de despeinado admite una variedad de algoritmos de interpolación.\n"
 "El filtro de desentrelazado es un desentrelazador clásico de YADIF.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Desbloquear:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Filtro de Desbloqueo:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -815,11 +973,25 @@
 "El filtro de desbloqueo elimina un tipo común de artefacto de compresión.\n"
 "Si su fuente muestra \"bloqueo\", este filtro puede ayudar a limpiarlo."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Afinar Desbloqueo:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Formato de cadena de filtro de desbloqueo personalizado\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Filtro Denoise:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -829,15 +1001,15 @@
 "El grano de la película y otros tipos de ruido de alta frecuencia son difíciles de comprimir.\n"
 "El uso de este filtro en dichas fuentes puede resultar en tamaños de archivo más pequeños."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Denoise predefinido:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Atenuacion de ruido:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -847,11 +1019,11 @@
 "\n"
 "SpatialLuma: SpatialChroma: TemporalLuma: TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Filtro Afilar:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -859,47 +1031,47 @@
 "El filtro de nitidez mejora los bordes y otros \n"
 "componentes de alta frecuencia en el video."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Afilado predefinido:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Afilado preciso:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Filtro Rotar:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Gire el video hacia la derecha en incrementos de 90 grados."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Escala de grises"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Si está habilitado, elimina los componentes de color del video."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Codificador de video:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Codificadores de video disponibles."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Tasa de fotogramas:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -911,19 +1083,19 @@
 "Se recomienda \"Igual que la fuente\". Si su fuente de video tiene\n"
 "una tasa de fotogramas variable, 'Igual que la fuente' la conservará."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Velocidad de fotograma constante"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Selecciona una Tasa de fotogramas constante."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Velocidad de fotograma variable"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -935,11 +1107,11 @@
 "\n"
 "VFR no es compatible con algunos reproductores."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Tasa de fotogramas variable"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -949,7 +1121,7 @@
 "\n"
 "No es compatible con algunos reproductores."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -977,15 +1149,15 @@
 "La escala de FFMpeg y Theora es más lineal.\n"
 "Estos codificadores no tienen un modo sin pérdidas."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Calidad constante:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Tasa de bits (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -999,11 +1171,11 @@
 "Pero el promedio durante una larga duración será el valor establecido aquí. Si necesitas\n"
 "limitar la tasa de bits instantánea, consulte las configuraciones vbv-bufsize y vbv-maxrate de x264."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Codificación en 2 pasadas"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1016,11 +1188,11 @@
 "Previamente hay que seleccionar la opcion 'Tasa de bits'. Durante la 1ª pasada, las estadísticas sobre los videos son recogidos. Luego, en la segunda pasada, se usan esas estadísticas.\n"
 "para tomar decisiones de asignación de bits."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Primera pasada rapida"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1028,44 +1200,27 @@
 "Aplica ajustes que aceleran la primera pasada de la codificación en dos "
 "pasadas."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Usar Opciones Avanzadas"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Use la pestaña Opciones avanzadas para la configuración x264.\n"
-"\n"
-"¡Úselo bajo su propio riesgo!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Preset:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"Ajusta la configuración del codificador para compensar la eficiencia de compresión con la velocidad de codificación.\n"
+"Ajusta la configuración del codificador para compensar la eficiencia de la compresión con la velocidad de codificación.\n"
 "\n"
 "Esto establece la configuración predeterminada del codificador.\n"
-"Tonos, perfiles, niveles y cadenas de opciones avanzadas se aplicarán a esto.\n"
-"Por lo general, debe configurar esta opción a la más lenta que pueda soportar, ya que las configuraciones más lentas darán como resultado archivos de mejor calidad o más pequeños."
+"A esto se le aplicarán afinados, perfiles, niveles y opciones extra.\n"
+"Por lo general, debe establecer esta opción en lo más lento que pueda soportar, ya que más lento\n"
+"La configuración dará como resultado archivos de mejor calidad o más pequeños."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Afinar:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1079,11 +1234,11 @@
 "establecer características del archivo de salida. Los cambios se aplicarán después\n"
 "del preajuste, pero antes de todos los demás parámetros."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Decodificación rápida"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1093,11 +1248,11 @@
 "\n"
 "Configúralo si tu dispositivo está teniendo problemas para reproducir la salida (fotogramas eliminados)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Latencia cero"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1113,11 +1268,11 @@
 "Dado que HandBrake no es adecuado para transmisiones en vivo,\n"
 "Esta configuración es de poco valor aquí."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Perfil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1127,11 +1282,11 @@
 "\n"
 "Anula todos los demás Ajustes."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Nivel:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1141,11 +1296,11 @@
 "\n"
 "Anula todos los demás Ajustes."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Mas ajustes:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1155,56 +1310,45 @@
 "\n"
 "Lista separada por dos puntos de las opciones de codificador."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Lista de Pistas"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Mostrar lista de pistas de audio de salida"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Selección de pistas"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Mostrar opciones de selección de pistas de origen"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Añadir"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Añadir nuevos ajustes de audio a la lista"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Añadir todo"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Añadir todas las pistas de audio a la lista"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Recargar las pistas de audio por defecto"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Lista de Pistas"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Modo de selección:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Seleccione qué pistas de audio de la fuente se usaran."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1212,135 +1356,135 @@
 "Cree una lista de idiomas para los que desea seleccionar audio.\n"
 "Las pistas que coincidan con estos idiomas se seleccionarán usando el Modo de selección elegido."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Idiomas disponibles"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Idiomas seleccionados"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Usar solo el primer codificador para audio secundario"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 "Solo la pista de audio principal se codificará con la lista completa de codificadores.\n"
 "Todas las demás pistas de salida de audio secundarias se codificarán solo con el primer codificador."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Copia directa automática:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítalo si tu dispositivo de reproducción es compatible con MP3.\n"
-"Esto permite que se seleccione la transferencia de MP3 cuando está activada la selección automática de transferencia."
+"Habilite esto si su dispositivo de reproducción es compatible con MP3.\n"
+"Esto permite seleccionar el passthru MP3 cuando la selección de passthru automática está habilitada."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción admite AAC.\n"
-"Esto permite que se seleccione AAC passthru cuando se habilita la selección automática de passthru."
+"Habilite esto si su dispositivo de reproducción es compatible con AAC.\n"
+"Esto permite seleccionar el paso a través de AAC cuando la selección de paso automático está habilitada."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción es compatible con AC-3.\n"
-"Esto permite que se seleccione AC-3 passthru cuando la selección automática de passthru está habilitada."
+"Habilite esto si su dispositivo de reproducción es compatible con AC-3.\n"
+"Esto permite seleccionar el paso a través AC-3 cuando la selección de paso automático está habilitada."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción admite DTS.\n"
-"Esto permite seleccionar DTS passthru cuando la selección automática de passthru está habilitada."
+"Habilite esto si su dispositivo de reproducción es compatible con DTS.\n"
+"Esto permite seleccionar DTS passthru cuando la selección de passthru automática está habilitada."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción es compatible con DTS-HD.\n"
-"Esto permite que se seleccione DTS-HD passthru cuando se habilita la selección automática de passthru."
+"Habilite esto si su dispositivo de reproducción es compatible con DTS-HD.\n"
+"Esto permite seleccionar el passthru DTS-HD cuando la selección de passthru automática está habilitada."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción es compatible con EAC-3.\n"
-"Esto permite que se seleccione EAC-3 passthru cuando se habilita la selección automática de passthru."
+"Habilite esto si su dispositivo de reproducción es compatible con EAC-3.\n"
+"Esto permite seleccionar el paso a través EAC-3 cuando la selección de paso automático está habilitada."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción admite TrueHD.\n"
-"Esto permite que se seleccione TrueHD Passthru cuando se habilita la selección automática de Passthru."
+"Habilite esto si su dispositivo de reproducción es compatible con TrueHD.\n"
+"Esto permite seleccionar el passthru TrueHD cuando la selección de passthru automática está habilitada."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilítelo si su dispositivo de reproducción admite FLAC.\n"
-"Esto permite que se seleccione FLAC passthru cuando se habilita la selección automática de passthru."
+"Habilite esto si su dispositivo de reproducción es compatible con FLAC.\n"
+"Esto permite seleccionar el passthru FLAC cuando la selección de passthru automática está habilitada."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Codificador alternativo a la copia directa:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1348,80 +1492,80 @@
 "Configure el códec de audio para que se codifique cuando no se pueda "
 "encontrar una pista adecuada para la transferencia de audio."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Ajustes del codificador de Audio:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Cada pista de origen seleccionada se codificará con todos los codificadores "
 "seleccionados"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Codificador"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Tasa de bits / Calidad"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Mezcla"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Tasa de muestreo"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Ganancia"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Selección de pistas"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Mostrar lista de subtítulos de salida"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Añadir nuevos ajustes de subtítulos a la lista"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Añadir todas las pistas de subtítulos a la lista"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Escanear audio extranjero"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Añadir una pasada extra a la codificación que busca\n"
-"para los subtítulos candidatos que proporcionan subtítulos para\n"
+"Añadir un paso extra a la codificación que busca\n"
+"candidatos a subtítulos que proporcionan subtítulos para\n"
 "segmentos del audio que están en un idioma extranjero."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Recargar todos los ajustes de subtítulos por defecto"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Seleccione que pistas de subtítulos de la fuente se usaran."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1435,45 +1579,45 @@
 "El primer idioma en esta lista es su idioma \"preferido\" y se usará para determinar\n"
 "la configuración de selección de subtítulos cuando haya audio extranjero."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Idioma preferido: Ninguno"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Añadir pasada de escaneo de audio extranjero"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Añada \"Escanear audio Extranjero\" cuando la pista de audio predeterminada sea su idioma preferido.\n"
-"Esta busqueda de pasadas encuentra secuencias cortas de audio extranjero y proporciona subtítulos para ellos.\n"
+"Añadir \"Escaneo de audio extranjero\" cuando la pista de audio predeterminada sea su idioma preferido.\n"
+"Este paso de búsqueda encuentra secuencias cortas de audio extranjero y les proporciona subtítulos.\n"
 "\n"
-"Esta opción requiere que se configure un idioma en la lista de Idiomas seleccionados."
+"Esta opción requiere que se establezca un idioma en la lista Idiomas seleccionados."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "Añadir pista de subtítulos si el audio predeterminado es extranjero"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Cuando la pista de audio predeterminada no sea su idioma preferido, agregue \n"
-"una pista de subtítulos.\n"
-"Esta opción requiere que se configure un idioma en la lista de Idiomas seleccionados."
+"Cuando la pista de audio predeterminada no sea su idioma preferido, añadir una pista de subtítulos.\n"
+"\n"
+"Esta opción requiere que se establezca un idioma en la lista Idiomas seleccionados."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Añadir subtítulos incrustados cuando estén disponibles"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1481,55 +1625,59 @@
 "Los subtítulos cerrados son subtítulos de texto que se pueden agregar a "
 "cualquier contenedor como una pista de subtítulos suave"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Modo de Incrustacion*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Establecer el comportamiento del subtítulo \"Incrustado\".\n"
+"Establece el comportamiento del subtítulo \"Incrustados\".\n"
 "\n"
 "Los subtítulos incrustados son parte del video y no se pueden desactivar durante la reproducción.\n"
-"¡Sólo se puede grabar una pista de subtítulos! Para evitar conflictos se elige el primero."
+"¡Solo se puede grabar una pista de subtítulos! Dado que pueden ocurrir conflictos, el primero elegido gana."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Incrustacion para reproductores deficientes*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "Subtitulos de DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Incrustar la primera pista de subtítulos de DVD seleccionada. Todas las demás pistas de subtítulos de DVD serán descartadas. Use esta opción si el software o dispositivo de su reproductor no admite subtítulos de DVD.\n"
-"¡Sólo se puede incrustar una pista de subtítulos! Para evitar conflictos el primero sera elegido."
+"Grabe la primera pista de subtítulos de DVD seleccionada. Todas las demás pistas de subtítulos de DVD se descartarán.\n"
+"Use esta opción si el software o dispositivo de su reproductor no admite subtítulos de DVD.\n"
+"\n"
+"¡Solo se puede grabar una pista de subtítulos! Dado que pueden ocurrir conflictos, el primero elegido gana."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Subtitulos Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Incrustar la primera pista de subtítulos Blu-ray seleccionada. Todas las demás pistas de subtítulos de Blu-ray se descartarán. Use esta opción si el software o dispositivo de su reproductor no es compatible con los subtítulos de Blu-ray.\n"
-"¡Sólo se puede incrustar una pista de subtítulos! Para evitar conflictos el primero sera elegido."
+"Grabe la primera pista de subtítulos de Blu-ray seleccionada. Todas las demás pistas de subtítulos de Blu-ray se descartarán.\n"
+"Use esta opción si el software o dispositivo de su reproductor no admite subtítulos en Blu-ray.\n"
+"\n"
+"¡Solo se puede grabar una pista de subtítulos! Dado que pueden ocurrir conflictos, el primero elegido gana."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1537,7 +1685,7 @@
 "* Solo se aplicará una de las opciones de incrustacion de subtítulos "
 "anteriores, comenzando por la primera"
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1545,683 +1693,244 @@
 "Sólo se puede incrustar una pista de subtítulos! Dado que los conflictos "
 "pueden ocurrir, el primero sera el elegido."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Subtitulos"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Fotogramas de Referencia:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Los valores sanos van del 1-6. Cuanto más agregue, mejor será la compresión, pero más lenta será la codificación. \n"
-"La animación tiende a requerir de más fotogramas de referencia mucho más que el contenido de la película. \n"
-"Tenga en cuenta que muchos dispositivos de hardware tienen limitaciones en la cantidad de fotogramas de referencia compatibles, por lo que si está codificando para una consola portátil o un reproductor independiente, ¡No toque esto a menos que sepa lo que está haciendo!"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Maximos fotogramas-B:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Los valores sanos van del 2-5. Esto especifica el número máximo de fotogramas B secuenciales que el codificador puede usar.\n"
-"\n"
-"Por lo general, los números grandes no ayudan significativamente a menos que los fotogramas B adaptables estén establecidos en Optimo. El material fuente animado por Cel y la pirámide B también aumentan significativamente la utilidad de valores más grandes.\n"
-"\n"
-"El perfil de línea base, como se requiere para iPods y dispositivos similares, requiere que los fotogramas B se configuren en 0 (apagado)."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Fotogramas B piramidales:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"La pirámide B mejora la compresión al crear una estructura piramidal (de ahí el nombre)\n"
-"de fotogramas B, permitiendo que los fotogramas B se refieran entre sí para mejorar la compresión.\n"
-"\n"
-"Requiere fotogramas B maximos mayor que 1; Se recomienda el uso de fotogramas B adaptativos óptimos para obtener un beneficio de compresión total."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Fotogramas P ponderados:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Realiza análisis adicionales para decidir los parámetros de ponderación para cada fotograma.\n"
-"\n"
-"Esto mejora ligeramente la compresión general y mejora en gran medida la calidad del desvanecimiento.\n"
-"\n"
-"El perfil de línea base, como se requiere para iPods y dispositivos similares, requiere que se desactive la predicción de fotograma P ponderada. Tenga en cuenta que algunos dispositivos y reproductores, incluso los que son compatibles con el perfil principal, pueden tener problemas con la predicción de fotograma P ponderado: el Apple TV es completamente incompatible con él, por ejemplo."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "Transformacion 8x8"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"La transformación 8x8 es la característica más útil de x264 en términos de compresión por velocidad.\n"
-"\n"
-"Mejora la compresión en al menos un 5% a un costo de velocidad muy pequeño y puede proporcionar un beneficio de calidad visual inusualmente alto en comparación con su ganancia de compresión. Sin embargo, requiere un perfil alto, que muchos dispositivos pueden no admitir."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "Codificación de entropía CABAC"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"Una vez que el codificador ha hecho su trabajo, tiene una gran cantidad de datos que deben comprimirse sin pérdida, de forma similar a ZIP o RAR. H.264 proporciona dos opciones para esto: CAVLC y CABAC. CABAC decodifica mucho más lento pero se comprime mejor (10-30%), especialmente a tasas de bits más bajas.\n"
-"\n"
-"Si está buscando minimizar los requisitos de la CPU para la reproducción de video, desactive esta opción.\n"
-"El perfil de línea base, como se requiere para iPods y dispositivos similares, requiere que CABAC esté deshabilitado."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Características de codificación"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Metodo de Estimación de Movimiento:"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Controla el método de estimación de movimiento.\n"
-"\n"
-"La estimación de movimiento es cómo el codificador estima cómo se ha movido cada bloque de píxeles en un fotograma.\n"
-"Un mejor método de búsqueda de movimiento mejora la compresión a costa de la velocidad.\n"
-"\n"
-"Hay cinco metodos:\n"
-"Diamante: Realiza una búsqueda extremadamente rápida y simple utilizando un patrón de diamante.\n"
-"Hexágono: Realiza una búsqueda algo más efectiva pero ligeramente más lenta usando un patrón hexagonal.\n"
-"Desigual Multi-Hex: Realiza una búsqueda muy amplia utilizando una variedad de patrones, capturando con mayor precisión el movimiento complejo.\n"
-"Exhaustivo: Realiza una búsqueda \"tonta\" de cada píxel en un área amplia. Significativamente más lento para sólo una pequeña ganancia de compresión.\n"
-"Exhaustivo transformado: Como exhaustivo, pero toma decisiones aún más precisas. Por consiguiente, algo más lento, también para solo una pequeña mejora."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Estimación de movimiento de Subpixel:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Esta configuración controla tanto la estimación de movimiento de precisión de subpixel como los métodos de modo de codificacion.\n"
-"\n"
-"La estimación de movimiento de subpíxeles se utiliza para refinar las estimaciones de movimiento más allá de la mera precisión de píxeles, mejorando la compresión. El modo de codificacion es el método utilizado para elegir cómo codificar cada bloque de pixeles: una decisión muy importante.\n"
-"SAD es el método más rápido, seguido de SATD, RD, refinamiento de RD y el más lento, QPRD.\n"
-"Se recomienda encarecidamente 6 o superior: Psy-RD, una optimización psy muy poderosa que ayuda a retener los detalles, requiere RD.\n"
-"11 deshabilita todas las terminaciones tempranas en el análisis.\n"
-"10 y 11, las opciones más potentes y más lentas, requieren cuantificación adaptativa (aq-mode> 0) y trellis 2 (siempre)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Rango de Estimacion de movimiento:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"Esta es la distancia de las búsquedas x264 desde su conjetura inicial en el\n"
-"Movimiento de un bloque para tratar de encontrar su movimiento real.\n"
-"\n"
-"El valor predeterminado está bien para la mayoría de los contenidos, pero el video con movimiento extremadamente alto, especialmente en resoluciones de alta definición, puede beneficiarse de rangos más altos, aunque a un costo de alta velocidad."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Modo Directo Adaptativo:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 permite dos modos de predicción diferentes, Espaciales y Temporales, en fotogramas-B.\n"
-"\n"
-"Espacial, el valor predeterminado, casi siempre es mejor, pero Temporal también es útil a veces. x264 puede, a costa de una pequeña cantidad de velocidad (y en consecuencia para una pequeña ganancia de compresión), seleccionar de forma adaptativa cuál es mejor para cada fotograma en particular."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Fotogramas B Adaptativos:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 tiene una variedad de algoritmos para decidir cuándo usar fotogramas-B y cuántos usar.\n"
-"\n"
-"El modo rápido lleva aproximadamente la misma cantidad de tiempo, sin importar cuántos fotogramas B especifique. Sin embargo, aunque rápido, sus decisiones son a menudo subóptimas.\n"
-"\n"
-"El modo óptimo se vuelve más lento a medida que aumenta el número máximo de fotogramas-B, pero toma decisiones mucho más precisas, especialmente cuando se usa con piramidal-B."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Particiones:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"El modo de codificacion elige entre una variedad de opciones para tomar su decisión: esta opción elige qué opciones son.\n"
-"\n"
-"Menos particiones para verificar significa una codificación más rápida, a costa de peores decisiones, ya que la mejor opción podría haber sido la que se desactivó."
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Enrejado:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Enrejado ajusta con precisión el redondeo de los coeficientes de transformación para exprimir un 3-5% más de compresión a costa de cierta velocidad.\n"
-"\n"
-"\"Siempre\" usa el enrejado no solo durante el proceso de codificación principal, sino también durante el análisis, lo que mejora aún más la compresión, aunque a un costo de gran velocidad.\n"
-"\n"
-"Enrejado cuesta más velocidad a tasas de bits más altas y requiere CABAC."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analisis"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Fuerza de cuantificación adaptativa:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"La cuantización adaptativa controla cómo el codificador distribuye los bits en el fotograma.\n"
-"\n"
-"Los valores más altos quitan más bits de los bordes y las áreas complejas para mejorar las áreas con detalles más finos."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Tasa de Distorsión psicovisual:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"La Tasa de optimización psicovisual aprovecha las características de la visión humana\n"
-"para mejorar el detalle y la nitidez aparentes.\n"
-"El efecto se puede hacer más débil o más fuerte ajustando la fuerza.\n"
-"Al ser un algoritmo RD, requiere que el modo de decisión sea al menos \"6\"."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Enrejado Psicovisual:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"El enrejado psicovisual es un algoritmo experimental para mejorar aún más la nitidez y la retención de los detalles más allá de lo que hace Psicovisual RD.\n"
-"\n"
-"Los valores recomendados son de alrededor de 0.2, aunque los valores más altos pueden ayudar a los videos muy granulados o codificaciones de tasa de bits más bajas. No se recomienda para la animación de Cel y otros gráficos de bordes afilados."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Desbloqueo: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"Filtro de desbloqueo H.264.\n"
-"\n"
-"h.264 tiene un filtro de desbloqueo incorporado que suaviza los artefactos de bloqueo después de decodificar cada fotograma. Esto no solo mejora la calidad visual, sino que también ayuda a la compresión significativamente. El filtro de desbloqueo requiere una gran cantidad de potencia de la CPU, por lo que si está buscando minimizar los requisitos de la CPU para la reproducción de video, desactívelo.\n"
-"\n"
-"El filtro de desbloqueo tiene dos parámetros ajustables, \"fuerza\" (Alfa) y \"umbral\" (Beta).\n"
-"El primero controla qué tan fuerte (o débil) es el desbloqueador, mientras que el segundo controla a cuántos (o pocos) bordes aplica. Los valores más bajos significan menos desbloqueo, los valores más altos significan más desbloqueo.\n"
-"El valor predeterminado es 0 (fuerza normal) para ambos parámetros."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Desactivar el diezmado de la DCT"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"x264 normalmente elimina los bloques de datos casi vacíos para guardar los bits y usarlos mejor para otro propósito en el video. Sin embargo, esto a veces puede tener efectos negativos leves en la retención de grano sutil y dither.\n"
-"\n"
-"No toque esto a menos que tenga problemas con las bandas u otros casos similares en los que tenga problemas para mantener un ruido fino."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psicovisual"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"Las opciones seleccionadas aparecerán aquí.\n"
-"Puede editar estos y agregar opciones adicionales.\n"
-"\n"
-"Los valores predeterminados no se mostrarán. Los valores predeterminados son:\n"
-"ref = 3: bframes = 3: b-adapt = fast: direct = spatial:\n"
-"b-pirámide = normal: weightp = 2: me = hex: merange = 16:\n"
-"subme = 7: particiones = p8x8, b8x8, i8x8, i4x4: 8x8dct = 1:\n"
-"deblock = 0,0: enrejado = 1: psy-rd = 1,0: aq-strength = 1.0:\n"
-"no-fast-pskip = 0: no-dct-decimate = 0: cabac = 1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr ""
-"Cadena de opciones avanzadas para el codificador x264"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Video Avanzado"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Marcadores de capítulos"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Añadir marcadores de capítulos al archivo de salida."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Indice"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Duración"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titulo"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Capítulos"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Titulo:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Actores:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Director:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Fecha de lanzamiento:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Comentario:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Genero:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Argumento:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Ajustes"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Marca la codificación de la cola seleccionada como pendiente.\n"
-"Restablece el trabajo en cola a pendiente y listo para volver a ejecutarse."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Recargar todo"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Marca todas las codificaciones de la cola como pendientes.\n"
-"Restablece todos los trabajos en cola a pendientes y listos para volver a ejecutarse."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Borrar todo"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Borrar todas las codificaciones de la cola."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Guardar cola"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Guardar la cola actual de trabajos de codificación en un archivo.\n"
-"Este archivo se puede volver a cargar en un momento posterior para editar sus trabajos y volver a codificar."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Cargar archivo de cola"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Cargue un archivo de cola previamente guardado."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Guardar como:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Nombre de archivo de destino para su codificación."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "En:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Directorio de destino para su codificación."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Directorio de destino"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "OK"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Añadir multiples títulos a la cola"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Limpiar todo"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Desmarcar todos los títulos"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "Archivos de destino OK. No se detectaron duplicados."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Buscar actualizaciones automáticamente"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Cuando todos los códigos estén completos"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 "Asignar el nombre de archivo automáticamente (nombre original modificado)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+"Crear un nombre de archivo de destino a partir del nombre de archivo de "
+"origen o la etiqueta de volumen"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Plantilla para la asignación automática"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"Opciones disponibles: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Opciones disponibles: {source-path} {source} {title} {preset} {chapters} "
+"{date} {time} {creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 "Use la extensión de archivo compatible con iPod/iTunes (.m4v) para MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Número de vistas previas"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Filtrar títulos cortos (segundos)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filtrar títulos cortos de DVD y Blu-ray (segundos)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+"Borrar elementos de la cola de completados después de que se complete una "
+"codificación"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"De forma predeterminada, los trabajos completados permanecen en la cola y se marcan como completados.\n"
+"Marque esto si desea que la cola se limpie eliminando los trabajos completados."
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "General"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Nivel de detalle en la escala de calidad constante"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Usar la biblioteca dvdnav (en lugar de libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Controlar el espacio libre en el disco de destino"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 "Detener la codificación si el espacio libre en el disco cae por debajo del "
 "límite"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB Limite"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 "Guardar los registros de codificación en la misma ubicación que la película"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Nivel de detalle de los registros de actividad"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Caducidad de los registros de actividad"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Reducir las vistas previas de alta definición"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Escanear automáticamente los DVD"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Escanea el DVD cada vez que se carga un nuevo disco"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Tamaño de fuente de la ventana de actividad"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Ocultar la pestaña de Vídeo avanzado"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Use opciones de Video avanzado bajo su propio riesgo.\n"
-"Recomendamos que use los controles disponibles en la pestaña Vídeo en su lugar."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Borrar las codificaciones finalizadas de la cola"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"De forma predeterminada, los trabajos completados permanecen en la cola y se marcan como completados.\n"
-"Marque esto si desea que la cola se limpie eliminando los trabajos completados."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Usar los mismos ajustes para todos los títulos en un lote"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2232,72 +1941,68 @@
 "\n"
 "Desactive esta opción si desea permitir cambiar el ajuste de cada título de forma independiente."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Mostrar Ajustes"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Mostrar HandBrake para Dummies"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Nombre de la carpeta:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Descripcion"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Renombrar Preajuste"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Descripcion"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Categoría:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 "Establece la categoría en la que se mostrará este ajuste preestablecido."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Nombre de la categoría:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Nombre del PreAjuste:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Preajuste por defecto"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Establecer el Preset como predeterminado cuando se inicie HandBrake"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Dimensiones de imagen personalizadas"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Dimensiones"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Ancho máximo:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Habilitar el límite de ancho máximo."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2308,15 +2013,15 @@
 "\n"
 "Cuando se carga una nueva fuente, este valor se aplicará si el ancho de la fuente es mayor. Establecer esto en 0 significa que no hay ancho máximo."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Altura máxima:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Habilitar el límite máximo de altura."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2327,11 +2032,15 @@
 "\n"
 "Cuando se carga una nueva fuente, este valor se aplicará si la altura de la fuente es mayor. Poner esto a 0 significa que no hay altura máxima."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Vista previa de HandBrake"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Seleccionar los fotogramas de vista previa."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2339,80 +2048,110 @@
 "Codifique y reproduzca una secuencia corta de video a partir de la posición "
 "de vista previa actual."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Duracion:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Establecer la duración de la vista previa en vivo en segundos."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Mostrar Recorte"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Mostrar área recortada de la vista previa"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Resolucion original"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 "Restablecer ventana de vista previa a la resolución del video original"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Número de título:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Dispositivos de DVD detectados:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importar SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Habilitar configuraciones para importar un archivo de subtítulos SRT"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importar SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Habilite la configuración para importar un archivo de subtítulos SSA"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Lista de subtítulos incrustados"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Habilitar la configuración para seleccionar subtítulos incrustados"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Pista de la fuente"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Lista de subtítulos disponibles de su fuente."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Nombre de la pista:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Establece el nombre de la pista de subtítulos.\n"
+"\n"
+"Los reproductores pueden usar esto en la lista de selección de subtítulos."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Código de caracteres"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Archivo:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Compensar (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2420,7 +2159,7 @@
 "Establece el idioma de este subtítulo. Este valor será usado por los "
 "reproductores en los menús de subtítulos."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2432,37 +2171,29 @@
 "\n"
 "Los SRT vienen en todos los sabores de conjuntos de caracteres. Traducimos el conjunto de caracteres a UTF-8. El código de caracteres de la fuente es necesario para realizar esta traducción."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Seleccione el archivo SRT a importar."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Archivo SRT"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importar archivo"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 "Ajuste el desplazamiento en milisegundos entre las marcas de tiempo de video"
 " y SRT"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Pista"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Lista de subtítulos disponibles de su fuente."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Solo subtítulos forzados"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Incrustar en el video"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2470,23 +2201,15 @@
 "Renderiza el subtítulo sobre el video. \n"
 "El subtítulo será parte del video y no podrá ser deshabilitado."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Establecer pista por defecto"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Pista de la fuente"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Lista de pistas de audio disponibles de su fuente."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Nombre de la pista:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2496,15 +2219,15 @@
 "\n"
 "Los reproductores pueden usar esto en la lista de selección de audio."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Mezcla"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Frecuencia de muestreo"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2516,31 +2239,31 @@
 "Para la fuente de audio que tiene un amplio rango dinámico (secuencias muy fuertes y muy suaves), \n"
 "DRC le permite \"comprimir\" el rango haciendo que los sonidos fuertes sean más suaves y los sonidos suaves más fuertes."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Ajuste el códec de audio para codificar esta pista."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Habilitar ajustes de tasa de bits"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Calidad"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Habilitar ajustes de calidad"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Establezca la tasa de bits para codificar esta pista."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
@@ -2548,19 +2271,19 @@
 "Calidad:Para codecs de salida que lo soportan, ajuste la calidad de "
 "la salida."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Ajuste la mezcla de la pista de audio de salida."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Ajuste la frecuencia de muestreo de la pista de audio de salida."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2569,186 +2292,73 @@
 "de audio de salida."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Desactivado"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Omitir esta versión"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Recordarme más tarde"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "¡Una nueva versión de HandBrake está disponible!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx ya está disponible (tienes yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Notas de lanzamiento"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Transcodificador de video"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake es una herramienta para convertir videos de casi cualquier formato"
-" a una selección de códecs modernos y ampliamente compatibles."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Razones por las que te encantará HandBrake:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Convierte videos desde casi cualquier formato"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Libre y de código abierto"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multi-plataforma (Windows, Mac y Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Ventana principal y resumen de ajustes"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Ajustes de Resolución y Recorte de video"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Ajustes del codificador de video"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Selección y configuración de pistas de audio"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Edicion del Título del capítulo"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Incapaz de crear%s.</big>\n"
-"\n"
-"Error interno. No se pudo analizar la descripción de la interfaz de usuario.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Indice"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Duración"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Titulo"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Informacion del trabajo"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Información de la pista"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Nombre preestablecido"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "El dispositivo o archivo a codificar"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Los valores preestablecidos a usar para la codificación"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Mucho Spam"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "La ruta para anular el directorio de configuración del usuario"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Abra una consola para la salida de depuración"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Todo"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Calidad: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Tasa de bits: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Tasa de bits: %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Passthrough"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2759,7 +2369,7 @@
 "DRC: %s\n"
 "Nombre de pista: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2768,7 +2378,7 @@
 "%sGanancia: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2776,7 +2386,7 @@
 "Añadir un codificador de audio.\n"
 "Cada pista de origen seleccionada se codificará con todos los codificadores seleccionados."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2784,39 +2394,39 @@
 "Calidad de audio:\n"
 "Para los codificadores que lo admiten, ajuste la calidad de la salida."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Eliminar este codificador de audio"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Cerrar HandBrake terminará la codificación.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "No seleccionado"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Escaneando ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Parar escaneado"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Titulo no encontrado"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Nuevo Vídeo"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2827,438 +2437,437 @@
 "\n"
 "%sen%d segundos ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%ssu película se perderá si no sigues codificando."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Cancelar actual y detener"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Cancelar y Comenzar siguiente"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Finalizar y después detener"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Seguir codificando"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d codificacion(es) pendiente(s)"
+msgid "%d encode pending"
+msgstr "%d codificacion pendiente"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d codificaciones pendientes"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "trabajo %dde %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "pasada %d(exploración de subtítulos) de %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "pasada %d de %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr "Codificando: %s%s%.2f%% (%.2f fps, avg %.2f fps,ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Codificando: %s%s%.2f%% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Codificando: %s%s%.2f%%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Buscando la hora de inicio, "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Escaneando titulo %d de %d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Escaneando titulo %d de %d vista previa %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "¡Codificación Realizada!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Codificación Cancelada."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Ha fallado la codificación."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Muxing: Esto puede tomar un tiempo ..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Escanear esta fuente de DVD"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s:%.4g(Aviso: Sin pérdida)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s ya está disponible (tienes %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Codificación Completada"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "Deja ese cóctel, ¡Codificacion de HandBrake finalizada!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Su codificación está completada."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Apagando el equipo"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Poner el equipo en reposo"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Saliendo de Handbrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Primera pista que coincida con los idiomas seleccionados"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Todas las pistas que coincidan con los idiomas seleccionados"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Pista de subtítulos de audio extranjero"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Primera pista seleccionada"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Audio extranjero, luego primera pista seleccionada"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Capítulos:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Segundos:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Fotogramas:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "No hacer nada"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Mostrar Notificación"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Salir de Handbrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Poner el equipo en reposo"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Apagar el equipo"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Loose"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Personalizado"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "1 Semana"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "1 Mes"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "1 Año"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Nunca"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Diariamente"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Semanalmente"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Mensualmente"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Despeinado"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Unsharp"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Lapsharp"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 grados"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 grados"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 grados"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Espacial"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Temporal"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Rapido"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optima"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Estricto"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Sencillo"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Inteligente"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Hexágono"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Multi-Hexagono desigual"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Exhaustivo"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Hadamard Exhaustivo"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, sin subpixel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel en todos"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel en todos"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD en fotogramas I/P"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD en todos los fotogramas"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD refinado en fotogramas I/P"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD refinado en todos los fotogramas"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD en todos los fotogramas"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: No hay terminaciones tempranas en el análisis"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Más"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Algunos"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Todo"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Solo Codificar"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Siempre"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Igual que la fuente"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(Película NTSC)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(Película/Video PAL)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(Video NTSC)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds -(%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Sin Titulos"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Sin Audio"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Alguno"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3271,7 +2880,7 @@
 "Preajuste:\t%s\n"
 "Personalizado:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3282,7 +2891,7 @@
 "\n"
 "Preajuste:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3295,7 +2904,7 @@
 "Preajuste:\t%s\n"
 "Personalizado:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3306,7 +2915,7 @@
 "\n"
 "Preajuste:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3321,7 +2930,7 @@
 "Preajuste:\t%s\n"
 "Personalizado:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3334,7 +2943,7 @@
 "Filtro:\t%s\n"
 "Preajuste:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3351,7 +2960,7 @@
 "Afinar:\t%s\n"
 "Personalizado:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3368,8 +2977,7 @@
 "Afinar:\t%s\n"
 "Personalizado:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3381,18 +2989,29 @@
 "Debes elegir un codificador o contenedor de video diferente.\n"
 "Si continúas, FFMPEG será elegido para ti."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"Solo se admite VP8 o VP9 en el contenedor WebM.\n"
+"\n"
+"Debe elegir un códec o contenedor de video diferente.\n"
+"Si continúa, se elegirá uno por usted."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Continuar"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "No se ha encontrado ningún título.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3404,8 +3023,19 @@
 "Debes cambiar tus selecciones de subtítulos.\n"
 "Si continúas, se perderán algunos subtítulos."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"WebM en HandBrake solo admite subtítulos grabados.\n"
+"\n"
+"Debe cambiar sus selecciones de subtítulos.\n"
+"Si continúa, se perderán algunos subtítulos."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3417,8 +3047,7 @@
 "Debes elegir un archivo válido.\n"
 "Si continúas, este subtítulo será ignorado."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3430,7 +3059,7 @@
 "Debes elegir un codec de audio diferente.\n"
 "Si continúas, uno será elegido para ti."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3443,20 +3072,60 @@
 "Debes elegir un codec de audio diferente.\n"
 "Si continúas, uno será elegido para ti."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Incapaz de crear%s.</big>\n"
+"\n"
+"Error interno. No se pudo analizar la descripción de la interfaz de usuario.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Información de la pista"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Nombre preestablecido"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "El dispositivo o archivo a codificar"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Los valores preestablecidos a usar para la codificación"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Mucho Spam"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "La ruta para anular el directorio de configuración del usuario"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Abra una consola para la salida de depuración"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 "ghb_presets_menu_init: Error al encontrar la carpeta de ajustes "
 "preestablecidos."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 "Error al encontrar la carpeta principal cuando se agrega un elemento "
 "secundario."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3466,31 +3135,31 @@
 "\n"
 "¿Te gustaria continuar?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "¡Sácame de aquí!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Cargar copia de seguridad de Preajustes"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Todo (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Preajustes (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Preajustes heredados (* .plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Exportar Preajuste"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3501,15 +3170,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "Carpeta"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "preajuste"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3522,269 +3191,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Segundos"
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr "%s (Modificado)"
 
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Fotogramas"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Alinear A/V"
 
-#: ../src/queuehandler.c:228
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (Titulo %d,%s %dmediante %d, 2 pases de video) "
-"-->%s"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:236
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
-"<big>%s</big> (Titulo %d,%s%d mediante %d) --> %s"
+"%d%d%d%dRecorte\n"
+"%dx%d Almacenamiento, %dx%d pantalla\n"
+"%d:%d Relación de aspecto de píxeles\n"
+"%sRelación de aspecto de pantalla"
 
-#: ../src/queuehandler.c:299
+#: src/queuehandler.c:358
 #, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Preajuste Modificado Basado en: %s\n"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Tasa de Bits %dkbps"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:363
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Preajuste: %s\n"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Tasa de Bits %dkbps (2 Pasadas)"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:370
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Formato: %sContenedor\n"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Calidad Constante %.4g (%s)"
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Opciones de contenedor:"
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sMarcadores de capitulo"
+msgid "%sPreset %s"
+msgstr "%sPreajuste %s"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:408
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%sSoporte para iPod 5G"
+msgid "%sTune %s"
+msgstr "%sAfinar%s"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:413
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sOptimizador web"
+msgid "%sProfile %s"
+msgstr "%sPerfil%s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:418
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destino: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Aspecto preservado)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Aspecto perdido)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamórfico)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Anamórfico personalizado)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Imagen: "
+msgid "%sLevel %s"
+msgstr "%sNivel%s"
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:435
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Fuente: %d x %d, Salida %d x %d %s, Recorte %d:%d:%d:%d"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Velocidad de fotogramas constante %s fps"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:439
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Monitor %dx %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtros:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"%s fps Velocidad máxima de fotogramas (puede ser menor)"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDestelecinado"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Velocidad de fotogramas variable %s fps"
 
-#: ../src/queuehandler.c:460
-#, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", Solo forzado"
 
-#: ../src/queuehandler.c:475
-#, c-format
-msgid "%sDenoise %s:"
-msgstr "%sDenoise %s:"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", Incrustado"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDesbloquear: %d"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", Por defecto"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sEscala de grises"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Completado"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Video: %s"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Cancelado"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(constante)"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Fallido"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(variable)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "Pendiente"
 
-#: ../src/queuehandler.c:526
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Fotogramas por segundo: %s%s"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%dDia %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:532
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Fotogramas por segundo: Pico %s (puede ser más bajo)"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Dias%02d:%02d:%02d"
 
-#: ../src/queuehandler.c:536
-#, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Fotogramas por segundo: %s (fotogramas por segundo constante)"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Error"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Tasa de bits:"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "1era pasada rapida: En\n"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "No Disponible"
 
-#: ../src/queuehandler.c:592
-#, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Opciones de Video: Preajuste: %s"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Búsqueda de audio extranjero"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Afinar: "
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Codificar"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Perfil: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Primera pasada de la codificación (análisis)"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Nivel: %s"
-
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Opciones Avanzadas: %s\n"
-
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Audio: "
-
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Pistas de audio: %d"
-
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Tasa de bits: %d"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Segunda pasada de la codificacion (final)"
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Codificador: %s"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Error"
 
-#: ../src/queuehandler.c:707
+#: src/queuehandler.c:1177
 #, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
-"%d - %s --> Codificador: %s, Mezcla: %s, Frecuencia de muestreo: %s,%s"
-
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Subtitulo: "
-
-#: ../src/queuehandler.c:737
-#, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Pistas de subtitulos: %d\n"
+"pasada %d de %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Solo Forzados)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Escaneando Titulo"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (Incrustar)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Codificación pausada"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (Por defecto)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Codificación en progreso"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr "%s, Tiempo apagado (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sEl sistema de archivos de destino está casi lleno: %<PRIu64>MB Libre.\n"
-"Destino: %s\n"
+"%sEl sistema de archivos de destino está casi lleno:%<PRId64> MB libres.\n"
+"Destino:%s\n"
 "La codificación puede estar incompleta si continúa.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Reanudar, he solucionado el problema"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Reanudar, no me lo digas de nuevo"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3797,11 +3418,11 @@
 "Otro trabajo en cola ha especificado el mismo destino.\n"
 "¿Quieres sobrescribir?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3812,7 +3433,7 @@
 "\n"
 "Este no es un directorio válido."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3823,7 +3444,7 @@
 "\n"
 "No se puede leer o escribir el directorio.."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3836,16 +3457,16 @@
 "El archivo ya existe.\n"
 "¿Quieres sobrescribiro?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Seleccione este título para agregar a la cola.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Sin Titulo"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3855,31 +3476,31 @@
 "Este título no se agregará a la cola a menos que cambie\n"
 "el nombre del archivo de salida.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Parar codificación"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "P_arar codificación"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Reanudar"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Reanudar la codificación"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "P_arar codificación"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Reanudar codificación"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3887,25 +3508,23 @@
 "Actualmente estás codificando. ¿Que te gustaría hacer?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Idioma preferido: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Añadir %s pista de subtítulos si el audio por defecto no es %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Agrega una pista de subtítulos si el audio predeterminado no es tu idioma "
 "preferido"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3918,8 +3537,7 @@
 "Opciones ampliadas:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3931,3 +3549,8 @@
 "\n"
 "Opciones ampliadas:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s:%.4g(Aviso: Sin pérdida)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/fr.po -> HandBrake-1.5.1.tar.xz/gtk/po/fr.po Changed

@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
@@ -8,16 +8,17 @@
 # Nicolas Moignot <nicolas@moignot.net>, 2019
 # Denis Chenu <contact@sondages.pro>, 2019
 # Alexis DESMONS, 2019
-# Tof Bouf, 2019
+# Thomas Robert <thomas.rob105@gmail.com>, 2021
+# Tof Bouf, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Translators\n"
+"Last-Translator: Tof Bouf, 2021\n"
 "Language-Team: French (https://www.transifex.com/HandBrakeProject/teams/92423/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,7 +26,7 @@
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -35,11 +36,11 @@
 "\n"
 "Les sous-titres font partie de la vidéo et ne pourront pas être désactivés."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Incrustés"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -57,11 +58,11 @@
 "Cela est utile pour créer une piste de sous-titres\n"
 "« forcée » dans votre fichier de sortie."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Défaut"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -77,11 +78,11 @@
 "afficher des sous-titres durant les scènes où quelqu'un parle\n"
 "une langue étrangère."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Forcés uniquement"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -97,11 +98,11 @@
 "ne coïncide pas avec le début de la vidéo.\n"
 "Ce réglage permet de synchroniser les fichiers."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "Décalage SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -127,55 +128,235 @@
 "langue étrangère. Cette option donne de meilleurs\n"
 "résultats en conjonction avec l'option « Forcés »."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Piste"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Ouvrir le répertoire source"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Ouvrir le répertoire de destination "
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Ouvrir le répertoire du journal d'encodage"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Ouvrir le journal d'encodage"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Réinitialiser les tâches échouées"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Réinitialiser toutes les tâches"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Effacer les tâches terminées"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Effacer toutes les tâches"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Importer la liste d'attente"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Exporter la liste d'attente"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Préréglages Handbrake"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Préréglages"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Choisir \"De_fault\""
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Sauvegarder"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
-msgstr "Sauvegarder_sous"
+msgstr "Sauvegarder _sous"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Supprimer"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importer"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exporter"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
-msgstr "Réinitialiser les préréglages enregistrés"
+msgstr "Réinitialiser les _préréglages enregistrés"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Liste des préréglages"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "File d'attente Handbrake"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "File d'attente"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 tâche en attente"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Commencer l'encodage"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Commencer"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Mettre en pause l'encodage"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pause"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Options"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Quand c'est terminé: "
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Réinitialiser"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Marquer les entrées sélectionnées de la file d’attente comme En attente.\n"
+"Met les tâches en attente et prêtes à être lancées."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Editer"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Actions"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Préréglage :"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Source :"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titre :"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Destination :"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensions :"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Vidéo :"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio :"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Sous-titres :"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Résumé"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Passe :"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr " Heure de début :"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Heure de fin :"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Durée de pause :"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Heure d'encodage :"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Taille du fichier :"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Statut :"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistiques"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Journal d'activité"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Journal d'activité de Handbrake"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "À propos de HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -183,361 +364,340 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Développeurs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake est un transcodeur vidéo multiplatforme et multithreadé sous "
 "licence GPL."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake est un logiciel gratuit ; vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU General Public License telle que publiée par la Free Software Foundation ; d'après la version 2 de la License, ou version ultérieure (si vous préférez).\n"
+"HandBrake est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier selon les termes de la GNU General Public License version 2, telle que publiée par la Free Software Foundation.\n"
 "\n"
-"HandBrake est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE ; sans même une garantie implicite de QUALITÉ MARCHANDE ou de CORRESPONDRE À UN BUT PARTICULIER. Se référer au GNU General Public License pour plus de détails.\n"
+"HandBrake est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE ; sans même une garantie implicite de QUALITÉ MARCHANDE ou de CORRESPONDRE À UN BUT PARTICULIER. Se référer à la GNU General Public License pour plus de détails.\n"
 "\n"
-"Vous devriez avoir reçu une copie du GNU General Public License avec Glade. Si tel n'est pas le cas, vous êtes priés d'écrire au Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Vous devriez avoir reçu une copie de la GNU General Public License avec Glade. Si tel n'est pas le cas, vous êtes priés d'écrire à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Fichier"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
-msgstr "Open_Source"
+msgstr "Ouvrir _Source"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
-msgstr "Ouvrir Titre_seul"
+msgstr "Ouvrir _Titre seul"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
-msgstr "Définir la destination"
+msgstr "Définir la _Destination"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
-msgstr "_Liste"
+msgstr "File d'attente"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
-msgstr "Ajouter_plusieurs"
+msgstr "Ajouter _plusieurs"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Commencer l'encodage"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Mettre en pause l'encodage"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "Sauvegarder la file d'attente"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "Charger le fichier de la file d'attente"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Visualiser"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "Handbrake pour les Nuls"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "_Liste des préréglages"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Prévisualisation"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Fenêtre d’activité"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_À propos"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guide"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Choisir la source vidéo"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
-msgstr "Open Source"
+msgstr "Ouvrir la Source"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
-msgstr "Ajouter à la liste"
+msgstr "Ajouter à la file d'attente"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
-msgstr "Ajouter à la liste"
+msgstr "Ajouter à la file d'attente"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Commencer l'encodage"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Commencer"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Mettre en pause l'encodage"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pause"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Afficher la fenêtre des préréglages"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Préréglages"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Afficher la fenêtre de prévisualisation"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Prévisualisation"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
-msgstr "Afficher la liste"
+msgstr "Afficher la file d'attente"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
-msgstr "Liste d'attente"
+msgstr "File d'attente"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Afficher la fenêtre d'activitée"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Activité"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
-msgstr "Source :"
+msgstr "Source :"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Vérification en cours..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titre : "
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
-"Définissez le titre à encoder. Par défaut, le titre le plus long est choisi."
-" C'est souvent le titre d'un DVD. "
+"Définissez le titre à encoder.\n"
+"Par défaut, le titre le plus long est choisi. C'est souvent le film sur un DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
-msgstr "Aucun titre "
+msgstr "Aucun titre"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
-msgstr "Angle"
+msgstr "Angle :"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
-"Pour les DVD avec multiples angles, sélectionner les angles à encoder."
+"Pour les DVD avec angles multiples, sélectionner les angles à encoder."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
-msgstr "Etendue\\:"
+msgstr "Intervalle :"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
-"Étendue du titre à coder. Il peut s'agir de chapitres, de secondes ou "
-"d'images. "
+"Intervalle du titre à encoder. Il peut s'agir de chapitres, de secondes ou "
+"d'images."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Définir le premier chapitre à encoder."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Définir le dernier chapitre à encoder."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
-msgstr "Préréglage:"
+msgstr "Préréglage :"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Choisir le préréglage"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Modifié"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Actualiser"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
-"Recharger les paramètres pour la présélection. Les modifications seront "
-"ignorées. "
+"Recharger les paramètres pour la présélection.\n"
+"Les modifications seront perdues."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Sauvegarder le nouveau préréglage"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Enregistrer les réglages actuels dans un nouveau préréglage."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Format :"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
-msgstr "Format vers les pistes encodées en mux. "
+msgstr "Format de multiplexage des pistes encodées. "
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Optimisé pour le web"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
-"Optimize la disposition du fichier MP4 pour un téléchargement progressif.\n"
+"Optimise la disposition du fichier MP4 pour un téléchargement progressif.\n"
 "Cela permet au lecteur de débuter la lecture avant la fin du téléchargement."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Aligner les démarrages A/V"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 "Aligne les balises temporelles initiales de tous les flux audio et vidéo en\n"
-"incorporant des images vides ou en supprimant des images. Peu améliorer la synchro\n"
+"incorporant des images vides ou en supprimant des images. Peut améliorer la synchro\n"
 "audio/vidéo pour les lecteurs dysfonctionnels qui ne respectent pas les listes d’édition MP4."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Gestion de l’iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Ajouter l'Atom pour iPod requis pour certains anciens iPods."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
-msgstr "Durée:"
+msgstr "Durée :"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
-msgstr "Pistes:"
+msgstr "Pistes :"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
-msgstr "Filtres:"
+msgstr "Filtres :"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
-msgstr "Taille:"
+msgstr "Taille :"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Sommaire"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Rognage auto"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Rogner automatiquement les bordures noires autour de la vidéo."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Rognage flexible"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -550,47 +710,47 @@
 "de pixels, ce paramètre recadrera quelques pixels supplémentaires\n"
 "au lieu de faire le recadrage exact et de mettre à l'échelle jusqu'au multiple requis."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
-msgstr "Rognage de gauche"
+msgstr "Rognage à gauche"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Rognage du haut"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Rognage du bas"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Rognage à droite"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
-msgstr "Dimensions de rognage :"
+msgstr "Dimensions de rognage :"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Rognage"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Optimal pour la source"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
-"Si activé, sélectionne la résolution pour un espace \"optimal\".\n"
-"Ce sera la résolution qui se rapprochera le plus de la résolution source après rognage. "
+"Si activé, sélectionne la résolution de stockage \"optimale\".\n"
+"Ce sera la résolution qui se rapprochera le plus de la résolution source après rognage."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
-msgstr "Largeur:"
+msgstr "Largeur :"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -598,11 +758,11 @@
 "C'est la largeur utilisée pour le stockage de la vidéo.\n"
 "Les dimensions d'affichage seront différentes si le rapport largeur/hauteur n'est pas 1:1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
-msgstr "Hauteur:"
+msgstr "Hauteur :"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -610,38 +770,38 @@
 "C'est la hauteur utilisée pour le stockage de la vidéo.\n"
 "Les dimensions d'affichage seront différentes si le rapport largeur/hauteur n'est pas 1:1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
-msgstr "Anamorphique :"
+msgstr "Anamorphique :"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 "Modes anamorphiques :\n"
 "<tt>\n"
-"Aucun - Force rapport largeur/hauteur de pixel de 1:1.\n"
-"Souple - Utilise un rapport largeur/hauteur de pixel qui est\n"
-" aussi proche que possible des pixels de la vidéo source\n"
-" tout en préservant le ratio d'affichage original.\n"
+"Aucun - Force rapport largeur/hauteur de pixel de 1:1.\n"
+"Souple - Utilise un rapport largeur/hauteur de pixel qui est\n"
+" aussi proche que possible des pixels de la vidéo source\n"
+" tout en préservant le ratio d'affichage original.\n"
 "Automatique - Utilise un rapport largeur/hauteur de pixel qui\n"
-" maximise la résolution de stockage tout en préservant\n"
-" le ratio d'affichage original</tt>"
+" maximise la résolution de stockage tout en préservant\n"
+" le ratio d'affichage original</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
-msgstr "Alignement:"
+msgstr "Alignement :"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -653,20 +813,20 @@
 "Ce réglage est nécessaire seulement pour la compatibilité avec certains appareils.\n"
 "Choisissez 2 sauf si vous rencontrez des problèmes de compatibilité. "
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Géométrie de stockage"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Garder l'aspect"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr "Si activé, l'aspect originel de l'image de la source sera maintenu."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -674,28 +834,28 @@
 "C’est la largeur d'affichage. C'est le résultat de la mise à l’échelle de la"
 " dimension de stockage en fonction de l’aspect des pixels."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Aspect des pixels :"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
-"Le rapport largeur/hauteur de pixel détermine la form des pixels.\n"
+"Le rapport largeur/hauteur de pixel détermine la forme des pixels.\n"
 "\n"
 "Un ratio de 1:1 correspond à un pixel carré. Les autres valeurs déterminent un\n"
 "aspect rectangulaire. Les lecteurs ajusteront l'affichage de l'image pour obtenir\n"
 "le ratio spécifié."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -705,27 +865,27 @@
 "Un ratio de 1:1 correspond à un carré. Les autres valeurs déterminent un rectangle.\n"
 "Les lecteurs ajusteront les dimensions pour correspondre à l'apparence spécifiée."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Aspect d’affichage :"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Géométrie d’affichage"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensions"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Détéléciné :"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -735,7 +895,7 @@
 "\n"
 "Le téléciné est un processus qui ajuste la fréquence des images de vidéos en 24 ips vers le NTSC en 30 ips."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -745,11 +905,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Détection de l’entrelacement :"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -761,7 +921,7 @@
 "Si un filtre de désentrelacement est activé, seules les images que ce filtre\n"
 "identifie comme entrelacées seront désentrelacées."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -773,43 +933,43 @@
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Désentrelacer :"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
 "The decomb filter supports a variety of interpolation algorithms.\n"
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
-"Choisissez le filtre de désentrelacement ou dépeignage.\n"
+"Choisissez le type de désentrelacement.\n"
 "\n"
-"Le filtre de désentrelacement gère un certain nombre d’algorithmes d’interpolation.\n"
-"Le filtre de désentrelacement est un désentrelaceur classique YADIF.\n"
+"Le filtre 'Désentrelacer' gère un certain nombre d’algorithmes d’interpolation.\n"
+"Le filtre 'Yadif' est un désentrelaceur classique YADIF.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Préréglage de désentrelacement :"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
 "The decomb filter supports a variety of interpolation algorithms.\n"
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
-"Choisissez les options de désentrelacement ou dépeignage.\n"
+"Choisissez les options de désentrelacement.\n"
 "\n"
-"Le filtre de désentrelacement gère un certain nombre d’algorithmes d’interpolation.\n"
-"Le filtre de désentrelacement est un désentrelaceur classique YADIF.\n"
+"Le filtre 'Désentrelacer' gère un certain nombre d’algorithmes d’interpolation.\n"
+"Le filtre 'Yadif' est un désentrelaceur classique YADIF.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Déblocage :"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Filtre anti-blocs :"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -817,11 +977,25 @@
 "Le filtre de déblocage supprime des artéfacts fréquents de compression.\n"
 "Si la source présente des macroblocs visibles, ce filtre peut aider à les nettoyer."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Réglage du filtre anti-blocs :"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Format de la chaîne de réglages personnels du filtre anti-blocs:\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Filtre de réduction de bruit :"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -831,15 +1005,15 @@
 "Le grain de films et autres types de bruits de haute fréquence sont difficiles à comprimer.\n"
 "L'utilisation de ces filtres sur ce type de source permet de réduire la taille de fichier."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Préréglage de la réduction de bruit :"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Ajustement de la réduction de bruit :"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -849,11 +1023,11 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Filtre d’accentuation :"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -861,47 +1035,47 @@
 "Le filtrage d’accentuation renforce les bords et \n"
 "autres composants de haute fréquence dans la vidéo."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Préréglage d’accentuation."
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Ajustements d’accentuation :"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Filtre de rotation :"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Rotation de la vidéo 90 degrés à la fois"
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Niveaux de gris"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Une fois activé, filtre les composants de couleurs de la vidéo."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtres"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Encodeur vidéo :"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Encodeurs vidéo disponibles."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Fréquence d’images :"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -913,19 +1087,19 @@
 "« Comme la source » est recommandé. Is votre vidéo de source a\n"
 "une fréquence variable, elle sera préservée avec « Comme la source »."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Fréquence d’images constante :"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Permet une fréquence d’image constante en sortie."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Pic de fréquence d’images (FIV)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -937,11 +1111,11 @@
 "\n"
 "FIV n’est pas compatible avec certains lecteurs."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Fréquence d’image variable"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -951,7 +1125,7 @@
 "\n"
 "IPSV (VFR) n'est pas compatible avec certains lecteurs."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -978,15 +1152,15 @@
 "L’échelle de FFMpeg et Theora est plus linéaire.\n"
 "Ces encodeurs n’ont pas de mode sans perte."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Qualité constante:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Débit binaire (kbps) :"
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -1000,11 +1174,11 @@
 "Mais la moyenne sur le long terme aura la valeur définie ici. Si vous avez besoin de\n"
 "limiter le débit bonaire instantané, ajustez les réglages x264 vvv-bufsize et vbv-maxrate."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Encodage en 2 passes"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1018,11 +1192,11 @@
 "statistiques de la vidéo seront obtenues. Lors de la 2nde passe, ces \n"
 "statistiques seront utilisées pour les décisions d'allocation de débit binaire."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Premier passage turbo"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1030,45 +1204,27 @@
 "Durant la 1ère passe d'un encodage en 2 passes, utiliser les réglages qui "
 "accélèrent les choses."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Utilisé les options avancées"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Utiliser l'onglet des options avancées pour les réglages x264.\n"
-"\n"
-"Utilisez à vos risques et périls !"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Préréglage :"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 "Ajuste les réglages de l’encodeur pour réduire l'efficacité de compression au profit de la vitesse d'encodage.\n"
 "\n"
 "Ceci établit les réglages par défaut de l'encodeur.\n"
-"Ajustements, profils, niveaux et chaînes d’options avancées seront appliqués en sus.\n"
-"En règle générale, vous devriez définir ces options au plus lent possible. puisque le plus\n"
-"lent l'endommage, meilleur est la qualité et plus petit est le fichier."
+"Ajustements, profils, niveaux et chaînes d’options supplémentaires seront appliqués en sus.\n"
+"En règle générale, vous devriez définir ces options au plus lent que vous puissiez supporter,\n"
+"car meilleur est la qualité et plus petit est le fichier final."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Ajustement :"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1082,11 +1238,11 @@
 "déterminer les caractéristiques du fichier de destination. Les modifications seront\n"
 "appliquées après le préréglage mais avant les autres paramètres."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Décodage accéléré"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1096,11 +1252,11 @@
 "\n"
 "À activer si votre appareil a du mal à lire le résultat (images passées)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Latence nulle"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1116,11 +1272,11 @@
 "Comme HandBrake n'est pas adapté à la diffusion par flux en direct,\n"
 "ce réglage a peu de valeur ici."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1130,11 +1286,11 @@
 "\n"
 "Outrepasse tous les autres réglages."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Niveau:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1144,11 +1300,11 @@
 "\n"
 "Outrepasse tous les autres réglages."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Plus de paramètres:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1158,56 +1314,45 @@
 "\n"
 "Liste séparée par des virgules des options d'encodage."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Liste des pistes "
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Afficher la liste des pistes audio en sortie"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Sélection de piste"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Afficher les options de sélection de piste source"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Ajouter les réglages audio à la liste"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Tout ajouter"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Ajouter toutes les pistes audio à la liste"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Recharger les réglages audio depuis les valeurs par défaut"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Liste des pistes "
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Comportement des sélections :"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Choisissez quelles pistes audio du média source à utiliser"
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1215,134 +1360,136 @@
 "Créez une liste de toutes les pangs pour lesquelles vous voulez sélectionner l’audio.\n"
 "Les pistes correspondantes seront sélectionnées en fonction du choix de Comportement de sélction."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Enlever"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Langues disponibles"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Langues sélectionnées"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 "Utiliser uniquement le premier encodeur pour la piste audio secondaire"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
-msgstr "Débit binaire/Qualité"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+"Seule la piste audio primaire sera encodée avec la liste complète d'encodeurs.\n"
+"Toutes les autres pistes audio secondaires seront encodées avec le premier encodeur uniquement."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Recopie auto :"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le MP3.\n"
-" Cela permet la sélection de la recopie de la piste MP3 lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste MP3 lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le AAC.\n"
-" Cela permet la sélection de la recopie de la piste AAC lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste AAC lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le AC-3.\n"
-" Cela permet la sélection de la recopie de la piste AC-3 lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste AC-3 lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le DTS.\n"
-" Cela permet la sélection de la recopie de la piste DTS lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste DTS lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le DTS-HD.\n"
-" Cela permet la sélection de la recopie de la piste DTS-HD lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste DTS-HD lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le EAC-3.\n"
-" Cela permet la sélection de la recopie de la piste EAC-3 lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste EAC-3 lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le TrueHD.\n"
-" Cela permet la sélection de la recopie de la piste TrueHD lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste TrueHD lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Activer ceci si l’appareil de lecture gère le FLAC.\n"
-" Cela permet la sélection de la recopie de la piste FLAC lorsque la recopie automatique est sélectionnée."
+"Cela permet la sélection de la recopie de la piste FLAC lorsque la recopie automatique est sélectionnée."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Solution de repli de recopie :"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1350,80 +1497,80 @@
 "Définit le codec audio à utiliser pour l'encodage lorsqu’une piste "
 "compatible ne peut être trouvée pour la recopie audio."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Réglage encodage audio"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Chaque piste source sélectionnée sera encodée avec les encodeurs "
 "sélectionnés."
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Encodeur"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Débit binaire/Qualité"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Mixage"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Fréquence d'échantillonnage"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Gain"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Sélection de piste"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Affiche la liste des pistes de sous-titrées en sortie"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Ajoute de nouveaux réglages de sous-titres à la liste"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "joute toutes les pistes de sous-titres à la liste"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Analyse bande son étrangère"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Ajoutez une passe en plus pour les encodages avec recherche\n"
-" pour les sous-titres candidats qui proposent un sous-titrage\n"
-" poru les segments audio en langue étrangère."
+"Ajoutez une passe supplémentaire pour les encodages qui va\n"
+"rechercher d'éventuels sous-titres qui proposent un sous-titrage\n"
+"pour les segments audio en langue étrangère."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Recharger toues les sou-titre depuis les valeurs par défaut"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Choisir les pistes de sous-titres à utiliser depuis le média source"
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1438,47 +1585,47 @@
 "La première langue dans la liste est votre langue « favorite » et sera utilisée pour\n"
 "déterminer la sélection des réglages lorsqu'il y a de l'audio en langue étrangère."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Langue préférée: Aucune"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Ajoute une passe d’analyse des pistes audio étrangères"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Ajoute une « Analyse bande son étrangère »lorsque la piste audio par défaut est votre langue favorite.\n"
-" Cette étape de recherche trouve les courtes séquences de piste audio étrangères et fournit leurs sous-titres..\n"
+"Cette étape de recherche trouve les courtes séquences de piste audio étrangères et fournit leurs sous-titres..\n"
 "\n"
-" Cette option nécessite que la langue soit choisie dans la liste des langues sélectionnées."
+"Cette option nécessite que la langue soit choisie dans la liste des langues sélectionnées."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 "Ajoute une piste de sous-titres si la langue pour l'audio par défaut est "
 "étrangère"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Ajoute une piste de sous-titre quand la piste audio par défaut n'est pas votre langue favorite.\n"
 "\n"
-" Cette option nécessite que la langue soit choisie dans la liste des langues sélectionnées."
+"Cette option nécessite que la langue soit choisie dans la liste des langues sélectionnées."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Ajouter le sous-titrage intégré lorsqu'il est disponible"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1486,57 +1633,59 @@
 "Les sous-titres intégrés sont des textes de sous-titrage qui peuvent être "
 "ajoutés à tout format de conteneur en tant sous-titres surimprimés"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Comportement d’incrustation* :"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Détermine le comportement de l’incrustation des sous-titres.\n"
 "\n"
-" Les sous-titres incrustés font partie intégrante de la vidéo et ne peuvent être désactivés à la lecture.\n"
-" Une seule piste de sous-titre peut être incrustée ! Comme des conflicts pourraient survenir, la première sélectionnée gagne."
+"Les sous-titres incrustés font partie intégrante de la vidéo et ne peuvent être désactivés à la lecture.\n"
+"Une seule piste de sous-titre peut être incrustée ! Comme des conflicts pourraient survenir, la première sélectionnée gagne."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Incrusté pour lecteurs* déficients."
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "Sous-titres DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Incruste la permière piste de sous-titre du DVD sélectionné. Toutes les autres pistes de sous-titre de DVD seront ignorées.\n"
-" Utilisez cette option si votre logiciel de lecture ou appareil ne gère pas les sous-titres de DVD.\n"
+"Incruste la première piste de sous-titres du DVD sélectionné. Toutes les autres pistes de sous-titres de DVD seront ignorées.\n"
+"Utilisez cette option si votre logiciel de lecture ou appareil ne gère pas les sous-titres de DVD.\n"
 "\n"
-" Une seule piste de sous-titre peut être incrustée ! Comme des conflicts pourraient survenir, la première sélectionnée gagne."
+"Une seule piste de sous-titres peut être incrustée ! Comme des conflits pourraient survenir, la première sélectionnée gagne."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Sous-titres Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Incruste la permière piste de sous-titre du Blu-ray sélectionné. Toutes les "
-"autres pistes de sous-titre de Blu-ray seront ignorées."
+"Incruste la première piste de sous-titres du Blu-ray sélectionnée. Toutes les autres pistes de sous-titre du Blu-ray seront ignorées.\n"
+"Utilisez cette option si votre logiciel ou appareil de lecture ne gère pas les sous-titres des Blu-ray.\n"
+"\n"
+"Une seule piste de sous-titres peut être incrustée ! Comme des conflits pourraient survenir, la première sélectionnée gagne."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1544,7 +1693,7 @@
 "* seul une des options d’incrustation des sous-titres ci-dessus sera "
 "utilisée, en commençant en haut."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1552,715 +1701,243 @@
 "Une seule piste de sous-titre peut être incrustée ! Comme des conflicts "
 "peuvent survenir, le premier choisi gagnera."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Image de référence :"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Les valeurs raisonnables vont de 1 à 6. Plus vous en ajoutez, meilleure est la compression, mais plus lent est l'encodage.\n"
-"Les animations Cel tende à bénéficier de plus d'images de référence bien plus que du contenu du fil,.\n"
-"\n"
-"Beaucoup d'appareils de lecture ont des restrictions sur le nombre d’images de références\n"
-"gérées, donc si vous encodez pour des lecteurs portables ou indépendants, ne changez pas\n"
-"ces réglages sauf si vous êtes certain de ce que vous faites !"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Maximum de B-Frames :"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Les valeurs raisonnables vont de 2 à 5. Cela spécifie le nombre maximum de B-frames séquentielles que l'encodeur peut utiliser.\n"
-"\n"
-"Le valeurs hautes n'aident en général pas significativement sauf si les B-frames adaptatives sont réglées sur Optimal.\n"
-"Les matériaux source avec Cel animés et le B-pyramid augmentent également significativement l'utilité de valeurs plus\n"
-"grande.\n"
-"\n"
-"le profile de base, nécessaire pour les iPod et appareils similaires, nécessite les B-frames d'être sur 0 (désactivé)."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "B-Frames pyramidales :"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-pyramid améliore la compression en créant une structure pyramidale (d’où son nom)\n"
-"ou B-frames, permettant aux B-frames de se référencer els unes les autres pour améliorer\n"
-"la compression.\n"
-"\n"
-"Nécessite un Max B-frame plus grand que 1 : B-frames adaptatives optimales est vigoureusement recommandé pour bénéficier à plein des bénéfices de la compression."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "P-Frames pondérées :"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"E´&#x8;xécute des analyses supplémentaires pour décider du poids des paramètres de chaque image.\n"
-"\n"
-"Cela améliore un peu la compression globale et améliore beaucoup la qualité des fondus.\n"
-"\n"
-"Le profile de base, selon les spécifications de iPods et appareils similaires, nécessite que \n"
-" la prédiction des P-frames pondérées soit désactivée. Certains appareils, même ceux qui\n"
-"gèrent le profile principal, peuvent avoir des difficultés avec la prédiction des P-frames\n"
-"pondérées : L’Apple TV et complètement incompatible avec ce réglage par exemple."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "Transformation 8x8"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"La transformation 8x8 est la fonction la plus utile de x264 en terme de ratio compression-vitesse.\n"
-"\n"
-"Cela améliore la compression d'au moins 5 % avec une perte vitesse minimale et\n"
-"peut fournir un bénéfice de qualité visuelle inhabituellement haut comparé à son gain\n"
-"de compression. Toutefois, cela nécessite un profil haut, qui peut ne pas être géré par\n"
-"certains appareils."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "Entropie d’encodage CABAC"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"à la fin du travail de l'encodeur, il y a une tonne de données qui ont besoin\n"
-"d’être compressées sans perte, comme avec le ZIP ou RAR. H.264 fournit\n"
-"deux options pour cela : CAVLC et CABAC. CABAC décode plus lentement mais\n"
-"compresse beaucoup mieux (10-30 %), surtout avec un débit binaire plus petit.\n"
-"\n"
-"Si vous voulez minimizer l'utilisation de CPU pour la lecture de la vidéo, désactivez\n"
-"cette option.\n"
-"Le profile de base, nécessaire pour les iPods et les appareils similaires, nécessite que CABAC soit désactivé."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Fonctions d’encodage"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Méthode d'estimation de mouvement :"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Contrôle la méthode d’estimation de mouvement.\n"
-"\n"
-"L’estimation de mouvement est la méthode par laquelle l'encodeur estime comment chaque bloc de pixel dans une image s'est déplacé.\n"
-"Une meilleure recherche de mouvement améliore la compression au détriment de la vitesse.\n"
-"\n"
-"Diamant : Exécute une recherche très rapide et simple avec un motif en losange.\n"
-"Hexagone : Exécute une recherche un peu plus efficace mais un peu plus lente avec un motif hexagonal.\n"
-"Déséquilibré multi-hex : exécute une recherche large avec une variété de motifs, capturant plus précisément les mouvements.\n"
-"Exhaustive : exécute une recherche de base de chaque pixel sur une large zone. Beaucoup plus lent pour un gain minime de compression.\n"
-"Exhaustive transformée : Comme Exhaustive, mais effectue des décisions encore plus précises. Évidemment encore un peu plus lent, aussi avec un gain modeste."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Subpel ME &amp; mode :"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Ce réglage contrôle à la fous l'estimation de mouvement avec précision sous-pixel et les méthodes de mode de décision.\n"
-"\n"
-"L'estimation de mouvement avec précision sous-pixel est utilisée pour choisir comment encoder chaque bloque d'une image : une décision très importante.\n"
-"SAD est la méthode la plus rapide, suivie de SATD, RD, améliorations RD et le plus lent QPRD.\n"
-"6 ou plus est fortement recommandé : Psy-RD, une optimisation psy très puissante qui aide à conserver les détails nécessite RD.\n"
-"11 désactive touts les avortements précoces dans l'analyse.\n"
-"10 et 11, les options les plus puissantes et les plus lentes. nécessitent une quantification adaptative (aq-mode > 0) et un treillis de 2 (toujours)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Étendue d'estimation de mouvement :"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"C'est la distance de recherche de x264 à partir de son estimation initiale du\n"
-"déplacement d'un bloc pour tenter de déterminer son mouvement réel.\n"
-"\n"
-"La valeur par défaut est adaptée à la plupart des cas, mais dans les vidéos\n"
-"avec de rapides mouvements, surtout en résolution HD, de plus grandes valeurs\n"
-"peuvent être utiles, malgré un ralentissement."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Mode adaptatif direct :"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 gère deux modes de prédiction dans les images B : spatial et temporel.\n"
-"\n"
-"Spatial, le défaut, est presque toujours meilleur, mais temporel reste parfois utile.\n"
-"x264 peut, pour un coût modeste de vitesse (et avec un petit gain de compression),\n"
-"sélectionner adaptivement lequel est le meilleur pour chaque image en particulier."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "B-Frames adaptatives :"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 comprend une variété é d'algorithmes pour décider de quand utiliser els B-frames et combien en utiliser.\n"
-"\n"
-"Le mode rapide prend quasiment le même temps, quel que soit le nombre de B-frames spécifié.\n"
-"Toutefois, même si c'est rapide, les décisions sont souvent suboptimale.\n"
-"\n"
-"Le mode optimal ralentit à mesure que le nombre de B-frames augmente,\n"
-"mais les décisions sont d'autant plus précises, surtout avec la conjonction de B-pyramid."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Partitions :"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"Mode de décision choisi parmi une variété d'option pour prendre sa décision :\n"
-"cette option sélectionne quelles sont ces options.\n"
-"\n"
-"Moins de partitions à vérifier apporte un encodage plus rapide, au détriment de\n"
-"décisions moins judicieuses puisque les meilleures options peuvent être celles\n"
-"qui ont été désélectionnées."
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Trellis :"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Trellis affine les approximations de coefficients de transformation pour\n"
-"obtenir 3-5 % de compression supplémentaires, au détriments de la vitesse.\n"
-"\n"
-"« Toujours » utilise le treillis non seulement durant l'encodage principal, mais aussi\n"
-"durant l'analyse. ce qui améliore encore plus la compression, avec une plus grande perte de vitesse.\n"
-"\n"
-"Trellis amène à une plus grande perte de vitesse avec un débit binaire plus élevé et nécessite CABAC."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analyse"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Force de quantification adaptative :"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"Quantification adaptative contrôle comment l'encodeur distribue les bits dans l'aime.\n"
-"\n"
-"Les valeurs élevées retire des bits des bords et des zones complexes pour améliorer les zones avec plus de détails."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Taux de distortion psychovisuelle :"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"L'optimization de distortion d'image psychovisuelle tire partie des caractéristiques de la vision\n"
-"humaine pour améliorer drastiquement l'apparence des détails et la netteté.\n"
-"L'effet peut être atténué ou renforcé en en ajustant la puissance.\n"
-"Comme c'est un algorithme RD, il nécessite un mode de décision d'au moins « 6 »."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Treillis psychovisuel :"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Le treillis psychovisuel est un algorithme expérimental pour amélioré encore plus\n"
-"la netteté et la préservation des détails au delà de ce que fait le RD psychovisuel.\n"
-"\n"
-"Les valeurs recommandées onset autours de 0.2, bien que des valeurs supérieures puisse être utiles pour les vidéos avec beaucoup de grain ou avec un encodages avec\n"
-"des débit binaires faibles. N'est pas recommandé pour certaines animations cel ou\n"
-"d'autres graphismes avec des bords tries nets."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Déblocage :"
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"Filtre de déblocage H.264.\n"
-"\n"
-"h.264 est un filtre incorporé de déblocage qui lisse les artéfacts de blocs après\n"
-"le décodage de chaque image. Il améliore non seulement la qualité visuelle, mais\n"
-"aussi aide significativement à la compression. Le filtre de déblocage nécessite\n"
-"beaucoup de capacité de CPU, et donc si vous souhaitez réduire l'utilisation CPU pour la lecture vidéo, désactivez-le.\n"
-"\n"
-"Le filtre de déblocage deux paramètres qui peuvent être ajustés. « puissance » (alpha) et « seuil » (beta).\n"
-"Ce dernier contrôle la puissance (ou faiblesse) du déblocage, les valeurs les plus élevées apportent plus de déblocage.\n"
-"La valeur par défaut est 0 (puissance normale) pour les deux paramètres."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Pas de DCT Decimate"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"Le x264 remet à zéro les blocs presque vides pour économiser des bits pour\n"
-"se concentrer sur d'autres tâches dans la vidéo. Toutefois, ceci peut parfois avoir\n"
-"un effet un peu négatif sur la rétention d'un grain subtil et les valeurs près du seuil.\n"
-"\n"
-"N'y touchez pas, sauf si vous voyez des bandes ou autre lorsque vous avez des\n"
-"difficultés à conserver le bruit léger."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psychovisuel"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"Vos options sélectionnées apparaîtront ici.\n"
-"Vous pouvez les éditer et ajouter des options supplémentaires.\n"
-"\n"
-"Les valeurs pas défaut ne sont pas affichées. Les valeurs par défaut sont :\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "Chaîne avancé d’option x264 actuelle"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Vidéo avancée."
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Marqueurs de chapitres"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Ajouter des marqueurs de chapitre au fichier de sortie."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Index"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Durée"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titre"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Chapitres"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Titre:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Acteurs:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Directeur:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Date de sortie:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Commentaire:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Genre:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Description:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Synopsis:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Balise"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Réglages"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Editer"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Marquer les entrées sélectionnées de la file d’attente comme En attente.\n"
-"Met les tâches en attente et prêtes à être lancées."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Tout recharger"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Marquer toutes les entrées de la file d’attente comme En attente.\n"
-"Met toutes les tâches en attente et prêtes à être lancées."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Tout supprimer"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Tout supprimer les éléments dans la liste."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Enregistrer liste"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Enregistrer la file actuelle de tâches d’encodage dans un fichier.\n"
-"Ce fichier pourra être rechargé ultérieurement pour éditer les tâches et réencoder."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Charger la file d’attente"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Charger une file d’attente précédemment enregistrée."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Enregistrer sous:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Nom de fichier de destination pour l'encodage."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "De:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Répertoire de destination pour votre encodage."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Répertoire de destination"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "OK"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Tout selectionner"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Marquer tous les titres pour être ajoutés à la file d’attente"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Tout effacé."
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Enlever la marque de tous les titres"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "Les fichiers de destination sont OK. Aucun doublon détecté."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Rechercher les mises à jour automatiquement."
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Lorsque tous les encodages sont terminés"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 "Utiliser le renommage automatique (utilise le nom de la source modifié)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+"Créer le nom de fichier destination à partir du nom de fichier source ou du "
+"titre du disque."
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Modèle d'auto-nommage"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
+"Options disponibles : {source-path} {source} {title} {preset} {chapters} "
+"{date} {time} {creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 "Utiliser une extension de fichier compatible iPod/iTunes (.m4v) pour les MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Nombre d’aperçus"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Filtrer les titres courts (secondes)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filtrer les titres courts des DVD et Blu-ray (secondes)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+"Effacer les tâches terminées de la file d'attente lorsqu'un encodage se "
+"termine."
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"Par défaut, lees tâches terminées restent dans la queue et sont marquées comme terminées.\n"
+"Cochez cette option pour que la file se nettoie automatiquement en supprimant les tâches terminées."
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Général"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Granularité fractionnelle de Qualité constante"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Utiliser dvdnav (au lieu de libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Vérifier l’espace libre du disque de destination"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 "Mettre en pause l'encodage si l'espace disponible sur le disque dur est "
 "inférieur à la limite"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "Limite de Mo"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr "Placer les historiques encodage au même endroit que le film"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Niveau de détail de l'historique d’activité"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Longévité de l'historique d’activité"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Réduire la définition des aperçus HD"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Scanner automatiquement les DVD à leur insertion"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Scanne les DVD d`´s qu'un nouveau disque est chargé"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Taille de la police de la fenêtre d'activité"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Masquer l'onglet des options vidéos avancées."
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Utilisez les options vidéo à vos risques et périls.\n"
-"Nous recommandons d’utiliser plutôt les contrôles\n"
-"de l'onglet Vidéo."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Supprimer les tâches terminées de la file"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"Par défaut, lees tâches terminées restent dans la queue et sont marquées comme terminées.\n"
-"Cochez cette option pour que la file se nettoie automatiquement en supprimant les tâches terminées."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Utilise les mêmes réglages pour tous les titres dans un lot"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2272,71 +1949,67 @@
 "\n"
 "Décochez-la pour pouvoir changer les réglages de chaque titre indépendamment."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Autoriser les ajustements"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Autoriser Handbrake pour les nul"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Avancé"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Nom de dossier :"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Description"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Pré réglage de renommage :"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Nom:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Description"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Catégorie:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr "Détermine la catégorie sous laquelle ce préréglage sera affiché."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Nom de catégorie:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Nom de préréglage :"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Réglage par défaut"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Faire de ce préréglage le défaut lorsqu’Handbrake se lance"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Dimensions personnalisées d'image"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Dimensions"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Largeur maximale :"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Activer les limites de largeur maximale."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2348,15 +2021,15 @@
 "Lorsque la source est chargée, cette valeur sera utilisée si la larguer de la source est supérieure.\n"
 "Une valeur de 0 implique qu'il n'y a pas de largeur maximale."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Hauteur maximale :"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Activer les limites de hauteur maximale."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2368,11 +2041,15 @@
 "Quand une nouvelle est chargée, cette valeur sera appliquée si la hauteur de la source est plus grande.\n"
 "Avec un réglage de 0, il n'y a pas de hauteur maximale."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Aperçu Handbrake"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Sélectionner les images d’aperçu."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2380,80 +2057,110 @@
 "Encode et joue une courte séquence de la vidéo commençant au moment de "
 "l'aperçu actuel."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Durée:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Définit la durée de l'affichage d’aperçu en direct en secondes."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Afficher le rognage"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Afficher les zones de rognages sur l'aperçu"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Résolution de la source"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Réinitialise la fenêtre d'aperçu à la résolution de la vidéo source"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Numéro de titre :"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Lecteurs DVD détectés :"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importer SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Active les réglages pour l'importation de fichiers de sous-titres SRT"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importer SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Active les réglages pour l'importation de fichiers de sous-titres SSA"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Liste des sous-titres incorporés"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 "Active les réglages pour l'importation de fichiers de sous-titres incorporés"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Piste source"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Liste des pistes de sous-titres disponibles pour votre source."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Nom de piste:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Définit le nom de la piste de sous-titres.\n"
+"\n"
+"Les lecteurs peuvent l'utiliser dans la liste de sélection de sous-titres."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Langue"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Code caractère"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Fichier:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Décallage (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2461,7 +2168,7 @@
 "Définit la langue de ce sous-titre.\n"
 "Cette valeur peur être utilisée par les lecteurs dans le menu des sous-titres."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2475,37 +2182,29 @@
 "Nous traduisons les encodages en UTF-8.\n"
 "L’encodage caractères source est nécessaire pour effectuer cette traduction."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Sélectionner le fichier SRT à importer."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Fichier SRT"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importer un fichier"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 "Ajuster le décalage en milliseconde entre les balises temporelles vidéo et "
 "SRT"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Piste"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Liste des pistes de sous-titres disponibles pour votre source."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Sous-titres forcés uniquement"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Incruster sur la vidéo"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2513,23 +2212,15 @@
 "Affiche le sous-titrage au dessus de la vidéo.\n"
 "Le sous-titrage fera partie intégrante de la vidéo et ne pourra être désactivé."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Définir piste par défaut"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Piste source"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Liste des pistes audio disponibles pour votre source."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Nom de piste:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2539,15 +2230,15 @@
 "\n"
 "Les lecteurs peuvent l'utilise dans la liste de sélection audio."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Mix"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Fréquence d’échantillonnage"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2560,31 +2251,31 @@
 " faibles), La plage de compression dynamique vous permet de « comprimer » la plage\n"
 "en adoucissant les sons forts et en renforçant les sons faibles."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Définit le codec audio pour l'encodage de cette piste."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Débit binaire"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Active les réglages de débit binaire"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Qualité"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Active le réglage de qualité"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Définit le débit binaire avec lequel encoder cette piste."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
@@ -2592,19 +2283,19 @@
 "Qualité : Pour les codecs de destination qui le gèrent, ajuster la "
 "qualité de la destination."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Définit le mixage de la piste audio en sortie."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Définit la fréquence d’échantillonnage de la piste audio en sortie."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2613,187 +2304,74 @@
 "audio de destination."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0 dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Arrêt"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Passer cette version"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Me le rappeler plus tard"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "Une nouvelle version de HandBrake est disponible!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 "HandBrake xxx est maintenant disponible (vous disposez de la version yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Notes de version"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Transcodeur vidéo"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake est un outil pour la conversion de vidéos depuis quasiment tous "
-"les formats vers une sélection de codecs modernes et largement gérés."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Raisons pour lesquelles vous aimerez HandBrake:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Convertit les vidéos virtuellement dans n’importe quel format"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Gratuit et en source ouverte"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multiplateforme (Windows, Mac et Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Fenêtre principale et résumé des réglages"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Résolution vidéo et réglages de rognage."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Réglages de l'encodeur vidéo"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Sélection et réglages de la piste audio"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Editer titre de chapitre"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Impossible de créer %s.</big>\n"
-"\n"
-"Erreur interne. Impossible d’analyser la description de l'interface utilisateur.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Index"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Durée"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Titre"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Information du processus"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Information piste"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Nom du préréglage"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "L’appareil our le fichier à encoder"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Les valeurs prédéterminées à utiliser pour l'encodage"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Beaucoup de pourriels"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "Le chemin prend la précédence sur user config dir"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Ouvrir une console pour les informations de débogage"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Tout"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Qualité"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Débit binaire : %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Débit binaire : %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Recopie"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2804,7 +2382,7 @@
 "DRC : %s\n"
 "Nom de piste : %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2813,7 +2391,7 @@
 "%sGain : %s\n"
 "DRC : %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2821,7 +2399,7 @@
 "Ajoute un encodeur audio.\n"
 "Chaque piste source sélectionnée sera encodée avec les encodeurs sélectionnés."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2829,39 +2407,39 @@
 "Qualité audio :\n"
 "Pour les encodeurs qui le gèrent, ajuste la qualité en sortie."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Supprimer cet encodeur audio"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Quitter HandBrake arrêtera l'encodage.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Pas séléctionné"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Vérification ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Arrêter la vérification"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Aucun titre trouvé"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Nouvelle video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2872,440 +2450,439 @@
 "\n"
 "%s dans %d secondes ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sVotre video sera perdue si vous ne continuez pas l'encodage."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Annuler l'actuel et arrêter"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Annuler l'actuel, commencer le suivant"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Terminer l'actuel, commencer le suivant"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Continuer l’encodage"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr "%dencodage en attente"
+
+#: src/callbacks.c:3894
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%dencodage(s) en attente"
+msgid "%d encodes pending"
+msgstr "%dencodages en attente"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "tâche %d de %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "passe %d (balayage des sous-titres) de %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "passe %d de %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 "Encodage : %s%s%.2f %% (%.2f ips, may %.2f ips, fin est. %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Encodage : %s%s%.2f %% (fin est. %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Encodage: %s%s%.2f%%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Recherche de l'heure de début,"
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Vérification titre %d de %d ..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Vérification titre %d de %d aperçu %d ..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Mis en pause"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Encodage terminé!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Encodage annulé."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Encodage échoué."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Mixage : Ça pourra prendre un certain temps…"
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Vérification du DVD source."
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Avertissement : sans perte)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s est désormais disponible (vous avez %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Encodage terminé"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 "Posez votre cocktail, votre liste de conversion HandBrake est terminé!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Votre encodage est terminé."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Eteindre l'ordinateur."
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Mettre l'ordinateur en veille"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Quitter HandBrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Première piste correspondant aux langues sélectionnées"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Toutes les pistes correspondant à la langue sélectionnée"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Piste de sous-titre d'audio étranger"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Première piste sélectionnée"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Piste audio étrangère, puis la première piste sélectionnée"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Chapitres:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Secondes:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Images :"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Ne rien faire."
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Afficher les notifications."
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Quitter HandBrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Mettre l'ordinateur en veille"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Eteindre l'ordinateur."
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatique:"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Souple"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Personnalisé"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Semaine"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Mois"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Année"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Immortel"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Jamais"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Tous les jours"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Toutes les semaines"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Tous les mois"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Désentrelacer"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Renfort de netteté"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Affutage"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 degrés"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 degrés"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 degrés"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Spatial"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Temporel"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Rapide"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optimum"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Strict"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Simple"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Intelligent"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Losange"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Hexagone"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Inégal, hexagones multiples"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Exhaustif"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Hadamard exhaustif"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0 : SAD, pas de subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1 : SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2 : SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3 : SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4 : SATD, qpel sur tous"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5 : SATD, multi-qpel sur tous"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6 : RD dans les images I/P"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7 : RD dans toutes les images"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: Affinement RD dans les images I/P"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: Affinement RD dans toutes les images"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10 : QPRD dans toutes les images"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11 : Aucune terminaison précoce dans l'analyse"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "La plupart"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Certains"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Tout"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Encoder uniquement"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Toujours"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Comme la source"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(Film NTSC)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(Film/vidéo PAL)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(Vidéo NTSC)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Pas de titres"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Pas de son"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "N'importe lequel"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3318,7 +2895,7 @@
 "Préréglage :\t%s\n"
 "Personnalisé :%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3330,7 +2907,7 @@
 "Préréglage :\t%s\n"
 "\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3343,7 +2920,7 @@
 "Préréglage :\t%s\n"
 "Personnalisé :\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3355,7 +2932,7 @@
 "Préréglage :\t%s\n"
 "\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3370,7 +2947,7 @@
 "Préréglages:\t%s\n"
 "Personnalisés :\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3383,7 +2960,7 @@
 "Filtre :\t%s\n"
 "Préréglages:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3400,7 +2977,7 @@
 "Ajustement :\t%s\n"
 "Personnalisé :\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3417,8 +2994,7 @@
 "Ajustements :\t%s\n"
 "Personnalisés :\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3430,18 +3006,29 @@
 "Vous devriez choisir un codec vidéo ou un conteneur différent.\n"
 "Si vous continuez, FFMPEG sera choisi pour vous."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"Seuls VP8 ou VP9 sont supportés dans le conteneur WebM.\n"
+"\n"
+"Choisissez un codec video ou un conteneur différent.\n"
+"Si vous continuez, le choix sera fait automatiquement."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Continuer"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Titre non trouvé\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3453,8 +3040,19 @@
 "Vous devriez changer votre sélection de sous-titre.\n"
 "Si vous continuez, certains sous-titres seront perdus."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"Handbrake ne supporte que les sous-titres incrustés dans le conteneur WebM.\n"
+"\n"
+"Vous devriez modifier votre sélection de sous-titres.\n"
+"Si vous continuez, certains sous-titres seront perdus."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3466,8 +3064,7 @@
 "Vous devriez sélectionner un fichier valide.\n"
 "Si vous continuez, ce sous-titre sera ignoré."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3479,7 +3076,7 @@
 "Vous devriez choisir un codec audio différent.\n"
 "Si vous continuez, l'un d’entre eux sera choisi pour vous."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3492,17 +3089,57 @@
 "Vous devriez choisir un codec audio différent.\n"
 "Si vous continuez, un codec sera choisi pour vous."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Impossible de créer %s.</big>\n"
+"\n"
+"Erreur interne. Impossible d’analyser la description de l'interface utilisateur.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Information piste"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Nom du préréglage"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "L’appareil our le fichier à encoder"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Les valeurs prédéterminées à utiliser pour l'encodage"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Beaucoup de pourriels"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "Le chemin prend la précédence sur user config dir"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Ouvrir une console pour les informations de débogage"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 "ghb_presets_menu_init : Impossible de trouver le dossier des préréglages."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "Impossible de trouver le dossier parent en ajoutant l'enfant."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3512,31 +3149,31 @@
 "\n"
 " Voulez-vous continuer? "
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Sortez-moi d'ici! "
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Charger les préréglages de sauvegarde"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Tous (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Préréglages (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Préréglage ancien (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Exporter les préréglages"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3547,15 +3184,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "dossier"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "préréglages"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3568,268 +3205,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Secondes"
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr "%s (Modifié)"
 
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Images"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Aligner A/V"
 
-#: ../src/queuehandler.c:228
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (Titre %d, %s %d à %d, 2 passes vidéo) --> "
-"%s"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:236
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (Titre %d, %s %d à %d) --> %s"
-
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Préréglage vidéo basé sur : %s\n"
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d Rognage\n"
+"%dx%d stockage, %dx%d affichage\n"
+"%d:%d Ratio largeur/hauteur de pixel\n"
+"%s Ratio largeur/hauteur d'affichage"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:358
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Réglage%s\n"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Débit binaire : %dkbps"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:363
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Format : %s Conteneur\n"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Débit binaire : %dkbps (2 passes)"
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Options de conteneur :"
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:370
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sMarqueurs de chapitres"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Qualité constante %.4g(%s)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:403
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%sPrise en charge iPod 5ème génération"
+msgid "%sPreset %s"
+msgstr "%sPréréglage %s"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:408
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sOptimisé pour le web"
+msgid "%sTune %s"
+msgstr "%sRéglage %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:413
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destination : %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Aspect préservé)"
+msgid "%sProfile %s"
+msgstr "%sProfil %s"
 
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Aspect perdu)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorphique)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Anamorphique personnalisé)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Image"
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:418
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Source : %d x %d, destination %d x %d %s, rognage %d:%d:%d:%d"
+msgid "%sLevel %s"
+msgstr "%sNiveau %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:435
 #, c-format
-msgid ", Display %d x %d"
-msgstr ". Affichage %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtres"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Fréquence d’images constante %s ips"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:439
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDétéléciné"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"Pic de fréquence d’images %s ips (peut être plus faible)"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:444
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Fréquence d’images variable %s ips"
 
-#: ../src/queuehandler.c:475
-#, c-format
-msgid "%sDenoise %s:"
-msgstr "%sRéduction de bruit%s :"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", Forcés seulement"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDéblocage : %d"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", Incrustés"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sNiveaux de gris"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", Défaut"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Vidéo:%s"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Complété"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(constant)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Annulé"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(variable)"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Echoué"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", fréquence d’images : %s %s"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "En attente"
 
-#: ../src/queuehandler.c:532
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", fréquence d’images : Pic %s (peut être plus bas)"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d jour %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", fréquence d’images : Pic %s (fréquence d’image constante)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Erreur"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Débit binaire :"
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d jours %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "1ère passe turbo : Activé\n"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:592
-#, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Options vidéo : Préréglage : %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Ajustement : "
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Profil : %s"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Niveau: %s"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Indisponible"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Options avancés:%s\n"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Rechercher l'audio étranger "
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Son: "
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Encoder"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Pistes son: %d"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Encoder la première pass (Analyse)"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Débit binaire : %d"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Encoder la seconde pass (Final)"
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Encodeur : %s"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Erreur"
 
-#: ../src/queuehandler.c:707
+#: src/queuehandler.c:1177
 #, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
-"%d - %s --> Encodeur : %s, Mixage : %s, Fréquence d'échantillonnage : %s, %s"
-
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Sous-titre:"
-
-#: ../src/queuehandler.c:737
-#, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Pistes de sous-titres:%d\n"
+"passe %d sur %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr "(Uniquement forcé)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Titre du balayage"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr "(Incruster)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Encodage en pause"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr "(Défaut)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Encodage en cours"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, décallage (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Inconnue"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sLe système de fichier de destination est presque plein : %<PRIu64>Mo de libres.\n"
+"%sLe système de fichiers de destination est presque plein : %<PRId64> Mo libres.\n"
 "Destination : %s\n"
-"L’encodage pourra être incomplet si vous continuez.\n"
+"L’encodage pourrait être incomplet si vous continuez.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Reprendre, j'ai corrigé le problème"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Reprendre, ne pas redemander"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3842,11 +3432,11 @@
 "Une autre tâche en attente a indiqué la même destination.\n"
 "Voulez-vous l'écraser ?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3857,7 +3447,7 @@
 "\n"
 "Ce n'est pas un dossier de destination correct."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3868,7 +3458,7 @@
 "\n"
 "Lecture et écriture dans le répertoire impossible."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3881,16 +3471,16 @@
 "Le fichier existe déjà.\n"
 "Voulez-vous l’écraser ?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Sélectionner ce titre pour l'ajout à la liste\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Sans titre"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3900,31 +3490,31 @@
 "Ce titre ne sera pas ajouté à la file d'attente sauf si vous changez\n"
 "le nom de fichier de destination.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Arrêter"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Arrêter l'encodage"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "Arrêter l'encodage"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Reprendre"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Reprendre l'encodage"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "Arrêter l'encodage"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Reprendre l'encodage"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3932,25 +3522,23 @@
 "Vous êtes en train d'encoder, que voulez vous faire?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Langue préférée: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Ajouter la piste e sous-titre %s si l'audio par défaut n'est pas %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Ajouter la piste de sous-titre si l'audio par défaut n'est pas votre langue "
 "favorite."
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3963,8 +3551,7 @@
 "Options étendues\n"
 "« %s »"
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3976,3 +3563,8 @@
 "\n"
 "Options étendues :\n"
 "«  »"
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Avertissement : sans perte)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/ghb.pot -> HandBrake-1.5.1.tar.xz/gtk/po/ghb.pot Changed

@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/main.c:250 src/main.c:255 src/main.c:315 src/main.c:319
+#: src/main.c:249 src/main.c:254 src/main.c:314 src/main.c:318
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-06 12:44-0800\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@
 msgid "Burned In"
 msgstr ""
 
-#: src/ghb3.ui:32 src/ghb3.ui:9082
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -44,7 +44,7 @@
 msgid "Default"
 msgstr ""
 
-#: src/ghb3.ui:45 src/ghb3.ui:9044
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -135,39 +135,39 @@
 msgid "HandBrake Presets"
 msgstr ""
 
-#: src/ghb3.ui:163 src/ghb3.ui:2088
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr ""
 
-#: src/ghb3.ui:171 src/ghb3.ui:2096
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr ""
 
-#: src/ghb3.ui:185 src/ghb3.ui:2110
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr ""
 
-#: src/ghb3.ui:194 src/ghb3.ui:2119
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr ""
 
-#: src/ghb3.ui:203 src/ghb3.ui:2128
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr ""
 
-#: src/ghb3.ui:212 src/ghb3.ui:2137
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr ""
 
-#: src/ghb3.ui:226 src/ghb3.ui:2151
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr ""
 
-#: src/ghb3.ui:235 src/ghb3.ui:2160
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr ""
 
-#: src/ghb3.ui:249 src/ghb3.ui:2174
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr ""
 
@@ -187,23 +187,23 @@
 msgid "0 jobs pending"
 msgstr ""
 
-#: src/ghb3.ui:404 src/ghb3.ui:2284 src/queuehandler.c:2331
-#: src/queuehandler.c:2344 src/queuehandler.c:2355
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
 msgid "Start Encoding"
 msgstr ""
 
-#: src/ghb3.ui:406 src/ghb3.ui:2286 src/ghb3.ui:6392 src/queuehandler.c:2330
-#: src/queuehandler.c:2343
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
 msgid "Start"
 msgstr ""
 
-#: src/ghb3.ui:420 src/ghb3.ui:2299 src/queuehandler.c:2369
-#: src/queuehandler.c:2382 src/queuehandler.c:2393
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
 msgid "Pause Encoding"
 msgstr ""
 
-#: src/ghb3.ui:422 src/ghb3.ui:2301 src/queuehandler.c:2368
-#: src/queuehandler.c:2381
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
 msgid "Pause"
 msgstr ""
 
@@ -233,7 +233,7 @@
 msgid "Actions"
 msgstr ""
 
-#: src/ghb3.ui:741 src/ghb3.ui:4785
+#: src/ghb3.ui:741 src/ghb3.ui:4825
 msgid "Preset:"
 msgstr ""
 
@@ -241,94 +241,98 @@
 msgid "Source:"
 msgstr ""
 
-#: src/ghb3.ui:818
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
 msgid "Destination:"
 msgstr ""
 
-#: src/ghb3.ui:859
+#: src/ghb3.ui:899
 msgid "Dimensions:"
 msgstr ""
 
-#: src/ghb3.ui:895
+#: src/ghb3.ui:935
 msgid "Video:"
 msgstr ""
 
-#: src/ghb3.ui:931
+#: src/ghb3.ui:971
 msgid "Audio:"
 msgstr ""
 
-#: src/ghb3.ui:967
+#: src/ghb3.ui:1007
 msgid "Subtitles:"
 msgstr ""
 
-#: src/ghb3.ui:1006 src/ghb3.ui:3145
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
 msgid "Summary"
 msgstr ""
 
-#: src/ghb3.ui:1044
+#: src/ghb3.ui:1084
 msgid "Pass:"
 msgstr ""
 
-#: src/ghb3.ui:1080
+#: src/ghb3.ui:1120
 msgid "Start Time:"
 msgstr ""
 
-#: src/ghb3.ui:1116
+#: src/ghb3.ui:1156
 msgid "End Time:"
 msgstr ""
 
-#: src/ghb3.ui:1156
+#: src/ghb3.ui:1196
 msgid "Paused Duration:"
 msgstr ""
 
-#: src/ghb3.ui:1196
+#: src/ghb3.ui:1236
 msgid "Encode Time:"
 msgstr ""
 
-#: src/ghb3.ui:1232
+#: src/ghb3.ui:1272
 msgid "File Size:"
 msgstr ""
 
-#: src/ghb3.ui:1268
+#: src/ghb3.ui:1308
 msgid "Status:"
 msgstr ""
 
-#: src/ghb3.ui:1307
+#: src/ghb3.ui:1347
 msgid "Statistics"
 msgstr ""
 
-#: src/ghb3.ui:1372
+#: src/ghb3.ui:1412
 msgid "Activity Log"
 msgstr ""
 
-#: src/ghb3.ui:1395
+#: src/ghb3.ui:1435
 msgid "HandBrake Activity Log"
 msgstr ""
 
-#: src/ghb3.ui:1670
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr ""
 
-#: src/ghb3.ui:1676
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 msgstr ""
 
-#: src/ghb3.ui:1678
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 
-#: src/ghb3.ui:1680
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr ""
 
-#: src/ghb3.ui:1681
+#: src/ghb3.ui:1721
 msgid ""
 "HandBrake 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.\n"
+"the terms of the GNU General Public License version 2, as published by the "
+"Free Software Foundation.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -340,303 +344,303 @@
 "Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/ghb3.ui:1867
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr ""
 
-#: src/ghb3.ui:1890
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr ""
 
-#: src/ghb3.ui:1898
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr ""
 
-#: src/ghb3.ui:1907
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr ""
 
-#: src/ghb3.ui:1916
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr ""
 
-#: src/ghb3.ui:1931
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr ""
 
-#: src/ghb3.ui:1946
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr ""
 
-#: src/ghb3.ui:1961 src/ghb3.ui:2055
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr ""
 
-#: src/ghb3.ui:1969
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr ""
 
-#: src/ghb3.ui:1978
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr ""
 
-#: src/ghb3.ui:1987 src/queuehandler.c:2354
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr ""
 
-#: src/ghb3.ui:1996 src/queuehandler.c:2392
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr ""
 
-#: src/ghb3.ui:2005
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr ""
 
-#: src/ghb3.ui:2014
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr ""
 
-#: src/ghb3.ui:2029
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr ""
 
-#: src/ghb3.ui:2037
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr ""
 
-#: src/ghb3.ui:2046
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr ""
 
-#: src/ghb3.ui:2064
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr ""
 
-#: src/ghb3.ui:2073
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr ""
 
-#: src/ghb3.ui:2189
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr ""
 
-#: src/ghb3.ui:2197
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr ""
 
-#: src/ghb3.ui:2206
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr ""
 
-#: src/ghb3.ui:2244 src/callbacks.c:4115
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr ""
 
-#: src/ghb3.ui:2246 src/callbacks.c:4114
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr ""
 
-#: src/ghb3.ui:2269
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr ""
 
-#: src/ghb3.ui:2271
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr ""
 
-#: src/ghb3.ui:2326
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr ""
 
-#: src/ghb3.ui:2328
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr ""
 
-#: src/ghb3.ui:2341
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr ""
 
-#: src/ghb3.ui:2343
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr ""
 
-#: src/ghb3.ui:2356
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr ""
 
-#: src/ghb3.ui:2358 src/callbacks.c:4559
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr ""
 
-#: src/ghb3.ui:2371
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr ""
 
-#: src/ghb3.ui:2373
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr ""
 
-#: src/ghb3.ui:2403
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr ""
 
-#: src/ghb3.ui:2429 src/hb-backend.c:60 src/hb-backend.c:72 src/hb-backend.c:85
-#: src/hb-backend.c:250 src/hb-backend.c:335 src/hb-backend.c:2422
-#: src/hb-backend.c:2648 src/subtitlehandler.c:1366
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71 src/hb-backend.c:84
+#: src/hb-backend.c:249 src/hb-backend.c:334 src/hb-backend.c:2421
+#: src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr ""
 
-#: src/ghb3.ui:2474 src/callbacks.c:4087
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr ""
 
-#: src/ghb3.ui:2508
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr ""
 
-#: src/ghb3.ui:2536
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
 
-#: src/ghb3.ui:2558
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr ""
 
-#: src/ghb3.ui:2576
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr ""
 
-#: src/ghb3.ui:2588
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 
-#: src/ghb3.ui:2604
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr ""
 
-#: src/ghb3.ui:2615
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: src/ghb3.ui:2628
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr ""
 
-#: src/ghb3.ui:2643
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr ""
 
-#: src/ghb3.ui:2655
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr ""
 
-#: src/ghb3.ui:2680
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr ""
 
-#: src/ghb3.ui:2716
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr ""
 
-#: src/ghb3.ui:2747
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr ""
 
-#: src/ghb3.ui:2756 src/ghb3.ui:5129 src/ghb3.ui:5873
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr ""
 
-#: src/ghb3.ui:2759
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
 
-#: src/ghb3.ui:2771
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr ""
 
-#: src/ghb3.ui:2774
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr ""
 
-#: src/ghb3.ui:2856
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr ""
 
-#: src/ghb3.ui:2874
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: src/ghb3.ui:2886 src/queuehandler.c:243
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr ""
 
-#: src/ghb3.ui:2891
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: src/ghb3.ui:2907
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr ""
 
-#: src/ghb3.ui:2912
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: src/ghb3.ui:2929
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr ""
 
-#: src/ghb3.ui:2934
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr ""
 
-#: src/ghb3.ui:2956
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr ""
 
-#: src/ghb3.ui:2974
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr ""
 
-#: src/ghb3.ui:2989
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr ""
 
-#: src/ghb3.ui:3029
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr ""
 
-#: src/ghb3.ui:3069
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr ""
 
-#: src/ghb3.ui:3094 src/ghb3.ui:3315
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr ""
 
-#: src/ghb3.ui:3187
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr ""
 
-#: src/ghb3.ui:3192
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr ""
 
-#: src/ghb3.ui:3206
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr ""
 
-#: src/ghb3.ui:3210
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -645,68 +649,68 @@
 "the required multiple."
 msgstr ""
 
-#: src/ghb3.ui:3232
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr ""
 
-#: src/ghb3.ui:3249
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr ""
 
-#: src/ghb3.ui:3266
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr ""
 
-#: src/ghb3.ui:3283
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr ""
 
-#: src/ghb3.ui:3300
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr ""
 
-#: src/ghb3.ui:3336
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr ""
 
-#: src/ghb3.ui:3371
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr ""
 
-#: src/ghb3.ui:3375
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution "
 "after cropping."
 msgstr ""
 
-#: src/ghb3.ui:3393 src/ghb3.ui:3608
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr ""
 
-#: src/ghb3.ui:3408
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not "
 "1:1."
 msgstr ""
 
-#: src/ghb3.ui:3426 src/ghb3.ui:3640
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr ""
 
-#: src/ghb3.ui:3441
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not "
 "1:1."
 msgstr ""
 
-#: src/ghb3.ui:3471
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr ""
 
-#: src/ghb3.ui:3486
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
@@ -720,11 +724,11 @@
 " display aspect ratio</tt>"
 msgstr ""
 
-#: src/ghb3.ui:3510
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr ""
 
-#: src/ghb3.ui:3525
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -732,30 +736,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: src/ghb3.ui:3550
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr ""
 
-#: src/ghb3.ui:3585
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr ""
 
-#: src/ghb3.ui:3590
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: src/ghb3.ui:3623
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: src/ghb3.ui:3684
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr ""
 
-#: src/ghb3.ui:3699
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -764,11 +768,11 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: src/ghb3.ui:3719
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ""
 
-#: src/ghb3.ui:3734
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular "
@@ -776,27 +780,27 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: src/ghb3.ui:3754
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr ""
 
-#: src/ghb3.ui:3769
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr ""
 
-#: src/ghb3.ui:3790
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr ""
 
-#: src/ghb3.ui:3808
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr ""
 
-#: src/ghb3.ui:3836
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr ""
 
-#: src/ghb3.ui:3852
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -804,18 +808,18 @@
 "video frame rates which are 30fps."
 msgstr ""
 
-#: src/ghb3.ui:3867
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: src/ghb3.ui:3895
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr ""
 
-#: src/ghb3.ui:3911
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -823,7 +827,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: src/ghb3.ui:3927
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -831,11 +835,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: src/ghb3.ui:3956
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr ""
 
-#: src/ghb3.ui:3972
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -843,11 +847,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: src/ghb3.ui:3991
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr ""
 
-#: src/ghb3.ui:4007
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -855,32 +859,32 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: src/ghb3.ui:4050
+#: src/ghb3.ui:4090
 msgid "Deblock Filter:"
 msgstr ""
 
-#: src/ghb3.ui:4066 src/ghb3.ui:4098
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: src/ghb3.ui:4082
+#: src/ghb3.ui:4122
 msgid "Deblock Tune:"
 msgstr ""
 
-#: src/ghb3.ui:4112
+#: src/ghb3.ui:4152
 msgid ""
 "Custom deblock filter string format\n"
 "\n"
 "strength=weak|strong:thresh=0-100:blocksize=4-512"
 msgstr ""
 
-#: src/ghb3.ui:4140
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr ""
 
-#: src/ghb3.ui:4156 src/ghb3.ui:4189 src/ghb3.ui:4222
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to "
@@ -888,72 +892,72 @@
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: src/ghb3.ui:4173
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr ""
 
-#: src/ghb3.ui:4206
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr ""
 
-#: src/ghb3.ui:4237 src/ghb3.ui:4359
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: src/ghb3.ui:4265
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr ""
 
-#: src/ghb3.ui:4281 src/ghb3.ui:4313 src/ghb3.ui:4345
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: src/ghb3.ui:4297
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr ""
 
-#: src/ghb3.ui:4329
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr ""
 
-#: src/ghb3.ui:4387
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr ""
 
-#: src/ghb3.ui:4403
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: src/ghb3.ui:4417
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr ""
 
-#: src/ghb3.ui:4422
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: src/ghb3.ui:4433
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr ""
 
-#: src/ghb3.ui:4464
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr ""
 
-#: src/ghb3.ui:4478
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr ""
 
-#: src/ghb3.ui:4494
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr ""
 
-#: src/ghb3.ui:4509
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -961,19 +965,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: src/ghb3.ui:4524
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr ""
 
-#: src/ghb3.ui:4529
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr ""
 
-#: src/ghb3.ui:4543
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr ""
 
-#: src/ghb3.ui:4548
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -981,18 +985,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: src/ghb3.ui:4566
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr ""
 
-#: src/ghb3.ui:4571
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: src/ghb3.ui:4607 src/ghb3.ui:4639
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -1008,15 +1012,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: src/ghb3.ui:4634
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr ""
 
-#: src/ghb3.ui:4665
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr ""
 
-#: src/ghb3.ui:4670 src/ghb3.ui:4692
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -1027,11 +1031,11 @@
 "settings."
 msgstr ""
 
-#: src/ghb3.ui:4709
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr ""
 
-#: src/ghb3.ui:4714
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1041,16 +1045,16 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: src/ghb3.ui:4732
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: src/ghb3.ui:4737
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things along."
 msgstr ""
 
-#: src/ghb3.ui:4799
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against "
 "encoding speed.\n"
@@ -1062,11 +1066,11 @@
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: src/ghb3.ui:4825
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr ""
 
-#: src/ghb3.ui:4842
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1075,22 +1079,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: src/ghb3.ui:4858
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr ""
 
-#: src/ghb3.ui:4863
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: src/ghb3.ui:4881
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr ""
 
-#: src/ghb3.ui:4885
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1100,278 +1104,278 @@
 "this setting is of little value here."
 msgstr ""
 
-#: src/ghb3.ui:4909
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr ""
 
-#: src/ghb3.ui:4926
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: src/ghb3.ui:4944
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr ""
 
-#: src/ghb3.ui:4961
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: src/ghb3.ui:4986
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr ""
 
-#: src/ghb3.ui:5004
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: src/ghb3.ui:5038 src/main.c:1156
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr ""
 
 #. Add Button
-#: src/ghb3.ui:5104 src/ghb3.ui:5297 src/ghb3.ui:5834 src/ghb3.ui:6054
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
 #: src/audiohandler.c:1744
 msgid "Add"
 msgstr ""
 
-#: src/ghb3.ui:5106
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr ""
 
-#: src/ghb3.ui:5116 src/ghb3.ui:5846
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr ""
 
-#: src/ghb3.ui:5118
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr ""
 
-#: src/ghb3.ui:5131
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr ""
 
-#: src/ghb3.ui:5175 src/ghb3.ui:5919
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
 msgid "Track List"
 msgstr ""
 
-#: src/ghb3.ui:5206 src/ghb3.ui:5954
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr ""
 
-#: src/ghb3.ui:5221
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: src/ghb3.ui:5282
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection "
 "Behavior."
 msgstr ""
 
-#: src/ghb3.ui:5313 src/ghb3.ui:6070
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr ""
 
-#: src/ghb3.ui:5331 src/ghb3.ui:6088
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr ""
 
-#: src/ghb3.ui:5344 src/ghb3.ui:6101
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr ""
 
-#: src/ghb3.ui:5360
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 
-#: src/ghb3.ui:5365
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
 "All other secondary audio output tracks will be encoded with first encoder "
 "only."
 msgstr ""
 
-#: src/ghb3.ui:5401
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr ""
 
-#: src/ghb3.ui:5412
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr ""
 
-#: src/ghb3.ui:5417
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
 "This permits MP3 passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5433
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr ""
 
-#: src/ghb3.ui:5438
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
 "This permits AAC passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5454
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr ""
 
-#: src/ghb3.ui:5459
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
 "This permits AC-3 passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5475
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr ""
 
-#: src/ghb3.ui:5480
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
 "This permits DTS passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5496
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr ""
 
-#: src/ghb3.ui:5501
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
 "This permits DTS-HD passthru to be selected when automatic passthru "
 "selection is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5517
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr ""
 
-#: src/ghb3.ui:5522
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
 "This permits EAC-3 passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5538
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr ""
 
-#: src/ghb3.ui:5543
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
 "This permits TrueHD passthru to be selected when automatic passthru "
 "selection is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5559
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr ""
 
-#: src/ghb3.ui:5564
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
 "This permits FLAC passthru to be selected when automatic passthru selection "
 "is enabled."
 msgstr ""
 
-#: src/ghb3.ui:5597
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr ""
 
-#: src/ghb3.ui:5609
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: src/ghb3.ui:5638
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr ""
 
-#: src/ghb3.ui:5639
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 
-#: src/ghb3.ui:5664 src/ghb3.ui:9239
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr ""
 
-#: src/ghb3.ui:5675 src/ghb3.ui:9252
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr ""
 
-#: src/ghb3.ui:5686
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: src/ghb3.ui:5697
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr ""
 
-#: src/ghb3.ui:5708 src/ghb3.ui:9296
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr ""
 
-#: src/ghb3.ui:5719 src/ghb3.ui:9315
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr ""
 
-#: src/ghb3.ui:5756 src/ghb3.ui:6314
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
 msgid "Track Selection"
 msgstr ""
 
-#: src/ghb3.ui:5768
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr ""
 
-#: src/ghb3.ui:5836
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr ""
 
-#: src/ghb3.ui:5848
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr ""
 
-#: src/ghb3.ui:5858 src/queuehandler.c:560 src/queuehandler.c:991
-#: src/subtitlehandler.c:414
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr ""
 
-#: src/ghb3.ui:5860
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
 "for subtitle candidates that provide subtitles for\n"
 "segments of the audio that are in a foreign language."
 msgstr ""
 
-#: src/ghb3.ui:5875
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr ""
 
-#: src/ghb3.ui:5969
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: src/ghb3.ui:6034
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection "
@@ -1382,15 +1386,15 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: src/ghb3.ui:6115
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr ""
 
-#: src/ghb3.ui:6142
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: src/ghb3.ui:6147
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred "
 "language.\n"
@@ -1400,11 +1404,11 @@
 "This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: src/ghb3.ui:6162
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: src/ghb3.ui:6167
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle "
 "track.\n"
@@ -1412,21 +1416,21 @@
 "This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: src/ghb3.ui:6181
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: src/ghb3.ui:6186
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: src/ghb3.ui:6207
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr ""
 
-#: src/ghb3.ui:6219
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
@@ -1436,15 +1440,15 @@
 "chosen wins."
 msgstr ""
 
-#: src/ghb3.ui:6246
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: src/ghb3.ui:6255
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr ""
 
-#: src/ghb3.ui:6260
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks "
 "will be discarded.\n"
@@ -1455,11 +1459,11 @@
 "chosen wins."
 msgstr ""
 
-#: src/ghb3.ui:6274
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr ""
 
-#: src/ghb3.ui:6279
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle "
 "tracks will be discarded.\n"
@@ -1470,248 +1474,244 @@
 "chosen wins."
 msgstr ""
 
-#: src/ghb3.ui:6301
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: src/ghb3.ui:6302
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: src/ghb3.ui:6326
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr ""
 
-#: src/ghb3.ui:6341 src/queuehandler.c:233
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr ""
 
-#: src/ghb3.ui:6346
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr ""
 
-#: src/ghb3.ui:6380
+#: src/ghb3.ui:6420
 msgid "Index"
 msgstr ""
 
-#: src/ghb3.ui:6404
+#: src/ghb3.ui:6444
 msgid "Duration"
 msgstr ""
 
-#: src/ghb3.ui:6415
+#: src/ghb3.ui:6455
 msgid "Title"
 msgstr ""
 
-#: src/ghb3.ui:6452
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr ""
 
-#: src/ghb3.ui:6472
-msgid "Title:"
-msgstr ""
-
-#: src/ghb3.ui:6507
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr ""
 
-#: src/ghb3.ui:6542
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr ""
 
-#: src/ghb3.ui:6577
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr ""
 
-#: src/ghb3.ui:6612
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr ""
 
-#: src/ghb3.ui:6647
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr ""
 
-#: src/ghb3.ui:6682
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr ""
 
-#: src/ghb3.ui:6717
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr ""
 
-#: src/ghb3.ui:6755
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr ""
 
-#: src/ghb3.ui:6784
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr ""
 
-#: src/ghb3.ui:6798
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: src/ghb3.ui:6818
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr ""
 
-#: src/ghb3.ui:6831
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: src/ghb3.ui:6834 src/queuehandler.c:2178
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr ""
 
-#: src/ghb3.ui:6927 src/ghb3.ui:7835 src/ghb3.ui:7987 src/ghb3.ui:8713
-#: src/ghb3.ui:9118 src/callbacks.c:5455 src/callbacks.c:5465
-#: src/callbacks.c:5473 src/hb-backend.c:4182 src/hb-backend.c:4215
-#: src/hb-backend.c:4254 src/hb-backend.c:4285 src/hb-backend.c:4313
-#: src/hb-backend.c:4359 src/hb-backend.c:4416 src/hb-backend.c:4436
-#: src/hb-backend.c:4456 src/hb-backend.c:4517 src/hb-backend.c:4572
-#: src/queuehandler.c:1788 src/queuehandler.c:1805 src/queuehandler.c:1819
-#: src/queuehandler.c:1834
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr ""
 
-#: src/ghb3.ui:6936 src/ghb3.ui:7080 src/ghb3.ui:7844 src/ghb3.ui:7996
-#: src/ghb3.ui:8722 src/ghb3.ui:9127
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr ""
 
-#: src/ghb3.ui:6965
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr ""
 
-#: src/ghb3.ui:6969
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr ""
 
-#: src/ghb3.ui:6982
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr ""
 
-#: src/ghb3.ui:6986
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr ""
 
-#: src/ghb3.ui:7047
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: src/ghb3.ui:7069
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr ""
 
-#: src/ghb3.ui:7175
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr ""
 
-#: src/ghb3.ui:7212
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr ""
 
-#: src/ghb3.ui:7234
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 
-#: src/ghb3.ui:7235
+#: src/ghb3.ui:7275
 msgid "Create destination filename from source filename or volume label"
 msgstr ""
 
-#: src/ghb3.ui:7259
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr ""
 
-#: src/ghb3.ui:7270
+#: src/ghb3.ui:7310
 msgid ""
 "Available Options: {source-path} {source} {title} {preset} {chapters} {date} "
 "{time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: src/ghb3.ui:7290
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 
-#: src/ghb3.ui:7333
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr ""
 
-#: src/ghb3.ui:7371
+#: src/ghb3.ui:7411
 msgid "Filter short DVD and Blu-ray titles (seconds)"
 msgstr ""
 
-#: src/ghb3.ui:7385
-msgid "Clear completed queue items after and encode completes"
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
 msgstr ""
 
-#: src/ghb3.ui:7389
+#: src/ghb3.ui:7429
 msgid ""
 "By default, completed jobs remain in the queue and are marked as complete.\n"
 "Check this if you want the queue to clean itself up by deleting completed "
 "jobs."
 msgstr ""
 
-#: src/ghb3.ui:7406
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr ""
 
-#: src/ghb3.ui:7449
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: src/ghb3.ui:7466
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr ""
 
-#: src/ghb3.ui:7489
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr ""
 
-#: src/ghb3.ui:7493 src/ghb3.ui:7515 src/ghb3.ui:7696
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: src/ghb3.ui:7530
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr ""
 
-#: src/ghb3.ui:7558
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: src/ghb3.ui:7594
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: src/ghb3.ui:7629
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: src/ghb3.ui:7650
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: src/ghb3.ui:7667
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr ""
 
-#: src/ghb3.ui:7671
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr ""
 
-#: src/ghb3.ui:7710
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr ""
 
-#: src/ghb3.ui:7727
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr ""
 
-#: src/ghb3.ui:7731
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1720,67 +1720,67 @@
 "independently."
 msgstr ""
 
-#: src/ghb3.ui:7759
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: src/ghb3.ui:7775
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr ""
 
-#: src/ghb3.ui:7803
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr ""
 
-#: src/ghb3.ui:7881
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr ""
 
-#: src/ghb3.ui:7901
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr ""
 
-#: src/ghb3.ui:7958 src/ghb3.ui:8305
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
 msgid "Description"
 msgstr ""
 
-#: src/ghb3.ui:8039
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr ""
 
-#: src/ghb3.ui:8054
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: src/ghb3.ui:8070
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr ""
 
-#: src/ghb3.ui:8103
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr ""
 
-#: src/ghb3.ui:8137
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr ""
 
-#: src/ghb3.ui:8142
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr ""
 
-#: src/ghb3.ui:8168
+#: src/ghb3.ui:8208
 msgid "Dimensions"
 msgstr ""
 
-#: src/ghb3.ui:8194
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr ""
 
-#: src/ghb3.ui:8199
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr ""
 
-#: src/ghb3.ui:8217
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1789,15 +1789,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: src/ghb3.ui:8234
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr ""
 
-#: src/ghb3.ui:8239
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr ""
 
-#: src/ghb3.ui:8257
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -1806,126 +1806,126 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: src/ghb3.ui:8328
+#: src/ghb3.ui:8368
 msgid "HandBrake Preview"
 msgstr ""
 
-#: src/ghb3.ui:8387
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr ""
 
-#: src/ghb3.ui:8409
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: src/ghb3.ui:8480
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr ""
 
-#: src/ghb3.ui:8492
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: src/ghb3.ui:8508
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr ""
 
-#: src/ghb3.ui:8512
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: src/ghb3.ui:8523
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr ""
 
-#: src/ghb3.ui:8527
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 
-#: src/ghb3.ui:8559
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr ""
 
-#: src/ghb3.ui:8571
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr ""
 
-#: src/ghb3.ui:8605
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr ""
 
-#: src/ghb3.ui:8641
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr ""
 
-#: src/ghb3.ui:8751
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr ""
 
-#: src/ghb3.ui:8756
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr ""
 
-#: src/ghb3.ui:8767
+#: src/ghb3.ui:8807
 msgid "Import SSA"
 msgstr ""
 
-#: src/ghb3.ui:8772
+#: src/ghb3.ui:8812
 msgid "Enable settings to import an SSA subtitle file"
 msgstr ""
 
-#: src/ghb3.ui:8784
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr ""
 
-#: src/ghb3.ui:8789
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 
-#: src/ghb3.ui:8816 src/ghb3.ui:9159
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
 msgid "Source Track"
 msgstr ""
 
-#: src/ghb3.ui:8831
+#: src/ghb3.ui:8871
 msgid "List of subtitle tracks available from your source."
 msgstr ""
 
-#: src/ghb3.ui:8845 src/ghb3.ui:9189
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
 msgid "Track Name:"
 msgstr ""
 
-#: src/ghb3.ui:8861
+#: src/ghb3.ui:8901
 msgid ""
 "Set the subtitle track name.\n"
 "\n"
 "Players may use this in the subtitle selection list."
 msgstr ""
 
-#: src/ghb3.ui:8894
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr ""
 
-#: src/ghb3.ui:8908
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr ""
 
-#: src/ghb3.ui:8922
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr ""
 
-#: src/ghb3.ui:8937
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr ""
 
-#: src/ghb3.ui:8952
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: src/ghb3.ui:8970
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -1934,56 +1934,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: src/ghb3.ui:8994
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr ""
 
-#: src/ghb3.ui:8997
+#: src/ghb3.ui:9037
 msgid "Import File"
 msgstr ""
 
-#: src/ghb3.ui:9015
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: src/ghb3.ui:9039
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr ""
 
-#: src/ghb3.ui:9060
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr ""
 
-#: src/ghb3.ui:9065
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: src/ghb3.ui:9077
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr ""
 
-#: src/ghb3.ui:9175
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr ""
 
-#: src/ghb3.ui:9205
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: src/ghb3.ui:9268
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr ""
 
-#: src/ghb3.ui:9281
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr ""
 
-#: src/ghb3.ui:9311 src/ghb3.ui:9550 src/audiohandler.c:1917
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output "
 "audio track.\n"
@@ -1994,89 +1994,89 @@
 "sounds louder."
 msgstr ""
 
-#: src/ghb3.ui:9332 src/audiohandler.c:1768
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr ""
 
-#: src/ghb3.ui:9354 src/audiohandler.c:1782
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr ""
 
-#: src/ghb3.ui:9359
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr ""
 
-#: src/ghb3.ui:9369 src/audiohandler.c:1787
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr ""
 
-#: src/ghb3.ui:9374
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr ""
 
-#: src/ghb3.ui:9395 src/audiohandler.c:1801
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr ""
 
-#: src/ghb3.ui:9415
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: src/ghb3.ui:9437
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr ""
 
-#: src/ghb3.ui:9464 src/audiohandler.c:1853
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: src/ghb3.ui:9480 src/audiohandler.c:1866
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr ""
 
-#: src/ghb3.ui:9503 src/audiohandler.c:1887
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
 
 #. Audio Gain Label
-#: src/ghb3.ui:9521 src/audiohandler.c:1897
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr ""
 
 #. Audio DRC Label
-#: src/ghb3.ui:9568 src/audiohandler.c:417 src/audiohandler.c:754
-#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5224
-#: src/hb-backend.c:123 src/hb-backend.c:201 src/hb-backend.c:213
-#: src/hb-backend.c:225 src/hb-backend.c:237 src/hb-backend.c:263
-#: src/hb-backend.c:275 src/hb-backend.c:287 src/hb-backend.c:348
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr ""
 
-#: src/ghb3.ui:9604
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr ""
 
-#: src/ghb3.ui:9612
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr ""
 
-#: src/ghb3.ui:9681
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr ""
 
-#: src/ghb3.ui:9697
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 
-#: src/ghb3.ui:9725
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr ""
 
-#: src/audiohandler.c:429 src/audiohandler.c:750 src/audiohandler.c:1225
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr ""
@@ -2140,35 +2140,35 @@
 msgid "Remove this audio encoder"
 msgstr ""
 
-#: src/callbacks.c:794 src/callbacks.c:2136
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr ""
 
-#: src/callbacks.c:1379
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr ""
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: src/callbacks.c:1703 src/callbacks.c:4174
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr ""
 
-#: src/callbacks.c:1739 src/callbacks.c:1740
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr ""
 
-#: src/callbacks.c:2727 src/hb-backend.c:2086 src/hb-backend.c:2206
-#: src/hb-backend.c:2218
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr ""
 
-#: src/callbacks.c:2728
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr ""
 
-#: src/callbacks.c:3514 src/callbacks.c:3536 src/callbacks.c:3555
-#: src/callbacks.c:3587
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2176,437 +2176,437 @@
 "%s in %d seconds ..."
 msgstr ""
 
-#: src/callbacks.c:3658 src/callbacks.c:3700
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr ""
 
-#: src/callbacks.c:3661 src/callbacks.c:3703 src/queuehandler.c:1730
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr ""
 
-#: src/callbacks.c:3662
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr ""
 
-#: src/callbacks.c:3663
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr ""
 
-#: src/callbacks.c:3664 src/callbacks.c:3704
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr ""
 
-#: src/callbacks.c:3882
+#: src/callbacks.c:3890
 #, c-format
 msgid "%d encode pending"
 msgstr ""
 
-#: src/callbacks.c:3886
+#: src/callbacks.c:3894
 #, c-format
 msgid "%d encodes pending"
 msgstr ""
 
-#: src/callbacks.c:3943 src/callbacks.c:4011
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr ""
 
-#: src/callbacks.c:3953
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: src/callbacks.c:3958
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr ""
 
-#: src/callbacks.c:3971
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: src/callbacks.c:3981 src/callbacks.c:4021
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: src/callbacks.c:3991 src/callbacks.c:4030
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr ""
 
-#: src/callbacks.c:4017
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr ""
 
-#: src/callbacks.c:4096
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr ""
 
-#: src/callbacks.c:4185
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr ""
 
-#: src/callbacks.c:4216
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr ""
 
-#: src/callbacks.c:4220
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr ""
 
-#: src/callbacks.c:4225
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr ""
 
-#: src/callbacks.c:4267
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: src/callbacks.c:4869
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr ""
 
-#: src/callbacks.c:5257
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr ""
 
-#: src/callbacks.c:5438
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr ""
 
-#: src/callbacks.c:5440
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: src/callbacks.c:5453 src/callbacks.c:5463 src/callbacks.c:5471
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr ""
 
-#: src/callbacks.c:5454
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr ""
 
-#: src/callbacks.c:5464
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr ""
 
-#: src/callbacks.c:5472
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr ""
 
-#: src/hb-backend.c:61 src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: src/hb-backend.c:62 src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr ""
 
-#: src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr ""
 
-#: src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr ""
 
-#: src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr ""
 
-#: src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr ""
 
-#: src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr ""
 
-#: src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr ""
 
-#: src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr ""
 
-#: src/hb-backend.c:124 src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr ""
 
-#: src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: src/hb-backend.c:126 src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr ""
 
-#: src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr ""
 
-#: src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr ""
 
-#: src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr ""
 
-#: src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr ""
 
-#: src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr ""
 
-#: src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr ""
 
-#: src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr ""
 
-#: src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr ""
 
-#: src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr ""
 
-#: src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr ""
 
-#: src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr ""
 
-#: src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr ""
 
-#: src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr ""
 
-#: src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr ""
 
-#: src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr ""
 
-#: src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr ""
 
-#: src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr ""
 
-#: src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr ""
 
-#: src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr ""
 
-#: src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr ""
 
-#: src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr ""
 
-#: src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr ""
 
-#: src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr ""
 
-#: src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr ""
 
-#: src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr ""
 
-#: src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr ""
 
-#: src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr ""
 
-#: src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr ""
 
-#: src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr ""
 
-#: src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr ""
 
-#: src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr ""
 
-#: src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr ""
 
-#: src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr ""
 
-#: src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr ""
 
-#: src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr ""
 
-#: src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr ""
 
-#: src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr ""
 
-#: src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr ""
 
-#: src/hb-backend.c:337 src/main.c:1152 src/queuehandler.c:1560
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
 msgid "All"
 msgstr ""
 
-#: src/hb-backend.c:349
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr ""
 
-#: src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr ""
 
-#: src/hb-backend.c:1347 src/hb-backend.c:1407 src/hb-backend.c:1486
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr ""
 
-#: src/hb-backend.c:1500
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr ""
 
-#: src/hb-backend.c:1504
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr ""
 
-#: src/hb-backend.c:1508
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr ""
 
-#: src/hb-backend.c:2075
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr ""
 
-#: src/hb-backend.c:2225
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr ""
 
-#: src/hb-backend.c:2244
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr ""
 
-#: src/hb-backend.c:2250
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr ""
 
-#: src/hb-backend.c:2256
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr ""
 
-#: src/hb-backend.c:2290
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr ""
 
 #. No audio. set some default
-#: src/hb-backend.c:2575
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr ""
 
-#: src/hb-backend.c:4171
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2615,7 +2615,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4178
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2623,7 +2623,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4204
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2632,7 +2632,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4211
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2640,7 +2640,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4240
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2650,7 +2650,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4249
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2659,7 +2659,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4278
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2670,7 +2670,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4306
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2681,7 +2681,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: src/hb-backend.c:4340
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -2689,7 +2689,7 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: src/hb-backend.c:4350
+#: src/hb-backend.c:4349
 msgid ""
 "Only VP8 or VP9 is supported in the WebM container.\n"
 "\n"
@@ -2697,17 +2697,17 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: src/hb-backend.c:4359 src/hb-backend.c:4416 src/hb-backend.c:4436
-#: src/hb-backend.c:4456 src/hb-backend.c:4517 src/hb-backend.c:4572
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr ""
 
 #. No valid title, stop right there
-#: src/hb-backend.c:4385 src/hb-backend.c:4481
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr ""
 
-#: src/hb-backend.c:4412
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -2715,7 +2715,7 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: src/hb-backend.c:4432
+#: src/hb-backend.c:4431
 msgid ""
 "WebM in HandBrake only supports burned subtitles.\n"
 "\n"
@@ -2723,7 +2723,7 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: src/hb-backend.c:4452
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -2731,7 +2731,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: src/hb-backend.c:4513
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -2739,7 +2739,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: src/hb-backend.c:4568
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -2748,7 +2748,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: src/main.c:98
+#: src/main.c:97
 #, c-format
 msgid ""
 "<big>Unable to create %s.</big>\n"
@@ -2757,43 +2757,43 @@
 "%s"
 msgstr ""
 
-#: src/main.c:236 src/main.c:301
+#: src/main.c:235 src/main.c:300
 msgid "Track Information"
 msgstr ""
 
-#: src/main.c:363
+#: src/main.c:362
 msgid "Preset Name"
 msgstr ""
 
-#: src/main.c:581
+#: src/main.c:580
 msgid "The device or file to encode"
 msgstr ""
 
-#: src/main.c:582
+#: src/main.c:581
 msgid "The preset values to use for encoding"
 msgstr ""
 
-#: src/main.c:583
+#: src/main.c:582
 msgid "Spam a lot"
 msgstr ""
 
-#: src/main.c:584
+#: src/main.c:583
 msgid "The path to override user config dir"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:585
 msgid "Open a console for debug output"
 msgstr ""
 
-#: src/presets.c:1233
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 
-#: src/presets.c:1389
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: src/presets.c:1849
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of "
 "HandBrake!\n"
@@ -2801,31 +2801,31 @@
 "Would you like to continue?"
 msgstr ""
 
-#: src/presets.c:1852
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr ""
 
-#: src/presets.c:1852
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr ""
 
-#: src/presets.c:1998
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr ""
 
-#: src/presets.c:2003
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr ""
 
-#: src/presets.c:2009
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr ""
 
-#: src/presets.c:2105
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr ""
 
-#: src/presets.c:2432
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -2833,15 +2833,15 @@
 "%s"
 msgstr ""
 
-#: src/presets.c:2433
+#: src/presets.c:2446
 msgid "folder"
 msgstr ""
 
-#: src/presets.c:2433
+#: src/presets.c:2446
 msgid "preset"
 msgstr ""
 
-#: src/preview.c:488
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -2850,20 +2850,20 @@
 "%s"
 msgstr ""
 
-#: src/queuehandler.c:193
+#: src/queuehandler.c:196
 #, c-format
 msgid "%s (Modified)"
 msgstr ""
 
-#: src/queuehandler.c:238
+#: src/queuehandler.c:285
 msgid "Align A/V"
 msgstr ""
 
-#: src/queuehandler.c:248
+#: src/queuehandler.c:295
 msgid "iPod 5G"
 msgstr ""
 
-#: src/queuehandler.c:280
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
 "%d:%d:%d:%d Crop\n"
@@ -2872,168 +2872,168 @@
 "%s Display Aspect Ratio"
 msgstr ""
 
-#: src/queuehandler.c:311
+#: src/queuehandler.c:358
 #, c-format
 msgid "%s, Bitrate %dkbps"
 msgstr ""
 
-#: src/queuehandler.c:316
+#: src/queuehandler.c:363
 #, c-format
 msgid "%s, Bitrate %dkbps (2 Pass)"
 msgstr ""
 
-#: src/queuehandler.c:323
+#: src/queuehandler.c:370
 #, c-format
 msgid "%s, Constant Quality %.4g(%s)"
 msgstr ""
 
-#: src/queuehandler.c:356
+#: src/queuehandler.c:403
 #, c-format
 msgid "%sPreset %s"
 msgstr ""
 
-#: src/queuehandler.c:361
+#: src/queuehandler.c:408
 #, c-format
 msgid "%sTune %s"
 msgstr ""
 
-#: src/queuehandler.c:366
+#: src/queuehandler.c:413
 #, c-format
 msgid "%sProfile %s"
 msgstr ""
 
-#: src/queuehandler.c:371
+#: src/queuehandler.c:418
 #, c-format
 msgid "%sLevel %s"
 msgstr ""
 
-#: src/queuehandler.c:388
+#: src/queuehandler.c:435
 #, c-format
 msgid ""
 "\n"
 "Constant Framerate %s fps"
 msgstr ""
 
-#: src/queuehandler.c:392
+#: src/queuehandler.c:439
 #, c-format
 msgid ""
 "\n"
 "Peak Framerate %s fps (may be lower)"
 msgstr ""
 
-#: src/queuehandler.c:397
+#: src/queuehandler.c:444
 #, c-format
 msgid ""
 "\n"
 "Variable Framerate %s fps"
 msgstr ""
 
-#: src/queuehandler.c:563 src/queuehandler.c:594
+#: src/queuehandler.c:610 src/queuehandler.c:641
 msgid ", Forced Only"
 msgstr ""
 
-#: src/queuehandler.c:567 src/queuehandler.c:598
+#: src/queuehandler.c:614 src/queuehandler.c:645
 msgid ", Burned"
 msgstr ""
 
-#: src/queuehandler.c:571 src/queuehandler.c:602
+#: src/queuehandler.c:618 src/queuehandler.c:649
 msgid ", Default"
 msgstr ""
 
-#: src/queuehandler.c:658 src/queuehandler.c:1157
+#: src/queuehandler.c:705 src/queuehandler.c:1204
 msgid "Completed"
 msgstr ""
 
-#: src/queuehandler.c:662 src/queuehandler.c:1161
+#: src/queuehandler.c:709 src/queuehandler.c:1208
 msgid "Canceled"
 msgstr ""
 
-#: src/queuehandler.c:666 src/queuehandler.c:1165
+#: src/queuehandler.c:713 src/queuehandler.c:1212
 msgid "Failed"
 msgstr ""
 
-#: src/queuehandler.c:671
+#: src/queuehandler.c:718
 msgid "Pending"
 msgstr ""
 
-#: src/queuehandler.c:707 src/queuehandler.c:735 src/queuehandler.c:1205
-#: src/queuehandler.c:1233
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
 msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: src/queuehandler.c:710 src/queuehandler.c:738 src/queuehandler.c:1208
-#: src/queuehandler.c:1236
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
 msgid "%d Days %02d:%02d:%02d"
 msgstr ""
 
-#: src/queuehandler.c:751 src/queuehandler.c:1249
+#: src/queuehandler.c:798 src/queuehandler.c:1296
 msgid "B"
 msgstr ""
 
-#: src/queuehandler.c:755 src/queuehandler.c:1253
+#: src/queuehandler.c:802 src/queuehandler.c:1300
 msgid "KB"
 msgstr ""
 
-#: src/queuehandler.c:760 src/queuehandler.c:1258
+#: src/queuehandler.c:807 src/queuehandler.c:1305
 msgid "MB"
 msgstr ""
 
-#: src/queuehandler.c:765 src/queuehandler.c:1263
+#: src/queuehandler.c:812 src/queuehandler.c:1310
 msgid "GB"
 msgstr ""
 
-#: src/queuehandler.c:776 src/queuehandler.c:1274
+#: src/queuehandler.c:823 src/queuehandler.c:1321
 msgid "Not Available"
 msgstr ""
 
-#: src/queuehandler.c:1109
+#: src/queuehandler.c:1156
 msgid "Foreign Audio Search"
 msgstr ""
 
-#: src/queuehandler.c:1113
+#: src/queuehandler.c:1160
 msgid "Encode"
 msgstr ""
 
-#: src/queuehandler.c:1117
+#: src/queuehandler.c:1164
 msgid "Encode First Pass (Analysis)"
 msgstr ""
 
-#: src/queuehandler.c:1121
+#: src/queuehandler.c:1168
 msgid "Encode Second Pass (Final)"
 msgstr ""
 
 #. Should never happen
-#: src/queuehandler.c:1126
+#: src/queuehandler.c:1173
 msgid "Error"
 msgstr ""
 
-#: src/queuehandler.c:1130
+#: src/queuehandler.c:1177
 #, c-format
 msgid ""
 "pass %d of %d\n"
 "%s"
 msgstr ""
 
-#: src/queuehandler.c:1142
+#: src/queuehandler.c:1189
 msgid "Scanning Title"
 msgstr ""
 
-#: src/queuehandler.c:1146
+#: src/queuehandler.c:1193
 msgid "Encoding Paused"
 msgstr ""
 
-#: src/queuehandler.c:1150
+#: src/queuehandler.c:1197
 msgid "Encoding In Progress"
 msgstr ""
 
 #. Should never happen
-#: src/queuehandler.c:1170
+#: src/queuehandler.c:1217
 msgid "Unknown"
 msgstr ""
 
-#: src/queuehandler.c:1723
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
 "%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
@@ -3041,15 +3041,15 @@
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: src/queuehandler.c:1728
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr ""
 
-#: src/queuehandler.c:1729
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr ""
 
-#: src/queuehandler.c:1783
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3058,11 +3058,11 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: src/queuehandler.c:1788 src/queuehandler.c:1834
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr ""
 
-#: src/queuehandler.c:1801
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3070,7 +3070,7 @@
 "This is not a valid directory."
 msgstr ""
 
-#: src/queuehandler.c:1815
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3078,7 +3078,7 @@
 "Can not read or write the directory."
 msgstr ""
 
-#: src/queuehandler.c:1829
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3087,67 +3087,67 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: src/queuehandler.c:2142
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr ""
 
 #. Title label
-#: src/queuehandler.c:2150
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr ""
 
-#: src/queuehandler.c:2160
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: src/queuehandler.c:2324 src/queuehandler.c:2337
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr ""
 
-#: src/queuehandler.c:2325 src/queuehandler.c:2338 src/queuehandler.c:2350
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr ""
 
-#: src/queuehandler.c:2349
+#: src/queuehandler.c:2396
 msgid "S_top Encoding"
 msgstr ""
 
-#: src/queuehandler.c:2362 src/queuehandler.c:2375
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr ""
 
-#: src/queuehandler.c:2363 src/queuehandler.c:2376 src/queuehandler.c:2388
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr ""
 
-#: src/queuehandler.c:2387
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr ""
 
-#: src/queuehandler.c:3018
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
 
-#: src/subtitlehandler.c:1380
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr ""
 
-#: src/subtitlehandler.c:1394
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr ""
 
-#: src/subtitlehandler.c:1399
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 
-#: src/videohandler.c:203
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3156,7 +3156,7 @@
 "\"%s\""
 msgstr ""
 
-#: src/videohandler.c:206
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3165,7 +3165,7 @@
 "\"\""
 msgstr ""
 
-#: src/videohandler.c:350
+#: src/videohandler.c:349
 #, c-format
 msgid "%s: %.4g (Warning: lossless)"
 msgstr ""

HandBrake-1.5.1.tar.xz/gtk/po/he.po Added

@@ -0,0 +1,3127 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Omer I.S. <omeritzicschwartz@gmail.com>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ghb 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
+"PO-Revision-Date: 2018-10-10 18:14+0000\n"
+"Last-Translator: Omer I.S. <omeritzicschwartz@gmail.com>, 2021\n"
+"Language-Team: Hebrew (https://www.transifex.com/HandBrakeProject/teams/92423/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+
+#: src/ghb3.ui:23
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:26
+msgid "Burned In"
+msgstr ""
+
+#: src/ghb3.ui:32 src/ghb3.ui:9122
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+#: src/ghb3.ui:39
+msgid "Default"
+msgstr "ברירת מחדל"
+
+#: src/ghb3.ui:45 src/ghb3.ui:9084
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:51
+msgid "Forced Only"
+msgstr ""
+
+#: src/ghb3.ui:57
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+#: src/ghb3.ui:63
+msgid "SRT Offset"
+msgstr ""
+
+#: src/ghb3.ui:69
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Scan\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+#: src/ghb3.ui:80
+msgid "Track"
+msgstr ""
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr ""
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr ""
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr ""
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr ""
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr ""
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr ""
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr ""
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr ""
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr ""
+
+#: src/ghb3.ui:304
+msgid "Presets List"
+msgstr ""
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr ""
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr ""
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr ""
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr "על אודות HandBrake"
+
+#: src/ghb3.ui:1716
+msgid ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , HandBrake Devs"
+msgstr ""
+"כל הזכויות © 2008 - John Stebbins\n"
+"כל הזכויות שמורות © 2004 - , מפתחי HandBrake"
+
+#: src/ghb3.ui:1718
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+
+#: src/ghb3.ui:1720
+msgid "https://handbrake.fr"
+msgstr "https://handbrake.fr"
+
+#: src/ghb3.ui:1721
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/ghb3.ui:1907
+msgid "HandBrake"
+msgstr "HandBrake"
+
+#: src/ghb3.ui:1930
+msgid "_File"
+msgstr ""
+
+#: src/ghb3.ui:1938
+msgid "Open _Source"
+msgstr ""
+
+#: src/ghb3.ui:1947
+msgid "Open Single _Title"
+msgstr ""
+
+#: src/ghb3.ui:1956
+msgid "Set _Destination"
+msgstr ""
+
+#: src/ghb3.ui:1971
+msgid "_Preferences"
+msgstr ""
+
+#: src/ghb3.ui:1986
+msgid "_Quit"
+msgstr ""
+
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
+msgid "_Queue"
+msgstr ""
+
+#: src/ghb3.ui:2009
+msgid "_Add"
+msgstr ""
+
+#: src/ghb3.ui:2018
+msgid "Add _Multiple"
+msgstr ""
+
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
+msgid "_Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
+msgid "_Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2045
+msgid "S_ave Queue"
+msgstr ""
+
+#: src/ghb3.ui:2054
+msgid "_Load Queue File"
+msgstr ""
+
+#: src/ghb3.ui:2069
+msgid "_View"
+msgstr ""
+
+#: src/ghb3.ui:2077
+msgid "HandBrake For _Dumbies"
+msgstr ""
+
+#: src/ghb3.ui:2086
+msgid "Presets _List"
+msgstr ""
+
+#: src/ghb3.ui:2104
+msgid "_Preview"
+msgstr ""
+
+#: src/ghb3.ui:2113
+msgid "_Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2229
+msgid "_Help"
+msgstr ""
+
+#: src/ghb3.ui:2237
+msgid "_About"
+msgstr ""
+
+#: src/ghb3.ui:2246
+msgid "_Guide"
+msgstr ""
+
+#: src/ghb3.ui:2284 src/callbacks.c:4123
+msgid "Choose Video Source"
+msgstr ""
+
+#: src/ghb3.ui:2286 src/callbacks.c:4122
+msgid "Open Source"
+msgstr ""
+
+#: src/ghb3.ui:2309
+msgid "Add to Queue"
+msgstr ""
+
+#: src/ghb3.ui:2311
+msgid "Add To Queue"
+msgstr ""
+
+#: src/ghb3.ui:2366
+msgid "Show Presets Window"
+msgstr ""
+
+#: src/ghb3.ui:2368
+msgid "Presets"
+msgstr ""
+
+#: src/ghb3.ui:2381
+msgid "Show Preview Window"
+msgstr ""
+
+#: src/ghb3.ui:2383
+msgid "Preview"
+msgstr ""
+
+#: src/ghb3.ui:2396
+msgid "Show Queue"
+msgstr ""
+
+#: src/ghb3.ui:2398 src/callbacks.c:4567
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:2411
+msgid "Show Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2413
+msgid "Activity"
+msgstr ""
+
+#: src/ghb3.ui:2443
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
+msgid "None"
+msgstr ""
+
+#: src/ghb3.ui:2514 src/callbacks.c:4095
+msgid "Scanning..."
+msgstr ""
+
+#: src/ghb3.ui:2548
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:2576
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+#: src/ghb3.ui:2598
+msgid "No Titles"
+msgstr ""
+
+#: src/ghb3.ui:2616
+msgid "Angle:"
+msgstr ""
+
+#: src/ghb3.ui:2628
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+#: src/ghb3.ui:2644
+msgid "Range:"
+msgstr ""
+
+#: src/ghb3.ui:2655
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+#: src/ghb3.ui:2668
+msgid "Set the first chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2683
+msgid "-"
+msgstr ""
+
+#: src/ghb3.ui:2695
+msgid "Set the last chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2720
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:2756
+msgid "Choose Preset"
+msgstr ""
+
+#: src/ghb3.ui:2787
+msgid "Modified"
+msgstr ""
+
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
+msgid "Reload"
+msgstr ""
+
+#: src/ghb3.ui:2799
+msgid ""
+"Reload the settings for the currently selected preset.\n"
+"Modifications will be discarded."
+msgstr ""
+
+#: src/ghb3.ui:2811
+msgid "Save New Preset"
+msgstr ""
+
+#: src/ghb3.ui:2814
+msgid "Save the current settings to a new Preset."
+msgstr ""
+
+#: src/ghb3.ui:2896
+msgid "Format:"
+msgstr ""
+
+#: src/ghb3.ui:2914
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+#: src/ghb3.ui:2926 src/queuehandler.c:290
+msgid "Web Optimized"
+msgstr ""
+
+#: src/ghb3.ui:2931
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+#: src/ghb3.ui:2947
+msgid "Align A/V Start"
+msgstr ""
+
+#: src/ghb3.ui:2952
+msgid ""
+"Aligns the initial timestamps of all audio and video streams by\n"
+"inserting blank frames or dropping frames. May improve audio/video\n"
+"sync for broken players that do not honor MP4 edit lists."
+msgstr ""
+
+#: src/ghb3.ui:2969
+msgid "iPod 5G Support"
+msgstr ""
+
+#: src/ghb3.ui:2974
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+#: src/ghb3.ui:2996
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:3014
+msgid "hh:mm:ss"
+msgstr ""
+
+#: src/ghb3.ui:3029
+msgid "Tracks:"
+msgstr ""
+
+#: src/ghb3.ui:3069
+msgid "Filters:"
+msgstr ""
+
+#: src/ghb3.ui:3109
+msgid "Size:"
+msgstr ""
+
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
+msgid "--"
+msgstr ""
+
+#: src/ghb3.ui:3227
+msgid "Auto Crop"
+msgstr ""
+
+#: src/ghb3.ui:3232
+msgid "Automatically crop black borders around edges of the video."
+msgstr ""
+
+#: src/ghb3.ui:3246
+msgid "Loose Crop"
+msgstr ""
+
+#: src/ghb3.ui:3250
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+#: src/ghb3.ui:3272
+msgid "Left Crop"
+msgstr ""
+
+#: src/ghb3.ui:3289
+msgid "Top Crop"
+msgstr ""
+
+#: src/ghb3.ui:3306
+msgid "Bottom Crop"
+msgstr ""
+
+#: src/ghb3.ui:3323
+msgid "Right Crop"
+msgstr ""
+
+#: src/ghb3.ui:3340
+msgid "Crop Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:3376
+msgid "Cropping"
+msgstr ""
+
+#: src/ghb3.ui:3411
+msgid "Optimal for source"
+msgstr ""
+
+#: src/ghb3.ui:3415
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
+msgid "Width:"
+msgstr ""
+
+#: src/ghb3.ui:3448
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
+msgid "Height:"
+msgstr ""
+
+#: src/ghb3.ui:3481
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3511
+msgid "Anamorphic:"
+msgstr ""
+
+#: src/ghb3.ui:3526
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Use a pixel aspect ratio that is as\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
+"Automatic - Use a pixel aspect ratio that maximizes\n"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
+msgstr ""
+
+#: src/ghb3.ui:3550
+msgid "Alignment:"
+msgstr ""
+
+#: src/ghb3.ui:3565
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+#: src/ghb3.ui:3590
+msgid "Storage Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3625
+msgid "Keep Aspect"
+msgstr ""
+
+#: src/ghb3.ui:3630
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+#: src/ghb3.ui:3663
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+
+#: src/ghb3.ui:3724
+msgid "Pixel Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3739
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3759
+msgid ":"
+msgstr ""
+
+#: src/ghb3.ui:3774
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3794
+msgid "Display Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3809
+msgid "--:--"
+msgstr ""
+
+#: src/ghb3.ui:3830
+msgid "Display Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3848
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:3876
+msgid "Detelecine:"
+msgstr ""
+
+#: src/ghb3.ui:3892
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+#: src/ghb3.ui:3907
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+#: src/ghb3.ui:3935
+msgid "Interlace Detection:"
+msgstr ""
+
+#: src/ghb3.ui:3951
+msgid ""
+"This filter detects interlaced frames.\n"
+"\n"
+"If a deinterlace filter is enabled, only frames that this filter finds\n"
+"to be interlaced will be deinterlaced."
+msgstr ""
+
+#: src/ghb3.ui:3967
+msgid ""
+"Custom interlace detection filter string format\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+msgstr ""
+
+#: src/ghb3.ui:3996
+msgid "Deinterlace:"
+msgstr ""
+
+#: src/ghb3.ui:4012
+msgid ""
+"Choose decomb or deinterlace filter.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4031
+msgid "Deinterlace Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4047
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
+msgid "Denoise Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+#: src/ghb3.ui:4213
+msgid "Denoise Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4246
+msgid "Denoise Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+#: src/ghb3.ui:4305
+msgid "Sharpen Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
+msgid ""
+"Sharpen filtering enhances edges and other\n"
+"high frequency components in the video."
+msgstr ""
+
+#: src/ghb3.ui:4337
+msgid "Sharpen Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4369
+msgid "Sharpen Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4427
+msgid "Rotate Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4443
+msgid "Rotate the video clockwise in 90 degree increments."
+msgstr ""
+
+#: src/ghb3.ui:4457
+msgid "Grayscale"
+msgstr ""
+
+#: src/ghb3.ui:4462
+msgid "If enabled, filter colour components out of video."
+msgstr ""
+
+#: src/ghb3.ui:4473
+msgid "Filters"
+msgstr ""
+
+#: src/ghb3.ui:4504
+msgid "Video Encoder:"
+msgstr ""
+
+#: src/ghb3.ui:4518
+msgid "Available video encoders."
+msgstr ""
+
+#: src/ghb3.ui:4534
+msgid "Framerate:"
+msgstr ""
+
+#: src/ghb3.ui:4549
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+#: src/ghb3.ui:4564
+msgid "Constant Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4569
+msgid "Enables constant framerate output."
+msgstr ""
+
+#: src/ghb3.ui:4583
+msgid "Peak Framerate (VFR)"
+msgstr ""
+
+#: src/ghb3.ui:4588
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4606
+msgid "Variable Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4611
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+#: src/ghb3.ui:4674
+msgid "Constant Quality:"
+msgstr ""
+
+#: src/ghb3.ui:4705
+msgid "Bitrate (kbps): "
+msgstr ""
+
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+#: src/ghb3.ui:4749
+msgid "2-Pass Encoding"
+msgstr ""
+
+#: src/ghb3.ui:4754
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+#: src/ghb3.ui:4772
+msgid "Turbo First Pass"
+msgstr ""
+
+#: src/ghb3.ui:4777
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+#: src/ghb3.ui:4839
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+#: src/ghb3.ui:4865
+msgid "Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4882
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve efficiency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+#: src/ghb3.ui:4898
+msgid "Fast Decode"
+msgstr ""
+
+#: src/ghb3.ui:4903
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+#: src/ghb3.ui:4921
+msgid "Zero Latency"
+msgstr ""
+
+#: src/ghb3.ui:4925
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+#: src/ghb3.ui:4949
+msgid "Profile:"
+msgstr "פרופיל:"
+
+#: src/ghb3.ui:4966
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:4984
+msgid "Level:"
+msgstr ""
+
+#: src/ghb3.ui:5001
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:5026
+msgid "More Settings:"
+msgstr "הגדרות נוספות:"
+
+#: src/ghb3.ui:5044
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+#: src/ghb3.ui:5078 src/main.c:1155
+msgid "Video"
+msgstr ""
+
+#. Add Button
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
+msgid "Add"
+msgstr "הוספה"
+
+#: src/ghb3.ui:5146
+msgid "Add new audio settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
+msgid "Add All"
+msgstr ""
+
+#: src/ghb3.ui:5158
+msgid "Add all audio tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5171
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr ""
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
+msgid "Selection Behavior:"
+msgstr ""
+
+#: src/ghb3.ui:5261
+msgid "Choose which audio tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:5322
+msgid ""
+"Create a list of languages you would like to select audio for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior."
+msgstr ""
+
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
+msgid "Remove"
+msgstr ""
+
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
+msgid "Available Languages"
+msgstr ""
+
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
+msgid "Selected Languages"
+msgstr ""
+
+#: src/ghb3.ui:5400
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+#: src/ghb3.ui:5405
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+#: src/ghb3.ui:5441
+msgid "Auto Passthru:"
+msgstr ""
+
+#: src/ghb3.ui:5452
+msgid "MP3"
+msgstr ""
+
+#: src/ghb3.ui:5457
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5473
+msgid "AAC"
+msgstr ""
+
+#: src/ghb3.ui:5478
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5494
+msgid "AC-3"
+msgstr ""
+
+#: src/ghb3.ui:5499
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5515
+msgid "DTS"
+msgstr ""
+
+#: src/ghb3.ui:5520
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5536
+msgid "DTS-HD"
+msgstr ""
+
+#: src/ghb3.ui:5541
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5557
+msgid "EAC-3"
+msgstr ""
+
+#: src/ghb3.ui:5562
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5578
+msgid "TrueHD"
+msgstr ""
+
+#: src/ghb3.ui:5583
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5599
+msgid "FLAC"
+msgstr ""
+
+#: src/ghb3.ui:5604
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5637
+msgid "Passthru Fallback:"
+msgstr ""
+
+#: src/ghb3.ui:5649
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+#: src/ghb3.ui:5678
+msgid "Audio Encoder Settings:"
+msgstr ""
+
+#: src/ghb3.ui:5679
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
+msgid "Encoder"
+msgstr ""
+
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
+msgid "Bitrate/Quality"
+msgstr ""
+
+#: src/ghb3.ui:5726
+msgid "Mixdown"
+msgstr ""
+
+#: src/ghb3.ui:5737
+msgid "Samplerate"
+msgstr ""
+
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
+msgid "Gain"
+msgstr ""
+
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
+msgid "DRC"
+msgstr ""
+
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr ""
+
+#: src/ghb3.ui:5808
+msgid "Audio"
+msgstr ""
+
+#: src/ghb3.ui:5876
+msgid "Add new subtitle settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5888
+msgid "Add all subtitle tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
+msgid "Foreign Audio Scan"
+msgstr ""
+
+#: src/ghb3.ui:5900
+msgid ""
+"Add an extra pass to the encode which searches\n"
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:5915
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:6009
+msgid "Choose which subtitle tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:6074
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+
+#: src/ghb3.ui:6155
+msgid "Preferred Language: None"
+msgstr ""
+
+#: src/ghb3.ui:6182
+msgid "Add Foreign Audio Scan Pass"
+msgstr ""
+
+#: src/ghb3.ui:6187
+msgid ""
+"Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6202
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+#: src/ghb3.ui:6207
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle track.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6221
+msgid "Add Closed Captions when available"
+msgstr ""
+
+#: src/ghb3.ui:6226
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track"
+msgstr ""
+
+#: src/ghb3.ui:6247
+msgid "Burn-In Behavior*:"
+msgstr ""
+
+#: src/ghb3.ui:6259
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6286
+msgid "Burn-In for deficient players*:"
+msgstr ""
+
+#: src/ghb3.ui:6295
+msgid "DVD Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6300
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6314
+msgid "Blu-ray Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6319
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6341
+msgid ""
+"* Only one of the above subtitle burn options will be applied, "
+"starting with the top."
+msgstr ""
+
+#: src/ghb3.ui:6342
+msgid ""
+"Only one subtitle track can be burned! Since conflicts can occur, the first "
+"chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6366
+msgid "Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr ""
+
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr ""
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr ""
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr ""
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr ""
+
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr ""
+
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr ""
+
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr ""
+
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr ""
+
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr ""
+
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr ""
+
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr ""
+
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr ""
+
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr ""
+
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr ""
+
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr ""
+
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr ""
+
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr ""
+
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr ""
+
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr ""
+
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr ""
+
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr ""
+
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr ""
+
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr ""
+
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr ""
+
+#: src/ghb3.ui:7310
+msgid ""
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
+msgstr ""
+
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr ""
+
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr ""
+
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr ""
+
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr ""
+
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr ""
+
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr ""
+
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr ""
+
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr ""
+
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr ""
+
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr ""
+
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
+msgstr ""
+
+#: src/ghb3.ui:7767
+msgid "Use the same settings for all titles in a batch"
+msgstr ""
+
+#: src/ghb3.ui:7771
+msgid ""
+"When checked, every title will use the same settings when adding a\n"
+"batch of titles to the queue.\n"
+"\n"
+"Uncheck this if you want to allow changing each title's settings independently."
+msgstr ""
+
+#: src/ghb3.ui:7799
+msgid "Allow Tweaks"
+msgstr ""
+
+#: src/ghb3.ui:7815
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+#: src/ghb3.ui:7843
+msgid "Advanced"
+msgstr ""
+
+#: src/ghb3.ui:7921
+msgid "Rename Preset"
+msgstr ""
+
+#: src/ghb3.ui:7941
+msgid "Name:"
+msgstr ""
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
+msgid "Category:"
+msgstr ""
+
+#: src/ghb3.ui:8094
+msgid "Set the category that this preset will be shown under."
+msgstr ""
+
+#: src/ghb3.ui:8110
+msgid "Category Name:"
+msgstr ""
+
+#: src/ghb3.ui:8143
+msgid "Preset Name:"
+msgstr ""
+
+#: src/ghb3.ui:8177
+msgid "Default Preset"
+msgstr ""
+
+#: src/ghb3.ui:8182
+msgid "Make this the default Preset when HandBrake starts"
+msgstr ""
+
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:8234
+msgid "Maximum Width:"
+msgstr ""
+
+#: src/ghb3.ui:8239
+msgid "Enable maximum width limit."
+msgstr ""
+
+#: src/ghb3.ui:8257
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+#: src/ghb3.ui:8274
+msgid "Maximum Height:"
+msgstr ""
+
+#: src/ghb3.ui:8279
+msgid "Enable maximum height limit."
+msgstr ""
+
+#: src/ghb3.ui:8297
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
+msgid "Select preview frames."
+msgstr ""
+
+#: src/ghb3.ui:8449
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+#: src/ghb3.ui:8520
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:8532
+msgid "Set the duration of the live preview in seconds."
+msgstr ""
+
+#: src/ghb3.ui:8548
+msgid "Show Crop"
+msgstr ""
+
+#: src/ghb3.ui:8552
+msgid "Show Cropped area of the preview"
+msgstr ""
+
+#: src/ghb3.ui:8563
+msgid "Source Resolution"
+msgstr ""
+
+#: src/ghb3.ui:8567
+msgid "Reset preview window to the source video's resolution"
+msgstr ""
+
+#: src/ghb3.ui:8599
+msgid "_Cancel"
+msgstr ""
+
+#: src/ghb3.ui:8611
+msgid "_Open"
+msgstr ""
+
+#: src/ghb3.ui:8645
+msgid "Title Number:"
+msgstr ""
+
+#: src/ghb3.ui:8681
+msgid "Detected DVD devices:"
+msgstr ""
+
+#: src/ghb3.ui:8791
+msgid "Import SRT"
+msgstr ""
+
+#: src/ghb3.ui:8796
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
+msgid "Embedded Subtitle List"
+msgstr ""
+
+#: src/ghb3.ui:8829
+msgid "Enable settings to select embedded subtitles"
+msgstr ""
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
+msgid "Language"
+msgstr ""
+
+#: src/ghb3.ui:8948
+msgid "Character Code"
+msgstr ""
+
+#: src/ghb3.ui:8962
+msgid "File:"
+msgstr ""
+
+#: src/ghb3.ui:8977
+msgid "Offset (ms)"
+msgstr ""
+
+#: src/ghb3.ui:8992
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+#: src/ghb3.ui:9010
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+#: src/ghb3.ui:9034
+msgid "Select the SRT file to import."
+msgstr ""
+
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
+
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+#: src/ghb3.ui:9079
+msgid "Forced Subtitles Only"
+msgstr ""
+
+#: src/ghb3.ui:9100
+msgid "Burn into video"
+msgstr ""
+
+#: src/ghb3.ui:9105
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:9117
+msgid "Set Default Track"
+msgstr ""
+
+#: src/ghb3.ui:9215
+msgid "List of audio tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:9245
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+#: src/ghb3.ui:9308
+msgid "Mix"
+msgstr ""
+
+#: src/ghb3.ui:9321
+msgid "Sample Rate"
+msgstr ""
+
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
+msgid "Set the audio codec to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
+msgid "Bitrate"
+msgstr ""
+
+#: src/ghb3.ui:9399
+msgid "Enable bitrate setting"
+msgstr ""
+
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
+msgid "Quality"
+msgstr ""
+
+#: src/ghb3.ui:9414
+msgid "Enable quality setting"
+msgstr ""
+
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
+msgid "Set the bitrate to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9455
+msgid ""
+"Quality: For output codec's that support it, adjust the quality of "
+"the output."
+msgstr ""
+
+#: src/ghb3.ui:9477
+msgid "00.0"
+msgstr ""
+
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
+msgid "Set the mixdown of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
+msgid "Set the sample rate of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+#. Audio Gain Label
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
+msgid "0dB"
+msgstr ""
+
+#. Audio DRC Label
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
+msgid "Off"
+msgstr ""
+
+#: src/ghb3.ui:9644
+msgid "Skip This Version"
+msgstr ""
+
+#: src/ghb3.ui:9652
+msgid "Remind Me Later"
+msgstr ""
+
+#: src/ghb3.ui:9721
+msgid "A new version of HandBrake is available!"
+msgstr ""
+
+#: src/ghb3.ui:9737
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr ""
+
+#: src/ghb3.ui:9765
+msgid "Release Notes"
+msgstr ""
+
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
+#, c-format
+msgid "%ddB"
+msgstr ""
+
+#: src/audiohandler.c:726
+msgid "Quality: "
+msgstr ""
+
+#: src/audiohandler.c:733
+#, c-format
+msgid "Bitrate: %dkbps\n"
+msgstr ""
+
+#: src/audiohandler.c:745
+#, c-format
+msgid "%.4gkHz"
+msgstr ""
+
+#: src/audiohandler.c:760
+#, c-format
+msgid "%d - %s (%.4gkHz)"
+msgstr ""
+
+#: src/audiohandler.c:765
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr ""
+
+#: src/audiohandler.c:771
+msgid "Passthrough"
+msgstr ""
+
+#: src/audiohandler.c:780
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+
+#: src/audiohandler.c:785
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s"
+msgstr ""
+
+#: src/audiohandler.c:1746
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+#: src/audiohandler.c:1826
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+#: src/audiohandler.c:1946
+msgid "Remove this audio encoder"
+msgstr ""
+
+#: src/callbacks.c:793 src/callbacks.c:2144
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr ""
+
+#: src/callbacks.c:1378
+msgid "Not Selected"
+msgstr ""
+
+#. This needs to be in scanning and working since scanning
+#. happens fast enough that it can be missed
+#: src/callbacks.c:1711 src/callbacks.c:4182
+msgid "Scanning ..."
+msgstr ""
+
+#: src/callbacks.c:1747 src/callbacks.c:1748
+msgid "Stop Scan"
+msgstr ""
+
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
+msgid "No Title Found"
+msgstr ""
+
+#: src/callbacks.c:2736
+msgid "New Video"
+msgstr ""
+
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+
+#: src/callbacks.c:3666 src/callbacks.c:3708
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
+msgid "Cancel Current and Stop"
+msgstr ""
+
+#: src/callbacks.c:3670
+msgid "Cancel Current, Start Next"
+msgstr ""
+
+#: src/callbacks.c:3671
+msgid "Finish Current, then Stop"
+msgstr ""
+
+#: src/callbacks.c:3672 src/callbacks.c:3712
+msgid "Continue Encoding"
+msgstr ""
+
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
+#, c-format
+msgid "job %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3961
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#: src/callbacks.c:3966
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3979
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3989 src/callbacks.c:4029
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3999 src/callbacks.c:4038
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr ""
+
+#: src/callbacks.c:4025
+msgid "Searching for start time, "
+msgstr ""
+
+#: src/callbacks.c:4100
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#: src/callbacks.c:4104
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+#: src/callbacks.c:4193
+msgid "Paused"
+msgstr ""
+
+#: src/callbacks.c:4224
+msgid "Encode Done!"
+msgstr ""
+
+#: src/callbacks.c:4228
+msgid "Encode Canceled."
+msgstr ""
+
+#: src/callbacks.c:4233
+msgid "Encode Failed."
+msgstr ""
+
+#: src/callbacks.c:4275
+msgid "Muxing: This may take a while..."
+msgstr ""
+
+#: src/callbacks.c:4877
+msgid "Scan this DVD source"
+msgstr ""
+
+#: src/callbacks.c:5265
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr ""
+
+#: src/callbacks.c:5446
+msgid "Encode Complete"
+msgstr ""
+
+#: src/callbacks.c:5448
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr ""
+
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
+msgid "Your encode is complete."
+msgstr ""
+
+#: src/callbacks.c:5462
+msgid "Shutting down the computer"
+msgstr ""
+
+#: src/callbacks.c:5472
+msgid "Putting computer to sleep"
+msgstr ""
+
+#: src/callbacks.c:5480
+msgid "Quitting Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:60 src/hb-backend.c:85
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:61 src/hb-backend.c:86
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:72
+msgid "Foreign Audio Subtitle Track"
+msgstr ""
+
+#: src/hb-backend.c:73
+msgid "First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:74
+msgid "Foreign Audio, then First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:96
+msgid "Chapters:"
+msgstr ""
+
+#: src/hb-backend.c:97
+msgid "Seconds:"
+msgstr ""
+
+#: src/hb-backend.c:98
+msgid "Frames:"
+msgstr ""
+
+#: src/hb-backend.c:108
+msgid "Do Nothing"
+msgstr ""
+
+#: src/hb-backend.c:109
+msgid "Show Notification"
+msgstr ""
+
+#: src/hb-backend.c:110
+msgid "Quit Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:111
+msgid "Put Computer To Sleep"
+msgstr ""
+
+#: src/hb-backend.c:112
+msgid "Shutdown Computer"
+msgstr ""
+
+#: src/hb-backend.c:123 src/hb-backend.c:252
+msgid "Automatic"
+msgstr ""
+
+#: src/hb-backend.c:124
+msgid "Loose"
+msgstr ""
+
+#: src/hb-backend.c:125 src/hb-backend.c:337
+msgid "Custom"
+msgstr ""
+
+#: src/hb-backend.c:161
+msgid "Week"
+msgstr ""
+
+#: src/hb-backend.c:162
+msgid "Month"
+msgstr ""
+
+#: src/hb-backend.c:163
+msgid "Year"
+msgstr ""
+
+#: src/hb-backend.c:164
+msgid "Immortal"
+msgstr ""
+
+#: src/hb-backend.c:174
+msgid "Never"
+msgstr ""
+
+#: src/hb-backend.c:175
+msgid "Daily"
+msgstr ""
+
+#: src/hb-backend.c:176
+msgid "Weekly"
+msgstr ""
+
+#: src/hb-backend.c:177
+msgid "Monthly"
+msgstr ""
+
+#: src/hb-backend.c:201
+msgid "Decomb"
+msgstr ""
+
+#: src/hb-backend.c:202
+msgid "Yadif"
+msgstr ""
+
+#: src/hb-backend.c:213
+msgid "NLMeans"
+msgstr ""
+
+#: src/hb-backend.c:214
+msgid "HQDN3D"
+msgstr ""
+
+#: src/hb-backend.c:225
+msgid "Unsharp"
+msgstr ""
+
+#: src/hb-backend.c:226
+msgid "Lapsharp"
+msgstr ""
+
+#: src/hb-backend.c:237
+msgid "90 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:238
+msgid "180 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:239
+msgid "270 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:250
+msgid "Spatial"
+msgstr ""
+
+#: src/hb-backend.c:251
+msgid "Temporal"
+msgstr ""
+
+#: src/hb-backend.c:263
+msgid "Fast"
+msgstr ""
+
+#: src/hb-backend.c:264
+msgid "Optimal"
+msgstr ""
+
+#: src/hb-backend.c:275
+msgid "Strict"
+msgstr ""
+
+#: src/hb-backend.c:276
+msgid "Normal"
+msgstr ""
+
+#: src/hb-backend.c:287
+msgid "Simple"
+msgstr ""
+
+#: src/hb-backend.c:288
+msgid "Smart"
+msgstr ""
+
+#: src/hb-backend.c:298
+msgid "Diamond"
+msgstr ""
+
+#: src/hb-backend.c:299
+msgid "Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:300
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:301
+msgid "Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:302
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:312
+msgid "0: SAD, no subpel"
+msgstr ""
+
+#: src/hb-backend.c:313
+msgid "1: SAD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:314
+msgid "2: SATD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:315
+msgid "3: SATD: multi-qpel"
+msgstr ""
+
+#: src/hb-backend.c:316
+msgid "4: SATD, qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:317
+msgid "5: SATD, multi-qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:318
+msgid "6: RD in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:319
+msgid "7: RD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:320
+msgid "8: RD refine in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:321
+msgid "9: RD refine in all frames"
+msgstr ""
+
+#: src/hb-backend.c:322
+msgid "10: QPRD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:323
+msgid "11: No early terminations in analysis"
+msgstr ""
+
+#: src/hb-backend.c:333
+msgid "Most"
+msgstr ""
+
+#: src/hb-backend.c:335
+msgid "Some"
+msgstr ""
+
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
+msgid "Encode only"
+msgstr ""
+
+#: src/hb-backend.c:349
+msgid "Always"
+msgstr ""
+
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
+msgid "Same as source"
+msgstr ""
+
+#: src/hb-backend.c:1499
+msgid "(NTSC Film)"
+msgstr ""
+
+#: src/hb-backend.c:1503
+msgid "(PAL Film/Video)"
+msgstr ""
+
+#: src/hb-backend.c:1507
+msgid "(NTSC Video)"
+msgstr ""
+
+#: src/hb-backend.c:2074
+#, c-format
+msgid "%s - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2224
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - %s"
+msgstr ""
+
+#: src/hb-backend.c:2243
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2249
+#, c-format
+msgid "%3d - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2255
+#, c-format
+msgid "%3d - %02dh%02dm%02ds"
+msgstr ""
+
+#: src/hb-backend.c:2289
+msgid "No Titles"
+msgstr ""
+
+#. No audio. set some default
+#: src/hb-backend.c:2574
+msgid "No Audio"
+msgstr ""
+
+#: src/hb-backend.c:4170
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4177
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4203
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4210
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4239
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4248
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4277
+#, c-format
+msgid ""
+"Invalid Denoise Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4305
+#, c-format
+msgid ""
+"Invalid Sharpen Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4339
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr ""
+
+#. No valid title, stop right there
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
+msgid "No title found.\n"
+msgstr ""
+
+#: src/hb-backend.c:4411
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
+msgid ""
+"SRT file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+#: src/hb-backend.c:4512
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4567
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr ""
+
+#: src/presets.c:1388
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+#: src/presets.c:1848
+msgid ""
+"Presets found are newer than what is supported by this version of HandBrake!\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Get me out of here!"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Load backup presets"
+msgstr ""
+
+#: src/presets.c:1997
+msgid "All (*)"
+msgstr ""
+
+#: src/presets.c:2002
+msgid "Presets (*.json)"
+msgstr ""
+
+#: src/presets.c:2008
+msgid "Legacy Presets (*.plist)"
+msgstr ""
+
+#: src/presets.c:2104
+msgid "Export Preset"
+msgstr ""
+
+#: src/presets.c:2445
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "folder"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "preset"
+msgstr ""
+
+#: src/preview.c:487
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr ""
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr ""
+
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr ""
+
+#: src/queuehandler.c:327
+#, c-format
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+
+#: src/queuehandler.c:358
+#, c-format
+msgid "%s, Bitrate %dkbps"
+msgstr ""
+
+#: src/queuehandler.c:363
+#, c-format
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
+
+#: src/queuehandler.c:370
+#, c-format
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
+
+#: src/queuehandler.c:403
+#, c-format
+msgid "%sPreset %s"
+msgstr ""
+
+#: src/queuehandler.c:408
+#, c-format
+msgid "%sTune %s"
+msgstr ""
+
+#: src/queuehandler.c:413
+#, c-format
+msgid "%sProfile %s"
+msgstr ""
+
+#: src/queuehandler.c:418
+#, c-format
+msgid "%sLevel %s"
+msgstr ""
+
+#: src/queuehandler.c:435
+#, c-format
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:439
+#, c-format
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+
+#: src/queuehandler.c:444
+#, c-format
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
+
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
+
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
+
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
+
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
+
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
+
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
+
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
+#, c-format
+msgid "%d Day %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
+#, c-format
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
+
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
+
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
+
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
+
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
+
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
+
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr ""
+
+#: src/queuehandler.c:1177
+#, c-format
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
+
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
+
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
+
+#: src/queuehandler.c:1770
+#, c-format
+msgid ""
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
+"Destination: %s\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+
+#: src/queuehandler.c:1775
+msgid "Resume, I've fixed the problem"
+msgstr ""
+
+#: src/queuehandler.c:1776
+msgid "Resume, Don't tell me again"
+msgstr ""
+
+#: src/queuehandler.c:1830
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
+msgid "Overwrite"
+msgstr ""
+
+#: src/queuehandler.c:1848
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+
+#: src/queuehandler.c:1862
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+
+#: src/queuehandler.c:1876
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:2189
+msgid "Select this title for adding to the queue.\n"
+msgstr ""
+
+#. Title label
+#: src/queuehandler.c:2197
+msgid "No Title"
+msgstr ""
+
+#: src/queuehandler.c:2207
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
+msgid "Stop"
+msgstr ""
+
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
+msgid "Stop Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
+msgstr ""
+
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2434
+msgid "_Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:3065
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#: src/subtitlehandler.c:1379
+#, c-format
+msgid "Preferred Language: %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1393
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1398
+msgid "Add subtitle track if default audio is not your preferred language"
+msgstr ""
+
+#: src/videohandler.c:202
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+
+#: src/videohandler.c:205
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/hr.po -> HandBrake-1.5.1.tar.xz/gtk/po/hr.po Changed

@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Marino Rabach, 2019
+# Nomis101 <Nomis101@web.de>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
 "Last-Translator: Marino Rabach, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/HandBrakeProject/teams/92423/hr/)\n"
@@ -21,18 +21,18 @@
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Snimljeno"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -43,11 +43,11 @@
 "in your output."
 msgstr ""
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Zadano"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -57,11 +57,11 @@
 "a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Samo nametnuto"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -71,11 +71,11 @@
 "This setting allows you to synchronize the files."
 msgstr ""
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT Offset"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -90,55 +90,233 @@
 "conjunction with the \"Forced\" option."
 msgstr ""
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Zapis"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr ""
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Odaberi Zadano"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "Spremi"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Spremi kao"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "Preimenuj"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "Izbriši"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "Uvezi"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "Izvezi"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr ""
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Spisak postavki"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Započni"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pauza"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Uredi"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Prethodno postavljeno:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Naslov:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Sažetak"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "O programu HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -146,342 +324,321 @@
 "Autorska prava © 2008 - John Stebbins\n"
 "Autorska prava © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr ""
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "Datoteka"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr ""
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr ""
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr ""
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "Postavke"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "Izađi"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "Red čekanja"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "Dodaj"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr ""
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "Učitaj datoteku iz reda čekanja"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "Prikaz"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake za neznalice"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr ""
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "Pregled"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "Pomoć"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "O programu"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr ""
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr ""
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr ""
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Započni"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pauza"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Prethodne postavke"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Pregled"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Red čekanja"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Aktivnost"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Izvor:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Pregledavanje..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Bez naslova"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Kut:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Raspon:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Postavka:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Izmijenjeno"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Ponovno učitaj"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr ""
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Web Optimizirano"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Uskladi A/V pokretanje"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr ""
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr ""
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Trajanje:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Zapisi:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtri:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Veličina:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Sažetak"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Automatsko izrezivanje"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -490,83 +647,83 @@
 "the required multiple."
 msgstr ""
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr ""
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Izrezivanje"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr ""
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Širina:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Visina:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr ""
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Poravnanje:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -574,30 +731,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Geometrija pohrane"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr ""
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -605,56 +762,56 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Geometrija prikaza"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimenzije"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr ""
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr ""
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -662,7 +819,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -670,11 +827,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Deinterlace:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -682,11 +839,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -694,93 +851,104 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Sivi tonovi"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr ""
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr ""
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr ""
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -788,19 +956,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr ""
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr ""
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -808,18 +976,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -835,15 +1003,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr ""
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr ""
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -852,11 +1020,11 @@
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -865,46 +1033,31 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr ""
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Koristi napredne opcije"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Prethodno postavljeno:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -913,22 +1066,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr ""
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Nulta latencija"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -938,279 +1091,268 @@
 "this setting is of little value here."
 msgstr ""
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr ""
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Razina:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Više postavki:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Popis zapisa"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr ""
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Prikaži opcije odabira izvornog zapisa"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Dodaj sve"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Dodaj sve zvučne zapise u popis"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Popis zapisa"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr ""
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Auto Passthru:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr ""
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Postavke zvučnog Enkodera:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Koder"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Dobitak"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr ""
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Zvuk"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Dodaj sve zapise s podnaslovima u popis"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr ""
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1219,663 +1361,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr ""
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Podnaslovi"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Maksmalni B-Okviri:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8 transformacija"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Značajke Enkodiranja"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr ""
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Prilagodljivi Direktan način:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Prilagodljivi B-Okviri:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr ""
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analiziranje"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Deblocking: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
 msgstr ""
 
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
 msgstr ""
 
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Napredan video"
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Indeks"
 
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
-msgstr ""
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Trajanje"
 
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
-msgstr ""
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Naslov"
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Poglavlja"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Naslov:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr ""
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Režiser:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr ""
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Žanr:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr ""
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Postavke"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Uredi"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr ""
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Izbriši sve"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr ""
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Učitaj datoteku u redu čekanja"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr ""
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Spremi kao:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "Za:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "U redu"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Odaberi sve"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Očisti sve"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Automatska provjera ažuriranja"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr ""
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr ""
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
 msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Općenito"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr ""
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Nadziraj slobodan prostor odredišnog diska"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB Limit"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:638
-msgid "Automatically Scan DVD when loaded"
-msgstr ""
-
-#: ../src/ghb.m4.h:639
-msgid "Scans the DVD whenever a new disc is loaded"
-msgstr ""
-
-#: ../src/ghb.m4.h:640
-msgid "Activity Window Font Size"
-msgstr ""
-
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Sakrij karticu Napredne opcije videozapisa"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
 msgstr ""
 
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr ""
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1883,71 +1682,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Dopusti HandBrake za neznalice"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Naziv mape:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Opis"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Naziv:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Opis"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Kategorija:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr ""
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Prilagođene dimenzije slike"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr ""
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1955,15 +1750,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr ""
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -1971,95 +1766,126 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Trajanje:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "Odustani"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr ""
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr ""
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr ""
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr ""
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr ""
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr ""
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Naziv zapisa:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Jezik"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr ""
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Offset (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2068,72 +1894,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr ""
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Srt datoteka"
-
-#: ../src/ghb.m4.h:708
-msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+#: src/ghb3.ui:9037
+msgid "Import File"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Zapis"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr ""
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr ""
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr ""
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr ""
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Naziv zapisa:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr ""
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Brzina uzorkovanja"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2141,49 +1951,49 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr ""
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Kvaliteta"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2191,180 +2001,73 @@
 "Dobitak zvuka: Podesi pojačanje ili prigušenje izlaznog audio zapisa."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Isključeno"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr ""
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Podsjeti me kasnije"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "Nova verzija programa HandBrake je dostupna!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr ""
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Odabir zvučnog zapisa i postavke "
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Indeks"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Trajanje"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Naslov"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr ""
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr ""
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr ""
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr ""
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Sve"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Kvaliteta: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr ""
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr ""
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Passthrough"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2375,7 +2078,7 @@
 "DRC: %s\n"
 "Naziv zapisa: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2384,13 +2087,13 @@
 "%sDobitak: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2398,39 +2101,39 @@
 "Kvaliteta zvuka:\n"
 "Kod enkodera koji to podržavaju, prilagodite kvalitetu izlaza."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr ""
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr ""
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Nije odabrano"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr ""
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr ""
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr ""
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Novi videozapis"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2441,438 +2144,437 @@
 "\n"
 "%s u %d sekundi ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sFilm će biti izgubljen ako se ne nastavi s kodiranjem."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr ""
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr ""
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d kodiranje(a) na čekanju"
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr ""
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr ""
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pauzirano"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr ""
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr ""
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr ""
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr ""
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Upozorenje: bez gubitka)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr ""
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr ""
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr ""
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr ""
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr ""
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Svi zapisi koji odgovaraju odabranim jezicima"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Poglavlja:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr ""
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr ""
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Ne čini ništa"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr ""
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr ""
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatski"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Prilagođeno"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Tjedan"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Mjesec"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Godina"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr ""
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Nikad"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Svakodnevno"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Tjedno"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Mjesečno"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 stupnjeva"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 stupnjeva"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 stupnjeva"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Prostorno"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr ""
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Brzo"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optimalno"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr ""
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normalno"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Jednostavno"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Pametno"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Dijamant"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Hexagon"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, no subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel za sve"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel za sve"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD in all frames"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD refine in I/P-frames"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD u svim okvirima"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr ""
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr ""
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Sve"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr ""
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Uvijek"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Kao i izvor"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC Film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC Video)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Bez naslova"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Bez zvuka"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr ""
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2881,7 +2583,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2889,7 +2591,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2898,7 +2600,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2906,7 +2608,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2916,7 +2618,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2925,7 +2627,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2936,7 +2638,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2947,8 +2649,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -2956,18 +2657,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Nastavi"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -2975,8 +2683,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -2984,8 +2699,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -2993,7 +2707,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3006,47 +2720,83 @@
 "Trebate odabrati drugi audio kodek.\n"
 "Ako nastavite s radnjom, jedan će audio kodek biti nasumično izabran za vas."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Makni me odavde!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr ""
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Sve (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr ""
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr ""
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr ""
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3054,15 +2804,15 @@
 "%s"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "mapa"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr ""
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3071,265 +2821,206 @@
 "%s"
 msgstr ""
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Sekunde"
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr ""
 
-#: ../src/queuehandler.c:224
-msgid "Frames"
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:228
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
 msgstr ""
-"<big>%s</big> (Naslov %d, %s %d preko %d, 2 video prolaza) -->"
-" %s"
 
-#: ../src/queuehandler.c:236
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
-"<big>%s</big> (Naslov %d, %s %d preko %d) --> %s"
 
-#: ../src/queuehandler.c:299
+#: src/queuehandler.c:358
 #, c-format
-msgid "Modified Preset Based On: %s\n"
+msgid "%s, Bitrate %dkbps"
 msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:363
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Postavka: %s\n"
-
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
-#, c-format
-msgid "Format: %s Container\n"
-msgstr "Format: %s Spremnik\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Opcije spremnika:"
-
-#: ../src/queuehandler.c:324
-#, c-format
-msgid "%sChapter Markers"
-msgstr "%sOznake poglavlja"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G podrška"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sWeb Optimizirano"
+msgid "%sPreset %s"
+msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destinacija: %s \n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Očuvani omjer)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(izgubljeni omjer)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorfni format)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Prilagođeni Anamorfni format)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Slika: "
+msgid "%sTune %s"
+msgstr ""
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgid "%sProfile %s"
 msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Prikaz %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtri:"
+msgid "%sLevel %s"
+msgstr ""
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sSivi tonovi"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Videozapis: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(konstantni)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(promjenjivi)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Slika u sekundi: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Slika u sekundi: Peak %s (može biti manje )"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Slika u sekundi: %s (stalni broj slika)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Greška"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
+msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "Turbo 1. prolaz: Uključeno\n"
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Opcije videozapisa: Unaprijed postavljeno: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Ugađanje: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Profil: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Razina: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Napredne opcije: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Zvuk: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr " Zvučni zapisi: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
 msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Enkoder: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> Enkoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Podnaslov: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Greška"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Zapisi podnaslova: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Samo prisiljeno)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (Snimaj)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (Zadano)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Offset (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr ""
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr ""
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3338,11 +3029,11 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Prepiši"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3350,7 +3041,7 @@
 "This is not a valid directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3358,7 +3049,7 @@
 "Can not read or write the directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3367,69 +3058,67 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr ""
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Bez naslova"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Zaustavi"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Nastavi"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr ""
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3442,8 +3131,7 @@
 "Proširene opcije:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3455,3 +3143,8 @@
 "\n"
 "Proširene opcije:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Upozorenje: bez gubitka)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/it.po -> HandBrake-1.5.1.tar.xz/gtk/po/it.po Changed

@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Valerio Buzi <valeriobuzi87@gmail.com>, 2018
+# Nomis101 <Nomis101@web.de>, 2019
+# Vincenzo Reale <vinx.reale@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Valerio Buzi <valeriobuzi87@gmail.com>, 2018\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>, 2021\n"
 "Language-Team: Italian (https://www.transifex.com/HandBrakeProject/teams/92423/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +32,11 @@
 "\n"
 "Il sottotitolo farà parte del video e non potrà essere disabilitato."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Masterizzato"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +54,11 @@
 "Ciò è utile per creare una traccia \"forzata\"\n"
 "nell'output."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +74,11 @@
 "sottotitoli durante le scene in cui qualcuno sta parlando\n"
 "una lingua straniera."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Solo i forzati"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +94,11 @@
 "non coincide con l'inizio del video.\n"
 "Questa impostazione ti consente di sincronizzare i files."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
-msgstr "Offset SRT"
+msgstr "Scostamento SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -123,55 +124,233 @@
 "scena in lingua straniera. E' meglio utilizzare questa opzione in\n"
 "abbinamento all'opzione \"Forzati\"."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Traccia"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Apri cartella sorgente"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Apri cartella di destinazione"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Importa coda"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
-msgstr "_Presets"
+msgstr "_Preimpostazioni"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
-msgstr "Imposta De_fault"
+msgstr "Imposta prede_finiti"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Salva"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
-msgstr "Salva_come"
+msgstr "S_alva come"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Elimina"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importa"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Esporta"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
-msgstr "Reimposta_Presets_Incorporate"
+msgstr "Reimposta prei_mpostazioni integrate"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
-msgstr "Elenco Presets"
+msgstr "Elenco preimpostazioni"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Coda"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Avvia codifica"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Avvia"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Sospendi codifica"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "In pausa"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Opzioni"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Modifica"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Azioni"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Preimpostazione:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Sorgente:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titolo:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Destinazione:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensioni:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Sottotitoli:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Riepilogo"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Stato:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistiche"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
-msgstr "Riguardo a HandBrake"
+msgstr "Informazioni su HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -179,203 +358,181 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake è un transcodificatore video multiprocesso e multipiattaforma, con"
 " licenza GPL."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake è un software gratuito; è possibile ridistribuirlo e/o modificarlo secondo i termini della GNU General Public License pubblicata dalla Free Software Foundation; sia la versione 2 della licenza sia (a propria scelta) qualsiasi versione successiva.\n"
-"\n"
-"HandBrake è distribuito nella speranza che sia utile, ma SENZA ALCUNA GARANZIA; senza nemmeno la garanzia implicita di COMMERCIABILITÀ od IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la GNU General Public License per maggiori dettagli.\n"
-"\n"
-"Dovresti aver ricevuto una copia della GNU General Public License insieme a Glade; in caso contrario, scrivi alla Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_File"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
-msgstr "Apri _Sorgente"
+msgstr "Apri _sorgente"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
-msgstr "Apri Titolo _Singolo "
+msgstr "Apri titolo _singolo "
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
-msgstr "Imposta _Destinazione"
+msgstr "Imposta _destinazione"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Coda"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
-msgstr "Aggiunta _Multipla"
+msgstr "Aggiunta _multipla"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
-msgstr "_Avvia Codifica"
+msgstr "_Avvia codifica"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
-msgstr "_Codifica in Pausa"
+msgstr "Sos_pendi codifica"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "S_alva Coda"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Carica files in coda"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake a prova d'incapace"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
-msgstr "Elenco _Presets"
+msgstr "E_lenco preimpostazioni"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Anteprima"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
-msgstr "_Finestra Attività"
+msgstr "_Finestra attività"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Informazioni"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guida"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
-msgstr "Scegli Sorgente Video"
+msgstr "Scegli sorgente video"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
-msgstr "Apri Sorgente"
+msgstr "Apri sorgente"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Aggiungi alla coda"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Aggiungi alla coda"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Avvia Codifica"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Avvia"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Codifica in Pausa"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "In Pausa"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
-msgstr "Mostra Finestra Presets"
+msgstr "Mostra finestra preimpostazioni"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
-msgstr "Presets"
+msgstr "Preimpostazioni"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
-msgstr "Mostra Finestra Anteprima"
+msgstr "Mostra finestra di anteprima"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Anteprima"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
-msgstr "Mostra Coda"
+msgstr "Mostra coda"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Coda"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
-msgstr "Mostra Finestra Attività"
+msgstr "Mostra finestra attività"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Attività"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Sorgente:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Scansione..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -385,59 +542,59 @@
 "In modo predefinito viene scelto il titolo più lungo.\n"
 "Questo è spesso il titolo di un DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
-msgstr "Nessun Titolo"
+msgstr "Nessun titolo"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Angolazione:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 "Per i DVD multiangolazione, seleziona l'angolazione desiderata per la "
 "codifica."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Intervallo:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Intervallo del titolo da codificare. Possono essere capitoli, secondi o "
 "fotogrammi."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Imposta il primo capitolo da codificare."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Imposta l'ultimo capitolo da codificare."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
-msgstr "Preset:"
+msgstr "Preimpostazione:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
-msgstr "Scegli Preset"
+msgstr "Scegli preimpostazione"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Modificato"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Ricarica"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -445,27 +602,27 @@
 "Ricarica le impostazioni per il preset attualmente selezionato.\n"
 "Le modifiche verranno scartate."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
-msgstr "Salva Nuovo Preset"
+msgstr "Salva nuova preimpostazione"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
-msgstr "Salva le impostazioni correnti in un nuovo Preset."
+msgstr "Salva le impostazioni attuali in una nuova preimpostazione."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
-msgstr "Formato Mux per le tracce codificate."
+msgstr "Formato di multiplazione delle tracce codificate."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
-msgstr "Ottimizzato per il Web"
+msgstr "Ottimizzato per il web"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -473,68 +630,64 @@
 "Ottimizza il layout del file MP4 per il download progressivo.\n"
 "Ciò consente ad un riproduttore di avviare la riproduzione prima di scaricare l'intero file."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Allinea Inizio A/V"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 "Allinea data e ora iniziali di tutti i flussi audio e video\n"
-"inserendo frames vuoti o frames a discesa. Può migliorare la sincronizzazione audio/ video per i lettori corrotti che non rispettano gli elenchi di modifica MP4."
+"inserendo fotogrammi vuoti o fotogrammi mancanti. Può migliorare la sincronizzazione audio/video per i lettori che non rispettano gli elenchi di modifica MP4."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Supporto iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
-msgstr "Aggiungi l'iPod Atom necessario per alcuni vecchi iPods."
+msgstr "Aggiungi l'iPod Atom necessario per alcuni vecchi iPod."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Durata:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "oo:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Tracce:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtri:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Dimensione:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Riepilogo"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
-msgstr "Taglio Automatico"
+msgstr "Taglio automatico"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Taglia automaticamente i bordi neri attorno ai margini del video."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
-msgstr "Ritaglio Libero"
+msgstr "Ritaglio libero"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -542,38 +695,38 @@
 "instead of doing exact cropping and then scaling to\n"
 "the required multiple."
 msgstr ""
-"Quando le impostazioni dell'immagine richiedono che le dimensioni dell'immagine stessa vengano arrotondate ad un numero multiplo\n"
-"di pixels, questa impostazione ritaglia alcuni pixels extra invece che eseguire il ritaglio esatto e poi scalare al multiplo richiesto."
+"Quando le impostazioni dell'immagine richiedono che le dimensioni dell'immagine stessa vengano arrotondate a un numero multiplo\n"
+"di pixel, questa impostazione ritaglia alcuni pixel extra invece che eseguire il ritaglio esatto e poi scalare al multiplo richiesto."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Ritaglia a sinistra"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Ritaglia in alto"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Ritaglia in basso"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Ritaglia a destra"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
-msgstr "Ritaglia Dimensioni:"
+msgstr "Dimensioni ritaglio:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Ritaglio"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Ottimale per la sorgente"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -581,11 +734,11 @@
 "Se abilitato, seleziona la risoluzione di archiviazione \"ottimale\".\n"
 "Questa sarà la risoluzione che più corrisponde alla risoluzione sorgente dopo il ritaglio."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -593,11 +746,11 @@
 "Questa è la larghezza a cui il video, verrà memorizzato.\n"
 "Le dimensioni di visualizzazione effettive, saranno diverse se le proporzioni pixel non sono 1:1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Altezza:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -605,40 +758,29 @@
 "Questa è l'altezza a cui il video, verrà memorizzato.\n"
 "Le dimensioni di visualizzazione effettive, saranno diverse se le proporzioni pixel non sono 1:1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamorfico:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Modalità Anamorfiche:\n"
-"<tt>\n"
-"Nessuna - Forza le proporzioni pixel su 1: 1.\n"
-"Libero - Utilizza un rapporto di aspetto dei pixels il\n"
-" più vicino possibile al rapporto di aspetto dei pixels del\n"
-" video sorgente, pur mantenendo il rapporto\n"
-" di aspetto di visualizzazione originale.\n"
-"Automatica - Utilizza proporzioni dei\n"
-" pixels che ottimizzino la\n"
-" risoluzione di archiviazione, preservando le proporzioni di\n"
-" visualizzazione originali</tt>"
-
-#: ../src/ghb.m4.h:172
+
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Allineamento:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -650,76 +792,80 @@
 "Questa impostazione è necessaria solo per la compatibilità con alcuni dispositivi.\n"
 "È necessario utilizzare 2 a meno che non si verifichino problemi di compatibilità."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Geometria di archiviazione"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Mantieni aspetto"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 "Se abilitato, viene mantenuto l'aspetto di visualizzazione originale della "
 "sorgente."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 "Questa è la larghezza di visualizzazione. È il risultato della scalatura "
-"delle dimensioni di archiviazione in base all'aspetto dei pixels."
+"delle dimensioni di archiviazione in base all'aspetto dei pixel."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Aspetto pixel:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
+"L'aspetto dei pixel definisce la loro forma.\n"
+"\n"
+"Un rapporto 1: 1 definisce un pixel quadrato. Altri valori definiscono forme rettangolari.\n"
+"I lettori ridimensioneranno l'immagine per ottenere l'aspetto specificato."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
-"L'aspetto dei pixels definisce la loro forma.\n"
+"L'aspetto dei pixel definisce la loro forma.\n"
 "Un rapporto 1: 1 definisce un pixel quadrato. Altri valori definiscono forme rettangolari.\n"
 "I lettori ridimensioneranno l'immagine per ottenere l'aspetto specificato."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
-msgstr "Aspetto Visualizzazione:"
+msgstr "Aspetto schermo:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Geometria schermo"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensioni"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Detelecine:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -729,7 +875,7 @@
 "\n"
 "Il telecining è un processo che regola i frame rates dei film che sono di 24 fps ai frame rates video NTSC che sono di 30 fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -739,11 +885,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
-msgstr "Rilevamento Interlacciatura:"
+msgstr "Rilevamento interlacciamento:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -755,7 +901,7 @@
 "Se è abilitato un filtro di deinterlacciamento, verranno deinterlacciati\n"
 "solo i fotogrammi trovati interlacciati da questo filtro."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -767,11 +913,11 @@
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Deinterlacciamento:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -783,11 +929,11 @@
 "Il filtro decomb supporta vari algoritmi di interpolazione.\n"
 "Il filtro deinterlacciamento è un classico deinterlacciatore YADIF.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Preset Deinterlacciamento:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -799,11 +945,11 @@
 "Il filtro decomb supporta vari algoritmi di interpolazione.\n"
 "Il filtro deinterlacciamento è un classico deinterlacciatore YADIF.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -811,11 +957,22 @@
 "Il filtro di deblocking rimuove un tipo comune di artefatto di compressione.\n"
 "Se la tua fonte mostra una 'quadrettatura', questo filtro può aiutare a ripulirlo."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Filtro Denoise:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -825,15 +982,15 @@
 "La grana della pellicola ed altri tipi di rumore ad alta frequenza, sono difficili da comprimere.\n"
 "L'utilizzo di questo filtro su tali sorgenti, può ridurre le dimensioni dei files."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
-msgstr "Preset Denoise:"
+msgstr "Preimpostazione Denoise:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Sintonia Denoise:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -843,11 +1000,11 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Filtro Contrasto:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -855,47 +1012,47 @@
 "Il filtro Contrasto migliora i bordi ed altri\n"
 "componenti ad alta frequenza nel video."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
-msgstr "Preset Contrasto:"
+msgstr "Preimpostazione contrasto:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
-msgstr "Sintonia Contrasto:"
+msgstr "Sintonia contrasto:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Filtro Rotazione:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Ruota il video in senso orario con incrementi di 90 gradi."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
-msgstr "Scala di Grigi"
+msgstr "Scala di grigi"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Se abilitato, filtra i componenti a colori dal video."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
-msgstr "Codificatore Video:"
+msgstr "Codificatore video:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Codificatori video disponibili."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
-msgstr "Frequenza Fotogrammi:"
+msgstr "Velocità fotogrammi:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -904,21 +1061,21 @@
 msgstr ""
 "Frequenza fotogrammi in uscita.\n"
 "\n"
-"Ti raccomandiamo l'utilizzo dell'opzione 'Come Sorgente'. Se il tuo video sorgente ha un frequenza fotogrammi variabile, l'opzione 'Come Sorgente', la conserverà."
+"Ti raccomandiamo l'utilizzo dell'opzione 'Come sorgente'. Se il tuo video sorgente ha un frequenza fotogrammi variabile, l'opzione 'Come sorgente', la conserverà."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Frequenza fotogrammi costante"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Produce una frequenza fotogrammi costante in output."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Picco frequenza fotogrammi (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -930,11 +1087,11 @@
 "\n"
 "VFR non è compatibile con alcuni lettori."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Frequenza fotogrammi variabile"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -944,7 +1101,7 @@
 "\n"
 "VFR non è compatibile con alcuni lettori."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -971,15 +1128,15 @@
 "Le scale FFMpeg e Theora sono più lineari.\n"
 "Questi codificatori non offrono una modalità senza perdita dati."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Qualità costante:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Bitrate (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -993,11 +1150,11 @@
 "Ma la media su una lunga durata sarà il valore impostato qui. Se hai bisogno\n"
 "di limitare il bitrate istantaneo, controlla le impostazioni vbv-bufsize e vbv-maxrate di x264."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Codifica a 2 passaggi"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1011,11 +1168,11 @@
 "raccolte le statistiche sul video. Quindi, nel secondo passaggio, tali\n"
 "statistiche vengono utilizzate per prendere decisioni di allocazione del bitrate."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
-msgstr "Primo Passaggio Turbo"
+msgstr "Primo passaggio turbo"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1023,45 +1180,21 @@
 "Durante il 1° passaggio di una codifica a 2 passaggi, usa le impostazioni "
 "che velocizzino le fasi."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Usa Opzioni Avanzate"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Utilizza la scheda Opzioni avanzate per le impostazioni x264.\n"
-"\n"
-"Utilizzala a tuo rischio e pericolo!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Preset:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"Regola le impostazioni del codificatore per bilanciare efficienza di compressione e velocità di codifica.\n"
-"\n"
-"Stabilisce le impostazioni predefinite del codificatore.\n"
-"Ad esso verranno applicati sintonia, profili, livelli ed una stringa di opzioni avanzate.\n"
-"In genere, dovresti impostare questa opzione sul livello più lento\n"
-"che puoi tollerare poiché, impostazioni più lente, produrranno una qualità migliore o files più piccoli."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Sintonia:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1075,11 +1208,11 @@
 "od impostare le caratteristiche del file di output. Le modifiche verranno\n"
 "applicate dopo il preset, ma prima di tutti gli altri parametri."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Decodifica rapida"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1089,11 +1222,11 @@
 "\n"
 "Imposta questo parametro se il dispositivo fatica a riprodurre l'output (fotogrammi persi)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Latenza zero"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1109,11 +1242,11 @@
 "Poiché HandBrake non è adatto per trasmissioni in diretta,\n"
 "questa impostazione ha poco valore."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1123,11 +1256,11 @@
 "\n"
 "Sovrascrive tutte le altre impostazioni."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Livello:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1137,11 +1270,11 @@
 "\n"
 "Sovrascrive tutte le altre impostazioni."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Altre impostazioni:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1151,57 +1284,45 @@
 "\n"
 "Elenco separato da due punti delle opzioni del codificatore."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Elenco tracce"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Mostra Elenco Tracce Audio Output"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Selezione Tracce"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Mostra Opzioni Selezione Traccia Sorgente"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Aggiungi"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Aggiunge nuove impostazioni audio all'elenco"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
-msgstr "Aggiungi Tutto"
+msgstr "Aggiungi tutto"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
-msgstr "Aggiunge tutte le tracce audio all'elenco"
+msgstr "Aggiungi tutte le tracce audio all'elenco"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Ricarica tutte le impostazioni audio predefinite"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Elenco tracce"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
-msgstr "Comportamento Selezione:"
+msgstr "Comportamento selezione:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
-msgstr ""
-"Scegli quali tracce audio del supporto di origine debbano essere utilizzate."
+msgstr "Scegli quali tracce audio del supporto di origine sono utilizzate."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1209,197 +1330,196 @@
 "Crea un elenco di lingue per cui desideri selezionare l'audio.\n"
 "Le tracce corrispondenti a queste lingue, saranno selezionate usando il Comportamento Selezione prescelto."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Lingue disponibili"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Lingue selezionate"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Usa solo il primo codificatore per l'audio secondario"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
-"Solo la traccia audio primaria verrà codificata con l'elenco completo dei codificatori.\n"
-" Tutte le altre tracce di output audio secondarie verranno codificate solo con il primo codificatore."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Passthru Auto:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Abilita questa opzione se il tuo dispositivo di riproduzione supporta MP3.\n"
-" Ciò consente di selezionare passthru MP3 quando è abilitata la selezione passthru automatico."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Abilita questa opzione se il tuo dispositivo di riproduzione supporta AAC.\n"
-" Ciò consente di selezionare passthru AAC quando è abilitata la selezione passthru automatica."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
-msgstr ""
+msgstr "Ripiego passthru:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
+"Imposta il codificatore audio da utilizzare quando non è possibile trovare "
+"una traccia appropriata per il passthru audio."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Impostazioni codificatore audio:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
+"Ogni traccia sorgente selezionata sarà codificata con tutti i codificatori "
+"selezionati"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Codificatore"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Bitrate/Qualità"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
-msgstr ""
+msgstr "Mixdown"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
-msgstr ""
+msgstr "Campionamento"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Guadagno"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Selezione tracce"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Aggiungi nuove impostazioni sottotitoli all'elenco"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Aggiungi tutte le tracce sottotitoli dall'elenco"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
-msgstr ""
+msgstr "Scansione audio straniero"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Ricarica tutte le impostazioni sottotitoli predefinite"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
+"Scegli quali tracce di sottotitoli del supporto di origine sono utilizzate."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1408,663 +1528,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Lingua preferita: Nessuna"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
-msgstr ""
+msgstr "Aggiungi traccia dei sottotitoli se l'audio predefinito è straniero"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
-msgstr ""
+msgstr "Comportamento Burn-In*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
-msgstr ""
+msgstr "Burn-In per principianti*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "Sottotitoli DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Sottotitoli Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr "Marcatori di capitolo"
 
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Numero Massimo di Fotogrammi-B"
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr "Aggiungi marcatori di capitolo nel file di destinazione."
 
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Indice"
 
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Fotogrammi-B Piramidali:"
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Durata"
 
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titolo"
 
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr "Capitoli"
 
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr "Attori:"
 
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr ""
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr "Regista:"
 
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr "Data di uscita:"
 
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr "Commento:"
 
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr "Genere:"
 
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Parametri codifica"
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr "Descrizione:"
 
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Metodo di Stima Movimento:"
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr "Trama:"
 
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr "Tag"
 
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr "Salva con nome:"
 
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr "Nome del file di destinazione per la tua codifica."
 
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Area di Stima Movimento:"
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr "A:"
 
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr "Cartella di destinazione per la codifica."
 
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr "Cartella di destinazione"
 
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr "Annulla"
 
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Fotogrammi-B Adattativi:"
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr "OK"
 
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr "Seleziona tutto"
 
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Partizioni:"
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr "Marca tutti i titoli per l'aggiunta alla coda"
 
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr "Cancella tutto"
 
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr "Deseleziona tutti i titoli"
 
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr "File di destinazione OK. Nessun duplicato rilevato."
 
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analisi"
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Intensità Quantizzazione Adattiva:"
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr "Cerca aggiornamenti automaticamente"
 
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr "Quando tutte le codifiche sono completate."
 
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Usa nomi automatici (utilizza i nomi di origine modificati)"
 
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
 msgstr ""
 
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr "Modello di assegnazione automatica dei nomi"
 
-#: ../src/ghb.m4.h:543
+#: src/ghb3.ui:7310
 msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Deblocking: "
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "Usa estensione file per iPod/iTunes (.m4v) per i file MP4"
 
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr ""
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Avanzate video"
-
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
-msgstr "Marcatori Capitolo"
-
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
-msgstr "Aggiungi marcatori di capitolo nel file di destinazione."
-
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
-msgid "Chapters"
-msgstr "Capitoli"
-
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Titolo:"
-
-#: ../src/ghb.m4.h:585
-msgid "Actors:"
-msgstr "Attori:"
-
-#: ../src/ghb.m4.h:586
-msgid "Director:"
-msgstr "Regista:"
-
-#: ../src/ghb.m4.h:587
-msgid "Release Date:"
-msgstr "Data di uscita:"
-
-#: ../src/ghb.m4.h:588
-msgid "Comment:"
-msgstr "Commento:"
-
-#: ../src/ghb.m4.h:589
-msgid "Genre:"
-msgstr "Genere:"
-
-#: ../src/ghb.m4.h:590
-msgid "Description:"
-msgstr "Descrizione:"
-
-#: ../src/ghb.m4.h:591
-msgid "Plot:"
-msgstr "Trama:"
-
-#: ../src/ghb.m4.h:592
-msgid "Tags"
-msgstr "Tag"
-
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Impostazioni"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Modifica"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Ricarica tutto"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Elimina tutto"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Elimina tutti gli elementi nella coda."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Salva coda"
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr "Numero di anteprime"
 
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
 msgstr ""
 
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Carica file di coda"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Carica un file di coda salvato in precedenza."
-
-#: ../src/ghb.m4.h:607
-msgid "Save As:"
-msgstr "Salva con nome:"
-
-#: ../src/ghb.m4.h:608
-msgid "Destination filename for your encode."
-msgstr "Nome del file di destinazione per la tua codifica."
-
-#: ../src/ghb.m4.h:609
-msgid "To:"
-msgstr "A:"
-
-#: ../src/ghb.m4.h:610
-msgid "Destination directory for your encode."
-msgstr "Cartella di destinazione per la codifica."
-
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
-msgid "Destination Directory"
-msgstr "Cartella di destinazione"
-
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
-msgid "Cancel"
-msgstr "Annulla"
-
-#: ../src/ghb.m4.h:613
-msgid "OK"
-msgstr "OK"
-
-#: ../src/ghb.m4.h:614
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: ../src/ghb.m4.h:615
-msgid "Mark all titles for adding to the queue"
-msgstr "Marca tutti i titoli per l'aggiunta alla coda"
-
-#: ../src/ghb.m4.h:616
-msgid "Clear All"
-msgstr "Cancella tutto"
-
-#: ../src/ghb.m4.h:617
-msgid "Unmark all titles"
-msgstr "Deseleziona tutti i titoli"
-
-#: ../src/ghb.m4.h:618
-msgid "Destination files OK. No duplicates detected."
-msgstr "File di destinazione OK. Nessun duplicato rilevato."
-
-#: ../src/ghb.m4.h:619
-msgid "Preferences"
-msgstr "Preferenze"
-
-#: ../src/ghb.m4.h:620
-msgid "Automatically check for updates"
-msgstr "Cerca aggiornamenti automaticamente"
-
-#: ../src/ghb.m4.h:621
-msgid "When all encodes are complete"
-msgstr "Quando tutte le codifiche sono completate."
-
-#: ../src/ghb.m4.h:622
-msgid "Use automatic naming (uses modified source name)"
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
 msgstr ""
 
-#: ../src/ghb.m4.h:623
-msgid "Auto-Name Template"
-msgstr "Modello di Nominazione Automatica"
-
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7429
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
-msgstr ""
-
-#: ../src/ghb.m4.h:625
-msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
 msgstr ""
 
-#: ../src/ghb.m4.h:626
-msgid "Number of previews"
-msgstr "Numero di anteprime"
-
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Filtra titoli brevi (secondi)"
-
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Generale"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Usa dvdnav (anziché libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
-msgstr ""
+msgstr "Controlla lo spazio libero su disco a destinazione"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "Limite MB"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
-msgstr ""
+msgstr "Livello di verbosità registro delle attività"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
-msgstr ""
+msgstr "Longevità registro delle attività"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Scansiona Automaticamente il DVD quando caricato"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Scansione il DVD ogni volta che un nuovo disco viene caricato"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Dimensione font finestra di attività"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Nascondi scheda opzioni video avanzate"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Elimina lavori completati dalla coda"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
-msgstr ""
+msgstr "Utilizza le stesse impostazioni per tutti i titoli in serie"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2072,71 +1849,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
-msgstr ""
+msgstr "Consenti modifiche"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
-msgstr ""
+msgstr "Consenti HandBrake per principianti"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Nome cartella:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Descrizione"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
-msgstr "Rinomina Predefinito"
+msgstr "Rinomina preimpostazione"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Descrizione"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
-msgstr ""
+msgstr "Imposta la categoria in cui questa preimpostazione sarà visualizzata."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Nome categoria:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Nome predefinito:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Predefinito di Base"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Imposta come predefinito all'avvio di HandBrake"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Personalizza dimensioni immagine"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Larghezza massima:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Abilita limite larghezza massima."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2144,15 +1917,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Altezza massima:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Abilita limite altezza massima."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2160,95 +1933,128 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Seleziona frame di anteprima"
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Durata:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Seleziona la durata delle anteprime dirette in secondi."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Mostra ritaglio"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Mostra area ritagliata dell'anteprima"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Risoluzione sorgente"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Ripristina finestra di anteprima alla risoluzione del video sorgente"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Apri"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Numero titolo:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Dispositivi DVD rilevati:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importa SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Abilita le impostazioni per importare i sottotitoli in formato SRT"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importa SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Elenco sottotitoli incorporati"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Abilita impostazioni per selezionare i sottotitoli incorporati"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Traccia sorgente"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Elenco di tracce sottotitoli disponibili dalla sorgente."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Nome traccia:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Lingua"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
-msgstr "Codice Carattere"
+msgstr "Codice carattere"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "File:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
-msgstr ""
+msgstr "Scostamento (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
+"Imposta la lingua di questo sottotitolo.\n"
+"Questo valore sarà utilizzato dai lettori nel menu dei sottotitoli."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2257,57 +2063,41 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Seleziona il file SRT da importare."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "File srt"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importa file"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Traccia"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Elenco di tracce sottotitoli disponibili dalla sorgente."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Solo Sottotitoli Forzati"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Masterizza in video"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Imposta traccia predefinita"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Traccia sorgente"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Nome traccia:"
+msgstr "Elenco delle tracce audio disponibili dalla tua sorgente."
 
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2317,15 +2107,15 @@
 "\n"
 "I lettori potrebbero usare questa nella lista di selezione audio."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Mescola"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Frequenza di campionamento"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2333,251 +2123,148 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Imposta il codificatore audio da utilizzare per questa traccia."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Abilita impostazioni bitrate"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Qualità"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Abilita impostazioni qualità"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Imposta il bitrate con cui codificare questa traccia."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
-msgstr ""
+msgstr "Imposta il mixdown della traccia audio di uscita."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Imposta la frequenza di campionamento della traccia audio di output"
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Spento"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Salta questa versione"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Ricordamelo più tardi"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
-msgstr ""
+msgstr "Una nuova versione di HandBrake è disponibile!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx è ora disponibile (tu hai yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Note di rilascio"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Free e Open Source"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multi-piattaforma (Windows, Mac e Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Finestra principale e riepilogo delle impostazioni"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Risoluzione video e impostazioni ritaglio"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Impostazioni codificatore video"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Selezione traccia audio e impostazioni"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Indice"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Durata"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Titolo"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Informazioni Lavoro"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Informazioni traccia"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Nome predefinito"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "Il dispositivo o file da codificare"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "I valori predefiniti da usare per la codifica"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-"Il percorso per sovrascrivere la cartella di configurazione dell'utente"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Apri una console per i risultati di debug"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Tutto"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Qualità:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Bitrate: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d- %s (%.4g kHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Bitrate:%.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
-msgstr ""
+msgstr "Passthrough"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s\n"
 "Track Name: %s"
 msgstr ""
+"%sGuadagno: %s\n"
+"DRC: %s\n"
+"Nome traccia: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s"
 msgstr ""
+"%sGuadagno: %s\n"
+"DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2585,39 +2272,39 @@
 "Qualità audio:\n"
 "Per i codificatori che lo supportano, adatta la qualità dell'output."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Rimuovi questo codificatore audio"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Chiudendo HandBrake, il processo di codifica terminerà.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Non selezionato"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
-msgstr "Scansione ..."
+msgstr "Scansione…"
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Interrompi scansione"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Nessun titolo trovato"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Nuovo video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2628,439 +2315,438 @@
 "\n"
 "%sin%d secondi ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr ""
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Annulla corrente e interrompi"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Annulla corrente, avvia successivo"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Termina corrente e interrompi"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Continua la codifica"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
+msgid "%d encode pending"
 msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
-msgstr "lavoro %d di %d,"
+msgstr "operazione %d di %d,"
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
-msgstr ""
+msgstr "passaggio %d (scansione sottotitoli di %d,"
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "passaggio %d di %d,"
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 "Codifica: %s%s%.2f%% (%.2f fps, avg %.2f fps, ETA %02d h %02d m %02d s)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Codifica: %s%s%.2f%% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Codifica: %s%s%.2f%%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Cerca per il tempo di inizio,"
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Scansione titolo %d di %d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Scansione titolo %d di %d anteprima %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "In pausa"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Codifica effettuata!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Codifica annullata."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Codifica non riuscita."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
-msgstr ""
+msgstr "Multiplazione: potrebbe richiedere del tempo…"
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Scansiona questa sorgente DVD"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr ""
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s è ora disponibile (hai la versione %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Codifica completata"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "Metti giù quel cocktail, la tua coda di HandBrake è terminata!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "La tua codifica è completa."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Spegnere il computer"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Mettere il computer in stand-by"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Chiudi Handbrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
-msgstr ""
+msgstr "Traccia di sottotitoli audio straniero"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Prima traccia selezionata"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
-msgstr ""
+msgstr "Audio straniero, poi prima traccia selezionata"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Capitoli:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Secondi:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
-msgstr "Frame:"
+msgstr "Fotogrammi:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Non fare nulla"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Mostra notifiche"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Chiudi Handbrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Metti il computer in stand-by"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Spegni computer"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatico"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Personalizzato"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Settimana"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Mese"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Anno"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Immortale"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Mai"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Ogni giorno"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Ogni settimana"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Ogni mese"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
-msgstr ""
+msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 gradi"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 gradi"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 gradi"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Spaziale"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Temporale"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Veloce"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Ottimale"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Stretto"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normale"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Semplice"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Intelligente"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Esagono"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Esauriente"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, no subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel per tutti"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel per tutti"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD nei frame I/P"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD in tutti i frame"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD refine nei frame I/P"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD refine in tutti i frame"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD in tutti i frame"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
-msgstr "La Maggior parte"
+msgstr "La maggior parte"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Alcuni"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Tutto"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Codifica soltanto"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Uguale alla sorgente"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC Film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC Video)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s- (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d-%02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Nessun titolo"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Nessun audio"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Qualunque"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3068,16 +2754,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Impostazioni Detelecine non valide:\n"
+"\n"
+"Preimpostazione:\t%s\n"
+"Personalizzata:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
+"Impostazioni Detelecine non valide:\n"
+"\n"
+"Preimpostazione:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3085,16 +2778,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Impostazioni Comb rilevate non valide:\n"
+"\n"
+"Preimpostazione:\t%s\n"
+"Personalizzata:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
+"Impostazioni Comb rilevate non valide:\n"
+"\n"
+"Preimpostazione:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3104,7 +2804,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3113,7 +2813,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3123,8 +2823,14 @@
 "Tune:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Impostazioni Denoise non valide:\n"
+"\n"
+"Filtro:\t%s\n"
+"Preimpostazione:\t%s\n"
+"Sintonia:\t%s\n"
+"Personalizzata:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3135,8 +2841,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3144,18 +2849,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Continua"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Nessun titolo trovato.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3163,8 +2875,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3176,8 +2895,7 @@
 "Devi scegliere un file valido. \n"
 "Se continui, questo sottotitolo sarà ignorato."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3185,7 +2903,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3194,47 +2912,89 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Impossibile creare %s.</big>\n"
+"\n"
+"Errore interno. Non è possibile elaborare la descrizione della UI.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Informazioni traccia"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Nome predefinito"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Il dispositivo o file da codificare"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "I valori predefiniti da usare per la codifica"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Troppo spam"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+"Il percorso per sovrascrivere la cartella di configurazione dell'utente"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Apri una console per i risultati di debug"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
+"ghb_presets_menu_init: individuazione cartelle preimpostazioni non riuscita."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Portami fuori di qui!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
-msgstr "Carica predefiniti di backup"
+msgstr "Carica preimpostazioni di backup"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Tutto (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Predefiniti (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
-msgstr "Predefiniti di Compatibilità (*.plist)"
+msgstr "Preimpostazioni obsolete (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Esporta Predefinito"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3245,15 +3005,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "cartella"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "predefinito"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3261,263 +3021,213 @@
 "\n"
 "%s"
 msgstr ""
+"Estensione GStreamer mancante\n"
+"Audio o video potrebbero non essere riprodotti come previsto\n"
+"\n"
+"%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Secondi"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Frame"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
+msgstr "%s (Modificato)"
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:236
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
+
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
 
-#: ../src/queuehandler.c:299
+#: src/queuehandler.c:358
 #, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Modificato Predefinito Basato Su: %s\n"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Bitrate %dkbps"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:363
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Predefinito: %s\n"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:370
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Formato:%sContenitore\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Opzioni contenitore:"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Qualità costante %.4g(%s)"
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sChapter Markers"
+msgid "%sPreset %s"
 msgstr ""
 
-#: ../src/queuehandler.c:329
-#, c-format
-msgid "%siPod 5G Support"
-msgstr "%sSupporto per iPod 5G"
-
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:408
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sWeb ottimizzato"
+msgid "%sTune %s"
+msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:413
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destinazione:%s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Aspetto preservato)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Aspetto non preservato)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorfico)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Anamorfico personalizzato)"
+msgid "%sProfile %s"
+msgstr "%sProfilo %s"
 
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Immagine:"
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:418
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Sorgente: %d x %d, Output%d x %d%s, Ritaglio %d:%d:%d:%d"
+msgid "%sLevel %s"
+msgstr "%sLivello %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:435
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Display %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtri:"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:439
 #, c-format
-msgid "%sDetelecine"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
 msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:444
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:475
-#, c-format
-msgid "%sDenoise %s:"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
 msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDeblock: %d"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sScala di grigi"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Video:%s"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Completato"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(costante)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Annullato"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(variabile)"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Non riuscito"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Framerate:%s%s"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "In attesa"
 
-#: ../src/queuehandler.c:532
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ""
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d Giorno %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Framerate: %s (frame rate costante)"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Giorni %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Errore"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Bitrate:"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr ""
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:592
-#, c-format
-msgid "Video Options: Preset: %s"
-msgstr ""
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Non disponibile"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
 msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr "- Profilo: %s"
-
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Livello: %s"
-
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Opzioni avanzate:%s\n"
-
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr " Audio: "
-
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Tracce audio: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Codifica"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Bitrate: %d"
-
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Codificatore: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
 msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Sottotitolo:"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Errore"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Tracce sottotitoli: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"passaggio %d di %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr "(Solo Forzato)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr "(Masterizza)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Codifica sospesa"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr "(Predefinito)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Codifica in corso"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr ""
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Sconosciuta"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Riprendi, ho risolto il problema"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Riprendi, non ripetermelo di nuovo"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3530,11 +3240,11 @@
 "Un altro lavoro in coda ha specificato la stessa destinazione.\n"
 "Vuoi sovrascrivere?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3545,7 +3255,7 @@
 "\n"
 "Questa non è una cartella valida."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3556,7 +3266,7 @@
 "\n"
 "Impossibile leggere o scrivere la cartella."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3569,16 +3279,16 @@
 "Il file è già esistente.\n"
 "Vuoi sovrascrivere?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Seleziona questo titolo per aggiungere alla coda.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Nessun titolo"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3588,55 +3298,53 @@
 "Questo titolo non sarà aggiunto alla coda se non cambi il nome\n"
 "del file di output.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Interrompi"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Interrompi codifica"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "F_erma codifica"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Riprendi"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Riprendi codifica"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "F_erma codifica"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Riprendi codifica"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr "La codifica è in corso. Cosa vuoi fare?\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Lingua preferita: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Aggiungi traccia sottotitoli %s se l'audio predefinito non è %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Aggiungi traccia sottotitoli se l'audio predefinito non è la tua lingua "
 "preferita"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3646,11 +3354,10 @@
 msgstr ""
 "%s\n"
 "\n"
-"Opzioni Espanse:\n"
+"Opzioni espanse:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3660,5 +3367,10 @@
 msgstr ""
 "%s\n"
 "\n"
-"Opzioni Espanse:\n"
+"Opzioni espanse:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Avviso: senza perdita di informazione)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/ko.po -> HandBrake-1.5.1.tar.xz/gtk/po/ko.po Changed

@@ -1,22 +1,22 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Mia_Kim <minju980508@gmail.com>, 2019
+# Nomis101 <Nomis101@web.de>, 2019
 # JinHee Kim <sinnanjini@gmail.com>, 2019
-# nayoon kim <belloyv@gmail.com>, 2019
-# Changkyoon Kim <ocnblu@gmail.com>, 2014
+# nayoon <belloyv@gmail.com>, 2019
+# Jung Hee Lee <daemul72@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: nayoon kim <belloyv@gmail.com>, 2019\n"
+"Last-Translator: Jung Hee Lee <daemul72@gmail.com>, 2021\n"
 "Language-Team: Korean (https://www.transifex.com/HandBrakeProject/teams/92423/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +24,7 @@
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -34,11 +34,11 @@
 "\n"
 "자막은 비디오의 일부가 되고, 비활성화할 수 없습니다."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
-msgstr "영상에 추가"
+msgstr "번인"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -48,7 +48,7 @@
 "This is useful for creating a \"forced\" track\n"
 "in your output."
 msgstr ""
-"기본 출력 자막 트랙 설정\n"
+"기본 출력 자막 트랙을 지정합니다.\n"
 "\n"
 "대부분의 재생기는 비디오를 재생할 때\n"
 "이 자막 트랙을 자동적으로 표시합니다.\n"
@@ -56,11 +56,11 @@
 "이 설정은 출력에서 \"강제 표시\" 트랙으로 만들 때\n"
 "유용합니다."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
-msgstr "기본"
+msgstr "기본값"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -76,11 +76,11 @@
 "얘기하는 장면에서 자막을 보여줄 때\n"
 "사용됩니다."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "강제 표시만"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -96,11 +96,11 @@
 "비디오의 시작 시간과 일치하지 않기도 합니다.\n"
 "이 설정은 파일의 동기화를 제공합니다."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT 오프셋"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -114,67 +114,247 @@
 "language scene. This option is best used in\n"
 "conjunction with the \"Forced\" option."
 msgstr ""
-"파일 자막 트랙\n"
+"원본 자막 트랙\n"
 "\n"
-"해당 비디오 파일에서 인식되는\n"
-"어떤 자막이든 선택할 수 있습니다.\n"
+"원본 파일에서 인식되는 자막을\n"
+"선택할 수 있습니다.\n"
 "\n"
 "또한, \"외부 오디오 스캔\"이라는\n"
 "특별한 트랙 옵션이 있습니다. 해당 옵션은\n"
 "외국어 장면에 필요한 자막을\n"
-"검색하는 인코딩에 추가 패스를\n"
+"스캔하는 인코딩에 추가 패스를\n"
 "추가합니다. 이 옵션은 \"강제\" 옵션과\n"
 "함께 사용하는 것이 가장 좋습니다."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "트랙"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "원본 디렉토리 열기"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "대상 디렉토리 열기"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "인코드 로그 디렉토리 열기"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "인코드 로그 열기"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "실패한 작업 재설정"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "모든 작업 재설정"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "완료된 작업 지우기"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "모든 작업 지우기"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "대기열 가져오기"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "대기열 내보내기"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "HandBrake 프리셋"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
-msgstr "사전설정(_P)"
+msgstr "프리셋(_P)"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
-msgstr "기본값 설정"
+msgstr "기본값 지정(_F)"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "저장(_S)"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
-msgstr "다른 이름으로 저장"
+msgstr "다른 이름으로 저장(_A)"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
-msgstr "이름 바꾸기"
+msgstr "이름 변경(_R)"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "삭제(_D)"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "가져오기(_I)"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "내보내기(_E)"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
-msgstr "내장된 환경 설정 재설정"
+msgstr "기본 제공된 프리셋 초기화(_B)"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
-msgstr "환경설정 목록"
+msgstr "프리셋 목록"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "HandBrake 대기열"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "대기열"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0개 작업 보류 중"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "인코딩 시작"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "시작"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "인코딩 정지"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "정지"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "옵션"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "완료된 경우:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "재설정"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"선택된 대기열 항목을 보류 중인 것으로 표시합니다\n"
+"대기열 작업을 보류 중으로 재설정하고 다시 실행할 준비가 됩니다."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "편집"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "동작"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "프리셋:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "원본:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "제목:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "대상:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "치수:"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "비디오:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "오디오:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "자막:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "개요"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "패스:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "시작 시간:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "종료 시간:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "일시 중지된 재생시간:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "인코딩 시간:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "파일 크기:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "상태:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "통계"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "작업 로그"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "HandBrake 작업 로그"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "HandBrake 정보"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -182,299 +362,282 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr "HandBrake는 GPL 라이센스를 따르며, 다중플랫폼, 다중쓰레드 기반의 비디오 변환기입니다."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake는 자유 소프트웨어입니다; 자유 소프트웨어 재단에서 공표한 GNU 일반 공중 사용 허가서(라이센스 버전 2 또는 그 이후)에 따라 재배포하거나 수정할 수 있습니다.\n"
+"HandBrake는 자유 소프트웨어이며, 자유 소프트웨어 재단에서 발행한 GNU 일반 공중 사용허가서 버전 2의 조건에 따라 재배포 및/또는 수정할 수 있습니다.\n"
 "\n"
-"HandBrake는 유용하길 희망하면서 배포되지만, 어떠한 보증도 하지 않습니다; 특정 목적을 위한 상업성 또는 적합성에 대한 묵시적인 보증도 하지 않습니다. 자세한 사항은 GNU 일반 공중 사용 허가서를 참고하세요.\n"
+"HandBrake는 유용하길 희망하면서 배포되지만, 어떠한 보증도 하지 않습니다; 특정 목적을 위한 상업성 또는 적합성에 대한 묵시적인 보증도 하지 않습니다.. 자세한 내용은 GNU 일반 공중 사용허가서를 참조하십시오.\n"
 "\n"
-"Glade와 함께 GNU 일반 공중 사용 허가서의 사본이 포함되어 있습니다; 그렇지 않다면, 자유 소프트웨어 재단으로 연락하세요, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"GNU 일반 공중 사용허가서 사본을 Glade와 함께 받았어야 합니다. 그렇지 않다면, 자유 소프트웨어 재단으로 연락하세요, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "파일(_F)"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
-msgstr "오픈 소스"
+msgstr "원본 열기(_S)"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
-msgstr "단일 제목 열기"
+msgstr "단일 제목 열기(_T)"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
-msgstr "경로 설정"
+msgstr "대상 지정(_D)"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
-msgstr "설정(_P)"
+msgstr "기본설정(_P)"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "종료(_Q)"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
-msgstr "큐(_Q)"
+msgstr "대기열(_Q)"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "추가(_A)"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "다중 추가(_M)"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
-msgstr "인코딩 시작"
+msgstr "인코딩 시작(_S)"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
-msgstr "인코딩 중지"
+msgstr "인코딩 일시 중지(_P)"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
-msgstr "대기열 저장"
+msgstr "대기열 저장(_A)"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
-msgstr "대기열 파일 로드"
+msgstr "대기열 파일 불러오기(_L)"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "보기(_V)"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
-msgstr "더미에 대한 HandBrake(_D)"
+msgstr "초보자를 위한 HandBrake(_D)"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
-msgstr "환경설정 목록"
+msgstr "프리셋 목록(_L)"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "미리보기(_P)"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "작업 창(_A)"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "도움말(_H)"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "정보(_A)"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
-msgstr "가이드(_G)"
+msgstr "설명서(_G)"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "비디오 원본 선택"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
-msgstr "오픈 소스"
+msgstr "원본 열기"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
-msgstr "큐에 추가하기"
+msgstr "대기열에 추가하기"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "대기열 추가"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "인코딩 시작"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "시작"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "인코딩 정지"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "정지"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
-msgstr "설정 화면 보이기"
+msgstr "설정 화면 표시"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
-msgstr "사전설정"
+msgstr "프리셋"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
-msgstr "미리보기 화면 보이기"
+msgstr "미리표시 화면 표시"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "미리보기"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
-msgstr "큐 보기"
+msgstr "대기열 표시"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
-msgstr "큐"
+msgstr "대기열"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
-msgstr "작업 창 보기"
+msgstr "작업 창 표시"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "작업"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "원본:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "없음"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
-msgstr "검색 중..."
+msgstr "스캔 중..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "제목:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
-"인코딩할 타이틀 지정.\n"
-"기본적으로 가장 킨 타이틀이 선택됩니다.\n"
-"이는 보통 DVD의 주요 타이틀입니다."
+"인코딩할 제목 지정.\n"
+"기본적으로 가장 킨 제목이 선택됩니다.\n"
+"이것은 보통 DVD의 주요 제목입니다."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "제목 없음"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "구도:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "멀티 앵글 DVD의 경우, 인코딩할 앵글을 선택합니다."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "범위:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
-msgstr "인코딩할 타이틀의 범위. 챕터, 초, 프레임 등"
+msgstr "인코딩할 제목의 범위입니다. 챕터, 초 또는 프레임일 수 있습니다."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
-msgstr "인코딩할 첫 챕터 설정"
+msgstr "인코딩할 첫 챕터를 지정합니다."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
-msgstr "인코딩할 마지막 챕터 설정"
+msgstr "인코딩할 마지막 챕터를 지정합니다."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
-msgstr "환경설정:"
+msgstr "프리셋:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
-msgstr "환경설정 선택"
+msgstr "프리셋 선택"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "수정"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "다시 불러오기"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
-"현재 선택된 환경설정으로 설정을 다시 로드합니다.\n"
+"현재 선택된 프리셋으로 설정을 다시 불러옵니다.\n"
 "수정사항은 폐기됩니다."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
-msgstr "새 환경설정 저장"
+msgstr "새 프리셋 저장"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
-msgstr "현재 설정을 새 환경설정에 저장"
+msgstr "현재 설정을 새 프리셋에 저장합니다."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "형식:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
-msgstr "인코딩된 트랙에 합쳐질 형식"
+msgstr "다중사용으로 인코딩된 트랙에 대한 형식입니다."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
-msgstr "웹에 최적화"
+msgstr "웹 최적화"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
-"증분 다운로드 동안 MP4 파일의 레이아웃 최적화.\n"
-"이 설정은 전체 파일을 다운로드하는 동안 재생기가 재생을 시작할 수 있게 합니다."
+"증분 다운로드 동안 MP4 파일의 레이아웃을 최적화합니다.\n"
+"이 옵션은 재생기가 전체 파일을 다운로드하기 전에 재생을 시작할 수 있습니다."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "A/V 시작 정렬"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -483,55 +646,51 @@
 "빈 프레임을 삽입하거나 프레임을 삭제하여 모든 오디오 및 비디오 스트림의 초기 타임 스탬프를 정렬합니다. \n"
 "MP4 편집 목록을 준수하지 않는 손상된 플레이어의 오디오/비디오 동기화를 향상시킬 수 있습니다."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G 지원"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
-msgstr "일부 구형 iPods에 필요한 iPod Atom 추가"
+msgstr "일부 구형 iPod에 필요한 iPod Atom을 추가합니다."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "재생시간:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "트랙:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "필터:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "크기:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "요약"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
-msgstr "자동 잘라내기"
+msgstr "자동 자르기"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "비디오 외곽의 검은 배경을 자동으로 잘라냅니다."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
-msgstr "느슨하게 잘라내기"
+msgstr "루스 자르기"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -539,138 +698,138 @@
 "instead of doing exact cropping and then scaling to\n"
 "the required multiple."
 msgstr ""
-"영상 설정에서 픽셀 개수의 배수 크기로 근사화된\n"
-"영상 크기가 필요할 때, 이 설정은 추가적인\n"
-"잘라내기와 요구된 배수로 크기를 조절하는 것\n"
-"대신에 일부 추가 픽셀을 잘라냅니다."
+"영상 설정에 따라 이미지 치수를 일부 \n"
+"여러 개의 픽셀로 반올림해야 하는 경우, \n"
+"이 설정은 정확하게 잘라낸 다음 필요한 \n"
+"여러 픽셀로 확장하는 대신 몇 개의 \n"
+"추가 픽셀을 자릅니다."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
-msgstr "좌측 잘라내기"
+msgstr "좌측 자르기"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
-msgstr "상단 잘라내기"
+msgstr "상단 자르기"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
-msgstr "하단 잘라내기"
+msgstr "하단 자르기"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
-msgstr "우측 잘라내기"
+msgstr "우측 자르기"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
-msgstr " 절단 치수:"
+msgstr "자르기 치수:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
-msgstr "잘라내기"
+msgstr "자르기"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "원본에 최적화"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
-"활성화된 경우, '최적' 스토리지 해상도를 선택하십시오.\n"
-"크롭핑 후 원본 자료 해상도와 가장 적절하게 일치하는 해상도가 될 것입니다."
+"활성화된 경우 '최적' 저장 해상도를 선택합니다.\n"
+"자르기 후 소스 해상도와 가장 밀접하게 일치하는 해상도입니다."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "너비:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
-"이 값은 비디오가 저장될 폭의 길이입니다.\n"
-"픽셀 종횡비가 1:1이 아니라면 실제 화면 크기는 달라질 수 있습니다."
+"이 값은 비디오가 저장되는 너비입니다.\n"
+"픽셀 종횡비가 1:1이 아닌 경우 실제 표시 치수가 달라집니다."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "높이:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
-"이 값은 비디오가 저장될 높이의 길이입니다.\n"
-"픽셀 종횡비가 1:1이 아니라면 실제 화면 크기는 달라질 수 있습니다."
+"이 값은 비디오가 저장되는 높이입니다..\n"
+"픽셀 종횡비가 1:1이 아닌 경우 실제 표시 치수가 달라집니다."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "아나모픽:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 "아나모픽 모드:\n"
 "<tt>\n"
-"없음 - 1:1로 가로 세로 픽셀 비율 강제 적용\n"
-"느슨함 - 원본 디스플레이 가로 세로 비율을 유지하면서\n"
-" 원본 파일의 가로 세로 픽셀 비율과 최대한 가까운\n"
-" 가로 세로 픽셀 비율 사용\n"
-"자동 - 기존 디스플레이 가로 세로 비율을 유지하면서\n"
-" 스토리지 해상도를 극대화하는 가로 세로 픽셀\n"
-" 비율 사용</tt>"
+"없음 - 픽셀 종횡비를 1:1로 강제합니다.\n"
+"루스 - 원본 화면 종횡비를 유지하면서 \n"
+" 원본 비디오 픽셀 종횡비에 가능한 한 가까운 \n"
+" 픽셀 종횡비 사용\n"
+"자동 - 원래 화면 종횡비를 유지하면서 \n"
+" 저장 해상도를 최대화하는 픽셀 종횡비 사용</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "정렬:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
 "This setting is only necessary for compatibility with some devices.\n"
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
-"스토리지 치수를 해당 값의 배수로 정렬하십시오.\n"
+"이 값의 배수에 저장 치수를 맞춥니다.\n"
 "\n"
-"해당 설정은 일부 장치와 호환하는 데 반드시 필요합니다.\n"
-"호환성 문제가 발생하지 않는 한 2로 설정해야 합니다."
+"이 설정은 일부 장치와의 호환성에만 필요합니다.\n"
+"호환성 문제가 발생하지 않는 한 2를 사용해야 합니다."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "저장 형상"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
-msgstr "비율 유지"
+msgstr "화면 유지"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
-msgstr "활성화하면, 원본의 화면 종횡비가 유지됩니다."
+msgstr "활성화하면, 원본의 원래 디스플레이 화면이 유지됩니다."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
-msgstr "디스플레이 너비입니다. 픽셀 크기로 저장 크기를 조정한 결과입니다."
+msgstr "이것은 화면 너비입니다. 가로세로 픽셀에 따라 저장 치수를 조정한 결과입니다."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
-msgstr "픽셀 종횡비:"
+msgstr "가로세로 픽셀:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -682,11 +841,11 @@
 "1:1 비율은 정사각 픽셀로 결정됩니다. 다른 값은 사각형 모양을 결정합니다.\n"
 "재생기는 지정된 비율에 따라서 이미지의 크기를 조절합니다."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -696,122 +855,136 @@
 "1:1 비율은 정사각 픽셀로 결정됩니다. 다른 값은 사각형 모양을 결정합니다.\n"
 "재생기는 지정된 비율에 따라서 이미지의 크기를 조절합니다."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
-msgstr "화면 비율:"
+msgstr "디스플레이 화면:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
-msgstr "디스플레이 구조"
+msgstr "디스플레이 형상"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
-msgstr "크기"
+msgstr "치수"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
-msgstr "Detelecine:"
+msgstr "텔레시네 해제:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
-"해당 필터는 telecining의 결과물인 'combing' artifacts를 제거합니다.\n"
+"해당 필터는 텔레시닝의 결과물인 '코밍' 아티팩트를 제거합니다.\n"
 "\n"
-"Telecining은 24fps인 필름 프레임률을 30fps인 NTSC 비디오 프레임률로 조정하는 과정입니다."
+"텔레시닝은 24fps인 필름 프레임률을 30fps인 NTSC 비디오 프레임률로 조정하는 과정입니다."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
-"사용자 detelecine 필터 문자열 형식\n"
+"사용자 지정 텔레시네 해제 필터 문자열 형식\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
-msgstr "인터레이스 검출:"
+msgstr "인터레이스 감지:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
 "If a deinterlace filter is enabled, only frames that this filter finds\n"
 "to be interlaced will be deinterlaced."
 msgstr ""
-"해당 필터는 인터페이스된(interlaced) 프레임을 검출합니다.\n"
+"해당 필터는 인터페이스된 프레임을 감지합니다.\n"
 "\n"
-"비인터레이스(deinterlace) 필터가 활성화된 경우, 이 필터가 인터레이스되었다 판단한 프레임만을 비인터레이스합니다."
+"인터레이스 해제 필터가 활성화된 경우, 이 필터가 인터레이스되었다 판단한 프레임만을 인터레이스 해제합니다."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 msgstr ""
-"사용자 설정 인터레이스 검출 필터 문장 형식\n"
+"사용자 지정 인터레이스 감지 필터 문장 형식\n"
 "\n"
 "모드:공간 메트릭:모션 스레시:마스크 필터 모드:\n"
 "블록 스레시: 블록 폭: 블록 높이"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
-msgstr "디인터레이스:"
+msgstr "인터레이스 해제:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
 "The decomb filter supports a variety of interpolation algorithms.\n"
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
-"decomb이나 deinterlace 필터를 선택하십시오.\n"
+"Decomb나 인터레이스 해제 필터를 선택합니다.\n"
 "\n"
-"decomb 필터는 다양한 보간법 알고리즘을 지원합니다.\n"
-"deinterlace 필터는 고전적인 YADIF deinterlacer입니다.\n"
+"Decomb 필터는 다양한 보간법 알고리즘을 지원합니다.\n"
+"인터레이스 해제 필터는 고전적인 YADIF 인터레이스 해제도구입니다.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
-msgstr "Deinterlace 설정:"
+msgstr "인터레이스 해제 설정:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
 "The decomb filter supports a variety of interpolation algorithms.\n"
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
-"decomb이나 deinterlace 필터를 선택하십시오.\n"
+"Decomb나 인터레이스 해제 필터를 선택합니다.\n"
 "\n"
-"decomb 필터는 다양한 보간법 알고리즘을 지원합니다.\n"
-"deinterlace 필터는 고전적인 YADIF deinterlacer입니다.\n"
+"Decomb 필터는 다양한 보간법 알고리즘을 지원합니다.\n"
+"인터레이스 해제 필터는 고전적인 YADIF 인터레이스 해제도구입니다.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "블록 제거 필터:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
-"Deblock 필터는 압축 과정에서 생긴 영향을 제거합니다.\n"
+"블록 제거 필터는 일반적인 유형의 압축 아티팩트를 제거합니다.\n"
 "원본 영상에 블럭이 많다면, 이 필터가 도움이 됩니다."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "블록 제거 조정:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"사용자 지정 블록 제거 필터 문자열 형식\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "노이즈 제거 필터:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -821,29 +994,29 @@
 "필름 그레인과 다른 종류의 고주파 노이즈는 압축을 어렵게 만듭니다.\n"
 "그런 원본에 이 필터를 사용하면 파일을 더 작게 만들 수 있습니다."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
-msgstr "노이즈 제거 사전설정:"
+msgstr "노이즈 제거 프리셋:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "노이즈 제거 조정:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
-"사용자 노이즈 제거 필터 문자열 형식\n"
+"사용자 지정 노이즈 제거 필터 문자열 형식\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "선명도 필터:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -851,47 +1024,47 @@
 "선명도(Sharpen) 필터링은 비디오의 가장자리\n"
 "및 높은 빈도의 구성요소를 향상시킵니다."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
-msgstr "선명도 설정:"
+msgstr "선명도 프리셋:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "선명도 조정:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "회전 필터:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
-msgstr "비디오를 시계 방향으로 90도 회전"
+msgstr "비디오를 시계 방향으로 90도 회전합니다."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
-msgstr "회색조"
+msgstr "그레이스케일"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
-msgstr "활성화된 경우, 컬러 구성 요소를 비디오에서 필터링하십시오."
+msgstr "활성화된 경우, 컬러 구성 요소를 비디오에서 필터링합니다."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
-msgstr "필터:"
+msgstr "필터"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "비디오 인코더:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "사용 가능한 비디오 인코더."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "프레임레이트:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -903,19 +1076,19 @@
 "'원본과 동일'이 권장됩니다. 원본 비디오가 가변\n"
 "프레임레이트라면, '원본과 동일'은 그 설정을 보존합니다."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "고정 프레임레이트"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
-msgstr "고정 프레임레이트 출력 활성화"
+msgstr "고정 프레임레이트 출력을 활성화합니다."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "피크 프레임레이트 (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -927,11 +1100,11 @@
 "\n"
 "가변 프레임레이트는 일부 재생기와 호환되지 않을 수 있습니다."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "가변 프레임레이트"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -941,7 +1114,7 @@
 "\n"
 "VFR은 일부 재생기와 호환되지 않습니다."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -956,11 +1129,11 @@
 "FFMpeg's and Theora's scale is more linear.\n"
 "These encoders do not have a lossless mode."
 msgstr ""
-"원하는 품질 지정.\n"
-"인코더는 지정된 품질을 목표로 동작합니다.\n"
+"원하는 화질 지정.\n"
+"인코더는 지정된 화질을 목표로 동작합니다.\n"
 "각 비디오 인코더에 사용되는 스케일은 다릅니다.\n"
 "\n"
-"x264의 스케일은 로그형태로 동작하며 작은 값일수록 높은 품질을\n"
+"x264의 스케일은 로그형태로 동작하며 작은 값일수록 높은 화질을\n"
 "의미합니다. 작은 값은 점점 더 큰 파일을 만들어 냅니다. 0 값은\n"
 "무손실을 의미하고, 원본 역시 무손실이라고해도 원본보다 더 큰\n"
 "파일이 만들어질 수도 있습니다.\n"
@@ -968,15 +1141,15 @@
 "FFMpeg과 Theora의 스케일은 좀더 선형적입니다.\n"
 "이런 인코더들은 무손실 모드를 지원하지 않습니다."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
-msgstr "고정 품질:"
+msgstr "고정 화질:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
-msgstr "비트레이트 (kbps):"
+msgstr "비트레이트 (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -984,17 +1157,17 @@
 "But the average over a long duration will be the value set here. If you need\n"
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
-"평균 비트레이트 설정.\n"
+"평균 비트레이트를 지정합니다.\n"
 "\n"
 "특정 시간에서 순간 비트레이트는 높거나 낮을 수도 있습니다.\n"
 "그러나 긴 시간 동안의 평균치는 이 값에 수렴합니다. 순간 비트레이트를\n"
 "제한하려면 x264의 vbv-bufsize와 vbv-maxrate 설정을 살펴보세요."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
-msgstr "2단계 인코딩"
+msgstr "2 패스 인코딩"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1002,61 +1175,43 @@
 "the video are collected. Then in the second pass, those statistics are used\n"
 "to make bitrate allocation decisions."
 msgstr ""
-"2단계 인코딩 수행.\n"
+"2 패스 인코딩을 수행합니다.\n"
 "\n"
-"'비트레이트' 옵션은 필요조건입니다. 1단계 동안, 비디오에 대한 통계치가\n"
-"수집됩니다. 두번째 단계에서, 그 통계치는 비트레이트 할당을 결정하는데\n"
-"사용됩니다."
+"'비트레이트' 옵션은 필수 사항입니다. 1번째 패스를 하는 동안 비디오에 대한 \n"
+"통계가 수집됩니다. 그런 다음 두 번째 패스에서 이러한 통계를 사용하여 \n"
+"비트레이트 할당을 결정합니다."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
-msgstr "1단계 가속"
+msgstr "첫 번째 패스 가속"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
-msgstr "2단계 인코딩 중 1단계에서 속도를 높이려면 설정을 사용하세요."
-
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "고급 옵션 사용"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"x264 설정에 고급 옵션 탭 사용.\n"
-"\n"
-"위험 부담을 갖고 사용하세요!"
+msgstr "2패스 인코딩의 1번째 패스를 하는 동안, 속도를 높이는 설정을 사용합니다."
 
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "사전설정:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"압축 효율과 인코딩 속도 사이의 인코더 설정 사용.\n"
+"인코딩 속도와 압축 효율을 차단하도록 인코더 설정을 조정합니다.\n"
 "\n"
-"이 설정은 기본 인코더 설정을 만듭니다.\n"
-"조정, 프로필, 수준, 고급 옵션 문자열이 이 설정에 적용됩니다.\n"
-"낮은 속도의 설정은 더 좋은 품질 또는 더 작은 파일을 만들기 때문에\n"
-"참을 수 있는 정도의 속도를 지정하는데 이 옵션을 사용합니다."
+"이 옵션은 기본 인코더 설정이 설정됩니다.\n"
+"튜닝, 프로필, 레벨 및 추가 옵션 문자열이 여기에 적용됩니다.\n"
+"일반적으로 이 옵션은 느리므로 견딜 수 있는 가장 느린 값으로 설정해야 합니다.\n"
+"설정을 사용하면 화질이 향상되거나 파일 크기가 작아집니다."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "조정:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1064,31 +1219,31 @@
 "characteristics of the output file. Changes will be applied after the\n"
 "preset but before all other parameters."
 msgstr ""
-"일반적인 시나리오에 맞도록 설정을 조정하십시오.\n"
+"일반적인 시나리오에 맞도록 설정을 조정합니다.\n"
 "\n"
 "특정한 파일의 특성에 대한 효율성을 증가시킬 수 있거나 출력 파일의\n"
-"특성을 설정할 수 있습니다. 변경 사항은 환경 설정 후 다른 모든 파라미터보다\n"
-"먼저 적용됩니다. "
+"특성을 설정할 수 있습니다. 변경사항은 프리셋 후 다른 모든 \n"
+"파라미터보다 먼저 적용됩니다."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "고속 디코딩"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
-"디코더의 CPU 사용율 감소.\n"
+"디코더 CPU 사용량을 줄입니다.\n"
 "\n"
-"(끊김 등으로) 출력물 재생이 어려우면 이 설정을 사용하세요."
+"장치가 출력을 재생하는 데 어려움을 겪는 경우(프레임 누락), 이 옵션을 지정합니다."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "대기 시간 없음"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1104,11 +1259,11 @@
 "HandBrake는 라이브 스트리밍 방송 목적으로는 적합하지 않기 때문에,\n"
 "이러한 설정은 여기서 별로 가치가 없습니다."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "프로필:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1118,25 +1273,25 @@
 "\n"
 "다른 모든 설정을 덮어씁니다."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
-msgstr "수준:"
+msgstr "레벨:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
-"지정된 수준과의 호환성 지정 및 보장.\n"
+"지정된 레벨을 설정하고 준수합니다.\n"
 "\n"
-"다른 모든 설정을 덮어씁니다."
+"다른 모든 설정을 재정의합니다."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "상세 설정:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1146,269 +1301,257 @@
 "\n"
 "콜론으로 분리된 인코더 옵션 목록."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "비디오"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "트랙 목록"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "출력 오디오 트랙 목록 보여주기"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "트랙 선택"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "소스 트랙 선택 옵션 표시"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "추가"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "새로운 오디오 설정을 목록에 추가"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "모두 추가"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "모든 오디오 트랙을 목록에 추가"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "기본 설정에서 모든 오디오 설정 다시 불러오기"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "트랙 목록"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "선택 동작:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
-msgstr "사용할 소스 미디어의 오디오 트랙을 선택하십시오"
+msgstr "사용할 원본 미디어의 오디오 트랙을 선택합니다."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
-"오디오를 선택할 언어 목록을 만드십시오.\n"
-"이러한 언어와 일치하는 트랙은 선택한 '선택 동작'을 사용하여 선택됩니다."
+"오디오를 선택할 언어 목록을 만듭니다.\n"
+"선택한 선택 동작을 사용하여 이러한 언어와 일치하는 트랙을 선택합니다."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "제거"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "사용 가능한 언어"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "선택된 언어"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "부 오디오에 대해서 첫 인코더만 사용"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
-"기본 오디오 트래만 전체 인코더 목록으로 인코딩됩니다.\n"
-"다른 모든 보조 오디오 출력 트랙은 첫 번째 인코더로만 인코딩됩니다."
+"기본 오디오 트랙만 전체 인코더 목록으로 인코딩됩니다.\n"
+"다른 모든 보조 오디오 출력 트랙은 첫 번째 인코더로만 인코딩됩니다."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
-msgstr "자동 패스쓰루:"
+msgstr "자동 패스트루:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 MP3를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 MP3 경유를 선택할 수 있습니다."
+"재생 장치가 MP3를 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능할 때 MP3 경유 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 AAC를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 AAC경유를 선택할 수 있습니다."
+"재생 장치가 AAC를 지원하는 경우 이 기능을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능할 때, AAC 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 AC-3를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 AC-3 경유를 선택할 수 있습니다."
+"재생 장치가 AC-3을 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능할 때, AC-3 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 DTS를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 DTS경유를 선택할 수 있습니다."
+"재생 장치에서 DTS를 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능한 경우, DTS 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 DTS-HD를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 DTS-HD 경유를 선택할 수 있습니다."
+"재생 장치가 DTS-HD를 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능한 경우, DTS-HD 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 EAC-3를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 EAC-3경유를 선택할 수 있습니다."
+"재생 장치가 EAC-3을 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능할 때, EAC-3 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 TrueHD를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 TrueHD 경유를 선택할 수 있습니다."
+"재생 장치가 TrueHD를 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능한 경우, TrueHD 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"재생 장치가 FLAC를 지원하는 경우 활성하십시오.\n"
-"이를 통해 자동 경유 선택이 활성화 된 경우 FLAC 경유를 선택할 수 있습니다."
+"재생 장치가 FLAC를 지원하는 경우 이 옵션을 활성화합니다.\n"
+"이 옵션은 자동 패스트루 선택이 사용 가능한 경우, FLAC 패스트루 선택이 허용됩니다."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
-msgstr "패스쓰루 대체:"
+msgstr "패스트루 대체:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
-msgstr "오디오 패스쓰루에 적합한 트랙이 없는 경우 인코딩할 오디오 코덱을 설정합니다."
+msgstr "오디오 패스트루에 적합한 트랙이 없는 경우 인코딩할 오디오 코덱을 지정합니다."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "오디오 인코딩 설정:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
-msgstr "선택된 각각의 원본 트랙은 선택된 모든 인코더로 인코딩됩니다."
+msgstr "선택된 각각의 원본 트랙은 선택된 모든 인코더로 인코딩됩니다"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "인코더"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
-msgstr "비프레이트/품질"
+msgstr "비프레이트/화질"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "믹스다운"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "샘플레이트"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "게인"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "트랙 선택"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "오디오"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "출력 자막 트랙 목록 보이기"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "새로운 자막 설정을 목록에 추가"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "모든 자막 트랙을 목록에 추가"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "외부 오디오 스캔"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"외국어 오디오로 된 부분에 대해서 \n"
-" 자막을 제공하는 자막 후보들을 \n"
-" 검색하는 인코딩에 추가 패스를 넣으십시오."
+"외국어로 된 오디오 세그먼트에 대해 자막을 제공하는\n"
+"자막 후보를 검색하는 인코딩에 추가 패스를 추가합니다."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "기본 설정에서 모든 자막 설정 다시 불러오기"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
-msgstr "사용할 소스 미디어의 자막 트랙을 선택하십시오 "
+msgstr "사용할 원본 미디어의 자막 트랙을 선택합니다."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1416,889 +1559,419 @@
 "The first language in this list is your \"preferred\" language and will be used\n"
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
-"자막을 선택할 언어들의 목록을 만드십시오.\n"
-"이 언어들과 일치하는 트랙들은 정해진 선택 동작을 사용하여 선택됩니다.\n"
+"자막을 선택할 언어 목록을 만듭니다.\n"
+"선택한 선택 동작을 사용하여 이러한 언어들과 일치하는 트랙을 선택합니다.\n"
 "\n"
-"이 목록의 첫번째 언어는 \"기본 설정\" 언어이며\n"
-"외부 오디오가 있을 때 자막 선택 설정을 결정하는 데 사용됩니다."
+"이 목록의 첫 번째 언어는 \"기본\" 언어이며, 외부 오디오가 있을 때 자막 \n"
+"선택 설정을 결정하는 데 사용됩니다."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
-msgstr "선호하는 언어: 없음"
+msgstr "기본 언어: 없음"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "외부 오디오 스캔 패스 추가"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"기본 오디오 트랙이 선호하는 언어인 경우 \"외부 오디오 스캔\"을 추가하십시오.\n"
-"이 검색 단계는 짧은 외부 오디오 시퀀스를 찾아서 자막을 제공합니다.\n"
+"기본 오디오 트랙이 기본 언어인 경우 \"외부 오디오 스캔\"을 추가합니다.\n"
+"이 검색 패스는 외부 오디오의 짧은 시퀀스를 찾고 자막을 제공합니다.\n"
 "\n"
-"이 옵션을 사용하려면 선택한 언어 목록에서 언어를 설정해야합니다."
+"이 옵션을 사용하려면 선택한 언어 목록에서 언어를 설정해야 합니다."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "기본 오디오가 외국어인 경우 자막 트랙 추가"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"기본 오디오 트랙이 기본 언어가 아닐 경우 자막 트랙을 추가하십시오.\n"
+"기본 오디오 트랙이 기본 언어가 아닌 경우 자막 트랙을 추가합니다.\n"
 "\n"
-"이 옵션을 사용하려면 선택된 언어 목록에서 언어가 설정되어야 합니다."
+"이 옵션을 사용하려면 선택한 언어 목록에서 언어를 설정해야 합니다."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
-msgstr "표시 여부 선택이 가능한 캡션이 존재하는 경우 추가"
+msgstr "사용 가능한 경우 자막(Closed Captions) 추가"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
-msgstr ""
-"오디오를 선택하려는 언어 목록을 작성하십시오.\n"
-"이 언어와 일치하는 트랙은 선택한 Selection Behavior를 사용하여 선택됩니다."
+msgstr "자막(Closed Captions)은 매끄러운 자막 트랙으로 모든 컨테이너에 추가할 수 있는 텍스트 자막입니다"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "복제 시 행동*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"자막의 동작을 \"Burn-In\"으로 설정하시오.\n"
+"자막 \"번인\"의 동작을 지정합니다.\n"
 "\n"
-"Burned-In 자막들은 비디오의 일부분이며 재생 중에는 비활성화할 수 없습니다.\n"
-"오직 하나의 자막 트랙만이 burned될 수 있습니다! 충돌이 일어날 수 있기 때문에, 가장 먼저 선택된 것이 이깁니다."
+"번인 자막은 동영상의 일부이며 재생 중에 비활성화할 수 없습니다.\n"
+"자막 트랙은 하나만 추가할 수 있습니다! 충돌이 발생할 수 있기 때문에 먼저 선택한 자막이 우선합니다."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "결함이 있는 플레이어를 위한 복제*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD 자막"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"처음 선택된 DVD 자막 트랙을 굽으십시오. 모든 다른 DVD 자막 트랙들은 삭제될 것입니다.\n"
-"플레이어의 소프트웨어 또는 장치가 DVD 자막을 지원하지 않는 경우 이 옵션을 사용하십시오.\n"
+"처음 선택한 DVD 자막 트랙을 추가합니다. 다른 DVD 자막 트랙은 모두 삭제됩니다.\n"
+"플레이어 소프트웨어 또는 장치에서 DVD 자막을 지원하지 않는 경우, 이 옵션을 사용합니다.\n"
 "\n"
-"오직 하나의 자막 트랙만이 구워질 수 있습니다! 충돌이 일어날 수 이씩 때문에, 가장 먼저 선택된 것이 적용됩니다."
+"자막 트랙은 하나만 추가할 수 있습니다! 충돌이 발생할 수 있기 때문에 먼저 선택한 자막이 우선합니다."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Blu-ray 자막"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"처음 선택된 Blu-ray 자막 트랙을 굽으십시오. 모든 다른 Blu-ray 자막 트랙들은 삭제될 것입니다.\n"
-"플레이어의 소프트웨어 또는 장치가 DVD 자막을 지원하지 않는 경우 이 옵션을 사용하십시오.\n"
+"처음 선택한 블루레이 자막 트랙을 추가합니다. 다른 블루레이 자막 트랙은 모두 삭제됩니다.\n"
+"플레이어 소프트웨어 또는 장치에서 블루레이 자막을 지원하지 않는 경우, 이 옵션을 사용합니다.\n"
 "\n"
-"오직 하나의 자막 트랙만이 구워질 수 있습니다! 충돌이 일어날 수 이씩 때문에, 가장 먼저 선택된 것이 적용됩니다."
+"자막 트랙은 하나만 추가할 수 있습니다! 충돌이 발생할 수 있기 때문에 먼저 선택한 자막이 우선합니다."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr "*위에서부터 시작하여 위의 자막 레코딩 옵션 중 하나만 적용됩니다."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
-msgstr "하나의 자막 트랙만 레코딩할 수 있습니다! 충돌이 발생할 수 있기 때문에 처음 선택한 것만 적용가능합니다."
+msgstr "자막 트랙은 하나만 추가할 수 있습니다! 충돌이 발생할 수 있기 때문에 먼저 선택한 자막이 우선합니다."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "자막"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "참조 프레임:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"정상적인 값은 ~1-6입니다. 더 많이 추가할 수록 압축은 좋아지지만 인코딩은 더 느려집니다.\n"
-"Cel 애니메이션은 영화 콘텐츠보다 더 많은 참조 프레임들로부터 이익을 얻는 경향이 있습니다.\n"
-"\n"
-"많은 하드웨어 장치들은 지원되는 참조 프레임 수에 제한이 있으므로 휴대용 또는 standalone 플레이어를 인코딩한다면 자신이 무엇을 하고 있는지에 대해 확실히 알지 않는다면 이것을 건드리지 마십시오!"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "최대 B-프레임:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"정상적인 값은 ~2-5입니다. 이것은 인코더가 사용할 수 있는 순차 B 프레임의 최대 값을 명시합니다.\n"
-"\n"
-"adaptvie B-frames이 Optimal로 설정되어 있지 않는다면 큰 숫자들은 일반적으로 큰 도움이 되질 않습니다.\n"
-"Cel-애니메이션으로 된 원본과 B-pyramid 또한 더 큰 값의 유용성을 굉장히 증사시킵니다.\n"
-"\n"
-"iPods 및 이와 유사한 기기에 필요한 baseline 프로파일은 B-frames를 0(off)로 설정해야 합니다."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "피라미드 B-프레임:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-pyramid는 B-frames의 피라미드 구조(그 이름은 여기서 유래했습니다)를 만들어 B-frames이 서로 다른 것을 참조할 수 있도록 하여 압축을 개선합니다.\n"
-"\n"
-"1보다 큰 최대 B-frames 필요; 최대 압축 이익을 위해 B-frames가 강력히 권장됩니다."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "가중 P-프레임:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"각 프레임에 대한 가중 파라미터 결정을 위해 추가 분석을 수행하십시오.\n"
-"\n"
-"이것은 전체적인 압축을 약간 향상시키고 fade의 품질을 크게 향상시킵니다.\n"
-"\n"
-"iPods과 유사한 기기에 필요한 Baseline profile은 weighted P-frame 예측을 비활성화해야 합니다. Main profile을 지원하는 기기나 플레이어들 조차도 Weighted P-frame 예측에 문제가 있을 수 있다는 점에 유의하십시오: 예를 들어, Apple TV는 이것과 완전히 호환되지 않습니다."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8 변환"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"8x8 변환은 속도당 압축이라는 부분에서 x264의 가장 유용한 기능입니다.\n"
-"\n"
-"이는 매우 적은 속도 비용으로 압축을 최소 5% 가량 향상시키며 압축 증폭과\n"
-"비교하면 보기 드물게 시각적 품질의 높은 이익을 제공할 수도 있습니다.\n"
-"하지만, 최대 증폭을 요구하며, 이는 많은 기기들에 지원되지 않고 있습니다."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "CABAC 엔트로피 인코딩"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"인코더가 작업을 마치면, ZIP나 RAR과 비슷하게 손실없이 압축해야할 필요가 있는 데이터들이 있습니다. H.264는 이에 대하여 두 가지 옵션을\n"
-"제공합니다: CAVLC와 CABAC. CABAC는 디코딩 속도가 매우 느리지만\n"
-"특히 낮은 비트 전송속도로, 상당히 압축 성능이 좋은 편(10-30%)입니다.\n"
-"\n"
-"비디오 재생에 필요한 CPU 요구 사항을 최소화하고자 한다면, 이 옵션을 사용할 수 없습니다.\n"
-"iPod 및 이와 비슷한 장치에 필요한 기본 조건은 CABAC를 비활성화해야합니다."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "인코딩 항목"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "움직임 추정 방법:"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"움직임 추정 방법 제어.\n"
-"\n"
-"움직임 추정은 프레임에서 각 픽셀 블럭이 어떻게 움직일지를 인코더가 추정하는 것입니다.\n"
-"더 좋은 움직임 검색 방법은 속도를 희생해서 압축율을 향상시킵니다.\n"
-"\n"
-"Diamond: 다이아몬드 패턴을 사용해 매우 빠르고 간단한 검색 수행.\n"
-"Hexagon: 육각 패턴을 이용해 다소 느리지만 효율적인 검색 수행.\n"
-"Uneven Multi-Hex: 복잡한 움직임을 좀 더 정확하게 포착하기 위해, 다양한 패턴을 이용해 광범위한 검색 수행.\n"
-"Exhaustive: 넓은 영역에서 모든 픽셀에 대해 \"무식한\" 검색 수행. 압축률도 낮고 매우 느림.\n"
-"Transformed Exhaustive: Exhaustive와 유사하지만 더 정확함. 압축률은 낮고 다소 느림."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Subpel ME &amp; 모드:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"이 설정은 부가 픽셀-정밀 모션 평가와 모드 결정 방법을 모두 제어합니다.\n"
-"\n"
-"부가 픽셀 평가는 단순한 픽셀 정확도에서 끝나는 것이 아니라 추정치를 정제하여 압축을 향상시키는 데 사용됩니다.\n"
-"모드 결정은 프레임의 각 블록을 인코딩하는 방법을 선택하는 데 사용되는 방법으로 매우 중요한 결정입니다.\n"
-"SAD는 가장 빠른 방법으로, 그 뒤로는 SATD, RD, RD 정교화와 가장 느린 QPRD가 있습니다.\n"
-"6이상은 강력히 추천됩니다: 세부사항을 유지하는 데 도움이 되는 매우 강력한 psy 최적화인 Psy-RD는 RD를 필요로 합니다.\n"
-"11은 분석에 있어서 모든 초기 종료를 비활성화합니다.\n"
-"가장 강력하고 느린 옵션인 10과 11은 적응 정량화(aq-mode>0)와 (항상) trellis 2를 필요로 합니다."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "움직임 추정 범위:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"이것은 블록의 움직임을 찾기 위해 블록의 움직임을 처음 추측한 것에서부터 x264가 검색하는 거리입니다.\n"
-"\n"
-"기본값은 대부분의 움직임에 대해 정상이지만, 특히 HD 해상도에서, 극도로\n"
-"많은 움직이는 비디오는 높은 속도 비용에도 불구하고, 더 높은 범위의\n"
-"이점을 얻을 수 있습니다."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "적응형 다이렉트 모드:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264는 B-frames에서 공간과 시간이라는 두 가지 다른 예측 모드를 허용합니다.\n"
-"\n"
-"기본적으로 공간이 거의 항상 더 좋지만, 시간도 때때로 유용합니다.\n"
-"x264는 작은 속도의 비용(그리고 작은 압축에 따른 이득)으로 각 특정 프레임에 더 적합한 것을 적절히 선택할 수 있습니다."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "적응형 B-프레임:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264에는 B-프레임 사용 시기와 사용할 수 있는 개수를 결정하는 다양한 알고리즘이 있습니다.\n"
-"\n"
-"빠른 모드는 지정한 B-프레임 수에 상관없이 대략 동일한 시간이 소요됩니다.\n"
-"하지만, 아무리 빠르더라도, 이 결정은 어디까지나 차선책입니다.\n"
-"\n"
-"최적화 모드는 B-프레임의 최대 개수가 증가함에 따라서 점점 느려지게 되지만,\n"
-"특히 B-피라미드와 함께 사용할 경우 훨씬 더 정확한 결정을 내리게 됩니다."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "분할:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"모드 결정은 해당 결정을 하기 위한 다양한 옵션에서 고르는 것입니다.:\n"
-"이 옵션은 어떤 옵션인지를 선택합니다.\n"
-"\n"
-"가장 좋은 옵션은 비활성화된 옵션일 수 있기 때문에 더 안 좋은 결정이라는 측면에서, \n"
-"확인한 더 적은 파티션은 더 빠른 인코딩을 의미합니다. "
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "트레일리스:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Trellis는 일정한 속도 비용으로 3-5% 더 많은 압축을 제거하기 위해\n"
-"변환 계수 반올림을 미세하게 조정합니다.\n"
-"\n"
-"\"항상\"은 메인 인코딩 프로세스 동안만 사용되는 것일 뿐만 아니라, 분석 중에도\n"
-"사용되는데, 이는 엄청난 속도 비용이 들지만 압축 성능을 훨씬 향상시킵니다.\n"
-"\n"
-"Trellis는 더 높은 비트 전송률로 더 많은 속도를 내며 CABAC를 필요로 합니다."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "분석"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "조정 양자화 강도:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"적응 양자화는 인코더가 프레임에 비트를 분배하는 방법을 제어합니다.\n"
-"\n"
-"값이 높을수록 가장자리와 복잡한 영역에서 더 많은 비트를 가져와서 미세한 영역으로 영역을 향상시킵니다."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Psychovisual Rate 왜곡:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"Psychovisual rate-distortion 최적화는 인간 비전의 특성을 활용하여 외관상 세밀함과 선명도를 극적으로 향상시킵니다.\n"
-"강도를 조정하여 효과를 약하거나 강하게 만들 수 있습니다.\n"
-"RD 알고리즘이므로 모드 결정은 \"6\"이상이어야 합니다."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Psychovisual 격자:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Psychovisual 격자는 Psychovisual RD보다 선명도와 디테일 유지를 더욱 향상시키는 실험 알고리즘입니다.\n"
-"\n"
-"권장 값은 0.2정도이지만 값이 커지면 매우 작은 비디오나 낮은 비트레이트 인코드에 도움이 될 수 있습니다.\n"
-"셀 애니메이션 및 기타 선명도 그래픽에는 권장되지 않습니다."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Deblocking:"
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"H.264 deblocking 필터.\n"
-"\n"
-"h.264는 각 프레임을 디코딩한 후 blocking artifacts를 없애는 내장 deblocking\n"
-"필터를 가지고 있습니다. 이는 시각적 품질을 향상시킬 뿐만 아니라, 또한\n"
-"압축에도 크게 도움이 됩니다. deblocking 필터는 상당한 CPU 전력을 필요로 하며,\n"
-"만약 비디오 재생을 위한 CPU 요구 사항을 최소화하려면, 이 부분을 비활성화하십시오.\n"
-"\n"
-"deblocking 필터는 두 개의 조정 가능한 파라미터, \"강도\" (Alpha) 와 \"한계점\" (Beta) 를 가집니다.\n"
-"전자는 deblocker가 얼마나 강한 지 (약한 지) 를 조절하지만, 후자는 얼마나 많은 (적은) 엣지를 \n"
-"적용할 지를 조절합니다. 적은 값은 적은 deblocking을 의미하며, 높은 값은 높은 deblocking을 의미합니다.\n"
-"두 개의 파라미터에 대해서 기본값은 0 (기본 강도) 입니다."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "DCT 훼손 없음"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"x264는 일반적으로 비어 있는 데이터 블록을 0으로 설정하여 비트를 저장하면서\n"
-"비디오의 다른 목적으로 더욱 잘 사용합니다. 하지만, 이것은 가끔 미묘한\n"
-"그레인과 디더링을 유지하는 데에 부정적인 영향을 끼칠 수 있습니다.\n"
-"\n"
-"\n"
-"미세한 소음을 유지하는 데 문제가 있는 다른 경우가 아니라면 x264의 옵션을 \n"
-"건드리지 마십시오."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psychovisual"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"선택된 옵션이 여기에 표시됩니다.\n"
-"이 옵션들을 편집하거나 다른 옵션을 추가할 수 있습니다.\n"
-"\n"
-"기본 값은 나타나지 않습니다. 기본 값은 다음과 같습니다:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "현재의 x264 고급 옵션 문자열"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "고급 비디오"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "챕터 마커"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
-msgstr "출력 파일에 챕터 마커 추가"
+msgstr "출력 파일에 챕터 마커를 추가합니다."
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "색인"
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "재생시간"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "제목"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "챕터"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "타이틀:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "배우:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "감독:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "배포일:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "주석:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "장르:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "설명:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
-msgstr "플롯:"
+msgstr "줄거리:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "태그"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "설정"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "편집"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"선택된 큐의 작업을 보류로 표시.\n"
-"큐 작업을 보류로 초기화하고 재 시작을 대기."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "모두 다시 불러오기"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"모든 큐의 작업을 보류로 표시.\n"
-"모든 큐 작업을 보류로 초기화하고 재 시작을 대기."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "전체 삭제"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "대기열에서 모든 항목 삭제"
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "대기열 저장"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"현재 인코딩 작업 큐를 파일에 저장하십시오.\n"
-"작업을 편집하고 다시 인코딩하기 위해 이 파일을 이후에 다시 로드할 수 있습니다."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "대기열 파일 불러오기"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "이전에 저장한 대기열 파일 불러오기"
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "다른 이름으로 저장:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
-msgstr "인코딩에 대한 대상 파일 이름"
+msgstr "인코딩의 대상 파일 이름입니다."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "위치:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
-msgstr "인코딩에 대한 대상 디렉토리"
+msgstr "인코딩의 대상 디렉터리입니다."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "대상 디렉토리"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "취소"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
-msgstr "승인"
+msgstr "확인"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "전체 선택"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
-msgstr "모든 타이틀을 추에 추가하기로 표시"
+msgstr "모든 제목을 대기열에 추가하기로 표시"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "모두 지우기"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
-msgstr "모든 타이틀에서 마커 제거"
+msgstr "모든 제목에서 마커 제거"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
-msgstr "대상 파일 승인. 중복 발견되지 않음."
+msgstr "대상 파일 확인. 검색된 중복 항목이 없습니다."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "설정"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "자동으로 업데이트 확인"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "모든 인코딩이 완료됐을 때"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
-msgstr "자동 이름 (수정된 원본 이름) 사용"
+msgstr "자동 이름 지정 사용 (수정된 원본 이름 사용)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr "원본 파일 이름 또는 볼륨 레이블에서 대상 파일 이름 만들기"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
-msgstr "자동 이름 부여 템플릿"
+msgstr "이름 자동 템플릿"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"사용가능한 옵션: {source} {title} {preset} {chapters} {date} {time} {creation-date}"
-" {creation-time} {quality} {bitrate}"
+"사용 가능한 옵션: {source-path} {source} {title} {preset} {chapters} {date} {time} "
+"{creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "MP4에 대해 iPod/iTunes 친화적인 확장자 (.m4v) 사용"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "미리보기 수"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "짧은 타이틀 필터링 (초)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "짧은 DVD 및 블루레이 제목 필터링(초)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr "완료된 대기열 항목 지우기 및 인코딩 완료"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"기본적으로 완료된 작업은 대기열에 남아있고 완료된 것으로 표시됩니다.\n"
+"완료된 작업을 대기열에서 지우려면 이 것을 선택하세요."
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "일반"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
-msgstr "분수 형태의 고정 품질 단위"
+msgstr "고정 화질 부분 세분화"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "(libdvdread 대신) dvdnav 사용"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "저장 경로 사용 가능한 디스크 공간 검사"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr "한도 이하로 사용가능한 디스크 공간이 없을 시, 인코딩 중지"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB 한계"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
-msgstr "개별 인코딩 로그를 영화와 동일한 위치에 놓기"
+msgstr "개별 인코딩 로그를 동영상과 동일한 위치에 배치"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
-msgstr "작업 로그 상세 수준"
+msgstr "작업 로그 상세 레벨"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
-msgstr "작업 로그 길이"
+msgstr "작업 로그 수명"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
-msgstr "HD 미리보기 축소"
+msgstr "고화질 미리 보기 비율에 따라 줄이기"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
-msgstr "DVD가 삽입되면 자동으로 검색"
+msgstr "DVD가 삽입되면 자동으로 스캔"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
-msgstr "새로운 디스크가 삽입되면 DVD 검색"
+msgstr "새로운 디스크가 삽입되면 DVD 스캔"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
-msgstr "액티비티 화면 글자 크기"
+msgstr "작업 창 글꼴 크기"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "고급 비디오 출력 탭 숨기기"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"위험 부다을 갖고 고급 비디오 옵션 사용.\n"
-"비디오 탭에 위치한 제어 명령을 사용하시는 편이\n"
-"더 좋습니다."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "큐에서 완료된 작업 삭제"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"기본적으로 완료된 작업은 큐에 남아있고 완료된 것으로 표시됩니다.\n"
-"완료된 작업을 큐에서 지우려면 이 것을 선택하세요."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "묶인 모든 파일들에 대해 동일한 설정 적용"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
 "\n"
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
-"이 옵션을 선택하면 대기열에 일련의 타이틀을 추가할 때 모든 타이틀이 동일한 설정을 사용합니다.\n"
-"각 타이틀의 설정을 독립적으로 변경하려면 선택을 해제하십시오."
+"이 옵션을 선택하면 대기열에 일련의 제목을 추가할 때 모든 제목이 동일한 설정을 사용합니다.\n"
+"각 제목의 설정을 독립적으로 변경하려면 선택을 해제합니다."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "설정 변경 허용"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "초보자를 위한 HandBrake를 허용"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "고급"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "폴더 이름:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "설명"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
-msgstr "이름 바꾸기 환경 설정"
+msgstr "프리셋 이름 변경 "
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "이름:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "설명"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
-msgstr "카테고리:"
+msgstr "범주:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
-msgstr "해당 설정을 표시할 카테고리를 설정하십시오."
+msgstr "해당 프리셋을 표시할 범주를 지정합니다."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
-msgstr "카테고리 이름:"
+msgstr "범주 이름:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
-msgstr "사전설정 이름:"
+msgstr "프리셋 이름:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
-msgstr "기본 설정"
+msgstr "기본 프리셋"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
-msgstr "HandBrake 실행 시, 이를 기본 환경 설정으로 설정하십시오."
+msgstr "HandBrake 실행 시, 이를 기본 프리셋으로 지정합니다"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "사용자 설정 화면 크기"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "치수"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "최대 폭:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "최대 폭 제한을 활성화합니다."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2310,15 +1983,15 @@
 "새로운 원본이 적재됐을 때, 원본의 폭이 이 값보다 크면 이 값이 적용됩니다.\n"
 "0은 최대 폭을 지정하지 않는다는 의미입니다."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "최대 높이:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "최대 높이 제한 활성화."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2330,89 +2003,123 @@
 "새로운 원본이 적재됐을 때, 원본의 높이가 이 값보다 크면 이 값이 적용됩니다.\n"
 "0은 최대 높이를 지정하지 않는다는 의미입니다."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "HandBrake 미리보기"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
-msgstr "미리보기 프레임 선택"
+msgstr "미리보기 프레임을 선택합니다."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
-msgstr "현재 미리보기 위치부터 시작하는 짧은 비디오를 인코딩하고 재생"
+msgstr "현재 미리보기 위치에서 시작하는 짧은 비디오 시퀀스를 인코딩하고 재생합니다."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "재생시간:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "실시간 미리보기의 재생시간을 초단위로 설정."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
-msgstr "잘라내기 보기"
+msgstr "자르기 표시"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
-msgstr "미리보기에서 잘라낸 영역 보기"
+msgstr "미리표시에서 잘라낸 영역 표시"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
-msgstr "영상 해상도"
+msgstr "원본 해상도"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
-msgstr "미리보기 화면을 원본 파일의 해상도로 재설정"
+msgstr "미리보기 창을 원본 비디오 해상도로 재설정"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
-msgstr "_취소"
+msgstr "취소(_C)"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
-msgstr "_열기"
+msgstr "열기(_O)"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
-msgstr "타이틀 번호:"
+msgstr "제목 번호:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
-msgstr "발견된 DVD 장치:"
+msgstr "감지된 DVD 장치:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "SRT 가져오기"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "SRT 자막 파일 가져오기 활성화"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "SSA 가져오기"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "SSA 자막 파일을 가져오기 위한 설정 활성화"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "내장된 자막 목록"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "내장 자막 선택 설정 활성화"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "원본 트랙"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "원본에서 사용할 수 있는 자막 트랙 목록입니다."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "트랙 이름:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"자막 트랙 이름을 설정합니다.\n"
+"\n"
+"재생기들은 이것을 자막 선택 목록에서 사용할 수 있습니다."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "언어"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "문자 인코딩"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "파일:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "오프셋 (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2420,7 +2127,7 @@
 "이 자막의 언어 설정.\n"
 "이 값은 자막 메뉴에서 재생기가 사용합니다."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2434,35 +2141,27 @@
 "이 문자 집합을 UTF-8로 변환합니다.\n"
 "이 변환을 수행하기 위해서 원본 문자 인코딩 방식이 필요합니다."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
-msgstr "가져올 SRT 파일 선택"
+msgstr "가져올 SRT 파일을 선택합니다."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Srt 파일"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "파일 가져오기"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr "비디오와 SRT 타임스탬프 사이에 밀리초 단위로 오프셋을 조정합니다"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "트랙"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "원본에서 사용 가능한 자막 목록"
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "강제 표시 자막만"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
-msgstr "영상에 추가"
+msgstr "비디오로 굽기"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2470,23 +2169,15 @@
 "비디오에 자막을 입힙니다.\n"
 "자막은 비디오의 일부가 되고, 비활성화할 수 없습니다."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "기본 트랙 지정"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "원본 트랙"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
-msgstr "원본에서 사용가능한 오디오 트랙의 목록"
+msgstr "원본에서 사용할 수 있는 오디오 트랙 목록입니다."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "트랙 이름:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2496,15 +2187,15 @@
 "\n"
 "재생기에서 오디오 선택 목록에 이 이름을 사용합니다."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "믹스"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "샘플레이트"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2515,233 +2206,122 @@
 "넓은 다이나믹 레인지를 가진 원본 오디오 (매우 크고 부드러운 시퀀스)에 대해서\n"
 "다이나믹 레인지 압축은 큰 소리를 부드럽게 만들고 부드러운 소리를 크게 만들어서 레인지를 '압축'합니다."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
-msgstr "이 트랙을 인코딩할 오디오 코덱 설정"
+msgstr "이 트랙을 인코딩할 오디오 코덱을 지정합니다."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "비트레이트"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "비트레이트 설정 활성화"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
-msgstr "품질"
+msgstr "화질"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
-msgstr "품질 설정 활성화"
+msgstr "화질 설정 활성화"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
-msgstr "이 트랙을 인코딩할 비트레이트 설정"
+msgstr "이 트랙을 인코딩할 비트레이트를 지정합니다."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
-msgstr "품질: 출력 코덱이 지원하는 경우, 출력물의 품질을 조정."
+msgstr "화질: 출력 코덱이 지원하는 경우, 출력물의 화질을 조정."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
-msgstr "오디오 트랙 출력의 믹스다운 설정"
+msgstr "오디오 트랙 출력의 믹스다운을 지정합니다."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
-msgstr "오디오 트랙 출력의 샘플레이트 설정"
+msgstr "출력 오디오 트랙의 샘플레이트를 지정합니다."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr "오디오 게인: 출력된 오디오 트랙의 증폭 또는 감쇄를 조정합니다."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "끄기"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "이 버전 무시"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "나중에 알려주기"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
-msgstr " 새 버전의 HandBrake가 있습니다!"
+msgstr "HandBrake의 새로운 버전을 사용할 수 있습니다!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx 버전이 있습니다. (현재 버전은 yyy 입니다)"
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "배포 기록"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "비디오 트랜스코더"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr "HandBrake는 현대적이며 널리 지원되는 코덱을 사용하여 대부분의 형식으로 비디오를 변환하는 도구(tool)입니다."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "HandBrake를 좋아하게 될 이유:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "대부분의 형식으로 비디오 변환"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "자유 및 오픈 소스"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "멀티-플랫폼 (Windows, Mac and Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "메인화면 및 설정 요약"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "비디오 해상도와 자르기 설정"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "비디오 인코더 설정"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "오디오 트랙 선택 및 설정"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "챕터 제목 변경"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>%s 생성할 수 없음.</big>\n"
-"\n"
-"내부 에러. UI 설명을 분석할 수 없음.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "색인"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "재생시간"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "타이틀:"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "작업 정보"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "트랙 정보"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "사전설정 이름"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "인코딩할 장치 또는 파일"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "인코딩에 사용할 사전설정 값"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Spam a lot"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "사용자 설정 디렉토리를 덮어 쓸 경로"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "디버그 출력을 위한 콘솔 열기"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "모두"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
-msgstr "품질:"
+msgstr "화질: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
-msgstr "비트 전송속도: %dkbps\n"
+msgstr "비트레이트: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "비트레이트: %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
-msgstr "패스쓰루"
+msgstr "패스트루"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2752,7 +2332,7 @@
 "DRC: %s\n"
 "트랙 이름: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2761,55 +2341,55 @@
 "%s얻기: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
-"오디오 인코더 추가하기.\n"
+"오디오 인코더를 추가합니다.\n"
 "선택된 각 원본 트랙은 선택된 모든 인코더로 인코딩됩니다."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
 msgstr ""
-"오디오 품질:\n"
-"지원되는 인코더라면 출력 품질을 조정합니다."
+"오디오 화질:\n"
+"지원되는 인코더라면 출력 화질을 조정합니다."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "오디오 인코더 제거"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "HandBrake를 종료하면 인코딩이 중지됩니다.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "선택되지 않음"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
-msgstr "검색 중 ..."
+msgstr "스캔 중 ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
-msgstr "검색 중지"
+msgstr "스캔 중지"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
-msgstr "발견된 타이틀 없음"
+msgstr "제목 없음"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "새 비디오"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2820,438 +2400,437 @@
 "\n"
 "%s (%d 초) ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
-msgstr "인코딩을 계속하지 않으면 %s영화가 사라집니다."
+msgstr "인코딩을 계속하지 않으면 %s동영상이 손실됩니다."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "현재 작업 취소 및 전체 중지"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "현재 작업 취소 및 다음 작업 시작"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "현재 작업 마친 후 전체 중지"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "인코딩 계속하기"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d 인코딩 대기 중"
+msgid "%d encode pending"
+msgstr "%d개 인코딩 보류 중"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d개 인코딩 보류 중"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
-msgstr "작업 %d / %d,"
+msgstr "작업 %d / %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
-msgstr "단계 %d / %d (자막 검색),"
+msgstr "패스 %d / %d (자막 스캔), "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
-msgstr "단계 %d / %d,"
+msgstr "패스 %d / %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr "인코딩: %s%s%.2f %% (%.2f fps, 평균 %.2f fps, ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "인코딩: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "인코딩: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
-msgstr "시작 시간 찾는 중,"
+msgstr "시작 시간 검색 중, "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
-msgstr "타이틀 %d / %d 검색 중..."
+msgstr "제목 %d / %d 스캔 중..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
-msgstr "타이틀 %d / %d 검색 중, 미리보기 %d..."
+msgstr "제목 %d / %d 스캔 중, 미리보기 %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "정지됨"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "인코딩 완료!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "인코딩 취소됨."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "인코딩 실패함."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
-msgstr "먹싱: 시간이 걸립니다..."
+msgstr "다중화: 시간이 좀 걸릴 수 있습니다..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
-msgstr "이 DVD 원본 검색"
+msgstr "이 DVD 원본 스캔"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (주의: 무손실)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
-msgstr "HandBrake %s/%s 버전이 사용 가능합니다. (현재 버전 %s/%d)"
+msgstr "HandBrake %s/%s 버전이 사용 가능합니다. (설치 버전 %s/%d)"
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "인코딩 완료됨"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
-msgstr "칵테일을 내려놓으세요, HandBrake 큐에 있는 작업이 완료됐습니다!"
+msgstr "칵테일을 내려놓으세요, HandBrake 대기열에 있는 작업이 완료됐습니다!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "인코딩이 완료됐습니다."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "컴퓨터 종료 중"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
-msgstr "컴퓨터 잠가지 진입 중"
+msgstr "컴퓨터 절전모드로 전환 중"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Handbrake 종료 중"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "선택된 언어에 부합하는 첫 트랙"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "선택된 언어에 부합하는 모든 트랙"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "외부 오디오 자막 트랙"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "처음 선택된 트랙"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "외부 오디오 그리고 처음 선택된 트랙"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "챕터:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "초:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "프레임:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
-msgstr "아무 것도 하지 않음"
+msgstr "아무 것도 안함"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
-msgstr "알림 보기"
+msgstr "알림 표시"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Handbrake 종료"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
-msgstr "잠자기 모르도 전환"
+msgstr "컴퓨터 절전 모드로 전환"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "컴퓨터 종료"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "자동"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
-msgstr "느슨하게"
+msgstr "루스"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
-msgstr "사용자화"
+msgstr "사용자 지정"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
-msgstr "주"
+msgstr "1주간"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
-msgstr "월"
+msgstr "1개월"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
-msgstr "연도"
+msgstr "일년"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
-msgstr "Immortal"
+msgstr "영속"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "하지 않음"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "매일"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "매주"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "매달"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Unsharp"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Lapsharp"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90º"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180º"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270º"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "공간"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "임시"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "빠름"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "최적"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
-msgstr "엄격하게"
+msgstr "최소한"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "보통"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "단순"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "스마트"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
-msgstr "Diamond"
+msgstr "마름모꼴"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
-msgstr "Hexagon"
+msgstr "육각형"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
-msgstr "Uneven Multi-Hexagon"
+msgstr "균일하지 않은 다중 육각형"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Exhaustive"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
-msgstr "Hadamard Exhaustive"
+msgstr "아다마르 Exhaustive"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, 부화소 없음"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, 1/4 화소 적용"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, 복수의 1/4 화소 적용"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: I/P-프레임의 RD"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: 모든 프레임의 RD"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: I/P-프레임의 RD 수정"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: 모든 프레임의 RD 수정"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: 모든 프레임의 QPRD"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: 분석 중 조기 종료하지 않음"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "대부분"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "일부"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "모두"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "인코딩만"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "항상"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
-msgstr "원본과 동일하게"
+msgstr "원본과 동일"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC 필름)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL 필름/비디오)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC 비디오)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
-msgstr "%3d - %02dh%02dm%02ds - %s"
+msgstr "%3d - %02d시간 %02d분 %02d초 - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
-msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr "%3d - %02d시간 %02d분 %02d초 - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPSL)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
-msgstr "%3d - %02dh%02dm%02ds"
+msgstr "%3d - %02d시간 %02d분 %02d초"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
-msgstr "타이틀 없음"
+msgstr "제목 없음"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "오디오 없음"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "아무거나"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3259,23 +2838,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
-"사용 불가능한 Detelecine 설정:\n"
+"잘못된 텔레시네 해제 설정:\n"
 "\n"
-"환경설정:\t%s\n"
-"사용자 설정:\t%s\n"
+"프리셋:\t%s\n"
+"사용자 지정:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
-"사용 불가능한 Deinterlace 설정:\n"
+"잘못된 텔레시네 해제 설정:\n"
 "\n"
-"환경설정:\t%s\n"
+"프리셋:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3283,23 +2862,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
-"사용 불가능한 Comb Detect 설정:\n"
+"잘못된 Comb Detect 설정:\n"
 "\n"
-"환경설정:\t%s\n"
-"사용자 설정:\t%s\n"
+"프리셋:\t%s\n"
+"사용자 지정:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
-"사용 불가능한 Comb Detect 설정:\n"
+"잘못된 Comb Detect 설정:\n"
 "\n"
-"환경설정:\t%s\n"
+"프리셋:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3308,13 +2887,13 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
-"사용 불가능한 Deinterlace 설정:\n"
+"잘못된 인터레이스 해제 설정:\n"
 "\n"
 "필터:\t%s\n"
-"환경설정:\t%s\n"
-"사용자 설정\t%s\n"
+"프리셋:\t%s\n"
+"사용자 지정\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3322,12 +2901,12 @@
 "Filter:\t%s\n"
 "Preset:\t%s\n"
 msgstr ""
-"사용 불가능한 Deinterlace 설정:\n"
+"잘못된 인터레이스 해제 설정:\n"
 "\n"
 "필터:\t%s\n"
-"환경설정:\t%s\n"
+"프리셋:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3337,14 +2916,14 @@
 "Tune:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
-"사용 불가능한 Denoise 설정:\n"
+"잘못된 노이즈 제거 설정:\n"
 "\n"
 "필터:\t%s\n"
-"환경설정:\t%s\n"
+"프리셋:\t%s\n"
 "조정:\t%s\n"
-"사용자 설정:\t%s\n"
+"사용자 지정:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3354,15 +2933,14 @@
 "Tune:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
-"사용 불가능한 Sharpen 설정:\n"
+"잘못된 선명도 설정:\n"
 "\n"
 "필터: \t%s\n"
-"환경설정:\t%s\n"
+"프리셋:\t%s\n"
 "조정:\t%s\n"
-"사용자 설정:\t%s\n"
+"사용자 지정:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3374,31 +2952,53 @@
 "다른 비디오 코덱이나 컨테이너를 선택하세요.\n"
 "계속하면, FFMPEG이 선택됩니다."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"WebM 컨테이너에서는 VP8 또는 VP9만 지원됩니다.\n"
+"\n"
+"다른 비디오 코덱 또는 컨테이너를 선택해야 합니다.\n"
+"계속 진행하면, 임의의 코덱이 선택됩니다."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
-msgstr "계속"
+msgstr "계속하기"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
-msgstr "발견된 타이틀 없음.\n"
+msgstr "제목이 없습니다.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
 "You should change your subtitle selections.\n"
 "If you continue, some subtitles will be lost."
 msgstr ""
-"단 하나의 자막만 영상에 추가됩니다.\n"
+"하나의 자막만 비디오에 추가할 수 있습니다.\n"
 "\n"
 "자막 선택을 변경해야 합니다.\n"
-"계속하면, 일부 자막은 무시됩니다."
+"계속하면 일부 자막이 손실됩니다."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"HandBrake의 WebM은 추가된 자막만 지원합니다.\n"
+"\n"
+"자막 선택을 변경해야합니다.\n"
+"계속하면 일부 자막이 손실됩니다."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3410,20 +3010,19 @@
 "사용 가능한 파일을 선택해야 합니다.\n"
 "계속하시면, 해당 자막이 무시됩니다."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
 "You should choose a different audio codec.\n"
 "If you continue, one will be chosen for you."
 msgstr ""
-"원본이 Pass-Thru를 지원하지 않습니다.\n"
+"원본이 패스트루를 지원하지 않습니다.\n"
 "\n"
 "다른 오디오 코덱을 선택해야 합니다.\n"
-"계속하면, 임의의 코덱이 선택됩니다."
+"계속 진행하면, 임의의 코덱이 선택됩니다."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3431,74 +3030,114 @@
 "You should choose a different audio codec.\n"
 "If you continue, one will be chosen for you."
 msgstr ""
-"%s는 %s 컨테이너에서 지원하지 않습니다.\n"
+"%s은(는) %s 컨테이너에서 지원하지 않습니다.\n"
+"\n"
+"다른 오디오 코덱을 선택해야 합니다.\n"
+"계속 진행하면, 임의의 코덱이 선택됩니다."
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>%s 생성할 수 없음.</big>\n"
 "\n"
-"다른 오디오 코덱을 선택하세요.\n"
-"계속하면, 임의의 코덱이 선택됩니다."
+"내부 오류입니다. UI 설명을 구문분석 할 수 없습니다.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "트랙 정보"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "프리셋 이름"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "인코딩할 장치 또는 파일"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "인코딩에 사용할 프리셋 값"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "많은 스팸"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "사용자 설정 디렉토리를 덮어 쓸 경로"
 
-#: ../src/presets.c:1192
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "디버그 출력을 위한 콘솔 열기"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
-msgstr "ghp_환경설정_초기_메뉴: 환경설정 폴더를 찾지 못하였습니다. "
+msgstr "ghb_presets_menu_init: 프리셋 폴더를 찾지 못하였습니다."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "파일 추가 도중 상위 폴더를 찾지 못하였습니다."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
-"발견된 환경설정이 현재 버전의 HandBrake에서 지원되는 설정보다 최신 버전입니다.\n"
+"발견된 프리셋이 현재 버전의 HandBrake에서 지원되는 설정보다 최신 버전입니다.\n"
 "\n"
 "계속하시겠습니까?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
-msgstr "날 여기서 꺼내줘!"
+msgstr "여기서 꺼내줘요!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
-msgstr "백업 환경설정 로드"
+msgstr "백업 프리셋 불러오기"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "모두 (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
-msgstr "환경설정 (*.json)"
+msgstr "프리셋 (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
-msgstr "이전 환경설정 (*.plist)"
+msgstr "기존 프리셋 (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
-msgstr "사전설정 내보내기"
+msgstr "프리셋 내보내기"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
 "\n"
 "%s"
 msgstr ""
-"%s 삭제 승인:\n"
+"%s 삭제 확인:\n"
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "폴더"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
-msgstr "사전설정"
+msgstr "프리셋"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3511,266 +3150,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "초"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "프레임"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (타이틀 %d, %s %d ~ %d, 2 비디오 수행) --> %s"
+msgid "%s (Modified)"
+msgstr "%s (수정됨)"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (타이틀 %d, %s %d ~ %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "A/V 정렬"
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "수정된 사전설정의 기반: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "사전설정: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d 자르기\n"
+"%dx%d 저장, %dx%d 화면\n"
+"%d:%d 픽셀 종횡비\n"
+"%s 화면 종횡비"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "형식: %s 컨테이너\n"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, 비트레이트 %dkbps"
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "컨테이너 옵션:"
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%s챕터 마커"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, 비트레이트 %dkbps (2 Pass)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G 지원"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, 고정 화질 %.4g(%s)"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%s웹에 최적화"
+msgid "%sPreset %s"
+msgstr "%s프리셋%s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "대상: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(비율 보존)"
+msgid "%sTune %s"
+msgstr "%s조정 %s"
 
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(비율 손실)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(아나모픽)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(사용자 아나모픽)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "영상: "
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "원본: %d x %d, 출력%d x %d %s, 잘라내기 %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr "%s프로필 %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", 화면 %d x %d"
+msgid "%sLevel %s"
+msgstr "%s레벨%s"
 
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "필터:"
-
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"고정 프레임레이트 %s fps"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"피크 프레임레이트 %s fps (더 낮을 수 있음)"
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"가변 프레임레이트 %s fps"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", 강제 표시만"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%s회색조"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", 추가됨"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "비디오: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", 기본값"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(고정)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "완료됨"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(가변)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "취소됨"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", 프레임레이트: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "실패함"
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", 프레임레이트: 피크 %s (낮을 수도 있음)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "보류 중"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", 프레임레이트: %s (고정 프레임레이트)"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d일 %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "에러"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "비트레이트:"
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "1 단계 가속: 켜기\n"
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "비디오 출력: 사전설정: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d일 %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - 조정:"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - 프로필: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - 수준: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "고급 옵션: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "오디오: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "사용할 수 없음"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "오디오 트랙: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "외부 오디오 검색"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "비트레이트: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "인코딩"
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> 인코딩: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "첫 번째 패스 인코딩 (분석)"
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> 인코딩: %s, 믹스다운: %s, 견본 비율: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "두 번째 패스 인코딩 (최종)"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "자막:"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "에러"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "자막 트랙: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"패스 %d / %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr "(강제로)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "제목 스캔 중"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr "(굽기)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "인코딩 일시 중지됨"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr "(기본)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "인코딩 진행 중"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr "%s, 오프셋 (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "알 수 없음"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%s 파일 경로 디스크 공간이 부족합니다: %<PRIu64>MB 남았습니다.\n"
-"경로 : %s\n"
-"계속 진행 시 인코딩이 완료되지 못할 수도 있습니다.\n"
+"%s 대상 파일 시스템이 거의 꽉 찼습니다: %<PRId64>MB 사용 가능.\n"
+"대상: %s\n"
+"계속 진행하면 인코딩이 불완전할 수 있습니다.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
-msgstr "다시 시작, 해당 문제를 해결하였습니다."
+msgstr "다시 시작, 해당 문제를 해결했습니다"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
-msgstr "다시 시작, 다시는 묻지 마십시오."
+msgstr "다시 시작하기, 다시 묻지 않습니다"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3780,14 +3374,14 @@
 msgstr ""
 "대상: %s\n"
 "\n"
-"큐의 다른 작업이 동일한 대상을 지정하고 있습니다.\n"
+"대기열의 다른 작업이 동일한 대상을 지정하고 있습니다.\n"
 "덮어쓰시겠습니까?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "덮어쓰기"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3798,7 +3392,7 @@
 "\n"
 "유효한 디렉토리가 아닙니다."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3809,7 +3403,7 @@
 "\n"
 "읽거나 쓸 수 없는 디렉토리입니다."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3822,50 +3416,50 @@
 "파일이 이미 존재합니다.\n"
 "덮어쓰시겠습니까?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
-msgstr "이 타이틀을 큐에 추가하기 위해 선택.\n"
+msgstr "이 제목을 대기열에 추가하기 위해 선택.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
-msgstr "타이틀 없음"
+msgstr "제목 없음"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
-"같은 대상 파일 이름을 가진 다른 타이틀이 있습니다.\n"
-"출력 파일을 변경하기 전에는 이 타이틀이 큐에\n"
+"같은 대상 파일 이름을 가진 다른 제목이 있습니다.\n"
+"출력 파일을 변경하기 전에는 이 제목이 대기열에\n"
 "추가되지 않습니다.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "중지"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "인코딩 중지"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "인코딩 중지(_T)"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "다시 시작"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "인코딩 다시 시작"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "인코딩 중단"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
-msgstr "인코딩 다시 시작하기"
+msgstr "인코딩 다시 시작(_R)"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3873,23 +3467,21 @@
 "인코딩 중입니다. 무엇을 하시겠습니까?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
-msgstr "선호하는 언어: %s"
+msgstr "기본 언어: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "%s 자막 트랙을 기본 오디오 트랙이 %s 아닌 경우 추가"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
-msgstr "기본 오디오가 선호하는 언어가 아닐 경우 자막 트랙 추가"
+msgstr "기본 오디오가 기본 언어가 아닌 경우 자막 트랙 추가"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3902,8 +3494,7 @@
 "확장 옵션:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3915,3 +3506,8 @@
 "\n"
 "확장 옵션:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (주의: 무손실)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/nl.po -> HandBrake-1.5.1.tar.xz/gtk/po/nl.po Changed

@@ -1,19 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Sigmund Walrerson <riseofthenorse@live.be>, 2019
+# Sigmund Walrerson <riseofthenorse@live.be>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Sigmund Walrerson <riseofthenorse@live.be>, 2019\n"
+"Last-Translator: Sigmund Walrerson <riseofthenorse@live.be>, 2021\n"
 "Language-Team: Dutch (https://www.transifex.com/HandBrakeProject/teams/92423/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +31,11 @@
 "\n"
 "De ondertitel wordt deel van de video en kan niet worden uitgeschakeld."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "ingebrand"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +53,11 @@
 "Dit is nuttig om een \"geforceerde\" track\n"
 "in uw output te creëren."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "standaard"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +73,11 @@
 "om ondertitels te tonen tijdens scènes waarin een\n"
 "vreemde taal gesproken wordt."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Enkel geforceerd"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +93,11 @@
 "niet overeen met het begin van de video.\n"
 "Deze instelling laat u toe om de bestanden te synchroniseren."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT Offset"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -124,55 +124,235 @@
 "wordt best gebruikt in combinatie met de\n"
 "\"geforceerd\" optie."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Track"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Open bronmap"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Open doelmap"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Open map encoderingslog"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Open encoderingslog"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Mislukte taken herstellen"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Alle taken herstellen"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Voltooide taken opruimen"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Alle taken opruimen"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Importeer wachtrij"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Exporteer wachtrij"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Handbrake-voorinstellingen"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "Voorinstellingen"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Stel als _Standaard in"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Opslaan _Als"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Naam wijzigen"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Verwijderen"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importeren"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exporteren"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "_Herstel ingebouwde voorinstellingen"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Lijst met voorinstellingen"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "HandBrake wachtrij"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Wachtrij"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 taken in wachtrij"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Start encoderen"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Start"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Pauzeer encoderen"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pauzeer"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Opties"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Wanneer voltooid:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Herstellen"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Markeer het geselecteerde item in de wachtrij als wachtend.\n"
+"Dit herstelt de huidige wachtrij-taak naar wachtend en klaar om opnieuw uit te voeren."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Bewerken"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Acties"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Voorinstelling:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Bron:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Doel:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Afmetingen:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Audio:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Ondertitels:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Samenvatting"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Passage:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Starttijd:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Eindtijd:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Gepauseerde duurtijd:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Encoderingstijd:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Bestandsgrootte:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistieken"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Activiteitslog"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Handbrake-activiteitslog"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Over HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -180,203 +360,186 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake is een GPL-gelicentiëerde, multi-platform, multi-threaded "
 "videotranscoder."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake is gratis software; U kunt het herverdelen en/of aanpassen onder de termen van de GNU General Public License zoals gepubliceerd door de Free Software Foundation; ofwel versie 2 van de licentie, of (naar keuze) elke latere versie.\n"
+"HandBrake is gratis software; U kunt het herverdelen en/of aanpassen onder de termen van de GNU General Public License zoals gepubliceerd door de Free Software Foundation\n"
 "\n"
 "HandBrake wordt verdeeld in de hoop dat het nuttig zal zijn, maar ZONDER ENIGE GARANTIE; zelfs zonder de geïmpliceerde garantie van VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General Public License voor meer details.\n"
 "\n"
 "U zou een kopie van de GNU General Public License samen met Glade moeten ontvangen hebben; is dit niet het geval, schrijf dan naar de Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "Bestand"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Open Bron"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Open Enkele _Titel"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
-msgstr "Stel Bestemming in"
+msgstr "Stel Doel in"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "Instellingen"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "Stoppen"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "Wachtlijst"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "Toevoegen"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "_Meerdere Toevoegen"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Start Encoderen"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Pauzeer Encoderen"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "W_achtlijst Opslaan"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Laad Wachtlijstbestand"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "Weerga_ve"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake Voor _Dummies"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Voorinstellingen_lijst"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Activiteitsvenster"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Help"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "Over"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Gids"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Kies video-bron"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Open bron"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Aan wachtlijst toevoegen"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Aan wachtlijst toevoegen"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Start encoderen"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Start"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Pauzeer encoderen"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pauzeer"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Toon voorinstellingenvenster"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Voorinstellingen"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Toon preview-venster"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Preview"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Toon wachtlijst"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Wachtlijst"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Toon activiteitsvenster"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Activiteit"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Bron:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Geen"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Scannen..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -386,57 +549,57 @@
 "Standaard wordt de langste titel gekozen.\n"
 "Dit is vaak de getoonde titel van een DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Geen titels"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Angle:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "Voor multi-angle DVD's, kies de gewenste angle om te encoderen."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Bereik:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Bereik van de te encoderen titel. Kunnen hoofdstukken, seconden of frames "
 "zijn."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Stel het eerste te encoderen hoofdstuk in."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Stel het laatste te encoderen hoofdstuk in."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Voorinstelling:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Kies voorinstelling"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Gewijzigd"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Herladen"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -444,27 +607,27 @@
 "Herlaad de instellingen voor de huidige voorinstelling.\n"
 "Wijzigingen worden verworpen."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Nieuwe voorinstelling opslaan"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "De huidige instellingen opslaan als nieuwe voorinstelling."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Formaat:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Formaat waarin geëncodeerde tracks gemuxt worden."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Web-geöptimaliseerd"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -472,11 +635,11 @@
 "Optimaliseer de opmaak van het MP4-bestand voor progressieve download.\n"
 "Dit laat een speler toe om het afspelen te starten voor het hele bestand is gedownload."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Aligneer A/V start"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -487,55 +650,51 @@
 "synchronizatie verbeteren voor kapotte spelers die MP4 editlijsten niet\n"
 "respecteren."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G Ondersteuning"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Voeg iPod Atom toe, nodig voor sommige oudere iPods."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Afspeelduur:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "uu:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Tracks:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filters:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Grootte:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Auto bijsnijden"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Automatisch zwarte randen rond de video bijsnijden."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Los bijsnijden"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -543,41 +702,41 @@
 "instead of doing exact cropping and then scaling to\n"
 "the required multiple."
 msgstr ""
-"Wanneer de instellingen vereisen dat dimensies\n"
+"Wanneer de instellingen vereisen dat afmetingen\n"
 "afgerond zijn tot een bepaald meervoud van een aantal\n"
 "pixels, zal deze instellingen een aantal extra pixels bijsnijden\n"
 "in plaat van exact bij te snijden en dan te herschalen\n"
 "naar het nodige meervoud."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Links bijsnijden"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Boven bijsnijden"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Onder bijsnijden"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Rechts bijsnijden"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Afmetingen bijsnijden:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Bijsnijden"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Optimaal voor bron"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -585,11 +744,11 @@
 "Als ingeschakeld, wordt de 'optimale' opslagresolutie gekozen.\n"
 "Dit is de resolutie die het best overeenkomt met de bron na bijsnijden."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Breedte:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -598,11 +757,11 @@
 "De werkelijke weergave-afmetingen verschillen als de\n"
 "pixel-aspectverhouding niet 1:1 is."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Hoogte:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -611,66 +770,66 @@
 "De werkelijke weergave-afmetingen verschillen als de\n"
 "pixel-aspectverhouding niet 1:1 is."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamorf:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Anamorfe modus:\n"
+"Anamorfe Modes:\n"
 "<tt>\n"
-"Geen - Forceer pixel-aspectverhouding op 1:1.\n"
-"Los - Gebruik een pixel-aspectverhouding die zo dicht\n"
-" mogelijk overeenkomt met de pixel-aspectverhouding\n"
-" van de bron, terwijl de oorspronkelijke beeldverhouding\n"
-" behouden blijft.\n"
+"Geen - Forceer pixel-aspectverhouding op 1:1.\n"
+"Los - Gebruik een pixel-aspectverhouding die zo dicht\n"
+" mogelijk overeenkomt met de pixel-aspectverhouding\n"
+" van de bron, terwijl de oorspronkelijke beeldverhouding\n"
+" behouden blijft.\n"
 "Automatisch - Gebruik een pixel-aspectverhouding die de\n"
-" opslagresolutie maximaliseer, terwijl de\n"
-" oorspronkelijke beeldverhouding behouden blijft.</tt>"
+" opslagresolutie maximaliseert, terwijl de\n"
+" oorspronkelijke beeldverhouding behouden blijft.</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Afmetingen uitlijnen:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
 "This setting is only necessary for compatibility with some devices.\n"
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
-"Stel opslagefmetingen in op meervouden van deze waarde.\n"
+"Stel opslagafmetingen in op meervouden van deze waarde.\n"
 "\n"
 "Deze instelling is enkel nodig voor compatibiliteit met sommige\n"
 "apparaten. Gebruik 2 tenzij compatibiliteitsproblemen opduiken."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Opslaggeometrie"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Verhouding behouden"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 "Indien ingeschakeld zal de oorspronkelijke beeldverhouding van de bron "
 "worden behouden."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -678,11 +837,11 @@
 "Dit is de weergavebreedte. Het is het resultaat van het schalen\n"
 "van de opslagafmetingen door de pixel-aspectverhouding."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Pixel-aspectverhouding:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -696,11 +855,11 @@
 "Spelers zullen het beeld schalen om de gespecifiëerde\n"
 "aspectverhouding te behalen."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -713,27 +872,27 @@
 "Spelers zullen het beeld schalen om de gespecifiëerde\n"
 "aspectverhouding te behalen."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Beeldverhouding:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Weergavegeometrie"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Afmetingen"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Detelecine:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -742,7 +901,7 @@
 "Deze filter verwijdert 'combing' artefacten die het resultaat zijn van telecine.\n"
 "Telecine is het process dat framesnelheid van film van 24 fps omzet naar de NTSC video framesnelheid van 30 fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -752,11 +911,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Interlace-detectie:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -768,7 +927,7 @@
 "Als een deinterlace-filter is ingeschakeld, zullen enkel de\n"
 "door deze filter gevonden frames deinterlaced worden."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -780,11 +939,11 @@
 "Mode:Spatiale Metriek:Spatiale Drempel:Maskerfilter Mode:\n"
 "Blokdrempel:Blokbreedte:Blokhoogte"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Deinterlace:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -796,11 +955,11 @@
 "De decomb filter ondersteunt verschillende interpolatie-algoritmen.\n"
 "De deinterlace filter is een klassieke YADIF deinterlacer.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Deinterlace voorinstelling:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -812,11 +971,11 @@
 "De decomb filter ondersteunt verschillende interpolatie-algoritmen.\n"
 "De deinterlace filter is een klassieke YADIF deinterlacer.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Ontblokking:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Ontblokkingsfilter:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -824,11 +983,25 @@
 "De ontblokkingfilter verwijdert een veelvoorkomend artefact van compressie.\n"
 "Als de bron 'blokkig' is, kan deze filter het helpen opschonen."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Ontblokking-regeling:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Aangepaste ontblokkingfilter string-formaat\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Ontruisfilter"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -838,15 +1011,15 @@
 "Filmkorrel en andere soorten hoogfrequente ruis zijn moeilijk te comprimeren.\n"
 "Deze filter op dergelijke bronnen te gebruiken kan resulteren in kleinere bestanden."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Ontruis-voorinstelling"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Ontruis-regeling"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -856,11 +1029,11 @@
 "\n"
 "SpatialeLuma:SpatialeChroma:TemporeleLuma:TemporeleChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Scherptefilter:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -868,47 +1041,47 @@
 "De scherptefilter versterkt randen en andere\n"
 "hoogfrequente componenten in de video."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Scherpte-voorinstelling:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Scherpte-regeling:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Rotatiefilter:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Roteer de video in stappen van 90 graden in wijzerzin."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Grijswaarden"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Indien ingeschakeld, filter kleurcomponenten uit de video."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filters"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Video-encoder:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Beschikbare video-encoders"
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Framesnelheid:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -920,19 +1093,19 @@
 "'Zelfde als bron' is aangeraden. Als de bronvideo een variabele\n"
 "framesnelheid heeft, zal 'Zelfde als bron' deze behouden."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Constante framesnelheid"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Stelt een constante framesnelheid in voor de uitvoer."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Piek-framesnelheid (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -944,11 +1117,11 @@
 "\n"
 "VFR is niet compatibel met sommige spelers."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Variabele framesnelheid"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -958,7 +1131,7 @@
 "\n"
 "VFR is niet compatibel met sommige spelers."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -986,15 +1159,15 @@
 "FFMpeg en Theora hebben een meer lineaire schaal.\n"
 "Deze encoders hebben geen verliesloze modus."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Constante kwaliteit:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Bitsnelheid (kbps):"
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -1009,11 +1182,11 @@
 "waarde zijn. Als de momentane bitsnelheid beperkt moet worden, moeten\n"
 "de vbv-bufsize- and vbv-maxrate-instellingen van x264 bekeken worden."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "2-passage-encodering"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1027,11 +1200,11 @@
 "over de video verzameld. In de 2e passage worden die statistieken\n"
 "gebruikt om beslissingen over toewijzing van bitsnelheden te maken."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Turbo eerste passage"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1039,30 +1212,12 @@
 "Gebruik instellingen die het proces versnellen tijdens de 1e passage\n"
 "van de encodering met 2 passages."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Gebruik geavanceerde opties"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Gebruik de tab 'geavanceerde opties' voor x264-instellingen.\n"
-"\n"
-"Gebruik op eigen risico!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Voorinstelling:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
@@ -1073,13 +1228,13 @@
 "De string met regelingen, profielen, niveaus en geavanceerde opties wordt\n"
 "hierop toegepast. Over het algemeen zouden deze opties zo traag\n"
 "als draaglijk moeten ingesteld worden, aangezien tragere instellingen\n"
-"beter kwaliteit of kleinere bestanden oplevert."
+"een betere kwaliteit of kleinere bestanden oplevert."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Regelen:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1093,11 +1248,11 @@
 "of karakteristieken in de uitvoer instellen. Veranderingen worden\n"
 "toegepast na de voorinstelling maar vóór alle andere parameters."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Snel decoderen"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1108,11 +1263,11 @@
 "Stel dit in als uw apparaat moeite heeft om de uitvoer af te spelen\n"
 "(verloren frames)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Geen vertraging"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1127,11 +1282,11 @@
 "Aangezien HandBrake niet geschikt is voor uitzending van live-beelden,\n"
 "heeft deze instelling weinig nut."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profiel:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1141,11 +1296,11 @@
 "\n"
 "Heeft voorrang op alle andere instellingen."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Niveau:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1155,11 +1310,11 @@
 "\n"
 "Heeft voorrang op alle andere instellingen."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Meer instellingen:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1169,56 +1324,45 @@
 "\n"
 "Lijst van encoder-opties, gescheiden door dubbel punt."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Track-lijst"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Toon audio-track-lijst van uitvoer"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Track-selectie"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Toon track-selectie-opties van de bron"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Toevoegen"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Voeg nieuwe audio-instellingen toe aan de lijst"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Allen toevoegen"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Voeg alle audio-tracks toe aan de lijst"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Stel alle audio-instellingen in op hun standaard."
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Track-lijst"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Selectiegedrag:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Kies welke audio-tracks van de bron-media gebruikt worden."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1226,135 +1370,135 @@
 "Maak een lijst van talen waarvoor audio geselecteerd wordt.\n"
 "Tracks die overeenkomen met deze talen worden geselecteerd door het gekozen selectiegedrag."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Beschikbare talen"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Geselecteerde talen"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Gebruik enkel de eerste encoder voor secundaire audio"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 "Enkel de primaire audio-track wordt geëncodeerd met de volledige encoder-lijst.\n"
 "Alle andere, secundaire audio-tracks voor uitvoer worden enkel met de eerste encoder geëncodeerd."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Auto Passthru:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat MP3 ondersteunt.\n"
 "Dit laat toe om MP3 passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat AAC ondersteunt.\n"
 "Dit laat toe om AAC passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat AC-3 ondersteunt.\n"
 "Dit laat toe om AC-3 passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat DTS ondersteunt.\n"
 "Dit laat toe om DTS passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat DTS-HD ondersteunt.\n"
 "Dit laat toe om DTS-HD passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat EAC-3 ondersteunt.\n"
 "Dit laat toe om EAC-3 passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat TrueHD ondersteunt.\n"
 "Dit laat toe om TrueHD passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Schakel dit in als uw afspeelapparaat FLAC ondersteunt.\n"
 "Dit laat toe om FLAC passthru te selecteren als Auto Passthru is ingeschakeld."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Passthru terugval-track:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1362,80 +1506,80 @@
 "Stel de audio-codec om te encoderen in wanneer geen geschikte track voor "
 "audio-passthru kan gevonden worden."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Audio-encoder-instellingen:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Elke geselcteerde bron-track zal worden geëncodeerd met alle geselecteerde "
 "encoders."
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Encoder"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Bitsnelheid/Kwaliteit"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
-msgstr "Afmixen"
+msgstr "Mixdown"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
-msgstr "Sample-frequentie"
+msgstr "Sample-snelheid"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Versterking"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Track-selectie"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Audio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Toon ondertitiel-track-lijst van uitvoer"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Voeg nieuwe ondertitel-instellingen toe aan de lijst"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Voeg alle ondertitel-tracks toe aan de lijst"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Vreemde taal audio-scan"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 "Voeg een extra passage aan de encodering toe om te\n"
 "zoeken naar kandidaat-ondertitels die tekst voorzien voor\n"
 "audiosegmenten in een vreemde taal."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Stel alle ondertitel-instellingen in op hun standaard."
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Kies welke ondertitel-tracks van de bronmedia gebruikt worden."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1449,20 +1593,20 @@
 "De eerste taal in deze lijst is de \"voorkeur\"-taal en wordt gebruikt om\n"
 "de selectie van ondertitels te bepalen als er vreemde talen gesproken worden."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Voorkeurstaal: Geen"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Voeg passage voor vreemde talen toe"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Voeg een \"vreemde talen\"-scan toe wanneer de standaard-audio-track\n"
 "in de voorkeurstaal is. Deze passage vindt korte sequenties van audio in\n"
@@ -1470,26 +1614,26 @@
 "\n"
 "Voor deze optie moet er een taal in de lijst met geselcteerde talen zijn."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 "Voeg ondertitel-track toe als de standaard-audio in een vreemde taal is."
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Wanneer de standaard-audio-track niet in de voorkeurstaal is, voeg een ondertitel-track toe.\n"
 "\n"
-"Deze optie vereist dat er een taal in de lijst met geselcteerde talen is."
+"Deze optie vereist dat er een taal in de lijst met geselcteerde talen is"
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Voeg bijgesloten ondertitels toe indien voorhanden."
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1497,38 +1641,37 @@
 "Bijgesloten ondertitels zijn ondertitels die aan elke container kunnen "
 "toegevoegd worden als een \"soft\" ondertitel-track"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Burn-In-gedrag*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Stel het gedrag van ondertitel-\"Burn-In\" in.\n"
 "\n"
-"Ondertitels met \"Burn-In\" zijn een deel van de video\n"
-"en kunnen niet uitgeschakeld worden tijdens het afspelen.\n"
-"Slechts één ondertitel-track kan gebruikt worden!\n"
+"Ondertitels met \"Burn-In\" zijn een deel van de video en kunnen niet uitgeschakeld\n"
+"worden tijdens het afspelen. Slechts één ondertitel-track kan gebruikt worden!\n"
 "Aangezien conflicten kunnen optreden, wint de eerstgekozen ondertitel."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Burn-In voor gebrekkige spelers*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD-ondertitels"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Brand de eerste geselecteerde DVD-ondertitel-track. Alle andere DVD-ondertitel-tracks worden verworpen.\n"
 "Gebruik deze optie als de speler of het afspeelapparaat geen DVD-ondertitels ondersteunt.\n"
@@ -1536,16 +1679,16 @@
 "Slechts één ondertitel-track kan gebruikt worden!\n"
 "Aangezien conflicten kunnen optreden, wint de eerstgekozen ondertitel."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Blu-ray-ondertitels"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Brand de eerste geselecteerde Blu-ray-ondertitel-track. Alle andere Blu-ray-ondertitel-tracks worden verworpen.\n"
 "Gebruik deze optie als de speler of het afspeelapparaat geen Blu-ray-ondertitels ondersteunt.\n"
@@ -1553,7 +1696,7 @@
 "Slechts één ondertitel-track kan gebruikt worden!\n"
 "Aangezien conflicten kunnen optreden, wint de eerstgekozen ondertitel."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1561,833 +1704,474 @@
 "* Slechts één van bovenstaande ondertitel-opties wordt toegepast, "
 "beginnend met de bovenste."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
-"Slechts één ondertitel-track kan gebruikt worden!\n"
+"Slechts één ondertitel-track kan ingebrand worden!\n"
 "Aangezien conflicten kunnen optreden, wint de eerstgekozen ondertitel."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Referentie-frames:"
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr "Hoofdstukmarkeringen"
 
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Gangbare waarden zijn ~1-6. Hoe meer, des te beter de compressie,\n"
-"maar des te trager het encoderen. Celanimaties hebben doorgans\n"
-"meer voordeel aan meer referentie-frames dan film-inhoud.\n"
-"\n"
-"Merk op dat de hardware van veel apparaten beperkingen op het aantal\n"
-"referentie-frames oplegt, dus bij het encoderen voor draagbare of\n"
-"standalone-spelers is het aangeraden deze waarde niet te veranderen\n"
-"zonder kennis van zaken."
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr "Voeg hoofdstukmarkeringen toe aan het uitvoerbestand."
 
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Maximum aantal B-Frames:"
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Index"
 
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Gangbare waarden zijn ~2-5. Dit specifiëert het maximaal aantal B-frames\n"
-"dat de encoder kan gebruiken.\n"
-"\n"
-"Grote getallen helpen meestal niet, tenzij de optie Adaptieve B-frames\n"
-"op Optimaal is ingesteld. Celanimaties als bronmateriaal en B-piramide\n"
-"maken grotere waarden ook nuttiger.\n"
-"\n"
-"Het Baseline-profiel, nodig voor iPods en gelijkaardige apparaten, vereist\n"
-"dat B-frames op 0 (uit) ingesteld is."
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Speelduur"
 
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Piramidale B-Frames:"
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titel"
 
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-piramide verbertert compressie door een piramidale structuur van\n"
-"B-frames te creëren (vandaar de naam), waardoor B-frames naar elkaar\n"
-"refereren.\n"
-"\n"
-"Vereist een maximaal aantal B-frames groter dan 1; gerbuik van optimale\n"
-"adaptieve B-frames is sterk aangewezen voor het volledige\n"
-"compressie-voordeel."
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr "Hoodstukken"
 
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Gewogen P-Frames:"
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr "Acteurs:"
 
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Voert een extra analyse uit om gewichtparameters voor elke frame te kiezen.\n"
-"\n"
-"Dit verbetert de compressie licht en verbetert de kwaliteit van fades aanzienlijk.\n"
-"\n"
-"Het Baseline-profiel, nodig voor iPods en gelijkaardige apparaten, vereist\n"
-"dat gewogen P-frames uitgeschakeld zijn. Bemerk dat sommige apparaten\n"
-"en spelers, zelfs degene die het Hoofdprofiel ondersteunen, problemen\n"
-"kunnen ervaren met Gewogen P-frames: De Apple TV is er volledig\n"
-"incompatible mee, bijvoorbeeld."
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr "Regisseur:"
 
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8-Transformatie"
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr "Publicatiedatum:"
 
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"De 8x8-transformatie is het meest nuttige onderdeel van x264 in termen\n"
-"van compressie-over-tijdsduur.\n"
-"\n"
-"Het verbetert compressie met minstens 5%, met een zeer kleine kost in\n"
-"tijdsduur, en kan ongewoon hoge visuele kwaliteit bieden in vergelijking\n"
-"met de compressie-winst. Het vereist echter wel het Hoog-profiel, dat door\n"
-"vele apparaten mogelijks niet ondersteund wordt."
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr "Commentaar:"
 
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "CABAC entropie-encodering"
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr "Genre:"
 
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"Na het encoderen, moet een hoeveelheid data verliesloos gecomprimeerd\n"
-"worden, zoals naar ZIP of RAR. H.264 voorziet hiervoor twee opties:\n"
-"CAVLC en CABAC. CABAC decodeert veel trager maar comprimeert \n"
-"beduidend beter (10-30%), vooral bij lage bitsnelheden.\n"
-"\n"
-"Als het doel is om CPU-verbruik voor het afspelen te minimaliseren, moet\n"
-"deze optie uitgeschakeld worden.\n"
-"Het Basisprofiel, zoals vereist voor iPods en gelijkaardige apparaten,\n"
-"vereist dat CABAC is uitgeschakeld."
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr "Beschrijving:"
 
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Encoderingsonderdelen"
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr "Plot:"
 
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Bewegingschattingsmethode:"
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr "Tags"
 
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Stelt de bewegingschattingsmethode in.\n"
-"\n"
-"bewegingsschatting is de manier waarop de encoder schat hoe elke blok pixels is bewogen.\n"
-"Een betere zoekmethode verbetert compressie ten koste van snelheid.\n"
-"\n"
-"Ruit: Een extreem snelle en eenvoudige zoekmethode met een ruitvormig patroon.\n"
-"Zeshoek: Een meer effectieve maar iets tragere zoekmethode met een zeshoekig patroon\n"
-"Oneven Multi-Hex: Een heel brede zoekmethode met verschillende patronen, die complexe bewegingen nauwkeuriger kan vastleggen.\n"
-"Grondig: Een \"domme\" zoekmethode die elke pixel in een breed gebied bekijkt. Significant trager voor een kleine winst in compressie.\n"
-"Getransformeerd grondig: Zoals Grondig, maar met meer nauwkeurige beslissingen. Daardoor iets trager, ook voor een kleine winst in compressie."
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr "Opslaan als:"
 
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Subpel ME &amp; Mode:"
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr "Doelbestandsnaam voor de encodering."
 
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Deze instelling beheert de subpixel-precisie-bewegingsschatting en mode-beslissingsmethoden.\n"
-"\n"
-"subpixel-bewegingsschatting wordt gebruikt om bewegingsschatting nauwkeuriger dan op pixel-niveau te doen, wat de compressie verbetert.\n"
-"De mode-beslissing is de methode die gebruikt wordt om te kiezen hoe elk blok van de frame geëncodeerd wordt: een heel belangrijke beslissing.\n"
-"SAD is de snelste methode, gevolgd door SATD, RD, RD verfijning, en de traagste, QPRD.\n"
-"6 of hoger is ten sterkste aangeraden: Psy-RD, een zeer sterke psy-optimalisatie die detail helpt behouden, vereist RD.\n"
-"11 schakelt alle vroege stopzetting in de analyse uit.\n"
-"10 en 11, de meest krachtige en traagste opties, vereisen adaptieve kwantisatie (aq-mode > 0) en trellis 2 (altijd)."
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr "Naar:"
 
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr "Doelmap voor de encodering."
 
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr "Doelmap"
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr "Annuleer"
 
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr "OK"
 
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr "Alles selecteren"
 
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr ""
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr "Markeer alle titels om aan de wachtrij toe te voegen"
 
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr "Alles opruimen"
 
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr ""
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr "Onmarkeer alle titels"
 
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr "Doelbestanden OK. Geen duplicaten gedetecteerd."
 
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr "Automatisch controleren op updates"
 
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr ""
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr "Wanneer alle encoderingen voltooid zijn."
 
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr "Gebruik automatische naamgeving (gebruikt gewijzigde bronnaam)"
 
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr "Maak doel-bestandsnaam uit bron-bestandsnaam of volume-label"
 
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr "Auto-naam-sjabloon"
 
-#: ../src/ghb.m4.h:538
+#: src/ghb3.ui:7310
 msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
+"Beschikbare opties: {source-path} {source} {title} {preset} {chapters} "
+"{date} {time} {creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr "Gebruik iPod/iTunes-vriendelijke (.m4v) bestandsextensie voor MP4"
 
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr ""
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr "Aantal previews"
 
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filter korte DVD- en Blu-ray-titels (seconden)"
 
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr "Voltooide wachtrij-items opruimen nadat een encodering is voltooid"
 
-#: ../src/ghb.m4.h:562
+#: src/ghb3.ui:7429
 msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
 msgstr ""
+"Standaard blijven voltooide taken in de wachtrij en gemarkeerd als voltooid.\n"
+"Vink dit aan als de wachtrij zichzelf moet opschonen door voltooide taken te verwijderen."
 
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr "Algemeen"
 
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr "Constante-kwaliteit fractionele granulariteit"
 
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr ""
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr "Gebruik dvdnav (in plaats van libdvdread)"
 
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr ""
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr "Monitor vrije ruimte van doelschijf"
 
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
-msgstr ""
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr "Pauzeer encodering als vrije schijfruimte onder limiet valt"
 
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
-msgstr ""
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr "MB limiet"
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
-msgid "Chapters"
-msgstr ""
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr "Plaats inidividuele encode-logs in dezelfde locatie als de film"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr ""
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr "Uitvoerigheidsniveau activiteitslog"
 
-#: ../src/ghb.m4.h:585
-msgid "Actors:"
-msgstr ""
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr "Levensduur activiteitslog"
 
-#: ../src/ghb.m4.h:586
-msgid "Director:"
-msgstr ""
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr "High Definition previews herschalen"
 
-#: ../src/ghb.m4.h:587
-msgid "Release Date:"
-msgstr ""
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr "Automatisch DVD scannen bij inladen"
 
-#: ../src/ghb.m4.h:588
-msgid "Comment:"
-msgstr ""
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr "Scant de DVD wanneer een nieuwe schijf wordt ingeladen"
 
-#: ../src/ghb.m4.h:589
-msgid "Genre:"
-msgstr ""
-
-#: ../src/ghb.m4.h:590
-msgid "Description:"
-msgstr ""
-
-#: ../src/ghb.m4.h:591
-msgid "Plot:"
-msgstr ""
-
-#: ../src/ghb.m4.h:592
-msgid "Tags"
-msgstr ""
-
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr ""
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr ""
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr ""
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr ""
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr ""
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr ""
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr ""
-
-#: ../src/ghb.m4.h:607
-msgid "Save As:"
-msgstr ""
-
-#: ../src/ghb.m4.h:608
-msgid "Destination filename for your encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:609
-msgid "To:"
-msgstr ""
-
-#: ../src/ghb.m4.h:610
-msgid "Destination directory for your encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
-msgid "Destination Directory"
-msgstr ""
-
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
-msgid "Cancel"
-msgstr ""
-
-#: ../src/ghb.m4.h:613
-msgid "OK"
-msgstr ""
-
-#: ../src/ghb.m4.h:614
-msgid "Select All"
-msgstr ""
-
-#: ../src/ghb.m4.h:615
-msgid "Mark all titles for adding to the queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:616
-msgid "Clear All"
-msgstr ""
-
-#: ../src/ghb.m4.h:617
-msgid "Unmark all titles"
-msgstr ""
-
-#: ../src/ghb.m4.h:618
-msgid "Destination files OK. No duplicates detected."
-msgstr ""
-
-#: ../src/ghb.m4.h:619
-msgid "Preferences"
-msgstr ""
-
-#: ../src/ghb.m4.h:620
-msgid "Automatically check for updates"
-msgstr ""
-
-#: ../src/ghb.m4.h:621
-msgid "When all encodes are complete"
-msgstr ""
-
-#: ../src/ghb.m4.h:622
-msgid "Use automatic naming (uses modified source name)"
-msgstr ""
-
-#: ../src/ghb.m4.h:623
-msgid "Auto-Name Template"
-msgstr ""
-
-#: ../src/ghb.m4.h:624
-msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
-msgstr ""
-
-#: ../src/ghb.m4.h:625
-msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
-msgstr ""
-
-#: ../src/ghb.m4.h:626
-msgid "Number of previews"
-msgstr ""
-
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr ""
-
-#: ../src/ghb.m4.h:628
-msgid "General"
-msgstr ""
-
-#: ../src/ghb.m4.h:629
-msgid "Constant Quality fractional granularity"
-msgstr ""
-
-#: ../src/ghb.m4.h:630
-msgid "Use dvdnav (instead of libdvdread)"
-msgstr ""
-
-#: ../src/ghb.m4.h:631
-msgid "Monitor destination disk free space"
-msgstr ""
-
-#: ../src/ghb.m4.h:632
-msgid "Pause encoding if free disk space drops below limit"
-msgstr ""
-
-#: ../src/ghb.m4.h:633
-msgid "MB Limit"
-msgstr ""
-
-#: ../src/ghb.m4.h:634
-msgid "Put individual encode logs in same location as movie"
-msgstr ""
-
-#: ../src/ghb.m4.h:635
-msgid "Activity Log Verbosity Level"
-msgstr ""
-
-#: ../src/ghb.m4.h:636
-msgid "Activity Log Longevity"
-msgstr ""
-
-#: ../src/ghb.m4.h:637
-msgid "Scale down High Definition previews"
-msgstr ""
-
-#: ../src/ghb.m4.h:638
-msgid "Automatically Scan DVD when loaded"
-msgstr ""
-
-#: ../src/ghb.m4.h:639
-msgid "Scans the DVD whenever a new disc is loaded"
-msgstr ""
-
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
-msgstr ""
-
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr ""
+msgstr "Lettergrootte activiteitsvenster"
 
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
-msgstr ""
+msgstr "Gebruik dezelfde instellingen voor alle titels in een groep"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
 "\n"
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
+"Indien aangevinkt, gebruikt elke titel dezelfde instellingen wanneer\n"
+"een groep titels aan de wachtrij wordt toegevoegd.\n"
+"\n"
+"Vink dit uit om toe te laten om de instellingen van elke titel\n"
+"onafhankelijk te wijzigen."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
-msgstr ""
+msgstr "Tweaks toelaten"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
-msgstr ""
+msgstr "HandBrake voor Dummies toelaten"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
-msgstr ""
-
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr ""
+msgstr "Geavanceerd"
 
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
-msgstr ""
+msgstr "Hernoem voorinstelling"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
-msgstr ""
+msgstr "Naam:"
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Beschrijving"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:8079
 msgid "Category:"
-msgstr ""
+msgstr "Categorie:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
+"Stel de categorie waaronder deze voorinstelling zal getoond worden in."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
-msgstr ""
+msgstr "Categorienaam:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
-msgstr ""
+msgstr "Naam voorinstelling:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
-msgstr ""
+msgstr "Standaard-voorinstelling"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
-msgstr ""
+msgstr "Maak dit de standaard-voorinstelling wanneer HandBrake opstart"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr ""
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Afmetingen"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
-msgstr ""
+msgstr "Maximumbreedte:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
-msgstr ""
+msgstr "Schakel limiet voor maximumbreedte in."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
 "Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
 "Setting this to 0 means there is no maximum width."
 msgstr ""
+"Dit is de maximumbreedte waarmee de video wordt opgeslaan.\n"
+"\n"
+"Wanneer een nieuwe bron wordt geladen, wordt deze waarde toegepast indien de\n"
+"bronbreedte groter is. Dit op 0 zetten betekent dat er geen maximumbreedte is."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
-msgstr ""
+msgstr "Maximumhoogte:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
-msgstr ""
+msgstr "Schakel limiet voor maximumhoogte in."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
 "Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
 "Setting this to 0 means there is no maximum height."
 msgstr ""
+"Dit is de maximumhoogte waarmee de video wordt opgeslaan.\n"
+"\n"
+"Wanneer een nieuwe bron wordt geladen, wordt deze waarde toegepast indien de\n"
+"bronhoogte groter is. Dit op 0 zetten betekent dat er geen maximumhoogte is."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Handbrake-preview"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
-msgstr ""
+msgstr "Selecteer previewframes"
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
+"Encodeer en speel een kort stuk video vanaf de huidige preview-positie"
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
-msgstr ""
+msgstr "Afspeelduur:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
-msgstr ""
+msgstr "Stel de afspeelduur van de live preview in seconden in."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
-msgstr ""
+msgstr "Toon knip"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
-msgstr ""
+msgstr "Toon de geknipte oppervlakte van de preview"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
-msgstr ""
+msgstr "Bronresolutie"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
-msgstr ""
+msgstr "Herstel het preview-scherm naar de resolutie van de bronvideo"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
-msgstr ""
+msgstr "_Annuleer"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
-msgstr ""
+msgstr "Titelnummer:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
-msgstr ""
+msgstr "Gedetecteerde DVD-apparaten:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
-msgstr ""
+msgstr "Importeer SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
-msgstr ""
+msgstr "Schakel instellingen in om een SRT-ondertitelbestand in te laden"
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importeer SSA"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Schakel instellingen in om een SSA-ondertitelbestand in te laden"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
-msgstr ""
+msgstr "Lijst van ingebouwde ondertitels"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
+msgstr "Schakel instellingen in om ingebouwde ondertitels te selecteren"
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Bron-track"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Lijst van beschikbare ondertiteltracks uit de bron."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Tracknaam:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
 msgstr ""
+"Stel de naam voor de ondertiteltrack in.\n"
+"\n"
+"Spelers kunnen deze gebruiken in de audioselectielijst."
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8934
 msgid "Language"
-msgstr ""
+msgstr "Taal"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
-msgstr ""
+msgstr "Karakter-codering"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
-msgstr ""
+msgstr "Bestand:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
-msgstr ""
+msgstr "Verschuiving (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
+"Stel de taal van deze ondertitel in.\n"
+"Deze waarde wordt door spelers gebruikt in ondertitelmenus."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2395,801 +2179,709 @@
 "We translate the character set to UTF-8.\n"
 "The source's character code is needed in order to perform this translation."
 msgstr ""
+"Stel de karakter-set in die gebruikt wordt door het te importeren SRT-bestand.\n"
+"\n"
+"Er bestaan SRT's met verschillende karakter-sets.\n"
+"De karakter-set wordt vertaald naar UTF-8.\n"
+"De karakter-set van de bron is vereist om deze vertaling te kunnen uitvoeren."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
-msgstr ""
+msgstr "Selecteer het te importeren SRT-bestand."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr ""
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importeer Bestand"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
+"Stel de verschuiving in milliseconden tussen de video en de SRT-tijdstippen "
+"in."
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
-msgstr ""
+msgstr "Enkel geforceerde ondertitels"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
-msgstr ""
+msgstr "Inbranden in video"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
+"Render de ondertitel over de video.\n"
+"De ondertitel wordt deel van de video en kan niet worden uitgeschakeld."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr ""
+msgstr "Stel standaard-track in"
 
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr ""
+msgstr "Lijst van beschikbare audiotracks uit de bron."
 
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
+"Stel de naam voor de audiotrack in.\n"
+"\n"
+"Spelers kunnen deze gebruiken in de audioselectielijst."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
-msgstr ""
+msgstr "Mix"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
-msgstr ""
+msgstr "Sample-snelheid"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
 "For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
+"Dynamisch-bereikcompressie : Wijzig het dynamisch bereik van de audio-uitvoertrack.\n"
+"\n"
+"Voor bronaudio met een breed dynamisch bereik (heel luide en heel stille sequenties),\n"
+"laat DBC toe om het bereik te 'comprimeren' door luide geluiden stiller en stille geluiden luider te maken."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
-msgstr ""
+msgstr "Stel de audio-codec om deze track te encoderen in."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
-msgstr ""
+msgstr "Bitsnelheid"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
-msgstr ""
+msgstr "Bitsnelheid-instelling inschakelen"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
-msgstr ""
+msgstr "Kwaliteit"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
-msgstr ""
+msgstr "Kwaliteit-instelling inschakelen"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
-msgstr ""
+msgstr "Stel de bitsnelheid in om deze track mee te encoderen."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
+"Kwaliteit: Voor codecs die het ondersteunen, pas de kwaliteit van de "
+"uitvoer aan."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
-msgstr ""
+msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
-msgstr ""
+msgstr "Stel de mixdown van de uitvoertrack in."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
-msgstr ""
+msgstr "Stel de sample-snelheid van de uitvoertrack in."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
+"Audioversterking: Pas de versterking of verzwakking van het uitvoer-"
+"audiokanaal aan."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
-msgstr ""
+msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
-msgstr ""
+msgstr "Uit"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
-msgstr ""
+msgstr "Deze versie overslaan"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
-msgstr ""
+msgstr "Herinner mij later"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
-msgstr ""
+msgstr "Een nieuwere versie van HandBrake is beschikbaar!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
-msgstr ""
+msgstr "HandBrake xxx is nu beschikbaar (huidge versie is yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr ""
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr ""
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr ""
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr ""
+msgstr "Release-opmerkingen"
 
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr ""
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr ""
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr ""
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr ""
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
-msgstr ""
+msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
-msgstr ""
+msgstr "Kwaliteit:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
-msgstr ""
+msgstr "Bitsnelheid: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
-msgstr ""
+msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
-msgstr ""
+msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
-msgstr ""
+msgstr "Bitsnelheid: %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
-msgstr ""
+msgstr "Passthrough"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s\n"
 "Track Name: %s"
 msgstr ""
+"%sVersterking: %s\n"
+"DRC: %s\n"
+"Tracknaam: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s"
 msgstr ""
+"%sVersterking: %s\n"
+"DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
+"Voeg een audio-encoder toe.\n"
+"Elke geselcteerde bron-track zal worden geëncodeerd met alle geselecteerde encoders."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
 msgstr ""
+"Audiokwaliteit:\n"
+"Voor encoders die het ondersteunen, pas de kwaliteit van de uitvoer aan."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
-msgstr ""
+msgstr "Verwijder deze audio-encoder"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
-msgstr ""
+msgstr "Handbrake sluiten zal het encoderen beëindigen.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
-msgstr ""
+msgstr "Niet geselecteerd"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
-msgstr ""
+msgstr "Scannen ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
-msgstr ""
+msgstr "Stop Scan"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
-msgstr ""
+msgstr "Geen titel gevonden"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
-msgstr ""
+msgstr "Nieuwe video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
 "\n"
 "%s in %d seconds ..."
 msgstr ""
+"%s\n"
+"\n"
+"%s in %d seconden ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
-msgstr ""
+msgstr "%sDe film zal verloren gaan als de encodering niet wordt hervat."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
-msgstr ""
+msgstr "Huidige annuleren en stoppen"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
-msgstr ""
+msgstr "Huidige annuleren, start volgende"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
-msgstr ""
+msgstr "Huidige afwerken, dan stoppen"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
-msgstr ""
+msgstr "Hervat encodering"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr ""
+msgid "%d encode pending"
+msgstr "%d encodering in wachtrij"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d encoderingen in wachtrij"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
-msgstr ""
+msgstr "taak %d van %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
-msgstr ""
+msgstr "passage %d (ondertitel-scan) van %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
-msgstr ""
+msgstr "passage %d van %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
-msgstr ""
+msgstr "Encoderen: %s%s%.2f %% (%.2f fps, gem. %.2f fps, ETA %02du%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
-msgstr ""
+msgstr "Encoderen: %s%s%.2f %% (ETA %02du%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
-msgstr ""
+msgstr "Encoderen: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
-msgstr ""
+msgstr "Zoeken naar starttijd,"
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
-msgstr ""
+msgstr "Titel %d van %d scannen..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
-msgstr ""
+msgstr "Titel %d van %d scannen, preview %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
-msgstr ""
+msgstr "Gepauzeerd"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
-msgstr ""
+msgstr "Encoderen klaar!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
-msgstr ""
+msgstr "Encoderen geannuleerd."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
-msgstr ""
+msgstr "Encoderen mislukt."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
-msgstr ""
+msgstr "Muxen: Dit kan even duren..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
-msgstr ""
-
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr ""
+msgstr "Scan deze DVD-bron"
 
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
-msgstr ""
+msgstr "HandBrake %s/%s is nu beschikbaar (je hebt %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
-msgstr ""
+msgstr "Encoderen voltooid"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
-msgstr ""
+msgstr "Zet die cocktail neer. Je HandBrake-wachtrij is klaar!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
-msgstr ""
+msgstr "Het encoderen is voltooid."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
-msgstr ""
+msgstr "De computer wordt afgesloten"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
-msgstr ""
+msgstr "De computer wordt in slaapstand gezet"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
-msgstr ""
+msgstr "Handbrake wordt afgesloten"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
-msgstr ""
+msgstr "Eerste track overeenkomstig geselecteerde talen"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
-msgstr ""
+msgstr "Alle tracks overeenkomstig geselecteerde talen"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
-msgstr ""
+msgstr "Vreemde taal audio ondertitel-track"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
-msgstr ""
+msgstr "Eerste geselecteerde track"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
-msgstr ""
+msgstr "Vreemde taal audio, dan eerste geselecteerde track"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
-msgstr ""
+msgstr "Hoofdstukken:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
-msgstr ""
+msgstr "Seconden:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
-msgstr ""
+msgstr "Frames:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
-msgstr ""
+msgstr "Niets wordt gedaan"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
-msgstr ""
+msgstr "Toon melding"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
-msgstr ""
+msgstr "Handbrake afsluiten"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
-msgstr ""
+msgstr "De computer in slaapstand zetten"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
-msgstr ""
+msgstr "De computer afsluiten"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
-msgstr ""
+msgstr "Automatisch"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
-msgstr ""
+msgstr "Los"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
-msgstr ""
+msgstr "Aangepast"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
-msgstr ""
+msgstr "Week"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
-msgstr ""
+msgstr "Maand"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
-msgstr ""
+msgstr "Jaar"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
-msgstr ""
+msgstr "Onsterfelijk"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
-msgstr ""
+msgstr "Nooit"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
-msgstr ""
+msgstr "Dagelijks"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
-msgstr ""
+msgstr "Wekelijks"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
-msgstr ""
+msgstr "Maandelijks"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
-msgstr ""
+msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
-msgstr ""
+msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
-msgstr ""
+msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
-msgstr ""
+msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
-msgstr ""
+msgstr "Unsharp"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
-msgstr ""
+msgstr "Lapsharp"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
-msgstr ""
+msgstr "90 Graden"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
-msgstr ""
+msgstr "180 Graden"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
-msgstr ""
+msgstr "270 Graden"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
-msgstr ""
+msgstr "Spatiaal"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
-msgstr ""
+msgstr "Temporaal"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
-msgstr ""
+msgstr "Snel"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
-msgstr ""
+msgstr "Optimaal"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
-msgstr ""
+msgstr "Strict"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
-msgstr ""
+msgstr "Normaal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
-msgstr ""
+msgstr "Eenvoudig"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
-msgstr ""
+msgstr "Slim"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
-msgstr ""
+msgstr "Ruit"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
-msgstr ""
+msgstr "Zeshoek"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
-msgstr ""
+msgstr "Onregelmatige multi-zeshoek"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
-msgstr ""
+msgstr "Uitgebreid"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
-msgstr ""
+msgstr "Hadamard uitgebreid"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
-msgstr ""
+msgstr "0: SAD, geen subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
-msgstr ""
+msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
-msgstr ""
+msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
-msgstr ""
+msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
-msgstr ""
+msgstr "4: SATD, qpel op alle"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
-msgstr ""
+msgstr "5: SATD, multi-qpel op alle"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
-msgstr ""
+msgstr "6: RD in I/P-frames"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
-msgstr ""
+msgstr "7: RD in all frames"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
-msgstr ""
+msgstr "8: RD verfijnd in I/P-frames"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
-msgstr ""
+msgstr "9: RD verfijnd in all frames"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
-msgstr ""
+msgstr "10: QPRD in alle frames"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
-msgstr ""
+msgstr "11: Geen vroege stopzetting in de analyse"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
-msgstr ""
+msgstr "Meeste"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
-msgstr ""
+msgstr "Sommige"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Alle"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
-msgstr ""
+msgstr "Enkel encoderen"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
-msgstr ""
+msgstr "Altijd"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
-msgstr ""
+msgstr "Zelfde als bron"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
-msgstr ""
+msgstr "(NTSC Film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
-msgstr ""
+msgstr "(PAL Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
-msgstr ""
+msgstr "(NTSC Video)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
-msgstr ""
+msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
-msgstr ""
+msgstr "%3d - %02du%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
-msgstr ""
+msgstr "%3d - %02du%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
-msgstr ""
+msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
-msgstr ""
+msgstr "%3d - %02du%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
-msgstr ""
+msgstr "Geen titels"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
-msgstr ""
-
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr ""
+msgstr "Geen audio"
 
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3197,16 +2889,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Ongeldige detelecine-instellingen:\n"
+"\n"
+"Voorinstelling:\t%s\n"
+"Aangepast:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
+"Ongeldige detelecine-instellingen:\n"
+"\n"
+"Voorinstelling:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3214,16 +2913,23 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Ongeldige Comb-detectie-instellingen:\n"
+"\n"
+"Voorinstelling:\t%s\n"
+"Aangepast:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
 "\n"
 "Preset:\t%s\n"
 msgstr ""
+"Ongeldige Comb-detectie-instellingen:\n"
+"\n"
+"Voorinstelling:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3232,8 +2938,13 @@
 "Preset:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Ongeldige deinterlace-instellingen:\n"
+"\n"
+"Filter:\t%s\n"
+"Voorinstelling:\t%s\n"
+"Aangepast:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3241,8 +2952,12 @@
 "Filter:\t%s\n"
 "Preset:\t%s\n"
 msgstr ""
+"Ongeldige deinterlace-instellingen:\n"
+"\n"
+"Filter:\t%s\n"
+"Voorinstelling:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3252,8 +2967,14 @@
 "Tune:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Ongeldige denoise-instellingen:\n"
+"\n"
+"Filter:\t%s\n"
+"Voorinstellingen:\t%s\n"
+"Regeling:\t%s\n"
+"Aangepast:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3263,54 +2984,96 @@
 "Tune:\t%s\n"
 "Custom:\t%s\n"
 msgstr ""
+"Ongeldige scherpte-instellingen:\n"
+"\n"
+"Filter:\t%s\n"
+"Voorinstelling:\t%s\n"
+"Regeling:\t%s\n"
+"Aangepast:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
 "You should choose a different video codec or container.\n"
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
+"Theora is niet ondersteund in de MP4-container.\n"
+"\n"
+"Kies een andere video-codec of container.\n"
+"Als u doorgaat zal FFMPEG gekozen worden."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-msgid "Continue"
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
 msgstr ""
+"Enkel VP8 of VP9 zijn ondersteund in de WebM-container.\n"
+"\n"
+"Kies een andere video-codec of container.\n"
+"Als u doorgaat zal er automatisch één gekozen worden."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr "Doorgaan"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
-msgstr ""
+msgstr "Geen titel gevonden.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
 "You should change your subtitle selections.\n"
 "If you continue, some subtitles will be lost."
 msgstr ""
+"Er kan slechts één ondertitel in de video gebrand worden.\n"
+"\n"
+"Pas de ondertitel-selecties aan.\n"
+"Als u doorgaat zullen sommige ondertitels verloren gaan."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"WebM in HandBrake ondersteunt enkel ingebrande ondertitels.\n"
+"\n"
+"Pas de ondertitel-selecties aan.\n"
+"Als u doorgaat zullen sommige ondertitels verloren gaan."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
 "You should choose a valid file.\n"
 "If you continue, this subtitle will be ignored."
 msgstr ""
+"SRT-bestand bestaat niet of is geen regulier bestand.\n"
+"\n"
+"Kies een geldig bestand.\n"
+"Als u doorgaat zal deze ondertitel genegeerd worden."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
 "You should choose a different audio codec.\n"
 "If you continue, one will be chosen for you."
 msgstr ""
+"De bron ondersteunt geen Pass-thru.\n"
+"\n"
+"Kies een andere audio-codec.\n"
+"Als u doorgaat zal er automatisch één gekozen worden."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3318,64 +3081,115 @@
 "You should choose a different audio codec.\n"
 "If you continue, one will be chosen for you."
 msgstr ""
+"%s is niet ondersteund in de %s-container.\n"
+"\n"
+"Kies een andere audio-codec.\n"
+"Als u doorgaat zal er automatisch één gekozen worden."
 
-#: ../src/presets.c:1192
-msgid "ghb_presets_menu_init: Failed to find presets folder."
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
 msgstr ""
+"<big>Kan %s niet aanmaken.</big>\n"
+"\n"
+"Interne fout. Kan UI-beschrijving niet lezen.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Trackinformatie"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Naam voorinstelling"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Het apparaat of bestand om te encoderen"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "De voorinstelling om te gebruiken voor encoderen"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Spam veel"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "Het pad om de gebruikersconfiguratiemap te overschrijven"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Open een console voor debug-uitvoer"
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr "ghb_presets_menu_init: Vinden van voorinstelling-map mislukt."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
+"Vinden van de bovenliggende map mislukt bij het toevoegen van een item."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
+"Gevonden voorinstellingen zijn nieuwer dan wat door deze versie van HandBrake ondersteund wordt!\n"
+"\n"
+"Wilt u doorgaan?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
-msgstr ""
+msgstr "Haal me hier weg."
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
-msgstr ""
+msgstr "Backup-voorinstellingen inladen"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
-msgstr ""
+msgstr "Alle (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
-msgstr ""
+msgstr "Voorinstellingen (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
-msgstr ""
+msgstr "Oude voorinstellingen (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
-msgstr ""
+msgstr "Voorinstelling exporteren"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
 "\n"
 "%s"
 msgstr ""
+"Bevestig verwijderen van %s:\n"
+"\n"
+"%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
-msgstr ""
+msgstr "map"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
-msgstr ""
+msgstr "voorinstelling"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3383,263 +3197,226 @@
 "\n"
 "%s"
 msgstr ""
+"GStreamer plug-in ontbreekt\n"
+"Audio or Video speelt mogelijks niet als verwacht\n"
+"\n"
+"%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr ""
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr ""
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
+msgid "%s (Modified)"
+msgstr "%s (Gewijzigd)"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr ""
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Aligneer A/V"
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr ""
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
+"%d:%d:%d:%d Bijsnijden\n"
+"%dx%d opslag, %dx%d beeld\n"
+"%d:%d Pixel-verhouding\n"
+"%s Beeldverhouding"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr ""
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr ""
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Bitsnelheid %dkbps"
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr ""
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Bitsnelheid %dkbps (2 Passages)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr ""
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Constante kwaliteit %.4g(%s)"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr ""
+msgid "%sPreset %s"
+msgstr "%sVoorinstelling %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr ""
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr ""
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr ""
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr ""
+msgid "%sTune %s"
+msgstr "%sRegelen %s"
 
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr ""
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr ""
+msgid "%sProfile %s"
+msgstr "%sProfiel %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ""
+msgid "%sLevel %s"
+msgstr "%sNiveau %s"
 
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr ""
-
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
 msgstr ""
+"\n"
+"Constante framesnelheid %s fps"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
 msgstr ""
+"\n"
+"Piek-framesnelheid %s fps (kan lager zijn)"
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
 msgstr ""
+"\n"
+"Variabele framesnelheid %s fps"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr ""
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", enkel geforceerd"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr ""
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", gebrand"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr ""
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", standaard"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr ""
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Voltooid"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr ""
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Geannuleerd"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ""
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Mislukt"
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ""
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "In wachtrij"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ""
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr ""
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr ""
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr ""
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr ""
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d Dag %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr ""
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Dagen %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr ""
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr ""
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "kB"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr ""
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr ""
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr ""
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Niet beschikbaar"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr ""
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Vreemde taal audio zoeken"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr ""
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Encoderen"
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr ""
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Encoderen eerste passage (analyse)"
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr ""
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Encoderen tweede passage (laatste)"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr ""
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Fout"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
+"passage %d van %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr ""
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Titel scannen"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr ""
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Encoderen gepauzeerd"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr ""
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Encoderen bezig"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr ""
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
+"%sHet doel-bestandssysteem is bijna vol: %<PRId64> MB beschikbaar.\n"
+"Doel: %s\n"
+"Encoderen kan onvolledig zijn als wordt verdergegaan.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
-msgstr ""
+msgstr "Hervatten, het probleem is opgelost"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
-msgstr ""
+msgstr "Hervatten, niet opnieuw herinneren"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3647,28 +3424,38 @@
 "Another queued job has specified the same destination.\n"
 "Do you want to overwrite?"
 msgstr ""
+"Doel: %s\n"
+"\n"
+"Een andere taak heeft hetzelfde doel ingesteld.\n"
+"Overschrijven?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
-msgstr ""
+msgstr "Overschrijven"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
 "\n"
 "This is not a valid directory."
 msgstr ""
+"Doel: %s\n"
+"\n"
+"Dit is geen geldige bestandsmap."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
 "\n"
 "Can not read or write the directory."
 msgstr ""
+"Doel: %s\n"
+"\n"
+"Kan niet lezen van of schrijven naar de map."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3676,70 +3463,78 @@
 "File already exists.\n"
 "Do you want to overwrite?"
 msgstr ""
+"Doel: %s\n"
+"\n"
+"Bestand bestaat al.\n"
+"Overschrijven?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
-msgstr ""
+msgstr "Selecteer deze titel om aan de wachtrij toe te voegen.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
-msgstr ""
+msgstr "Geen titel"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
+"Er is een andere titel met dezelfde doelbestandsnaam.\n"
+"Deze titel zal niet aan de wachtrij worden toegevoegd tenzij\n"
+"de doelbestandsnaam wordt aangepast.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
-msgstr ""
+msgstr "Stop"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
-msgstr ""
+msgstr "Stop encoderen"
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "S_top encoderen"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
-msgstr ""
+msgstr "Hervatten"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
-msgstr ""
-
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr ""
+msgstr "Hervat encoderen"
 
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
-msgstr ""
+msgstr "_Hervat encoderen"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
+"Encoderen is bezig. Wat wilt u doen?\n"
+"\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
-msgstr ""
+msgstr "Voorkeurstaal: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
-msgstr ""
+msgstr "Voeg %s ondertitel-track toe als de standaard-audio niet %s is"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
+"Voeg ondertitel-track toe als de standaard-audio niet de voorkeurstaal is"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3747,9 +3542,12 @@
 "Expanded Options:\n"
 "\"%s\""
 msgstr ""
+"%s\n"
+"\n"
+"Uitgebreide opties:\n"
+"\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3757,3 +3555,12 @@
 "Expanded Options:\n"
 "\"\""
 msgstr ""
+"%s\n"
+"\n"
+"Uitgebreide opties:\n"
+"\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Waarschuwing: verliesloos)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/pl.po -> HandBrake-1.5.1.tar.xz/gtk/po/pl.po Changed

@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Piotr Komur <pkomur@gmail.com>, 2019
+# Nomis101 <Nomis101@web.de>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
 "Last-Translator: Piotr Komur <pkomur@gmail.com>, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/HandBrakeProject/teams/92423/pl/)\n"
@@ -21,18 +21,18 @@
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr ""
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -43,11 +43,11 @@
 "in your output."
 msgstr ""
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr ""
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -57,11 +57,11 @@
 "a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr ""
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -71,11 +71,11 @@
 "This setting allows you to synchronize the files."
 msgstr ""
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr ""
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -90,396 +90,553 @@
 "conjunction with the \"Forced\" option."
 msgstr ""
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr ""
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Profile"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Ustaw _domyślny"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Zapisz _jako"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "Zmień _nazwę"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Usuń"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importuj"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Eksportuj"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "Resetuj _wbudowane profile "
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Lista profilów"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Rozpocznij konwertowanie "
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr ""
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Wstrzymaj konwertowanie"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pauza"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Tytuł"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Podsumowanie"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "O programie"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 msgstr ""
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr ""
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr ""
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Plik"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "_Otwórz źródło"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Otwórz pojedynczy _tytuł"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Ustaw _cel"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Preferencje"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Wyjście"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Kolejka"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Dodaj _wiele"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Rozpocznij konwertowanie"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Wstrzymaj konwertowanie"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "Zapisz _kolejkę"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "Wczytaj kolejkę z pliku"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "Widok"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr ""
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Lista profilów"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "Podgląd"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "Okno aktywności"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "Pomoc"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "O programie"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "Przewodnik"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Wybierz źródło wideo"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Otwórz źródło"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Dodaj do kolejki"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Dodaj do kolejki"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Rozpocznij konwertowanie "
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr ""
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Wstrzymaj konwertowanie"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pauza"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Pokaż listę profilów"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Profile"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Pokaż okno podglądu"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Podgląd"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Pokaż kolejkę"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Kolejka"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Pokaż okno aktywności"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Aktywności"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Źródło:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Brak"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr ""
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Brak tytułów"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Kąt:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Zakres:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr ""
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Profil:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Wybierz profil"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr ""
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr ""
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr ""
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr ""
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr ""
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr ""
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr ""
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr ""
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr ""
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr ""
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Ścieżki:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtry:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Wymiary:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr ""
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Podsumowanie"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Automatycznie"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Obetnij"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -488,83 +645,83 @@
 "the required multiple."
 msgstr ""
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Z lewej"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Od góry"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Od dołu"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Z prawej"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Wymiary po przycięciu:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Przycinanie"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr ""
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr ""
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr ""
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr ""
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -572,30 +729,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr ""
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -603,56 +760,56 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ""
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr ""
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Wymiary"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr ""
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr ""
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -660,7 +817,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -668,11 +825,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr ""
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -680,11 +837,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -692,93 +849,104 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr ""
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtry"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr ""
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr ""
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr ""
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -786,19 +954,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr ""
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr ""
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -806,18 +974,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -833,15 +1001,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr ""
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr ""
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -850,11 +1018,11 @@
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -863,46 +1031,31 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr ""
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr ""
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr ""
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -911,22 +1064,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr ""
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr ""
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -936,279 +1089,268 @@
 "this setting is of little value here."
 msgstr ""
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr ""
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr ""
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr ""
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Wideo"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr ""
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr ""
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr ""
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr ""
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr ""
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr ""
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr ""
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr ""
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr ""
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr ""
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr ""
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr ""
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr ""
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr ""
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr ""
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr ""
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr ""
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr ""
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr ""
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr ""
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr ""
 
-#: ../src/ghb.m4.h:384
-msgid "Audio"
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
 msgstr ""
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
+#: src/ghb3.ui:5808
+msgid "Audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr ""
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1217,663 +1359,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr ""
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Napisy"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr ""
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr ""
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr ""
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr ""
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr ""
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr ""
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
 msgstr ""
 
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
 msgstr ""
 
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
+#: src/ghb3.ui:6420
+msgid "Index"
 msgstr ""
 
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
+#: src/ghb3.ui:6444
+msgid "Duration"
 msgstr ""
 
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
+#: src/ghb3.ui:6455
+msgid "Title"
 msgstr ""
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Rozdziały"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Tytuł"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Aktorzy:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr ""
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr ""
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr ""
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr ""
 
-#: ../src/ghb.m4.h:591
-msgid "Plot:"
-msgstr ""
-
-#: ../src/ghb.m4.h:592
-msgid "Tags"
-msgstr "Informacje"
-
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr ""
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr ""
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr ""
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr ""
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr ""
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Wczytaj kolejkę z pliku"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
+#: src/ghb3.ui:6757
+msgid "Plot:"
 msgstr ""
 
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr "Informacje"
+
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr ""
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "W katalogu:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr ""
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr ""
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr ""
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr ""
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr ""
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr ""
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr ""
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
 msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr ""
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr ""
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr ""
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr ""
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr ""
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr ""
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1881,71 +1680,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr ""
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr ""
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr ""
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr ""
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr ""
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
 msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr ""
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1953,15 +1748,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr ""
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -1969,95 +1764,126 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr ""
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr ""
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr ""
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr ""
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr ""
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr ""
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr ""
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr ""
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr ""
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr ""
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr ""
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2066,72 +1892,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr ""
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
+#: src/ghb3.ui:9037
+msgid "Import File"
 msgstr ""
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr ""
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr ""
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr ""
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr ""
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr ""
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr ""
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2139,229 +1949,122 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr ""
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr ""
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr ""
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr ""
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr ""
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr ""
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr ""
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr ""
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr ""
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr ""
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr ""
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr ""
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr ""
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr ""
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr ""
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr ""
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr ""
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr ""
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr ""
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr ""
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr ""
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr ""
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr ""
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2369,58 +2072,58 @@
 "Track Name: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
 msgstr ""
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr ""
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr ""
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr ""
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr ""
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr ""
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr ""
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr ""
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2428,438 +2131,437 @@
 "%s in %d seconds ..."
 msgstr ""
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr ""
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr ""
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr ""
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
 #, c-format
-msgid "%d encode(s) pending"
+msgid "%d encodes pending"
 msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr ""
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr ""
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr ""
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr ""
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr ""
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr ""
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr ""
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr ""
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr ""
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr ""
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr ""
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr ""
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr ""
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Rozdziały:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr ""
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr ""
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr ""
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr ""
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr ""
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr ""
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr ""
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr ""
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr ""
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr ""
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr ""
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr ""
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr ""
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr ""
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr ""
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr ""
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr ""
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr ""
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr ""
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr ""
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr ""
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr ""
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr ""
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr ""
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr ""
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr ""
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr ""
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr ""
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr ""
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr ""
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr ""
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr ""
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr ""
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr ""
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr ""
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr ""
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr ""
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr ""
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr ""
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr ""
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2868,7 +2570,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2876,7 +2578,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2885,7 +2587,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2893,7 +2595,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2903,7 +2605,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2912,7 +2614,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2923,7 +2625,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2934,8 +2636,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -2943,18 +2644,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr ""
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -2962,8 +2670,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -2971,8 +2686,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -2980,7 +2694,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -2989,47 +2703,83 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr ""
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr ""
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr ""
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr ""
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr ""
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3037,15 +2787,15 @@
 "%s"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr ""
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3054,262 +2804,206 @@
 "%s"
 msgstr ""
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr ""
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr ""
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
 msgstr ""
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
 msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr ""
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
+msgid "%s, Bitrate %dkbps"
 msgstr ""
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
+msgid "%s, Bitrate %dkbps (2 Pass)"
 msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
+msgid "%s, Constant Quality %.4g(%s)"
 msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
+msgid "%sPreset %s"
 msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr ""
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr ""
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr ""
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
+msgid "%sTune %s"
 msgstr ""
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgid "%sProfile %s"
 msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
+msgid "%sLevel %s"
 msgstr ""
 
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtry:"
-
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
 msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
 msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
 msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
 msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
 msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
 msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
 msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
+#: src/queuehandler.c:718
+msgid "Pending"
 msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ""
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr ""
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr ""
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
+msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr ""
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
+msgid "%d Days %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
 msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
 msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
 msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
 msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
 msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
 msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
 msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
 msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
 msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
 msgstr ""
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
 msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
 msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
 msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
 msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr ""
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr ""
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3318,11 +3012,11 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr ""
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3330,7 +3024,7 @@
 "This is not a valid directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3338,7 +3032,7 @@
 "Can not read or write the directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3347,69 +3041,67 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr ""
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr ""
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr ""
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Zatrzymaj konwertowanie"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "Zatrzymaj konwertowanie"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Wznów"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Wznów konwertowanie"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "Zatrzymaj konwertowanie"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "Wznów konwertowanie"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3418,8 +3110,7 @@
 "\"%s\""
 msgstr ""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3427,3 +3118,8 @@
 "Expanded Options:\n"
 "\"\""
 msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/pt.po -> HandBrake-1.5.1.tar.xz/gtk/po/pt.po Changed

@@ -1,17 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Rui <xymarior@yandex.com>, 2019
+# Nomis101 <Nomis101@web.de>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
 "Last-Translator: Rui <xymarior@yandex.com>, 2019\n"
 "Language-Team: Portuguese (https://www.transifex.com/HandBrakeProject/teams/92423/pt/)\n"
@@ -21,7 +21,7 @@
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +31,11 @@
 "\n"
 "As legendas farão parte do vídeo e não poderão ser desativadas."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr ""
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +53,11 @@
 "\n"
 "Isto é útil para \"forçar\" uma faixa na sua saída."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -67,11 +67,11 @@
 "a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Apenas forçado"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -81,11 +81,11 @@
 "This setting allows you to synchronize the files."
 msgstr ""
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr ""
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -100,55 +100,233 @@
 "conjunction with the \"Forced\" option."
 msgstr ""
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Faixa"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Predefinições"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "De_finir como padrão"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Gravar"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Gravar _como"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Alterar nome"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Eliminar"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importar"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exportar"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "Repor _predefinições de origem"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Lista de predefinições"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Iniciar codificação"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Iniciar"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Pausar codificação"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Predefinição:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Sumário"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Sobre o HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -156,253 +334,236 @@
 "Direitos de autor © 2008 - John Stebbins\n"
 "Direitos de autor © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "O HandBrake é licenciado sob a GPL, multiplataforma, transcodificador de "
 "vídeo multitarefa"
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Abrir _fonte"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr ""
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Definir _destino"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Fila"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Adicionar _vários"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Iniciar codificação"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Pausar codificação"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "G_ravar fila"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Carregar ficheiro de fila"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Visualização"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr ""
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "_Lista de predefinições"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Pré-visualização"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "Janela de _atividades"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Sobre"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guia"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Selecionar fonte de vídeo"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Abrir fonte"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Adicionar à fila"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Adicionar à fila"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Iniciar codificação"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Iniciar"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Pausar codificação"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pausar"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Mostrar janela de predefinições"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Predefinições"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Mostrar janela de pré-visualização"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Pré-visualização"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Mostrar fila"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Fila"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Mostrar janela de atividades"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Atividades"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Fonte:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "A analisar..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr ""
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Ângulo:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "Para DVD's com vários ângulos, selecione o ângulo que quer codificar."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr ""
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Definir o primeiro capítulo a ser codificado."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Definir o último capítulo a ser codificado."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Predefinição:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Escolher predefinição"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Alterado"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -410,92 +571,88 @@
 "Recarregar as configurações para a predefinição selecionada.\n"
 "As alterações serão descartadas."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Gravar nova predefinição"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Gravar as configurações atuais numa nova predefinição."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Otimizado para Internet"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr ""
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Suporte para o iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr ""
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Duração:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Faixas:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtros:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Sumário"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Recortar automaticamente"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Recortar automaticamente as bordas pretas à volta do vídeo."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -504,83 +661,83 @@
 "the required multiple."
 msgstr ""
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr ""
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr ""
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr ""
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Largura:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr ""
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -588,30 +745,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr ""
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -619,56 +776,56 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensões"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr ""
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr ""
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -676,7 +833,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -684,11 +841,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr ""
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -696,11 +853,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -708,93 +865,104 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr ""
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Codificador de vídeo:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Codificadores de vídeo disponíveis."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr ""
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -802,19 +970,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr ""
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr ""
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -822,18 +990,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -849,15 +1017,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Qualidade constante:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr ""
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -866,11 +1034,11 @@
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -879,46 +1047,31 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr ""
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr ""
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Predefinição:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -927,22 +1080,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Descodificação rápida"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr ""
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -952,279 +1105,268 @@
 "this setting is of little value here."
 msgstr ""
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Perfil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Nível:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Mais configurações:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Lista de faixas"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Mostrar a lista de faixas áudio de saída"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Seleção de faixas"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Mostrar mais opções de seleção de faixas da fonte"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Adicionar novas configurações de áudio à lista"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Adicionar tudo"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Adicionar todas as faixas áudio à lista"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Lista de faixas"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr ""
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Remover"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Idiomas disponíveis"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Idiomas selecionados"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr ""
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr ""
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr ""
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Codificador"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Ganho"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr ""
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Seleção de faixas"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr ""
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1233,663 +1375,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr ""
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr ""
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr ""
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr ""
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr ""
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr ""
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr ""
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
 msgstr ""
 
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
 msgstr ""
 
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
+#: src/ghb3.ui:6420
+msgid "Index"
 msgstr ""
 
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
+#: src/ghb3.ui:6444
+msgid "Duration"
 msgstr ""
 
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
+#: src/ghb3.ui:6455
+msgid "Title"
 msgstr ""
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr ""
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr ""
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr ""
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr ""
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr ""
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:589
-msgid "Genre:"
-msgstr ""
-
-#: ../src/ghb.m4.h:590
-msgid "Description:"
-msgstr ""
-
-#: ../src/ghb.m4.h:591
-msgid "Plot:"
-msgstr ""
-
-#: ../src/ghb.m4.h:592
-msgid "Tags"
-msgstr ""
-
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr ""
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr ""
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr ""
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr ""
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr ""
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
+#: src/ghb3.ui:6687
+msgid "Genre:"
 msgstr ""
 
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
+#: src/ghb3.ui:6722
+msgid "Description:"
 msgstr ""
 
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
+#: src/ghb3.ui:6757
+msgid "Plot:"
 msgstr ""
 
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
+#: src/ghb3.ui:6795
+msgid "Tags"
 msgstr ""
 
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr ""
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr ""
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr ""
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr ""
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr ""
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr ""
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr ""
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr ""
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr ""
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
 msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr ""
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr ""
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr ""
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr ""
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr ""
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr ""
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1897,71 +1696,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr ""
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr ""
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr ""
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr ""
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr ""
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
 msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr ""
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1969,15 +1764,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr ""
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr ""
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -1985,95 +1780,126 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr ""
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr ""
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr ""
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr ""
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr ""
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr ""
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr ""
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Linguagem"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr ""
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr ""
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr ""
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2082,72 +1908,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr ""
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
+#: src/ghb3.ui:9037
+msgid "Import File"
 msgstr ""
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr ""
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr ""
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr ""
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr ""
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr ""
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr ""
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2155,229 +1965,122 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Selecione o codec de áudio para codificar essa faixa."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr ""
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Selecione o bitrate para codificar essa faixa."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr ""
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr ""
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr ""
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr ""
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr ""
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr ""
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr ""
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr ""
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr ""
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr ""
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr ""
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr ""
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr ""
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr ""
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr ""
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr ""
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Qualidade:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr ""
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr ""
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr ""
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr ""
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr ""
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2385,14 +2088,14 @@
 "Track Name: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2400,45 +2103,45 @@
 "Adicionar um encoder de áudio.\n"
 "Cada faixa selecionada será codificada com todos os encoders selecionados."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
 msgstr ""
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr ""
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr ""
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Não Selecionado"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Escaneando ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr ""
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr ""
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr ""
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2449,438 +2152,437 @@
 "\n"
 "%s em %d segundos ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sSeu vídeo será perdido se não continuar a codificação."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Cancelar Atual e Parar"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Cancelar Atual, Começar o Próximo"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Terminar o Atual, em seguida Parar."
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Continuar Codificação"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
+msgid "%d encode pending"
 msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "trabalho %d de %d,"
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr ""
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr ""
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Codificação Terminada!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Codificação Cancelada."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Falha na Codificação."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Escanear essa fonte de DVD."
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Aviso: sem perda)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s está disponível (você tem %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Codificação Completa"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Sua codificação está completa."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Desligando o computador"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Colocando o computador em suspensão"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Saindo Handbrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr ""
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr ""
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr ""
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr ""
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr ""
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr ""
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr ""
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Customizado"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr ""
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr ""
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr ""
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr ""
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr ""
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr ""
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr ""
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr ""
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr ""
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr ""
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr ""
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr ""
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr ""
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr ""
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr ""
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr ""
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr ""
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Estrito"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr ""
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr ""
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr ""
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr ""
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr ""
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr ""
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr ""
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr ""
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr ""
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr ""
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr ""
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr ""
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr ""
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr ""
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr ""
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr ""
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2889,7 +2591,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2897,7 +2599,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2906,7 +2608,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2914,7 +2616,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2924,7 +2626,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2933,7 +2635,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2944,7 +2646,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2955,8 +2657,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -2964,18 +2665,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr ""
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -2983,8 +2691,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -2992,8 +2707,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3001,7 +2715,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3010,47 +2724,83 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr ""
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr ""
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr ""
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr ""
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr ""
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3058,15 +2808,15 @@
 "%s"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr ""
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3075,262 +2825,206 @@
 "%s"
 msgstr ""
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr ""
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr ""
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
 msgstr ""
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
 msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
+msgid "%s, Bitrate %dkbps"
 msgstr ""
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr ""
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
+msgid "%s, Bitrate %dkbps (2 Pass)"
 msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
+msgid "%s, Constant Quality %.4g(%s)"
 msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
+msgid "%sPreset %s"
 msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr ""
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr ""
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr ""
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
+msgid "%sTune %s"
 msgstr ""
 
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr ""
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgid "%sProfile %s"
 msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
+msgid "%sLevel %s"
 msgstr ""
 
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr ""
-
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
 msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
 msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
 msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
 msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
 msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
 msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
 msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
+#: src/queuehandler.c:718
+msgid "Pending"
 msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ""
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr ""
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr ""
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
+msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr ""
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
+msgid "%d Days %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
 msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
 msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
 msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
 msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
 msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
 msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
 msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
 msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
 msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
 msgstr ""
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
 msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
 msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
 msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
 msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr ""
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr ""
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3339,11 +3033,11 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr ""
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3351,7 +3045,7 @@
 "This is not a valid directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3359,7 +3053,7 @@
 "Can not read or write the directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3368,69 +3062,67 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr ""
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr ""
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr ""
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2356
-msgid "Resume"
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
-msgid "Resume Encoding"
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
 msgstr ""
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr ""
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3439,8 +3131,7 @@
 "\"%s\""
 msgstr ""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3448,3 +3139,8 @@
 "Expanded Options:\n"
 "\"\""
 msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Aviso: sem perda)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/pt_BR.po -> HandBrake-1.5.1.tar.xz/gtk/po/pt_BR.po Changed

@@ -1,19 +1,21 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Gabriel Luiz Bastos de Oliveira <gabriel.bastos.oliveira@gmail.com>, 2014
+# Nomis101 <Nomis101@web.de>, 2019
+# 1111b07adbf58311a84d4d600482725e_5743f4c <4da7f1e717ffc01dbdfab0c343762106_894646>, 2020
+# Wellington Uemura <wellingtonuemura@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Gabriel Luiz Bastos de Oliveira <gabriel.bastos.oliveira@gmail.com>, 2014\n"
+"Last-Translator: Wellington Uemura <wellingtonuemura@gmail.com>, 2021\n"
 "Language-Team: Portuguese (Brazil) (https://www.transifex.com/HandBrakeProject/teams/92423/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +23,7 @@
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +33,11 @@
 "\n"
 "As legendas farão parte do vídeo e não poderão ser desabilitadas."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
-msgstr "Queimado em"
+msgstr "Gravado em"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +55,11 @@
 "\n"
 "Isto é útil para \"forçar\" uma faixa na sua saída."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +75,11 @@
 "subtítulos durante cenas onde alguém está falando \n"
 "uma língua estrangeira."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Somente a Forçada"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +95,11 @@
 "não coincide com o início do vídeo.\n"
 "Esta definição permite sincronizar os arquivos."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "Deslocamento de SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -123,55 +125,235 @@
 "Esta opção é melhor usada em \n"
 "conjunção com a opção \"Forçada\"."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Faixa"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Abra o diretório de origem"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Abra o diretório de destino"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Abra o diretório do registro de codificação"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Abra o registro de codificação"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Zere as tarefas que falharam"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Zere todas as tarefas"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Limpe todos os trabalhos concluídos"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Limpe todos os trabalhos"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Fila de importação"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Fila de exportação"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Pré definições do HandBreak"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Predefinições"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
-msgstr "De_finir como Padrão"
+msgstr "De_fina como Padrão"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
-msgstr "_Salvar"
+msgstr "_Salve"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
-msgstr "S_alvar como"
+msgstr "S_alve como"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
-msgstr "_Renomear"
+msgstr "_Renomeie"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
-msgstr "_Remover"
+msgstr "_Remova"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
-msgstr "_Importar"
+msgstr "_Importe"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
-msgstr "_Exportar"
+msgstr "_Exporte"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
-msgstr "Reiniciar_Ajustes Predefinidos"
+msgstr "Zere os _Ajustes Predefinidos"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
-msgstr "Lista de Predefinidos"
+msgstr "Lista das pré definições"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "Fila do HandBrake"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Fila"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 tarefas pendentes"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Inicie a codificação"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Iniciar"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Pausar Codificação"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Opções"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Quando for concluído:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Redefinir"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Marca a entrada da fila selecionada como pendente.\n"
+"Redefine o trabalho da fila para pendente e pronto para ser executado novamente."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Editar"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Ações"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Predefinido:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Origem:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Títulos:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Destino:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensões:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Vídeo:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Áudio:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Legendas:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Sumário"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Passagem:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Hora do Início:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Hora da conclusão:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Duração da pausa:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Tempo da codificação:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Tamanho do arquivo:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Condição geral:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Estatísticas"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Registro de atividade"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Registro de atividade do HandBrake"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Sobre o HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -179,203 +361,186 @@
 "Direitos Autorais © 2008 - John Stebbins\n"
 "Direitos Autorais © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "O HandBrake é um conversor vídeo multiplataforma, multi-segmentado e "
 "delicença GPL."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake é software gratuito; você pode redistribui-lo e/ou modificá-lo nas condições da Licença de Grande Público de GNU como publicado pela Fundação de Software Gratuita; a versão 2 da Licença, ou (na sua opção) qualquer versão posterior.\n"
+"O HandBrake é um software livre; você pode redistribuí-lo e/ou modificá-lo sob os termos da Licença Pública Geral GNU como publicada pela Free Software Foundation; na versão 2 da Licença, ou (a seu critério) qualquer versão posterior.\n"
 "\n"
-"É distribuído na esperança de que será útil, mas SEM QUALQUER GARANTIA; sem até a garantia subentendida de VALOR COMERCIAL ou APTIDÃO DE UM DETERMINADO OBJETIVO. Ver a Licença de Grande Público de GNU para mais detalhes.\n"
+"O HandBrake é distribuído na esperança de que possa ser útil, mas SEM NENHUMA GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou APLICAÇÃO EM PARTICULAR. Consulte a Licença Pública Geral GNU para mais detalhes.\n"
 "\n"
-"Você deve ter recebido uma cópia da Licença de Grande Público de GNU junto com os documentos; se não, escreva ao Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com Glade; se não, escreva para a Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Arquivo"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Abrir _Fonte"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Abrir Título_Simples"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Definir _Destino"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "F_ila"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Adic._Vários"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Iniciar Codificação"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Pausar Codificação"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "S_alvar Fila"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "Carregar Fi_la de Arquivos"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "Ex_ibir"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake para _Noobs"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "_Lista de Predefinições"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Prévia"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "Log de _Atividades"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "Suport_e"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "S_obre"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guia"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Selecionar Fonte de Vídeo"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Abrir Fonte"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Adicionar à Fila"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Adicionar Á Fila"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Iniciar Codificação"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Iniciar"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Pausar Codificação"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Pausar"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Exibir Predefinidos"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Predefinidos"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Exibir Prévia"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Prévia"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Exibir Fila"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Fila"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Exibir Log de Atividades"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Atividade"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Fonte:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Nenhuma"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Procurando..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -385,58 +550,58 @@
 "Por padrão, o mais longo é o selecionado.\n"
 "Muitas vezes, é o título de recursos de um DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Sem Títulos"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Ângulo:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 "Para DVD's com vários ângulos, selecione o desejado para ser convertido."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Intervalo:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Intervalo de título para codificação. Pode ser capítulos, segundos ou "
 "quadros."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Definir o primeiro capítulo para ser convertido."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Definir o último capítulo para ser convertido."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Predefinido:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Escolher Predefinição"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Recarregar"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -444,27 +609,27 @@
 "Recarregar as configurações para a predefinição selecionada.\n"
 "Quaisquer modificações serão descartadas."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Salvar nova Predefinição"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Salvar as configurações feitas para uma nova predefinição."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Formato a ser usado para a codificação."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Otimizado para Web"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -474,11 +639,11 @@
 "Isto permite que um reprodutor inicie a reprodução\n"
 "antes de terminar o download do arquivo completo."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Alinhar ao Início do A/V"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -489,55 +654,51 @@
 "melhorar a sincronia de áudio/vídeo para reprodutores\n"
 "de vídeo simples com má interpretação de MP4."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Suporte ao iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Adicionar o iPod Atom, necessário para iPods mais antigos."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Duração:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Faixas:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtros:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Tamanho:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Sumário"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Auto-Corte"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Retira as bordas pretas ao redor do vídeo automaticamente."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Corte solto"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -551,35 +712,35 @@
 "alguns pixels extras, ao invés de realizar um corte\n"
 "exato e redimensionar para a quantia necessária."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Corte à Esquerda"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Corte Acima"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Corte Abaixo"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Corte à Direita"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Dimensões do Corte:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Cortar"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Otimizada para fonte"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -587,11 +748,11 @@
 "Se habilitada, seleciona a capacidade de resolução 'otimizada'.\n"
 "Esta será a resolução que mais se assemelha a resolução da fonte após os cortes."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Largura:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -599,11 +760,11 @@
 "Esta é a largura em que o vídeo será fornecido.\n"
 "As dimensões de exposição reais vão se diferenciar se a proporção de aspecto de pixel não for 1:1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Altura:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -611,39 +772,40 @@
 "Esta é a altura em que o vídeo será fornecido.\n"
 "As dimensões de exposição reais vão se diferenciar se a proporção de aspecto de pixel não for 1:1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamórfico:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Modos Anamórficos:\n"
+"Modos anamórficos:\n"
 "<tt>\n"
-"Nenhuma - Força a proporção de aspecto de pixel 1:1. \n"
-"Livre - Usa uma proporção de pixel que é como \n"
-" o mais próximo possível da fonte de vídeo em \n"
-" relação ao aspecto, preservando o original\n"
-" da proporção de exibição \n"
-"Automática - Usa uma proporção de pixel que maximiza \n"
-" resolução de armazenamento, preservando o original \n"
-" apresenta aspecto proporcional </tt>"
+"Nenhum - Impõem a proporção do pixel para 1:1.\n"
+"Solto - Use a proporção do aspecto do pixel que seja\n"
+" o mais próximo possível da origem do vídeo e\n"
+" preservando a proporção do aspecto do pixel do\n"
+" vídeo original\n"
+"Automático - Use uma proporção do aspecto do pixel que\n"
+" maximize a resolução de armazenamento ao mesmo\n"
+" tempo que mantém a proporção do aspecto original\n"
+" da tela</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Alinhamento:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -655,20 +817,20 @@
 "Essa configuração é necessária apenas para compatibilidade com alguns dispositivos.\n"
 "Você deve usar 2, a menos se você enfrentar problemas de compatibilidade."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Armazenamento Geométrico"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Guardar Aspecto"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr "Se permitido, o aspecto da mostragem original da fonte será mantido."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -676,11 +838,11 @@
 "Essa é a largura da Tela. Ela é o resultado de escalas das dimensões de "
 "armazenamento pelo aspecto de pixel."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Aspecto de Pixel:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -692,11 +854,11 @@
 "Uma proporção de 1:1 define um pixel quadrado. Outros valores definem formas retangulares.\n"
 "os reprodutores escolherão a imagem para realizar o aspecto especificado."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -706,27 +868,27 @@
 "Uma proporção 1:1 define um pixel quadrado. Outros valores definem formas retangulares.\n"
 "os reprodutores escolherão a imagem para realizar o aspecto especificado."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Aspecto da Tela:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Mostrar Geometria"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Dimensões"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "De Tela de Cinema:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -736,7 +898,7 @@
 "\n"
 "O Telecining é um processo que ajusta os quadros do filme que são 24fps para taxas de vídeo NTSC que são 30fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -746,11 +908,11 @@
 "\n"
 "SobraEsquerda:SobraDireita:SobraTopo:SobraBaseQuebraDeEscrita:MétricaPlana:Paridade"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Detector de Entrelaçamento:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -761,7 +923,7 @@
 "\n"
 "Se um filtro de desentrelaçamento é ativado, somente os quadros entrelaçados que esse filtro encontrar serão desentrelaçados."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -773,11 +935,11 @@
 "Modo:Espacial Métrico:Movimento Descascar :Espacial Descascar:Modo de Filtro de Máscara:\n"
 "Bloco de Descascar: Bloco Largura: Altura do Bloco"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Desentrelace:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -789,11 +951,11 @@
 "O filtro decomb suporta uma variedade algorítimos de interpolações.\n"
 "O filtro de desentrelace é o clássico filtro YADIF.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Predefinições e Desentrelace:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -805,11 +967,11 @@
 "O filtro decomb suporta uma variedade de algorítimos de interpolações.\n"
 "O filtro de desentrelace é o clássico YADIF.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Desbloquear:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Filtro de remoção de blocos:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -817,11 +979,25 @@
 "O filtro desbloqueio remove um tipo comum de artefato de compressão.\n"
 "Se a sua fonte de exposições exibir 'bloqueio', este filtro pode ajudar a limpá-lo"
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Ajuste do removedor de blocos:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Formato do comando do filtro de remoção de blocos\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Filtro Redução de Ruídos:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -831,15 +1007,15 @@
 "Granulação de filme e outros tipos de ruídos de alta frequência são difíceis de comprimir. \n"
 "Usando este filtro em tais fontes podem resultar em tamanhos de arquivo menores."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Predefinições de Redução de Ruídos:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Sintonia de Redução de Ruídos:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -849,11 +1025,11 @@
 "\n"
 "EspacialLuminância:EspacialCroma:TemporalLuminância:TemporalCroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Filtro de Nitidez:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -861,47 +1037,47 @@
 "A filtragem de nitidez aprimora as bordas e outros\n"
 "componentes de alta frequência no vídeo."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Predefinições de Nitidez:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Sintonia de Nitidez:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Filtro de Rotação:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Gira o vídeo no sentido horário em incrementos de 90 graus."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Escala de Cinza"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Se ativado, filtra os componentes de cor fora do vídeo."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtros"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Codificador de Vídeo:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Codificadores de vídeo disponíveis."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Taxa de Quadros:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -913,19 +1089,19 @@
 "'Igual à fonte' é recomendado. Se o seu vídeo de origem tiver\n"
 "uma taxa de quadros variável, 'Igual à origem' irá preservá-lo."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Taxa de Quadros Constante"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Habilita uma taxa de quadros de saída constante."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Taxa de Quadros por Pico (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -937,11 +1113,11 @@
 "\n"
 "VFR não é compatível com alguns reprodutores de mídia."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Taxa de Quadros Variáveis"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -951,7 +1127,7 @@
 "\n"
 "VFR não é compatível com alguns reprodutores de mídia."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -974,15 +1150,15 @@
 "A diminuição deste valor resultará em aumentos progressivamente maiores\n"
 "no tamanho do arquivo resultante. Um valor de 0 significa sem perdas e resultará em um tamanho de arquivo maior que a fonte original, a menos que a fonte também seja sem perdas. A escala de FFMpeg e Theora é mais linear. Esses codificadores não tem um modo sem perdas."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Qualidade Constante:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Taxa de Bits(kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -996,11 +1172,11 @@
 "Mas a média durante um longo período será o valor definido aqui. Se precisar\n"
 "limitar a taxa de bits instantânea, veja as configurações vbv-bufsize e vbv-maxrate do x264."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Codificar em 2-Passos"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1014,11 +1190,11 @@
 "o vídeo são coletados. Em seguida, na segunda fase, as estatísticas são utilizadas\n"
 "para tomar as decisões de alocação da taxa de bits."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "1º-Passo Turbo"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1026,44 +1202,27 @@
 "Durante a 1º passo de uma codificação de 2 passagens, use esta configuração "
 "para acelerar as coisas."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Usar Opções Avançadas"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Usa opções avançadas de ajustes na aba do x264.\n"
-"\n"
-"Use por sua conta e risco!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Predefinido:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"Ajusta as configurações do conversor para compensar a eficiência da compactação com a velocidade de codificação.\n"
+"Ajusta as configurações dos codificadores em troca da eficiência de compressão e da velocidade de codificação.\n"
 "\n"
-"Isso estabelece às configurações padrão do conversor.\n"
-"Ajustes, perfis, níveis e cadeias de opções avançadas serão aplicados a isso.\n"
-"No geral, você deve definir essa opção como mais lenta você puder suportar, pois configurações mais lentas resultarão em arquivos de melhor qualidade ou menores."
+"Isto estabelece um padrão das suas configurações do codificador.\n"
+"A isto serão aplicados ajustes, perfis, níveis e uma sequência de opções extras.\n"
+"Em geral, esta opção deve ser definida para o mais lento que você puder suportar, uma vez que, a velocidade de compressão mais lenta\n"
+"resulta em arquivos de melhor qualidade ou com um tamanho menor."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Sintonia:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1077,11 +1236,11 @@
 "características do arquivo de saída. As alterações serão aplicadas após a pré-configuração,\n"
 "mas antes de todos os outros parâmetros."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Codificação Rápida"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1091,11 +1250,11 @@
 "\n"
 "Defina isto se o seu dispositivo está lutando para reproduzir a saída (quadros perdidos)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Latência Zero"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1111,11 +1270,11 @@
 "Como o HandBrake não é adequado para transmissão ao vivo, esta\n"
 "configuração é de pouco valor aqui."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Perfil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1125,11 +1284,11 @@
 "\n"
 "Substitui todas as outras configurações."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Nível:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1139,11 +1298,11 @@
 "\n"
 "Substitui todas as outras configurações."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Mais Configurações:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1153,56 +1312,45 @@
 "\n"
 "Lista separada por colo de opções de codificadores."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Lista de Faixas"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Mostrar Saída de Áudio da Lista de Faixas"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Selecionar Faixas"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Mostrar Opções da Origem de Seleção da Faixa"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Adicionar"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Adicionar novas configurações de áudio para a lista"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Adicionar Todas"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Adicionar Todas as Faixas de Áudio da Lista"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Recarregar todas os ajustes de áudio para padrão"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Lista de Faixas"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Selecionar Comportamento:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Escolha as faixas de áudio da fonte de mídia que serão utilizadas."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1210,135 +1358,135 @@
 "Cria uma lista de idiomas de áudio que você gostaria de escolher.\n"
 "Faixas correspondentes a estes idiomas serão selecionados usando o escolhido Comportamento da Seleção."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Remover"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Idiomas Disponíveis"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Idiomas Selecionados"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Use apenas o primeiro codificador de áudio secundário"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
-"Somente a trilha de áudio primária será codificada com a lista completa do codificador.\n"
-" Todas as outras trilhas de saída de áudio secundárias serão codificadas somente com o primeiro codificador."
+"Somente a faixa de áudio principal será codificada com a lista completa de codificação.\n"
+"Todas as outras faixas secundárias de áudio geradas, serão codificadas apenas com o primeiro codificador."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Auto Passagem Direta:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de MP3 tem suporte.\n"
-" Isso permite a passagem direta do áudio MP3 selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com MP3.\n"
+"Isso permite que o MP3 passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de AAC tem suporte.\n"
-" Isso permite a passagem direta do áudio AAC selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com AAC.\n"
+"Isso permite que o AAC passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de AC-3 tem suporte.\n"
-" Isso permite a passagem direta do áudio AC-3 selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com AC-3.\n"
+"Isso permite que o AC-3 passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de DTS tem suporte.\n"
-" Isso permite a passagem direta do áudio DTS selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com DTS.\n"
+"Isso permite que o DTS passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de DTS-HD tem suporte.\n"
-" Isso permite a passagem direta do áudio DTS-HD selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com DTS-HD.\n"
+"Isso permite que o DTS-HD passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de EAC-3 tem suporte.\n"
-" Isso permite a passagem direta do áudio EAC-3 selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com EAC-3.\n"
+"Isso permite que o EAC-3 passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de TrueHD tem suporte.\n"
-" Isso permite a passagem direta do áudio TrueHD selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com TrueHD.\n"
+"Isso permite que o TrueHD passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Habilite esta opção se o seu dispositivo de reprodução de FLAC tem suporte.\n"
-" Isso permite a passagem direta do áudio FLAC selecionado quando a seleção da passagem automática está ativada."
+"Ative isto se o dispositivo de reprodução for compatível com FLAC.\n"
+"Isso permite que o FLAC passe direto para ser selecionado quando a seleção de passagem direta automática for ativada."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Saída de Passagem Direta:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1346,80 +1494,80 @@
 "Decida se quer que o codec de áudio codifique quando uma pista conveniente "
 "não pode ser encontrada para passagem direta de áudio."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr " Configurações do Codificador de Áudio:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Cada faixa da fonte selecionada será codificada com todos os "
 "codificadoresselecionados"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Codificador"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Taxa de Bits/Qualidade"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Mistura Baixa"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Taxa de Amostragem"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Ganho"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Selecionar Faixas"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Mostrar a Faixa de Saída da Lista de Legendas"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Adicionar novas configurações de legenda à lista"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Adicionar todas as faixas de legendas à lista"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Examinar Áudio Estrangeiro"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Acrescenta um passo extra para o codificador procurar\n"
-" candidatos a subtítulo que fornecem subtítulos dos\n"
-" segmentos dos Áudios que estão em uma língua estrangeira."
+"Acrescente um passo extra ao codificador que busca\n"
+"os candidatos para as legendas que forneçam legendas para\n"
+"os segmentos de áudio que estão numa língua estrangeira."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Recarregar todas as legendas para padrão "
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Escolhe quais faixas de legendas de origem de mídia serão utilizadas."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1433,45 +1581,45 @@
 "O primeiro idioma desta lista é o 'preferido' da língua e será usado \n"
 "para determinar as configurações da seleção de legendas quando há áudio externo."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Idioma Preferido: Nenhum"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Adicionar Áudio Externo verificar Passo"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Adiciona 'Escanear Áudios Estrangeiros' quando o padrão de faixa de áudio é o seu idioma preferido.\n"
-" Este passo encontra sequências curtas de áudios estrangeiros e fornece legendas para eles.\n"
+"Adiciona a \"Pesquisa de áudio estrangeira\" quando a pista de áudio padrão for o seu idioma preferido.\n"
+"Este passe de busca encontra pequenas sequências de áudio estrangeiro e oferece legendas para elas.\n"
 "\n"
-" Esta opção requer uma linguagem que deve ser definida na lista de Idiomas."
+"Esta opção requer que um idioma seja definido na lista de idiomas selecionados."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "Acrescenta a faixa de legenda se o áudio padrão for estrangeiro"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Quando a faixa de áudio padrão não é o seu idioma preferido, adiciona uma faixa de legendas.\n"
+"Quando a faixa de áudio padrão não for o seu idioma preferido, adicione uma faixa de legenda.\n"
 "\n"
-" Esta opção requer um idioma que deve ser definido na lista de Idiomas."
+"Esta opção requer que um idioma seja definido na lista de idiomas selecionados."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Adicionar Legendas quando disponível"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1479,59 +1627,59 @@
 "As legendas fechadas são subtítulos de texto que podem ser acrescentados a "
 "qualquer container como uma pista de subtítulo suave"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Comportamento Queimar em*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Defina o comportamento da legenda \"Queimar em\".\n"
+"Defina o comportamento do subtítulo \"Queimar em\".\n"
 "\n"
-" As legendas queimadas fazem parte do vídeo e não podem ser desativadas durante a reprodução.\n"
-" Apenas uma faixa de legenda pode ser gravada! Como conflitos podem ocorrer, o primeiro escolhido ganha."
+"As legendas que forem queimadas fazem parte do vídeo e não podem ser desativadas durante a reprodução.\n"
+"Apenas uma faixa de legenda pode ser queimada! Como podem ocorrer conflitos, o primeiro escolhido ganha."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Queimar em para reprodutores limitados*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "Legendas do DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Grava a primeira legenda fixa selecionada do DVD. Todas as outras faixas de legendas de DVD serão descartadas.\n"
+"Queime a primeira faixa selecionada de legenda do DVD. Todas as outras faixas de legenda do DVD serão descartadas.\n"
+"Use esta opção se o software ou o dispositivo do seu leitor não for compatível com legendas de DVD.\n"
 "\n"
-" Use esta opção se seu Reprodutor de vídeos ou dispositivo não suporta legendas de DVD. Apenas uma faixa de legenda pode ser gravada! Como conflitos podem ocorrer, o primeiro escolhido ganha."
+"Somente uma faixa de legenda pode ser queimada! Como podem ocorrer conflitos, o primeiro escolhido ganha."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Legendas Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Grava a primeira legenda fixa selecionada no Blu-ray. Todas as outras faixas de legendas do Blu-ray será descartada.\n"
+"Queime a primeira faixa selecionada de legenda do Blu-ray. Todas as outras faixas de legenda do Blu-ray serão descartadas.\n"
+"Use esta opção se o software ou o dispositivo do seu leitor não for compatível com legendas de Blu-ray.\n"
 "\n"
-" Use esta opção se seu reprodutor de vídeos ou dispositivo não suporta legendas de Blu-ray. \n"
-"\n"
-" Apenas uma faixa de legenda pode ser gravada! Como conflitos podem ocorrer, o primeiro escolhido ganha."
+"Somente uma faixa de legenda pode ser queimada! Como podem ocorrer conflitos, o primeiro escolhido ganha."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1539,7 +1687,7 @@
 "* Apenas uma das opções de legendas de gravação será aplicada, "
 "começando com a primeira."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1547,708 +1695,239 @@
 "Apenas uma faixa de legendas pode ser queimada! Podem ocorrer conflitos, "
 "então o primeiro escolhido vence."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Legendas"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Quadros de Referência:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Os valores são de ~ 1-6. Quanto mais você adicionar, melhor será a compactação, mas mais lenta será a codificação.\n"
-"A animação Cel tendem a se beneficiar mais de quadros de referência do que conteúdos de filme.\n"
-"\n"
-"Observe que muitos dispositivos de hardware têm limitações quanto ao número de referência de quadros suportada,\n"
-"por isso, se você estiver codificando para um dispositivo portátil ou autônomo, não toque nele, a menos que\n"
-"Você tenha certeza absoluta e que saiba o que está fazendo!"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Quadros-B Máximos:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Os valores são de ~ 2-5. Isso especifica o número máximo de quadros-B sequenciais que o codificador pode usar.\n"
-"\n"
-"Geralmente, números grandes não ajudam significativamente, a menos que os quadros B adaptativos estejam definidos como Optimal.\n"
-"O material fonte animado por Cel e a pirâmide B também aumentam significativamente a utilidade de valores.\n"
-"\n"
-"O perfil da linha de base, conforme necessário para iPods e dispositivos semelhantes, exige que os quadros B sejam definidos como 0 (desativado)."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Quadros-B Piramidais:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"Pirâmide-B melhora a compressão, criando uma estrutura piramidal (daí o nome)\n"
-"de quadros-B, permitindo que os quadros-B se refiram para melhorar a compactação.\n"
-"\n"
-"Requer quadros-B Máx. maior que 1; os quadros-B adaptativos ideais são altamente recomendados para o benefício de compressão total."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Quadros-P Ponderados:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Executa análises extras para decidir sobre parâmetros de ponderação para cada quadro.\n"
-"\n"
-"Isso melhora um pouco a compactação geral e muito a qualidade dos desbotamentos.\n"
-"\n"
-"O perfil da linha de base, requer Quadro-P ponderado, conforme necessário para iPods e dispositivos similares com\n"
-"previsão para ser desativado no perfil principal. Note que alguns dispositivos e reprodutores de vídeo, mesmo aqueles que suportam,\n"
-"podem ter problemas com a previsão Quadro-P Ponderada: o Apple TV é\n"
-"completamente incompatível com ele, por exemplo."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "Transformação 8x8"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"A transformação 8x8 é o recurso mais útil do x264 em termos de compactação por velocidade.\n"
-"\n"
-"Melhora a compressão em pelo menos 5% a um custo de velocidade muito pequeno e pode\n"
-"fornecer um benefício de qualidade visual incomumente alto se comparado a seu\n"
-"ganho. No entanto, requer Perfil Alto, o que muitos dispositivos podem não suportar."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "Codificação De Entropia CABAC"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"Depois que o codificador faz seu trabalho, ele tem um monte de dados que\n"
-"precisa ser compactado sem perdas, semelhante ao ZIP ou RAR. O H.264 fornece\n"
-"duas opções para isso: CAVLC e CABAC. CABAC decodifica muito mais lentamente\n"
-"comprime significativamente melhor (10-30%), especialmente em taxas de bits mais baixas.\n"
-"\n"
-"Se você deseja minimizar os requisitos de CPU para reprodução de vídeo, desative essa opção.\n"
-"O perfil da linha de base, conforme o necessário para iPods e dispositivos semelhantes, exige que o CABAC seja desativado."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Recursos De Codificação"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Método de Movimento Leste:"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Controla o método de estimativa de movimento.\n"
-"\n"
-"A estimativa de movimento é como o codificador estima como cada bloco de pixels em um quadro foi movido.\n"
-"Um melhor método de busca por movimento melhora a compressão ao custo da velocidade.\n"
-"\n"
-"Diamante: realiza uma pesquisa extremamente rápida e simples usando um padrão de losango.\n"
-"Hexágono: executa uma pesquisa um pouco mais eficaz, porém um pouco mais lenta, usando um padrão de hexágono.\n"
-"Multi-Hex desigual: executa uma pesquisa muito ampla usando uma variedade de padrões, capturando com mais precisão o movimento complexo.\n"
-"Exaustivo: realiza uma busca \"burra\" de cada pixel em uma área ampla. Significativamente mais lento apenas por um pequeno ganho de compressão.\n"
-"Transformado Exaustivo: Como exaustivo, mas toma decisões ainda mais precisas. Por conseguinte, um pouco mais lento, também por apenas uma pequena melhoria."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Modo; Subpixel ME &amp:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Essa configuração controla a estimativa de movimento de precisão de subpixel e os métodos de modos de decisão.\n"
-"\n"
-"A estimativa de movimento de subpixel é usada para refinar estimativas de movimento além da mera precisão de pixels, melhorando a compactação.\n"
-"A decisão do modo é o método usado para escolher como codificar cada bloco do quadro: uma decisão muito importante.\n"
-"O SAD é o método mais rápido, seguido pelo refinamento SATD, RD, RD e o mais lento, QPRD.\n"
-"6 ou superior é altamente recomendado: Psy-RD, uma otimização do cão e bem poderosa que ajuda a reter detalhes, requer RD.\n"
-"11 desativa todas as terminações antecipadas em análise.\n"
-"10 e 11, as opções mais poderosas e mais lentas, requerem quantização adaptativa (aq-mode 0) e trellis 2 (sempre)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Intervalo de Movimento Leste:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"Essa é a pesquisa do x264 da distância de seu palpite inicial no\n"
-"movimento de um bloco, a fim de tentar encontrar o seu movimento real.\n"
-"\n"
-"O padrão é bom para a maioria dos conteúdos, mas vídeo em movimento extremamente alto, \n"
-"especialmente em resoluções HD, podem se beneficiar de faixas mais altas, embora\n"
-"a um custo de alta velocidade."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Modo Adaptativo Direto:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"O H.264 permite dois modos de previsão diferentes, espacial e temporal, em quadros-B.\n"
-"\n"
-"Espacial, o padrão, é quase sempre melhor, mas temporal às vezes também é útil.\n"
-"x264 pode, ao custo de uma pequena quantidade de velocidade (e de acordo com um pequeno ganho de compressão), \n"
-"selecione adaptativamente qual é o melhor para cada quadro específico."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Quadros-B Adaptativo:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"O modo rápido leva aproximadamente a mesma quantidade de tempo, independentemente de quantos quadros-B você especificar.\n"
-"No entanto, enquanto rápido, suas decisões são muitas vezes abaixo do ideal.\n"
-"\n"
-"O modo ótimo fica mais lento à medida que o número máximo de quadros B aumenta, \n"
-"mas toma decisões muito mais precisas, especialmente quando usadas com a pirâmide-B."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Partições:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"A decisão do modo escolhe uma variedade de opções para tomar sua decisão: \n"
-"essa opção escolhe quais opções são essas.\n"
-"\n"
-"Menos partições para verificar significa codificação mais rápida, ao custo de piores\n"
-"decisões, já que a melhor opção pode ter sido uma que foi desativada."
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Treliça:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Treliça ajusta o arredondamento dos coeficientes de transformação para que\n"
-"comprima 3-5% mais ao custo de alguma velocidade.\n"
-"\n"
-"'Sempre' usa treliça não apenas durante o processo principal de codificação, mas também\n"
-"durante a análise, o que melhora ainda mais a compressão, embora com grande custo de velocidade.\n"
-"\n"
-"Treliça custa mais velocidade em altas taxas de bits e requer CABAC."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Análises"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Força de Quantização Adaptativa:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"A quantização adaptativa controla como o codificador distribui bits pelo quadro.\n"
-"\n"
-"Valores mais altos retiram mais bits das bordas e áreas complexas para melhorar áreas com detalhes mais precisos."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Taxa de Distorção Psico-visual:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"A otimização da distorção de taxa psico-visual tira proveito das características da\n"
-"visão para melhorar dramaticamente os detalhes aparentes e a nitidez.\n"
-"O efeito pode tornar-se mais fraco ou mais forte ajustando a força.\n"
-"Sendo um algoritmo RD, requer que a decisão do modo seja pelo menos '6'."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Treliça Psico-visual:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Treliça Psico-visual é um algoritmo experimental para promover\n"
-"a melhora da nitidez e a retenção de detalhes além do que o Psico-visual RD faz.\n"
-"\n"
-"Os valores recomendados são em torno de 0,2, embora valores mais altos possam ajudar muito vídeo granulado ou codificações de taxa de quadros mais baixas. Não recomendado para animações Cel e outros gráficos com arestas vivas."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Desbloqueio:"
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"Filtro de desbloqueio H.264.\n"
-"\n"
-"O h.264 tem um filtro de desbloqueio interno que suaviza os artefatos de bloqueio\n"
-"depois de decodificar cada quadro. Isso não apenas melhora a qualidade visual, mas também\n"
-"ajuda na compactação significativamente. O filtro de desbloqueio exige muita energia da CPU, \n"
-"por isso, se pretender minimizar os requisitos de CPU para a reprodução de vídeos, desative-os.\n"
-"\n"
-"O filtro de desbloqueio tem dois parâmetros ajustáveis, \"força\" (Alfa) e \"limiar\" (Beta).\n"
-"O primeiro controla o quão forte (ou fraco) é o desbloqueador, enquanto o segundo controla quantos\n"
-"(ou poucas) arestas a que se aplica. Valores menores significam menos desbloqueio, valores mais altos significam mais desbloqueio.\n"
-"O padrão é 0 (força normal) para os dois parâmetros."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Não Dizimar DCT"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"O x264 normalmente zera os blocos de dados quase vazios para salvar os bits para\n"
-"ser melhor usado para algum outro propósito no vídeo. No entanto, isso pode\n"
-"às vezes ter efeitos negativos na retenção de grãos sutis e\n"
-"tremor.\n"
-"\n"
-"Não toque nisso, a menos que você tenha problemas de formação de faixas ou outros casos semelhantes. Onde você está tendo problemas para manter um bom ruído."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psico-visual"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"As opções selecionadas aparecerão aqui. \n"
-"você pode editar estas e adicionar outras opções.\n"
-"\n"
-"Valores padrão não serão mostrados. Os padrões são:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr ""
-"Opção Avançada de Sequência de caracteres Do Atual "
-"x264"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Vídeo Avançado"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Marcadores De Capítulo"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Adiciona marcadores de capítulo para o arquivo de saída."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Indexar"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Duração"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Título"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Capítulos"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Títulos:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Atores:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Diretor:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Data de Lançamento:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Comentário:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Gênero:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Descrição:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Sinopse:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Marcadores"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Ajustes"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Editar"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Marca a entrada da fila selecionada como pendente.\n"
-"Redefine o trabalho da fila para pendente e pronto para ser executado novamente."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Recarregar Todos"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Marca todas as entradas da fila como pendentes. \n"
-"Repõe todos os trabalhos de fila de espera e a deixa pronta \n"
-"para ser executado novamente."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Remover Todos"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Remove todos os itens da fila de espera."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Salvar Fila"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Salva a fila atual de trabalhos de codificação em um arquivo. \n"
-"Esse arquivo pode ser recarregado posteriormente para editar seus trabalhos e re-codificá-los."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Carregar Arquivo de Fila"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Carrega um arquivo prévio de fila salvo."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Salvar Como:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Nome do arquivo de destino para a sua codificar."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "Para:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Diretório de destino para o seu arquivo codificado."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Diretório de Destino"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "Ok"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Selecionar Todos"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Marcar todos os títulos para adicionar à fila"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Limpar Todos"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Desmarcar Todos os Títulos"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "Arquivos de destino OK. Nenhum duplicado detectado."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Checar por novas versões automaticamente"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Quando todos os codificadores estão completos"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 "O uso de atribuição automática de nomes (usa origem do nome modificado)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+"Crie o nome do arquivo de destino a partir do nome do arquivo de origem ou "
+"da etiqueta do volume"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Modelo de Nome Automático"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
+"Opções disponíveis: {caminho-da-origem} {origem} {título} {predefinição} "
+"{capítulos} {dia} {hora} {dia-de-criação} {horário-da-criação} {qualidade} "
+"{taxa-de-bits}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "Uso amigável do iPod/iTunes (.m4v) extensão de arquivo para MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Número de visualizações"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Filtro de títulos curtos (segundos)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filtro de títulos em DVD e Blu-ray curtos (segundos)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr "Limpe os itens da fila quando ao codificação for concluída"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"Por padrão, os trabalhos concluídos permanecem na fila e são marcados como concluídos. \n"
+"Verifique se deseja que a fila se limpe excluindo os trabalhos concluídos."
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Geral"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Granulação fracionada de Qualidade Constante"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Usar dvdnav (ao invés de libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Monitor de destino de espaço livre no HD"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr "Pausa a codificação se o espaço livre em disco cair abaixo do limite"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "Limite MB"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr "Colocar logs individuais do codificador no mesmo local do filme"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Nível de Verbosidade do Log de Atividades"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Longevidade do Log de Atividades"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Diminuir visualizações em Alta Definição"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Automaticamente procura o DVD quando carregado"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Procura o DVD sempre que um novo disco é carregado"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Tamanho da Fonte da Janela de Atividades"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Aba de Funções Avançadas das Opções de Vídeo"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Use opções avançadas de vídeo por sua conta e risco.\n"
-"Recomendamos que você use os controles disponíveis\n"
-"na guia Vídeo, em vez disso."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Remover trabalhos concluídos da fila"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"Por padrão, os trabalhos concluídos permanecem na fila e são marcados como concluídos. \n"
-"Verifique se deseja que a fila se limpe excluindo os trabalhos concluídos."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Use as mesmas configurações para todos os títulos em um lote"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2260,71 +1939,67 @@
 "\n"
 "Desmarque esta opção se quiser permitir alterações nas configurações de cada título de forma independente."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Permitir Ajustes"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Permitir HandBrake Para Leigos"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Nome da Pasta:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Descrição"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Renomear Predefinições"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Descrição"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Categoria:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr "Defina a categoria onde esta predefinição será mostrada abaixo."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Nome da Categoria:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Nome da Predefinição:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Predefinição Padrão"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Tornar esta a Predefinição padrão quando o HandBrake iniciar"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Dimensões Personalizadas da Imagem"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Dimensões"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Largura Máx:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Habilita o limite máximo de largura. "
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2336,15 +2011,15 @@
 "Sempre que uma nova fonte for carregada, esse valor será aplicado se a largura da fonte for maior.\n"
 "Definir isso como 0 significa que não há largura máxima."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Altura Máxima:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Habilitar limite máximo de altura."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2356,11 +2031,15 @@
 "Sempre que uma nova fonte for carregada, esse valor será aplicado se a altura da fonte for maior.\n"
 "Definir isso como 0 significa que não há altura máxima."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Pré visualização do HandBrake"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Seleciona os quadros de prévia."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2368,79 +2047,109 @@
 "Codifica e reproduz uma pequena sequência do vídeo a partir da posição atual"
 " de visualização."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Duração:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Define a duração da visualização ao vivo em segundos."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Mostrar Corte"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Mostra a área cortada na prévia"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Resolução da Origem"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Redefine a janela de visualização para a resolução do vídeo de origem"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Abrir"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Número do Título:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Dispositivos de DVD detectados:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importar SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Ativar configurações para importar um arquivo de legenda SRT"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importe o SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Ative as configurações para importar um arquivo de legenda SSA"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Lista de Legendas Incorporadas"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Ativar configurações para selecionar legendas incorporadas"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Faixa da Fonte"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Mostra as faixas de legendas disponíveis na sua fonte."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Nome da Faixa:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Define o nome da faixa da legenda.\n"
+"\n"
+"Alguns reprodutores podem usar isso na lista de seleção de legendas."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Idioma"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Código do Caractere"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Arquivo:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Deslocamento (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2448,7 +2157,7 @@
 "Define o idioma desta legenda.\n"
 "Este valor será usado pelos reprodutores de vídeo nos menus de legendas."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2462,35 +2171,27 @@
 "Nós traduzimos o conjunto de caracteres para UTF-8.\n"
 "O código de caracteres da fonte é necessário para realizar esta tradução."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Selecione o arquivo SRT para importar"
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Arquivo SRT"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importe o arquivo"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr "Ajusta o deslocamento em milissegundos entre o tempo de vídeo e SRT"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Faixa"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Mostra as faixas de legendas disponíveis na sua fonte."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Somente Legenda Forçada"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Queimar para o vídeo"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2498,23 +2199,15 @@
 "Renderiza a legenda no vídeo.\n"
 "O subtítulo fará parte do vídeo e não poderá ser desativado."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Definir Faixa Padrão"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Faixa da Fonte"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Mostra as faixas de áudio disponíveis na sua fonte."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Nome da Faixa:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2524,15 +2217,15 @@
 "\n"
 "Os reprodutores de vídeo podem usar isto na lista de seleção de áudio."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Misturar"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Taxa de Amostra"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2544,31 +2237,31 @@
 "Para fonte de áudio que possui um amplo alcance dinâmico (sequências muito altas e muito macias),\n"
 "O DRC permite 'comprimir' o alcance fazendo sons altos mais suaves e sons suaves mais altos."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Define o codec de áudio para codificar esta faixa."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Taxa de Bits"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Habilitar ajustes de taxa de bits"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Qualidade"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Habilitar ajustes de qualidade"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Define a taxa de bits para codificar esta faixa."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
@@ -2576,19 +2269,19 @@
 "Qualidade: Para codecs de saída que suportam e ajustem a qualidade da"
 " saída."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Define a mixagem da faixa de saída de áudio."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Define a taxa de amostragem da faixa de áudio de saída."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2597,186 +2290,73 @@
 "de saída."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Desativado"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Pular Esta Versão"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Lembrar Mais Tarde"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "Uma nova versão do HandBrake está disponível!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx está disponível agora (você tem yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Notas da Versão"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Vídeo Transcodificador"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake é uma ferramenta para converter vídeo de quase qualquer formato "
-"para uma seleção de codecs modernos e amplamente suportados."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Razões que vão fazer você adorar o Handbrake:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Converta vídeos de praticamente qualquer formato"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Gratuito e de Código Aberto"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multi-Plataforma (Linux, Mac e Windows)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Janela principal e resumo das configurações"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Resolução de vídeo e configurações de recorte"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Configurações do codificador de vídeo"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Seleção e configurações de faixa de áudio"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Edição de títulos de capítulos"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Impossível criar %s.</big>\n"
-"\n"
-"Erro interno. Não foi possível analisar a descrição da INTERFACE do usuário.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Indexar"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Duração"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Título"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Informação da Tarefa"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Informação da Faixa"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Nome da Predefinição"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "O arquivo ou dispositivo para codificar"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Os valores predefinidos para utilizar na codificação"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Muito spam"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "O caminho para substituir o diretório de configuração do usuário"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Abrir um console para saída de depuração"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Todos"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Qualidade:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Taxa de Bits: %dkbps \n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Taxa de Bits : %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Passagem Direta"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2787,7 +2367,7 @@
 "DRC: %s\n"
 "Nome da Faixa: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2796,7 +2376,7 @@
 "%sGanho: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2804,7 +2384,7 @@
 "Adiciona um codificador de áudio.\n"
 "Cada faixa de origem selecionada será codificada com todos os codificadores selecionados."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2812,39 +2392,39 @@
 "Qualidade do Áudio:\n"
 "Para codificadores que o suportam, ajuste a qualidade da saída."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Remover este codificador de áudio"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Fechar o HandBrake ao terminar de codificar.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Não Selecionado"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Procurando..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Parar Procura"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Nenhum Título Encontrado"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Novo Vídeo"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2855,439 +2435,438 @@
 "\n"
 "%s em %d segundos ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%s Seu filme será perdido se você parar a codificação."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Cancelar Atual e Parar"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Cancelar Atual, Começar um Novo"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Finalizar Atual, Depois Parar"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Continuar Codificação"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d pendente(s)"
+msgid "%d encode pending"
+msgstr "%d codificação pendente"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d codificações pendentes"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "tarefas %d de %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "passo %d (procurar legenda) de %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "passo %d de %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 "Codificando: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Codificando: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Codificando: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Buscando por tempo inicial,"
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Procurando título %d de %d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Procurando título %d de %d prévia %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Codificação Terminada!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Codificação Cancelada."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Falha ao Codificar."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Empacotando: Isso pode demorar um pouco..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Procurando nesta fonte de DVD"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Aviso: sem perdas)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s está disponível agora (você tem %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Codificação Completa"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "Considere este Coquetel. Sua fila do HandBrake está pronta!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Sua codificação está pronta."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Desligando o computador"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Colocando o computador para dormir"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Parando o Handbrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Primeira faixa combina com os idiomas selecionados"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Todas as faixas combinam com os idiomas selecionados"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Faixa de Legendas de Áudio Estrangeira"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Primeira Faixa Selecionada"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Áudio Estrangeiro, depois Primeira Faixa Selecionada"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Capítulos:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Segundos:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Quadros:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Não Fazer Nada"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Mostrar Notificação"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Sair do HandBrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Colocar o Computador para Dormir"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Desligar o Computador"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Solto"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Customizar"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Semana"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Mês"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Ano"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Imortal"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Nunca"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Diário"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Semanal"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Mensal"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "ModosNL"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Desfocado"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "VoltaNítida"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 Graus"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 Graus"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 Graus"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Espacial"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Temporal"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Rápido"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optimizado"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Estrito"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Simples"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Inteligente"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Diamante"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Hexágono"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Multi-Hexágono Desigual"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Exaustivo"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Hadamard Exaustivo"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, no subpixel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpixel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpixel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpixel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpixel em tudo"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpixel em tudo"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD em quadros-P/I"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD em todos os quadros"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD refinar em quadros-P/i"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD refinar em todos os quadros"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD em todos os quadros"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: Não há rescisões antecipadas na análise"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Mais"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Algum"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Todos"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Somente codificar"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Sempre"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "O mesmo da fonte"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(Filme NTSC)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(Filme/Vídeo PAL)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(Vídeo NTSC)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Sem Títulos"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Sem Áudio"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Nenhum"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3300,7 +2879,7 @@
 "Predefinição:\t%s\n"
 "Customização:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3311,7 +2890,7 @@
 "\n"
 "Predefinição:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3324,7 +2903,7 @@
 "Predefinição:\t%s\n"
 "Customizado:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3335,7 +2914,7 @@
 "\n"
 "Predefinição:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3350,7 +2929,7 @@
 "Predefinido:\t%s\n"
 "Customizado:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3363,7 +2942,7 @@
 "Filtro:\t%s\n"
 "Predefinição:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3380,7 +2959,7 @@
 "Sintonia:\t%s\n"
 "Customizado:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3397,8 +2976,7 @@
 "Sintonia:\t%s\n"
 "Customizado:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3410,18 +2988,29 @@
 "Você deve escolher um codec ou container de vídeo diferente. \n"
 "Se você continuar, o FFMPEG será escolhido para você."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"O contêiner WebM é compatível apenas com VP8 ou VP9.\n"
+"\n"
+"Você deve escolher um codec de vídeo ou um contêiner diferente.\n"
+"Caso continue, um será escolhido para você."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Continuar"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Nenhum título encontrado.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3433,8 +3022,19 @@
 "Você deve alterar suas seleções de legendas.\n"
 "Se você continuar, algumas legendas serão perdidas."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"O WebM no HandBrake é compatível apenas com legendas queimadas.\n"
+"\n"
+"Você deve alterar a sua seleção de legendas.\n"
+"Caso continue, algumas legendas serão perdidas."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3446,8 +3046,7 @@
 "Você deve escolher um arquivo válido.\n"
 "Se você continuar, esta legenda será ignorada."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3461,7 +3060,7 @@
 "\n"
 " "
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3474,17 +3073,57 @@
 "Você deve escolher um codec de áudio diferente. \n"
 "Se você continuar, será escolhido um para você."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Impossível criar %s.</big>\n"
+"\n"
+"Erro interno. Não foi possível analisar a descrição da INTERFACE do usuário.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Informação da Faixa"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Nome da Predefinição"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "O arquivo ou dispositivo para codificar"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Os valores predefinidos para utilizar na codificação"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Muito spam"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "O caminho para substituir o diretório de configuração do usuário"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Abrir um console para saída de depuração"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 "ghb_presets_menu_init:  Não foi possível encontrar a pasta de predefinições."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "Falha ao encontrar a pasta pai ao adicionar filho."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3494,31 +3133,31 @@
 " \n"
 "Deseja continuar?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Tire-me daqui!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Carregar predefinições de backup"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Todas (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Predefinições (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Legado de predefinições (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Exportar Predefinição"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3529,15 +3168,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "Pasta"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "Predefinição"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3550,269 +3189,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Segundos"
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr "%s (Modificado)"
 
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Quadros"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Alinhe A/V"
 
-#: ../src/queuehandler.c:228
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (Título %d, %s %d completo %d, Vídeo em "
-"2-passos) --> %s"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:236
+#: src/queuehandler.c:327
 #, c-format
 msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
-"<big>%s</big> (Título %d, %s %d completo %d) --> %s"
+"%d:%d:%d:%d Corte\n"
+"%dx%d armazenamento, %dx%d tela\n"
+"%d:%d Proporção de aspecto do pixel\n"
+"%s Proporção de aspecto da tela"
 
-#: ../src/queuehandler.c:299
+#: src/queuehandler.c:358
 #, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Predefinição Modificada Baseada em: %s\n"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Taxa de bits %dkbps"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:363
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Predefinição: %s\n"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Taxa de bits %dkbps (2 passagens)"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:370
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Formato: %s Container\n"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Qualidade constante %.4g(%s)"
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Opções de Container:"
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sMarcadores de Capítulo"
+msgid "%sPreset %s"
+msgstr "%sPredefinição %s"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:408
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%s Suporte a iPod 5G"
+msgid "%sTune %s"
+msgstr "%sAjuste %s"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:413
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sOptimizador Web"
+msgid "%sProfile %s"
+msgstr "%sPerfíl %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:418
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destino: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Preservar Aspecto)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Aspecto Perdido)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamórfico)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Anamórfico Customizado)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Imagem: "
+msgid "%sLevel %s"
+msgstr "%sNível %s"
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:435
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Fonte: %d x %d, Saída %d x %d %s, Corte %d:%d:%d:%d"
-
-#: ../src/queuehandler.c:399
-#, c-format
-msgid ", Display %d x %d"
-msgstr ", Mostrar %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtros:"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Taxa de quadros constantes %s fps"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:439
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDe tela de cinema"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"Pico da taxa de quadros %s fps (pode ser menor)"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:444
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Taxa de quadros variáveis %s fps"
 
-#: ../src/queuehandler.c:475
-#, c-format
-msgid "%sDenoise %s:"
-msgstr "%sRedução de Ruídos %s:"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", Por imposição apenas"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDesbloqueador: %d"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", Queimado"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sEscala de Cinza"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", Padrão"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Vídeo: %s"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Concluído"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(Constante)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Cancelado"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(Variável)"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Falhou"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Taxa de Quadro: %s %s"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "Pendente"
 
-#: ../src/queuehandler.c:532
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Taxa de Quadro: Pico %s (pode ser menor)"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d Dia %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Taxa de Quadro: %s (taxa de quadro constante)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Erro"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Taxa de Bits:"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Dias %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "1º Passo Turbo: Ligado\n"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:592
-#, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Opções de Vídeo: Predefinição: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Sintonia: "
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Perfil: %s"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Não disponível"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Nível: %s"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Busca por áudio estrangeiro"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Opções Avançadas: %s\n"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Codifique"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Áudio: "
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Codifique a primeira passagem (Análise)"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Faixas de Áudio: %d"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Codifique a segunda passagem (Final)"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Taxa de Bits: %d"
-
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Codificador: %s"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Erro"
 
-#: ../src/queuehandler.c:707
+#: src/queuehandler.c:1177
 #, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
-"%d - %s --> Codificador: %s, Misturado: %s, Taxa de Amostragem: %s, %s"
-
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Legenda: "
-
-#: ../src/queuehandler.c:737
-#, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Faixas de Subtitulos: %d\n"
+"passe %d de %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr "(Somente Forçada)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Procurando o título"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr "(Queimar)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Codificação pausada"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr "(Padrão)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Codificação em andamento"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Deslocamento (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%s O destino do sistema de arquivos está quase cheio: %<PRIu64>MB livre.\n"
+"%sO arquivo de sistema do destino está quase cheio: %<PRId64> MB livre.\n"
 "Destino: %s\n"
-"A conversão pode ficar incompleta se persistir.\n"
+"Caso continue, a codificação poderá ficar incompleta caso continue.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Continuar. Consertei o problema"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Continuar. Não dizer novamente"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3825,11 +3416,11 @@
 "Outro trabalho na fila especificou o mesmo destino.\n"
 "Deseja substituir?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Substituir"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3840,7 +3431,7 @@
 "\n"
 "Não é um diretório válido."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3851,7 +3442,7 @@
 "\n"
 "Não pode ler ou escrever o diretório."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3864,16 +3455,16 @@
 "O arquivo já existe.\n"
 "Quer subscrever?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Selecione esse título para adicionar à fila\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Sem Título"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3883,31 +3474,31 @@
 "Este título não será acrescentado à fila a menos que você modifique \n"
 "o nome do arquivo.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Parar Conversão"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "P_arar Conversão"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Continuar"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Continuar Conversão"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "P_arar Conversão"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Continuar Conversão"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3915,25 +3506,23 @@
 "Você já está convertendo. O que o quer fazer?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Idioma Preferido: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Adicionar a pista de subtitulo %s se o áudio padrão não for%s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Acrescentar a pista de subtítulo se o áudio padrão não for da sua língua "
 "preferencial"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3946,8 +3535,7 @@
 "Opções Expandidas:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3959,3 +3547,8 @@
 "\n"
 "Opções Expandidas:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Aviso: sem perdas)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/ru.po -> HandBrake-1.5.1.tar.xz/gtk/po/ru.po Changed

@@ -1,18 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
 # Ilya Ilyushenok <ilya4795@gmail.com>, 2019
-# VictorR2007 <victorr2007@yandex.ru>, 2019
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
 "Last-Translator: VictorR2007 <victorr2007@yandex.ru>, 2019\n"
 "Language-Team: Russian (https://www.transifex.com/HandBrakeProject/teams/92423/ru/)\n"
@@ -22,7 +21,7 @@
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -32,11 +31,11 @@
 "\n"
 "Субтитры будут на части видео и не могут быть отключены."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Встроенные"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -54,11 +53,11 @@
 "Это эффективно для создания «форсированной» дорожки\n"
 "в выводе."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -74,11 +73,11 @@
 "субтитры во время сцен, где кто-то говорит\n"
 "на иностранном языке."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Только форсированные"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -94,11 +93,11 @@
 "не совпадает с началом видео.\n"
 "Этот параметр позволяет синхронизировать файлы."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "Смещение SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -124,55 +123,235 @@
 "иностранным языком.Эту опцию лучше всего использовать в\n"
 "сочетании с опцией «Форсированные»."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Дорожка"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Предустановки"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Установить по умолчанию"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "_Сохранить как"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Переименовать"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Удалить"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Импорт"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Экспорт"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "_Сбросить предустановки"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Список предустановок"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Начать кодирование"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Старт"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Приостановить кодирование"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Отметить выбранные записи очереди, как в ожидании.\n"
+"Сбросить ожидание очереди заданий и продолжить выполнять задание снова."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Изменить"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Предустановка:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Название:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Описание"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "О программе"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -180,203 +359,181 @@
 "Авторские права © 2008 John Stebbins\n"
 "Авторские права © 2004 HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake, это GPL-лицензированный, мультиплатформенный, многопоточный видео"
 " транскодер."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake― свободное программное обеспечение. Вы можете распространять или изменять его при условиях соответствия GNU General Public License опубликованной Free Software Foundation; либо версии 2 лицензии, либо (на ваше усмотрение) любой более поздней версии.\n"
-"\n"
-"HandBrake распространяется в надежде на то, что приложение будет полезно, но БЕЗ ВСЯКИХ ГАРАНТИЙ; не гарантируется даже ПРИГОДНОСТЬ или СООТВЕТСТВИЕ КАКИМ-ЛИБО ТРЕБОВАНИЯМ. Для получения дополнительной информации ознакомьтесь с GNU General Public License.\n"
-"\n"
-"Вы должны получить копию GNU General Public License вместе с этой программой. Если этого не произошло, напишите to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Файл"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Открыть _источник"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Открыть один _файл"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Установить _назначение"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Параметры"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Выход"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Очередь"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Добавить"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Добавить _несколько"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Начать кодирование"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Приостановить кодирование"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "С_охранить очередь"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Загрузить файл очереди"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Вид"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake для чайников"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "_Список предустановок"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Просмотр"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Окно активности"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_О программе"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Руководство"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Выбрать исходное видео"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Открыть источник"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Добавить в очередь"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Добавить в очередь"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Начать кодирование"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Старт"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Приостановить кодирование"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Пауза"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Показать окно предустановок"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Предустановки"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Показать окно просмотра"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Показать очередь"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Очередь"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Показать окно активности"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Активность"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Источник:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Нет"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Сканирование…"
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Название:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -386,82 +543,82 @@
 "По умолчанию выбрано длинное название.\n"
 "Часто это название функций DVD."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Без названия"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Угол:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "Для нескольких ракурсов DVD, выберите нужный ракурс для кодирования."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Диапазон:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 "Диапазон заголовков для кодирования. Могут быть главы, секунды или кадры."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Установить первую главу для кодирования."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Установить последнюю главу для кодирования."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Предустановка:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Выберите предустановку"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Изменён"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Перезагрузить"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr "Перезагрузить настройки для текущей выбранной предустановки."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Сохранить новую предустановку"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Применить текущие настройки в новую предустановку."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Формат:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Формат мультиплексора кодирования дорожек."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Оптимизация для интернет-трансляции"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -469,11 +626,11 @@
 "Оптимизирует структуру файлов mp4 для последовательной загрузки.\n"
 "Это позволяет проигрывателю начать воспроизведение до загрузки всего файла."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Запуск выравнивания А/В"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -483,55 +640,51 @@
 "вставляя пустые кадры или пропуская кадры. Может улучшить синхронизацию аудио / видео\n"
 " для проигрывателей, которые не читают списки редактирования MP4."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "Поддержка iPod 5G"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Добавить iPod Atom, необходимый некоторым старым плеерам."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Продолжительность:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "чч:мм:сс"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Дорожки:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Фильтры:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Размер:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Описание"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Автообрезка черных полос"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Автоматически обрезает черные полосы по краям видео."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Произвольное кадрирование"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -545,35 +698,35 @@
 "пикселей, а не делать точную обрезку и затем масштабирование\n"
 "до требуемого числа пикселей."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Обрезка слева"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Обрезка сверху"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Обрезка снизу"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Обрезка справа"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Размер после обрезки:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Кадрирование"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Оптимально для источника"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -581,11 +734,11 @@
 "Если включено, выберет оптимальное разрешение для сохранения.\n"
 "Это будет разрешение, наиболее точно соответствующее исходному разрешению после обрезки."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Ширина:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -593,11 +746,11 @@
 "Это ширина, в которой будет храниться видео.\n"
 "Фактические размеры дисплей будут отличаться, если соотношение сторон пиксела не равно 1:1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Высота:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -605,38 +758,29 @@
 "Это высота, в которой будет храниться видео.\n"
 "Фактические размеры дисплей будут отличаться, если соотношение сторон пиксела не равно 1:1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Анаморфотный:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Анаморфотные режимы:\n"
-"<tt>\n"
-"Нет - Принудительное соотношение сторон 1:1.\n"
-"Произвольно - Использовать соотношение пикселей\n"
-" чтобы значение и соотношение сторон соответствовало\n"
-" соотношению сторон оригинала\n"
-"Авто - Использует соотношение сторон пикселей, которое \n"
-" максимизирует разрешение, сохраняя при этом исходный\n"
-" формат изображения</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Выравнивание:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -648,21 +792,21 @@
 "Этот параметр необходим только для совместимости с некоторыми устройствами.\n"
 "Следует использовать 2, если вы не испытываете проблем с совместимостью."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Геометрия сохранения"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Сохранять соотношение сторон"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 "Если включено, оригинальное соотношение сторон источника будут сохранено."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -670,11 +814,11 @@
 "Это ширина дисплея. Это является результатом изменения размеров сохранения "
 "пропорций пикселей."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Пропорции в пикселах:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -686,11 +830,11 @@
 "Соотношение 1:1 определяет квадратный пиксель. Другие значения определяют прямоугольные формы.\n"
 "Проигрыватели будут масштабировать изображение, чтобы достичь указанного соотношения."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -700,27 +844,27 @@
 "Соотношение 1:1 определяет квадратный пиксель. Другие значения определяют прямоугольные формы.\n"
 "Проигрыватели будут масштабировать изображение, чтобы достичь указанного соотношения."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Соотношение дисплея:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Геометрия экрана"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Размер изображения"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Детелесин:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -730,7 +874,7 @@
 "\n"
 "Телесин, это процесс, который регулирует частоту кадров фильма 24fps в NTSC, в видео с частотой кадров 30fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -740,11 +884,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Предустановки деинтерлейсинга:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -756,7 +900,7 @@
 "Если включен фильтр деинтерлейса, только фрагменты, которые этот фильтр находит\n"
 " чересстрочным, будут исправлены."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -768,11 +912,11 @@
 "Режим: пространственный Метрика: движение Отсечение: пространственное Отсечение: маска Режим фильтра:\n"
 "Блокировка отсечения: блокировка ширины: блокировка высоты"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Деинтерлейсинг:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -784,11 +928,11 @@
 "Фильтр устранения гребёнки поддерживает множество алгоритмов интерполяции.\n"
 "Фильтр деинтерлейса является классическим деинтерлейсером YADIF.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Предустановки деинтерлейсинга:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -800,11 +944,11 @@
 "Фильтр устранения гребёнки поддерживает множество алгоритмов интерполяции.\n"
 "Фильтр деинтерлейса является классическим деинтерлейсером YADIF.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Подавление блоков:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -812,11 +956,22 @@
 "Фильтр для устранения «блочности» устраняет распространенный тип артефактов сжатия.\n"
 "Если в источнике существует «блочность», этот фильтр может помочь в ее очистке."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Фильтр шумоподавления:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -826,15 +981,15 @@
 "Зернистость фильма и другие виды высокочастотного шума сложно сжимать.\n"
 "Использование этого фильтра на таких источниках может привести к уменьшению размеров файлов."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Предустановка шумоподавления:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Настройка шумоподавления:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -844,11 +999,11 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Фильтр резкости:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -856,47 +1011,47 @@
 "Фильтрация резкости усиливает края и другиеr\n"
 "высокочастотные компоненты в видео."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Предустановка резкости:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Настройка резкости:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Фильтр поворота:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Повернуть видео по часовой стрелке на 90 градусов."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Чёрно-белое"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Если включено, фильтр вывода оттенков цвета в видео."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Фильтры"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Кодировщик видео:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Доступные кодировщики видео."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Частота кадров:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -908,19 +1063,19 @@
 "Рекомендуется «Как в источнике». Если исходное видео имеет\n"
 "переменную частоту кадров, выбор «Как в источнике» сохранит ее."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Постоянная частота кадров"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Включает постоянную частоту кадров вывода."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Пик частоты кадров (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -932,11 +1087,11 @@
 "\n"
 "VFR не совместим с некоторыми проигрывателями."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Переменная частота кадров"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -946,7 +1101,7 @@
 "\n"
 "VFR не совместим с некоторыми проигрывателями."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -973,15 +1128,15 @@
 "У FFMpeg и Theora шкала является более линейной.\n"
 "Эти кодировщики не имеет режима без потерь."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Постоянное качество:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Битрейт (кбит/с): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -995,11 +1150,11 @@
 "Но средний, на протяжении длительного срока, будет на установленном здесь значении.\n"
 "Если нужно ограничить кратковременный битрейт, смотрите настройки x264 vbv-bufsize и vbv-maxrate."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "Кодирование в 2 прохода"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1013,11 +1168,11 @@
 "статистика о видео. Тогда на втором проходе используются эти статистические\n"
 "данные в решении распределения битрейта."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Первый проход быстро"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1025,45 +1180,21 @@
 "Во время 1-го проход при 2-х проходном кодировании используйте настройки "
 "скоростного прохода."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Использовать дополнительные параметры"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Используйте вкладку дополнительных настроек для настройки x264. \n"
-"\n"
-" Используйте на свой страх и риск!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Предустановка:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
-"Регулирует настройки кодировщика, балансируя между эффективностью сжатия и скоростью кодирования.\n"
-"\n"
-"Это определяют настройки кодировщика по умолчанию.\n"
-"Регулировка, профили, уровни и дополнительные параметры строки, будут применять это.\n"
-"Как правило, нужно установить этот параметр на самый медленный, Медленная настройка\n"
-"приведёт к улучшению качества или несколько меньшему размеру файла."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Настройки:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1077,11 +1208,11 @@
 "характеристик выходного файла. Изменения будут применены после предустановки, но\n"
 "до всех остальных параметров."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Быстрое кодирование"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1091,11 +1222,11 @@
 "\n"
 "Установите ее, если ваше устройство имеет затруднение с воспроизведением на выходе (пропускает кадры)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Нулевая задержка"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1111,11 +1242,11 @@
 "Поскольку HandBrake не подходит трансляции потокового вещания,\n"
 "этот параметр не имеет здесь большого значения."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Профиль:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1125,11 +1256,11 @@
 "\n"
 "Подавляет все другие настройки."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Уровень:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1139,11 +1270,11 @@
 "\n"
 "Подавляет все другие настройки."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Дополнительно:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1153,56 +1284,45 @@
 "\n"
 "Список вариантов опций разделять двоеточиями."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Видео"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Список дорожек"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Показать список выходных звуковых дорожек"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Выбранная дорожка"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Показать опции выбора исходного трека"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Добавить"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Добавить новые настройки аудио в список"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Добавить все"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Добавить в список все звуковые дорожки"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Перезагрузить все настройки звука по умолчанию"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Список дорожек"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Выбор поведения:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Выберите, какие звуковые дорожки исходного носителя используются."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1210,135 +1330,117 @@
 "Создать список языков, которые вы хотите выбрать для аудио.\n"
 "Дорожки, соответствующие этим языкам, будут выбраны с помощью «Выбор поведения»."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Удалить"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Доступные языки"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Выбранные языки"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Использовать только первый кодировщик для вторичного аудиосигнала"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
-"Только основная звуковая дорожка будет закодирован полным списком кодировщиков.\n"
-" Все другие, вторичные звуковые дорожки, будут закодированы только первым кодировщиком."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Автопроходные без перекодирования:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает MP3.\n"
-" Это позволяет при необходимости вызвать MP3, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает AAC.\n"
-" Это позволяет при необходимости вызвать AAC, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает AC-3.\n"
-" Это позволяет при необходимости вызвать AC-3, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает DTS.\n"
-" Это позволяет при необходимости вызвать DTS, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает DTS-HD.\n"
-" Это позволяет при необходимости вызвать DTS-HD, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает EAC-3.\n"
-" Это позволяет при необходимости вызвать EAC-3, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает TrueHD.\n"
-" Это позволяет при необходимости вызвать TrueHD, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Включите это, если ваше устройство воспроизведения поддерживает FLAC.\n"
-" Это позволяет при необходимости вызвать FLAC, если включен автоматический выбор."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Резервный без перекодирования:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1346,80 +1448,77 @@
 "Установить кодировщика аудио для кодирования с тем, что бы использовать "
 "когда подходящий декодер не найден."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Параметры кодирования звука:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 "Каждая дорожка выбранного источника будет закодирована со всеми выбранными "
 "кодировщиками."
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Кодировщик"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Битрейт/Качество"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Микширование"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Частота дискретизации"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Усиление"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Выбранная дорожка"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Аудио"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Показать список выходных дорожек субтитров"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Добавить новые настройки субтитров в список"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Добавить все дорожки субтитров в список"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Сканирование иностранного языка"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Добавить дополнительный проход кодирования с поиском\n"
-" кандидатур для субтитров, которые обеспечат субтитрами\n"
-" сегменты звука на иностранном языке."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Перезагрузить все настройки субтитров по умолчанию"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Выберите, какие дорожки субтитров исходного носителя используются."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1433,45 +1532,38 @@
 "Первый язык в этом списке «Предпочтительных» языков и будет использоваться\n"
 "при определении параметров выбора субтитров, когда присутствует иностранный звук. "
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Предпочитаемый язык: нет"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Добавить сканирование иностранного языка в проход"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Добавить «Сканирование иностранного языка», когда для звуковой дорожки у вас выбран предпочитаемый язык по умолчанию.\n"
-" Этот проход сканирования находит короткие последовательности иностранного звука и предоставляет для них субтитры.\n"
-"\n"
-" Эта опция требует установки языка в списке выбранных языков."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "Добавить дорожку субтитров, если по умолчанию будет иностранный звук"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
-"Когда для звуковой дорожки по умолчанию нет нужного языка, добавить дорожку субтитров.\n"
-"\n"
-" Эта опция требует установки языка в списке выбранных языков."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Добавлять скрытые субтитры, когда возможно"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1479,59 +1571,47 @@
 "Текстовые субтитры, которые могут быть добавлены в любой контейнер, как "
 "дорожка мягких субтитров"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Поведение вшитых субтитров*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Установить поведение «Вшитых» субтитров.\n"
-"\n"
-" Вшитые субтитры являются частью видео и не могут быть отключены во время воспроизведения.\n"
-" Может быть записана только одна дорожка субтитров! Могут возникать конфликты. Победит первый выбранный."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Вшитые субтитры для слабых проигрывателей*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "Субтитры DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Записать первую выбранную дорожку субтитров DVD. Все остальные дорожки субтитров DVD будут отброшены.\n"
-" Используйте эту опцию, если ваш проигрыватель или устройство не поддерживает субтитры DVD.\n"
-"\n"
-" Может быть записана только одна дорожка субтитров! Могут возникать конфликты. Победит первый выбранный."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Субтитры Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
-"Записать первую выбранную дорожку субтитров Blu-ray. Все остальные дорожки субтитров Blu-ray будут отброшены.\n"
-" Используйте эту опцию, если ваш проигрыватель или устройство не поддерживает субтитры Blu-ray.\n"
-"\n"
-" Может быть записана только одна дорожка субтитров! Могут возникать конфликты. Победит первый выбранный."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1539,7 +1619,7 @@
 "* Будет применяться только один из указанных выше вариантов "
 "субтитров, начиная с верхнего."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1547,714 +1627,238 @@
 "Может быть записана только одна дорожка субтитров! Могут возникать "
 "конфликты. Победит первый выбранный."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Субтитры"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Рефернсные кадры:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Нормальные значения ~ 1-6.Чем больше вы добавите, тем лучше сжатие, но медленнее кодирование.\n"
-"Cel анимация, как правило, дает выгоду от дополнительных опорных кадров гораздо больше, чем от содержимого фильма.\n"
-"\n"
-"Следует отметить, что многие аппаратные устройства имеют ограничения по количеству поддерживаемых опорных\n"
-"кадров, так что если вы кодируете для карманного компьютера, не трогайте это, если\n"
-"не уверенны, что знаете, что вы делаете!"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Максимум B-кадров:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Нормальные значения ~ 2-5. Это определяет максимальное число последовательных B-кадров, которые может использовать кодировщик.\n"
-"\n"
-"Большое количество обычно не помогает, если адаптивные B-кадры не установлены в «Оптимально».\n"
-"\n"
-"Базовый профиль, как это требуется для iPod и аналогичных устройств, требует чтобы для B-кадров было установлено на 0 (Выкл.)."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Пирамидальные B-кадры:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"Пирамидальные B-кадры улучшают сжатие, создавая пирамидальную структуру (отсюда\n"
-"название)\n"
-"В-кадров, что позволяет B-кадрам ссылаться друг на друга, чтобы улучшить сжатие.\n"
-"\n"
-"Требования для Максимум B-кадров, больше 1; для адаптивных B-кадров рекомендуются «Оптимально» для выгоды полного сжатия."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Взвешенные P-кадры:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Выполняет дополнительный анализ, чтобы принять решение о весовых параметрах для каждого кадра.\n"
-"\n"
-"Это немного улучшает общее сжатие и значительно улучшает качество изображения.\n"
-"\n"
-"Базовый профиль, как это требуется для iPod и подобных устройств, требует чтобы прогнозирование\n"
-"взвешенных P-кадров было отключено. Обратите внимание, что у некоторых устройств и проигрывателей, даже тех, которые поддерживают\n"
-"основной профиль, могут возникнуть проблемы с прогнозированием взвешенных P-кадров: например Apple TV, является\n"
-"совершенно несовместим с этим."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "Преобразование 8x8 "
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"Умное использование преобразований 8x8 является наиболее полезной особенностью x264 с точки зрения сжатие-скорость.\n"
-"\n"
-"Это улучшает сжатие по меньшей мере на 5% при очень малых издержках скорости и может\n"
-"обеспечить необычайно высокое качество изображения при получении выгоды в его\n"
-"сжатии. Тем не менее, она требует высокого профиля, которые многие устройства могут не поддерживать."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "Энтропийное кодирование CABAC"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"После того как кодировщик завершит работу, у него много данных, которые\n"
-"должна быть сжаты без потерь, подобно ZIP или RAR. H.264 обеспечивает\n"
-"для этого два варианта: CAVLC и CABAC. CABAC декодирует намного медленнее,\n"
-"но сжимает значительно лучше (10-30%), особенно при более низком битрейте.\n"
-"\n"
-"Если хотите минимизировать требования к процессору при воспроизведении видео, отключите эту опцию.\n"
-"Базовый профиль, требуемый для iPod и аналогичных устройств, требует чтобы CABAC быть отключен."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Особенности кодирования"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Метод оценки движения"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Управляет методом оценки движения.\n"
-"\n"
-"Оценкой движения кодировщик определяет, как каждый блок пикселей переместился в кадре.\n"
-"Поиск метода движения улучшает сжатие за счет скорости.\n"
-"\n"
-"Ромб: выполняет чрезвычайно быстрый и простой поиск с помощью ромбовидной формы.\n"
-"Шестиугольник: работает несколько более эффективно, но поиск немного медленнее при использовании формы шестиугольника.\n"
-"Неравномерный мульти-шестиугольник: выполняет очень широкий поиск, используя различные модели более точного захвата сложного движения.\n"
-"Полный: выполняет «немой» поиск каждого пиксела в широкой области. Существенно медленнее, лишь с небольшим приростом сжатия.\n"
-"Полный Адамара: как всесторонний, делает еще более точные решения. Соответственно, работает несколько медленнее, и только для небольшого улучшения."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Режим оценки субпикселов:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Этот параметр управляет субпиксельной точностью оценки движения и режимами методов решений.\n"
-"\n"
-"Субпиксельная оценка движения используется для улучшения оценки движения с точностью до пикселя, улучшая сжатие.\n"
-"Режим выбора метода используется, чтобы выбирать, как кодировать каждый блок кадра:: очень важное решение.\n"
-"Быстрый CAD метод, последующий SATD, RD, RD повышенного качества, и медленный QPRD.\n"
-"Настоятельно рекомендуется 6 или выше: Psy-RD, это очень мощная пси оптимизация, которая помогает сохранить детали, требуется RD.\n"
-"11 отключает все ранее сделанные анализы.\n"
-"10 и 11, самые мощные и самые медленные параметры, требуют адаптивное квантование (AQ-режим> 0) и треллис (Всегда)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Диапазон поиска движения:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"Это расстояние поиска x264 от предположительного начала блока\n"
-"движения, чтобы попытаться найти его фактическое движение.\n"
-"\n"
-"По умолчанию подходит для большинства содержимого, но чрезвычайно высокое движение видео,\n"
-"особенно на разрешениях HD, можно извлечь выгоду из более высоких диапазонов, хотя\n"
-"большие издержки в скорости."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Режим адаптивного управления:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 позволяет прогнозировать два различных режима, пространственные и временные B-кадры.\n"
-"\n"
-"Пространственный по умолчанию, он почти всегда лучше, но временной иногда бывает тоже полезен.\n"
-"x264 может, ценой небольшого уменьшения скорости (и соответственно, небольшого коэффициента усиления сжатия),\n"
-"адаптивно выбирать, какой лучше для каждого конкретного кадра."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Адаптивные B-кадры:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 имеет множество алгоритмов, чтобы решить, когда и сколько B-кадров следует использовать.\n"
-"\n"
-"Быстрый режим не занимает много времени, независимо от того, сколько B-кадров вы укажете.\n"
-"Тем не менее, хоть и быстро, его решения часто недостаточны.\n"
-"\n"
-"Оптимальный режим медленнее, а максимальное число B-кадров увеличенное,\n"
-"и он делает намного более точные решения, особенно при использовании B-пирамиды."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Разделение на макроблоки:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"Режим выбирает решение из множества вариантов, чтобы сделать свое решение:\n"
-"эта опция выбирает, какие варианты использовать.\n"
-"\n"
-"Меньшее количество разделов для проверки означает более быстрое кодирование, за счет худшего\n"
-"решения, поскольку лучший вариант возможно был тот, который был выключен."
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Треллис квантование:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Треллис настраивает коэффициент округления преобразования, чтобы\n"
-"выжать 3-5% большего сжатия, ценой некоторой скорости.\n"
-"\n"
-"Использовать «Всегда» не только во время основного процесса кодирования, но и\n"
-"при анализе, который улучшает сжатие, хотя и с большими издержками скорости.\n"
-"\n"
-"Треллис придает больше скорости с более высоким битрейтом и требует CABAC."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Анализ"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Адаптивная сила квантования:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"Адаптивное квантование контролирует, как кодировщик распределяет биты по всем кадрам.\n"
-"\n"
-"Высокие значения считают больше битов от краев и сложных областей для улучшения участков с четкими деталями."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Психовизуальная скорость искажения:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"Психовизуальная скорость искажения использует преимущества характеристик человеческого зрения,\n"
-"чтобы значительно улучшить детали и резкость.\n"
-"Эффект можно ослабить или усилить, регулируя силу. Алгоритм скорости искажения\n"
-"требует по меньшей мере установки режима «6»."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Психовизуальные треллисы:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Психовизуальные треллисы являются экспериментальным алгоритмом, способствующим\n"
-"улучшению резкости и сохранения деталей выше, чем это делает психовизуальная скорость искажения.\n"
-"\n"
-"Рекомендуемые значения около 0,2. Более высокие значения могут помочь при очень\n"
-"зернистом видео или низким битрейте кодирования. Не рекомендуется для кель анимации кель\n"
-"и другой графики с острыми краями."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Подавление блочности: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"Фильтр устранения блочности H.264.\n"
-"\n"
-"h.264 имеет встроенный фильтр устранения блочности для сглаживания артефактов блочности\n"
-"после декодирования каждого кадра. Это не только улучшает визуальное качество, но и значительно помогает сжатию. Фильтр деблокирования занимает много ресурсов процессора.\n"
-"Если хотите минимизировать требования к процессору при воспроизведении видео, отключите эту опцию.\n"
-"\n"
-"Фильтр деблокирования имеет два регулируемых параметра, «сила» (Альфа) и\n"
-"«порог» (Бета).\n"
-"Первый контролирует, насколько сильное (или слабое) деблокирование, в то время как последний определяет, сколько\n"
-"(или намного) она применяется. Более низкие значения означают меньше блочности, высокие значения означают больше блочности.\n"
-"По умолчанию 0 (нормальная сила) для обоих параметров."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Не опустошать DCT"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"x264 обычно обнуляет почти пустые блоки данных для сохранения битов, которые\n"
-"лучше будет использовать для других целей в видео. Тем не менее, иногда это\n"
-"может иметь некоторое отрицательное воздействие при сохранении тонких мелких\n"
-"частиц и размытия.\n"
-"Не касайтесь этого, если не испытываете проблем от сохранения мелких шумов."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Восприятие"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"Выбранные опции будут показаны здесь.\n"
-"Вы можете их отредактировать и добавить в дополнительные опции.\n"
-"\n"
-"Значение по умолчанию не будет показано. По умолчанию это:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "Дополнительная строка текущей опции x264"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Дополнительно"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Маркеры глав"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Добавить маркеры глав в выходной файл."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Индекс"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Продолжительность"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Название"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Главы"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Название:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Актеры:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Режиссёр:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Дата выпуска:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Комментарий:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Жанр:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Описание:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Сюжет:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Теги"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Настройки"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Изменить"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Отметить выбранные записи очереди, как в ожидании.\n"
-"Сбросить ожидание очереди заданий и продолжить выполнять задание снова."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Обновить все"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Отметить все записи очереди, как в ожидании.\n"
-"Сбросить ожидание все заданий очереди и продолжить выполнять задание снова."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Удалить все"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Удалить все объекты из очереди."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Сохранить очередь"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Сохранить текущую очередь заданий кодирования в файл.\n"
-"Файл можно перезагрузить в другое время, изменить задания и перекодировать."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Загрузить файл очереди"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Загрузить сохранённый ранее файл очереди."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Сохранить как:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Название папки для перекодированных файлов."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "В:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Папка назначения для перекодированных файлов."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Каталог назначения"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Отмена"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "OK"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Отметить все названия для добавления в очередь"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Очистить все"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Снять все названия"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "С файлами назначения все хорошо. Дубликаты не обнаружены."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Параметры"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Автоматически проверять наличие обновлений"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Когда все кодирование завершено"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 "Использовать автоматический идентификатор (использует измененное исходное "
 "имя)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Шаблон автонаименования"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"Доступные параметры: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 "Использовать дружественное iPod/iTunes расширение файла (.m4v) для MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Количество миниатюр"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Фильтр коротких наименований (в секундах)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"По умолчанию, выполненные задания остаются в очереди и помечаются как завершенные.\n"
+"Отметьте это, если хотите очищать очередь до окончания выполнения задания."
+
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Общие"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Незначительная зернистость при постоянном качестве"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Использовать dvdnav (вместо libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Мониторинг свободного места для диска назначения"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 "Пауза кодирования, если свободное место на диске опускается ниже предела"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "Ограничение Мб"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 "Помещать индивидуальные логи кодирования в то же расположение, что и фильм"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Подробный журнал уровня деятельности"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Долговечный журнала операций"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Уменьшать высокую четкость просмотра"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Автоматически сканировать DVD при загрузке"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Сканировать DVD после загрузки нового диска"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Размер шрифта окна активности"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Скрывать вкладку дополнительной настройки видео"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Используйте дополнительные параметры видео на свой страх и риск.\n"
-"Мы рекомендуем вам использовать доступные элементы управления на\n"
-"на вкладке «Видео»."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Удалять завершённые задачи из очереди"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"По умолчанию, выполненные задания остаются в очереди и помечаются как завершенные.\n"
-"Отметьте это, если хотите очищать очередь до окончания выполнения задания."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Использовать те же настройки для всех заголовков в партии"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2266,71 +1870,67 @@
 "\n"
 "Снимите этот флажок, если вы хотите разрешить изменение настроек каждого заголовка независимо."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Разрешить тонкие настройки"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Сделать HandBrake для чайников"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Название папки:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Описание"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Переименовать предустановку"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Название:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Описание"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Категория:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr "Установить категорию, в которой будет отображаться эта предустановка."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Название категории:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Название предустановки:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Предустановка по умолчанию"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Сделать эту предустановку по умолчанию при запуске HandBrake"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Пользовательский размер изображения"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Максимальная ширина:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Включить лимит максимальной ширины."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2342,15 +1942,15 @@
 "Всякий раз, когда загружается новый источник, это значение будет применяться, если ширина источника больше.\n"
 "Значение 0 означает, что максимальной ширины нет."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Максимальная высота:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Включить лимит максимальной высоты."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2362,11 +1962,15 @@
 "Всякий раз, когда загружается новый источник, это значение будет применяться, если высота источника больше.\n"
 "Значение 0 означает, что максимальной высоты нет."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Выбор кадра просмотра."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2374,80 +1978,107 @@
 "Кодировать и воспроизводить короткие последовательности видео, начиная с "
 "текущего положения просмотра."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Продолжительность:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Установить продолжительность предварительного просмотра в секундах."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Показать границы обрезки"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Показать просмотр обрезанных областей"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Разрешение источника"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 "Сбросить окно предварительного просмотра до разрешения исходного видео"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Открыть"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Количество названий:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Обнаружено устройство DVD:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Импорт SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Включить настройки импорта файла субтитров SRT"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Список встроенных субтитров"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Включить настройки выбранных встроенных субтитров"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Дорожка источника"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Список дорожек субтитров доступных в источнике."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Название дорожки:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Язык"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Кодировка"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Файл:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Смещение (мс)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2455,7 +2086,7 @@
 "Установить язык этих субтитров.\n"
 "Это значение будет использоваться проигрывателями в меню субтитров."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2469,36 +2100,28 @@
 "Мы переводим набор символов в UTF-8.\n"
 "Кодировка источника необходима для того, чтобы выполнить этот перевод."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Выберите файл srt для импорта."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Файл srt"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 "Установить смещение в миллисекундах между видео и метками времени SRT"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Дорожка"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Список дорожек субтитров доступных в источнике."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Только форсированные субтитры"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Записать в видео"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2506,23 +2129,15 @@
 "Отображение субтитров на видео.\n"
 "Субтитры будут на части видео и не могут быть отключены."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Установить дорожку по умолчанию"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Дорожка источника"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Список доступных в источнике звуковых дорожек."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Название дорожки:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2532,15 +2147,15 @@
 "\n"
 "Проигрыватели могут использовать это списке выбора звука. "
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Смешивание"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Частота дискретизации"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2550,31 +2165,31 @@
 "Динамическое сжатие диапазона:\n"
 "Для источника звука, который имеет широкий динамический диапазон. Очень громкие и очень мягкие последовательности, DRC позволяет сжимать диапазон, делая громкие разделы мягче и мягкие разделы громче."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Установить аудио кодек для кодирования этой дорожки."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Включить настройку битрейта"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Качество"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Включить настройку качества"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Установить битрейт для кодирования этой дорожки."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
@@ -2582,19 +2197,19 @@
 "Качество: Для выходного кодека, который поддерживают это, установить "
 "качество вывода."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Установить микширование каналов выходной звуковой дорожки."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Установить частоту дискретизации дорожки вывода звука."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2603,186 +2218,73 @@
 "вывода."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0дБ"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Выкл"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Пропустить эту версию"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Напомнить позже"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "Доступна новая версия HandBrake!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "Доступна новая версия HandBrake xxx (у вас версия yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Заметки о релизе"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Транскодер видео"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake - это инструмент для преобразования видео практически из любого "
-"формата и набор современных, широко поддерживаемых кодеков."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Причины, по которым вы полюбите Handbrake:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Преобразование видео практически из любого формата"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Бесплатный и открытый исходный код"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multi-Platform (Windows, Mac and Linux)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Главное окно и обзор настроек"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Разрешение видео и параметры обрезки"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Настройки видеокодера"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Выбор и настройка звуковой дорожки"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Редактирование заголовка главы"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Не удалось создать %s.</big>\n"
-"\n"
-"Внутренняя ошибка. Не удалось разобрать описание пользовательского интерфейса.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Индекс"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Продолжительность"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Название"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Сведения о задании"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Информация о дорожке"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Название предустановки"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "Устройство или файл для кодирования"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Использовать для кодирования заданные значения"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Много спама"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "Путь к переопределенному каталогу конфигураций пользователя"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Открыть консоль для вывода отладки"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Все"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%dдБ"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Качество: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Битрейт: %dкбит/с\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gкГц"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gкГц)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Битрейт: %.4gкбит/с"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Транзитная передача"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2793,7 +2295,7 @@
 "DRC: %s\n"
 "Название дорожки: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2802,7 +2304,7 @@
 "%sУсиление: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2810,7 +2312,7 @@
 "Добавить аудио кодировщик.\n"
 "Каждая дорожка выбранного источника будет закодирована со всеми выбранными кодировщиками."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2818,39 +2320,39 @@
 "Качество звука:\n"
 "Для выходного кодека, который поддерживают это, установить качество вывода."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Удалить этот кодировщик звука"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Закрытие HandBrake прекратит кодирование.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Не выбрано"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Сканирование…"
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Остановить сканирование"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Название не найдено"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Новое видео"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2861,441 +2363,440 @@
 "\n"
 "%s в %d секунды ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sВаш фильм будет потерян, если вы не продолжать кодирование."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Отменить текущий и остановить"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Отменить текущий, начать следующий"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Закончить текущий, затем остановить"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Продолжить кодирование"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "В ожидании кодирования %d"
+msgid "%d encode pending"
+msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "задание %d из %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "проход %d (сканирование субтитров) из %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "проход %d из %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 "Кодирование: %s%s%.2f %% (%.2f fps, средний %.2f fps, время до окончания "
 "%02d час %02d мин %02d сек)."
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 "Кодирование: %s%s%.2f %% (время до окончания %02d час %02d мин %02d сек)."
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Кодирование: %s%s%.2f %%."
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Поиск времени начала, "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Сканирование фильма %d из %d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Сканирование фильма %d из %d просмотр %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Приостановлено"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Кодирование завершено!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Кодирование отменено."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Ошибка кодирования."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Мультиплексирование: Это может занять некоторое время..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Сканировать этот DVD"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Предупреждение: без потерь)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "Доступна новая версия HandBrake %s/%s (у вас версия %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Кодирование завершено"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "HandBrake завершил кодировать этот фильм!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Кодирование завершено."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Выключение компьютера"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Переход в спящий режим"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Очередь"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Первая дорожка соответствующая выбранным языкам"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Все дорожки соответствующие выбранным языкам"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Дорожка субтитров иностранного языка"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Первая выбранная дорожка"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Иностранный язык, затем первая выбранная дорожка"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Главы:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Секунды:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Кадры:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Ничего не делать"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Показать уведомление"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Выйти из Handbrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Перейти в спящий режим"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Выключить компьютер"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Автоматически"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Произвольно"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Другое"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Неделя"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Месяц"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Год"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Вечно"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Никогда"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Ежедневно"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Еженедельно"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Ежемесячно"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Устранение гребенки"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Нерезкое"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Нерезкое"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 градусов"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 градусов"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 градусов"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Пространственный"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Временной"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Быстро"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Оптимально"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Строгое"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Обычные"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Простые"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Интеллектуальные"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Ромб"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Шестиугольник"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Неравномерный мульти-шестиугольник"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Полный"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Исчерпывающая Адамара"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, без субпиксельной"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel во всех"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel во всех"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD в I/P-кадрах"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD во всех кадрах"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD улучшать в I/P-кадрах"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD улучшать во всех кадрах"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD во всех кадрах"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: Без ранние сделанных анализов"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Большинство"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Некоторые"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Все"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Только кодирование"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Всегда"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Как в источнике"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(Фильм NTSC)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(Фильм/видео PAL)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(Видео NTSC)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02d час %02d мин %02d сек - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02d час %02d мин %02d сек - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02d час %02d мин %02d сек"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Без названия"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Нет звука"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Любой"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3308,7 +2809,7 @@
 "Предустановка:\t%s\n"
 "Другое:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3319,7 +2820,7 @@
 "\n"
 "Предустановка:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3332,7 +2833,7 @@
 "Предустановка:\t%s\n"
 "Другое:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3343,7 +2844,7 @@
 "\n"
 "Предустановка:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3358,7 +2859,7 @@
 "Предустановка:\t%s\n"
 "Другое:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3371,7 +2872,7 @@
 "Фильтр:\t%s\n"
 "Предустановка:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3388,7 +2889,7 @@
 "Настройка:\t%s\n"
 "Другое:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3405,8 +2906,7 @@
 "Настройка:\t%s\n"
 "Другое:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3418,18 +2918,25 @@
 "Необходимо выбрать другой видеокодек или контейнер.\n"
 "Если продолжите, для вас будет выбран ffmpeg."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Продолжить"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Название не найдено.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3441,8 +2948,15 @@
 "Вы должны изменить настройки субтитров.\n"
 "Если продолжите, некоторые субтитры будут потеряны."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3454,8 +2968,7 @@
 "Вам следует выбрать правильный файл.\n"
 "Если продолжите, эти субтитры будут игнорироваться."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3467,7 +2980,7 @@
 "Вы должны выбрать другой звуковой кодек.\n"
 "Если вы продолжите, один из них будет выбран для вас."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3480,16 +2993,56 @@
 "Вам следует выбрать другой кодировщик звука.\n"
 "Если продолжите, один будет выбран для вас."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Не удалось создать %s.</big>\n"
+"\n"
+"Внутренняя ошибка. Не удалось разобрать описание пользовательского интерфейса.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Информация о дорожке"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Название предустановки"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Устройство или файл для кодирования"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Использовать для кодирования заданные значения"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Много спама"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "Путь к переопределенному каталогу конфигураций пользователя"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Открыть консоль для вывода отладки"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr "ghb_presets_menu_init: Не удалось найти папку предустановок."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "Не удалось найти родительскую папку."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3499,31 +3052,31 @@
 "\n"
 "Продолжить?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Забери меня отсюда!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Загрузить резервную копию предустановки"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Все (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Предустановки (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Устаревшие предустановки (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Экспорт предустановки"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3534,15 +3087,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "папку"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "Предустановка"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3555,269 +3108,206 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Секунды"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Кадры"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
 msgstr ""
-"<big>%s</big> (Название %d, %s %d по %d, 2 прохода видео) --> "
-"%s"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (Название %d, %s %d по %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr ""
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Изменен шаблон на основе: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Предустановка: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Формат: Контейнер %s\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Параметры контейнера:"
+msgid "%s, Bitrate %dkbps"
+msgstr ""
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sМаркеры глав"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%sПоддержка iPod 5G"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sОптимизация для интернет-трансляции"
+msgid "%sPreset %s"
+msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Назначение: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Соотношение сохранилось)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Соотношение потерялось)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Анаморфотный)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Пользовательский анаморфотный)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Изображение:"
+msgid "%sTune %s"
+msgstr ""
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Источник: %d x %d, Вывод %d x %d %s, Обрезка %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Дисплей %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Фильтры:"
+msgid "%sLevel %s"
+msgstr ""
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sДетелесин"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sШумоподавление %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sУровень блочности: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sЧёрно-белое"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Видео: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(постоянная)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(переменная)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Частота кадров: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Частота кадров: Пик %s (может быть ниже)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Частота кадров: %s (включает постоянную частоту кадров)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Ошибка"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Битрейт:"
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "кбит/с"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "Turbo 1 проход: На\n"
+msgid "%d Day %02d:%02d:%02d"
+msgstr ""
 
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Параметры видео: Предустановка: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Настройки: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Профиль: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Уровень: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Дополнительные опции: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Аудио: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Звуковые дорожки: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Битрейт: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Кодировщик: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
 msgstr ""
-"%d - %s --> Кодировщик: %s, Микширование: %s, Частота дискредитации: %s, %s"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Субтитры:"
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Ошибка"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Дорожки субтитров: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Только форсированные)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (Записать)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (По умолчанию)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Смещение (мс) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sФайловая система почти заполнена: %<PRIu64> Мб свободно\n"
-"\n"
-"Назначение: %s\n"
-"Кодирование может быть неполным, если продолжите.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Возобновить, я исправил проблему"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Возобновить, не говорить мне снова"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3830,11 +3320,11 @@
 "Другое задание в очереди имеет это же назначение.\n"
 "Хотите его перезаписать?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3845,7 +3335,7 @@
 "\n"
 "Это не допустимый каталог."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3856,7 +3346,7 @@
 "\n"
 "Не удается чтение или запись в папку."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3869,16 +3359,16 @@
 "Файл уже существует.\n"
 "Хотите его переписать?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Отметить все названия для добавления в очередь.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Без названия"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3888,31 +3378,31 @@
 "Это название не будет добавлено в очередь, если не изменить\n"
 "имя выходного файла.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Остановить"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Остановить кодирование"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "О_становить кодирование"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Возобновить"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Продолжить кодирование"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "О_становить кодирование"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Продолжить кодирование"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3920,24 +3410,22 @@
 "Вы сейчас кодируете. Что бы вы хотели сделать?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Предпочитаемый язык: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Добавить %s дорожку субтитров, если не звука по умолчанию %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Добавить дорожку субтитров, если для звука по умолчанию нет нужного языка"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3950,8 +3438,7 @@
 "Расширенные параметры:\n"
 "«%s»"
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3963,3 +3450,8 @@
 "\n"
 "Расширенные параметры:\n"
 "«»"
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Предупреждение: без потерь)"

HandBrake-1.5.1.tar.xz/gtk/po/si.po Added

@@ -0,0 +1,3125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Hela Basa, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ghb 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
+"PO-Revision-Date: 2018-10-10 18:14+0000\n"
+"Last-Translator: Hela Basa, 2021\n"
+"Language-Team: Sinhala (https://www.transifex.com/HandBrakeProject/teams/92423/si/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: si\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/ghb3.ui:23
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:26
+msgid "Burned In"
+msgstr ""
+
+#: src/ghb3.ui:32 src/ghb3.ui:9122
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+#: src/ghb3.ui:39
+msgid "Default"
+msgstr ""
+
+#: src/ghb3.ui:45 src/ghb3.ui:9084
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:51
+msgid "Forced Only"
+msgstr ""
+
+#: src/ghb3.ui:57
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+#: src/ghb3.ui:63
+msgid "SRT Offset"
+msgstr ""
+
+#: src/ghb3.ui:69
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Scan\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+#: src/ghb3.ui:80
+msgid "Track"
+msgstr ""
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr ""
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr ""
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr "සුරකින්න (_S)"
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr ""
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr ""
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr ""
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr ""
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr ""
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr ""
+
+#: src/ghb3.ui:304
+msgid "Presets List"
+msgstr ""
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "අරඹන්න"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr ""
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr ""
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr ""
+
+#: src/ghb3.ui:1716
+msgid ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , HandBrake Devs"
+msgstr ""
+
+#: src/ghb3.ui:1718
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+
+#: src/ghb3.ui:1720
+msgid "https://handbrake.fr"
+msgstr ""
+
+#: src/ghb3.ui:1721
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/ghb3.ui:1907
+msgid "HandBrake"
+msgstr ""
+
+#: src/ghb3.ui:1930
+msgid "_File"
+msgstr ""
+
+#: src/ghb3.ui:1938
+msgid "Open _Source"
+msgstr ""
+
+#: src/ghb3.ui:1947
+msgid "Open Single _Title"
+msgstr ""
+
+#: src/ghb3.ui:1956
+msgid "Set _Destination"
+msgstr ""
+
+#: src/ghb3.ui:1971
+msgid "_Preferences"
+msgstr ""
+
+#: src/ghb3.ui:1986
+msgid "_Quit"
+msgstr ""
+
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
+msgid "_Queue"
+msgstr ""
+
+#: src/ghb3.ui:2009
+msgid "_Add"
+msgstr ""
+
+#: src/ghb3.ui:2018
+msgid "Add _Multiple"
+msgstr ""
+
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
+msgid "_Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
+msgid "_Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2045
+msgid "S_ave Queue"
+msgstr ""
+
+#: src/ghb3.ui:2054
+msgid "_Load Queue File"
+msgstr ""
+
+#: src/ghb3.ui:2069
+msgid "_View"
+msgstr ""
+
+#: src/ghb3.ui:2077
+msgid "HandBrake For _Dumbies"
+msgstr ""
+
+#: src/ghb3.ui:2086
+msgid "Presets _List"
+msgstr ""
+
+#: src/ghb3.ui:2104
+msgid "_Preview"
+msgstr ""
+
+#: src/ghb3.ui:2113
+msgid "_Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2229
+msgid "_Help"
+msgstr ""
+
+#: src/ghb3.ui:2237
+msgid "_About"
+msgstr "පිළිබඳව (_A)"
+
+#: src/ghb3.ui:2246
+msgid "_Guide"
+msgstr ""
+
+#: src/ghb3.ui:2284 src/callbacks.c:4123
+msgid "Choose Video Source"
+msgstr ""
+
+#: src/ghb3.ui:2286 src/callbacks.c:4122
+msgid "Open Source"
+msgstr ""
+
+#: src/ghb3.ui:2309
+msgid "Add to Queue"
+msgstr ""
+
+#: src/ghb3.ui:2311
+msgid "Add To Queue"
+msgstr ""
+
+#: src/ghb3.ui:2366
+msgid "Show Presets Window"
+msgstr ""
+
+#: src/ghb3.ui:2368
+msgid "Presets"
+msgstr ""
+
+#: src/ghb3.ui:2381
+msgid "Show Preview Window"
+msgstr ""
+
+#: src/ghb3.ui:2383
+msgid "Preview"
+msgstr "පෙරදසුන"
+
+#: src/ghb3.ui:2396
+msgid "Show Queue"
+msgstr ""
+
+#: src/ghb3.ui:2398 src/callbacks.c:4567
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:2411
+msgid "Show Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2413
+msgid "Activity"
+msgstr ""
+
+#: src/ghb3.ui:2443
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
+msgid "None"
+msgstr ""
+
+#: src/ghb3.ui:2514 src/callbacks.c:4095
+msgid "Scanning..."
+msgstr ""
+
+#: src/ghb3.ui:2548
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:2576
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+#: src/ghb3.ui:2598
+msgid "No Titles"
+msgstr ""
+
+#: src/ghb3.ui:2616
+msgid "Angle:"
+msgstr ""
+
+#: src/ghb3.ui:2628
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+#: src/ghb3.ui:2644
+msgid "Range:"
+msgstr ""
+
+#: src/ghb3.ui:2655
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+#: src/ghb3.ui:2668
+msgid "Set the first chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2683
+msgid "-"
+msgstr ""
+
+#: src/ghb3.ui:2695
+msgid "Set the last chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2720
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:2756
+msgid "Choose Preset"
+msgstr ""
+
+#: src/ghb3.ui:2787
+msgid "Modified"
+msgstr ""
+
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
+msgid "Reload"
+msgstr ""
+
+#: src/ghb3.ui:2799
+msgid ""
+"Reload the settings for the currently selected preset.\n"
+"Modifications will be discarded."
+msgstr ""
+
+#: src/ghb3.ui:2811
+msgid "Save New Preset"
+msgstr ""
+
+#: src/ghb3.ui:2814
+msgid "Save the current settings to a new Preset."
+msgstr ""
+
+#: src/ghb3.ui:2896
+msgid "Format:"
+msgstr ""
+
+#: src/ghb3.ui:2914
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+#: src/ghb3.ui:2926 src/queuehandler.c:290
+msgid "Web Optimized"
+msgstr ""
+
+#: src/ghb3.ui:2931
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+#: src/ghb3.ui:2947
+msgid "Align A/V Start"
+msgstr ""
+
+#: src/ghb3.ui:2952
+msgid ""
+"Aligns the initial timestamps of all audio and video streams by\n"
+"inserting blank frames or dropping frames. May improve audio/video\n"
+"sync for broken players that do not honor MP4 edit lists."
+msgstr ""
+
+#: src/ghb3.ui:2969
+msgid "iPod 5G Support"
+msgstr ""
+
+#: src/ghb3.ui:2974
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+#: src/ghb3.ui:2996
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:3014
+msgid "hh:mm:ss"
+msgstr ""
+
+#: src/ghb3.ui:3029
+msgid "Tracks:"
+msgstr ""
+
+#: src/ghb3.ui:3069
+msgid "Filters:"
+msgstr ""
+
+#: src/ghb3.ui:3109
+msgid "Size:"
+msgstr ""
+
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
+msgid "--"
+msgstr ""
+
+#: src/ghb3.ui:3227
+msgid "Auto Crop"
+msgstr ""
+
+#: src/ghb3.ui:3232
+msgid "Automatically crop black borders around edges of the video."
+msgstr ""
+
+#: src/ghb3.ui:3246
+msgid "Loose Crop"
+msgstr ""
+
+#: src/ghb3.ui:3250
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+#: src/ghb3.ui:3272
+msgid "Left Crop"
+msgstr ""
+
+#: src/ghb3.ui:3289
+msgid "Top Crop"
+msgstr ""
+
+#: src/ghb3.ui:3306
+msgid "Bottom Crop"
+msgstr ""
+
+#: src/ghb3.ui:3323
+msgid "Right Crop"
+msgstr ""
+
+#: src/ghb3.ui:3340
+msgid "Crop Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:3376
+msgid "Cropping"
+msgstr ""
+
+#: src/ghb3.ui:3411
+msgid "Optimal for source"
+msgstr ""
+
+#: src/ghb3.ui:3415
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
+msgid "Width:"
+msgstr ""
+
+#: src/ghb3.ui:3448
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
+msgid "Height:"
+msgstr ""
+
+#: src/ghb3.ui:3481
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3511
+msgid "Anamorphic:"
+msgstr ""
+
+#: src/ghb3.ui:3526
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Use a pixel aspect ratio that is as\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
+"Automatic - Use a pixel aspect ratio that maximizes\n"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
+msgstr ""
+
+#: src/ghb3.ui:3550
+msgid "Alignment:"
+msgstr ""
+
+#: src/ghb3.ui:3565
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+#: src/ghb3.ui:3590
+msgid "Storage Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3625
+msgid "Keep Aspect"
+msgstr ""
+
+#: src/ghb3.ui:3630
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+#: src/ghb3.ui:3663
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+
+#: src/ghb3.ui:3724
+msgid "Pixel Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3739
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3759
+msgid ":"
+msgstr ""
+
+#: src/ghb3.ui:3774
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3794
+msgid "Display Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3809
+msgid "--:--"
+msgstr ""
+
+#: src/ghb3.ui:3830
+msgid "Display Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3848
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:3876
+msgid "Detelecine:"
+msgstr ""
+
+#: src/ghb3.ui:3892
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+#: src/ghb3.ui:3907
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+#: src/ghb3.ui:3935
+msgid "Interlace Detection:"
+msgstr ""
+
+#: src/ghb3.ui:3951
+msgid ""
+"This filter detects interlaced frames.\n"
+"\n"
+"If a deinterlace filter is enabled, only frames that this filter finds\n"
+"to be interlaced will be deinterlaced."
+msgstr ""
+
+#: src/ghb3.ui:3967
+msgid ""
+"Custom interlace detection filter string format\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+msgstr ""
+
+#: src/ghb3.ui:3996
+msgid "Deinterlace:"
+msgstr ""
+
+#: src/ghb3.ui:4012
+msgid ""
+"Choose decomb or deinterlace filter.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4031
+msgid "Deinterlace Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4047
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
+msgid "Denoise Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+#: src/ghb3.ui:4213
+msgid "Denoise Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4246
+msgid "Denoise Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+#: src/ghb3.ui:4305
+msgid "Sharpen Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
+msgid ""
+"Sharpen filtering enhances edges and other\n"
+"high frequency components in the video."
+msgstr ""
+
+#: src/ghb3.ui:4337
+msgid "Sharpen Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4369
+msgid "Sharpen Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4427
+msgid "Rotate Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4443
+msgid "Rotate the video clockwise in 90 degree increments."
+msgstr ""
+
+#: src/ghb3.ui:4457
+msgid "Grayscale"
+msgstr ""
+
+#: src/ghb3.ui:4462
+msgid "If enabled, filter colour components out of video."
+msgstr ""
+
+#: src/ghb3.ui:4473
+msgid "Filters"
+msgstr ""
+
+#: src/ghb3.ui:4504
+msgid "Video Encoder:"
+msgstr ""
+
+#: src/ghb3.ui:4518
+msgid "Available video encoders."
+msgstr ""
+
+#: src/ghb3.ui:4534
+msgid "Framerate:"
+msgstr ""
+
+#: src/ghb3.ui:4549
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+#: src/ghb3.ui:4564
+msgid "Constant Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4569
+msgid "Enables constant framerate output."
+msgstr ""
+
+#: src/ghb3.ui:4583
+msgid "Peak Framerate (VFR)"
+msgstr ""
+
+#: src/ghb3.ui:4588
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4606
+msgid "Variable Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4611
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+#: src/ghb3.ui:4674
+msgid "Constant Quality:"
+msgstr ""
+
+#: src/ghb3.ui:4705
+msgid "Bitrate (kbps): "
+msgstr ""
+
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+#: src/ghb3.ui:4749
+msgid "2-Pass Encoding"
+msgstr ""
+
+#: src/ghb3.ui:4754
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+#: src/ghb3.ui:4772
+msgid "Turbo First Pass"
+msgstr ""
+
+#: src/ghb3.ui:4777
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+#: src/ghb3.ui:4839
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+#: src/ghb3.ui:4865
+msgid "Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4882
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve efficiency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+#: src/ghb3.ui:4898
+msgid "Fast Decode"
+msgstr ""
+
+#: src/ghb3.ui:4903
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+#: src/ghb3.ui:4921
+msgid "Zero Latency"
+msgstr ""
+
+#: src/ghb3.ui:4925
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+#: src/ghb3.ui:4949
+msgid "Profile:"
+msgstr ""
+
+#: src/ghb3.ui:4966
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:4984
+msgid "Level:"
+msgstr ""
+
+#: src/ghb3.ui:5001
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:5026
+msgid "More Settings:"
+msgstr ""
+
+#: src/ghb3.ui:5044
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+#: src/ghb3.ui:5078 src/main.c:1155
+msgid "Video"
+msgstr ""
+
+#. Add Button
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
+msgid "Add"
+msgstr ""
+
+#: src/ghb3.ui:5146
+msgid "Add new audio settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
+msgid "Add All"
+msgstr ""
+
+#: src/ghb3.ui:5158
+msgid "Add all audio tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5171
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr ""
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
+msgid "Selection Behavior:"
+msgstr ""
+
+#: src/ghb3.ui:5261
+msgid "Choose which audio tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:5322
+msgid ""
+"Create a list of languages you would like to select audio for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior."
+msgstr ""
+
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
+msgid "Remove"
+msgstr ""
+
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
+msgid "Available Languages"
+msgstr ""
+
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
+msgid "Selected Languages"
+msgstr ""
+
+#: src/ghb3.ui:5400
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+#: src/ghb3.ui:5405
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+#: src/ghb3.ui:5441
+msgid "Auto Passthru:"
+msgstr ""
+
+#: src/ghb3.ui:5452
+msgid "MP3"
+msgstr ""
+
+#: src/ghb3.ui:5457
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5473
+msgid "AAC"
+msgstr ""
+
+#: src/ghb3.ui:5478
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5494
+msgid "AC-3"
+msgstr ""
+
+#: src/ghb3.ui:5499
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5515
+msgid "DTS"
+msgstr ""
+
+#: src/ghb3.ui:5520
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5536
+msgid "DTS-HD"
+msgstr ""
+
+#: src/ghb3.ui:5541
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5557
+msgid "EAC-3"
+msgstr ""
+
+#: src/ghb3.ui:5562
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5578
+msgid "TrueHD"
+msgstr ""
+
+#: src/ghb3.ui:5583
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5599
+msgid "FLAC"
+msgstr ""
+
+#: src/ghb3.ui:5604
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5637
+msgid "Passthru Fallback:"
+msgstr ""
+
+#: src/ghb3.ui:5649
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+#: src/ghb3.ui:5678
+msgid "Audio Encoder Settings:"
+msgstr ""
+
+#: src/ghb3.ui:5679
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
+msgid "Encoder"
+msgstr ""
+
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
+msgid "Bitrate/Quality"
+msgstr ""
+
+#: src/ghb3.ui:5726
+msgid "Mixdown"
+msgstr ""
+
+#: src/ghb3.ui:5737
+msgid "Samplerate"
+msgstr ""
+
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
+msgid "Gain"
+msgstr ""
+
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
+msgid "DRC"
+msgstr ""
+
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr ""
+
+#: src/ghb3.ui:5808
+msgid "Audio"
+msgstr ""
+
+#: src/ghb3.ui:5876
+msgid "Add new subtitle settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5888
+msgid "Add all subtitle tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
+msgid "Foreign Audio Scan"
+msgstr ""
+
+#: src/ghb3.ui:5900
+msgid ""
+"Add an extra pass to the encode which searches\n"
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:5915
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:6009
+msgid "Choose which subtitle tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:6074
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+
+#: src/ghb3.ui:6155
+msgid "Preferred Language: None"
+msgstr ""
+
+#: src/ghb3.ui:6182
+msgid "Add Foreign Audio Scan Pass"
+msgstr ""
+
+#: src/ghb3.ui:6187
+msgid ""
+"Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6202
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+#: src/ghb3.ui:6207
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle track.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6221
+msgid "Add Closed Captions when available"
+msgstr ""
+
+#: src/ghb3.ui:6226
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track"
+msgstr ""
+
+#: src/ghb3.ui:6247
+msgid "Burn-In Behavior*:"
+msgstr ""
+
+#: src/ghb3.ui:6259
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6286
+msgid "Burn-In for deficient players*:"
+msgstr ""
+
+#: src/ghb3.ui:6295
+msgid "DVD Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6300
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6314
+msgid "Blu-ray Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6319
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6341
+msgid ""
+"* Only one of the above subtitle burn options will be applied, "
+"starting with the top."
+msgstr ""
+
+#: src/ghb3.ui:6342
+msgid ""
+"Only one subtitle track can be burned! Since conflicts can occur, the first "
+"chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6366
+msgid "Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr ""
+
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr ""
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr ""
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr ""
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr ""
+
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr ""
+
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr ""
+
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr ""
+
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr ""
+
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr ""
+
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr ""
+
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr ""
+
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr ""
+
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr ""
+
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr ""
+
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr ""
+
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr ""
+
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr ""
+
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr ""
+
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr ""
+
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr ""
+
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr ""
+
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr ""
+
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr ""
+
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr ""
+
+#: src/ghb3.ui:7310
+msgid ""
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
+msgstr ""
+
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr ""
+
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr ""
+
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr ""
+
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr ""
+
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr ""
+
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr ""
+
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr ""
+
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr ""
+
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr ""
+
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr ""
+
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
+msgstr ""
+
+#: src/ghb3.ui:7767
+msgid "Use the same settings for all titles in a batch"
+msgstr ""
+
+#: src/ghb3.ui:7771
+msgid ""
+"When checked, every title will use the same settings when adding a\n"
+"batch of titles to the queue.\n"
+"\n"
+"Uncheck this if you want to allow changing each title's settings independently."
+msgstr ""
+
+#: src/ghb3.ui:7799
+msgid "Allow Tweaks"
+msgstr ""
+
+#: src/ghb3.ui:7815
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+#: src/ghb3.ui:7843
+msgid "Advanced"
+msgstr ""
+
+#: src/ghb3.ui:7921
+msgid "Rename Preset"
+msgstr ""
+
+#: src/ghb3.ui:7941
+msgid "Name:"
+msgstr ""
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
+msgid "Category:"
+msgstr ""
+
+#: src/ghb3.ui:8094
+msgid "Set the category that this preset will be shown under."
+msgstr ""
+
+#: src/ghb3.ui:8110
+msgid "Category Name:"
+msgstr ""
+
+#: src/ghb3.ui:8143
+msgid "Preset Name:"
+msgstr ""
+
+#: src/ghb3.ui:8177
+msgid "Default Preset"
+msgstr ""
+
+#: src/ghb3.ui:8182
+msgid "Make this the default Preset when HandBrake starts"
+msgstr ""
+
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:8234
+msgid "Maximum Width:"
+msgstr ""
+
+#: src/ghb3.ui:8239
+msgid "Enable maximum width limit."
+msgstr ""
+
+#: src/ghb3.ui:8257
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+#: src/ghb3.ui:8274
+msgid "Maximum Height:"
+msgstr ""
+
+#: src/ghb3.ui:8279
+msgid "Enable maximum height limit."
+msgstr ""
+
+#: src/ghb3.ui:8297
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
+msgid "Select preview frames."
+msgstr ""
+
+#: src/ghb3.ui:8449
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+#: src/ghb3.ui:8520
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:8532
+msgid "Set the duration of the live preview in seconds."
+msgstr ""
+
+#: src/ghb3.ui:8548
+msgid "Show Crop"
+msgstr ""
+
+#: src/ghb3.ui:8552
+msgid "Show Cropped area of the preview"
+msgstr ""
+
+#: src/ghb3.ui:8563
+msgid "Source Resolution"
+msgstr ""
+
+#: src/ghb3.ui:8567
+msgid "Reset preview window to the source video's resolution"
+msgstr ""
+
+#: src/ghb3.ui:8599
+msgid "_Cancel"
+msgstr ""
+
+#: src/ghb3.ui:8611
+msgid "_Open"
+msgstr ""
+
+#: src/ghb3.ui:8645
+msgid "Title Number:"
+msgstr ""
+
+#: src/ghb3.ui:8681
+msgid "Detected DVD devices:"
+msgstr ""
+
+#: src/ghb3.ui:8791
+msgid "Import SRT"
+msgstr ""
+
+#: src/ghb3.ui:8796
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
+msgid "Embedded Subtitle List"
+msgstr ""
+
+#: src/ghb3.ui:8829
+msgid "Enable settings to select embedded subtitles"
+msgstr ""
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
+msgid "Language"
+msgstr ""
+
+#: src/ghb3.ui:8948
+msgid "Character Code"
+msgstr ""
+
+#: src/ghb3.ui:8962
+msgid "File:"
+msgstr ""
+
+#: src/ghb3.ui:8977
+msgid "Offset (ms)"
+msgstr ""
+
+#: src/ghb3.ui:8992
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+#: src/ghb3.ui:9010
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+#: src/ghb3.ui:9034
+msgid "Select the SRT file to import."
+msgstr ""
+
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
+
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+#: src/ghb3.ui:9079
+msgid "Forced Subtitles Only"
+msgstr ""
+
+#: src/ghb3.ui:9100
+msgid "Burn into video"
+msgstr ""
+
+#: src/ghb3.ui:9105
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:9117
+msgid "Set Default Track"
+msgstr ""
+
+#: src/ghb3.ui:9215
+msgid "List of audio tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:9245
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+#: src/ghb3.ui:9308
+msgid "Mix"
+msgstr ""
+
+#: src/ghb3.ui:9321
+msgid "Sample Rate"
+msgstr ""
+
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
+msgid "Set the audio codec to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
+msgid "Bitrate"
+msgstr ""
+
+#: src/ghb3.ui:9399
+msgid "Enable bitrate setting"
+msgstr ""
+
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
+msgid "Quality"
+msgstr ""
+
+#: src/ghb3.ui:9414
+msgid "Enable quality setting"
+msgstr ""
+
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
+msgid "Set the bitrate to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9455
+msgid ""
+"Quality: For output codec's that support it, adjust the quality of "
+"the output."
+msgstr ""
+
+#: src/ghb3.ui:9477
+msgid "00.0"
+msgstr ""
+
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
+msgid "Set the mixdown of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
+msgid "Set the sample rate of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+#. Audio Gain Label
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
+msgid "0dB"
+msgstr ""
+
+#. Audio DRC Label
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
+msgid "Off"
+msgstr ""
+
+#: src/ghb3.ui:9644
+msgid "Skip This Version"
+msgstr ""
+
+#: src/ghb3.ui:9652
+msgid "Remind Me Later"
+msgstr ""
+
+#: src/ghb3.ui:9721
+msgid "A new version of HandBrake is available!"
+msgstr ""
+
+#: src/ghb3.ui:9737
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr ""
+
+#: src/ghb3.ui:9765
+msgid "Release Notes"
+msgstr ""
+
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
+#, c-format
+msgid "%ddB"
+msgstr ""
+
+#: src/audiohandler.c:726
+msgid "Quality: "
+msgstr ""
+
+#: src/audiohandler.c:733
+#, c-format
+msgid "Bitrate: %dkbps\n"
+msgstr ""
+
+#: src/audiohandler.c:745
+#, c-format
+msgid "%.4gkHz"
+msgstr ""
+
+#: src/audiohandler.c:760
+#, c-format
+msgid "%d - %s (%.4gkHz)"
+msgstr ""
+
+#: src/audiohandler.c:765
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr ""
+
+#: src/audiohandler.c:771
+msgid "Passthrough"
+msgstr ""
+
+#: src/audiohandler.c:780
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+
+#: src/audiohandler.c:785
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s"
+msgstr ""
+
+#: src/audiohandler.c:1746
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+#: src/audiohandler.c:1826
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+#: src/audiohandler.c:1946
+msgid "Remove this audio encoder"
+msgstr ""
+
+#: src/callbacks.c:793 src/callbacks.c:2144
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr ""
+
+#: src/callbacks.c:1378
+msgid "Not Selected"
+msgstr ""
+
+#. This needs to be in scanning and working since scanning
+#. happens fast enough that it can be missed
+#: src/callbacks.c:1711 src/callbacks.c:4182
+msgid "Scanning ..."
+msgstr ""
+
+#: src/callbacks.c:1747 src/callbacks.c:1748
+msgid "Stop Scan"
+msgstr ""
+
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
+msgid "No Title Found"
+msgstr ""
+
+#: src/callbacks.c:2736
+msgid "New Video"
+msgstr ""
+
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+
+#: src/callbacks.c:3666 src/callbacks.c:3708
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
+msgid "Cancel Current and Stop"
+msgstr ""
+
+#: src/callbacks.c:3670
+msgid "Cancel Current, Start Next"
+msgstr ""
+
+#: src/callbacks.c:3671
+msgid "Finish Current, then Stop"
+msgstr ""
+
+#: src/callbacks.c:3672 src/callbacks.c:3712
+msgid "Continue Encoding"
+msgstr ""
+
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
+#, c-format
+msgid "job %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3961
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#: src/callbacks.c:3966
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3979
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3989 src/callbacks.c:4029
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3999 src/callbacks.c:4038
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr ""
+
+#: src/callbacks.c:4025
+msgid "Searching for start time, "
+msgstr ""
+
+#: src/callbacks.c:4100
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#: src/callbacks.c:4104
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+#: src/callbacks.c:4193
+msgid "Paused"
+msgstr ""
+
+#: src/callbacks.c:4224
+msgid "Encode Done!"
+msgstr ""
+
+#: src/callbacks.c:4228
+msgid "Encode Canceled."
+msgstr ""
+
+#: src/callbacks.c:4233
+msgid "Encode Failed."
+msgstr ""
+
+#: src/callbacks.c:4275
+msgid "Muxing: This may take a while..."
+msgstr ""
+
+#: src/callbacks.c:4877
+msgid "Scan this DVD source"
+msgstr ""
+
+#: src/callbacks.c:5265
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr ""
+
+#: src/callbacks.c:5446
+msgid "Encode Complete"
+msgstr ""
+
+#: src/callbacks.c:5448
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr ""
+
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
+msgid "Your encode is complete."
+msgstr ""
+
+#: src/callbacks.c:5462
+msgid "Shutting down the computer"
+msgstr ""
+
+#: src/callbacks.c:5472
+msgid "Putting computer to sleep"
+msgstr ""
+
+#: src/callbacks.c:5480
+msgid "Quitting Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:60 src/hb-backend.c:85
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:61 src/hb-backend.c:86
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:72
+msgid "Foreign Audio Subtitle Track"
+msgstr ""
+
+#: src/hb-backend.c:73
+msgid "First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:74
+msgid "Foreign Audio, then First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:96
+msgid "Chapters:"
+msgstr ""
+
+#: src/hb-backend.c:97
+msgid "Seconds:"
+msgstr ""
+
+#: src/hb-backend.c:98
+msgid "Frames:"
+msgstr ""
+
+#: src/hb-backend.c:108
+msgid "Do Nothing"
+msgstr ""
+
+#: src/hb-backend.c:109
+msgid "Show Notification"
+msgstr ""
+
+#: src/hb-backend.c:110
+msgid "Quit Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:111
+msgid "Put Computer To Sleep"
+msgstr ""
+
+#: src/hb-backend.c:112
+msgid "Shutdown Computer"
+msgstr ""
+
+#: src/hb-backend.c:123 src/hb-backend.c:252
+msgid "Automatic"
+msgstr ""
+
+#: src/hb-backend.c:124
+msgid "Loose"
+msgstr ""
+
+#: src/hb-backend.c:125 src/hb-backend.c:337
+msgid "Custom"
+msgstr ""
+
+#: src/hb-backend.c:161
+msgid "Week"
+msgstr ""
+
+#: src/hb-backend.c:162
+msgid "Month"
+msgstr ""
+
+#: src/hb-backend.c:163
+msgid "Year"
+msgstr ""
+
+#: src/hb-backend.c:164
+msgid "Immortal"
+msgstr ""
+
+#: src/hb-backend.c:174
+msgid "Never"
+msgstr ""
+
+#: src/hb-backend.c:175
+msgid "Daily"
+msgstr ""
+
+#: src/hb-backend.c:176
+msgid "Weekly"
+msgstr ""
+
+#: src/hb-backend.c:177
+msgid "Monthly"
+msgstr ""
+
+#: src/hb-backend.c:201
+msgid "Decomb"
+msgstr ""
+
+#: src/hb-backend.c:202
+msgid "Yadif"
+msgstr ""
+
+#: src/hb-backend.c:213
+msgid "NLMeans"
+msgstr ""
+
+#: src/hb-backend.c:214
+msgid "HQDN3D"
+msgstr ""
+
+#: src/hb-backend.c:225
+msgid "Unsharp"
+msgstr ""
+
+#: src/hb-backend.c:226
+msgid "Lapsharp"
+msgstr ""
+
+#: src/hb-backend.c:237
+msgid "90 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:238
+msgid "180 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:239
+msgid "270 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:250
+msgid "Spatial"
+msgstr ""
+
+#: src/hb-backend.c:251
+msgid "Temporal"
+msgstr ""
+
+#: src/hb-backend.c:263
+msgid "Fast"
+msgstr ""
+
+#: src/hb-backend.c:264
+msgid "Optimal"
+msgstr ""
+
+#: src/hb-backend.c:275
+msgid "Strict"
+msgstr ""
+
+#: src/hb-backend.c:276
+msgid "Normal"
+msgstr ""
+
+#: src/hb-backend.c:287
+msgid "Simple"
+msgstr ""
+
+#: src/hb-backend.c:288
+msgid "Smart"
+msgstr ""
+
+#: src/hb-backend.c:298
+msgid "Diamond"
+msgstr ""
+
+#: src/hb-backend.c:299
+msgid "Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:300
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:301
+msgid "Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:302
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:312
+msgid "0: SAD, no subpel"
+msgstr ""
+
+#: src/hb-backend.c:313
+msgid "1: SAD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:314
+msgid "2: SATD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:315
+msgid "3: SATD: multi-qpel"
+msgstr ""
+
+#: src/hb-backend.c:316
+msgid "4: SATD, qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:317
+msgid "5: SATD, multi-qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:318
+msgid "6: RD in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:319
+msgid "7: RD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:320
+msgid "8: RD refine in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:321
+msgid "9: RD refine in all frames"
+msgstr ""
+
+#: src/hb-backend.c:322
+msgid "10: QPRD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:323
+msgid "11: No early terminations in analysis"
+msgstr ""
+
+#: src/hb-backend.c:333
+msgid "Most"
+msgstr ""
+
+#: src/hb-backend.c:335
+msgid "Some"
+msgstr ""
+
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
+msgid "Encode only"
+msgstr ""
+
+#: src/hb-backend.c:349
+msgid "Always"
+msgstr ""
+
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
+msgid "Same as source"
+msgstr ""
+
+#: src/hb-backend.c:1499
+msgid "(NTSC Film)"
+msgstr ""
+
+#: src/hb-backend.c:1503
+msgid "(PAL Film/Video)"
+msgstr ""
+
+#: src/hb-backend.c:1507
+msgid "(NTSC Video)"
+msgstr ""
+
+#: src/hb-backend.c:2074
+#, c-format
+msgid "%s - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2224
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - %s"
+msgstr ""
+
+#: src/hb-backend.c:2243
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2249
+#, c-format
+msgid "%3d - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2255
+#, c-format
+msgid "%3d - %02dh%02dm%02ds"
+msgstr ""
+
+#: src/hb-backend.c:2289
+msgid "No Titles"
+msgstr ""
+
+#. No audio. set some default
+#: src/hb-backend.c:2574
+msgid "No Audio"
+msgstr ""
+
+#: src/hb-backend.c:4170
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4177
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4203
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4210
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4239
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4248
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4277
+#, c-format
+msgid ""
+"Invalid Denoise Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4305
+#, c-format
+msgid ""
+"Invalid Sharpen Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4339
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr ""
+
+#. No valid title, stop right there
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
+msgid "No title found.\n"
+msgstr ""
+
+#: src/hb-backend.c:4411
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
+msgid ""
+"SRT file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+#: src/hb-backend.c:4512
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4567
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr ""
+
+#: src/presets.c:1388
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+#: src/presets.c:1848
+msgid ""
+"Presets found are newer than what is supported by this version of HandBrake!\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Get me out of here!"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Load backup presets"
+msgstr ""
+
+#: src/presets.c:1997
+msgid "All (*)"
+msgstr ""
+
+#: src/presets.c:2002
+msgid "Presets (*.json)"
+msgstr ""
+
+#: src/presets.c:2008
+msgid "Legacy Presets (*.plist)"
+msgstr ""
+
+#: src/presets.c:2104
+msgid "Export Preset"
+msgstr ""
+
+#: src/presets.c:2445
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "folder"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "preset"
+msgstr ""
+
+#: src/preview.c:487
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr ""
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr ""
+
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr ""
+
+#: src/queuehandler.c:327
+#, c-format
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+
+#: src/queuehandler.c:358
+#, c-format
+msgid "%s, Bitrate %dkbps"
+msgstr ""
+
+#: src/queuehandler.c:363
+#, c-format
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
+
+#: src/queuehandler.c:370
+#, c-format
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
+
+#: src/queuehandler.c:403
+#, c-format
+msgid "%sPreset %s"
+msgstr ""
+
+#: src/queuehandler.c:408
+#, c-format
+msgid "%sTune %s"
+msgstr ""
+
+#: src/queuehandler.c:413
+#, c-format
+msgid "%sProfile %s"
+msgstr ""
+
+#: src/queuehandler.c:418
+#, c-format
+msgid "%sLevel %s"
+msgstr ""
+
+#: src/queuehandler.c:435
+#, c-format
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:439
+#, c-format
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+
+#: src/queuehandler.c:444
+#, c-format
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
+
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
+
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
+
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
+
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
+
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
+
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
+
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
+#, c-format
+msgid "%d Day %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
+#, c-format
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
+
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
+
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
+
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
+
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
+
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
+
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr ""
+
+#: src/queuehandler.c:1177
+#, c-format
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
+
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
+
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
+
+#: src/queuehandler.c:1770
+#, c-format
+msgid ""
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
+"Destination: %s\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+
+#: src/queuehandler.c:1775
+msgid "Resume, I've fixed the problem"
+msgstr ""
+
+#: src/queuehandler.c:1776
+msgid "Resume, Don't tell me again"
+msgstr ""
+
+#: src/queuehandler.c:1830
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
+msgid "Overwrite"
+msgstr ""
+
+#: src/queuehandler.c:1848
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+
+#: src/queuehandler.c:1862
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+
+#: src/queuehandler.c:1876
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:2189
+msgid "Select this title for adding to the queue.\n"
+msgstr ""
+
+#. Title label
+#: src/queuehandler.c:2197
+msgid "No Title"
+msgstr ""
+
+#: src/queuehandler.c:2207
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
+msgid "Stop"
+msgstr ""
+
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
+msgid "Stop Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
+msgstr ""
+
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2434
+msgid "_Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:3065
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#: src/subtitlehandler.c:1379
+#, c-format
+msgid "Preferred Language: %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1393
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1398
+msgid "Add subtitle track if default audio is not your preferred language"
+msgstr ""
+
+#: src/videohandler.c:202
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+
+#: src/videohandler.c:205
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.5.1.tar.xz/gtk/po/sl_SI.po Added

@@ -0,0 +1,3125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# Martin Srebotnjak <miles@filmsi.net>, 2021
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ghb 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
+"PO-Revision-Date: 2018-10-10 18:14+0000\n"
+"Last-Translator: Martin Srebotnjak <miles@filmsi.net>, 2021\n"
+"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/HandBrakeProject/teams/92423/sl_SI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sl_SI\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#: src/ghb3.ui:23
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:26
+msgid "Burned In"
+msgstr ""
+
+#: src/ghb3.ui:32 src/ghb3.ui:9122
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+#: src/ghb3.ui:39
+msgid "Default"
+msgstr ""
+
+#: src/ghb3.ui:45 src/ghb3.ui:9084
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:51
+msgid "Forced Only"
+msgstr ""
+
+#: src/ghb3.ui:57
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+#: src/ghb3.ui:63
+msgid "SRT Offset"
+msgstr ""
+
+#: src/ghb3.ui:69
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Scan\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+#: src/ghb3.ui:80
+msgid "Track"
+msgstr ""
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr "_Prednastavitve"
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr "Nastavi kot priv_zeto"
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr "_Shrani"
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr "Shrani _kot"
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr "_Preimenuj"
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr "_Izbriši"
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr "_Uvozi"
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr "_Izvozi"
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr ""
+
+#: src/ghb3.ui:304
+msgid "Presets List"
+msgstr ""
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr ""
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr ""
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr ""
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr "O programu HandBrake"
+
+#: src/ghb3.ui:1716
+msgid ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , HandBrake Devs"
+msgstr ""
+
+#: src/ghb3.ui:1718
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr ""
+
+#: src/ghb3.ui:1720
+msgid "https://handbrake.fr"
+msgstr ""
+
+#: src/ghb3.ui:1721
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/ghb3.ui:1907
+msgid "HandBrake"
+msgstr "HandBrake"
+
+#: src/ghb3.ui:1930
+msgid "_File"
+msgstr "_Datoteka"
+
+#: src/ghb3.ui:1938
+msgid "Open _Source"
+msgstr "Odpri _vir"
+
+#: src/ghb3.ui:1947
+msgid "Open Single _Title"
+msgstr ""
+
+#: src/ghb3.ui:1956
+msgid "Set _Destination"
+msgstr ""
+
+#: src/ghb3.ui:1971
+msgid "_Preferences"
+msgstr "_Nastavitve"
+
+#: src/ghb3.ui:1986
+msgid "_Quit"
+msgstr "I_zhod"
+
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
+msgid "_Queue"
+msgstr "_Vrsta"
+
+#: src/ghb3.ui:2009
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: src/ghb3.ui:2018
+msgid "Add _Multiple"
+msgstr ""
+
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
+msgid "_Start Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
+msgid "_Pause Encoding"
+msgstr ""
+
+#: src/ghb3.ui:2045
+msgid "S_ave Queue"
+msgstr "S_hrani vrsto"
+
+#: src/ghb3.ui:2054
+msgid "_Load Queue File"
+msgstr ""
+
+#: src/ghb3.ui:2069
+msgid "_View"
+msgstr "_Pogled"
+
+#: src/ghb3.ui:2077
+msgid "HandBrake For _Dumbies"
+msgstr ""
+
+#: src/ghb3.ui:2086
+msgid "Presets _List"
+msgstr ""
+
+#: src/ghb3.ui:2104
+msgid "_Preview"
+msgstr "_Predogled"
+
+#: src/ghb3.ui:2113
+msgid "_Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2229
+msgid "_Help"
+msgstr "Po_moč"
+
+#: src/ghb3.ui:2237
+msgid "_About"
+msgstr "_O programu"
+
+#: src/ghb3.ui:2246
+msgid "_Guide"
+msgstr "_Vodnik"
+
+#: src/ghb3.ui:2284 src/callbacks.c:4123
+msgid "Choose Video Source"
+msgstr ""
+
+#: src/ghb3.ui:2286 src/callbacks.c:4122
+msgid "Open Source"
+msgstr "Odpri vir"
+
+#: src/ghb3.ui:2309
+msgid "Add to Queue"
+msgstr "Dodaj v vrsto"
+
+#: src/ghb3.ui:2311
+msgid "Add To Queue"
+msgstr "Dodaj v vrsto"
+
+#: src/ghb3.ui:2366
+msgid "Show Presets Window"
+msgstr ""
+
+#: src/ghb3.ui:2368
+msgid "Presets"
+msgstr "Prednastavitve"
+
+#: src/ghb3.ui:2381
+msgid "Show Preview Window"
+msgstr ""
+
+#: src/ghb3.ui:2383
+msgid "Preview"
+msgstr "Predogled"
+
+#: src/ghb3.ui:2396
+msgid "Show Queue"
+msgstr "Pokaži vrsto"
+
+#: src/ghb3.ui:2398 src/callbacks.c:4567
+msgid "Queue"
+msgstr "Vrsta"
+
+#: src/ghb3.ui:2411
+msgid "Show Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2413
+msgid "Activity"
+msgstr "Dejavnost"
+
+#: src/ghb3.ui:2443
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
+msgid "None"
+msgstr "Brez"
+
+#: src/ghb3.ui:2514 src/callbacks.c:4095
+msgid "Scanning..."
+msgstr ""
+
+#: src/ghb3.ui:2548
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:2576
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+#: src/ghb3.ui:2598
+msgid "No Titles"
+msgstr ""
+
+#: src/ghb3.ui:2616
+msgid "Angle:"
+msgstr ""
+
+#: src/ghb3.ui:2628
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+#: src/ghb3.ui:2644
+msgid "Range:"
+msgstr ""
+
+#: src/ghb3.ui:2655
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+#: src/ghb3.ui:2668
+msgid "Set the first chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2683
+msgid "-"
+msgstr ""
+
+#: src/ghb3.ui:2695
+msgid "Set the last chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2720
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:2756
+msgid "Choose Preset"
+msgstr ""
+
+#: src/ghb3.ui:2787
+msgid "Modified"
+msgstr ""
+
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
+msgid "Reload"
+msgstr ""
+
+#: src/ghb3.ui:2799
+msgid ""
+"Reload the settings for the currently selected preset.\n"
+"Modifications will be discarded."
+msgstr ""
+
+#: src/ghb3.ui:2811
+msgid "Save New Preset"
+msgstr ""
+
+#: src/ghb3.ui:2814
+msgid "Save the current settings to a new Preset."
+msgstr ""
+
+#: src/ghb3.ui:2896
+msgid "Format:"
+msgstr ""
+
+#: src/ghb3.ui:2914
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+#: src/ghb3.ui:2926 src/queuehandler.c:290
+msgid "Web Optimized"
+msgstr ""
+
+#: src/ghb3.ui:2931
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+#: src/ghb3.ui:2947
+msgid "Align A/V Start"
+msgstr ""
+
+#: src/ghb3.ui:2952
+msgid ""
+"Aligns the initial timestamps of all audio and video streams by\n"
+"inserting blank frames or dropping frames. May improve audio/video\n"
+"sync for broken players that do not honor MP4 edit lists."
+msgstr ""
+
+#: src/ghb3.ui:2969
+msgid "iPod 5G Support"
+msgstr ""
+
+#: src/ghb3.ui:2974
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+#: src/ghb3.ui:2996
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: src/ghb3.ui:3014
+msgid "hh:mm:ss"
+msgstr ""
+
+#: src/ghb3.ui:3029
+msgid "Tracks:"
+msgstr ""
+
+#: src/ghb3.ui:3069
+msgid "Filters:"
+msgstr ""
+
+#: src/ghb3.ui:3109
+msgid "Size:"
+msgstr ""
+
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
+msgid "--"
+msgstr ""
+
+#: src/ghb3.ui:3227
+msgid "Auto Crop"
+msgstr ""
+
+#: src/ghb3.ui:3232
+msgid "Automatically crop black borders around edges of the video."
+msgstr ""
+
+#: src/ghb3.ui:3246
+msgid "Loose Crop"
+msgstr ""
+
+#: src/ghb3.ui:3250
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+#: src/ghb3.ui:3272
+msgid "Left Crop"
+msgstr ""
+
+#: src/ghb3.ui:3289
+msgid "Top Crop"
+msgstr ""
+
+#: src/ghb3.ui:3306
+msgid "Bottom Crop"
+msgstr ""
+
+#: src/ghb3.ui:3323
+msgid "Right Crop"
+msgstr ""
+
+#: src/ghb3.ui:3340
+msgid "Crop Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:3376
+msgid "Cropping"
+msgstr ""
+
+#: src/ghb3.ui:3411
+msgid "Optimal for source"
+msgstr ""
+
+#: src/ghb3.ui:3415
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
+msgid "Width:"
+msgstr ""
+
+#: src/ghb3.ui:3448
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
+msgid "Height:"
+msgstr ""
+
+#: src/ghb3.ui:3481
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3511
+msgid "Anamorphic:"
+msgstr ""
+
+#: src/ghb3.ui:3526
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Use a pixel aspect ratio that is as\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
+"Automatic - Use a pixel aspect ratio that maximizes\n"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
+msgstr ""
+
+#: src/ghb3.ui:3550
+msgid "Alignment:"
+msgstr ""
+
+#: src/ghb3.ui:3565
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+#: src/ghb3.ui:3590
+msgid "Storage Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3625
+msgid "Keep Aspect"
+msgstr ""
+
+#: src/ghb3.ui:3630
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr ""
+
+#: src/ghb3.ui:3663
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+
+#: src/ghb3.ui:3724
+msgid "Pixel Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3739
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3759
+msgid ":"
+msgstr ""
+
+#: src/ghb3.ui:3774
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3794
+msgid "Display Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3809
+msgid "--:--"
+msgstr ""
+
+#: src/ghb3.ui:3830
+msgid "Display Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3848
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:3876
+msgid "Detelecine:"
+msgstr ""
+
+#: src/ghb3.ui:3892
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+#: src/ghb3.ui:3907
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+#: src/ghb3.ui:3935
+msgid "Interlace Detection:"
+msgstr ""
+
+#: src/ghb3.ui:3951
+msgid ""
+"This filter detects interlaced frames.\n"
+"\n"
+"If a deinterlace filter is enabled, only frames that this filter finds\n"
+"to be interlaced will be deinterlaced."
+msgstr ""
+
+#: src/ghb3.ui:3967
+msgid ""
+"Custom interlace detection filter string format\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+msgstr ""
+
+#: src/ghb3.ui:3996
+msgid "Deinterlace:"
+msgstr ""
+
+#: src/ghb3.ui:4012
+msgid ""
+"Choose decomb or deinterlace filter.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4031
+msgid "Deinterlace Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4047
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
+msgid "Denoise Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+
+#: src/ghb3.ui:4213
+msgid "Denoise Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4246
+msgid "Denoise Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+#: src/ghb3.ui:4305
+msgid "Sharpen Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
+msgid ""
+"Sharpen filtering enhances edges and other\n"
+"high frequency components in the video."
+msgstr ""
+
+#: src/ghb3.ui:4337
+msgid "Sharpen Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4369
+msgid "Sharpen Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4427
+msgid "Rotate Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4443
+msgid "Rotate the video clockwise in 90 degree increments."
+msgstr ""
+
+#: src/ghb3.ui:4457
+msgid "Grayscale"
+msgstr ""
+
+#: src/ghb3.ui:4462
+msgid "If enabled, filter colour components out of video."
+msgstr ""
+
+#: src/ghb3.ui:4473
+msgid "Filters"
+msgstr ""
+
+#: src/ghb3.ui:4504
+msgid "Video Encoder:"
+msgstr ""
+
+#: src/ghb3.ui:4518
+msgid "Available video encoders."
+msgstr ""
+
+#: src/ghb3.ui:4534
+msgid "Framerate:"
+msgstr ""
+
+#: src/ghb3.ui:4549
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+
+#: src/ghb3.ui:4564
+msgid "Constant Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4569
+msgid "Enables constant framerate output."
+msgstr ""
+
+#: src/ghb3.ui:4583
+msgid "Peak Framerate (VFR)"
+msgstr ""
+
+#: src/ghb3.ui:4588
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4606
+msgid "Variable Framerate"
+msgstr ""
+
+#: src/ghb3.ui:4611
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+#: src/ghb3.ui:4674
+msgid "Constant Quality:"
+msgstr ""
+
+#: src/ghb3.ui:4705
+msgid "Bitrate (kbps): "
+msgstr ""
+
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+
+#: src/ghb3.ui:4749
+msgid "2-Pass Encoding"
+msgstr ""
+
+#: src/ghb3.ui:4754
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+#: src/ghb3.ui:4772
+msgid "Turbo First Pass"
+msgstr ""
+
+#: src/ghb3.ui:4777
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+#: src/ghb3.ui:4839
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+#: src/ghb3.ui:4865
+msgid "Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4882
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve efficiency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+#: src/ghb3.ui:4898
+msgid "Fast Decode"
+msgstr ""
+
+#: src/ghb3.ui:4903
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+
+#: src/ghb3.ui:4921
+msgid "Zero Latency"
+msgstr ""
+
+#: src/ghb3.ui:4925
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+
+#: src/ghb3.ui:4949
+msgid "Profile:"
+msgstr ""
+
+#: src/ghb3.ui:4966
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:4984
+msgid "Level:"
+msgstr ""
+
+#: src/ghb3.ui:5001
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:5026
+msgid "More Settings:"
+msgstr ""
+
+#: src/ghb3.ui:5044
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+#: src/ghb3.ui:5078 src/main.c:1155
+msgid "Video"
+msgstr ""
+
+#. Add Button
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
+msgid "Add"
+msgstr ""
+
+#: src/ghb3.ui:5146
+msgid "Add new audio settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
+msgid "Add All"
+msgstr ""
+
+#: src/ghb3.ui:5158
+msgid "Add all audio tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5171
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr ""
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
+msgid "Selection Behavior:"
+msgstr ""
+
+#: src/ghb3.ui:5261
+msgid "Choose which audio tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:5322
+msgid ""
+"Create a list of languages you would like to select audio for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior."
+msgstr ""
+
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
+msgid "Remove"
+msgstr ""
+
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
+msgid "Available Languages"
+msgstr ""
+
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
+msgid "Selected Languages"
+msgstr ""
+
+#: src/ghb3.ui:5400
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+#: src/ghb3.ui:5405
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+#: src/ghb3.ui:5441
+msgid "Auto Passthru:"
+msgstr ""
+
+#: src/ghb3.ui:5452
+msgid "MP3"
+msgstr ""
+
+#: src/ghb3.ui:5457
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5473
+msgid "AAC"
+msgstr ""
+
+#: src/ghb3.ui:5478
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5494
+msgid "AC-3"
+msgstr ""
+
+#: src/ghb3.ui:5499
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5515
+msgid "DTS"
+msgstr ""
+
+#: src/ghb3.ui:5520
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5536
+msgid "DTS-HD"
+msgstr ""
+
+#: src/ghb3.ui:5541
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5557
+msgid "EAC-3"
+msgstr ""
+
+#: src/ghb3.ui:5562
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5578
+msgid "TrueHD"
+msgstr ""
+
+#: src/ghb3.ui:5583
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5599
+msgid "FLAC"
+msgstr ""
+
+#: src/ghb3.ui:5604
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5637
+msgid "Passthru Fallback:"
+msgstr ""
+
+#: src/ghb3.ui:5649
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+#: src/ghb3.ui:5678
+msgid "Audio Encoder Settings:"
+msgstr ""
+
+#: src/ghb3.ui:5679
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
+msgid "Encoder"
+msgstr ""
+
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
+msgid "Bitrate/Quality"
+msgstr ""
+
+#: src/ghb3.ui:5726
+msgid "Mixdown"
+msgstr ""
+
+#: src/ghb3.ui:5737
+msgid "Samplerate"
+msgstr ""
+
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
+msgid "Gain"
+msgstr ""
+
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
+msgid "DRC"
+msgstr ""
+
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr ""
+
+#: src/ghb3.ui:5808
+msgid "Audio"
+msgstr ""
+
+#: src/ghb3.ui:5876
+msgid "Add new subtitle settings to the list"
+msgstr ""
+
+#: src/ghb3.ui:5888
+msgid "Add all subtitle tracks to the list"
+msgstr ""
+
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
+msgid "Foreign Audio Scan"
+msgstr ""
+
+#: src/ghb3.ui:5900
+msgid ""
+"Add an extra pass to the encode which searches\n"
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:5915
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:6009
+msgid "Choose which subtitle tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:6074
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+
+#: src/ghb3.ui:6155
+msgid "Preferred Language: None"
+msgstr ""
+
+#: src/ghb3.ui:6182
+msgid "Add Foreign Audio Scan Pass"
+msgstr ""
+
+#: src/ghb3.ui:6187
+msgid ""
+"Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6202
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+#: src/ghb3.ui:6207
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle track.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6221
+msgid "Add Closed Captions when available"
+msgstr ""
+
+#: src/ghb3.ui:6226
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track"
+msgstr ""
+
+#: src/ghb3.ui:6247
+msgid "Burn-In Behavior*:"
+msgstr ""
+
+#: src/ghb3.ui:6259
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6286
+msgid "Burn-In for deficient players*:"
+msgstr ""
+
+#: src/ghb3.ui:6295
+msgid "DVD Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6300
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6314
+msgid "Blu-ray Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6319
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6341
+msgid ""
+"* Only one of the above subtitle burn options will be applied, "
+"starting with the top."
+msgstr ""
+
+#: src/ghb3.ui:6342
+msgid ""
+"Only one subtitle track can be burned! Since conflicts can occur, the first "
+"chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6366
+msgid "Subtitles"
+msgstr ""
+
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr ""
+
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr ""
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr ""
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr ""
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr ""
+
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr ""
+
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr ""
+
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr ""
+
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr ""
+
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr ""
+
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr ""
+
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr ""
+
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr ""
+
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr ""
+
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr ""
+
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr ""
+
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr ""
+
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr ""
+
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr ""
+
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr ""
+
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr ""
+
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr ""
+
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr ""
+
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr ""
+
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr ""
+
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr ""
+
+#: src/ghb3.ui:7310
+msgid ""
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
+msgstr ""
+
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr ""
+
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr ""
+
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr ""
+
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr ""
+
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr ""
+
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr ""
+
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr ""
+
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr ""
+
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr ""
+
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr ""
+
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
+msgstr ""
+
+#: src/ghb3.ui:7767
+msgid "Use the same settings for all titles in a batch"
+msgstr ""
+
+#: src/ghb3.ui:7771
+msgid ""
+"When checked, every title will use the same settings when adding a\n"
+"batch of titles to the queue.\n"
+"\n"
+"Uncheck this if you want to allow changing each title's settings independently."
+msgstr ""
+
+#: src/ghb3.ui:7799
+msgid "Allow Tweaks"
+msgstr ""
+
+#: src/ghb3.ui:7815
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+#: src/ghb3.ui:7843
+msgid "Advanced"
+msgstr ""
+
+#: src/ghb3.ui:7921
+msgid "Rename Preset"
+msgstr ""
+
+#: src/ghb3.ui:7941
+msgid "Name:"
+msgstr ""
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
+msgid "Category:"
+msgstr ""
+
+#: src/ghb3.ui:8094
+msgid "Set the category that this preset will be shown under."
+msgstr ""
+
+#: src/ghb3.ui:8110
+msgid "Category Name:"
+msgstr ""
+
+#: src/ghb3.ui:8143
+msgid "Preset Name:"
+msgstr ""
+
+#: src/ghb3.ui:8177
+msgid "Default Preset"
+msgstr ""
+
+#: src/ghb3.ui:8182
+msgid "Make this the default Preset when HandBrake starts"
+msgstr ""
+
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:8234
+msgid "Maximum Width:"
+msgstr ""
+
+#: src/ghb3.ui:8239
+msgid "Enable maximum width limit."
+msgstr ""
+
+#: src/ghb3.ui:8257
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+#: src/ghb3.ui:8274
+msgid "Maximum Height:"
+msgstr ""
+
+#: src/ghb3.ui:8279
+msgid "Enable maximum height limit."
+msgstr ""
+
+#: src/ghb3.ui:8297
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
+msgid "Select preview frames."
+msgstr ""
+
+#: src/ghb3.ui:8449
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+#: src/ghb3.ui:8520
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:8532
+msgid "Set the duration of the live preview in seconds."
+msgstr ""
+
+#: src/ghb3.ui:8548
+msgid "Show Crop"
+msgstr ""
+
+#: src/ghb3.ui:8552
+msgid "Show Cropped area of the preview"
+msgstr ""
+
+#: src/ghb3.ui:8563
+msgid "Source Resolution"
+msgstr ""
+
+#: src/ghb3.ui:8567
+msgid "Reset preview window to the source video's resolution"
+msgstr ""
+
+#: src/ghb3.ui:8599
+msgid "_Cancel"
+msgstr ""
+
+#: src/ghb3.ui:8611
+msgid "_Open"
+msgstr ""
+
+#: src/ghb3.ui:8645
+msgid "Title Number:"
+msgstr ""
+
+#: src/ghb3.ui:8681
+msgid "Detected DVD devices:"
+msgstr ""
+
+#: src/ghb3.ui:8791
+msgid "Import SRT"
+msgstr ""
+
+#: src/ghb3.ui:8796
+msgid "Enable settings to import an SRT subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
+msgid "Embedded Subtitle List"
+msgstr ""
+
+#: src/ghb3.ui:8829
+msgid "Enable settings to select embedded subtitles"
+msgstr ""
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
+msgid "Language"
+msgstr ""
+
+#: src/ghb3.ui:8948
+msgid "Character Code"
+msgstr ""
+
+#: src/ghb3.ui:8962
+msgid "File:"
+msgstr ""
+
+#: src/ghb3.ui:8977
+msgid "Offset (ms)"
+msgstr ""
+
+#: src/ghb3.ui:8992
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+#: src/ghb3.ui:9010
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+#: src/ghb3.ui:9034
+msgid "Select the SRT file to import."
+msgstr ""
+
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
+
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+#: src/ghb3.ui:9079
+msgid "Forced Subtitles Only"
+msgstr ""
+
+#: src/ghb3.ui:9100
+msgid "Burn into video"
+msgstr ""
+
+#: src/ghb3.ui:9105
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:9117
+msgid "Set Default Track"
+msgstr ""
+
+#: src/ghb3.ui:9215
+msgid "List of audio tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:9245
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+#: src/ghb3.ui:9308
+msgid "Mix"
+msgstr ""
+
+#: src/ghb3.ui:9321
+msgid "Sample Rate"
+msgstr ""
+
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
+msgid "Set the audio codec to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
+msgid "Bitrate"
+msgstr ""
+
+#: src/ghb3.ui:9399
+msgid "Enable bitrate setting"
+msgstr ""
+
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
+msgid "Quality"
+msgstr ""
+
+#: src/ghb3.ui:9414
+msgid "Enable quality setting"
+msgstr ""
+
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
+msgid "Set the bitrate to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9455
+msgid ""
+"Quality: For output codec's that support it, adjust the quality of "
+"the output."
+msgstr ""
+
+#: src/ghb3.ui:9477
+msgid "00.0"
+msgstr ""
+
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
+msgid "Set the mixdown of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
+msgid "Set the sample rate of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+#. Audio Gain Label
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
+msgid "0dB"
+msgstr ""
+
+#. Audio DRC Label
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
+msgid "Off"
+msgstr ""
+
+#: src/ghb3.ui:9644
+msgid "Skip This Version"
+msgstr ""
+
+#: src/ghb3.ui:9652
+msgid "Remind Me Later"
+msgstr ""
+
+#: src/ghb3.ui:9721
+msgid "A new version of HandBrake is available!"
+msgstr ""
+
+#: src/ghb3.ui:9737
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr ""
+
+#: src/ghb3.ui:9765
+msgid "Release Notes"
+msgstr ""
+
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
+#, c-format
+msgid "%ddB"
+msgstr ""
+
+#: src/audiohandler.c:726
+msgid "Quality: "
+msgstr ""
+
+#: src/audiohandler.c:733
+#, c-format
+msgid "Bitrate: %dkbps\n"
+msgstr ""
+
+#: src/audiohandler.c:745
+#, c-format
+msgid "%.4gkHz"
+msgstr ""
+
+#: src/audiohandler.c:760
+#, c-format
+msgid "%d - %s (%.4gkHz)"
+msgstr ""
+
+#: src/audiohandler.c:765
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr ""
+
+#: src/audiohandler.c:771
+msgid "Passthrough"
+msgstr ""
+
+#: src/audiohandler.c:780
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+
+#: src/audiohandler.c:785
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s"
+msgstr ""
+
+#: src/audiohandler.c:1746
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+#: src/audiohandler.c:1826
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+#: src/audiohandler.c:1946
+msgid "Remove this audio encoder"
+msgstr ""
+
+#: src/callbacks.c:793 src/callbacks.c:2144
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr ""
+
+#: src/callbacks.c:1378
+msgid "Not Selected"
+msgstr ""
+
+#. This needs to be in scanning and working since scanning
+#. happens fast enough that it can be missed
+#: src/callbacks.c:1711 src/callbacks.c:4182
+msgid "Scanning ..."
+msgstr ""
+
+#: src/callbacks.c:1747 src/callbacks.c:1748
+msgid "Stop Scan"
+msgstr ""
+
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
+msgid "No Title Found"
+msgstr ""
+
+#: src/callbacks.c:2736
+msgid "New Video"
+msgstr ""
+
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+
+#: src/callbacks.c:3666 src/callbacks.c:3708
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
+msgid "Cancel Current and Stop"
+msgstr ""
+
+#: src/callbacks.c:3670
+msgid "Cancel Current, Start Next"
+msgstr ""
+
+#: src/callbacks.c:3671
+msgid "Finish Current, then Stop"
+msgstr ""
+
+#: src/callbacks.c:3672 src/callbacks.c:3712
+msgid "Continue Encoding"
+msgstr ""
+
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
+#, c-format
+msgid "job %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3961
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#: src/callbacks.c:3966
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3979
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3989 src/callbacks.c:4029
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3999 src/callbacks.c:4038
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr ""
+
+#: src/callbacks.c:4025
+msgid "Searching for start time, "
+msgstr ""
+
+#: src/callbacks.c:4100
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#: src/callbacks.c:4104
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+#: src/callbacks.c:4193
+msgid "Paused"
+msgstr ""
+
+#: src/callbacks.c:4224
+msgid "Encode Done!"
+msgstr ""
+
+#: src/callbacks.c:4228
+msgid "Encode Canceled."
+msgstr ""
+
+#: src/callbacks.c:4233
+msgid "Encode Failed."
+msgstr ""
+
+#: src/callbacks.c:4275
+msgid "Muxing: This may take a while..."
+msgstr ""
+
+#: src/callbacks.c:4877
+msgid "Scan this DVD source"
+msgstr ""
+
+#: src/callbacks.c:5265
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr ""
+
+#: src/callbacks.c:5446
+msgid "Encode Complete"
+msgstr ""
+
+#: src/callbacks.c:5448
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr ""
+
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
+msgid "Your encode is complete."
+msgstr ""
+
+#: src/callbacks.c:5462
+msgid "Shutting down the computer"
+msgstr ""
+
+#: src/callbacks.c:5472
+msgid "Putting computer to sleep"
+msgstr ""
+
+#: src/callbacks.c:5480
+msgid "Quitting Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:60 src/hb-backend.c:85
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:61 src/hb-backend.c:86
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:72
+msgid "Foreign Audio Subtitle Track"
+msgstr ""
+
+#: src/hb-backend.c:73
+msgid "First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:74
+msgid "Foreign Audio, then First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:96
+msgid "Chapters:"
+msgstr ""
+
+#: src/hb-backend.c:97
+msgid "Seconds:"
+msgstr ""
+
+#: src/hb-backend.c:98
+msgid "Frames:"
+msgstr ""
+
+#: src/hb-backend.c:108
+msgid "Do Nothing"
+msgstr ""
+
+#: src/hb-backend.c:109
+msgid "Show Notification"
+msgstr ""
+
+#: src/hb-backend.c:110
+msgid "Quit Handbrake"
+msgstr ""
+
+#: src/hb-backend.c:111
+msgid "Put Computer To Sleep"
+msgstr ""
+
+#: src/hb-backend.c:112
+msgid "Shutdown Computer"
+msgstr ""
+
+#: src/hb-backend.c:123 src/hb-backend.c:252
+msgid "Automatic"
+msgstr ""
+
+#: src/hb-backend.c:124
+msgid "Loose"
+msgstr ""
+
+#: src/hb-backend.c:125 src/hb-backend.c:337
+msgid "Custom"
+msgstr ""
+
+#: src/hb-backend.c:161
+msgid "Week"
+msgstr ""
+
+#: src/hb-backend.c:162
+msgid "Month"
+msgstr ""
+
+#: src/hb-backend.c:163
+msgid "Year"
+msgstr ""
+
+#: src/hb-backend.c:164
+msgid "Immortal"
+msgstr ""
+
+#: src/hb-backend.c:174
+msgid "Never"
+msgstr ""
+
+#: src/hb-backend.c:175
+msgid "Daily"
+msgstr ""
+
+#: src/hb-backend.c:176
+msgid "Weekly"
+msgstr ""
+
+#: src/hb-backend.c:177
+msgid "Monthly"
+msgstr ""
+
+#: src/hb-backend.c:201
+msgid "Decomb"
+msgstr ""
+
+#: src/hb-backend.c:202
+msgid "Yadif"
+msgstr ""
+
+#: src/hb-backend.c:213
+msgid "NLMeans"
+msgstr ""
+
+#: src/hb-backend.c:214
+msgid "HQDN3D"
+msgstr ""
+
+#: src/hb-backend.c:225
+msgid "Unsharp"
+msgstr ""
+
+#: src/hb-backend.c:226
+msgid "Lapsharp"
+msgstr ""
+
+#: src/hb-backend.c:237
+msgid "90 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:238
+msgid "180 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:239
+msgid "270 Degrees"
+msgstr ""
+
+#: src/hb-backend.c:250
+msgid "Spatial"
+msgstr ""
+
+#: src/hb-backend.c:251
+msgid "Temporal"
+msgstr ""
+
+#: src/hb-backend.c:263
+msgid "Fast"
+msgstr ""
+
+#: src/hb-backend.c:264
+msgid "Optimal"
+msgstr ""
+
+#: src/hb-backend.c:275
+msgid "Strict"
+msgstr ""
+
+#: src/hb-backend.c:276
+msgid "Normal"
+msgstr ""
+
+#: src/hb-backend.c:287
+msgid "Simple"
+msgstr ""
+
+#: src/hb-backend.c:288
+msgid "Smart"
+msgstr ""
+
+#: src/hb-backend.c:298
+msgid "Diamond"
+msgstr ""
+
+#: src/hb-backend.c:299
+msgid "Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:300
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:301
+msgid "Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:302
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:312
+msgid "0: SAD, no subpel"
+msgstr ""
+
+#: src/hb-backend.c:313
+msgid "1: SAD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:314
+msgid "2: SATD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:315
+msgid "3: SATD: multi-qpel"
+msgstr ""
+
+#: src/hb-backend.c:316
+msgid "4: SATD, qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:317
+msgid "5: SATD, multi-qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:318
+msgid "6: RD in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:319
+msgid "7: RD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:320
+msgid "8: RD refine in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:321
+msgid "9: RD refine in all frames"
+msgstr ""
+
+#: src/hb-backend.c:322
+msgid "10: QPRD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:323
+msgid "11: No early terminations in analysis"
+msgstr ""
+
+#: src/hb-backend.c:333
+msgid "Most"
+msgstr ""
+
+#: src/hb-backend.c:335
+msgid "Some"
+msgstr ""
+
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
+msgid "Encode only"
+msgstr ""
+
+#: src/hb-backend.c:349
+msgid "Always"
+msgstr ""
+
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
+msgid "Same as source"
+msgstr ""
+
+#: src/hb-backend.c:1499
+msgid "(NTSC Film)"
+msgstr ""
+
+#: src/hb-backend.c:1503
+msgid "(PAL Film/Video)"
+msgstr ""
+
+#: src/hb-backend.c:1507
+msgid "(NTSC Video)"
+msgstr ""
+
+#: src/hb-backend.c:2074
+#, c-format
+msgid "%s - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2224
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - %s"
+msgstr ""
+
+#: src/hb-backend.c:2243
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2249
+#, c-format
+msgid "%3d - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2255
+#, c-format
+msgid "%3d - %02dh%02dm%02ds"
+msgstr ""
+
+#: src/hb-backend.c:2289
+msgid "No Titles"
+msgstr ""
+
+#. No audio. set some default
+#: src/hb-backend.c:2574
+msgid "No Audio"
+msgstr ""
+
+#: src/hb-backend.c:4170
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4177
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4203
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4210
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4239
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4248
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4277
+#, c-format
+msgid ""
+"Invalid Denoise Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4305
+#, c-format
+msgid ""
+"Invalid Sharpen Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4339
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr ""
+
+#. No valid title, stop right there
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
+msgid "No title found.\n"
+msgstr ""
+
+#: src/hb-backend.c:4411
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
+msgid ""
+"SRT file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+#: src/hb-backend.c:4512
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4567
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr ""
+
+#: src/presets.c:1388
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+#: src/presets.c:1848
+msgid ""
+"Presets found are newer than what is supported by this version of HandBrake!\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Get me out of here!"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Load backup presets"
+msgstr ""
+
+#: src/presets.c:1997
+msgid "All (*)"
+msgstr ""
+
+#: src/presets.c:2002
+msgid "Presets (*.json)"
+msgstr ""
+
+#: src/presets.c:2008
+msgid "Legacy Presets (*.plist)"
+msgstr ""
+
+#: src/presets.c:2104
+msgid "Export Preset"
+msgstr ""
+
+#: src/presets.c:2445
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "folder"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "preset"
+msgstr ""
+
+#: src/preview.c:487
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr ""
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr ""
+
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr ""
+
+#: src/queuehandler.c:327
+#, c-format
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+
+#: src/queuehandler.c:358
+#, c-format
+msgid "%s, Bitrate %dkbps"
+msgstr ""
+
+#: src/queuehandler.c:363
+#, c-format
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
+
+#: src/queuehandler.c:370
+#, c-format
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
+
+#: src/queuehandler.c:403
+#, c-format
+msgid "%sPreset %s"
+msgstr ""
+
+#: src/queuehandler.c:408
+#, c-format
+msgid "%sTune %s"
+msgstr ""
+
+#: src/queuehandler.c:413
+#, c-format
+msgid "%sProfile %s"
+msgstr ""
+
+#: src/queuehandler.c:418
+#, c-format
+msgid "%sLevel %s"
+msgstr ""
+
+#: src/queuehandler.c:435
+#, c-format
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:439
+#, c-format
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+
+#: src/queuehandler.c:444
+#, c-format
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
+
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
+
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
+
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
+
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
+
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
+
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
+
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
+#, c-format
+msgid "%d Day %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
+#, c-format
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
+
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
+
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
+
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
+
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
+
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
+
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr ""
+
+#: src/queuehandler.c:1177
+#, c-format
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
+
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
+
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
+
+#: src/queuehandler.c:1770
+#, c-format
+msgid ""
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
+"Destination: %s\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+
+#: src/queuehandler.c:1775
+msgid "Resume, I've fixed the problem"
+msgstr ""
+
+#: src/queuehandler.c:1776
+msgid "Resume, Don't tell me again"
+msgstr ""
+
+#: src/queuehandler.c:1830
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
+msgid "Overwrite"
+msgstr ""
+
+#: src/queuehandler.c:1848
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+
+#: src/queuehandler.c:1862
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+
+#: src/queuehandler.c:1876
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:2189
+msgid "Select this title for adding to the queue.\n"
+msgstr ""
+
+#. Title label
+#: src/queuehandler.c:2197
+msgid "No Title"
+msgstr ""
+
+#: src/queuehandler.c:2207
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
+msgid "Stop"
+msgstr ""
+
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
+msgid "Stop Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
+msgstr ""
+
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2434
+msgid "_Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:3065
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#: src/subtitlehandler.c:1379
+#, c-format
+msgid "Preferred Language: %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1393
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1398
+msgid "Add subtitle track if default audio is not your preferred language"
+msgstr ""
+
+#: src/videohandler.c:202
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+
+#: src/videohandler.c:205
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/sv.po -> HandBrake-1.5.1.tar.xz/gtk/po/sv.po Changed

@@ -1,19 +1,19 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Åke Engelbrektson, 2019
+# Åke Engelbrektson, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Åke Engelbrektson, 2019\n"
+"Last-Translator: Åke Engelbrektson, 2021\n"
 "Language-Team: Swedish (Sweden) (https://www.transifex.com/HandBrakeProject/teams/92423/sv_SE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@
 "Language: sv_SE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +31,11 @@
 "\n"
 "Undertexten blir en del av videon och kan inte avaktiveras."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Inbränd"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +53,11 @@
 "Detta är användbart för att skapa ett\n"
 "\"obligatoriskt\" spår i din utdata."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +73,11 @@
 "för att visa undertext i scener där någon pratar\n"
 "ett främmande språk."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Endast obligatorisk"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +93,11 @@
 "SRT-fil, med början på videon.\n"
 "Denna inställning låter dig synkronisera filerna."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT-förskjutning"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -123,55 +123,235 @@
 "främmande språk. Det här alternativet används bäst\n"
 "tillsammans med alternativet \"Obligatorisk\"."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Spår"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "Öppna källmappen"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "Öppna målmappen"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "Öppna kodloggmappen"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "Öppna kodloggen"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "Återställ misslyckade jobb"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "Återställ alla jobb"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "Ta bort slutförda jobb"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "Ta bort alla jobb"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "Importera kö"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "Exportera kö"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "Handbrake förinställningar"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Mallar"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "Ange som sta_ndard"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Spara"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "Spara _som"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Ta bort"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_Importera"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Exportera"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "Återställ _inbyggda mallar"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Mallista"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "Handbrake-kö"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "Kö"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 väntande jobb"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Starta kodning"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Start"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Pausa kodning"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Paus"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Alternativ"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "Vid slutfört:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Återställ"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"Märk markerad köpost som väntande.\n"
+"Återställer köat jobb till väntande och klart att köra igen."
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Redigera"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "Åtgärder"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Mall:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "Källa:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "Målmapp:"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "Dimensioner:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "Video:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "Ljud:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "Undertexter:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Sammanfattning"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Pass:"
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "Starttid:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "Sluttid:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "Pausad varaktighet:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "Kodningstid:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "Filstorlek:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "Statistik"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "Aktivitetslogg"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "Handbrake aktivitetslogg"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "Om HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -179,203 +359,186 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake är en GPL-licensierad, multiplattform, flertrådad video-"
 "transkoder."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake är fri mjukvara! Du kan återdistribuera det och/eller modifiera det, under villkoren för GNU General Public License som den publiceras av Free Software Foundation. Antingen version 2 av licensen, eller valfri senare version.\n"
+"HandBrake är fri mjukvara! Du kan återdistribuera det och/eller modifiera det, under villkoren för GNU General Public License version 2, som den publiceras av Free Software Foundation.\n"
 "\n"
 "HandBrake distribueras i hopp om att det skall vara användbart, men UTAN NÅGRA GARANTIER. Utan ens underförstådd garanti om SÄLJBARHET eller LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. Se GNU General Public License för mer detaljerad info.\n"
 "\n"
 "Du bör ha fått en kopia av GNU General Public License, tillsammans med Glade. Om inte, skriv till Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Arkiv"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "Öppna _källa"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Öppna enskild titel"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "Ange _plats"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "A_vsluta"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Kö"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "Lägg till _flera"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "_Starta kodningen"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "_Pausa kodning"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "S_para kön"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Läs in köfil"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Visa"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "HandBrake för _nybörjare"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Mal_lista"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Förhandsgranskning"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Aktivitetsfönster"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Guide"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Välj videokälla"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "Öppna källfil"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Lägg till i kön"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "Lägg till i kön"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Starta kodning"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Start"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Pausa kodning"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "Paus"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "Visa mallfönster"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "Mallar"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Visa förhandsgranskningsfönstret"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Förhandsgranska"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Visa kön"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Kö"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Visa aktivitetsfönster"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Källa:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Inget"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Söker..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -385,55 +548,55 @@
 "Som standard väljs den längsta titeln.\n"
 "Detta är ofta titeln på en DVD-skiva."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Inga titlar"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "För flervinklade DVD:er, välj önskad vinkling att koda."
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Intervall:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr "Intervall att koda om. Kan vara avsnitt, sekunder eller bildrutor."
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Ange första avsnittet att koda om."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Ange sista avsnittet att koda om."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Mall:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Välj mall"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Modifierad"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Läs in igen"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -441,27 +604,27 @@
 "Läs in inställningarna för aktuell mall igen.\n"
 "Ändringar kommer att tas bort."
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Spara ny mall"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Spara aktuella inställningar som en ny mall."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Format:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "Format att muxa kodade spår till."
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Webboptimerat"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -469,11 +632,11 @@
 "Optimera MP4-filens layout, för progressiv nedladdning.\n"
 "Detta låter en spelare starta uppspelning innan hela filen är nedladdad."
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Justera A/V Start"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -484,55 +647,51 @@
 "Kan förbättra ljud-/videosynkronisering för bristfälliga spelare\n"
 "som inte hedrar MP4-redigeringslistor."
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G-stöd"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Lägg till iPod Atom, nödvändiga för vissa äldre iPod:ar."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Varaktighet:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Spår:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filter:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Storlek:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Sammanfattning"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Beskär automatiskt"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Beskär svarta kanter runt videon, automatiskt."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "Lös beskärning"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -546,35 +705,35 @@
 "för att utföra en exakt beskärning och sedan skala\n"
 "bilden till erforderlig multipel."
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Beskär vänsterkant"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Beskär överkant"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Beskär underkant"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Beskär högerkant"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Beskärningsstorlek:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Beskärning"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Optimal för källan"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -582,11 +741,11 @@
 "Vid aktivering, välj \"Optimal\" lagringsupplösning.\n"
 "Detta blir den upplösning som närmast matchar källans upplösning efter beskärning."
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Bredd:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -594,11 +753,11 @@
 "Detta är den bredd som videon kommer att sparas i.\n"
 "Den verkliga skärmstorleken kommer att differentieras om pixelproportionerna inte är 1:1."
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Höjd:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -606,27 +765,27 @@
 "Detta är den höjd som videon kommer att sparas i.\n"
 "Den verkliga skärmstorleken kommer att differentieras om pixelproportionerna inte är 1:1."
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamorft:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 "Anamorfiska lägen:\n"
 "<tt>\n"
-"Ingen - Tvinga bildpunktsförhållandet till 1:1.\n"
-"Löst - Använd ett bildpunktsförhållande som\n"
+"Ingen - Tvinga bildpunktsförhållandet till 1:1.\n"
+"Löst - Använd ett bildpunktsförhållande som\n"
 "är så nära källvideons proportioner som möjligt,\n"
 "medan de ursprungliga visningsproportionerna\n"
 "bevaras.\n"
@@ -634,11 +793,11 @@
 "maximerar lagringsresolutionen medan de \n"
 "ursprungliga visningsproportionerna bevaras.</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Justering:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -650,21 +809,21 @@
 "Denna inställning behövs bara för kompatibilitet med vissa enheter.\n"
 "Du bör använda 2, om du inte får kompatibilitetsproblem."
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Lagringsgeometri"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "Bevara proportioner"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 "Om aktiverad, kommer källans ursprungliga visningsproportioner att bevaras."
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
@@ -672,11 +831,11 @@
 "Detta är skärmbredden. Den är resultatet av skalningen, av "
 "lagringsdimensioner, efter pixelproportioner."
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Pixelproportion:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -688,11 +847,11 @@
 "Förhållandet 1:1 definierar en kvadratisk bildpunkt. Andra värden definierar rektangulära former.\n"
 "Mediaspelare skalar bilden för att uppnå specificerade proportioner."
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -702,27 +861,27 @@
 "Förhållandet 1:1 definierar en kvadratisk bildpunkt. Andra värden definierar rektangulära former.\n"
 "Mediaspelare skalar bilden för att uppnå specificerade proportioner."
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Visningsproportioner:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Skärmgeometri"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Storlek"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Detelecine:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -732,7 +891,7 @@
 "\n"
 "Telecining är en process som justerar filmbildfrekvens på 24fps till NTSC videobildfrekvens på 30fps."
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -742,11 +901,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Sammanflätningsidentifiering:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -758,7 +917,7 @@
 "Om ett avflätningsfilter aktiveras, kommer endast bildrutor\n"
 "som identifieras av detta filter att bli avflätade."
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -770,11 +929,11 @@
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Avflätning:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -786,11 +945,11 @@
 "Decomb-filtret stödjer en mängd interpoleringsalgoritmer.\n"
 "Avflätningsfiltret är en klassisk YADIF-avflätare.\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Avflätningsmall:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -802,11 +961,11 @@
 "Decomb-filtret stödjer en mängd interpoleringsalgoritmer.\n"
 "Avflätningsfiltret är en klassisk YADIF-avflätare.\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Blockborttagning:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr "Deblock-filter:"
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -814,11 +973,25 @@
 "Blockborttagningsfiltret tar bort en vanlig typ av komprimeringsartefakt.\n"
 "Tillämpas på avkodad, komprimerad video för att förbättra visuell kvalitet genom att jämna ut vassa kanter."
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "Deblock-justering:"
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"Anpassat deblock-filter strängformat\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Brusreduceringsfilter:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -828,15 +1001,15 @@
 "Grynighet och andra typer av högfrekvent brus är svårt att komprimera.\n"
 "Användning av detta filter på sådana källor, kan resultera i mindre filstorlek."
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Brusreduceringsmall:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Brusjustering:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -846,11 +1019,11 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Skärpefilter:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
@@ -858,47 +1031,47 @@
 "Skärpefiltrering förbättrar kanter och andra\n"
 "högfrekvenskomponenter i filmen."
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Skärpemall:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Skärpejustering:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Rotationsfilter:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr "Rotera videon medurs i steg om 90 grader."
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Gråskala"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "Om aktiverad, filtreras färgkomponenter bort från videon."
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filter"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Videokodare:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Tillgängliga videokodare."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Bildfrekvens:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -910,19 +1083,19 @@
 "\"Samma som källan\" rekommenderas, om din video har\n"
 "en variabel bildfrekvens. \"Samma som källan\" bevarar den."
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Konstant bildfrekvens"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Aktiverar konstant bildfrekvens i utdata."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "Toppad bildfrekvens (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -934,11 +1107,11 @@
 "\n"
 "VFR är inte kompatibel med alla mediaspelare."
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Variabel bildfrekvens"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -948,7 +1121,7 @@
 "\n"
 "VFR är inte kompatibel med alla mediaspelare."
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -976,15 +1149,15 @@
 "FFMpeg- och Theora-skalan är mer linjär.\n"
 "Dessa kodare har inget förlustfritt läge."
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Konstant kvalitet:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Bithastighet (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -999,11 +1172,11 @@
 "begränsa den momentana bithastigheten, kan du titta på x264-inställningarna för\n"
 "vbv-bufsize och vbv-maxrate."
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "2-passkodning"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -1017,11 +1190,11 @@
 "statistik om videon in. Under 2:a passet, används statistiken för att\n"
 "avgöra rätt bithastighet."
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "Turbo 1:a Pass"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
@@ -1029,30 +1202,12 @@
 "Använd inställningar som skyndar på saker, under 1:a passet i en "
 "2-passkodning."
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Använd avancerade alternativ"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"Använd avancerade alternativ för x264-inställningar.\n"
-"\n"
-"Används på egen risk!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Mall:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
@@ -1063,11 +1218,11 @@
 "Generellt bör du sätta detta alternativ så långsamt som du står ut med, eftersom\n"
 "långsammare inställningar resulterar i bättre kvalitet eller mindre filer."
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "Justera:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1081,11 +1236,11 @@
 "utdatafilens egenskaper. Ändringar kommer att tillämpas efter\n"
 "mallen, men före alla andra parametrar."
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Snabb avkodning"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1095,11 +1250,11 @@
 "\n"
 "Aktivera det här om din enhet får kämpa vid uppspelning (tappade bildrutor)."
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Nollfördröjning"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1115,11 +1270,11 @@
 "Eftersom HandBrake inte är lämplig för direktsändningsändamål,\n"
 "är denna inställning av litet värde här."
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1129,11 +1284,11 @@
 "\n"
 "Åsidosätter alla andra inställningar."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Nivå:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1143,11 +1298,11 @@
 "\n"
 "Åsidosätter alla andra inställningar."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Fler inställningar:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1157,56 +1312,45 @@
 "\n"
 "Kolonseparerad lista över kodningsalternativ."
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Spårlista"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "Visa ljudspårlista för utdata"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Spårval"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "Visa alternativ för källspårsval"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Lägg till"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Lägg till nya ljudinställningar i listan"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Lägg till alla"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Lägg till alla ljudspår till listan"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Läs in alla ljudinställningar från standard igen"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Spårlista"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Välj beteende:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "Välj vilket källljudspår som skall användas."
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1214,135 +1358,135 @@
 "Skapa en lista över de språk som du vill kunna välja ljudspår för.\n"
 "Spår som matchar dessa språk kommer att väljas med hjälp av det valda urvalsbeteendet."
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Ta bort"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Tillgängliga språk"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Välj språk"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "Använd endast första kodaren för sekundärt ljud"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 "Endast det primära ljudspåret kommer att kodas med hela kodarlistan.\n"
-" Alla andra ljudspår kommer bara att kodas med den första kodaren."
+"Alla andra sekundära ljudspår kommer endast att kodas med första kodaren."
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Automatisk genomströmning:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer MP3.\n"
-" Detta tillåter att MP3-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att MP3-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer AAC.\n"
-" Detta tillåter att AAC-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att AAC-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer AC-3.\n"
-" Detta tillåter att AC-3-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att AC-3-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer DTS.\n"
-" Detta tillåter att DTS-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att DTS-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer DTS-HD.\n"
-" Detta tillåter att DTS-HD-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att DTS-HD-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer EAC-3.\n"
-" Detta tillåter att EAC-3-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att EAC-3-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Aktivera detta om din uppspelningsenhet stödjer TrueHD.\n"
-" Detta tillåter att TrueHD-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Aktivera detta om din uppspelningsenhet stödjer ThrueHD.\n"
+"Detta tillåter att ThrueHD-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "Aktivera detta om din uppspelningsenhet stödjer FLAC.\n"
-" Detta tillåter att FLAC-genomströmning väljs när automatisk genomströmning är aktiverat."
+"Detta tillåter att FLAC-genomströmning väljs när automatisk genomströmning är aktiverat."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Genomströmningsreserv:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
@@ -1350,78 +1494,78 @@
 "Ange ljudkodek att koda om med, när ett passande spår för ljudgenomströmning"
 " inte kan hittas."
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Ljudkodningsinställningar:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr "Varje markerat källspår kommer att kodas med alla valda kodare"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Kodare"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Bithastighet/Kvalitet"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "Nermixning"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Samplingsfrekvens"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Förstärkning"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Spårval"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Ljud"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "Visa undertextlista för utdata"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Lägg till nya undertextinställningar i listan"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "Lägg till alla undertextspår i listan"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Främmande ljudsökning"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
-"Lägger till ett extra pass till omkodningen, som söker efter\n"
-" undertextkandidater med undertext till segment\n"
-" av ljudet som är på främmande språk."
+"Lägger till ett extra pass till omkodningen, som söker\n"
+"efter undertextkandidater med undertext till segment\n"
+"av det ljud som är på främmande språk."
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Läs in alla undertextinställningar från standard igen"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "Välj vilket undertextspår som skall användas."
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1435,45 +1579,45 @@
 "Första språket i listan är ditt \"föredragna\" språk och kommer att användas\n"
 "för att avgöra undertextvalet vid förekomst av främmande språk."
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Föredraget språk: Inget"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "Lägg till främmande ljudsökningspass"
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Lägg till \"Främmande ljudsökning\" när standardljudspåret är ditt föredragna språk.\n"
-" Detta sökpass hittar korta sekvenser på främmande språk och tillhandahåller undertexter för dem.\n"
+"Detta sökpass hittar korta sekvenser på främmande språk och tillhandahåller undertexter för dem.\n"
 "\n"
-" Detta alternativ kräver att ett språk har valts från listan med \"Tillgängliga språk\"."
+"Detta alternativ kräver att ett språk har valts från listan med \"Tillgängliga språk\"."
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "Lägg till undertextspår om standardspråket är främmande"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "Lägg till ett undertextspår, när standardljudspåret inte är ditt föredragna språk.\n"
 "\n"
-" Detta alternativ kräver att ett språk har valts från listan med \"Tillgängliga språk\"."
+"Detta alternativ kräver att ett språk har valts från listan med \"Tillgängliga språk\"."
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "Lägg till textning när det finns tillgängligt"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
@@ -1481,59 +1625,59 @@
 "Stängd textning är undertexter som kan läggas till i valfri behållare, som "
 "ett fristående undertextspår"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Inbränningsbeteende*:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Ange inbränningsbeteende för undertext.\n"
 "\n"
-" Inbrända undertexter är en del av videon och kan inte inaktiveras vid uppspelning.\n"
-" Endast ett undertextspår kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
+"Inbrända undertexter är en del av videon och kan inte inaktiveras vid uppspelning.\n"
+"Endast en undertext kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "Inbränning för bristfälliga spelare*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD-undertexter"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Bränn den först valda DVD-undertexten. Alla andra DVD-undertexter kommer att tas bort.\n"
-" Använd detta alternativ om ditt spelarprogram eller enhet inte stödjer DVD-undertexter.\n"
+"Använd detta alternativ om ditt spelarprogram eller enhet inte stödjer DVD-undertexter.\n"
 "\n"
-" Endast ett undertextspår kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
+"Endast ett undertextspår kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Blu-ray-undertexter"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "Bränn den först valda Blu-ray-undertexten. Alla andra Blu-ray-undertexter kommer att tas bort.\n"
-" Använd detta alternativ om ditt spelarprogram eller enhet inte stödjer Blu-ray-undertexter.\n"
+"Använd detta alternativ om ditt spelarprogram eller enhet inte stödjer Blu-ray-undertexter.\n"
 "\n"
-" Endast ett undertextspår kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
+"Endast ett undertextspår kan brännas! Eftersom konflikter kan uppstå, vinner det först valda."
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
@@ -1541,7 +1685,7 @@
 "* Endast ett av ovanstående undertextalternativ kommer att tillämpas,"
 " med början överst."
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
@@ -1549,707 +1693,235 @@
 "Endast ett undertextspår kan brännas in, eftersom konflikter kan uppstå! Det"
 " först valda vinner."
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "Referensbildrutor:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"Förnuftiga värden är ~1-6. Ju mer du ökar, desto bättre komprimering men långsammare omkodning.\n"
-"Cel-animering tenderar att dra fördel av fler referensbildrutor, snarare än filminnehåll.\n"
-"\n"
-"Notera att många hårdvaruenheter har begränsningar i antalet referensbildrutor som stöds,\n"
-"så om du kodar för en handhållen eller fristående spelare, bör du inte röra detta, såvida du inte är\n"
-"absolut säker på vad du gör!"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "Max B-bildrutor:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"Förnuftiga värden är ~2-5. Detta specificerar max antal sekventiella B-bildrutor som kodaren kan använda.\n"
-"\n"
-"Höga siffror ger generellt ingen avsevärd förbättring, såvida inte adaptiva B-bildrutor anges till \"Optimal\".\n"
-"Cel-animerat källmaterial och B-pyramid ökar också nyttan av högre värden.\n"
-"\n"
-"Basprofil krävs för iPod och liknande enheter. Kräver att B-bildrutor anges som 0 (Av)."
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "Pyramidala B-bildrutor:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-pyramid förbättrar komprimering genom att skapa en pyramidal struktur,\n"
-"som låter B-bildrutor referera till varandra för att förbättra komprimeringen.\n"
-"\n"
-"Kräver max B-bildrutor högre än 1. Optimala adaptiva B-bildrutor rekommenderas starkt, för full komprimeringsfördel."
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "Viktade P-rutor:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"Utför extra analys för att avgöra viktningsparametrar för varje bildruta.\n"
-"\n"
-"Detta förbättrar den övergripande komprimeringen något, och förbättrar\n"
-"kvaliteten på toningar kraftigt.\n"
-"\n"
-"Basprofilen, som krävs för iPod och liknande enheter, kräver att viktad P-bildruteberäkning\n"
-"är inaktiverad. Notera att vissa enheter och spelare, även de som stöder huvudprofilen,\n"
-"kan ha problem med viktad P-bildruteberäkning. Apple-TV är t.ex helt inkompatibel."
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8-transformering"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"8x8-transformering är den enskilt mest användbara funktionen i x264, när det gäller komprimering-per-hastighet.\n"
-"\n"
-"Det förbättrar kompressionen med åtminstone 5%, för en mycket liten hastighetskostnad\n"
-"och erbjuder ovanlig stora visuella kvalitetsfördelar, jämfört med kompressionsvinsten.\n"
-"Det kräver dock hög profil, vilket många enheter kanske inte stödjer."
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "CABAC entropikodning"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"Efter att kodaren har gjort sitt jobb, har den en mängd data som behöver\n"
-"komprimeras förlustfritt, liknande ZIP eller RAR. H.264 erbjuder två alternativ\n"
-"för detta. CAVLC och CABAC. CABAC kodar mycket långsammare, men komprimerar\n"
-"betydligt bättre (10-30%), speciellt vid lägre bithastigheter.\n"
-"\n"
-"Om du vill minimera CPU-kraven för videouppspelning, bör du inaktivera detta alternativ.\n"
-"Basprofilen, som krävs för iPod och liknande enheter, kräver att CABAC inaktiveras."
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Kodningsfunktioner"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "Rörelseberäknad metod:"
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"Kontrollerar rörelseberäkningsmetoden.\n"
-"\n"
-"Rörelseberäkning är hur kodaren beräknar hur varje bildpunktsblock i en bildruta, har flyttats.\n"
-"En bättre sökmetod för rörelse, förbättrar komprimeringen på bekostnad av hastigheten.\n"
-"\n"
-"Diamant: Utför en extremt snabb och enkel sökning med hjälp av ett diamantmönster.\n"
-"Hexagon: Utför en något mer effektiv men lite långsammare sökning i ett hexagonmönster.\n"
-"Uttömmande: Utför en \"dum\" sökning efter varje bildpunkt över ett brett område. Betydligt långsammare för endast en liten komprimeringsvinst.\n"
-"Transformerad uttömmande: Som Uttömmande, men tar än mer exakta beslut. Ytterligare något långsammare, för endast en liten förbättring."
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "Subpel ME &amp; läge:"
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"Denna inställning kontrollerar både SubME och lägesbeslutsmetoder.\n"
-"\n"
-"SubME används för förfining av rörelseuppskattningar bortom enbart pixelprecision, för förbättrad kompression.\n"
-"Lägesbeslut är metoden som används för att avgöra hur varje block i bildrutan skall kodas. Ett mycket viktigt beslut.\n"
-"SAD är den snabbaste metoden, följt av SATD, RD, RD-förfining och den långsammaste, QPRD.\n"
-"6 eller högre rekommenderas starkt. Psy-RD, en mycket kraftfull optimering som hjälper till att bevara detaljer, kräver RD.\n"
-"11 inaktiverar alla tidiga avslut i analys.\n"
-"10 och 11, de mest kraftfulla och långsammaste alternativen kräver adaptiv kvantisering (aq-läge> 0) och trellis 2 (alltid)."
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "Rörelseberäknat intervall:"
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"Detta är det avstånd x264 söker av, från sin ursprungliga uppskattning\n"
-"av ett blocks rörelse, för att försöka finna dess verkliga rörelse.\n"
-"\n"
-"Standard räcker för de flesta innehåll, men video med extremt mycket rörelse,\n"
-"speciellt med HD-upplösning, kan dra nytta av högre intervall, om än på\n"
-"bekostnad av hastighet."
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "Adaptivt direktläge:"
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 möjliggör två olika prognoslägen, rumslig och tidsmässig, i B-bildrutor.\n"
-"\n"
-"Rumslig (standard) är nästan alltid bättre, men ibland är också tidsmässig användbar.\n"
-"x264 kan, till kostnad av en liten hastighetssänkning (och följaktligen en liten komprimeringsvinst),\n"
-"adaptivt avgöra vilket som är bäst för varje enskild bildruta."
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Adaptiva B-bildrutor:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 har en mängd olika algoritmer för att avgöra när B-bildrutor skall användas och hur många som skall användas.\n"
-"\n"
-"Snabb läge tar ungefär samma tid oavsett hur många B-bildrutor du anger.\n"
-"Men tack vare snabbheten är dess beslut ofta suboptimala.\n"
-"\n"
-"Optimalt läge blir långsammare i förhållande till att maximalt antal B-bildrutor ökar,\n"
-"men ger mycket mer korrekta beslut, speciellt när de används med B-pyramid."
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Partitioner:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"Lägesbeslut väljer från en mängd olika alternativ för att fatta beslut:\n"
-"Det här alternativet avgör vilka dessa alternativ är.\n"
-"\n"
-"Färre partitioner att kontrollera innebär snabbare kodning, på bekostnad\n"
-"av sämre beslut. Eftersom bästa alternativet kan vara ett som är avstängt."
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "Trellis:"
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"Trellis finjusterar avrundningen av transformeringskoefficienterna för\n"
-"att pressa ut ytterligare 3-5% kompression på bekostnad av lite fart.\n"
-"\n"
-"\"Alltid\" använder Trellis inte bara under den huvudsakliga kodningsprocessen, utan också\n"
-"under analysen, vilket förbättrar komprimeringen ännu mer, om än till stor hastighetskostnad."
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analys"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "Adaptiv kvantiseringsstyrka:"
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"Adaptiv kvantisering kontrollerar hur kodaren distribuerar databitar över bildrutan.\n"
-"\n"
-"Högre värden tar bort fler bitar från kanter och komplexa områden, för att förbättra mer detaljerade områden."
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "Psykovisuell frekvensdistortion:"
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"Psykovisuell distorsionsoptimering drar fördel av mänskliga synegenskaper,\n"
-"för att dramatiskt förbättra detaljrikedom och skärpa.\n"
-"Effekten kan göras svagare eller starkare genom att justera styrkan.\n"
-"Då det är en RD-algoritm, krävs åtminstone lägesbeslut \"6\"."
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "Psykovisuell trellis:"
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"Psychovisuell trellis är en experimentell algoritm för att ytterligare förbättra\n"
-"skärpa och detaljlagring utöver vad psychovisual RD gör.\n"
-"\n"
-"Rekommenderat värde är runt 0.2, men högre värden kan förbättra mycket\n"
-"gryniga videor eller lägre bithastighetskodningar. Rekommenderas inte för\n"
-"cel-animering och annan skarpt avgränsad grafik."
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Blockborttagning: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"H.264 Blockborttagningsfilter.\n"
-"\n"
-"h.264 har ett inbyggt blockborttagningsfilter som jämnar ut blockerande artefakter efter avkodning\n"
-"av bildrutor. Detta förbättrar inte bara visuell kvalitet, utan är också en betydande hjälp i\n"
-"komprimeringen. Blockborttagningsfiltret tar mycket CPU-kraft i anspråk, så om du strävar efter att\n"
-"minimera CPU-kraven för videouppspelning, bör du inaktivera detta.\n"
-"\n"
-"Blockborttagningsfiltret har två justerbara parametrar, \"styrka\" (Alfa) och \"tröskelvärde\" (Beta).\n"
-"Den förra kontrollerar hur stark (eller svag) blockborttagningen är, medan den senare kontrollerar\n"
-"hur många (eller få) kanter den tillämpas på. Lägre värden betyder svagare blockborttagning, högre\n"
-"betyder starkare blockborttagning. Standardvärde är 0 (normalstyrka) för bägge parametrarna."
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "Ingen DCT-decimering"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"x264 nollställer normalt, nästan tomma datablock för att spara bitar\n"
-"som kan användas bättre för andra ändamål i videon. Ibland kan detta\n"
-"ha en lätt negativa effekter på bevarande av subtila korn och gitter.\n"
-"\n"
-"Rör inte detta om du inte har bandproblem, eller andra sådana fall\n"
-"där du har problem med att bevara fint buller."
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "Psykovisuellt"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"Dina valda alternativ kommer att visas här.\n"
-"Du kan redigera dessa och lägga till fler alternativ.\n"
-"\n"
-"Standardvärden visas inte. Standardvärden är:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "Sträng för aktuella avancerade x264-alternativ"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Avancerad video"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Avsnittsmarkörer"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Lägg till avsnittsmarkörer i utdatafilen."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "Index"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Varaktighet"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Titel"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Avsnitt"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Titel:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Aktörer:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Regissör:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Publiceringsdatum:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Genre:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Graf:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Taggar"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Inställningar"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Redigera"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"Märk markerad köpost som väntande.\n"
-"Återställer köat jobb till väntande och klart att köra igen."
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Läs om alla"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"Märk alla köposter som väntande.\n"
-"Återställer alla köade jobb till väntande och klara att köra igen."
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Ta bort alla"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Ta bort alla objekt i kön."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Spara kön"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"Spara aktuell kö av kodningsjobb som en fil.\n"
-"Denna fil kan läsas in vid en senare tidpunkt, för att redigera och koda om."
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Läs in köfil"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Läs in en tidigare sparad köfil."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Spara som:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "Målfilsnamn för din omkodning."
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "Till:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "Målmapp för din omkodning."
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Målmapp"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "OK"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Markera alla"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Markera titlar för att lägga till i kön"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Rensa alla"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Avmarkera alla titlar"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "Målfilerna är OK. Inga dubbletter identifierade."
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Sök automatiskt efter uppdateringar"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "När alla omkodningar är slutförda"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr "Använd automatisk namngivning (använder modifierade källnamn)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr "Skapa målfilsnamn från källfilsnamn eller volymetikett"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Mall för autonamn"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"Tillgängliga alternativ: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Tillgängliga alternativ: {source-path} {source} {title} {preset} {chapters} "
+"{date} {time} {creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "Använd iPod-/iTunes-vänligt (.m4v) filtillägg för MP4"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Antal förhandsvisningar"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Filtrera korta titlar (sekunder)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "Filtrera korta DVD- och Blu-ray-titlar (sekunder)"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr "Ta bort slutförda köobjekt när en kodning har slutförts"
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"Som standard, behålls slutförda jobb i kön och markeras som slutförda.\n"
+"Markera det här, om du vill att kön skall rensa sig själv och ta bort slutförda jobb."
+
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "Fraktionerad kornighet i konstant kvalitet"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Använd dvdnav (istället för libdvdread)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "Övervaka måldiskens lediga utrymme"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr "Pausa kodningen om ledigt diskutrymme sjunker under gränsen"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB-gräns"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr "Spara individuella omkodningsloggar i samma mapp som filmen"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "Utförlig aktivitetslogg"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "Varaktig aktivitetslogg"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "Skala ner HD-förhandsvisningar"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "Skanna DVD automatiskt vid inmatning"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Skannar DVD:n när en ny skiva matas in"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "Aktivitetsfönstrets teckenstorlek"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Dölj avancerade videoalternativ"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Använd avancerade videoalternativ på egen risk.\n"
-"Vi rekommenderar att du använde tillgängliga kontroller\n"
-"under videofliken istället."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "Ta bort slutförda jobb från kön"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"Som standard, behålls slutförda jobb i kön och markeras som slutförda.\n"
-"Markera det här, om du vill att kön skall rensa sig själv och ta bort slutförda jobb."
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Använd samma inställningar för alla titlar i en omgång"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2261,71 +1933,67 @@
 "\n"
 "Avaktivera om du vill göra oberoende inställningar för enskilda titlar."
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "Tillåt justeringar"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "Tillåt HandBrake för nybörjare"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Mappnamn:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Byt mallnamn"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Beskrivning"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr "Ange under vilken kategori denna mall skall visas."
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Kategorinamn:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Mallnamn:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Standardmall"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "Gör det här till standardmall när HandBrake startas"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Anpassade bildstorlekar"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr "Dimensioner"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Maxbredd:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Aktivera maxbredd."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2337,15 +2005,15 @@
 "När en ny källa läses in, är detta det värde som kommer att tillämpas om källans bredd är längre.\n"
 "0-värde innebär att ingen maxbredd tillämpas."
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Maxhöjd:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Aktivera maxhöjd."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2357,11 +2025,15 @@
 "När en ny källa läses in, är detta det värde som kommer att tillämpas om källans höjd är högre.\n"
 "0-värde innebär att ingen maxhöjd tillämpas."
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "Handbrake förhandsvisning"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Välj förhandsgranskningsrutor."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2369,79 +2041,109 @@
 "Koda om och spela upp en kort sekvens av videon, med början från aktuell "
 "förhandsgranskningsposition."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Varaktighet:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "Ange varaktighet för förhandsgranskningen, i sekunder."
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Visa beskärning"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "Visa beskuret område"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Källupplösning"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Återställ förhandsgranskningsfönstret till källvideons upplösning"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Öppna"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Titelnummer:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Identifierade DVD-enheter:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "Importera SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "Aktivera inställningar för import av SRT undertextfil"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "Importera SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "Aktivera inställningar för import av SSA undertextfil"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Inbäddad undertextlista"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Aktivera inställningar för val av inbäddade undertexter"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Källspår"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Lista över undertextspår, tillgängliga från din källa."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Spårnamn:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"Ange undertextnamn.\n"
+"\n"
+"Spelare kan använda detta i undertextlistan."
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Språk"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Teckenkod"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Fil:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Förskjutning (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2449,7 +2151,7 @@
 "Ange språket i denna undertext.\n"
 "Detta värde används av spelare, i undertextmenyer."
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2463,36 +2165,28 @@
 "Vi konverterar teckentabellen till UTF-8.\n"
 "Källans teckentabell behövs för att utföra denna konvertering."
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "Välj SRT-fil för import."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "SRT-fil"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "Importera fil"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 "Justera förskjutningen i millisekunder, mellan video och SRT-tidsstämplar"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Spår"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Lista över undertextspår, tillgängliga från din källa."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Endast obligatoriska undertexter"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Bränn in i videon"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2500,23 +2194,15 @@
 "Rendera undertexten över videon.\n"
 "Undertexten blir en del av videon och kan inte avaktiveras."
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Ange standardspår"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Källspår"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Lista över ljudspår, tillgängliga från din källa."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Spårnamn:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2526,15 +2212,15 @@
 "\n"
 "Spelare kan använda detta i ljudspårslistan."
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Mix"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Samplingsfrekvens"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2546,50 +2232,50 @@
 "För källjud som har ett brett dynamiskt intervall (mycket högt och mycket låga sekvenser),\n"
 "Låter DRC dig \"komprimera\" intervallet genom att göra höga ljud lägre och låga ljud högre."
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Ange ljudkodek att koda om detta spår med."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Bithastighet"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Aktivera bithastighetsinställningar"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Kvalitet"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Aktivera kvalitetsinställningar"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Ange bithastighet att koda om detta spår med."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 "Kvalitet: Justera utdatakvalitet, för de kodekar som stöder det."
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "Ange nermixning för utdataljudet."
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Ange samplingsfrekvens för utdataljudet."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
@@ -2598,186 +2284,73 @@
 "ljudspår."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0 dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Av"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Hoppa över den här versionen"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Påminn mig senare"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "En ny version av HandBrake finns tillgänglig!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx finns nu tillgänglig (du har yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Versionsnotiser"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "Video-omkodare"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-"HandBrake är ett verktyg för att konvertera film från nästan vilket format "
-"som helst, till ett urval av moderna, allmänt stödda kodekar."
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "Anledningar till att du kommer att älska HandBrake:"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "Konvertera video från nästan vilket format som helst"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "Fri och öppen källkod"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "Multiplattform (Linux, Mac och Windows)"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "Huvudfönster och inställningssammandrag"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "Videoupplösning och beskärningsinställningar"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "Inställningar för videokodare"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "Ljudspårsval och inställningar"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "Redigera avsnittstitel"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>Kunde inte skapa %s.</big>\n"
-"\n"
-"Internt fel. Kunde inte tolka UI-beskrivning.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "Index"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Varaktighet"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Titel"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "Jobbinformation"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Spårinformation"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Mallnamn"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "Enhet eller fil att koda om"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "Mallvärden att använda för kodning"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "Spam a lot"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "Sökväg för att åsidosätta användarkonfigurationsmappen"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Öppna en konsol för felsökningsutdata"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Alla"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Kvalitet: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Bithastighet: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Bithastighet: %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Genomströmning"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2788,7 +2361,7 @@
 "DRC: %s\n"
 "Spårnamn: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2797,7 +2370,7 @@
 "%sGain: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2805,7 +2378,7 @@
 "Lägg till en ljudkodare.\n"
 "Varje valt källspår kommer att kodas med alla valda kodare."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2813,39 +2386,39 @@
 "Ljudkvalitet:\n"
 "Justera kvaliteten på utdata, för kodare som stödjer det."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Ta bort den här ljudkodaren"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "Om HandBrake avslutas, avbryts kodningen.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Inte valt"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Söker..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Stoppa sökning"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Ingen titel hittades"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Ny video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2856,438 +2429,437 @@
 "\n"
 "%s på %d sekunder ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sDin film kommer att förloras om du inte fortsätter kodningen."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Avbryt pågående och stoppa"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Avbryt pågående, starta nästa"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Slutför aktuell, stoppa sedan"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Fortsätt koda"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d kodning(ar) väntande"
+msgid "%d encode pending"
+msgstr "%d kodning väntar"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d kodningar väntar"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr "jobb %d av %d, "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "pass %d (undertextsökning) av %d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "pass %d av %d, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr "Kodning: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Kodning: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Kodning: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Söker efter starttid, "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "Genomsöker titel %d av %d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "Genomsöker %d av %d förhandsgranskning %d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Pausad"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Omkodning klar!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Omkodning avbruten."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Omkodning misslyckades."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "Muxning: Detta kan ta en stund..."
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Genomsök denna DVD-källa"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Varning: förlustfri)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s finns nu tillgänglig (du har %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Omkodning slutförd"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "Ställ ner drinken, din HandBrake-kö är klar!"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Din omkodning är slutförd."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Stänger av datorn"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Försätter datorn i viloläge"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Avslutar HandBrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "Första spår som matchar valda språk"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "Alla spår som matchar de valda språken"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "Främmande språks undertextspår"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "Först valda spår"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "Främmande ljudspråk, sedan först valda spår"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Avsnitt:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Sekunder:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Bildrutor:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Gör ingenting"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Visa avisering"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Avsluta HandBrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "Försätt datorn i viloläge"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Stäng av datorn"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "Lös"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Anpassad"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Vecka"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Månad"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "År"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Odödlig"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Varje dag"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Varje vecka"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Varje månad"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Oskärpa"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Laserskärpa"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 grader"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 grader"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 grader"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Rumsliga"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Temporär"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Snabb"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "Optimal"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Strikt"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Smart"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Diamant"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Hexagon"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "Ojämn multihexagon"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Uttömmande"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "Hadamard uttömmande"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, ingen subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, qpel på alla"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, multi-qpel på alla"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD i I-/P-bildrutor"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD i alla bildrutor"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: RD-förfining i I-/P-bildrutor"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: RD-förfining i alla bildrutor"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD i alla bildrutor"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: Inga tidiga avslut i analysen"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Mest"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Vissa"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Alla"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Koda endast"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Alltid"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Samma som källan"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC-film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC-video)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02dh%02dm%02ds - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02dh%02dm%02ds"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Inga titlar"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Inget ljud"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Alla"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3300,7 +2872,7 @@
 "Mall:\t%s\n"
 "Anpassat:\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3311,7 +2883,7 @@
 "\n"
 "Mall:\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3324,7 +2896,7 @@
 "Mall:\t%s\n"
 "Anpassat:\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3335,7 +2907,7 @@
 "\n"
 "Mall:\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3350,7 +2922,7 @@
 "Mall:\t%s\n"
 "Anpassat:\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3363,7 +2935,7 @@
 "Filter:\t%s\n"
 "Mall:\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3380,7 +2952,7 @@
 "Justering:\t%s\n"
 "Anpassat:\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3397,8 +2969,7 @@
 "Justering:\t%s\n"
 "Anpassat:\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3410,18 +2981,29 @@
 "Du bör välja en annan videokodek eller behållare.\n"
 "Om du fortsätter, kommer FFMPEG att användas."
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"Endast VP8 eller VP9 stöds i WebM-behållaren.\n"
+"\n"
+"Du bör välja en annan videokodek eller behållare.\n"
+"Om du fortsätter, kommer en att väljas åt dig."
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Fortsätt"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Ingen titel hittades.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3433,8 +3015,19 @@
 "Du bör ändra dina undertextinställningar.\n"
 "Om du fortsätter kan vissa undertexter förloras."
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"WebM i HandBrake, stödjer endast inbrända undertexter.\n"
+"\n"
+"Du bör ändra dina undertextinställningar.\n"
+"Om du fortsätter kommer vissa undertexter att förloras."
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3446,8 +3039,7 @@
 "Du måste välja en giltig fil.\n"
 "Om du fortsätter, kommer undertexten att undantas."
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3459,7 +3051,7 @@
 "Du bör välja en annan ljudkodek.\n"
 "Om du fortsätter, kommer en att väljas åt dig."
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3472,16 +3064,56 @@
 "Välj en annan videokodek.\n"
 "Om du fortsätter, kommer en att väljas åt dig."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>Kunde inte skapa %s.</big>\n"
+"\n"
+"Internt fel. Kunde inte tolka UI-beskrivning.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Spårinformation"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Mallnamn"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Enhet eller fil att koda om"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "Mallvärden att använda för kodning"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "Spam a lot"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "Sökväg för att åsidosätta användarkonfigurationsmappen"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Öppna en konsol för felsökningsutdata"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr "ghb_presets_menu_init: Kunde inte hitta mallmappen."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "Kunde inte hitta överordnad mapp när undermapp lades till."
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3491,31 +3123,31 @@
 "\n"
 "Vill du fortsätta?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Ta mig härifrån!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Läs in säkerhetskopierade mallar"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Alla (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Mallar (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Äldre mallar (*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Exportera mallar"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3526,15 +3158,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "mapp"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "mall"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3547,267 +3179,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Sekunder"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Bildrutor"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (Titel %d, %s %d genom %d, 2 videopass) --> "
-"%s"
+msgid "%s (Modified)"
+msgstr "%s (Ändrad)"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (Titel %d, %s %d genom %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "Justera A/V"
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "Modifierad mall baserad på: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Mall: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d Beskär\n"
+"%dx%d lagring, %dx%d visning\n"
+"%d:%d Pixel-bildförhållande\n"
+"%s Visningsbildförhållande"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Format: %s Behållare\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Behållaralternativ:"
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, Bithastighet: %dkbps"
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sKapitelmarkörer"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, Bithastighet: %dkbps (2 pass)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G-stöd"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, Konstant kvalitet %.4g(%s)"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sWebboptimerat"
+msgid "%sPreset %s"
+msgstr "%sFörinställning %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Destination: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Bildförhållande bevarat)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Bildförhållande förlorat)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorfisk)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Anpassat anamorfisk)"
+msgid "%sTune %s"
+msgstr "%sJustering %s"
 
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Bild: "
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Källa: %d x %d, Utdata %d x %d %s, Beskär %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr "%sProfil %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Skärm %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filter:"
+msgid "%sLevel %s"
+msgstr "%sNivå %s"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"Konstant bildfrekvens %s fps"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"Peak-bildfrekvens %s fps (kan vara lägre)"
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"Variabel bildfrekvens %s fps"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", Endast tvingad"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sGråskala"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", Bränd"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", Standard"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(konstant)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "Slutförd"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(variabel)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "Avbruten"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Bildfrekvens: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "Misslyckad"
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Bildfrekvens: Topp %s (kan vara lägre)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "Väntar"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Bildfrekvens: %s (konstant bildfrekvens)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Fel"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Bithastighet:"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d Dag %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "Turbo 1st Pass: På\n"
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Videoalternativ: Mall: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d Dagar %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - Justering: "
-
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Profil: %s"
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Nivå: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Avancerade alternativ: %s\n"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Ljud: "
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Ljudspår: %d"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "Ej tillgänglig"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Bithastighet: %d"
-
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Kodare: %s"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "Främmande ljudsökning"
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> Kodare: %s, Nermixning: %s, Samplingshastighet: %s, %s"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "Koda"
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "Koda första passet (Analys)"
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "Koda andra passet (Slutför)"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Undertext: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Fel"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Undertextspår: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"pass %d av %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Endast obligatorisk)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "Söker titel"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (Bränn)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "Kodning pausad"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (Standard)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "Kodning pågår"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Förskjutning (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "Okänd"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sMålets filsystem är nästan fullt: %<PRIu64>MB ledigt.\n"
+"%sMålets filsystem är nästan fullt: %<PRId64>MB ledigt.\n"
 "Mål: %s\n"
 "Kodningen kanske blir ofullständig om du fortsätter.\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Återuppta, jag har fixat problemet"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Återuppta, berätta inte igen"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3820,11 +3406,11 @@
 "Ett annat köat jobb har specificerat samma målplats.\n"
 "Vill du skriva över?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3835,7 +3421,7 @@
 "\n"
 "Detta är ingen giltig målmapp."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3846,7 +3432,7 @@
 "\n"
 "Kan inte läsa eller skriva målmappen."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3859,16 +3445,16 @@
 "Filen finns redan.\n"
 "Vill du skriva över den?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Välj den här titeln för att läggas till i kön.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Ingen titel"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3878,31 +3464,31 @@
 "Denna titel kommer inte att läggas till i kön, om du\n"
 "inte först ändrar utdatafilens namn.\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Stoppa omkodning"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "S_toppa omkodning"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "Återuppta"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Återuppta omkodning"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "S_toppa omkodning"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Återuppta omkodning"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3910,24 +3496,22 @@
 "Det pågår en omkodning. Vad vill du göra?\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Föredraget språk: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "Lägg till %s undertextspår om standardljudet inte är %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr ""
 "Lägg till undertextspår om standardljudet inte är ditt föredragna språk"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3940,8 +3524,7 @@
 "Utökade alternativ:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3953,3 +3536,8 @@
 "\n"
 "Utökade alternativ:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Varning: förlustfri)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/tr.po -> HandBrake-1.5.1.tar.xz/gtk/po/tr.po Changed

@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Ege Öz <ege.oz@yandex.com.tr>, 2018
+# Mesut Akcan <makcan@gmail.com>, 2020
+# Osman Öz <osmanoz50@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: Ege Öz <ege.oz@yandex.com.tr>, 2018\n"
+"Last-Translator: Osman Öz <osmanoz50@gmail.com>, 2021\n"
 "Language-Team: Turkish (https://www.transifex.com/HandBrakeProject/teams/92423/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +32,11 @@
 "\n"
 "Altyazı videonun parçası olacak ve devre dışı bırakılamaz"
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "Yaz"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -46,11 +47,11 @@
 "in your output."
 msgstr ""
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "Varsayılan"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -60,11 +61,11 @@
 "a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "Sadece Zorlanmış"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -74,11 +75,11 @@
 "This setting allows you to synchronize the files."
 msgstr ""
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT Kaydırması"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -93,55 +94,233 @@
 "conjunction with the \"Forced\" option."
 msgstr ""
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "Parça"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "_Hazır Ayarlar"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "_Varsayılan Olarak Ayarla"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "_Kaydet"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "_Farklı Kaydet"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "_Yeniden Adlandır"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "_Sil"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "_İçe Aktar"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "_Dışa Aktar"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "_Yerleşik Hazır Ayarları Sıfırla"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "Ön Ayarlar Listesi"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Kodlamayı Başlat"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Başla"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Kodlamayı Duraklat"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Duraklat"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "Seçenekler"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "Sıfırla"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "Düzenle"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "Ön Ayar:"
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "Başlık:"
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "Özet"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "HandBrake Hakkında"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -149,198 +328,181 @@
 "Telif Hakkı © 2008 - John Stebbins\n"
 "Telif Hakkı © 2004 -, HandBrake Geliştiricileri"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
 "HandBrake GPL lisanslı, çok platformlu, çok iş parçacıklı video "
 "transcoder'dır."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "_Dosya"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "_Kaynağı Aç"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "Tek _Başlık Aç"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "_Hedefi Ayarla"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "_Tercihler"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "_Çık"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "_Sıra"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "_Ekle"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "_Birden Çok Ekle"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "Kodlamayı Başlat"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "Kodlamayı _Duraklat"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "K_ayıt Sırası"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "_Sıra Dosyası Yükle"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "_Görünüm"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "_Yeni Başlayanlar için HandBrake"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "Hazır Ayarlar _Listesi"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "_Önizleme"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "_Aktivite Penceresi"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "_Yardım"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "_Hakkında"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "_Kılavuz"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "Video Kaynağı Seç"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr ""
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "Sıraya Ekle"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "Kodlamayı Başlat"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "Başla"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "Kodlamayı Duraklat"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr ""
+msgstr "Sıraya Ekle"
 
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
-msgstr ""
+msgstr "Ön Ayarlar"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "Önizleme Penceresini Göster"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "Önizleme"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "Sırayı Göster"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "Sıra"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "Etkinlik Penceresini Göster"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr ""
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "Kaynak:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "Yok"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "Taranıyor..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "Başlık:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -350,146 +512,142 @@
 "Varsayılan olarak en uzun başlık kullanılacaktır.\n"
 "Bu genellikle DVD' nin başlığıdır."
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "Başlık Yok"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "Açı:"
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "Aralık:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "Kodlanacak ilk bölümü belirle."
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "Kodlanacak son bölümü belirle."
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "Ön Ayar:"
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "Hazır Ayar Seç"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "Değiştirilmiş"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "Tekrar yükle"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "Yeni Hazır Ayarı Kaydet"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "Mevcut ayarları yeni bir Hazır Ayar'a kaydedin."
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr "Biçim:"
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Web'e Uygun"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "Ses/Video başlangıcı hizlama"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G Desteği"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr "Bazı eski iPod'lar için gerekli olan iPod Atom'u ekleyin."
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "Süre:"
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "ss:dd:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr "Parça:"
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr "Filtreler:"
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "Boyut:"
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "Özet"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr "Otomatik Kırpma"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "Videonun çevresindeki siyah sınırları kes."
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -498,92 +656,83 @@
 "the required multiple."
 msgstr ""
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr "Soldan Kırpma"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "Üstten Kırpma"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "Alttan Kırpma"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr "Sağdan Kırpma"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "Kırpma Ölçüleri:"
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "Kırpma"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "Kaynak için en uygun"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "Genişlik:"
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr "Yükseklik:"
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "Anamorfik:"
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
-"Anamorfik Modlar:\n"
-"<tt>\n"
-"Hiçbiri - Piksel en boy oranını 1: 1'e zorlar\n"
-"Gevşek - Orijinal görüntünün en boy oranını korurken\n"
-" kaynak video piksel en boy oranına olabildiğince \n"
-" yakın bir piksel en boy oranı kullanır\n"
-"Otomatik - Orijinal ekran en boy oranını korurken\n"
-" depolama çözünürlüğünü en üst düzeye \n"
-" çıkaran bir piksel en boy oranını kullanır</tt>"
-
-#: ../src/ghb.m4.h:172
+
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr "Hizalandırma:"
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -591,30 +740,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "Depolama Geometrisi"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "En Boy Oranını Koru"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "Piksel Çerçevesi:"
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -622,56 +771,56 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "Görüntüleme Çerçevesi:"
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "Geometriyi Göster"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "Boyutlar"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "Telesine Giderme:"
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "Geçişme Algılama:"
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -679,7 +828,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -687,11 +836,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "Geçişme Giderme:"
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -699,11 +848,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "Geçişme Giderme Hazır Ayarı:"
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -711,93 +860,104 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
-msgstr "Blok Gider:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "Gürültü Giderme Filtresi:"
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "Gürültü Giderme Ön Ayarı:"
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr "Gürültü Giderme Ayarı:"
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "Keskinleştirme Filtresi:"
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "Keskinleştirme Hazır Ayarı:"
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr "Keskinleştirme Ayarı:"
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "Döndürme Filtresi:"
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "Gri Tonlama"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "Filtreler"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "Video Kodlayıcısı:"
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "Kullanılabilir video kodlayıcıları."
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "Kare Hızı:"
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -805,19 +965,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "Sabit Kare Hızı"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "Sabit kare hızı çıktısını etkinleştirir."
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "En Yüksek Kare hızı(VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -825,18 +985,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "Değişken Kare Hızı"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -852,15 +1012,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "Sabit kalite:"
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "Bit Hızı (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -869,11 +1029,11 @@
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "2 Geçişli Kodlama"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -882,49 +1042,31 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr ""
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "Gelişmiş Seçenekleri Kullan"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"x264 için gelişmiş ayarlar bölümünü kullan.\n"
-"\n"
-"Kendi sorumluluğunuzda kullanın!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "Ön Ayar:"
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr "İnce Ayar:"
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -933,22 +1075,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "Hızlı Kod Çözme"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "Sıfır Gecikme"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -958,11 +1100,11 @@
 "this setting is of little value here."
 msgstr ""
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "Profil:"
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -972,11 +1114,11 @@
 "\n"
 "Diğer tüm ayarları geçersiz kılar."
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "Seviye:"
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -986,273 +1128,246 @@
 "\n"
 "Tüm diğer ayarları geçersiz kılar."
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "Daha Fazla Ayar:"
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "Video"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "Parça Listesi"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "Parça Seçimi"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr ""
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "Ekle"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "Listeye yeni ses ayarları ekle"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "Hepsini Ekle"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "Tüm ses parçalarını listeye ekle"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "Tüm ses ayarlarını varsayılandan geri yükle"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "Parça Listesi"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "Seçim Davranışı:"
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "Kaldır"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "Kullanılabilir Diller"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "Seçilen Diller"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "İkincil ses için sadece ilk kodlayıcıyı kullanın"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "Otomatik Doğrudan Geçirme:"
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız MP3'ü destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde MP3 doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız AAC'yi destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde AAC doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız AC-3'ü destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde AC-3 doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız DTS'yi destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde DTS doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız DTS-HD'yi destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde DTS-HD doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız EAC-3'ü destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde EAC-3 doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız TrueHD'yi destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde TrueHD doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
-"Oynatma cihazınız FLAC'i destekliyorsa bunu etkinleştirin.\n"
-" Bu, otomatik doğrudan geçirme etkinleştirildiğinde FLAC doğrudan geçirmenin seçilmesine izin verir."
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "Doğrudan Geçirme Alternatifi:"
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Ses Kodlayıcısı Ayarları:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "Kodlayıcı"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "Bit Hızı/Kalite"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "Örnek Hızı"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "Kazanç"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "DRC"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "Parça Seçimi"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "Ses"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "Listeye yeni alt yazı ayarları ekle"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "Yabancı Ses Taraması"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "Tüm altyazı ayarlarını varsayılandan geri yükle"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1261,665 +1376,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "Tercih Edilen Dil: Yok"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "Yazma Davranışı *:"
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD Alt Yazıları"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "Blu-ray Alt yazıları"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Alt yazı"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8 Dönüşümü"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "Kodlama Özellikleri"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr ""
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "Uyarlanabilir B-Frames:"
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "Bölüntüler:"
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "Analiz"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "Blok Giderme: "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "DCT Azaltması Yok"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr ""
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "Gelişmiş Video"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "Bölüm İmleçleri"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "Çıktı dosyasına bölüm imleçleri ekle."
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr ""
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "Süre"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "Başlık"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "Bölümler"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "Başlık:"
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "Oyuncular:"
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "Yönetmen:"
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "Yayın Tarihi:"
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "Yorum:"
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "Tür:"
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "Konu:"
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "Etiketler"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "Ayarlar"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "Düzenle"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "Tümünü Yeniden Yükle"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "Hepsini Sil"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "Kuyruktaki tüm öğeleri silin."
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "Kaydetme Sırası"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "Sıra Dosyası Yükle"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "Önceden kaydedilmiş bir sıra dosyasını yükleyin."
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "Farklı Kaydet:"
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "Nereye:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "Hedef Dizin"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "Tamam"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "Hepsini Seç"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "Sıraya eklemek için tüm başlıkları işaretle"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "Hepsini Temizle"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "Tüm başlıkların işaretlerini kaldır"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "Tercihler"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "Güncellemeleri otomatik olarak kontrol et"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "Tüm kodlamalar tamamlandığında"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr "Otomatik adlandırma kullan (değiştirilmiş kaynak adı kullanır)"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "Otomatik Adlandırma Şablonu"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "MP4 için iPod/iTunes'la uyumlu (.m4v) dosya uzantısını kullan"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "Önizleme sayısı"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "Kısa başlıkları filtrele (saniye)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "Genel"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "Dvdnav kullan (libdvdread yerine)"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr ""
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr "Boş disk alanı sınırın altına düşerse kodlamayı duraklat"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB Sınırı"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "HD önizlemeleri küçült"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "DVD takıldığın otomatik olarak incele"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "Yeni bir disk takıldığında DVD'yi tarar"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr ""
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "Gelişmiş Video Seçenekleri Sekmesini Gizle"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"Gelişmiş video seçeneklerini kendi sorumluluğunuzda kullanın.\n"
-"Bunun yerine Video sekmesinde bulunan kontrolleri kullanmanızı öneririz."
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "Bir toplu işteki tüm başlıklar için aynı ayarları kullanın"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1927,71 +1697,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "_Yeni Başlayanlar için HandBrake'ye İzin Ver"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "Klasör Adı:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "Açıklama"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "Hazır Ayarı Yeniden Adlandır"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "Adı:"
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "Açıklama"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "Kategori:"
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "Kategori Adı:"
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "Ön Ayar Adı:"
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "Varsayılan Hazır Ayar"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "HandBrake başladığında bu hazır ayarı kullansın"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "Özel Resim Boyutu"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Maksimum Genişlik:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "Maksimum genişlik sınırını etkinleştir."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1999,15 +1765,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Maksimum yükseklik:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "Maksimum yükseklik sınırını etkinleştir."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2015,11 +1781,15 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "Önizleme karelerini seçin."
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
@@ -2027,85 +1797,112 @@
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Süre:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "Kırpmayı Göster"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "Kaynak Çözünürlüğü"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "Önizleme penceresini kaynak videonun çözünürlüğüne sıfırla"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "_Aç"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "Başlık Numarası:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "Tespit edilen DVD cihazları:"
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "SRT'yi içe aktar"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "SRT altyazı dosyalarını içe aktarma ayarlarını etkinleştir"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "Gömülü Alt Yazı Listesi"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "Gömülü alt yazıları seçmek için ayarları etkinleştir"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "Kaynak Parça"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "Kaynağınızdaki kullanılabilir alt yazıların listesi."
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "Parça Adı:"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Dil"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "Karakter Kodu"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "Dosya:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "Kaydırma (ms)"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2114,72 +1911,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "İçe aktarılacak SRT dosyasını seçin."
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Srt Dosyası"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "Parça"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "Kaynağınızdaki kullanılabilir alt yazıların listesi."
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "Sadece Zorlanmış Altyazılar"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "Videoya yaz"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "Varsayılan Parçayı Ayarla"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "Kaynak Parça"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "Kaynağınızdaki kullanılabilir ses parçalarının listesi."
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "Parça Adı:"
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "Karıştır"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "Örnek Hızı"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2187,233 +1968,122 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "Bu parçayı kodlamak için ses kodekini ayarlayın."
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "Bit Hızı"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "Bit hızı ayarını etkinleştir"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Kalite"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "Kalite ayarını etkinleştir"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "Bu parçayı kodlamak için bit hızı seçin."
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "Çıktılanacak ses parçasının örnek hızını ayarlayın."
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr "Ses Kazancı: Çıktılanacak sesi yükseltin veya alçaltın."
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "Kapalı"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "Bu versiyonu atla"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "Daha Sonra Hatırlat"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "HandBrake'in yeni bir sürümü mevcut!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx sürümü indirilebilir (yüklü sürüm yyy)."
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Sürüm Notları"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>%s oluşturulamadı.</big>\n"
-"\n"
-"İç hata. Kullanıcı arayüzü açıklaması ayrıştırılamadı.\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr ""
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "Süre"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "Başlık"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "Parça Bilgisi"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "Hazır Ayar Adı"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "Kodlanacak cihaz veya dosya"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "Hata ayıklama çıkışı için bir konsol açın"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "Tümü"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Kalite: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "Bit hızı: %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "Bit hızı:%.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "Doğrudan Geçirme"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2424,7 +2094,7 @@
 "DRC: %s\n"
 "Parça Adı: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2433,7 +2103,7 @@
 "%sKazanç: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2441,7 +2111,7 @@
 "Bir ses kodlayıcı ekle.\n"
 "Seçilen her kaynak parça, seçilen tüm kodlayıcılarla kodlanacaktır."
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2449,39 +2119,39 @@
 "Ses Kalitesi:\n"
 "Bunu destekleyen kodlayıcılar için, çıktının kalitesini ayarlayın."
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "Bu ses kodlayıcıyı kaldır"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "HandBrake'in kapatılması kodlamayı sonlandırır.\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Seçili değil"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "Taranıyor ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "Taramayı Durdur"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "Başlık Bulunamadı"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "Yeni Video"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2489,438 +2159,437 @@
 "%s in %d seconds ..."
 msgstr ""
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%sKodlamaya devam etmezseniz filminiz kaybolur."
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "Şimdikini İptal Et ve Durdur"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "Şimdikini İptal Et, Sıradakini Başlat"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "Şimdikini Bitir, Sonra Dur"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "Kodlamaya Devam Et"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
 #, c-format
-msgid "%d encode(s) pending"
-msgstr "%d kodlanacak dosya bekleniyor"
+msgid "%d encodes pending"
+msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "%2$d taneden %1$d tanesi, "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr "Kodlama: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02ds%02ddk%02dsn)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "Kodlama: %s%s%.2f %% (ETA %02ds%02ddk%02dsn)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "Kodlama: %s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "Başlangıç zamanı araması, "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "%2$d başlıktan %1$d tanesi incelendi ..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "%2$d başlıktan %1$d tanesi inclendi önizleme %3$d..."
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Durduruldu"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "Kodlama Başarılı!"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "Kodlama İptal edildi."
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "Kodlama Başarısız."
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "Bu DVD kaynağını tara"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (Uyarı: kayıpsız)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s çıktı (yüklü sürüm %s/%d)."
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "Kodlama Tamam"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "Kodlamanız tamamlandı."
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "Bilgisayar kapatılıyor"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "Bilgisayar uyku moduna alınıyor"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "Handbrake'den Çıkılıyor"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "İlk Seçilen Parça"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "Bölümler:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "Saniye:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "Çerçeveler:"
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "Hiçbir Şey Yapma"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "Bildirimleri göster"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Handbrake'den Çık"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Bilgisayarı Kapat"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Otomatik"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "Özel"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Hafta"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Ay"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Yıl"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "Ölümsüz"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Asla"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Günlük"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Haftalık"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Aylık"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "NLMeans"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "Flu"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 Derece"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 Derece"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 Derece"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "Uzaysal"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "Geçici"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "Hızlı"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "En Uygun"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "Sıkı"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "Basit"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "Akıllı"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "Elmas"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "Altıgen"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "Ayrıntılı"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, subpel yok"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: çoklu qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, hepsinde qpel"
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, hepsinde çoklu qpel"
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: I/P çerçevelerinde RD"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: Tüm çerçevelerde RD"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: tüm karelerde QPRD"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "Çoğu"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "Bazı"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "Tümü"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "Yalnızca kodla"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "Her Zaman"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "Kaynakla aynı"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC Film)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL Film/Video)"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC Videosu)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (% 05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02ds%02ddk%02dsn - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02ds%02ddk%02dsn - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02ds%02ddk%02dsn"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "Başlık Yok"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "Ses yok"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "Herhangi"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2929,7 +2598,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2937,7 +2606,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2946,7 +2615,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2954,7 +2623,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2964,7 +2633,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2973,7 +2642,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2984,7 +2653,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2995,8 +2664,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3004,18 +2672,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "Devam Et"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "Başlık bulunamadı.\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3023,8 +2698,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3032,8 +2714,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3041,7 +2722,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3054,16 +2735,56 @@
 "Farklı bir ses kodu çözücü seçmelisiniz.\n"
 "Devam ederseniz, sizin için seçilecektir."
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>%s oluşturulamadı.</big>\n"
+"\n"
+"İç hata. Kullanıcı arayüzü açıklaması ayrıştırılamadı.\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "Parça Bilgisi"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "Hazır Ayar Adı"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "Kodlanacak cihaz veya dosya"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "Hata ayıklama çıkışı için bir konsol açın"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr "ghb_presets_menu_init: Hazır ayar klasörü bulunamadı."
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3073,31 +2794,31 @@
 "\n"
 "Devam etmek ister misiniz?"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "Beni buradan çıkar!"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "Yedek hazır ayarları yükle"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "Tümü (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "Hazır Aylarlar (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "Eski Ön Ayarlar (* .plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "Hazır Ayarı Dışa Aktar"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3107,15 +2828,15 @@
 "%s dosyasının silinmesini onayla:\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "klasör"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "hazır ayar"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3124,265 +2845,206 @@
 "%s"
 msgstr ""
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "Saniye"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "Çerçeveler"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
 msgstr ""
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
 msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "Ön ayar: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "Biçim: %s Kapsayıcı\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "Kapsayıcı Seçenekleri:"
+msgid "%s, Bitrate %dkbps"
+msgstr ""
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%sBölüm İmleçleri"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G Desteği"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%sWeb için Optimize Edildi"
+msgid "%sPreset %s"
+msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "Hedef: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(Çerçeve Korundu)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(Çerçeve Kaybedildi)"
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(Anamorfik)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(Özel Anamorfik)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "Resim: "
+msgid "%sTune %s"
+msgstr ""
 
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "Kaynak: %d x %d, Çıktı %d x %d %s, Kırp %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", Göster %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "Filtreler:"
+msgid "%sLevel %s"
+msgstr ""
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%sTelesine Giderme"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%sGürültü Giderme %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%sBlok Giderme: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%sGri Tonlama"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(sabit)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(değişken)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr ", Çerçeve Hızı: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr ", Çerçeve Hızı: En Yüksek %s (daha düşük olabilir)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ", Kare hızı: %s (sabit kare hızı)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "Hata"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "Bit Hızı:"
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
+msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "Video Seçenekleri: Ön Ayar: %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - İnce Ayar: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - Profil: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - Seviye: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "Gelişmiş Seçenekler: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "Ses: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "Ses Parçaları: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "Bit hızı: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> Kodlayıcı: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> Kodlayıcı: %s , Birleştirme: %s , Örnek Hızı: %s , %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "Alt yazı: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Hata"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "Alt yazılar: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (Sadece Zorla)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (Yaz)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (Varsayılan)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr " %s, Kaydırma (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%sHedef dosya sistemi neredeyse dolu: %<PRIu64>MB boş.\n"
-"Hedef: %s\n"
-"Devam ederseniniz kodlama tamamlanamayabilir. \n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "Devam et, sorunu çözdüm"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "Devam et, bir daha söyleme"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3395,11 +3057,11 @@
 "Diğer sıraya alınmış iş aynı hedefi belirledi.\n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Üzerine Yaz"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3410,7 +3072,7 @@
 "\n"
 "Bu geçerli bir dizin değil."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3421,7 +3083,7 @@
 "\n"
 "Dosya okunamıyor veya yazılamıyor."
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3434,69 +3096,67 @@
 "Dosya zaten mevcut.\n"
 "Üzerine yazmak istiyor musunuz?"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "Sıraya eklemek için bu başlığı seçin.\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "Başlık Yok"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr ""
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "Kodlamayı Durdur"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "Kodlamayı D_urdur"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr ""
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "Kodlamayı devam ettir"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "Kodlamayı D_urdur"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "_Kodlamaya Devam Et"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "Tercih Edilen Dil: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr ""
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr "Eğer varsayılan ses tercih edilen dile ait değilse altyazı ekle"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3509,8 +3169,7 @@
 "Genişletilmiş Seçenekler:\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3522,3 +3181,8 @@
 "\n"
 "Genişletilmiş Sençenekler:\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (Uyarı: kayıpsız)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/uk_UA.po -> HandBrake-1.5.1.tar.xz/gtk/po/uk_UA.po Changed

@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# prolinux ukrainian <prolinux@ukr.net>, 2019
+# cappelikan <cappelikan@gmail.com>, 2019
+# Олександр (6c6c6) <6c6c6.ukr@gmail.com>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: prolinux ukrainian <prolinux@ukr.net>, 2019\n"
+"Last-Translator: Олександр (6c6c6) <6c6c6.ukr@gmail.com>, 2020\n"
 "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/HandBrakeProject/teams/92423/uk_UA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,18 +22,21 @@
 "Language: uk_UA\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
+"Візуалізуйте підзаголовки на відео. \n"
+"\n"
+"Підзаголовок буде частиною відео, і його неможливо відключити."
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
-msgstr ""
+msgstr "Пропалено в"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -42,12 +46,19 @@
 "This is useful for creating a \"forced\" track\n"
 "in your output."
 msgstr ""
+"Встановити за замовчуванням вихідний трек субтитрів.\n"
+"\n"
+"Більшість гравців автоматично відображатиме це\n"
+"трек субтитрів під час відтворення відео.\n"
+"\n"
+"Це корисно для створення \"вимушеної\" доріжки\n"
+"у вашому виході."
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
-msgstr ""
+msgstr "За замовчуванням"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -56,12 +67,18 @@
 "subtitles during scenes where someone is speaking\n"
 "a foreign language."
 msgstr ""
+"Використовуйте лише субтитри, які були позначені прапором\n"
+"як змушений у вихідному треку субтитрів\n"
+"\n"
+"\"Примусові\" субтитри зазвичай використовуються для показу\n"
+"субтитри під час сцен, де хтось виступає\n"
+"іноземна мова."
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
-msgstr ""
+msgstr "Тільки примусово"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -70,12 +87,18 @@
 "does not coincide with the start of the video.\n"
 "This setting allows you to synchronize the files."
 msgstr ""
+"Додавання (або віднімання) зміщення (у мілісекундах)\n"
+"до початку треку субтитрів SRT.\n"
+"\n"
+"Часто запуск зовнішнього файлу SRT\n"
+"не збігається з початком відео.\n"
+"Цей параметр дозволяє синхронізувати файли."
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
-msgstr ""
+msgstr "Зсув SRT"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -89,397 +112,569 @@
 "language scene. This option is best used in\n"
 "conjunction with the \"Forced\" option."
 msgstr ""
+"Доріжка субтитрів джерела\n"
+"\n"
+"Ви можете вибрати будь-який із субтитрів\n"
+"розпізнається у вашому вихідному файлі.\n"
+"\n"
+"Крім того, є спеціальний варіант треку\n"
+"\"Сканування іноземного аудіо\". Ця опція додасть\n"
+"додатковий перехід до коду, який шукає\n"
+"субтитри, які можуть відповідати іноземному\n"
+"мовна сцена. Цей варіант найкраще використовувати в\n"
+"сполучення з опцією \"Примусово\"."
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
+msgstr "Доріжка"
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:39
-msgid "_Presets"
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:40
-msgid "Set De_fault"
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:41
-msgid "_Save"
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
 msgstr ""
 
-#: ../src/ghb.m4.h:42
-msgid "Save _As"
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
 msgstr ""
 
-#: ../src/ghb.m4.h:43
-msgid "_Rename"
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
 msgstr ""
 
-#: ../src/ghb.m4.h:44
-msgid "_Delete"
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
 msgstr ""
 
-#: ../src/ghb.m4.h:45
-msgid "_Import"
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
 msgstr ""
 
-#: ../src/ghb.m4.h:46
-msgid "_Export"
+#: src/ghb3.ui:124
+msgid "Import Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:47
-msgid "Reset _Built-in Presets"
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
 msgstr ""
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr "_Шаблони"
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr "Встановити _типовим"
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr "_Зберегти"
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr "Зберегти _як"
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr "_Прейменувати"
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr "_Видалити"
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr "_Імпорт"
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr "_Експорт"
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr "Скинути _вбудовані шаблони"
+
+#: src/ghb3.ui:304
 msgid "Presets List"
+msgstr "Список шаблонів"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:49
-msgid "About HandBrake"
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
 msgstr ""
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "Почати кодування"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "Розпочати"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "Призупинити кодування"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "Призупинити"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr ""
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr ""
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr ""
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr "Про HandBrake"
+
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 msgstr ""
+"Авторство © 2008 - John Stebbins\n"
+"Авторство © 2004 - , розробники HandBrake"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
 msgstr ""
+"HandBrake, що розповсюджується відповідно до ліцензії GPL, це "
+"багатоплатформовий, багатопотоковий відеотранскодер."
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr ""
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr ""
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
-msgstr ""
+msgstr "_Файл"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
-msgstr ""
+msgstr "Відкрити _джерело"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
-msgstr ""
+msgstr "Відкрити один _файл"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
-msgstr ""
+msgstr "Встановити _призначення"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
-msgstr ""
+msgstr "_Налаштування"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
-msgstr ""
+msgstr "_Вихід"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
-msgstr ""
+msgstr "_Черга"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
-msgstr ""
+msgstr "_Додати"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
-msgstr ""
+msgstr "Додати _кілька"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
-msgstr ""
+msgstr "_Почати кодування"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
-msgstr ""
+msgstr "П_ризупинити кодування"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
-msgstr ""
+msgstr "З_берегти чергу"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
-msgstr ""
+msgstr "_Завантажити файл черги"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
-msgstr ""
+msgstr "_Вигляд"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
-msgstr ""
+msgstr "HandBrake для _чайників"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
-msgstr ""
+msgstr "Список _шаблонів"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
-msgstr ""
+msgstr "_Перегляд"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
-msgstr ""
+msgstr "Вікно _активності"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
-msgstr ""
+msgstr "_Допомога"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
-msgstr ""
+msgstr "_Про програму"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
-msgstr ""
+msgstr "_Керівництво"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
-msgstr ""
+msgstr "Вибрати початкове відео"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
-msgstr ""
+msgstr "Відкрити джерело"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
-msgstr ""
+msgstr "Додати до черги"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr ""
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr ""
+msgstr "Додати до черги"
 
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
-msgstr ""
+msgstr "Показати вікно шаблонів"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
-msgstr ""
+msgstr "Шаблони"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
-msgstr ""
+msgstr "Показати вікно перегляду"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
-msgstr ""
+msgstr "Попередній перегляд"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
-msgstr ""
+msgstr "Показати чергу"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr ""
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr ""
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr ""
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr ""
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr ""
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr ""
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
 "This is often the feature title of a DVD."
 msgstr ""
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr ""
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr ""
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr ""
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr ""
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr ""
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
 msgstr ""
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr ""
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
 msgstr ""
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr ""
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr ""
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
 msgstr ""
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr ""
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
 "sync for broken players that do not honor MP4 edit lists."
 msgstr ""
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr ""
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
 msgstr ""
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr ""
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr ""
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
 msgstr ""
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
 msgstr ""
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr ""
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr ""
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr ""
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -488,83 +683,83 @@
 "the required multiple."
 msgstr ""
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr ""
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr ""
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr ""
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
 msgstr ""
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr ""
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
 msgstr ""
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
 msgstr ""
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr ""
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -572,30 +767,30 @@
 "You should use 2 unless you experience compatibility issues."
 msgstr ""
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr ""
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr ""
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -603,56 +798,56 @@
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ""
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
 "Players will scale the image in order to achieve the specified aspect."
 msgstr ""
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr ""
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr ""
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr ""
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr ""
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr ""
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
 "Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
 msgstr ""
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 msgstr ""
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr ""
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -660,7 +855,7 @@
 "to be interlaced will be deinterlaced."
 msgstr ""
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -668,11 +863,11 @@
 "Block Thresh: Block Width: Block Height"
 msgstr ""
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr ""
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -680,11 +875,11 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -692,93 +887,104 @@
 "The deinterlace filter is a classic YADIF deinterlacer.\n"
 msgstr ""
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
 msgstr ""
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
 "Using this filter on such sources can result in smaller file sizes."
 msgstr ""
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 msgstr ""
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr ""
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr ""
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr ""
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
 msgstr ""
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr ""
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr ""
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr ""
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr ""
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr ""
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr ""
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -786,19 +992,19 @@
 "a variable framerate, 'Same as source' will preserve it."
 msgstr ""
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr ""
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr ""
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -806,18 +1012,18 @@
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
 "VFR is not compatible with some players."
 msgstr ""
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -833,15 +1039,15 @@
 "These encoders do not have a lossless mode."
 msgstr ""
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr ""
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr ""
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -850,11 +1056,11 @@
 "to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr ""
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -863,46 +1069,31 @@
 "to make bitrate allocation decisions."
 msgstr ""
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr ""
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr ""
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr ""
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
 msgstr ""
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -911,22 +1102,22 @@
 "preset but before all other parameters."
 msgstr ""
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr ""
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
 "Set this if your device is struggling to play the output (dropped frames)."
 msgstr ""
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr ""
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -936,280 +1127,269 @@
 "this setting is of little value here."
 msgstr ""
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr ""
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr ""
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
 "Overrides all other settings."
 msgstr ""
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr ""
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
 "Colon separated list of encoder options."
 msgstr ""
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr ""
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr ""
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr ""
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr ""
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr ""
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr ""
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr ""
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr ""
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
 msgstr ""
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr ""
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr ""
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr ""
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr ""
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr ""
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr ""
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr ""
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "Налаштування перетворення аудіо:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr ""
-"Кожна обрана вхідна доріжка буде перетворена з усіма обраними кодеками"
+"Кожна обрана початкова доріжка буде перетворена з усіма обраними кодеками"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr ""
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr ""
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr ""
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr ""
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr ""
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr ""
 
-#: ../src/ghb.m4.h:384
-msgid "Audio"
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
 msgstr ""
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
+#: src/ghb3.ui:5808
+msgid "Audio"
 msgstr ""
 
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr ""
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr ""
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr ""
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr ""
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr ""
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1218,663 +1398,320 @@
 "for determining subtitle selection settings when there is foreign audio."
 msgstr ""
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr ""
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr ""
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr ""
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr ""
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr ""
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr ""
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
-msgstr "DVD субтитри"
+msgstr "Субтитри DVD"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
-msgstr "Blu-ray субтитри"
+msgstr "Субтитри Blu-ray"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr ""
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr ""
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "Субтитри"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr ""
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr ""
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr ""
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr ""
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr ""
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr ""
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr ""
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr ""
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr ""
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr ""
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr ""
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr ""
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr ""
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr ""
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr ""
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
 msgstr ""
 
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
 msgstr ""
 
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
+#: src/ghb3.ui:6420
+msgid "Index"
 msgstr ""
 
-#: ../src/ghb.m4.h:581
-msgid "Chapter Markers"
+#: src/ghb3.ui:6444
+msgid "Duration"
 msgstr ""
 
-#: ../src/ghb.m4.h:582
-msgid "Add chapter markers to output file."
+#: src/ghb3.ui:6455
+msgid "Title"
 msgstr ""
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr ""
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr ""
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr ""
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr ""
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr ""
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr ""
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr ""
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr ""
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr ""
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr ""
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr ""
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr ""
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr ""
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr ""
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr ""
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr ""
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr ""
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr ""
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr ""
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr ""
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr ""
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr ""
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr ""
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr ""
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr ""
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr ""
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr ""
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr ""
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr ""
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr ""
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr ""
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr ""
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr ""
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr ""
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
 msgstr ""
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr ""
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr ""
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr ""
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr ""
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr ""
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr ""
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr ""
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr ""
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr ""
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr ""
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr ""
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr ""
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr ""
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr ""
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -1882,71 +1719,67 @@
 "Uncheck this if you want to allow changing each title's settings independently."
 msgstr ""
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr ""
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr ""
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr ""
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr ""
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr ""
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr ""
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr ""
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr ""
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr ""
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr ""
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
 msgstr ""
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "Максимальна ширина:"
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
-msgstr "Увімкнути обмеження максимальної ширини"
+msgstr "Увімкнути обмеження максимальної ширини."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -1954,15 +1787,15 @@
 "Setting this to 0 means there is no maximum width."
 msgstr ""
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "Максимальна висота:"
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
-msgstr "Увімкнути обмеження максимальної висоти"
+msgstr "Увімкнути обмеження максимальної висоти."
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -1970,95 +1803,126 @@
 "Setting this to 0 means there is no maximum height."
 msgstr ""
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr ""
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr ""
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "Тривалість:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr ""
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr ""
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr ""
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr ""
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr ""
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr ""
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr ""
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr ""
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr ""
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr ""
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr ""
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr ""
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr ""
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "Мова"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr ""
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr ""
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr ""
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
 msgstr ""
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2067,72 +1931,56 @@
 "The source's character code is needed in order to perform this translation."
 msgstr ""
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr ""
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
+#: src/ghb3.ui:9037
+msgid "Import File"
 msgstr ""
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr ""
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr ""
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr ""
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr ""
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
 msgstr ""
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr ""
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr ""
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr ""
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr ""
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
 "Players may use this in the audio selection list."
 msgstr ""
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr ""
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr ""
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2140,229 +1988,122 @@
 "DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
 msgstr ""
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr ""
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "Якість"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr ""
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr ""
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr ""
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr ""
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr ""
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr ""
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr ""
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr ""
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr ""
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr ""
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr ""
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr ""
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "Нотатки релізу"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr ""
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr ""
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr ""
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr ""
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr ""
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr ""
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr ""
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr ""
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr ""
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr ""
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr ""
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr ""
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr ""
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr ""
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr ""
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "Якість:"
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr ""
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr ""
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr ""
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr ""
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr ""
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2370,58 +2111,58 @@
 "Track Name: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
 "DRC: %s"
 msgstr ""
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
 msgstr ""
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
 msgstr ""
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr ""
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr ""
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "Не обрано"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr ""
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr ""
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr ""
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr ""
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2429,438 +2170,437 @@
 "%s in %d seconds ..."
 msgstr ""
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr ""
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr ""
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr ""
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr ""
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
+msgid "%d encode pending"
 msgstr ""
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr ""
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr ""
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr ""
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr ""
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr ""
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "Призупинено"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr ""
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr ""
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr ""
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr ""
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
-msgstr "Просканувати це джерело DVD"
-
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr ""
+msgstr "Просканувати цей DVD"
 
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr ""
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr ""
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr ""
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr ""
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr ""
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr ""
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr ""
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr ""
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr ""
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr ""
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr ""
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr ""
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr ""
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr ""
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr ""
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "Вийти з Handbrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr ""
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "Вимкнути комп’ютер"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "Автоматично"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr ""
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr ""
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "Тиждень"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "Місяць"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "Рік"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr ""
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "Ніколи"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "Щоденно"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "Щотижня"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "Щомісячно"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr ""
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr ""
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr ""
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr ""
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr ""
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90 градусів"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180 градусів"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270 градусів"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr ""
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr ""
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr ""
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr ""
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr ""
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr ""
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr ""
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr ""
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr ""
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr ""
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr ""
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr ""
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr ""
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr ""
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr ""
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr ""
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr ""
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr ""
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr ""
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr ""
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr ""
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr ""
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr ""
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr ""
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr ""
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr ""
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr ""
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr ""
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr ""
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr ""
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr ""
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2869,7 +2609,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -2877,7 +2617,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2886,7 +2626,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -2894,7 +2634,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2904,7 +2644,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -2913,7 +2653,7 @@
 "Preset:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -2924,7 +2664,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -2935,8 +2675,7 @@
 "Custom:\t%s\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -2944,18 +2683,25 @@
 "If you continue, FFMPEG will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr ""
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr ""
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -2963,8 +2709,15 @@
 "If you continue, some subtitles will be lost."
 msgstr ""
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -2972,8 +2725,7 @@
 "If you continue, this subtitle will be ignored."
 msgstr ""
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -2981,7 +2733,7 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -2990,47 +2742,83 @@
 "If you continue, one will be chosen for you."
 msgstr ""
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr ""
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr ""
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr ""
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr ""
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
 "Would you like to continue?"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr ""
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr ""
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr ""
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr ""
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr ""
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr ""
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3038,15 +2826,15 @@
 "%s"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr ""
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr ""
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3055,262 +2843,206 @@
 "%s"
 msgstr ""
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr ""
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr ""
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
+msgid "%s (Modified)"
 msgstr ""
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
 msgstr ""
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
 msgstr ""
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
 msgstr ""
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
+msgid "%s, Bitrate %dkbps"
 msgstr ""
 
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr ""
-
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
+msgid "%s, Bitrate %dkbps (2 Pass)"
 msgstr ""
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
+msgid "%s, Constant Quality %.4g(%s)"
 msgstr ""
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
+msgid "%sPreset %s"
 msgstr ""
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr ""
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
+msgid "%sTune %s"
 msgstr ""
 
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr ""
-
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr ""
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr ""
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
+msgid "%sProfile %s"
 msgstr ""
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
+msgid "%sLevel %s"
 msgstr ""
 
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr ""
-
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
 msgstr ""
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
 msgstr ""
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
 msgstr ""
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
 msgstr ""
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
 msgstr ""
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
 msgstr ""
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
 msgstr ""
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
 msgstr ""
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
+#: src/queuehandler.c:718
+msgid "Pending"
 msgstr ""
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr ""
-
-#: ../src/queuehandler.c:539
-msgid "Error"
+msgid "%d Day %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr ""
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr ""
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr ""
-
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
+msgid "%d Days %02d:%02d:%02d"
 msgstr ""
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
 msgstr ""
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
 msgstr ""
 
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
 msgstr ""
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
 msgstr ""
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
 msgstr ""
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
 msgstr ""
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
+#: src/queuehandler.c:1160
+msgid "Encode"
 msgstr ""
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
 msgstr ""
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
 msgstr ""
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr ""
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "Помилка"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
 msgstr ""
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
 msgstr ""
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
 msgstr ""
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
 msgstr ""
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
 msgstr ""
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr ""
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr ""
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3319,11 +3051,11 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "Перезаписати"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3332,9 +3064,9 @@
 msgstr ""
 "Призначення: %s\n"
 "\n"
-"Це не правильна тека."
+"Це непридатна тека."
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3342,7 +3074,7 @@
 "Can not read or write the directory."
 msgstr ""
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3351,69 +3083,69 @@
 "Do you want to overwrite?"
 msgstr ""
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr ""
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
-msgstr ""
+msgstr "Без назви"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
 "the output file name.\n"
 msgstr ""
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "Зупинити"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
-msgstr "Зупинити перетворення"
+msgstr "Зупинити кодування"
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "З_упинити кодування"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
-msgstr ""
+msgstr "Відновити"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
-msgstr ""
-
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr ""
+msgstr "Відновити кодування"
 
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
-msgstr ""
+msgstr "_Відновити кодування"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
 msgstr ""
+"Виконується кодування. Що б Ви хотіли зробити?\n"
+"\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
-msgstr ""
+msgstr "Привілейовані мови: %s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
-msgstr ""
+msgstr "Додати %s доріжку субтитрів, якщо типове аудіо не %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
-msgstr ""
+msgstr "Додати доріжку субтитрів, якщо типове аудіо не привілейованою мовою"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3421,9 +3153,12 @@
 "Expanded Options:\n"
 "\"%s\""
 msgstr ""
+"%s\n"
+"\n"
+"Розширені опції:\n"
+"„%s“"
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3431,3 +3166,12 @@
 "Expanded Options:\n"
 "\"\""
 msgstr ""
+"%s\n"
+"\n"
+"Розширені опції:\n"
+"„“"
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/po/zh_CN.po -> HandBrake-1.5.1.tar.xz/gtk/po/zh_CN.po Changed

@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# 玉堂白鹤 <yjwork@qq.com>, 2019
+# 玉堂白鹤 <yjwork@qq.com>, 2021
+# pluwen <pluwen@gmail.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ghb 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-10 11:11-0700\n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
 "PO-Revision-Date: 2018-10-10 18:14+0000\n"
-"Last-Translator: 玉堂白鹤 <yjwork@qq.com>, 2019\n"
+"Last-Translator: pluwen <pluwen@gmail.com>, 2021\n"
 "Language-Team: Chinese (https://www.transifex.com/HandBrakeProject/teams/92423/zh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +22,7 @@
 "Language: zh\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/ghb.m4.h:1
+#: src/ghb3.ui:23
 msgid ""
 "Render the subtitle over the video.\n"
 "\n"
@@ -31,11 +32,11 @@
 "\n"
 "字幕将成为视频的一部，并且无法禁止显示。"
 
-#: ../src/ghb.m4.h:4
+#: src/ghb3.ui:26
 msgid "Burned In"
 msgstr "烧录"
 
-#: ../src/ghb.m4.h:5
+#: src/ghb3.ui:32 src/ghb3.ui:9122
 msgid ""
 "Set the default output subtitle track.\n"
 "\n"
@@ -53,11 +54,11 @@
 "当您需要在输出中创建一个\n"
 "“强制”轨道时很有用。"
 
-#: ../src/ghb.m4.h:12
+#: src/ghb3.ui:39
 msgid "Default"
 msgstr "默认"
 
-#: ../src/ghb.m4.h:13
+#: src/ghb3.ui:45 src/ghb3.ui:9084
 msgid ""
 "Use only subtitles that have been flagged\n"
 "as forced in the source subtitle track\n"
@@ -73,11 +74,11 @@
 "用于视频中在说外语\n"
 "的时候。"
 
-#: ../src/ghb.m4.h:19
+#: src/ghb3.ui:51
 msgid "Forced Only"
 msgstr "只使用强制显示字幕"
 
-#: ../src/ghb.m4.h:20
+#: src/ghb3.ui:57
 msgid ""
 "Add (or subtract) an offset (in milliseconds)\n"
 "to the start of the SRT subtitle track.\n"
@@ -93,11 +94,11 @@
 "与视频不同步。\n"
 "这个设置可以使它们同步。"
 
-#: ../src/ghb.m4.h:26
+#: src/ghb3.ui:63
 msgid "SRT Offset"
 msgstr "SRT 字幕时间偏移"
 
-#: ../src/ghb.m4.h:27
+#: src/ghb3.ui:69
 msgid ""
 "The source subtitle track\n"
 "\n"
@@ -119,55 +120,235 @@
 "编码器去搜索 外语字幕。这个选项最好和\n"
 "字幕选项 \"强制\" 搭配使用。"
 
-#: ../src/ghb.m4.h:38
+#: src/ghb3.ui:80
 msgid "Track"
 msgstr "轨道"
 
-#: ../src/ghb.m4.h:39
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr "打开源文件目录"
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr "打开目标目录"
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr "打开编码日志目录"
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr "打开编码日志"
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr "重置失败的任务"
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr "重置所有任务"
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr "清除已完成的任务"
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr "清除所有任务"
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr "导入队列"
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr "导出队列"
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr "HandBrake 预设"
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
 msgid "_Presets"
 msgstr "预设值(_P)"
 
-#: ../src/ghb.m4.h:40
+#: src/ghb3.ui:171 src/ghb3.ui:2136
 msgid "Set De_fault"
 msgstr "设为默认(_F)"
 
-#: ../src/ghb.m4.h:41
+#: src/ghb3.ui:185 src/ghb3.ui:2150
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/ghb.m4.h:42
+#: src/ghb3.ui:194 src/ghb3.ui:2159
 msgid "Save _As"
 msgstr "另存为(_A)"
 
-#: ../src/ghb.m4.h:43
+#: src/ghb3.ui:203 src/ghb3.ui:2168
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/ghb.m4.h:44
+#: src/ghb3.ui:212 src/ghb3.ui:2177
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../src/ghb.m4.h:45
+#: src/ghb3.ui:226 src/ghb3.ui:2191
 msgid "_Import"
 msgstr "导入(_I)"
 
-#: ../src/ghb.m4.h:46
+#: src/ghb3.ui:235 src/ghb3.ui:2200
 msgid "_Export"
 msgstr "导出(_E)"
 
-#: ../src/ghb.m4.h:47
+#: src/ghb3.ui:249 src/ghb3.ui:2214
 msgid "Reset _Built-in Presets"
 msgstr "重置内建预设(_B)"
 
-#: ../src/ghb.m4.h:48
+#: src/ghb3.ui:304
 msgid "Presets List"
 msgstr "预设列表"
 
-#: ../src/ghb.m4.h:49
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr "HandBrake 队列"
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr "队列"
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr "0 个任务排队中"
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "开始编码"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "开始"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "暂停编码"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "暂停"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr "选项"
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr "完成时:"
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr "重置"
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+"将选中队列条目标记为等待。\n"
+"重置队列中的编码任务为等待状态并准备再次运行。"
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "编辑"
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr "动作"
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "预设："
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr "源文件:"
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr "标题："
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr "目标"
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr "尺寸:"
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr "视频:"
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr "音频:"
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr "字幕:"
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr "摘要"
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr "Pass："
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr "开始时间:"
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr "结束时间:"
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr "暂停持续时间:"
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr "编码时间:"
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr "文件大小:"
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr "状态:"
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr "统计"
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr "活动日志"
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr "HandBrake 活动日志"
+
+#: src/ghb3.ui:1710
 msgid "About HandBrake"
 msgstr "关于 HandBrake"
 
-#: ../src/ghb.m4.h:50
+#: src/ghb3.ui:1716
 msgid ""
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
@@ -175,200 +356,183 @@
 "Copyright © 2008 - John Stebbins\n"
 "Copyright © 2004 - , HandBrake Devs"
 
-#: ../src/ghb.m4.h:52
+#: src/ghb3.ui:1718
 msgid ""
 "HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
-msgstr "HandBrake 是一个遵循GPL许可，多平台，多线程的视频编码器。"
+msgstr "HandBrake 是一个遵循 GPL 许可，多平台，多线程的视频编码器。"
 
-#: ../src/ghb.m4.h:53
+#: src/ghb3.ui:1720
 msgid "https://handbrake.fr"
 msgstr "https://handbrake.fr"
 
-#: ../src/ghb.m4.h:54
+#: src/ghb3.ui:1721
 msgid ""
-"HandBrake 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.\n"
+"HandBrake 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.\n"
 "\n"
 "HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
-"HandBrake 是一款自由软件；您可以在 自由软件基金会发布的 GNU 通用公共许可证（第2版，或更新的版本）下再分发或者修改。\n"
+"HandBrake 是一款自由软件；您可以在 自由软件基金会发布的 GNU 通用公共许可证（第2版）下再分发或者修改。\n"
 "HandBrake 希望能够帮到您，但无任何形式的担保责任，其包括但不限于，就适售性以及特定目的的适用性为默示性担保。详情参见 GNU 通用公共许可证全文。\n"
 "\n"
 "您应当随程序收到了 GNU 通用公共许可证的一份拷贝；如果没有，您可以写信到 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 索取。"
 
-#: ../src/ghb.m4.h:59 ../src/fr.handbrake.ghb.appdata.xml.template.h:1
+#: src/ghb3.ui:1907
 msgid "HandBrake"
 msgstr "HandBrake"
 
-#: ../src/ghb.m4.h:60
+#: src/ghb3.ui:1930
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/ghb.m4.h:61
+#: src/ghb3.ui:1938
 msgid "Open _Source"
 msgstr "打开源文件(_S)"
 
-#: ../src/ghb.m4.h:62
+#: src/ghb3.ui:1947
 msgid "Open Single _Title"
 msgstr "打开单个标题"
 
-#: ../src/ghb.m4.h:63
+#: src/ghb3.ui:1956
 msgid "Set _Destination"
 msgstr "设置目标文件(_D)"
 
-#: ../src/ghb.m4.h:64
+#: src/ghb3.ui:1971
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/ghb.m4.h:65
+#: src/ghb3.ui:1986
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/ghb.m4.h:66
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
 msgid "_Queue"
 msgstr "队列(_Q)"
 
-#: ../src/ghb.m4.h:67
+#: src/ghb3.ui:2009
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: ../src/ghb.m4.h:68
+#: src/ghb3.ui:2018
 msgid "Add _Multiple"
 msgstr "添加多个(_M)"
 
-#: ../src/ghb.m4.h:69 ../src/queuehandler.c:2374
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
 msgid "_Start Encoding"
 msgstr "开始编码(_S)"
 
-#: ../src/ghb.m4.h:70 ../src/queuehandler.c:2385
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
 msgid "_Pause Encoding"
 msgstr "暂停编码(_P)"
 
-#: ../src/ghb.m4.h:71
+#: src/ghb3.ui:2045
 msgid "S_ave Queue"
 msgstr "保存队列(_A)"
 
-#: ../src/ghb.m4.h:72
+#: src/ghb3.ui:2054
 msgid "_Load Queue File"
 msgstr "加载队列文件(_L)"
 
-#: ../src/ghb.m4.h:73
+#: src/ghb3.ui:2069
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../src/ghb.m4.h:74
+#: src/ghb3.ui:2077
 msgid "HandBrake For _Dumbies"
 msgstr "初学者使用 HandBrake (_D)"
 
-#: ../src/ghb.m4.h:75
+#: src/ghb3.ui:2086
 msgid "Presets _List"
 msgstr "预设列表(_L)"
 
-#: ../src/ghb.m4.h:76
+#: src/ghb3.ui:2104
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../src/ghb.m4.h:77
+#: src/ghb3.ui:2113
 msgid "_Activity Window"
 msgstr "活动日志窗口(_A)"
 
-#: ../src/ghb.m4.h:78
+#: src/ghb3.ui:2229
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/ghb.m4.h:79
+#: src/ghb3.ui:2237
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/ghb.m4.h:80
+#: src/ghb3.ui:2246
 msgid "_Guide"
 msgstr "手册(_G)"
 
-#: ../src/ghb.m4.h:81 ../src/callbacks.c:4076
+#: src/ghb3.ui:2284 src/callbacks.c:4123
 msgid "Choose Video Source"
 msgstr "选择视频源文件"
 
-#: ../src/ghb.m4.h:82 ../src/callbacks.c:4075
+#: src/ghb3.ui:2286 src/callbacks.c:4122
 msgid "Open Source"
 msgstr "打开源文件"
 
-#: ../src/ghb.m4.h:83
+#: src/ghb3.ui:2309
 msgid "Add to Queue"
 msgstr "添加到队列"
 
-#: ../src/ghb.m4.h:84
+#: src/ghb3.ui:2311
 msgid "Add To Queue"
 msgstr "添加到队列"
 
-#: ../src/ghb.m4.h:85 ../src/queuehandler.c:2350 ../src/queuehandler.c:2375
-msgid "Start Encoding"
-msgstr "开始编码"
-
-#: ../src/ghb.m4.h:86 ../src/main.c:228 ../src/queuehandler.c:2349
-msgid "Start"
-msgstr "开始"
-
-#: ../src/ghb.m4.h:87 ../src/queuehandler.c:2363 ../src/queuehandler.c:2386
-msgid "Pause Encoding"
-msgstr "暂停编码"
-
-#: ../src/ghb.m4.h:88 ../src/queuehandler.c:2362
-msgid "Pause"
-msgstr "暂停"
-
-#: ../src/ghb.m4.h:89
+#: src/ghb3.ui:2366
 msgid "Show Presets Window"
 msgstr "显示预设窗口"
 
-#: ../src/ghb.m4.h:90
+#: src/ghb3.ui:2368
 msgid "Presets"
 msgstr "预设"
 
-#: ../src/ghb.m4.h:91
+#: src/ghb3.ui:2381
 msgid "Show Preview Window"
 msgstr "显示预览窗口"
 
-#: ../src/ghb.m4.h:92
+#: src/ghb3.ui:2383
 msgid "Preview"
 msgstr "预览"
 
-#: ../src/ghb.m4.h:93
+#: src/ghb3.ui:2396
 msgid "Show Queue"
 msgstr "显示队列"
 
-#: ../src/ghb.m4.h:94 ../src/callbacks.c:4620 ../src/callbacks.c:4624
+#: src/ghb3.ui:2398 src/callbacks.c:4567
 msgid "Queue"
 msgstr "队列"
 
-#: ../src/ghb.m4.h:95
+#: src/ghb3.ui:2411
 msgid "Show Activity Window"
 msgstr "显示活动日志窗口"
 
-#: ../src/ghb.m4.h:96
+#: src/ghb3.ui:2413
 msgid "Activity"
 msgstr "活动日志"
 
-#: ../src/ghb.m4.h:97
+#: src/ghb3.ui:2443
 msgid "Source:"
 msgstr "源文件:"
 
-#: ../src/ghb.m4.h:98 ../src/hb-backend.c:60 ../src/hb-backend.c:72
-#: ../src/hb-backend.c:85 ../src/hb-backend.c:250 ../src/hb-backend.c:335
-#: ../src/hb-backend.c:2439 ../src/hb-backend.c:2661
-#: ../src/subtitlehandler.c:1266
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
 msgid "None"
 msgstr "无"
 
-#: ../src/ghb.m4.h:99 ../src/callbacks.c:4048
+#: src/ghb3.ui:2514 src/callbacks.c:4095
 msgid "Scanning..."
 msgstr "扫描中 ..."
 
-#: ../src/ghb.m4.h:100
+#: src/ghb3.ui:2548
 msgid "Title:"
 msgstr "标题:"
 
-#: ../src/ghb.m4.h:101
+#: src/ghb3.ui:2576
 msgid ""
 "Set the title to encode.\n"
 "By default the longest title is chosen.\n"
@@ -378,55 +542,55 @@
 "默认使用时长最长的标题。\n"
 "这通常是 DVD 的特辑标题。"
 
-#: ../src/ghb.m4.h:104
+#: src/ghb3.ui:2598
 msgid "No Titles"
 msgstr "无标题"
 
-#: ../src/ghb.m4.h:105
+#: src/ghb3.ui:2616
 msgid "Angle:"
 msgstr "角度："
 
-#: ../src/ghb.m4.h:106
+#: src/ghb3.ui:2628
 msgid "For multi-angle DVD's, select the desired angle to encode."
 msgstr "用于在多角度的 DVD 中，选择所希望的角度来进行编码。"
 
-#: ../src/ghb.m4.h:107
+#: src/ghb3.ui:2644
 msgid "Range:"
 msgstr "范围:"
 
-#: ../src/ghb.m4.h:108
+#: src/ghb3.ui:2655
 msgid "Range of title to encode. Can be chapters, seconds, or frames."
 msgstr "需要编码的标题范围。可以是章节，秒或帧。"
 
-#: ../src/ghb.m4.h:109
+#: src/ghb3.ui:2668
 msgid "Set the first chapter to encode."
 msgstr "设置起始章节。"
 
-#: ../src/ghb.m4.h:110
+#: src/ghb3.ui:2683
 msgid "-"
 msgstr "-"
 
-#: ../src/ghb.m4.h:111
+#: src/ghb3.ui:2695
 msgid "Set the last chapter to encode."
 msgstr "设置终止章节。"
 
-#: ../src/ghb.m4.h:112
+#: src/ghb3.ui:2720
 msgid "Preset:"
 msgstr "预设："
 
-#: ../src/ghb.m4.h:113
+#: src/ghb3.ui:2756
 msgid "Choose Preset"
 msgstr "选择预设"
 
-#: ../src/ghb.m4.h:114
+#: src/ghb3.ui:2787
 msgid "Modified"
 msgstr "被修改"
 
-#: ../src/ghb.m4.h:115
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
 msgid "Reload"
 msgstr "重新加载"
 
-#: ../src/ghb.m4.h:116
+#: src/ghb3.ui:2799
 msgid ""
 "Reload the settings for the currently selected preset.\n"
 "Modifications will be discarded."
@@ -434,27 +598,27 @@
 "重新加载当前选定预设的设置。\n"
 "修改将被丢弃。"
 
-#: ../src/ghb.m4.h:118
+#: src/ghb3.ui:2811
 msgid "Save New Preset"
 msgstr "保存为新预设"
 
-#: ../src/ghb.m4.h:119
+#: src/ghb3.ui:2814
 msgid "Save the current settings to a new Preset."
 msgstr "保存当前设置为新的预设。"
 
-#: ../src/ghb.m4.h:120
+#: src/ghb3.ui:2896
 msgid "Format:"
-msgstr "格式:"
+msgstr "格式："
 
-#: ../src/ghb.m4.h:121
+#: src/ghb3.ui:2914
 msgid "Format to mux encoded tracks to."
 msgstr "轨道混流的格式。"
 
-#: ../src/ghb.m4.h:122
+#: src/ghb3.ui:2926 src/queuehandler.c:290
 msgid "Web Optimized"
 msgstr "Web 优化"
 
-#: ../src/ghb.m4.h:123
+#: src/ghb3.ui:2931
 msgid ""
 "Optimize the layout of the MP4 file for progressive download.\n"
 "This allows a player to initiate playback before downloading the entire file."
@@ -462,11 +626,11 @@
 "优化 MP4 容器布局以便渐进式下载。\n"
 "这允许用户在下载完整个文件之前就可以开始播放。"
 
-#: ../src/ghb.m4.h:125
+#: src/ghb3.ui:2947
 msgid "Align A/V Start"
 msgstr "对齐音视频开头"
 
-#: ../src/ghb.m4.h:126
+#: src/ghb3.ui:2952
 msgid ""
 "Aligns the initial timestamps of all audio and video streams by\n"
 "inserting blank frames or dropping frames. May improve audio/video\n"
@@ -475,55 +639,51 @@
 "通过插入空白帧或丢帧来对齐所有音频和视频流的初始时间戳。 \n"
 "可以改善不遵守 MP4 编辑列表的蹩脚播放器的音频/视频同步。"
 
-#: ../src/ghb.m4.h:129
+#: src/ghb3.ui:2969
 msgid "iPod 5G Support"
 msgstr "iPod 5G 支持"
 
-#: ../src/ghb.m4.h:130
+#: src/ghb3.ui:2974
 msgid "Add iPod Atom needed by some older iPods."
-msgstr "添加老旧 iPod 所需的iPod Atom。"
+msgstr "添加老旧 iPod 所需的 iPod Atom。"
 
-#: ../src/ghb.m4.h:131
+#: src/ghb3.ui:2996
 msgid "Duration:"
 msgstr "持续时长："
 
-#: ../src/ghb.m4.h:132
+#: src/ghb3.ui:3014
 msgid "hh:mm:ss"
 msgstr "hh:mm:ss"
 
-#: ../src/ghb.m4.h:133
+#: src/ghb3.ui:3029
 msgid "Tracks:"
-msgstr "轨信息："
+msgstr "轨道："
 
-#: ../src/ghb.m4.h:134
+#: src/ghb3.ui:3069
 msgid "Filters:"
-msgstr "过滤："
+msgstr "滤镜："
 
-#: ../src/ghb.m4.h:135
+#: src/ghb3.ui:3109
 msgid "Size:"
 msgstr "尺寸："
 
-#: ../src/ghb.m4.h:136
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
 msgid "--"
 msgstr "--"
 
-#: ../src/ghb.m4.h:137
-msgid "Summary"
-msgstr "摘要"
-
-#: ../src/ghb.m4.h:138
+#: src/ghb3.ui:3227
 msgid "Auto Crop"
-msgstr "自动剪裁"
+msgstr "自动裁剪"
 
-#: ../src/ghb.m4.h:139
+#: src/ghb3.ui:3232
 msgid "Automatically crop black borders around edges of the video."
 msgstr "自动裁剪黑边。"
 
-#: ../src/ghb.m4.h:140
+#: src/ghb3.ui:3246
 msgid "Loose Crop"
 msgstr "宽松裁剪"
 
-#: ../src/ghb.m4.h:141
+#: src/ghb3.ui:3250
 msgid ""
 "When picture settings require that the image\n"
 "dimensions be rounded to some multiple number\n"
@@ -535,35 +695,35 @@
 "该设置将裁剪额外的像素然后缩放到所需\n"
 "倍数，而不做精确的裁剪。"
 
-#: ../src/ghb.m4.h:146
+#: src/ghb3.ui:3272
 msgid "Left Crop"
-msgstr "左剪裁"
+msgstr "左侧裁剪"
 
-#: ../src/ghb.m4.h:147
+#: src/ghb3.ui:3289
 msgid "Top Crop"
 msgstr "顶部裁剪"
 
-#: ../src/ghb.m4.h:148
+#: src/ghb3.ui:3306
 msgid "Bottom Crop"
 msgstr "底部裁剪"
 
-#: ../src/ghb.m4.h:149
+#: src/ghb3.ui:3323
 msgid "Right Crop"
-msgstr "右剪裁"
+msgstr "右侧裁剪"
 
-#: ../src/ghb.m4.h:150
+#: src/ghb3.ui:3340
 msgid "Crop Dimensions:"
 msgstr "裁剪尺寸："
 
-#: ../src/ghb.m4.h:151
+#: src/ghb3.ui:3376
 msgid "Cropping"
 msgstr "裁剪"
 
-#: ../src/ghb.m4.h:152
+#: src/ghb3.ui:3411
 msgid "Optimal for source"
 msgstr "以源文件尺寸为最优"
 
-#: ../src/ghb.m4.h:153
+#: src/ghb3.ui:3415
 msgid ""
 "If enabled, select the 'optimal' storage resolution.\n"
 "This will be the resolution that most closely matches the source resolution after cropping."
@@ -571,11 +731,11 @@
 "如果启用该选项，我们将选择“最优”的分辨率保存。\n"
 "这个分辨率是源文件裁剪后最接近源文件的分辨率。"
 
-#: ../src/ghb.m4.h:155
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
 msgid "Width:"
 msgstr "宽度："
 
-#: ../src/ghb.m4.h:156
+#: src/ghb3.ui:3448
 msgid ""
 "This is the width that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -583,11 +743,11 @@
 "这是视频存储的宽度。\n"
 "如果像素宽高比不是 1:1 的话，实际的画面显示尺寸会有所不同。"
 
-#: ../src/ghb.m4.h:158
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
 msgid "Height:"
-msgstr "高："
+msgstr "高度："
 
-#: ../src/ghb.m4.h:159
+#: src/ghb3.ui:3481
 msgid ""
 "This is the height that the video will be stored at.\n"
 "The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
@@ -595,36 +755,36 @@
 "这是视频存储的高度。\n"
 "如果像素宽高比不是 1:1 的话，实际的画面显示尺寸会有所不同。"
 
-#: ../src/ghb.m4.h:161
+#: src/ghb3.ui:3511
 msgid "Anamorphic:"
 msgstr "变形："
 
-#: ../src/ghb.m4.h:162
+#: src/ghb3.ui:3526
 msgid ""
 "Anamorphic Modes:\n"
 "<tt>\n"
 "None - Force pixel aspect ratio to 1:1.\n"
 "Loose - Use a pixel aspect ratio that is as\n"
-" close as possible to the source video pixel\n"
-" aspect ratio while preserving the original\n"
-" display aspect ratio\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
 "Automatic - Use a pixel aspect ratio that maximizes\n"
-" storage resolution while preserving the original\n"
-" display aspect ratio</tt>"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
 msgstr ""
 "画面变形模式：\n"
 "<tt>\n"
-"无 强制使用 1:1 的像素宽高比。\n"
-"宽松 - 尽可能使用接近源视频像素宽高比的\n"
-" 像素宽高比，同时保留原始显示宽高比\n"
+"无 - 强制使用 1:1 的像素宽高比。\n"
+"宽松 - 尽可能使用接近源视频像素宽高比的\n"
+"  像素宽高比，同时保留原始显示宽高比\n"
 "自动 - 使用最大化存储分辨率的像素宽高比，\n"
-" 同时保留原始显示宽高比</tt>"
+"  同时保留原始显示宽高比</tt>"
 
-#: ../src/ghb.m4.h:172
+#: src/ghb3.ui:3550
 msgid "Alignment:"
-msgstr "对齐方式："
+msgstr "对齐："
 
-#: ../src/ghb.m4.h:173
+#: src/ghb3.ui:3565
 msgid ""
 "Align storage dimensions to multiples of this value.\n"
 "\n"
@@ -636,30 +796,30 @@
 "这个设置仅用于兼容部分设备。\n"
 "您应该使用 2 除非您遇到兼容性问题。"
 
-#: ../src/ghb.m4.h:177
+#: src/ghb3.ui:3590
 msgid "Storage Geometry"
 msgstr "存储尺寸"
 
-#: ../src/ghb.m4.h:178
+#: src/ghb3.ui:3625
 msgid "Keep Aspect"
 msgstr "保持宽高比"
 
-#: ../src/ghb.m4.h:179
+#: src/ghb3.ui:3630
 msgid ""
 "If enabled, the original display aspect of the source will be maintained."
 msgstr "如果勾选此项，则保持源文件的画面宽高比。"
 
-#: ../src/ghb.m4.h:180
+#: src/ghb3.ui:3663
 msgid ""
 "This is the display width. It is the result of scaling the storage "
 "dimensions by the pixel aspect."
 msgstr "这是画面显示的宽度，它是由存储尺寸按照像素宽高比缩放的结果。"
 
-#: ../src/ghb.m4.h:181
+#: src/ghb3.ui:3724
 msgid "Pixel Aspect:"
 msgstr "像素宽高比："
 
-#: ../src/ghb.m4.h:182
+#: src/ghb3.ui:3739
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "\n"
@@ -671,11 +831,11 @@
 "1:1 的像素宽高比就是正方形的像素。 其他的比例则是长方形的像素。\n"
 "播放器为显示指定宽高比将缩放画面。"
 
-#: ../src/ghb.m4.h:186
+#: src/ghb3.ui:3759
 msgid ":"
 msgstr ":"
 
-#: ../src/ghb.m4.h:187
+#: src/ghb3.ui:3774
 msgid ""
 "Pixel aspect defines the shape of the pixels.\n"
 "A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
@@ -685,27 +845,27 @@
 "1:1 的像素宽高比就是正方形的像素。 其他的比例则是矩形像素。\n"
 "播放器为显示指定宽高比将缩放图像。"
 
-#: ../src/ghb.m4.h:190
+#: src/ghb3.ui:3794
 msgid "Display Aspect:"
 msgstr "显示宽高比："
 
-#: ../src/ghb.m4.h:191
+#: src/ghb3.ui:3809
 msgid "--:--"
 msgstr "--:--"
 
-#: ../src/ghb.m4.h:192
+#: src/ghb3.ui:3830
 msgid "Display Geometry"
 msgstr "画面尺寸"
 
-#: ../src/ghb.m4.h:193
+#: src/ghb3.ui:3848
 msgid "Dimensions"
 msgstr "尺寸"
 
-#: ../src/ghb.m4.h:194
+#: src/ghb3.ui:3876
 msgid "Detelecine:"
 msgstr "反胶卷过带滤镜："
 
-#: ../src/ghb.m4.h:195
+#: src/ghb3.ui:3892
 msgid ""
 "This filter removes 'combing' artifacts that are the result of telecining.\n"
 "\n"
@@ -715,7 +875,7 @@
 "\n"
 "胶卷过带 (telecining) 用于转换 24fps 的胶卷为 30fps NTSC 视频。"
 
-#: ../src/ghb.m4.h:198
+#: src/ghb3.ui:3907
 msgid ""
 "Custom detelecine filter string format\n"
 "\n"
@@ -725,11 +885,11 @@
 "\n"
 "JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
 
-#: ../src/ghb.m4.h:201
+#: src/ghb3.ui:3935
 msgid "Interlace Detection:"
 msgstr "隔行扫描检测："
 
-#: ../src/ghb.m4.h:202
+#: src/ghb3.ui:3951
 msgid ""
 "This filter detects interlaced frames.\n"
 "\n"
@@ -740,7 +900,7 @@
 "\n"
 "如果启用了反交错滤镜，则只有该滤镜发现隔行扫描的帧才会进行反交错处理。"
 
-#: ../src/ghb.m4.h:206
+#: src/ghb3.ui:3967
 msgid ""
 "Custom interlace detection filter string format\n"
 "\n"
@@ -752,11 +912,11 @@
 "Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
 "Block Thresh: Block Width: Block Height"
 
-#: ../src/ghb.m4.h:210
+#: src/ghb3.ui:3996
 msgid "Deinterlace:"
 msgstr "反交错："
 
-#: ../src/ghb.m4.h:211
+#: src/ghb3.ui:4012
 msgid ""
 "Choose decomb or deinterlace filter.\n"
 "\n"
@@ -768,11 +928,11 @@
 "decomb 去梳状纹理滤镜支持各种插值算法。\n"
 "deinterlace 反交错滤镜是经典的 YADIF 去隔行过滤器。\n"
 
-#: ../src/ghb.m4.h:216
+#: src/ghb3.ui:4031
 msgid "Deinterlace Preset:"
 msgstr "反交错预设："
 
-#: ../src/ghb.m4.h:217
+#: src/ghb3.ui:4047
 msgid ""
 "Choose decomb or deinterlace filter options.\n"
 "\n"
@@ -784,11 +944,11 @@
 "decomb 去梳状纹理滤镜支持各种插值算法。\n"
 "deinterlace 反交错滤镜是经典的 YADIF 去隔行扫描器。\n"
 
-#: ../src/ghb.m4.h:222
-msgid "Deblock:"
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
 msgstr "去区块滤镜："
 
-#: ../src/ghb.m4.h:223
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
 msgid ""
 "The deblocking filter removes a common type of compression artifact.\n"
 "If your source exhibits 'blockiness', this filter may help clean it up."
@@ -796,11 +956,25 @@
 "去区块滤镜可以去除压缩导致的区块效应。\n"
 "如果您的源文件存在区块效应，这个滤镜则可以将其清除。"
 
-#: ../src/ghb.m4.h:225
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr "去块效应调优："
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+"自定义去区块滤镜字符串格式 \n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+
+#: src/ghb3.ui:4180
 msgid "Denoise Filter:"
 msgstr "降噪滤镜："
 
-#: ../src/ghb.m4.h:226
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
 msgid ""
 "Denoise filtering reduces or removes the appearance of noise and grain.\n"
 "Film grain and other types of high frequency noise are difficult to compress.\n"
@@ -810,15 +984,15 @@
 "胶卷颗粒噪点及其他高频噪音通常难以压缩。\n"
 "使用该滤镜可以得到更小的输出文件。"
 
-#: ../src/ghb.m4.h:229
+#: src/ghb3.ui:4213
 msgid "Denoise Preset:"
 msgstr "降噪预设："
 
-#: ../src/ghb.m4.h:230
+#: src/ghb3.ui:4246
 msgid "Denoise Tune:"
-msgstr "降噪优化："
+msgstr "降噪调优："
 
-#: ../src/ghb.m4.h:231
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
 msgid ""
 "Custom denoise filter string format\n"
 "\n"
@@ -828,57 +1002,57 @@
 "\n"
 "SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
 
-#: ../src/ghb.m4.h:234
+#: src/ghb3.ui:4305
 msgid "Sharpen Filter:"
 msgstr "锐化滤镜："
 
-#: ../src/ghb.m4.h:235
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
 msgid ""
 "Sharpen filtering enhances edges and other\n"
 "high frequency components in the video."
 msgstr "锐化滤镜将增强视频中的边缘和其他高频成分。 "
 
-#: ../src/ghb.m4.h:237
+#: src/ghb3.ui:4337
 msgid "Sharpen Preset:"
 msgstr "锐化预设："
 
-#: ../src/ghb.m4.h:238
+#: src/ghb3.ui:4369
 msgid "Sharpen Tune:"
-msgstr "锐化优化："
+msgstr "锐化调优："
 
-#: ../src/ghb.m4.h:239
+#: src/ghb3.ui:4427
 msgid "Rotate Filter:"
 msgstr "旋转滤镜："
 
-#: ../src/ghb.m4.h:240
+#: src/ghb3.ui:4443
 msgid "Rotate the video clockwise in 90 degree increments."
-msgstr "以90度为增量顺时针旋转视频。"
+msgstr "以 90 度为增量顺时针旋转视频。"
 
-#: ../src/ghb.m4.h:241
+#: src/ghb3.ui:4457
 msgid "Grayscale"
 msgstr "灰度"
 
-#: ../src/ghb.m4.h:242
+#: src/ghb3.ui:4462
 msgid "If enabled, filter colour components out of video."
 msgstr "如果启用，将过滤输出文件的色彩部分。"
 
-#: ../src/ghb.m4.h:243
+#: src/ghb3.ui:4473
 msgid "Filters"
 msgstr "滤镜"
 
-#: ../src/ghb.m4.h:244
+#: src/ghb3.ui:4504
 msgid "Video Encoder:"
 msgstr "视频编码器："
 
-#: ../src/ghb.m4.h:245
+#: src/ghb3.ui:4518
 msgid "Available video encoders."
 msgstr "可用的视频编码器。"
 
-#: ../src/ghb.m4.h:246
+#: src/ghb3.ui:4534
 msgid "Framerate:"
 msgstr "帧率："
 
-#: ../src/ghb.m4.h:247
+#: src/ghb3.ui:4549
 msgid ""
 "Output framerate.\n"
 "\n"
@@ -890,19 +1064,19 @@
 "推荐选择“与源视频相同”。如果您的源视频使用动态帧率，\n"
 "该选项能保证其与源视频帧率一致。"
 
-#: ../src/ghb.m4.h:251
+#: src/ghb3.ui:4564
 msgid "Constant Framerate"
 msgstr "固定帧率"
 
-#: ../src/ghb.m4.h:252
+#: src/ghb3.ui:4569
 msgid "Enables constant framerate output."
 msgstr "启用恒定帧率输出。"
 
-#: ../src/ghb.m4.h:253
+#: src/ghb3.ui:4583
 msgid "Peak Framerate (VFR)"
 msgstr "峰值帧率 (VFR)"
 
-#: ../src/ghb.m4.h:254
+#: src/ghb3.ui:4588
 msgid ""
 "Enables variable framerate output with a peak\n"
 "rate determined by the framerate setting.\n"
@@ -914,11 +1088,11 @@
 "\n"
 "部分播放器可能不兼容 VFR。"
 
-#: ../src/ghb.m4.h:258
+#: src/ghb3.ui:4606
 msgid "Variable Framerate"
 msgstr "动态帧率"
 
-#: ../src/ghb.m4.h:259
+#: src/ghb3.ui:4611
 msgid ""
 "Enables variable framerate output.\n"
 "\n"
@@ -928,7 +1102,7 @@
 "\n"
 "一些播放器与动态帧率不兼容。"
 
-#: ../src/ghb.m4.h:262
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
 msgid ""
 "Set the desired quality factor.\n"
 "The encoder targets a certain quality.\n"
@@ -953,15 +1127,15 @@
 "\n"
 "FFMpeg 和 Theora 的刻度是线性的，而且显然没有无损模式。"
 
-#: ../src/ghb.m4.h:274 ../src/queuehandler.c:555
+#: src/ghb3.ui:4674
 msgid "Constant Quality:"
 msgstr "恒定画质："
 
-#: ../src/ghb.m4.h:275
+#: src/ghb3.ui:4705
 msgid "Bitrate (kbps): "
 msgstr "码率 (kbps): "
 
-#: ../src/ghb.m4.h:276
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
 msgid ""
 "Set the average bitrate.\n"
 "\n"
@@ -974,11 +1148,11 @@
 "任意时间点的瞬时码率可能更高或者更低，但是总体的平均值为此处设置的值。\n"
 "如果您需要限定瞬时码率的值，您可以参考 x264 的 vbv-bufsize 和 vbv-maxrate 设置。"
 
-#: ../src/ghb.m4.h:281
+#: src/ghb3.ui:4749
 msgid "2-Pass Encoding"
 msgstr "二次编码"
 
-#: ../src/ghb.m4.h:282
+#: src/ghb3.ui:4754
 msgid ""
 "Perform 2 Pass Encoding.\n"
 "\n"
@@ -991,55 +1165,37 @@
 "需要先勾选“码率”选项。第一次编码时，我们将采集视频统计信息。\n"
 "然后在第二次编码时，根据这些统计信息决定码率的分配。"
 
-#: ../src/ghb.m4.h:287
+#: src/ghb3.ui:4772
 msgid "Turbo First Pass"
 msgstr "加快首次编码"
 
-#: ../src/ghb.m4.h:288
+#: src/ghb3.ui:4777
 msgid ""
 "During the 1st pass of a 2 pass encode, use settings that speed things "
 "along."
 msgstr "在二次编码的第一次编码中，使用加速编码的设置。"
 
-#: ../src/ghb.m4.h:289
-msgid "Use Advanced Options"
-msgstr "使用高级视频选项"
-
-#: ../src/ghb.m4.h:290
-msgid ""
-"Use advanced options Tab for x264 settings.\n"
-"\n"
-"Use at your own risk!"
-msgstr ""
-"使用高级视频选项卡中的设置。\n"
-"\n"
-"风险自负!"
-
-#: ../src/ghb.m4.h:293
-msgid "Preset:"
-msgstr "预设："
-
-#: ../src/ghb.m4.h:294
+#: src/ghb3.ui:4839
 msgid ""
 "Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
 "\n"
 "This establishes your default encoder settings.\n"
-"Tunes, profiles, levels and advanced option string will be applied to this.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
 "You should generally set this option to the slowest you can bear since slower\n"
 "settings will result in better quality or smaller files."
 msgstr ""
 "调整编码器设置以在压缩效率与编码速度之间折衷。\n"
 "\n"
 "这将建立您的默认编码设置。\n"
-"优化、规格，级别以及高级设置选项字符串都将应用到该设置。\n"
+"调优、规格，级别以及扩展设置选项字符串都将应用到该设置。\n"
 "您应该选择您所能接受的最慢的设置选项，因为较慢的设置可以\n"
 "得到更好的输出质量或者更小的输出文件。"
 
-#: ../src/ghb.m4.h:300
+#: src/ghb3.ui:4865
 msgid "Tune:"
-msgstr "优化："
+msgstr "调优："
 
-#: ../src/ghb.m4.h:301
+#: src/ghb3.ui:4882
 msgid ""
 "Tune settings to optimize for common scenarios.\n"
 "\n"
@@ -1052,11 +1208,11 @@
 "对于特定的源文件特性或者输出文件特性，这能提高效率。\n"
 "所修改的选项作用紧跟预设但是在其他参数之前。"
 
-#: ../src/ghb.m4.h:306
+#: src/ghb3.ui:4898
 msgid "Fast Decode"
 msgstr "快速解码"
 
-#: ../src/ghb.m4.h:307
+#: src/ghb3.ui:4903
 msgid ""
 "Reduce decoder CPU usage.\n"
 "\n"
@@ -1066,11 +1222,11 @@
 "\n"
 "如果您的输出在设备上播放不流畅（掉帧），请勾选此选项。"
 
-#: ../src/ghb.m4.h:310
+#: src/ghb3.ui:4921
 msgid "Zero Latency"
 msgstr "零延迟"
 
-#: ../src/ghb.m4.h:311
+#: src/ghb3.ui:4925
 msgid ""
 "Minimize latency between input to encoder and output of decoder.\n"
 "\n"
@@ -1086,11 +1242,11 @@
 "但是 HandBrake 并不适用于流媒体广播，\n"
 "所以这个设置基本没有什么意义。"
 
-#: ../src/ghb.m4.h:317
+#: src/ghb3.ui:4949
 msgid "Profile:"
 msgstr "规格："
 
-#: ../src/ghb.m4.h:318
+#: src/ghb3.ui:4966
 msgid ""
 "Sets and ensures compliance with the specified profile.\n"
 "\n"
@@ -1100,11 +1256,11 @@
 "\n"
 "会覆盖其他所有设置。"
 
-#: ../src/ghb.m4.h:321
+#: src/ghb3.ui:4984
 msgid "Level:"
 msgstr "级别："
 
-#: ../src/ghb.m4.h:322
+#: src/ghb3.ui:5001
 msgid ""
 "Sets and ensures compliance with the specified level.\n"
 "\n"
@@ -1114,11 +1270,11 @@
 "\n"
 "会覆盖其他所有设置。"
 
-#: ../src/ghb.m4.h:325
+#: src/ghb3.ui:5026
 msgid "More Settings:"
 msgstr "更多设置："
 
-#: ../src/ghb.m4.h:326
+#: src/ghb3.ui:5044
 msgid ""
 "Additional encoder settings.\n"
 "\n"
@@ -1128,56 +1284,45 @@
 "\n"
 "选项由英文冒号分隔。"
 
-#: ../src/ghb.m4.h:329 ../src/main.c:1155
+#: src/ghb3.ui:5078 src/main.c:1155
 msgid "Video"
 msgstr "视频"
 
-#: ../src/ghb.m4.h:330
-msgid "Track List"
-msgstr "轨列表"
-
-#: ../src/ghb.m4.h:331
-msgid "Show Output Audio Track List"
-msgstr "显示输出的音轨列表"
-
-#: ../src/ghb.m4.h:332
-msgid "Track Selection"
-msgstr "轨选项"
-
-#: ../src/ghb.m4.h:333
-msgid "Show Source Track Selection Options"
-msgstr "显示源轨选择选项"
-
 #. Add Button
-#: ../src/ghb.m4.h:334 ../src/audiohandler.c:1723
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
 msgid "Add"
 msgstr "添加"
 
-#: ../src/ghb.m4.h:335
+#: src/ghb3.ui:5146
 msgid "Add new audio settings to the list"
 msgstr "添加新的音频设置至列表"
 
-#: ../src/ghb.m4.h:336
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
 msgid "Add All"
 msgstr "全部添加"
 
-#: ../src/ghb.m4.h:337
+#: src/ghb3.ui:5158
 msgid "Add all audio tracks to the list"
 msgstr "将所有音轨到列表"
 
-#: ../src/ghb.m4.h:338
+#: src/ghb3.ui:5171
 msgid "Reload all audio settings from defaults"
 msgstr "重新加载所有音频的默认设置"
 
-#: ../src/ghb.m4.h:339
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "轨列表"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
 msgid "Selection Behavior:"
 msgstr "选择行为："
 
-#: ../src/ghb.m4.h:340
+#: src/ghb3.ui:5261
 msgid "Choose which audio tracks of the source media are used."
 msgstr "选择使用源媒体的哪一个音轨。"
 
-#: ../src/ghb.m4.h:341
+#: src/ghb3.ui:5322
 msgid ""
 "Create a list of languages you would like to select audio for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior."
@@ -1185,209 +1330,209 @@
 "创建您想要选择的音频的语言列表。\n"
 "将使用所选的选择行为选择与这些语言匹配的音轨。"
 
-#: ../src/ghb.m4.h:343
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/ghb.m4.h:344
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
 msgid "Available Languages"
 msgstr "可用语言"
 
-#: ../src/ghb.m4.h:345
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
 msgid "Selected Languages"
 msgstr "已选择语言"
 
-#: ../src/ghb.m4.h:346
+#: src/ghb3.ui:5400
 msgid "Use only first encoder for secondary audio"
 msgstr "仅使用第一编码器，用于辅助音频"
 
-#: ../src/ghb.m4.h:347
+#: src/ghb3.ui:5405
 msgid ""
 "Only the primary audio track will be encoded with the full encoder list.\n"
-" All other secondary audio output tracks will be encoded with first encoder only."
+"All other secondary audio output tracks will be encoded with first encoder only."
 msgstr ""
 "只有首选音轨会使用整个列表的编码器进行编码。\n"
-" 其他次选音轨只会使用第一个编码器进行编码。"
+"其他次选音轨只会使用第一个编码器进行编码。"
 
-#: ../src/ghb.m4.h:349
+#: src/ghb3.ui:5441
 msgid "Auto Passthru:"
 msgstr "自动复制流："
 
-#: ../src/ghb.m4.h:350
+#: src/ghb3.ui:5452
 msgid "MP3"
 msgstr "MP3"
 
-#: ../src/ghb.m4.h:351
+#: src/ghb3.ui:5457
 msgid ""
 "Enable this if your playback device supports MP3.\n"
-" This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 MP3 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 MP3 直通。"
+"已勾选自动直通时则允许使用 MP3 直通。"
 
-#: ../src/ghb.m4.h:353
+#: src/ghb3.ui:5473
 msgid "AAC"
 msgstr "AAC"
 
-#: ../src/ghb.m4.h:354
+#: src/ghb3.ui:5478
 msgid ""
 "Enable this if your playback device supports AAC.\n"
-" This permits AAC passthru to be selected when automatic passthru selection is enabled."
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 AAC 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 AAC 直通。"
+"已勾选自动直通时则允许使用 AAC 直通。"
 
-#: ../src/ghb.m4.h:356
+#: src/ghb3.ui:5494
 msgid "AC-3"
 msgstr "AC-3"
 
-#: ../src/ghb.m4.h:357
+#: src/ghb3.ui:5499
 msgid ""
 "Enable this if your playback device supports AC-3.\n"
-" This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 AC-3 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 AC-3 直通。"
+"已勾选自动直通时则允许使用 AC-3 直通。"
 
-#: ../src/ghb.m4.h:359
+#: src/ghb3.ui:5515
 msgid "DTS"
 msgstr "DTS"
 
-#: ../src/ghb.m4.h:360
+#: src/ghb3.ui:5520
 msgid ""
 "Enable this if your playback device supports DTS.\n"
-" This permits DTS passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 DTS 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 DTS 直通。"
+"已勾选自动直通时则允许使用 DTS 直通。"
 
-#: ../src/ghb.m4.h:362
+#: src/ghb3.ui:5536
 msgid "DTS-HD"
 msgstr "DTS-HD"
 
-#: ../src/ghb.m4.h:363
+#: src/ghb3.ui:5541
 msgid ""
 "Enable this if your playback device supports DTS-HD.\n"
-" This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 DTS-HD 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 DTS-HD 直通。"
+"已勾选自动直通时则允许使用 DTS-HD 直通。"
 
-#: ../src/ghb.m4.h:365
+#: src/ghb3.ui:5557
 msgid "EAC-3"
 msgstr "EAC-3"
 
-#: ../src/ghb.m4.h:366
+#: src/ghb3.ui:5562
 msgid ""
 "Enable this if your playback device supports EAC-3.\n"
-" This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 EAC-3 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 EAC-3 直通。"
+"已勾选自动直通时则允许使用 EAC-3 直通。"
 
-#: ../src/ghb.m4.h:368
+#: src/ghb3.ui:5578
 msgid "TrueHD"
 msgstr "TrueHD"
 
-#: ../src/ghb.m4.h:369
+#: src/ghb3.ui:5583
 msgid ""
 "Enable this if your playback device supports TrueHD.\n"
-" This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 TrueHD 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 TrueHD 直通。"
+"已勾选自动直通时则允许使用 TrueHD 直通。"
 
-#: ../src/ghb.m4.h:371
+#: src/ghb3.ui:5599
 msgid "FLAC"
 msgstr "FLAC"
 
-#: ../src/ghb.m4.h:372
+#: src/ghb3.ui:5604
 msgid ""
 "Enable this if your playback device supports FLAC.\n"
-" This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
 msgstr ""
 "如果您的回放设备支持 FLAC 则勾选此项。\n"
-" 已勾选自动直通时则允许使用 FLAC 直通。"
+"已勾选自动直通时则允许使用 FLAC 直通。"
 
-#: ../src/ghb.m4.h:374
+#: src/ghb3.ui:5637
 msgid "Passthru Fallback:"
 msgstr "直通回滚："
 
-#: ../src/ghb.m4.h:375
+#: src/ghb3.ui:5649
 msgid ""
 "Set the audio codec to encode with when a suitable track can not be found "
 "for audio passthru."
 msgstr "当音频直通无法找到合适的轨道时，设置用于编码的音频编解码器。"
 
-#: ../src/ghb.m4.h:376
+#: src/ghb3.ui:5678
 msgid "Audio Encoder Settings:"
 msgstr "音频编码设置:"
 
-#: ../src/ghb.m4.h:377
+#: src/ghb3.ui:5679
 msgid "Each selected source track will be encoded with all selected encoders"
 msgstr "每一个选中的源音轨都将用所有选中编码器进行编码"
 
-#: ../src/ghb.m4.h:378
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
 msgid "Encoder"
 msgstr "编码"
 
-#: ../src/ghb.m4.h:379
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
 msgid "Bitrate/Quality"
 msgstr "比特率/质量"
 
-#: ../src/ghb.m4.h:380
+#: src/ghb3.ui:5726
 msgid "Mixdown"
 msgstr "混音"
 
-#: ../src/ghb.m4.h:381
+#: src/ghb3.ui:5737
 msgid "Samplerate"
 msgstr "采样率"
 
-#: ../src/ghb.m4.h:382
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
 msgid "Gain"
 msgstr "增益"
 
-#: ../src/ghb.m4.h:383
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
 msgid "DRC"
 msgstr "动态范围压缩(DRC)"
 
-#: ../src/ghb.m4.h:384
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr "轨选项"
+
+#: src/ghb3.ui:5808
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/ghb.m4.h:385
-msgid "Show Output Subtitle Track List"
-msgstr "显示输出的字幕轨列表"
-
-#: ../src/ghb.m4.h:386
+#: src/ghb3.ui:5876
 msgid "Add new subtitle settings to the list"
 msgstr "新增的字幕添加到列表"
 
-#: ../src/ghb.m4.h:387
+#: src/ghb3.ui:5888
 msgid "Add all subtitle tracks to the list"
 msgstr "将所有字幕轨道到列表"
 
-#: ../src/ghb.m4.h:388 ../src/queuehandler.c:111 ../src/queuehandler.c:164
-#: ../src/subtitlehandler.c:382
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
 msgid "Foreign Audio Scan"
 msgstr "外语音频扫描"
 
-#: ../src/ghb.m4.h:389
+#: src/ghb3.ui:5900
 msgid ""
 "Add an extra pass to the encode which searches\n"
-" for subtitle candidates that provide subtitles for\n"
-" segments of the audio that are in a foreign language."
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
 msgstr "添加一个为外语音频段搜索候选字幕的通道到编码中。"
 
-#: ../src/ghb.m4.h:392
+#: src/ghb3.ui:5915
 msgid "Reload all subtitle settings from defaults"
 msgstr "从默认设置加载所有字幕设置"
 
-#: ../src/ghb.m4.h:393
+#: src/ghb3.ui:6009
 msgid "Choose which subtitle tracks of the source media are used."
 msgstr "选择使用源媒体的哪一个字幕轨。"
 
-#: ../src/ghb.m4.h:394
+#: src/ghb3.ui:6074
 msgid ""
 "Create a list of languages you would like to select subtitles for.\n"
 "Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
@@ -1401,811 +1546,343 @@
 "列表中的第一个语言是您的“首选”语言，并在有外语音\n"
 "轨时用于检测字幕选择设置。"
 
-#: ../src/ghb.m4.h:399
+#: src/ghb3.ui:6155
 msgid "Preferred Language: None"
 msgstr "首选语言：无"
 
-#: ../src/ghb.m4.h:400
+#: src/ghb3.ui:6182
 msgid "Add Foreign Audio Scan Pass"
 msgstr "添加外语音频扫描通道 "
 
-#: ../src/ghb.m4.h:401
+#: src/ghb3.ui:6187
 msgid ""
 "Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
-" This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "当默认音轨是您的首选语言时，添加选项“外语音轨搜索”。\n"
-" 这将搜索出小段外语音频片段并为其提供字幕。\n"
+" 这将搜索出小段外语音频片段并为其提供字幕。\n"
 "\n"
-" 此选项需要有语言设置在已选择语言列表里。"
+"此选项需要有语言设置在已选择语言列表里。"
 
-#: ../src/ghb.m4.h:405
+#: src/ghb3.ui:6202
 msgid "Add subtitle track if default audio is foreign"
 msgstr "如果默认音轨为外语则添加字幕轨"
 
-#: ../src/ghb.m4.h:406
+#: src/ghb3.ui:6207
 msgid ""
 "When the default audio track is not your preferred language, add a subtitle track.\n"
 "\n"
-" This option requires a language to be set in the Selected Languages list."
+"This option requires a language to be set in the Selected Languages list."
 msgstr ""
 "当默认音频轨道不是您首选的语言时，添加一个字幕轨道。\n"
 "\n"
-" 此选项需要有语言设置在已选择语言列表里。"
+"此选项需要有语言设置在已选择语言列表里。"
 
-#: ../src/ghb.m4.h:409
+#: src/ghb3.ui:6221
 msgid "Add Closed Captions when available"
 msgstr "如果可用的话，添加隐藏字幕"
 
-#: ../src/ghb.m4.h:410
+#: src/ghb3.ui:6226
 msgid ""
 "Closed captions are text subtitles that can be added to any container as a "
 "soft subtitle track"
 msgstr "隐藏字幕可以以软字幕轨道方式添加到任意容器"
 
-#: ../src/ghb.m4.h:411
+#: src/ghb3.ui:6247
 msgid "Burn-In Behavior*:"
 msgstr "烧录偏好*："
 
-#: ../src/ghb.m4.h:412
+#: src/ghb3.ui:6259
 msgid ""
 "Set the behavior of subtitle \"Burn-In\".\n"
 "\n"
-" Burned-In subtitles are part of the video and can not be disabled during playback.\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "设置字幕模式为“内嵌”。\n"
 "\n"
-" 内嵌字幕是视频的一部分，并且无法在播放时禁用。\n"
-" 您只能内嵌一个字幕！由于可能的冲突，最后只会使用第一个字幕。"
+"内嵌字幕是视频的一部分，并且无法在播放时禁用。\n"
+"您只能内嵌一个字幕！由于可能的冲突，最后只会使用第一个字幕。"
 
-#: ../src/ghb.m4.h:416
+#: src/ghb3.ui:6286
 msgid "Burn-In for deficient players*:"
 msgstr "为老旧播放器内嵌*:"
 
-#: ../src/ghb.m4.h:417
+#: src/ghb3.ui:6295
 msgid "DVD Subtitles"
 msgstr "DVD 字幕"
 
-#: ../src/ghb.m4.h:418
+#: src/ghb3.ui:6300
 msgid ""
 "Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support DVD subtitles.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "内嵌所选 DVD 字幕轨道的第一个字幕。其他 DVD 字幕轨道将会被丢弃。\n"
-" 如果您的软件或者设备不支持 DVD 字幕则使用这个选项。\n"
+"如果您的软件或者设备不支持 DVD 字幕则使用这个选项。\n"
 "\n"
-" 您只能内嵌一个字幕轨道！由于可能的冲突，最后只会使用第一个字幕。"
+"您只能内嵌一个字幕轨道！由于可能的冲突，最后只会使用第一个字幕。"
 
-#: ../src/ghb.m4.h:422
+#: src/ghb3.ui:6314
 msgid "Blu-ray Subtitles"
 msgstr "蓝光字幕"
 
-#: ../src/ghb.m4.h:423
+#: src/ghb3.ui:6319
 msgid ""
 "Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
-" Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
 "\n"
-" Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
 msgstr ""
 "内嵌第一个选中的蓝光字幕轨道。所有其他蓝光字幕轨道将会被丢弃。\n"
-" 如果您的播放器或者设备不支持蓝光字幕，则使用该选项。\n"
+"如果您的播放器或者设备不支持蓝光字幕，则使用该选项。\n"
 "\n"
-" 您只能内嵌一个字幕轨道！由于可能的冲突，最后只会使用第一个字幕。"
+"您只能内嵌一个字幕轨道！由于可能的冲突，最后只会使用第一个字幕。"
 
-#: ../src/ghb.m4.h:427
+#: src/ghb3.ui:6341
 msgid ""
 "* Only one of the above subtitle burn options will be applied, "
 "starting with the top."
 msgstr "* 上述字幕内嵌选项只有一个有效，从上至下选择。"
 
-#: ../src/ghb.m4.h:428
+#: src/ghb3.ui:6342
 msgid ""
 "Only one subtitle track can be burned! Since conflicts can occur, the first "
 "chosen wins."
 msgstr "您只能内嵌一个字幕轨道！由于可能的冲突，最后只会使用第一个字幕。"
 
-#: ../src/ghb.m4.h:429
+#: src/ghb3.ui:6366
 msgid "Subtitles"
 msgstr "字幕"
 
-#: ../src/ghb.m4.h:430
-msgid "Reference Frames:"
-msgstr "参考帧范围:"
-
-#: ../src/ghb.m4.h:431
-msgid ""
-"Sane values are ~1-6. The more you add, the better the compression, but the slower the encode.\n"
-"Cel animation tends to benefit from more reference frames a lot more than film content.\n"
-"\n"
-"Note that many hardware devices have limitations on the number of supported reference\n"
-"frames, so if you're encoding for a handheld or standalone player, don't touch this unless\n"
-"you're absolutely sure you know what you're doing!"
-msgstr ""
-"合理的取值范围是 1-6。您添加的参考帧越多，压缩效果越好，但是编码速度就越慢。\n"
-"传统的手绘动画 (赛璐珞动画) 比胶卷电影更多地受益于使用更多的参考帧。\n"
-"\n"
-"注意，很多设备对参考帧数量的支持是有限的，所以，如果您要为手持式设备或者独\n"
-"立播放器编码，除非您道您在干什么，否则请不要修改此项！"
-
-#: ../src/ghb.m4.h:437
-msgid "Maximum B-Frames:"
-msgstr "最长B帧序列长:"
-
-#: ../src/ghb.m4.h:438
-msgid ""
-"Sane values are ~2-5. This specifies the maximum number of sequential B-frames that the encoder can use.\n"
-"\n"
-"Large numbers generally won't help significantly unless Adaptive B-frames is set to Optimal.\n"
-"Cel-animated source material and B-pyramid also significantly increase the usefulness of larger\n"
-"values.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires B-frames to be set to 0 (off)."
-msgstr ""
-"合理的取值范围是 2-5。此项指定了编码器能使用的最大连续 B-帧数量。\n"
-"\n"
-"除非自适应 B-帧项设置为“最优”，否则更大的数值通常没什么用。\n"
-"传统的手绘动画(赛璐珞动画)源素材和 B-金字塔也显著增加较大数值的作用。\n"
-"\n"
-"iPods 和一些类似设备使用基本规格 (Baseline Profile) 的设备，\n"
-"要求 B-帧数量设置为0 (关闭)。"
-
-#: ../src/ghb.m4.h:445
-msgid "Pyramidal B-Frames:"
-msgstr "B帧金字塔序列:"
-
-#: ../src/ghb.m4.h:446
-msgid ""
-"B-pyramid improves compression by creating a pyramidal structure (hence the name)\n"
-"of B-frames, allowing B-frames to reference each other to improve compression.\n"
-"\n"
-"Requires Max B-frames greater than 1; optimal adaptive B-frames is strongly recommended for full compression benefit."
-msgstr ""
-"B-金字塔提高了压缩率，它通过创建一个金字塔结构的 B-帧(因此得名)，\n"
-"允许 B-帧引用彼此而提高了压缩率。\n"
-"\n"
-"最大 B-帧值需要大于 1；为了整体压缩的优势建议优化自适应 B-帧。"
-
-#: ../src/ghb.m4.h:450
-msgid "Weighted P-Frames:"
-msgstr "加权P帧:"
-
-#: ../src/ghb.m4.h:451
-msgid ""
-"Performs extra analysis to decide upon weighting parameters for each frame.\n"
-"\n"
-"This improves overall compression slightly and improves the quality of fades greatly.\n"
-"\n"
-"Baseline profile, as required for iPods and similar devices, requires weighted P-frame\n"
-"prediction to be disabled. Note that some devices and players, even those that support\n"
-"Main Profile, may have problems with Weighted P-frame prediction: the Apple TV is\n"
-"completely incompatible with it, for example."
-msgstr ""
-"执行额外的分析以决定每一帧的权重。\n"
-"\n"
-"这总体上略微提升了压缩率，并极大地提高了淡入淡出质量。\n"
-"\n"
-"iPods 和一些类似设备使用基本规格 (Baseline Profile) 的设备，要求禁用加权 P 帧预测。\n"
-"注意，即使是支持主流规格 (Main Profile) 的设备与播放器，也有可能不兼容加权 P 帧预测：\n"
-"比如说，Apple TV 就完全不兼容它。"
-
-#: ../src/ghb.m4.h:459
-msgid "8x8 Transform"
-msgstr "8x8 变换"
-
-#: ../src/ghb.m4.h:461
-#, no-c-format
-msgid ""
-"The 8x8 transform is the single most useful feature of x264 in terms of compression-per-speed.\n"
-"\n"
-"It improves compression by at least 5% at a very small speed cost and may\n"
-"provide an unusually high visual quality benefit compared to its compression\n"
-"gain. However, it requires High Profile, which many devices may not support."
-msgstr ""
-"8x8 变换是 x264 在 compression-per-speed 方便很实用的特性。\n"
-"\n"
-"它将压缩率提高了至少 5%，代价仅仅是很小的速度开销，而且提供了相对其压缩量来说难得的视觉质量。\n"
-"然而，它需要用到很多设备可能都不支持的高级规格 (High Profile)。"
-
-#: ../src/ghb.m4.h:466
-msgid "CABAC Entropy Encoding"
-msgstr "CABAC 熵编码"
-
-#: ../src/ghb.m4.h:468
-#, no-c-format
-msgid ""
-"After the encoder has done its work, it has a bunch of data that\n"
-"needs to be compressed losslessly, similar to ZIP or RAR. H.264 provides\n"
-"two options for this: CAVLC and CABAC. CABAC decodes a lot slower but\n"
-"compresses significantly better (10-30%), especially at lower bitrates.\n"
-"\n"
-"If you're looking to minimize CPU requirements for video playback, disable this option.\n"
-"Baseline profile, as required for iPods and similar devices, requires CABAC to be disabled."
-msgstr ""
-"在编码器完成编码工作之后，它还有一堆数据需要无损压缩，类似 ZIP 或 RAR。\n"
-"H264 为此提供了两个选项：适应性变动长度编码 (CAVLC) 和\n"
-"前文参考之适应性二元算术编码 (CABAC)。CABAC 解码速度比较慢，\n"
-"但是压缩效果更好 (10-30%)，特别是在低码率的情况下。\n"
-"\n"
-"如果您需要尽量减轻 CPU 回放视频的负担，请禁用此选项。\n"
-"iPods 和类似设备使用基本规格 (Baseline Profile) 的设备，\n"
-"要求禁用 CABAC。"
-
-#: ../src/ghb.m4.h:475
-msgid "Encoding Features"
-msgstr "编码特性"
-
-#: ../src/ghb.m4.h:476
-msgid "Motion Est. Method:"
-msgstr "运动估计方法："
-
-#: ../src/ghb.m4.h:477
-msgid ""
-"Controls the motion estimation method.\n"
-"\n"
-"Motion estimation is how the encoder estimates how each block of pixels in a frame has moved.\n"
-"A better motion search method improves compression at the cost of speed.\n"
-"\n"
-"Diamond: performs an extremely fast and simple search using a diamond pattern.\n"
-"Hexagon: performs a somewhat more effective but slightly slower search using a hexagon pattern.\n"
-"Uneven Multi-Hex: performs a very wide search using a variety of patterns, more accurately capturing complex motion.\n"
-"Exhaustive: performs a \"dumb\" search of every pixel in a wide area. Significantly slower for only a small compression gain.\n"
-"Transformed Exhaustive: Like exhaustive, but makes even more accurate decisions. Accordingly, somewhat slower, also for only a small improvement."
-msgstr ""
-"控制运动估计方法：\n"
-"\n"
-"运动估计方法描述了编码器如何估计每一帧中的像素宏区块的移动。\n"
-"更好的运动估计方法以牺牲速度为代价来提升压缩。\n"
-"\n"
-"菱形检索：以菱形模式执行一个超级快速而简单的搜索。\n"
-"六边形检索：以六边形模式执行会更加有效率但是速度更慢的搜索。\n"
-"可变半径六边形检索：由于其更加精确和具有扩展性的算法，能够更加精确的捕捉复杂运动。\n"
-"全面检索：在整个区域内一个像素一个像素的搜索，相对于压缩率的那点收益来说速度超级慢。\n"
-"改造的全面检索：就像全面检索，一种尝试接近在每个动态向量执行变换 (通常是阿达马变换\n"
-"(Hadamard transform)) 比较的效果的算法，但效果好一点而速度慢一点。"
-
-#: ../src/ghb.m4.h:487
-msgid "Subpel ME &amp; Mode:"
-msgstr "亚像素运动估计 &amp; 模式决策方法："
-
-#: ../src/ghb.m4.h:488
-msgid ""
-"This setting controls both subpixel-precision motion estimation and mode decision methods.\n"
-"\n"
-"Subpixel motion estimation is used for refining motion estimates beyond mere pixel accuracy, improving compression.\n"
-"Mode decision is the method used to choose how to encode each block of the frame: a very important decision.\n"
-"SAD is the fastest method, followed by SATD, RD, RD refinement, and the slowest, QPRD.\n"
-"6 or higher is strongly recommended: Psy-RD, a very powerful psy optimization that helps retain detail, requires RD.\n"
-"11 disables all early terminations in analysis.\n"
-"10 and 11, the most powerful and slowest options, require adaptive quantization (aq-mode > 0) and trellis 2 (always)."
-msgstr ""
-"这个设置控制亚像素精度的运动估计和模式决策方法。\n"
-"\n"
-"亚像素运动估计用于改进像素精度之外的运动估计，并提高了压缩率。\n"
-"模式决策方法是决定如何编码帧的每一区块的重要决策方法。\n"
-"绝对误差和 (SAD) 是最快的方法，接着是将误差做变换 (通常是阿达马变换(Hadamard transform))之后的绝对误差和 (SATD)、率失真 (RD)、细化的率失真，以及最慢的量化参数率失真 (QPRD)。\n"
-"推荐 6 或者更高的值：Psy-RD 是一个强大的心理视觉优化工具，可以保留更多细节，它依赖率失真 (RD)。\n"
-"11 禁止分析过程提早终止。\n"
-"10 和 11 是最强大和最慢的选项，需要自适应量化 (aq-mode > 0) 和栅格 2 (总是)。"
-
-#: ../src/ghb.m4.h:496
-msgid "Motion Est. Range:"
-msgstr "运动估计范围："
-
-#: ../src/ghb.m4.h:497
-msgid ""
-"This is the distance x264 searches from its initial guess at the\n"
-"motion of a block in order to try to find its actual motion.\n"
-"\n"
-"The default is fine for most content, but extremely high motion video,\n"
-"especially at HD resolutions, may benefit from higher ranges, albeit at\n"
-"a high speed cost."
-msgstr ""
-"这是 x264 查找区块实际运动距离时的初始估计值。\n"
-"\n"
-"默认值同样是比较合适的，但是对于非常高的动态视频，特别是高分辨率的情况，\n"
-"使用更高的范围会更好，虽然速度花费更高。"
-
-#: ../src/ghb.m4.h:503
-msgid "Adaptive Direct Mode:"
-msgstr "基于相关性的自适应模式："
-
-#: ../src/ghb.m4.h:504
-msgid ""
-"H.264 allows for two different prediction modes, spatial and temporal, in B-frames.\n"
-"\n"
-"Spatial, the default, is almost always better, but temporal is sometimes useful too.\n"
-"x264 can, at the cost of a small amount of speed (and accordingly for a small compression gain),\n"
-"adaptively select which is better for each particular frame."
-msgstr ""
-"H.264 允许 B-帧使用两种不同的预测模式：基于空间相关性的模式与基于时间相关性的模式。\n"
-"\n"
-"默认使用基于空间相关性的预测模式大部分情况下就表现良好，但是有的时候基于时间相关性的\n"
-"预测模式也很有用。\n"
-"x264 可以以牺牲较小的速度为代价 (相对于较小的压缩率变化来说),自适应选择每一帧选择合适的预测模式。"
-
-#: ../src/ghb.m4.h:509
-msgid "Adaptive B-Frames:"
-msgstr "自适应 B-帧："
-
-#: ../src/ghb.m4.h:510
-msgid ""
-"x264 has a variety of algorithms to decide when to use B-frames and how many to use.\n"
-"\n"
-"Fast mode takes roughly the same amount of time no matter how many B-frames you specify.\n"
-"However, while fast, its decisions are often suboptimal.\n"
-"\n"
-"Optimal mode gets slower as the maximum number of B-Frames increases,\n"
-"but makes much more accurate decisions, especially when used with B-pyramid."
-msgstr ""
-"x264 有多种算法来决定何时使用 B-帧以及使用数量。\n"
-"\n"
-"无论您使用多少 B-帧，快速模式大约需要的时间都差不多的。\n"
-"然而，尽管它快速，其决策往往不够理想。\n"
-"\n"
-"最优模式随着 B-帧数量的增加而变慢，但是能作出更准确的\n"
-"决策，特别是使用 B-金字塔时。"
-
-#: ../src/ghb.m4.h:517
-msgid "Partitions:"
-msgstr "分区数量："
-
-#: ../src/ghb.m4.h:518
-msgid ""
-"Mode decision picks from a variety of options to make its decision:\n"
-"this option chooses what options those are.\n"
-"\n"
-"Fewer partitions to check means faster encoding, at the cost of worse\n"
-"decisions, since the best option might have been one that was turned off."
-msgstr ""
-"模式决策会根据多种选项作出决策：\n"
-"这个选项决定选择哪些选项。\n"
-"\n"
-"因为最佳的选项可能被关闭了，在最糟糕的\n"
-"情况下更少的分区检查意味着编码速度更快。"
-
-#: ../src/ghb.m4.h:523
-msgid "Trellis:"
-msgstr "栅格："
-
-#: ../src/ghb.m4.h:525
-#, no-c-format
-msgid ""
-"Trellis fine-tunes the rounding of transform coefficients to\n"
-"squeeze out 3-5% more compression at the cost of some speed.\n"
-"\n"
-"\"Always\" uses trellis not only during the main encoding process, but also\n"
-"during analysis, which improves compression even more, albeit at great speed cost.\n"
-"\n"
-"Trellis costs more speed at higher bitrates and requires CABAC."
-msgstr ""
-"以牺牲一些速度为代价进行栅格微调变换系数微调来榨取出 3-5% 的压缩。\n"
-"\n"
-"“总是”这项不仅在编码阶段，还在分析阶段使用栅格，尽管这会牺牲极大\n"
-"的速度损失，但是它能够更多地提高压缩。\n"
-"\n"
-"栅格在码率更高时牺牲更多的速度，并且依赖 CABAC。"
-
-#: ../src/ghb.m4.h:532
-msgid "Analysis"
-msgstr "分析"
-
-#: ../src/ghb.m4.h:533
-msgid "Adaptive Quantization Strength:"
-msgstr "自适应量化强度值："
-
-#: ../src/ghb.m4.h:534
-msgid ""
-"Adaptive quantization controls how the encoder distributes bits across the frame.\n"
-"\n"
-"Higher values take more bits away from edges and complex areas to improve areas with finer detail."
-msgstr ""
-"自适应量化算法控制编码器如何给每帧分配比特。\n"
-"\n"
-"更高强度值将给边缘及复杂区域分配更多比特以提升精细程度。"
-
-#: ../src/ghb.m4.h:537
-msgid "Psychovisual Rate Distortion:"
-msgstr "心理视觉率失真："
-
-#: ../src/ghb.m4.h:538
-msgid ""
-"Psychovisual rate-distortion optimization takes advantage of the characteristics of human\n"
-"vision to dramatically improve apparent detail and sharpness.\n"
-"The effect can be made weaker or stronger by adjusting the strength.\n"
-"Being an RD algorithm, it requires mode decision to be at least \"6\"."
-msgstr ""
-"心理视觉率失真优化利用了人类视觉的特点显著地提升了细节与锐度。\n"
-"调整强度值即可调整最终效果。\n"
-"作为一种率失真(RD)算法，它要求模式决策方法的值至少设置为“6”。"
-
-#: ../src/ghb.m4.h:542
-msgid "Psychovisual Trellis:"
-msgstr "心理视觉栅格算法："
-
-#: ../src/ghb.m4.h:543
-msgid ""
-"Psychovisual trellis is an experimental algorithm to further\n"
-"improve sharpness and detail retention beyond what Psychovisual RD does.\n"
-"\n"
-"Recommended values are around 0.2, though higher values may help for very\n"
-"grainy video or lower bitrate encodes. Not recommended for cel animation\n"
-"and other sharp-edged graphics."
-msgstr ""
-"心理视觉栅格算法是一个还在实验之中的算法，\n"
-"对提高锐度和细节保留方面远超心理视觉率失真算法。\n"
-"\n"
-"推荐值约为 0.2，尽管更高的值可以减少胶卷颗粒\n"
-"或者得到低码率编码。\n"
-"不推荐用于传统的手绘动画 (赛璐珞动画) 及其他边缘锐利的图像。"
-
-#: ../src/ghb.m4.h:549
-msgid "Deblocking: "
-msgstr "去区块效应： "
-
-#: ../src/ghb.m4.h:550
-msgid ""
-"H.264 deblocking filter.\n"
-"\n"
-"h.264 has a built-in deblocking filter that smooths out blocking artifacts\n"
-"after decoding each frame. This not only improves visual quality, but also\n"
-"helps compression significantly. The deblocking filter takes a lot of CPU power,\n"
-"so if you're looking to minimize CPU requirements for video playback, disable it.\n"
-"\n"
-"The deblocking filter has two adjustable parameters, \"strength\" (Alpha) and \"threshold\" (Beta).\n"
-"The former controls how strong (or weak) the deblocker is, while the latter controls how many\n"
-"(or few) edges it applies to. Lower values mean less deblocking, higher values mean more deblocking.\n"
-"The default is 0 (normal strength) for both parameters."
-msgstr ""
-"H.264 去区块滤镜。\n"
-"\n"
-"H.264 有一个内置的去区块滤镜，用于使每帧解码后产生的区块效应变平滑。\n"
-"这不仅提高了视觉品质还显著的提高了压缩。去区块滤镜会耗费大量的 CPU 资源，\n"
-"如果您想要尽量减轻视频回放的 CPU 要求，请禁止它。\n"
-"\n"
-"去区块滤镜有两个调节参数：“强度值” (Alpha) 与“阈值” (Beta)。\n"
-"前者控制去区块滤镜的强弱程度，而后者控制需要调节的边缘的数量多少。\n"
-"数值越小意味着更少的去区块，数量越大意味着更多的去区块。\n"
-"这两个参数的默认值都是 0 (一般强度)。"
-
-#: ../src/ghb.m4.h:561
-msgid "No DCT Decimate"
-msgstr "禁用 DCT 跳过"
-
-#: ../src/ghb.m4.h:562
-msgid ""
-"x264 normally zeroes out nearly-empty data blocks to save bits to\n"
-"be better used for some other purpose in the video. However, this can\n"
-"sometimes have slight negative effects on retention of subtle grain and\n"
-"dither.\n"
-"\n"
-"Don't touch this unless you're having banding issues or other such cases\n"
-"where you are having trouble keeping fine noise."
-msgstr ""
-"通常 x264 会将视频中几乎全零的数据块归零以节省数据位，并用作他用。\n"
-"然而，这有时候会对保留胶卷颗粒与抖动产生轻微的负面影响。\n"
-"\n"
-"除非您遇到纹理问题或者在需要保留精细噪声方面有麻烦了，\n"
-"否则请不要改动这里。"
-
-#: ../src/ghb.m4.h:569
-msgid "Psychovisual"
-msgstr "心理视觉"
-
-#: ../src/ghb.m4.h:570
-msgid ""
-"Your selected options will appear here.\n"
-"You can edit these and add additional options.\n"
-"\n"
-"Default values will not be shown. The defaults are:\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-msgstr ""
-"您选择的选项将会出现在此处。 \n"
-"您可以编辑这些选项，也可以添加额外的选项。\n"
-"\n"
-" 默认值不会显示出来。默认值为：\n"
-"ref=3:bframes=3:b-adapt=fast:direct=spatial:\n"
-"b-pyramid=normal:weightp=2:me=hex:merange=16:\n"
-"subme=7:partitions=p8x8,b8x8,i8x8,i4x4:8x8dct=1:\n"
-"deblock=0,0:trellis=1:psy-rd=1,0:aq-strength=1.0:\n"
-"no-fast-pskip=0:no-dct-decimate=0:cabac=1"
-
-#: ../src/ghb.m4.h:579
-msgid "Current x264 Advanced Option String"
-msgstr "当前 x264 高级选项字符串"
-
-#: ../src/ghb.m4.h:580
-msgid "Advanced Video"
-msgstr "高级视频"
-
-#: ../src/ghb.m4.h:581
+#: src/ghb3.ui:6381 src/queuehandler.c:280
 msgid "Chapter Markers"
 msgstr "章节标记"
 
-#: ../src/ghb.m4.h:582
+#: src/ghb3.ui:6386
 msgid "Add chapter markers to output file."
 msgstr "添加章节标记到输出文件。"
 
-#: ../src/ghb.m4.h:583 ../src/queuehandler.c:217 ../src/queuehandler.c:220
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr "序号"
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr "持续时长"
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr "标题"
+
+#: src/ghb3.ui:6492
 msgid "Chapters"
 msgstr "章节"
 
-#: ../src/ghb.m4.h:584
-msgid "Title:"
-msgstr "标题："
-
-#: ../src/ghb.m4.h:585
+#: src/ghb3.ui:6547
 msgid "Actors:"
 msgstr "演员："
 
-#: ../src/ghb.m4.h:586
+#: src/ghb3.ui:6582
 msgid "Director:"
 msgstr "导演："
 
-#: ../src/ghb.m4.h:587
+#: src/ghb3.ui:6617
 msgid "Release Date:"
 msgstr "发布日期："
 
-#: ../src/ghb.m4.h:588
+#: src/ghb3.ui:6652
 msgid "Comment:"
 msgstr "评论："
 
-#: ../src/ghb.m4.h:589
+#: src/ghb3.ui:6687
 msgid "Genre:"
 msgstr "种类："
 
-#: ../src/ghb.m4.h:590
+#: src/ghb3.ui:6722
 msgid "Description:"
 msgstr "描述："
 
-#: ../src/ghb.m4.h:591
+#: src/ghb3.ui:6757
 msgid "Plot:"
 msgstr "剧情："
 
-#: ../src/ghb.m4.h:592
+#: src/ghb3.ui:6795
 msgid "Tags"
 msgstr "标签"
 
-#: ../src/ghb.m4.h:593
-msgid "Settings"
-msgstr "设置"
-
-#: ../src/ghb.m4.h:594
-msgid "Edit"
-msgstr "编辑"
-
-#: ../src/ghb.m4.h:595
-msgid ""
-"Mark selected queue entry as pending.\n"
-"Resets the queue job to pending and ready to run again."
-msgstr ""
-"将选中队列条目标记为等待。\n"
-"重置队列中的编码任务为等待状态并准备再次运行。"
-
-#: ../src/ghb.m4.h:597
-msgid "Reload All"
-msgstr "全部重载"
-
-#: ../src/ghb.m4.h:598
-msgid ""
-"Mark all queue entries as pending.\n"
-"Resets all queue jobs to pending and ready to run again."
-msgstr ""
-"将所有队列条目标记为等待。\n"
-"重置队列中的所有编码任务为等待并准备再次运行。"
-
-#: ../src/ghb.m4.h:600
-msgid "Delete All"
-msgstr "全部删除"
-
-#: ../src/ghb.m4.h:601
-msgid "Delete all items in the queue."
-msgstr "删除队列中的所有项目。"
-
-#: ../src/ghb.m4.h:602
-msgid "Save Queue"
-msgstr "保存队列"
-
-#: ../src/ghb.m4.h:603
-msgid ""
-"Save the current queue of encode jobs to a file.\n"
-"This file may be reloaded at a later time to edit your jobs and re-encode."
-msgstr ""
-"将当前队列中的编码任务保存到文件。\n"
-"您可以稍后载入该文件，编辑编码任务然后重新编码。"
-
-#: ../src/ghb.m4.h:605
-msgid "Load Queue File"
-msgstr "加载队列文件"
-
-#: ../src/ghb.m4.h:606
-msgid "Load a previously saved queue file."
-msgstr "加载先前保存的队列文件。"
-
-#: ../src/ghb.m4.h:607
+#: src/ghb3.ui:6824
 msgid "Save As:"
 msgstr "另存为："
 
-#: ../src/ghb.m4.h:608
+#: src/ghb3.ui:6838
 msgid "Destination filename for your encode."
 msgstr "编码的目标文件名。"
 
-#: ../src/ghb.m4.h:609
+#: src/ghb3.ui:6858
 msgid "To:"
 msgstr "位置:"
 
-#: ../src/ghb.m4.h:610
+#: src/ghb3.ui:6871
 msgid "Destination directory for your encode."
 msgstr "编码的目标文件夹。"
 
-#: ../src/ghb.m4.h:611 ../src/queuehandler.c:1834
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
 msgid "Destination Directory"
 msgstr "目标文件夹"
 
-#: ../src/ghb.m4.h:612 ../src/callbacks.c:5713 ../src/callbacks.c:5723
-#: ../src/callbacks.c:5731 ../src/hb-backend.c:4219 ../src/hb-backend.c:4252
-#: ../src/hb-backend.c:4291 ../src/hb-backend.c:4322 ../src/hb-backend.c:4350
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1233
-#: ../src/queuehandler.c:1247 ../src/queuehandler.c:1262
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/ghb.m4.h:613
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
 msgid "OK"
 msgstr "确定"
 
-#: ../src/ghb.m4.h:614
+#: src/ghb3.ui:7005
 msgid "Select All"
 msgstr "全选"
 
-#: ../src/ghb.m4.h:615
+#: src/ghb3.ui:7009
 msgid "Mark all titles for adding to the queue"
 msgstr "将所有标题标记并加入队列"
 
-#: ../src/ghb.m4.h:616
+#: src/ghb3.ui:7022
 msgid "Clear All"
 msgstr "清除所有"
 
-#: ../src/ghb.m4.h:617
+#: src/ghb3.ui:7026
 msgid "Unmark all titles"
 msgstr "取消标记所有标题"
 
-#: ../src/ghb.m4.h:618
+#: src/ghb3.ui:7087
 msgid "Destination files OK. No duplicates detected."
 msgstr "目标文件没问题。未检测到重复文件。"
 
-#: ../src/ghb.m4.h:619
+#: src/ghb3.ui:7109
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/ghb.m4.h:620
+#: src/ghb3.ui:7215
 msgid "Automatically check for updates"
 msgstr "自动检查更新"
 
-#: ../src/ghb.m4.h:621
+#: src/ghb3.ui:7252
 msgid "When all encodes are complete"
 msgstr "当所有编码完成后"
 
-#: ../src/ghb.m4.h:622
+#: src/ghb3.ui:7274
 msgid "Use automatic naming (uses modified source name)"
 msgstr "使用自动命名（使用修改后的源名称）"
 
-#: ../src/ghb.m4.h:623
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr "从源文件名或卷标创建目标文件名"
+
+#: src/ghb3.ui:7299
 msgid "Auto-Name Template"
 msgstr "自动命名模板"
 
-#: ../src/ghb.m4.h:624
+#: src/ghb3.ui:7310
 msgid ""
-"Available Options: {source} {title} {preset} {chapters} {date} {time} "
-"{creation-date} {creation-time} {quality} {bitrate}"
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
 msgstr ""
-"可用选项: {source} {title} {preset} {chapters} {date} {time} {creation-date} "
-"{creation-time} {quality} {bitrate}"
+"可用选项: {source-path} {source} {title} {preset} {chapters} {date} {time} "
+"{creation-date} {creation-time} {quality} {bitrate}"
 
-#: ../src/ghb.m4.h:625
+#: src/ghb3.ui:7330
 msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
 msgstr "为 MP4 使用 iPod / iTunes 友好的文件扩展名（.m4v）"
 
-#: ../src/ghb.m4.h:626
+#: src/ghb3.ui:7373
 msgid "Number of previews"
 msgstr "预览数"
 
-#: ../src/ghb.m4.h:627
-msgid "Filter short titles (seconds)"
-msgstr "筛选持续时长短的标题 (秒)"
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr "过滤短的 DVD 和蓝光标题（秒）"
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr "编码完成后清除已完成的队列项目"
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"默认情况下，已完成编码任务仍然保留在队列中并标记为已完成。\n"
+"如果您想要编码任务完成时自动清除，则勾选此项。"
 
-#: ../src/ghb.m4.h:628
+#: src/ghb3.ui:7446
 msgid "General"
 msgstr "普通"
 
-#: ../src/ghb.m4.h:629
+#: src/ghb3.ui:7489
 msgid "Constant Quality fractional granularity"
 msgstr "恒定画质因子的调节粒度"
 
-#: ../src/ghb.m4.h:630
+#: src/ghb3.ui:7506
 msgid "Use dvdnav (instead of libdvdread)"
 msgstr "使用 dvdnav（代替 libdvdread）"
 
-#: ../src/ghb.m4.h:631
+#: src/ghb3.ui:7529
 msgid "Monitor destination disk free space"
 msgstr "监控目标磁盘可用空间"
 
-#: ../src/ghb.m4.h:632
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
 msgid "Pause encoding if free disk space drops below limit"
 msgstr "如果可用磁盘空间低于限制，暂停编码"
 
-#: ../src/ghb.m4.h:633
+#: src/ghb3.ui:7570
 msgid "MB Limit"
 msgstr "MB 限制"
 
-#: ../src/ghb.m4.h:634
+#: src/ghb3.ui:7598
 msgid "Put individual encode logs in same location as movie"
 msgstr "将个人编码日志放在与电影相同的位置"
 
-#: ../src/ghb.m4.h:635
+#: src/ghb3.ui:7634
 msgid "Activity Log Verbosity Level"
 msgstr "活动日志详细程度"
 
-#: ../src/ghb.m4.h:636
+#: src/ghb3.ui:7669
 msgid "Activity Log Longevity"
 msgstr "活动日志保存时间"
 
-#: ../src/ghb.m4.h:637
+#: src/ghb3.ui:7690
 msgid "Scale down High Definition previews"
 msgstr "缩小高清视频的预览尺寸"
 
-#: ../src/ghb.m4.h:638
+#: src/ghb3.ui:7707
 msgid "Automatically Scan DVD when loaded"
 msgstr "DVD 装载时自动扫描"
 
-#: ../src/ghb.m4.h:639
+#: src/ghb3.ui:7711
 msgid "Scans the DVD whenever a new disc is loaded"
 msgstr "当有新碟装载时扫描 DVD"
 
-#: ../src/ghb.m4.h:640
+#: src/ghb3.ui:7750
 msgid "Activity Window Font Size"
 msgstr "活动窗口字体大小"
 
-#: ../src/ghb.m4.h:641
-msgid "Hide Advanced Video Options Tab"
-msgstr "隐藏高级视频选项标签"
-
-#: ../src/ghb.m4.h:642
-msgid ""
-"Use advanced video options at your own risk.\n"
-"We recommend that you use the controls available\n"
-"on the Video tab instead."
-msgstr ""
-"您如果使用高级视频选项，风险自负哟。\n"
-"我们推荐您只使用视频标签提供的控制选项。"
-
-#: ../src/ghb.m4.h:645
-msgid "Delete completed jobs from queue"
-msgstr "删除队列中已完成的作业"
-
-#: ../src/ghb.m4.h:646
-msgid ""
-"By default, completed jobs remain in the queue and are marked as complete.\n"
-"Check this if you want the queue to clean itself up by deleting completed jobs."
-msgstr ""
-"默认情况下，已完成编码任务仍然保留在队列中并标记为已完成。\n"
-"如果您想要编码任务完成时自动清除，则勾选此项。"
-
-#: ../src/ghb.m4.h:648
+#: src/ghb3.ui:7767
 msgid "Use the same settings for all titles in a batch"
 msgstr "对批处理中的所有标题使用相同的设置"
 
-#: ../src/ghb.m4.h:649
+#: src/ghb3.ui:7771
 msgid ""
 "When checked, every title will use the same settings when adding a\n"
 "batch of titles to the queue.\n"
@@ -2216,71 +1893,67 @@
 "\n"
 "如果要允许单独更改每个标题的设置，请取消选中此项。"
 
-#: ../src/ghb.m4.h:653
+#: src/ghb3.ui:7799
 msgid "Allow Tweaks"
 msgstr "允许 Tweaks"
 
-#: ../src/ghb.m4.h:654
+#: src/ghb3.ui:7815
 msgid "Allow HandBrake For Dummies"
 msgstr "为新手提供傻瓜模式"
 
-#: ../src/ghb.m4.h:655
+#: src/ghb3.ui:7843
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/ghb.m4.h:656
-msgid "Folder Name:"
-msgstr "文件夹名称:"
-
-#: ../src/ghb.m4.h:657
-msgid "Description"
-msgstr "描述"
-
-#: ../src/ghb.m4.h:658
+#: src/ghb3.ui:7921
 msgid "Rename Preset"
 msgstr "重命名预设"
 
-#: ../src/ghb.m4.h:659
+#: src/ghb3.ui:7941
 msgid "Name:"
 msgstr "命名："
 
-#: ../src/ghb.m4.h:660
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "描述"
+
+#: src/ghb3.ui:8079
 msgid "Category:"
 msgstr "类别："
 
-#: ../src/ghb.m4.h:661
+#: src/ghb3.ui:8094
 msgid "Set the category that this preset will be shown under."
 msgstr "设置此预设将显示在下面的类别。"
 
-#: ../src/ghb.m4.h:662
+#: src/ghb3.ui:8110
 msgid "Category Name:"
 msgstr "类别名称："
 
-#: ../src/ghb.m4.h:663
+#: src/ghb3.ui:8143
 msgid "Preset Name:"
 msgstr "预设名称："
 
-#: ../src/ghb.m4.h:664
+#: src/ghb3.ui:8177
 msgid "Default Preset"
 msgstr "默认预设"
 
-#: ../src/ghb.m4.h:665
+#: src/ghb3.ui:8182
 msgid "Make this the default Preset when HandBrake starts"
 msgstr "设置为 HandBrake 启动时的默认预设"
 
-#: ../src/ghb.m4.h:666
-msgid "Custom Picture Dimensions"
-msgstr "自定义图像尺寸"
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr " 尺寸"
 
-#: ../src/ghb.m4.h:667
+#: src/ghb3.ui:8234
 msgid "Maximum Width:"
 msgstr "最大宽度："
 
-#: ../src/ghb.m4.h:668
+#: src/ghb3.ui:8239
 msgid "Enable maximum width limit."
 msgstr "启用最大宽度限制."
 
-#: ../src/ghb.m4.h:669
+#: src/ghb3.ui:8257
 msgid ""
 "This is the maximum width that the video will be stored at.\n"
 "\n"
@@ -2292,15 +1965,15 @@
 "当新导入的源文件的宽度更大的时候应用这个值。\n"
 "将其设置为 0 意味着不限制最大宽度。"
 
-#: ../src/ghb.m4.h:673
+#: src/ghb3.ui:8274
 msgid "Maximum Height:"
 msgstr "最大高度："
 
-#: ../src/ghb.m4.h:674
+#: src/ghb3.ui:8279
 msgid "Enable maximum height limit."
 msgstr "启用最大高度限制。"
 
-#: ../src/ghb.m4.h:675
+#: src/ghb3.ui:8297
 msgid ""
 "This is the maximum height that the video will be stored at.\n"
 "\n"
@@ -2312,89 +1985,123 @@
 "当新导入的源文件的高度更大的时候应用这个值。\n"
 "将其设置为 0 意味着不限制最大高度。"
 
-#: ../src/ghb.m4.h:679
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr "HandBrake 预览"
+
+#: src/ghb3.ui:8427
 msgid "Select preview frames."
 msgstr "选择预览画面。"
 
-#: ../src/ghb.m4.h:680
+#: src/ghb3.ui:8449
 msgid ""
 "Encode and play a short sequence of video starting from the current preview "
 "position."
 msgstr "从当前预览位置编码并播放一小段视频。"
 
-#: ../src/ghb.m4.h:681
+#: src/ghb3.ui:8520
 msgid "Duration:"
 msgstr "持续时间:"
 
-#: ../src/ghb.m4.h:682
+#: src/ghb3.ui:8532
 msgid "Set the duration of the live preview in seconds."
 msgstr "以秒为单位设置实时预览时间。"
 
-#: ../src/ghb.m4.h:683
+#: src/ghb3.ui:8548
 msgid "Show Crop"
 msgstr "显示裁剪"
 
-#: ../src/ghb.m4.h:684
+#: src/ghb3.ui:8552
 msgid "Show Cropped area of the preview"
 msgstr "显示预览中被裁剪部分"
 
-#: ../src/ghb.m4.h:685
+#: src/ghb3.ui:8563
 msgid "Source Resolution"
 msgstr "源分辨率"
 
-#: ../src/ghb.m4.h:686
+#: src/ghb3.ui:8567
 msgid "Reset preview window to the source video's resolution"
 msgstr "将预览窗口重置为源视频的分辨率"
 
-#: ../src/ghb.m4.h:687
+#: src/ghb3.ui:8599
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/ghb.m4.h:688
+#: src/ghb3.ui:8611
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/ghb.m4.h:689
+#: src/ghb3.ui:8645
 msgid "Title Number:"
 msgstr "标题编号:"
 
-#: ../src/ghb.m4.h:690
+#: src/ghb3.ui:8681
 msgid "Detected DVD devices:"
 msgstr "侦测到 DVD 设备："
 
-#: ../src/ghb.m4.h:691
+#: src/ghb3.ui:8791
 msgid "Import SRT"
 msgstr "导入 SRT"
 
-#: ../src/ghb.m4.h:692
+#: src/ghb3.ui:8796
 msgid "Enable settings to import an SRT subtitle file"
 msgstr "勾选此项以导入 SRT 字幕文件"
 
-#: ../src/ghb.m4.h:693
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr "导入 SSA"
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr "勾选此项以导入 SSA 字幕文件"
+
+#: src/ghb3.ui:8824
 msgid "Embedded Subtitle List"
 msgstr "内嵌字幕列表"
 
-#: ../src/ghb.m4.h:694
+#: src/ghb3.ui:8829
 msgid "Enable settings to select embedded subtitles"
 msgstr "允许设置选择的内嵌字幕"
 
-#: ../src/ghb.m4.h:695
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "源音轨"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr "您的源文件内所有可用的字幕轨列表。"
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "音轨名称："
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+"设置字幕轨名称。\n"
+"\n"
+"播放器可以在字幕轨选择列表中使用。"
+
+#: src/ghb3.ui:8934
 msgid "Language"
 msgstr "语言"
 
-#: ../src/ghb.m4.h:696
+#: src/ghb3.ui:8948
 msgid "Character Code"
 msgstr "字符编码"
 
-#: ../src/ghb.m4.h:697
+#: src/ghb3.ui:8962
 msgid "File:"
 msgstr "文件:"
 
-#: ../src/ghb.m4.h:698
+#: src/ghb3.ui:8977
 msgid "Offset (ms)"
 msgstr "延迟(毫秒）"
 
-#: ../src/ghb.m4.h:699
+#: src/ghb3.ui:8992
 msgid ""
 "Set the language of this subtitle.\n"
 "This value will be used by players in subtitle menus."
@@ -2402,7 +2109,7 @@
 "设置该字幕的语言。\n"
 "这个值用于播放器中的字幕菜单。"
 
-#: ../src/ghb.m4.h:701
+#: src/ghb3.ui:9010
 msgid ""
 "Set the character code used by the SRT file you are importing.\n"
 "\n"
@@ -2416,35 +2123,27 @@
 "我们一般将其转换为 UTF-8。\n"
 "因此，我们需要源文件的字符编码。"
 
-#: ../src/ghb.m4.h:706
+#: src/ghb3.ui:9034
 msgid "Select the SRT file to import."
 msgstr "选择要导入的 SRT 文件。"
 
-#: ../src/ghb.m4.h:707
-msgid "Srt File"
-msgstr "Srt 文件"
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr "导入文件"
 
-#: ../src/ghb.m4.h:708
+#: src/ghb3.ui:9055
 msgid "Adjust the offset in milliseconds between video and SRT timestamps"
 msgstr "调整视频与 SRT 文件的时间偏移量，单位为毫秒"
 
-#: ../src/ghb.m4.h:709
-msgid "Track"
-msgstr "字幕轨"
-
-#: ../src/ghb.m4.h:710
-msgid "List of subtitle tracks available from your source."
-msgstr "您的源文件内所有可用的字幕轨列表。"
-
-#: ../src/ghb.m4.h:711
+#: src/ghb3.ui:9079
 msgid "Forced Subtitles Only"
 msgstr "仅强制字幕"
 
-#: ../src/ghb.m4.h:712
+#: src/ghb3.ui:9100
 msgid "Burn into video"
 msgstr "烧录进视频"
 
-#: ../src/ghb.m4.h:713
+#: src/ghb3.ui:9105
 msgid ""
 "Render the subtitle over the video.\n"
 "The subtitle will be part of the video and can not be disabled."
@@ -2452,23 +2151,15 @@
 "在视频中显示该字幕。\n"
 "字幕将作为视频的一部分，并且不能被禁用。"
 
-#: ../src/ghb.m4.h:715
+#: src/ghb3.ui:9117
 msgid "Set Default Track"
 msgstr "设置默认轨"
 
-#: ../src/ghb.m4.h:716
-msgid "Source Track"
-msgstr "源音轨"
-
-#: ../src/ghb.m4.h:717
+#: src/ghb3.ui:9215
 msgid "List of audio tracks available from your source."
 msgstr "您的源文件内可用的音频轨列表。"
 
-#: ../src/ghb.m4.h:718
-msgid "Track Name:"
-msgstr "音轨名称："
-
-#: ../src/ghb.m4.h:719
+#: src/ghb3.ui:9245
 msgid ""
 "Set the audio track name.\n"
 "\n"
@@ -2478,15 +2169,15 @@
 "\n"
 "播放器可以在音轨选择列表中使用。"
 
-#: ../src/ghb.m4.h:722
+#: src/ghb3.ui:9308
 msgid "Mix"
 msgstr "混合"
 
-#: ../src/ghb.m4.h:723
+#: src/ghb3.ui:9321
 msgid "Sample Rate"
 msgstr "采样率"
 
-#: ../src/ghb.m4.h:724 ../src/audiohandler.c:1899
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
 msgid ""
 "Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
 "\n"
@@ -2497,233 +2188,122 @@
 "\n"
 "对于源音轨有较大音量范围的（非常响亮和非常柔和的序列），动态范围压缩 (DRC) 允许您压缩其范围使得大音量降低而小音量有所增加。"
 
-#: ../src/ghb.m4.h:728 ../src/audiohandler.c:1747
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
 msgid "Set the audio codec to encode this track with."
 msgstr "设置该轨道的音频编码。"
 
-#: ../src/ghb.m4.h:729 ../src/audiohandler.c:1761
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
 msgid "Bitrate"
 msgstr "码率"
 
-#: ../src/ghb.m4.h:730
+#: src/ghb3.ui:9399
 msgid "Enable bitrate setting"
 msgstr "启用码率设置"
 
-#: ../src/ghb.m4.h:731 ../src/audiohandler.c:1766
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
 msgid "Quality"
 msgstr "质量"
 
-#: ../src/ghb.m4.h:732
+#: src/ghb3.ui:9414
 msgid "Enable quality setting"
 msgstr "启用质量设置"
 
-#: ../src/ghb.m4.h:733 ../src/audiohandler.c:1780
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
 msgid "Set the bitrate to encode this track with."
 msgstr "设置该轨道的码率。"
 
-#: ../src/ghb.m4.h:734
+#: src/ghb3.ui:9455
 msgid ""
 "Quality: For output codec's that support it, adjust the quality of "
 "the output."
 msgstr "音质： 调整输出的音频质量，需要编码器支持。"
 
-#: ../src/ghb.m4.h:735
+#: src/ghb3.ui:9477
 msgid "00.0"
 msgstr "00.0"
 
-#: ../src/ghb.m4.h:736 ../src/audiohandler.c:1833
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
 msgid "Set the mixdown of the output audio track."
 msgstr "设置输出音轨的混音。"
 
-#: ../src/ghb.m4.h:737 ../src/audiohandler.c:1846
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
 msgid "Set the sample rate of the output audio track."
 msgstr "设置输出音轨的采样率。"
 
-#: ../src/ghb.m4.h:738 ../src/audiohandler.c:1868
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
 msgid ""
 "Audio Gain: Adjust the amplification or attenuation of the output "
 "audio track."
 msgstr "音频增益： 调整输出音量大小。"
 
 #. Audio Gain Label
-#: ../src/ghb.m4.h:739 ../src/audiohandler.c:1878
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
 msgid "0dB"
 msgstr "0dB"
 
 #. Audio DRC Label
-#: ../src/ghb.m4.h:740 ../src/audiohandler.c:413 ../src/audiohandler.c:743
-#: ../src/audiohandler.c:1150 ../src/audiohandler.c:1913
-#: ../src/callbacks.c:5447 ../src/hb-backend.c:123 ../src/hb-backend.c:201
-#: ../src/hb-backend.c:213 ../src/hb-backend.c:225 ../src/hb-backend.c:237
-#: ../src/hb-backend.c:263 ../src/hb-backend.c:275 ../src/hb-backend.c:287
-#: ../src/hb-backend.c:348
-#, c-format
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
 msgid "Off"
 msgstr "关闭"
 
-#: ../src/ghb.m4.h:741
+#: src/ghb3.ui:9644
 msgid "Skip This Version"
 msgstr "跳过此版本"
 
-#: ../src/ghb.m4.h:742
+#: src/ghb3.ui:9652
 msgid "Remind Me Later"
 msgstr "稍后提醒我"
 
-#: ../src/ghb.m4.h:743
+#: src/ghb3.ui:9721
 msgid "A new version of HandBrake is available!"
 msgstr "有新版本的 HandBrake 可用!"
 
-#: ../src/ghb.m4.h:744
+#: src/ghb3.ui:9737
 msgid "HandBrake xxx is now available (you have yyy)."
 msgstr "HandBrake xxx 现在可用 (您拥有 yyy)。"
 
-#: ../src/ghb.m4.h:745
+#: src/ghb3.ui:9765
 msgid "Release Notes"
 msgstr "发行说明"
 
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:2
-msgid "Video Transcoder"
-msgstr "视频转码器"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:3
-msgid ""
-"HandBrake is a tool for converting video from nearly any format to a "
-"selection of modern, widely supported codecs."
-msgstr "HandBrake 是一种几乎可以将任何格式转换为现代广泛支持的编码视频的工具。"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:4
-msgid "Reasons you'll love Handbrake:"
-msgstr "您喜欢 Handbrake 的原因："
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:5
-msgid "Convert video from nearly any format"
-msgstr "几乎转换任何格式视频"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:6
-msgid "Free and Open Source"
-msgstr "自由和开源"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:7
-msgid "Multi-Platform (Windows, Mac and Linux)"
-msgstr "多平台（Windows，Mac 和 Linux）"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:8
-msgid "Main window and settings summary"
-msgstr "主窗口和设置摘要"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:9
-msgid "Video resolution and cropping settings"
-msgstr "视频分辨率和裁剪设置"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:10
-msgid "Video encoder settings"
-msgstr "视频编码器设置"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:11
-msgid "Audio track selection and settings"
-msgstr "音轨选择和设置"
-
-#: ../src/fr.handbrake.ghb.appdata.xml.template.h:12
-msgid "Chapter title editing"
-msgstr "章节标题编辑"
-
-#: ../src/main.c:100
-#, c-format
-msgid ""
-"<big>Unable to create %s.</big>\n"
-"\n"
-"Internal error. Could not parse UI description.\n"
-"%s"
-msgstr ""
-"<big>无法创建 %s。</big>\n"
-"\n"
-"内部错误。无法解析 UI 描述。\n"
-"%s"
-
-#: ../src/main.c:223
-msgid "Index"
-msgstr "序号"
-
-#: ../src/main.c:233
-msgid "Duration"
-msgstr "持续时长"
-
-#: ../src/main.c:238
-msgid "Title"
-msgstr "标题"
-
-#: ../src/main.c:275
-msgid "Job Information"
-msgstr "作业信息"
-
-#: ../src/main.c:346 ../src/main.c:411
-msgid "Track Information"
-msgstr "轨信息"
-
-#: ../src/main.c:466
-msgid "Preset Name"
-msgstr "预设名称"
-
-#: ../src/main.c:672
-msgid "The device or file to encode"
-msgstr "要编码的设备或者文件"
-
-#: ../src/main.c:673
-msgid "The preset values to use for encoding"
-msgstr "用于编码的预设值"
-
-#: ../src/main.c:674
-msgid "Spam a lot"
-msgstr "垃圾邮件很多"
-
-#: ../src/main.c:675
-msgid "The path to override user config dir"
-msgstr "覆盖用户配置目录的路径"
-
-#: ../src/main.c:677
-msgid "Open a console for debug output"
-msgstr "打开控制台进行调试输出"
-
-#: ../src/main.c:1151 ../src/hb-backend.c:337 ../src/queuehandler.c:929
-msgid "All"
-msgstr "所有"
-
-#: ../src/audiohandler.c:425 ../src/audiohandler.c:739
-#: ../src/audiohandler.c:1218
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
 #, c-format
 msgid "%ddB"
 msgstr "%ddB"
 
-#: ../src/audiohandler.c:715 ../src/queuehandler.c:679
+#: src/audiohandler.c:726
 msgid "Quality: "
 msgstr "质量: "
 
-#: ../src/audiohandler.c:722
+#: src/audiohandler.c:733
 #, c-format
 msgid "Bitrate: %dkbps\n"
 msgstr "码率 : %dkbps\n"
 
-#: ../src/audiohandler.c:734
+#: src/audiohandler.c:745
 #, c-format
 msgid "%.4gkHz"
 msgstr "%.4gkHz"
 
-#: ../src/audiohandler.c:749
+#: src/audiohandler.c:760
 #, c-format
 msgid "%d - %s (%.4gkHz)"
 msgstr "%d - %s (%.4gkHz)"
 
-#: ../src/audiohandler.c:754
+#: src/audiohandler.c:765
 #, c-format
 msgid "Bitrate: %.4gkbps"
 msgstr "码率 : %.4gkbps"
 
-#: ../src/audiohandler.c:760
-#, c-format
+#: src/audiohandler.c:771
 msgid "Passthrough"
 msgstr "直通"
 
-#: ../src/audiohandler.c:769
+#: src/audiohandler.c:780
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2734,7 +2314,7 @@
 "DRC: %s\n"
 "曲目名称: %s"
 
-#: ../src/audiohandler.c:774
+#: src/audiohandler.c:785
 #, c-format
 msgid ""
 "%sGain: %s\n"
@@ -2743,7 +2323,7 @@
 "%s增益: %s\n"
 "DRC: %s"
 
-#: ../src/audiohandler.c:1725
+#: src/audiohandler.c:1746
 msgid ""
 "Add an audio encoder.\n"
 "Each selected source track will be encoded with all selected encoders."
@@ -2751,7 +2331,7 @@
 "添加一个音频编码器。\n"
 "每一个选中的源音轨都将使用所有选中的编码器进行编码。"
 
-#: ../src/audiohandler.c:1806
+#: src/audiohandler.c:1826
 msgid ""
 "Audio Quality:\n"
 "For encoders that support it, adjust the quality of the output."
@@ -2759,39 +2339,39 @@
 "音质：\n"
 "调节输出的音频质量，需要编码器支持。"
 
-#: ../src/audiohandler.c:1928
+#: src/audiohandler.c:1946
 msgid "Remove this audio encoder"
 msgstr "移除此音频编码"
 
-#: ../src/callbacks.c:789 ../src/callbacks.c:2076
+#: src/callbacks.c:793 src/callbacks.c:2144
 msgid "Closing HandBrake will terminate encoding.\n"
 msgstr "关闭 HandBrake 将终止编码。\n"
 
-#: ../src/callbacks.c:1347
+#: src/callbacks.c:1378
 msgid "Not Selected"
 msgstr "未选择"
 
 #. This needs to be in scanning and working since scanning
 #. happens fast enough that it can be missed
-#: ../src/callbacks.c:1664 ../src/callbacks.c:4159
+#: src/callbacks.c:1711 src/callbacks.c:4182
 msgid "Scanning ..."
 msgstr "扫描中 ..."
 
-#: ../src/callbacks.c:1700 ../src/callbacks.c:1701
+#: src/callbacks.c:1747 src/callbacks.c:1748
 msgid "Stop Scan"
 msgstr "停止扫描"
 
-#: ../src/callbacks.c:2667 ../src/hb-backend.c:2103 ../src/hb-backend.c:2223
-#: ../src/hb-backend.c:2235
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
 msgid "No Title Found"
 msgstr "找不到标题"
 
-#: ../src/callbacks.c:2668
+#: src/callbacks.c:2736
 msgid "New Video"
 msgstr "新视频"
 
-#: ../src/callbacks.c:3461 ../src/callbacks.c:3483 ../src/callbacks.c:3502
-#: ../src/callbacks.c:3534
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
 #, c-format
 msgid ""
 "%s\n"
@@ -2802,438 +2382,437 @@
 "\n"
 "%s在%d秒 ..."
 
-#: ../src/callbacks.c:3605 ../src/callbacks.c:3647
+#: src/callbacks.c:3666 src/callbacks.c:3708
 #, c-format
 msgid "%sYour movie will be lost if you don't continue encoding."
 msgstr "%s如果您不继续编码，您的电影将会丢失。"
 
-#: ../src/callbacks.c:3608 ../src/callbacks.c:3650 ../src/queuehandler.c:1158
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
 msgid "Cancel Current and Stop"
 msgstr "取消当前任务并停止"
 
-#: ../src/callbacks.c:3609
+#: src/callbacks.c:3670
 msgid "Cancel Current, Start Next"
 msgstr "取消当前任务，开始下一个"
 
-#: ../src/callbacks.c:3610
+#: src/callbacks.c:3671
 msgid "Finish Current, then Stop"
 msgstr "完成当前任务，然后停止"
 
-#: ../src/callbacks.c:3611 ../src/callbacks.c:3651
+#: src/callbacks.c:3672 src/callbacks.c:3712
 msgid "Continue Encoding"
 msgstr "继续编码"
 
-#: ../src/callbacks.c:3833
+#: src/callbacks.c:3890
 #, c-format
-msgid "%d encode(s) pending"
+msgid "%d encode pending"
 msgstr "%d个编码进程排队中"
 
-#: ../src/callbacks.c:3901 ../src/callbacks.c:3969
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr "%d个编码进程排队中"
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
 #, c-format
 msgid "job %d of %d, "
-msgstr "正在进行第%d个进程，共%d个进程， "
+msgstr "正在进行第%d个任务 ，共%d个任务， "
 
-#: ../src/callbacks.c:3911
+#: src/callbacks.c:3961
 #, c-format
 msgid "pass %d (subtitle scan) of %d, "
 msgstr "正在处理%d(扫描字幕中)of%d, "
 
-#: ../src/callbacks.c:3916
+#: src/callbacks.c:3966
 #, c-format
 msgid "pass %d of %d, "
 msgstr "正在处理%dof%d "
 
-#: ../src/callbacks.c:3929
+#: src/callbacks.c:3979
 #, c-format
 msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
 msgstr "正在编码：%s%s%.2f %% (%.2f fps，平均 %.2f fps，还需%02d小时%02d分%02d秒)"
 
-#: ../src/callbacks.c:3939 ../src/callbacks.c:3979
+#: src/callbacks.c:3989 src/callbacks.c:4029
 #, c-format
 msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
 msgstr "正在编码：%s%s%.2f %% (还需 %02d小时%02d分%02d秒)"
 
-#: ../src/callbacks.c:3949 ../src/callbacks.c:3988
+#: src/callbacks.c:3999 src/callbacks.c:4038
 #, c-format
 msgid "Encoding: %s%s%.2f %%"
 msgstr "正在编码：%s%s%.2f %%"
 
-#: ../src/callbacks.c:3975
-#, c-format
+#: src/callbacks.c:4025
 msgid "Searching for start time, "
 msgstr "搜索开始时间， "
 
-#: ../src/callbacks.c:4053
+#: src/callbacks.c:4100
 #, c-format
 msgid "Scanning title %d of %d..."
 msgstr "正在扫描标题%d，共%d..."
 
-#: ../src/callbacks.c:4057
+#: src/callbacks.c:4104
 #, c-format
 msgid "Scanning title %d of %d preview %d..."
 msgstr "正在扫描标题%dof%d，预览%d……"
 
-#: ../src/callbacks.c:4168
+#: src/callbacks.c:4193
 msgid "Paused"
 msgstr "暂停"
 
-#: ../src/callbacks.c:4199
+#: src/callbacks.c:4224
 msgid "Encode Done!"
 msgstr "编码完成！"
 
-#: ../src/callbacks.c:4204
+#: src/callbacks.c:4228
 msgid "Encode Canceled."
 msgstr "编码取消。"
 
-#: ../src/callbacks.c:4210
+#: src/callbacks.c:4233
 msgid "Encode Failed."
 msgstr "编码失败。"
 
-#: ../src/callbacks.c:4255
+#: src/callbacks.c:4275
 msgid "Muxing: This may take a while..."
 msgstr "合成中：这可能需要一段时间…"
 
-#: ../src/callbacks.c:5110
+#: src/callbacks.c:4877
 msgid "Scan this DVD source"
 msgstr "扫描 DVD 源"
 
-#: ../src/callbacks.c:5478
-#, c-format
-msgid "%s: %.4g (Warning: lossless)"
-msgstr "%s: %.4g (警告：无损)"
-
-#: ../src/callbacks.c:5515
+#: src/callbacks.c:5265
 #, c-format
 msgid "HandBrake %s/%s is now available (you have %s/%d)."
 msgstr "HandBrake %s/%s 现在可用 (您拥有 %s/%d)。"
 
-#: ../src/callbacks.c:5696
+#: src/callbacks.c:5446
 msgid "Encode Complete"
 msgstr "编码完成"
 
-#: ../src/callbacks.c:5698
+#: src/callbacks.c:5448
 msgid "Put down that cocktail, Your HandBrake queue is done!"
 msgstr "放下鸡尾酒，您的 HandBrake 队列已经完成！"
 
-#: ../src/callbacks.c:5711 ../src/callbacks.c:5721 ../src/callbacks.c:5729
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
 msgid "Your encode is complete."
 msgstr "您的编码已完成。"
 
-#: ../src/callbacks.c:5712
+#: src/callbacks.c:5462
 msgid "Shutting down the computer"
 msgstr "关闭此计算机"
 
-#: ../src/callbacks.c:5722
+#: src/callbacks.c:5472
 msgid "Putting computer to sleep"
 msgstr "计算机转入休眠"
 
-#: ../src/callbacks.c:5730
+#: src/callbacks.c:5480
 msgid "Quitting Handbrake"
 msgstr "退出 Handbrake"
 
-#: ../src/hb-backend.c:61 ../src/hb-backend.c:86
+#: src/hb-backend.c:60 src/hb-backend.c:85
 msgid "First Track Matching Selected Languages"
 msgstr "第一个符合所选语言的轨道"
 
-#: ../src/hb-backend.c:62 ../src/hb-backend.c:87
+#: src/hb-backend.c:61 src/hb-backend.c:86
 msgid "All Tracks Matching Selected Languages"
 msgstr "所有符合所选语言的轨道"
 
-#: ../src/hb-backend.c:73
+#: src/hb-backend.c:72
 msgid "Foreign Audio Subtitle Track"
 msgstr "外语音频字幕轨道"
 
-#: ../src/hb-backend.c:74
+#: src/hb-backend.c:73
 msgid "First Selected Track"
 msgstr "使用第一个选中的轨道"
 
-#: ../src/hb-backend.c:75
+#: src/hb-backend.c:74
 msgid "Foreign Audio, then First Selected Track"
 msgstr "使用外语音轨中第一个选中的轨道"
 
-#: ../src/hb-backend.c:97
+#: src/hb-backend.c:96
 msgid "Chapters:"
 msgstr "章节:"
 
-#: ../src/hb-backend.c:98
+#: src/hb-backend.c:97
 msgid "Seconds:"
 msgstr "秒:"
 
-#: ../src/hb-backend.c:99
+#: src/hb-backend.c:98
 msgid "Frames:"
 msgstr "帧："
 
-#: ../src/hb-backend.c:109
+#: src/hb-backend.c:108
 msgid "Do Nothing"
 msgstr "啥都不干"
 
-#: ../src/hb-backend.c:110
+#: src/hb-backend.c:109
 msgid "Show Notification"
 msgstr "显示通知"
 
-#: ../src/hb-backend.c:111
+#: src/hb-backend.c:110
 msgid "Quit Handbrake"
 msgstr "退出 Handbrake"
 
-#: ../src/hb-backend.c:112
+#: src/hb-backend.c:111
 msgid "Put Computer To Sleep"
 msgstr "计算机转入休眠"
 
-#: ../src/hb-backend.c:113
+#: src/hb-backend.c:112
 msgid "Shutdown Computer"
 msgstr "关闭计算机"
 
-#: ../src/hb-backend.c:124 ../src/hb-backend.c:253
+#: src/hb-backend.c:123 src/hb-backend.c:252
 msgid "Automatic"
 msgstr "自动"
 
-#: ../src/hb-backend.c:125
+#: src/hb-backend.c:124
 msgid "Loose"
 msgstr "宽松"
 
-#: ../src/hb-backend.c:126 ../src/hb-backend.c:338
+#: src/hb-backend.c:125 src/hb-backend.c:337
 msgid "Custom"
 msgstr "自定义"
 
-#: ../src/hb-backend.c:162
+#: src/hb-backend.c:161
 msgid "Week"
 msgstr "星期"
 
-#: ../src/hb-backend.c:163
+#: src/hb-backend.c:162
 msgid "Month"
 msgstr "月"
 
-#: ../src/hb-backend.c:164
+#: src/hb-backend.c:163
 msgid "Year"
 msgstr "年"
 
-#: ../src/hb-backend.c:165
+#: src/hb-backend.c:164
 msgid "Immortal"
 msgstr "永久"
 
-#: ../src/hb-backend.c:175
+#: src/hb-backend.c:174
 msgid "Never"
 msgstr "从不"
 
-#: ../src/hb-backend.c:176
+#: src/hb-backend.c:175
 msgid "Daily"
 msgstr "每天"
 
-#: ../src/hb-backend.c:177
+#: src/hb-backend.c:176
 msgid "Weekly"
 msgstr "每周"
 
-#: ../src/hb-backend.c:178
+#: src/hb-backend.c:177
 msgid "Monthly"
 msgstr "每月"
 
-#: ../src/hb-backend.c:202
+#: src/hb-backend.c:201
 msgid "Decomb"
 msgstr "Decomb 去梳状纹理滤镜"
 
-#: ../src/hb-backend.c:203
+#: src/hb-backend.c:202
 msgid "Yadif"
 msgstr "Yadif 反交错滤镜"
 
-#: ../src/hb-backend.c:214
+#: src/hb-backend.c:213
 msgid "NLMeans"
 msgstr "非局部均值去噪"
 
-#: ../src/hb-backend.c:215
+#: src/hb-backend.c:214
 msgid "HQDN3D"
 msgstr "HQDN3D"
 
-#: ../src/hb-backend.c:226
+#: src/hb-backend.c:225
 msgid "Unsharp"
 msgstr "反锐化"
 
-#: ../src/hb-backend.c:227
+#: src/hb-backend.c:226
 msgid "Lapsharp"
 msgstr "Lapsharp 拉普拉斯锐化"
 
-#: ../src/hb-backend.c:238
+#: src/hb-backend.c:237
 msgid "90 Degrees"
 msgstr "90度"
 
-#: ../src/hb-backend.c:239
+#: src/hb-backend.c:238
 msgid "180 Degrees"
 msgstr "180度"
 
-#: ../src/hb-backend.c:240
+#: src/hb-backend.c:239
 msgid "270 Degrees"
 msgstr "270度"
 
-#: ../src/hb-backend.c:251
+#: src/hb-backend.c:250
 msgid "Spatial"
 msgstr "空间"
 
-#: ../src/hb-backend.c:252
+#: src/hb-backend.c:251
 msgid "Temporal"
 msgstr "基于时间相关性"
 
-#: ../src/hb-backend.c:264
+#: src/hb-backend.c:263
 msgid "Fast"
 msgstr "快速"
 
-#: ../src/hb-backend.c:265
+#: src/hb-backend.c:264
 msgid "Optimal"
 msgstr "最佳"
 
-#: ../src/hb-backend.c:276
+#: src/hb-backend.c:275
 msgid "Strict"
 msgstr "严格"
 
-#: ../src/hb-backend.c:277
+#: src/hb-backend.c:276
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/hb-backend.c:288
+#: src/hb-backend.c:287
 msgid "Simple"
 msgstr "简单"
 
-#: ../src/hb-backend.c:289
+#: src/hb-backend.c:288
 msgid "Smart"
 msgstr "智能"
 
-#: ../src/hb-backend.c:299
+#: src/hb-backend.c:298
 msgid "Diamond"
 msgstr "菱形检索"
 
-#: ../src/hb-backend.c:300
+#: src/hb-backend.c:299
 msgid "Hexagon"
 msgstr "六边形检索"
 
-#: ../src/hb-backend.c:301
+#: src/hb-backend.c:300
 msgid "Uneven Multi-Hexagon"
 msgstr "可变半径六边形检索"
 
-#: ../src/hb-backend.c:302
+#: src/hb-backend.c:301
 msgid "Exhaustive"
 msgstr "全面检索"
 
-#: ../src/hb-backend.c:303
+#: src/hb-backend.c:302
 msgid "Hadamard Exhaustive"
 msgstr "哈德曼 (Hadamard) 全面检索"
 
-#: ../src/hb-backend.c:313
+#: src/hb-backend.c:312
 msgid "0: SAD, no subpel"
 msgstr "0: SAD, 无 subpel"
 
-#: ../src/hb-backend.c:314
+#: src/hb-backend.c:313
 msgid "1: SAD, qpel"
 msgstr "1: SAD, qpel"
 
-#: ../src/hb-backend.c:315
+#: src/hb-backend.c:314
 msgid "2: SATD, qpel"
 msgstr "2: SATD, qpel"
 
-#: ../src/hb-backend.c:316
+#: src/hb-backend.c:315
 msgid "3: SATD: multi-qpel"
 msgstr "3: SATD: multi-qpel"
 
-#: ../src/hb-backend.c:317
+#: src/hb-backend.c:316
 msgid "4: SATD, qpel on all"
 msgstr "4: SATD, 全部 qpel "
 
-#: ../src/hb-backend.c:318
+#: src/hb-backend.c:317
 msgid "5: SATD, multi-qpel on all"
 msgstr "5: SATD, 全部 multi-qpel "
 
-#: ../src/hb-backend.c:319
+#: src/hb-backend.c:318
 msgid "6: RD in I/P-frames"
 msgstr "6: RD 在 I/P帧"
 
-#: ../src/hb-backend.c:320
+#: src/hb-backend.c:319
 msgid "7: RD in all frames"
 msgstr "7: RD 在所有帧中"
 
-#: ../src/hb-backend.c:321
+#: src/hb-backend.c:320
 msgid "8: RD refine in I/P-frames"
 msgstr "8: 在 I/P 帧中 RD 优化"
 
-#: ../src/hb-backend.c:322
+#: src/hb-backend.c:321
 msgid "9: RD refine in all frames"
 msgstr "9: 在所有帧中 RD 优化"
 
-#: ../src/hb-backend.c:323
+#: src/hb-backend.c:322
 msgid "10: QPRD in all frames"
 msgstr "10: QPRD 在所有帧中"
 
-#: ../src/hb-backend.c:324
+#: src/hb-backend.c:323
 msgid "11: No early terminations in analysis"
 msgstr "11: 禁止分析过程提早终止"
 
-#: ../src/hb-backend.c:334
+#: src/hb-backend.c:333
 msgid "Most"
 msgstr "大多数"
 
-#: ../src/hb-backend.c:336
+#: src/hb-backend.c:335
 msgid "Some"
 msgstr "一些"
 
-#: ../src/hb-backend.c:349
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "所有"
+
+#: src/hb-backend.c:348
 msgid "Encode only"
 msgstr "仅支持编码"
 
-#: ../src/hb-backend.c:350
+#: src/hb-backend.c:349
 msgid "Always"
 msgstr "总是"
 
-#: ../src/hb-backend.c:1369 ../src/hb-backend.c:1429 ../src/hb-backend.c:1508
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
 msgid "Same as source"
 msgstr "与源视频相同"
 
-#: ../src/hb-backend.c:1522
+#: src/hb-backend.c:1499
 msgid "(NTSC Film)"
 msgstr "(NTSC 电影)"
 
-#: ../src/hb-backend.c:1526
+#: src/hb-backend.c:1503
 msgid "(PAL Film/Video)"
 msgstr "(PAL 电影/视频）"
 
-#: ../src/hb-backend.c:1530
+#: src/hb-backend.c:1507
 msgid "(NTSC Video)"
 msgstr "(NTSC 视频)"
 
-#: ../src/hb-backend.c:2092
+#: src/hb-backend.c:2074
 #, c-format
 msgid "%s - (%05d.MPLS)"
 msgstr "%s - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2242
+#: src/hb-backend.c:2224
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - %s"
 msgstr "%3d - %02d小时%02d分%02d秒 - %s"
 
-#: ../src/hb-backend.c:2261
+#: src/hb-backend.c:2243
 #, c-format
 msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
 msgstr "%3d - %02d小时%02d分%02d秒 - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2267
+#: src/hb-backend.c:2249
 #, c-format
 msgid "%3d - (%05d.MPLS)"
 msgstr "%3d - (%05d.MPLS)"
 
-#: ../src/hb-backend.c:2273
+#: src/hb-backend.c:2255
 #, c-format
 msgid "%3d - %02dh%02dm%02ds"
 msgstr "%3d - %02d小时%02d分%02d秒"
 
-#: ../src/hb-backend.c:2307
+#: src/hb-backend.c:2289
 msgid "No Titles"
 msgstr "无标题"
 
 #. No audio. set some default
-#: ../src/hb-backend.c:2588
+#: src/hb-backend.c:2574
 msgid "No Audio"
 msgstr "无音频"
 
-#: ../src/hb-backend.c:3078
-msgid "Any"
-msgstr "任何"
-
-#: ../src/hb-backend.c:4208
+#: src/hb-backend.c:4170
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3246,7 +2825,7 @@
 "预设：\t%s\n"
 "自定义：\t%s\n"
 
-#: ../src/hb-backend.c:4215
+#: src/hb-backend.c:4177
 #, c-format
 msgid ""
 "Invalid Detelecine Settings:\n"
@@ -3257,7 +2836,7 @@
 "\n"
 "预设：\t%s\n"
 
-#: ../src/hb-backend.c:4241
+#: src/hb-backend.c:4203
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3270,7 +2849,7 @@
 "预设：\t%s\n"
 "自定义：\t%s\n"
 
-#: ../src/hb-backend.c:4248
+#: src/hb-backend.c:4210
 #, c-format
 msgid ""
 "Invalid Comb Detect Settings:\n"
@@ -3281,7 +2860,7 @@
 "\n"
 "预设：\t%s\n"
 
-#: ../src/hb-backend.c:4277
+#: src/hb-backend.c:4239
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3296,7 +2875,7 @@
 "预设：\t%s\n"
 "自定义：\t%s\n"
 
-#: ../src/hb-backend.c:4286
+#: src/hb-backend.c:4248
 #, c-format
 msgid ""
 "Invalid Deinterlace Settings:\n"
@@ -3309,7 +2888,7 @@
 "滤镜：\t%s\n"
 "预设：\t%s\n"
 
-#: ../src/hb-backend.c:4315
+#: src/hb-backend.c:4277
 #, c-format
 msgid ""
 "Invalid Denoise Settings:\n"
@@ -3323,10 +2902,10 @@
 "\n"
 "滤镜：\t%s\n"
 "预设：\t%s\n"
-"优化：\t%s\n"
+"调优：\t%s\n"
 "自定义：\t%s\n"
 
-#: ../src/hb-backend.c:4343
+#: src/hb-backend.c:4305
 #, c-format
 msgid ""
 "Invalid Sharpen Settings:\n"
@@ -3340,11 +2919,10 @@
 "\n"
 "滤镜：\t%s\n"
 "预设：\t%s\n"
-"优化：\t%s\n"
+"调优：\t%s\n"
 "自定义：\t%s\n"
 
-#: ../src/hb-backend.c:4375
-#, c-format
+#: src/hb-backend.c:4339
 msgid ""
 "Theora is not supported in the MP4 container.\n"
 "\n"
@@ -3356,18 +2934,29 @@
 "您应该选择其他视频编解码器或者容器。\n"
 "如果您继续，FFMPEG 将为您自动选择。"
 
-#: ../src/hb-backend.c:4379 ../src/hb-backend.c:4429 ../src/hb-backend.c:4453
-#: ../src/hb-backend.c:4514 ../src/hb-backend.c:4555
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+"WebM 容器仅支持 VP8 和 VP9 编码。\n"
+"\n"
+"您应该选择其他视频编解码器或者容器。\n"
+"如果您继续，将为您自动选择一个。"
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
 msgid "Continue"
 msgstr "继续"
 
 #. No valid title, stop right there
-#: ../src/hb-backend.c:4404 ../src/hb-backend.c:4478
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
 msgid "No title found.\n"
 msgstr "找不到标题。\n"
 
-#: ../src/hb-backend.c:4425
-#, c-format
+#: src/hb-backend.c:4411
 msgid ""
 "Only one subtitle may be burned into the video.\n"
 "\n"
@@ -3379,8 +2968,19 @@
 "您应该修改您的字幕选择。\n"
 "如果您选择继续，一些字幕将会丢失。"
 
-#: ../src/hb-backend.c:4449
-#, c-format
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+"HandBrake 中的 WebM 仅支持烧录字幕。\n"
+"\n"
+"您应该修改您的字幕选择。\n"
+"如果您选择继续，一些字幕将会丢失。"
+
+#: src/hb-backend.c:4451
 msgid ""
 "SRT file does not exist or not a regular file.\n"
 "\n"
@@ -3392,8 +2992,7 @@
 "您应该选择一个有效的文件。\n"
 "如果您继续，该字幕将会被忽略。"
 
-#: ../src/hb-backend.c:4510
-#, c-format
+#: src/hb-backend.c:4512
 msgid ""
 "The source does not support Pass-Thru.\n"
 "\n"
@@ -3405,7 +3004,7 @@
 "您应该选择另一个音频编解码器。\n"
 "如果您继续，我们将为您指定一个。"
 
-#: ../src/hb-backend.c:4551
+#: src/hb-backend.c:4567
 #, c-format
 msgid ""
 "%s is not supported in the %s container.\n"
@@ -3418,16 +3017,56 @@
 "您应该选择另一个音频编解码器。\n"
 "如果您继续，我们将为您选择一个。"
 
-#: ../src/presets.c:1192
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+"<big>无法创建 %s。</big>\n"
+"\n"
+"内部错误。无法解析 UI 描述。\n"
+"%s"
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "轨信息"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "预设名称"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr "要编码的设备或者文件"
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr "用于编码的预设值"
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr "垃圾邮件很多"
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr "覆盖用户配置目录的路径"
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr "打开控制台进行调试输出"
+
+#: src/presets.c:1232
 msgid "ghb_presets_menu_init: Failed to find presets folder."
 msgstr "ghb_presets_menu_init: 无法找到预设文件夹。"
 
-#: ../src/presets.c:1348
+#: src/presets.c:1388
 msgid "Failed to find parent folder when adding child."
 msgstr "添加子项时无法找到父文件夹。"
 
-#: ../src/presets.c:1822
-#, c-format
+#: src/presets.c:1848
 msgid ""
 "Presets found are newer than what is supported by this version of HandBrake!\n"
 "\n"
@@ -3437,31 +3076,31 @@
 "\n"
 "您想继续吗？"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Get me out of here!"
 msgstr "离开这里吧！"
 
-#: ../src/presets.c:1825
+#: src/presets.c:1851
 msgid "Load backup presets"
 msgstr "加载备份预设"
 
-#: ../src/presets.c:1971
+#: src/presets.c:1997
 msgid "All (*)"
 msgstr "所有 (*)"
 
-#: ../src/presets.c:1976
+#: src/presets.c:2002
 msgid "Presets (*.json)"
 msgstr "预置 (*.json)"
 
-#: ../src/presets.c:1982
+#: src/presets.c:2008
 msgid "Legacy Presets (*.plist)"
 msgstr "旧版预置(*.plist)"
 
-#: ../src/presets.c:2077
+#: src/presets.c:2104
 msgid "Export Preset"
 msgstr "输出设定"
 
-#: ../src/presets.c:2398
+#: src/presets.c:2445
 #, c-format
 msgid ""
 "Confirm deletion of %s:\n"
@@ -3472,15 +3111,15 @@
 "\n"
 "%s"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "folder"
 msgstr "文件夹"
 
-#: ../src/presets.c:2399
+#: src/presets.c:2446
 msgid "preset"
 msgstr "预设"
 
-#: ../src/preview.c:490
+#: src/preview.c:487
 #, c-format
 msgid ""
 "Missing GStreamer plugin\n"
@@ -3493,266 +3132,221 @@
 "\n"
 "%s"
 
-#: ../src/queuehandler.c:222
-msgid "Seconds"
-msgstr "秒"
-
-#: ../src/queuehandler.c:224
-msgid "Frames"
-msgstr "帧"
-
-#: ../src/queuehandler.c:228
+#: src/queuehandler.c:196
 #, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d, 2 Video Passes) -->"
-" %s"
-msgstr ""
-"<big>%s</big> (标题 %d, %s %d 到 %d, 2 视频通道) --> %s"
+msgid "%s (Modified)"
+msgstr "%s (已修改)"
 
-#: ../src/queuehandler.c:236
-#, c-format
-msgid ""
-"<big>%s</big> (Title %d, %s %d through %d) --> %s"
-msgstr "<big>%s</big> (标题 %d, %s %d 到 %d) --> %s"
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr "对齐音视频"
 
-#: ../src/queuehandler.c:299
-#, c-format
-msgid "Modified Preset Based On: %s\n"
-msgstr "修改预设于： %s\n"
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr "iPod 5G"
 
-#: ../src/queuehandler.c:303
+#: src/queuehandler.c:327
 #, c-format
-msgid "Preset: %s\n"
-msgstr "预设： %s\n"
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+"%d:%d:%d:%d 剪裁\n"
+"%dx%d 存储, %dx%d 显示\n"
+"%d:%d 像素宽高比\n"
+"%s 显示宽高比"
 
-#. Next line in the display (Container type)
-#. Format: XXX Container
-#: ../src/queuehandler.c:308
+#: src/queuehandler.c:358
 #, c-format
-msgid "Format: %s Container\n"
-msgstr "格式： %s 容器\n"
-
-#: ../src/queuehandler.c:321
-msgid "Container Options:"
-msgstr "容器选项："
+msgid "%s, Bitrate %dkbps"
+msgstr "%s, 码率 %dkbps"
 
-#: ../src/queuehandler.c:324
+#: src/queuehandler.c:363
 #, c-format
-msgid "%sChapter Markers"
-msgstr "%s章节标记"
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr "%s, 码率 %dkbps (2 Pass二次转码)"
 
-#: ../src/queuehandler.c:329
+#: src/queuehandler.c:370
 #, c-format
-msgid "%siPod 5G Support"
-msgstr "%siPod 5G 支持"
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr "%s, 恒定画质 %.4g(%s)"
 
-#: ../src/queuehandler.c:334
+#: src/queuehandler.c:403
 #, c-format
-msgid "%sWeb Optimized"
-msgstr "%s网络优化"
+msgid "%sPreset %s"
+msgstr "%s预设 %s"
 
-#: ../src/queuehandler.c:343
+#: src/queuehandler.c:408
 #, c-format
-msgid "Destination: %s\n"
-msgstr "目标: %s\n"
-
-#: ../src/queuehandler.c:367
-msgid "(Aspect Preserved)"
-msgstr "(保持画面宽高比)"
-
-#: ../src/queuehandler.c:371
-msgid "(Aspect Lost)"
-msgstr "(未保持画面宽高比)"
+msgid "%sTune %s"
+msgstr "%s调优 %s"
 
-#: ../src/queuehandler.c:376
-msgid "(Anamorphic)"
-msgstr "(变形)"
-
-#: ../src/queuehandler.c:380
-msgid "(Custom Anamorphic)"
-msgstr "(自定义变形)"
-
-#: ../src/queuehandler.c:390
-msgid "Picture: "
-msgstr "画面： "
-
-#: ../src/queuehandler.c:391
+#: src/queuehandler.c:413
 #, c-format
-msgid "Source: %d x %d, Output %d x %d %s, Crop %d:%d:%d:%d"
-msgstr "源文件：%d x %d，输出 %d x %d %s，裁剪 %d:%d:%d:%d"
+msgid "%sProfile %s"
+msgstr "%s配置文件 %s"
 
-#: ../src/queuehandler.c:399
+#: src/queuehandler.c:418
 #, c-format
-msgid ", Display %d x %d"
-msgstr ", 显示尺寸 %d x %d"
-
-#: ../src/queuehandler.c:448
-msgid "Filters:"
-msgstr "滤镜："
+msgid "%sLevel %s"
+msgstr "%s等级 %s"
 
-#: ../src/queuehandler.c:451
+#: src/queuehandler.c:435
 #, c-format
-msgid "%sDetelecine"
-msgstr "%s反胶卷过带滤镜"
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+"\n"
+"固定帧率 %s fps"
 
-#: ../src/queuehandler.c:460
+#: src/queuehandler.c:439
 #, c-format
-msgid "%s%s:"
-msgstr "%s%s:"
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+"\n"
+"峰值帧率 %s fps (可能更低)"
 
-#: ../src/queuehandler.c:475
+#: src/queuehandler.c:444
 #, c-format
-msgid "%sDenoise %s:"
-msgstr "%s去噪 %s:"
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+"\n"
+"动态帧率 %s fps"
 
-#: ../src/queuehandler.c:497
-#, c-format
-msgid "%sDeblock: %d"
-msgstr "%s去区块滤镜：%d"
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ", 仅强制"
 
-#: ../src/queuehandler.c:502
-#, c-format
-msgid "%sGrayscale"
-msgstr "%s灰度"
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ", 已烧录"
 
-#: ../src/queuehandler.c:515
-#, c-format
-msgid "Video: %s"
-msgstr "视频: %s"
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ", 默认"
 
-#: ../src/queuehandler.c:523
-msgid "(constant)"
-msgstr "(固定)"
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr "完成"
 
-#: ../src/queuehandler.c:525
-msgid "(variable)"
-msgstr "(动态)"
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr "已取消"
 
-#: ../src/queuehandler.c:526
-#, c-format
-msgid ", Framerate: %s %s"
-msgstr "，帧率：%s %s"
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr "已失败"
 
-#: ../src/queuehandler.c:532
-#, c-format
-msgid ", Framerate: Peak %s (may be lower)"
-msgstr "，帧率：峰值 %s (也许低一点)"
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr "排队中"
 
-#: ../src/queuehandler.c:536
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
 #, c-format
-msgid ", Framerate: %s (constant frame rate)"
-msgstr "，帧率：%s (恒定帧率)"
-
-#: ../src/queuehandler.c:539
-msgid "Error"
-msgstr "错误"
-
-#: ../src/queuehandler.c:546
-msgid "Bitrate:"
-msgstr "比特率："
-
-#: ../src/queuehandler.c:547
-msgid "kbps"
-msgstr "kbps"
-
-#: ../src/queuehandler.c:567
-msgid "Turbo 1st Pass: On\n"
-msgstr "加速首次编码： 启用\n"
+msgid "%d Day %02d:%02d:%02d"
+msgstr "%d 天 %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:592
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
 #, c-format
-msgid "Video Options: Preset: %s"
-msgstr "视频选项 预设： %s"
+msgid "%d Days %02d:%02d:%02d"
+msgstr "%d 天 %02d:%02d:%02d"
 
-#: ../src/queuehandler.c:596
-msgid " - Tune: "
-msgstr " - 优化: "
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr "B"
 
-#: ../src/queuehandler.c:619
-#, c-format
-msgid " - Profile: %s"
-msgstr " - 规格：%s"
-
-#: ../src/queuehandler.c:623
-#, c-format
-msgid " - Level: %s"
-msgstr " - 级别：%s"
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr "KB"
 
-#: ../src/queuehandler.c:632 ../src/queuehandler.c:642
-#, c-format
-msgid "Advanced Options: %s\n"
-msgstr "高级选项: %s\n"
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr "MB"
 
-#: ../src/queuehandler.c:659
-msgid "Audio: "
-msgstr "音频: "
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr "GB"
 
-#: ../src/queuehandler.c:663
-#, c-format
-msgid "Audio Tracks: %d"
-msgstr "音轨: %d"
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr "不可用"
 
-#: ../src/queuehandler.c:684
-#, c-format
-msgid "Bitrate: %d"
-msgstr "码率: %d"
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr "外语音频搜索"
 
-#: ../src/queuehandler.c:702
-#, c-format
-msgid "%d - %s --> Encoder: %s"
-msgstr "%d - %s --> 编码：%s"
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr "编码"
 
-#: ../src/queuehandler.c:707
-#, c-format
-msgid "%d - %s --> Encoder: %s, Mixdown: %s, SampleRate: %s, %s"
-msgstr "%d - %s --> 编码：%s, 混音： %s, 采样率： %s, %s"
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr "首次编码（分析）"
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr "二次编码 (完结)"
 
-#: ../src/queuehandler.c:733
-msgid "Subtitle: "
-msgstr "字幕: "
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "错误"
 
-#: ../src/queuehandler.c:737
+#: src/queuehandler.c:1177
 #, c-format
-msgid "Subtitle Tracks: %d\n"
-msgstr "字幕轨: %d\n"
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+"正在处理 %d of %d\n"
+"%s"
 
-#: ../src/queuehandler.c:751 ../src/queuehandler.c:778
-msgid " (Forced Only)"
-msgstr " (仅强制)"
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr "扫描标题"
 
-#: ../src/queuehandler.c:752 ../src/queuehandler.c:779
-msgid " (Burn)"
-msgstr " (烧录)"
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr "编码暂停"
 
-#: ../src/queuehandler.c:753 ../src/queuehandler.c:780
-msgid " (Default)"
-msgstr " (默认)"
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr "编码进行中"
 
-#: ../src/queuehandler.c:787
-#, c-format
-msgid " %s, Offset (ms) %d%s\n"
-msgstr "%s，延迟(毫秒)%d%s\n"
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr "未知"
 
-#: ../src/queuehandler.c:1151
+#: src/queuehandler.c:1770
 #, c-format
 msgid ""
-"%sThe destination filesystem is almost full: %<PRIu64>MB free.\n"
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
 "Destination: %s\n"
 "Encode may be incomplete if you proceed.\n"
 msgstr ""
-"%s目标文件系统几乎已满: %<PRIu64>MB 空闲。\n"
+"%s目标文件系统几乎已满: %<PRId64>MB 空闲。\n"
 "目标: %s\n"
 "如果继续，编码可能不完整。\n"
 
-#: ../src/queuehandler.c:1156
+#: src/queuehandler.c:1775
 msgid "Resume, I've fixed the problem"
 msgstr "继续，我已经解决了这个问题"
 
-#: ../src/queuehandler.c:1157
+#: src/queuehandler.c:1776
 msgid "Resume, Don't tell me again"
 msgstr "继续，不要再通知我"
 
-#: ../src/queuehandler.c:1211
+#: src/queuehandler.c:1830
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3761,14 +3355,14 @@
 "Do you want to overwrite?"
 msgstr ""
 "目标路径中：%s\n"
-"已经有另一个作业指定了相同路径\n"
+"已经有另一个任务指定了相同路径\n"
 "是否要覆盖？"
 
-#: ../src/queuehandler.c:1216 ../src/queuehandler.c:1262
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ../src/queuehandler.c:1229
+#: src/queuehandler.c:1848
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3779,7 +3373,7 @@
 "\n"
 "这不是有效的目录。"
 
-#: ../src/queuehandler.c:1243
+#: src/queuehandler.c:1862
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3790,7 +3384,7 @@
 "\n"
 "没有读取或者写入权限。"
 
-#: ../src/queuehandler.c:1257
+#: src/queuehandler.c:1876
 #, c-format
 msgid ""
 "Destination: %s\n"
@@ -3801,16 +3395,16 @@
 "目标路径中已经存在：%s\n"
 "是否要覆盖？"
 
-#: ../src/queuehandler.c:1798
+#: src/queuehandler.c:2189
 msgid "Select this title for adding to the queue.\n"
 msgstr "添加选中的标题到渲染队列\n"
 
 #. Title label
-#: ../src/queuehandler.c:1806
+#: src/queuehandler.c:2197
 msgid "No Title"
 msgstr "无标题"
 
-#: ../src/queuehandler.c:1816
+#: src/queuehandler.c:2207
 msgid ""
 "There is another title with the same destination file name.\n"
 "This title will not be added to the queue unless you change\n"
@@ -3820,31 +3414,31 @@
 "该标题不会被添加到队列中，除非您\n"
 "修改输出文件名。\n"
 
-#: ../src/queuehandler.c:2343
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/queuehandler.c:2344 ../src/queuehandler.c:2370
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
 msgid "Stop Encoding"
 msgstr "停止编码"
 
-#: ../src/queuehandler.c:2356
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr "停止编码(_T)"
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
 msgid "Resume"
 msgstr "恢复"
 
-#: ../src/queuehandler.c:2357 ../src/queuehandler.c:2381
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
 msgid "Resume Encoding"
 msgstr "重新编码"
 
-#: ../src/queuehandler.c:2369
-msgid "S_top Encoding"
-msgstr "停止编码(_T)"
-
-#: ../src/queuehandler.c:2380
+#: src/queuehandler.c:2434
 msgid "_Resume Encoding"
 msgstr "重新编码(_R)"
 
-#: ../src/queuehandler.c:2419
+#: src/queuehandler.c:3065
 msgid ""
 "You are currently encoding. What would you like to do?\n"
 "\n"
@@ -3852,23 +3446,21 @@
 "您当前正在编码。您想要做什么？\n"
 "\n"
 
-#: ../src/subtitlehandler.c:1280
+#: src/subtitlehandler.c:1379
 #, c-format
 msgid "Preferred Language: %s"
 msgstr "首选语言：%s"
 
-#: ../src/subtitlehandler.c:1294
+#: src/subtitlehandler.c:1393
 #, c-format
 msgid "Add %s subtitle track if default audio is not %s"
 msgstr "添加 %s 字幕轨，如果默认音频不是 %s"
 
-#: ../src/subtitlehandler.c:1299
-#, c-format
+#: src/subtitlehandler.c:1398
 msgid "Add subtitle track if default audio is not your preferred language"
 msgstr "如果默认的音频不是您的首选语言，则添加字幕轨"
 
-#: ../src/videohandler.c:207 ../src/videohandler.c:226
-#: ../src/x264handler.c:173
+#: src/videohandler.c:202
 #, c-format
 msgid ""
 "%s\n"
@@ -3881,8 +3473,7 @@
 "扩展选项：\n"
 "\"%s\""
 
-#: ../src/videohandler.c:210 ../src/videohandler.c:229
-#: ../src/x264handler.c:176
+#: src/videohandler.c:205
 #, c-format
 msgid ""
 "%s\n"
@@ -3894,3 +3485,8 @@
 "\n"
 "扩展选项：\n"
 "\"\""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr "%s: %.4g (警告：无损)"

HandBrake-1.5.1.tar.xz/gtk/po/zh_TW.po Added

@@ -0,0 +1,3174 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the ghb package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# toto6038 <toto6038@gmail.com>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: ghb 0.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-06-17 08:17-0600\n"
+"PO-Revision-Date: 2018-10-10 18:14+0000\n"
+"Last-Translator: toto6038 <toto6038@gmail.com>, 2020\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/HandBrakeProject/teams/92423/zh_TW/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/ghb3.ui:23
+msgid ""
+"Render the subtitle over the video.\n"
+"\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+"在影片中算繪字幕。\n"
+"\n"
+"字幕將會成為影片的一部分，且無法關閉。"
+
+#: src/ghb3.ui:26
+msgid "Burned In"
+msgstr ""
+
+#: src/ghb3.ui:32 src/ghb3.ui:9122
+msgid ""
+"Set the default output subtitle track.\n"
+"\n"
+"Most players will automatically display this\n"
+"subtitle track whenever the video is played.\n"
+"\n"
+"This is useful for creating a \"forced\" track\n"
+"in your output."
+msgstr ""
+
+#: src/ghb3.ui:39
+msgid "Default"
+msgstr ""
+
+#: src/ghb3.ui:45 src/ghb3.ui:9084
+msgid ""
+"Use only subtitles that have been flagged\n"
+"as forced in the source subtitle track\n"
+"\n"
+"\"Forced\" subtitles are usually used to show\n"
+"subtitles during scenes where someone is speaking\n"
+"a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:51
+msgid "Forced Only"
+msgstr ""
+
+#: src/ghb3.ui:57
+msgid ""
+"Add (or subtract) an offset (in milliseconds)\n"
+"to the start of the SRT subtitle track.\n"
+"\n"
+"Often, the start of an external SRT file\n"
+"does not coincide with the start of the video.\n"
+"This setting allows you to synchronize the files."
+msgstr ""
+
+#: src/ghb3.ui:63
+msgid "SRT Offset"
+msgstr ""
+
+#: src/ghb3.ui:69
+msgid ""
+"The source subtitle track\n"
+"\n"
+"You can choose any of the subtitles\n"
+"recognized in your source file.\n"
+"\n"
+"In addition, there is a special track option\n"
+"\"Foreign Audio Scan\". This option will add\n"
+"an extra pass to the encode that searches for\n"
+"subtitles that may correspond to a foreign\n"
+"language scene. This option is best used in\n"
+"conjunction with the \"Forced\" option."
+msgstr ""
+
+#: src/ghb3.ui:80
+msgid "Track"
+msgstr ""
+
+#: src/ghb3.ui:87
+msgid "Open Source Directory"
+msgstr ""
+
+#: src/ghb3.ui:91
+msgid "Open Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:95
+msgid "Open Encode Log Directory"
+msgstr ""
+
+#: src/ghb3.ui:99
+msgid "Open Encode Log"
+msgstr ""
+
+#: src/ghb3.ui:108
+msgid "Reset Failed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:112
+msgid "Reset All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:116
+msgid "Clear Completed Jobs"
+msgstr ""
+
+#: src/ghb3.ui:120
+msgid "Clear All Jobs"
+msgstr ""
+
+#: src/ghb3.ui:124
+msgid "Import Queue"
+msgstr ""
+
+#: src/ghb3.ui:128
+msgid "Export Queue"
+msgstr ""
+
+#: src/ghb3.ui:135
+msgid "HandBrake Presets"
+msgstr ""
+
+#: src/ghb3.ui:163 src/ghb3.ui:2128
+msgid "_Presets"
+msgstr "預設檔 (P)"
+
+#: src/ghb3.ui:171 src/ghb3.ui:2136
+msgid "Set De_fault"
+msgstr "設成預設 (D)"
+
+#: src/ghb3.ui:185 src/ghb3.ui:2150
+msgid "_Save"
+msgstr "儲存 (S)"
+
+#: src/ghb3.ui:194 src/ghb3.ui:2159
+msgid "Save _As"
+msgstr "另存為 (A)"
+
+#: src/ghb3.ui:203 src/ghb3.ui:2168
+msgid "_Rename"
+msgstr "重新命名 (R)"
+
+#: src/ghb3.ui:212 src/ghb3.ui:2177
+msgid "_Delete"
+msgstr "刪除 (D)"
+
+#: src/ghb3.ui:226 src/ghb3.ui:2191
+msgid "_Import"
+msgstr "匯入 (I)"
+
+#: src/ghb3.ui:235 src/ghb3.ui:2200
+msgid "_Export"
+msgstr "匯出 (E)"
+
+#: src/ghb3.ui:249 src/ghb3.ui:2214
+msgid "Reset _Built-in Presets"
+msgstr "重置內建預設檔 (B)"
+
+#: src/ghb3.ui:304
+msgid "Presets List"
+msgstr "預設檔清單"
+
+#: src/ghb3.ui:318
+msgid "HandBrake Queue"
+msgstr ""
+
+#: src/ghb3.ui:352
+msgid "Queue"
+msgstr ""
+
+#: src/ghb3.ui:367
+msgid "0 jobs pending"
+msgstr ""
+
+#: src/ghb3.ui:404 src/ghb3.ui:2324 src/queuehandler.c:2378
+#: src/queuehandler.c:2391 src/queuehandler.c:2402
+msgid "Start Encoding"
+msgstr "開始編碼"
+
+#: src/ghb3.ui:406 src/ghb3.ui:2326 src/ghb3.ui:6432 src/queuehandler.c:2377
+#: src/queuehandler.c:2390
+msgid "Start"
+msgstr "開始"
+
+#: src/ghb3.ui:420 src/ghb3.ui:2339 src/queuehandler.c:2416
+#: src/queuehandler.c:2429 src/queuehandler.c:2440
+msgid "Pause Encoding"
+msgstr "暫停編碼"
+
+#: src/ghb3.ui:422 src/ghb3.ui:2341 src/queuehandler.c:2415
+#: src/queuehandler.c:2428
+msgid "Pause"
+msgstr "暫停"
+
+#: src/ghb3.ui:480
+msgid "Options"
+msgstr ""
+
+#: src/ghb3.ui:549
+msgid "When Done:"
+msgstr ""
+
+#: src/ghb3.ui:630
+msgid "Reset"
+msgstr ""
+
+#: src/ghb3.ui:632
+msgid ""
+"Mark selected queue entry as pending.\n"
+"Resets the queue job to pending and ready to run again."
+msgstr ""
+
+#: src/ghb3.ui:647
+msgid "Edit"
+msgstr "編輯 "
+
+#: src/ghb3.ui:692
+msgid "Actions"
+msgstr ""
+
+#: src/ghb3.ui:741 src/ghb3.ui:4825
+msgid "Preset:"
+msgstr "預設檔："
+
+#: src/ghb3.ui:777
+msgid "Source:"
+msgstr ""
+
+#: src/ghb3.ui:818 src/ghb3.ui:6512
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:858
+msgid "Destination:"
+msgstr ""
+
+#: src/ghb3.ui:899
+msgid "Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:935
+msgid "Video:"
+msgstr ""
+
+#: src/ghb3.ui:971
+msgid "Audio:"
+msgstr ""
+
+#: src/ghb3.ui:1007
+msgid "Subtitles:"
+msgstr ""
+
+#: src/ghb3.ui:1046 src/ghb3.ui:3185
+msgid "Summary"
+msgstr ""
+
+#: src/ghb3.ui:1084
+msgid "Pass:"
+msgstr ""
+
+#: src/ghb3.ui:1120
+msgid "Start Time:"
+msgstr ""
+
+#: src/ghb3.ui:1156
+msgid "End Time:"
+msgstr ""
+
+#: src/ghb3.ui:1196
+msgid "Paused Duration:"
+msgstr ""
+
+#: src/ghb3.ui:1236
+msgid "Encode Time:"
+msgstr ""
+
+#: src/ghb3.ui:1272
+msgid "File Size:"
+msgstr ""
+
+#: src/ghb3.ui:1308
+msgid "Status:"
+msgstr ""
+
+#: src/ghb3.ui:1347
+msgid "Statistics"
+msgstr ""
+
+#: src/ghb3.ui:1412
+msgid "Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1435
+msgid "HandBrake Activity Log"
+msgstr ""
+
+#: src/ghb3.ui:1710
+msgid "About HandBrake"
+msgstr "關於 HandBrake"
+
+#: src/ghb3.ui:1716
+msgid ""
+"Copyright © 2008 - John Stebbins\n"
+"Copyright © 2004 - , HandBrake Devs"
+msgstr ""
+"版權所有 ©️ 2008 - John Stebbins\n"
+"版權所有 ©️ 2004 - , HandBrake 開發團隊"
+
+#: src/ghb3.ui:1718
+msgid ""
+"HandBrake is a GPL-licensed, multiplatform, multithreaded video transcoder."
+msgstr "HandBrake 是一款依據 GPL 授權、跨平台、多執行緒的影片轉碼器。"
+
+#: src/ghb3.ui:1720
+msgid "https://handbrake.fr"
+msgstr "https://handbrake.fr"
+
+#: src/ghb3.ui:1721
+msgid ""
+"HandBrake 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.\n"
+"\n"
+"HandBrake is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with Glade; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/ghb3.ui:1907
+msgid "HandBrake"
+msgstr "HandBrake"
+
+#: src/ghb3.ui:1930
+msgid "_File"
+msgstr "檔案 (F)"
+
+#: src/ghb3.ui:1938
+msgid "Open _Source"
+msgstr "打開來源 (S)"
+
+#: src/ghb3.ui:1947
+msgid "Open Single _Title"
+msgstr ""
+
+#: src/ghb3.ui:1956
+msgid "Set _Destination"
+msgstr ""
+
+#: src/ghb3.ui:1971
+msgid "_Preferences"
+msgstr "偏好設定 (P)"
+
+#: src/ghb3.ui:1986
+msgid "_Quit"
+msgstr "退出 (Q)"
+
+#: src/ghb3.ui:2001 src/ghb3.ui:2095
+msgid "_Queue"
+msgstr "佇列 (Q)"
+
+#: src/ghb3.ui:2009
+msgid "_Add"
+msgstr "新增 (A)"
+
+#: src/ghb3.ui:2018
+msgid "Add _Multiple"
+msgstr ""
+
+#: src/ghb3.ui:2027 src/queuehandler.c:2401
+msgid "_Start Encoding"
+msgstr "開始編碼 (S)"
+
+#: src/ghb3.ui:2036 src/queuehandler.c:2439
+msgid "_Pause Encoding"
+msgstr "暫停編碼 (P)"
+
+#: src/ghb3.ui:2045
+msgid "S_ave Queue"
+msgstr "儲存佇列 (A)"
+
+#: src/ghb3.ui:2054
+msgid "_Load Queue File"
+msgstr "載入佇列檔案 (L)"
+
+#: src/ghb3.ui:2069
+msgid "_View"
+msgstr "檢視 (V)"
+
+#: src/ghb3.ui:2077
+msgid "HandBrake For _Dumbies"
+msgstr ""
+
+#: src/ghb3.ui:2086
+msgid "Presets _List"
+msgstr "預設檔清單 (L)"
+
+#: src/ghb3.ui:2104
+msgid "_Preview"
+msgstr "預覽 (P)"
+
+#: src/ghb3.ui:2113
+msgid "_Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2229
+msgid "_Help"
+msgstr "協助 (H)"
+
+#: src/ghb3.ui:2237
+msgid "_About"
+msgstr "關於 (A)"
+
+#: src/ghb3.ui:2246
+msgid "_Guide"
+msgstr "導覽 (G)"
+
+#: src/ghb3.ui:2284 src/callbacks.c:4123
+msgid "Choose Video Source"
+msgstr "選擇影片來源"
+
+#: src/ghb3.ui:2286 src/callbacks.c:4122
+msgid "Open Source"
+msgstr "打開來源"
+
+#: src/ghb3.ui:2309
+msgid "Add to Queue"
+msgstr "新增至佇列"
+
+#: src/ghb3.ui:2311
+msgid "Add To Queue"
+msgstr "新增至佇列"
+
+#: src/ghb3.ui:2366
+msgid "Show Presets Window"
+msgstr "顯示預設檔視窗"
+
+#: src/ghb3.ui:2368
+msgid "Presets"
+msgstr "預設檔"
+
+#: src/ghb3.ui:2381
+msgid "Show Preview Window"
+msgstr "顯示預設檔視窗"
+
+#: src/ghb3.ui:2383
+msgid "Preview"
+msgstr "預覽"
+
+#: src/ghb3.ui:2396
+msgid "Show Queue"
+msgstr "顯示佇列"
+
+#: src/ghb3.ui:2398 src/callbacks.c:4567
+msgid "Queue"
+msgstr "佇列"
+
+#: src/ghb3.ui:2411
+msgid "Show Activity Window"
+msgstr ""
+
+#: src/ghb3.ui:2413
+msgid "Activity"
+msgstr ""
+
+#: src/ghb3.ui:2443
+msgid "Source:"
+msgstr "來源："
+
+#: src/ghb3.ui:2469 src/hb-backend.c:59 src/hb-backend.c:71
+#: src/hb-backend.c:84 src/hb-backend.c:249 src/hb-backend.c:334
+#: src/hb-backend.c:2421 src/hb-backend.c:2647 src/subtitlehandler.c:1365
+msgid "None"
+msgstr "無"
+
+#: src/ghb3.ui:2514 src/callbacks.c:4095
+msgid "Scanning..."
+msgstr "掃描中..."
+
+#: src/ghb3.ui:2548
+msgid "Title:"
+msgstr ""
+
+#: src/ghb3.ui:2576
+msgid ""
+"Set the title to encode.\n"
+"By default the longest title is chosen.\n"
+"This is often the feature title of a DVD."
+msgstr ""
+
+#: src/ghb3.ui:2598
+msgid "No Titles"
+msgstr ""
+
+#: src/ghb3.ui:2616
+msgid "Angle:"
+msgstr ""
+
+#: src/ghb3.ui:2628
+msgid "For multi-angle DVD's, select the desired angle to encode."
+msgstr ""
+
+#: src/ghb3.ui:2644
+msgid "Range:"
+msgstr ""
+
+#: src/ghb3.ui:2655
+msgid "Range of title to encode. Can be chapters, seconds, or frames."
+msgstr ""
+
+#: src/ghb3.ui:2668
+msgid "Set the first chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2683
+msgid "-"
+msgstr "-"
+
+#: src/ghb3.ui:2695
+msgid "Set the last chapter to encode."
+msgstr ""
+
+#: src/ghb3.ui:2720
+msgid "Preset:"
+msgstr "預設檔："
+
+#: src/ghb3.ui:2756
+msgid "Choose Preset"
+msgstr "選擇預設檔"
+
+#: src/ghb3.ui:2787
+msgid "Modified"
+msgstr ""
+
+#: src/ghb3.ui:2796 src/ghb3.ui:5169 src/ghb3.ui:5913
+msgid "Reload"
+msgstr "重新載入"
+
+#: src/ghb3.ui:2799
+msgid ""
+"Reload the settings for the currently selected preset.\n"
+"Modifications will be discarded."
+msgstr ""
+
+#: src/ghb3.ui:2811
+msgid "Save New Preset"
+msgstr "儲存新的預設檔"
+
+#: src/ghb3.ui:2814
+msgid "Save the current settings to a new Preset."
+msgstr ""
+
+#: src/ghb3.ui:2896
+msgid "Format:"
+msgstr "格式："
+
+#: src/ghb3.ui:2914
+msgid "Format to mux encoded tracks to."
+msgstr ""
+
+#: src/ghb3.ui:2926 src/queuehandler.c:290
+msgid "Web Optimized"
+msgstr "針對網頁最佳化"
+
+#: src/ghb3.ui:2931
+msgid ""
+"Optimize the layout of the MP4 file for progressive download.\n"
+"This allows a player to initiate playback before downloading the entire file."
+msgstr ""
+
+#: src/ghb3.ui:2947
+msgid "Align A/V Start"
+msgstr ""
+
+#: src/ghb3.ui:2952
+msgid ""
+"Aligns the initial timestamps of all audio and video streams by\n"
+"inserting blank frames or dropping frames. May improve audio/video\n"
+"sync for broken players that do not honor MP4 edit lists."
+msgstr ""
+
+#: src/ghb3.ui:2969
+msgid "iPod 5G Support"
+msgstr "iPod 5G 支援"
+
+#: src/ghb3.ui:2974
+msgid "Add iPod Atom needed by some older iPods."
+msgstr ""
+
+#: src/ghb3.ui:2996
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:3014
+msgid "hh:mm:ss"
+msgstr "HH:MM:SS"
+
+#: src/ghb3.ui:3029
+msgid "Tracks:"
+msgstr "軌道："
+
+#: src/ghb3.ui:3069
+msgid "Filters:"
+msgstr "濾鏡："
+
+#: src/ghb3.ui:3109
+msgid "Size:"
+msgstr ""
+
+#: src/ghb3.ui:3134 src/ghb3.ui:3355
+msgid "--"
+msgstr "--"
+
+#: src/ghb3.ui:3227
+msgid "Auto Crop"
+msgstr "自動裁切"
+
+#: src/ghb3.ui:3232
+msgid "Automatically crop black borders around edges of the video."
+msgstr "自動裁切影片周圍的黑邊。"
+
+#: src/ghb3.ui:3246
+msgid "Loose Crop"
+msgstr ""
+
+#: src/ghb3.ui:3250
+msgid ""
+"When picture settings require that the image\n"
+"dimensions be rounded to some multiple number\n"
+"of pixels, this setting will crop a few extra pixels\n"
+"instead of doing exact cropping and then scaling to\n"
+"the required multiple."
+msgstr ""
+
+#: src/ghb3.ui:3272
+msgid "Left Crop"
+msgstr ""
+
+#: src/ghb3.ui:3289
+msgid "Top Crop"
+msgstr ""
+
+#: src/ghb3.ui:3306
+msgid "Bottom Crop"
+msgstr ""
+
+#: src/ghb3.ui:3323
+msgid "Right Crop"
+msgstr ""
+
+#: src/ghb3.ui:3340
+msgid "Crop Dimensions:"
+msgstr ""
+
+#: src/ghb3.ui:3376
+msgid "Cropping"
+msgstr ""
+
+#: src/ghb3.ui:3411
+msgid "Optimal for source"
+msgstr ""
+
+#: src/ghb3.ui:3415
+msgid ""
+"If enabled, select the 'optimal' storage resolution.\n"
+"This will be the resolution that most closely matches the source resolution after cropping."
+msgstr ""
+
+#: src/ghb3.ui:3433 src/ghb3.ui:3648
+msgid "Width:"
+msgstr "寬度："
+
+#: src/ghb3.ui:3448
+msgid ""
+"This is the width that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3466 src/ghb3.ui:3680
+msgid "Height:"
+msgstr "高度："
+
+#: src/ghb3.ui:3481
+msgid ""
+"This is the height that the video will be stored at.\n"
+"The actual display dimensions will differ if the pixel aspect ratio is not 1:1."
+msgstr ""
+
+#: src/ghb3.ui:3511
+msgid "Anamorphic:"
+msgstr ""
+
+#: src/ghb3.ui:3526
+msgid ""
+"Anamorphic Modes:\n"
+"<tt>\n"
+"None - Force pixel aspect ratio to 1:1.\n"
+"Loose - Use a pixel aspect ratio that is as\n"
+" close as possible to the source video pixel\n"
+" aspect ratio while preserving the original\n"
+" display aspect ratio\n"
+"Automatic - Use a pixel aspect ratio that maximizes\n"
+" storage resolution while preserving the original\n"
+" display aspect ratio</tt>"
+msgstr ""
+
+#: src/ghb3.ui:3550
+msgid "Alignment:"
+msgstr "對齊："
+
+#: src/ghb3.ui:3565
+msgid ""
+"Align storage dimensions to multiples of this value.\n"
+"\n"
+"This setting is only necessary for compatibility with some devices.\n"
+"You should use 2 unless you experience compatibility issues."
+msgstr ""
+
+#: src/ghb3.ui:3590
+msgid "Storage Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3625
+msgid "Keep Aspect"
+msgstr "保持長寬比"
+
+#: src/ghb3.ui:3630
+msgid ""
+"If enabled, the original display aspect of the source will be maintained."
+msgstr "若被啟用，來源的原先長寬比將被保留。"
+
+#: src/ghb3.ui:3663
+msgid ""
+"This is the display width. It is the result of scaling the storage "
+"dimensions by the pixel aspect."
+msgstr ""
+
+#: src/ghb3.ui:3724
+msgid "Pixel Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3739
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3759
+msgid ":"
+msgstr ":"
+
+#: src/ghb3.ui:3774
+msgid ""
+"Pixel aspect defines the shape of the pixels.\n"
+"A 1:1 ratio defines a square pixel. Other values define rectangular shapes.\n"
+"Players will scale the image in order to achieve the specified aspect."
+msgstr ""
+
+#: src/ghb3.ui:3794
+msgid "Display Aspect:"
+msgstr ""
+
+#: src/ghb3.ui:3809
+msgid "--:--"
+msgstr "--:--"
+
+#: src/ghb3.ui:3830
+msgid "Display Geometry"
+msgstr ""
+
+#: src/ghb3.ui:3848
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:3876
+msgid "Detelecine:"
+msgstr ""
+
+#: src/ghb3.ui:3892
+msgid ""
+"This filter removes 'combing' artifacts that are the result of telecining.\n"
+"\n"
+"Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps."
+msgstr ""
+
+#: src/ghb3.ui:3907
+msgid ""
+"Custom detelecine filter string format\n"
+"\n"
+"JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity"
+msgstr ""
+
+#: src/ghb3.ui:3935
+msgid "Interlace Detection:"
+msgstr ""
+
+#: src/ghb3.ui:3951
+msgid ""
+"This filter detects interlaced frames.\n"
+"\n"
+"If a deinterlace filter is enabled, only frames that this filter finds\n"
+"to be interlaced will be deinterlaced."
+msgstr ""
+
+#: src/ghb3.ui:3967
+msgid ""
+"Custom interlace detection filter string format\n"
+"\n"
+"Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:\n"
+"Block Thresh: Block Width: Block Height"
+msgstr ""
+
+#: src/ghb3.ui:3996
+msgid "Deinterlace:"
+msgstr ""
+
+#: src/ghb3.ui:4012
+msgid ""
+"Choose decomb or deinterlace filter.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4031
+msgid "Deinterlace Preset:"
+msgstr ""
+
+#: src/ghb3.ui:4047
+msgid ""
+"Choose decomb or deinterlace filter options.\n"
+"\n"
+"The decomb filter supports a variety of interpolation algorithms.\n"
+"The deinterlace filter is a classic YADIF deinterlacer.\n"
+msgstr ""
+
+#: src/ghb3.ui:4090
+msgid "Deblock Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4106 src/ghb3.ui:4138
+msgid ""
+"The deblocking filter removes a common type of compression artifact.\n"
+"If your source exhibits 'blockiness', this filter may help clean it up."
+msgstr ""
+
+#: src/ghb3.ui:4122
+msgid "Deblock Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4152
+msgid ""
+"Custom deblock filter string format\n"
+"\n"
+"strength=weak|strong:thresh=0-100:blocksize=4-512"
+msgstr ""
+
+#: src/ghb3.ui:4180
+msgid "Denoise Filter:"
+msgstr "降噪濾鏡："
+
+#: src/ghb3.ui:4196 src/ghb3.ui:4229 src/ghb3.ui:4262
+msgid ""
+"Denoise filtering reduces or removes the appearance of noise and grain.\n"
+"Film grain and other types of high frequency noise are difficult to compress.\n"
+"Using this filter on such sources can result in smaller file sizes."
+msgstr ""
+"降噪濾鏡可減少或移除噪訊及顆粒。\n"
+"膠片顆粒或其他高頻噪訊是極難壓縮的。\n"
+"針對此類來源使用此濾鏡以產生較小的檔案。"
+
+#: src/ghb3.ui:4213
+msgid "Denoise Preset:"
+msgstr "降噪預設檔："
+
+#: src/ghb3.ui:4246
+msgid "Denoise Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4277 src/ghb3.ui:4399
+msgid ""
+"Custom denoise filter string format\n"
+"\n"
+"SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma"
+msgstr ""
+
+#: src/ghb3.ui:4305
+msgid "Sharpen Filter:"
+msgstr "銳利化濾鏡："
+
+#: src/ghb3.ui:4321 src/ghb3.ui:4353 src/ghb3.ui:4385
+msgid ""
+"Sharpen filtering enhances edges and other\n"
+"high frequency components in the video."
+msgstr ""
+"銳利化濾鏡可在影片強化邊緣及其他\n"
+"高頻細節。"
+
+#: src/ghb3.ui:4337
+msgid "Sharpen Preset:"
+msgstr "銳利化預設檔："
+
+#: src/ghb3.ui:4369
+msgid "Sharpen Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4427
+msgid "Rotate Filter:"
+msgstr ""
+
+#: src/ghb3.ui:4443
+msgid "Rotate the video clockwise in 90 degree increments."
+msgstr "將影片旋轉順時鐘 90 度"
+
+#: src/ghb3.ui:4457
+msgid "Grayscale"
+msgstr "灰階"
+
+#: src/ghb3.ui:4462
+msgid "If enabled, filter colour components out of video."
+msgstr "若被啟用，影片中的彩色部分將被剔除。"
+
+#: src/ghb3.ui:4473
+msgid "Filters"
+msgstr "濾鏡"
+
+#: src/ghb3.ui:4504
+msgid "Video Encoder:"
+msgstr "影片編碼器："
+
+#: src/ghb3.ui:4518
+msgid "Available video encoders."
+msgstr "可用的影片編碼器。"
+
+#: src/ghb3.ui:4534
+msgid "Framerate:"
+msgstr "影格率："
+
+#: src/ghb3.ui:4549
+msgid ""
+"Output framerate.\n"
+"\n"
+"'Same as source' is recommended. If your source video has\n"
+"a variable framerate, 'Same as source' will preserve it."
+msgstr ""
+"輸出的影格率。\n"
+"\n"
+"推薦「和來源相同」。若您的來源影片具有可變動的影格率，「和來源相同」將保留它。"
+
+#: src/ghb3.ui:4564
+msgid "Constant Framerate"
+msgstr "固定影格率"
+
+#: src/ghb3.ui:4569
+msgid "Enables constant framerate output."
+msgstr "啟用固定影格率輸出。"
+
+#: src/ghb3.ui:4583
+msgid "Peak Framerate (VFR)"
+msgstr ""
+
+#: src/ghb3.ui:4588
+msgid ""
+"Enables variable framerate output with a peak\n"
+"rate determined by the framerate setting.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+
+#: src/ghb3.ui:4606
+msgid "Variable Framerate"
+msgstr "可變動的影格率"
+
+#: src/ghb3.ui:4611
+msgid ""
+"Enables variable framerate output.\n"
+"\n"
+"VFR is not compatible with some players."
+msgstr ""
+"啟用可變動的影格率 (VFR)。\n"
+"\n"
+"VFR 與有些播放器不相容。"
+
+#: src/ghb3.ui:4647 src/ghb3.ui:4679
+msgid ""
+"Set the desired quality factor.\n"
+"The encoder targets a certain quality.\n"
+"The scale used by each video encoder is different.\n"
+"\n"
+"x264's scale is logarithmic and lower values correspond to higher quality.\n"
+"So small decreases in value will result in progressively larger increases\n"
+"in the resulting file size. A value of 0 means lossless and will result\n"
+"in a file size that is larger than the original source, unless the source\n"
+"was also lossless.\n"
+"\n"
+"FFMpeg's and Theora's scale is more linear.\n"
+"These encoders do not have a lossless mode."
+msgstr ""
+
+#: src/ghb3.ui:4674
+msgid "Constant Quality:"
+msgstr "固定品質："
+
+#: src/ghb3.ui:4705
+msgid "Bitrate (kbps): "
+msgstr "位元速率 (kbps)："
+
+#: src/ghb3.ui:4710 src/ghb3.ui:4732
+msgid ""
+"Set the average bitrate.\n"
+"\n"
+"The instantaneous bitrate can be much higher or lower at any point in time.\n"
+"But the average over a long duration will be the value set here. If you need\n"
+"to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings."
+msgstr ""
+"設定平均位元速率。\n"
+"\n"
+"瞬時的位元速率可在某時間點高得多或低得多。\n"
+"但長時間的平均位元速率數值可在此設定。若您需要\n"
+"限制瞬時的位元速率，請使用 x264 的 vbv-bufsize 及 vbv-maxrate 設定。"
+
+#: src/ghb3.ui:4749
+msgid "2-Pass Encoding"
+msgstr ""
+
+#: src/ghb3.ui:4754
+msgid ""
+"Perform 2 Pass Encoding.\n"
+"\n"
+"The 'Bitrate' option is prerequisite. During the 1st pass, statistics about\n"
+"the video are collected. Then in the second pass, those statistics are used\n"
+"to make bitrate allocation decisions."
+msgstr ""
+
+#: src/ghb3.ui:4772
+msgid "Turbo First Pass"
+msgstr ""
+
+#: src/ghb3.ui:4777
+msgid ""
+"During the 1st pass of a 2 pass encode, use settings that speed things "
+"along."
+msgstr ""
+
+#: src/ghb3.ui:4839
+msgid ""
+"Adjusts encoder settings to trade off compression efficiency against encoding speed.\n"
+"\n"
+"This establishes your default encoder settings.\n"
+"Tunes, profiles, levels and extra options string will be applied to this.\n"
+"You should generally set this option to the slowest you can bear since slower\n"
+"settings will result in better quality or smaller files."
+msgstr ""
+
+#: src/ghb3.ui:4865
+msgid "Tune:"
+msgstr ""
+
+#: src/ghb3.ui:4882
+msgid ""
+"Tune settings to optimize for common scenarios.\n"
+"\n"
+"This can improve efficiency for particular source characteristics or set\n"
+"characteristics of the output file. Changes will be applied after the\n"
+"preset but before all other parameters."
+msgstr ""
+
+#: src/ghb3.ui:4898
+msgid "Fast Decode"
+msgstr "快速解碼"
+
+#: src/ghb3.ui:4903
+msgid ""
+"Reduce decoder CPU usage.\n"
+"\n"
+"Set this if your device is struggling to play the output (dropped frames)."
+msgstr ""
+"減少解碼器的 CPU 使用率。\n"
+"\n"
+"若您的裝置在播放輸出檔時有困難（如：丟失影格）請選此。"
+
+#: src/ghb3.ui:4921
+msgid "Zero Latency"
+msgstr "零延遲"
+
+#: src/ghb3.ui:4925
+msgid ""
+"Minimize latency between input to encoder and output of decoder.\n"
+"\n"
+"This is useful for broadcast of live streams.\n"
+"\n"
+"Since HandBrake is not suitable for live stream broadcast purposes,\n"
+"this setting is of little value here."
+msgstr ""
+"最小化輸入至編碼器及輸出至解碼器間的延遲。\n"
+"\n"
+"對於廣播或串流直播尤為有用。\n"
+"\n"
+"由於 HandBrake 並不適合串流直播用途，\n"
+"此設定作用不大。"
+
+#: src/ghb3.ui:4949
+msgid "Profile:"
+msgstr "設定檔："
+
+#: src/ghb3.ui:4966
+msgid ""
+"Sets and ensures compliance with the specified profile.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:4984
+msgid "Level:"
+msgstr ""
+
+#: src/ghb3.ui:5001
+msgid ""
+"Sets and ensures compliance with the specified level.\n"
+"\n"
+"Overrides all other settings."
+msgstr ""
+
+#: src/ghb3.ui:5026
+msgid "More Settings:"
+msgstr "更多設定："
+
+#: src/ghb3.ui:5044
+msgid ""
+"Additional encoder settings.\n"
+"\n"
+"Colon separated list of encoder options."
+msgstr ""
+
+#: src/ghb3.ui:5078 src/main.c:1155
+msgid "Video"
+msgstr "影片"
+
+#. Add Button
+#: src/ghb3.ui:5144 src/ghb3.ui:5337 src/ghb3.ui:5874 src/ghb3.ui:6094
+#: src/audiohandler.c:1744
+msgid "Add"
+msgstr "新增"
+
+#: src/ghb3.ui:5146
+msgid "Add new audio settings to the list"
+msgstr "增加新音訊設定至清單"
+
+#: src/ghb3.ui:5156 src/ghb3.ui:5886
+msgid "Add All"
+msgstr "新增全部"
+
+#: src/ghb3.ui:5158
+msgid "Add all audio tracks to the list"
+msgstr "新增所有音軌至清單"
+
+#: src/ghb3.ui:5171
+msgid "Reload all audio settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:5215 src/ghb3.ui:5959
+msgid "Track List"
+msgstr "軌道清單"
+
+#: src/ghb3.ui:5246 src/ghb3.ui:5994
+msgid "Selection Behavior:"
+msgstr ""
+
+#: src/ghb3.ui:5261
+msgid "Choose which audio tracks of the source media are used."
+msgstr "選擇要使用的來源媒體音軌。"
+
+#: src/ghb3.ui:5322
+msgid ""
+"Create a list of languages you would like to select audio for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior."
+msgstr ""
+
+#: src/ghb3.ui:5353 src/ghb3.ui:6110
+msgid "Remove"
+msgstr "移除"
+
+#: src/ghb3.ui:5371 src/ghb3.ui:6128
+msgid "Available Languages"
+msgstr "可用的語言"
+
+#: src/ghb3.ui:5384 src/ghb3.ui:6141
+msgid "Selected Languages"
+msgstr "已選的語言"
+
+#: src/ghb3.ui:5400
+msgid "Use only first encoder for secondary audio"
+msgstr ""
+
+#: src/ghb3.ui:5405
+msgid ""
+"Only the primary audio track will be encoded with the full encoder list.\n"
+"All other secondary audio output tracks will be encoded with first encoder only."
+msgstr ""
+
+#: src/ghb3.ui:5441
+msgid "Auto Passthru:"
+msgstr ""
+
+#: src/ghb3.ui:5452
+msgid "MP3"
+msgstr "MP3"
+
+#: src/ghb3.ui:5457
+msgid ""
+"Enable this if your playback device supports MP3.\n"
+"This permits MP3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5473
+msgid "AAC"
+msgstr "AAC"
+
+#: src/ghb3.ui:5478
+msgid ""
+"Enable this if your playback device supports AAC.\n"
+"This permits AAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5494
+msgid "AC-3"
+msgstr "AC-3"
+
+#: src/ghb3.ui:5499
+msgid ""
+"Enable this if your playback device supports AC-3.\n"
+"This permits AC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5515
+msgid "DTS"
+msgstr "DTS"
+
+#: src/ghb3.ui:5520
+msgid ""
+"Enable this if your playback device supports DTS.\n"
+"This permits DTS passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5536
+msgid "DTS-HD"
+msgstr "DTS-HD"
+
+#: src/ghb3.ui:5541
+msgid ""
+"Enable this if your playback device supports DTS-HD.\n"
+"This permits DTS-HD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5557
+msgid "EAC-3"
+msgstr "EAC-3"
+
+#: src/ghb3.ui:5562
+msgid ""
+"Enable this if your playback device supports EAC-3.\n"
+"This permits EAC-3 passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5578
+msgid "TrueHD"
+msgstr "TrueHD"
+
+#: src/ghb3.ui:5583
+msgid ""
+"Enable this if your playback device supports TrueHD.\n"
+"This permits TrueHD passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5599
+msgid "FLAC"
+msgstr "FLAC"
+
+#: src/ghb3.ui:5604
+msgid ""
+"Enable this if your playback device supports FLAC.\n"
+"This permits FLAC passthru to be selected when automatic passthru selection is enabled."
+msgstr ""
+
+#: src/ghb3.ui:5637
+msgid "Passthru Fallback:"
+msgstr ""
+
+#: src/ghb3.ui:5649
+msgid ""
+"Set the audio codec to encode with when a suitable track can not be found "
+"for audio passthru."
+msgstr ""
+
+#: src/ghb3.ui:5678
+msgid "Audio Encoder Settings:"
+msgstr "音訊編碼器設定："
+
+#: src/ghb3.ui:5679
+msgid "Each selected source track will be encoded with all selected encoders"
+msgstr ""
+
+#: src/ghb3.ui:5704 src/ghb3.ui:9279
+msgid "Encoder"
+msgstr "編碼器"
+
+#: src/ghb3.ui:5715 src/ghb3.ui:9292
+msgid "Bitrate/Quality"
+msgstr "位元速率/品質"
+
+#: src/ghb3.ui:5726
+msgid "Mixdown"
+msgstr ""
+
+#: src/ghb3.ui:5737
+msgid "Samplerate"
+msgstr "取樣率"
+
+#: src/ghb3.ui:5748 src/ghb3.ui:9336
+msgid "Gain"
+msgstr "增益"
+
+#: src/ghb3.ui:5759 src/ghb3.ui:9355
+msgid "DRC"
+msgstr "DRC"
+
+#: src/ghb3.ui:5796 src/ghb3.ui:6354
+msgid "Track Selection"
+msgstr ""
+
+#: src/ghb3.ui:5808
+msgid "Audio"
+msgstr "音訊"
+
+#: src/ghb3.ui:5876
+msgid "Add new subtitle settings to the list"
+msgstr "新增字幕設定至清單"
+
+#: src/ghb3.ui:5888
+msgid "Add all subtitle tracks to the list"
+msgstr "新增所有字幕軌至清單"
+
+#: src/ghb3.ui:5898 src/queuehandler.c:607 src/queuehandler.c:1038
+#: src/subtitlehandler.c:413
+msgid "Foreign Audio Scan"
+msgstr ""
+
+#: src/ghb3.ui:5900
+msgid ""
+"Add an extra pass to the encode which searches\n"
+"for subtitle candidates that provide subtitles for\n"
+"segments of the audio that are in a foreign language."
+msgstr ""
+
+#: src/ghb3.ui:5915
+msgid "Reload all subtitle settings from defaults"
+msgstr ""
+
+#: src/ghb3.ui:6009
+msgid "Choose which subtitle tracks of the source media are used."
+msgstr ""
+
+#: src/ghb3.ui:6074
+msgid ""
+"Create a list of languages you would like to select subtitles for.\n"
+"Tracks matching these languages will be selected using the chosen Selection Behavior.\n"
+"\n"
+"The first language in this list is your \"preferred\" language and will be used\n"
+"for determining subtitle selection settings when there is foreign audio."
+msgstr ""
+
+#: src/ghb3.ui:6155
+msgid "Preferred Language: None"
+msgstr "偏好的語言：無"
+
+#: src/ghb3.ui:6182
+msgid "Add Foreign Audio Scan Pass"
+msgstr ""
+
+#: src/ghb3.ui:6187
+msgid ""
+"Add \"Foreign Audio Scan\" when the default audio track is your preferred language.\n"
+"This search pass finds short sequences of foreign audio and provides subtitles for them.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6202
+msgid "Add subtitle track if default audio is foreign"
+msgstr ""
+
+#: src/ghb3.ui:6207
+msgid ""
+"When the default audio track is not your preferred language, add a subtitle track.\n"
+"\n"
+"This option requires a language to be set in the Selected Languages list."
+msgstr ""
+
+#: src/ghb3.ui:6221
+msgid "Add Closed Captions when available"
+msgstr ""
+
+#: src/ghb3.ui:6226
+msgid ""
+"Closed captions are text subtitles that can be added to any container as a "
+"soft subtitle track"
+msgstr ""
+
+#: src/ghb3.ui:6247
+msgid "Burn-In Behavior*:"
+msgstr ""
+
+#: src/ghb3.ui:6259
+msgid ""
+"Set the behavior of subtitle \"Burn-In\".\n"
+"\n"
+"Burned-In subtitles are part of the video and can not be disabled during playback.\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6286
+msgid "Burn-In for deficient players*:"
+msgstr ""
+
+#: src/ghb3.ui:6295
+msgid "DVD Subtitles"
+msgstr "DVD 字幕"
+
+#: src/ghb3.ui:6300
+msgid ""
+"Burn the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support DVD subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6314
+msgid "Blu-ray Subtitles"
+msgstr "藍光字幕"
+
+#: src/ghb3.ui:6319
+msgid ""
+"Burn the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded.\n"
+"Use this option if your player software or device does not support Blu-ray subtitles.\n"
+"\n"
+"Only one subtitle track can be burned! Since conflicts can occur, the first chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6341
+msgid ""
+"* Only one of the above subtitle burn options will be applied, "
+"starting with the top."
+msgstr ""
+
+#: src/ghb3.ui:6342
+msgid ""
+"Only one subtitle track can be burned! Since conflicts can occur, the first "
+"chosen wins."
+msgstr ""
+
+#: src/ghb3.ui:6366
+msgid "Subtitles"
+msgstr "字幕"
+
+#: src/ghb3.ui:6381 src/queuehandler.c:280
+msgid "Chapter Markers"
+msgstr ""
+
+#: src/ghb3.ui:6386
+msgid "Add chapter markers to output file."
+msgstr ""
+
+#: src/ghb3.ui:6420
+msgid "Index"
+msgstr ""
+
+#: src/ghb3.ui:6444
+msgid "Duration"
+msgstr ""
+
+#: src/ghb3.ui:6455
+msgid "Title"
+msgstr ""
+
+#: src/ghb3.ui:6492
+msgid "Chapters"
+msgstr "章節："
+
+#: src/ghb3.ui:6547
+msgid "Actors:"
+msgstr "演員："
+
+#: src/ghb3.ui:6582
+msgid "Director:"
+msgstr "導演："
+
+#: src/ghb3.ui:6617
+msgid "Release Date:"
+msgstr "釋出日期："
+
+#: src/ghb3.ui:6652
+msgid "Comment:"
+msgstr ""
+
+#: src/ghb3.ui:6687
+msgid "Genre:"
+msgstr "類型："
+
+#: src/ghb3.ui:6722
+msgid "Description:"
+msgstr "敘述："
+
+#: src/ghb3.ui:6757
+msgid "Plot:"
+msgstr ""
+
+#: src/ghb3.ui:6795
+msgid "Tags"
+msgstr ""
+
+#: src/ghb3.ui:6824
+msgid "Save As:"
+msgstr "另存為："
+
+#: src/ghb3.ui:6838
+msgid "Destination filename for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6858
+msgid "To:"
+msgstr ""
+
+#: src/ghb3.ui:6871
+msgid "Destination directory for your encode."
+msgstr ""
+
+#: src/ghb3.ui:6874 src/queuehandler.c:2225
+msgid "Destination Directory"
+msgstr ""
+
+#: src/ghb3.ui:6967 src/ghb3.ui:7875 src/ghb3.ui:8027 src/ghb3.ui:8753
+#: src/ghb3.ui:9158 src/callbacks.c:5463 src/callbacks.c:5473
+#: src/callbacks.c:5481 src/hb-backend.c:4181 src/hb-backend.c:4214
+#: src/hb-backend.c:4253 src/hb-backend.c:4284 src/hb-backend.c:4312
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+#: src/queuehandler.c:1835 src/queuehandler.c:1852 src/queuehandler.c:1866
+#: src/queuehandler.c:1881
+msgid "Cancel"
+msgstr "取消"
+
+#: src/ghb3.ui:6976 src/ghb3.ui:7120 src/ghb3.ui:7884 src/ghb3.ui:8036
+#: src/ghb3.ui:8762 src/ghb3.ui:9167
+msgid "OK"
+msgstr "OK"
+
+#: src/ghb3.ui:7005
+msgid "Select All"
+msgstr "選擇全部"
+
+#: src/ghb3.ui:7009
+msgid "Mark all titles for adding to the queue"
+msgstr ""
+
+#: src/ghb3.ui:7022
+msgid "Clear All"
+msgstr "清除全部"
+
+#: src/ghb3.ui:7026
+msgid "Unmark all titles"
+msgstr ""
+
+#: src/ghb3.ui:7087
+msgid "Destination files OK. No duplicates detected."
+msgstr "目的地檔案正常。未偵測到重複檔案。"
+
+#: src/ghb3.ui:7109
+msgid "Preferences"
+msgstr "偏好設定。"
+
+#: src/ghb3.ui:7215
+msgid "Automatically check for updates"
+msgstr "自動檢查更新"
+
+#: src/ghb3.ui:7252
+msgid "When all encodes are complete"
+msgstr "當所有編碼工作完成"
+
+#: src/ghb3.ui:7274
+msgid "Use automatic naming (uses modified source name)"
+msgstr ""
+
+#: src/ghb3.ui:7275
+msgid "Create destination filename from source filename or volume label"
+msgstr ""
+
+#: src/ghb3.ui:7299
+msgid "Auto-Name Template"
+msgstr "自動命名樣板"
+
+#: src/ghb3.ui:7310
+msgid ""
+"Available Options: {source-path} {source} {title} {preset} {chapters} {date}"
+" {time} {creation-date} {creation-time} {quality} {bitrate}"
+msgstr ""
+
+#: src/ghb3.ui:7330
+msgid "Use iPod/iTunes friendly (.m4v) file extension for MP4"
+msgstr ""
+
+#: src/ghb3.ui:7373
+msgid "Number of previews"
+msgstr ""
+
+#: src/ghb3.ui:7411
+msgid "Filter short DVD and Blu-ray titles (seconds)"
+msgstr ""
+
+#: src/ghb3.ui:7425
+msgid "Clear completed queue items after an encode completes"
+msgstr ""
+
+#: src/ghb3.ui:7429
+msgid ""
+"By default, completed jobs remain in the queue and are marked as complete.\n"
+"Check this if you want the queue to clean itself up by deleting completed jobs."
+msgstr ""
+"已完成的工作預設將留在佇列中，並被標示已完成。\n"
+"若您希望佇列自動清除已完成的工作，請勾選。"
+
+#: src/ghb3.ui:7446
+msgid "General"
+msgstr "一般"
+
+#: src/ghb3.ui:7489
+msgid "Constant Quality fractional granularity"
+msgstr ""
+
+#: src/ghb3.ui:7506
+msgid "Use dvdnav (instead of libdvdread)"
+msgstr ""
+
+#: src/ghb3.ui:7529
+msgid "Monitor destination disk free space"
+msgstr "監測目的地磁碟剩餘空間"
+
+#: src/ghb3.ui:7533 src/ghb3.ui:7555 src/ghb3.ui:7736
+msgid "Pause encoding if free disk space drops below limit"
+msgstr "在剩餘磁碟空間低於限制時暫停編碼"
+
+#: src/ghb3.ui:7570
+msgid "MB Limit"
+msgstr ""
+
+#: src/ghb3.ui:7598
+msgid "Put individual encode logs in same location as movie"
+msgstr ""
+
+#: src/ghb3.ui:7634
+msgid "Activity Log Verbosity Level"
+msgstr ""
+
+#: src/ghb3.ui:7669
+msgid "Activity Log Longevity"
+msgstr ""
+
+#: src/ghb3.ui:7690
+msgid "Scale down High Definition previews"
+msgstr ""
+
+#: src/ghb3.ui:7707
+msgid "Automatically Scan DVD when loaded"
+msgstr ""
+
+#: src/ghb3.ui:7711
+msgid "Scans the DVD whenever a new disc is loaded"
+msgstr ""
+
+#: src/ghb3.ui:7750
+msgid "Activity Window Font Size"
+msgstr ""
+
+#: src/ghb3.ui:7767
+msgid "Use the same settings for all titles in a batch"
+msgstr ""
+
+#: src/ghb3.ui:7771
+msgid ""
+"When checked, every title will use the same settings when adding a\n"
+"batch of titles to the queue.\n"
+"\n"
+"Uncheck this if you want to allow changing each title's settings independently."
+msgstr ""
+
+#: src/ghb3.ui:7799
+msgid "Allow Tweaks"
+msgstr ""
+
+#: src/ghb3.ui:7815
+msgid "Allow HandBrake For Dummies"
+msgstr ""
+
+#: src/ghb3.ui:7843
+msgid "Advanced"
+msgstr ""
+
+#: src/ghb3.ui:7921
+msgid "Rename Preset"
+msgstr "重新命名預設檔"
+
+#: src/ghb3.ui:7941
+msgid "Name:"
+msgstr "名稱："
+
+#: src/ghb3.ui:7998 src/ghb3.ui:8345
+msgid "Description"
+msgstr "敘述"
+
+#: src/ghb3.ui:8079
+msgid "Category:"
+msgstr "類別："
+
+#: src/ghb3.ui:8094
+msgid "Set the category that this preset will be shown under."
+msgstr ""
+
+#: src/ghb3.ui:8110
+msgid "Category Name:"
+msgstr "類別名稱："
+
+#: src/ghb3.ui:8143
+msgid "Preset Name:"
+msgstr "預設檔名稱："
+
+#: src/ghb3.ui:8177
+msgid "Default Preset"
+msgstr ""
+
+#: src/ghb3.ui:8182
+msgid "Make this the default Preset when HandBrake starts"
+msgstr ""
+
+#: src/ghb3.ui:8208
+msgid "Dimensions"
+msgstr ""
+
+#: src/ghb3.ui:8234
+msgid "Maximum Width:"
+msgstr "最大寬度："
+
+#: src/ghb3.ui:8239
+msgid "Enable maximum width limit."
+msgstr "啟用最大寬度限制。"
+
+#: src/ghb3.ui:8257
+msgid ""
+"This is the maximum width that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source width is greater.\n"
+"Setting this to 0 means there is no maximum width."
+msgstr ""
+
+#: src/ghb3.ui:8274
+msgid "Maximum Height:"
+msgstr "最大高度："
+
+#: src/ghb3.ui:8279
+msgid "Enable maximum height limit."
+msgstr "啟用最大高度限制。"
+
+#: src/ghb3.ui:8297
+msgid ""
+"This is the maximum height that the video will be stored at.\n"
+"\n"
+"Whenever a new source is loaded, this value will be applied if the source height is greater.\n"
+"Setting this to 0 means there is no maximum height."
+msgstr ""
+
+#: src/ghb3.ui:8368
+msgid "HandBrake Preview"
+msgstr ""
+
+#: src/ghb3.ui:8427
+msgid "Select preview frames."
+msgstr ""
+
+#: src/ghb3.ui:8449
+msgid ""
+"Encode and play a short sequence of video starting from the current preview "
+"position."
+msgstr ""
+
+#: src/ghb3.ui:8520
+msgid "Duration:"
+msgstr ""
+
+#: src/ghb3.ui:8532
+msgid "Set the duration of the live preview in seconds."
+msgstr ""
+
+#: src/ghb3.ui:8548
+msgid "Show Crop"
+msgstr ""
+
+#: src/ghb3.ui:8552
+msgid "Show Cropped area of the preview"
+msgstr ""
+
+#: src/ghb3.ui:8563
+msgid "Source Resolution"
+msgstr ""
+
+#: src/ghb3.ui:8567
+msgid "Reset preview window to the source video's resolution"
+msgstr ""
+
+#: src/ghb3.ui:8599
+msgid "_Cancel"
+msgstr "取消 (C)"
+
+#: src/ghb3.ui:8611
+msgid "_Open"
+msgstr "開啟 (O)"
+
+#: src/ghb3.ui:8645
+msgid "Title Number:"
+msgstr ""
+
+#: src/ghb3.ui:8681
+msgid "Detected DVD devices:"
+msgstr "偵測到的 DVD 裝置："
+
+#: src/ghb3.ui:8791
+msgid "Import SRT"
+msgstr "匯入 SRT"
+
+#: src/ghb3.ui:8796
+msgid "Enable settings to import an SRT subtitle file"
+msgstr "啟用此設定以匯入 SRT 字幕檔"
+
+#: src/ghb3.ui:8807
+msgid "Import SSA"
+msgstr ""
+
+#: src/ghb3.ui:8812
+msgid "Enable settings to import an SSA subtitle file"
+msgstr ""
+
+#: src/ghb3.ui:8824
+msgid "Embedded Subtitle List"
+msgstr "內嵌式字幕清單"
+
+#: src/ghb3.ui:8829
+msgid "Enable settings to select embedded subtitles"
+msgstr "啟用此設定以選擇內嵌式字幕"
+
+#: src/ghb3.ui:8856 src/ghb3.ui:9199
+msgid "Source Track"
+msgstr "來源軌道"
+
+#: src/ghb3.ui:8871
+msgid "List of subtitle tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:8885 src/ghb3.ui:9229
+msgid "Track Name:"
+msgstr "軌道名稱"
+
+#: src/ghb3.ui:8901
+msgid ""
+"Set the subtitle track name.\n"
+"\n"
+"Players may use this in the subtitle selection list."
+msgstr ""
+
+#: src/ghb3.ui:8934
+msgid "Language"
+msgstr "語言"
+
+#: src/ghb3.ui:8948
+msgid "Character Code"
+msgstr ""
+
+#: src/ghb3.ui:8962
+msgid "File:"
+msgstr "檔案："
+
+#: src/ghb3.ui:8977
+msgid "Offset (ms)"
+msgstr ""
+
+#: src/ghb3.ui:8992
+msgid ""
+"Set the language of this subtitle.\n"
+"This value will be used by players in subtitle menus."
+msgstr ""
+
+#: src/ghb3.ui:9010
+msgid ""
+"Set the character code used by the SRT file you are importing.\n"
+"\n"
+"SRTs come in all flavours of character sets.\n"
+"We translate the character set to UTF-8.\n"
+"The source's character code is needed in order to perform this translation."
+msgstr ""
+
+#: src/ghb3.ui:9034
+msgid "Select the SRT file to import."
+msgstr "選擇要匯入的 SRT 檔案。"
+
+#: src/ghb3.ui:9037
+msgid "Import File"
+msgstr ""
+
+#: src/ghb3.ui:9055
+msgid "Adjust the offset in milliseconds between video and SRT timestamps"
+msgstr ""
+
+#: src/ghb3.ui:9079
+msgid "Forced Subtitles Only"
+msgstr ""
+
+#: src/ghb3.ui:9100
+msgid "Burn into video"
+msgstr ""
+
+#: src/ghb3.ui:9105
+msgid ""
+"Render the subtitle over the video.\n"
+"The subtitle will be part of the video and can not be disabled."
+msgstr ""
+
+#: src/ghb3.ui:9117
+msgid "Set Default Track"
+msgstr "設定預設軌道"
+
+#: src/ghb3.ui:9215
+msgid "List of audio tracks available from your source."
+msgstr ""
+
+#: src/ghb3.ui:9245
+msgid ""
+"Set the audio track name.\n"
+"\n"
+"Players may use this in the audio selection list."
+msgstr ""
+
+#: src/ghb3.ui:9308
+msgid "Mix"
+msgstr ""
+
+#: src/ghb3.ui:9321
+msgid "Sample Rate"
+msgstr "取樣率"
+
+#: src/ghb3.ui:9351 src/ghb3.ui:9590 src/audiohandler.c:1917
+msgid ""
+"Dynamic Range Compression: Adjust the dynamic range of the output audio track.\n"
+"\n"
+"For source audio that has a wide dynamic range (very loud and very soft sequences),\n"
+"DRC allows you to 'compress' the range by making loud sounds softer and soft sounds louder."
+msgstr ""
+
+#: src/ghb3.ui:9372 src/audiohandler.c:1768
+msgid "Set the audio codec to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9394 src/audiohandler.c:1782
+msgid "Bitrate"
+msgstr "位元速率"
+
+#: src/ghb3.ui:9399
+msgid "Enable bitrate setting"
+msgstr "啟用位元速率設定"
+
+#: src/ghb3.ui:9409 src/audiohandler.c:1787
+msgid "Quality"
+msgstr "品質"
+
+#: src/ghb3.ui:9414
+msgid "Enable quality setting"
+msgstr "啟用品質設定"
+
+#: src/ghb3.ui:9435 src/audiohandler.c:1801
+msgid "Set the bitrate to encode this track with."
+msgstr ""
+
+#: src/ghb3.ui:9455
+msgid ""
+"Quality: For output codec's that support it, adjust the quality of "
+"the output."
+msgstr ""
+
+#: src/ghb3.ui:9477
+msgid "00.0"
+msgstr ""
+
+#: src/ghb3.ui:9504 src/audiohandler.c:1853
+msgid "Set the mixdown of the output audio track."
+msgstr ""
+
+#: src/ghb3.ui:9520 src/audiohandler.c:1866
+msgid "Set the sample rate of the output audio track."
+msgstr "設定輸出檔案的音軌取樣率。"
+
+#: src/ghb3.ui:9543 src/audiohandler.c:1887
+msgid ""
+"Audio Gain: Adjust the amplification or attenuation of the output "
+"audio track."
+msgstr ""
+
+#. Audio Gain Label
+#: src/ghb3.ui:9561 src/audiohandler.c:1897
+msgid "0dB"
+msgstr "0dB"
+
+#. Audio DRC Label
+#: src/ghb3.ui:9608 src/audiohandler.c:416 src/audiohandler.c:754
+#: src/audiohandler.c:1157 src/audiohandler.c:1931 src/callbacks.c:5232
+#: src/hb-backend.c:122 src/hb-backend.c:200 src/hb-backend.c:212
+#: src/hb-backend.c:224 src/hb-backend.c:236 src/hb-backend.c:262
+#: src/hb-backend.c:274 src/hb-backend.c:286 src/hb-backend.c:347
+msgid "Off"
+msgstr "關閉"
+
+#: src/ghb3.ui:9644
+msgid "Skip This Version"
+msgstr "略過此版本"
+
+#: src/ghb3.ui:9652
+msgid "Remind Me Later"
+msgstr "稍後提醒我"
+
+#: src/ghb3.ui:9721
+msgid "A new version of HandBrake is available!"
+msgstr "新版的 HandBrake 已可使用！"
+
+#: src/ghb3.ui:9737
+msgid "HandBrake xxx is now available (you have yyy)."
+msgstr "HandBrake xxx 目前已可使用 (您有 yyy)。"
+
+#: src/ghb3.ui:9765
+msgid "Release Notes"
+msgstr "發行公告"
+
+#: src/audiohandler.c:428 src/audiohandler.c:750 src/audiohandler.c:1225
+#, c-format
+msgid "%ddB"
+msgstr "%ddB"
+
+#: src/audiohandler.c:726
+msgid "Quality: "
+msgstr "品質："
+
+#: src/audiohandler.c:733
+#, c-format
+msgid "Bitrate: %dkbps\n"
+msgstr "位元速率： %d kbps\n"
+
+#: src/audiohandler.c:745
+#, c-format
+msgid "%.4gkHz"
+msgstr "%.4gkHz"
+
+#: src/audiohandler.c:760
+#, c-format
+msgid "%d - %s (%.4gkHz)"
+msgstr "%d - %s (%.4gkHz)"
+
+#: src/audiohandler.c:765
+#, c-format
+msgid "Bitrate: %.4gkbps"
+msgstr "位元速率：%.4gkbps"
+
+#: src/audiohandler.c:771
+msgid "Passthrough"
+msgstr ""
+
+#: src/audiohandler.c:780
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s\n"
+"Track Name: %s"
+msgstr ""
+"%s增益：%s\n"
+"DRC：%s\n"
+"軌道名稱：%s"
+
+#: src/audiohandler.c:785
+#, c-format
+msgid ""
+"%sGain: %s\n"
+"DRC: %s"
+msgstr ""
+"%s增益：%s\n"
+"DRC：%s"
+
+#: src/audiohandler.c:1746
+msgid ""
+"Add an audio encoder.\n"
+"Each selected source track will be encoded with all selected encoders."
+msgstr ""
+
+#: src/audiohandler.c:1826
+msgid ""
+"Audio Quality:\n"
+"For encoders that support it, adjust the quality of the output."
+msgstr ""
+
+#: src/audiohandler.c:1946
+msgid "Remove this audio encoder"
+msgstr "刪除此音訊編碼器"
+
+#: src/callbacks.c:793 src/callbacks.c:2144
+msgid "Closing HandBrake will terminate encoding.\n"
+msgstr "關閉 HandBrake 將終止編碼。\n"
+
+#: src/callbacks.c:1378
+msgid "Not Selected"
+msgstr ""
+
+#. This needs to be in scanning and working since scanning
+#. happens fast enough that it can be missed
+#: src/callbacks.c:1711 src/callbacks.c:4182
+msgid "Scanning ..."
+msgstr "掃描中..."
+
+#: src/callbacks.c:1747 src/callbacks.c:1748
+msgid "Stop Scan"
+msgstr "停止掃描"
+
+#: src/callbacks.c:2735 src/hb-backend.c:2085 src/hb-backend.c:2205
+#: src/hb-backend.c:2217
+msgid "No Title Found"
+msgstr ""
+
+#: src/callbacks.c:2736
+msgid "New Video"
+msgstr "新影片"
+
+#: src/callbacks.c:3522 src/callbacks.c:3544 src/callbacks.c:3563
+#: src/callbacks.c:3595
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s in %d seconds ..."
+msgstr ""
+
+#: src/callbacks.c:3666 src/callbacks.c:3708
+#, c-format
+msgid "%sYour movie will be lost if you don't continue encoding."
+msgstr ""
+
+#: src/callbacks.c:3669 src/callbacks.c:3711 src/queuehandler.c:1777
+msgid "Cancel Current and Stop"
+msgstr "取消目前的，並停止"
+
+#: src/callbacks.c:3670
+msgid "Cancel Current, Start Next"
+msgstr "取消目前的，並開始下一個"
+
+#: src/callbacks.c:3671
+msgid "Finish Current, then Stop"
+msgstr "完成目前的，並停止"
+
+#: src/callbacks.c:3672 src/callbacks.c:3712
+msgid "Continue Encoding"
+msgstr "繼續編碼"
+
+#: src/callbacks.c:3890
+#, c-format
+msgid "%d encode pending"
+msgstr ""
+
+#: src/callbacks.c:3894
+#, c-format
+msgid "%d encodes pending"
+msgstr ""
+
+#: src/callbacks.c:3951 src/callbacks.c:4019
+#, c-format
+msgid "job %d of %d, "
+msgstr "工作 %d/%d，"
+
+#: src/callbacks.c:3961
+#, c-format
+msgid "pass %d (subtitle scan) of %d, "
+msgstr ""
+
+#: src/callbacks.c:3966
+#, c-format
+msgid "pass %d of %d, "
+msgstr ""
+
+#: src/callbacks.c:3979
+#, c-format
+msgid "Encoding: %s%s%.2f %% (%.2f fps, avg %.2f fps, ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3989 src/callbacks.c:4029
+#, c-format
+msgid "Encoding: %s%s%.2f %% (ETA %02dh%02dm%02ds)"
+msgstr ""
+
+#: src/callbacks.c:3999 src/callbacks.c:4038
+#, c-format
+msgid "Encoding: %s%s%.2f %%"
+msgstr ""
+
+#: src/callbacks.c:4025
+msgid "Searching for start time, "
+msgstr ""
+
+#: src/callbacks.c:4100
+#, c-format
+msgid "Scanning title %d of %d..."
+msgstr ""
+
+#: src/callbacks.c:4104
+#, c-format
+msgid "Scanning title %d of %d preview %d..."
+msgstr ""
+
+#: src/callbacks.c:4193
+msgid "Paused"
+msgstr ""
+
+#: src/callbacks.c:4224
+msgid "Encode Done!"
+msgstr "編碼完成！"
+
+#: src/callbacks.c:4228
+msgid "Encode Canceled."
+msgstr "已取消編碼。"
+
+#: src/callbacks.c:4233
+msgid "Encode Failed."
+msgstr "編碼失敗。"
+
+#: src/callbacks.c:4275
+msgid "Muxing: This may take a while..."
+msgstr ""
+
+#: src/callbacks.c:4877
+msgid "Scan this DVD source"
+msgstr "掃描此 DVD 來源"
+
+#: src/callbacks.c:5265
+#, c-format
+msgid "HandBrake %s/%s is now available (you have %s/%d)."
+msgstr "HandBrake %s/%s 已經可供使用（您有 %s/%d）。"
+
+#: src/callbacks.c:5446
+msgid "Encode Complete"
+msgstr "編碼完畢"
+
+#: src/callbacks.c:5448
+msgid "Put down that cocktail, Your HandBrake queue is done!"
+msgstr ""
+
+#: src/callbacks.c:5461 src/callbacks.c:5471 src/callbacks.c:5479
+msgid "Your encode is complete."
+msgstr "您的編碼工作已經完成。"
+
+#: src/callbacks.c:5462
+msgid "Shutting down the computer"
+msgstr "關機"
+
+#: src/callbacks.c:5472
+msgid "Putting computer to sleep"
+msgstr ""
+
+#: src/callbacks.c:5480
+msgid "Quitting Handbrake"
+msgstr "退出 HandBrake"
+
+#: src/hb-backend.c:60 src/hb-backend.c:85
+msgid "First Track Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:61 src/hb-backend.c:86
+msgid "All Tracks Matching Selected Languages"
+msgstr ""
+
+#: src/hb-backend.c:72
+msgid "Foreign Audio Subtitle Track"
+msgstr ""
+
+#: src/hb-backend.c:73
+msgid "First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:74
+msgid "Foreign Audio, then First Selected Track"
+msgstr ""
+
+#: src/hb-backend.c:96
+msgid "Chapters:"
+msgstr "章節："
+
+#: src/hb-backend.c:97
+msgid "Seconds:"
+msgstr ""
+
+#: src/hb-backend.c:98
+msgid "Frames:"
+msgstr ""
+
+#: src/hb-backend.c:108
+msgid "Do Nothing"
+msgstr "什麼都不做"
+
+#: src/hb-backend.c:109
+msgid "Show Notification"
+msgstr "顯示通知"
+
+#: src/hb-backend.c:110
+msgid "Quit Handbrake"
+msgstr "退出 HandBrake"
+
+#: src/hb-backend.c:111
+msgid "Put Computer To Sleep"
+msgstr ""
+
+#: src/hb-backend.c:112
+msgid "Shutdown Computer"
+msgstr "關機"
+
+#: src/hb-backend.c:123 src/hb-backend.c:252
+msgid "Automatic"
+msgstr ""
+
+#: src/hb-backend.c:124
+msgid "Loose"
+msgstr ""
+
+#: src/hb-backend.c:125 src/hb-backend.c:337
+msgid "Custom"
+msgstr ""
+
+#: src/hb-backend.c:161
+msgid "Week"
+msgstr ""
+
+#: src/hb-backend.c:162
+msgid "Month"
+msgstr ""
+
+#: src/hb-backend.c:163
+msgid "Year"
+msgstr ""
+
+#: src/hb-backend.c:164
+msgid "Immortal"
+msgstr ""
+
+#: src/hb-backend.c:174
+msgid "Never"
+msgstr "永不"
+
+#: src/hb-backend.c:175
+msgid "Daily"
+msgstr "每天"
+
+#: src/hb-backend.c:176
+msgid "Weekly"
+msgstr "每週"
+
+#: src/hb-backend.c:177
+msgid "Monthly"
+msgstr "每月"
+
+#: src/hb-backend.c:201
+msgid "Decomb"
+msgstr ""
+
+#: src/hb-backend.c:202
+msgid "Yadif"
+msgstr ""
+
+#: src/hb-backend.c:213
+msgid "NLMeans"
+msgstr "NLMeans"
+
+#: src/hb-backend.c:214
+msgid "HQDN3D"
+msgstr "HQDN3D"
+
+#: src/hb-backend.c:225
+msgid "Unsharp"
+msgstr ""
+
+#: src/hb-backend.c:226
+msgid "Lapsharp"
+msgstr ""
+
+#: src/hb-backend.c:237
+msgid "90 Degrees"
+msgstr "90 度"
+
+#: src/hb-backend.c:238
+msgid "180 Degrees"
+msgstr "180 度"
+
+#: src/hb-backend.c:239
+msgid "270 Degrees"
+msgstr "270 度"
+
+#: src/hb-backend.c:250
+msgid "Spatial"
+msgstr ""
+
+#: src/hb-backend.c:251
+msgid "Temporal"
+msgstr ""
+
+#: src/hb-backend.c:263
+msgid "Fast"
+msgstr ""
+
+#: src/hb-backend.c:264
+msgid "Optimal"
+msgstr ""
+
+#: src/hb-backend.c:275
+msgid "Strict"
+msgstr ""
+
+#: src/hb-backend.c:276
+msgid "Normal"
+msgstr ""
+
+#: src/hb-backend.c:287
+msgid "Simple"
+msgstr ""
+
+#: src/hb-backend.c:288
+msgid "Smart"
+msgstr ""
+
+#: src/hb-backend.c:298
+msgid "Diamond"
+msgstr ""
+
+#: src/hb-backend.c:299
+msgid "Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:300
+msgid "Uneven Multi-Hexagon"
+msgstr ""
+
+#: src/hb-backend.c:301
+msgid "Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:302
+msgid "Hadamard Exhaustive"
+msgstr ""
+
+#: src/hb-backend.c:312
+msgid "0: SAD, no subpel"
+msgstr ""
+
+#: src/hb-backend.c:313
+msgid "1: SAD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:314
+msgid "2: SATD, qpel"
+msgstr ""
+
+#: src/hb-backend.c:315
+msgid "3: SATD: multi-qpel"
+msgstr ""
+
+#: src/hb-backend.c:316
+msgid "4: SATD, qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:317
+msgid "5: SATD, multi-qpel on all"
+msgstr ""
+
+#: src/hb-backend.c:318
+msgid "6: RD in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:319
+msgid "7: RD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:320
+msgid "8: RD refine in I/P-frames"
+msgstr ""
+
+#: src/hb-backend.c:321
+msgid "9: RD refine in all frames"
+msgstr ""
+
+#: src/hb-backend.c:322
+msgid "10: QPRD in all frames"
+msgstr ""
+
+#: src/hb-backend.c:323
+msgid "11: No early terminations in analysis"
+msgstr ""
+
+#: src/hb-backend.c:333
+msgid "Most"
+msgstr ""
+
+#: src/hb-backend.c:335
+msgid "Some"
+msgstr ""
+
+#: src/hb-backend.c:336 src/main.c:1151 src/queuehandler.c:1607
+msgid "All"
+msgstr "全部"
+
+#: src/hb-backend.c:348
+msgid "Encode only"
+msgstr ""
+
+#: src/hb-backend.c:349
+msgid "Always"
+msgstr ""
+
+#: src/hb-backend.c:1346 src/hb-backend.c:1406 src/hb-backend.c:1485
+msgid "Same as source"
+msgstr ""
+
+#: src/hb-backend.c:1499
+msgid "(NTSC Film)"
+msgstr ""
+
+#: src/hb-backend.c:1503
+msgid "(PAL Film/Video)"
+msgstr ""
+
+#: src/hb-backend.c:1507
+msgid "(NTSC Video)"
+msgstr ""
+
+#: src/hb-backend.c:2074
+#, c-format
+msgid "%s - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2224
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - %s"
+msgstr ""
+
+#: src/hb-backend.c:2243
+#, c-format
+msgid "%3d - %02dh%02dm%02ds - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2249
+#, c-format
+msgid "%3d - (%05d.MPLS)"
+msgstr ""
+
+#: src/hb-backend.c:2255
+#, c-format
+msgid "%3d - %02dh%02dm%02ds"
+msgstr ""
+
+#: src/hb-backend.c:2289
+msgid "No Titles"
+msgstr ""
+
+#. No audio. set some default
+#: src/hb-backend.c:2574
+msgid "No Audio"
+msgstr "無音訊"
+
+#: src/hb-backend.c:4170
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4177
+#, c-format
+msgid ""
+"Invalid Detelecine Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4203
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4210
+#, c-format
+msgid ""
+"Invalid Comb Detect Settings:\n"
+"\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4239
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4248
+#, c-format
+msgid ""
+"Invalid Deinterlace Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+msgstr ""
+
+#: src/hb-backend.c:4277
+#, c-format
+msgid ""
+"Invalid Denoise Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"無效的降噪設定：\n"
+"\n"
+"濾鏡：\t%s\n"
+"預設檔：\t%s\n"
+"微調：\t%s\n"
+"自訂：\t%s\n"
+
+#: src/hb-backend.c:4305
+#, c-format
+msgid ""
+"Invalid Sharpen Settings:\n"
+"\n"
+"Filter:\t%s\n"
+"Preset:\t%s\n"
+"Tune:\t%s\n"
+"Custom:\t%s\n"
+msgstr ""
+"無效的銳利化設定：\n"
+"\n"
+"濾鏡：\t%s\n"
+"預設檔：\t%s\n"
+"微調：\t%s\n"
+"自訂：\t%s\n"
+
+#: src/hb-backend.c:4339
+msgid ""
+"Theora is not supported in the MP4 container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, FFMPEG will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4349
+msgid ""
+"Only VP8 or VP9 is supported in the WebM container.\n"
+"\n"
+"You should choose a different video codec or container.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4358 src/hb-backend.c:4415 src/hb-backend.c:4435
+#: src/hb-backend.c:4455 src/hb-backend.c:4516 src/hb-backend.c:4571
+msgid "Continue"
+msgstr "繼續"
+
+#. No valid title, stop right there
+#: src/hb-backend.c:4384 src/hb-backend.c:4480
+msgid "No title found.\n"
+msgstr ""
+
+#: src/hb-backend.c:4411
+msgid ""
+"Only one subtitle may be burned into the video.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4431
+msgid ""
+"WebM in HandBrake only supports burned subtitles.\n"
+"\n"
+"You should change your subtitle selections.\n"
+"If you continue, some subtitles will be lost."
+msgstr ""
+
+#: src/hb-backend.c:4451
+msgid ""
+"SRT file does not exist or not a regular file.\n"
+"\n"
+"You should choose a valid file.\n"
+"If you continue, this subtitle will be ignored."
+msgstr ""
+
+#: src/hb-backend.c:4512
+msgid ""
+"The source does not support Pass-Thru.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/hb-backend.c:4567
+#, c-format
+msgid ""
+"%s is not supported in the %s container.\n"
+"\n"
+"You should choose a different audio codec.\n"
+"If you continue, one will be chosen for you."
+msgstr ""
+
+#: src/main.c:97
+#, c-format
+msgid ""
+"<big>Unable to create %s.</big>\n"
+"\n"
+"Internal error. Could not parse UI description.\n"
+"%s"
+msgstr ""
+
+#: src/main.c:235 src/main.c:300
+msgid "Track Information"
+msgstr "軌道資訊"
+
+#: src/main.c:362
+msgid "Preset Name"
+msgstr "預設檔名稱"
+
+#: src/main.c:580
+msgid "The device or file to encode"
+msgstr ""
+
+#: src/main.c:581
+msgid "The preset values to use for encoding"
+msgstr ""
+
+#: src/main.c:582
+msgid "Spam a lot"
+msgstr ""
+
+#: src/main.c:583
+msgid "The path to override user config dir"
+msgstr ""
+
+#: src/main.c:585
+msgid "Open a console for debug output"
+msgstr ""
+
+#: src/presets.c:1232
+msgid "ghb_presets_menu_init: Failed to find presets folder."
+msgstr ""
+
+#: src/presets.c:1388
+msgid "Failed to find parent folder when adding child."
+msgstr ""
+
+#: src/presets.c:1848
+msgid ""
+"Presets found are newer than what is supported by this version of HandBrake!\n"
+"\n"
+"Would you like to continue?"
+msgstr ""
+
+#: src/presets.c:1851
+msgid "Get me out of here!"
+msgstr "帶我離開這裡！"
+
+#: src/presets.c:1851
+msgid "Load backup presets"
+msgstr ""
+
+#: src/presets.c:1997
+msgid "All (*)"
+msgstr "全部 (*)"
+
+#: src/presets.c:2002
+msgid "Presets (*.json)"
+msgstr "預設檔 (*.json)"
+
+#: src/presets.c:2008
+msgid "Legacy Presets (*.plist)"
+msgstr ""
+
+#: src/presets.c:2104
+msgid "Export Preset"
+msgstr "匯出預設檔"
+
+#: src/presets.c:2445
+#, c-format
+msgid ""
+"Confirm deletion of %s:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/presets.c:2446
+msgid "folder"
+msgstr "資料夾"
+
+#: src/presets.c:2446
+msgid "preset"
+msgstr "預設檔"
+
+#: src/preview.c:487
+#, c-format
+msgid ""
+"Missing GStreamer plugin\n"
+"Audio or Video may not play as expected\n"
+"\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:196
+#, c-format
+msgid "%s (Modified)"
+msgstr ""
+
+#: src/queuehandler.c:285
+msgid "Align A/V"
+msgstr ""
+
+#: src/queuehandler.c:295
+msgid "iPod 5G"
+msgstr ""
+
+#: src/queuehandler.c:327
+#, c-format
+msgid ""
+"%d:%d:%d:%d Crop\n"
+"%dx%d storage, %dx%d display\n"
+"%d:%d Pixel Aspect Ratio\n"
+"%s Display Aspect Ratio"
+msgstr ""
+
+#: src/queuehandler.c:358
+#, c-format
+msgid "%s, Bitrate %dkbps"
+msgstr ""
+
+#: src/queuehandler.c:363
+#, c-format
+msgid "%s, Bitrate %dkbps (2 Pass)"
+msgstr ""
+
+#: src/queuehandler.c:370
+#, c-format
+msgid "%s, Constant Quality %.4g(%s)"
+msgstr ""
+
+#: src/queuehandler.c:403
+#, c-format
+msgid "%sPreset %s"
+msgstr ""
+
+#: src/queuehandler.c:408
+#, c-format
+msgid "%sTune %s"
+msgstr ""
+
+#: src/queuehandler.c:413
+#, c-format
+msgid "%sProfile %s"
+msgstr ""
+
+#: src/queuehandler.c:418
+#, c-format
+msgid "%sLevel %s"
+msgstr ""
+
+#: src/queuehandler.c:435
+#, c-format
+msgid ""
+"\n"
+"Constant Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:439
+#, c-format
+msgid ""
+"\n"
+"Peak Framerate %s fps (may be lower)"
+msgstr ""
+
+#: src/queuehandler.c:444
+#, c-format
+msgid ""
+"\n"
+"Variable Framerate %s fps"
+msgstr ""
+
+#: src/queuehandler.c:610 src/queuehandler.c:641
+msgid ", Forced Only"
+msgstr ""
+
+#: src/queuehandler.c:614 src/queuehandler.c:645
+msgid ", Burned"
+msgstr ""
+
+#: src/queuehandler.c:618 src/queuehandler.c:649
+msgid ", Default"
+msgstr ""
+
+#: src/queuehandler.c:705 src/queuehandler.c:1204
+msgid "Completed"
+msgstr ""
+
+#: src/queuehandler.c:709 src/queuehandler.c:1208
+msgid "Canceled"
+msgstr ""
+
+#: src/queuehandler.c:713 src/queuehandler.c:1212
+msgid "Failed"
+msgstr ""
+
+#: src/queuehandler.c:718
+msgid "Pending"
+msgstr ""
+
+#: src/queuehandler.c:754 src/queuehandler.c:782 src/queuehandler.c:1252
+#: src/queuehandler.c:1280
+#, c-format
+msgid "%d Day %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:757 src/queuehandler.c:785 src/queuehandler.c:1255
+#: src/queuehandler.c:1283
+#, c-format
+msgid "%d Days %02d:%02d:%02d"
+msgstr ""
+
+#: src/queuehandler.c:798 src/queuehandler.c:1296
+msgid "B"
+msgstr ""
+
+#: src/queuehandler.c:802 src/queuehandler.c:1300
+msgid "KB"
+msgstr ""
+
+#: src/queuehandler.c:807 src/queuehandler.c:1305
+msgid "MB"
+msgstr ""
+
+#: src/queuehandler.c:812 src/queuehandler.c:1310
+msgid "GB"
+msgstr ""
+
+#: src/queuehandler.c:823 src/queuehandler.c:1321
+msgid "Not Available"
+msgstr ""
+
+#: src/queuehandler.c:1156
+msgid "Foreign Audio Search"
+msgstr ""
+
+#: src/queuehandler.c:1160
+msgid "Encode"
+msgstr ""
+
+#: src/queuehandler.c:1164
+msgid "Encode First Pass (Analysis)"
+msgstr ""
+
+#: src/queuehandler.c:1168
+msgid "Encode Second Pass (Final)"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1173
+msgid "Error"
+msgstr "錯誤"
+
+#: src/queuehandler.c:1177
+#, c-format
+msgid ""
+"pass %d of %d\n"
+"%s"
+msgstr ""
+
+#: src/queuehandler.c:1189
+msgid "Scanning Title"
+msgstr ""
+
+#: src/queuehandler.c:1193
+msgid "Encoding Paused"
+msgstr ""
+
+#: src/queuehandler.c:1197
+msgid "Encoding In Progress"
+msgstr ""
+
+#. Should never happen
+#: src/queuehandler.c:1217
+msgid "Unknown"
+msgstr ""
+
+#: src/queuehandler.c:1770
+#, c-format
+msgid ""
+"%sThe destination filesystem is almost full: %<PRId64> MB free.\n"
+"Destination: %s\n"
+"Encode may be incomplete if you proceed.\n"
+msgstr ""
+
+#: src/queuehandler.c:1775
+msgid "Resume, I've fixed the problem"
+msgstr ""
+
+#: src/queuehandler.c:1776
+msgid "Resume, Don't tell me again"
+msgstr ""
+
+#: src/queuehandler.c:1830
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Another queued job has specified the same destination.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:1835 src/queuehandler.c:1881
+msgid "Overwrite"
+msgstr ""
+
+#: src/queuehandler.c:1848
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"This is not a valid directory."
+msgstr ""
+
+#: src/queuehandler.c:1862
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"Can not read or write the directory."
+msgstr ""
+
+#: src/queuehandler.c:1876
+#, c-format
+msgid ""
+"Destination: %s\n"
+"\n"
+"File already exists.\n"
+"Do you want to overwrite?"
+msgstr ""
+
+#: src/queuehandler.c:2189
+msgid "Select this title for adding to the queue.\n"
+msgstr ""
+
+#. Title label
+#: src/queuehandler.c:2197
+msgid "No Title"
+msgstr ""
+
+#: src/queuehandler.c:2207
+msgid ""
+"There is another title with the same destination file name.\n"
+"This title will not be added to the queue unless you change\n"
+"the output file name.\n"
+msgstr ""
+
+#: src/queuehandler.c:2371 src/queuehandler.c:2384
+msgid "Stop"
+msgstr ""
+
+#: src/queuehandler.c:2372 src/queuehandler.c:2385 src/queuehandler.c:2397
+msgid "Stop Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2396
+msgid "S_top Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2409 src/queuehandler.c:2422
+msgid "Resume"
+msgstr ""
+
+#: src/queuehandler.c:2410 src/queuehandler.c:2423 src/queuehandler.c:2435
+msgid "Resume Encoding"
+msgstr ""
+
+#: src/queuehandler.c:2434
+msgid "_Resume Encoding"
+msgstr "繼續編碼 (R)"
+
+#: src/queuehandler.c:3065
+msgid ""
+"You are currently encoding. What would you like to do?\n"
+"\n"
+msgstr ""
+
+#: src/subtitlehandler.c:1379
+#, c-format
+msgid "Preferred Language: %s"
+msgstr "偏好的語言：%s"
+
+#: src/subtitlehandler.c:1393
+#, c-format
+msgid "Add %s subtitle track if default audio is not %s"
+msgstr ""
+
+#: src/subtitlehandler.c:1398
+msgid "Add subtitle track if default audio is not your preferred language"
+msgstr ""
+
+#: src/videohandler.c:202
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"%s\""
+msgstr ""
+
+#: src/videohandler.c:205
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Expanded Options:\n"
+"\"\""
+msgstr ""
+
+#: src/videohandler.c:349
+#, c-format
+msgid "%s: %.4g (Warning: lossless)"
+msgstr ""

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/Makefile.am -> HandBrake-1.5.1.tar.xz/gtk/src/Makefile.am Changed

@@ -39,16 +39,18 @@
 
 hb_menu = fr.handbrake.ghb.desktop
 
-appdatadir = $(datarootdir)/metainfo
-appdata_in_files = fr.handbrake.ghb.appdata.xml.in
-appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-dist_appdata_DATA = $(appdata_files)
+metainfodir = $(datarootdir)/metainfo
+metainfo_in_files = fr.handbrake.ghb.metainfo.xml.in
+if ! MINGW
+metainfo_DATA = $(metainfo_in_files:.xml.in=.xml)
+dist_metainfo_DATA = $(metainfo_files)
+endif
 
 EXTRA_DIST = \
-	$(appdata_in_files)
+	$(metainfo_in_files)
 
 DISTCLEANFILES = \
-	$(appdata_files)
+	$(metainfo_files)
 
 AM_CPPFLAGS = \
 	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
@@ -115,7 +117,7 @@
 
 if MINGW
 ghb_LDFLAGS = \
-	-mwindows -Wl,--export-dynamic -Wl,--exclude-libs,ALL
+	-mwindows
 else
 ghb_LDFLAGS = \
 	-Wl,--export-dynamic -Wl,--exclude-libs,ALL
@@ -134,12 +136,13 @@
 icon_res.o: icon_res.c icon_res.h
 icons.o: icon_res.h
 
-data_res.c : data_res.gresource.xml $(srcdir)/internal_defaults.json widget.deps widget_reverse.deps
-	cp $(srcdir)/internal_defaults.json .
+internal_defaults.json : internal_defaults.json.template
+	cp $(srcdir)/internal_defaults.json.template $@
+
+data_res.c : data_res.gresource.xml internal_defaults.json widget.deps widget_reverse.deps
 	glib-compile-resources --generate --target=$@ --c-name ghb_data --manual-register $<
 
-data_res.h : data_res.gresource.xml $(srcdir)/internal_defaults.json widget.deps widget_reverse.deps
-	cp $(srcdir)/internal_defaults.json .
+data_res.h : data_res.gresource.xml internal_defaults.json widget.deps widget_reverse.deps
 	glib-compile-resources --generate --target=$@ --c-name ghb_data --manual-register $<
 
 if GHB_GTK_4_00
@@ -172,10 +175,10 @@
 widget.deps: makedeps.py
 	$(HB_PYTHON) $(srcdir)/makedeps.py
 
-fr.handbrake.ghb.appdata.xml: fr.handbrake.ghb.appdata.xml.in
+fr.handbrake.ghb.metainfo.xml: fr.handbrake.ghb.metainfo.xml.in
 	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
-fr.handbrake.ghb.appdata.xml.in: fr.handbrake.ghb.appdata.template.xml
+fr.handbrake.ghb.metainfo.xml.in: fr.handbrake.ghb.metainfo.template.xml
 	sed -e 's^RELEASE_TAG^<release version="$(HB.version)" date="$(word 1,$(HB.repo.date))" />^' $< > $@
 
 $(srcdir)/marshalers.h: marshalers.list

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/appcast.c -> HandBrake-1.5.1.tar.xz/gtk/src/appcast.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/appcast.h -> HandBrake-1.5.1.tar.xz/gtk/src/appcast.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/audiohandler.c -> HandBrake-1.5.1.tar.xz/gtk/src/audiohandler.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/audiohandler.h -> HandBrake-1.5.1.tar.xz/gtk/src/audiohandler.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/callbacks.c -> HandBrake-1.5.1.tar.xz/gtk/src/callbacks.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * callbacks.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * callbacks.c is free software.
 *
@@ -749,14 +749,14 @@
 }
 
 void
-ghb_check_all_depencencies(signal_user_data_t *ud)
+ghb_check_all_dependencies(signal_user_data_t *ud)
 {
 GhbDictIter iter;
 const gchar *dep_name;
 GhbValue *value;
 GObject *dep_object;
 
- g_debug("ghb_check_all_depencencies ()");
+ g_debug("ghb_check_all_dependencies ()");
 if (rev_map == NULL) return;
 iter = ghb_dict_iter_init(rev_map);
 while (ghb_dict_iter_next(rev_map, &iter, &dep_name, &value))
@@ -1349,7 +1349,7 @@
 
 dialog = GHB_WIDGET(ud->builder, "source_dialog");
 device = gtk_combo_box_text_get_active_text(combo);
- // Protext against unexpected NULL return value
+ // Protects against unexpected NULL return value
 if (device != NULL)
 {
 name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
@@ -1388,6 +1388,15 @@
 gtk_combo_box_set_active(GTK_COMBO_BOX(combo), 0);
 }
 
+void ghb_break_pts_duration(gint64 ptsDuration, gint *hh, gint *mm, gdouble *ss)
+{
+ *hh = ptsDuration / (90000 * 60 * 60);
+ ptsDuration -= *hh * 90000 * 60 * 60;
+ *mm = ptsDuration / (90000 * 60);
+ ptsDuration -= *mm * 90000 * 60;
+ *ss = (gdouble)ptsDuration / 90000;
+}
+
 void ghb_break_duration(gint64 duration, gint *hh, gint *mm, gint *ss)
 {
 *hh = duration / (60*60);
@@ -1660,7 +1669,7 @@
 ud->scale_busy = TRUE;
 
 ghb_set_widget_ranges(ud, ud->settings);
- ghb_check_all_depencencies(ud);
+ ghb_check_all_dependencies(ud);
 ghb_show_container_options(ud);
 check_chapter_markers(ud);
 
@@ -2197,42 +2206,6 @@
 return aspect;
 }
 
-static void
-update_aspect_info(signal_user_data_t *ud)
-{
-}
-
-static void
-update_crop_info(signal_user_data_t *ud)
-{
- GtkWidget *widget;
- gchar *text;
- gint width, height, crop4 = {0,};
- gint title_id, titleindex;
- const hb_title_t *title;
-
- title_id = ghb_dict_get_int(ud->settings, "title");
- title = ghb_lookup_title(title_id, &titleindex);
- if (title != NULL)
- {
- crop0 = ghb_dict_get_int(ud->settings, "PictureTopCrop");
- crop1 = ghb_dict_get_int(ud->settings, "PictureBottomCrop");
- crop2 = ghb_dict_get_int(ud->settings, "PictureLeftCrop");
- crop3 = ghb_dict_get_int(ud->settings, "PictureRightCrop");
- width = title->geometry.width - crop2 - crop3;
- height = title->geometry.height - crop0 - crop1;
- text = g_strdup_printf ("%d x %d", width, height);
- widget = GHB_WIDGET(ud->builder, "crop_dimensions2");
- gtk_label_set_text(GTK_LABEL(widget), text);
- g_free(text);
- }
-}
-
-static void
-update_scale_info(signal_user_data_t *ud)
-{
-}
-
 void
 ghb_update_title_info(signal_user_data_t *ud)
 {
@@ -2273,21 +2246,26 @@
 widget = GHB_WIDGET(ud->builder, "source_info_label");
 gtk_label_set_text(GTK_LABEL(widget), text);
 free(text);
- free(aspect);
 free(rate);
 
- ghb_update_display_aspect_label(ud);
+ text = g_strdup_printf("%d x %d", geo->width, geo->height);
+ ghb_ui_update(ud, "source_storage_size", ghb_string_value(text));
+ g_free(text);
+
+ text = g_strdup_printf("%d x %d", geo->width * geo->par.num / geo->par.den,
+ geo->height);
+ ghb_ui_update(ud, "source_display_size", ghb_string_value(text));
+ g_free(text);
 
- update_crop_info(ud);
- update_aspect_info(ud);
- update_scale_info(ud);
+ ghb_ui_update(ud, "source_aspect_ratio", ghb_string_value(aspect));
+ free(aspect);
 }
 
 static void update_meta(GhbValue *settings, const char *name, const char *val)
 {
 GhbValue *metadata = ghb_get_job_metadata_settings(settings);
 
- if (val == NULL)
+ if (val == NULL || val0 == 0)
 ghb_dict_remove(metadata, name);
 else
 ghb_dict_set_string(metadata, name, val);
@@ -2491,7 +2469,7 @@
 
 // Filters
 gboolean detel, comb_detect, deint, decomb, deblock, nlmeans, denoise;
- gboolean unsharp, lapsharp, rot, gray;
+ gboolean unsharp, lapsharp, hflip, rot, gray, colorspace, chroma_smooth;
 const char * sval;
 
 sval = ghb_dict_get_string(ud->settings, "PictureDetelecine");
@@ -2509,9 +2487,14 @@
 sval = ghb_dict_get_string(ud->settings, "PictureSharpenFilter");
 unsharp = sval != NULL && !strcasecmp(sval, "unsharp");
 lapsharp = sval != NULL && !strcasecmp(sval, "lapsharp");
- sval = ghb_dict_get_string(ud->settings, "PictureRotate");
- rot = sval != NULL && !!strcasecmp(sval, "disable=1");
+ hflip = ghb_dict_get_bool(ud->settings, "hflip");
+ sval = ghb_dict_get_string(ud->settings, "rotate");
+ rot = sval != NULL && !!strcasecmp(sval, "0");
 gray = ghb_dict_get_bool(ud->settings, "VideoGrayScale");
+ sval = ghb_dict_get_string(ud->settings, "PictureColorspacePreset");
+ colorspace = sval != NULL && !!strcasecmp(sval, "off");
+ sval = ghb_dict_get_string(ud->settings, "PictureChromaSmoothPreset");
+ chroma_smooth = sval != NULL && !!strcasecmp(sval, "off");
 
 str = g_string_new("");
 sval = "";
@@ -2557,21 +2540,27 @@
 g_string_append_printf(str, "%s%s", sval, filter->name);
 sval = ", ";
 }
+ if (chroma_smooth)
+ {
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_CHROMA_SMOOTH);
+ g_string_append_printf(str, "%s%s", sval, filter->name);
+ sval = ", ";
+ }
 if (unsharp)
 {
 hb_filter_object_t * filter = hb_filter_get(HB_FILTER_UNSHARP);
 g_string_append_printf(str, "%s%s", sval, filter->name);
 sval = ", ";
 }
- if (lapsharp)
+ if (rot || hflip)
 {
- hb_filter_object_t * filter = hb_filter_get(HB_FILTER_LAPSHARP);
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_ROTATE);
 g_string_append_printf(str, "%s%s", sval, filter->name);
 sval = ", ";
 }
- if (rot)
+ if (lapsharp)
 {
- hb_filter_object_t * filter = hb_filter_get(HB_FILTER_ROTATE);
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_LAPSHARP);
 g_string_append_printf(str, "%s%s", sval, filter->name);
 sval = ", ";
 }
@@ -2581,6 +2570,12 @@
 g_string_append_printf(str, "%s%s", sval, filter->name);
 sval = ", ";
 }
+ if (colorspace)
+ {
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_COLORSPACE);
+ g_string_append_printf(str, "%s%s", sval, filter->name);
+ sval = ", ";
+ }
 
 text = g_string_free(str, FALSE);
 widget = GHB_WIDGET(ud->builder, "filters_summary");
@@ -2593,8 +2588,8 @@
 
 width = ghb_dict_get_int(ud->settings, "scale_width");
 height = ghb_dict_get_int(ud->settings, "scale_height");
- display_width = ghb_dict_get_int(ud->settings, "PictureDisplayWidth");
- display_height = ghb_dict_get_int(ud->settings, "PictureDisplayHeight");
+ display_width = ghb_dict_get_int(ud->settings, "PictureDARWidth");
+ display_height = ghb_dict_get_int(ud->settings, "DisplayHeight");
 par_width = ghb_dict_get_int(ud->settings, "PicturePARWidth");
 par_height = ghb_dict_get_int(ud->settings, "PicturePARHeight");
 
@@ -2602,7 +2597,7 @@
 display_aspect = ghb_get_display_aspect_string(display_width,
 display_height);
 
- display_width = ghb_dict_get_int(ud->settings, "PictureDisplayWidth");
+ display_width = ghb_dict_get_int(ud->settings, "PictureDARWidth");
 text = g_strdup_printf("%dx%d storage, %dx%d display\n"
 "%d:%d Pixel Aspect Ratio\n"
 "%s Display Aspect Ratio",
@@ -2613,6 +2608,7 @@
 
 g_free(text);
 g_free(display_aspect);
+
 ghb_value_free(&titleDict);
 }
 
@@ -2652,15 +2648,25 @@
 ghb_dict_set_string(settings, "volume", label);
 g_free(label);
 
+
+ int angle, hflip;
+ hb_geometry_crop_t srcGeo;
+
+ srcGeo.geometry = title->geometry;
+ memcpy(srcGeo.crop, &title->crop, 4 * sizeof(int));
+ angle = ghb_dict_get_int(settings, "rotate");
+ hflip = ghb_dict_get_int(settings, "hflip");
+ hb_rotate_geometry(&srcGeo, &srcGeo, angle, hflip);
+ ghb_apply_crop(settings, &srcGeo);
+
 int crop4;
 
- ghb_apply_crop(settings, title);
 crop0 = ghb_dict_get_int(settings, "PictureTopCrop");
 crop1 = ghb_dict_get_int(settings, "PictureBottomCrop");
 crop2 = ghb_dict_get_int(settings, "PictureLeftCrop");
 crop3 = ghb_dict_get_int(settings, "PictureRightCrop");
 ghb_dict_set_int(settings, "scale_width",
- title->geometry.width - crop2 - crop3);
+ srcGeo.geometry.width - crop2 - crop3);
 
 // If anamorphic or keep_aspect, the height will
 // be automatically calculated
@@ -2674,50 +2680,59 @@
 pic_par == HB_ANAMORPHIC_CUSTOM)
 {
 ghb_dict_set_int(settings, "scale_height",
- title->geometry.height - crop0 - crop1);
+ srcGeo.geometry.height - crop0 - crop1);
 }
 
- ghb_set_scale_settings(settings, GHB_PIC_KEEP_PAR|GHB_PIC_USE_MAX);
+ ghb_set_scale_settings(ud, settings, GHB_PIC_USE_MAX);
 ghb_dict_set_int(settings, "angle_count", title->angle_count);
 
- ghb_dict_set_string(settings, "MetaName", title->name);
- update_meta(settings, "Name", title->name);
- if (title->metadata)
- {
- if (title->metadata->name)
- {
- ghb_dict_set_string(settings, "MetaName",
- title->metadata->name);
- update_meta(settings, "Name", title->metadata->name);
- }
- ghb_dict_set_string(settings, "MetaArtist",
- title->metadata->artist);
- update_meta(settings, "Artist", title->metadata->artist);
- ghb_dict_set_string(settings, "MetaReleaseDate",
- title->metadata->release_date);
- update_meta(settings, "ReleaseDate", title->metadata->release_date);
- ghb_dict_set_string(settings, "MetaComment",
- title->metadata->comment);
- update_meta(settings, "Comment", title->metadata->comment);
- if (!title->metadata->name && title->metadata->album)
+
+ // Clear UI settings for new title
+ ghb_dict_set_string(settings, "MetaName", "");
+ ghb_dict_set_string(settings, "MetaArtist", "");
+ ghb_dict_set_string(settings, "MetaReleaseDate", "");
+ ghb_dict_set_string(settings, "MetaComment", "");
+ ghb_dict_set_string(settings, "MetaAlbumArtist", "");
+ ghb_dict_set_string(settings, "MetaGenre", "");
+ ghb_dict_set_string(settings, "MetaDescription", "");
+ ghb_dict_set_string(settings, "MetaLongDescription", "");
+
+ if (ghb_dict_get_bool(settings, "MetadataPassthrough"))
+ {
+ ghb_dict_set_string(settings, "MetaName", title->name);
+ update_meta(settings, "Name", title->name);
+ if (title->metadata && title->metadata->dict)
 {
- ghb_dict_set_string(settings, "MetaName",
- title->metadata->album);
- update_meta(settings, "Name", title->metadata->album);
+
+ hb_dict_iter_t iter = hb_dict_iter_init(title->metadata->dict);
+
+ while (iter != HB_DICT_ITER_DONE)
+ {
+ const char * key;
+ hb_value_t * val;
+
+ hb_dict_iter_next_ex(title->metadata->dict, &iter, &key, &val);
+ if (key != NULL && val != NULL)
+ {
+ const char * str = hb_value_get_string(val);
+
+ update_meta(settings, key, str);
+
+ if (!strcmp(key, "Album"))
+ {
+ key = "Name";
+ }
+ char * ui_key = g_strdup_printf("Meta%s", key);
+ ghb_dict_set_string(settings, ui_key, str);
+ free(ui_key);
+ }
+ }
 }
- ghb_dict_set_string(settings, "MetaAlbumArtist",
- title->metadata->album_artist);
- update_meta(settings, "AlbumArtist", title->metadata->album_artist);
- ghb_dict_set_string(settings, "MetaGenre",
- title->metadata->genre);
- update_meta(settings, "Genre", title->metadata->genre);
- ghb_dict_set_string(settings, "MetaDescription",
- title->metadata->description);
- update_meta(settings, "Description", title->metadata->description);
- ghb_dict_set_string(settings, "MetaLongDescription",
- title->metadata->long_description);
- update_meta(settings, "LongDescription",
- title->metadata->long_description);
+ }
+ else
+ {
+ GhbValue * meta = ghb_get_job_metadata_settings(settings);
+ hb_dict_clear(meta);
 }
 ghb_sanitize_audio_track_settings(settings);
 }
@@ -2725,6 +2740,7 @@
 {
 ghb_dict_set_string(settings, "source_label", _("No Title Found"));
 ghb_dict_set_string(settings, "volume", _("New Video"));
+ ghb_set_scale_settings(ud, settings, GHB_PIC_USE_MAX);
 }
 
 set_destination_settings(ud, settings);
@@ -2910,6 +2926,85 @@
 }
 
 G_MODULE_EXPORT void
+meta_pass_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ setting_widget_changed_cb(widget, ud);
+
+ int title_id, titleindex;
+ const hb_title_t * title;
+
+ title_id = ghb_dict_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+
+ if (title != NULL &&
+ ghb_dict_get_bool(ud->settings, "MetadataPassthrough"))
+ {
+ // Reload metadata from title
+ ghb_dict_set_string(ud->settings, "MetaName", title->name);
+ update_meta(ud->settings, "Name", title->name);
+ if (title->metadata && title->metadata->dict)
+ {
+
+ hb_dict_iter_t iter = hb_dict_iter_init(title->metadata->dict);
+
+ while (iter != HB_DICT_ITER_DONE)
+ {
+ const char * key;
+ hb_value_t * val;
+
+ hb_dict_iter_next_ex(title->metadata->dict, &iter, &key, &val);
+ if (key != NULL && val != NULL)
+ {
+ const char * str = hb_value_get_string(val);
+
+ update_meta(ud->settings, key, str);
+
+ if (!strcmp(key, "Album"))
+ {
+ key = "Name";
+ }
+ char * ui_key = g_strdup_printf("Meta%s", key);
+ ghb_dict_set_string(ud->settings, ui_key, str);
+ free(ui_key);
+ }
+ }
+ }
+ }
+ else
+ {
+ // Clear metadata
+ ghb_dict_set_string(ud->settings, "MetaName", "");
+ ghb_dict_set_string(ud->settings, "MetaArtist", "");
+ ghb_dict_set_string(ud->settings, "MetaReleaseDate", "");
+ ghb_dict_set_string(ud->settings, "MetaComment", "");
+ ghb_dict_set_string(ud->settings, "MetaAlbumArtist", "");
+ ghb_dict_set_string(ud->settings, "MetaGenre", "");
+ ghb_dict_set_string(ud->settings, "MetaDescription", "");
+ ghb_dict_set_string(ud->settings, "MetaLongDescription", "");
+
+ GhbValue * meta = ghb_get_job_metadata_settings(ud->settings);
+ hb_dict_clear(meta);
+ }
+
+ // Update UI
+ ghb_ui_update_from_settings(ud, "MetaName", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaArtist", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaReleaseDate", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaComment", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaAlbumArtist", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaGenre", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaDescription", ud->settings);
+ ghb_ui_update_from_settings(ud, "MetaLongDescription", ud->settings);
+}
+
+G_MODULE_EXPORT void
+filter_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ setting_widget_changed_cb(widget, ud);
+ update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
 nonsetting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 ghb_widget_to_setting(ud->settings, widget);
@@ -3226,37 +3321,21 @@
 return TRUE;
 }
 
-G_MODULE_EXPORT void
-start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+static void sanitize_ptop(signal_user_data_t * ud, int end_changed)
 {
 int64_t start, end;
 
- ghb_widget_to_setting(ud->settings, widget);
-
- GhbValue *dest = ghb_get_job_dest_settings(ud->settings);
- GhbValue *range = ghb_get_job_range_settings(ud->settings);
 if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
 {
 start = ghb_dict_get_int(ud->settings, "start_point");
 end = ghb_dict_get_int(ud->settings, "end_point");
 if (start > end)
 {
- ghb_ui_update(ud, "end_point", ghb_int_value(start));
- end = start;
+ if (end_changed == 1)
+ ghb_ui_update(ud, "start_point", ghb_int_value(end));
+ else
+ ghb_ui_update(ud, "end_point", ghb_int_value(start));
 }
- ghb_check_dependency(ud, widget, NULL);
- if (check_name_template(ud, "{chapters}"))
- set_destination(ud);
- widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
- gtk_widget_set_sensitive(widget, end > start);
- update_title_duration(ud);
-
- gboolean markers;
- markers = ghb_dict_get_int(ud->settings, "ChapterMarkers");
- markers &= (end > start);
- ghb_dict_set_bool(dest, "ChapterMarkers", markers);
- ghb_dict_set_int(range, "Start", start);
- ghb_dict_set_int(range, "End", end);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
 {
@@ -3264,14 +3343,11 @@
 end = ghb_dict_get_double(ud->settings, "end_point") * 90000;
 if (start >= end)
 {
- ghb_ui_update(ud, "end_point", ghb_int_value(start+1));
- end = start + 90000;
+ if (end_changed == 1)
+ ghb_ui_update(ud, "start_point", ghb_int_value(end-1));
+ else
+ ghb_ui_update(ud, "end_point", ghb_int_value(start+1));
 }
- ghb_check_dependency(ud, widget, NULL);
- update_title_duration(ud);
-
- ghb_dict_set_int(range, "Start", start);
- ghb_dict_set_int(range, "End", end);
 }
 else if (ghb_settings_combo_int(ud->settings, "PtoPType") == 2)
 {
@@ -3279,39 +3355,27 @@
 end = ghb_dict_get_int(ud->settings, "end_point");
 if (start > end)
 {
- ghb_ui_update(ud, "end_point", ghb_int_value(start));
- end = start;
+ if (end_changed == 1)
+ ghb_ui_update(ud, "start_point", ghb_int_value(end));
+ else
+ ghb_ui_update(ud, "end_point", ghb_int_value(start));
 }
- ghb_check_dependency(ud, widget, NULL);
- update_title_duration(ud);
-
- ghb_dict_set_int(range, "Start", start);
- ghb_dict_set_int(range, "End", end);
 }
 }
 
-G_MODULE_EXPORT void
-end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+static void update_ptop(signal_user_data_t * ud)
 {
 int64_t start, end;
-
- ghb_widget_to_setting(ud->settings, widget);
-
 GhbValue *dest = ghb_get_job_dest_settings(ud->settings);
 GhbValue *range = ghb_get_job_range_settings(ud->settings);
+
 if (ghb_settings_combo_int(ud->settings, "PtoPType") == 0)
 {
 start = ghb_dict_get_int(ud->settings, "start_point");
 end = ghb_dict_get_int(ud->settings, "end_point");
- if (start > end)
- {
- ghb_ui_update(ud, "start_point", ghb_int_value(end));
- start = end;
- }
- ghb_check_dependency(ud, widget, NULL);
 if (check_name_template(ud, "{chapters}"))
 set_destination(ud);
- widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
+ GtkWidget *widget = GHB_WIDGET (ud->builder, "ChapterMarkers");
 gtk_widget_set_sensitive(widget, end > start);
 update_title_duration(ud);
 
@@ -3326,12 +3390,6 @@
 {
 start = ghb_dict_get_double(ud->settings, "start_point") * 90000;
 end = ghb_dict_get_double(ud->settings, "end_point") * 90000;
- if (start >= end)
- {
- ghb_ui_update(ud, "start_point", ghb_int_value(end-1));
- start = end - 90000;
- }
- ghb_check_dependency(ud, widget, NULL);
 update_title_duration(ud);
 
 ghb_dict_set_int(range, "Start", start);
@@ -3341,12 +3399,6 @@
 {
 start = ghb_dict_get_int(ud->settings, "start_point");
 end = ghb_dict_get_int(ud->settings, "end_point");
- if (start > end)
- {
- ghb_ui_update(ud, "start_point", ghb_int_value(end));
- start = end;
- }
- ghb_check_dependency(ud, widget, NULL);
 update_title_duration(ud);
 
 ghb_dict_set_int(range, "Start", start);
@@ -3355,6 +3407,42 @@
 }
 
 G_MODULE_EXPORT void
+ptop_edited_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ if (ghb_settings_combo_int(ud->settings, "PtoPType") == 1)
+ return;
+
+ const gchar *text, *key;
+ int val = 0;
+
+ text = ghb_editable_get_text(widget);
+ if (text == NULL || text0 == 0)
+ return;
+ val = g_strtod(text, NULL);
+ key = ghb_get_setting_key(widget);
+ ghb_dict_set_int(ud->settings, key, val);
+ update_ptop(ud);
+}
+
+G_MODULE_EXPORT void
+start_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ sanitize_ptop(ud, 0);
+ ghb_check_dependency(ud, widget, NULL);
+ update_ptop(ud);
+}
+
+G_MODULE_EXPORT void
+end_point_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ ghb_widget_to_setting(ud->settings, widget);
+ sanitize_ptop(ud, 1);
+ ghb_check_dependency(ud, widget, NULL);
+ update_ptop(ud);
+}
+
+G_MODULE_EXPORT void
 scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
 g_debug("scale_width_changed_cb ()");
@@ -3362,11 +3450,9 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_WIDTH|GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, GHB_PIC_KEEP_WIDTH);
 update_preview = TRUE;
 ghb_live_reset(ud);
-
- update_scale_info(ud);
 }
 
 G_MODULE_EXPORT void
@@ -3377,12 +3463,10 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT|GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT);
 
 update_preview = TRUE;
 ghb_live_reset(ud);
-
- update_scale_info(ud);
 }
 
 G_MODULE_EXPORT void
@@ -3393,11 +3477,23 @@
 ghb_check_dependency(ud, widget, NULL);
 ghb_clear_presets_selection(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, 0);
 update_preview = TRUE;
 ghb_live_reset(ud);
+}
 
- update_crop_info(ud);
+G_MODULE_EXPORT void
+pad_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ g_debug("pad_changed_cb ()");
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+ if (gtk_widget_is_sensitive(widget))
+ ghb_set_scale(ud, 0);
+
+ update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
@@ -3423,7 +3519,7 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_HEIGHT|GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
 
 update_preview = TRUE;
 }
@@ -3437,7 +3533,7 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT);
 
 update_preview = TRUE;
 }
@@ -3451,10 +3547,108 @@
 ghb_clear_presets_selection(ud);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, 0);
 update_preview = TRUE;
+}
 
- update_aspect_info(ud);
+G_MODULE_EXPORT void
+rotate_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ int angle, hflip, prev_angle, prev_hflip;
+
+ g_debug("rotate_changed_cb ()");
+ prev_angle = ghb_dict_get_int(ud->settings, "rotate");
+ prev_hflip = ghb_dict_get_int(ud->settings, "hflip");
+
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+
+ hb_geometry_crop_t geo;
+
+ // First normalize current settings to 0 angle 0 hflip
+ geo.geometry.width = ghb_dict_get_int(ud->settings, "scale_width");
+ geo.geometry.height = ghb_dict_get_int(ud->settings, "scale_height");
+ geo.geometry.par.num =
+ ghb_dict_get_int(ud->settings, "PicturePARWidth");
+ geo.geometry.par.den =
+ ghb_dict_get_int(ud->settings, "PicturePARHeight");
+ geo.crop0 = ghb_dict_get_int(ud->settings, "PictureTopCrop");
+ geo.crop1 = ghb_dict_get_int(ud->settings, "PictureBottomCrop");
+ geo.crop2 = ghb_dict_get_int(ud->settings, "PictureLeftCrop");
+ geo.crop3 = ghb_dict_get_int(ud->settings, "PictureRightCrop");
+
+ geo.pad0 = ghb_dict_get_int(ud->settings, "PicturePadTop");
+ geo.pad1 = ghb_dict_get_int(ud->settings, "PicturePadBottom");
+ geo.pad2 = ghb_dict_get_int(ud->settings, "PicturePadLeft");
+ geo.pad3 = ghb_dict_get_int(ud->settings, "PicturePadRight");
+ // Normally hflip is applied, then rotation.
+ // To revert, must apply rotation then hflip.
+ hb_rotate_geometry(&geo, &geo, 360 - prev_angle, 0);
+ hb_rotate_geometry(&geo, &geo, 0, prev_hflip);
+
+ const hb_title_t * title;
+ int title_id, titleindex;
+
+ title_id = ghb_dict_get_int(ud->settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
+ if (title != NULL)
+ {
+ // If there is a title, reset to title width/height so that
+ // dimension limits get properly re-applied
+ geo.geometry.width = title->geometry.width;
+ geo.geometry.height = title->geometry.height;
+ }
+
+ // rotate dimensions to new angle and hflip
+ angle = ghb_dict_get_int(ud->settings, "rotate");
+ hflip = ghb_dict_get_int(ud->settings, "hflip");
+ hb_rotate_geometry(&geo, &geo, angle, hflip);
+
+ ghb_dict_set_int(ud->settings, "scale_width",
+ geo.geometry.width - geo.crop2 - geo.crop3);
+ ghb_dict_set_int(ud->settings, "scale_height",
+ geo.geometry.height - geo.crop0 - geo.crop1);
+ ghb_dict_set_int(ud->settings, "PicturePARWidth", geo.geometry.par.num);
+ ghb_dict_set_int(ud->settings, "PicturePARHeight", geo.geometry.par.den);
+ ghb_dict_set_int(ud->settings, "PictureTopCrop", geo.crop0);
+ ghb_dict_set_int(ud->settings, "PictureBottomCrop", geo.crop1);
+ ghb_dict_set_int(ud->settings, "PictureLeftCrop", geo.crop2);
+ ghb_dict_set_int(ud->settings, "PictureRightCrop", geo.crop3);
+
+ ghb_dict_set_int(ud->settings, "PicturePadTop", geo.pad0);
+ ghb_dict_set_int(ud->settings, "PicturePadBottom", geo.pad1);
+ ghb_dict_set_int(ud->settings, "PicturePadLeft", geo.pad2);
+ ghb_dict_set_int(ud->settings, "PicturePadRight", geo.pad3);
+
+ ghb_set_scale(ud, 0);
+ update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
+resolution_limit_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+ g_debug("resolution_limit_changed_cb ()");
+ ghb_widget_to_setting(ud->settings, widget);
+ ghb_check_dependency(ud, widget, NULL);
+ ghb_clear_presets_selection(ud);
+ ghb_live_reset(ud);
+
+ const gchar * resolution_limit;
+ int width, height;
+
+ resolution_limit = ghb_dict_get_string(ud->settings, "resolution_limit");
+ ghb_lookup_resolution_limit_dimensions(resolution_limit, &width, &height);
+ if (width >= 0 && height >= 0)
+ {
+ ghb_dict_set_int(ud->settings, "PictureWidth", width);
+ ghb_dict_set_int(ud->settings, "PictureHeight", height);
+ }
+
+ ghb_set_scale(ud, GHB_PIC_KEEP_HEIGHT);
+
+ update_preview = TRUE;
 }
 
 G_MODULE_EXPORT void
@@ -4303,7 +4497,7 @@
 if (update_preview)
 {
 g_debug("Updating preview\n");
- ghb_set_preview_image (ud);
+ ghb_set_preview_image(ud);
 update_preview = FALSE;
 }
 
@@ -4533,7 +4727,8 @@
 HB_PROJECT_URL_WEBSITE);
 gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget),
 HB_PROJECT_URL_WEBSITE);
- gtk_widget_show (widget);
+ gtk_dialog_run(GTK_DIALOG(widget));
+ gtk_widget_hide(widget);
 }
 
 #define HB_DOCS "https://handbrake.fr/docs/"
@@ -5200,7 +5395,7 @@
 
 case 3:
 {
- // Its a tripple left mouse button click
+ // It's a triple left mouse button click
 GtkWidget *widget;
 widget = GHB_WIDGET(ud->builder, "allow_tweaks");
 gtk_widget_show(widget);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/callbacks.h -> HandBrake-1.5.1.tar.xz/gtk/src/callbacks.h Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * callbacks.h
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * callbacks.h is free software.
 *
@@ -41,7 +41,7 @@
 g_thread_create((GThreadFunc)(f), (p), TRUE, NULL)
 #endif
 
-void ghb_check_all_depencencies(signal_user_data_t *ud);
+void ghb_check_all_dependencies(signal_user_data_t *ud);
 gboolean ghb_timer_cb(gpointer data);
 gboolean ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data);
 void warn_log_handler(
@@ -88,6 +88,8 @@
 void ghb_update_summary_info(signal_user_data_t *ud);
 void ghb_set_title_settings(signal_user_data_t *ud, GhbValue *settings);
 void ghb_browse_uri(signal_user_data_t *ud, const gchar *uri);
+void ghb_break_pts_duration(gint64 ptsDuration,
+ gint *hh, gint *mm, gdouble *ss);
 void ghb_break_duration(gint64 duration, gint *hh, gint *mm, gint *ss);
 
 #endif // _CALLBACKS_H_

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/chapters.c -> HandBrake-1.5.1.tar.xz/gtk/src/chapters.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/chapters.h -> HandBrake-1.5.1.tar.xz/gtk/src/chapters.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/fr.handbrake.ghb.desktop -> HandBrake-1.5.1.tar.xz/gtk/src/fr.handbrake.ghb.desktop Changed

@@ -7,4 +7,4 @@
 Terminal=false
 Type=Application
 Categories=GTK;AudioVideo;Video;
-MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/ogg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;
+MimeType=application/ogg;application/x-extension-mp4;application/x-flac;application/x-matroska;application/x-ogg;audio/ac3;audio/mp4;audio/mpeg;audio/ogg;audio/x-flac;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-mpeg;audio/x-vorbis;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/quicktime;video/vnd.divx;video/x-avi;video/x-m4v;video/x-matroska;video/x-mpeg;video/ogg;video/x-ogm+ogg;video/x-theora+ogg;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd;

HandBrake-1.5.1.tar.xz/gtk/src/fr.handbrake.ghb.metainfo.template.xml Added

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="desktop-application">
+ <id>fr.handbrake.ghb</id>
+ <translation>ghb</translation>
+ <update_contact>jstebbins.hb_AT_gmail.com</update_contact>
+ <launchable type="desktop-id">fr.handbrake.ghb.desktop</launchable>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>HandBrake</name>
+ <summary>Video Transcoder</summary>
+
+ <description>
+ HandBrake is a tool for converting video from nearly any format to a selection of modern, widely supported codecs.
+ Reasons you'll love Handbrake:
+ <ul>
+ <li>Convert video from nearly any format</li>
+ <li>Free and Open Source</li>
+ <li>Multi-Platform (Windows, Mac and Linux)</li>
+ </ul>
+ </description>
+
+ <url type="homepage">https://handbrake.fr/</url>
+ <url type="help">https://handbrake.fr/docs/</url>
+ <url type="bugtracker">https://github.com/HandBrake/HandBrake/issues</url>
+ <url type="translate">https://www.transifex.com/HandBrakeProject/</url>
+ <mimetypes>
+ <mimetype>application/ogg</mimetype>
+ <mimetype>application/x-extension-mp4</mimetype>
+ <mimetype>application/x-flac</mimetype>
+ <mimetype>application/x-matroska</mimetype>
+ <mimetype>application/x-ogg</mimetype>
+ <mimetype>audio/ac3</mimetype>
+ <mimetype>audio/mp4</mimetype>
+ <mimetype>audio/mpeg</mimetype>
+ <mimetype>audio/ogg</mimetype>
+ <mimetype>audio/x-flac</mimetype>
+ <mimetype>audio/x-matroska</mimetype>
+ <mimetype>audio/x-mp2</mimetype>
+ <mimetype>audio/x-mp3</mimetype>
+ <mimetype>audio/x-mpeg</mimetype>
+ <mimetype>audio/x-vorbis</mimetype>
+ <mimetype>video/mp4</mimetype>
+ <mimetype>video/mp4v-es</mimetype>
+ <mimetype>video/mpeg</mimetype>
+ <mimetype>video/msvideo</mimetype>
+ <mimetype>video/quicktime</mimetype>
+ <mimetype>video/vnd.divx</mimetype>
+ <mimetype>video/x-avi</mimetype>
+ <mimetype>video/x-m4v</mimetype>
+ <mimetype>video/x-matroska</mimetype>
+ <mimetype>video/x-mpeg</mimetype>
+ <mimetype>video/ogg</mimetype>
+ <mimetype>video/x-ogm+ogg</mimetype>
+ <mimetype>video/x-theora+ogg</mimetype>
+ <mimetype>x-content/video-dvd</mimetype>
+ <mimetype>x-content/video-vcd</mimetype>
+ <mimetype>x-content/video-svcd</mimetype>
+ </mimetypes>
+
+ <screenshots>
+ <screenshot type="default">
+ <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Summary_linux.png</image>
+ <caption>Main window and settings summary</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Dimensions_linux.png</image>
+ <caption>Video resolution and cropping settings</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Video_linux.png</image>
+ <caption>Video encoder settings</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Audio_linux.png</image>
+ <caption>Audio track selection and settings</caption>
+ </screenshot>
+ <screenshot>
+ <image>https://download.handbrake.fr/handbrake/images/HandBrake_1.1.x_Chapters_linux.png</image>
+ <caption>Chapter title editing</caption>
+ </screenshot>
+ </screenshots>
+
+ <provides>
+ <binary>ghb</binary>
+ </provides>
+
+ <releases>
+ RELEASE_TAG
+ </releases>
+ 
+ <content_rating type="oars-1.1">
+ <content_attribute id="violence-cartoon">none</content_attribute>
+ <content_attribute id="violence-fantasy">none</content_attribute>
+ <content_attribute id="violence-realistic">none</content_attribute>
+ <content_attribute id="violence-bloodshed">none</content_attribute>
+ <content_attribute id="violence-sexual">none</content_attribute>
+ <content_attribute id="violence-desecration">none</content_attribute>
+ <content_attribute id="violence-slavery">none</content_attribute>
+ <content_attribute id="violence-worship">none</content_attribute>
+ <content_attribute id="drugs-alcohol">none</content_attribute>
+ <content_attribute id="drugs-narcotics">none</content_attribute>
+ <content_attribute id="drugs-tobacco">none</content_attribute>
+ <content_attribute id="sex-nudity">none</content_attribute>
+ <content_attribute id="sex-themes">none</content_attribute>
+ <content_attribute id="sex-homosexuality">none</content_attribute>
+ <content_attribute id="sex-prostitution">none</content_attribute>
+ <content_attribute id="sex-adultery">none</content_attribute>
+ <content_attribute id="sex-appearance">none</content_attribute>
+ <content_attribute id="language-profanity">none</content_attribute>
+ <content_attribute id="language-humor">none</content_attribute>
+ <content_attribute id="language-discrimination">none</content_attribute>
+ <content_attribute id="social-chat">none</content_attribute>
+ <content_attribute id="social-info">none</content_attribute>
+ <content_attribute id="social-audio">none</content_attribute>
+ <content_attribute id="social-location">none</content_attribute>
+ <content_attribute id="social-contacts">none</content_attribute>
+ <content_attribute id="money-purchasing">none</content_attribute>
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+ 
+</component>
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghb-dvd.c -> HandBrake-1.5.1.tar.xz/gtk/src/ghb-dvd.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghb-dvd.h -> HandBrake-1.5.1.tar.xz/gtk/src/ghb-dvd.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghb3.ui -> HandBrake-1.5.1.tar.xz/gtk/src/ghb3.ui Changed

@@ -808,6 +808,46 @@
 </packing>
 </child>
 <child>
+ <object class="GtkLabel" id="queue_summary_title_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="halign">start</property>
+ <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Title:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="queue_summary_title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="hexpand">False</property>
+ <property name="label" translatable="yes"></property>
+ <property name="width-chars">50</property>
+ <property name="lines">2</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="ellipsize">middle</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
 <object class="GtkLabel" id="queue_summary_dest_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
@@ -818,7 +858,7 @@
 <property name="label" translatable="yes">Destination:</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -842,7 +882,7 @@
 <property name="margin-bottom">12</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
+ <property name="top_attach">3</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -859,7 +899,7 @@
 <property name="label" translatable="yes">Dimensions:</property>
 </object>
 <packing>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -878,7 +918,7 @@
 <property name="width-chars">50</property>
 </object>
 <packing>
- <property name="top_attach">3</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -895,7 +935,7 @@
 <property name="label" translatable="yes">Video:</property>
 </object>
 <packing>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -914,7 +954,7 @@
 <property name="width-chars">50</property>
 </object>
 <packing>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -931,7 +971,7 @@
 <property name="label" translatable="yes">Audio:</property>
 </object>
 <packing>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -950,7 +990,7 @@
 <property name="width-chars">50</property>
 </object>
 <packing>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -967,7 +1007,7 @@
 <property name="label" translatable="yes">Subtitles:</property>
 </object>
 <packing>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -986,7 +1026,7 @@
 <property name="width-chars">50</property>
 </object>
 <packing>
- <property name="top_attach">6</property>
+ <property name="top_attach">7</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -1456,6 +1496,11 @@
 </object>
 </child>
 </object>
+ <object class="GtkImage" id="display_size_lock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">emblem-readonly</property>
+ </object>
 <object class="GtkAdjustment" id="adjustment1">
 <property name="lower">1</property>
 <property name="upper">100</property>
@@ -1482,33 +1527,55 @@
 <property name="step_increment">1</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkAdjustment" id="adjustment13">
- <property name="upper">1000</property>
- <property name="step_increment">1</property>
+ <object class="GtkAdjustment" id="TopPadAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkAdjustment" id="adjustment14">
- <property name="upper">1000</property>
- <property name="step_increment">1</property>
+ <object class="GtkAdjustment" id="BottomPadAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkAdjustment" id="adjustment15">
- <property name="upper">1000</property>
- <property name="step_increment">1</property>
+ <object class="GtkAdjustment" id="LeftPadAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkAdjustment" id="adjustment16">
- <property name="upper">1000</property>
- <property name="step_increment">1</property>
+ <object class="GtkAdjustment" id="RightPadAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkAdjustment" id="adjustment17">
- <property name="upper">8000</property>
+ <object class="GtkAdjustment" id="LeftCropAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="TopCropAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="BottomCropAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="RightCropAdjustment">
+ <property name="upper">8192</property>
+ <property name="step_increment">2</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="scale_width_adjustment">
+ <property name="lower">32</property>
+ <property name="upper">20480</property>
 <property name="step_increment">2</property>
 <property name="page_increment">16</property>
 </object>
- <object class="GtkAdjustment" id="adjustment18">
- <property name="upper">8000</property>
+ <object class="GtkAdjustment" id="scale_height_adjustment">
+ <property name="lower">32</property>
+ <property name="upper">20480</property>
 <property name="step_increment">2</property>
 <property name="page_increment">16</property>
 </object>
@@ -1603,13 +1670,15 @@
 <property name="step_increment">10</property>
 <property name="page_increment">100</property>
 </object>
- <object class="GtkAdjustment" id="adjustment32">
- <property name="upper">8000</property>
+ <object class="GtkAdjustment" id="PictureWidthAdjustment">
+ <property name="lower">0</property>
+ <property name="upper">20480</property>
 <property name="step_increment">2</property>
 <property name="page_increment">16</property>
 </object>
- <object class="GtkAdjustment" id="adjustment33">
- <property name="upper">8000</property>
+ <object class="GtkAdjustment" id="PictureHeightAdjustment">
+ <property name="lower">0</property>
+ <property name="upper">20480</property>
 <property name="step_increment">2</property>
 <property name="page_increment">16</property>
 </object>
@@ -1664,6 +1733,18 @@
 <property name="step_increment">1</property>
 <property name="page_increment">10</property>
 </object>
+ <object class="GtkAdjustment" id="DisplayWidthAdjustment">
+ <property name="lower">32</property>
+ <property name="upper">20480</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">16</property>
+ </object>
+ <object class="GtkAdjustment" id="DisplayHeightAdjustment">
+ <property name="lower">32</property>
+ <property name="upper">20480</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">16</property>
+ </object>
 <object class="GtkAboutDialog" id="hb_about">
 <property name="transient_for">hb_window</property>
 <property name="can_focus">False</property>
@@ -2034,7 +2115,7 @@
 <property name="can_focus">False</property>
 <child>
 <object class="GtkCheckMenuItem" id="hbfd">
- <property name="label" translatable="yes">HandBrake For _Dumbies</property>
+ <property name="label" translatable="yes">HandBrake For _Dummies</property>
 <property name="visible">False</property>
 <property name="can_focus">False</property>
 <property name="use_underline">True</property>
@@ -2628,6 +2709,7 @@
 <property name="tooltip_text" translatable="yes">Set the first chapter to encode.</property>
 <property name="adjustment">adjustment1</property>
 <property name="numeric">True</property>
+ <signal name="changed" handler="ptop_edited_cb" swapped="no"/>
 <signal name="value-changed" handler="start_point_changed_cb" swapped="no"/>
 <signal name="output" handler="ptop_output_cb" swapped="no"/>
 <signal name="input" handler="ptop_input_cb" swapped="no"/>
@@ -2655,6 +2737,7 @@
 <property name="tooltip_text" translatable="yes">Set the last chapter to encode.</property>
 <property name="adjustment">adjustment2</property>
 <property name="numeric">True</property>
+ <signal name="changed" handler="ptop_edited_cb" swapped="no"/>
 <signal name="value-changed" handler="end_point_changed_cb" swapped="no"/>
 <signal name="output" handler="ptop_output_cb" swapped="no"/>
 <signal name="input" handler="ptop_input_cb" swapped="no"/>
@@ -2945,6 +3028,26 @@
 </packing>
 </child>
 <child>
+ <object class="GtkCheckButton" id="MetadataPassthrough">
+ <property name="label" translatable="yes">Passthru Common Metadata</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Copy metadata from source to output.</property>
+ <property name="halign">start</property>
+ <property name="hexpand">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="meta_pass_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">4</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
 <object class="GtkLabel" id="label6">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
@@ -2956,7 +3059,7 @@
 <property name="label" translatable="yes">Duration:</property>
 </object>
 <packing>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -2976,7 +3079,7 @@
 <property name="width-chars">8</property>
 </object>
 <packing>
- <property name="top_attach">4</property>
+ <property name="top_attach">5</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -2994,7 +3097,7 @@
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -3016,7 +3119,7 @@
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="top_attach">5</property>
+ <property name="top_attach">6</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">8</property>
@@ -3034,7 +3137,7 @@
 <property name="margin-top">12</property>
 </object>
 <packing>
- <property name="top_attach">13</property>
+ <property name="top_attach">14</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -3056,7 +3159,7 @@
 <property name="use_markup">True</property>
 </object>
 <packing>
- <property name="top_attach">13</property>
+ <property name="top_attach">14</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">4</property>
@@ -3075,7 +3178,7 @@
 <property name="margin-top">12</property>
 </object>
 <packing>
- <property name="top_attach">14</property>
+ <property name="top_attach">15</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -3094,7 +3197,7 @@
 <property name="label" translatable="yes">--</property>
 </object>
 <packing>
- <property name="top_attach">14</property>
+ <property name="top_attach">15</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -3150,9 +3253,156 @@
 <property name="orientation">vertical</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
- <property name="margin-top">16</property>
+ <property name="margin-top">8</property>
 <property name="margin-start">0</property>
- <property name="spacing">16</property>
+ <property name="spacing">24</property>
+ <child>
+ <object class="GtkFrame" id="source_dimensions_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="margin-start">2</property>
+ <property name="margin-end">2</property>
+ <child>
+ <object class="GtkGrid" id="source_dimensions_grid">
+ <property name="margin-top">8</property>
+ <property name="row-spacing">4</property>
+ <property name="column-spacing">32</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkBox" id="source_storage_hbox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="source_storage_size_label">
+ <property name="label" translatable="yes">Storage Size:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="source_storage_size">
+ <property name="label" translatable="yes">--</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="source_display_hbox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="source_display_size_label">
+ <property name="label" translatable="yes">Display Size:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="source_display_size">
+ <property name="label" translatable="yes">--</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="source_aspect_hbox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="source_aspect_ratio_label">
+ <property name="label" translatable="yes">Aspect Ratio:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="source_aspect_ratio">
+ <property name="label" translatable="yes">--</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="source_dimensions_frame_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Source Dimensions&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
 <child>
 <object class="GtkBox" id="hbox75">
 <property name="orientation">horizontal</property>
@@ -3175,149 +3425,177 @@
 <property name="can_focus">False</property>
 <property name="margin-top">6</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">4</property>
 <child>
- <object class="GtkGrid" id="crop_grid">
- <property name="row-spacing">4</property>
- <property name="column-spacing">0</property>
+ <object class="GtkGrid" id="table16">
+ <property name="row-spacing">2</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="column_spacing">5</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="row-spacing">4</property>
+ <property name="column-spacing">8</property>
 <child>
- <object class="GtkCheckButton" id="PictureAutoCrop">
- <property name="label" translatable="yes">Auto Crop</property>
+ <object class="GtkLabel" id="hflip_label">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Automatically crop black borders around edges of the video.</property>
+ <property name="can_focus">False</property>
 <property name="halign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ <property name="label" translatable="yes">Flipping:</property>
 </object>
 <packing>
 <property name="top_attach">0</property>
 <property name="left_attach">0</property>
- <property name="width">4</property>
+ <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="PictureLooseCrop">
- <property name="label" translatable="yes">Loose Crop</property>
+ <object class="GtkCheckButton" id="hflip">
+ <property name="label" translatable="yes">Horizontal ⇌</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">When picture settings require that the image
-dimensions be rounded to some multiple number
-of pixels, this setting will crop a few extra pixels
-instead of doing exact cropping and then scaling to
-the required multiple.</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Flip video horizontally.</property>
 <property name="halign">start</property>
 <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ <signal name="toggled" handler="rotate_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureRotateLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Rotation:</property>
 </object>
 <packing>
 <property name="top_attach">1</property>
 <property name="left_attach">0</property>
- <property name="width">4</property>
+ <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureLeftCrop">
- <property name="width-chars">6</property>
+ <object class="GtkComboBox" id="rotate">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Left Crop</property>
- <property name="adjustment">adjustment13</property>
- <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">Rotate the video clockwise in 90 degree increments.</property>
+ <signal name="changed" handler="rotate_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="crop_mode_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Cropping:</property>
 </object>
 <packing>
 <property name="top_attach">2</property>
 <property name="left_attach">0</property>
- <property name="width">6</property>
+ <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureTopCrop">
- <property name="width-chars">6</property>
+ <object class="GtkComboBox" id="crop_mode">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Top Crop</property>
- <property name="adjustment">adjustment14</property>
- <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">How to apply crop settings.</property>
+ <signal name="changed" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">5</property>
- <property name="width">6</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureBottomCrop">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="PictureLeftCrop">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Bottom Crop</property>
- <property name="adjustment">adjustment15</property>
+ <property name="tooltip_text" translatable="yes">Left Crop</property>
+ <property name="adjustment">LeftCropAdjustment</property>
 <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">3</property>
- <property name="left_attach">5</property>
- <property name="width">6</property>
+ <property name="top_attach">4</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureRightCrop">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="PictureTopCrop">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Right Crop</property>
- <property name="adjustment">adjustment16</property>
+ <property name="tooltip_text" translatable="yes">Top Crop</property>
+ <property name="adjustment">TopCropAdjustment</property>
 <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">10</property>
- <property name="width">6</property>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label97">
+ <object class="GtkSpinButton" id="PictureBottomCrop">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">Crop Dimensions:</property>
+ <property name="tooltip_text" translatable="yes">Bottom Crop</property>
+ <property name="adjustment">BottomCropAdjustment</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">5</property>
- <property name="left_attach">0</property>
- <property name="width">4</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="crop_dimensions2">
+ <object class="GtkSpinButton" id="PictureRightCrop">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">--</property>
+ <property name="tooltip_text" translatable="yes">Right Crop</property>
+ <property name="adjustment">RightCropAdjustment</property>
+ <signal name="value-changed" handler="crop_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">5</property>
- <property name="left_attach">4</property>
- <property name="width">4</property>
+ <property name="top_attach">4</property>
+ <property name="left_attach">2</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
@@ -3326,6 +3604,19 @@
 <property name="position">0</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkGrid" id="crop_grid">
+ <property name="row-spacing">4</property>
+ <property name="column-spacing">8</property>
+ <property name="column-homogeneous">True</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
 </object>
 </child>
 <child type="label">
@@ -3333,7 +3624,7 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Cropping&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Orientation &amp;amp; Cropping&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -3367,30 +3658,43 @@
 <property name="halign">start</property>
 <property name="valign">start</property>
 <child>
- <object class="GtkCheckButton" id="autoscale">
- <property name="label" translatable="yes">Optimal for source</property>
+ <object class="GtkLabel" id="resolution_limit_label">
 <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">If enabled, select the 'optimal' storage resolution.
-This will be the resolution that most closely matches the source resolution after cropping.</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="halign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ <property name="label" translatable="yes">Resolution Limit:</property>
 </object>
 <packing>
 <property name="top_attach">0</property>
 <property name="left_attach">0</property>
- <property name="width">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="resolution_limit">
+ <property name="visible">True</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_markup" translatable="yes">Resolution limits for common video formats.</property>
+ <signal name="changed" handler="resolution_limit_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">3</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label27">
+ <object class="GtkLabel" id="maximum_size_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Width:</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Maximum Size:</property>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -3400,14 +3704,13 @@
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="scale_width">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="PictureWidth">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">This is the width that the video will be stored at.
-The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
- <property name="adjustment">adjustment17</property>
+ <property name="tooltip_text" translatable="yes">This is the maximum width that the video will be stored at.</property>
+ <property name="adjustment">PictureWidthAdjustment</property>
 <property name="snap_to_ticks">True</property>
 <signal name="value-changed" handler="scale_width_changed_cb" swapped="no"/>
 </object>
@@ -3419,59 +3722,45 @@
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label28">
+ <object class="GtkLabel" id="label23">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Height:</property>
+ <property name="label" translatable="yes">x</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">2</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="scale_height">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="PictureHeight">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">This is the height that the video will be stored at.
-The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
- <property name="adjustment">adjustment18</property>
+ <property name="tooltip_text" translatable="yes">This is the maximum height that the video will be stored at.</property>
+ <property name="adjustment">PictureHeightAdjustment</property>
 <signal name="value-changed" handler="scale_height_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">3</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="ana_grid">
- <property name="row-spacing">2</property>
- <property name="column-spacing">4</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
 <child>
- <object class="GtkLabel" id="label96">
+ <object class="GtkLabel" id="anamorphic_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="halign">start</property>
 <property name="label" translatable="yes">Anamorphic:</property>
 </object>
 <packing>
- <property name="top_attach">0</property>
+ <property name="top_attach">2</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
@@ -3483,205 +3772,249 @@
 <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_markup" translatable="yes">&lt;b&gt;Anamorphic Modes:&lt;/b&gt;
-&lt;small&gt;&lt;tt&gt;
-None - Force pixel aspect ratio to 1:1.
-Loose - Use a pixel aspect ratio that is as
- close as possible to the source video pixel
- aspect ratio while preserving the original
- display aspect ratio
-Automatic - Use a pixel aspect ratio that maximizes
+ <property name="tooltip_markup" translatable="yes">&lt;b&gt;Anamorphic Modes:&lt;/b&gt;&lt;small&gt;&lt;tt&gt;
+ Automatic - Use a pixel aspect ratio that maximizes
 storage resolution while preserving the original
- display aspect ratio&lt;/tt&gt;&lt;/small&gt;</property>
+ display aspect ratio.
+ None - Force pixel aspect ratio to 1:1.
+ Custom - Enter a custom pixel aspect ratio.&lt;/tt&gt;&lt;/small&gt;</property>
 <signal name="changed" handler="scale_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
+ <property name="top_attach">2</property>
 <property name="left_attach">1</property>
- <property name="width">1</property>
+ <property name="width">3</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label95">
+ <object class="GtkLabel" id="pixel_aspect_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="halign">start</property>
- <property name="label" translatable="yes">Alignment:</property>
+ <property name="label" translatable="yes">Pixel Aspect:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="PictureModulus">
+ <object class="GtkSpinButton" id="PicturePARWidth">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
- <property name="valign">GTK_ALIGN_CENTER</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Align storage dimensions to multiples of this value.
+ <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
 
-This setting is only necessary for compatibility with some devices.
-You should use 2 unless you experience compatibility issues.</property>
- <signal name="changed" handler="scale_changed_cb" swapped="no"/>
+A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
+Players will scale the image in order to achieve the specified aspect.</property>
+ <property name="adjustment">adjustment29</property>
+ <property name="snap_to_ticks">True</property>
+ <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
- </object>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label25">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Storage Geometry&lt;/b&gt;</property>
- <property name="use_markup">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <property name="margin-start">2</property>
- <property name="margin-end">2</property>
- <child>
- <object class="GtkBox" id="vbox10">
- <property name="orientation">vertical</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkGrid" id="display_grid">
- <property name="row-spacing">2</property>
- <property name="column-spacing">4</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
 <child>
- <object class="GtkCheckButton" id="PictureKeepRatio">
- <property name="label" translatable="yes">Keep Aspect</property>
+ <object class="GtkLabel" id="picture_aspect_colon">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">:</property>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="PicturePARHeight">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">If enabled, the original display aspect of the source will be maintained.</property>
- <property name="halign">start</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
+A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
+Players will scale the image in order to achieve the specified aspect.</property>
+ <property name="adjustment">adjustment30</property>
+ <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">0</property>
- <property name="width">2</property>
+ <property name="top_attach">3</property>
+ <property name="left_attach">3</property>
+ <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label91">
+ <object class="GtkLabel" id="scaled_size_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Width:</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Scaled Size:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureDisplayWidth">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="scale_width">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">This is the display width. It is the result of scaling the storage dimensions by the pixel aspect.</property>
- <property name="adjustment">adjustment25</property>
+ <property name="tooltip_text" translatable="yes">This is the width that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
+ <property name="adjustment">scale_width_adjustment</property>
 <property name="snap_to_ticks">True</property>
- <signal name="value-changed" handler="display_width_changed_cb" swapped="no"/>
+ <signal name="value-changed" handler="scale_width_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label92">
+ <object class="GtkLabel" id="label28">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Height:</property>
+ <property name="label" translatable="yes">x</property>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="left_attach">2</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PictureDisplayHeight">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="scale_height">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="adjustment">adjustment26</property>
- <signal name="value-changed" handler="display_height_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">This is the height that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</property>
+ <property name="adjustment">scale_height_adjustment</property>
+ <signal name="value-changed" handler="scale_height_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="left_attach">3</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkCheckButton" id="PictureUseMaximumSize">
+ <property name="label" translatable="yes">Optimal Size</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Use highest resolution permitted by above settings.</property>
+ <property name="halign">start</property>
+ <property name="active">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">5</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="PictureAllowUpscaling">
+ <property name="label" translatable="yes">Allow Upscaling</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">If not enabled, scaled dimensions will be limited to source dimensions.</property>
+ <property name="halign">start</property>
+ <property name="active">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">6</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
- <property name="position">0</property>
+ <property name="position">2</property>
 </packing>
 </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label25">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Resolution &amp;amp; Scaling&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="margin-start">2</property>
+ <property name="margin-end">2</property>
+ <child>
+ <object class="GtkBox" id="vbox10">
+ <property name="orientation">vertical</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
 <child>
- <object class="GtkGrid" id="aspect_grid">
+ <object class="GtkGrid" id="pad_options_grid">
 <property name="row-spacing">2</property>
 <property name="column-spacing">4</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="halign">start</property>
 <property name="valign">start</property>
+ <property name="column-spacing">8</property>
+ <property name="row-spacing">4</property>
 <child>
- <object class="GtkLabel" id="label98">
+ <object class="GtkLabel" id="pad_mode_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="halign">start</property>
- <property name="label" translatable="yes">Pixel Aspect:</property>
+ <property name="label" translatable="yes">Fill:</property>
 </object>
 <packing>
 <property name="top_attach">0</property>
@@ -3691,93 +4024,127 @@
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PicturePARWidth">
- <property name="width-chars">6</property>
+ <object class="GtkComboBox" id="PicturePadMode">
+ <property name="hexpand">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
 <property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
-
-A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
-Players will scale the image in order to achieve the specified aspect.</property>
- <property name="adjustment">adjustment29</property>
- <property name="snap_to_ticks">True</property>
- <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">Add a border around the video.</property>
+ <signal name="changed" handler="pad_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">0</property>
 <property name="left_attach">1</property>
- <property name="width">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
+
 <child>
- <object class="GtkLabel" id="label99">
+ <object class="GtkSpinButton" id="PicturePadLeft">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">:</property>
+ <property name="tooltip_text" translatable="yes">Left Pad</property>
+ <property name="adjustment">LeftPadAdjustment</property>
+ <signal name="value-changed" handler="pad_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">2</property>
- <property name="width">1</property>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkSpinButton" id="PicturePARHeight">
- <property name="width-chars">6</property>
+ <object class="GtkSpinButton" id="PicturePadTop">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Pixel aspect defines the shape of the pixels.
-A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
-Players will scale the image in order to achieve the specified aspect.</property>
- <property name="adjustment">adjustment30</property>
- <signal name="value-changed" handler="par_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">Top Pad</property>
+ <property name="adjustment">TopPadAdjustment</property>
+ <signal name="value-changed" handler="pad_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">3</property>
- <property name="width">1</property>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="label93">
- <property name="width_request">100</property>
+ <object class="GtkSpinButton" id="PicturePadBottom">
+ <property name="width-chars">4</property>
 <property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Bottom Pad</property>
+ <property name="adjustment">BottomPadAdjustment</property>
+ <signal name="value-changed" handler="pad_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="PicturePadRight">
+ <property name="width-chars">4</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Right Pad</property>
+ <property name="adjustment">RightPadAdjustment</property>
+ <signal name="value-changed" handler="pad_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pad_color_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
 <property name="halign">start</property>
- <property name="label" translatable="yes">Display Aspect:</property>
+ <property name="label" translatable="yes">Color:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkLabel" id="display_aspect">
+ <object class="GtkComboBox" id="PicturePadColor">
+ <property name="hexpand">False</property>
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes">--:--</property>
+ <property name="tooltip_text" translatable="yes">Color of border added around video.</property>
+ <signal name="changed" handler="pad_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">4</property>
 <property name="left_attach">1</property>
- <property name="width">1</property>
+ <property name="width">2</property>
 <property name="height">1</property>
 </packing>
 </child>
 </object>
 <packing>
- <property name="position">1</property>
+ <property name="position">0</property>
 </packing>
 </child>
 </object>
@@ -3787,7 +4154,7 @@
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">&lt;b&gt;Display Geometry&lt;/b&gt;</property>
+ <property name="label" translatable="yes">&lt;b&gt;Borders&lt;/b&gt;</property>
 <property name="use_markup">True</property>
 </object>
 </child>
@@ -3798,7 +4165,216 @@
 </child>
 </object>
 <packing>
- <property name="position">0</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="final_dimensions_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <property name="margin-start">2</property>
+ <property name="margin-end">2</property>
+ <child>
+ <object class="GtkGrid" id="final_dimensions_grid">
+ <property name="margin-top">8</property>
+ <property name="row-spacing">4</property>
+ <property name="column-spacing">32</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkBox" id="final_storage_hbox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="final_storage_size_label">
+ <property name="label" translatable="yes">Storage Size:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="final_storage_size">
+ <property name="label" translatable="yes">--</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="display_size_grid">
+ <property name="row-spacing">2</property>
+ <property name="column-spacing">4</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <child>
+ <object class="GtkLabel" id="display_size_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Display Size:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="PictureDARWidth">
+ <property name="width-chars">4</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Changing the display size will stretch the video.</property>
+ <property name="adjustment">DisplayWidthAdjustment</property>
+ <property name="snap_to_ticks">True</property>
+ <signal name="value-changed" handler="display_width_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="display_size_x_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">x</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="DisplayHeight">
+ <property name="width-chars">4</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Changing the display size will stretch the video.</property>
+ <property name="adjustment">DisplayHeightAdjustment</property>
+ <signal name="value-changed" handler="display_height_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="PictureKeepRatio">
+ <property name="label" translatable="yes">Automatic</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Changing the display size will stretch the video.</property>
+ <property name="halign">start</property>
+ <property name="active">False</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="scale_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="final_aspect_hbox">
+ <property name="orientation">horizontal</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="final_aspect_label">
+ <property name="label" translatable="yes">Aspect Ratio:</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="final_aspect_ratio">
+ <property name="label" translatable="yes">--</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="final_dimensions_frame_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">&lt;b&gt;Final Dimensions&lt;/b&gt;</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">2</property>
 </packing>
 </child>
 </object>
@@ -3852,7 +4428,7 @@
 <property name="tooltip_text" translatable="yes">This filter removes 'combing' artifacts that are the result of telecining.
 
 Telecining is a process that adjusts film framerates that are 24fps to NTSC video frame rates which are 30fps.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">0</property>
@@ -3868,7 +4444,7 @@
 
 JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -3929,7 +4505,7 @@
 Mode:Spatial Metric:Motion Thresh:Spatial Thresh:Mask Filter Mode:
 Block Thresh: Block Width: Block Height</property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -4009,7 +4585,7 @@
 The decomb filter supports a variety of interpolation algorithms.
 The deinterlace filter is a classic YADIF deinterlacer.
 </property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
@@ -4023,7 +4599,7 @@
 <property name="can_focus">True</property>
 <property name="tooltip_text" translatable="yes"></property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
@@ -4065,7 +4641,7 @@
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="tooltip_text" translatable="yes">The deblocking filter removes a common type of compression artifact.
 If your source exhibits 'blockiness', this filter may help clean it up.</property>
- <signal name="changed" handler="denoise_filter_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -4097,7 +4673,7 @@
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="tooltip_text" translatable="yes">The deblocking filter removes a common type of compression artifact.
 If your source exhibits 'blockiness', this filter may help clean it up.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
@@ -4113,7 +4689,7 @@
 
 strength=weak|strong:thresh=0-100:blocksize=4-512</property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
@@ -4189,7 +4765,7 @@
 <property name="tooltip_text" translatable="yes">Denoise filtering reduces or removes the appearance of noise and grain.
 Film grain and other types of high frequency noise are difficult to compress.
 Using this filter on such sources can result in smaller file sizes.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
@@ -4222,7 +4798,7 @@
 <property name="tooltip_text" translatable="yes">Denoise filtering reduces or removes the appearance of noise and grain.
 Film grain and other types of high frequency noise are difficult to compress.
 Using this filter on such sources can result in smaller file sizes.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
@@ -4238,7 +4814,97 @@
 
 SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkGrid" id="chroma_smooth_grid">
+ <property name="row-spacing">2</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <child>
+ <object class="GtkLabel" id="PictureChromaSmoothPresetLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Chroma Smooth Filter:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureChromaSmoothPreset">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">The chroma smooth filter removes common color artifacts.
+Lower resolution analog source content may benefit from this filter.</property>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PictureChromaSmoothTuneLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Chroma Smooth Tune:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="PictureChromaSmoothTune">
+ <property name="valign">GTK_ALIGN_CENTER</property>
+ <property name="width_request">100</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">The chroma smooth filter removes common color artifacts.
+Lower resolution analog source content may benefit from this filter.</property>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureChromaSmoothCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom deblock filter string format
+
+strength=weak|strong:thresh=0-100:blocksize=4-512</property>
+ <property name="width-chars">8</property>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
@@ -4258,7 +4924,7 @@
 <property name="halign">start</property>
 <property name="valign">start</property>
 <child>
- <object class="GtkLabel" id="PictureSharpenFilterel">
+ <object class="GtkLabel" id="PictureSharpenFilterLabel">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="halign">start</property>
@@ -4312,7 +4978,7 @@
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="tooltip_text" translatable="yes">Sharpen filtering enhances edges and other
 high frequency components in the video.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -4344,7 +5010,7 @@
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
 <property name="tooltip_text" translatable="yes">Sharpen filtering enhances edges and other
 high frequency components in the video.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">2</property>
@@ -4360,7 +5026,7 @@
 
 SpatialLuma:SpatialChroma:TemporalLuma:TemporalChroma</property>
 <property name="width-chars">8</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">3</property>
@@ -4372,7 +5038,21 @@
 </object>
 </child>
 <child>
- <object class="GtkGrid" id="table16">
+ <object class="GtkCheckButton" id="VideoGrayScale">
+ <property name="label" translatable="yes">Grayscale</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">If enabled, filter colour components out of video.</property>
+ <property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="filter_widget_changed_cb" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkGrid" id="ColorspaceGrid">
 <property name="row-spacing">2</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
@@ -4380,28 +5060,44 @@
 <property name="halign">start</property>
 <property name="valign">start</property>
 <child>
- <object class="GtkLabel" id="PictureRotateLabel">
+ <object class="GtkLabel" id="ColorspaceLabel">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="halign">start</property>
- <property name="label" translatable="yes">Rotate Filter:</property>
+ <property name="label" translatable="yes">Colorspace:</property>
 </object>
 <packing>
- <property name="top_attach">1</property>
+ <property name="top_attach">0</property>
 <property name="left_attach">0</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkComboBox" id="PictureRotate">
+ <object class="GtkComboBox" id="PictureColorspacePreset">
 <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="width_request">100</property>
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Rotate the video clockwise in 90 degree increments.</property>
- <signal name="changed" handler="setting_widget_changed_cb" swapped="no"/>
+ <property name="tooltip_text" translatable="yes">Translate the colorspace of the source.</property>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="PictureColorspaceCustom">
+ <property name="can_focus">True</property>
+ <property name="tooltip_text" translatable="yes">Custom detelecine filter string format
+
+JunkLeft:JunkRight:JunkTop:JunkBottom:StrictBreaks:MetricPlane:Parity</property>
+ <property name="width-chars">8</property>
+ <signal name="changed" handler="filter_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
 <property name="top_attach">1</property>
@@ -4412,20 +5108,6 @@
 </child>
 </object>
 </child>
- <child>
- <object class="GtkCheckButton" id="VideoGrayScale">
- <property name="label" translatable="yes">Grayscale</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">If enabled, filter colour components out of video.</property>
- <property name="halign">start</property>
- <property name="valign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="setting_widget_changed_cb" swapped="no"/>
- </object>
- </child>
 </object>
 <packing>
 <property name="position">2</property>
@@ -5408,14 +6090,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="AudioAllowMP3Pass">
- <property name="label" translatable="yes">MP3</property>
+ <object class="GtkCheckButton" id="AudioAllowMP2Pass">
+ <property name="label" translatable="yes">MP2</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP3.
-This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP2.
+This permits MP2 passthru to be selected when automatic passthru selection is enabled.</property>
 <property name="halign">start</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
@@ -5429,14 +6111,14 @@
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="AudioAllowAACPass">
- <property name="label" translatable="yes">AAC</property>
+ <object class="GtkCheckButton" id="AudioAllowMP3Pass">
+ <property name="label" translatable="yes">MP3</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AAC.
-This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports MP3.
+This permits MP3 passthru to be selected when automatic passthru selection is enabled.</property>
 <property name="halign">start</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
@@ -5471,56 +6153,56 @@
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="AudioAllowDTSPass">
- <property name="label" translatable="yes">DTS</property>
+ <object class="GtkCheckButton" id="AudioAllowEAC3Pass">
+ <property name="label" translatable="yes">EAC-3</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS.
-This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports EAC-3.
+This permits EAC-3 passthru to be selected when automatic passthru selection is enabled.</property>
 <property name="halign">start</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
- <property name="label" translatable="yes">DTS-HD</property>
+ <object class="GtkCheckButton" id="AudioAllowDTSPass">
+ <property name="label" translatable="yes">DTS</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS-HD.
-This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS.
+This permits DTS passthru to be selected when automatic passthru selection is enabled.</property>
 <property name="halign">start</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
 <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
 </object>
 <packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
 <property name="top_attach">2</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
 </child>
 <child>
- <object class="GtkCheckButton" id="AudioAllowEAC3Pass">
- <property name="label" translatable="yes">EAC-3</property>
+ <object class="GtkCheckButton" id="AudioAllowDTSHDPass">
+ <property name="label" translatable="yes">DTS-HD</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable this if your playback device supports EAC-3.
-This permits EAC-3 passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports DTS-HD.
+This permits DTS-HD passthru to be selected when automatic passthru selection is enabled.</property>
 <property name="halign">start</property>
 <property name="active">True</property>
 <property name="draw_indicator">True</property>
@@ -5528,7 +6210,7 @@
 </object>
 <packing>
 <property name="left_attach">2</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">2</property>
 <property name="width">1</property>
 <property name="height">1</property>
 </packing>
@@ -5575,6 +6257,27 @@
 <property name="height">1</property>
 </packing>
 </child>
+ <child>
+ <object class="GtkCheckButton" id="AudioAllowAACPass">
+ <property name="label" translatable="yes">AAC</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="tooltip_text" translatable="yes">Enable this if your playback device supports AAC.
+This permits AAC passthru to be selected when automatic passthru selection is enabled.</property>
+ <property name="halign">start</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="audio_passthru_widget_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
 </object>
 <packing>
 <property name="position">0</property>
@@ -6916,7 +7619,7 @@
 <property name="step_increment">5</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkDialog" id="titla_add_multiple_dialog">
+ <object class="GtkDialog" id="title_add_multiple_dialog">
 <property name="transient_for">hb_window</property>
 <property name="can_focus">False</property>
 <property name="type_hint">dialog</property>
@@ -7382,7 +8085,7 @@
 </child>
 <child>
 <object class="GtkCheckButton" id="RemoveFinishedJobs">
- <property name="label" translatable="yes">Clear completed queue items after and encode completes</property>
+ <property name="label" translatable="yes">Clear completed queue items after an encode completes</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
@@ -7693,7 +8396,6 @@
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Pause encoding if free disk space drops below limit</property>
 <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="adjustment">ActivityFontSizeAdjustment</property>
 <signal name="value-changed" handler="activity_font_changed_cb" swapped="no"/>
@@ -8189,85 +8891,6 @@
 <property name="height">1</property>
 </packing>
 </child>
- <child>
- <object class="GtkCheckButton" id="PictureWidthEnable">
- <property name="label" translatable="yes">Maximum Width:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable maximum width limit.</property>
- <property name="halign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="preset_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureWidth">
- <property name="width-chars">7</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">This is the maximum width that the video will be stored at.
-
-Whenever a new source is loaded, this value will be applied if the source width is greater.
-Setting this to 0 means there is no maximum width.</property>
- <property name="adjustment">adjustment32</property>
- <property name="snap_to_ticks">True</property>
- <signal name="value-changed" handler="preset_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="PictureHeightEnable">
- <property name="label" translatable="yes">Maximum Height:</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Enable maximum height limit.</property>
- <property name="halign">start</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="preset_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="PictureHeight">
- <property name="width-chars">7</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">This is the maximum height that the video will be stored at.
-
-Whenever a new source is loaded, this value will be applied if the source height is greater.
-Setting this to 0 means there is no maximum height.</property>
- <property name="adjustment">adjustment33</property>
- <signal name="value-changed" handler="preset_widget_changed_cb" swapped="no"/>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
 </object>
 <packing>
 <property name="position">2</property>
@@ -8506,7 +9129,7 @@
 <child>
 <object class="GtkCheckButton" id="preview_show_crop">
 <property name="label" translatable="yes">Show Crop</property>
- <property name="visible">True</property>
+ <property name="visible">False</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
 <property name="tooltip_text" translatable="yes">Show Cropped area of the preview</property>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghb4.ui -> HandBrake-1.5.1.tar.xz/gtk/src/ghb4.ui Changed

@@ -680,6 +680,42 @@
 </object>
 </child>
 <child>
+ <object class="GtkLabel" id="queue_summary_title_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="halign">start</property>
+ <property name="use_markup">True</property>
+ <property name="label" translatable="yes">Title:</property>
+ <layout>
+ <property name="top-attach">2</property>
+ <property name="left-attach">0</property>
+ </layout>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="queue_summary_title">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="hexpand">False</property>
+ <property name="label" translatable="yes"></property>
+ <property name="width-chars">50</property>
+ <property name="lines">2</property>
+ <property name="wrap_mode">word-char</property>
+ <property name="ellipsize">middle</property>
+ <property name="selectable">True</property>
+ <layout>
+ <property name="top-attach">2</property>
+ <property name="left-attach">1</property>
+ </layout>
+ </object>
+ </child>
+ <child>
 <object class="GtkLabel" id="queue_summary_dest_label">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
@@ -689,7 +725,7 @@
 <property name="use_markup">True</property>
 <property name="label" translatable="yes">Destination:</property>
 <layout>
- <property name="top-attach">2</property>
+ <property name="top-attach">3</property>
 <property name="left-attach">0</property>
 </layout>
 </object>
@@ -709,7 +745,7 @@
 <property name="selectable">True</property>
 <property name="margin-bottom">12</property>
 <layout>
- <property name="top-attach">2</property>
+ <property name="top-attach">3</property>
 <property name="left-attach">1</property>
 </layout>
 </object>
@@ -724,7 +760,7 @@
 <property name="use_markup">True</property>
 <property name="label" translatable="yes">Dimensions:</property>
 <layout>
- <property name="top-attach">3</property>
+ <property name="top-attach">4</property>
 <property name="left-attach">0</property>
 </layout>
 </object>
@@ -739,7 +775,7 @@
 <property name="label" translatable="yes"></property>
 <property name="width-chars">50</property>
 <layout>
- <property name="top-attach">3</property>
+ <property name="top-attach">4</property>
 <property name="left-attach">1</property>
 </layout>
 </object>
@@ -754,7 +790,7 @@
 <property name="use_markup">True</property>
 <property name="label" translatable="yes">Video:</property>
 <layout>
- <property name="top-attach">4</property>
+ <property name="top-attach">5</property>
 <property name="left-attach">0</property>
 </layout>
 </object>
@@ -769,7 +805,7 @@
 <property name="label" translatable="yes"></property>
 <property name="width-chars">50</property>
 <layout>
- <property name="top-attach">4</property>
+ <property name="top-attach">5</property>
 <property name="left-attach">1</property>
 </layout>
 </object>
@@ -784,7 +820,7 @@
 <property name="use_markup">True</property>
 <property name="label" translatable="yes">Audio:</property>
 <layout>
- <property name="top-attach">5</property>
+ <property name="top-attach">6</property>
 <property name="left-attach">0</property>
 </layout>
 </object>
@@ -799,7 +835,7 @@
 <property name="label" translatable="yes"></property>
 <property name="width-chars">50</property>
 <layout>
- <property name="top-attach">5</property>
+ <property name="top-attach">6</property>
 <property name="left-attach">1</property>
 </layout>
 </object>
@@ -814,7 +850,7 @@
 <property name="use_markup">True</property>
 <property name="label" translatable="yes">Subtitles:</property>
 <layout>
- <property name="top-attach">6</property>
+ <property name="top-attach">7</property>
 <property name="left-attach">0</property>
 </layout>
 </object>
@@ -829,7 +865,7 @@
 <property name="label" translatable="yes"></property>
 <property name="width-chars">50</property>
 <layout>
- <property name="top-attach">6</property>
+ <property name="top-attach">7</property>
 <property name="left-attach">1</property>
 </layout>
 </object>
@@ -1763,7 +1799,7 @@
 <property name="can_focus">False</property>
 <child>
 <object class="GtkCheckMenuItem" id="hbfd">
- <property name="label" translatable="yes">HandBrake For _Dumbies</property>
+ <property name="label" translatable="yes">HandBrake For _Dummies</property>
 <property name="visible">False</property>
 <property name="can_focus">False</property>
 <property name="use_underline">True</property>
@@ -3652,7 +3688,7 @@
 <property name="halign">start</property>
 <property name="valign">start</property>
 <child>
- <object class="GtkLabel" id="PictureSharpenFilterel">
+ <object class="GtkLabel" id="PictureSharpenFilterLabel">
 <property name="visible">True</property>
 <property name="can_focus">False</property>
 <property name="halign">start</property>
@@ -5866,7 +5902,7 @@
 <property name="step_increment">5</property>
 <property name="page_increment">10</property>
 </object>
- <object class="GtkDialog" id="titla_add_multiple_dialog">
+ <object class="GtkDialog" id="title_add_multiple_dialog">
 <property name="transient_for">hb_window</property>
 <property name="can_focus">False</property>
 <property name="type_hint">dialog</property>
@@ -6232,7 +6268,7 @@
 </child>
 <child>
 <object class="GtkCheckButton" id="RemoveFinishedJobs">
- <property name="label" translatable="yes">Clear completed queue items after and encode completes</property>
+ <property name="label" translatable="yes">Clear completed queue items after an encode completes</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
 <property name="receives_default">False</property>
@@ -6485,7 +6521,6 @@
 <property name="width-chars">3</property>
 <property name="visible">True</property>
 <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Pause encoding if free disk space drops below limit</property>
 <property name="valign">GTK_ALIGN_CENTER</property>
 <property name="adjustment">ActivityFontSizeAdjustment</property>
 <signal name="value-changed" handler="activity_font_changed_cb" swapped="no"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghbcompat.c -> HandBrake-1.5.1.tar.xz/gtk/src/ghbcompat.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/ghbcompat.h -> HandBrake-1.5.1.tar.xz/gtk/src/ghbcompat.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/hb-backend.c -> HandBrake-1.5.1.tar.xz/gtk/src/hb-backend.c Changed

@@ -1,6 +1,6 @@
 /*
 * hb-backend.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * hb-backend.c is free software.
 *
@@ -35,6 +35,7 @@
 #include "subtitlehandler.h"
 #include "audiohandler.h"
 #include "videohandler.h"
+#include "queuehandler.h"
 #include "preview.h"
 #include "presets.h"
 #include "values.h"
@@ -119,10 +120,9 @@
 
 static options_map_t d_par_opts =
 {
- {N_("Off"), "off", HB_ANAMORPHIC_NONE},
- {N_("Automatic"), "auto", HB_ANAMORPHIC_AUTO},
- {N_("Loose"), "loose", HB_ANAMORPHIC_LOOSE},
- {N_("Custom"), "custom", HB_ANAMORPHIC_CUSTOM},
+ {N_("Automatic"), "auto", HB_ANAMORPHIC_AUTO},
+ {N_("None"), "off", HB_ANAMORPHIC_NONE},
+ {N_("Custom"), "custom", HB_ANAMORPHIC_CUSTOM},
 };
 combo_opts_t par_opts =
 {
@@ -231,12 +231,24 @@
 d_sharpen_opts
 };
 
+static options_map_t d_crop_opts =
+{
+ {N_("Automatic"), "auto", 0},
+ {N_("None"), "none", 1},
+ {N_("Custom"), "custom", 2},
+};
+combo_opts_t crop_opts =
+{
+ sizeof(d_crop_opts)/sizeof(options_map_t),
+ d_crop_opts
+};
+
 static options_map_t d_rotate_opts =
 {
- {N_("Off"), "disable=1", 0},
- {N_("90 Degrees"), "angle=90", 90},
- {N_("180 Degrees"), "angle=180", 180},
- {N_("270 Degrees"), "angle=270", 270},
+ {N_("Off"), "0", 0},
+ {N_("90°"), "90", 90},
+ {N_("180°"), "180", 180},
+ {N_("270°"), "270", 270},
 };
 combo_opts_t rotate_opts =
 {
@@ -244,6 +256,51 @@
 d_rotate_opts
 };
 
+static options_map_t d_resolution_opts =
+{
+ {N_("4320p 8K Ultra HD"), "4320p", 4320},
+ {N_("2160p 4K Ultra HD"), "2160p", 2160},
+ {N_("1440p 2.5K Quad HD"), "1440p", 1440},
+ {N_("1080p Full HD"), "1080p", 1080},
+ {N_("720p HD"), "720p", 720},
+ {N_("576p PAL"), "576p", 576},
+ {N_("480p NTSC"), "480p", 480},
+ {N_("None"), "none", 0},
+ {N_("Custom"), "custom", 1},
+};
+combo_opts_t resolution_opts =
+{
+ sizeof(d_resolution_opts)/sizeof(options_map_t),
+ d_resolution_opts
+};
+
+static options_map_t d_pad_opts =
+{
+ {N_("None"), "none", 0},
+ {N_("Height (Letterbox)"), "letterbox", 1},
+ {N_("Width (Pillarbox)"), "pillarbox", 2},
+ {N_("Width &amp; Height"), "fill", 3},
+ {N_("Custom"), "custom", 4},
+};
+combo_opts_t pad_opts =
+{
+ sizeof(d_pad_opts)/sizeof(options_map_t),
+ d_pad_opts
+};
+
+static options_map_t d_pad_color_opts =
+{
+ {N_("Black"), "black", 0},
+ {N_("Dark Gray"), "darkslategray", 1},
+ {N_("Gray"), "slategray", 2},
+ {N_("White"), "white", 3},
+};
+combo_opts_t pad_color_opts =
+{
+ sizeof(d_pad_color_opts)/sizeof(options_map_t),
+ d_pad_color_opts
+};
+
 static options_map_t d_direct_opts =
 {
 {N_("None"), "none", 0},
@@ -360,6 +417,18 @@
 gboolean preset;
 } filter_opts_t;
 
+static filter_opts_t chroma_smooth_preset_opts =
+{
+ .filter_id = HB_FILTER_CHROMA_SMOOTH,
+ .preset = TRUE
+};
+
+static filter_opts_t chroma_smooth_tune_opts =
+{
+ .filter_id = HB_FILTER_CHROMA_SMOOTH,
+ .preset = FALSE
+};
+
 static filter_opts_t deblock_preset_opts =
 {
 .filter_id = HB_FILTER_DEBLOCK,
@@ -378,6 +447,12 @@
 .preset = TRUE
 };
 
+static filter_opts_t colorspace_preset_opts =
+{
+ .filter_id = HB_FILTER_COLORSPACE,
+ .preset = TRUE
+};
+
 static filter_opts_t nlmeans_preset_opts =
 {
 .filter_id = HB_FILTER_NLMEANS,
@@ -422,6 +497,26 @@
 .preset = TRUE
 };
 
+typedef struct
+{
+ const gchar * shortOpt;
+ int width;
+ int height;
+} resolution_map_t;
+
+static resolution_map_t resolution_to_opts =
+{
+ {"4320p", 7680, 4320},
+ {"2160p", 3840, 2160},
+ {"1440p", 2560, 1440},
+ {"1080p", 1920, 1080},
+ {"720p", 1280, 720},
+ {"576p", 720, 576},
+ {"480p", 720, 480},
+ {"none", 0, 0},
+ {NULL, 0, 0},
+};
+
 typedef void (*opts_set_f)(signal_user_data_t *ud, const gchar *name,
 void *opts, const void* data);
 typedef GhbValue* (*opt_get_f)(const gchar *name, const void *opts,
@@ -529,12 +624,6 @@
 generic_opt_get
 },
 {
- "PictureModulus",
- &alignment_opts,
- small_opts_set,
- generic_opt_get
- },
- {
 "LoggingLevel",
 &logging_opts,
 small_opts_set,
@@ -601,6 +690,12 @@
 generic_opt_get
 },
 {
+ "PictureColorspacePreset",
+ &colorspace_preset_opts,
+ filter_opts_set,
+ filter_opt_get
+ },
+ {
 "PictureDenoisePreset",
 &nlmeans_preset_opts,
 denoise_opts_set,
@@ -613,6 +708,18 @@
 filter_opt_get
 },
 {
+ "PictureChromaSmoothPreset",
+ &chroma_smooth_preset_opts,
+ filter_opts_set,
+ filter_opt_get
+ },
+ {
+ "PictureChromaSmoothTune",
+ &chroma_smooth_tune_opts,
+ filter_opts_set,
+ filter_opt_get
+ },
+ {
 "PictureSharpenFilter",
 &sharpen_opts,
 small_opts_set,
@@ -631,12 +738,36 @@
 filter_opt_get
 },
 {
- "PictureRotate",
+ "rotate",
 &rotate_opts,
 small_opts_set,
 generic_opt_get
 },
 {
+ "crop_mode",
+ &crop_opts,
+ small_opts_set,
+ generic_opt_get
+ },
+ {
+ "resolution_limit",
+ &resolution_opts,
+ small_opts_set,
+ generic_opt_get
+ },
+ {
+ "PicturePadMode",
+ &pad_opts,
+ small_opts_set,
+ generic_opt_get
+ },
+ {
+ "PicturePadColor",
+ &pad_color_opts,
+ small_opts_set,
+ generic_opt_get
+ },
+ {
 "AudioBitrate",
 NULL,
 audio_bitrate_opts_set,
@@ -791,6 +922,42 @@
 return lang_lookup_index(str);
 }
 
+const gchar *
+ghb_lookup_resolution_limit(int width, int height)
+{
+ int ii;
+
+ for (ii = 0; resolution_to_optsii.shortOpt != NULL; ii++)
+ {
+ if (resolution_to_optsii.width == width &&
+ resolution_to_optsii.height == height)
+ {
+ return resolution_to_optsii.shortOpt;
+ }
+ }
+ return "custom";
+}
+
+int
+ghb_lookup_resolution_limit_dimensions(const gchar * opt,
+ int * width, int * height)
+{
+ int ii;
+
+ for (ii = 0; resolution_to_optsii.shortOpt != NULL; ii++)
+ {
+ if (!strcmp(opt, resolution_to_optsii.shortOpt))
+ {
+ *width = resolution_to_optsii.width;
+ *height = resolution_to_optsii.height;
+ return 0;
+ }
+ }
+ *width = -1;
+ *height = -1;
+ return 1;
+}
+
 static void
 del_tree(const gchar *name, gboolean del_top)
 {
@@ -3148,6 +3315,8 @@
 duration = title->duration;
 
 count = hb_list_count(title->list_chapter);
+ if (sc < 1) sc = 1;
+ if (ec < 1) ec = 1;
 if (sc > count) sc = count;
 if (ec > count) ec = count;
 
@@ -3622,45 +3791,78 @@
 void
 ghb_picture_settings_deps(signal_user_data_t *ud)
 {
- gboolean autoscale, keep_aspect, enable_keep_aspect;
+ gboolean autoscale, keep_aspect, custom_resolution_limit;
 gboolean enable_scale_width, enable_scale_height;
 gboolean enable_disp_width, enable_disp_height, enable_par;
+ gboolean custom_crop, custom_pad;
+ const gchar * resolution_limit, * crop_mode, * pad_mode;
 gint pic_par;
 GtkWidget *widget;
 
- pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
- enable_keep_aspect = (pic_par != HB_ANAMORPHIC_STRICT &&
- pic_par != HB_ANAMORPHIC_AUTO &&
- pic_par != HB_ANAMORPHIC_LOOSE);
- keep_aspect = ghb_dict_get_bool(ud->settings, "PictureKeepRatio");
- autoscale = ghb_dict_get_bool(ud->settings, "autoscale");
-
- enable_scale_width = enable_scale_height =
- !autoscale && (pic_par != HB_ANAMORPHIC_STRICT);
- enable_disp_width = (pic_par == HB_ANAMORPHIC_CUSTOM) && !keep_aspect;
- enable_par = (pic_par == HB_ANAMORPHIC_CUSTOM) && !keep_aspect;
- enable_disp_height = FALSE;
-
- widget = GHB_WIDGET(ud->builder, "PictureModulus");
- gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
- widget = GHB_WIDGET(ud->builder, "PictureLooseCrop");
- gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
+ pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+ keep_aspect = ghb_dict_get_bool(ud->settings, "PictureKeepRatio");
+ autoscale = ghb_dict_get_bool(ud->settings, "PictureUseMaximumSize");
+ resolution_limit = ghb_dict_get_string(ud->settings, "resolution_limit");
+ crop_mode = ghb_dict_get_string(ud->settings, "crop_mode");
+ pad_mode = ghb_dict_get_string(ud->settings, "PicturePadMode");
+
+ enable_scale_width = enable_scale_height = !autoscale;
+ enable_disp_width = !keep_aspect;
+ enable_par = (pic_par == HB_ANAMORPHIC_CUSTOM);
+ enable_disp_height = FALSE;
+ custom_resolution_limit = !strcmp(resolution_limit, "custom");
+ custom_crop = !strcmp(crop_mode, "custom");
+ custom_pad = !strcmp(pad_mode, "custom");
+
 widget = GHB_WIDGET(ud->builder, "scale_width");
 gtk_widget_set_sensitive(widget, enable_scale_width);
 widget = GHB_WIDGET(ud->builder, "scale_height");
 gtk_widget_set_sensitive(widget, enable_scale_height);
- widget = GHB_WIDGET(ud->builder, "PictureDisplayWidth");
+
+ widget = GHB_WIDGET(ud->builder, "PictureDARWidth");
 gtk_widget_set_sensitive(widget, enable_disp_width);
- widget = GHB_WIDGET(ud->builder, "PictureDisplayHeight");
+ widget = GHB_WIDGET(ud->builder, "DisplayHeight");
 gtk_widget_set_sensitive(widget, enable_disp_height);
+
 widget = GHB_WIDGET(ud->builder, "PicturePARWidth");
 gtk_widget_set_sensitive(widget, enable_par);
 widget = GHB_WIDGET(ud->builder, "PicturePARHeight");
 gtk_widget_set_sensitive(widget, enable_par);
- widget = GHB_WIDGET(ud->builder, "PictureKeepRatio");
- gtk_widget_set_sensitive(widget, enable_keep_aspect);
- widget = GHB_WIDGET(ud->builder, "autoscale");
- gtk_widget_set_sensitive(widget, pic_par != HB_ANAMORPHIC_STRICT);
+
+ widget = GHB_WIDGET(ud->builder, "PictureWidth");
+ gtk_widget_set_sensitive(widget, custom_resolution_limit);
+ widget = GHB_WIDGET(ud->builder, "PictureHeight");
+ gtk_widget_set_sensitive(widget, custom_resolution_limit);
+
+ widget = GHB_WIDGET(ud->builder, "PictureTopCrop");
+ gtk_widget_set_sensitive(widget, custom_crop);
+ widget = GHB_WIDGET(ud->builder, "PictureBottomCrop");
+ gtk_widget_set_sensitive(widget, custom_crop);
+ widget = GHB_WIDGET(ud->builder, "PictureLeftCrop");
+ gtk_widget_set_sensitive(widget, custom_crop);
+ widget = GHB_WIDGET(ud->builder, "PictureRightCrop");
+ gtk_widget_set_sensitive(widget, custom_crop);
+
+ widget = GHB_WIDGET(ud->builder, "PicturePadTop");
+ gtk_widget_set_sensitive(widget, custom_pad);
+ widget = GHB_WIDGET(ud->builder, "PicturePadBottom");
+ gtk_widget_set_sensitive(widget, custom_pad);
+ widget = GHB_WIDGET(ud->builder, "PicturePadLeft");
+ gtk_widget_set_sensitive(widget, custom_pad);
+ widget = GHB_WIDGET(ud->builder, "PicturePadRight");
+ gtk_widget_set_sensitive(widget, custom_pad);
+
+ widget = GHB_WIDGET(ud->builder, "display_size_lock_image");
+ if (keep_aspect)
+ {
+ gtk_image_set_from_icon_name(GTK_IMAGE(widget), "emblem-readonly",
+ GTK_ICON_SIZE_BUTTON);
+ }
+ else
+ {
+ gtk_image_set_from_icon_name(GTK_IMAGE(widget), "edit-clear",
+ GTK_ICON_SIZE_BUTTON);
+ }
 }
 
 void
@@ -3684,240 +3886,240 @@
 }
 
 void
-ghb_apply_crop(GhbValue *settings, const hb_title_t * title)
+ghb_apply_pad(GhbValue *settings,
+ const hb_geometry_settings_t * geo,
+ hb_geometry_t * result)
+{
+ gboolean fillwidth, fillheight;
+ gint pad4 = {0,};
+
+ const gchar * pad_mode;
+
+ pad_mode = ghb_dict_get_string(settings, "PicturePadMode");
+ fillwidth = fillheight = !strcmp(pad_mode, "fill");
+ fillheight = fillheight || !strcmp(pad_mode, "letterbox");
+ fillwidth = fillwidth || !strcmp(pad_mode, "pillarbox");
+
+ if (!strcmp(pad_mode, "custom"))
+ {
+ pad0 = ghb_dict_get_int(settings, "PicturePadTop");
+ pad1 = ghb_dict_get_int(settings, "PicturePadBottom");
+ pad2 = ghb_dict_get_int(settings, "PicturePadLeft");
+ pad3 = ghb_dict_get_int(settings, "PicturePadRight");
+ }
+
+ if (fillheight && geo->maxHeight > 0)
+ {
+ pad0 = (geo->maxHeight - result->height) / 2;
+ pad1 = geo->maxHeight - result->height - pad0;
+ }
+ if (fillwidth && geo->maxWidth > 0)
+ {
+ pad2 = (geo->maxWidth - result->width) / 2;
+ pad3 = geo->maxWidth - result->width - pad2;
+ }
+
+ pad0 = MOD_DOWN(pad0, 2);
+ pad1 = MOD_DOWN(pad1, 2);
+ pad2 = MOD_DOWN(pad2, 2);
+ pad3 = MOD_DOWN(pad3, 2);
+ ghb_dict_set_int(settings, "PicturePadTop", pad0);
+ ghb_dict_set_int(settings, "PicturePadBottom", pad1);
+ ghb_dict_set_int(settings, "PicturePadLeft", pad2);
+ ghb_dict_set_int(settings, "PicturePadRight", pad3);
+
+ result->width += pad2 + pad3;
+ result->height += pad0 + pad1;
+}
+
+void
+ghb_apply_crop(GhbValue *settings, const hb_geometry_crop_t * geo)
 {
- gboolean autocrop, loosecrop;
+ gboolean autocrop, customcrop;
 gint crop4 = {0,};
 
- autocrop = ghb_dict_get_bool(settings, "PictureAutoCrop");
- // "PictureLooseCrop" is a flag that says we prefer to crop extra to
- // satisfy alignment constraints rather than scaling to satisfy them.
- loosecrop = ghb_dict_get_bool(settings, "PictureLooseCrop");
+ const gchar * crop_mode;
+
+ crop_mode = ghb_dict_get_string(settings, "crop_mode");
+ autocrop = !strcmp(crop_mode, "auto");
+ customcrop = !strcmp(crop_mode, "custom");
 
 if (autocrop)
 {
- crop0 = title->crop0;
- crop1 = title->crop1;
- crop2 = title->crop2;
- crop3 = title->crop3;
+ crop0 = geo->crop0;
+ crop1 = geo->crop1;
+ crop2 = geo->crop2;
+ crop3 = geo->crop3;
 }
- else
+ else if (customcrop)
 {
 crop0 = ghb_dict_get_int(settings, "PictureTopCrop");
 crop1 = ghb_dict_get_int(settings, "PictureBottomCrop");
 crop2 = ghb_dict_get_int(settings, "PictureLeftCrop");
 crop3 = ghb_dict_get_int(settings, "PictureRightCrop");
 }
- if (loosecrop)
- {
- gint need1, need2;
- gint crop_width, crop_height, width, height;
- gint mod;
-
- mod = ghb_settings_combo_int(settings, "PictureModulus");
- if (mod <= 0)
- mod = 16;
-
- // Adjust the cropping to accomplish the desired width and height
- crop_width = title->geometry.width - crop2 - crop3;
- crop_height = title->geometry.height - crop0 - crop1;
- width = MOD_DOWN(crop_width, mod);
- height = MOD_DOWN(crop_height, mod);
-
- need1 = EVEN((crop_height - height) / 2);
- need2 = crop_height - height - need1;
- crop0 += need1;
- crop1 += need2;
- need1 = EVEN((crop_width - width) / 2);
- need2 = crop_width - width - need1;
- crop2 += need1;
- crop3 += need2;
- }
+
 // Prevent crop from creating too small an image
- if (title->geometry.height - crop0 -crop1 < 16)
+ if (geo->geometry.height - crop0 -crop1 < 16)
 {
- crop0 = title->geometry.height - crop1 - 16;
+ crop0 = geo->geometry.height - crop1 - 16;
 if (crop0 < 0)
 {
 crop1 += crop0;
- crop0 = 0;
+ crop0 = 0;
 }
 }
- if (title->geometry.width - crop2 - crop3 < 16)
+ if (geo->geometry.width - crop2 - crop3 < 16)
 {
- crop2 = title->geometry.width - crop3 - 16;
+ crop2 = geo->geometry.width - crop3 - 16;
 if (crop2 < 0)
 {
 crop3 += crop2;
- crop2 = 0;
+ crop2 = 0;
 }
 }
- ghb_dict_set_int(settings, "PictureTopCrop", crop0);
+ crop0 = MOD_DOWN(crop0, 2);
+ crop1 = MOD_DOWN(crop1, 2);
+ crop2 = MOD_DOWN(crop2, 2);
+ crop3 = MOD_DOWN(crop3, 2);
+ ghb_dict_set_int(settings, "PictureTopCrop", crop0);
 ghb_dict_set_int(settings, "PictureBottomCrop", crop1);
- ghb_dict_set_int(settings, "PictureLeftCrop", crop2);
- ghb_dict_set_int(settings, "PictureRightCrop", crop3);
+ ghb_dict_set_int(settings, "PictureLeftCrop", crop2);
+ ghb_dict_set_int(settings, "PictureRightCrop", crop3);
 }
 
 void
-ghb_set_scale_settings(GhbValue *settings, gint mode)
+ghb_set_scale_settings(signal_user_data_t * ud, GhbValue *settings, gint mode)
 {
 gboolean keep_aspect;
- gint pic_par;
- gboolean autoscale;
- gint crop4 = {0,};
- gint width, height;
- gint crop_width, crop_height;
- gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH);
- gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT);
- gint mod;
- gint max_width = 0;
- gint max_height = 0;
-
- pic_par = ghb_settings_combo_int(settings, "PicturePAR");
- if (pic_par == HB_ANAMORPHIC_STRICT)
- {
- ghb_dict_set_bool(settings, "autoscale", TRUE);
- ghb_dict_set_int(settings, "PictureModulus", 2);
- ghb_dict_set_bool(settings, "PictureLooseCrop", TRUE);
- }
- if (pic_par == HB_ANAMORPHIC_STRICT ||
- pic_par == HB_ANAMORPHIC_AUTO ||
- pic_par == HB_ANAMORPHIC_LOOSE)
- {
- ghb_dict_set_bool(settings, "PictureKeepRatio", TRUE);
- }
+ gboolean autoscale, upscale;
+ gboolean keep_width = (mode & GHB_PIC_KEEP_WIDTH);
+ gboolean keep_height = (mode & GHB_PIC_KEEP_HEIGHT);
+ gboolean keep_display_width = (mode & GHB_PIC_KEEP_DISPLAY_WIDTH);
+ const gchar * pad_mode;
 
 int title_id, titleindex;
 const hb_title_t * title;
+ int angle, hflip;
 
- title_id = ghb_dict_get_int(settings, "title");
- title = ghb_lookup_title(title_id, &titleindex);
- if (title == NULL) return;
-
- hb_geometry_t srcGeo, resultGeo;
+ hb_geometry_crop_t srcGeo;
+ hb_geometry_t resultGeo;
 hb_geometry_settings_t uiGeo;
 
- srcGeo.width = title->geometry.width;
- srcGeo.height = title->geometry.height;
- srcGeo.par = title->geometry.par;
-
- // First configure widgets
- mod = ghb_settings_combo_int(settings, "PictureModulus");
- if (mod <= 0)
- mod = 16;
- keep_aspect = ghb_dict_get_bool(settings, "PictureKeepRatio");
- autoscale = ghb_dict_get_bool(settings, "autoscale");
- // Align dimensions to either 16 or 2 pixels
- // The scaler crashes if the dimensions are not divisible by 2
- // x264 also will not accept dims that are not multiple of 2
- if (autoscale)
- {
- keep_width = FALSE;
- keep_height = FALSE;
- }
-
- ghb_apply_crop(settings, title);
- crop0 = ghb_dict_get_int(settings, "PictureTopCrop");
- crop1 = ghb_dict_get_int(settings, "PictureBottomCrop");
- crop2 = ghb_dict_get_int(settings, "PictureLeftCrop");
- crop3 = ghb_dict_get_int(settings, "PictureRightCrop");
- uiGeo.crop0 = crop0;
- uiGeo.crop1 = crop1;
- uiGeo.crop2 = crop2;
- uiGeo.crop3 = crop3;
+ title_id = ghb_dict_get_int(settings, "title");
+ title = ghb_lookup_title(title_id, &titleindex);
 
- crop_width = title->geometry.width - crop2 - crop3;
- crop_height = title->geometry.height - crop0 - crop1;
- if (autoscale)
+ if (title != NULL)
 {
- width = crop_width;
- height = crop_height;
+ srcGeo.geometry = title->geometry;
+ memcpy(srcGeo.crop, &title->crop, 4 * sizeof(int));
 }
 else
 {
- width = ghb_dict_get_int(settings, "scale_width");
- height = ghb_dict_get_int(settings, "scale_height");
- if (mode & GHB_PIC_USE_MAX)
- {
- max_width = MOD_DOWN(
- ghb_dict_get_int(settings, "PictureWidth"), mod);
- max_height = MOD_DOWN(
- ghb_dict_get_int(settings, "PictureHeight"), mod);
+ // Defaults so that the Dimensions tab does something reasonable
+ // when there is no title
+ memset(&srcGeo, 0, sizeof(srcGeo));
+ srcGeo.geometry.width = ghb_dict_get_int(settings, "PictureWidth");
+ srcGeo.geometry.height = ghb_dict_get_int(settings, "PictureHeight");
+ srcGeo.geometry.par.num = 1;
+ srcGeo.geometry.par.den = 1;
+ if (srcGeo.geometry.width == 0 || srcGeo.geometry.height == 0)
+ {
+ srcGeo.geometry.width = 1920;
+ srcGeo.geometry.height = 1080;
 }
 }
- g_debug("max_width %d, max_height %d\n", max_width, max_height);
-
- if (width < 16)
- width = 16;
- if (height < 16)
- height = 16;
 
- width = MOD_ROUND(width, mod);
- height = MOD_ROUND(height, mod);
+ // Rotate title dimensions so that they align with the current
+ // orientation of dimensions tab settings
+ angle = ghb_dict_get_int(settings, "rotate");
+ hflip = ghb_dict_get_int(settings, "hflip");
+ hb_rotate_geometry(&srcGeo, &srcGeo, angle, hflip);
+
+ // Apply crop mode to current settings and sanitize crop values
+ ghb_apply_crop(settings, &srcGeo);
+
+ memset(&uiGeo, 0, sizeof(uiGeo));
+
+ pad_mode = ghb_dict_get_string(ud->settings, "PicturePadMode");
+ autoscale = ghb_dict_get_bool(settings, "PictureUseMaximumSize");
+ upscale = ghb_dict_get_bool(settings, "PictureAllowUpscaling");
+ keep_aspect = ghb_dict_get_bool(settings, "PictureKeepRatio");
 
- uiGeo.mode = pic_par;
- uiGeo.keep = 0;
+ if (keep_display_width)
+ uiGeo.keep |= HB_KEEP_DISPLAY_WIDTH;
 if (keep_width)
 uiGeo.keep |= HB_KEEP_WIDTH;
 if (keep_height)
 uiGeo.keep |= HB_KEEP_HEIGHT;
 if (keep_aspect)
 uiGeo.keep |= HB_KEEP_DISPLAY_ASPECT;
- uiGeo.itu_par = 0;
- uiGeo.modulus = mod;
- uiGeo.geometry.width = width;
- uiGeo.geometry.height = height;
- uiGeo.geometry.par = title->geometry.par;
- uiGeo.maxWidth = max_width;
- uiGeo.maxHeight = max_height;
- if (pic_par != HB_ANAMORPHIC_NONE)
- {
- if (pic_par == HB_ANAMORPHIC_CUSTOM && !keep_aspect)
- {
- if (mode & GHB_PIC_KEEP_PAR)
- {
- uiGeo.geometry.par.num =
- ghb_dict_get_int(settings, "PicturePARWidth");
- uiGeo.geometry.par.den =
- ghb_dict_get_int(settings, "PicturePARHeight");
- }
- else if (mode & (GHB_PIC_KEEP_DISPLAY_HEIGHT |
- GHB_PIC_KEEP_DISPLAY_WIDTH))
- {
- uiGeo.geometry.par.num =
- ghb_dict_get_int(settings, "PictureDisplayWidth");
- uiGeo.geometry.par.den = width;
- hb_reduce(&uiGeo.geometry.par.num, &uiGeo.geometry.par.den,
- uiGeo.geometry.par.num, uiGeo.geometry.par.den);
- }
- }
- else
- {
- uiGeo.keep |= HB_KEEP_DISPLAY_ASPECT;
- }
- }
- // hb_set_anamorphic_size will adjust par, dar, and width/height
- // to conform to job parameters that have been set, including
- // maxWidth and maxHeight
- hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
+ if (!strcmp(pad_mode, "custom"))
+ uiGeo.keep |= HB_KEEP_PAD;
 
- ghb_dict_set_int(settings, "scale_width", resultGeo.width);
- ghb_dict_set_int(settings, "scale_height", resultGeo.height);
+ if (upscale)
+ uiGeo.flags |= HB_GEO_SCALE_UP;
+ if (autoscale)
+ uiGeo.flags |= HB_GEO_SCALE_BEST;
 
- gint disp_width;
+ uiGeo.mode = ghb_settings_combo_int(settings, "PicturePAR");
+ uiGeo.modulus = ghb_dict_get_int(settings, "PictureModulus");
+ uiGeo.geometry.width = ghb_dict_get_int(settings, "scale_width");
+ uiGeo.geometry.height = ghb_dict_get_int(settings, "scale_height");
+ uiGeo.maxWidth = ghb_dict_get_int(settings, "PictureWidth");
+ uiGeo.maxHeight = ghb_dict_get_int(settings, "PictureHeight");
+ uiGeo.geometry.par.num = ghb_dict_get_int(settings, "PicturePARWidth");
+ uiGeo.geometry.par.den = ghb_dict_get_int(settings, "PicturePARHeight");
+ uiGeo.displayWidth = ghb_dict_get_int(settings, "PictureDARWidth");
+ uiGeo.displayHeight = ghb_dict_get_int(settings, "DisplayHeight");
+
+ uiGeo.pad0 = ghb_dict_get_int(settings, "PicturePadTop");
+ uiGeo.pad1 = ghb_dict_get_int(settings, "PicturePadBottom");
+ uiGeo.pad2 = ghb_dict_get_int(settings, "PicturePadLeft");
+ uiGeo.pad3 = ghb_dict_get_int(settings, "PicturePadRight");
+
+ uiGeo.crop0 = ghb_dict_get_int(settings, "PictureTopCrop");
+ uiGeo.crop1 = ghb_dict_get_int(settings, "PictureBottomCrop");
+ uiGeo.crop2 = ghb_dict_get_int(settings, "PictureLeftCrop");
+ uiGeo.crop3 = ghb_dict_get_int(settings, "PictureRightCrop");
+
+ // hb_set_anamorphic_size2 will adjust par, dar, and width/height
+ // and enforce resolution limits
+ hb_set_anamorphic_size2(&srcGeo.geometry, &uiGeo, &resultGeo);
 
- disp_width = ((gdouble)resultGeo.par.num / resultGeo.par.den) *
- resultGeo.width + 0.5;
+ ghb_dict_set_int(settings, "scale_width", resultGeo.width);
+ ghb_dict_set_int(settings, "scale_height", resultGeo.height);
 
 ghb_dict_set_int(settings, "PicturePARWidth", resultGeo.par.num);
 ghb_dict_set_int(settings, "PicturePARHeight", resultGeo.par.den);
- ghb_dict_set_int(settings, "PictureDisplayWidth", disp_width);
- ghb_dict_set_int(settings, "PictureDisplayHeight", resultGeo.height);
 
 // Update Job PAR
 GhbValue *par = ghb_get_job_par_settings(settings);
 ghb_dict_set_int(par, "Num", resultGeo.par.num);
 ghb_dict_set_int(par, "Den", resultGeo.par.den);
+
+ uiGeo.maxWidth = ghb_dict_get_int(settings, "PictureWidth");
+ uiGeo.maxHeight = ghb_dict_get_int(settings, "PictureHeight");
+ ghb_apply_pad(settings, &uiGeo, &resultGeo);
+
+ gint disp_width;
+
+ disp_width = ((gdouble)resultGeo.par.num / resultGeo.par.den) *
+ resultGeo.width + 0.5;
+
+ ghb_dict_set_int(settings, "PictureDARWidth", disp_width);
+ ghb_dict_set_int(settings, "DisplayHeight", resultGeo.height);
+
+ char * storage_size;
+ storage_size = hb_strdup_printf("%d x %d",
+ resultGeo.width, resultGeo.height);
+ ghb_ui_update(ud, "final_storage_size", ghb_string_value(storage_size));
+ g_free(storage_size);
+
+ char * aspect;
+ aspect = ghb_get_display_aspect_string(disp_width, resultGeo.height);
+ ghb_ui_update(ud, "final_aspect_ratio", ghb_string_value(aspect));
+ g_free(aspect);
 }
 
 char *
@@ -3926,93 +4128,49 @@
 gchar *str;
 
 gint iaspect = disp_width * 9 / disp_height;
- if (disp_width > 2 * disp_height)
+ if (disp_width / disp_height > 1.9)
 {
+ // x.x:1
 str = g_strdup_printf("%.2f:1", disp_width / disp_height);
 }
- else if (iaspect <= 16 && iaspect >= 15)
+ else if (iaspect >= 15)
 {
+ // x.x:9
 str = g_strdup_printf("%.4g:9", disp_width * 9 / disp_height);
 }
- else if (iaspect <= 12 && iaspect >= 11)
+ else if (iaspect >= 9)
 {
+ // x.x:3
 str = g_strdup_printf("%.4g:3", disp_width * 3 / disp_height);
 }
 else
 {
- gint dar_width, dar_height;
- hb_reduce(&dar_width, &dar_height, disp_width, disp_height);
- str = g_strdup_printf("%d:%d", dar_width, dar_height);
+ // 1:x.x
+ str = g_strdup_printf("1:%.2f", disp_height / disp_width);
 }
 return str;
 }
 
 void
-ghb_update_display_aspect_label(signal_user_data_t *ud)
-{
- gint width, disp_height;
- gint par_num, par_den;
- double disp_width;
- gchar *str;
-
- width = ghb_dict_get_int(ud->settings, "scale_width");
- disp_height = ghb_dict_get_int(ud->settings, "scale_height");
- par_num = ghb_dict_get_int(ud->settings, "PicturePARWidth");
- par_den = ghb_dict_get_int(ud->settings, "PicturePARHeight");
- disp_width = (double)width * par_num / par_den;
- str = ghb_get_display_aspect_string(disp_width, disp_height);
- ghb_ui_update(ud, "display_aspect", ghb_string_value(str));
- g_free(str);
-}
-
-void
 ghb_set_scale(signal_user_data_t *ud, gint mode)
 {
 if (ud->scale_busy) return;
 ud->scale_busy = TRUE;
 
- ghb_set_scale_settings(ud->settings, mode);
+ ghb_set_scale_settings(ud, ud->settings, mode);
 ghb_update_summary_info(ud);
 ghb_picture_settings_deps(ud);
 
 // Step needs to be at least 2 because odd widths cause scaler crash
 // subsampled chroma requires even crop values.
 GtkWidget *widget;
- int mod = ghb_settings_combo_int(ud->settings, "PictureModulus");
+ int mod = ghb_dict_get_int(ud->settings, "PictureModulus");
 widget = GHB_WIDGET (ud->builder, "scale_width");
 gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
 widget = GHB_WIDGET (ud->builder, "scale_height");
 gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
 
- // "PictureLooseCrop" is a flag that says we prefer to crop extra to
- // satisfy alignment constraints rather than scaling to satisfy them.
- gboolean loosecrop = ghb_dict_get_bool(ud->settings, "PictureLooseCrop");
- if (loosecrop)
- {
- widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
- widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
- widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
- widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), mod, 16);
- }
- else
- {
- widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
- widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
- widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
- widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
- gtk_spin_button_set_increments (GTK_SPIN_BUTTON(widget), 2, 16);
- }
-
- ghb_ui_update_from_settings(ud, "autoscale", ud->settings);
- ghb_ui_update_from_settings(ud, "PictureModulus", ud->settings);
- ghb_ui_update_from_settings(ud, "PictureLooseCrop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureUseMaximumSize", ud->settings);
 ghb_ui_update_from_settings(ud, "PictureKeepRatio", ud->settings);
 
 ghb_ui_update_from_settings(ud, "PictureTopCrop", ud->settings);
@@ -4022,55 +4180,20 @@
 
 ghb_ui_update_from_settings(ud, "scale_width", ud->settings);
 ghb_ui_update_from_settings(ud, "scale_height", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureWidth", ud->settings);
+ ghb_ui_update_from_settings(ud, "PictureHeight", ud->settings);
 
 ghb_ui_update_from_settings(ud, "PicturePARWidth", ud->settings);
 ghb_ui_update_from_settings(ud, "PicturePARHeight", ud->settings);
- ghb_ui_update_from_settings(ud, "PictureDisplayWidth", ud->settings);
- ghb_ui_update_from_settings(ud, "PictureDisplayHeight", ud->settings);
- ghb_update_display_aspect_label(ud);
- ud->scale_busy = FALSE;
-}
 
-static void
-get_preview_geometry(signal_user_data_t *ud, const hb_title_t *title,
- hb_geometry_t *srcGeo, hb_geometry_settings_t *uiGeo)
-{
- srcGeo->width = title->geometry.width;
- srcGeo->height = title->geometry.height;
- srcGeo->par = title->geometry.par;
-
- uiGeo->mode = ghb_settings_combo_int(ud->settings, "PicturePAR");
- uiGeo->keep = (ghb_dict_get_bool(ud->settings, "PictureKeepRatio") ||
- uiGeo->mode == HB_ANAMORPHIC_STRICT ||
- uiGeo->mode == HB_ANAMORPHIC_LOOSE) ?
- HB_KEEP_DISPLAY_ASPECT : 0;
- uiGeo->itu_par = 0;
- uiGeo->modulus = ghb_settings_combo_int(ud->settings, "PictureModulus");
- uiGeo->crop0 = ghb_dict_get_int(ud->settings, "PictureTopCrop");
- uiGeo->crop1 = ghb_dict_get_int(ud->settings, "PictureBottomCrop");
- uiGeo->crop2 = ghb_dict_get_int(ud->settings, "PictureLeftCrop");
- uiGeo->crop3 = ghb_dict_get_int(ud->settings, "PictureRightCrop");
- uiGeo->geometry.width = ghb_dict_get_int(ud->settings, "scale_width");
- uiGeo->geometry.height = ghb_dict_get_int(ud->settings, "scale_height");
- uiGeo->geometry.par.num = ghb_dict_get_int(ud->settings, "PicturePARWidth");
- uiGeo->geometry.par.den = ghb_dict_get_int(ud->settings, "PicturePARHeight");
- uiGeo->maxWidth = 0;
- uiGeo->maxHeight = 0;
- if (ghb_dict_get_bool(ud->prefs, "preview_show_crop"))
- {
- gdouble xscale = (gdouble)uiGeo->geometry.width /
- (title->geometry.width - uiGeo->crop2 - uiGeo->crop3);
- gdouble yscale = (gdouble)uiGeo->geometry.height /
- (title->geometry.height - uiGeo->crop0 - uiGeo->crop1);
-
- uiGeo->geometry.width += xscale * (uiGeo->crop2 + uiGeo->crop3);
- uiGeo->geometry.height += yscale * (uiGeo->crop0 + uiGeo->crop1);
- uiGeo->crop0 = 0;
- uiGeo->crop1 = 0;
- uiGeo->crop2 = 0;
- uiGeo->crop3 = 0;
- uiGeo->modulus = 2;
- }
+ ghb_ui_update_from_settings(ud, "PicturePadTop", ud->settings);
+ ghb_ui_update_from_settings(ud, "PicturePadBottom", ud->settings);
+ ghb_ui_update_from_settings(ud, "PicturePadLeft", ud->settings);
+ ghb_ui_update_from_settings(ud, "PicturePadRight", ud->settings);
+
+ ghb_ui_update_from_settings(ud, "PictureDARWidth", ud->settings);
+ ghb_ui_update_from_settings(ud, "DisplayHeight", ud->settings);
+ ud->scale_busy = FALSE;
 }
 
 const char*
@@ -4665,143 +4788,32 @@
 }
 }
 
-static void
-vert_line(
- GdkPixbuf * pb,
- guint8 r,
- guint8 g,
- guint8 b,
- gint x,
- gint y,
- gint len,
- gint width)
-{
- guint8 *pixels = gdk_pixbuf_get_pixels (pb);
- guint8 *dst;
- gint ii, jj;
- gint channels = gdk_pixbuf_get_n_channels (pb);
- gint stride = gdk_pixbuf_get_rowstride (pb);
-
- for (jj = 0; jj < width; jj++)
- {
- dst = pixels + y * stride + (x+jj) * channels;
- for (ii = 0; ii < len; ii++)
- {
- dst0 = r;
- dst1 = g;
- dst2 = b;
- dst += stride;
- }
- }
-}
-
-static void
-horz_line(
- GdkPixbuf * pb,
- guint8 r,
- guint8 g,
- guint8 b,
- gint x,
- gint y,
- gint len,
- gint width)
-{
- guint8 *pixels = gdk_pixbuf_get_pixels (pb);
- guint8 *dst;
- gint ii, jj;
- gint channels = gdk_pixbuf_get_n_channels (pb);
- gint stride = gdk_pixbuf_get_rowstride (pb);
-
- for (jj = 0; jj < width; jj++)
- {
- dst = pixels + (y+jj) * stride + x * channels;
- for (ii = 0; ii < len; ii++)
- {
- dst0 = r;
- dst1 = g;
- dst2 = b;
- dst += channels;
- }
- }
-}
-
-static void
-hash_pixbuf(
- GdkPixbuf * pb,
- gint x,
- gint y,
- gint w,
- gint h,
- gint step,
- gint orientation)
-{
- gint ii, jj;
- gint line_width = 8;
- struct
- {
- guint8 r;
- guint8 g;
- guint8 b;
- } c4 =
- {{0x80, 0x80, 0x80},{0xC0, 0x80, 0x70},{0x80, 0xA0, 0x80},{0x70, 0x80, 0xA0}};
-
- if (!orientation)
- {
- // vertical lines
- for (ii = x, jj = 0; ii+line_width < x+w; ii += step, jj++)
- {
- vert_line(pb, cjj&3.r, cjj&3.g, cjj&3.b, ii, y, h, line_width);
- }
- }
- else
- {
- // horizontal lines
- for (ii = y, jj = 0; ii+line_width < y+h; ii += step, jj++)
- {
- horz_line(pb, cjj&3.r, cjj&3.g, cjj&3.b, x, ii, w, line_width);
- }
- }
-}
-
 GdkPixbuf*
 ghb_get_preview_image(
- const hb_title_t *title,
 gint index,
- signal_user_data_t *ud,
- gint *out_width,
- gint *out_height)
+ signal_user_data_t *ud)
 {
- hb_geometry_t srcGeo, resultGeo;
- hb_geometry_settings_t uiGeo;
+ GhbValue * settings, * job;
 
- if( title == NULL ) return NULL;
+ settings = ghb_value_dup(ud->settings);
+ ghb_finalize_job(settings);
+ job = ghb_get_job_settings(settings);
 
- gboolean deinterlace;
- deinterlace = ghb_settings_combo_int(ud->settings,
- "PictureDeinterlaceFilter") != HB_FILTER_INVALID;
-
- // Get the geometry settings for the preview. This will disable
- // cropping if the setting to show the cropped region is enabled.
- get_preview_geometry(ud, title, &srcGeo, &uiGeo);
-
- // hb_get_preview doesn't compensate for anamorphic, so lets
- // calculate scale factors
- hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
-
- // Rescale preview dimensions to adjust for screen PAR and settings PAR
- ghb_par_scale(ud, &uiGeo.geometry.width, &uiGeo.geometry.height,
- resultGeo.par.num, resultGeo.par.den);
- uiGeo.geometry.par.num = 1;
- uiGeo.geometry.par.den = 1;
-
- GdkPixbuf *preview;
- hb_image_t *image;
- image = hb_get_preview2(h_scan, title->index, index, &uiGeo, deinterlace);
+ GdkPixbuf * preview;
+ hb_image_t * image = NULL;
+ if (ghb_get_job_title_id(settings) >= 0)
+ {
+ image = hb_get_preview3(h_scan, index, job);
+ }
+ ghb_value_free(&settings);
 
 if (image == NULL)
 {
- preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
- title->geometry.width, title->geometry.height);
+ preview = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, 854, 480);
+ guint8 * pixels = gdk_pixbuf_get_pixels(preview);
+ gint stride = gdk_pixbuf_get_rowstride(preview);
+ memset(pixels, 0, 480 * stride);
+
 return preview;
 }
 
@@ -4837,83 +4849,8 @@
 dst += stride;
 }
 
- *out_width = ghb_dict_get_int(ud->settings, "scale_width");
- *out_height = ghb_dict_get_int(ud->settings, "scale_height");
- ghb_par_scale(ud, out_width, out_height,
- resultGeo.par.num, resultGeo.par.den);
-
- gint c0, c1, c2, c3;
- c0 = ghb_dict_get_int(ud->settings, "PictureTopCrop");
- c1 = ghb_dict_get_int(ud->settings, "PictureBottomCrop");
- c2 = ghb_dict_get_int(ud->settings, "PictureLeftCrop");
- c3 = ghb_dict_get_int(ud->settings, "PictureRightCrop");
-
- gdouble xscale, yscale;
- if (ghb_dict_get_bool(ud->prefs, "preview_show_crop"))
- {
- xscale = (gdouble)image->width / title->geometry.width;
- yscale = (gdouble)image->height / title->geometry.height;
- }
- else
- {
- xscale = (gdouble)image->width / (title->geometry.width - c2 - c3);
- yscale = (gdouble)image->height / (title->geometry.height - c0 - c1);
- }
-
- int previewWidth = image->width;
- int previewHeight = image->height;
-
- // If the preview is too large to fit the screen, reduce it's size.
- if (ghb_dict_get_bool(ud->prefs, "reduce_hd_preview"))
- {
- gint factor = 80;
- gint s_w, s_h;
-
- ghb_monitor_get_size(GHB_WIDGET(ud->builder, "hb_window"), &s_w, &s_h);
- if (s_w > 0 && s_h > 0 &&
- (previewWidth > s_w * factor / 100 ||
- previewHeight > s_h * factor / 100))
- {
- GdkPixbuf *scaled_preview;
- int orig_w = previewWidth;
- int orig_h = previewHeight;
-
- if (previewWidth > s_w * factor / 100)
- {
- previewWidth = s_w * factor / 100;
- previewHeight = previewHeight * previewWidth / orig_w;
- }
- if (previewHeight > s_h * factor / 100)
- {
- previewHeight = s_h * factor / 100;
- previewWidth = orig_w * previewHeight / orig_h;
- }
- xscale *= (gdouble)previewWidth / orig_w;
- yscale *= (gdouble)previewHeight / orig_h;
- scaled_preview = gdk_pixbuf_scale_simple(preview,
- previewWidth, previewHeight, GDK_INTERP_HYPER);
- g_object_unref(preview);
- preview = scaled_preview;
- }
- }
-
- if (ghb_dict_get_bool(ud->prefs, "preview_show_crop"))
- {
- c0 *= yscale;
- c1 *= yscale;
- c2 *= xscale;
- c3 *= xscale;
-
- // Top
- hash_pixbuf(preview, 0, 0, previewWidth, c0, 32, 0);
- // Bottom
- hash_pixbuf(preview, 0, previewHeight-c1, previewWidth, c1, 32, 0);
- // Left
- hash_pixbuf(preview, 0, 0, c2, previewHeight, 32, 1);
- // Right
- hash_pixbuf(preview, previewWidth-c3, 0, c3, previewHeight, 32, 1);
- }
 hb_image_close(&image);
+
 return preview;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/hb-backend.h -> HandBrake-1.5.1.tar.xz/gtk/src/hb-backend.h Changed

@@ -1,6 +1,6 @@
 /*
 * hb-backend.h
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * hb-backend.h is free software.
 *
@@ -124,9 +124,10 @@
 void ghb_backend_queue_scan(const gchar *path, gint titleindex);
 hb_list_t * ghb_get_title_list();
 void ghb_par_init(signal_user_data_t *ud);
-void ghb_apply_crop(GhbValue *settings, const hb_title_t * title);
+void ghb_apply_crop(GhbValue *settings, const hb_geometry_crop_t * geo);
 void ghb_set_scale(signal_user_data_t *ud, gint mode);
-void ghb_set_scale_settings(GhbValue *settings, gint mode);
+void ghb_set_scale_settings(signal_user_data_t * ud,
+ GhbValue *settings, gint mode);
 void ghb_picture_settings_deps(signal_user_data_t *ud);
 gint64 ghb_get_chapter_duration(const hb_title_t *title, gint chap);
 gint64 ghb_get_chapter_start(const hb_title_t *title, gint chap);
@@ -146,9 +147,7 @@
 gint ghb_find_subtitle_track(const hb_title_t * title, const gchar * lang, int start);
 gint ghb_pick_subtitle_track(signal_user_data_t *ud);
 gint ghb_longest_title(void);
-GdkPixbuf* ghb_get_preview_image(
- const hb_title_t *title, gint index, signal_user_data_t *ud,
- gint *out_width, gint *out_height);
+GdkPixbuf* ghb_get_preview_image(gint index, signal_user_data_t *ud);
 gchar* ghb_dvd_volname(const gchar *device);
 gint ghb_subtitle_track_source(GhbValue *settings, gint track);
 const gchar* ghb_subtitle_track_lang(GhbValue *settings, gint track);
@@ -183,7 +182,6 @@
 
 int ghb_lookup_lang(const GhbValue *glang);
 const iso639_lang_t* ghb_iso639_lookup_by_int(int idx);
-void ghb_update_display_aspect_label(signal_user_data_t *ud);
 
 // libhb lookup helpers
 const hb_title_t* ghb_lookup_title(int title_id, int *index);
@@ -234,4 +232,8 @@
 gchar* ghb_create_source_label(const hb_title_t * title);
 gchar* ghb_create_volume_label(const hb_title_t * title);
 
+const gchar * ghb_lookup_resolution_limit(int width, int height);
+int ghb_lookup_resolution_limit_dimensions(const gchar * opt,
+ int * width, int * height);
+
 #endif // _HBBACKEND_H_

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/icons.c -> HandBrake-1.5.1.tar.xz/gtk/src/icons.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/icons.h -> HandBrake-1.5.1.tar.xz/gtk/src/icons.h Changed

HandBrake-1.5.1.tar.xz/gtk/src/internal_defaults.json.template Added

@@ -0,0 +1,112 @@
+{
+    "Globals": {
+        "SkipDiskFreeCheck": false,
+        "show_preview": false,
+        "scan_source": "",
+        "volume": "New Video"
+    },
+    "OneTimeInitialization": {
+        "title": "none"
+    },
+    "Initialization": {
+        "AudioAllowMP2Pass": false,
+        "AudioAllowMP3Pass": false,
+        "AudioAllowAACPass": false,
+        "AudioAllowAC3Pass": false,
+        "AudioAllowDTSPass": false,
+        "AudioAllowDTSHDPass": false,
+        "AudioAllowEAC3Pass": false,
+        "AudioAllowFLACPass": false,
+        "AudioAllowTRUEHDPass": false,
+        "AudioBitrate": "192",
+        "AudioEncoder": "copy:ac3",
+        "AudioTrack": 0,
+        "AudioTrackQualityEnable": false,
+        "AudioTrackQuality": -1.0,
+        "AudioTrackGainSlider": 0.0,
+        "AudioTrackDRCSlider": 0.0,
+        "AudioMixdown": "dpl2",
+        "AudioSamplerate": "auto",
+        "AudioTrackName": "",
+        "angle_count": 1,
+        "angle": 1,
+        "dest_dir": "",
+        "end_point": 100.0,
+        "MetaName": "",
+        "MetaArtist": "",
+        "MetaAlbumArtist": "",
+        "MetaReleaseDate": "",
+        "MetaComment": "",
+        "MetaGenre": "",
+        "MetaDescription": "",
+        "MetaLongDescription": "",
+        "PresetFullName": "/Regular/Normal",
+        "PresetCategory": "new",
+        "preset_modified": false,
+        "preset_reload": false,
+        "DisplayHeight": 480,
+        "PtoPType": "chapter",
+        "scale_height": 0,
+        "scale_width": 0,
+        "single_title": 1,
+        "start_point": 1.0,
+        "start_frame": -1,
+        "title_selected": false,
+        "source_label": "New Video",
+        "chapter_list": ,
+        "vquality_type_bitrate": false,
+        "vquality_type_constant": false,
+        "ImportLanguage": "und",
+        "SrtCodeset": "ISO-8859-1",
+        "ImportFile": "",
+        "ImportOffset": 0,
+        "VideoFramerateCFR": false,
+        "VideoFrameratePFR": false,
+        "VideoFramerateVFR": true,
+        "PictureDeinterlaceDecomb": false,
+        "VideoPresetSlider": 0,
+        "x264ZeroLatency": false,
+        "x264FastDecode": false
+    },
+    "Preferences": {
+        "ActivityFontSize": 8,
+        "DiskFreeCheck": true,
+        "DiskFreeLimit": 2000,
+        "RemoveFinishedJobs": false,
+        "SyncTitleSettings": true,
+        "AutoScan": false,
+        "AddCC": false,
+        "EncodeLogLocation": false,
+        "allow_tweaks": false,
+        "last_update_check": 0,
+        "check_updates": "weekly",
+        "default_source": "/dev/dvd",
+        "ExportDirectory": "",
+        "destination_dir": "",
+        "hbfd": false,
+        "hbfd_feature": false,
+        "live_duration": 15,
+        "LoggingLevel": "1",
+        "LogLongevity": "immortal",
+        "use_dvdnav": true,
+        "reduce_hd_preview": true,
+        "MinTitleDuration": 10,
+        "preview_count": 10,
+        "preview_show_crop": false,
+        "preview_x": -1,
+        "preview_y": -1,
+        "UseM4v": true,
+        "auto_name": true,
+        "auto_name_template": "{source}",
+        "update_skip_version": 0,
+        "VideoQualityGranularity": "1",
+        "version": "0.1",
+        "PreferredLanguage": "und",
+        "WhenComplete": "notify",
+        "SrtDir": "",
+        "window_width": 1,
+        "window_height": 1,
+        "preset_window_width": 1,
+        "preset_window_height": 1
+    }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/jobdict.c -> HandBrake-1.5.1.tar.xz/gtk/src/jobdict.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/jobdict.h -> HandBrake-1.5.1.tar.xz/gtk/src/jobdict.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/main.c -> HandBrake-1.5.1.tar.xz/gtk/src/main.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * main.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * main.c is free software.
 *
@@ -941,7 +941,7 @@
 }
 
 // Grey out widgets that are dependent on a disabled feature
- ghb_check_all_depencencies(ud);
+ ghb_check_all_dependencies(ud);
 
 return FALSE;
 }
@@ -1166,8 +1166,8 @@
 gtk_file_filter_set_name(filter, "MPG");
 gtk_file_filter_add_pattern(filter, "*.mpg");
 gtk_file_filter_add_pattern(filter, "*.MPG");
- gtk_file_filter_add_pattern(filter, "*.mepg");
- gtk_file_filter_add_pattern(filter, "*.MEPG");
+ gtk_file_filter_add_pattern(filter, "*.mpeg");
+ gtk_file_filter_add_pattern(filter, "*.MPEG");
 gtk_file_chooser_add_filter(chooser, filter);
 filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterEVO"));
 gtk_file_filter_set_name(filter, "EVO");
@@ -1228,7 +1228,7 @@
 // Gtk has a really stupid bug. If the file chooser is showing
 // hidden files AND there is no filter set, it will not select
 // the filename when gtk_file_chooser_set_filename is called.
- // So add a completely unnessary filter to prevent this behavior.
+ // So add a completely unnecessary filter to prevent this behavior.
 filter = GTK_FILE_FILTER(GHB_OBJECT(ud->builder, "SourceFilterAll"));
 gtk_file_chooser_set_filter(chooser, filter);
 
@@ -1265,6 +1265,10 @@
 "detelecine", HB_FILTER_DETELECINE);
 ghb_set_custom_filter_tooltip(ud, "PictureCombDetectCustom",
 "interlace detection", HB_FILTER_COMB_DETECT);
+ ghb_set_custom_filter_tooltip(ud, "PictureColorspaceCustom",
+ "colorspace", HB_FILTER_COLORSPACE);
+ ghb_set_custom_filter_tooltip(ud, "PictureChromaSmoothCustom",
+ "chroma smooth", HB_FILTER_CHROMA_SMOOTH);
 
 gtk_application_add_window(GTK_APPLICATION(app), GTK_WINDOW(ghb_window));
 GtkWidget * window = GHB_WIDGET(ud->builder, "presets_window");

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/makedeps.py -> HandBrake-1.5.1.tar.xz/gtk/src/makedeps.py Changed

@@ -37,6 +37,9 @@
     DepEntry("PictureDenoisePreset", "PictureDenoiseCustom", "custom", False, True),
     DepEntry("PictureDenoisePreset", "PictureDenoiseTune", "custom", True, True),
     DepEntry("PictureDenoisePreset", "PictureDenoiseTuneLabel", "custom", True, True),
+    DepEntry("PictureChromaSmoothPreset", "PictureChromaSmoothTune", "off|custom", True, True),
+    DepEntry("PictureChromaSmoothPreset", "PictureChromaSmoothTuneLabel", "off|custom", True, True),
+    DepEntry("PictureChromaSmoothPreset", "PictureChromaSmoothCustom", "custom", False, True),
 
     DepEntry("PictureSharpenFilter", "PictureSharpenPreset", "off", True, True),
     DepEntry("PictureSharpenFilter", "PictureSharpenPresetLabel", "off", True, True),
@@ -47,12 +50,7 @@
     DepEntry("PictureSharpenPreset", "PictureSharpenTune", "custom", True, True),
     DepEntry("PictureSharpenPreset", "PictureSharpenTuneLabel", "custom", True, True),
     DepEntry("PictureDetelecine", "PictureDetelecineCustom", "custom", False, True),
-    DepEntry("PictureWidthEnable", "PictureWidth", "1", False, False),
-    DepEntry("PictureHeightEnable", "PictureHeight", "1", False, False),
-    DepEntry("PictureAutoCrop", "PictureTopCrop", "0", False, False),
-    DepEntry("PictureAutoCrop", "PictureBottomCrop", "0", False, False),
-    DepEntry("PictureAutoCrop", "PictureLeftCrop", "0", False, False),
-    DepEntry("PictureAutoCrop", "PictureRightCrop", "0", False, False),
+    DepEntry("PictureColorspacePreset", "PictureColorspaceCustom", "custom", False, True),
     DepEntry("VideoEncoder", "x264FastDecode", "x264|x264_10bit", False, True),
     DepEntry("VideoEncoder", "VideoOptionExtraWindow", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9", False, True),
     DepEntry("VideoEncoder", "VideoOptionExtraLabel", "x264|x264_10bit|x265|x265_10bit|x265_12bit|x265_16bit|mpeg4|mpeg2|VP8|VP9", False, True),

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/plist.c -> HandBrake-1.5.1.tar.xz/gtk/src/plist.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/plist.h -> HandBrake-1.5.1.tar.xz/gtk/src/plist.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/presets.c -> HandBrake-1.5.1.tar.xz/gtk/src/presets.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * presets.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * presets.c is free software.
 *
@@ -256,17 +256,51 @@
 ghb_dict_set(settings, "scale_width", ghb_value_dup(
 ghb_dict_get_value(settings, "PictureWidth")));
 
- int width, height, uses_pic, autoscale;
+ if (ghb_dict_get_bool(settings, "PictureAutoCrop"))
+ {
+ ghb_dict_set_string(settings, "crop_mode", "auto");
+ }
+ else
+ {
+ int ct = ghb_dict_get_int(settings, "PictureTopCrop");
+ int cb = ghb_dict_get_int(settings, "PictureBottomCrop");
+ int cl = ghb_dict_get_int(settings, "PictureLeftCrop");
+ int cr = ghb_dict_get_int(settings, "PictureRightCrop");
+ if (ct == 0 && cb == 0 && cl == 0 && cr == 0)
+ {
+ ghb_dict_set_string(settings, "crop_mode", "none");
+ }
+ else
+ {
+ ghb_dict_set_string(settings, "crop_mode", "custom");
+ }
+ }
+
+ int width, height;
+ const gchar * resolution_limit;
 
 width = ghb_dict_get_int(settings, "PictureWidth");
 height = ghb_dict_get_int(settings, "PictureHeight");
- uses_pic = ghb_dict_get_int(settings, "UsesPictureSettings");
-
- autoscale = uses_pic != 1 || (width == 0 && height == 0);
- ghb_dict_set_bool(settings, "autoscale", autoscale);
- ghb_dict_set_int(settings, "PictureWidthEnable", !autoscale);
- ghb_dict_set_int(settings, "PictureHeightEnable", !autoscale);
-
+ resolution_limit = ghb_lookup_resolution_limit(width, height);
+ ghb_dict_set_string(settings, "resolution_limit", resolution_limit);
+
+ const char * rotate = ghb_dict_get_string(settings, "PictureRotate");
+ if (rotate != NULL)
+ {
+ int angle, hflip;
+ char * angle_opt;
+ hb_dict_t * filter_settings;
+
+ filter_settings = hb_generate_filter_settings(HB_FILTER_ROTATE,
+ NULL, NULL, rotate);
+ angle = hb_dict_get_int(filter_settings, "angle");
+ hflip = hb_dict_get_bool(filter_settings, "hflip");
+ angle_opt = g_strdup_printf("%d", angle);
+ ghb_dict_set_string(settings, "rotate", angle_opt);
+ ghb_dict_set_int(settings, "hflip", hflip);
+ g_free(angle_opt);
+ hb_value_free(&filter_settings);
+ }
 gint vqtype;
 
 vqtype = ghb_dict_get_int(settings, "VideoQualityType");
@@ -396,6 +430,9 @@
 {
 default:
 break;
+ case HB_ACODEC_MP2_PASS:
+ ghb_dict_set_bool(settings, "AudioAllowMP2Pass", 1);
+ break;
 case HB_ACODEC_LAME:
 case HB_ACODEC_MP3_PASS:
 ghb_dict_set_bool(settings, "AudioAllowMP3Pass", 1);
@@ -437,7 +474,7 @@
 }
 
 // Initialization order of some widgets matter because the value of
-// these widgets are used to establich limits on the values that
+// these widgets are used to establish limits on the values that
 // other widgets are allowed to take.
 //
 // So make sure these get initialized first.
@@ -474,7 +511,7 @@
 }
 
 iter = ghb_dict_iter_init(tmp);
- // middle (void*) cast prevents gcc warning "defreferencing type-punned
+ // middle (void*) cast prevents gcc warning "dereferencing type-punned
 // pointer will break strict-aliasing rules"
 while (ghb_dict_iter_next(tmp, &iter, &key, &gval))
 {
@@ -1649,6 +1686,10 @@
 GhbValue* ghb_create_copy_mask(GhbValue *settings)
 {
 GhbValue *copy_mask = ghb_array_new();
+ if (ghb_dict_get_bool(settings, "AudioAllowMP2Pass"))
+ {
+ ghb_array_append(copy_mask, ghb_string_value_new("copy:mp2"));
+ }
 if (ghb_dict_get_bool(settings, "AudioAllowMP3Pass"))
 {
 ghb_array_append(copy_mask, ghb_string_value_new("copy:mp3"));
@@ -1690,31 +1731,24 @@
 {
 GhbValue *preset = ghb_value_dup(settings);
 
- gboolean autoscale, br, constant;
+ gboolean br, constant;
 
 ghb_dict_remove(preset, "title");
 ghb_dict_set_bool(preset, "Default", 0);
- if (!ghb_dict_get_bool(preset, "PictureWidthEnable"))
- {
- ghb_dict_remove(preset, "PictureWidth");
- }
- if (!ghb_dict_get_bool(preset, "PictureHeightEnable"))
- {
- ghb_dict_remove(preset, "PictureHeight");
- }
- autoscale = !ghb_dict_get_bool(preset, "PictureWidthEnable") &&
- !ghb_dict_get_bool(preset, "PictureHeightEnable");
 
 br = ghb_dict_get_bool(preset, "vquality_type_bitrate");
 constant = ghb_dict_get_bool(preset, "vquality_type_constant");
- if (autoscale)
- {
- ghb_dict_set_int(preset, "UsesPictureSettings", 2);
- }
- else
- {
- ghb_dict_set_int(preset, "UsesPictureSettings", 1);
- }
+
+ const char * angle = ghb_dict_get_string(preset, "rotate");
+ int hflip = ghb_dict_get_int(preset, "hflip");
+ char * rot_flip = g_strdup_printf("angle=%s:hflip=%d", angle, hflip);
+ ghb_dict_set_string(preset, "PictureRotate", rot_flip);
+ g_free(rot_flip);
+
+ const gchar * crop_mode;
+
+ crop_mode = ghb_dict_get_string(settings, "crop_mode");
+ ghb_dict_set_bool(preset, "PictureAutoCrop", !strcmp(crop_mode, "auto"));
 
 // VideoQualityType/0/1/2 - vquality_type_/target/bitrate/constant
 // *note: target is no longer used
@@ -1768,14 +1802,18 @@
 g_string_append_printf(str, "%s", tune);
 sep = ",";
 }
- if (ghb_dict_get_bool(preset, "x264FastDecode"))
- {
- g_string_append_printf(str, "%s%s", sep, "fastdecode");
- sep = ",";
- }
- if (ghb_dict_get_bool(preset, "x264ZeroLatency"))
+ int encoder = ghb_get_video_encoder(settings);
+ if (encoder & HB_VCODEC_X264_MASK)
 {
- g_string_append_printf(str, "%s%s", sep, "zerolatency");
+ if (ghb_dict_get_bool(preset, "x264FastDecode"))
+ {
+ g_string_append_printf(str, "%s%s", sep, "fastdecode");
+ sep = ",";
+ }
+ if (ghb_dict_get_bool(preset, "x264ZeroLatency"))
+ {
+ g_string_append_printf(str, "%s%s", sep, "zerolatency");
+ }
 }
 char *tunes;
 tunes = g_string_free(str, FALSE);
@@ -1875,7 +1913,7 @@
 {
 if (presets_add_config_file("presets") < 0)
 {
- ghb_log("Failed to read presets file, initailizing new presets...");
+ ghb_log("Failed to read presets file, initializing new presets...");
 hb_presets_builtin_update();
 store_presets();
 }
@@ -2219,8 +2257,6 @@
 const gchar * fullname;
 int type;
 hb_preset_index_t * path;
- int width, height;
- gboolean autoscale;
 GtkWidget * dialog;
 GtkWidget * widget;
 GtkEntry * entry;
@@ -2231,13 +2267,8 @@
 name = ghb_dict_get_string(ud->settings, "PresetName");
 type = ghb_dict_get_int(ud->settings, "Type");
 fullname = ghb_dict_get_string(ud->settings, "PresetFullName");
- width = ghb_dict_get_int(ud->settings, "PictureWidth");
- height = ghb_dict_get_int(ud->settings, "PictureHeight");
- autoscale = ghb_dict_get_bool(ud->settings, "autoscale");
 
 ghb_ui_update(ud, "PresetSetDefault", ghb_boolean_value(FALSE));
- ghb_ui_update(ud, "PictureWidthEnable", ghb_boolean_value(!autoscale));
- ghb_ui_update(ud, "PictureHeightEnable", ghb_boolean_value(!autoscale));
 
 path = hb_preset_search_index(fullname, 0, type);
 
@@ -2281,16 +2312,6 @@
 }
 ghb_ui_update(ud, "PresetCategory", ghb_string_value(category));
 tv = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "PresetDescription"));
- if (!width)
- {
- width = ghb_dict_get_int(ud->settings, "scale_width");
- ghb_ui_update(ud, "PictureWidth", ghb_int_value(width));
- }
- if (!height)
- {
- height = ghb_dict_get_int(ud->settings, "scale_height");
- ghb_ui_update(ud, "PictureHeight", ghb_int_value(height));
- }
 
 dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
 entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "PresetName"));
@@ -2401,18 +2422,32 @@
 preset_remove_action_cb(GSimpleAction *action, GVariant *param,
 signal_user_data_t *ud)
 {
- int type;
- const char * fullname;
 hb_preset_index_t * path;
+ GhbValue * preset;
 
- type = ghb_dict_get_int(ud->settings, "Type");
- fullname = ghb_dict_get_string(ud->settings, "PresetFullName");
- if (fullname == NULL)
+ path = get_selected_path(ud);
+ if (path != NULL)
 {
- return;
+ preset = hb_preset_get(path);
 }
- path = hb_preset_search_index(fullname, 0, type);
- if (path == NULL)
+ if (path == NULL || preset == NULL)
+ {
+ const char * fullname;
+ int type;
+
+ fullname = ghb_dict_get_string(ud->settings, "PresetFullName");
+ if (fullname == NULL)
+ {
+ return;
+ }
+ type = ghb_dict_get_int(ud->settings, "Type");
+ path = hb_preset_search_index(fullname, 0, type);
+ if (path != NULL)
+ {
+ preset = hb_preset_get(path);
+ }
+ }
+ if (path == NULL || preset == NULL)
 {
 return;
 }
@@ -2423,7 +2458,7 @@
 GtkResponseType response;
 const char * name;
 
- name = ghb_dict_get_string(ud->settings, "PresetName");
+ name = ghb_dict_get_string(preset, "PresetName");
 is_folder = preset_is_folder(path);
 hb_window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
 dialog = gtk_message_dialog_new(hb_window, GTK_DIALOG_MODAL,
@@ -2435,42 +2470,81 @@
 gtk_widget_destroy(dialog);
 if (response == GTK_RESPONSE_YES)
 {
- GtkTreeView * treeview;
- GtkTreeSelection * selection;
- gboolean valid = TRUE;
- hb_value_t * preset;
-
+ int depth = path->depth;
 
 // Determine which preset to highlight after deletion done
 hb_preset_index_t new_path = *path;
+ // Always select a preset, not a folder
+ if (depth == 1)
+ {
+ new_path.depth = 2;
+ }
 // Try next
- new_path.indexpath->depth - 1 = path->indexpath->depth - 1 + 1;
+ new_path.indexdepth - 1 = path->indexdepth - 1 + 1;
 preset = hb_preset_get(&new_path);
- if (preset == NULL)
+ // After deletion, index of new selected item is one less
+ new_path.indexdepth - 1--;
+ if (preset == NULL && path->indexdepth - 1 > 0)
 {
 // Try previous
- new_path.indexpath->depth - 1 =
- path->indexpath->depth - 1 - 1;
+ new_path.indexdepth - 1 = path->indexdepth - 1 - 1;
+ preset = hb_preset_get(&new_path);
+ }
+ if (preset == NULL)
+ {
+ // perhaps we are deleting the last item in a folder
+ // Try first item in next and previous folders
+ depth = 1;
+ new_path.index1 = 0;
+ // Try next
+ new_path.indexdepth - 1 = path->indexdepth - 1 + 1;
 preset = hb_preset_get(&new_path);
- if (preset == NULL)
+ // After deletion, index of new selected item is one less
+ new_path.indexdepth - 1--;
+ if (preset == NULL && path->indexdepth - 1 > 0)
 {
- valid = FALSE;
+ // Try previous
+ new_path.indexdepth - 1 = path->indexdepth - 1 - 1;
+ preset = hb_preset_get(&new_path);
 }
 }
 
- // Remove the selected item
- // First unselect it so that selecting the new item works properly
+ GtkTreeView * treeview;
+ GtkTreeSelection * selection;
+
+ // unselect item to be deleted
 treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
 selection = gtk_tree_view_get_selection(treeview);
 gtk_tree_selection_unselect_all(selection);
 
+ // Remove the item
 if (hb_preset_delete(path) >= 0)
 {
- store_presets();
 presets_list_remove(ud, path);
+ if (path->depth == 2)
+ {
+ // If deleting this item resulted in an empty folder
+ // delete the folder
+ int count = 0;
+ hb_value_t * folder;
+
+ path->depth = 1;
+ folder = hb_presets_get_folder_children(path);
+ if (folder != NULL)
+ {
+ count = ghb_array_len(folder);
+ }
+ if (count == 0)
+ {
+ // delete the folder
+ hb_preset_delete(path);
+ presets_list_remove(ud, path);
+ }
+ }
+ store_presets();
 ghb_presets_menu_reinit(ud);
 }
- if (valid)
+ if (preset != NULL)
 {
 select_preset2(ud, &new_path);
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/presets.h -> HandBrake-1.5.1.tar.xz/gtk/src/presets.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/preview.c -> HandBrake-1.5.1.tar.xz/gtk/src/preview.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * preview.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * preview.c is free software.
 *
@@ -112,13 +112,6 @@
 }
 
 void
-preview_set_size(signal_user_data_t *ud, int width, int height)
-{
- ud->preview->width = width;
- ud->preview->height = height;
-}
-
-void
 preview_set_render_size(signal_user_data_t *ud, int width, int height)
 {
 GtkWidget * widget;
@@ -126,6 +119,29 @@
 GhbSurface * ss;
 GdkGeometry geo;
 
+ if (ghb_dict_get_bool(ud->prefs, "reduce_hd_preview"))
+ {
+ gint factor = 80;
+ gint s_w, s_h;
+
+ ghb_monitor_get_size(GHB_WIDGET(ud->builder, "hb_window"), &s_w, &s_h);
+ if (s_w > 0 && s_h > 0)
+ {
+ int orig_w = width;
+ int orig_h = height;
+
+ if (width > s_w * factor / 100)
+ {
+ width = s_w * factor / 100;
+ height = height * width / orig_w;
+ }
+ if (height > s_h * factor / 100)
+ {
+ height = s_h * factor / 100;
+ width = orig_w * height / orig_h;
+ }
+ }
+ }
 widget = GHB_WIDGET (ud->builder, "preview_image");
 gtk_widget_set_size_request(widget, width, height);
 window = GTK_WINDOW(GHB_WIDGET(ud->builder, "preview_window"));
@@ -146,6 +162,25 @@
 }
 
 void
+preview_set_size(signal_user_data_t *ud, int width, int height)
+{
+ if (height == ud->preview->width &&
+ width == ud->preview->height)
+ {
+ // Rotation happened, fix up render size
+ preview_set_render_size(ud, ud->preview->render_height,
+ ud->preview->render_width);
+ }
+ else if (width != ud->preview->width ||
+ height != ud->preview->height)
+ {
+ preview_set_render_size(ud, width, height);
+ }
+ ud->preview->width = width;
+ ud->preview->height = height;
+}
+
+void
 ghb_preview_init(signal_user_data_t *ud)
 {
 GtkWidget *widget;
@@ -933,20 +968,9 @@
 init_preview_image(signal_user_data_t *ud)
 {
 GtkWidget *widget;
- gint width, height;
-
- gint title_id, titleindex;
- const hb_title_t *title;
 
 live_preview_stop(ud);
 
- title_id = ghb_dict_get_int(ud->settings, "title");
- title = ghb_lookup_title(title_id, &titleindex);
- if (title == NULL && ud->preview->pix != NULL)
- {
- g_object_unref(ud->preview->pix);
- ud->preview->pix = NULL;
- }
 widget = GHB_WIDGET (ud->builder, "preview_frame");
 ud->preview->frame = ghb_widget_int(widget) - 1;
 if (ud->preview->encodedud->preview->frame)
@@ -971,8 +995,7 @@
 if (ud->preview->scaled_pix != NULL)
 g_object_unref(ud->preview->scaled_pix);
 
- ud->preview->pix = ghb_get_preview_image(title, ud->preview->frame,
- ud, &width, &height);
+ ud->preview->pix = ghb_get_preview_image(ud->preview->frame, ud);
 if (ud->preview->pix == NULL)
 return;
 
@@ -1404,7 +1427,7 @@
 // Look for transition to iconified state.
 // Toggle "Show Preview" button when iconified.
 // I only do this because there seems to be no
- // way to reliably disable the iconfy button without
+ // way to reliably disable the iconify button without
 // also disabling the maximize button.
 GdkEventWindowState * wse = (GdkEventWindowState*)event;
 if (wse->changed_mask & wse->new_window_state &
@@ -1464,13 +1487,17 @@
 G_MODULE_EXPORT void
 show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
+#if 0
+ // Disabled until we reimplement this or come up with something better
+ //
 g_debug("show_crop_changed_cb ()");
 ghb_widget_to_setting(ud->prefs, widget);
 ghb_check_dependency(ud, widget, NULL);
 ghb_live_reset(ud);
 if (gtk_widget_is_sensitive(widget))
- ghb_set_scale(ud, GHB_PIC_KEEP_PAR);
+ ghb_set_scale(ud, 0);
 ghb_pref_save(ud->prefs, "preview_show_crop");
 ghb_rescale_preview_image(ud);
+#endif
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/preview.h -> HandBrake-1.5.1.tar.xz/gtk/src/preview.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/queuehandler.c -> HandBrake-1.5.1.tar.xz/gtk/src/queuehandler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * queuehandler.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * queuehandler.c is free software.
 *
@@ -151,12 +151,16 @@
 const char * ctext;
 const char * sep;
 GtkWidget * widget;
- GhbValue * uiDict = NULL;
- GhbValue * titleDict = NULL;
+ GhbValue * uiDict = NULL;
+ GhbValue * jobDict = NULL;
+ GhbValue * sourceDict = NULL;
+ GhbValue * rangeDict = NULL;
+ GhbValue * titleDict = NULL;
 
 if (queueDict != NULL)
 {
 uiDict = ghb_dict_get(queueDict, "uiSettings");
+ jobDict = ghb_dict_get(queueDict, "Job");
 titleDict = ghb_dict_get(queueDict, "Title");
 }
 if (titleDict == NULL)
@@ -202,10 +206,54 @@
 g_free(text);
 
 // Source
- ctext = ghb_dict_get_string(titleDict, "Path");
+ sourceDict = ghb_dict_get(jobDict, "Source");
+ ctext = ghb_dict_get_string(sourceDict, "Path");
 widget = GHB_WIDGET(ud->builder, "queue_summary_source");
 gtk_label_set_text(GTK_LABEL(widget), ctext);
 
+ // Title
+ const char * rangeType;
+ int titleID;
+ int64_t rangeStart, rangeEnd;
+
+ titleID = ghb_dict_get_int(sourceDict, "Title");
+ rangeDict = ghb_dict_get(sourceDict, "Range");
+ rangeType = ghb_dict_get_string(rangeDict, "Type");
+ rangeStart = ghb_dict_get_int(rangeDict, "Start");
+ rangeEnd = ghb_dict_get_int(rangeDict, "End");
+
+ str = g_string_new("");
+ g_string_append_printf(str, "%-8d", titleID);
+ if (!strcmp(rangeType, "chapter"))
+ {
+ g_string_append_printf(str, "Chapters: %ld to %ld",
+ rangeStart, rangeEnd);
+ }
+ else if (!strcmp(rangeType, "time"))
+ {
+ int start_hh, start_mm;
+ double start_ss;
+ int end_hh, end_mm;
+ double end_ss;
+
+ ghb_break_pts_duration(rangeStart, &start_hh, &start_mm, &start_ss);
+ ghb_break_pts_duration(rangeEnd, &end_hh, &end_mm, &end_ss);
+ g_string_append_printf(str,
+ "Time: %02d:%02d:%05.2f to %02d:%02d:%05.2f",
+ start_hh, start_mm, start_ss,
+ end_hh, end_mm, end_ss);
+ }
+ else if (!strcmp(rangeType, "frame"))
+ {
+ g_string_append_printf(str, "Frames: %ld to %ld",
+ rangeStart, rangeEnd);
+ }
+ text = g_string_free(str, FALSE);
+ widget = GHB_WIDGET(ud->builder, "queue_summary_title");
+ gtk_label_set_text(GTK_LABEL(widget), text);
+ g_free(text);
+ 
+
 // Destination
 ctext = ghb_dict_get_string(uiDict, "destination");
 str = g_string_new(ctext);
@@ -253,7 +301,7 @@
 gtk_label_set_text(GTK_LABEL(widget), text);
 g_free(text);
 
- // Dimenstions
+ // Dimensions
 double display_width;
 int width, height, display_height, par_width, par_height;
 int crop4;
@@ -261,8 +309,8 @@
 
 width = ghb_dict_get_int(uiDict, "scale_width");
 height = ghb_dict_get_int(uiDict, "scale_height");
- display_width = ghb_dict_get_int(uiDict, "PictureDisplayWidth");
- display_height = ghb_dict_get_int(uiDict, "PictureDisplayHeight");
+ display_width = ghb_dict_get_int(uiDict, "PictureDARWidth");
+ display_height = ghb_dict_get_int(uiDict, "DisplayHeight");
 par_width = ghb_dict_get_int(uiDict, "PicturePARWidth");
 par_height = ghb_dict_get_int(uiDict, "PicturePARHeight");
 crop0 = ghb_dict_get_int(uiDict, "PictureTopCrop");
@@ -275,7 +323,7 @@
 display_aspect = ghb_get_display_aspect_string(display_width,
 display_height);
 
- display_width = ghb_dict_get_int(uiDict, "PictureDisplayWidth");
+ display_width = ghb_dict_get_int(uiDict, "PictureDARWidth");
 text = g_strdup_printf(_("%d:%d:%d:%d Crop\n"
 "%dx%d storage, %dx%d display\n"
 "%d:%d Pixel Aspect Ratio\n"
@@ -399,7 +447,7 @@
 
 // Append Filters to video summary
 gboolean detel, comb_detect, deint, decomb, deblock, nlmeans, denoise;
- gboolean unsharp, lapsharp, rot, gray;
+ gboolean unsharp, lapsharp, hflip, rot, gray, colorspace, chroma_smooth;
 
 ctext = ghb_dict_get_string(uiDict, "PictureDetelecine");
 detel = ctext != NULL && !!strcasecmp(ctext, "off");
@@ -416,9 +464,14 @@
 ctext = ghb_dict_get_string(uiDict, "PictureSharpenFilter");
 unsharp = ctext != NULL && !strcasecmp(ctext, "unsharp");
 lapsharp = ctext != NULL && !strcasecmp(ctext, "lapsharp");
- ctext = ghb_dict_get_string(uiDict, "PictureRotate");
- rot = ctext != NULL && !!strcasecmp(ctext, "disable=1");
+ hflip = ghb_dict_get_bool(uiDict, "hflip");
+ ctext = ghb_dict_get_string(uiDict, "rotate");
+ rot = ctext != NULL && !!strcasecmp(ctext, "0");
 gray = ghb_dict_get_bool(uiDict, "VideoGrayScale");
+ ctext = ghb_dict_get_string(uiDict, "PictureColorspacePreset");
+ colorspace = ctext != NULL && !!strcasecmp(ctext, "off");
+ ctext = ghb_dict_get_string(uiDict, "PictureChromaSmoothPreset");
+ chroma_smooth = ctext != NULL && !!strcasecmp(ctext, "off");
 
 sep = "\n";
 if (detel)
@@ -463,6 +516,12 @@
 g_string_append_printf(str, "%s%s", sep, filter->name);
 sep = ", ";
 }
+ if (chroma_smooth)
+ {
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_CHROMA_SMOOTH);
+ g_string_append_printf(str, "%s%s", sep, filter->name);
+ sep = ", ";
+ }
 if (unsharp)
 {
 hb_filter_object_t * filter = hb_filter_get(HB_FILTER_UNSHARP);
@@ -475,7 +534,7 @@
 g_string_append_printf(str, "%s%s", sep, filter->name);
 sep = ", ";
 }
- if (rot)
+ if (rot || hflip)
 {
 hb_filter_object_t * filter = hb_filter_get(HB_FILTER_ROTATE);
 g_string_append_printf(str, "%s%s", sep, filter->name);
@@ -487,6 +546,12 @@
 g_string_append_printf(str, "%s%s", sep, filter->name);
 sep = ", ";
 }
+ if (colorspace)
+ {
+ hb_filter_object_t * filter = hb_filter_get(HB_FILTER_COLORSPACE);
+ g_string_append_printf(str, "%s%s", sep, filter->name);
+ sep = ", ";
+ }
 
 text = g_string_free(str, FALSE);
 widget = GHB_WIDGET(ud->builder, "queue_summary_video");
@@ -1140,7 +1205,7 @@
 {
 result = _("Scanning Title");
 }
- else if (status->state & GHB_STATE_SCANNING)
+ else if (status->state & GHB_STATE_PAUSED)
 {
 result = _("Encoding Paused");
 }
@@ -1868,16 +1933,14 @@
 preset = ghb_settings_to_preset(settings);
 job = ghb_dict_get(settings, "Job");
 
- // Apply selected preset settings
- hb_preset_apply_mux(preset, job);
- hb_preset_apply_video(preset, job);
- hb_preset_apply_filters(preset, job);
-
 // Add scale filter since the above does not
- GhbValue *filter_list, *filter_dict;
+ GhbValue *filter_settings, *filter_list, *filter_dict;
 int width, height, crop4;
 
- filter_list = ghb_get_job_filter_list(settings);
+ filter_settings = ghb_get_job_filter_settings(settings);
+ filter_list = ghb_array_new();
+ ghb_dict_set(filter_settings, "FilterList", filter_list);
+
 width = ghb_dict_get_int(settings, "scale_width");
 height = ghb_dict_get_int(settings, "scale_height");
 
@@ -1899,6 +1962,11 @@
 ghb_dict_set(filter_dict, "Settings", dict);
 hb_add_filter2(filter_list, filter_dict);
 
+ // Apply selected preset settings
+ hb_preset_apply_mux(preset, job);
+ hb_preset_apply_video(preset, job);
+ hb_preset_apply_filters(preset, job);
+
 ghb_value_free(&preset);
 }
 
@@ -2873,7 +2941,7 @@
 
 // Pop up the title multiple selections dialog
 GtkResponseType response;
- GtkWidget *dialog = GHB_WIDGET(ud->builder, "titla_add_multiple_dialog");
+ GtkWidget *dialog = GHB_WIDGET(ud->builder, "title_add_multiple_dialog");
 response = gtk_dialog_run(GTK_DIALOG(dialog));
 gtk_widget_hide(dialog);
 if (response == GTK_RESPONSE_OK)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/queuehandler.h -> HandBrake-1.5.1.tar.xz/gtk/src/queuehandler.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/renderer_button.c -> HandBrake-1.5.1.tar.xz/gtk/src/renderer_button.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/renderer_button.h -> HandBrake-1.5.1.tar.xz/gtk/src/renderer_button.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/resources.c -> HandBrake-1.5.1.tar.xz/gtk/src/resources.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/resources.h -> HandBrake-1.5.1.tar.xz/gtk/src/resources.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/settings.c -> HandBrake-1.5.1.tar.xz/gtk/src/settings.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/settings.h -> HandBrake-1.5.1.tar.xz/gtk/src/settings.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/subtitlehandler.c -> HandBrake-1.5.1.tar.xz/gtk/src/subtitlehandler.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/subtitlehandler.h -> HandBrake-1.5.1.tar.xz/gtk/src/subtitlehandler.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/titledict.c -> HandBrake-1.5.1.tar.xz/gtk/src/titledict.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/titledict.h -> HandBrake-1.5.1.tar.xz/gtk/src/titledict.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/values.c -> HandBrake-1.5.1.tar.xz/gtk/src/values.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/values.h -> HandBrake-1.5.1.tar.xz/gtk/src/values.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/videohandler.c -> HandBrake-1.5.1.tar.xz/gtk/src/videohandler.c Changed

@@ -1,7 +1,7 @@
 /* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
 /*
 * videohandler.c
- * Copyright (C) John Stebbins 2008-2020 <stebbins@stebbins>
+ * Copyright (C) John Stebbins 2008-2022 <stebbins@stebbins>
 *
 * videohandler.c is free software.
 *
@@ -163,7 +163,7 @@
 
 if (w == 0 || h == 0)
 {
- if (!ghb_dict_get_bool(ud->settings, "autoscale"))
+ if (!ghb_dict_get_bool(ud->settings, "PictureUseMaximumSize"))
 {
 w = ghb_dict_get_int(ud->settings, "PictureWidth");
 h = ghb_dict_get_int(ud->settings, "PictureHeight");
@@ -289,7 +289,7 @@
 // When the range of a slider changes, GTK used to sample all the
 // possible values to determine the correct amount of screen space to
 // allocate for the value strings. Some *genius* decided it would be
- // more effecient to just sample the first and last value which means
+ // more efficient to just sample the first and last value which means
 // that if certain characters are wider than others and the middle
 // values happen to use those characters, the space allocated is
 // too small and the string wraps to the next line or is truncated.
@@ -328,7 +328,7 @@
 // When the range of a slider changes, GTK used to sample all the
 // possible values to determine the correct amount of screen space to
 // allocate for the value strings. Some *genius* decided it would be
- // more effecient to just sample the first and last value which means
+ // more efficient to just sample the first and last value which means
 // that if certain characters are wider than others and the middle
 // values happen to use those characters, the space allocated is
 // too small and the string wraps to the next line or is truncated.
@@ -357,7 +357,7 @@
 // When the range of a slider changes, GTK used to sample all the
 // possible values to determine the correct amount of screen space to
 // allocate for the value strings. Some *genius* decided it would be
- // more effecient to just sample the first and last value which means
+ // more efficient to just sample the first and last value which means
 // that if certain characters are wider than others and the middle
 // values happen to use those characters, the space allocated is
 // too small and the string wraps to the next line or is truncated.

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/gtk/src/videohandler.h -> HandBrake-1.5.1.tar.xz/gtk/src/videohandler.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/audio_remap.c -> HandBrake-1.5.1.tar.xz/libhb/audio_remap.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/audio_resample.c -> HandBrake-1.5.1.tar.xz/libhb/audio_resample.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/avfilter.c -> HandBrake-1.5.1.tar.xz/libhb/avfilter.c Changed

@@ -11,6 +11,10 @@
 #include "handbrake/hbavfilter.h"
 #include "handbrake/avfilter_priv.h"
 
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+#include "handbrake/qsv_common.h"
+#endif
+
 static int  avfilter_init(hb_filter_object_t * filter, hb_filter_init_t * init);
 static int  avfilter_post_init( hb_filter_object_t * filter, hb_job_t * job );
 static void avfilter_close( hb_filter_object_t * filter );
@@ -231,16 +235,41 @@
 static hb_buffer_t* filterFrame( hb_filter_private_t * pv, hb_buffer_t * in )
 {
     hb_buffer_list_t   list;
-    hb_buffer_t      * buf, * next;
-
-    hb_avfilter_add_buf(pv->graph, in);
-    buf = hb_avfilter_get_buf(pv->graph);
+    hb_buffer_t      * buf = NULL, * next = NULL;
+    int av_frame_is_not_null = 1; // TODO: find the reason for empty input av_frame for ffmpeg filters
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+    mfxFrameSurface1 *surface = NULL;
+    HBQSVFramesContext *frames_ctx = NULL;
+    if (hb_qsv_hw_filters_are_enabled(pv->input.job))
+    {
+        if (in && in->qsv_details.frame)
+        {
+            // We need to keep surface pointer because hb_avfilter_add_buf set it to 0 after in ffmpeg call
+            surface = (mfxFrameSurface1 *)in->qsv_details.frame->data3;
+            frames_ctx = in->qsv_details.qsv_frames_ctx;
+        }
+        else
+        {
+            av_frame_is_not_null = 0;
+        }
+    }
+#endif
+    if (av_frame_is_not_null)
+    {
+        hb_avfilter_add_buf(pv->graph, in);
+        buf = hb_avfilter_get_buf(pv->graph);
+    }
     while (buf != NULL)
     {
         hb_buffer_list_append(&pv->list, buf);
         buf = hb_avfilter_get_buf(pv->graph);
     }
-
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+    if (hb_qsv_hw_filters_are_enabled(pv->input.job) && surface)
+    {
+        hb_qsv_release_surface_from_pool_by_surface_pointer(frames_ctx, surface);
+    }
+#endif
     // Delay one frame so we can set the stop time of the output buffer
     hb_buffer_list_clear(&list);
     while (hb_buffer_list_count(&pv->list) > 1)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/batch.c -> HandBrake-1.5.1.tar.xz/libhb/batch.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/bd.c -> HandBrake-1.5.1.tar.xz/libhb/bd.c Changed

@@ -1,6 +1,6 @@
-/* dvd.c
+/* bd.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -88,7 +88,7 @@
 return d->title_count;
 }
 
-static void add_subtitle(int track, hb_list_t *list_subtitle, BLURAY_STREAM_INFO *bdsub, uint32_t codec)
+static void add_subtitle(int track, hb_list_t *list_subtitle, BLURAY_STREAM_INFO *bdsub, uint32_t codec, uint32_t codec_param)
 {
 hb_subtitle_t * subtitle;
 iso639_lang_t * lang;
@@ -120,6 +120,7 @@
 subtitle->reg_desc = STR4_TO_UINT32("HDMV");
 subtitle->stream_type = bdsub->coding_type;
 subtitle->codec = codec;
+ subtitle->codec_param = codec_param;
 subtitle->timebase.num = 1;
 subtitle->timebase.den = 90000;
 
@@ -520,7 +521,7 @@
 // Add 2 audio tracks. One for DTS-HD and one for DTS
 add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_DTS,
 HB_ACODEC_DCA, AV_CODEC_ID_DTS, HB_AUDIO_ATTR_NONE);
- // DTS-HD is special. The substreams must be concatinated
+ // DTS-HD is special. The substreams must be concatenated
 // DTS-core followed by DTS-hd-extensions. Setting
 // a substream id of 0 says use all substreams.
 add_audio(ii, title->list_audio, bdaudio, 0,
@@ -600,7 +601,7 @@
 add_audio(ii, title->list_audio, bdaudio, HB_SUBSTREAM_BD_DTS,
 HB_ACODEC_DCA, AV_CODEC_ID_DTS,
 HB_AUDIO_ATTR_SECONDARY);
- // DTS-HD is special. The substreams must be concatinated
+ // DTS-HD is special. The substreams must be concatenated
 // DTS-core followed by DTS-hd-extensions. Setting
 // a substream id of 0 says use all substreams.
 add_audio(ii, title->list_audio, bdaudio, 0,
@@ -633,7 +634,8 @@
 switch( bdpgs->coding_type )
 {
 case BLURAY_STREAM_TYPE_SUB_PG:
- add_subtitle(ii, title->list_subtitle, bdpgs, WORK_DECPGSSUB);
+ add_subtitle(ii, title->list_subtitle, bdpgs, WORK_DECAVSUB,
+ AV_CODEC_ID_HDMV_PGS_SUBTITLE);
 break;
 default:
 hb_log( "scan: unknown subtitle pid 0x%x codec 0x%x",
@@ -727,9 +729,9 @@
 int longest = 0;
 int ii;
 uint64_t longest_duration = 0;
- int highest_rank = 0;
+ int highest_rank = 0, rank;
 int most_chapters = 0;
- int rank8 = {0, 1, 3, 2, 6, 5, 7, 4};
+ int ranks9 = {0, 1, 3, 2, 6, 5, 7, 4, 8};
 BLURAY_TITLE_INFO * ti;
 
 for ( ii = 0; ii < hb_list_count( list_title ); ii++ )
@@ -741,16 +743,21 @@
 BLURAY_STREAM_INFO * bdvideo = &ti->clips0.video_streams0;
 if ( title->duration > longest_duration * 0.7 && bdvideo->format < 8 )
 {
- if (highest_rank < rankbdvideo->format ||
+ rank = 0;
+ if (bdvideo->format <= 8)
+ {
+ rank = ranksbdvideo->format;
+ }
+ if (highest_rank < rank ||
 ( title->duration > longest_duration &&
- highest_rank == rankbdvideo->format))
+ highest_rank == rank))
 {
 longest = title->index;
 longest_duration = title->duration;
- highest_rank = rankbdvideo->format;
+ highest_rank = rank;
 most_chapters = ti->chapter_count;
 }
- else if (highest_rank == rankbdvideo->format &&
+ else if (highest_rank == rank &&
 title->duration == longest_duration &&
 ti->chapter_count > most_chapters)
 {
@@ -912,6 +919,8 @@
 {
 // A unit is 6144 bytes (32 TS packets). Give up after we've
 // seen > 6MB of invalid data.
+ hb_error("bd: Error, too many consecutive bad units.");
+ hb_set_work_error(d->h, HB_ERROR_READ);
 return NULL;
 }
 continue;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/chroma_smooth.c -> HandBrake-1.5.1.tar.xz/libhb/chroma_smooth.c Changed

@@ -1,7 +1,7 @@
 /* chroma_smooth.c
 
 Copyright (c) 2002 Rémi Guyomarch <rguyom at pobox.com>
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -40,6 +40,9 @@
 chroma_smooth_plane_context_t plane_ctx3;
 chroma_smooth_thread_context3_t * thread_ctx;
 int threads;
+
+ hb_filter_init_t input;
+ hb_filter_init_t output;
 };
 
 static int chroma_smooth_init(hb_filter_object_t *filter,
@@ -164,6 +167,8 @@
 }
 hb_filter_private_t * pv = filter->private_data;
 
+ pv->input = *init;
+
 // Mark parameters unset
 for (int c = 0; c < 3; c++)
 {
@@ -240,6 +245,8 @@
 return -1;
 }
 
+ pv->output = *init;
+
 return 0;
 }
 
@@ -331,6 +338,11 @@
 }
 
 out = hb_frame_buffer_init(in->f.fmt, in->f.width, in->f.height);
+ out->f.color_prim = pv->output.color_prim;
+ out->f.color_transfer = pv->output.color_transfer;
+ out->f.color_matrix = pv->output.color_matrix;
+ out->f.color_range = pv->output.color_range;
+ out->f.chroma_location = pv->output.chroma_location;
 
 int c;
 for (c = 0; c < 3; c++)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/colormap.c -> HandBrake-1.5.1.tar.xz/libhb/colormap.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/colorspace.c -> HandBrake-1.5.1.tar.xz/libhb/colorspace.c Changed

@@ -14,8 +14,8 @@
 hb_filter_init_t * init);
 
 const char colorspace_template =
- "format=^"HB_ALL_REG"$:range=^"HB_ALL_REG"$:primaries=^"HB_ALL_REG"$:"
- "matrix=^"HB_ALL_REG"$:transfer=^"HB_ALL_REG"$";
+ "primaries=^"HB_ALL_REG"$:transfer=^"HB_ALL_REG"$:matrix=^"HB_ALL_REG"$:range=^"HB_ALL_REG"$:"
+ "tonemap=^"HB_ALL_REG"$:param=^"HB_FLOAT_REG"$:desat=^"HB_FLOAT_REG"$";
 
 hb_filter_object_t hb_filter_colorspace =
 {
@@ -30,6 +30,135 @@
 .settings_template = colorspace_template,
 };
 
+static const char * get_matrix_name(int colorspace)
+{
+ switch (colorspace) {
+ case AVCOL_SPC_RGB:
+ return "gbr";
+ case AVCOL_SPC_BT709:
+ return "bt709";
+ case AVCOL_SPC_UNSPECIFIED:
+ return "unknown";
+ case AVCOL_SPC_FCC:
+ return "fcc";
+ case AVCOL_SPC_BT470BG:
+ return "bt470bg";
+ case AVCOL_SPC_SMPTE170M:
+ return "smpte170m";
+ case AVCOL_SPC_SMPTE240M:
+ return "smpte2400m";
+ case AVCOL_SPC_YCGCO:
+ return "ycgco";
+ case AVCOL_SPC_BT2020_NCL:
+ return "bt2020nc";
+ case AVCOL_SPC_BT2020_CL:
+ return "bt2020c";
+ case AVCOL_SPC_CHROMA_DERIVED_NCL:
+ return "chroma-derived-nc";
+ case AVCOL_SPC_CHROMA_DERIVED_CL:
+ return "chroma-derived-c";
+ case AVCOL_SPC_ICTCP:
+ return "ictcp";
+ }
+ return "unspecified";
+}
+
+static const char * get_transfer_name(int color_trc)
+{
+ switch (color_trc) {
+ case AVCOL_TRC_UNSPECIFIED:
+ return "unspecified";
+ case AVCOL_TRC_BT709:
+ return "709";
+ case AVCOL_TRC_GAMMA22:
+ return "bt470m";
+ case AVCOL_TRC_GAMMA28:
+ return "bt470bg";
+ case AVCOL_TRC_SMPTE170M:
+ return "smpte170m";
+ case AVCOL_TRC_SMPTE240M:
+ return "240m"; // fixme
+ case AVCOL_TRC_LINEAR:
+ return "linear";
+ case AVCOL_TRC_LOG:
+ return "log100";
+ case AVCOL_TRC_LOG_SQRT:
+ return "log316";
+ case AVCOL_TRC_IEC61966_2_4:
+ return "iec61966-2-4";
+ case AVCOL_TRC_BT2020_10:
+ return "2020_10";
+ case AVCOL_TRC_BT2020_12:
+ return "2020_12";
+ case AVCOL_TRC_SMPTE2084:
+ return "smpte2084";
+ case AVCOL_TRC_ARIB_STD_B67:
+ return "arib-std-b67";
+ case AVCOL_TRC_IEC61966_2_1:
+ return "iec61966-2-1";
+ }
+ return "unspecified";
+}
+
+static const char * get_primaries_name(int color_primaries)
+{
+ switch (color_primaries) {
+ case AVCOL_PRI_UNSPECIFIED:
+ return "unspecified";
+ case AVCOL_PRI_BT709:
+ return "709";
+ case AVCOL_PRI_BT470M:
+ return "bt470m";
+ case AVCOL_PRI_BT470BG:
+ return "bt470bg";
+ case AVCOL_PRI_SMPTE170M:
+ return "smpte170m";
+ case AVCOL_PRI_SMPTE240M:
+ return "smpte240m";
+ case AVCOL_PRI_FILM:
+ return "film";
+ case AVCOL_PRI_BT2020:
+ return "bt2020";
+ case AVCOL_PRI_SMPTE428:
+ return "smpte428";
+ case AVCOL_PRI_SMPTE431:
+ return "smpte431";
+ case AVCOL_PRI_SMPTE432:
+ return "smpte432";
+ case AVCOL_PRI_JEDEC_P22:
+ return "jedec-p22";
+ }
+ return "unspecified";
+}
+
+static const char * get_range_name(int color_range)
+{
+ switch (color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ case AVCOL_RANGE_MPEG:
+ return "limited";
+ case AVCOL_RANGE_JPEG:
+ return "full";
+ }
+ return "limited";
+}
+
+#define REFERENCE_WHITE 100.0f
+
+static double determine_signal_peak(hb_filter_init_t * init)
+{
+ double peak = init->job->coll.max_cll / REFERENCE_WHITE;
+ if (!peak && init->job->mastering.has_luminance)
+ {
+ peak = hb_q2d(init->job->mastering.max_luminance) / REFERENCE_WHITE;
+ }
+ if (!peak || peak < 1)
+ {
+ peak = init->color_transfer == HB_COLR_TRA_SMPTEST2084 ? 100.0f : 10.0f;
+ }
+ return peak;
+}
+
 static int colorspace_init(hb_filter_object_t * filter, hb_filter_init_t * init)
 {
 hb_filter_private_t * pv = NULL;
@@ -44,45 +173,148 @@
 
 hb_dict_t * settings = filter->settings;
 
- char * format = NULL, * range = NULL;
+ char * range = NULL;
 char * primaries = NULL, * transfer = NULL, * matrix = NULL;
+ char * tonemap = NULL;
+ double param = 0, desat = 0;
 
- hb_dict_extract_string(&format, settings, "format");
 hb_dict_extract_string(&range, settings, "range");
 hb_dict_extract_string(&primaries, settings, "primaries");
 hb_dict_extract_string(&transfer, settings, "transfer");
 hb_dict_extract_string(&matrix, settings, "matrix");
+ hb_dict_extract_string(&tonemap, settings, "tonemap");
+ hb_dict_extract_double(&param, settings, "param");
+ hb_dict_extract_double(&desat, settings, "desat");
 
- if (!(format || range || primaries || transfer || matrix))
+ if (!(range || primaries || transfer || matrix))
 {
 return 0;
 }
 
- hb_dict_t * avfilter = hb_dict_init();
- hb_dict_t * avsettings = hb_dict_init();
+ int color_prim, color_transfer, color_matrix, color_range;
+
+ color_prim = init->color_prim;
+ color_transfer = init->color_transfer;
+ color_matrix = init->color_matrix;
+ color_range = init->color_range;
 
- if (format)
+ if (primaries)
+ {
+ color_prim = av_color_primaries_from_name(primaries);
+ free(primaries);
+ }
+ if (transfer)
 {
- hb_dict_set_string(avsettings, "format", format);
+ color_transfer = av_color_transfer_from_name(transfer);
+ free(transfer);
+ }
+ if (matrix)
+ {
+ color_matrix = av_color_space_from_name(matrix);
+ free(matrix);
 }
 if (range)
 {
- hb_dict_set_string(avsettings, "range", range);
+ color_range = av_color_range_from_name(range);
+ free(range);
 }
- if (primaries)
+
+ if (color_prim == init->color_prim && color_transfer == init->color_transfer &&
+ color_matrix == init->color_matrix && color_range == init->color_range)
 {
- hb_dict_set_string(avsettings, "primaries", primaries);
+ return 0;
 }
- if (transfer)
+
+ hb_value_array_t * avfilters = hb_value_array_init();
+ hb_dict_t * avfilter = NULL;
+ hb_dict_t * avsettings = NULL;
+
+ if (transfer && init->color_transfer != color_transfer &&
+ (init->color_transfer == HB_COLR_TRA_SMPTEST2084 || init->color_transfer == HB_COLR_TRA_ARIB_STD_B67))
 {
- hb_dict_set_string(avsettings, "trc", transfer);
+ // Zscale
+ avfilter = hb_dict_init();
+ avsettings = hb_dict_init();
+
+ hb_dict_set_string(avsettings, "transfer", "linear");
+ hb_dict_set_string(avsettings, "npl", "100");
+ hb_dict_set(avfilter, "zscale", avsettings);
+
+ hb_value_array_append(avfilters, avfilter);
+
+ // Format
+ avfilter = hb_dict_init();
+ avsettings = hb_dict_init();
+
+ hb_dict_set_string(avsettings, "pix_fmts", "gbrpf32le");
+ hb_dict_set(avfilter, "format", avsettings);
+
+ hb_value_array_append(avfilters, avfilter);
+
+ // Tonemap
+ avfilter = hb_dict_init();
+ avsettings = hb_dict_init();
+
+ const char * tonemap_in = tonemap != NULL ? tonemap : "hable";
+
+ hb_dict_set_string(avsettings, "tonemap", tonemap_in);
+ if (strcmp(tonemap_in, "hable") && strcmp(tonemap_in, "none") && param != 0)
+ {
+ hb_dict_set_double(avsettings, "param", param);
+ }
+ hb_dict_set_double(avsettings, "desat", desat);
+ // FIXME: this could be automated by passing through side data.
+ double peak = determine_signal_peak(init);
+ hb_dict_set_double(avsettings, "peak", peak);
+ hb_dict_set(avfilter, "tonemap", avsettings);
+
+ hb_value_array_append(avfilters, avfilter);
 }
- if (matrix)
+
+ if (tonemap)
 {
- hb_dict_set_string(avsettings, "space", matrix);
+ free(tonemap);
 }
- hb_dict_set(avfilter, "colorspace", avsettings);
- pv->avfilters = avfilter;
+
+ // Zscale
+ avfilter = hb_dict_init();
+ avsettings = hb_dict_init();
+
+ if (color_prim != init->color_prim)
+ {
+ hb_dict_set_string(avsettings, "primaries", get_primaries_name(color_prim));
+ }
+ if (color_transfer != init->color_transfer)
+ {
+ hb_dict_set_string(avsettings, "transfer", get_transfer_name(color_transfer));
+ }
+ if (color_matrix != init->color_matrix)
+ {
+ hb_dict_set_string(avsettings, "matrix", get_matrix_name(color_matrix));
+ }
+ if (color_range != init->color_range)
+ {
+ hb_dict_set_string(avsettings, "range", get_range_name(color_range));
+ }
+
+ hb_dict_set(avfilter, "zscale", avsettings);
+ hb_value_array_append(avfilters, avfilter);
+
+ // Format
+ avfilter = hb_dict_init();
+ avsettings = hb_dict_init();
+
+ hb_dict_set_string(avsettings, "pix_fmts", av_get_pix_fmt_name(init->pix_fmt));
+ hb_dict_set(avfilter, "format", avsettings);
+
+ hb_value_array_append(avfilters, avfilter);
+
+ pv->avfilters = avfilters;
+
+ init->color_prim = color_prim;
+ init->color_transfer = color_transfer;
+ init->color_matrix = color_matrix;
+ init->color_range = color_range;
 
 pv->output = *init;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/comb_detect.c -> HandBrake-1.5.1.tar.xz/libhb/comb_detect.c Changed

@@ -1,6 +1,6 @@
 /* comb_detect.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -421,7 +421,7 @@
 static void detect_gamma_combed_segment( hb_filter_private_t * pv,
 int segment_start, int segment_stop )
 {
- /* A mish-mash of various comb detection tricks
+ /* A mishmash of various comb detection tricks
 picked up from neuron2's Decomb plugin for
 AviSynth and tritical's IsCombedT and
 IsCombedTIVTC plugins. */
@@ -530,7 +530,7 @@
 static void detect_combed_segment( hb_filter_private_t * pv,
 int segment_start, int segment_stop )
 {
- /* A mish-mash of various comb detection tricks
+ /* A mishmash of various comb detection tricks
 picked up from neuron2's Decomb plugin for
 AviSynth and tritical's IsCombedT and
 IsCombedTIVTC plugins. */

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/common.c -> HandBrake-1.5.1.tar.xz/libhb/common.c Changed

@@ -1,6 +1,6 @@
 /* common.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -54,8 +54,18 @@
 enum
 {
 HB_GID_NONE = -1, // encoders must NEVER use it
- HB_GID_VCODEC_H264,
- HB_GID_VCODEC_H265,
+ HB_GID_VCODEC_H264_MF,
+ HB_GID_VCODEC_H264_NVENC,
+ HB_GID_VCODEC_H264_QSV,
+ HB_GID_VCODEC_H264_VCE,
+ HB_GID_VCODEC_H264_VT,
+ HB_GID_VCODEC_H264_X264,
+ HB_GID_VCODEC_H265_MF,
+ HB_GID_VCODEC_H265_NVENC,
+ HB_GID_VCODEC_H265_QSV,
+ HB_GID_VCODEC_H265_VCE,
+ HB_GID_VCODEC_H265_VT,
+ HB_GID_VCODEC_H265_X265,
 HB_GID_VCODEC_MPEG2,
 HB_GID_VCODEC_MPEG4,
 HB_GID_VCODEC_THEORA,
@@ -73,6 +83,7 @@
 HB_GID_ACODEC_EAC3_PASS,
 HB_GID_ACODEC_FLAC,
 HB_GID_ACODEC_FLAC_PASS,
+ HB_GID_ACODEC_MP2_PASS,
 HB_GID_ACODEC_MP3,
 HB_GID_ACODEC_MP3_PASS,
 HB_GID_ACODEC_TRUEHD_PASS,
@@ -236,6 +247,7 @@
 {
 hb_encoder_t item;
 hb_encoder_t *next;
+ int deprecated;
 int enabled;
 int gid;
 } hb_encoder_internal_t;
@@ -244,31 +256,34 @@
 hb_encoder_internal_t hb_video_encoders =
 {
 // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "FFmpeg", "ffmpeg", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG4, },
- { { "MPEG-4 (FFmpeg)", "ffmpeg4", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG4, },
- { { "MPEG-2 (FFmpeg)", "ffmpeg2", NULL, HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_MPEG2, },
- { { "VP3 (Theora)", "libtheora", NULL, HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_VCODEC_THEORA, },
+ { { "FFmpeg", "ffmpeg", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-4 (FFmpeg)", "ffmpeg4", NULL, HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-2 (FFmpeg)", "ffmpeg2", NULL, HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_VCODEC_MPEG2, },
+ { { "VP3 (Theora)", "libtheora", NULL, HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_VCODEC_THEORA, },
 // actual encoders
- { { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264_8BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.264 10-bit (x264)", "x264_10bit", "H.264 10-bit (libx264)", HB_VCODEC_X264_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel Media SDK)", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.264 (AMD VCE)", "vce_h264", "H.264 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.264 (NVEnc)", "nvenc_h264", "H.264 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.264 (VideoToolbox)","vt_h264", "H.264 (libavcodec)", HB_VCODEC_FFMPEG_VT_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H264, },
- { { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265_8BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 10-bit (x265)", "x265_10bit", "H.265 10-bit (libx265)", HB_VCODEC_X265_10BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 12-bit (x265)", "x265_12bit", "H.265 12-bit (libx265)", HB_VCODEC_X265_12BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 16-bit (x265)", "x265_16bit", "H.265 16-bit (libx265)", HB_VCODEC_X265_16BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 (Intel QSV)", "qsv_h265", "H.265 (Intel Media SDK)", HB_VCODEC_QSV_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 10-bit (Intel QSV)","qsv_h265_10bit", "H.265 10-bit (Intel Media SDK)", HB_VCODEC_QSV_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 (AMD VCE)", "vce_h265", "H.265 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 (NVEnc)", "nvenc_h265", "H.265 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "H.265 (VideoToolbox)","vt_h265", "H.265 (libavcodec)", HB_VCODEC_FFMPEG_VT_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_H265, },
- { { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG4, },
- { { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_MPEG2, },
- { { "VP8", "VP8", "VP8 (libvpx)", HB_VCODEC_FFMPEG_VP8, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_VP8, },
- { { "VP9", "VP9", "VP9 (libvpx)", HB_VCODEC_FFMPEG_VP9, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_VP9, },
- { { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_VCODEC_THEORA, },
+ { { "H.264 (x264)", "x264", "H.264 (libx264)", HB_VCODEC_X264_8BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_X264, },
+ { { "H.264 10-bit (x264)", "x264_10bit", "H.264 10-bit (libx264)", HB_VCODEC_X264_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_X264, },
+ { { "H.264 (Intel QSV)", "qsv_h264", "H.264 (Intel Media SDK)", HB_VCODEC_QSV_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_QSV, },
+ { { "H.264 (AMD VCE)", "vce_h264", "H.264 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_VCE, },
+ { { "H.264 (NVEnc)", "nvenc_h264", "H.264 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_NVENC, },
+ { { "H.264 (MediaFoundation)","mf_h264", "H.264 (MediaFoundation)", HB_VCODEC_FFMPEG_MF_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_MF, },
+ { { "H.264 (VideoToolbox)","vt_h264", "H.264 (VideoToolbox)", HB_VCODEC_VT_H264, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H264_VT, },
+ { { "H.265 (x265)", "x265", "H.265 (libx265)", HB_VCODEC_X265_8BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_X265, },
+ { { "H.265 10-bit (x265)", "x265_10bit", "H.265 10-bit (libx265)", HB_VCODEC_X265_10BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_X265, },
+ { { "H.265 12-bit (x265)", "x265_12bit", "H.265 12-bit (libx265)", HB_VCODEC_X265_12BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_X265, },
+ { { "H.265 16-bit (x265)", "x265_16bit", "H.265 16-bit (libx265)", HB_VCODEC_X265_16BIT, HB_MUX_AV_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_X265, },
+ { { "H.265 (Intel QSV)", "qsv_h265", "H.265 (Intel Media SDK)", HB_VCODEC_QSV_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_QSV, },
+ { { "H.265 10-bit (Intel QSV)","qsv_h265_10bit", "H.265 10-bit (Intel Media SDK)", HB_VCODEC_QSV_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_QSV, },
+ { { "H.265 (AMD VCE)", "vce_h265", "H.265 (AMD VCE)", HB_VCODEC_FFMPEG_VCE_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VCE, },
+ { { "H.265 (NVEnc)", "nvenc_h265", "H.265 (NVEnc)", HB_VCODEC_FFMPEG_NVENC_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_NVENC, },
+ { { "H.265 (MediaFoundation)","mf_h265", "H.265 (MediaFoundation)", HB_VCODEC_FFMPEG_MF_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_MF, },
+ { { "H.265 (VideoToolbox)","vt_h265", "H.265 (VideoToolbox)", HB_VCODEC_VT_H265, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VT, },
+ { { "H.265 10-bit (VideoToolbox)","vt_h265_10bit", "H.265 10-bit (VideoToolbox)", HB_VCODEC_VT_H265_10BIT, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_H265_VT, },
+ { { "MPEG-4", "mpeg4", "MPEG-4 (libavcodec)", HB_VCODEC_FFMPEG_MPEG4, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_MPEG4, },
+ { { "MPEG-2", "mpeg2", "MPEG-2 (libavcodec)", HB_VCODEC_FFMPEG_MPEG2, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_MPEG2, },
+ { { "VP8", "VP8", "VP8 (libvpx)", HB_VCODEC_FFMPEG_VP8, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP8, },
+ { { "VP9", "VP9", "VP9 (libvpx)", HB_VCODEC_FFMPEG_VP9, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_VP9, },
+ { { "Theora", "theora", "Theora (libtheora)", HB_VCODEC_THEORA, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_VCODEC_THEORA, },
 };
 int hb_video_encoders_count = sizeof(hb_video_encoders) / sizeof(hb_video_encoders0);
 static int hb_video_encoder_is_enabled(int encoder, int disable_hardware)
@@ -279,7 +294,7 @@
 #if HB_PROJECT_FEATURE_QSV
 if (encoder & HB_VCODEC_QSV_MASK)
 {
- return hb_qsv_video_encoder_is_enabled(encoder);
+ return hb_qsv_video_encoder_is_enabled(hb_qsv_get_adapter_index(), encoder);
 }
 #endif
 
@@ -299,10 +314,19 @@
 #endif
 
 #ifdef __APPLE__
- case HB_VCODEC_FFMPEG_VT_H264:
- return hb_vt_h264_is_available();
- case HB_VCODEC_FFMPEG_VT_H265:
- return hb_vt_h265_is_available();
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_is_encoder_available(encoder);
+#endif
+
+#if HB_PROJECT_FEATURE_MF
+ // TODO: Try to instantiate a throwaway encoder to see if a suitable MediaFoundation encoder can be found?
+ // Alt, implement logic similar to ffmpeg's encoder selection, to see if one would be found.
+ case HB_VCODEC_FFMPEG_MF_H264:
+ return 1;
+ case HB_VCODEC_FFMPEG_MF_H265:
+ return 1;
 #endif
 }
 }
@@ -348,40 +372,41 @@
 hb_encoder_internal_t hb_audio_encoders =
 {
 // legacy encoders, back to HB 0.9.4 whenever possible (disabled)
- { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_DTS_PASS, },
- { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AC3, },
- { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_MP3, },
- { { "Vorbis (vorbis)", "libvorbis", NULL, HB_ACODEC_VORBIS, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_VORBIS, },
- { { "FLAC (ffmpeg)", "ffflac", NULL, HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_FLAC, },
- { { "FLAC (24-bit)", "ffflac24", NULL, HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_FLAC, },
+ { { "", "dts", NULL, HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_DTS_PASS, },
+ { { "AAC (faac)", "faac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC, },
+ { { "AAC (ffmpeg)", "ffaac", NULL, HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AAC, },
+ { { "AC3 (ffmpeg)", "ffac3", NULL, HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_AC3, },
+ { { "MP3 (lame)", "lame", NULL, HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_MP3, },
+ { { "Vorbis (vorbis)", "libvorbis", NULL, HB_ACODEC_VORBIS, HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_VORBIS, },
+ { { "FLAC (ffmpeg)", "ffflac", NULL, HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_FLAC, },
+ { { "FLAC (24-bit)", "ffflac24", NULL, HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 1, 0, HB_GID_ACODEC_FLAC, },
 // generic names
- { { "AAC", "aac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC, },
- { { "HE-AAC", "haac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, HB_GID_ACODEC_AAC_HE, },
+ { { "AAC", "aac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 0, HB_GID_ACODEC_AAC, },
+ { { "HE-AAC", "haac", NULL, 0, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 0, HB_GID_ACODEC_AAC_HE, },
 // actual encoders
- { { "None", "none", "None", HB_ACODEC_NONE, 0, }, NULL, 1, HB_GID_NONE, },
- { { "AAC (CoreAudio)", "ca_aac", "AAC (Apple AudioToolbox)", HB_ACODEC_CA_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
- { { "HE-AAC (CoreAudio)", "ca_haac", "HE-AAC (Apple AudioToolbox)", HB_ACODEC_CA_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE, },
- { { "AAC (FDK)", "fdk_aac", "AAC (libfdk_aac)", HB_ACODEC_FDK_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
- { { "HE-AAC (FDK)", "fdk_haac", "HE-AAC (libfdk_aac)", HB_ACODEC_FDK_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_HE, },
- { { "AAC (avcodec)", "av_aac", "AAC (libavcodec)", HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC, },
- { { "AAC Passthru", "copy:aac", "AAC Passthru", HB_ACODEC_AAC_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AAC_PASS, },
- { { "AC3", "ac3", "AC3 (libavcodec)", HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AC3, },
- { { "AC3 Passthru", "copy:ac3", "AC3 Passthru", HB_ACODEC_AC3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AC3_PASS, },
- { { "E-AC3", "eac3", "E-AC3 (libavcodec)", HB_ACODEC_FFEAC3, HB_MUX_MASK_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_ACODEC_EAC3, },
- { { "E-AC3 Passthru", "copy:eac3", "E-AC3 Passthru", HB_ACODEC_EAC3_PASS, HB_MUX_MASK_MP4|HB_MUX_AV_MKV, }, NULL, 1, HB_GID_ACODEC_EAC3_PASS, },
- { { "TrueHD Passthru", "copy:truehd","TrueHD Passthru", HB_ACODEC_TRUEHD_PASS, HB_MUX_AV_MKV, }, NULL, 1, HB_GID_ACODEC_TRUEHD_PASS,},
- { { "DTS Passthru", "copy:dts", "DTS Passthru", HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_DTS_PASS, },
- { { "DTS-HD Passthru", "copy:dtshd", "DTS-HD Passthru", HB_ACODEC_DCA_HD_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_DTSHD_PASS, },
- { { "MP3", "mp3", "MP3 (libmp3lame)", HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_MP3, },
- { { "MP3 Passthru", "copy:mp3", "MP3 Passthru", HB_ACODEC_MP3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_MP3_PASS, },
- { { "Vorbis", "vorbis", "Vorbis (libvorbis)", HB_ACODEC_VORBIS, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_VORBIS, },
- { { "FLAC 16-bit", "flac16", "FLAC 16-bit (libavcodec)", HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_FLAC, },
- { { "FLAC 24-bit", "flac24", "FLAC 24-bit (libavcodec)", HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_FLAC, },
- { { "FLAC Passthru", "copy:flac", "FLAC Passthru", HB_ACODEC_FLAC_PASS, HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_FLAC_PASS, },
- { { "Opus", "opus", "Opus (libopus)", HB_ACODEC_OPUS, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_OPUS, },
- { { "Auto Passthru", "copy", "Auto Passthru", HB_ACODEC_AUTO_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 1, HB_GID_ACODEC_AUTO_PASS, },
+ { { "None", "none", "None", HB_ACODEC_NONE, 0, }, NULL, 0, 1, HB_GID_NONE, },
+ { { "AAC (CoreAudio)", "ca_aac", "AAC (Apple AudioToolbox)", HB_ACODEC_CA_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC, },
+ { { "HE-AAC (CoreAudio)", "ca_haac", "HE-AAC (Apple AudioToolbox)", HB_ACODEC_CA_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC_HE, },
+ { { "AAC (FDK)", "fdk_aac", "AAC (libfdk_aac)", HB_ACODEC_FDK_AAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC, },
+ { { "HE-AAC (FDK)", "fdk_haac", "HE-AAC (libfdk_aac)", HB_ACODEC_FDK_HAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC_HE, },
+ { { "AAC (avcodec)", "av_aac", "AAC (libavcodec)", HB_ACODEC_FFAAC, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC, },
+ { { "AAC Passthru", "copy:aac", "AAC Passthru", HB_ACODEC_AAC_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AAC_PASS, },
+ { { "AC3", "ac3", "AC3 (libavcodec)", HB_ACODEC_AC3, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AC3, },
+ { { "AC3 Passthru", "copy:ac3", "AC3 Passthru", HB_ACODEC_AC3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AC3_PASS, },
+ { { "E-AC3", "eac3", "E-AC3 (libavcodec)", HB_ACODEC_FFEAC3, HB_MUX_MASK_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_ACODEC_EAC3, },
+ { { "E-AC3 Passthru", "copy:eac3", "E-AC3 Passthru", HB_ACODEC_EAC3_PASS, HB_MUX_MASK_MP4|HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_ACODEC_EAC3_PASS, },
+ { { "TrueHD Passthru", "copy:truehd","TrueHD Passthru", HB_ACODEC_TRUEHD_PASS, HB_MUX_AV_MKV, }, NULL, 0, 1, HB_GID_ACODEC_TRUEHD_PASS,},
+ { { "DTS Passthru", "copy:dts", "DTS Passthru", HB_ACODEC_DCA_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_DTS_PASS, },
+ { { "DTS-HD Passthru", "copy:dtshd", "DTS-HD Passthru", HB_ACODEC_DCA_HD_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_DTSHD_PASS, },
+ { { "MP2 Passthru", "copy:mp2", "MP2 Passthru", HB_ACODEC_MP2_PASS, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_MP2_PASS, },
+ { { "MP3", "mp3", "MP3 (libmp3lame)", HB_ACODEC_LAME, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_MP3, },
+ { { "MP3 Passthru", "copy:mp3", "MP3 Passthru", HB_ACODEC_MP3_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_MP3_PASS, },
+ { { "Vorbis", "vorbis", "Vorbis (libvorbis)", HB_ACODEC_VORBIS, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_VORBIS, },
+ { { "FLAC 16-bit", "flac16", "FLAC 16-bit (libavcodec)", HB_ACODEC_FFFLAC, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC, },
+ { { "FLAC 24-bit", "flac24", "FLAC 24-bit (libavcodec)", HB_ACODEC_FFFLAC24, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC, },
+ { { "FLAC Passthru", "copy:flac", "FLAC Passthru", HB_ACODEC_FLAC_PASS, HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_FLAC_PASS, },
+ { { "Opus", "opus", "Opus (libopus)", HB_ACODEC_OPUS, HB_MUX_MASK_WEBM|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_OPUS, },
+ { { "Auto Passthru", "copy", "Auto Passthru", HB_ACODEC_AUTO_PASS, HB_MUX_MASK_MP4|HB_MUX_MASK_MKV, }, NULL, 0, 1, HB_GID_ACODEC_AUTO_PASS, },
 };
 int hb_audio_encoders_count = sizeof(hb_audio_encoders) / sizeof(hb_audio_encoders0);
 static int hb_audio_encoder_is_enabled(int encoder)
@@ -1392,12 +1417,21 @@
 *high = 63.;
 break;
 
- case HB_VCODEC_FFMPEG_VT_H264:
- case HB_VCODEC_FFMPEG_VT_H265:
- *direction = 1;
- *granularity = 0.1;
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ *direction = 0;
+ *granularity = 1.;
 *low = 0.;
- *high = 0.;
+ *high = 100.;
+ break;
+
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
+ *direction = 0;
+ *granularity = 1;
+ *low = 0;
+ *high = 100;
 break;
 
 case HB_VCODEC_FFMPEG_MPEG2:
@@ -1434,13 +1468,92 @@
 case HB_VCODEC_FFMPEG_VP9:
 case HB_VCODEC_FFMPEG_NVENC_H264:
 case HB_VCODEC_FFMPEG_NVENC_H265:
+ case HB_VCODEC_FFMPEG_VCE_H264:
+ case HB_VCODEC_FFMPEG_VCE_H265:
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
 return "CQ";
 
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
+ return "Quality";
+
 default:
 return "QP";
 }
 }
 
+int hb_video_quality_is_supported(uint32_t codec)
+{
+ switch (codec)
+ {
+#ifdef __APPLE__
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_is_constant_quality_available(codec);
+#endif
+
+ default:
+ return 1;
+ }
+}
+
+int hb_video_twopass_is_supported(uint32_t codec)
+{
+ switch (codec)
+ {
+#ifdef __APPLE__
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_is_two_pass_available(codec);
+#endif
+
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
+ case HB_VCODEC_FFMPEG_VCE_H264:
+ case HB_VCODEC_FFMPEG_VCE_H265:
+ case HB_VCODEC_FFMPEG_NVENC_H264:
+ case HB_VCODEC_FFMPEG_NVENC_H265:
+ case HB_VCODEC_QSV_H264:
+ case HB_VCODEC_QSV_H265:
+ case HB_VCODEC_QSV_H265_10BIT:
+ return 0;
+
+ default:
+ return 1;
+ }
+}
+
+int hb_video_encoder_is_supported(int encoder)
+{
+ const hb_encoder_t *video_encoder = NULL;
+ while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ {
+ if (video_encoder->codec == encoder)
+ {
+ return 1;
+ }
+ }
+ return 0;
+}
+
+int hb_video_encoder_pix_fmt_is_supported(int encoder, int pix_fmt)
+{
+ const int *pix_fmts = hb_video_encoder_get_pix_fmts(encoder);
+ while (*pix_fmts != AV_PIX_FMT_NONE)
+ {
+ if (pix_fmt == *pix_fmts)
+ {
+ return 1;
+ }
+ pix_fmts++;
+ }
+ return 0;
+}
+
 int hb_video_encoder_get_depth(int encoder)
 {
 switch (encoder)
@@ -1448,6 +1561,9 @@
 #if HB_PROJECT_FEATURE_QSV
 case HB_VCODEC_QSV_H265_10BIT:
 #endif
+#ifdef __APPLE__
+ case HB_VCODEC_VT_H265_10BIT:
+#endif
 case HB_VCODEC_X264_10BIT:
 case HB_VCODEC_X265_10BIT:
 return 10;
@@ -1487,6 +1603,12 @@
 case HB_VCODEC_X265_16BIT:
 return x265_preset_names;
 #endif
+#ifdef __APPLE__
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_preset_get_names(encoder);
+#endif
 default:
 return NULL;
 }
@@ -1543,11 +1665,16 @@
 case HB_VCODEC_FFMPEG_VCE_H265:
 return hb_vce_h265_profile_names;
 #endif
-
+#if __APPLE__
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_profile_get_names(encoder);
+#endif
 case HB_VCODEC_FFMPEG_NVENC_H264:
 case HB_VCODEC_FFMPEG_NVENC_H265:
- case HB_VCODEC_FFMPEG_VT_H264:
- case HB_VCODEC_FFMPEG_VT_H265:
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
 return hb_av_profile_get_names(encoder);
 default:
 return NULL;
@@ -1568,7 +1695,7 @@
 case HB_VCODEC_X264_8BIT:
 case HB_VCODEC_X264_10BIT:
 case HB_VCODEC_FFMPEG_NVENC_H264:
- case HB_VCODEC_FFMPEG_VT_H264:
+ case HB_VCODEC_FFMPEG_MF_H264:
 return hb_h264_level_names;
 
 #if HB_PROJECT_FEATURE_VCE
@@ -1582,11 +1709,14 @@
 case HB_VCODEC_X265_16BIT:
 case HB_VCODEC_FFMPEG_NVENC_H265:
 case HB_VCODEC_FFMPEG_VCE_H265:
+ case HB_VCODEC_FFMPEG_MF_H265:
 return hb_h265_level_names;
 
 #ifdef __APPLE__
- case HB_VCODEC_FFMPEG_VT_H265:
- return hb_vt_h265_level_names;
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_level_get_names(encoder);
 #endif
 
 default:
@@ -1594,6 +1724,56 @@
 }
 }
 
+static const enum AVPixelFormat standard_pix_fmts =
+{
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat standard_10bit_pix_fmts =
+{
+ AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat standard_12bit_pix_fmts =
+{
+ AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+const int* hb_video_encoder_get_pix_fmts(int encoder)
+{
+#if HB_PROJECT_FEATURE_QSV
+ if (encoder & HB_VCODEC_QSV_MASK)
+ {
+ return hb_qsv_get_pix_fmts(encoder);
+ }
+#endif
+
+ if (encoder & HB_VCODEC_FFMPEG_MASK)
+ {
+ return hb_av_get_pix_fmts(encoder);
+ }
+
+ switch (encoder)
+ {
+ case HB_VCODEC_X264_10BIT:
+ return standard_10bit_pix_fmts;
+#if HB_PROJECT_FEATURE_X265
+ case HB_VCODEC_X265_10BIT:
+ return standard_10bit_pix_fmts;
+ case HB_VCODEC_X265_12BIT:
+ return standard_12bit_pix_fmts;
+#endif
+#if __APPLE__
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return hb_vt_get_pix_fmts(encoder);
+#endif
+ default:
+ return standard_pix_fmts;
+ }
+}
+
 // Get limits and hints for the UIs.
 //
 // granularity sets the minimum step increments that should be used
@@ -1610,7 +1790,7 @@
 *direction = 0;
 *granularity = 1.;
 *low = 1.;
- *high = 10.;
+ *high = 5.;
 break;
 
 case HB_ACODEC_FDK_HAAC:
@@ -1667,7 +1847,7 @@
 switch (codec)
 {
 case HB_ACODEC_FFAAC:
- return 5.;
+ return 3.;
 
 case HB_ACODEC_FDK_HAAC:
 case HB_ACODEC_FDK_AAC:
@@ -1775,10 +1955,16 @@
 return SWR_DITHER_TRIANGULAR;
 }
 
-int hb_audio_dither_is_supported(uint32_t codec)
+int hb_audio_dither_is_supported(uint32_t codec, int depth)
 {
 // Since dithering is performed by swresample, all codecs are supported
- return 1;
+ switch (codec)
+ {
+ case HB_ACODEC_FFFLAC:
+ if (depth == 0 || depth > 16)
+ return 1;
+ }
+ return 0;
 }
 
 int hb_audio_dither_get_from_name(const char *name)
@@ -2215,12 +2401,12 @@
 if (!(encoder & HB_VCODEC_MASK))
 goto fail;
 
- const hb_encoder_t *video_encoder = NULL;
- while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ int i;
+ for (i = 0; i < hb_video_encoders_count; i++)
 {
- if (video_encoder->codec == encoder)
+ if (hb_video_encodersi.item.codec == encoder && hb_video_encodersi.deprecated == 0)
 {
- return video_encoder->name;
+ return hb_video_encodersi.item.name;
 }
 }
 
@@ -2233,12 +2419,12 @@
 if (!(encoder & HB_VCODEC_MASK))
 goto fail;
 
- const hb_encoder_t *video_encoder = NULL;
- while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ int i;
+ for (i = 0; i < hb_video_encoders_count; i++)
 {
- if (video_encoder->codec == encoder)
+ if (hb_video_encodersi.item.codec == encoder && hb_video_encodersi.deprecated == 0)
 {
- return video_encoder->short_name;
+ return hb_video_encodersi.item.short_name;
 }
 }
 
@@ -2251,12 +2437,12 @@
 if (!(encoder & HB_VCODEC_MASK))
 goto fail;
 
- const hb_encoder_t *video_encoder = NULL;
- while ((video_encoder = hb_video_encoder_get_next(video_encoder)) != NULL)
+ int i;
+ for (i = 0; i < hb_video_encoders_count; i++)
 {
- if (video_encoder->codec == encoder)
+ if (hb_video_encodersi.item.codec == encoder && hb_video_encodersi.deprecated == 0)
 {
- return video_encoder->long_name;
+ return hb_video_encodersi.item.long_name;
 }
 }
 
@@ -2844,9 +3030,9 @@
 }
 }
 
-void hb_limit_rational( int *x, int *y, int num, int den, int limit )
+void hb_limit_rational( int *x, int *y, int64_t num, int64_t den, int limit )
 {
- hb_reduce( &num, &den, num, den );
+ hb_reduce64( &num, &den, num, den );
 if ( num < limit && den < limit )
 {
 *x = num;
@@ -3239,7 +3425,7 @@
 /**********************************************************************
 * hb_list_insert
 **********************************************************************
- * Adds an item at the specifiec position in the list, making it bigger
+ * Adds an item at the specified position in the list, making it bigger
 * if necessary.
 * Can safely be called with a NULL pointer to add, it will be ignored.
 *********************************************************************/
@@ -3690,7 +3876,7 @@
 t->video_timebase.num = 1;
 t->video_timebase.den = 90000;
 t->angle_count = 1;
- t->geometry.par.num = 1;
+ t->geometry.par.num = 0;
 t->geometry.par.den = 1;
 
 return t;
@@ -3763,23 +3949,22 @@
 /* Autocrop by default. Gnark gnark */
 memcpy( job->crop, title->crop, 4 * sizeof( int ) );
 
-
- hb_geometry_t resultGeo, srcGeo;
+ hb_geometry_t srcGeo, resultGeo;
 hb_geometry_settings_t uiGeo;
 
 srcGeo = title->geometry;
 
 memset(&uiGeo, 0, sizeof(uiGeo));
 memcpy(uiGeo.crop, title->crop, 4 * sizeof( int ));
- uiGeo.geometry.width = srcGeo.width - uiGeo.crop2 - uiGeo.crop3;
+ uiGeo.geometry.width = srcGeo.width - uiGeo.crop2 - uiGeo.crop3;
 uiGeo.geometry.height = srcGeo.height - uiGeo.crop0 - uiGeo.crop1;
 uiGeo.mode = HB_ANAMORPHIC_NONE;
 uiGeo.keep = HB_KEEP_DISPLAY_ASPECT;
 
 hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
- job->width = resultGeo.width;
+ job->width = resultGeo.width;
 job->height = resultGeo.height;
- job->par = resultGeo.par;
+ job->par = resultGeo.par;
 
 job->vcodec = HB_VCODEC_FFMPEG_MPEG4;
 job->vquality = HB_INVALID_VIDEO_QUALITY;
@@ -3788,14 +3973,18 @@
 job->pass_id = HB_PASS_ENCODE;
 job->vrate = title->vrate;
 
- job->pix_fmt = AV_PIX_FMT_YUV420P;
- job->color_prim = title->color_prim;
- job->color_transfer = title->color_transfer;
- job->color_matrix = title->color_matrix;
- job->color_range = title->color_range;
+ job->input_pix_fmt = AV_PIX_FMT_YUV420P;
+ job->output_pix_fmt = AV_PIX_FMT_YUV420P;
+ job->color_prim = title->color_prim;
+ job->color_transfer = title->color_transfer;
+ job->color_matrix = title->color_matrix;
+ job->color_range = title->color_range;
+ job->chroma_location = title->chroma_location;
 job->color_prim_override = HB_COLR_PRI_UNDEF;
 job->color_transfer_override = HB_COLR_TRA_UNDEF;
 job->color_matrix_override = HB_COLR_MAT_UNDEF;
+ job->mastering = title->mastering;
+ job->coll = title->coll;
 
 job->mux = HB_MUX_MP4;
 
@@ -3807,8 +3996,12 @@
 job->metadata = hb_metadata_copy( title->metadata );
 
 #if HB_PROJECT_FEATURE_QSV
+ job->qsv.ctx = NULL;
+ if (!job->indepth_scan)
+ {
+ job->qsv.ctx = hb_qsv_context_init();
+ }
 job->qsv.enc_info.is_init_done = 0;
- job->qsv.async_depth = HB_QSV_ASYNC_DEPTH_DEFAULT;
 job->qsv.decode = !!(title->video_decode_support &
 HB_DECODE_SUPPORT_QSV);
 #endif
@@ -4069,6 +4262,27 @@
 return list;
 }
 
+hb_dict_t * hb_filter_dict_find(const hb_value_array_t * list, int filter_id)
+{
+ hb_dict_t * filter = NULL;
+ int ii;
+
+ if (list == NULL)
+ {
+ return NULL;
+ }
+ for (ii = 0; ii < hb_value_array_len(list); ii++)
+ {
+ filter = hb_value_array_get(list, ii);
+ if (hb_dict_get_int(filter, "ID") == filter_id)
+ {
+ return filter;
+ }
+ }
+
+ return NULL;
+}
+
 hb_filter_object_t * hb_filter_find(const hb_list_t *list, int filter_id)
 {
 hb_filter_object_t *filter = NULL;
@@ -4172,7 +4386,12 @@
 filter = &hb_filter_grayscale;
 break;
 
+ case HB_FILTER_FORMAT:
+ filter = &hb_filter_format;
+ break;
+
 #if HB_PROJECT_FEATURE_QSV
+#if !HB_QSV_ONEVPL
 case HB_FILTER_QSV:
 filter = &hb_filter_qsv;
 break;
@@ -4185,6 +4404,7 @@
 filter = &hb_filter_qsv_post;
 break;
 #endif
+#endif
 
 case HB_FILTER_MT_FRAME:
 filter = &hb_filter_mt_frame;
@@ -4622,7 +4842,7 @@
 * Applies information from the given job to the official job instance.
 * @param job Handle to hb_job_t.
 * @param chapter The chapter to apply the name to (1-based).
- * @param titel to apply.
+ * @param title to apply.
 *********************************************************************/
 void hb_chapter_set_title_by_index( hb_job_t * job, int chapter_index, const char * title )
 {
@@ -4952,11 +5172,15 @@
 return 0;
 }
 
- subtitle->id = (hb_list_count(job->list_subtitle) << 8) |
- HB_SUBTITLE_IMPORT_TAG;
- subtitle->format = TEXTSUB;
- subtitle->source = source;
- subtitle->codec = source == IMPORTSRT ? WORK_DECSRTSUB : WORK_DECSSASUB;
+ subtitle->id = (hb_list_count(job->list_subtitle) << 8) |
+ HB_SUBTITLE_IMPORT_TAG;
+ subtitle->format = TEXTSUB;
+ subtitle->source = source;
+ subtitle->codec = WORK_DECSRTSUB;
+ subtitle->codec = source == IMPORTSRT ? WORK_DECSRTSUB :
+ WORK_DECSSASUB;
+ subtitle->codec_param = source == IMPORTSRT ? AV_CODEC_ID_SUBRIP :
+ AV_CODEC_ID_ASS;
 subtitle->timebase.num = 1;
 subtitle->timebase.den = 90000;
 
@@ -5002,7 +5226,7 @@
 {
 return source == VOBSUB || source == PGSSUB || source == SSASUB ||
 source == CC608SUB || source == UTF8SUB || source == TX3GSUB ||
- source == IMPORTSRT || source == IMPORTSSA;
+ source == IMPORTSRT || source == IMPORTSSA || source == DVBSUB;
 }
 
 int hb_subtitle_can_pass( int source, int mux )
@@ -5012,6 +5236,7 @@
 case HB_MUX_AV_MKV:
 switch( source )
 {
+ case DVBSUB:
 case PGSSUB:
 case VOBSUB:
 case SSASUB:
@@ -5099,6 +5324,10 @@
 hb_metadata_t *hb_metadata_init()
 {
 hb_metadata_t *metadata = calloc( 1, sizeof(*metadata) );
+ if (metadata != NULL)
+ {
+ metadata->dict = hb_dict_init();
+ }
 return metadata;
 }
 
@@ -5114,45 +5343,9 @@
 if ( src )
 {
 metadata = calloc( 1, sizeof(*metadata) );
- if ( src->name )
- {
- metadata->name = strdup(src->name);
- }
- if ( src->artist )
- {
- metadata->artist = strdup(src->artist);
- }
- if ( src->album_artist )
+ if (src->dict != NULL)
 {
- metadata->album_artist = strdup(src->album_artist);
- }
- if ( src->composer )
- {
- metadata->composer = strdup(src->composer);
- }
- if ( src->release_date )
- {
- metadata->release_date = strdup(src->release_date);
- }
- if ( src->comment )
- {
- metadata->comment = strdup(src->comment);
- }
- if ( src->album )
- {
- metadata->album = strdup(src->album);
- }
- if ( src->genre )
- {
- metadata->genre = strdup(src->genre);
- }
- if ( src->description )
- {
- metadata->description = strdup(src->description);
- }
- if ( src->long_description )
- {
- metadata->long_description = strdup(src->long_description);
+ metadata->dict = hb_value_dup(src->dict);
 }
 if ( src->list_coverart )
 {
@@ -5180,16 +5373,10 @@
 hb_metadata_t *m = *_m;
 hb_coverart_t *art;
 
- free( m->name );
- free( m->artist );
- free( m->composer );
- free( m->release_date );
- free( m->comment );
- free( m->album );
- free( m->album_artist );
- free( m->genre );
- free( m->description );
- free( m->long_description );
+ if (m->dict != NULL)
+ {
+ hb_value_free(&m->dict);
+ }
 
 if ( m->list_coverart )
 {
@@ -5212,83 +5399,15 @@
 **********************************************************************
 *
 *********************************************************************/
-void hb_metadata_set_name( hb_metadata_t *metadata, const char *name )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->name, name );
- }
-}
-
-void hb_metadata_set_artist( hb_metadata_t *metadata, const char *artist )
+void hb_update_meta_dict(hb_dict_t * dict, const char * key, const char * value)
 {
- if ( metadata )
+ if (value != NULL)
 {
- hb_update_str( &metadata->artist, artist );
+ hb_dict_set_string(dict, key, value);
 }
-}
-
-void hb_metadata_set_composer( hb_metadata_t *metadata, const char *composer )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->composer, composer );
- }
-}
-
-void hb_metadata_set_release_date( hb_metadata_t *metadata, const char *release_date )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->release_date, release_date );
- }
-}
-
-void hb_metadata_set_comment( hb_metadata_t *metadata, const char *comment )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->comment, comment );
- }
-}
-
-void hb_metadata_set_genre( hb_metadata_t *metadata, const char *genre )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->genre, genre );
- }
-}
-
-void hb_metadata_set_album( hb_metadata_t *metadata, const char *album )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->album, album );
- }
-}
-
-void hb_metadata_set_album_artist( hb_metadata_t *metadata, const char *album_artist )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->album_artist, album_artist );
- }
-}
-
-void hb_metadata_set_description( hb_metadata_t *metadata, const char *description )
-{
- if ( metadata )
- {
- hb_update_str( &metadata->description, description );
- }
-}
-
-void hb_metadata_set_long_description( hb_metadata_t *metadata, const char *long_description )
-{
- if ( metadata )
+ else
 {
- hb_update_str( &metadata->long_description, long_description );
+ hb_dict_remove(dict, key);
 }
 }
 
@@ -5513,7 +5632,7 @@
 /**********************************************************************
 * hb_rgb2yuv
 **********************************************************************
- * Converts an RGB pixel to a YCrCb pixel.
+ * Converts an RGB pixel to a limited range Bt.601 YCrCb pixel.
 *
 * This conversion is lossy (due to rounding and clamping).
 *
@@ -5544,6 +5663,30 @@
 return (y << 16) | (Cr << 8) | Cb;
 }
 
+int hb_rgb2yuv_bt709(int rgb)
+{
+ double r, g, b;
+ int y, Cr, Cb;
+
+ r = (rgb >> 16) & 0xff;
+ g = (rgb >> 8) & 0xff;
+ b = (rgb ) & 0xff;
+
+ y = 16. + ( 0.1826 * r) + (0.6142 * g) + (0.0620 * b);
+ Cb = 128. + (-0.1006 * r) - (0.3386 * g) + (0.4392 * b);
+ Cr = 128. + ( 0.4392 * r) - (0.3986 * g) - (0.0403 * b);
+
+ y = (y < 0) ? 0 : y;
+ Cb = (Cb < 0) ? 0 : Cb;
+ Cr = (Cr < 0) ? 0 : Cr;
+
+ y = (y > 255) ? 255 : y;
+ Cb = (Cb > 255) ? 255 : Cb;
+ Cr = (Cr > 255) ? 255 : Cr;
+
+ return (y << 16) | (Cr << 8) | Cb;
+}
+
 const char * hb_subsource_name( int source )
 {
 switch (source)
@@ -5565,6 +5708,8 @@
 return "SSA";
 case PGSSUB:
 return "PGS";
+ case DVBSUB:
+ return "DVB";
 default:
 return "Unknown";
 }
@@ -5800,130 +5945,104 @@
 }
 }
 
-// Only return values supported by 'colorspace' avfilter:
-const char * hb_get_format_name(int format)
+int hb_get_bit_depth(int format)
 {
- switch (format)
- {
- case AV_PIX_FMT_YUV420P:
- return "yuv420p";
- case AV_PIX_FMT_YUV420P10:
- return "yuv420p10";
- case AV_PIX_FMT_YUV420P12:
- return "yuv420p12";
- case AV_PIX_FMT_YUV422P:
- return "yuv422p";
- case AV_PIX_FMT_YUV422P10:
- return "yuv422p10";
- case AV_PIX_FMT_YUV422P12:
- return "yuv422p12";
- case AV_PIX_FMT_YUV444P:
- return "yuv444p";
- case AV_PIX_FMT_YUV444P10:
- return "yuv444p10";
- case AV_PIX_FMT_YUV444P12:
- return "yuv444p12";
- default:
- return NULL;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format);
+ int i, min, max;
+
+ if (!desc || !desc->nb_components) {
+ return -1;
 }
+
+ min = INT_MAX, max = -INT_MAX;
+ for (i = 0; i < desc->nb_components; i++) {
+ min = FFMIN(desc->compi.depth, min);
+ max = FFMAX(desc->compi.depth, max);
+ }
+
+ return max;
 }
 
-// Only return values supported by 'colorspace' avfilter:
-const char * hb_get_primaries_name(int primaries)
+static int pix_fmt_is_supported(hb_job_t * job, int pix_fmt)
 {
- switch (primaries)
+ int title_bit_depth = hb_get_bit_depth(job->title->pix_fmt);
+ int pix_fmt_bit_depth = hb_get_bit_depth(pix_fmt);
+
+ if (pix_fmt_bit_depth > title_bit_depth)
 {
- case HB_COLR_PRI_BT709:
- return "bt709";
- case HB_COLR_PRI_BT470M:
- return "bt470m";
- case HB_COLR_PRI_EBUTECH:
- return "bt470bg";
- case HB_COLR_PRI_SMPTEC:
- return "smpte170m";
- case HB_COLR_PRI_SMPTE240M:
- return "smpte240m";
- case HB_COLR_PRI_SMPTE428:
- return "smpte428";
- case HB_COLR_PRI_FILM:
- return "film";
- case HB_COLR_PRI_SMPTE431:
- return "smpte431";
- case HB_COLR_PRI_SMPTE432:
- return "smpte432";
- case HB_COLR_PRI_BT2020:
- return "bt2020";
- case HB_COLR_PRI_JEDEC_P22:
- return "jedec-p22";
- default:
- return NULL;
+ return 0;
 }
-}
 
-// Only return values supported by 'colorspace' avfilter:
-const char * hb_get_transfer_name(int transfer)
-{
- switch (transfer)
+ if (job->title->video_decode_support & HB_DECODE_SUPPORT_QSV)
 {
- case HB_COLR_TRA_BT709:
- return "bt709";
- case HB_COLR_TRA_GAMMA22:
- return "gamma22";
- case HB_COLR_TRA_GAMMA28:
- return "gamma28";
- case HB_COLR_TRA_SMPTE170M:
- return "smpte170m";
- case HB_COLR_TRA_SMPTE240M:
- return "smpte240m";
- case HB_COLR_TRA_IEC61966_2_1:
- return "iec61966-2-1";
- case HB_COLR_TRA_IEC61966_2_4:
- return "iec61966-2-4";
- case HB_COLR_TRA_BT2020_10:
- return "bt2020-10";
- case HB_COLR_TRA_BT2020_12:
- return "bt2020-12";
- default:
- return NULL;
+ // Allow formats supported by QSV pipeline via system memory
+ // at that stage only, video memory formats will be reassigned later if allowed
+ if (pix_fmt != AV_PIX_FMT_YUV420P10 &&
+ pix_fmt != AV_PIX_FMT_YUV420P)
+ {
+ return 0;
+ }
+ }
+ else
+ {
+ // Allow biplanar formats only if
+ // hardware decoding is enabled.
+ if (pix_fmt == AV_PIX_FMT_P010LE ||
+ pix_fmt == AV_PIX_FMT_NV12)
+ {
+ return 0;
+ }
 }
-}
 
-// Only return values supported by 'colorspace' avfilter:
-const char * hb_get_matrix_name(int matrix)
-{
- switch (matrix)
+ for (int i = 0; i < hb_list_count(job->list_filter); i++)
 {
- case HB_COLR_MAT_BT709:
- return "bt709";
- case HB_COLR_MAT_FCC:
- return "fcc";
- case HB_COLR_MAT_BT470BG:
- return "bt470bg";
- case HB_COLR_MAT_SMPTE170M:
- return "smpte170m";
- case HB_COLR_MAT_SMPTE240M:
- return "smpte240m";
- case HB_COLR_MAT_YCGCO:
- return "ycgco";
- case HB_COLR_MAT_RGB:
- return "gbr";
- case HB_COLR_MAT_BT2020_NCL:
- return "bt2020ncl";
- default:
- return NULL;
+ hb_filter_object_t *filter = hb_list_item(job->list_filter, i);
+
+ switch (filter->id)
+ {
+ case HB_FILTER_DETELECINE:
+ case HB_FILTER_COMB_DETECT:
+ case HB_FILTER_DECOMB:
+ case HB_FILTER_DENOISE:
+ case HB_FILTER_NLMEANS:
+ case HB_FILTER_CHROMA_SMOOTH:
+ case HB_FILTER_LAPSHARP:
+ case HB_FILTER_UNSHARP:
+ case HB_FILTER_GRAYSCALE:
+ if (pix_fmt != AV_PIX_FMT_YUV420P)
+ {
+ return 0;
+ }
+ case HB_FILTER_RENDER_SUB:
+ if (pix_fmt != AV_PIX_FMT_YUV420P &&
+ pix_fmt != AV_PIX_FMT_YUV420P10 &&
+ pix_fmt != AV_PIX_FMT_YUV420P12)
+ {
+ return 0;
+ }
+ }
 }
+
+ return 1;
 }
 
-// Only return values supported by 'colorspace' avfilter:
-const char * hb_get_color_range_name(int range)
+static const enum AVPixelFormat pipeline_pix_fmts =
 {
- switch (range)
+ AV_PIX_FMT_YUV420P12, AV_PIX_FMT_P010LE, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+int hb_get_best_pix_fmt(hb_job_t * job)
+{
+ const int *pix_fmts = pipeline_pix_fmts;
+
+ while (*pix_fmts != AV_PIX_FMT_NONE)
 {
- case AVCOL_RANGE_MPEG:
- return "mpeg";
- case AVCOL_RANGE_JPEG:
- return "jpeg";
- default:
- return "mpeg";
+ if (pix_fmt_is_supported(job, *pix_fmts))
+ {
+ return *pix_fmts;
+ }
+ pix_fmts++;
 }
+
+ return AV_PIX_FMT_YUV420P;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/compat.c -> HandBrake-1.5.1.tar.xz/libhb/compat.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/cropscale.c -> HandBrake-1.5.1.tar.xz/libhb/cropscale.c Changed

@@ -9,6 +9,11 @@
 
 #include "handbrake/common.h"
 #include "handbrake/avfilter_priv.h"
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+#include "handbrake/qsv_common.h"
+#include "libavutil/hwcontext_qsv.h"
+#include "libavutil/hwcontext.h"
+#endif
 
 static int crop_scale_init(hb_filter_object_t * filter,
 hb_filter_init_t * init);
@@ -33,20 +38,6 @@
 .settings_template = crop_scale_template,
 };
 
-static const char * color_format_range(enum AVPixelFormat format, int range)
-{
- switch (format)
- {
- case AV_PIX_FMT_YUVJ420P:
- case AV_PIX_FMT_YUVJ422P:
- case AV_PIX_FMT_YUVJ444P:
- case AV_PIX_FMT_YUVJ440P:
- return "full";
- default:
- return range == AVCOL_RANGE_JPEG ? "full" : "limited";
- }
-}
-
 /* CropScale Settings
 * mode:parity
 *
@@ -72,14 +63,17 @@
 
 hb_dict_t * settings = filter->settings;
 hb_value_array_t * avfilters = hb_value_array_init();
- int width, height, top, bottom, left, right;
- const char * matrix;
+ int width, height;
+ int cropped_width, cropped_height;
+ int top = 0, bottom = 0, left = 0, right = 0;
 
 // Convert crop settings to 'crop' avfilter
 hb_dict_extract_int(&top, settings, "crop-top");
 hb_dict_extract_int(&bottom, settings, "crop-bottom");
 hb_dict_extract_int(&left, settings, "crop-left");
 hb_dict_extract_int(&right, settings, "crop-right");
+ cropped_width = init->geometry.width - left - right;
+ cropped_height = init->geometry.height - top - bottom;
 if (top > 0 || bottom > 0 || left > 0 || right > 0)
 {
 hb_dict_t * avfilter = hb_dict_init();
@@ -87,12 +81,15 @@
 
 hb_dict_set_int(avsettings, "x", left);
 hb_dict_set_int(avsettings, "y", top);
- hb_dict_set_int(avsettings, "w", init->geometry.width - left - right);
- hb_dict_set_int(avsettings, "h", init->geometry.height - top - bottom);
+ hb_dict_set_int(avsettings, "w", cropped_width);
+ hb_dict_set_int(avsettings, "h", cropped_height);
 hb_dict_set(avfilter, "crop", avsettings);
 hb_value_array_append(avfilters, avfilter);
 }
 
+ width = cropped_width;
+ height = cropped_height;
+
 // Convert scale settings to 'scale' avfilter
 hb_dict_extract_int(&width, settings, "width");
 hb_dict_extract_int(&height, settings, "height");
@@ -100,60 +97,104 @@
 hb_dict_t * avfilter = hb_dict_init();
 hb_dict_t * avsettings = hb_dict_init();
 
- hb_dict_set_int(avsettings, "width", width);
- hb_dict_set_int(avsettings, "height", height);
- hb_dict_set_string(avsettings, "flags", "lanczos+accurate_rnd");
- switch (init->color_matrix)
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+ if (hb_qsv_hw_filters_are_enabled(init->job))
 {
- case HB_COLR_MAT_BT709:
- matrix = "bt709";
- break;
- case HB_COLR_MAT_FCC:
- matrix = "fcc";
- break;
- case HB_COLR_MAT_SMPTE240M:
- matrix = "smpte240m";
- break;
- case HB_COLR_MAT_BT470BG:
- case HB_COLR_MAT_SMPTE170M:
- matrix = "smpte170m";
- break;
- case HB_COLR_MAT_BT2020_NCL:
- case HB_COLR_MAT_BT2020_CL:
- matrix = "bt2020";
- break;
- default:
- case HB_COLR_MAT_UNDEF:
- matrix = NULL;
- break;
-
+ int result = hb_create_ffmpeg_pool(init->job, width, height, init->pix_fmt, HB_QSV_POOL_SURFACE_SIZE, 0, &init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->hw_frames_ctx);
+ if (result < 0)
+ {
+ hb_error("hb_create_ffmpeg_pool vpp allocation failed");
+ return result;
+ }
+
+ if (top > 0 || bottom > 0 || left > 0 || right > 0)
+ {
+ hb_dict_set_int(avsettings, "cx", left);
+ hb_dict_set_int(avsettings, "cy", top);
+ hb_dict_set_int(avsettings, "cw", cropped_width);
+ hb_dict_set_int(avsettings, "ch", cropped_height);
+ }
+
+ hb_dict_set_int(avsettings, "w", width);
+ hb_dict_set_int(avsettings, "h", height);
+ if (init->job->qsv.ctx->vpp_scale_mode)
+ {
+ hb_dict_set_string(avsettings, "mode", init->job->qsv.ctx->vpp_scale_mode);
+ }
+ if (init->job->qsv.ctx->vpp_interpolation_method)
+ {
+ hb_dict_set_string(avsettings, "method", init->job->qsv.ctx->vpp_interpolation_method);
+ }
+ hb_log("qsv: scaling filter mode %s", init->job->qsv.ctx->vpp_scale_mode ? init->job->qsv.ctx->vpp_scale_mode : "default");
+ hb_log("qsv: scaling filter interpolation method %s", init->job->qsv.ctx->vpp_interpolation_method ? init->job->qsv.ctx->vpp_interpolation_method : "default");
+ hb_dict_set(avfilter, "vpp_qsv", avsettings);
+
+ AVHWFramesContext *frames_ctx;
+ AVQSVFramesContext *frames_hwctx;
+ AVBufferRef *hw_frames_ctx;
+
+ hw_frames_ctx = init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->hw_frames_ctx;
+ frames_ctx = (AVHWFramesContext*)hw_frames_ctx->data;
+ frames_hwctx = frames_ctx->hwctx;
+ mfxHDLPair* handle_pair = (mfxHDLPair*)frames_hwctx->surfaces0.Data.MemId;
+ init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->input_texture = ((size_t)handle_pair->second != MFX_INFINITE) ? handle_pair->first : NULL;
+
+ /* allocate the memory ids for the external frames */
+ av_buffer_unref(&init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->mids_buf);
+ init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->mids_buf = hb_qsv_create_mids(init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->hw_frames_ctx);
+ if (!init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->mids_buf)
+ return AVERROR(ENOMEM);
+ init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->mids = (QSVMid*)init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->mids_buf->data;
+ init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->nb_mids = frames_hwctx->nb_surfaces;
+ memset(init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->pool, 0, init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->nb_mids * sizeof(init->job->qsv.ctx->hb_vpp_qsv_frames_ctx->pool0));
 }
- if (matrix != NULL)
+ else
+#endif
 {
- hb_dict_set_string(avsettings, "in_color_matrix", matrix);
- hb_dict_set_string(avsettings, "out_color_matrix", matrix);
+ hb_dict_set_int(avsettings, "width", width);
+ hb_dict_set_int(avsettings, "height", height);
+ hb_dict_set_string(avsettings, "flags", "lanczos+accurate_rnd");
+ hb_dict_set(avfilter, "scale", avsettings);
 }
- hb_dict_set_string(avsettings, "in_range",
- color_format_range(init->pix_fmt, init->color_range));
- hb_dict_set_string(avsettings, "out_range", "limited");
- hb_dict_set(avfilter, "scale", avsettings);
+ 
 hb_value_array_append(avfilters, avfilter);
 
 avfilter = hb_dict_init();
 avsettings = hb_dict_init();
 
- // TODO: Support other pix formats
- // Force output to YUV420P for until other formats are supported
- hb_dict_set(avsettings, "pix_fmts", hb_value_string("yuv420p"));
- hb_dict_set(avfilter, "format", avsettings);
- hb_value_array_append(avfilters, avfilter);
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+ if (!hb_qsv_hw_filters_are_enabled(init->job))
+#endif
+ {
+ char * out_pix_fmt = NULL;
+
+ // "out_pix_fmt" is a private option used internally by
+ // handbrake for preview generation
+ hb_dict_extract_string(&out_pix_fmt, settings, "out_pix_fmt");
+ if (out_pix_fmt != NULL)
+ {
+ hb_dict_set_string(avsettings, "pix_fmts", out_pix_fmt);
+ free(out_pix_fmt);
+ }
+ else
+ {
+ hb_dict_set_string(avsettings, "pix_fmts",
+ av_get_pix_fmt_name(init->pix_fmt));
+ }
+ hb_dict_set(avfilter, "format", avsettings);
+ hb_value_array_append(avfilters, avfilter);
+ }
 
 init->crop0 = top;
 init->crop1 = bottom;
 init->crop2 = left;
 init->crop3 = right;
+ hb_limit_rational(&init->geometry.par.num, &init->geometry.par.den,
+ (int64_t)init->geometry.par.num * height * cropped_width,
+ (int64_t)init->geometry.par.den * width * cropped_height, 65535);
 init->geometry.width = width;
 init->geometry.height = height;
+
 pv->output = *init;
 
 pv->avfilters = avfilters;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decavcodec.c -> HandBrake-1.5.1.tar.xz/libhb/decavcodec.c Changed

@@ -107,6 +107,7 @@
 
 int width;
 int height;
+ int color_range;
 int pix_fmt;
 };
 
@@ -118,6 +119,7 @@
 AVCodecContext * context;
 AVCodecParserContext * parser;
 AVFrame * frame;
+ AVPacket * pkt;
 hb_buffer_t * palette;
 int threads;
 int video_codec_opened;
@@ -209,7 +211,7 @@
 // Currently, samplerate conversion is performed in sync.c
 // So set output samplerate to input samplerate
 // This should someday get reworked to be part of an audio
- // filter pipleine.
+ // filter pipeline.
 pv->resample =
 hb_audio_resample_init(AV_SAMPLE_FMT_FLT,
 w->audio->config.in.samplerate,
@@ -336,6 +338,13 @@
 return 1;
 }
 
+ pv->pkt = av_packet_alloc();
+ if (pv->pkt == NULL)
+ {
+ hb_log("decavcodecaInit: av_packet_alloc failed");
+ return 1;
+ }
+
 return 0;
 }
 
@@ -395,6 +404,7 @@
 {
 hb_avcodec_free_context(&pv->context);
 }
+ av_packet_free(&pv->pkt);
 hb_audio_resample_free(pv->resample);
 
 int ii;
@@ -735,16 +745,15 @@
 context->request_channel_layout = 0;
 }
 
- AVPacket avp;
- av_init_packet(&avp);
- avp.data = parse_buffer;
- avp.size = parse_buffer_size;
+ AVPacket *avp = av_packet_alloc();
+ avp->data = parse_buffer;
+ avp->size = parse_buffer_size;
 
- ret = avcodec_send_packet(context, &avp);
+ ret = avcodec_send_packet(context, avp);
 if (ret < 0 && ret != AVERROR_EOF)
 {
 parse_pos += parse_len;
- av_packet_unref(&avp);
+ av_packet_free(&avp);
 continue;
 }
 
@@ -850,7 +859,7 @@
 // Parse ADTS AAC streams for AudioSpecificConfig.
 // This data is required in order to write
 // proper headers in MP4, WebM, and MKV files.
- parse_adts_extradata(audio, context, &avp);
+ parse_adts_extradata(audio, context, avp);
 }
 
 result = 1;
@@ -859,7 +868,7 @@
 break;
 }
 } while (ret >= 0);
- av_packet_unref(&avp);
+ av_packet_free(&avp);
 av_frame_free(&frame);
 parse_pos += parse_len;
 }
@@ -935,39 +944,9 @@
 
 static hb_buffer_t * cc_fill_buffer(hb_work_private_t *pv, uint8_t *cc, int size)
 {
- int cc_count4 = {0,};
- int ii;
- hb_buffer_t *buf = NULL;
+ hb_buffer_t * buf = hb_buffer_init(size);
 
- for (ii = 0; ii < size; ii += 3)
- {
- if ((ccii & 0x04) == 0) // not valid
- continue;
- if ((ccii+1 & 0x7f) == 0 && (ccii+2 & 0x7f) == 0) // stuffing
- continue;
- int type = ccii & 0x03;
- cc_counttype++;
- }
-
- // Only handles CC1 for now.
- if (cc_count0 > 0)
- {
- buf = hb_buffer_init(cc_count0 * 2);
- int jj = 0;
- for (ii = 0; ii < size; ii += 3)
- {
- if ((ccii & 0x04) == 0) // not valid
- continue;
- if ((ccii+1 & 0x7f) == 0 && (ccii+2 & 0x7f) == 0) // stuffing
- continue;
- int type = ccii & 0x03;
- if (type == 0)
- {
- buf->datajj++ = ccii+1;
- buf->datajj++ = ccii+2;
- }
- }
- }
+ memcpy(buf->data, cc, size);
 return buf;
 }
 
@@ -984,7 +963,7 @@
 if (pv->qsv.decode &&
 pv->qsv.config.io_pattern == MFX_IOPATTERN_OUT_VIDEO_MEMORY)
 {
- out = hb_qsv_copy_frame(pv->frame, pv->job->qsv.ctx);
+ out = hb_qsv_copy_avframe_to_video_buffer(pv->job, pv->frame, 0);
 }
 else
 #endif
@@ -992,6 +971,14 @@
 out = hb_avframe_to_video_buffer(pv->frame, (AVRational){1,1});
 }
 
+ // Make sure every frame is tagged.
+ if (out->f.color_prim == HB_COLR_PRI_UNDEF || out->f.color_transfer == HB_COLR_TRA_UNDEF || out->f.color_matrix == HB_COLR_MAT_UNDEF)
+ {
+ out->f.color_prim = pv->title->color_prim;
+ out->f.color_transfer = pv->title->color_transfer;
+ out->f.color_matrix = pv->title->color_matrix;
+ }
+
 if (pv->frame->pts != AV_NOPTS_VALUE)
 {
 reordered = reordered_hash_rem(pv, pv->frame->pts);
@@ -1074,12 +1061,15 @@
 
 subtitle = calloc(sizeof( hb_subtitle_t ), 1);
 subtitle->track = hb_list_count(pv->title->list_subtitle);
- subtitle->id = HB_SUBTITLE_EMBEDDED_CC_TAG;
- subtitle->format = TEXTSUB;
- subtitle->source = CC608SUB;
- subtitle->config.dest = PASSTHRUSUB;
- subtitle->codec = WORK_DECCC608;
- subtitle->attributes = HB_SUBTITLE_ATTR_CC;
+ subtitle->id = HB_SUBTITLE_EMBEDDED_CC_TAG;
+ subtitle->format = TEXTSUB;
+ subtitle->source = CC608SUB;
+ subtitle->config.dest = PASSTHRUSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = AV_CODEC_ID_EIA_608;
+ subtitle->attributes = HB_SUBTITLE_ATTR_CC;
+ subtitle->timebase.num = 1;
+ subtitle->timebase.den = 90000;
 
 /*
 * The language of the subtitles will be the same as the
@@ -1110,12 +1100,36 @@
 if (cc_buf != NULL)
 {
 cc_buf->s.start = out->s.start;
+ cc_buf->s.duration = (int64_t)AV_NOPTS_VALUE;
 cc_buf->s.scr_sequence = out->s.scr_sequence;
 }
 cc_send_to_decoder(pv, cc_buf);
 }
 }
 
+ // Check for HDR mastering data
+ sd = av_frame_get_side_data(pv->frame, AV_FRAME_DATA_MASTERING_DISPLAY_METADATA);
+ if (sd != NULL)
+ {
+ if (!pv->job && pv->title && sd->size > 0)
+ {
+ AVMasteringDisplayMetadata *mastering = (AVMasteringDisplayMetadata *)sd->data;
+ pv->title->mastering = hb_mastering_ff_to_hb(*mastering);
+ }
+ }
+
+ // Check for HDR content light level data
+ sd = av_frame_get_side_data(pv->frame, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL);
+ if (sd != NULL)
+ {
+ if (!pv->job && pv->title && sd->size > 0)
+ {
+ AVContentLightMetadata *coll = (AVContentLightMetadata *)sd->data;
+ pv->title->coll.max_cll = coll->MaxCLL;
+ pv->title->coll.max_fall = coll->MaxFALL;
+ }
+ }
+
 return out;
 }
 
@@ -1127,6 +1141,7 @@
 hb_dict_t * settings;
 hb_filter_init_t filter_init;
 enum AVPixelFormat pix_fmt;
+ enum AVColorRange color_range;
 
 #if HB_PROJECT_FEATURE_QSV
 if (pv->qsv.decode &&
@@ -1144,6 +1159,7 @@
 orig_width = pv->context->width & ~1;
 orig_height = pv->context->height & ~1;
 pix_fmt = AV_PIX_FMT_YUV420P;
+ color_range = AVCOL_RANGE_MPEG;
 }
 else
 {
@@ -1158,12 +1174,14 @@
 orig_width = pv->job->title->geometry.width;
 orig_height = pv->job->title->geometry.height;
 }
- pix_fmt = pv->job->pix_fmt;
+ pix_fmt = pv->job->input_pix_fmt;
+ color_range = pv->job->color_range;
 }
 
 if (pix_fmt == pv->frame->format &&
 orig_width == pv->frame->width &&
 orig_height == pv->frame->height &&
+ color_range == pv->frame->color_range &&
 HB_ROTATION_0 == pv->title->rotation)
 {
 // No filtering required.
@@ -1171,18 +1189,20 @@
 return 0;
 }
 
- if (pv->video_filters.graph != NULL &&
- pv->video_filters.width == pv->frame->width &&
- pv->video_filters.height == pv->frame->height &&
- pv->video_filters.pix_fmt == pv->frame->format)
+ if (pv->video_filters.graph != NULL &&
+ pv->video_filters.width == pv->frame->width &&
+ pv->video_filters.height == pv->frame->height &&
+ pv->video_filters.color_range == pv->frame->color_range &&
+ pv->video_filters.pix_fmt == pv->frame->format)
 {
 // Current filter settings are good
 return 0;
 }
 
- pv->video_filters.width = pv->frame->width;
- pv->video_filters.height = pv->frame->height;
- pv->video_filters.pix_fmt = pv->frame->format;
+ pv->video_filters.width = pv->frame->width;
+ pv->video_filters.height = pv->frame->height;
+ pv->video_filters.color_range = pv->frame->color_range;
+ pv->video_filters.pix_fmt = pv->frame->format;
 
 // New filter required, create filter graph
 close_video_filters(pv);
@@ -1197,18 +1217,37 @@
 filters = hb_value_array_init();
 if (pix_fmt != pv->frame->format ||
 orig_width != pv->frame->width ||
- orig_height != pv->frame->height)
+ orig_height != pv->frame->height ||
+ color_range != pv->frame->color_range)
 {
-
 settings = hb_dict_init();
- hb_dict_set(settings, "w", hb_value_int(orig_width));
- hb_dict_set(settings, "h", hb_value_int(orig_height));
- hb_dict_set(settings, "flags", hb_value_string("lanczos+accurate_rnd"));
- hb_avfilter_append_dict(filters, "scale", settings);
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+ if (hb_qsv_hw_filters_are_enabled(pv->job))
+ {
+ hb_dict_set(settings, "w", hb_value_int(orig_width));
+ hb_dict_set(settings, "h", hb_value_int(orig_height));
+ hb_avfilter_append_dict(filters, "scale_qsv", settings);
+ }
+ else
+#endif
+ {
+ hb_dict_set(settings, "w", hb_value_int(orig_width));
+ hb_dict_set(settings, "h", hb_value_int(orig_height));
+ hb_dict_set(settings, "flags", hb_value_string("lanczos+accurate_rnd"));
+ if (color_range == AVCOL_RANGE_JPEG)
+ {
+ hb_dict_set_string(settings, "out_range", "full");
+ }
+ else
+ {
+ hb_dict_set_string(settings, "out_range", "limited");
+ }
+ hb_avfilter_append_dict(filters, "scale", settings);
 
- settings = hb_dict_init();
- hb_dict_set(settings, "pix_fmts", hb_value_string("yuv420p"));
- hb_avfilter_append_dict(filters, "format", settings);
+ settings = hb_dict_init();
+ hb_dict_set(settings, "pix_fmts", hb_value_string(av_get_pix_fmt_name(pix_fmt)));
+ hb_avfilter_append_dict(filters, "format", settings);
+ }
 }
 if (pv->title->rotation != HB_ROTATION_0)
 {
@@ -1218,21 +1257,25 @@
 settings = hb_dict_init();
 hb_dict_set(settings, "dir", hb_value_string("cclock"));
 hb_avfilter_append_dict(filters, "transpose", settings);
+ hb_log("Auto-Rotating video 90 degrees");
 break;
 case HB_ROTATION_180:
 hb_avfilter_append_dict(filters, "hflip", hb_value_null());
 hb_avfilter_append_dict(filters, "vflip", hb_value_null());
+ hb_log("Auto-Rotating video 180 degrees");
 break;
 case HB_ROTATION_270:
 settings = hb_dict_init();
 hb_dict_set(settings, "dir", hb_value_string("clock"));
 hb_avfilter_append_dict(filters, "transpose", settings);
+ hb_log("Auto-Rotating video 270 degrees");
 break;
 default:
 hb_log("reinit_video_filters: Unknown rotation, failed");
 }
 }
 
+ filter_init.job = pv->job;
 filter_init.pix_fmt = pv->frame->format;
 filter_init.geometry.width = pv->frame->width;
 filter_init.geometry.height = pv->frame->height;
@@ -1295,7 +1338,7 @@
 static int decodeFrame( hb_work_private_t * pv, packet_info_t * packet_info )
 {
 int got_picture = 0, oldlevel = 0, ret;
- AVPacket avp;
+ AVPacket *avp = pv->pkt;
 reordered_data_t * reordered;
 
 if ( global_verbosity_level <= 1 )
@@ -1304,13 +1347,12 @@
 av_log_set_level( AV_LOG_QUIET );
 }
 
- av_init_packet(&avp);
 if (packet_info != NULL)
 {
- avp.data = packet_info->data;
- avp.size = packet_info->size;
- avp.pts = pv->sequence;
- avp.dts = pv->sequence;
+ avp->data = packet_info->data;
+ avp->size = packet_info->size;
+ avp->pts = pv->sequence;
+ avp->dts = pv->sequence;
 reordered = malloc(sizeof(*reordered));
 if (reordered != NULL)
 {
@@ -1326,29 +1368,29 @@
 // PNG in a mov container.
 if (packet_info->frametype & HB_FRAME_MASK_KEY)
 {
- avp.flags |= AV_PKT_FLAG_KEY;
+ avp->flags |= AV_PKT_FLAG_KEY;
 }
- avp.flags |= packet_info->discard * AV_PKT_FLAG_DISCARD;
+ avp->flags |= packet_info->discard * AV_PKT_FLAG_DISCARD;
 }
 else
 {
- avp.data = NULL;
- avp.size = 0;
+ avp->data = NULL;
+ avp->size = 0;
 }
 
 if (pv->palette != NULL)
 {
 uint8_t * palette;
 int size;
- palette = av_packet_new_side_data(&avp, AV_PKT_DATA_PALETTE,
+ palette = av_packet_new_side_data(avp, AV_PKT_DATA_PALETTE,
 AVPALETTE_SIZE);
 size = MIN(pv->palette->size, AVPALETTE_SIZE);
 memcpy(palette, pv->palette->data, size);
 hb_buffer_close(&pv->palette);
 }
 
- ret = avcodec_send_packet(pv->context, &avp);
- av_packet_unref(&avp);
+ ret = avcodec_send_packet(pv->context, avp);
+ av_packet_unref(avp);
 if (ret < 0 && ret != AVERROR_EOF)
 {
 ++pv->decode_errors;
@@ -1404,7 +1446,7 @@
 pv->qsv.config.io_pattern = MFX_IOPATTERN_OUT_SYSTEM_MEMORY;
 if(hb_qsv_full_path_is_enabled(job))
 {
- hb_qsv_info_t *info = hb_qsv_info_get(job->vcodec);
+ hb_qsv_info_t *info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
 if (info != NULL)
 {
 // setup the QSV configuration
@@ -1419,15 +1461,23 @@
 // more surfaces may be needed for the lookahead
 pv->qsv.config.additional_buffers = 160;
 }
- if(!pv->job->qsv.ctx)
+ if (!pv->job->qsv.ctx)
 {
- pv->job->qsv.ctx = av_mallocz(sizeof(hb_qsv_context));
- if(!pv->job->qsv.ctx)
+ hb_error( "decavcodecvInit: no context" );
+ return 1;
+ }
+ pv->job->qsv.ctx->full_path_is_enabled = 1;
+ if (!pv->job->qsv.ctx->hb_dec_qsv_frames_ctx)
+ {
+ pv->job->qsv.ctx->hb_dec_qsv_frames_ctx = av_mallocz(sizeof(HBQSVFramesContext));
+ if(!pv->job->qsv.ctx->hb_dec_qsv_frames_ctx)
 {
- hb_error( "decavcodecvInit: qsv ctx alloc failed" );
+ hb_error( "decavcodecvInit: HBQSVFramesContext dec alloc failed" );
 return 1;
 }
- hb_qsv_add_context_usage(pv->job->qsv.ctx, 0);
+ }
+ if (!pv->job->qsv.ctx->dec_space)
+ {
 pv->job->qsv.ctx->dec_space = av_mallocz(sizeof(hb_qsv_space));
 if(!pv->job->qsv.ctx->dec_space)
 {
@@ -1478,14 +1528,15 @@
 if (pv->qsv.decode &&
 pv->qsv.config.io_pattern == MFX_IOPATTERN_OUT_VIDEO_MEMORY)
 {
- // assign callbacks
- pv->context->get_format = hb_qsv_get_format;
- pv->context->get_buffer2 = hb_qsv_get_buffer;
+ // assign callbacks and job to have access to qsv context from ffmpeg
+ pv->context->get_format = hb_qsv_get_format;
+ pv->context->get_buffer2 = hb_qsv_get_buffer;
+ pv->context->opaque = pv->job;
 pv->context->hwaccel_context = 0;
 }
 #endif
 
- // Set encoder opts
+ // Set decoder opts
 AVDictionary * av_opts = NULL;
 av_dict_set( &av_opts, "refcounted_frames", "1", 0 );
 if (pv->title->flags & HBTF_NO_IDR)
@@ -1524,6 +1575,13 @@
 return 1;
 }
 
+ pv->pkt = av_packet_alloc();
+ if (pv->pkt == NULL)
+ {
+ hb_log("decavcodecvInit: av_packet_alloc failed");
+ return 1;
+ }
+
 /*
 * If not scanning, then are we supposed to extract Closed Captions
 * and send them to the decoder?
@@ -2099,28 +2157,16 @@
 info->color_transfer = get_color_transfer(pv->context->color_trc);
 info->color_matrix = get_color_matrix(pv->context->colorspace,
 info->geometry);
- info->color_range = pv->context->color_range;
+ info->color_range = pv->context->color_range;
+ info->chroma_location = pv->context->chroma_sample_location;
 
 info->video_decode_support = HB_DECODE_SUPPORT_SW;
 
 #if HB_PROJECT_FEATURE_QSV
- if (avcodec_find_decoder_by_name(hb_qsv_decode_get_codec_name(pv->context->codec_id)))
+ if (hb_qsv_available())
 {
- switch (pv->context->codec_id)
- {
- case AV_CODEC_ID_HEVC:
- case AV_CODEC_ID_H264:
- if (pv->context->pix_fmt == AV_PIX_FMT_YUV420P ||
- pv->context->pix_fmt == AV_PIX_FMT_YUVJ420P ||
- pv->context->pix_fmt == AV_PIX_FMT_YUV420P10LE)
- {
- info->video_decode_support |= HB_DECODE_SUPPORT_QSV;
- }
- break;
-
- default:
- break;
- }
+ if (hb_qsv_decode_codec_supported_codec(hb_qsv_get_adapter_index(), pv->context->codec_id, pv->context->pix_fmt))
+ info->video_decode_support |= HB_DECODE_SUPPORT_QSV;
 }
 #endif
 
@@ -2173,7 +2219,7 @@
 static void decodeAudio(hb_work_private_t *pv, packet_info_t * packet_info)
 {
 AVCodecContext * context = pv->context;
- AVPacket avp;
+ AVPacket * avp = pv->pkt;
 int ret;
 
 // libav does not supply timestamps for wmapro audio (possibly others)
@@ -2184,25 +2230,24 @@
 {
 pv->next_pts = packet_info->pts;
 }
- av_init_packet(&avp);
 if (packet_info != NULL)
 {
- avp.data = packet_info->data;
- avp.size = packet_info->size;
- avp.pts = packet_info->pts;
- avp.dts = AV_NOPTS_VALUE;
- avp.flags |= packet_info->discard * AV_PKT_FLAG_DISCARD;
+ avp->data = packet_info->data;
+ avp->size = packet_info->size;
+ avp->pts = packet_info->pts;
+ avp->dts = AV_NOPTS_VALUE;
+ avp->flags |= packet_info->discard * AV_PKT_FLAG_DISCARD;
 }
 else
 {
- avp.data = NULL;
- avp.size = 0;
+ avp->data = NULL;
+ avp->size = 0;
 }
 
- ret = avcodec_send_packet(context, &avp);
+ ret = avcodec_send_packet(context, avp);
 if (ret < 0 && ret != AVERROR_EOF)
 {
- av_packet_unref(&avp);
+ av_packet_unref(avp);
 return;
 }
 
@@ -2240,8 +2285,8 @@
 // Note that even though we are doing passthru, we had to decode
 // so that we know the stop time and the pts of the next audio
 // packet.
- out = hb_buffer_init(avp.size);
- memcpy(out->data, avp.data, avp.size);
+ out = hb_buffer_init(avp->size);
+ memcpy(out->data, avp->data, avp->size);
 }
 else
 {
@@ -2286,7 +2331,7 @@
 {
 hb_log("decavcodec: hb_audio_resample_update() failed");
 av_frame_unref(pv->frame);
- av_packet_unref(&avp);
+ av_packet_unref(avp);
 return;
 }
 out = hb_audio_resample(pv->resample,
@@ -2341,5 +2386,5 @@
 av_frame_unref(pv->frame);
 ++pv->nframes;
 } while (ret >= 0);
- av_packet_unref(&avp);
+ av_packet_unref(avp);
 }

HandBrake-1.5.1.tar.xz/libhb/decavsub.c Added

@@ -0,0 +1,714 @@
+/* decavsub.c
+
+ Copyright (c) 2003-2022 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "handbrake/handbrake.h"
+#include "handbrake/hbffmpeg.h"
+#include "handbrake/decavsub.h"
+
+struct hb_avsub_context_s
+{
+ AVCodecContext * context;
+ AVPacket * pkt;
+ hb_job_t * job;
+ hb_subtitle_t * subtitle;
+ // For subs, when doing passthru, we don't know if we need a
+ // packet until we have processed several packets. So we cache
+ // all the packets we see until libav returns a subtitle with
+ // the information we need.
+ hb_buffer_list_t list_pass;
+ // List of subtitle packets to be output by this decoder.
+ hb_buffer_list_t list;
+ // XXX: we may occasionally see subtitles with broken timestamps
+ // while this should really get fixed elsewhere,
+ // dropping subtitles should be avoided as much as possible
+ int64_t last_pts;
+ // For PGS subs, we need to pass 'empty' subtitles through (they clear the
+ // display) - when doing forced-only extraction, only pass empty subtitles
+ // through if we've seen a forced sub since the last empty sub
+ uint8_t seen_forced_sub;
+};
+
+struct hb_work_private_s
+{
+ hb_avsub_context_t * ctx;
+};
+
+hb_avsub_context_t * decavsubInit( hb_work_object_t * w, hb_job_t * job )
+{
+ hb_avsub_context_t * ctx = calloc( 1, sizeof( hb_avsub_context_t ) );
+
+ if (ctx == NULL)
+ {
+ return NULL;
+ }
+ ctx->seen_forced_sub = 0;
+ ctx->last_pts = AV_NOPTS_VALUE;
+ ctx->job = job;
+ ctx->subtitle = w->subtitle;
+
+ AVCodec * codec = avcodec_find_decoder(ctx->subtitle->codec_param);
+ AVCodecContext * context = avcodec_alloc_context3(codec);
+ context->codec = codec;
+
+ hb_buffer_list_clear(&ctx->list);
+ hb_buffer_list_clear(&ctx->list_pass);
+ ctx->context = context;
+ context->pkt_timebase.num = ctx->subtitle->timebase.num;
+ context->pkt_timebase.den = ctx->subtitle->timebase.den;
+
+ // Set decoder opts...
+ AVDictionary * av_opts = NULL;
+ av_dict_set( &av_opts, "sub_text_format", "ass", 0 );
+ if (ctx->subtitle->source == CC608SUB)
+ {
+ av_dict_set( &av_opts, "data_field", "first", 0 );
+ av_dict_set( &av_opts, "real_time", "1", 0 );
+ }
+ if (ctx->subtitle->source == VOBSUB && ctx->subtitle->palette_set)
+ {
+ char * palette = hb_strdup_printf(
+ "%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x",
+ hb_yuv2rgb(ctx->subtitle->palette0),
+ hb_yuv2rgb(ctx->subtitle->palette1),
+ hb_yuv2rgb(ctx->subtitle->palette2),
+ hb_yuv2rgb(ctx->subtitle->palette3),
+ hb_yuv2rgb(ctx->subtitle->palette4),
+ hb_yuv2rgb(ctx->subtitle->palette5),
+ hb_yuv2rgb(ctx->subtitle->palette6),
+ hb_yuv2rgb(ctx->subtitle->palette7),
+ hb_yuv2rgb(ctx->subtitle->palette8),
+ hb_yuv2rgb(ctx->subtitle->palette9),
+ hb_yuv2rgb(ctx->subtitle->palette10),
+ hb_yuv2rgb(ctx->subtitle->palette11),
+ hb_yuv2rgb(ctx->subtitle->palette12),
+ hb_yuv2rgb(ctx->subtitle->palette13),
+ hb_yuv2rgb(ctx->subtitle->palette14),
+ hb_yuv2rgb(ctx->subtitle->palette15));
+ av_dict_set( &av_opts, "palette", palette, 0 );
+ free(palette);
+ }
+
+ if (hb_avcodec_open(ctx->context, codec, &av_opts, 0))
+ {
+ av_dict_free( &av_opts );
+ free(ctx);
+ hb_log("decsubInit: avcodec_open failed");
+ return NULL;
+ }
+ av_dict_free( &av_opts );
+
+ ctx->pkt = av_packet_alloc();
+ if (ctx->pkt == NULL)
+ {
+ hb_log("decsubInit: av_packet_alloc failed");
+ return NULL;
+ }
+
+ if (ctx->subtitle->format == TEXTSUB)
+ {
+ int height = job->title->geometry.height - job->crop0 - job->crop1;
+ int width = job->title->geometry.width - job->crop2 - job->crop3;
+ switch (ctx->subtitle->codec_param)
+ {
+ case AV_CODEC_ID_ASS:
+ {
+ // Extradata should already be filled in by demux
+ } break;
+
+ case AV_CODEC_ID_EIA_608:
+ {
+ // Mono font for CC
+ hb_subtitle_add_ssa_header(ctx->subtitle, HB_FONT_MONO,
+ 20, 384, 288);
+ } break;
+
+ default:
+ {
+ hb_subtitle_add_ssa_header(ctx->subtitle, HB_FONT_SANS,
+ .066 * job->title->geometry.height, width, height);
+ } break;
+ }
+ }
+ return ctx;
+}
+
+static int decsubInit( hb_work_object_t * w, hb_job_t * job )
+{
+ hb_work_private_t * pv;
+
+ pv = calloc( 1, sizeof( hb_work_private_t ) );
+ if (pv == NULL)
+ {
+ return 1;
+ }
+
+ pv->ctx = decavsubInit(w, job);
+ if (pv->ctx == NULL)
+ {
+ free(pv);
+ return 1;
+ }
+ w->private_data = pv;
+ return 0;
+}
+
+static void make_empty_pgs( hb_buffer_t * buf )
+{
+ hb_buffer_t * b = buf;
+ uint8_t done = 0;
+
+ // Each buffer is composed of 1 or more segments.
+ // Segment header is:
+ // type - 1 byte
+ // length - 2 bytes
+ // We want to modify the presentation segment which is type 0x16
+ //
+ // Note that every pgs display set is required to have a presentation
+ // segment, so we will only have to look at one display set.
+ while ( b && !done )
+ {
+ int ii = 0;
+
+ while (ii + 3 <= b->size)
+ {
+ uint8_t type;
+ int len;
+ int segment_len_pos;
+
+ type = b->dataii++;
+ segment_len_pos = ii;
+ len = ((int)b->dataii << 8) + b->dataii+1;
+ ii += 2;
+
+ if (type == 0x16 && ii + len <= b->size)
+ {
+ int obj_count;
+ int kk, jj = ii;
+ int obj_start;
+
+ // Skip
+ // video descriptor 5 bytes
+ // composition descriptor 3 bytes
+ // palette update flg 1 byte
+ // palette id ref 1 byte
+ jj += 10;
+
+ // Set number of composition objects to 0
+ obj_count = b->datajj;
+ b->datajj = 0;
+ jj++;
+ obj_start = jj;
+
+ // And remove all the composition objects
+ for (kk = 0; kk < obj_count; kk++)
+ {
+ uint8_t crop;
+
+ crop = b->datajj + 3;
+ // skip
+ // object id - 2 bytes
+ // window id - 1 byte
+ // object/forced flag - 1 byte
+ // x pos - 2 bytes
+ // y pos - 2 bytes
+ jj += 8;
+ if (crop & 0x80)
+ {
+ // skip
+ // crop x - 2 bytes
+ // crop y - 2 bytes
+ // crop w - 2 bytes
+ // crop h - 2 bytes
+ jj += 8;
+ }
+ }
+ if (jj < b->size)
+ {
+ memmove(b->data + obj_start, b->data + jj, b->size - jj);
+ }
+ b->size = obj_start + ( b->size - jj );
+ done = 1;
+ len = obj_start - (segment_len_pos + 2);
+ b->datasegment_len_pos = len >> 8;
+ b->datasegment_len_pos+1 = len & 0xff;
+ break;
+ }
+ ii += len;
+ }
+ b = b->next;
+ }
+}
+
+static void make_empty_sub( int source, hb_buffer_list_t * list_pass )
+{
+ switch (source)
+ {
+ case PGSSUB:
+ make_empty_pgs(hb_buffer_list_head(list_pass));
+ break;
+ case DVBSUB:
+ break;
+ default:
+ hb_buffer_list_close(list_pass);
+ break;
+ }
+}
+
+// Returns a pointer to the first character after the ASS preamble
+static const char * ssa_text(const char * ssa)
+{
+ int ii;
+ const char * text = ssa;
+
+ if (ssa == NULL)
+ return NULL;
+ for (ii = 0; ii < 8; ii++)
+ {
+ text = strchr(text, ',');
+ if (text == NULL)
+ break;
+ text++;
+ }
+ return text;
+}
+
+int decavsubWork( hb_avsub_context_t * ctx,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out )
+{
+ hb_buffer_t * in = *buf_in;
+ hb_buffer_settings_t in_s = in->s;
+
+ if (in_s.flags & HB_BUF_FLAG_EOF)
+ {
+ /* EOF on input stream - send it downstream & say that we're done */
+ *buf_in = NULL;
+ hb_buffer_list_append(&ctx->list, in);
+
+ *buf_out = hb_buffer_list_clear(&ctx->list);
+ return HB_WORK_DONE;
+ }
+
+ if (!ctx->job->indepth_scan &&
+ ctx->subtitle->config.dest == PASSTHRUSUB &&
+ hb_subtitle_can_pass(ctx->subtitle->source, ctx->job->mux))
+ {
+ // Append to buffer list. It will be sent to fifo after we determine
+ // if this is a packet we need.
+ hb_buffer_list_append(&ctx->list_pass, in);
+
+ // We are keeping the buffer, so prevent the filter loop from
+ // deleting it.
+ *buf_in = NULL;
+ }
+
+ AVSubtitle subtitle;
+ memset( &subtitle, 0, sizeof(subtitle) );
+
+ int64_t duration = AV_NOPTS_VALUE;
+
+ ctx->pkt->data = in->data;
+ ctx->pkt->size = in->size;
+ ctx->pkt->pts = in_s.start;
+ if (in_s.duration > 0 || ctx->subtitle->source != PGSSUB)
+ {
+ duration = in_s.duration;
+ }
+
+ if (duration <= 0 &&
+ in_s.start != AV_NOPTS_VALUE &&
+ in_s.stop != AV_NOPTS_VALUE &&
+ in_s.stop > in_s.start)
+ {
+ duration = in_s.stop - in_s.start;
+ }
+
+ int has_subtitle = 0;
+
+ while (ctx->pkt->size > 0)
+ {
+ int usedBytes = avcodec_decode_subtitle2(ctx->context, &subtitle,
+ &has_subtitle, ctx->pkt );
+ if (usedBytes < 0)
+ {
+ hb_error("unable to decode subtitle with %d bytes.", ctx->pkt->size);
+ return HB_WORK_OK;
+ }
+
+ if (usedBytes == 0)
+ {
+ // We expect avcodec_decode_subtitle2 to return the number
+ // of bytes consumed, or an error. If for some unforeseen reason
+ // it returns 0, lets not get stuck in an infinite loop!
+ usedBytes = ctx->pkt->size;
+ }
+
+ if (usedBytes <= ctx->pkt->size)
+ {
+ ctx->pkt->data += usedBytes;
+ ctx->pkt->size -= usedBytes;
+ }
+ else
+ {
+ ctx->pkt->size = 0;
+ }
+
+ if (!has_subtitle)
+ {
+ continue;
+ }
+
+ uint8_t forced_sub = 0;
+ uint8_t usable_sub = 0;
+ uint8_t clear_sub = 0;
+
+ // collect subtitle statistics for foreign audio search
+ if (subtitle.num_rects)
+ {
+ ctx->subtitle->hits++;
+ if (subtitle.rects0->flags & AV_SUBTITLE_FLAG_FORCED)
+ {
+ forced_sub = 1;
+ ctx->subtitle->forced_hits++;
+ }
+ }
+ else
+ {
+ clear_sub = 1;
+ }
+
+ // do we need this subtitle?
+ usable_sub =
+ // Need all subs
+ !ctx->subtitle->config.force ||
+ // Need only forced subs
+ forced_sub ||
+ // Need to terminate last forced sub
+ (ctx->seen_forced_sub && clear_sub);
+
+ // do we need to create an empty subtitle?
+ if (ctx->subtitle->config.force && ctx->seen_forced_sub && !usable_sub)
+ {
+ // We are forced-only and need to output this subtitle, but
+ // it's neither forced nor empty.
+ //
+ // If passthru, create an empty subtitle.
+ // Also, flag an empty subtitle for subtitle RENDER.
+ make_empty_sub(ctx->subtitle->source, &ctx->list_pass);
+ usable_sub = clear_sub = 1;
+ }
+
+ if (!usable_sub)
+ {
+ // Discard accumulated passthrough subtitle data
+ hb_buffer_list_close(&ctx->list_pass);
+ avsubtitle_free(&subtitle);
+ continue;
+ }
+
+ // Keep track of forced subs that we may need to manually
+ // terminate with an empty subtitle packet.
+ ctx->seen_forced_sub = forced_sub && !clear_sub;
+
+ int64_t pts = AV_NOPTS_VALUE;
+ hb_buffer_t * out = NULL;
+
+ if (clear_sub)
+ {
+ duration = 0;
+ }
+ else if (ctx->subtitle->source != DVBSUB &&
+ ctx->subtitle->source != PGSSUB &&
+ subtitle.end_display_time > 0 &&
+ subtitle.end_display_time < UINT32_MAX)
+ {
+ duration = av_rescale(subtitle.end_display_time, 90000, 1000);
+ }
+ if (subtitle.pts != AV_NOPTS_VALUE)
+ {
+ pts = av_rescale(subtitle.pts, 90000, AV_TIME_BASE) +
+ av_rescale(subtitle.start_display_time, 90000, 1000);
+ }
+ else
+ {
+ if (in_s.start >= 0)
+ {
+ pts = in_s.start;
+ }
+ else
+ {
+ // XXX: a broken pts will cause us to drop this subtitle,
+ // which is bad; use a default duration of 3 seconds
+ //
+ // A broken pts is only generated when a subtitle packet
+ // occurs after a discontinuity and before the
+ // next audio or video packet which re-establishes
+ // timing (afaik).
+ if (ctx->last_pts == AV_NOPTS_VALUE)
+ {
+ pts = 0LL;
+ }
+ else
+ {
+ pts = ctx->last_pts + 3 * 90000LL;
+ }
+ hb_log("warning decavsub: track %d, invalid PTS",
+ ctx->subtitle->out_track);
+ }
+ }
+ // work around broken timestamps
+ if (pts < ctx->last_pts)
+ {
+ // XXX: this should only happen if the previous pts
+ // was unknown and our 3 second default duration
+ // overshot the next subtitle pts.
+ //
+ // assign a 1 second duration
+ hb_log("decavsub: track %d, non-monotonically increasing PTS, last %"PRId64" current %"PRId64"",
+ ctx->subtitle->out_track,
+ ctx->last_pts, pts);
+ pts = ctx->last_pts + 1 * 90000LL;
+ }
+ ctx->last_pts = pts;
+
+ if (ctx->subtitle->format == TEXTSUB)
+ {
+ // TEXTSUB && (PASSTHROUGHSUB || RENDERSUB)
+
+ // Text subtitles are treated the same regardless of
+ // whether we are burning or passing through. They
+ // get translated to SSA
+ //
+ // When using the "real_time" option with CC608 subtitles,
+ // ffmpeg prepends an ASS rect that has only the preamble
+ // to every list of returned rects. libass doesn't like this
+ // and logs a warning for every one of these. So strip these
+ // out by using only the last rect in the list.
+ //
+ // Also, when a CC needs to be removed from the screen, ffmpeg
+ // emits a single rect with only the preamble. Detect this
+ // and flag an "End Of Subtitle" EOS.
+ int ii = subtitle.num_rects - 1;
+ const char * text = ssa_text(subtitle.rectsii->ass);
+ if (!clear_sub && text != NULL && *text != 0)
+ {
+ int size = strlen(subtitle.rectsii->ass) + 1;
+ out = hb_buffer_init(size);
+ strcpy((char*)out->data, subtitle.rectsii->ass);
+ }
+ else
+ {
+ out = hb_buffer_init(0);
+ out->s.flags = HB_BUF_FLAG_EOS;
+ }
+ hb_buffer_list_close(&ctx->list_pass);
+ }
+ else if (ctx->subtitle->config.dest == PASSTHRUSUB &&
+ hb_subtitle_can_pass(ctx->subtitle->source, ctx->job->mux))
+ {
+ // PICTURESUB && PASSTHROUGHSUB
+
+ // subtitles may be spread across multiple packets
+ //
+ // In the MKV container, all segments are found in the same
+ // packet (this is expected by some devices, such as the
+ // WD TV Live). So if there are multiple packets,
+ // merge them.
+ if (hb_buffer_list_count(&ctx->list_pass) == 1)
+ {
+ // packets already merged (e.g. MKV sources)
+ out = hb_buffer_list_clear(&ctx->list_pass);
+ out->s.start = AV_NOPTS_VALUE;
+ out->s.stop = AV_NOPTS_VALUE;
+ out->s.duration = (int64_t)AV_NOPTS_VALUE;
+ }
+ else
+ {
+ int size = 0;
+ uint8_t * data;
+ hb_buffer_t * b;
+
+ b = hb_buffer_list_head(&ctx->list_pass);
+ while (b != NULL)
+ {
+ size += b->size;
+ b = b->next;
+ }
+
+ out = hb_buffer_init( size );
+ out->s.duration = (int64_t)AV_NOPTS_VALUE;
+ data = out->data;
+ b = hb_buffer_list_head(&ctx->list_pass);
+ while (b != NULL)
+ {
+ memcpy(data, b->data, b->size);
+ data += b->size;
+ b = b->next;
+ }
+ hb_buffer_list_close(&ctx->list_pass);
+ }
+ if (clear_sub)
+ {
+ out->s.flags = HB_BUF_FLAG_EOS;
+ }
+ }
+ else
+ {
+ // PICTURESUB && RENDERSUB
+ if (!clear_sub)
+ {
+ unsigned ii, x0, y0, x1, y1, w, h;
+
+ x0 = subtitle.rects0->x;
+ y0 = subtitle.rects0->y;
+ x1 = subtitle.rects0->x + subtitle.rects0->w;
+ y1 = subtitle.rects0->y + subtitle.rects0->h;
+
+ // First, find total bounding rectangle
+ for (ii = 1; ii < subtitle.num_rects; ii++)
+ {
+ if (subtitle.rectsii->x < x0)
+ x0 = subtitle.rectsii->x;
+ if (subtitle.rectsii->y < y0)
+ y0 = subtitle.rectsii->y;
+ if (subtitle.rectsii->x + subtitle.rectsii->w > x1)
+ x1 = subtitle.rectsii->x + subtitle.rectsii->w;
+ if (subtitle.rectsii->y + subtitle.rectsii->h > y1)
+ y1 = subtitle.rectsii->y + subtitle.rectsii->h;
+ }
+ w = x1 - x0;
+ h = y1 - y0;
+
+ out = hb_frame_buffer_init(AV_PIX_FMT_YUVA420P, w, h);
+ memset(out->data, 0, out->size);
+
+ out->f.x = x0;
+ out->f.y = y0;
+ out->f.window_width = ctx->context->width;
+ out->f.window_height = ctx->context->height;
+ for (ii = 0; ii < subtitle.num_rects; ii++)
+ {
+ AVSubtitleRect *rect = subtitle.rectsii;
+
+ int off_x = rect->x - x0;
+ int off_y = rect->y - y0;
+ uint8_t *lum = out->plane0.data;
+ uint8_t *chromaU = out->plane1.data;
+ uint8_t *chromaV = out->plane2.data;
+ uint8_t *alpha = out->plane3.data;
+
+ lum += off_y * out->plane0.stride + off_x;
+ alpha += off_y * out->plane3.stride + off_x;
+ chromaU += (off_y >> 1) * out->plane1.stride + (off_x >> 1);
+ chromaV += (off_y >> 1) * out->plane2.stride + (off_x >> 1);
+
+ int xx, yy;
+ for (yy = 0; yy < rect->h; yy++)
+ {
+ for (xx = 0; xx < rect->w; xx++)
+ {
+ uint32_t argb, yuv;
+ int pixel;
+ uint8_t color;
+
+ pixel = yy * rect->w + xx;
+ color = rect->data0pixel;
+ argb = ((uint32_t*)rect->data1)color;
+ yuv = hb_rgb2yuv(argb);
+
+ lumxx = (yuv >> 16) & 0xff;
+ alphaxx = (argb >> 24) & 0xff;
+ if ((xx & 1) == 0 && (yy & 1) == 0)
+ {
+ chromaVxx>>1 = (yuv >> 8) & 0xff;
+ chromaUxx>>1 = yuv & 0xff;
+ }
+ }
+ lum += out->plane0.stride;
+ if ((yy & 1) == 0)
+ {
+ chromaU += out->plane1.stride;
+ chromaV += out->plane2.stride;
+ }
+ alpha += out->plane3.stride;
+ }
+ }
+ }
+ else
+ {
+ out = hb_buffer_init( 0 );
+
+ out->s.flags = HB_BUF_FLAG_EOS;
+ out->f.x = 0;
+ out->f.y = 0;
+ out->f.width = 0;
+ out->f.height = 0;
+ duration = 0;
+ }
+ }
+ out->s.id = in_s.id;
+ out->s.scr_sequence = in_s.scr_sequence;
+ out->s.frametype = HB_FRAME_SUBTITLE;
+ out->s.start = pts;
+ if (duration != AV_NOPTS_VALUE)
+ {
+ out->s.stop = pts + duration;
+ out->s.duration = duration;
+ }
+
+ hb_buffer_list_append(&ctx->list, out);
+ avsubtitle_free(&subtitle);
+ }
+
+ *buf_out = hb_buffer_list_clear(&ctx->list);
+ return HB_WORK_OK;
+}
+
+static int decsubWork( hb_work_object_t * w,
+ hb_buffer_t ** buf_in,
+ hb_buffer_t ** buf_out )
+{
+ hb_work_private_t * pv = w->private_data;
+
+ return decavsubWork(pv->ctx, buf_in, buf_out );
+}
+
+void decavsubClose( hb_avsub_context_t * ctx )
+{
+ if (ctx == NULL)
+ {
+ return;
+ }
+ av_packet_free(&ctx->pkt);
+ hb_buffer_list_close(&ctx->list_pass);
+ avcodec_flush_buffers(ctx->context);
+ avcodec_free_context(&ctx->context);
+ free(ctx);
+}
+
+static void decsubClose( hb_work_object_t * w )
+{
+ hb_work_private_t * pv = w->private_data;
+ if (pv == NULL)
+ {
+ return;
+ }
+ decavsubClose(pv->ctx);
+ free(pv);
+ w->private_data = NULL;
+}
+
+hb_work_object_t hb_decavsub =
+{
+ .id = WORK_DECAVSUB,
+ .name = "Subtitle decoder (libavcodec)",
+ .init = decsubInit,
+ .work = decsubWork,
+ .close = decsubClose,
+};

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/declpcm.c -> HandBrake-1.5.1.tar.xz/libhb/declpcm.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decomb.c -> HandBrake-1.5.1.tar.xz/libhb/decomb.c Changed

@@ -1,6 +1,6 @@
 /* decomb.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -1254,10 +1254,11 @@
 buf = hb_frame_buffer_init(pv->ref1->f.fmt,
 pv->ref1->f.width,
 pv->ref1->f.height);
- buf->f.color_prim = pv->output.color_prim;
- buf->f.color_transfer = pv->output.color_transfer;
- buf->f.color_matrix = pv->output.color_matrix;
- buf->f.color_range = pv->output.color_range ;
+ buf->f.color_prim = pv->output.color_prim;
+ buf->f.color_transfer = pv->output.color_transfer;
+ buf->f.color_matrix = pv->output.color_matrix;
+ buf->f.color_range = pv->output.color_range;
+ buf->f.chroma_location = pv->output.chroma_location;
 yadif_filter(pv, buf, parity, tff);
 
 /* Copy buffered settings to output buffer settings */

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decsrtsub.c -> HandBrake-1.5.1.tar.xz/libhb/decsrtsub.c Changed

@@ -1,6 +1,6 @@
 /* decsrtsub.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -14,7 +14,7 @@
 #include <errno.h>
 #include "handbrake/handbrake.h"
 #include "handbrake/colormap.h"
-#include "handbrake/decsrtsub.h"
+#include "handbrake/decavsub.h"
 
 struct start_and_end {
 unsigned long start, end;
@@ -40,6 +40,7 @@
 */
 struct hb_work_private_s
 {
+ hb_avsub_context_t * ctx;
 hb_job_t * job;
 FILE * file;
 char buf1024;
@@ -62,181 +63,32 @@
 int line; // SSA line number
 };
 
-static char* srt_markup_to_ssa(char *srt, int *len)
-{
- char terminator;
- char color40;
- uint32_t rgb;
-
- *len = 0;
- if (srt0 != '<' && srt0 != '{')
- return NULL;
-
- if (srt0 == '<')
- terminator = '>';
- else
- terminator = '}';
-
- if (srt1 == 'i' && srt2 == terminator)
- {
- *len = 3;
- return hb_strdup_printf("{\\i1}");
- }
- else if (srt1 == 'b' && srt2 == terminator)
- {
- *len = 3;
- return hb_strdup_printf("{\\b1}");
- }
- else if (srt1 == 'u' && srt2 == terminator)
- {
- *len = 3;
- return hb_strdup_printf("{\\u1}");
- }
- else if (srt1 == '/' && srt2 == 'i' && srt3 == terminator)
- {
- *len = 4;
- return hb_strdup_printf("{\\i0}");
- }
- else if (srt1 == '/' && srt2 == 'b' && srt3 == terminator)
- {
- *len = 4;
- return hb_strdup_printf("{\\b0}");
- }
- else if (srt1 == '/' && srt2 == 'u' && srt3 == terminator)
- {
- *len = 4;
- return hb_strdup_printf("{\\u0}");
- }
- else if (srt0 == '<' && !strncmp(srt + 1, "font", 4))
- {
- int match;
- match = sscanf(srt + 1, "font color=\"%39^\"\">", color);
- if (match != 1)
- {
- return NULL;
- }
- while (srt*len != '>') (*len)++;
- (*len)++;
- if (color0 == '#')
- rgb = strtol(color + 1, NULL, 16);
- else
- rgb = hb_rgb_lookup_by_name(color);
- return hb_strdup_printf("{\\1c&H%X&}", HB_RGB_TO_BGR(rgb));
- }
- else if (srt0 == '<' && srt1 == '/' && !strncmp(srt + 2, "font", 4) &&
- srt6 == '>')
- {
- *len = 7;
- return hb_strdup_printf("{\\1c&HFFFFFF&}");
- }
-
- return NULL;
-}
-
-void hb_srt_to_ssa(hb_buffer_t *sub_in, int line)
-{
- if (sub_in->size == 0)
- return;
-
- // null terminate input if not already terminated
- if (sub_in->datasub_in->size-1 != 0)
- {
- hb_buffer_realloc(sub_in, ++sub_in->size);
- sub_in->datasub_in->size - 1 = 0;
- }
- char * srt = (char*)sub_in->data;
- // SSA markup expands a little over SRT, so allocate a bit of extra
- // space. More will be realloc'd if needed.
- hb_buffer_t * sub = hb_buffer_init(sub_in->size + 80);
- char * ssa, *ssa_markup;
- int skip, len, pos, ii;
-
- // Exchange data between input sub and new ssa_sub
- // After this, sub_in contains ssa data
- hb_buffer_swap_copy(sub_in, sub);
- ssa = (char*)sub_in->data;
-
- sprintf((char*)sub_in->data, "%d,,Default,,0,0,0,,", line);
- pos = strlen((char*)sub_in->data);
-
- ii = 0;
- while (srtii != '\0')
- {
- if ((ssa_markup = srt_markup_to_ssa(srt + ii, &skip)) != NULL)
- {
- len = strlen(ssa_markup);
- hb_buffer_realloc(sub_in, pos + len + 1);
- // After realloc, sub_in->data may change
- ssa = (char*)sub_in->data;
- sprintf(ssa + pos, "%s", ssa_markup);
- free(ssa_markup);
- pos += len;
- ii += skip;
- }
- else
- {
- hb_buffer_realloc(sub_in, pos + 4);
- // After realloc, sub_in->data may change
- ssa = (char*)sub_in->data;
- if (srtii == '\r')
- {
- if (srtii + 1 == '\n')
- {
- ii++;
- }
- if (srtii + 1 != 0)
- {
- ssapos++ = '\\';
- ssapos++ = 'N';
- }
- ii++;
- }
- else if (srtii == '\n')
- {
- if (srtii + 1 != 0)
- {
- ssapos++ = '\\';
- ssapos++ = 'N';
- }
- ii++;
- }
- else
- {
- ssapos++ = srtii++;
- }
- }
- }
- ssapos = '\0';
- sub_in->size = pos + 1;
- hb_buffer_close(&sub);
-}
-
 static int
 read_time_from_string( const char* timeString, struct start_and_end *result )
 {
 // for ex. 00:00:15,248 --> 00:00:16,545
 
- long houres1, minutes1, seconds1, milliseconds1,
- houres2, minutes2, seconds2, milliseconds2;
+ long hours1, minutes1, seconds1, milliseconds1,
+ hours2, minutes2, seconds2, milliseconds2;
 int scanned;
 
 scanned = sscanf(timeString, "%ld:%ld:%ld,%ld --> %ld:%ld:%ld,%ld\n",
- &houres1, &minutes1, &seconds1, &milliseconds1,
- &houres2, &minutes2, &seconds2, &milliseconds2);
+ &hours1, &minutes1, &seconds1, &milliseconds1,
+ &hours2, &minutes2, &seconds2, &milliseconds2);
 if (scanned != 8)
 {
 scanned = sscanf(timeString, "%ld:%ld:%ld.%ld --> %ld:%ld:%ld.%ld\n",
- &houres1, &minutes1, &seconds1, &milliseconds1,
- &houres2, &minutes2, &seconds2, &milliseconds2);
+ &hours1, &minutes1, &seconds1, &milliseconds1,
+ &hours2, &minutes2, &seconds2, &milliseconds2);
 if (scanned != 8)
 {
 return 0;
 }
 }
 result->start =
- milliseconds1 + seconds1*1000 + minutes1*60*1000 + houres1*60*60*1000;
+ milliseconds1 + seconds1*1000 + minutes1*60*1000 + hours1*60*60*1000;
 result->end =
- milliseconds2 + seconds2*1000 + minutes2*60*1000 + houres2*60*60*1000;
+ milliseconds2 + seconds2*1000 + minutes2*60*1000 + hours2*60*60*1000;
 return 1;
 }
 
@@ -363,10 +215,25 @@
 char line_buffer1024;
 int reprocess = 0, resync = 0;
 
- if( !pv->file )
+ if (!pv->file)
 {
+ return hb_buffer_eof_init();
+ }
+
+ if (pv->job->reader_pts_offset == AV_NOPTS_VALUE)
+ {
+ // We need to wait for reader to initialize it's pts offset so that
+ // we know where to start reading SRTs.
 return NULL;
 }
+ if (pv->start_time == AV_NOPTS_VALUE)
+ {
+ pv->start_time = pv->job->reader_pts_offset;
+ if (pv->job->pts_to_stop > 0)
+ {
+ pv->stop_time = pv->job->pts_to_start + pv->job->pts_to_stop;
+ }
+ }
 
 while( reprocess || get_line( pv, line_buffer, sizeof( line_buffer ) ) )
 {
@@ -572,7 +439,7 @@
 {
 hb_deep_log( 3, "Discarding SRT at time start %"PRId64", stop %"PRId64, start_time, stop_time);
 memset( &pv->current_entry, 0, sizeof( srt_entry_t ) );
- return NULL;
+ return hb_buffer_eof_init();
 }
 
 for (q = p = pv->current_entry.text; *p != '\0'; p++)
@@ -613,7 +480,7 @@
 return buffer;
 }
 
- return NULL;
+ return hb_buffer_eof_init();
 }
 
 static int decsrtInit( hb_work_object_t * w, hb_job_t * job )
@@ -627,6 +494,11 @@
 {
 goto fail;
 }
+ pv->ctx = decavsubInit(w, job);
+ if (pv->ctx == NULL)
+ {
+ goto fail;
+ }
 
 w->private_data = pv;
 
@@ -701,6 +573,7 @@
 fail:
 if (pv != NULL)
 {
+ decavsubClose(pv->ctx);
 if (pv->iconv_context != (iconv_t) -1)
 {
 iconv_close(pv->iconv_context);
@@ -719,33 +592,21 @@
 hb_buffer_t ** buf_out )
 {
 hb_work_private_t * pv = w->private_data;
- hb_buffer_t * out = NULL;
+ hb_buffer_t * in;
+ int result;
 
- if (pv->job->reader_pts_offset == AV_NOPTS_VALUE)
+ in = srt_read( pv );
+ if (in == NULL)
 {
- // We need to wait for reader to initialize it's pts offset so that
- // we know where to start reading SRTs.
- *buf_out = NULL;
 return HB_WORK_OK;
 }
- if (pv->start_time == AV_NOPTS_VALUE)
- {
- pv->start_time = pv->job->reader_pts_offset;
- if (pv->job->pts_to_stop > 0)
- {
- pv->stop_time = pv->job->pts_to_start + pv->job->pts_to_stop;
- }
- }
- out = srt_read( pv );
- if (out != NULL)
+
+ result = decavsubWork(pv->ctx, &in, buf_out);
+ if (in != NULL)
 {
- hb_srt_to_ssa(out, ++pv->line);
- *buf_out = out;
- return HB_WORK_OK;
- } else {
- *buf_out = hb_buffer_eof_init();
- return HB_WORK_DONE;
+ hb_buffer_close(&in);
 }
+ return result;
 }
 
 static void decsrtClose( hb_work_object_t * w )
@@ -753,10 +614,12 @@
 hb_work_private_t * pv = w->private_data;
 if (pv != NULL)
 {
+ decavsubClose(pv->ctx);
 fclose( pv->file );
 iconv_close(pv->iconv_context);
 free( w->private_data );
 }
+ w->private_data = NULL;
 }
 
 hb_work_object_t hb_decsrtsub =

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/decssasub.c -> HandBrake-1.5.1.tar.xz/libhb/decssasub.c Changed

@@ -1,6 +1,6 @@
 /* decssasub.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -23,119 +23,92 @@
 *
 * @author David Foster (davidfstr)
 */
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include "handbrake/handbrake.h"
 
-#include <ass/ass.h>
-#include "handbrake/decssasub.h"
-#include "handbrake/colormap.h"
+#include "handbrake/handbrake.h"
+#include "handbrake/decavsub.h"
+#include "libavformat/avformat.h"
 
 struct hb_work_private_s
 {
- hb_job_t * job;
- hb_subtitle_t * subtitle;
-
- // SSA Import
- FILE * file;
- int readOrder;
+ AVFormatContext * ic;
+ hb_avsub_context_t * ctx;
+ AVPacket * pkt;
+ hb_job_t * job;
+ hb_subtitle_t * subtitle;
 
 // Time of first desired subtitle adjusted by reader_pts_offset
 uint64_t start_time;
 uint64_t stop_time;
 };
 
-#define SSA_VERBOSE_PACKETS 0
-
 static int extradataInit( hb_work_private_t * pv )
 {
- int events = 0;
- char * events_tag = "Events";
- char * format_tag = "Format:";
- int events_len = strlen(events_tag);;
- int format_len = strlen(format_tag);;
- char * header = NULL;
-
- while (1)
+ if (pv->ic->nb_streams < 1)
 {
- char * line = NULL;
- ssize_t len;
- size_t size = 0;
-
- len = hb_getline(&line, &size, pv->file);
- if (len < 0)
- {
- // Incomplete SSA header
- free(header);
- return 1;
- }
- if (len > 0 && line != NULL)
- {
- if (header != NULL)
- {
- char * tmp = header;
- header = hb_strdup_printf("%s%s", header, line);
- free(tmp);
- }
- else
- {
- header = strdup(line);
- }
- if (!events)
- {
- if (len >= events_len &&
- !strncasecmp(line, events_tag, events_len))
- {
- events = 1;
- }
- }
- else
- {
- if (len >= format_len &&
- !strncasecmp(line, format_tag, format_len))
- {
- free(line);
- break;
- }
- // Improperly formatted SSA header
- free(header);
- return 1;
- }
- }
- free(line);
+ hb_error("SSA demux found no streams");
+ return 1;
 }
- pv->subtitle->extradata = (uint8_t*)header;
- pv->subtitle->extradata_size = strlen(header) + 1;
 
+ AVStream * st = pv->ic->streams0;
+ if (st->codecpar->codec_id != AV_CODEC_ID_ASS)
+ {
+ hb_error("SSA demux found wrong codec_id %x", st->codecpar->codec_id);
+ return 1;
+ }
+ if (st->codecpar->extradata != NULL)
+ {
+ pv->subtitle->extradata = malloc(st->codecpar->extradata_size + 1);
+ memcpy(pv->subtitle->extradata,
+ st->codecpar->extradata, st->codecpar->extradata_size);
+ pv->subtitle->extradatast->codecpar->extradata_size = 0;
+ pv->subtitle->extradata_size = st->codecpar->extradata_size + 1;
+ }
 return 0;
 }
 
 static int decssaInit( hb_work_object_t * w, hb_job_t * job )
 {
- hb_work_private_t * pv;
+ hb_work_private_t * pv = NULL;
 int ii;
 
- pv = calloc( 1, sizeof( hb_work_private_t ) );
+ if (w->subtitle->config.src_filename == NULL)
+ {
+ hb_error("No SSA subtitle file specified");
+ goto fail;
+ }
+
+ pv = calloc( 1, sizeof( hb_work_private_t ) );
+ if (pv == NULL)
+ {
+ goto fail;
+ }
 w->private_data = pv;
 pv->job = job;
 pv->subtitle = w->subtitle;
 
- if (w->fifo_in == NULL && pv->subtitle->config.src_filename != NULL)
+ pv->pkt = av_packet_alloc();
+ if (pv->pkt == NULL)
 {
- pv->file = hb_fopen(pv->subtitle->config.src_filename, "r");
- if(pv->file == NULL)
- {
- hb_error("Could not open the SSA subtitle file '%s'\n",
- pv->subtitle->config.src_filename);
- goto fail;
- }
+ hb_error("decssaInit: av_packet_alloc failed");
+ goto fail;
+ }
 
- // Read SSA header and store in subtitle extradata
- if (extradataInit(pv))
- {
- goto fail;
- }
+ if (avformat_open_input(&pv->ic, pv->subtitle->config.src_filename,
+ NULL, NULL ) < 0 )
+ {
+ hb_error("Could not open the SSA subtitle file '%s'\n",
+ pv->subtitle->config.src_filename);
+ goto fail;
+ }
+ pv->ctx = decavsubInit(w, job);
+ if (pv->ctx == NULL)
+ {
+ goto fail;
+ }
+
+ if (extradataInit(pv))
+ {
+ goto fail;
 }
 
 /*
@@ -179,9 +152,11 @@
 fail:
 if (pv != NULL)
 {
- if (pv->file != NULL)
+ av_packet_free(&pv->pkt);
+ decavsubClose(pv->ctx);
+ if (pv->ic)
 {
- fclose(pv->file);
+ avformat_close_input(&pv->ic);
 }
 free(pv);
 w->private_data = NULL;
@@ -189,146 +164,84 @@
 return 1;
 }
 
-#define SSA_2_HB_TIME(hr,min,sec,centi) \
- ( 90LL * ( hr * 1000LL * 60 * 60 +\
- min * 1000LL * 60 +\
- sec * 1000LL +\
- centi * 10LL ) )
-
-/*
- * Parses the start and stop time from the specified SSA packet.
- *
- * Returns true if parsing failed; false otherwise.
- */
-static int parse_timing( char *line, int64_t *start, int64_t *stop )
+static hb_buffer_t * ssa_read( hb_work_private_t * pv )
 {
- /*
- * Parse Start and End fields for timing information
- */
- int start_hr, start_min, start_sec, start_centi;
- int end_hr, end_min, end_sec, end_centi;
- // SSA subtitles have an empty layer field (bare ','). The scanf
- // format specifier "%*128^," will not match on a bare ','. There
- // must be at least one non ',' character in the match. So the format
- // specifier is placed directly next to the ':' so that the next
- // expected ' ' after the ':' will be the character it matches on
- // when there is no layer field.
- int numPartsRead = sscanf(line, "Dialogue:%*128^,,"
- "%d:%d:%d.%d," // Start
- "%d:%d:%d.%d,", // End
- &start_hr, &start_min, &start_sec, &start_centi,
- &end_hr, &end_min, &end_sec, &end_centi );
- if ( numPartsRead != 8 )
- return 1;
-
- *start = SSA_2_HB_TIME(start_hr, start_min, start_sec, start_centi);
- *stop = SSA_2_HB_TIME( end_hr, end_min, end_sec, end_centi);
+ int err;
+ hb_buffer_t * out;
 
- return 0;
-}
+ if (pv->job->reader_pts_offset == AV_NOPTS_VALUE)
+ {
+ // We need to wait for reader to initialize it's pts offset so that
+ // we know where to start reading SSA.
+ return NULL;
+ }
+ if (pv->start_time == AV_NOPTS_VALUE)
+ {
+ pv->start_time = pv->job->reader_pts_offset;
+ if (pv->job->pts_to_stop > 0)
+ {
+ pv->stop_time = pv->job->pts_to_start + pv->job->pts_to_stop;
+ }
+ }
 
-static char * find_field( char * pos, char * end, int fieldNum )
-{
- int curFieldID = 1;
- while (pos < end)
+ if ((err = av_read_frame(pv->ic, pv->pkt)) < 0)
 {
- if ( *pos++ == ',' )
+ if (err != AVERROR_EOF)
 {
- curFieldID++;
- if ( curFieldID == fieldNum )
- return pos;
+ hb_error("SSA demux read error %d", err);
 }
+ return hb_buffer_eof_init();
 }
- return NULL;
-}
+ AVStream * st = pv->ic->streamspv->pkt->stream_index;
 
-/*
- * SSA line format:
- * Dialogue: Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
- * 1 2 3 4 5 6 7 8 9 10
- *
- * MKV-SSA packet format:
- * ReadOrder,Marked, Style,Name,MarginL,MarginR,MarginV,Effect,Text '\0'
- * 1 2 3 4 5 6 7 8 9
- */
-static hb_buffer_t *
-decode_line_to_mkv_ssa( hb_work_private_t * pv, char * line, int size )
-{
- hb_buffer_t * out;
+ out = hb_buffer_init(pv->pkt->size + 1);
+ memcpy(out->data, pv->pkt->data, pv->pkt->size);
+ out->datapv->pkt->size = 0;
+ out->size = pv->pkt->size;
 
- // Trim trailing CR/LF
- while (size > 0 && (linesize - 1 == '\n' || linesize - 1 == '\r'))
+ double tsconv = (double)90000. * st->time_base.num / st->time_base.den;
+ if (pv->pkt->pts != AV_NOPTS_VALUE)
 {
- line--size = 0;
+ out->s.start = pv->pkt->pts * tsconv +
+ pv->subtitle->config.offset * 90;
 }
-
- int64_t start, stop;
- if (parse_timing(line, &start, &stop))
+ if (pv->pkt->dts != AV_NOPTS_VALUE)
 {
- goto fail;
+ out->s.renderOffset = pv->pkt->dts * tsconv +
+ pv->subtitle->config.offset * 90;
 }
-
- // Convert the SSA packet to MKV-SSA format, which is what libass expects
- char * mkvSSA;
- int numPartsRead;
- char * styleToTextFields;
- char * layerField = malloc(size);
-
- // SSA subtitles have an empty layer field (bare ','). The scanf
- // format specifier "%*128^," will not match on a bare ','. There
- // must be at least one non ',' character in the match. So the format
- // specifier is placed directly next to the ':' so that the next
- // expected ' ' after the ':' will be the character it matches on
- // when there is no layer field.
- numPartsRead = sscanf( (char *)line, "Dialogue:%128^,,", layerField );
- if ( numPartsRead != 1 )
+ if (out->s.renderOffset >= 0 && out->s.start == AV_NOPTS_VALUE)
 {
- free(layerField);
- goto fail;
+ out->s.start = out->s.renderOffset;
 }
-
- styleToTextFields = find_field( line, line + size, 4 );
- if ( styleToTextFields == NULL ) {
- free( layerField );
- goto fail;
+ else if (out->s.renderOffset == AV_NOPTS_VALUE && out->s.start >= 0)
+ {
+ out->s.renderOffset = out->s.start;
 }
-
- // The sscanf conversion above will result in an extra space
- // before the layerField. Strip the space.
- char *stripLayerField = layerField;
- for(; *stripLayerField == ' '; stripLayerField++);
-
- out = hb_buffer_init( size + 1 );
- mkvSSA = (char*)out->data;
-
- mkvSSA0 = '\0';
- sprintf(mkvSSA, "%d", pv->readOrder++);
- strcat( mkvSSA, "," );
- strcat( mkvSSA, stripLayerField );
- strcat( mkvSSA, "," );
- strcat( mkvSSA, (char *)styleToTextFields );
-
- out->size = strlen(mkvSSA) + 1;
- out->s.frametype = HB_FRAME_SUBTITLE;
- out->s.start = start + pv->subtitle->config.offset * 90;
- out->s.duration = stop - start;
- out->s.stop = stop + pv->subtitle->config.offset * 90;
-
- if (out->size == 0)
+ int64_t pkt_duration = pv->pkt->duration;
+ if (pkt_duration != AV_NOPTS_VALUE)
 {
- hb_buffer_close(&out);
+ out->s.duration = pkt_duration * tsconv;
+ out->s.stop = out->s.start + out->s.duration;
 }
- else if (out->s.stop <= pv->start_time ||
- out->s.start >= pv->stop_time)
+ else
 {
- // Drop subtitles that end before the start time
- // or start after the stop time
+ out->s.duration = (int64_t)AV_NOPTS_VALUE;
+ }
+ out->s.type = SUBTITLE_BUF;
+ av_packet_unref(pv->pkt);
+
+ if (out->s.stop <= pv->start_time || out->s.start >= pv->stop_time)
+ {
+ // Drop subtitles that end before the PtoP start time
+ // or start after the PtoP stop time
 hb_deep_log(3, "Discarding SSA at time start %"PRId64", stop %"PRId64,
 out->s.start, out->s.stop);
 hb_buffer_close(&out);
 }
 else
 {
+ // Adjust start/stop for subtitles that span PtoP start/stop
 if (out->s.start < pv->start_time)
 {
 out->s.start = pv->start_time;
@@ -340,64 +253,6 @@
 out->s.start -= pv->start_time;
 out->s.stop -= pv->start_time;
 }
-
-
- free( layerField );
-
- return out;
-
-fail:
- hb_log( "decssasub: malformed SSA subtitle packet: %.*s\n", size, line );
- return NULL;
-}
-
-/*
- * Read the SSA file and put the entries into the subtitle fifo for all to read
- */
-static hb_buffer_t * ssa_read( hb_work_private_t * pv )
-{
- hb_buffer_t * out;
-
- if (pv->job->reader_pts_offset == AV_NOPTS_VALUE)
- {
- // We need to wait for reader to initialize it's pts offset so that
- // we know where to start reading SSA.
- return NULL;
- }
- if (pv->start_time == AV_NOPTS_VALUE)
- {
- pv->start_time = pv->job->reader_pts_offset;
- if (pv->job->pts_to_stop > 0)
- {
- pv->stop_time = pv->job->pts_to_start + pv->job->pts_to_stop;
- }
- }
- while (!feof(pv->file))
- {
- char * line = NULL;
- ssize_t len;
- size_t size = 0;
-
- len = hb_getline(&line, &size, pv->file);
- if (len > 0 && line != NULL)
- {
- out = decode_line_to_mkv_ssa(pv, line, len);
- if (out != NULL)
- {
- free(line);
- return out;
- }
- }
- free(line);
- if (len < 0)
- {
- // Error or EOF
- out = hb_buffer_eof_init();
- return out;
- }
- }
- out = hb_buffer_eof_init();
-
 return out;
 }
 
@@ -405,41 +260,34 @@
 hb_buffer_t ** buf_out )
 {
 hb_work_private_t * pv = w->private_data;
- hb_buffer_t * in = *buf_in;
+ hb_buffer_t * in;
+ int result;
 
- *buf_in = NULL;
- *buf_out = NULL;
- if (in == NULL && pv->file != NULL)
+ in = ssa_read(pv);
+ if (in == NULL)
 {
- in = ssa_read(pv);
- if (in == NULL)
- {
- return HB_WORK_OK;
- }
+ return HB_WORK_OK;
 }
- *buf_out = in;
- if (in->s.flags & HB_BUF_FLAG_EOF)
+
+ result = decavsubWork(pv->ctx, &in, buf_out);
+ if (in != NULL)
 {
- return HB_WORK_DONE;
+ hb_buffer_close(&in);
 }
-
- // Not much to do here. ffmpeg already supplies SSA subtitles in the
- // required matroska packet format.
- //
- // We require string termination of the buffer
- hb_buffer_realloc(in, ++in->size);
- in->datain->size - 1 = '\0';
-
-#if SSA_VERBOSE_PACKETS
- printf("\nPACKET(%"PRId64",%"PRId64"): %.*s\n", in->s.start/90, in->s.stop/90, in->size, in->data);
-#endif
-
- return HB_WORK_OK;
+ return result;
 }
 
 static void decssaClose( hb_work_object_t * w )
 {
- free( w->private_data );
+ hb_work_private_t * pv = w->private_data;
+ if (pv != NULL)
+ {
+ decavsubClose(pv->ctx);
+ av_packet_free(&pv->pkt);
+ avformat_close_input(&pv->ic);
+ free(pv);
+ }
+ w->private_data = NULL;
 }
 
 hb_work_object_t hb_decssasub =

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/dectx3gsub.c -> HandBrake-1.5.1.tar.xz/libhb/dectx3gsub.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/demuxmpeg.c -> HandBrake-1.5.1.tar.xz/libhb/demuxmpeg.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/denoise.c -> HandBrake-1.5.1.tar.xz/libhb/denoise.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/detelecine.c -> HandBrake-1.5.1.tar.xz/libhb/detelecine.c Changed

@@ -1,6 +1,6 @@
 /* detelecine.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -832,17 +832,25 @@
 pv->input = *init;
 pv->pullup_ctx = ctx = pullup_alloc_context();
 
- ctx->junk_left = ctx->junk_right = 1;
- ctx->junk_top = ctx->junk_bottom = 4;
+ // "Skip" array top, bottom, left, right
+ int top, bottom, left, right;
+
+ left = right = ctx->junk_left = ctx->junk_right = 1;
+ top = bottom = ctx->junk_top = ctx->junk_bottom = 4;
 ctx->strict_breaks = -1;
 ctx->metric_plane = 0;
 ctx->parity = -1;
 
- // "Skip" array top, bottom, left, right
- hb_dict_extract_int(&ctx->junk_top, filter->settings, "skip-top");
- hb_dict_extract_int(&ctx->junk_bottom, filter->settings, "skip-bottom");
- hb_dict_extract_int(&ctx->junk_left, filter->settings, "skip-left");
- hb_dict_extract_int(&ctx->junk_right, filter->settings, "skip-right");
+ hb_dict_extract_int(&top, filter->settings, "skip-top");
+ hb_dict_extract_int(&bottom, filter->settings, "skip-bottom");
+ hb_dict_extract_int(&left, filter->settings, "skip-left");
+ hb_dict_extract_int(&right, filter->settings, "skip-right");
+ // Enforce safety zones
+ ctx->junk_top = top > ctx->junk_top ? top : ctx->junk_top;
+ ctx->junk_bottom = bottom > ctx->junk_bottom ? bottom : ctx->junk_bottom;
+ ctx->junk_left = left > ctx->junk_left ? left : ctx->junk_left;
+ ctx->junk_right = right > ctx->junk_right ? right : ctx->junk_right;
+
 hb_dict_extract_int(&ctx->strict_breaks, filter->settings, "strict-breaks");
 hb_dict_extract_int(&ctx->metric_plane, filter->settings, "plane");
 hb_dict_extract_int(&ctx->parity, filter->settings, "parity");
@@ -1024,10 +1032,11 @@
 }
 
 out = hb_frame_buffer_init(pv->output.pix_fmt, in->f.width, in->f.height);
- out->f.color_prim = pv->output.color_prim;
- out->f.color_transfer = pv->output.color_transfer;
- out->f.color_matrix = pv->output.color_matrix;
- out->f.color_range = pv->output.color_range ;
+ out->f.color_prim = pv->output.color_prim;
+ out->f.color_transfer = pv->output.color_transfer;
+ out->f.color_matrix = pv->output.color_matrix;
+ out->f.color_range = pv->output.color_range;
+ out->f.chroma_location = pv->output.chroma_location;
 
 /* Copy pullup frame buffer into output buffer */
 memcpy( out->plane0.data, frame->buffer->planes0, frame->buffer->size0 );

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/dvd.c -> HandBrake-1.5.1.tar.xz/libhb/dvd.c Changed

@@ -1,6 +1,6 @@
 /* dvd.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -205,7 +205,8 @@
 subtitle->config.dest = RENDERSUB;
 subtitle->stream_type = 0xbd;
 subtitle->substream_type = 0x20 + position;
- subtitle->codec = WORK_DECVOBSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = AV_CODEC_ID_DVD_SUBTITLE;
 subtitle->timebase.num = 1;
 subtitle->timebase.den = 90000;
 
@@ -516,6 +517,7 @@
 }
 if( !audio->id )
 {
+ free(audio);
 continue;
 }
 
@@ -861,6 +863,11 @@
 
 count = f * d->title_block_count;
 
+ if (d->file == NULL)
+ {
+ return 1;
+ }
+
 for( i = d->cell_start; i <= d->cell_end; i++ )
 {
 sizeCell = d->pgc->cell_playbacki.last_sector + 1 -
@@ -1454,4 +1461,3 @@
 else
 dvd_methods = hb_dvdread_methods();
 }
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/dvdnav.c -> HandBrake-1.5.1.tar.xz/libhb/dvdnav.c Changed

@@ -1,6 +1,6 @@
 /* dvdnav.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -351,7 +351,8 @@
 subtitle->config.dest = RENDERSUB;
 subtitle->stream_type = 0xbd;
 subtitle->substream_type = 0x20 + position;
- subtitle->codec = WORK_DECVOBSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = AV_CODEC_ID_DVD_SUBTITLE;
 subtitle->timebase.num = 1;
 subtitle->timebase.den = 90000;
 
@@ -1748,6 +1749,11 @@
 // Transition to another title signals that we are done.
 hb_buffer_close( &b );
 hb_deep_log(2, "dvdnav: vts change, found next title");
+ if (error_count > 0)
+ {
+ // Last read attempt failed
+ hb_set_work_error(d->h, HB_ERROR_READ);
+ }
 return NULL;
 }
 }
@@ -1772,6 +1778,11 @@
 // Transition to another title signals that we are done.
 hb_buffer_close( &b );
 hb_deep_log(2, "dvdnav: cell change, found next title");
+ if (error_count > 0)
+ {
+ // Last read attempt failed
+ hb_set_work_error(d->h, HB_ERROR_READ);
+ }
 return NULL;
 }
 c = FindChapterIndex(d->list_dvd_chapter, pgcn, pgn);
@@ -1783,6 +1794,11 @@
 // a transition to an earlier chapter means we're done.
 hb_buffer_close( &b );
 hb_deep_log(2, "dvdnav: cell change, previous chapter");
+ if (error_count > 0)
+ {
+ // Last read attempt failed
+ hb_set_work_error(d->h, HB_ERROR_READ);
+ }
 return NULL;
 }
 chapter = d->chapter = c;
@@ -1791,6 +1807,11 @@
 {
 hb_buffer_close( &b );
 hb_deep_log(2, "dvdnav: cell change, previous cell");
+ if (error_count > 0)
+ {
+ // Last read attempt failed
+ hb_set_work_error(d->h, HB_ERROR_READ);
+ }
 return NULL;
 }
 d->cell = cell_event->cellN;
@@ -1829,6 +1850,11 @@
 d->stopped = 1;
 hb_buffer_close( &b );
 hb_deep_log(2, "dvdnav: stop");
+ if (error_count > 0)
+ {
+ // Last read attempt failed
+ hb_set_work_error(d->h, HB_ERROR_READ);
+ }
 return NULL;
 
 default:
@@ -2176,4 +2202,4 @@
 d->vts = 0;
 d->pgcn = 0;
 d->pgn = 0;
-}
+}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/eedi2.c -> HandBrake-1.5.1.tar.xz/libhb/eedi2.c Changed

@@ -1,6 +1,6 @@
 /* eedi2.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -857,7 +857,7 @@
 }
 
 /**
- * Filters the frane-height edge direction mask
+ * Filters the frame-height edge direction mask
 * @param mskp Pointer to the edge mask
 * @param msk_pitch Stride of mskp
 * @param dmskp Pointer to the edge direction mask being read from
@@ -1357,7 +1357,7 @@
 * @param tmp_pitch Stride of tmp
 * @param dst Pointer to the destination to store the blurred field plane
 * @param dst_pitch Stride of dst
- * @param height Height of the hakf-height field-sized frame
+ * @param height Height of the half-height field-sized frame
 * @param width Width of dstp bitmap rows, as opposed to the padded stride in dst_pitch
 */
 void eedi2_gaussian_blur1( uint8_t * src, int src_pitch, uint8_t * tmp, int tmp_pitch, uint8_t * dst, int dst_pitch, int height, int width )

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/enc_qsv.c -> HandBrake-1.5.1.tar.xz/libhb/enc_qsv.c Changed

@@ -1,3 +1,4 @@
+
 /* ********************************************************************* *\
 
 Copyright (C) 2013 Intel Corporation. All rights reserved.
@@ -40,10 +41,7 @@
 
 #include "libavutil/hwcontext_qsv.h"
 #include "libavutil/hwcontext.h"
-#include <mfx/mfxvideo.h>
-
-extern AVBufferRef *hb_hw_device_ctx;
-EncQSVFramesContext hb_enc_qsv_frames_ctx;
+#include "vpl/mfxvideo.h"
 
 /*
 * The frame info struct remembers information about each frame across calls to
@@ -99,6 +97,7 @@
 
 int async_depth;
 int max_async_depth;
+ int max_buffer_size;
 
 // if encode-only, system memory used
 int is_sys_mem;
@@ -315,12 +314,12 @@
 }
 
 /* need more space for 10bits */
- int bpp12 = 3;
- if (pv->param.videoParam->mfx.FrameInfo.FourCC == MFX_FOURCC_P010)
+ if (pv->param.videoParam->mfx.FrameInfo.FourCC == MFX_FOURCC_P010 ||
+ pv->param.videoParam->mfx.CodecId == MFX_CODEC_HEVC)
 {
 hb_buffer_realloc(bitstream_buf,bitstream_buf->size*2);
- bpp12 = 6;
 }
+ int bpp12 = (pv->param.videoParam->mfx.FrameInfo.FourCC == MFX_FOURCC_P010) ? 6 : 3;
 bitstream.Data = bitstream_buf->data;
 bitstream.MaxLength = bitstream_buf->alloc;
 
@@ -507,8 +506,7 @@
 
 for (i = 0; i < nb_surfaces; i++) {
 QSVMid *mid = &midsi;
- mid->handle = frames_hwctx->surfacesi.Data.MemId;
- mid->texture = frames_hwctx->texture;
+ mid->handle_pair = (mfxHDLPair*)frames_hwctx->surfacesi.Data.MemId;
 mid->hw_frames_ref = hw_frames_ref1;
 }
 
@@ -554,7 +552,7 @@
 static mfxStatus hb_qsv_frame_alloc(mfxHDL pthis, mfxFrameAllocRequest *req,
 mfxFrameAllocResponse *resp)
 {
- EncQSVFramesContext *ctx = pthis;
+ HBQSVFramesContext *ctx = pthis;
 int ret;
 
 /* this should only be called from an encoder or decoder and
@@ -682,7 +680,7 @@
 goto fail;
 
 qsv_mid->surf.Info = hw_frames_hwctx->surfaces0.Info;
- qsv_mid->surf.Data.MemId = qsv_mid->handle;
+ qsv_mid->surf.Data.MemId = qsv_mid->handle_pair;
 
 /* map the data to the system memory */
 ret = av_hwframe_map(qsv_mid->locked_frame, qsv_mid->hw_frame,
@@ -715,14 +713,12 @@
 static mfxStatus hb_qsv_frame_get_hdl(mfxHDL pthis, mfxMemId mid, mfxHDL *hdl)
 {
 QSVMid *qsv_mid = (QSVMid*)mid;
+ mfxHDLPair *pair_dst = (mfxHDLPair*)hdl;
+ mfxHDLPair *pair_src = (mfxHDLPair*)qsv_mid->handle_pair;
 
- if (qsv_mid->texture) {
- mfxHDLPair *pPair = (mfxHDLPair*)hdl;
- pPair->first = qsv_mid->texture;
- pPair->second = qsv_mid->handle;
- } else {
- *hdl = qsv_mid->handle;
- }
+ pair_dst->first = pair_src->first;
+ if (pair_src->second != (mfxMemId)MFX_INFINITE)
+ pair_dst->second = pair_src->second;
 
 return MFX_ERR_NONE;
 }
@@ -747,12 +743,8 @@
 
 if (qsv == NULL)
 {
- if (!pv->is_sys_mem)
- {
- hb_error("qsv_enc_init: decode enabled but no context!");
- return 3;
- }
- job->qsv.ctx = qsv = av_mallocz(sizeof(hb_qsv_context));
+ hb_error("qsv_enc_init: no context!");
+ return 3;
 }
 
 hb_qsv_space *qsv_encode = qsv->enc_space;
@@ -761,9 +753,6 @@
 // if only for encode
 if (pv->is_sys_mem)
 {
- // no need to use additional sync as encode only -> single thread
- hb_qsv_add_context_usage(qsv, 0);
-
 // re-use the session from encqsvInit
 qsv->mfx_session = pv->mfx_session;
 }
@@ -774,7 +763,7 @@
 mfxVersion ver;
 mfxIMPL impl;
 
- AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)hb_hw_device_ctx->data;
+ AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)qsv->hb_hw_device_ctx->data;
 AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
 mfxSession parent_session = device_hwctx->session;
 
@@ -795,7 +784,7 @@
 // reuse parent session
 qsv->mfx_session = parent_session;
 mfxFrameAllocator frame_allocator = {
- .pthis = &hb_enc_qsv_frames_ctx,
+ .pthis = pv->job->qsv.ctx->hb_dec_qsv_frames_ctx,
 .Alloc = hb_qsv_frame_alloc,
 .Lock = hb_qsv_frame_lock,
 .Unlock = hb_qsv_frame_unlock,
@@ -803,6 +792,11 @@
 .Free = hb_qsv_frame_free,
 };
 
+ if (hb_qsv_hw_filters_are_enabled(pv->job))
+ {
+ frame_allocator.pthis = pv->job->qsv.ctx->hb_vpp_qsv_frames_ctx;
+ }
+
 err = MFXVideoCORE_SetFrameAllocator(qsv->mfx_session, &frame_allocator);
 if (err != MFX_ERR_NONE)
 {
@@ -858,9 +852,9 @@
 {
 pv->sws_context_to_nv12 = hb_sws_get_context(
 job->width, job->height,
- AV_PIX_FMT_YUV420P,
+ job->output_pix_fmt, job->color_range,
 job->width, job->height,
- AV_PIX_FMT_P010LE,
+ AV_PIX_FMT_P010LE, job->color_range,
 SWS_LANCZOS|SWS_ACCURATE_RND,
 SWS_CS_DEFAULT);
 }
@@ -868,16 +862,16 @@
 {
 pv->sws_context_to_nv12 = hb_sws_get_context(
 job->width, job->height,
- AV_PIX_FMT_YUV420P,
+ job->output_pix_fmt, job->color_range,
 job->width, job->height,
- AV_PIX_FMT_NV12,
+ AV_PIX_FMT_NV12, job->color_range,
 SWS_LANCZOS|SWS_ACCURATE_RND,
 SWS_CS_DEFAULT);
 }
 }
 
 // allocate tasks
- qsv_encode->p_buf_max_size = HB_QSV_BUF_SIZE_DEFAULT;
+ qsv_encode->p_buf_max_size = pv->max_buffer_size * 1000;
 qsv_encode->tasks = hb_qsv_list_init(HAVE_THREADS);
 for (i = 0; i < pv->max_async_depth; i++)
 {
@@ -890,6 +884,7 @@
 hb_qsv_list_add(qsv_encode->tasks, task);
 }
 
+#if !HB_QSV_ONEVPL
 // plugins should be loaded before querying for surface allocation
 if (pv->loaded_plugins == NULL)
 {
@@ -900,7 +895,7 @@
 *job->die = 1;
 return -1;
 }
- pv->loaded_plugins = hb_qsv_load_plugins(pv->qsv_info, qsv->mfx_session, version);
+ pv->loaded_plugins = hb_qsv_load_plugins(hb_qsv_get_adapter_index(), pv->qsv_info, qsv->mfx_session, version);
 if (pv->loaded_plugins == NULL)
 {
 hb_error("qsv_enc_init: hb_qsv_load_plugins failed");
@@ -909,6 +904,7 @@
 return -1;
 }
 }
+#endif
 
 // setup surface allocation
 pv->param.videoParam->IOPattern = (pv->is_sys_mem ?
@@ -1006,6 +1002,199 @@
 return 0;
 }
 
+static int log_encoder_params(const hb_work_private_t *pv, const mfxVideoParam *videoParam)
+{
+ const mfxExtCodingOption *option1 = NULL;
+ const mfxExtCodingOption2 *option2 = NULL;
+ const mfxExtVideoSignalInfo *extVideoSignalInfo = NULL;
+
+ // log code path and main output settings
+ hb_log("encqsvInit: using %s%s path",
+ pv->is_sys_mem ? "encode-only" : "full QSV",
+ videoParam->mfx.LowPower == MFX_CODINGOPTION_ON ? " (LowPower)" : "" );
+ hb_log("encqsvInit: %s %s profile @ level %s",
+ hb_qsv_codec_name (videoParam->mfx.CodecId),
+ hb_qsv_profile_name(videoParam->mfx.CodecId, videoParam->mfx.CodecProfile),
+ hb_qsv_level_name (videoParam->mfx.CodecId, videoParam->mfx.CodecLevel));
+ hb_log("encqsvInit: TargetUsage %"PRIu16" AsyncDepth %"PRIu16"",
+ videoParam->mfx.TargetUsage, videoParam->AsyncDepth);
+ hb_log("encqsvInit: GopRefDist %"PRIu16" GopPicSize %"PRIu16" NumRefFrame %"PRIu16"",
+ videoParam->mfx.GopRefDist, videoParam->mfx.GopPicSize, videoParam->mfx.NumRefFrame);
+
+ if (pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
+ {
+ hb_log("encqsvInit: BFramesMax %d BRefType %s",
+ videoParam->mfx.GopRefDist > 1 ?
+ videoParam->mfx.GopRefDist - 1 : 0,
+ pv->param.gop.b_pyramid ? "pyramid" : "off");
+ }
+ else
+ {
+ hb_log("encqsvInit: BFramesMax %d",
+ videoParam->mfx.GopRefDist > 1 ?
+ videoParam->mfx.GopRefDist - 1 : 0);
+ }
+
+ for (int i = 0; i < videoParam->NumExtParam; i++)
+ {
+ mfxExtCodingOption *option = (mfxExtCodingOption*)videoParam->ExtParami;
+ if (option->Header.BufferId == MFX_EXTBUFF_VIDEO_SIGNAL_INFO)
+ {
+ extVideoSignalInfo = (mfxExtVideoSignalInfo*)videoParam->ExtParami;
+ }
+ else if (option->Header.BufferId == MFX_EXTBUFF_CODING_OPTION)
+ {
+ option1 = (mfxExtCodingOption*)videoParam->ExtParami;
+ }
+ else if (option->Header.BufferId == MFX_EXTBUFF_CODING_OPTION2)
+ {
+ option2 = (mfxExtCodingOption2*)videoParam->ExtParami;
+ }
+ else
+ {
+ hb_log("Unknown Header.BufferId=%d", option->Header.BufferId);
+ }
+ }
+
+ if (option2 && (option2->AdaptiveI != MFX_CODINGOPTION_OFF ||
+ option2->AdaptiveB != MFX_CODINGOPTION_OFF))
+ {
+ if (videoParam->mfx.GopRefDist > 1)
+ {
+ hb_log("encqsvInit: AdaptiveI %s AdaptiveB %s",
+ hb_qsv_codingoption_get_name(option2->AdaptiveI),
+ hb_qsv_codingoption_get_name(option2->AdaptiveB));
+ }
+ else
+ {
+ hb_log("encqsvInit: AdaptiveI %s",
+ hb_qsv_codingoption_get_name(option2->AdaptiveI));
+ }
+ }
+
+ if (videoParam->mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ {
+ char qpi7, qpp9, qpb9;
+ snprintf(qpi, sizeof(qpi), "QPI %"PRIu16"", videoParam->mfx.QPI);
+ snprintf(qpp, sizeof(qpp), " QPP %"PRIu16"", videoParam->mfx.QPP);
+ snprintf(qpb, sizeof(qpb), " QPB %"PRIu16"", videoParam->mfx.QPB);
+ hb_log("encqsvInit: RateControlMethod CQP with %s%s%s", qpi,
+ videoParam->mfx.GopPicSize > 1 ? qpp : "",
+ videoParam->mfx.GopRefDist > 1 ? qpb : "");
+ }
+ else
+ {
+ switch (videoParam->mfx.RateControlMethod)
+ {
+ case MFX_RATECONTROL_LA:
+ hb_log("encqsvInit: RateControlMethod LA TargetKbps %"PRIu16" BRCParamMultiplier %"PRIu16" LookAheadDepth %"PRIu16"",
+ videoParam->mfx.TargetKbps, videoParam->mfx.BRCParamMultiplier, (option2 != NULL) ? option2->LookAheadDepth : 0);
+ break;
+ case MFX_RATECONTROL_LA_ICQ:
+ hb_log("encqsvInit: RateControlMethod LA_ICQ ICQQuality %"PRIu16" LookAheadDepth %"PRIu16"",
+ videoParam->mfx.ICQQuality, (option2 != NULL) ? option2->LookAheadDepth : 0);
+ break;
+ case MFX_RATECONTROL_ICQ:
+ hb_log("encqsvInit: RateControlMethod ICQ ICQQuality %"PRIu16"",
+ videoParam->mfx.ICQQuality);
+ break;
+ case MFX_RATECONTROL_CBR:
+ case MFX_RATECONTROL_VBR:
+ hb_log("encqsvInit: RateControlMethod %s TargetKbps %"PRIu16" MaxKbps %"PRIu16" BufferSizeInKB %"PRIu16" InitialDelayInKB %"PRIu16" BRCParamMultiplier %"PRIu16"",
+ videoParam->mfx.RateControlMethod == MFX_RATECONTROL_CBR ? "CBR" : "VBR",
+ videoParam->mfx.TargetKbps, videoParam->mfx.MaxKbps,
+ videoParam->mfx.BufferSizeInKB, videoParam->mfx.InitialDelayInKB, videoParam->mfx.BRCParamMultiplier);
+ break;
+ default:
+ hb_log("encqsvInit: invalid rate control method %"PRIu16"",
+ videoParam->mfx.RateControlMethod);
+ return -1;
+ }
+ }
+
+ if (option2 && (videoParam->mfx.RateControlMethod == MFX_RATECONTROL_LA ||
+ videoParam->mfx.RateControlMethod == MFX_RATECONTROL_LA_ICQ))
+ {
+ switch (option2->LookAheadDS)
+ {
+ case MFX_LOOKAHEAD_DS_UNKNOWN:
+ hb_log("encqsvInit: LookAheadDS unknown (auto)");
+ break;
+ case MFX_LOOKAHEAD_DS_OFF: // default
+ break;
+ case MFX_LOOKAHEAD_DS_2x:
+ hb_log("encqsvInit: LookAheadDS 2x");
+ break;
+ case MFX_LOOKAHEAD_DS_4x:
+ hb_log("encqsvInit: LookAheadDS 4x");
+ break;
+ default:
+ hb_log("encqsvInit: invalid LookAheadDS value 0x%"PRIx16"",
+ option2->LookAheadDS);
+ break;
+ }
+ }
+
+ switch (videoParam->mfx.FrameInfo.PicStruct)
+ {
+ case MFX_PICSTRUCT_PROGRESSIVE: // default
+ break;
+ case MFX_PICSTRUCT_FIELD_TFF:
+ hb_log("encqsvInit: PicStruct top field first");
+ break;
+ case MFX_PICSTRUCT_FIELD_BFF:
+ hb_log("encqsvInit: PicStruct bottom field first");
+ break;
+ default:
+ hb_error("encqsvInit: invalid PicStruct value 0x%"PRIx16"",
+ videoParam->mfx.FrameInfo.PicStruct);
+ return -1;
+ }
+
+ if (videoParam->mfx.CodecId == MFX_CODEC_AVC)
+ {
+ if (option1 && (option1->CAVLC != MFX_CODINGOPTION_OFF))
+ {
+ hb_log("encqsvInit: CAVLC %s",
+ hb_qsv_codingoption_get_name(option1->CAVLC));
+ }
+ }
+
+ if (option2 && (option2->ExtBRC != MFX_CODINGOPTION_OFF))
+ {
+ hb_log("encqsvInit: ExtBRC %s",
+ hb_qsv_codingoption_get_name(option2->ExtBRC));
+ }
+
+ if (option2 && (option2->MBBRC != MFX_CODINGOPTION_OFF))
+ {
+ hb_log("encqsvInit: MBBRC %s",
+ hb_qsv_codingoption_get_name(option2->MBBRC));
+ }
+
+ if (option2)
+ {
+ switch (option2->Trellis)
+ {
+ case MFX_TRELLIS_OFF: // default
+ break;
+ case MFX_TRELLIS_UNKNOWN:
+ hb_log("encqsvInit: Trellis unknown (auto)");
+ break;
+ default:
+ hb_log("encqsvInit: Trellis on (%s%s%s)",
+ (option2->Trellis & MFX_TRELLIS_I) ? "I" : "",
+ (option2->Trellis & MFX_TRELLIS_P) &&
+ (videoParam->mfx.GopPicSize > 1) ? "P" : "",
+ (option2->Trellis & MFX_TRELLIS_B) &&
+ (videoParam->mfx.GopRefDist > 1) ? "B" : "");
+ break;
+ }
+ }
+
+ return 0;
+}
+
 /***********************************************************************
 * encqsvInit
 ***********************************************************************
@@ -1013,12 +1202,13 @@
 **********************************************************************/
 int encqsvInit(hb_work_object_t *w, hb_job_t *job)
 {
+ int brc_param_multiplier;
 hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
 w->private_data = pv;
 
 pv->is_sys_mem = hb_qsv_full_path_is_enabled(job) ? 0 : 1; // TODO: re-implement QSV VPP filtering support
 pv->job = job;
- pv->qsv_info = hb_qsv_info_get(job->vcodec);
+ pv->qsv_info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
 pv->delayed_processing = hb_list_init();
 pv->last_start = INT64_MIN;
 hb_buffer_list_clear(&pv->encoded_frames);
@@ -1057,7 +1247,7 @@
 hb_value_t *value = hb_dict_iter_value(iter);
 char *str = hb_value_get_string_xform(value);
 
- switch (hb_qsv_param_parse(&pv->param, pv->qsv_info, key, str))
+ switch (hb_qsv_param_parse(&pv->param, pv->qsv_info, pv->job, key, str))
 {
 case HB_QSV_PARAM_OK:
 break;
@@ -1083,7 +1273,16 @@
 }
 hb_dict_free(&options_list);
 }
-
+#if defined(_WIN32) || defined(__MINGW32__)
+ if (pv->is_sys_mem && hb_qsv_implementation_is_hardware(pv->qsv_info->implementation))
+ {
+ // select the right hardware implementation based on dx index
+ if (!job->qsv.ctx->qsv_device)
+ hb_qsv_param_parse_dx_index(pv->job, hb_qsv_get_adapter_index());
+ mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11;
+ pv->qsv_info->implementation = hb_qsv_dx_index_to_impl(job->qsv.ctx->dx_index) | hw_preference;
+ }
+#endif
 // reload colorimetry in case values were set in encoder_options
 if (pv->param.videoSignalInfo.ColourDescriptionPresent)
 {
@@ -1219,26 +1418,36 @@
 {
 pv->param.rc.lookahead = pv->param.rc.lookahead && (pv->param.rc.icq || job->vquality <= HB_INVALID_VIDEO_QUALITY);
 }
-
+#if HB_PROJECT_FEATURE_QSV
+ if (pv->job->qsv.ctx != NULL)
+ {
+ job->qsv.ctx->la_is_enabled = pv->param.rc.lookahead ? 1 : 0;
+ }
+#endif
+ //libmfx BRC parameters are 16 bits thus maybe overflow, then BRCParamMultiplier is needed
+ brc_param_multiplier = (FFMAX(FFMAX3(job->vbitrate, pv->param.rc.vbv_max_bitrate, pv->param.rc.vbv_buffer_size / 8),
+ pv->param.rc.vbv_buffer_init / 8) + 0x10000) / 0x10000;
 // set VBV here (this will be overridden for CQP and ignored for LA)
 // only set BufferSizeInKB, InitialDelayInKB and MaxKbps if we have
- // them - otheriwse Media SDK will pick values for us automatically
+ // them - otherwise Media SDK will pick values for us automatically
 if (pv->param.rc.vbv_buffer_size > 0)
 {
 if (pv->param.rc.vbv_buffer_init > 1.0)
 {
- pv->param.videoParam->mfx.InitialDelayInKB = (pv->param.rc.vbv_buffer_init / 8);
+ pv->param.videoParam->mfx.InitialDelayInKB = (pv->param.rc.vbv_buffer_init / 8) / brc_param_multiplier;
 }
 else if (pv->param.rc.vbv_buffer_init > 0.0)
 {
 pv->param.videoParam->mfx.InitialDelayInKB = (pv->param.rc.vbv_buffer_size *
- pv->param.rc.vbv_buffer_init / 8);
+ pv->param.rc.vbv_buffer_init / 8) / brc_param_multiplier;
 }
- pv->param.videoParam->mfx.BufferSizeInKB = (pv->param.rc.vbv_buffer_size / 8);
+ pv->param.videoParam->mfx.BufferSizeInKB = (pv->param.rc.vbv_buffer_size / 8) / brc_param_multiplier;
+ pv->param.videoParam->mfx.BRCParamMultiplier = brc_param_multiplier;
 }
 if (pv->param.rc.vbv_max_bitrate > 0)
 {
- pv->param.videoParam->mfx.MaxKbps = pv->param.rc.vbv_max_bitrate;
+ pv->param.videoParam->mfx.MaxKbps = pv->param.rc.vbv_max_bitrate / brc_param_multiplier;
+ pv->param.videoParam->mfx.BRCParamMultiplier = brc_param_multiplier;
 }
 
 // set rate control parameters
@@ -1282,8 +1491,9 @@
 if (pv->param.rc.lookahead)
 {
 // introduced in API 1.7
- pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_LA;
- pv->param.videoParam->mfx.TargetKbps = job->vbitrate;
+ pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_LA;
+ pv->param.videoParam->mfx.TargetKbps = job->vbitrate / brc_param_multiplier;
+ pv->param.videoParam->mfx.BRCParamMultiplier = brc_param_multiplier;
 // ignored, but some drivers will change AsyncDepth because of it
 pv->param.codingOption2.ExtBRC = MFX_CODINGOPTION_OFF;
 }
@@ -1298,7 +1508,8 @@
 {
 pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_VBR;
 }
- pv->param.videoParam->mfx.TargetKbps = job->vbitrate;
+ pv->param.videoParam->mfx.TargetKbps = job->vbitrate / brc_param_multiplier;
+ pv->param.videoParam->mfx.BRCParamMultiplier = brc_param_multiplier;
 }
 }
 else
@@ -1391,7 +1602,8 @@
 * this is fine since the actual encode will use the same
 * values for all parameters relevant to the output bitstream
 */
- mfxStatus err;
+ int err;
+ mfxStatus sts;
 mfxVersion version;
 mfxVideoParam videoParam;
 mfxExtBuffer *extParamArray3;
@@ -1401,17 +1613,17 @@
 mfxExtCodingOptionSPSPPS sps_pps_buf, *sps_pps = &sps_pps_buf;
 version.Major = HB_QSV_MINVERSION_MAJOR;
 version.Minor = HB_QSV_MINVERSION_MINOR;
- err = MFXInit(pv->qsv_info->implementation, &version, &session);
- if (err != MFX_ERR_NONE)
+ sts = MFXInit(pv->qsv_info->implementation, &version, &session);
+ if (sts != MFX_ERR_NONE)
 {
- hb_error("encqsvInit: MFXInit failed (%d)", err);
+ hb_error("encqsvInit: MFXInit failed (%d) with implementation %d", sts, pv->qsv_info->implementation);
 return -1;
 }
 
 if (pv->qsv_info->implementation & MFX_IMPL_HARDWARE_ANY)
 {
 // On linux, the handle to the VA display must be set.
- // This code is essentiall a NOP other platforms.
+ // This code is essentially a NOP other platforms.
 pv->display = hb_qsv_display_init();
 if (pv->display != NULL)
 {
@@ -1421,40 +1633,49 @@
 }
 
 /* Query the API version for hb_qsv_load_plugins */
- err = MFXQueryVersion(session, &version);
- if (err != MFX_ERR_NONE)
+ sts = MFXQueryVersion(session, &version);
+ if (sts != MFX_ERR_NONE)
 {
- hb_error("encqsvInit: MFXQueryVersion failed (%d)", err);
+ hb_error("encqsvInit: MFXQueryVersion failed (%d)", sts);
 MFXClose(session);
 return -1;
 }
 
+#if !HB_QSV_ONEVPL
 /* Load required MFX plug-ins */
- pv->loaded_plugins = hb_qsv_load_plugins(pv->qsv_info, session, version);
+ pv->loaded_plugins = hb_qsv_load_plugins(hb_qsv_get_adapter_index(), pv->qsv_info, session, version);
 if (pv->loaded_plugins == NULL)
 {
 hb_error("encqsvInit: hb_qsv_load_plugins failed");
 MFXClose(session);
 return -1;
 }
+#endif
 
- err = MFXVideoENCODE_Init(session, pv->param.videoParam);
+ sts = MFXVideoENCODE_Init(session, pv->param.videoParam);
 // workaround for the early 15.33.x driver, should be removed later
 #define HB_DRIVER_FIX_33
 #ifdef HB_DRIVER_FIX_33
 int la_workaround = 0;
- if (err < MFX_ERR_NONE &&
+ if (sts < MFX_ERR_NONE &&
 pv->param.videoParam->mfx.RateControlMethod == MFX_RATECONTROL_LA)
 {
 pv->param.videoParam->mfx.RateControlMethod = MFX_RATECONTROL_CBR;
- err = MFXVideoENCODE_Init(session, pv->param.videoParam);
+ sts = MFXVideoENCODE_Init(session, pv->param.videoParam);
 la_workaround = 1;
 }
 #endif
- if (err < MFX_ERR_NONE) // ignore warnings
+ if (sts < MFX_ERR_NONE) // ignore warnings
 {
- hb_error("encqsvInit: MFXVideoENCODE_Init failed (%d)", err);
+ hb_error("encqsvInit: MFXVideoENCODE_Init failed (%d)", sts);
+ err = log_encoder_params(pv, pv->param.videoParam);
+ if (err < 0)
+ {
+ hb_error("encqsvInit: log_encoder_params failed (%d)", err);
+ }
+#if !HB_QSV_ONEVPL
 hb_qsv_unload_plugins(&pv->loaded_plugins, session, version);
+#endif
 MFXClose(session);
 return -1;
 }
@@ -1491,11 +1712,13 @@
 {
 videoParam.ExtParamvideoParam.NumExtParam++ = (mfxExtBuffer*)option2;
 }
- err = MFXVideoENCODE_GetVideoParam(session, &videoParam);
- if (err != MFX_ERR_NONE)
+ sts = MFXVideoENCODE_GetVideoParam(session, &videoParam);
+ if (sts != MFX_ERR_NONE)
 {
- hb_error("encqsvInit: MFXVideoENCODE_GetVideoParam failed (%d)", err);
+ hb_error("encqsvInit: MFXVideoENCODE_GetVideoParam failed (%d)", sts);
+#if !HB_QSV_ONEVPL
 hb_qsv_unload_plugins(&pv->loaded_plugins, session, version);
+#endif
 MFXClose(session);
 return -1;
 }
@@ -1516,7 +1739,9 @@
 if (qsv_hevc_make_header(w, session) < 0)
 {
 hb_error("encqsvInit: qsv_hevc_make_header failed");
+#if !HB_QSV_ONEVPL
 hb_qsv_unload_plugins(&pv->loaded_plugins, session, version);
+#endif
 MFXVideoENCODE_Close(session);
 MFXClose(session);
 return -1;
@@ -1543,7 +1768,9 @@
 }
 else
 {
+#if !HB_QSV_ONEVPL
 hb_qsv_unload_plugins(&pv->loaded_plugins, session, version);
+#endif
 MFXClose(session);
 }
 
@@ -1568,173 +1795,13 @@
 pv->list_dts = hb_list_init();
 }
 
- // log code path and main output settings
- hb_log("encqsvInit: using %s%s path",
- pv->is_sys_mem ? "encode-only" : "full QSV",
- videoParam.mfx.LowPower == MFX_CODINGOPTION_ON ? " (LowPower)" : "" );
- hb_log("encqsvInit: %s %s profile @ level %s",
- hb_qsv_codec_name (videoParam.mfx.CodecId),
- hb_qsv_profile_name(videoParam.mfx.CodecId, videoParam.mfx.CodecProfile),
- hb_qsv_level_name (videoParam.mfx.CodecId, videoParam.mfx.CodecLevel));
- hb_log("encqsvInit: TargetUsage %"PRIu16" AsyncDepth %"PRIu16"",
- videoParam.mfx.TargetUsage, videoParam.AsyncDepth);
- hb_log("encqsvInit: GopRefDist %"PRIu16" GopPicSize %"PRIu16" NumRefFrame %"PRIu16"",
- videoParam.mfx.GopRefDist, videoParam.mfx.GopPicSize, videoParam.mfx.NumRefFrame);
- if (pv->qsv_info->capabilities & HB_QSV_CAP_B_REF_PYRAMID)
- {
- hb_log("encqsvInit: BFramesMax %d BRefType %s",
- videoParam.mfx.GopRefDist > 1 ?
- videoParam.mfx.GopRefDist - 1 : 0,
- pv->param.gop.b_pyramid ? "pyramid" : "off");
- }
- else
- {
- hb_log("encqsvInit: BFramesMax %d",
- videoParam.mfx.GopRefDist > 1 ?
- videoParam.mfx.GopRefDist - 1 : 0);
- }
- if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_IB_ADAPT)
- {
- if (option2->AdaptiveI != MFX_CODINGOPTION_OFF ||
- option2->AdaptiveB != MFX_CODINGOPTION_OFF)
- {
- if (videoParam.mfx.GopRefDist > 1)
- {
- hb_log("encqsvInit: AdaptiveI %s AdaptiveB %s",
- hb_qsv_codingoption_get_name(option2->AdaptiveI),
- hb_qsv_codingoption_get_name(option2->AdaptiveB));
- }
- else
- {
- hb_log("encqsvInit: AdaptiveI %s",
- hb_qsv_codingoption_get_name(option2->AdaptiveI));
- }
- }
- }
- if (videoParam.mfx.RateControlMethod == MFX_RATECONTROL_CQP)
+ err = log_encoder_params(pv, &videoParam);
+ if (err < 0)
 {
- char qpi7, qpp9, qpb9;
- snprintf(qpi, sizeof(qpi), "QPI %"PRIu16"", videoParam.mfx.QPI);
- snprintf(qpp, sizeof(qpp), " QPP %"PRIu16"", videoParam.mfx.QPP);
- snprintf(qpb, sizeof(qpb), " QPB %"PRIu16"", videoParam.mfx.QPB);
- hb_log("encqsvInit: RateControlMethod CQP with %s%s%s", qpi,
- videoParam.mfx.GopPicSize > 1 ? qpp : "",
- videoParam.mfx.GopRefDist > 1 ? qpb : "");
- }
- else
- {
- switch (videoParam.mfx.RateControlMethod)
- {
- case MFX_RATECONTROL_LA:
- hb_log("encqsvInit: RateControlMethod LA TargetKbps %"PRIu16" LookAheadDepth %"PRIu16"",
- videoParam.mfx.TargetKbps, option2->LookAheadDepth);
- break;
- case MFX_RATECONTROL_LA_ICQ:
- hb_log("encqsvInit: RateControlMethod LA_ICQ ICQQuality %"PRIu16" LookAheadDepth %"PRIu16"",
- videoParam.mfx.ICQQuality, option2->LookAheadDepth);
- break;
- case MFX_RATECONTROL_ICQ:
- hb_log("encqsvInit: RateControlMethod ICQ ICQQuality %"PRIu16"",
- videoParam.mfx.ICQQuality);
- break;
- case MFX_RATECONTROL_CBR:
- case MFX_RATECONTROL_VBR:
- hb_log("encqsvInit: RateControlMethod %s TargetKbps %"PRIu16" MaxKbps %"PRIu16" BufferSizeInKB %"PRIu16" InitialDelayInKB %"PRIu16"",
- videoParam.mfx.RateControlMethod == MFX_RATECONTROL_CBR ? "CBR" : "VBR",
- videoParam.mfx.TargetKbps, videoParam.mfx.MaxKbps,
- videoParam.mfx.BufferSizeInKB, videoParam.mfx.InitialDelayInKB);
- break;
- default:
- hb_log("encqsvInit: invalid rate control method %"PRIu16"",
- videoParam.mfx.RateControlMethod);
- return -1;
- }
- }
- if ((pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_LA_DOWNS) &&
- (videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA ||
- videoParam.mfx.RateControlMethod == MFX_RATECONTROL_LA_ICQ))
- {
- switch (option2->LookAheadDS)
- {
- case MFX_LOOKAHEAD_DS_UNKNOWN:
- hb_log("encqsvInit: LookAheadDS unknown (auto)");
- break;
- case MFX_LOOKAHEAD_DS_OFF: // default
- break;
- case MFX_LOOKAHEAD_DS_2x:
- hb_log("encqsvInit: LookAheadDS 2x");
- break;
- case MFX_LOOKAHEAD_DS_4x:
- hb_log("encqsvInit: LookAheadDS 4x");
- break;
- default:
- hb_log("encqsvInit: invalid LookAheadDS value 0x%"PRIx16"",
- option2->LookAheadDS);
- break;
- }
- }
- switch (videoParam.mfx.FrameInfo.PicStruct)
- {
- case MFX_PICSTRUCT_PROGRESSIVE: // default
- break;
- case MFX_PICSTRUCT_FIELD_TFF:
- hb_log("encqsvInit: PicStruct top field first");
- break;
- case MFX_PICSTRUCT_FIELD_BFF:
- hb_log("encqsvInit: PicStruct bottom field first");
- break;
- default:
- hb_error("encqsvInit: invalid PicStruct value 0x%"PRIx16"",
- videoParam.mfx.FrameInfo.PicStruct);
- return -1;
- }
- if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION1)
- {
- if (videoParam.mfx.CodecId == MFX_CODEC_AVC)
- {
- if (option1->CAVLC != MFX_CODINGOPTION_OFF)
- {
- hb_log("encqsvInit: CAVLC %s",
- hb_qsv_codingoption_get_name(option1->CAVLC));
- }
- }
- }
- if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_EXTBRC)
- {
- if (option2->ExtBRC != MFX_CODINGOPTION_OFF)
- {
- hb_log("encqsvInit: ExtBRC %s",
- hb_qsv_codingoption_get_name(option2->ExtBRC));
- }
- }
- if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_MBBRC)
- {
- if (option2->MBBRC != MFX_CODINGOPTION_ON)
- {
- hb_log("encqsvInit: MBBRC %s",
- hb_qsv_codingoption_get_name(option2->MBBRC));
- }
- }
- if (pv->qsv_info->capabilities & HB_QSV_CAP_OPTION2_TRELLIS)
- {
- switch (option2->Trellis)
- {
- case MFX_TRELLIS_OFF: // default
- break;
- case MFX_TRELLIS_UNKNOWN:
- hb_log("encqsvInit: Trellis unknown (auto)");
- break;
- default:
- hb_log("encqsvInit: Trellis on (%s%s%s)",
- (option2->Trellis & MFX_TRELLIS_I) ? "I" : "",
- (option2->Trellis & MFX_TRELLIS_P) &&
- (videoParam.mfx.GopPicSize > 1) ? "P" : "",
- (option2->Trellis & MFX_TRELLIS_B) &&
- (videoParam.mfx.GopRefDist > 1) ? "B" : "");
- break;
- }
+ hb_error("encqsvInit: log_encoder_params failed (%d)", err);
+ return -1;
 }
-
+ pv->max_buffer_size = videoParam.mfx.BufferSizeInKB;
 // AsyncDepth has now been set and/or modified by Media SDK
 // fall back to default if zero
 pv->max_async_depth = videoParam.AsyncDepth ? videoParam.AsyncDepth : HB_QSV_ASYNC_DEPTH_DEFAULT;
@@ -1758,14 +1825,14 @@
 
 if (qsv_ctx != NULL)
 {
+#if !HB_QSV_ONEVPL
 /* Unload MFX plug-ins */
 if (MFXQueryVersion(qsv_ctx->mfx_session, &version) == MFX_ERR_NONE)
 {
 hb_qsv_unload_plugins(&pv->loaded_plugins, qsv_ctx->mfx_session, version);
 }
-
- /* QSV context cleanup and MFXClose */
- hb_qsv_context_clean(qsv_ctx);
+#endif
+ hb_qsv_uninit_enc(pv->job);
 
 hb_display_close(&pv->display);
 
@@ -1809,14 +1876,7 @@
 }
 qsv_enc_space->is_init_done = 0;
 }
-
- if (pv->is_sys_mem)
- {
- av_freep(&qsv_ctx);
- }
 }
-
- hb_qsv_uninit_enc();
 }
 
 if (pv != NULL)
@@ -2056,8 +2116,10 @@
 
 static int qsv_enc_work(hb_work_private_t *pv,
 hb_qsv_list *qsv_atom,
- mfxFrameSurface1 *surface)
+ mfxFrameSurface1 *surface,
+ HBQSVFramesContext *frames_ctx)
 {
+ int err;
 mfxStatus sts;
 hb_qsv_context *qsv_ctx = pv->job->qsv.ctx;
 hb_qsv_space *qsv_enc_space = pv->job->qsv.ctx->enc_space;
@@ -2083,7 +2145,7 @@
 {
 if(!pv->is_sys_mem && surface)
 {
- hb_qsv_release_surface_from_pool(surface->Data.MemId);
+ hb_qsv_release_surface_from_pool_by_surface_pointer(frames_ctx, surface);
 }
 
 if (qsv_atom != NULL)
@@ -2105,14 +2167,20 @@
 }
 else
 {
- hb_qsv_stage *new_stage = hb_qsv_stage_init();
- new_stage->type = HB_QSV_ENCODE;
- new_stage->in.p_surface = surface;
- new_stage->out.sync = qsv_enc_space->p_syncpsync_idx;
- new_stage->out.p_bs = task->bs;
- task->stage = new_stage;
+ hb_qsv_stage *new_stage = hb_qsv_stage_init();
+ new_stage->type = HB_QSV_ENCODE;
+ new_stage->in.p_surface = surface;
+ new_stage->in.p_frames_ctx = frames_ctx;
+ new_stage->out.sync = qsv_enc_space->p_syncpsync_idx;
+ new_stage->out.p_bs = task->bs;
+ task->stage = new_stage;
 pv->async_depth++;
 
+ if(!pv->is_sys_mem && surface)
+ {
+ hb_qsv_release_surface_from_pool_by_surface_pointer(frames_ctx, surface);
+ }
+
 if (qsv_atom != NULL)
 {
 hb_qsv_add_stagee(&qsv_atom, new_stage, HAVE_THREADS);
@@ -2155,12 +2223,11 @@
 pv->async_depth--;
 
 /* perform a sync operation to get the output bitstream */
- hb_qsv_wait_on_sync(qsv_ctx, task->stage);
-
- mfxFrameSurface1 *surface = task->stage->in.p_surface;
- if(!pv->is_sys_mem && surface)
+ err = hb_qsv_wait_on_sync(qsv_ctx, task->stage);
+ if (err < 0)
 {
- hb_qsv_release_surface_from_pool(surface->Data.MemId);
+ hb_error("encqsv: hb_qsv_wait_on_sync failed (%d)", err);
+ return err;
 }
 
 if (task->bs->DataLength > 0)
@@ -2191,6 +2258,7 @@
 
 int encqsvWork(hb_work_object_t *w, hb_buffer_t **buf_in, hb_buffer_t **buf_out)
 {
+ int err;
 hb_work_private_t *pv = w->private_data;
 hb_buffer_t *in = *buf_in;
 hb_job_t *job = pv->job;
@@ -2210,14 +2278,20 @@
 */
 if (in->s.flags & HB_BUF_FLAG_EOF)
 {
- qsv_enc_work(pv, NULL, NULL);
+ err = qsv_enc_work(pv, NULL, NULL, NULL);
+ if (err < 0)
+ {
+ hb_error("encqsvWork: EOF qsv_enc_work failed %d", err);
+ goto fail;
+ }
 hb_buffer_list_append(&pv->encoded_frames, in);
 *buf_out = hb_buffer_list_clear(&pv->encoded_frames);
 *buf_in = NULL; // don't let 'work_loop' close this buffer
 return HB_WORK_DONE;
 }
 
- mfxFrameSurface1 *surface = NULL;
+ mfxFrameSurface1 *surface = NULL;
+ HBQSVFramesContext *frames_ctx = NULL;
 hb_qsv_list *qsv_atom = NULL;
 hb_qsv_context *qsv_ctx = job->qsv.ctx;
 hb_qsv_space *qsv_enc_space = job->qsv.ctx->enc_space;
@@ -2240,23 +2314,16 @@
 {
 #if HB_PROJECT_FEATURE_QSV
 QSVMid *mid = NULL;
- if(in->qsv_details.frame)
+ if (in->qsv_details.frame && in->qsv_details.frame->data3)
 {
 surface = ((mfxFrameSurface1*)in->qsv_details.frame->data3);
- mid = surface->Data.MemId;
- }
- else
- {
- // Create black buffer in the begining of the encoding, usually first 2 frames
- hb_qsv_get_free_surface_from_pool(HB_POOL_SURFACE_SIZE - HB_POOL_ENCODER_SIZE, HB_POOL_SURFACE_SIZE, &mid, &surface);
- }
-
- if(surface)
- {
- hb_qsv_replace_surface_mid(mid, surface);
+ frames_ctx = in->qsv_details.qsv_frames_ctx;
+ hb_qsv_get_mid_by_surface_from_pool(frames_ctx, surface, &mid);
+ hb_qsv_replace_surface_mid(frames_ctx, mid, surface);
 }
 else
 {
+ hb_error("encqsv: in->qsv_details no surface available");
 goto fail;
 }
 #endif
@@ -2307,15 +2374,17 @@
 * the encoder to make sure the next frame is a keyframe
 *
 * The hard reset ensures encoding resumes with a clean state, avoiding
- * miscellaneous hard-to-disagnose issues that may occur when resuming
+ * miscellaneous hard-to-diagnose issues that may occur when resuming
 * an encode after flushing the encoder or using MFXVideoENCODE_Reset.
 */
 if (in->s.new_chap > 0 && job->chapter_markers)
 {
 mfxStatus sts;
 
- if (qsv_enc_work(pv, NULL, NULL) < 0)
+ err = qsv_enc_work(pv, NULL, NULL, NULL);
+ if (err < 0)
 {
+ hb_error("encqsvWork: new_chap qsv_enc_work failed %d", err);
 goto fail;
 }
 
@@ -2352,8 +2421,10 @@
 /*
 * Now that the input surface is setup, we can encode it.
 */
- if (qsv_enc_work(pv, qsv_atom, surface) < 0)
+ err = qsv_enc_work(pv, qsv_atom, surface, frames_ctx);
+ if (err < 0)
 {
+ hb_error("encqsvWork: qsv_enc_work failed %d", err);
 goto fail;
 }
 #if HB_PROJECT_FEATURE_QSV

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encavcodec.c -> HandBrake-1.5.1.tar.xz/libhb/encavcodec.c Changed

@@ -1,6 +1,6 @@
 /* encavcodec.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -14,6 +14,11 @@
 #include "handbrake/h265_common.h"
 #include "handbrake/nal_units.h"
 
+#if HB_PROJECT_FEATURE_NVENC
+#include "handbrake/nvenc_common.h"
+#endif
+
+
 /*
 * The frame info struct remembers information about each frame across calls
 * to avcodec_encode_video. Since frames are uniquely identified by their
@@ -31,6 +36,7 @@
 {
 hb_job_t * job;
 AVCodecContext * context;
+ AVPacket * pkt;
 FILE * file;
 
 int frameno_in;
@@ -70,7 +76,7 @@
 
 static const char * const h26x_nvenc_preset_names =
 {
- "hq", "hp", "fast", "medium", "slow", "default", NULL // No Lossless "losslesshp", "lossless", "llhp", "llhq", "ll", "bd". We don't need them.
+ "fastest", "faster", "fast", "medium", "slow", "slower", "slowest", NULL
 };
 
 static const char * const h264_nvenc_profile_names =
@@ -83,19 +89,29 @@
 "auto", "main", NULL // "main10", "rext" We do not currently support 10bit encodes with this encoder.
 };
 
-static const char * const h26x_vt_preset_name =
+static const char * const h26x_mf_preset_name =
 {
 "default", NULL
 };
 
-static const char * const h264_vt_profile_name =
+static const char * const h264_mf_profile_name =
 {
 "auto", "baseline", "main", "high", NULL
 };
 
-static const char * const h265_vt_profile_name =
+static const char * const h265_mf_profile_name =
+{
+ "auto", "main", NULL
+};
+
+static const enum AVPixelFormat pix_fmts =
 {
- "auto", "main", NULL // "main10" not currently supported.
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat h26x_mf_pix_fmts =
+{
+ AV_PIX_FMT_NV12, AV_PIX_FMT_NONE
 };
 
 int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
@@ -111,6 +127,14 @@
 w->private_data = pv;
 pv->job = job;
 pv->chapter_queue = hb_chapter_queue_init();
+ pv->pkt = av_packet_alloc();
+
+ if (pv->pkt == NULL)
+ {
+ hb_log("encavcodecInit: av_packet_alloc failed");
+ ret = 1;
+ goto done;
+ }
 
 hb_buffer_list_clear(&pv->delay_list);
 
@@ -150,9 +174,9 @@
 hb_log("encavcodecInit: H.264 (AMD VCE)");
 codec_name = "h264_amf";
 break;
- case HB_VCODEC_FFMPEG_VT_H264:
- hb_log("encavcodecInit: H.264 (VideoToolbox)");
- codec_name = "h264_videotoolbox";
+ case HB_VCODEC_FFMPEG_MF_H264:
+ hb_log("encavcodecInit: H.264 (MediaFoundation)");
+ codec_name = "h264_mf";
 break;
 }
 }break;
@@ -167,9 +191,9 @@
 hb_log("encavcodecInit: H.265 (AMD VCE)");
 codec_name = "hevc_amf";
 break;
- case HB_VCODEC_FFMPEG_VT_H265:
- hb_log("encavcodecInit: H.265 (VideoToolbox)");
- codec_name = "hevc_videotoolbox";
+ case HB_VCODEC_FFMPEG_MF_H265:
+ hb_log("encavcodecInit: H.265 (MediaFoundation)");
+ codec_name = "hevc_mf";
 break;
 }
 }break;
@@ -250,6 +274,7 @@
 
 context->time_base.den = fps.num;
 context->time_base.num = fps.den;
+ context->framerate = fps;
 context->gop_size = ((double)job->orig_vrate.num / job->orig_vrate.den +
 0.5) * 10;
 if ((job->vcodec == HB_VCODEC_FFMPEG_VCE_H264) || (job->vcodec == HB_VCODEC_FFMPEG_VCE_H265))
@@ -311,14 +336,37 @@
 
 if ( job->vcodec == HB_VCODEC_FFMPEG_NVENC_H264 ||
 job->vcodec == HB_VCODEC_FFMPEG_NVENC_H265 ) {
- av_dict_set( &av_opts, "rc", "cbr_hq", 0 );
- hb_log( "encavcodec: encoding at rc=cbr_hq Bitrate %d", job->vbitrate );
+ av_dict_set( &av_opts, "rc", "vbr", 0 );
+ av_dict_set( &av_opts, "multipass", "fullres", 0 );
+ hb_log( "encavcodec: encoding at rc=vbr, multipass=fullres, Bitrate %d", job->vbitrate );
 }
 
- if ( job->vcodec == HB_VCODEC_FFMPEG_VCE_H264 || job->vcodec == HB_VCODEC_FFMPEG_VCE_H265 ) {
+ if ( job->vcodec == HB_VCODEC_FFMPEG_VCE_H264 || job->vcodec == HB_VCODEC_FFMPEG_VCE_H265 )
+ {
 av_dict_set( &av_opts, "rc", "vbr_peak", 0 );
+
+ // since we do not have scene change detection, set a
+ // relatively short gop size to help avoid stale references
+ context->gop_size = (int)(FFMIN(av_q2d(fps) * 2, 120));
+
+ //Work around an ffmpeg issue mentioned in issue #3447
+ if (job->vcodec == HB_VCODEC_FFMPEG_VCE_H265)
+ {
+ av_dict_set( &av_opts, "qmin", "0", 0 );
+ av_dict_set( &av_opts, "qmax", "51", 0 );
+ }
 hb_log( "encavcodec: encoding at rc=vbr_peak Bitrate %d", job->vbitrate );
 }
+
+ if (job->vcodec == HB_VCODEC_FFMPEG_MF_H264 ||
+ job->vcodec == HB_VCODEC_FFMPEG_MF_H265) {
+ av_dict_set(&av_opts, "rate_control", "u_vbr", 0); // options are cbr, pc_vbr, u_vbr, ld_vbr, g_vbr, gld_vbr
+
+ // On Qualcomm encoders, the VBR modes can easily drop frames if
+ // the rate control feels like it needs it (in certain
+ // configurations), unless scenario is set to camera_record.
+ av_dict_set(&av_opts, "scenario", "camera_record", 0);
+ }
 }
 else
 {
@@ -367,17 +415,22 @@
 
 context->bit_rate = 0;
 
- av_dict_set( &av_opts, "rc", "vbr_hq", 0 );
+ av_dict_set( &av_opts, "rc", "vbr", 0 );
 av_dict_set( &av_opts, "cq", quality, 0 );
+ av_dict_set( &av_opts, "multipass", "fullres", 0 );
 
 // further Advanced Quality Settings in Constant Quality Mode
 av_dict_set( &av_opts, "init_qpP", quality, 0 );
 av_dict_set( &av_opts, "init_qpB", qualityB, 0 );
 av_dict_set( &av_opts, "init_qpI", qualityI, 0 );
- hb_log( "encavcodec: encoding at rc=vbr %.2f", job->vquality );
+ hb_log( "encavcodec: encoding at rc=vbr, multipass=fullres, %.2f", job->vquality );
 }
- else if ( job->vcodec == HB_VCODEC_FFMPEG_VCE_H264 || job->vcodec == HB_VCODEC_FFMPEG_VCE_H265 )
+ else if ( job->vcodec == HB_VCODEC_FFMPEG_VCE_H264 )
 {
+ // since we do not have scene change detection, set a
+ // relatively short gop size to help avoid stale references
+ context->gop_size = (int)(FFMIN(av_q2d(fps) * 2, 120));
+
 char quality7;
 char qualityB7;
 double adjustedQualityB = job->vquality + 2;
@@ -393,12 +446,365 @@
 
 av_dict_set( &av_opts, "qp_i", quality, 0 );
 av_dict_set( &av_opts, "qp_p", quality, 0 );
+ av_dict_set( &av_opts, "qp_b", qualityB, 0 );
+ hb_log( "encavcodec: encoding at QP %.2f", job->vquality );
+ }
+ else if ( job->vcodec == HB_VCODEC_FFMPEG_VCE_H265 )
+ {
+ char *vce_h265_max_au_size_char,
+ vce_h265_q_char4;
+ int vce_h265_cq_step,
+ vce_h265_max_au_size,
+ vce_h265_max_au_size_length,
+ vce_h265_qmin,
+ vce_h265_qmax,
+ vce_h265_qmin_p,
+ vce_h265_qmax_p,
+ vce_h265_threshold;
+ double vce_h265_bit_rate,
+ vce_h265_buffer_size,
+ vce_h265_comp_factor,
+ vce_h265_exp_scale,
+ vce_h265_max_rate = 0;
+
+ /*
+ constant quality tuning for peak constrained vbr rate control
+
+ summary of settings:
+ - set a relatively short gop size to help avoid stale references, since we do not have scene detection
+ - constrain qmin and qmax to ensure consistent visual quality window regardless of complexity in detail and/or motion
+ - limit max rate to 1.3x (effectively ~2x) target bit rate to allow adequate variance while avoiding extreme peaks
+ - calculate hrd buffer size based on max rate to manage short term data rate in conjunction with max au size
+ - set max au size to 1/4 hrd buffer size to improve intra-gop bit allocation and minimize refresh/recovery effects at gop transitions
+
+ additional settings for low quality / bit rates:
+ - increase gop size slightly to save bits by reducing total keyframe count
+ - increase qmin to save bits by minimizing overallocation to static scenes
+ - increase max rate to give the encoder flexibility in reallocating saved bits
+ - increase qmax as a last resort to avoid overshooting data rate
+ */
+
+ // set gop size to two seconds in frames
+ context->gop_size = (int)(FFMIN(av_q2d(fps) * 2, 120));
+
+ // the fun part
+ if (job->vquality > 0 && job->vquality < 51)
+ {
+ // set rc mode to peak constrained vbr
+ av_dict_set( &av_opts, "rc", "vbr_peak", 0 );
+
+ /*
+ // calculate CQ 33 bit rate, which is the basis for all other CQ bit rates
+ vce_h265_bit_rate = ((sqrt(sqrt(job->width * job->height) * job->width * job->height / 1000) * 1.2) + 150) * 1000;
+
+ // initial compounding factor for calculating bit rates for other CQ values
+ vce_h265_comp_factor = 1.16;
+
+ // calculate CQ 39 bit rate, which is the low bit rate quality threshold
+ vce_h265_threshold = vce_h265_bit_rate * pow(1.0L / vce_h265_comp_factor, 5);
+
+ // calculate bit rate for user specified CQ value
+ if (job->vquality < 33)
+ {
+ for (vce_h265_cq_step = 32; vce_h265_cq_step >= job->vquality; vce_h265_cq_step--)
+ {
+ if (vce_h265_cq_step < 18)
+ {
+ vce_h265_comp_factor = 1.14; // vce_h265_comp_factor * 0.9827586207;
+ }
+ if (vce_h265_cq_step < 15)
+ {
+ vce_h265_comp_factor = 1.12; // vce_h265_comp_factor * 0.9824561404;
+ }
+ vce_h265_bit_rate = vce_h265_bit_rate * vce_h265_comp_factor;
+ }
+ }
+ else if (job->vquality > 33)
+ {
+ for (vce_h265_cq_step = 34; vce_h265_cq_step <= job->vquality; vce_h265_cq_step++)
+ {
+ if (vce_h265_cq_step > 39)
+ {
+ vce_h265_comp_factor = 1.15; // vce_h265_comp_factor * 0.9913793103;
+ }
+ if (vce_h265_cq_step > 49)
+ {
+ vce_h265_comp_factor = 1.25; // vce_h265_comp_factor * 1.0869565217;
+ }
+ vce_h265_bit_rate = vce_h265_bit_rate / vce_h265_comp_factor;
+ }
+ }
+ context->bit_rate = (int)(vce_h265_bit_rate);
+ */
 
- if ( job->vcodec != HB_VCODEC_FFMPEG_VCE_H265 )
+ // calculate CQ 30 bit rate, which is the basis for all other CQ bit rates
+ vce_h265_bit_rate = sqrt(job->width * job->height * pow(sqrt(job->width * job->height) / 1000, 2.5) + 400000) * 1000;
+
+ // initial compounding factor for calculating bit rates for other CQ values
+ vce_h265_comp_factor = 1.15;
+
+ // calculate CQ 39 bit rate, which is the low bit rate quality threshold
+ vce_h265_threshold = vce_h265_bit_rate * pow(1.0L / vce_h265_comp_factor, 8);
+
+ // calculate bit rate for user specified CQ value
+ if (job->vquality < 30)
+ {
+ vce_h265_comp_factor = 1.18;
+ for (vce_h265_cq_step = 29; vce_h265_cq_step >= job->vquality; vce_h265_cq_step--)
+ {
+ // reticulate splines
+ if (vce_h265_cq_step < 21)
+ {
+ vce_h265_comp_factor = 1.15;
+ }
+ if (vce_h265_cq_step < 15)
+ {
+ vce_h265_comp_factor = 1.12;
+ }
+ if (vce_h265_cq_step < 8)
+ {
+ vce_h265_comp_factor = 1.1;
+ }
+ if (vce_h265_cq_step < 3)
+ {
+ vce_h265_comp_factor = 1.08;
+ }
+ vce_h265_bit_rate = vce_h265_bit_rate * vce_h265_comp_factor;
+ }
+ }
+ else
+ {
+ for (vce_h265_cq_step = 31; vce_h265_cq_step <= job->vquality; vce_h265_cq_step++)
+ {
+ vce_h265_bit_rate = vce_h265_bit_rate / vce_h265_comp_factor;
+ }
+ }
+ context->bit_rate = (int)(vce_h265_bit_rate);
+
+ // QP 1-19
+ // constrain qmax to ensure bits are not underallocated to motion
+ vce_h265_qmin = 0;
+ vce_h265_qmax = (int)(sqrt(job->vquality - 0.75) * 8);
+ vce_h265_qmin_p = 0;
+ vce_h265_qmax_p = vce_h265_qmax + 2;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 12)
+ {
+ // CQ 20-22
+ // constrain qmin to ensure bits are not overallocated to low motion, static scenes
+ vce_h265_qmin = 4;
+ vce_h265_qmax = 34;
+ vce_h265_qmin_p = 8;
+ vce_h265_qmax_p = 38;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 8)
+ {
+ // CQ 23-27
+ vce_h265_qmin = 8;
+ vce_h265_qmax = 36;
+ vce_h265_qmin_p = 12;
+ vce_h265_qmax_p = 40;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 4)
+ {
+ // CQ 28-32
+ vce_h265_qmin = 16;
+ vce_h265_qmax = 38;
+ vce_h265_qmin_p = 19;
+ vce_h265_qmax_p = 42;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 2)
+ {
+ // CQ 33-38
+ // bit rate is at or just above the starvation threshold
+ // increase qmax to baseline for decent references (I) and minimal motion trails, recovery effects (P)
+ vce_h265_qmin = 19;
+ vce_h265_qmax = 39;
+ vce_h265_qmin_p = 22;
+ vce_h265_qmax_p = 44;
+
+ if (vce_h265_bit_rate <= vce_h265_threshold)
+ {
+ // CQ 39-40
+ // bit rate is at or just below the starvation threshold
+ // increase gop size to save bits by reducing total keyframe count
+ // increase qmin to continue saving bits by minimizing overallocation to static scenes
+ // increase qmax beyond baseline for decent references (I) and minimal motion trails, recovery effects (P)
+ // increase max rate to allow higher relative peaks in short bursts
+ context->gop_size = (int)(FFMIN(av_q2d(fps) * 3, 180));
+ vce_h265_qmin = 22;
+ vce_h265_qmax = 40;
+ vce_h265_qmin_p = 24;
+ vce_h265_qmax_p = 45;
+ vce_h265_max_rate = vce_h265_bit_rate * 1.5;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.85)
+ {
+ // CQ 41
+ vce_h265_qmin = 24;
+ vce_h265_qmax = 41;
+ vce_h265_qmin_p = 27;
+ vce_h265_qmax_p = 46;
+ vce_h265_max_rate = vce_h265_bit_rate * 2.5;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.7)
+ {
+ // CQ 42
+ vce_h265_qmin = 27;
+ vce_h265_qmax = 42;
+ vce_h265_qmin_p = 30;
+ vce_h265_qmax_p = 47;
+ vce_h265_max_rate = vce_h265_bit_rate * 6.5;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.6)
+ {
+ // CQ 43
+ vce_h265_qmin = 31;
+ vce_h265_qmax = 44;
+ vce_h265_qmin_p = 34;
+ vce_h265_qmax_p = 48;
+ vce_h265_max_rate = vce_h265_bit_rate * 15;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.51)
+ {
+ // CQ 44-45
+ vce_h265_qmin = 35;
+ vce_h265_qmax = 46;
+ vce_h265_qmin_p = 38;
+ vce_h265_qmax_p = 49;
+ vce_h265_max_rate = vce_h265_bit_rate * 19;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.42)
+ {
+ // CQ 46-47
+ // bit rate is insufficient for any motion
+ vce_h265_qmin = 39;
+ vce_h265_qmax = 48;
+ vce_h265_qmin_p = 42;
+ vce_h265_qmax_p = 50;
+ vce_h265_max_rate = vce_h265_bit_rate * 22;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.32)
+ {
+ // CQ 48-49
+ // bit rate is entirely insufficient
+ vce_h265_qmin = 43;
+ vce_h265_qmax = 49;
+ vce_h265_qmin_p = 46;
+ vce_h265_qmax_p = 50;
+ vce_h265_max_rate = vce_h265_bit_rate * 24;
+
+ if (vce_h265_bit_rate < vce_h265_threshold * 0.24)
+ {
+ // CQ 50
+ // there are no bits
+ vce_h265_qmin = 45;
+ vce_h265_qmax = 49;
+ vce_h265_qmin_p = 49;
+ vce_h265_qmax_p = 51;
+ vce_h265_max_rate = vce_h265_bit_rate * 10;
+ }
+
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // factor for calculating max rate and buffer size
+ vce_h265_exp_scale = FFMIN(1.0L * 1000000 / vce_h265_bit_rate, 1.0L);
+
+ // ideal max rate is ~1.3x target bit rate, diminishing on a curve as target bit rate increases
+ // this allows allows the actual bit rate to vary as needed to ensure consistent visual quality,
+ // while limiting potentially exteme one-second peaks to approximately double the target bit rate
+ if (vce_h265_max_rate == 0)
+ {
+ vce_h265_max_rate = vce_h265_bit_rate * ((vce_h265_exp_scale * 10) + 1);
+ vce_h265_max_rate = FFMAX(vce_h265_bit_rate * 1.05L, FFMIN(vce_h265_max_rate, vce_h265_bit_rate * 1.3L));
+ }
+ context->rc_max_rate = (int)(vce_h265_max_rate);
+
+ // ideal hrd buffer size is the calculated max rate, diminishing on a curve as target bit rate increases
+ // minimum 1/3 target bit rate ensures the buffer size is not too constrained at higher target bit rates
+ vce_h265_buffer_size = FFMAX(vce_h265_bit_rate / 3, vce_h265_max_rate - (vce_h265_max_rate / FFMAX(vce_h265_exp_scale * 150.0L, 1.5L)));
+ if (vce_h265_buffer_size / vce_h265_max_rate > 0.98L)
+ {
+ // buffer size is nearly identical to max rate, make them equal
+ vce_h265_buffer_size = vce_h265_max_rate;
+ }
+ context->rc_buffer_size = (int)(vce_h265_buffer_size);
+ context->rc_initial_buffer_occupancy = context->rc_buffer_size;
+
+ // ideal max au size (frame size + overhead) is 1/4 the hrd buffer size
+ // this improves bit allocation by preventing the encoder from spending too many bits early in the gop
+ // or during periods of low motion, leaving too few bits for remaining frames and objects in motion
+ // better intra-gop quality consistency also helps minimize refresh/recovery effects at gop transitions
+ // if max_au_size is set, libavcodec will also set enforce_hrd for us
+ vce_h265_max_au_size = (int)(vce_h265_buffer_size * 0.25);
+ vce_h265_max_au_size_length = snprintf(NULL, 0, "%d", vce_h265_max_au_size);
+ vce_h265_max_au_size_char = malloc(vce_h265_max_au_size_length + 1);
+ if( !vce_h265_max_au_size_char )
+ {
+ hb_log( "encavcodecInit: malloc of size %d "
+ "failed", vce_h265_max_au_size_length );
+ ret = 1;
+ goto done;
+ }
+ snprintf(vce_h265_max_au_size_char, vce_h265_max_au_size_length + 1, "%d", vce_h265_max_au_size);
+ av_dict_set( &av_opts, "max_au_size", vce_h265_max_au_size_char, 0 );
+ free(vce_h265_max_au_size_char);
+ }
+ else
 {
- av_dict_set( &av_opts, "qp_b", qualityB, 0 );
+ // set rc mode to cqp
+ av_dict_set( &av_opts, "rc", "cqp", 0 );
+
+ // set relatively long gop size for CQ 0
+ // does not affect quality; only IDR frequency and thus file size
+ context->gop_size = job->vquality < 1 ? 250 : (int)(FFMIN(av_q2d(fps) * 3, 180));
+
+ // CQ 0 == CQP 0
+ // CQ 51 == CQP 51
+ vce_h265_qmin = job->vquality < 1 ? 0 : 51;
+ vce_h265_qmax = vce_h265_qmin;
+ vce_h265_qmin_p = vce_h265_qmin;
+ vce_h265_qmax_p = vce_h265_qmin;
+ snprintf(vce_h265_q_char, 4, "%d", vce_h265_qmin);
+ av_dict_set( &av_opts, "qp_i", vce_h265_q_char, 0 );
+ av_dict_set( &av_opts, "qp_p", vce_h265_q_char, 0 );
 }
- hb_log( "encavcodec: encoding at QP %.2f", job->vquality );
+
+ context->qmin = vce_h265_qmin;
+ context->qmax = vce_h265_qmax;
+ snprintf(vce_h265_q_char, 4, "%d", vce_h265_qmin_p);
+ av_dict_set( &av_opts, "min_qp_p", vce_h265_q_char, 0 );
+ snprintf(vce_h265_q_char, 4, "%d", vce_h265_qmax_p);
+ av_dict_set( &av_opts, "max_qp_p", vce_h265_q_char, 0 );
+
+ hb_log( "encavcodec: encoding at constant quality %d", (int)(job->vquality) );
+ hb_log( "encavcodec: QP (I) %d-%d", vce_h265_qmin, vce_h265_qmax );
+ hb_log( "encavcodec: QP (P) %d-%d", vce_h265_qmin_p, vce_h265_qmax_p );
+ hb_log( "encavcodec: GOP Size %d", context->gop_size );
+ if (vce_h265_max_rate > 0)
+ {
+ hb_log( "encavcodec: Max Rate %"PRId64"", context->rc_max_rate/1000 );
+ hb_log( "encavcodec: Buffer Size %d", context->rc_buffer_size/1000 );
+ hb_log( "encavcodec: Max AU Size %d", vce_h265_max_au_size/1000 );
+ }
+ }
+ else if (job->vcodec == HB_VCODEC_FFMPEG_MF_H264 ||
+ job->vcodec == HB_VCODEC_FFMPEG_MF_H265)
+ {
+ char quality7;
+ snprintf(quality, 7, "%d", (int)job->vquality);
+ av_dict_set(&av_opts, "rate_control", "quality", 0);
+ av_dict_set(&av_opts, "quality", quality, 0);
 }
 else
 {
@@ -413,7 +819,7 @@
 }
 context->width = job->width;
 context->height = job->height;
- context->pix_fmt = AV_PIX_FMT_YUV420P;
+ context->pix_fmt = job->output_pix_fmt;
 
 context->sample_aspect_ratio.num = job->par.num;
 context->sample_aspect_ratio.den = job->par.den;
@@ -435,6 +841,7 @@
 context->color_primaries = hb_output_color_prim(job);
 context->color_trc = hb_output_color_transfer(job);
 context->colorspace = hb_output_color_matrix(job);
+ context->chroma_sample_location = job->chroma_location;
 
 if (!job->inline_parameter_sets)
 {
@@ -445,47 +852,6 @@
 context->flags |= AV_CODEC_FLAG_GRAY;
 }
 
- if (job->vcodec == HB_VCODEC_FFMPEG_VT_H264)
- {
- // Set profile and level
- if (job->encoder_profile != NULL && *job->encoder_profile)
- {
- if (!strcasecmp(job->encoder_profile, "baseline"))
- av_dict_set(&av_opts, "profile", "baseline", 0);
- else if (!strcasecmp(job->encoder_profile, "main"))
- av_dict_set(&av_opts, "profile", "main", 0);
- else if (!strcasecmp(job->encoder_profile, "high"))
- av_dict_set(&av_opts, "profile", "high", 0);
- }
-
- if (job->encoder_level != NULL && *job->encoder_level)
- {
- int i = 1;
- while (hb_h264_level_namesi != NULL)
- {
- if (!strcasecmp(job->encoder_level, hb_h264_level_namesi))
- av_dict_set(&av_opts, "level", job->encoder_level, 0);
- ++i;
- }
- }
-
- context->max_b_frames = 16;
- }
-
- if (job->vcodec == HB_VCODEC_FFMPEG_VT_H265)
- {
- // Set profile and level
- if (job->encoder_profile != NULL && *job->encoder_profile)
- {
- if (!strcasecmp(job->encoder_profile, "main"))
- av_dict_set(&av_opts, "profile", "main", 0);
- else if (!strcasecmp(job->encoder_profile, "main10"))
- av_dict_set(&av_opts, "profile", "main10", 0);
- }
-
- context->max_b_frames = 16;
- }
-
 if (job->vcodec == HB_VCODEC_FFMPEG_VCE_H264)
 {
 // Set profile and level
@@ -571,6 +937,35 @@
 av_dict_set(&av_opts, "gops_per_idr", "1", 0);
 }
 
+ if (job->vcodec == HB_VCODEC_FFMPEG_MF_H264)
+ {
+ context->profile = FF_PROFILE_UNKNOWN;
+ if (job->encoder_profile != NULL && *job->encoder_profile)
+ {
+ if (!strcasecmp(job->encoder_profile, "baseline"))
+ context->profile = FF_PROFILE_H264_BASELINE;
+ else if (!strcasecmp(job->encoder_profile, "main"))
+ context->profile = FF_PROFILE_H264_MAIN;
+ else if (!strcasecmp(job->encoder_profile, "high"))
+ context->profile = FF_PROFILE_H264_HIGH;
+ }
+
+ }
+
+ if (job->vcodec == HB_VCODEC_FFMPEG_MF_H264 ||
+ job->vcodec == HB_VCODEC_FFMPEG_MF_H265)
+ {
+ av_dict_set(&av_opts, "hw_encoding", "1", 0);
+ }
+
+ if (job->vcodec == HB_VCODEC_FFMPEG_MF_H265)
+ {
+ // Qualcomm's HEVC encoder does support b-frames. Some chipsets
+ // support setting this to either 1 or 2, while others only support
+ // setting it to 1.
+ context->max_b_frames = 1;
+ }
+
 if( job->pass_id == HB_PASS_ENCODE_1ST ||
 job->pass_id == HB_PASS_ENCODE_2ND )
 {
@@ -672,17 +1067,7 @@
 job->areBframes = 0;
 if (context->has_b_frames > 0)
 {
- if (job->vcodec == HB_VCODEC_FFMPEG_VT_H265)
- {
- // VT appears to enable b-pyramid by default and there
- // is no documented way of modifying this behaviour or
- // querying if it is enabled.
- job->areBframes = 2;
- }
- else
- {
- job->areBframes = context->has_b_frames;
- }
+ job->areBframes = context->has_b_frames;
 }
 
 if (context->extradata != NULL)
@@ -709,6 +1094,7 @@
 {
 return;
 }
+ av_packet_free(&pv->pkt);
 hb_chapter_queue_close(&pv->chapter_queue);
 if( pv->context )
 {
@@ -822,11 +1208,9 @@
 while (1)
 {
 int ret;
- AVPacket pkt;
 hb_buffer_t * out;
 
- av_init_packet(&pkt);
- ret = avcodec_receive_packet(pv->context, &pkt);
+ ret = avcodec_receive_packet(pv->context, pv->pkt);
 if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
 {
 break;
@@ -836,11 +1220,11 @@
 hb_log("encavcodec: avcodec_receive_packet failed");
 }
 
- out = hb_buffer_init(pkt.size);
- memcpy(out->data, pkt.data, out->size);
+ out = hb_buffer_init(pv->pkt->size);
+ memcpy(out->data, pv->pkt->data, out->size);
 
- int64_t frameno = pkt.pts;
- out->size = pkt.size;
+ int64_t frameno = pv->pkt->pts;
+ out->size = pv->pkt->size;
 out->s.start = get_frame_start(pv, frameno);
 out->s.duration = get_frame_duration(pv, frameno);
 out->s.stop = out->s.stop + out->s.duration;
@@ -850,7 +1234,7 @@
 // must be considered to potentially be reference frames
 out->s.flags = HB_FLAG_FRAMETYPE_REF;
 out->s.frametype = 0;
- if (pkt.flags & AV_PKT_FLAG_KEY)
+ if (pv->pkt->flags & AV_PKT_FLAG_KEY)
 {
 out->s.flags |= HB_FLAG_FRAMETYPE_KEY;
 hb_chapter_dequeue(pv->chapter_queue, out);
@@ -858,7 +1242,7 @@
 out = process_delay_list(pv, out);
 
 hb_buffer_list_append(list, out);
- av_packet_unref(&pkt);
+ av_packet_unref(pv->pkt);
 }
 }
 
@@ -871,6 +1255,7 @@
 
 frame.width = in->f.width;
 frame.height = in->f.height;
+ frame.format = in->f.fmt;
 frame.data0 = in->plane0.data;
 frame.data1 = in->plane1.data;
 frame.data2 = in->plane2.data;
@@ -1055,10 +1440,14 @@
 return apply_vp8_preset(av_opts, preset);
 case HB_VCODEC_FFMPEG_VP9:
 return apply_vp9_preset(av_opts, preset);
+ 
+#if HB_PROJECT_FEATURE_NVENC
 case HB_VCODEC_FFMPEG_NVENC_H264:
 case HB_VCODEC_FFMPEG_NVENC_H265:
- av_dict_set( av_opts, "preset", preset, 0);
- break;
+ preset = hb_map_nvenc_preset_name(preset);
+ av_dict_set( av_opts, "preset", preset, 0);
+ break;
+#endif
 default:
 break;
 }
@@ -1082,9 +1471,9 @@
 case HB_VCODEC_FFMPEG_NVENC_H265:
 return h26x_nvenc_preset_names;
 
- case HB_VCODEC_FFMPEG_VT_H264:
- case HB_VCODEC_FFMPEG_VT_H265:
- return h26x_vt_preset_name;
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
+ return h26x_mf_preset_name;
 
 default:
 return NULL;
@@ -1099,12 +1488,25 @@
 return h264_nvenc_profile_names;
 case HB_VCODEC_FFMPEG_NVENC_H265:
 return h265_nvenc_profile_names;
- case HB_VCODEC_FFMPEG_VT_H264:
- return h264_vt_profile_name;
- case HB_VCODEC_FFMPEG_VT_H265:
- return h265_vt_profile_name;
+ case HB_VCODEC_FFMPEG_MF_H264:
+ return h264_mf_profile_name;
+ case HB_VCODEC_FFMPEG_MF_H265:
+ return h265_mf_profile_name;
 
 default:
 return NULL;
 }
 }
+
+const int* hb_av_get_pix_fmts(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
+ return h26x_mf_pix_fmts;
+
+ default:
+ return pix_fmts;
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encavcodecaudio.c -> HandBrake-1.5.1.tar.xz/libhb/encavcodecaudio.c Changed

@@ -1,6 +1,6 @@
 /* encavcodecaudio.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -14,6 +14,7 @@
 {
 hb_job_t * job;
 AVCodecContext * context;
+ AVPacket * pkt;
 
 int out_discrete_channels;
 int samples_per_frame;
@@ -52,6 +53,13 @@
 pv->job = job;
 pv->list = hb_list_init();
 pv->last_pts = AV_NOPTS_VALUE;
+ pv->pkt = av_packet_alloc();
+
+ if (pv->pkt == NULL)
+ {
+ hb_error("encavcodecaInit: av_packet_alloc failed");
+ return 1;
+ }
 
 // channel count, layout and matrix encoding
 int matrix_encoding;
@@ -253,7 +261,8 @@
 context->sample_rate, 0);
 av_opt_set_int(pv->swresample, "out_sample_rate",
 context->sample_rate, 0);
- if (hb_audio_dither_is_supported(audio->config.out.codec))
+ if (hb_audio_dither_is_supported(audio->config.out.codec,
+ audio->config.in.sample_bit_depth))
 {
 // dithering needs the sample rate
 av_opt_set_int(pv->swresample, "dither_method",
@@ -318,6 +327,8 @@
 hb_avcodec_free_context(&pv->context);
 }
 
+ av_packet_free(&pv->pkt);
+
 if (pv->output_buf != NULL)
 {
 free(pv->output_buf);
@@ -352,11 +363,9 @@
 {
 // Prepare output packet
 int ret;
- AVPacket pkt;
 hb_buffer_t * out;
 
- av_init_packet(&pkt);
- ret = avcodec_receive_packet(pv->context, &pkt);
+ ret = avcodec_receive_packet(pv->context, pv->pkt);
 if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
 {
 break;
@@ -367,19 +376,19 @@
 break;
 }
 
- out = hb_buffer_init(pkt.size);
- memcpy(out->data, pkt.data, out->size);
+ out = hb_buffer_init(pv->pkt->size);
+ memcpy(out->data, pv->pkt->data, out->size);
 
 // FIXME: On windows builds, there is an upstream bug in the lame
 // encoder that causes an extra output packet that has the same
 // timestamp as the second to last packet. This causes an error
 // during muxing. Work around it by dropping such packets here.
 // See: https://github.com/HandBrake/HandBrake/issues/726
- if (pkt.pts > pv->last_pts)
+ if (pv->pkt->pts > pv->last_pts)
 {
 // The output pts from libav is in context->time_base. Convert it
 // back to our timebase.
- out->s.start = av_rescale_q(pkt.pts, pv->context->time_base,
+ out->s.start = av_rescale_q(pv->pkt->pts, pv->context->time_base,
 (AVRational){1, 90000});
 out->s.duration = (double)90000 * pv->samples_per_frame /
 audio->config.out.samplerate;
@@ -388,9 +397,9 @@
 out->s.frametype = HB_FRAME_AUDIO;
 
 hb_buffer_list_append(list, out);
- pv->last_pts = pkt.pts;
+ pv->last_pts = pv->pkt->pts;
 }
- av_packet_unref(&pkt);
+ av_packet_unref(pv->pkt);
 }
 }
 
@@ -409,7 +418,10 @@
 
 // Prepare input frame
 int out_size;
- AVFrame frame = { .nb_samples = pv->samples_per_frame, };
+ AVFrame frame = { .nb_samples = pv->samples_per_frame,
+ .format = pv->context->sample_fmt,
+ .channels = pv->context->channels
+ };
 
 out_size = av_samples_get_buffer_size(NULL,
 pv->context->channels,

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/enctheora.c -> HandBrake-1.5.1.tar.xz/libhb/enctheora.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encvorbis.c -> HandBrake-1.5.1.tar.xz/libhb/encvorbis.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encx264.c -> HandBrake-1.5.1.tar.xz/libhb/encx264.c Changed

@@ -1,6 +1,6 @@
 /* encx264.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -28,6 +28,9 @@
 
 #define DTS_BUFFER_SIZE 32
 
+#define MASTERING_CHROMA_DEN 50000
+#define MASTERING_LUMA_DEN 10000
+
 struct hb_work_private_s
 {
 hb_job_t * job;
@@ -127,6 +130,11 @@
 }
 #endif
 
+static inline int64_t rescale(hb_rational_t q, int b)
+{
+ return av_rescale(q.num, b, q.den);
+}
+
 void hb_x264_global_init(void)
 {
 #if X264_BUILD < 153
@@ -387,11 +395,44 @@
 param.i_keyint_max = 10 * param.i_keyint_min;
 param.i_log_level = X264_LOG_INFO;
 
- /* set up the VUI color model & gamma to match what the COLR atom
- * set in muxmp4.c says. See libhb/muxmp4.c for notes. */
+ /* set up the VUI color model & gamma */
 param.vui.i_colorprim = hb_output_color_prim(job);
 param.vui.i_transfer = hb_output_color_transfer(job);
 param.vui.i_colmatrix = hb_output_color_matrix(job);
+ if (job->chroma_location != AVCHROMA_LOC_UNSPECIFIED)
+ {
+ param.vui.i_chroma_loc = job->chroma_location - 1;
+ }
+
+#if X264_BUILD >= 163
+ /* HDR10 Static metadata */
+ if (job->color_transfer == HB_COLR_TRA_SMPTEST2084)
+ {
+ /* Mastering display metadata */
+ if (job->mastering.has_primaries && job->mastering.has_luminance)
+ {
+ param.mastering_display.b_mastering_display = 1;
+ param.mastering_display.i_red_x = rescale(job->mastering.display_primaries00, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_red_y = rescale(job->mastering.display_primaries01, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_green_x = rescale(job->mastering.display_primaries10, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_green_y = rescale(job->mastering.display_primaries11, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_blue_x = rescale(job->mastering.display_primaries20, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_blue_y = rescale(job->mastering.display_primaries21, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_white_x = rescale(job->mastering.white_point0, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_white_y = rescale(job->mastering.white_point1, MASTERING_CHROMA_DEN);
+ param.mastering_display.i_display_max = rescale(job->mastering.max_luminance, MASTERING_LUMA_DEN);
+ param.mastering_display.i_display_min = rescale(job->mastering.min_luminance, MASTERING_LUMA_DEN);
+ }
+
+ /* Content light level */
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ param.content_light_level.b_cll = 1;
+ param.content_light_level.i_max_cll = job->coll.max_cll;
+ param.content_light_level.i_max_fall = job->coll.max_fall;
+ }
+ }
+#endif
 
 /* place job->encoder_options in an hb_dict_t for convenience */
 hb_dict_t * x264_opts = NULL;
@@ -428,6 +469,35 @@
 job->color_prim_override = param.vui.i_colorprim;
 job->color_transfer_override = param.vui.i_transfer;
 job->color_matrix_override = param.vui.i_colmatrix;
+ job->chroma_location = param.vui.i_chroma_loc + 1;
+
+#if X264_BUILD >= 163
+ /* Reload HDR10 mastering display metadata settings in case custom values were set
+ * in the encoder_options string */
+ if (param.mastering_display.b_mastering_display)
+ {
+ job->mastering.display_primaries00 = hb_make_q(param.mastering_display.i_red_x, MASTERING_CHROMA_DEN);
+ job->mastering.display_primaries01 = hb_make_q(param.mastering_display.i_red_y, MASTERING_CHROMA_DEN);
+ job->mastering.display_primaries10 = hb_make_q(param.mastering_display.i_green_x, MASTERING_CHROMA_DEN);
+ job->mastering.display_primaries11 = hb_make_q(param.mastering_display.i_green_y, MASTERING_CHROMA_DEN);
+ job->mastering.display_primaries20 = hb_make_q(param.mastering_display.i_blue_x, MASTERING_CHROMA_DEN);
+ job->mastering.display_primaries21 = hb_make_q(param.mastering_display.i_blue_y, MASTERING_CHROMA_DEN);
+
+ job->mastering.white_point0 = hb_make_q(param.mastering_display.i_white_x, MASTERING_CHROMA_DEN);
+ job->mastering.white_point1 = hb_make_q(param.mastering_display.i_white_y, MASTERING_CHROMA_DEN);
+
+ job->mastering.min_luminance = hb_make_q(param.mastering_display.i_display_min, MASTERING_LUMA_DEN);
+ job->mastering.max_luminance = hb_make_q(param.mastering_display.i_display_max, MASTERING_LUMA_DEN);
+ }
+
+ /* Reload HDR10 content light level metadata settings in case custom values were set
+ * in the encoder_options string */
+ if (param.content_light_level.b_cll)
+ {
+ job->coll.max_cll = param.content_light_level.i_max_cll;
+ job->coll.max_fall = param.content_light_level.i_max_fall;
+ }
+#endif
 
 /* For 25 fps sources, HandBrake's explicit keyints will match the x264 defaults:
 * min-keyint 25 (same as auto), keyint 250. */
@@ -755,7 +825,8 @@
 hb_buffer_t *tmp = NULL;
 
 /* Point x264 at our current buffers Y(UV) data. */
- if (pv->pic_in.img.i_csp & X264_CSP_HIGH_DEPTH)
+ if (pv->pic_in.img.i_csp & X264_CSP_HIGH_DEPTH &&
+ job->output_pix_fmt == AV_PIX_FMT_YUV420P)
 {
 tmp = expand_buf(pv->api->bit_depth, in);
 pv->pic_in.img.i_stride0 = tmp->plane0.stride;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/encx265.c -> HandBrake-1.5.1.tar.xz/libhb/encx265.c Changed

@@ -1,6 +1,6 @@
 /* encx265.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -34,6 +34,9 @@
 #define FRAME_INFO_SIZE (1 << (FRAME_INFO_MIN2 - FRAME_INFO_MAX2 + 1))
 #define FRAME_INFO_MASK (FRAME_INFO_SIZE - 1)
 
+#define MASTERING_CHROMA_DEN 50000
+#define MASTERING_LUMA_DEN 10000
+
 static const char * const hb_x265_encopt_synonyms2 =
 {
 { "me", "motion", },
@@ -60,8 +63,14 @@
 
 // Multiple bit-depth
 const x265_api * api;
+ int bit_depth;
 };
 
+static inline int64_t rescale(hb_rational_t q, int b)
+{
+ return av_rescale(q.num, b, q.den);
+}
+
 static int param_parse(hb_work_private_t *pv, x265_param *param,
 const char *key, const char *value)
 {
@@ -106,6 +115,7 @@
 return X265_PARAM_BAD_VALUE;
 }
 
+
 /***********************************************************************
 * hb_work_encx265_init
 ***********************************************************************
@@ -194,8 +204,79 @@
 goto fail;
 }
 
+ /*
+ * HDR10 Static metadata
+ */
+ if (job->color_transfer == HB_COLR_TRA_SMPTEST2084)
+ {
+ if (depth > 8)
+ {
+ if (param_parse(pv, param, "hdr-opt", "1"))
+ {
+ goto fail;
+ }
+ }
+
+ /*
+ * Mastering display metadata.
+ */
+ if (job->mastering.has_primaries && job->mastering.has_luminance)
+ {
+ char masteringDisplayColorVolume256;
+ snprintf(masteringDisplayColorVolume, sizeof(masteringDisplayColorVolume),
+ "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
+ (unsigned short)rescale(job->mastering.display_primaries10, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.display_primaries11, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.display_primaries20, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.display_primaries21, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.display_primaries00, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.display_primaries01, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.white_point0, MASTERING_CHROMA_DEN),
+ (unsigned short)rescale(job->mastering.white_point1, MASTERING_CHROMA_DEN),
+ (unsigned)rescale(job->mastering.max_luminance, MASTERING_LUMA_DEN),
+ (unsigned)rescale(job->mastering.min_luminance, MASTERING_LUMA_DEN));
+
+ if (param_parse(pv, param, "master-display", masteringDisplayColorVolume))
+ {
+ goto fail;
+ }
+ }
+
+ /*
+ * Content light level.
+ */
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ char contentLightLevel256;
+ snprintf(contentLightLevel, sizeof(contentLightLevel),
+ "%hu,%hu",
+ (unsigned short)job->coll.max_cll, (unsigned short)job->coll.max_fall);
+
+ if (param_parse(pv, param, "max-cll", contentLightLevel))
+ {
+ goto fail;
+ }
+ }
+ }
+
+ if (job->chroma_location != AVCHROMA_LOC_UNSPECIFIED) {
+ char chromaLocation256;
+ snprintf(chromaLocation, sizeof(chromaLocation),
+ "%d",
+ job->chroma_location - 1);
+
+ if (param_parse(pv, param, "chromaloc", chromaLocation))
+ {
+ goto fail;
+ }
+ }
+
+ /* Bit depth */
+ pv->bit_depth = hb_get_bit_depth(job->output_pix_fmt);
+
 /* iterate through x265_opts and parse the options */
 hb_dict_t *x265_opts;
+ int override_mastering = 0, override_coll = 0, override_chroma_location = 0;
 x265_opts = hb_encopts_to_dict(job->encoder_options, job->vcodec);
 
 hb_dict_iter_t iter;
@@ -207,6 +288,19 @@
 hb_value_t *value = hb_dict_iter_value(iter);
 char *str = hb_value_get_string_xform(value);
 
+ if (!strcmp(key, "master-display"))
+ {
+ override_mastering = 1;
+ }
+ if (!strcmp(key, "max-cll"))
+ {
+ override_coll = 1;
+ }
+ if (!strcmp(key, "chromaloc"))
+ {
+ override_chroma_location = 1;
+ }
+
 // here's where the strings are passed to libx265 for parsing
 // unknown options or bad values are non-fatal, see encx264.c
 param_parse(pv, param, key, str);
@@ -223,7 +317,58 @@
 job->color_matrix_override = param->vui.matrixCoeffs;
 
 /*
- * Settings which can't be overridden in the encodeer_options string
+ * Reload mastering settings in case custom
+ * values were set in the encoder_options string.
+ */
+ if (override_mastering)
+ {
+ uint16_t display_primaries_x3;
+ uint16_t display_primaries_y3;
+ uint16_t white_point_x, white_point_y;
+ uint32_t max_luminance, min_luminance;
+
+ if (sscanf(param->masteringDisplayColorVolume, "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
+ &display_primaries_x1, &display_primaries_y1,
+ &display_primaries_x2, &display_primaries_y2,
+ &display_primaries_x0, &display_primaries_y0,
+ &white_point_x, &white_point_y,
+ &max_luminance, &min_luminance) == 10)
+ {
+ for (int i = 0; i < 3; i++)
+ {
+ job->mastering.display_primariesi0 = hb_make_q(display_primaries_xi, MASTERING_CHROMA_DEN);
+ job->mastering.display_primariesi1 = hb_make_q(display_primaries_yi, MASTERING_CHROMA_DEN);
+ }
+
+ job->mastering.white_point0 = hb_make_q(white_point_x, MASTERING_CHROMA_DEN);
+ job->mastering.white_point1 = hb_make_q(white_point_y, MASTERING_CHROMA_DEN);
+
+ job->mastering.min_luminance = hb_make_q(min_luminance, MASTERING_LUMA_DEN);
+ job->mastering.max_luminance = hb_make_q(max_luminance, MASTERING_LUMA_DEN);
+ }
+ }
+
+ /*
+ * Reload content light level settings in case custom
+ * values were set in the encoder_options string.
+ */
+ if (override_coll)
+ {
+ job->coll.max_fall = param->maxFALL;
+ job->coll.max_cll = param->maxCLL;
+ }
+
+ /*
+ * Reload chroma location settings in case custom
+ * values were set in the encoder_options string.
+ */
+ if (override_chroma_location)
+ {
+ job->chroma_location = param->vui.chromaSampleLocTypeBottomField + 1;
+ }
+
+ /*
+ * Settings which can't be overridden in the encoder_options string
 * (muxer-specific settings, resolution, ratecontrol, etc.).
 */
 param->bRepeatHeaders = job->inline_parameter_sets;
@@ -231,7 +376,7 @@
 param->sourceHeight = job->height;
 
 /*
- * Let x265 determnine whether to use an aspect ratio
+ * Let x265 determine whether to use an aspect ratio
 * index vs. the extended SAR index + SAR width/height.
 */
 char sar22;
@@ -477,7 +622,7 @@
 pic_in.planes2 = in->plane2.data;
 pic_in.poc = pv->frames_in++;
 pic_in.pts = in->s.start;
- pic_in.bitDepth = 8;
+ pic_in.bitDepth = pv->bit_depth;
 
 if (in->s.new_chap && job->chapter_markers)
 {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/fifo.c -> HandBrake-1.5.1.tar.xz/libhb/fifo.c Changed

@@ -1,6 +1,6 @@
 /* fifo.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -725,14 +725,15 @@
 #if HB_PROJECT_FEATURE_QSV
 // Reclaim QSV resources before dropping the buffer.
 // when decoding without QSV, the QSV atom will be NULL.
- if(b->qsv_details.frame)
+ if(b->qsv_details.frame && b->qsv_details.ctx != NULL)
 {
 mfxFrameSurface1 *surface = (mfxFrameSurface1*)b->qsv_details.frame->data3;
 if(surface)
 {
- hb_qsv_release_surface_from_pool(surface->Data.MemId);
+ hb_qsv_release_surface_from_pool_by_surface_pointer(b->qsv_details.qsv_frames_ctx, surface);
 b->qsv_details.frame->data3 = 0;
 }
+ av_frame_unref(b->qsv_details.frame);
 }
 if (b->qsv_details.qsv_atom != NULL && b->qsv_details.ctx != NULL)
 {
@@ -869,6 +870,9 @@
 image->format = buf->f.fmt;
 image->width = buf->f.width;
 image->height = buf->f.height;
+ image->color_prim = buf->f.color_prim;
+ image->color_transfer = buf->f.color_transfer;
+ image->color_matrix = buf->f.color_matrix;
 memcpy(image->data, buf->data, buf->size);
 
 int p;

HandBrake-1.5.1.tar.xz/libhb/format.c Added

@@ -0,0 +1,69 @@
+/* format.c
+
+ Copyright (c) 2003-2022 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "handbrake/common.h"
+#include "handbrake/avfilter_priv.h"
+
+static int format_init(hb_filter_object_t *filter,
+ hb_filter_init_t *init);
+
+const char format_template =
+ "format=^"HB_ALL_REG"$";
+
+hb_filter_object_t hb_filter_format =
+{
+ .id = HB_FILTER_FORMAT,
+ .enforce_order = 1,
+ .skip = 1,
+ .name = "Format",
+ .settings = NULL,
+ .init = format_init,
+ .work = hb_avfilter_null_work,
+ .close = hb_avfilter_alias_close,
+ .settings_template = format_template,
+};
+
+static int format_init(hb_filter_object_t *filter, hb_filter_init_t *init)
+{
+ hb_filter_private_t *pv = NULL;
+
+ pv = calloc(1, sizeof(struct hb_filter_private_s));
+ filter->private_data = pv;
+ if (pv == NULL)
+ {
+ return 1;
+ }
+ pv->input = *init;
+
+ hb_dict_t *settings = filter->settings;
+ char *format = NULL;
+
+ hb_dict_extract_string(&format, settings, "format");
+
+ if (format == NULL)
+ {
+ return 0;
+ }
+
+ hb_value_array_t *avfilters = hb_value_array_init();
+ hb_dict_t *avfilter = hb_dict_init();
+ hb_dict_t *avsettings = hb_dict_init();
+
+ hb_dict_set_string(avsettings, "pix_fmts", format);
+ hb_dict_set(avfilter, "format", avsettings);
+
+ hb_value_array_append(avfilters, avfilter);
+
+ pv->avfilters = avfilters;
+
+ init->pix_fmt = av_get_pix_fmt(format);
+ pv->output = *init;
+
+ return 0;
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/grayscale.c -> HandBrake-1.5.1.tar.xz/libhb/grayscale.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/audio_remap.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/audio_remap.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/audio_resample.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/audio_resample.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/avfilter_priv.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/avfilter_priv.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/bits.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/bits.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/colormap.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/colormap.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/common.h Changed

@@ -1,6 +1,6 @@
 /* common.h
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -139,14 +139,10 @@
 void hb_list_close( hb_list_t ** );
 
 void hb_reduce( int *x, int *y, int num, int den );
-void hb_limit_rational( int *x, int *y, int num, int den, int limit );
+void hb_limit_rational( int *x, int *y, int64_t num, int64_t den, int limit );
 void hb_reduce64( int64_t *x, int64_t *y, int64_t num, int64_t den );
 void hb_limit_rational64( int64_t *x, int64_t *y, int64_t num, int64_t den, int64_t limit );
 
-#define HB_KEEP_WIDTH 0x01
-#define HB_KEEP_HEIGHT 0x02
-#define HB_KEEP_DISPLAY_ASPECT 0x04
-
 void hb_job_set_encoder_preset (hb_job_t *job, const char *preset);
 void hb_job_set_encoder_tune (hb_job_t *job, const char *tune);
 void hb_job_set_encoder_options(hb_job_t *job, const char *options);
@@ -188,16 +184,8 @@
 hb_metadata_t * hb_metadata_init(void);
 hb_metadata_t * hb_metadata_copy(const hb_metadata_t *src);
 void hb_metadata_close(hb_metadata_t **metadata);
-void hb_metadata_set_name( hb_metadata_t *metadata, const char *name );
-void hb_metadata_set_artist( hb_metadata_t *metadata, const char *artist );
-void hb_metadata_set_composer( hb_metadata_t *metadata, const char *composer );
-void hb_metadata_set_release_date( hb_metadata_t *metadata, const char *release_date );
-void hb_metadata_set_comment( hb_metadata_t *metadata, const char *comment );
-void hb_metadata_set_genre( hb_metadata_t *metadata, const char *genre );
-void hb_metadata_set_album( hb_metadata_t *metadata, const char *album );
-void hb_metadata_set_album_artist( hb_metadata_t *metadata, const char *album_artist );
-void hb_metadata_set_description( hb_metadata_t *metadata, const char *description );
-void hb_metadata_set_long_description( hb_metadata_t *metadata, const char *long_description );
+void hb_update_meta_dict(hb_dict_t * dict, const char * key, const char * value);
+const char * hb_lookup_meta_key(const char * mux_key);
 void hb_metadata_add_coverart( hb_metadata_t *metadata, const uint8_t *data, int size, int type );
 void hb_metadata_rem_coverart( hb_metadata_t *metadata, int ii );
 
@@ -254,6 +242,16 @@
 int den;
 };
 
+static inline hb_rational_t hb_make_q(int num, int den)
+{
+ hb_rational_t r = { num, den };
+ return r;
+}
+
+static inline double hb_q2d(hb_rational_t a){
+ return a.num / (double) a.den;
+}
+
 struct hb_geometry_s
 {
 int width;
@@ -261,15 +259,38 @@
 hb_rational_t par;
 };
 
+struct hb_geometry_crop_s
+{
+ int crop4;
+ int pad4;
+ hb_geometry_t geometry;
+};
+
+// hb_geometry_settings_s 'keep' flags
+#define HB_KEEP_WIDTH 0x01
+#define HB_KEEP_HEIGHT 0x02
+#define HB_KEEP_DISPLAY_ASPECT 0x04
+#define HB_KEEP_DISPLAY_WIDTH 0x08
+#define HB_KEEP_PAD 0x10
+
+// hb_geometry_settings_s 'flags'
+#define HB_GEO_SCALE_UP 0x01
+#define HB_GEO_SCALE_BEST 0x02
+
 struct hb_geometry_settings_s
 {
- int mode; // Anamorphic mode, see job struct anamorphic
- int keep; // Specifies settings that shouldn't be changed
- int itu_par; // use dvd dimensions to determine PAR
- int modulus; // pixel alignment for loose anamorphic
- int crop4; // Pixels cropped from source before scaling
- int maxWidth; // max destination storage width
- int maxHeight; // max destination storage height
+ int mode; // Anamorphic mode, see job struct anamorphic
+ int keep; // Specifies settings that shouldn't be changed
+ int flags; // Flags that affect calculations
+ int itu_par; // use dvd dimensions to determine PAR
+ int modulus; // pixel alignment for loose anamorphic
+ int crop4; // Pixels cropped from source before scaling
+ int pad4; // Pixels cropped from source before scaling
+ int maxWidth; // max destination storage width
+ int maxHeight; // max destination storage height
+ int displayWidth; // display width, used with !HB_KEEP_DISPLAY_ASPECT
+ int displayHeight; // display height, used with !HB_KEEP_DISPLAY_ASPECT
+ // Note that display size includes pad!
 hb_geometry_t geometry;
 };
 
@@ -280,6 +301,9 @@
 int max_plane;
 int width;
 int height;
+ int color_prim;
+ int color_transfer;
+ int color_matrix;
 uint8_t *data;
 
 struct image_plane
@@ -309,6 +333,20 @@
 int64_t offset;
 };
 
+struct hb_mastering_display_metadata_s {
+ hb_rational_t display_primaries32;
+ hb_rational_t white_point2;
+ hb_rational_t min_luminance;
+ hb_rational_t max_luminance;
+ int has_primaries;
+ int has_luminance;
+};
+
+struct hb_content_light_metadata_s {
+ unsigned max_cll;
+ unsigned max_fall;
+};
+
 /*******************************************************************************
 * Lists of rates, mixdowns, encoders etc.
 *******************************************************************************
@@ -368,12 +406,18 @@
 
 void hb_video_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
 const char* hb_video_quality_get_name(uint32_t codec);
+int hb_video_quality_is_supported(uint32_t codec);
 
+int hb_video_twopass_is_supported(uint32_t codec);
+
+int hb_video_encoder_is_supported(int encoder);
+int hb_video_encoder_pix_fmt_is_supported(int encoder, int pix_fmt);
 int hb_video_encoder_get_depth (int encoder);
 const char* const* hb_video_encoder_get_presets (int encoder);
 const char* const* hb_video_encoder_get_tunes (int encoder);
 const char* const* hb_video_encoder_get_profiles(int encoder);
 const char* const* hb_video_encoder_get_levels (int encoder);
+const int* hb_video_encoder_get_pix_fmts(int encoder);
 
 void hb_audio_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
 float hb_audio_quality_get_best(uint32_t codec, float quality);
@@ -385,7 +429,7 @@
 
 int hb_audio_dither_get_default(void);
 int hb_audio_dither_get_default_method(void); // default method, if enabled && supported
-int hb_audio_dither_is_supported(uint32_t codec);
+int hb_audio_dither_is_supported(uint32_t codec, int depth);
 int hb_audio_dither_get_from_name(const char *name);
 const char* hb_audio_dither_get_description(int method);
 const hb_dither_t* hb_audio_dither_get_next(const hb_dither_t *last);
@@ -510,7 +554,7 @@
 cfr: 0 (vfr), 1 (cfr), 2 (pfr) see render.c
 pass: 0, 1 or 2 (or -1 for scan)
 areBframes: boolean to note if b-frames are used */
-#define HB_VCODEC_MASK 0x0FFFFFF
+#define HB_VCODEC_MASK 0x7FFFFFF
 #define HB_VCODEC_INVALID 0x0000000
 #define HB_VCODEC_THEORA 0x0000002
 #define HB_VCODEC_FFMPEG_MPEG4 0x0000010
@@ -521,9 +565,13 @@
 #define HB_VCODEC_FFMPEG_VCE_H265 0x00080000
 #define HB_VCODEC_FFMPEG_NVENC_H264 0x00100000
 #define HB_VCODEC_FFMPEG_NVENC_H265 0x00200000
-#define HB_VCODEC_FFMPEG_VT_H264 0x00400000
-#define HB_VCODEC_FFMPEG_VT_H265 0x00800000
-#define HB_VCODEC_FFMPEG_MASK (0x00000F0|HB_VCODEC_FFMPEG_VCE_H264|HB_VCODEC_FFMPEG_VCE_H265|HB_VCODEC_FFMPEG_NVENC_H264|HB_VCODEC_FFMPEG_NVENC_H265|HB_VCODEC_FFMPEG_VT_H264|HB_VCODEC_FFMPEG_VT_H265)
+#define HB_VCODEC_VT_H264 0x00400000
+#define HB_VCODEC_VT_H265 0x00800000
+#define HB_VCODEC_VT_H265_10BIT 0x01000000
+#define HB_VCODEC_VT_MASK 0x1C00000
+#define HB_VCODEC_FFMPEG_MF_H264 0x02000000
+#define HB_VCODEC_FFMPEG_MF_H265 0x04000000
+#define HB_VCODEC_FFMPEG_MASK (0x00000F0|HB_VCODEC_FFMPEG_VCE_H264|HB_VCODEC_FFMPEG_VCE_H265|HB_VCODEC_FFMPEG_NVENC_H264|HB_VCODEC_FFMPEG_NVENC_H265|HB_VCODEC_FFMPEG_MF_H264|HB_VCODEC_FFMPEG_MF_H265)
 #define HB_VCODEC_QSV_H264 0x0000100
 #define HB_VCODEC_QSV_H265_8BIT 0x0000200
 #define HB_VCODEC_QSV_H265_10BIT 0x0000400
@@ -534,14 +582,14 @@
 #define HB_VCODEC_X264 HB_VCODEC_X264_8BIT
 #define HB_VCODEC_X264_10BIT 0x0020000
 #define HB_VCODEC_X264_MASK 0x0030000
-#define HB_VCODEC_H264_MASK (HB_VCODEC_X264_MASK|HB_VCODEC_QSV_H264|HB_VCODEC_FFMPEG_VCE_H264|HB_VCODEC_FFMPEG_NVENC_H264|HB_VCODEC_FFMPEG_VT_H264)
+#define HB_VCODEC_H264_MASK (HB_VCODEC_X264_MASK|HB_VCODEC_QSV_H264|HB_VCODEC_FFMPEG_VCE_H264|HB_VCODEC_FFMPEG_NVENC_H264|HB_VCODEC_VT_H264|HB_VCODEC_FFMPEG_MF_H264)
 #define HB_VCODEC_X265_8BIT 0x0001000
 #define HB_VCODEC_X265 HB_VCODEC_X265_8BIT
 #define HB_VCODEC_X265_10BIT 0x0002000
 #define HB_VCODEC_X265_12BIT 0x0004000
 #define HB_VCODEC_X265_16BIT 0x0008000
 #define HB_VCODEC_X265_MASK 0x000F000
-#define HB_VCODEC_H265_MASK (HB_VCODEC_X265_MASK|HB_VCODEC_QSV_H265_MASK|HB_VCODEC_FFMPEG_VCE_H265|HB_VCODEC_FFMPEG_NVENC_H265|HB_VCODEC_FFMPEG_VT_H265)
+#define HB_VCODEC_H265_MASK (HB_VCODEC_X265_MASK|HB_VCODEC_QSV_H265_MASK|HB_VCODEC_FFMPEG_VCE_H265|HB_VCODEC_FFMPEG_NVENC_H265|HB_VCODEC_FFMPEG_VT_H265|HB_VCODEC_FFMPEG_VT_H265_10BIT|HB_VCODEC_FFMPEG_MF_H265)
 
 /* define an invalid CQ value compatible with all CQ-capable codecs */
 #define HB_INVALID_VIDEO_QUALITY (-1000.)
@@ -565,11 +613,15 @@
 char *encoder_level;
 int areBframes;
 
- int pix_fmt;
+ // Pixel format from decoder to the end of the filters chain
+ int input_pix_fmt;
+ // Pixel format from the end of filters chain to the encoder
+ int output_pix_fmt;
 int color_prim;
 int color_transfer;
 int color_matrix;
 int color_range;
+ int chroma_location;
 
 int color_prim_override;
 int color_transfer_override;
@@ -624,6 +676,9 @@
 #define HB_COLR_MAT_ICTCP 14 // ITU-R BT.2100-0, ICtCp
 // 0, 3-5, 8, 11-65535: reserved/not implemented
 
+ hb_mastering_display_metadata_t mastering;
+ hb_content_light_metadata_t coll;
+
 hb_list_t * list_chapter;
 
 /* List of audio settings. */
@@ -749,7 +804,7 @@
 /* Audio Codecs: Update win/CS/HandBrake.Interop/HandBrakeInterop/HbLib/NativeConstants.cs when changing these consts */
 #define HB_ACODEC_INVALID 0x00000000
 #define HB_ACODEC_NONE 0x00000001
-#define HB_ACODEC_MASK 0x07FFFF01
+#define HB_ACODEC_MASK 0x0FFFFF01
 #define HB_ACODEC_LAME 0x00000200
 #define HB_ACODEC_VORBIS 0x00000400
 #define HB_ACODEC_AC3 0x00000800
@@ -760,6 +815,7 @@
 #define HB_ACODEC_FFAAC 0x00010000
 #define HB_ACODEC_FFMPEG 0x00020000
 #define HB_ACODEC_DCA_HD 0x00040000
+#define HB_ACODEC_MP2 0x08000000
 #define HB_ACODEC_MP3 0x00080000
 #define HB_ACODEC_FFFLAC 0x00100000
 #define HB_ACODEC_FFFLAC24 0x00200000
@@ -768,9 +824,9 @@
 #define HB_ACODEC_FFEAC3 0x01000000
 #define HB_ACODEC_FFTRUEHD 0x02000000
 #define HB_ACODEC_OPUS 0x04000000
-#define HB_ACODEC_FF_MASK 0x07FF2800
+#define HB_ACODEC_FF_MASK 0x0FFF2800
 #define HB_ACODEC_PASS_FLAG 0x40000000
-#define HB_ACODEC_PASS_MASK (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD)
+#define HB_ACODEC_PASS_MASK (HB_ACODEC_AC3 | HB_ACODEC_DCA | HB_ACODEC_DCA_HD | HB_ACODEC_FFAAC | HB_ACODEC_FFEAC3 | HB_ACODEC_FFFLAC | HB_ACODEC_MP2 | HB_ACODEC_MP3 | HB_ACODEC_FFTRUEHD)
 #define HB_ACODEC_AUTO_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_PASS_MASK)
 #define HB_ACODEC_ANY (HB_ACODEC_PASS_FLAG | HB_ACODEC_MASK)
 #define HB_ACODEC_AAC_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFAAC)
@@ -779,6 +835,7 @@
 #define HB_ACODEC_DCA_HD_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_DCA_HD)
 #define HB_ACODEC_EAC3_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFEAC3)
 #define HB_ACODEC_FLAC_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFFLAC)
+#define HB_ACODEC_MP2_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_MP2)
 #define HB_ACODEC_MP3_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_MP3)
 #define HB_ACODEC_TRUEHD_PASS (HB_ACODEC_PASS_FLAG | HB_ACODEC_FFTRUEHD)
 
@@ -846,7 +903,7 @@
 PRIVATE uint32_t reg_desc; /* Registration descriptor of source */
 PRIVATE uint32_t stream_type; /* Stream type from source stream */
 PRIVATE uint32_t substream_type; /* Substream type for multiplexed streams */
- PRIVATE uint32_t version; /* Bitsream version */
+ PRIVATE uint32_t version; /* Bitstream version */
 PRIVATE uint32_t flags; /* Bitstream flags, codec-specific */
 PRIVATE uint32_t mode; /* Bitstream mode, codec-specific */
 PRIVATE int samplerate; /* Input sample rate (Hz) */
@@ -966,13 +1023,23 @@
 hb_subtitle_config_t config;
 
 enum subtype { PICTURESUB, TEXTSUB } format;
- enum subsource { VOBSUB, CC608SUB, /*unused*/CC708SUB,
- UTF8SUB, TX3GSUB, SSASUB, PGSSUB,
- IMPORTSRT, IMPORTSSA, SRTSUB = IMPORTSRT } source;
+ enum subsource {
+ VOBSUB,
+ CC608SUB,
+ CC708SUB, // unused
+ UTF8SUB,
+ TX3GSUB,
+ SSASUB,
+ PGSSUB,
+ IMPORTSRT,
+ IMPORTSSA,
+ DVBSUB,
+ SRTSUB = IMPORTSRT
+ } source;
 const char * name;
 char lang1024;
 char iso639_24;
- uint32_t attributes; /* Closed Caption, Childrens, Directors etc */
+ uint32_t attributes; /* Closed Caption, Children, Directors etc */
 
 // Color lookup table for VOB subtitle tracks. Each entry is in YCbCr format.
 // Must be filled out by the demuxer for VOB subtitle tracks.
@@ -991,6 +1058,7 @@
 #ifdef __LIBHB__
 /* Internal data */
 uint32_t codec; /* Input "codec" */
+ uint32_t codec_param; /* Per-codec config info */
 uint32_t reg_desc; /* registration descriptor of source */
 uint32_t stream_type; /* stream type from source stream */
 uint32_t substream_type; /* substream for multiplexed streams */
@@ -1031,16 +1099,7 @@
 
 struct hb_metadata_s
 {
- char *name;
- char *artist; // Actors
- char *composer;
- char *release_date;
- char *comment;
- char *album; // DVD
- char *album_artist; // Director
- char *genre;
- char *description;
- char *long_description;
+ hb_dict_t * dict;
 hb_list_t * list_coverart;
 };
 
@@ -1075,6 +1134,9 @@
 int color_transfer;
 int color_matrix;
 int color_range;
+ int chroma_location;
+ hb_mastering_display_metadata_t mastering;
+ hb_content_light_metadata_t coll;
 hb_rational_t vrate;
 int crop4;
 enum {HB_DVD_DEMUXER, HB_TS_DEMUXER, HB_PS_DEMUXER, HB_NULL_DEMUXER} demuxer;
@@ -1184,6 +1246,7 @@
 int color_transfer;
 int color_matrix;
 int color_range;
+ int chroma_location;
 int video_decode_support;
 };
 struct
@@ -1251,15 +1314,14 @@
 extern hb_work_object_t hb_sync_audio;
 extern hb_work_object_t hb_sync_subtitle;
 extern hb_work_object_t hb_decvobsub;
-extern hb_work_object_t hb_encvobsub;
-extern hb_work_object_t hb_deccc608;
 extern hb_work_object_t hb_decsrtsub;
 extern hb_work_object_t hb_decutf8sub;
 extern hb_work_object_t hb_dectx3gsub;
 extern hb_work_object_t hb_decssasub;
-extern hb_work_object_t hb_decpgssub;
+extern hb_work_object_t hb_decavsub;
 extern hb_work_object_t hb_encavcodec;
 extern hb_work_object_t hb_encqsv;
+extern hb_work_object_t hb_encvt;
 extern hb_work_object_t hb_encx264;
 extern hb_work_object_t hb_enctheora;
 extern hb_work_object_t hb_encx265;
@@ -1287,6 +1349,7 @@
 int color_transfer;
 int color_matrix;
 int color_range;
+ int chroma_location;
 hb_geometry_t geometry;
 int crop4;
 hb_rational_t vrate;
@@ -1363,14 +1426,15 @@
 HB_FILTER_HQDN3D = HB_FILTER_DENOISE,
 HB_FILTER_NLMEANS,
 HB_FILTER_CHROMA_SMOOTH,
+ HB_FILTER_ROTATE,
 HB_FILTER_RENDER_SUB,
 HB_FILTER_CROP_SCALE,
 HB_FILTER_LAPSHARP,
 HB_FILTER_UNSHARP,
- HB_FILTER_ROTATE,
 HB_FILTER_GRAYSCALE,
 HB_FILTER_PAD,
 HB_FILTER_COLORSPACE,
+ HB_FILTER_FORMAT,
 
 // Finally filters that don't care what order they are in,
 // except that they must be after the above filters
@@ -1389,6 +1453,8 @@
 hb_filter_object_t * hb_filter_init( int filter_id );
 hb_filter_object_t * hb_filter_copy( hb_filter_object_t * filter );
 hb_list_t * hb_filter_list_copy(const hb_list_t *src);
+hb_dict_t * hb_filter_dict_find(const hb_value_array_t * list,
+ int filter_id);
 hb_filter_object_t * hb_filter_find(const hb_list_t *list, int filter_id);
 void hb_filter_close( hb_filter_object_t ** );
 void hb_filter_info_close( hb_filter_info_t ** );
@@ -1416,6 +1482,7 @@
 
 int hb_yuv2rgb(int yuv);
 int hb_rgb2yuv(int rgb);
+int hb_rgb2yuv_bt709(int rgb);
 
 const char * hb_subsource_name( int source );
 
@@ -1437,6 +1504,9 @@
 int hb_output_color_transfer(hb_job_t * job);
 int hb_output_color_matrix(hb_job_t * job);
 
+int hb_get_bit_depth(int format);
+int hb_get_best_pix_fmt(hb_job_t * job);
+
 #define HB_NEG_FLOAT_REG "((-)?((0-9+(.,0-9+)?)|(.,0-9+))"
 #define HB_FLOAT_REG "((0-9+(.,0-9+)?)|(.,0-9+))"
 #define HB_NEG_INT_REG "((-?0-9+)"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/compat.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/compat.h Changed

HandBrake-1.5.1.tar.xz/libhb/handbrake/decavsub.h Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/decomb.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/decomb.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/dvd.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/dvd.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/eedi2.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/eedi2.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/encx264.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/encx264.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/h264_common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/h264_common.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/h265_common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/h265_common.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/handbrake.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/handbrake.h Changed

@@ -1,6 +1,6 @@
 /* handbrake.h
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -28,6 +28,8 @@
 etc) */
 #define HB_DEBUG_NONE 0
 #define HB_DEBUG_ALL 1
+#define HB_PREVIEW_FORMAT_YUV 0
+#define HB_PREVIEW_FORMAT_JPG 1
 void hb_register( hb_work_object_t * );
 void hb_register_logger( void (*log_cb)(const char* message) );
 hb_handle_t * hb_init( int verbose );
@@ -68,16 +70,21 @@
 
 // JJJ: title->job?
 int hb_save_preview( hb_handle_t * h, int title, int preview,
- hb_buffer_t *buf );
+ hb_buffer_t *buf, int format );
 hb_buffer_t * hb_read_preview( hb_handle_t * h, hb_title_t *title,
- int preview );
+ int preview, int format );
 #endif // __LIBHB__
 
 hb_image_t * hb_get_preview2(hb_handle_t * h, int title_idx, int picture,
 hb_geometry_settings_t *geo, int deinterlace);
-void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
- hb_geometry_settings_t *geo,
- hb_geometry_t *result);
+hb_image_t * hb_get_preview3(hb_handle_t * h, int picture,
+ hb_dict_t * job_dict);
+void hb_rotate_geometry( hb_geometry_crop_t * geo,
+ hb_geometry_crop_t * result,
+ int angle, int hflip);
+void hb_set_anamorphic_size2(hb_geometry_t * src_geo,
+ hb_geometry_settings_t * geo,
+ hb_geometry_t * result);
 void hb_add_filter_dict( hb_job_t * job, hb_filter_object_t * filter,
 const hb_dict_t * settings_in );
 void hb_add_filter( hb_job_t * job, hb_filter_object_t * filter,
@@ -113,6 +120,10 @@
 hb_rational_t vrate; /* measured output vrate */
 
 hb_subtitle_t *select_subtitle; /* foreign language scan subtitle */
+
+#ifdef __APPLE__
+ void *vt_context;
+ #endif
 } hb_interjob_t;
 
 hb_interjob_t * hb_interjob_get( hb_handle_t * );

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/hb_dict.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/hb_dict.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/hb_json.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/hb_json.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/hbavfilter.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/hbavfilter.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/hbffmpeg.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/hbffmpeg.h Changed

@@ -1,6 +1,6 @@
 /* hbffmpeg.h
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -19,6 +19,7 @@
 #include "libavutil/avutil.h"
 #include "libavutil/downmix_info.h"
 #include "libavutil/display.h"
+#include "libavutil/mastering_display_metadata.h"
 #include "libswscale/swscale.h"
 #include "libswresample/swresample.h"
 #include "handbrake/common.h"
@@ -41,9 +42,12 @@
 int hb_colr_tra_ff_to_hb(int colr_tra);
 int hb_colr_mat_ff_to_hb(int colr_mat);
 
+hb_mastering_display_metadata_t hb_mastering_ff_to_hb(AVMasteringDisplayMetadata mastering);
+AVMasteringDisplayMetadata hb_mastering_hb_to_ff(hb_mastering_display_metadata_t mastering);
+
 struct SwsContext*
-hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
- int dstW, int dstH, enum AVPixelFormat dstFormat,
+hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat, int srcRange,
+ int dstW, int dstH, enum AVPixelFormat dstFormat, int dstRange,
 int flags, int colorspace);
 
 static const char* const hb_vce_preset_names = { "speed", "balanced", "quality", NULL, };
@@ -58,5 +62,6 @@
 int hb_av_encoder_present(int encoder);
 const char* const* hb_av_profile_get_names(int encoder);
 const char* const* hb_av_level_get_names(int encoder);
+const int* hb_av_get_pix_fmts(int encoder);
 
 #endif // HANDBRAKE_FFMPEG_H

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/hbtypes.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/hbtypes.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/internal.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/internal.h Changed

@@ -1,6 +1,6 @@
 /* internal.h
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -12,12 +12,7 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/pixdesc.h"
-
 #include "handbrake/project.h"
-#if HB_PROJECT_FEATURE_QSV
-#include "handbrake/qsv_libav.h"
-#include "libavcodec/avcodec.h"
-#endif
 
 /***********************************************************************
 * common.c
@@ -64,6 +59,10 @@
 */
 typedef struct hb_buffer_s hb_buffer_t;
 
+#if HB_PROJECT_FEATURE_QSV
+#include "handbrake/qsv_libav.h"
+#endif
+
 struct hb_buffer_settings_s
 {
 enum { OTHER_BUF, AUDIO_BUF, VIDEO_BUF, SUBTITLE_BUF, FRAME_BUF } type;
@@ -126,6 +125,7 @@
 int color_transfer;
 int color_matrix;
 int color_range;
+ int chroma_location;
 int max_plane;
 int window_width;
 int window_height;
@@ -154,10 +154,11 @@
 #if HB_PROJECT_FEATURE_QSV
 struct qsv
 {
- void * qsv_atom;
- AVFrame * frame;
- void * filter_details;
- hb_qsv_context * ctx;
+ void * qsv_atom;
+ AVFrame * frame;
+ void * filter_details;
+ hb_qsv_context * ctx;
+ HBQSVFramesContext * qsv_frames_ctx;
 } qsv_details;
 #endif
 
@@ -434,16 +435,14 @@
 WORK_SYNC_VIDEO,
 WORK_SYNC_AUDIO,
 WORK_SYNC_SUBTITLE,
- WORK_DECCC608,
 WORK_DECVOBSUB,
 WORK_DECSRTSUB,
- WORK_DECUTF8SUB,
 WORK_DECTX3GSUB,
 WORK_DECSSASUB,
- WORK_ENCVOBSUB,
 WORK_RENDER,
 WORK_ENCAVCODEC,
 WORK_ENCQSV,
+ WORK_ENCVT,
 WORK_ENCX264,
 WORK_ENCX265,
 WORK_ENCTHEORA,
@@ -457,7 +456,7 @@
 WORK_ENCAVCODEC_AUDIO,
 WORK_MUX,
 WORK_READER,
- WORK_DECPGSSUB
+ WORK_DECAVSUB
 };
 
 extern hb_filter_object_t hb_filter_detelecine;
@@ -479,6 +478,7 @@
 extern hb_filter_object_t hb_filter_avfilter;
 extern hb_filter_object_t hb_filter_mt_frame;
 extern hb_filter_object_t hb_filter_colorspace;
+extern hb_filter_object_t hb_filter_format;
 
 #if HB_PROJECT_FEATURE_QSV
 extern hb_filter_object_t hb_filter_qsv;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/lang.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/lang.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/nal_units.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/nal_units.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/nlmeans.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/nlmeans.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/nvenc_common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/nvenc_common.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/param.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/param.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/plist.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/plist.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/ports.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/ports.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/preset.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/preset.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/preset_builtin.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/preset_builtin.h Changed

@@ -41,6 +41,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -98,7 +100,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"veryfast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -147,6 +148,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -204,7 +207,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"veryfast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 23.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -253,6 +255,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -310,7 +314,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"veryfast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -359,6 +362,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"fast\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -416,7 +421,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"veryfast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -465,6 +469,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -522,7 +528,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -571,6 +576,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -628,7 +635,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -677,6 +683,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -734,7 +742,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -783,6 +790,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -840,7 +849,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -903,6 +911,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -960,7 +970,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1023,6 +1032,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1080,7 +1091,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 19.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1143,6 +1153,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1200,7 +1212,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 18.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1263,6 +1274,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1320,7 +1333,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 18.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1383,6 +1395,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1440,7 +1454,6 @@
 "                    \"VideoOptionExtra\": \"ref=5:bframes=5\", \n"
 "                    \"VideoPreset\": \"veryslow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 18.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1503,6 +1516,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1560,7 +1575,6 @@
 "                    \"VideoOptionExtra\": \"ref=5:bframes=5\", \n"
 "                    \"VideoPreset\": \"veryslow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 17.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1623,6 +1637,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1680,7 +1696,6 @@
 "                    \"VideoOptionExtra\": \"ref=5:bframes=5\", \n"
 "                    \"VideoPreset\": \"veryslow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 16.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1743,6 +1758,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1800,7 +1817,6 @@
 "                    \"VideoOptionExtra\": \"ref=5:bframes=5\", \n"
 "                    \"VideoPreset\": \"veryslow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 16.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1856,6 +1872,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -1913,7 +1931,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=21000:vbv-maxrate=2100:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -1962,6 +1979,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2019,7 +2038,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=12500:vbv-maxrate=1250:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2068,6 +2086,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2125,7 +2145,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=5500:vbv-maxrate=550:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2174,6 +2193,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2231,7 +2252,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=4500:vbv-maxrate=450:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2280,6 +2300,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2337,7 +2359,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=1650:vbv-maxrate=165:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=5,4:psy-rd=2.0:0.3:ref=5:bframes=5\", \n"
 "                    \"VideoPreset\": \"veryslow\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 25.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2386,6 +2407,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2443,7 +2466,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=9000:vbv-maxrate=900:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 23.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2492,6 +2514,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2549,7 +2573,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=5000:vbv-maxrate=500:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 23.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2598,6 +2621,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2655,7 +2680,6 @@
 "                    \"VideoOptionExtra\": \"vbv-bufsize=2500:vbv-maxrate=250:aq-mode=2:aq-strength=0.8:direct=auto:analyse=all:deblock=3,2\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 23.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2704,6 +2728,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2761,7 +2787,6 @@
 "                    \"VideoOptionExtra\": \"keyint=30:min-keyint=15:ref=1:bframes=2:b-pyramid=none\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2810,6 +2835,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2867,7 +2894,6 @@
 "                    \"VideoOptionExtra\": \"keyint=30:min-keyint=15:ref=1:bframes=2:b-pyramid=none\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -2916,6 +2942,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -2973,7 +3001,6 @@
 "                    \"VideoOptionExtra\": \"keyint=30:min-keyint=15:ref=1:bframes=2:b-pyramid=none\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -3022,6 +3049,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3079,7 +3108,6 @@
 "                    \"VideoOptionExtra\": \"keyint=30:min-keyint=15:ref=1:bframes=2:b-pyramid=none\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 19.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -3128,6 +3156,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3185,7 +3215,6 @@
 "                    \"VideoOptionExtra\": \"keyint=30:min-keyint=15:ref=1:bframes=2:b-pyramid=none\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -3206,7 +3235,8 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\"\n"
+"                        \"copy:aac\", \n"
+"                        \"copy:ac3\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
@@ -3223,6 +3253,19 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
+"                        }, \n"
+"                        {\n"
+"                            \"AudioBitrate\": 640, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"copy:ac3\", \n"
+"                            \"AudioMixdown\": \"none\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -3241,6 +3284,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3258,7 +3303,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureHeight\": 2160, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3274,9 +3319,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 1080p30\", \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.\", \n"
+"                    \"PresetName\": \"Amazon Fire 2160p60 4K HEVC Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3288,19 +3333,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoAvgBitrate\": 8000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
+"                    \"VideoEncoder\": \"x265\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.0\", \n"
-"                    \"VideoOptionExtra\": \"\", \n"
-"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
+"                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3312,7 +3356,8 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\"\n"
+"                        \"copy:aac\", \n"
+"                        \"copy:ac3\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
@@ -3329,6 +3374,19 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
+"                        }, \n"
+"                        {\n"
+"                            \"AudioBitrate\": 640, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"copy:ac3\", \n"
+"                            \"AudioMixdown\": \"none\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -3347,6 +3405,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3364,7 +3424,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 720, \n"
+"                    \"PictureHeight\": 1080, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3380,9 +3440,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 720p30\", \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).\", \n"
+"                    \"PresetName\": \"Amazon Fire 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3394,19 +3454,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 3000, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
 "                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.1\", \n"
+"                    \"VideoLevel\": \"4.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 21.0, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3424,7 +3483,7 @@
 "                    \"AudioLanguageList\": , \n"
 "                    \"AudioList\": \n"
 "                        {\n"
-"                            \"AudioBitrate\": 128, \n"
+"                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
 "                            \"AudioEncoder\": \"aac\", \n"
@@ -3453,6 +3512,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3470,7 +3531,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 576, \n"
+"                    \"PictureHeight\": 720, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3486,9 +3547,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 720, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 576p25\", \n"
+"                    \"PictureWidth\": 1280, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.\", \n"
+"                    \"PresetName\": \"Amazon Fire 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3500,19 +3561,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 1800, \n"
+"                    \"VideoAvgBitrate\": 3000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"25\", \n"
+"                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.0\", \n"
+"                    \"VideoLevel\": \"3.1\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoProfile\": \"high\", \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 20.0, \n"
+"                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3530,7 +3590,7 @@
 "                    \"AudioLanguageList\": , \n"
 "                    \"AudioList\": \n"
 "                        {\n"
-"                            \"AudioBitrate\": 128, \n"
+"                            \"AudioBitrate\": 160, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
 "                            \"AudioEncoder\": \"aac\", \n"
@@ -3559,6 +3619,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3576,7 +3638,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 480, \n"
+"                    \"PictureHeight\": 1080, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3592,9 +3654,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 720, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
-"                    \"PresetName\": \"Android 480p30\", \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
+"                    \"PresetName\": \"Android 1080p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3606,19 +3668,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 1500, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
 "                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.0\", \n"
+"                    \"VideoLevel\": \"4.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 20.0, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3630,8 +3691,7 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\", \n"
-"                        \"copy:ac3\"\n"
+"                        \"copy:aac\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
@@ -3648,19 +3708,6 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
-"                        }, \n"
-"                        {\n"
-"                            \"AudioBitrate\": 640, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"copy:ac3\", \n"
-"                            \"AudioMixdown\": \"none\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -3679,6 +3726,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3696,7 +3745,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureHeight\": 720, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3712,9 +3761,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 3840, \n"
-"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.\", \n"
-"                    \"PresetName\": \"Apple 2160p60 4K HEVC Surround\", \n"
+"                    \"PictureWidth\": 1280, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
+"                    \"PresetName\": \"Android 720p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3726,19 +3775,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 8000, \n"
+"                    \"VideoAvgBitrate\": 3000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x265\", \n"
-"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoEncoder\": \"x264\", \n"
+"                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"auto\", \n"
-"                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
-"                    \"VideoPreset\": \"slow\", \n"
+"                    \"VideoLevel\": \"3.1\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 24.0, \n"
+"                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3750,14 +3798,13 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\", \n"
-"                        \"copy:ac3\"\n"
+"                        \"copy:aac\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
 "                    \"AudioList\": \n"
 "                        {\n"
-"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioBitrate\": 128, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
 "                            \"AudioEncoder\": \"aac\", \n"
@@ -3768,19 +3815,6 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
-"                        }, \n"
-"                        {\n"
-"                            \"AudioBitrate\": 640, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"copy:ac3\", \n"
-"                            \"AudioMixdown\": \"none\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -3799,6 +3833,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3816,7 +3852,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureHeight\": 576, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3832,9 +3868,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 1080p60 Surround\", \n"
+"                    \"PictureWidth\": 720, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
+"                    \"PresetName\": \"Android 576p25\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3846,19 +3882,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoAvgBitrate\": 1800, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoFramerate\": \"25\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.2\", \n"
+"                    \"VideoLevel\": \"3.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoProfile\": \"main\", \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -3870,14 +3905,13 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\", \n"
-"                        \"copy:ac3\"\n"
+"                        \"copy:aac\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
 "                    \"AudioList\": \n"
 "                        {\n"
-"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioBitrate\": 128, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
 "                            \"AudioEncoder\": \"aac\", \n"
@@ -3888,19 +3922,6 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
-"                        }, \n"
-"                        {\n"
-"                            \"AudioBitrate\": 640, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"copy:ac3\", \n"
-"                            \"AudioMixdown\": \"none\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -3919,6 +3940,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -3936,7 +3959,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureHeight\": 480, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -3952,9 +3975,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 1080p30 Surround\", \n"
+"                    \"PictureWidth\": 720, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.\", \n"
+"                    \"PresetName\": \"Android 480p30\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -3966,19 +3989,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoAvgBitrate\": 1500, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
 "                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.0\", \n"
+"                    \"VideoLevel\": \"3.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoProfile\": \"main\", \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -4039,6 +4061,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4056,7 +4080,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 720, \n"
+"                    \"PictureHeight\": 2160, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -4072,9 +4096,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 720p30 Surround\", \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.\", \n"
+"                    \"PresetName\": \"Apple 2160p60 4K HEVC Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4086,19 +4110,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 3000, \n"
+"                    \"VideoAvgBitrate\": 8000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
+"                    \"VideoEncoder\": \"x265\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.1\", \n"
-"                    \"VideoOptionExtra\": \"\", \n"
-"                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
+"                    \"VideoPreset\": \"slow\", \n"
+"                    \"VideoProfile\": \"main\", \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 21.0, \n"
+"                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -4159,6 +4182,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4176,7 +4201,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 540, \n"
+"                    \"PictureHeight\": 1080, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -4192,115 +4217,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 960, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 540p30 Surround\", \n"
-"                    \"SubtitleAddCC\": false, \n"
-"                    \"SubtitleAddForeignAudioSearch\": true, \n"
-"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
-"                    \"SubtitleBurnBDSub\": true, \n"
-"                    \"SubtitleBurnBehavior\": \"foreign\", \n"
-"                    \"SubtitleBurnDVDSub\": true, \n"
-"                    \"SubtitleLanguageList\": , \n"
-"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
-"                    \"Type\": 0, \n"
-"                    \"UsesPictureFilters\": true, \n"
-"                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 2500, \n"
-"                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
-"                    \"VideoFramerateMode\": \"pfr\", \n"
-"                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.1\", \n"
-"                    \"VideoOptionExtra\": \"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\", \n"
-"                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
-"                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 20.0, \n"
-"                    \"VideoQualityType\": 2, \n"
-"                    \"VideoScaler\": \"swscale\", \n"
-"                    \"VideoTune\": \"\", \n"
-"                    \"VideoTurboTwoPass\": false, \n"
-"                    \"VideoTwoPass\": true, \n"
-"                    \"x264Option\": \"\", \n"
-"                    \"x264UseAdvancedOptions\": false\n"
-"                }, \n"
-"                {\n"
-"                    \"AlignAVStart\": false, \n"
-"                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\"\n"
-"                    , \n"
-"                    \"AudioEncoderFallback\": \"aac\", \n"
-"                    \"AudioLanguageList\": , \n"
-"                    \"AudioList\": \n"
-"                        {\n"
-"                            \"AudioBitrate\": 160, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"aac\", \n"
-"                            \"AudioMixdown\": \"stereo\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
-"                        }\n"
-"                    , \n"
-"                    \"AudioSecondaryEncoderMode\": true, \n"
-"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
-"                    \"ChapterMarkers\": true, \n"
-"                    \"ChildrenArray\": , \n"
-"                    \"Default\": false, \n"
-"                    \"FileFormat\": \"mp4\", \n"
-"                    \"Folder\": false, \n"
-"                    \"FolderOpen\": false, \n"
-"                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": false, \n"
-"                    \"Mp4iPodCompatible\": true, \n"
-"                    \"PictureAutoCrop\": true, \n"
-"                    \"PictureBottomCrop\": 0, \n"
-"                    \"PictureChromaSmoothCustom\": \"\", \n"
-"                    \"PictureChromaSmoothPreset\": \"off\", \n"
-"                    \"PictureChromaSmoothTune\": \"none\", \n"
-"                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
-"                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
-"                    \"PictureDeblockPreset\": \"off\", \n"
-"                    \"PictureDeblockTune\": \"medium\", \n"
-"                    \"PictureDeinterlaceCustom\": \"\", \n"
-"                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
-"                    \"PictureDeinterlacePreset\": \"default\", \n"
-"                    \"PictureDenoiseCustom\": \"\", \n"
-"                    \"PictureDenoiseFilter\": \"off\", \n"
-"                    \"PictureDenoisePreset\": \"light\", \n"
-"                    \"PictureDenoiseTune\": \"none\", \n"
-"                    \"PictureDetelecine\": \"off\", \n"
-"                    \"PictureDetelecineCustom\": \"\", \n"
-"                    \"PictureForceHeight\": 0, \n"
-"                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 240, \n"
-"                    \"PictureItuPAR\": false, \n"
-"                    \"PictureKeepRatio\": true, \n"
-"                    \"PictureLeftCrop\": 0, \n"
-"                    \"PictureLooseCrop\": false, \n"
-"                    \"PictureModulus\": 16, \n"
-"                    \"PicturePAR\": \"off\", \n"
-"                    \"PicturePARHeight\": 720, \n"
-"                    \"PicturePARWidth\": 853, \n"
-"                    \"PictureRightCrop\": 0, \n"
-"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
-"                    \"PictureSharpenCustom\": \"\", \n"
-"                    \"PictureSharpenFilter\": \"off\", \n"
-"                    \"PictureSharpenPreset\": \"medium\", \n"
-"                    \"PictureSharpenTune\": \"none\", \n"
-"                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 320, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.\", \n"
-"                    \"PresetName\": \"Apple 240p30\", \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.\", \n"
+"                    \"PresetName\": \"Apple 1080p60 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4312,23 +4231,22 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 350, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"1.3\", \n"
+"                    \"VideoLevel\": \"4.2\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"baseline\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoProfile\": \"high\", \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
-"                    \"VideoTurboTwoPass\": true, \n"
+"                    \"VideoTurboTwoPass\": false, \n"
 "                    \"VideoTwoPass\": true, \n"
 "                    \"x264Option\": \"\", \n"
 "                    \"x264UseAdvancedOptions\": false\n"
@@ -4378,13 +4296,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": true, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4402,7 +4322,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureHeight\": 1080, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -4418,9 +4338,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 3840, \n"
-"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.\", \n"
-"                    \"PresetName\": \"Chromecast 2160p60 4K HEVC Surround\", \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.\", \n"
+"                    \"PresetName\": \"Apple 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4432,19 +4352,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 8000, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x265\", \n"
-"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoEncoder\": \"x264\", \n"
+"                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"auto\", \n"
-"                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
-"                    \"VideoPreset\": \"slow\", \n"
-"                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoLevel\": \"4.0\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoProfile\": \"high\", \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 24.0, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -4498,13 +4417,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": true, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4522,7 +4443,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureHeight\": 720, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -4538,9 +4459,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.\", \n"
-"                    \"PresetName\": \"Chromecast 1080p60 Surround\", \n"
+"                    \"PictureWidth\": 1280, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.\", \n"
+"                    \"PresetName\": \"Apple 720p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4552,19 +4473,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoAvgBitrate\": 3000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"60\", \n"
+"                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.2\", \n"
+"                    \"VideoLevel\": \"3.1\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -4618,13 +4538,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": true, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4642,7 +4564,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureHeight\": 540, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -4658,9 +4580,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.\", \n"
-"                    \"PresetName\": \"Chromecast 1080p30 Surround\", \n"
+"                    \"PictureWidth\": 960, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.\", \n"
+"                    \"PresetName\": \"Apple 540p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4672,19 +4594,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoAvgBitrate\": 2500, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
 "                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.0\", \n"
-"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoLevel\": \"3.1\", \n"
+"                    \"VideoOptionExtra\": \"qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -4738,13 +4659,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4HttpOptimize\": true, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4779,8 +4702,8 @@
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 3840, \n"
-"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.\", \n"
-"                    \"PresetName\": \"Amazon Fire 2160p60 4K HEVC Surround\", \n"
+"                    \"PresetDescription\": \"H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.\", \n"
+"                    \"PresetName\": \"Chromecast 2160p60 4K HEVC Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4802,7 +4725,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -4858,13 +4780,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4HttpOptimize\": true, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4899,8 +4823,8 @@
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
 "                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).\", \n"
-"                    \"PresetName\": \"Amazon Fire 1080p30 Surround\", \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.\", \n"
+"                    \"PresetName\": \"Chromecast 1080p60 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -4915,14 +4839,13 @@
 "                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
+"                    \"VideoFramerate\": \"60\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.0\", \n"
+"                    \"VideoLevel\": \"4.2\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
+"                    \"VideoProfile\": \"high\", \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -4936,7 +4859,8 @@
 "                {\n"
 "                    \"AlignAVStart\": false, \n"
 "                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\"\n"
+"                        \"copy:aac\", \n"
+"                        \"copy:ac3\"\n"
 "                    , \n"
 "                    \"AudioEncoderFallback\": \"aac\", \n"
 "                    \"AudioLanguageList\": , \n"
@@ -4953,6 +4877,19 @@
 "                            \"AudioTrackGainSlider\": 0.0, \n"
 "                            \"AudioTrackQuality\": -1.0, \n"
 "                            \"AudioTrackQualityEnable\": false\n"
+"                        }, \n"
+"                        {\n"
+"                            \"AudioBitrate\": 640, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"copy:ac3\", \n"
+"                            \"AudioMixdown\": \"none\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
 "                        }\n"
 "                    , \n"
 "                    \"AudioSecondaryEncoderMode\": true, \n"
@@ -4964,13 +4901,15 @@
 "                    \"Folder\": false, \n"
 "                    \"FolderOpen\": false, \n"
 "                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4HttpOptimize\": true, \n"
 "                    \"Mp4iPodCompatible\": false, \n"
 "                    \"PictureAutoCrop\": true, \n"
 "                    \"PictureBottomCrop\": 0, \n"
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -4988,7 +4927,7 @@
 "                    \"PictureDetelecineCustom\": \"\", \n"
 "                    \"PictureForceHeight\": 0, \n"
 "                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 720, \n"
+"                    \"PictureHeight\": 1080, \n"
 "                    \"PictureItuPAR\": false, \n"
 "                    \"PictureKeepRatio\": true, \n"
 "                    \"PictureLeftCrop\": 0, \n"
@@ -5004,9 +4943,9 @@
 "                    \"PictureSharpenPreset\": \"medium\", \n"
 "                    \"PictureSharpenTune\": \"none\", \n"
 "                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1280, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.\", \n"
-"                    \"PresetName\": \"Amazon Fire 720p30\", \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.\", \n"
+"                    \"PresetName\": \"Chromecast 1080p30 Surround\", \n"
 "                    \"SubtitleAddCC\": false, \n"
 "                    \"SubtitleAddForeignAudioSearch\": true, \n"
 "                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
@@ -5018,19 +4957,18 @@
 "                    \"Type\": 0, \n"
 "                    \"UsesPictureFilters\": true, \n"
 "                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 3000, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
 "                    \"VideoColorMatrixCodeOverride\": 0, \n"
 "                    \"VideoEncoder\": \"x264\", \n"
 "                    \"VideoFramerate\": \"30\", \n"
 "                    \"VideoFramerateMode\": \"pfr\", \n"
 "                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"3.1\", \n"
+"                    \"VideoLevel\": \"4.0\", \n"
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 21.0, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
 "                    \"VideoScaler\": \"swscale\", \n"
 "                    \"VideoTune\": \"\", \n"
@@ -5091,6 +5029,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5148,7 +5088,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5211,6 +5150,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5268,7 +5209,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5317,6 +5257,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5374,7 +5316,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5423,6 +5364,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5480,7 +5423,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5546,6 +5488,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5603,7 +5547,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5666,6 +5609,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5723,7 +5668,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5786,6 +5730,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5843,7 +5789,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5892,6 +5837,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -5949,7 +5896,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -5998,6 +5944,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6055,7 +6003,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6118,6 +6065,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6175,127 +6124,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
-"                    \"VideoQSVDecode\": false, \n"
-"                    \"VideoQualitySlider\": 22.0, \n"
-"                    \"VideoQualityType\": 2, \n"
-"                    \"VideoScaler\": \"swscale\", \n"
-"                    \"VideoTune\": \"\", \n"
-"                    \"VideoTurboTwoPass\": false, \n"
-"                    \"VideoTwoPass\": true, \n"
-"                    \"x264Option\": \"\", \n"
-"                    \"x264UseAdvancedOptions\": false\n"
-"                }, \n"
-"                {\n"
-"                    \"AlignAVStart\": false, \n"
-"                    \"AudioCopyMask\": \n"
-"                        \"copy:aac\", \n"
-"                        \"copy:ac3\"\n"
-"                    , \n"
-"                    \"AudioEncoderFallback\": \"aac\", \n"
-"                    \"AudioLanguageList\": , \n"
-"                    \"AudioList\": \n"
-"                        {\n"
-"                            \"AudioBitrate\": 160, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"aac\", \n"
-"                            \"AudioMixdown\": \"stereo\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
-"                        }, \n"
-"                        {\n"
-"                            \"AudioBitrate\": 640, \n"
-"                            \"AudioCompressionLevel\": -1.0, \n"
-"                            \"AudioDitherMethod\": \"auto\", \n"
-"                            \"AudioEncoder\": \"copy:ac3\", \n"
-"                            \"AudioMixdown\": \"none\", \n"
-"                            \"AudioNormalizeMixLevel\": false, \n"
-"                            \"AudioSamplerate\": \"auto\", \n"
-"                            \"AudioTrackDRCSlider\": 0.0, \n"
-"                            \"AudioTrackGainSlider\": 0.0, \n"
-"                            \"AudioTrackQuality\": -1.0, \n"
-"                            \"AudioTrackQualityEnable\": false\n"
-"                        }\n"
-"                    , \n"
-"                    \"AudioSecondaryEncoderMode\": true, \n"
-"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
-"                    \"ChapterMarkers\": false, \n"
-"                    \"ChildrenArray\": , \n"
-"                    \"Default\": false, \n"
-"                    \"FileFormat\": \"mp4\", \n"
-"                    \"Folder\": false, \n"
-"                    \"FolderOpen\": false, \n"
-"                    \"InlineParameterSets\": false, \n"
-"                    \"Mp4HttpOptimize\": false, \n"
-"                    \"Mp4iPodCompatible\": false, \n"
-"                    \"PictureAutoCrop\": true, \n"
-"                    \"PictureBottomCrop\": 0, \n"
-"                    \"PictureChromaSmoothCustom\": \"\", \n"
-"                    \"PictureChromaSmoothPreset\": \"off\", \n"
-"                    \"PictureChromaSmoothTune\": \"none\", \n"
-"                    \"PictureCombDetectCustom\": \"\", \n"
-"                    \"PictureCombDetectPreset\": \"default\", \n"
-"                    \"PictureDARWidth\": 0, \n"
-"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
-"                    \"PictureDeblockPreset\": \"off\", \n"
-"                    \"PictureDeblockTune\": \"medium\", \n"
-"                    \"PictureDeinterlaceCustom\": \"\", \n"
-"                    \"PictureDeinterlaceFilter\": \"decomb\", \n"
-"                    \"PictureDeinterlacePreset\": \"default\", \n"
-"                    \"PictureDenoiseCustom\": \"\", \n"
-"                    \"PictureDenoiseFilter\": \"off\", \n"
-"                    \"PictureDenoisePreset\": \"light\", \n"
-"                    \"PictureDenoiseTune\": \"none\", \n"
-"                    \"PictureDetelecine\": \"off\", \n"
-"                    \"PictureDetelecineCustom\": \"\", \n"
-"                    \"PictureForceHeight\": 0, \n"
-"                    \"PictureForceWidth\": 0, \n"
-"                    \"PictureHeight\": 1080, \n"
-"                    \"PictureItuPAR\": false, \n"
-"                    \"PictureKeepRatio\": true, \n"
-"                    \"PictureLeftCrop\": 0, \n"
-"                    \"PictureLooseCrop\": false, \n"
-"                    \"PictureModulus\": 8, \n"
-"                    \"PicturePAR\": \"off\", \n"
-"                    \"PicturePARHeight\": 720, \n"
-"                    \"PicturePARWidth\": 853, \n"
-"                    \"PictureRightCrop\": 0, \n"
-"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
-"                    \"PictureSharpenCustom\": \"\", \n"
-"                    \"PictureSharpenFilter\": \"off\", \n"
-"                    \"PictureSharpenPreset\": \"medium\", \n"
-"                    \"PictureSharpenTune\": \"none\", \n"
-"                    \"PictureTopCrop\": 0, \n"
-"                    \"PictureWidth\": 1920, \n"
-"                    \"PresetDescription\": \"H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox 360.\", \n"
-"                    \"PresetName\": \"Xbox Legacy 1080p30 Surround\", \n"
-"                    \"SubtitleAddCC\": false, \n"
-"                    \"SubtitleAddForeignAudioSearch\": true, \n"
-"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
-"                    \"SubtitleBurnBDSub\": true, \n"
-"                    \"SubtitleBurnBehavior\": \"foreign\", \n"
-"                    \"SubtitleBurnDVDSub\": true, \n"
-"                    \"SubtitleLanguageList\": , \n"
-"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
-"                    \"Type\": 0, \n"
-"                    \"UsesPictureFilters\": true, \n"
-"                    \"UsesPictureSettings\": 1, \n"
-"                    \"VideoAvgBitrate\": 6000, \n"
-"                    \"VideoColorMatrixCodeOverride\": 0, \n"
-"                    \"VideoEncoder\": \"x264\", \n"
-"                    \"VideoFramerate\": \"30\", \n"
-"                    \"VideoFramerateMode\": \"pfr\", \n"
-"                    \"VideoGrayScale\": false, \n"
-"                    \"VideoLevel\": \"4.0\", \n"
-"                    \"VideoOptionExtra\": \"\", \n"
-"                    \"VideoPreset\": \"medium\", \n"
-"                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6351,6 +6179,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6408,7 +6238,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6457,6 +6286,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6514,7 +6345,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6563,6 +6393,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6620,7 +6452,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6669,6 +6500,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6726,7 +6559,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6775,6 +6607,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6832,7 +6666,6 @@
 "                    \"VideoOptionExtra\": \"strong-intra-smoothing=0:rect=0:aq-mode=1\", \n"
 "                    \"VideoPreset\": \"slow\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6881,6 +6714,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -6938,7 +6773,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -6987,6 +6821,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7044,7 +6880,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -7093,6 +6928,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7150,7 +6987,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -7199,6 +7035,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7256,7 +7094,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -7305,6 +7142,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7362,7 +7201,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"main\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -7409,6 +7247,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7466,7 +7306,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=30\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 24.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -7513,6 +7352,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7570,7 +7411,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=30\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -7617,6 +7457,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7674,7 +7516,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=30\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 21.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -7721,6 +7562,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7778,7 +7621,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=30\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -7825,6 +7667,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7882,7 +7726,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=30\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 20.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -7929,6 +7772,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -7986,7 +7831,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=24\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 4.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -8033,6 +7877,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8090,7 +7936,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=24\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 4.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -8137,6 +7982,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8194,7 +8041,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=24\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 4.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -8241,6 +8087,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"default\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8298,7 +8146,6 @@
 "                    \"VideoOptionExtra\": \"qmin=0:qmax=24\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 4.0, \n"
 "                    \"VideoQualityType\": 1, \n"
@@ -8325,6 +8172,861 @@
 "                    \"AudioLanguageList\": , \n"
 "                    \"AudioList\": \n"
 "                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"Nvidia NVENC hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 NVENC 2160p 4K\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 10500, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"nvenc_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"rc-lookahead=10\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoProfile\": \"auto\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 30.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"Nvidia NVENC hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 NVENC 1080p\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 3750, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"nvenc_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"rc-lookahead=10\", \n"
+"                    \"VideoPreset\": \"medium\", \n"
+"                    \"VideoProfile\": \"auto\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 27.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"Intel Quick Sync Video hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 QSV 2160p 4K\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 8000, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"qsv_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"speed\", \n"
+"                    \"VideoProfile\": \"auto\", \n"
+"                    \"VideoQSVDecode\": true, \n"
+"                    \"VideoQualitySlider\": 24.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"Intel Quick Sync Video hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 QSV 1080p\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 2500, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"qsv_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"speed\", \n"
+"                    \"VideoProfile\": \"auto\", \n"
+"                    \"VideoQSVDecode\": true, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"AMD VCN hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 VCN 2160p 4K\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 12500, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"vce_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"balanced\", \n"
+"                    \"VideoProfile\": \"main\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 28.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"strength=strong:thresh=20:blocksize=8\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 720, \n"
+"                    \"PicturePARWidth\": 853, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"AMD VCN hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.\", \n"
+"                    \"PresetName\": \"H.265 VCN 1080p\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 7250, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"vce_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"balanced\", \n"
+"                    \"VideoProfile\": \"main\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 25.0, \n"
+"                    \"VideoQualityType\": 2, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 2160, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 1, \n"
+"                    \"PicturePARWidth\": 1, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 3840, \n"
+"                    \"PresetDescription\": \"Hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container for ARM based platforms using Media Foundation\", \n"
+"                    \"PresetName\": \"H.265 MF 2160p 4K\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 9000, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"mf_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"balanced\", \n"
+"                    \"VideoProfile\": \"main\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 28.0, \n"
+"                    \"VideoQualityType\": 1, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }, \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
+"                            \"AudioBitrate\": 160, \n"
+"                            \"AudioCompressionLevel\": -1.0, \n"
+"                            \"AudioDitherMethod\": \"auto\", \n"
+"                            \"AudioEncoder\": \"aac\", \n"
+"                            \"AudioMixdown\": \"stereo\", \n"
+"                            \"AudioNormalizeMixLevel\": false, \n"
+"                            \"AudioSamplerate\": \"auto\", \n"
+"                            \"AudioTrackDRCSlider\": 0.0, \n"
+"                            \"AudioTrackGainSlider\": 0.0, \n"
+"                            \"AudioTrackQuality\": -1.0, \n"
+"                            \"AudioTrackQualityEnable\": false\n"
+"                        }\n"
+"                    , \n"
+"                    \"AudioSecondaryEncoderMode\": true, \n"
+"                    \"AudioTrackSelectionBehavior\": \"first\", \n"
+"                    \"ChapterMarkers\": true, \n"
+"                    \"ChildrenArray\": , \n"
+"                    \"Default\": false, \n"
+"                    \"FileFormat\": \"mp4\", \n"
+"                    \"Folder\": false, \n"
+"                    \"FolderOpen\": false, \n"
+"                    \"Mp4HttpOptimize\": false, \n"
+"                    \"Mp4iPodCompatible\": false, \n"
+"                    \"PictureAutoCrop\": false, \n"
+"                    \"PictureBottomCrop\": 0, \n"
+"                    \"PictureChromaSmoothCustom\": \"\", \n"
+"                    \"PictureChromaSmoothPreset\": \"off\", \n"
+"                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
+"                    \"PictureCombDetectCustom\": \"\", \n"
+"                    \"PictureCombDetectPreset\": \"off\", \n"
+"                    \"PictureDARWidth\": 0, \n"
+"                    \"PictureDeblockCustom\": \"\", \n"
+"                    \"PictureDeblockPreset\": \"off\", \n"
+"                    \"PictureDeblockTune\": \"medium\", \n"
+"                    \"PictureDeinterlaceCustom\": \"\", \n"
+"                    \"PictureDeinterlaceFilter\": \"off\", \n"
+"                    \"PictureDeinterlacePreset\": \"default\", \n"
+"                    \"PictureDenoiseCustom\": \"\", \n"
+"                    \"PictureDenoiseFilter\": \"off\", \n"
+"                    \"PictureDenoisePreset\": \"medium\", \n"
+"                    \"PictureDenoiseTune\": \"none\", \n"
+"                    \"PictureDetelecine\": \"off\", \n"
+"                    \"PictureDetelecineCustom\": \"\", \n"
+"                    \"PictureForceHeight\": 0, \n"
+"                    \"PictureForceWidth\": 0, \n"
+"                    \"PictureHeight\": 1080, \n"
+"                    \"PictureItuPAR\": false, \n"
+"                    \"PictureKeepRatio\": true, \n"
+"                    \"PictureLeftCrop\": 0, \n"
+"                    \"PictureLooseCrop\": false, \n"
+"                    \"PictureModulus\": 2, \n"
+"                    \"PicturePAR\": \"auto\", \n"
+"                    \"PicturePARHeight\": 1, \n"
+"                    \"PicturePARWidth\": 1, \n"
+"                    \"PictureRightCrop\": 0, \n"
+"                    \"PictureRotate\": \"angle=0:hflip=0\", \n"
+"                    \"PictureSharpenCustom\": \"\", \n"
+"                    \"PictureSharpenFilter\": \"off\", \n"
+"                    \"PictureSharpenPreset\": \"medium\", \n"
+"                    \"PictureSharpenTune\": \"none\", \n"
+"                    \"PictureTopCrop\": 0, \n"
+"                    \"PictureWidth\": 1920, \n"
+"                    \"PresetDescription\": \"Hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container for ARM based platforms using Media Foundation\", \n"
+"                    \"PresetName\": \"H.265 MF 1080p\", \n"
+"                    \"SubtitleAddCC\": false, \n"
+"                    \"SubtitleAddForeignAudioSearch\": false, \n"
+"                    \"SubtitleAddForeignAudioSubtitle\": false, \n"
+"                    \"SubtitleBurnBDSub\": false, \n"
+"                    \"SubtitleBurnBehavior\": \"none\", \n"
+"                    \"SubtitleBurnDVDSub\": false, \n"
+"                    \"SubtitleLanguageList\": , \n"
+"                    \"SubtitleTrackSelectionBehavior\": \"none\", \n"
+"                    \"Type\": 0, \n"
+"                    \"UsesPictureFilters\": true, \n"
+"                    \"UsesPictureSettings\": 1, \n"
+"                    \"VideoAvgBitrate\": 6000, \n"
+"                    \"VideoColorMatrixCodeOverride\": 0, \n"
+"                    \"VideoEncoder\": \"mf_h265\", \n"
+"                    \"VideoFramerate\": \"auto\", \n"
+"                    \"VideoFramerateMode\": \"vfr\", \n"
+"                    \"VideoGrayScale\": false, \n"
+"                    \"VideoLevel\": \"auto\", \n"
+"                    \"VideoOptionExtra\": \"\", \n"
+"                    \"VideoPreset\": \"balanced\", \n"
+"                    \"VideoProfile\": \"main\", \n"
+"                    \"VideoQSVDecode\": false, \n"
+"                    \"VideoQualitySlider\": 22.0, \n"
+"                    \"VideoQualityType\": 1, \n"
+"                    \"VideoScaler\": \"swscale\", \n"
+"                    \"VideoTune\": \"\", \n"
+"                    \"VideoTurboTwoPass\": false, \n"
+"                    \"VideoTwoPass\": false, \n"
+"                    \"x264Option\": \"\", \n"
+"                    \"x264UseAdvancedOptions\": false\n"
+"                }\n"
+"            , \n"
+"            \"Folder\": true, \n"
+"            \"PresetName\": \"Hardware\", \n"
+"            \"Type\": 0\n"
+"        }, \n"
+"        {\n"
+"            \"ChildrenArray\": \n"
+"                {\n"
+"                    \"AlignAVStart\": false, \n"
+"                    \"AudioCopyMask\": \n"
+"                        \"copy:aac\"\n"
+"                    , \n"
+"                    \"AudioEncoderFallback\": \"none\", \n"
+"                    \"AudioLanguageList\": , \n"
+"                    \"AudioList\": \n"
+"                        {\n"
 "                            \"AudioBitrate\": 320, \n"
 "                            \"AudioCompressionLevel\": -1.0, \n"
 "                            \"AudioDitherMethod\": \"auto\", \n"
@@ -8354,6 +9056,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8411,7 +9115,6 @@
 "                    \"VideoOptionExtra\": \"keyint=12:min-keyint=1:ref=1:bframes=0:qcomp=0.8:aq-strength=0.5:dct-decimate=0:fast-pskip=0:deblock=-2,-2\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 2.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -8460,6 +9163,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8517,7 +9222,6 @@
 "                    \"VideoOptionExtra\": \"keyint=12:min-keyint=1:ref=1:bframes=0:qcomp=0.8:aq-strength=0.5:dct-decimate=0:fast-pskip=0:deblock=-2,-2\", \n"
 "                    \"VideoPreset\": \"fast\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 10.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -8566,6 +9270,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8623,7 +9329,6 @@
 "                    \"VideoOptionExtra\": \"keyint=1:min-keyint=1:ref=1:bframes=0:qcomp=0.8:aq-strength=0.5\", \n"
 "                    \"VideoPreset\": \"superfast\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 18.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -8672,6 +9377,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8729,7 +9436,6 @@
 "                    \"VideoOptionExtra\": \"keyint=1:min-keyint=1:ref=1:bframes=0:qcomp=0.8:aq-strength=0.5\", \n"
 "                    \"VideoPreset\": \"superfast\", \n"
 "                    \"VideoProfile\": \"high\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 16.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -8792,6 +9498,8 @@
 "                    \"PictureChromaSmoothCustom\": \"\", \n"
 "                    \"PictureChromaSmoothPreset\": \"off\", \n"
 "                    \"PictureChromaSmoothTune\": \"none\", \n"
+"                    \"PictureColorspaceCustom\": \"\", \n"
+"                    \"PictureColorspacePreset\": \"off\", \n"
 "                    \"PictureCombDetectCustom\": \"\", \n"
 "                    \"PictureCombDetectPreset\": \"off\", \n"
 "                    \"PictureDARWidth\": 0, \n"
@@ -8815,7 +9523,7 @@
 "                    \"PictureLeftCrop\": 0, \n"
 "                    \"PictureLooseCrop\": false, \n"
 "                    \"PictureModulus\": 2, \n"
-"                    \"PicturePAR\": \"loose\", \n"
+"                    \"PicturePAR\": \"auto\", \n"
 "                    \"PicturePARHeight\": 720, \n"
 "                    \"PicturePARWidth\": 853, \n"
 "                    \"PictureRightCrop\": 0, \n"
@@ -8849,7 +9557,6 @@
 "                    \"VideoOptionExtra\": \"\", \n"
 "                    \"VideoPreset\": \"medium\", \n"
 "                    \"VideoProfile\": \"auto\", \n"
-"                    \"VideoQSVAsyncDepth\": 4, \n"
 "                    \"VideoQSVDecode\": false, \n"
 "                    \"VideoQualitySlider\": 22.0, \n"
 "                    \"VideoQualityType\": 2, \n"
@@ -8907,13 +9614,17 @@
 "            \"Folder\": false, \n"
 "            \"FolderOpen\": false, \n"
 "            \"InlineParameterSets\": false, \n"
+"            \"MetadataPassthrough\": true, \n"
 "            \"Mp4HttpOptimize\": false, \n"
 "            \"Mp4iPodCompatible\": false, \n"
+"            \"PictureAllowUpscaling\": false, \n"
 "            \"PictureAutoCrop\": true, \n"
 "            \"PictureBottomCrop\": 0, \n"
 "            \"PictureChromaSmoothCustom\": \"\", \n"
 "            \"PictureChromaSmoothPreset\": \"off\", \n"
 "            \"PictureChromaSmoothTune\": \"none\", \n"
+"            \"PictureColorspaceCustom\": \"\", \n"
+"            \"PictureColorspacePreset\": \"off\", \n"
 "            \"PictureCombDetectCustom\": \"\", \n"
 "            \"PictureCombDetectPreset\": \"off\", \n"
 "            \"PictureDARWidth\": 0, \n"
@@ -8937,9 +9648,15 @@
 "            \"PictureLeftCrop\": 0, \n"
 "            \"PictureLooseCrop\": false, \n"
 "            \"PictureModulus\": 2, \n"
-"            \"PicturePAR\": \"loose\", \n"
+"            \"PicturePAR\": \"auto\", \n"
 "            \"PicturePARHeight\": 720, \n"
 "            \"PicturePARWidth\": 853, \n"
+"            \"PicturePadBottom\": 0, \n"
+"            \"PicturePadColor\": \"black\", \n"
+"            \"PicturePadLeft\": 0, \n"
+"            \"PicturePadMode\": \"none\", \n"
+"            \"PicturePadRight\": 0, \n"
+"            \"PicturePadTop\": 0, \n"
 "            \"PictureRightCrop\": 0, \n"
 "            \"PictureRotate\": \"angle=0:hflip=0\", \n"
 "            \"PictureSharpenCustom\": \"\", \n"
@@ -8947,8 +9664,10 @@
 "            \"PictureSharpenPreset\": \"medium\", \n"
 "            \"PictureSharpenTune\": \"none\", \n"
 "            \"PictureTopCrop\": 0, \n"
+"            \"PictureUseMaximumSize\": true, \n"
 "            \"PictureWidth\": 0, \n"
 "            \"PresetDescription\": \"\", \n"
+"            \"PresetDisabled\": false, \n"
 "            \"PresetName\": \"Name Missing\", \n"
 "            \"SubtitleAddCC\": false, \n"
 "            \"SubtitleAddForeignAudioSearch\": false, \n"
@@ -8960,7 +9679,6 @@
 "            \"SubtitleTrackSelectionBehavior\": \"none\", \n"
 "            \"Type\": 1, \n"
 "            \"UsesPictureFilters\": true, \n"
-"            \"UsesPictureSettings\": 2, \n"
 "            \"VideoAvgBitrate\": 1800, \n"
 "            \"VideoColorMatrixCodeOverride\": 0, \n"
 "            \"VideoEncoder\": \"x264\", \n"
@@ -8971,7 +9689,6 @@
 "            \"VideoOptionExtra\": \"\", \n"
 "            \"VideoPreset\": \"medium\", \n"
 "            \"VideoProfile\": \"auto\", \n"
-"            \"VideoQSVAsyncDepth\": 4, \n"
 "            \"VideoQSVDecode\": false, \n"
 "            \"VideoQualitySlider\": 20.0, \n"
 "            \"VideoQualityType\": 2, \n"
@@ -8982,7 +9699,7 @@
 "            \"x264Option\": \"\", \n"
 "            \"x264UseAdvancedOptions\": false\n"
 "        }, \n"
-"        \"VersionMajor\": 42, \n"
+"        \"VersionMajor\": 47, \n"
 "        \"VersionMicro\": 0, \n"
 "        \"VersionMinor\": 0\n"
 "    }\n"

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/project.h.m4 -> HandBrake-1.5.1.tar.xz/libhb/handbrake/project.h.m4 Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/qsv_common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/qsv_common.h Changed

@@ -1,6 +1,6 @@
 /* qsv_common.h
 *
- * Copyright (c) 2003-2020 HandBrake Team
+ * Copyright (c) 2003-2022 HandBrake Team
 * This file is part of the HandBrake source code.
 * Homepage: <http://handbrake.fr/>.
 * It may be used under the terms of the GNU General Public License v2.
@@ -23,10 +23,17 @@
 #ifdef __LIBHB__
 // Private API
 
-#include "mfx/mfxvideo.h"
-#include "mfx/mfxplugin.h"
-#include "libavcodec/avcodec.h"
+#include "vpl/mfxvideo.h"
+
+#define HB_QSV_VERSION_ATLEAST(MAJOR, MINOR) \
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+#define HB_QSV_ONEVPL HB_QSV_VERSION_ATLEAST(2, 0)
+#if !HB_QSV_ONEVPL
+ #include "mfx/mfxplugin.h"
+#endif
 #include "handbrake/hb_dict.h"
+#include "handbrake/qsv_libav.h"
 
 /* Minimum Intel Media SDK version (currently 1.3, for Sandy Bridge support) */
 #define HB_QSV_MINVERSION_MAJOR HB_QSV_MSDK_VERSION_MAJOR
@@ -44,7 +51,7 @@
 typedef struct hb_qsv_info_s
 {
 // each info struct only corresponds to one CodecId and implementation combo
- const mfxU32 codec_id;
+ mfxU32 codec_id;
 mfxIMPL implementation;
 
 // whether the encoder is available for this implementation
@@ -74,21 +81,30 @@
 #define HB_QSV_CAP_OPTION2_IB_ADAPT (1LL << 35)
 #define HB_QSV_CAP_OPTION2_LA_DOWNS (1LL << 36)
 #define HB_QSV_CAP_OPTION2_NMPSLICE (1LL << 37)
+#define HB_QSV_CAP_VPP_SCALING (1LL << 38)
+#define HB_QSV_CAP_VPP_INTERPOLATION (1LL << 39)
 
 // TODO: add maximum encode resolution, etc.
 } hb_qsv_info_t;
 
 /* Intel Quick Sync Video utilities */
 hb_display_t * hb_qsv_display_init(void);
-int hb_qsv_video_encoder_is_enabled(int encoder);
+int hb_qsv_video_encoder_is_enabled(int adapter_index, int encoder);
 int hb_qsv_audio_encoder_is_enabled(int encoder);
 int hb_qsv_info_init();
 void hb_qsv_info_print();
-hb_qsv_info_t* hb_qsv_info_get(int encoder);
-
+hb_list_t* hb_qsv_adapters_list();
+hb_qsv_info_t* hb_qsv_encoder_info_get(int adapter_index, int encoder);
+int hb_qsv_hardware_generation(int cpu_platform);
+int hb_qsv_get_platform(int adapter_index);
+int hb_qsv_get_adapter_index();
+int hb_qsv_implementation_is_hardware(mfxIMPL implementation);
+
+#if !HB_QSV_ONEVPL
 /* Automatically load and unload any required MFX plug-ins */
-hb_list_t* hb_qsv_load_plugins (hb_qsv_info_t *info, mfxSession session, mfxVersion version);
+hb_list_t* hb_qsv_load_plugins (int adapter_index, hb_qsv_info_t *info, mfxSession session, mfxVersion version);
 void hb_qsv_unload_plugins(hb_list_t **_l, mfxSession session, mfxVersion version);
+#endif
 
 /* Intel Quick Sync Video DECODE utilities */
 const char* hb_qsv_decode_get_codec_name(enum AVCodecID codec_id);
@@ -110,6 +126,25 @@
 HB_QSV_PARAM_UNSUPPORTED,
 };
 
+/*
+ * * Determine the "generation" of QSV hardware based on the CPU microarchitecture.
+ * * Anything unknown is assumed to be more recent than the latest known generation.
+ * * This avoids having to order the hb_cpu_platform enum depending on QSV hardware.
+ * */
+enum
+{
+ QSV_G0, // third party hardware
+ QSV_G1, // Sandy Bridge or equivalent
+ QSV_G2, // Ivy Bridge or equivalent
+ QSV_G3, // Haswell or equivalent
+ QSV_G4, // Broadwell or equivalent
+ QSV_G5, // Skylake or equivalent
+ QSV_G6, // Kaby Lake or equivalent
+ QSV_G7, // Ice Lake or equivalent
+ QSV_G8, // Tiger Lake or equivalent
+ QSV_FU, // always last (future processors)
+};
+
 typedef struct
 {
 /*
@@ -160,6 +195,7 @@
 const char* const* hb_qsv_preset_get_names();
 const char* const* hb_qsv_profile_get_names(int encoder);
 const char* const* hb_qsv_level_get_names(int encoder);
+const int* hb_qsv_get_pix_fmts(int encoder);
 
 const char* hb_qsv_video_quality_get_name(uint32_t codec);
 void hb_qsv_video_quality_get_limits(uint32_t codec, float *low, float *high, float *granularity, int *direction);
@@ -174,11 +210,13 @@
 int hb_qsv_atoi (const char *str, int *err);
 float hb_qsv_atof (const char *str, int *err);
 
-int hb_qsv_param_default_preset(hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info, const char *preset);
-int hb_qsv_param_default (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info);
-int hb_qsv_param_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *key, const char *value);
-int hb_qsv_profile_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *profile_key, const int codec);
-int hb_qsv_level_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *level_key);
+int hb_qsv_param_default_async_depth();
+int hb_qsv_param_default_preset (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info, const char *preset);
+int hb_qsv_param_default (hb_qsv_param_t *param, mfxVideoParam *videoParam, hb_qsv_info_t *info);
+int hb_qsv_param_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, hb_job_t *job, const char *key, const char *value);
+int hb_qsv_profile_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *profile_key, const int codec);
+int hb_qsv_level_parse (hb_qsv_param_t *param, hb_qsv_info_t *info, const char *level_key);
+int hb_qsv_param_parse_dx_index (hb_job_t *job, const int dx_index);
 
 typedef struct
 {
@@ -200,66 +238,38 @@
 
 const char* hb_qsv_impl_get_name(int impl);
 const char* hb_qsv_impl_get_via_name(int impl);
-
-
-typedef struct QSVMid {
- AVBufferRef *hw_frames_ref;
- mfxHDL handle;
-
- void *texture;
-
- AVFrame *locked_frame;
- AVFrame *hw_frame;
- mfxFrameSurface1 surf;
-} QSVMid;
-
-typedef struct QSVFrame {
- AVFrame *frame;
- mfxFrameSurface1 surface;
- mfxEncodeCtrl enc_ctrl;
- mfxExtDecodedFrameInfo dec_info;
- mfxExtBuffer *ext_param;
-
- int queued;
- int used;
-
- struct QSVFrame *next;
-} QSVFrame;
-
-#define HB_POOL_SURFACE_SIZE (64)
-#define HB_POOL_ENCODER_SIZE (8)
-
-typedef struct EncQSVFramesContext {
- AVBufferRef *hw_frames_ctx;
- AVBufferRef *hw_frames_ctx2;
- //void *logctx;
-
- /* The memory ids for the external frames.
- * Refcounted, since we need one reference owned by the QSVFramesContext
- * (i.e. by the encoder/decoder) and another one given to the MFX session
- * from the frame allocator. */
- AVBufferRef *mids_buf;
- AVBufferRef *mids_buf2;
- QSVMid *mids;
- QSVMid *mids2;
- int nb_mids;
- int poolHB_POOL_SURFACE_SIZE;
- int pool2HB_POOL_SURFACE_SIZE;
- void *input_texture;
-} EncQSVFramesContext;
+mfxIMPL hb_qsv_dx_index_to_impl(int dx_index);
 
 /* Full QSV pipeline helpers */
+int hb_qsv_is_enabled(hb_job_t *job);
+hb_qsv_context* hb_qsv_context_init();
+void hb_qsv_context_uninit(hb_job_t *job);
+int hb_qsv_sanitize_filter_list(hb_job_t *job);
+int hb_qsv_hw_frames_init(AVCodecContext *s);
+int hb_create_ffmpeg_pool(hb_job_t *job, int coded_width, int coded_height, enum AVPixelFormat sw_pix_fmt, int pool_size, int extra_hw_frames, AVBufferRef **out_hw_frames_ctx);
+int hb_qsv_hw_filters_are_enabled(hb_job_t *job);
 int hb_qsv_full_path_is_enabled(hb_job_t *job);
 AVBufferRef *hb_qsv_create_mids(AVBufferRef *hw_frames_ref);
-hb_buffer_t* hb_qsv_copy_frame(AVFrame *frame, hb_qsv_context *qsv_ctx);
-void hb_qsv_get_free_surface_from_pool(const int start_index, const int end_index, QSVMid **out_mid, mfxFrameSurface1 **out_surface);
-int hb_qsv_replace_surface_mid(const QSVMid *mid, mfxFrameSurface1 *surface);
-int hb_qsv_release_surface_from_pool(const QSVMid *mid);
+int hb_qsv_attach_surface_to_video_buffer(hb_job_t *job, hb_buffer_t* buf, int is_vpp);
+int hb_qsv_copy_video_buffer_to_video_buffer(hb_job_t *job, hb_buffer_t* in, hb_buffer_t* out, int is_vpp);
+hb_buffer_t* hb_qsv_copy_avframe_to_video_buffer(hb_job_t *job, AVFrame *frame, int is_vpp);
+int hb_qsv_get_free_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, AVFrame* frame, QSVMid** out_mid);
+void hb_qsv_get_free_surface_from_pool_with_range(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const int start_index, const int end_index, QSVMid** out_mid, mfxFrameSurface1** out_surface);
+int hb_qsv_get_mid_by_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, mfxFrameSurface1 *surface, QSVMid **out_mid);
+int hb_qsv_replace_surface_mid(HBQSVFramesContext* hb_qsv_frames_ctx, const QSVMid *mid, mfxFrameSurface1 *surface);
+int hb_qsv_release_surface_from_pool_by_surface_pointer(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const mfxFrameSurface1 *surface);
 int hb_qsv_get_buffer(AVCodecContext *s, AVFrame *frame, int flags);
 enum AVPixelFormat hb_qsv_get_format(AVCodecContext *s, const enum AVPixelFormat *pix_fmts);
 int hb_qsv_preset_is_zero_copy_enabled(const hb_dict_t *job_dict);
 void hb_qsv_uninit_dec(AVCodecContext *s);
-void hb_qsv_uninit_enc();
+void hb_qsv_uninit_enc(hb_job_t *job);
+int hb_qsv_parse_adapter_index(hb_job_t *job);
+int hb_qsv_setup_job(hb_job_t *job);
+int hb_qsv_decode_h264_is_supported(int adapter_index);
+int hb_qsv_decode_h265_is_supported(int adapter_index);
+int hb_qsv_decode_h265_10_bit_is_supported(int adapter_index);
+int hb_qsv_decode_av1_is_supported(int adapter_index);
+int hb_qsv_decode_codec_supported_codec(int adapter_index, int video_codec_param, int pix_fmt);
 
 #endif // __LIBHB__
 #endif // HB_PROJECT_FEATURE_QSV

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/qsv_filter_pp.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/qsv_filter_pp.h Changed

@@ -33,14 +33,19 @@
 
 #if HB_PROJECT_FEATURE_QSV
 
+#include "handbrake/qsv_common.h"
+#if !HB_QSV_ONEVPL
 #include "mfx/mfxplugin.h"
+#endif
 
 struct qsv_filter_task_s;
 
 typedef struct{
         mfxFrameAllocator *alloc;
         mfxStatus             (*process)(struct qsv_filter_task_s*,void*);
+#if !HB_QSV_ONEVPL
         mfxCoreInterface    *core;
+#endif
 }qsv_filter_processor_t;
 
 typedef  struct qsv_filter_task_s{
@@ -54,15 +59,14 @@
 typedef struct qsv_filter_private_s{
 
         int                 is_init_done;
-
-        mfxCoreInterface    *core;
         mfxVideoParam       *videoparam;
-        mfxPluginParam      pluginparam;
-
         hb_filter_private_t *pv;
-
-        mfxPlugin           plug;
         hb_list_t           *tasks;
+#if !HB_QSV_ONEVPL
+        mfxCoreInterface    *core;
+        mfxPluginParam      pluginparam;
+        mfxPlugin           plug;
+#endif
 } qsv_filter_t;
 
 typedef struct hb_qsv_sync_s{
@@ -93,6 +97,7 @@
     struct SwsContext* sws_context_from_nv12;
 } hb_filter_private_t_qsv;
 
+#if !HB_QSV_ONEVPL
 // methods to be called by Media SDK
 mfxStatus MFX_CDECL qsv_PluginInit(mfxHDL pthis, mfxCoreInterface *core);
 mfxStatus MFX_CDECL qsv_PluginClose (mfxHDL pthis);
@@ -104,7 +109,7 @@
 // methods to be called by us
 mfxStatus plugin_init(qsv_filter_t*,mfxVideoParam*);
 mfxStatus plugin_close(qsv_filter_t*);
-
+#endif
 //internal functions
 mfxExtBuffer* get_ext_buffer(mfxExtBuffer**, mfxU32, mfxU32);
 int get_free_task(hb_list_t*);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/qsv_libav.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/qsv_libav.h Changed

@@ -116,9 +116,10 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "mfx/mfxvideo.h"
+#include "vpl/mfxvideo.h"
 #include "libavutil/mem.h"
 #include "libavutil/time.h"
+#include "libavcodec/avcodec.h"
 
 #if defined (__GNUC__)
 #include <pthread.h>
@@ -139,6 +140,11 @@
 // sleep is defined in milliseconds
 #define hb_qsv_sleep(x) av_usleep((x)*1000)
 
+#define HB_QSV_VERSION_ATLEAST(MAJOR, MINOR) \
+ (MFX_VERSION_MAJOR > (MAJOR) || \
+ MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
+#define HB_QSV_ONEVPL HB_QSV_VERSION_ATLEAST(2, 0)
+
 #define HB_QSV_ZERO_MEMORY(VAR) {memset(&VAR, 0, sizeof(VAR));}
 #define HB_QSV_ALIGN32(X) (((mfxU32)((X)+31)) & (~ (mfxU32)31))
 #define HB_QSV_ALIGN16(value) (((value + 15) >> 4) << 4)
@@ -160,7 +166,6 @@
 
 #define HB_QSV_SURFACE_NUM 80
 #define HB_QSV_SYNC_NUM HB_QSV_SURFACE_NUM*3/4
-#define HB_QSV_BUF_SIZE_DEFAULT 4096*2160*10
 #define HB_QSV_JOB_SIZE_DEFAULT 10
 #define HB_QSV_SYNC_TIME_DEFAULT 10000
 // see hb_qsv_get_free_sync, hb_qsv_get_free_surface , 100 if usleep(10*1000)(10ms) == 1 sec
@@ -187,6 +192,45 @@
 #define HB_QSV_ANY_MASK 0xFFF
 } HB_QSV_STAGE_TYPE;
 
+typedef struct QSVMid {
+ AVBufferRef *hw_frames_ref;
+ mfxHDLPair *handle_pair;
+
+ AVFrame *locked_frame;
+ AVFrame *hw_frame;
+ mfxFrameSurface1 surf;
+} QSVMid;
+
+typedef struct QSVFrame {
+ AVFrame *frame;
+ mfxFrameSurface1 surface;
+ mfxEncodeCtrl enc_ctrl;
+ mfxExtDecodedFrameInfo dec_info;
+ mfxExtBuffer *ext_param;
+
+ int queued;
+ int used;
+
+ struct QSVFrame *next;
+} QSVFrame;
+
+#define HB_QSV_POOL_FFMPEG_SURFACE_SIZE (64)
+#define HB_QSV_POOL_SURFACE_SIZE (64)
+
+typedef struct HBQSVFramesContext {
+ AVBufferRef *hw_frames_ctx;
+ //void *logctx;
+
+ /* The memory ids for the external frames.
+ * Refcounted, since we need one reference owned by the HBQSVFramesContext
+ * (i.e. by the encoder/decoder) and another one given to the MFX session
+ * from the frame allocator. */
+ AVBufferRef *mids_buf;
+ QSVMid *mids;
+ int nb_mids;
+ int poolHB_QSV_POOL_SURFACE_SIZE;
+ void *input_texture;
+} HBQSVFramesContext;
 
 typedef struct hb_qsv_list {
 // practically pthread_mutex_t
@@ -209,6 +253,7 @@
 struct {
 mfxBitstream *p_bs;
 mfxFrameSurface1 *p_surface;
+ HBQSVFramesContext *p_frames_ctx;
 } in;
 struct {
 mfxBitstream *p_bs;
@@ -234,8 +279,9 @@
 
 mfxFrameAllocResponse response;
 mfxFrameAllocRequest request2; // 0 - in, 1 - out, if needed
-
+#if !HB_QSV_ONEVPL
 mfxExtOpaqueSurfaceAlloc ext_opaque_alloc;
+#endif
 mfxExtBuffer **p_ext_params;
 uint16_t p_ext_param_num;
 
@@ -288,6 +334,21 @@
 
 void *qsv_config;
 
+ int num_cpu_filters;
+ int la_is_enabled;
+ int qsv_filters_are_enabled;
+ int full_path_is_enabled;
+ char *vpp_scale_mode;
+ char *vpp_interpolation_method;
+ char *qsv_device;
+ int dx_index;
+ AVBufferRef *hb_hw_device_ctx;
+ HBQSVFramesContext *hb_dec_qsv_frames_ctx;
+ HBQSVFramesContext *hb_vpp_qsv_frames_ctx;
+
+ mfxHDL device_manager_handle;
+ mfxHandleType device_manager_handle_type;
+ void *device_context;
 } hb_qsv_context;
 
 typedef enum {
@@ -314,7 +375,9 @@
 typedef struct hb_qsv_allocators_space {
 hb_qsv_space *space;
 mfxFrameAllocator frame_alloc;
+#if !HB_QSV_ONEVPL
 mfxBufferAllocator buffer_alloc;
+#endif
 } hb_qsv_allocators_space;
 
 typedef struct hb_qsv_config {
@@ -443,7 +506,7 @@
 int hb_qsv_get_free_encode_task(hb_qsv_list *);
 
 int av_is_qsv_available(mfxIMPL, mfxVersion *);
-void hb_qsv_wait_on_sync(hb_qsv_context *, hb_qsv_stage *);
+int hb_qsv_wait_on_sync(hb_qsv_context *, hb_qsv_stage *);
 
 void hb_qsv_add_context_usage(hb_qsv_context *, int);
 
@@ -460,7 +523,7 @@
 
 hb_qsv_stage *hb_qsv_stage_init(void);
 void hb_qsv_stage_clean(hb_qsv_stage **);
-int hb_qsv_context_clean(hb_qsv_context *);
+int hb_qsv_context_clean(hb_qsv_context *, int);
 
 int ff_qsv_is_sync_in_pipe(mfxSyncPoint *, hb_qsv_context *);
 int ff_qsv_is_surface_in_pipe(mfxFrameSurface1 *, hb_qsv_context *);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/qsv_memory.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/qsv_memory.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/ssautil.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/ssautil.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/taskset.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/taskset.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/handbrake/vce_common.h -> HandBrake-1.5.1.tar.xz/libhb/handbrake/vce_common.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/hb.c -> HandBrake-1.5.1.tar.xz/libhb/hb.c Changed

@@ -1,6 +1,6 @@
 /* hb.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -9,11 +9,13 @@
 
 #include "handbrake/handbrake.h"
 #include "handbrake/hbffmpeg.h"
+#include "handbrake/hbavfilter.h"
 #include "handbrake/encx264.h"
 #include "libavfilter/avfilter.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <turbojpeg.h>
 
 #if HB_PROJECT_FEATURE_QSV
 #include "handbrake/qsv_common.h"
@@ -89,7 +91,6 @@
 avctx->thread_count = (thread_count == HB_FFMPEG_THREADS_AUTO) ?
 hb_get_cpu_count() / 2 + 1 : thread_count;
 avctx->thread_type = FF_THREAD_FRAME|FF_THREAD_SLICE;
- avctx->thread_safe_callbacks = 1;
 }
 else
 {
@@ -458,114 +459,261 @@
 return &h->title_set;
 }
 
-int hb_save_preview( hb_handle_t * h, int title, int preview, hb_buffer_t *buf )
+int hb_save_preview( hb_handle_t * h, int title, int preview, hb_buffer_t *buf, int format )
 {
- FILE * file;
- char * filename;
- char reason80;
+ FILE * file;
+ char * filename;
+ char reason80;
+ const int planes_max = 3;
+ const int format_chars = 4;
+ char format_stringformat_chars;
+
+ switch (format)
+ {
+ case HB_PREVIEW_FORMAT_YUV:
+ strncpy(format_string, "yuv", format_chars);
+ break;
+ case HB_PREVIEW_FORMAT_JPG:
+ strncpy(format_string, "jpg", format_chars);
+ break;
+ default:
+ hb_error("hb_save_preview: Unsupported preview format %d", format);
+ return -1;
+ }
 
- filename = hb_get_temporary_filename("%d_%d_%d", hb_get_instance_id(h),
- title, preview );
+ filename = hb_get_temporary_filename("%d_%d_%d.%s", hb_get_instance_id(h),
+ title, preview, format_string);
 
 file = hb_fopen(filename, "wb");
 if (file == NULL)
 {
 if (strerror_r(errno, reason, 79) != 0)
+ {
 strcpy(reason, "unknown -- strerror_r() failed");
-
+ }
 hb_error("hb_save_preview: Failed to open %s (reason: %s)",
 filename, reason);
 free(filename);
 return -1;
 }
 
- int pp, hh;
- for( pp = 0; pp <= buf->f.max_plane; pp++ )
+ if (format == HB_PREVIEW_FORMAT_YUV)
 {
- uint8_t *data = buf->planepp.data;
- int stride = buf->planepp.stride;
- int w = buf->planepp.width;
- int h = buf->planepp.height;
-
- for( hh = 0; hh < h; hh++ )
+ int pp, hh;
+ for(pp = 0; pp < planes_max; pp++)
 {
- if (fwrite( data, w, 1, file ) < w)
+ const uint8_t * data = buf->planepp.data;
+ const int stride = buf->planepp.stride;
+ const int w = buf->planepp.width;
+ const int h = buf->planepp.height;
+
+ for(hh = 0; hh < h; hh++)
 {
- if (ferror(file))
+ if (fwrite(data, w, 1, file) < w)
 {
- if (strerror_r(errno, reason, 79) != 0)
- strcpy(reason, "unknown -- strerror_r() failed");
+ if (ferror(file))
+ {
+ if (strerror_r(errno, reason, 79) != 0)
+ {
+ strcpy(reason, "unknown -- strerror_r() failed");
+ }
+ hb_error("hb_save_preview: Failed to write line %d to %s "
+ "(reason: %s). Preview will be incomplete.",
+ hh, filename, reason);
+ goto done;
+ }
+ }
+ data += stride;
+ }
+ }
+ }
+ else if (format == HB_PREVIEW_FORMAT_JPG)
+ {
+ tjhandle jpeg_compressor = tjInitCompress();
+ const int jpeg_quality = 90;
+ unsigned long jpeg_size = 0;
+ unsigned char * jpeg_data = NULL;
+ int planes_strideplanes_max;
+ uint8_t * planes_dataplanes_max;
+ int pp, compressor_result;
+ for (pp = 0; pp < planes_max; pp++)
+ {
+ planes_stridepp = buf->planepp.stride;
+ planes_datapp = buf->planepp.data;
+ }
 
- hb_error( "hb_save_preview: Failed to write line %d to %s "
- "(reason: %s). Preview will be incomplete.",
- hh, filename, reason );
- goto done;
+ compressor_result = tjCompressFromYUVPlanes(jpeg_compressor,
+ (const unsigned char **)planes_data,
+ buf->plane0.width,
+ planes_stride,
+ buf->plane0.height,
+ TJSAMP_420,
+ &jpeg_data,
+ &jpeg_size,
+ jpeg_quality,
+ TJFLAG_FASTDCT);
+ if (compressor_result == 0)
+ {
+ const size_t ret = fwrite(jpeg_data, jpeg_size, 1, file);
+ if ((ret < jpeg_size) && (ferror(file)))
+ {
+ if (strerror_r(errno, reason, 79) != 0)
+ {
+ strcpy(reason, "unknown -- strerror_r() failed");
 }
+ hb_error("hb_save_preview: Failed to write to %s "
+ "(reason: %s).", filename, reason);
 }
- data += stride;
 }
+ else
+ {
+ hb_error("hb_save_preview: JPEG compression failed for "
+ "preview image %s", filename);
+ }
+
+ tjDestroy(jpeg_compressor);
+ tjFree(jpeg_data);
 }
 
 done:
 free(filename);
- fclose( file );
+ fclose(file);
 
 return 0;
 }
 
-hb_buffer_t * hb_read_preview(hb_handle_t * h, hb_title_t *title, int preview)
+hb_buffer_t * hb_read_preview(hb_handle_t * h, hb_title_t *title, int preview, int format)
 {
- FILE * file;
- char * filename;
- char reason80;
+ FILE * file = NULL;
+ char * filename = NULL;
+ char reason80;
+ const int planes_max = 3;
+ const int format_chars = 4;
+ char format_stringformat_chars;
 
- filename = hb_get_temporary_filename("%d_%d_%d", hb_get_instance_id(h),
- title->index, preview);
+ hb_buffer_t * buf;
+ buf = hb_frame_buffer_init(AV_PIX_FMT_YUV420P,
+ title->geometry.width, title->geometry.height);
+ buf->f.color_prim = title->color_prim;
+ buf->f.color_transfer = title->color_transfer;
+ buf->f.color_matrix = title->color_matrix;
+ buf->f.color_range = AVCOL_RANGE_MPEG;
+ buf->f.chroma_location = title->chroma_location;
+
+ if (!buf)
+ {
+ hb_error("hb_read_preview: hb_frame_buffer_init failed");
+ goto done;
+ }
+
+ switch (format)
+ {
+ case HB_PREVIEW_FORMAT_YUV:
+ strncpy(format_string, "yuv", format_chars);
+ break;
+ case HB_PREVIEW_FORMAT_JPG:
+ strncpy(format_string, "jpg", format_chars);
+ break;
+ default:
+ hb_error("hb_read_preview: Unsupported preview format %d", format);
+ return buf;
+ }
+
+ filename = hb_get_temporary_filename("%d_%d_%d.%s", hb_get_instance_id(h),
+ title->index, preview, format_string);
 
 file = hb_fopen(filename, "rb");
 if (file == NULL)
 {
 if (strerror_r(errno, reason, 79) != 0)
+ {
 strcpy(reason, "unknown -- strerror_r() failed");
-
+ }
 hb_error("hb_read_preview: Failed to open %s (reason: %s)",
 filename, reason);
 free(filename);
 return NULL;
 }
 
- hb_buffer_t * buf;
- buf = hb_frame_buffer_init(AV_PIX_FMT_YUV420P,
- title->geometry.width, title->geometry.height);
-
- if (!buf)
- goto done;
+ if (format == HB_PREVIEW_FORMAT_YUV)
+ {
+ int pp, hh;
+ for (pp = 0; pp < planes_max; pp++)
+ {
+ uint8_t * data = buf->planepp.data;
+ const int stride = buf->planepp.stride;
+ const int w = buf->planepp.width;
+ const int h = buf->planepp.height;
 
- int pp, hh;
- for (pp = 0; pp < 3; pp++)
+ for (hh = 0; hh < h; hh++)
+ {
+ if (fread(data, w, 1, file) < w)
+ {
+ if (ferror(file))
+ {
+ if (strerror_r(errno, reason, 79) != 0)
+ {
+ strcpy(reason, "unknown -- strerror_r() failed");
+ }
+ hb_error("hb_read_preview: Failed to read line %d from %s "
+ "(reason: %s). Preview will be incomplete.",
+ hh, filename, reason );
+ goto done;
+ }
+ }
+ data += stride;
+ }
+ }
+ }
+ else if (format == HB_PREVIEW_FORMAT_JPG)
 {
- uint8_t *data = buf->planepp.data;
- int stride = buf->planepp.stride;
- int w = buf->planepp.width;
- int h = buf->planepp.height;
+ fseek(file, 0, SEEK_END);
+ unsigned long jpeg_size = ftell(file);
+ fseek(file, 0, SEEK_SET);
+ unsigned char * jpeg_data = tjAlloc(jpeg_size + 1);
+ jpeg_datajpeg_size = 0;
 
- for (hh = 0; hh < h; hh++)
+ const size_t ret = fread(jpeg_data, jpeg_size, 1, file);
 {
- if (fread(data, w, 1, file) < w)
+ if ((ret < jpeg_size) && (ferror(file)))
 {
- if (ferror(file))
+ if (strerror_r(errno, reason, 79) != 0)
 {
- if (strerror_r(errno, reason, 79) != 0)
- strcpy(reason, "unknown -- strerror_r() failed");
-
- hb_error("hb_read_preview: Failed to read line %d from %s "
- "(reason: %s). Preview will be incomplete.",
- hh, filename, reason );
- goto done;
+ strcpy(reason, "unknown -- strerror_r() failed");
 }
+ hb_error("hb_read_preview: Failed to read from %s "
+ "(reason: %s).", filename, reason);
+ tjFree(jpeg_data);
+ goto done;
 }
- data += stride;
 }
+
+ tjhandle jpeg_decompressor = tjInitDecompress();
+ int planes_strideplanes_max;
+ uint8_t * planes_dataplanes_max;
+ int pp, decompressor_result;
+ for (pp = 0; pp < planes_max; pp++)
+ {
+ planes_stridepp = buf->planepp.stride;
+ planes_datapp = buf->planepp.data;
+ }
+
+ decompressor_result = tjDecompressToYUVPlanes(jpeg_decompressor,
+ jpeg_data,
+ jpeg_size,
+ (unsigned char **)planes_data,
+ buf->plane0.width,
+ planes_stride,
+ buf->plane0.height,
+ TJFLAG_FASTDCT);
+ if (decompressor_result != 0)
+ {
+ hb_error("hb_read_preview: JPEG decompression failed for "
+ "preview image %s", filename);
+ }
+
+ tjDestroy(jpeg_decompressor);
+ tjFree(jpeg_data);
 }
 
 done:
@@ -616,7 +764,7 @@
 goto fail;
 }
 
- in_buf = hb_read_preview( h, title, picture );
+ in_buf = hb_read_preview( h, title, picture, HB_PREVIEW_FORMAT_JPG );
 if ( in_buf == NULL )
 {
 goto fail;
@@ -644,7 +792,9 @@
 context = hb_sws_get_context(
 title->geometry.width - (geo->crop2 + geo->crop3),
 title->geometry.height - (geo->crop0 + geo->crop1),
- AV_PIX_FMT_YUV420P, width, height, AV_PIX_FMT_RGB32, swsflags, colorspace);
+ AV_PIX_FMT_YUV420P, AVCOL_RANGE_MPEG,
+ width, height, AV_PIX_FMT_RGB32, AVCOL_RANGE_MPEG,
+ swsflags, colorspace);
 
 if (context == NULL)
 {
@@ -680,6 +830,275 @@
 return image;
 }
 
+static void process_filter(hb_filter_object_t * filter)
+{
+ hb_buffer_t * in, * out;
+
+ while (filter->status != HB_FILTER_DONE)
+ {
+ in = hb_fifo_get_wait(filter->fifo_in);
+ if (in == NULL)
+ continue;
+
+ out = NULL;
+ filter->status = filter->work(filter, &in, &out);
+ if (in != NULL)
+ {
+ hb_buffer_close(&in);
+ }
+ if (out != NULL)
+ {
+ hb_fifo_push(filter->fifo_out, out);
+ }
+ }
+}
+
+// Get preview and apply applicable filters
+hb_image_t * hb_get_preview3(hb_handle_t * h, int picture,
+ hb_dict_t * job_dict)
+{
+ hb_job_t * job;
+ hb_title_t * title = NULL;
+ hb_buffer_t * in = NULL, * out;
+
+ job = hb_dict_to_job(h, job_dict);
+ if (job == NULL)
+ {
+ hb_error("hb_get_preview3: failed to unpack job");
+ goto fail;
+ }
+ title = job->title;
+
+ in = hb_read_preview( h, title, picture, HB_PREVIEW_FORMAT_JPG );
+ if (in == NULL)
+ {
+ goto fail;
+ }
+
+ // Initialize supported filters
+ hb_list_t * list_filter = job->list_filter;
+ hb_filter_init_t init;
+ int ii;
+
+ memset(&init, 0, sizeof(init));
+ init.time_base.num = 1;
+ init.time_base.den = 90000;
+ init.job = job;
+ init.pix_fmt = AV_PIX_FMT_YUV420P;
+ init.color_range = AVCOL_RANGE_MPEG;
+
+ init.color_prim = title->color_prim;
+ init.color_transfer = title->color_transfer;
+ init.color_matrix = title->color_matrix;
+ init.chroma_location = title->chroma_location;
+ init.geometry = title->geometry;
+ memset(init.crop, 0, sizeof(int4));
+ init.vrate = job->vrate;
+ init.cfr = 0;
+ init.grayscale = 0;
+
+ hb_filter_object_t * filter;
+
+ for (ii = 0; ii < hb_list_count(list_filter); )
+ {
+ filter = hb_list_item(list_filter, ii);
+ switch (filter->id)
+ {
+ case HB_FILTER_AVFILTER:
+ case HB_FILTER_CROP_SCALE:
+ case HB_FILTER_PAD:
+ case HB_FILTER_ROTATE:
+ case HB_FILTER_COLORSPACE:
+ case HB_FILTER_DECOMB:
+ case HB_FILTER_DETELECINE:
+ case HB_FILTER_DEINTERLACE:
+ case HB_FILTER_GRAYSCALE:
+ break;
+
+ case HB_FILTER_VFR:
+ case HB_FILTER_RENDER_SUB:
+ case HB_FILTER_QSV:
+ case HB_FILTER_NLMEANS:
+ case HB_FILTER_CHROMA_SMOOTH:
+ case HB_FILTER_LAPSHARP:
+ case HB_FILTER_UNSHARP:
+ case HB_FILTER_DEBLOCK:
+ case HB_FILTER_COMB_DETECT:
+ case HB_FILTER_HQDN3D:
+ // Not implemented, N/A, or requires multiple frame input
+ hb_list_rem(list_filter, filter);
+ hb_filter_close(&filter);
+ continue;
+ default:
+ hb_log("hb_get_preview3: Unrecognized filter (%d)",
+ filter->id);
+ hb_list_rem(list_filter, filter);
+ hb_filter_close(&filter);
+ continue;
+ }
+ if (filter->init != NULL && filter->init(filter, &init))
+ {
+ hb_error("hb_get_preview3: Failure to initialize filter '%s'",
+ filter->name);
+ hb_list_rem(list_filter, filter);
+ hb_filter_close(&filter);
+ continue;
+ }
+ ii++;
+ }
+
+ job->output_pix_fmt = init.pix_fmt;
+ job->color_prim = init.color_prim;
+ job->color_transfer = init.color_transfer;
+ job->color_matrix = init.color_matrix;
+ job->width = init.geometry.width;
+ job->height = init.geometry.height;
+ // job->par is supplied by the frontend.
+ //
+ // The filter chain does not know what the final desired PAR is.
+ // job->par = init.geometry.par;
+ memcpy(job->crop, init.crop, sizeof(int4));
+ job->vrate = init.vrate;
+ job->cfr = init.cfr;
+ job->grayscale = init.grayscale;
+
+ // Add "cropscale"
+ // Adjusts for pixel aspect, performs any requested
+ // post-scaling and sets required pix_fmt AV_PIX_FMT_RGB32
+ //
+ // This will scale the result at the end of the pipeline.
+ // I.e. padding will be scaled
+ hb_rational_t par = job->par;
+
+ int scaled_width = init.geometry.width;
+ int scaled_height = init.geometry.height;
+
+ filter = hb_filter_init(HB_FILTER_CROP_SCALE);
+ filter->settings = hb_dict_init();
+ if (par.num >= par.den)
+ {
+ scaled_width = scaled_width * par.num / par.den;
+ }
+ else
+ {
+ scaled_height = scaled_height * par.den / par.num;
+ }
+ hb_dict_set_int(filter->settings, "width", scaled_width);
+ hb_dict_set_int(filter->settings, "height", scaled_height);
+ hb_dict_set_string(filter->settings, "out_pix_fmt", av_get_pix_fmt_name(AV_PIX_FMT_RGB32));
+ hb_list_add(job->list_filter, filter);
+ if (filter->init != NULL && filter->init(filter, &init))
+ {
+ hb_error("hb_get_preview3: Failure to initialize filter '%s'",
+ filter->name);
+ hb_list_rem(list_filter, filter);
+ hb_filter_close(&filter);
+ }
+
+ hb_avfilter_combine(list_filter);
+
+ for( ii = 0; ii < hb_list_count( list_filter ); )
+ {
+ filter = hb_list_item( list_filter, ii );
+ filter->done = &job->done;
+ if (filter->post_init != NULL && filter->post_init(filter, job))
+ {
+ hb_log( "hb_get_preview3: Failure to initialise filter '%s'",
+ filter->name );
+ hb_list_rem(list_filter, filter);
+ hb_filter_close(&filter);
+ continue;
+ }
+ ii++;
+ }
+
+ // Set up filter fifos
+ hb_fifo_t *fifo_in, * fifo_first, * fifo_last;
+
+ fifo_last = fifo_in = fifo_first = hb_fifo_init(2, 2);
+ for( ii = 0; ii < hb_list_count( list_filter ); ii++)
+ {
+ filter = hb_list_item(list_filter, ii);
+ if (!filter->skip)
+ {
+ filter->fifo_in = fifo_in;
+ filter->fifo_out = hb_fifo_init(2, 2);
+ fifo_last = fifo_in = filter->fifo_out;
+ }
+ }
+
+ // Feed preview frame to filter chain
+ hb_fifo_push(fifo_first, in);
+ hb_fifo_push(fifo_first, hb_buffer_eof_init());
+
+ // Process the preview frame through all filters
+ for( ii = 0; ii < hb_list_count( list_filter ); ii++)
+ {
+ filter = hb_list_item(list_filter, ii);
+ if (!filter->skip)
+ {
+ process_filter(filter);
+ }
+ }
+ // Retrieve the filtered preview frame
+ out = hb_fifo_get(fifo_last);
+
+ // Close filters
+ for (ii = 0; ii < hb_list_count(list_filter); ii++)
+ {
+ filter = hb_list_item(list_filter, ii);
+ filter->close(filter);
+ }
+
+ // Close fifos
+ hb_fifo_close(&fifo_first);
+ for( ii = 0; ii < hb_list_count( list_filter ); ii++)
+ {
+ filter = hb_list_item(list_filter, ii);
+ hb_fifo_close(&filter->fifo_out);
+ }
+
+ if (out == NULL)
+ {
+ hb_error("hb_get_preview3: Failed to filter preview");
+ goto fail;
+ }
+
+ hb_image_t *image = hb_buffer_to_image(out);
+ hb_buffer_close(&out);
+ if (image->width < 16 || image->height < 16)
+ {
+ // Guard against broken filter generating degenerate images
+ hb_error("hb_get_preview3: bad preview image output by filters");
+ hb_image_close(&image);
+ goto fail;
+ }
+
+ // Clean up
+ hb_job_close(&job);
+
+ return image;
+
+fail:
+
+ {
+ int width = 854, height = 480;
+
+ if (title != NULL)
+ {
+ hb_geometry_t * geo = &title->geometry;
+
+ width = geo->width * geo->par.num / geo->par.den;
+ height = geo->height;
+ }
+
+ image = hb_image_init(AV_PIX_FMT_RGB32, width, height);
+ }
+ hb_job_close(&job);
+
+ return image;
+}
+
 /**
 * Analyzes a frame to detect interlacing artifacts
 * and returns true if interlacing (combing) is found.
@@ -751,7 +1170,7 @@
 
 // compare results
 /* The final cc score for a plane is the percentage of combed pixels it contains.
- Because sensitivity goes down to hundreths of a percent, multiply by 1000
+ Because sensitivity goes down to hundredths of a percent, multiply by 1000
 so it will be easy to compare against the threshold value which is an integer. */
 cck = (int)( ( cc_1 + cc_2 ) * 1000.0 / ( width * height ) );
 }
@@ -778,6 +1197,61 @@
 
 }
 
+static void hflip_crop_pad(int * dst, int * src, int hflip)
+{
+ if (hflip)
+ {
+ dst2 = src3;
+ dst3 = src2;
+ }
+}
+
+static void rotate_crop_pad(int * dst, int * src, int angle)
+{
+ if (angle == 90)
+ {
+ dst3 = src0;
+ dst1 = src3;
+ dst2 = src1;
+ dst0 = src2;
+ }
+ else if (angle == 180)
+ {
+ dst0 = src1;
+ dst1 = src0;
+ dst2 = src3;
+ dst3 = src2;
+ }
+ else if (angle == 270)
+ {
+ dst2 = src0;
+ dst1 = src2;
+ dst3 = src1;
+ dst0 = src3;
+ }
+}
+
+void hb_rotate_geometry( hb_geometry_crop_t * geo, hb_geometry_crop_t * result,
+ int angle, int hflip)
+{
+ hb_geometry_crop_t in = *geo; // Make a copy in case geo aliases result
+ *result = in;
+
+ // re-orient result if needed
+ hflip_crop_pad(result->crop, in.crop, hflip);
+ hflip_crop_pad(result->pad, in.pad, hflip);
+ if (angle == 90 || angle == 270)
+ {
+ result->geometry.width = in.geometry.height;
+ result->geometry.height = in.geometry.width;
+ result->geometry.par.num = in.geometry.par.den;
+ result->geometry.par.den = in.geometry.par.num;
+ }
+ in = *result;
+ rotate_crop_pad(result->crop, in.crop, angle);
+ rotate_crop_pad(result->pad, in.pad, angle);
+}
+
 /**
 * Calculates destination width and height for anamorphic content
 *
@@ -785,19 +1259,27 @@
 * @param source_geometry - Pointer to source geometry info
 * @param geometry - Pointer to requested destination parameters
 */
-void hb_set_anamorphic_size2(hb_geometry_t *src_geo,
- hb_geometry_settings_t *geo,
- hb_geometry_t *result)
+void hb_set_anamorphic_size2(hb_geometry_t * src_geo,
+ hb_geometry_settings_t * geo,
+ hb_geometry_t * result)
 {
- hb_rational_t in_par, out_par;
+ hb_rational_t in_par, src_par, orig_par;
 int keep_display_aspect = !!(geo->keep & HB_KEEP_DISPLAY_ASPECT);
+ int keep_display_width = !!(geo->keep & HB_KEEP_DISPLAY_WIDTH);
 int keep_height = !!(geo->keep & HB_KEEP_HEIGHT);
+ int keep_width = !!(geo->keep & HB_KEEP_WIDTH);
+ int keep_pad = !!(geo->keep & HB_KEEP_PAD);
+ int upscale = !!(geo->flags & HB_GEO_SCALE_UP);
+ int best = !!(geo->flags & HB_GEO_SCALE_BEST);
 
 /* Set up some variables to make the math easier to follow. */
- int cropped_width = src_geo->width - geo->crop2 - geo->crop3;
- int cropped_height = src_geo->height - geo->crop0 - geo->crop1;
- double storage_aspect = (double)cropped_width / cropped_height;
- int mod = (geo->modulus > 0) ? EVEN(geo->modulus) : 2;
+ int cropped_width = src_geo->width - geo->crop2 - geo->crop3;
+ int cropped_height = src_geo->height - geo->crop0 - geo->crop1;
+ double cropped_sar = (double)cropped_width / cropped_height;
+ int mod = (geo->modulus > 0) ? EVEN(geo->modulus) : 2;
+ int pad_width = geo->pad2 + geo->pad3;
+ int pad_height = geo->pad0 + geo->pad1;
+ double displayWidth, displayHeight;
 
 // Sanitize PAR
 if (geo->geometry.par.num == 0 || geo->geometry.par.den == 0)
@@ -809,13 +1291,18 @@
 src_geo->par.num = src_geo->par.den = 1;
 }
 
- // Use 64 bits to avoid overflow till the final hb_reduce() call
- hb_reduce(&in_par.num, &in_par.den,
- geo->geometry.par.num, geo->geometry.par.den);
- int64_t dst_par_num = in_par.num;
- int64_t dst_par_den = in_par.den;
+ in_par = geo->geometry.par;
+ src_par = src_geo->par;
 
- hb_rational_t src_par = src_geo->par;
+ if (!keep_width && !keep_display_width)
+ {
+ orig_par.num = geo->displayWidth;
+ orig_par.den = geo->geometry.width + pad_width;
+ }
+ else
+ {
+ orig_par = in_par;
+ }
 
 /* If a source was really NTSC or PAL and the user specified ITU PAR
 values, replace the standard PAR values with the ITU broadcast ones. */
@@ -834,14 +1321,14 @@
 if (iaspect == 16)
 {
 /* It's widescreen */
- dst_par_num = 40;
- dst_par_den = 33;
+ in_par.num = 40;
+ in_par.den = 33;
 }
 else if (iaspect == 12)
 {
 /* It's 4:3 */
- dst_par_num = 10;
- dst_par_den = 11;
+ in_par.num = 10;
+ in_par.den = 11;
 }
 }
 else if (src_geo->height == 576)
@@ -850,24 +1337,30 @@
 if (iaspect == 16)
 {
 /* It's widescreen */
- dst_par_num = 16;
- dst_par_den = 11;
+ in_par.num = 16;
+ in_par.den = 11;
 }
 else if (iaspect == 12)
 {
 /* It's 4:3 */
- dst_par_num = 12;
- dst_par_den = 11;
+ in_par.num = 12;
+ in_par.den = 11;
 }
 }
 }
 
- /*
- 3 different ways of deciding output dimensions:
- - 1: Strict anamorphic, preserve source dimensions
- - 2: Loose anamorphic, round to mod16 and preserve storage aspect ratio
- - 3: Power user anamorphic, specify everything
- */
+
+ // Remove pad from DAR, simplifies latter calculations
+ displayWidth = geo->displayWidth -
+ (double)pad_width * orig_par.den / orig_par.num;
+ displayHeight = geo->displayHeight - pad_height;
+ if (!keep_pad)
+ {
+
+ pad_width = 0;
+ pad_height = 0;
+ }
+
 int width, height;
 int maxWidth, maxHeight;
 
@@ -889,184 +1382,190 @@
 {
 maxHeight = HB_MAX_HEIGHT;
 }
+ if (!upscale)
+ {
+ // Limit resolution to source resolution + pad
+ if (maxWidth > cropped_width + pad_width)
+ {
+ maxWidth = MULTIPLE_MOD_DOWN(cropped_width + pad_width, mod);
+ }
+ if (maxHeight > cropped_height + pad_height)
+ {
+ maxHeight = MULTIPLE_MOD_DOWN(cropped_height + pad_height, mod);
+ }
+ }
+
+ width = geo->geometry.width;
+ height = geo->geometry.height;
 
+ if (best && !keep_display_width)
+ {
+ // Select "best" resolution based on upscale settings and
+ // source resolution.
+ width = cropped_width;
+ height = cropped_height;
+ if (upscale && maxWidth > 0)
+ {
+ width = maxWidth - pad_width;
+ }
+ if (upscale && maxHeight > 0)
+ {
+ height = maxHeight - pad_height;
+ }
+ }
 switch (geo->mode)
 {
+ case HB_ANAMORPHIC_STRICT:
+ /* "Strict" anamorphic: MOD 2, source PAR, and source dimensions */
+ mod = 2;
+ in_par = src_par;
+ width = cropped_width;
+ height = cropped_height;
+ break;
+
+ case HB_ANAMORPHIC_LOOSE:
+ in_par = src_par;
+ break;
+
 case HB_ANAMORPHIC_NONE:
+ /* "None" anamorphic, a.k.a. 1:1. */
+ in_par.num = 1;
+ in_par.den = 1;
+ break;
+
+ case HB_ANAMORPHIC_CUSTOM:
+ /* "Custom" anamorphic: Set a specific PAR */
+ default:
+ break;
+ }
+
+ // Use 64 bits to avoid overflow till the final hb_reduce() call
+ int64_t dst_par_num;
+ int64_t dst_par_den;
+
+ hb_reduce64(&dst_par_num, &dst_par_den, in_par.num, in_par.den);
+
+ switch (geo->mode)
+ {
+ case HB_ANAMORPHIC_STRICT:
+ case HB_ANAMORPHIC_LOOSE:
+ case HB_ANAMORPHIC_NONE:
+ case HB_ANAMORPHIC_CUSTOM:
 {
- /* "None" anamorphic, a.k.a. 1:1.
- */
- double par, cropped_sar, dar;
- par = (double)src_geo->par.num / src_geo->par.den;
- cropped_sar = (double)cropped_width / cropped_height;
- dar = par * cropped_sar;
+ double dar;
 
- /* "None" anamorphic. a.k.a. non-anamorphic
- * - Uses mod-compliant dimensions, set by user
- * - Allows users to set the either width *or* height
- */
 if (keep_display_aspect)
 {
+ // Recompute width or height to maintain the source DAR
+ double par;
+
+ par = (double)src_par.num / src_par.den;
+ dar = par * cropped_sar;
+
 if (!keep_height)
 {
- width = MULTIPLE_MOD_UP(geo->geometry.width, mod);
- height = MULTIPLE_MOD(width / dar, mod);
+ width = MULTIPLE_MOD_UP(width, mod);
+ height = MULTIPLE_MOD(
+ width * dst_par_num / dst_par_den / dar, mod);
 }
 else
 {
- height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
- width = MULTIPLE_MOD(height * dar, mod);
+ height = MULTIPLE_MOD_UP(height, mod);
+ width = MULTIPLE_MOD_UP(
+ dar * height * dst_par_den / dst_par_num, mod);
 }
 }
- else
+ else if (keep_display_width)
 {
- width = MULTIPLE_MOD_UP(geo->geometry.width, mod);
- height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
- }
-
- // Limit to min/max dimensions
- if (width < HB_MIN_WIDTH)
- {
- width = HB_MIN_WIDTH;
- if (keep_display_aspect)
+ // Recompute width if we are modifying display size
+ // in these anamorphic modes. These modes all have a fixed
+ // user specified PAR.
+ //
+ // It is assumed displayHeight == height in this scenario.
+ double dwidth;
+ dar = (double)displayWidth / displayHeight;
+
+ // We need to determine if we should round up or down.
+ // If a wider display aspect is requested, then the computed
+ // 'double' storage aspect will be larger than the current
+ // storage aspect, else it will be smaller.
+ dwidth = displayWidth * dst_par_den / dst_par_num;
+ if (dwidth > geo->geometry.width)
 {
- height = MULTIPLE_MOD(width / dar, mod);
+ width = MULTIPLE_MOD_UP((int)dwidth, mod);
 }
+ else
+ {
+ width = MULTIPLE_MOD_DOWN((int)dwidth, mod);
+ }
+ height = MULTIPLE_MOD_UP(height, mod);
 }
- if (height < HB_MIN_HEIGHT)
+ else
 {
- height = HB_MIN_HEIGHT;
- if (keep_display_aspect)
+ // Recompute width or height to maintain the current DAR
+ dar = (double)displayWidth / displayHeight;
+ if (!keep_height)
+ {
+ width = MULTIPLE_MOD_UP(width, mod);
+ height = MULTIPLE_MOD(
+ width * dst_par_num / dst_par_den / dar, mod);
+ }
+ else
 {
- width = MULTIPLE_MOD(height * dar, mod);
+ height = MULTIPLE_MOD_UP(height, mod);
+ width = MULTIPLE_MOD(
+ dar * height * dst_par_den / dst_par_num, mod);
 }
 }
- if (width > maxWidth)
+
+ // Limit to min/max dimensions
+ if (width + pad_width > maxWidth)
 {
- width = maxWidth;
+ width = maxWidth - pad_width;
 if (keep_display_aspect)
 {
- height = MULTIPLE_MOD(width / dar, mod);
+ height = MULTIPLE_MOD(
+ width * dst_par_num / dst_par_den / dar, mod);
 }
 }
- if (height > maxHeight)
+ if (height + pad_height > maxHeight)
 {
- height = maxHeight;
+ height = maxHeight - pad_height;
 if (keep_display_aspect)
 {
- width = MULTIPLE_MOD(height * dar, mod);
+ width = MULTIPLE_MOD_UP(
+ dar * height * dst_par_den / dst_par_num, mod);
 }
 }
- dst_par_num = dst_par_den = 1;
- } break;
-
- case HB_ANAMORPHIC_STRICT:
- {
- /* "Strict" anamorphic.
- * - Uses mod2-compliant dimensions,
- * - Forces title - crop dimensions
- */
- width = MULTIPLE_MOD_UP(cropped_width, 2);
- height = MULTIPLE_MOD_UP(cropped_height, 2);
-
- /* Adjust the output PAR for new width/height
- * Film AR is the source display width / cropped source height.
- * Output display width is the output height * film AR.
- * Output PAR is the output display width / output storage width.
- *
- * i.e.
- * source_display_width = cropped_width * source PAR
- * AR = source_display_width / cropped_height;
- * output_display_width = height * AR;
- * par = output_display_width / width;
- *
- * When these terms are reduced, you get the following...
- */
- dst_par_num = (int64_t)height * cropped_width * src_par.num;
- dst_par_den = (int64_t)width * cropped_height * src_par.den;
- } break;
-
- case HB_ANAMORPHIC_LOOSE:
- {
- /* "Loose" anamorphic.
- * - Uses mod-compliant dimensions, set by user
- * - Allows users to set the either width *or* height
- */
- if (!keep_height)
- {
- width = MULTIPLE_MOD_UP(geo->geometry.width, mod);
- height = MULTIPLE_MOD_UP(width / storage_aspect + 0.5, mod);
- }
- else
- {
- height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
- width = MULTIPLE_MOD_UP(height * storage_aspect + 0.5, mod);
- }
-
- // Limit to min/max dimensions
 if (width < HB_MIN_WIDTH)
 {
 width = HB_MIN_WIDTH;
- height = MULTIPLE_MOD(width / storage_aspect + 0.5, mod);
+ if (keep_display_aspect)
+ {
+ height = MULTIPLE_MOD(
+ width * dst_par_num / dst_par_den / dar, mod);
+ }
 }
 if (height < HB_MIN_HEIGHT)
 {
 height = HB_MIN_HEIGHT;
- width = MULTIPLE_MOD(height * storage_aspect + 0.5, mod);
- }
- if (width > maxWidth)
- {
- width = maxWidth;
- height = MULTIPLE_MOD(width / storage_aspect + 0.5, mod);
- }
- if (height > maxHeight)
- {
- height = maxHeight;
- width = MULTIPLE_MOD(height * storage_aspect + 0.5, mod);
+ if (keep_display_aspect)
+ {
+ width = MULTIPLE_MOD_UP(
+ dar * height * dst_par_den / dst_par_num, mod);
+ }
 }
 
- /* Adjust the output PAR for new width/height
- See comment in HB_ANAMORPHIC_STRICT */
- dst_par_num = (int64_t)height * cropped_width * src_par.num;
- dst_par_den = (int64_t)width * cropped_height * src_par.den;
- } break;
-
- case HB_ANAMORPHIC_CUSTOM:
- {
- /* "Custom" anamorphic: Power User Jamboree
- - Set everything based on specified values */
-
- /* Time to get picture dimensions that divide cleanly.*/
- width = MULTIPLE_MOD_UP(geo->geometry.width, mod);
- height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
-
- // Limit to min/max dimensions
- if (width < HB_MIN_WIDTH)
- {
- width = HB_MIN_WIDTH;
- }
- if (height < HB_MIN_HEIGHT)
+ if (geo->mode != HB_ANAMORPHIC_CUSTOM &&
+ geo->mode != HB_ANAMORPHIC_NONE && keep_display_aspect)
 {
- height = HB_MIN_HEIGHT;
- }
- if (width > maxWidth)
- {
- width = maxWidth;
- }
- if (height > maxHeight)
- {
- height = maxHeight;
- }
- if (keep_display_aspect)
- {
- /* We can ignore the possibility of a PAR change
- * Adjust the output PAR for new width/height
- * See comment in HB_ANAMORPHIC_STRICT
- */
- dst_par_num = (int64_t)height * cropped_width *
- src_par.num;
- dst_par_den = (int64_t)width * cropped_height *
- src_par.den;
+ // Rounding errors in width/height calculations may
+ // throw off final display aspect.
+ //
+ // Recompute PAR to fix display aspect, unless user set
+ // a specific PAR.
+ dst_par_num = (int64_t)height * cropped_width * src_par.num;
+ dst_par_den = (int64_t)width * cropped_height * src_par.den;
 }
 } break;
 
@@ -1079,14 +1578,36 @@
 * - Does *not* maintain original source PAR if one
 * or both dimensions is limited by maxWidth/maxHeight.
 */
- /* Anamorphic 3: Power User Jamboree
- - Set everything based on specified values */
+
+ if (!keep_display_aspect && keep_display_width)
+ {
+ // Recompute PAR if we are modifying display size
+ // in auto anamorphic mode (stretching the display aspect).
+ //
+ // Not that (keep_display_aspect && geo->displayWidth < 0)
+ // is not handled. It is not a valid use case in the
+ // frontends, so it is unnecessary to complicate this further
+ // with support for it.
+ width = geo->geometry.width;
+ height = geo->geometry.height;
+ dst_par_num = displayWidth;
+ dst_par_den = width;
+ break;
+ }
 
 /* Time to get picture dimensions that divide cleanly.*/
- width = MULTIPLE_MOD_UP(geo->geometry.width, mod);
- height = MULTIPLE_MOD_UP(geo->geometry.height, mod);
+ width = MULTIPLE_MOD_UP(width, mod);
+ height = MULTIPLE_MOD_UP(height, mod);
 
 // Limit to min/max dimensions
+ if (width + pad_width > maxWidth)
+ {
+ width = maxWidth - pad_width;
+ }
+ if (height + pad_height > maxHeight)
+ {
+ height = maxHeight - pad_height;
+ }
 if (width < HB_MIN_WIDTH)
 {
 width = HB_MIN_WIDTH;
@@ -1095,70 +1616,41 @@
 {
 height = HB_MIN_HEIGHT;
 }
- if (width > maxWidth)
+
+ /* Adjust the output PAR for new width/height */
+ if (keep_display_aspect)
 {
- width = maxWidth;
+ dst_par_num = (int64_t)height * cropped_width * src_par.num;
+ dst_par_den = (int64_t)width * cropped_height * src_par.den;
 }
- if (height > maxHeight)
+ else
 {
- height = maxHeight;
+ dst_par_num = displayWidth;
+ dst_par_den = width;
 }
- /* Adjust the output PAR for new width/height
- * See comment in HB_ANAMORPHIC_STRICT
- */
- dst_par_num = (int64_t)height * cropped_width * src_par.num;
- dst_par_den = (int64_t)width * cropped_height * src_par.den;
 } break;
 }
- if (width < HB_MIN_WIDTH || height < HB_MIN_HEIGHT ||
- width > maxWidth || height > maxHeight)
- {
- // Limits set above may have also attempted to keep PAR and DAR.
- // If we are still outside limits, enforce them and modify
- // PAR to keep DAR
- if (width < HB_MIN_WIDTH)
- {
- width = HB_MIN_WIDTH;
- }
- if (height < HB_MIN_HEIGHT)
- {
- height = HB_MIN_HEIGHT;
- }
- if (width > maxWidth)
- {
- width = maxWidth;
- }
- if (height > maxHeight)
- {
- height = maxHeight;
- }
- if (keep_display_aspect && geo->mode != HB_ANAMORPHIC_NONE)
- {
- dst_par_num = (int64_t)height * cropped_width * src_par.num;
- dst_par_den = (int64_t)width * cropped_height * src_par.den;
- }
- }
 
 /* Pass the results back to the caller */
- result->width = width;
+ result->width = width;
 result->height = height;
 
- /* While x264 is smart enough to reduce fractions on its own, libavcodec
- * needs some help with the math, so lose superfluous factors. */
- hb_limit_rational64(&dst_par_num, &dst_par_den,
- dst_par_num, dst_par_den, 65535);
-
- // If the user is directing updating PAR, don't override his values.
+ // If the user is directly updating PAR, don't override PAR values.
 // I.e. don't even reduce the values.
- hb_reduce(&out_par.num, &out_par.den, dst_par_num, dst_par_den);
- if (geo->mode == HB_ANAMORPHIC_CUSTOM && !keep_display_aspect &&
- out_par.num == in_par.num && out_par.den == in_par.den)
+ if (geo->mode == HB_ANAMORPHIC_CUSTOM ||
+ geo->mode == HB_ANAMORPHIC_NONE)
 {
- result->par.num = geo->geometry.par.num;
- result->par.den = geo->geometry.par.den;
+ // In these 2 anamorphic modes, the result PAR should be exactly
+ // what the user set PAR to.
+ result->par = in_par;
 }
 else
 {
+ /* While x264 is smart enough to reduce fractions on its own, libavcodec
+ * needs some help with the math, so lose superfluous factors. */
+ hb_limit_rational64(&dst_par_num, &dst_par_den,
+ dst_par_num, dst_par_den, 65535);
+
 hb_reduce(&result->par.num, &result->par.den, dst_par_num, dst_par_den);
 }
 }
@@ -1197,8 +1689,8 @@
 }
 else if ( id == new_id )
 {
- // Don't allow the same filter to be added twice
- hb_value_free(&filter_dict);
+ // Updating this filter with new settings
+ hb_value_array_set(list, ii, filter_dict);
 return;
 }
 }
@@ -1629,7 +2121,7 @@
 }
 
 /**
- * Closes access to libhb by freeing the hb_handle_t handle ontained in hb_init.
+ * Closes access to libhb by freeing the hb_handle_t handle contained in hb_init.
 * @param _h Pointer to handle to hb_handle_t.
 */
 void hb_close( hb_handle_t ** _h )
@@ -1665,6 +2157,7 @@
 int hb_global_init_no_hardware()
 {
 disable_hardware = 1;
+ hb_log( "Init: Hardware encoders are disabled." );
 return hb_global_init();
 }
 
@@ -1685,16 +2178,7 @@
 }
 
 #if HB_PROJECT_FEATURE_QSV
- if (!disable_hardware)
- {
- result = hb_qsv_info_init();
- if (result < 0)
- {
- hb_error("hb_qsv_info_init failed!");
- return -1;
- }
- hb_param_configure_qsv();
- }
+ hb_param_configure_qsv();
 #endif
 
 /* libavcodec */
@@ -1709,17 +2193,14 @@
 hb_register(&hb_decavcodecv);
 hb_register(&hb_decavcodeca);
 hb_register(&hb_declpcm);
- hb_register(&hb_deccc608);
- hb_register(&hb_decpgssub);
+ hb_register(&hb_decavsub);
 hb_register(&hb_decsrtsub);
 hb_register(&hb_decssasub);
 hb_register(&hb_dectx3gsub);
- hb_register(&hb_decutf8sub);
- hb_register(&hb_decvobsub);
- hb_register(&hb_encvobsub);
 hb_register(&hb_encavcodec);
 hb_register(&hb_encavcodeca);
 #ifdef __APPLE__
+ hb_register(&hb_encvt);
 hb_register(&hb_encca_aac);
 hb_register(&hb_encca_haac);
 #endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/hb_dict.c -> HandBrake-1.5.1.tar.xz/libhb/hb_dict.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/hb_json.c -> HandBrake-1.5.1.tar.xz/libhb/hb_json.c Changed

@@ -1,6 +1,6 @@
 /* json.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -117,7 +117,7 @@
 }
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_state_to_dict, json pack failure: %s", error.text);
 }
 return dict;
 }
@@ -143,7 +143,7 @@
 "Arch", hb_value_string(HB_PROJECT_HOST_ARCH));
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_version_dict, json pack failure: %s", error.text);
 return NULL;
 }
 
@@ -185,7 +185,7 @@
 "Default", hb_value_bool(attributes & HB_AUDIO_ATTR_DEFAULT));
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_audio_attributes_to_dict, json pack failure: %s", error.text);
 }
 return dict;
 }
@@ -211,7 +211,7 @@
 "Default", hb_value_bool(attributes & HB_SUBTITLE_ATTR_DEFAULT));
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_subtitle_attributes_to_dict, json pack failure: %s", error.text);
 }
 return dict;
 }
@@ -235,14 +235,14 @@
 "s:{s:o, s:o, s:{s:o, s:o}},"
 // CropTop, Bottom, Left, Right}
 "s:oooo,"
- // Color {Format, Range, Primary, Transfer, Matrix}
- "s:{s:o, s:o, s:o, s:o, s:o},"
+ // Color {Format, Range, Primary, Transfer, Matrix, ChromaLocation}
+ "s:{s:o, s:o, s:o, s:o, s:o, s:o},"
 // FrameRate {Num, Den}
 "s:{s:o, s:o},"
 // InterlaceDetected, VideoCodec
 "s:o, s:o,"
 // Metadata
- "s:{}"
+ "s:o"
 "}",
 "Type", hb_value_int(title->type),
 "Path", hb_value_string(title->path),
@@ -271,16 +271,17 @@
 "Primary", hb_value_int(title->color_prim),
 "Transfer", hb_value_int(title->color_transfer),
 "Matrix", hb_value_int(title->color_matrix),
+ "ChromaLocation", hb_value_int(title->chroma_location),
 "FrameRate",
 "Num", hb_value_int(title->vrate.num),
 "Den", hb_value_int(title->vrate.den),
 "InterlaceDetected", hb_value_bool(title->detected_interlacing),
 "VideoCodec", hb_value_string(title->video_codec_name),
- "Metadata"
+ "Metadata", hb_value_dup(title->metadata->dict)
 );
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_title_to_dict_internal, json pack failure: %s", error.text);
 return NULL;
 }
 
@@ -289,58 +290,6 @@
 hb_dict_set(dict, "Container", hb_value_string(title->container_name));
 }
 
- // Add metadata
- hb_dict_t *meta_dict = hb_dict_get(dict, "Metadata");
- if (title->metadata->name != NULL)
- {
- hb_dict_set(meta_dict, "Name", hb_value_string(title->metadata->name));
- }
- if (title->metadata->artist != NULL)
- {
- hb_dict_set(meta_dict, "Artist",
- hb_value_string(title->metadata->artist));
- }
- if (title->metadata->composer != NULL)
- {
- hb_dict_set(meta_dict, "Composer",
- hb_value_string(title->metadata->composer));
- }
- if (title->metadata->comment != NULL)
- {
- hb_dict_set(meta_dict, "Comment",
- hb_value_string(title->metadata->comment));
- }
- if (title->metadata->genre != NULL)
- {
- hb_dict_set(meta_dict, "Genre",
- hb_value_string(title->metadata->genre));
- }
- if (title->metadata->album != NULL)
- {
- hb_dict_set(meta_dict, "Album",
- hb_value_string(title->metadata->album));
- }
- if (title->metadata->album_artist != NULL)
- {
- hb_dict_set(meta_dict, "AlbumArtist",
- hb_value_string(title->metadata->album_artist));
- }
- if (title->metadata->description != NULL)
- {
- hb_dict_set(meta_dict, "Description",
- hb_value_string(title->metadata->description));
- }
- if (title->metadata->long_description != NULL)
- {
- hb_dict_set(meta_dict, "LongDescription",
- hb_value_string(title->metadata->long_description));
- }
- if (title->metadata->release_date != NULL)
- {
- hb_dict_set(meta_dict, "ReleaseDate",
- hb_value_string(title->metadata->release_date));
- }
-
 // process chapter list
 hb_dict_t * chapter_list = hb_value_array_init();
 for (ii = 0; ii < hb_list_count(title->list_chapter); ii++)
@@ -362,7 +311,7 @@
 );
 if (chapter_dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_title_to_dict_internal, chapter, json pack failure: %s", error.text);
 return NULL;
 }
 hb_value_array_append(chapter_list, chapter_dict);
@@ -391,7 +340,8 @@
 
 attributes = hb_audio_attributes_to_dict(audio->config.lang.attributes);
 audio_dict = json_pack_ex(&error, 0,
- "{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
+ "{s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
+ "TrackNumber", hb_value_int(ii + 1),
 "Description", hb_value_string(audio->config.lang.description),
 "Language", hb_value_string(audio->config.lang.simple),
 "LanguageCode", hb_value_string(audio->config.lang.iso639_2),
@@ -407,7 +357,7 @@
 "LFECount", hb_value_int(lfe_count));
 if (audio_dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_title_to_dict_internal, audio, json pack failure: %s", error.text);
 return NULL;
 }
 if (audio->config.in.name != NULL)
@@ -429,7 +379,8 @@
 format = subtitle->format == PICTURESUB ? "bitmap" : "text";
 attributes = hb_subtitle_attributes_to_dict(subtitle->attributes);
 subtitle_dict = json_pack_ex(&error, 0,
- "{s:o, s:o, s:o, s:o, s:o, s:o}",
+ "{s:o, s:o, s:o, s:o, s:o, s:o, s:o}",
+ "TrackNumber", hb_value_int(ii + 1),
 "Format", hb_value_string(format),
 "Source", hb_value_int(subtitle->source),
 "SourceName", hb_value_string(hb_subsource_name(subtitle->source)),
@@ -438,7 +389,7 @@
 "LanguageCode", hb_value_string(subtitle->iso639_2));
 if (subtitle_dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_title_to_dict_internal, subtitle, json pack failure: %s", error.text);
 return NULL;
 }
 if (subtitle->name != NULL)
@@ -528,6 +479,13 @@
 json_error_t error;
 int subtitle_search_burn;
 int ii;
+ int adapter_index = 0;
+
+#if HB_PROJECT_FEATURE_QSV
+ if (job->qsv.ctx){
+ adapter_index = job->qsv.ctx->dx_index;
+ }
+#endif
 
 if (job == NULL || job->title == NULL)
 return NULL;
@@ -536,7 +494,6 @@
 // necessary PAR value
 
 subtitle_search_burn = job->select_subtitle_config.dest == RENDERSUB;
-
 dict = json_pack_ex(&error, 0,
 "{"
 // SequenceID
@@ -548,14 +505,14 @@
 "s:{s:o, s:o, s:o,},"
 // PAR {Num, Den}
 "s:{s:o, s:o},"
- // Video {Encoder, QSV {Decode, AsyncDepth}}
- "s:{s:o, s:{s:o, s:o}},"
+ // Video {Encoder, QSV {Decode, AsyncDepth, AdapterIndex}}
+ "s:{s:o, s:{s:o, s:o, s:o}},"
 // Audio {CopyMask, FallbackEncoder, AudioList }
 "s:{s:, s:o, s:},"
 // Subtitles {Search {Enable, Forced, Default, Burn}, SubtitleList }
 "s:{s:{s:o, s:o, s:o, s:o}, s:},"
 // Metadata
- "s:{},"
+ "s:o,"
 // Filters {FilterList }
 "s:{s:}"
 "}",
@@ -578,6 +535,7 @@
 "QSV",
 "Decode", hb_value_bool(job->qsv.decode),
 "AsyncDepth", hb_value_int(job->qsv.async_depth),
+ "AdapterIndex", hb_value_int(adapter_index),
 "Audio",
 "CopyMask",
 "FallbackEncoder", hb_value_int(job->acodec_fallback),
@@ -589,13 +547,13 @@
 "Default", hb_value_bool(job->select_subtitle_config.default_track),
 "Burn", hb_value_bool(subtitle_search_burn),
 "SubtitleList",
- "Metadata",
+ "Metadata", hb_value_dup(job->metadata->dict),
 "Filters",
 "FilterList"
 );
 if (dict == NULL)
 {
- hb_error("json pack failure: %s", error.text);
+ hb_error("hb_job_to_dict, json pack failure: %s", error.text);
 return NULL;
 }
 hb_dict_t *dest_dict = hb_dict_get(dict, "Destination");
@@ -624,29 +582,29 @@
 else if (job->pts_to_start != 0 || job->pts_to_stop != 0)
 {
 range_dict = hb_dict_init();
- hb_dict_set(source_dict, "Type", hb_value_string("time"));
+ hb_dict_set(range_dict, "Type", hb_value_string("time"));
 if (job->pts_to_start > 0)
 {
- hb_dict_set(source_dict, "Start", hb_value_int(job->pts_to_start));
+ hb_dict_set(range_dict, "Start", hb_value_int(job->pts_to_start));
 }
 if (job->pts_to_stop > 0)
 {
- hb_dict_set(source_dict, "End",
+ hb_dict_set(range_dict, "End",
 hb_value_int(job->pts_to_start + job->pts_to_stop));
 }
 }
 else if (job->frame_to_start != 0 || job->frame_to_stop != 0)
 {
 range_dict = hb_dict_init();
- hb_dict_set(source_dict, "Type", hb_value_string("frame"));
+ hb_dict_set(range_dict, "Type", hb_value_string("frame"));
 if (job->frame_to_start > 0)
 {
- hb_dict_set(source_dict, "Start",
+ hb_dict_set(range_dict, "Start",
 hb_value_int(job->frame_to_start + 1));
 }
 if (job->frame_to_stop > 0)
 {
- hb_dict_set(source_dict, "End",
+ hb_dict_set(range_dict, "End",
 hb_value_int(job->frame_to_start + job->frame_to_stop));
 }
 }
@@ -660,8 +618,10 @@
 hb_dict_set(source_dict, "Range", range_dict);
 
 hb_dict_t *video_dict = hb_dict_get(dict, "Video");
- hb_dict_set(video_dict, "ColorFormat",
- hb_value_int(job->pix_fmt));
+ hb_dict_set(video_dict, "ColorInputFormat",
+ hb_value_int(job->input_pix_fmt));
+ hb_dict_set(video_dict, "ColorOutputFormat",
+ hb_value_int(job->output_pix_fmt));
 hb_dict_set(video_dict, "ColorRange",
 hb_value_int(job->color_range));
 hb_dict_set(video_dict, "ColorPrimaries",
@@ -670,6 +630,8 @@
 hb_value_int(job->color_transfer));
 hb_dict_set(video_dict, "ColorMatrix",
 hb_value_int(job->color_matrix));
+ hb_dict_set(video_dict, "ChromaLocation",
+ hb_value_int(job->chroma_location));
 if (job->color_prim_override != HB_COLR_PRI_UNDEF)
 {
 hb_dict_set(video_dict, "ColorPrimariesOverride",
@@ -686,6 +648,55 @@
 hb_value_int(job->color_matrix_override));
 }
 
+ // Mastering metadata
+ hb_dict_t *mastering_dict;
+ if (job->mastering.has_primaries || job->mastering.has_luminance)
+ {
+ mastering_dict = json_pack_ex(&error, 0,
+ "{"
+ // DisplayPrimaries32
+ "s:ii,ii,ii,ii,ii,ii,"
+ // WhitePoint2,
+ "s:i,i,i,i,"
+ // MinLuminance, MaxLuminance, HasPrimaries, HasLuminance
+ "s:i,i,s:i,i,s:b,s:b"
+ "}",
+ "DisplayPrimaries", job->mastering.display_primaries00.num,
+ job->mastering.display_primaries00.den,
+ job->mastering.display_primaries01.num,
+ job->mastering.display_primaries01.den,
+ job->mastering.display_primaries10.num,
+ job->mastering.display_primaries10.den,
+ job->mastering.display_primaries11.num,
+ job->mastering.display_primaries11.den,
+ job->mastering.display_primaries20.num,
+ job->mastering.display_primaries20.den,
+ job->mastering.display_primaries21.num,
+ job->mastering.display_primaries21.den,
+ "WhitePoint", job->mastering.white_point0.num,
+ job->mastering.white_point0.den,
+ job->mastering.white_point1.num,
+ job->mastering.white_point1.den,
+ "MinLuminance", job->mastering.min_luminance.num,
+ job->mastering.min_luminance.den,
+ "MaxLuminance", job->mastering.max_luminance.num,
+ job->mastering.max_luminance.den,
+ "HasPrimaries", job->mastering.has_primaries,
+ "HasLuminance", job->mastering.has_luminance
+ );
+ hb_dict_set(video_dict, "Mastering", mastering_dict);
+ }
+
+ // Content Light Level metadata
+ hb_dict_t *coll_dict;
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ coll_dict = json_pack_ex(&error, 0, "{s:i, s:i}",
+ "MaxCLL", job->coll.max_cll,
+ "MaxFALL", job->coll.max_fall);
+ hb_dict_set(video_dict, "ContentLightLevel", coll_dict);
+ }
+
 if (job->vquality > HB_INVALID_VIDEO_QUALITY)
 {
 hb_dict_set(video_dict, "Quality", hb_value_double(job->vquality));
@@ -720,54 +731,6 @@
 hb_dict_set(video_dict, "Options",
 hb_value_string(job->encoder_options));
 }
- hb_dict_t *meta_dict = hb_dict_get(dict, "Metadata");
- if (job->metadata->name != NULL)
- {
- hb_dict_set(meta_dict, "Name", hb_value_string(job->metadata->name));
- }
- if (job->metadata->artist != NULL)
- {
- hb_dict_set(meta_dict, "Artist",
- hb_value_string(job->metadata->artist));
- }
- if (job->metadata->composer != NULL)
- {
- hb_dict_set(meta_dict, "Composer",
- hb_value_string(job->metadata->composer));
- }
- if (job->metadata->comment != NULL)
- {
- hb_dict_set(meta_dict, "Comment",
- hb_value_string(job->metadata->comment));
- }
- if (job->metadata->genre != NULL)
- {
- hb_dict_set(meta_dict, "Genre", hb_value_string(job->metadata->genre));
- }
- if (job->metadata->album != NULL)
- {
- hb_dict_set(meta_dict, "Album", hb_value_string(job->metadata->album));
- }
- if (job->metadata->album_artist != NULL)
- {
- hb_dict_set(meta_dict, "AlbumArtist",
- hb_value_string(job->metadata->album_artist));
- }
- if (job->metadata->description != NULL)
- {
- hb_dict_set(meta_dict, "Description",
- hb_value_string(job->metadata->description));
- }
- if (job->metadata->long_description != NULL)
- {
- hb_dict_set(meta_dict, "LongDescription",
- hb_value_string(job->metadata->long_description));
- }
- if (job->metadata->release_date != NULL)
- {
- hb_dict_set(meta_dict, "ReleaseDate",
- hb_value_string(job->metadata->release_date));
- }
 
 // process chapter list
 hb_dict_t *chapter_list = hb_dict_get(dest_dict, "ChapterList");
@@ -926,6 +889,7 @@
 
 static double* unpack_f(double *f) { return f; }
 static int* unpack_i(int *i) { return i; }
+static unsigned* unpack_u(unsigned *u) { return u; }
 static json_int_t* unpack_I(json_int_t *i) { return i; }
 static int * unpack_b(int *b) { return b; }
 static const_str_t* unpack_s(const_str_t *s){ return s; }
@@ -1024,6 +988,8 @@
 hb_value_array_t * subtitle_list = NULL;
 hb_value_array_t * filter_list = NULL;
 hb_value_t * mux = NULL, * vcodec = NULL;
+ hb_dict_t * mastering_dict = NULL;
+ hb_dict_t * coll_dict = NULL;
 hb_value_t * acodec_copy_mask = NULL, * acodec_fallback = NULL;
 const char * destfile = NULL;
 const char * range_type = NULL;
@@ -1031,14 +997,11 @@
 const char * video_profile = NULL, * video_level = NULL;
 const char * video_options = NULL;
 int subtitle_search_burn = 0;
- const char * meta_name = NULL, * meta_artist = NULL;
- const char * meta_album_artist = NULL, * meta_release = NULL;
- const char * meta_comment = NULL, * meta_genre = NULL;
- const char * meta_composer = NULL, * meta_desc = NULL;
- const char * meta_long_desc = NULL;
 json_int_t range_start = -1, range_end = -1, range_seek_points = -1;
 int vbitrate = -1;
 double vquality = HB_INVALID_VIDEO_QUALITY;
+ int adapter_index = -1;
+ hb_dict_t * meta_dict = NULL;
 
 result = json_unpack_ex(dict, &error, 0,
 "{"
@@ -1054,23 +1017,26 @@
 "s?{s:i, s:i},"
 // Video {Codec, Quality, Bitrate, Preset, Tune, Profile, Level, Options
 // TwoPass, Turbo,
- // ColorFormat, ColorRange,
- // ColorPrimaries, ColorTransfer, ColorMatrix,
+ // ColorInputFormat, ColorOutputFormat, ColorRange,
+ // ColorPrimaries, ColorTransfer, ColorMatrix, ChromaLocation,
+ // Mastering,
+ // ContentLightLevel,
 // ColorPrimariesOverride, ColorTransferOverride, ColorMatrixOverride,
- // QSV {Decode, AsyncDepth}}
- "s:{s:o, s?f, s?i, s?s, s?s, s?s, s?s, s?s,"
+ // QSV {Decode, AsyncDepth, AdapterIndex}}
+ "s:{s:o, s?F, s?i, s?s, s?s, s?s, s?s, s?s,"
 " s?b, s?b,"
- " s?i, s?i,"
 " s?i, s?i, s?i,"
+ " s?i, s?i, s?i, s?i,"
+ " s?o,"
+ " s?o,"
 " s?i, s?i, s?i,"
- " s?{s?b, s?i}},"
+ " s?{s?b, s?i, s?i}},"
 // Audio {CopyMask, FallbackEncoder, AudioList}
 "s?{s?o, s?o, s?o},"
 // Subtitle {Search {Enable, Forced, Default, Burn}, SubtitleList}
 "s?{s?{s:b, s?b, s?b, s?b}, s?o},"
- // Metadata {Name, Artist, Composer, AlbumArtist, ReleaseDate,
- // Comment, Genre, Description, LongDescription}
- "s?{s?s, s?s, s?s, s?s, s?s, s?s, s?s, s?s, s?s},"
+ // Metadata
+ "s?o,"
 // Filters {FilterList}
 "s?{s?o}"
 "}",
@@ -1106,17 +1072,22 @@
 "Options", unpack_s(&video_options),
 "TwoPass", unpack_b(&job->twopass),
 "Turbo", unpack_b(&job->fastfirstpass),
- "ColorFormat", unpack_i(&job->pix_fmt),
+ "ColorInputFormat", unpack_i(&job->input_pix_fmt),
+ "ColorOutputFormat", unpack_i(&job->output_pix_fmt),
 "ColorRange", unpack_i(&job->color_range),
 "ColorPrimaries", unpack_i(&job->color_prim),
 "ColorTransfer", unpack_i(&job->color_transfer),
 "ColorMatrix", unpack_i(&job->color_matrix),
+ "ChromaLocation", unpack_i(&job->chroma_location),
+ "Mastering", unpack_o(&mastering_dict),
+ "ContentLightLevel", unpack_o(&coll_dict),
 "ColorPrimariesOverride", unpack_i(&job->color_prim_override),
 "ColorTransferOverride", unpack_i(&job->color_transfer_override),
 "ColorMatrixOverride", unpack_i(&job->color_matrix_override),
 "QSV",
 "Decode", unpack_b(&job->qsv.decode),
 "AsyncDepth", unpack_i(&job->qsv.async_depth),
+ "AdapterIndex", unpack_i(&adapter_index),
 "Audio",
 "CopyMask", unpack_o(&acodec_copy_mask),
 "FallbackEncoder", unpack_o(&acodec_fallback),
@@ -1128,16 +1099,7 @@
 "Default", unpack_b(&job->select_subtitle_config.default_track),
 "Burn", unpack_b(&subtitle_search_burn),
 "SubtitleList", unpack_o(&subtitle_list),
- "Metadata",
- "Name", unpack_s(&meta_name),
- "Artist", unpack_s(&meta_artist),
- "Composer", unpack_s(&meta_composer),
- "AlbumArtist", unpack_s(&meta_album_artist),
- "ReleaseDate", unpack_s(&meta_release),
- "Comment", unpack_s(&meta_comment),
- "Genre", unpack_s(&meta_genre),
- "Description", unpack_s(&meta_desc),
- "LongDescription", unpack_s(&meta_long_desc),
+ "Metadata", unpack_o(&meta_dict),
 "Filters",
 "FilterList", unpack_o(&filter_list)
 );
@@ -1146,10 +1108,11 @@
 hb_error("hb_dict_to_job: failed to parse dict: %s", error.text);
 goto fail;
 }
-
- // Make sure QSV Decode is only True if the hardware is available.
- job->qsv.decode = job->qsv.decode && hb_qsv_available();
-
+ if (meta_dict != NULL)
+ {
+ hb_value_free(&job->metadata->dict);
+ job->metadata->dict = hb_value_dup(meta_dict);
+ }
 // Lookup mux id
 if (hb_value_type(mux) == HB_VALUE_TYPE_STRING)
 {
@@ -1219,8 +1182,13 @@
 hb_job_set_encoder_level(job, video_level);
 hb_job_set_encoder_options(job, video_options);
 
+#if HB_PROJECT_FEATURE_QSV
+ if (job->qsv.ctx) {
+ job->qsv.ctx->dx_index = adapter_index;
+ }
+#endif
 // If both vbitrate and vquality were specified, vbitrate is used;
- // we need to ensure the unused rate contro mode is always set to an
+ // we need to ensure the unused rate control mode is always set to an
 // invalid value, as if both values are valid, behavior is undefined
 // (some encoders first check for a valid vquality, whereas others
 // check for a valid vbitrate instead)
@@ -1238,103 +1206,60 @@
 
 job->select_subtitle_config.dest = subtitle_search_burn ?
 RENDERSUB : PASSTHRUSUB;
- if (meta_name != NULL)
- {
- if (meta_name0 != 0)
- {
- hb_metadata_set_name(job->metadata, meta_name);
- }
- else
- {
- hb_metadata_set_name(job->metadata, NULL);
- }
- }
- if (meta_artist != NULL)
- {
- if (meta_artist0 != 0)
- {
- hb_metadata_set_artist(job->metadata, meta_artist);
- }
- else
- {
- hb_metadata_set_artist(job->metadata, NULL);
- }
- }
- if (meta_composer != NULL)
- {
- if (meta_composer0 != 0)
- {
- hb_metadata_set_composer(job->metadata, meta_composer);
- }
- else
- {
- hb_metadata_set_composer(job->metadata, NULL);
- }
- }
- if (meta_album_artist != NULL)
- {
- if (meta_album_artist0 != 0)
- {
- hb_metadata_set_album_artist(job->metadata, meta_album_artist);
- }
- else
- {
- hb_metadata_set_album_artist(job->metadata, NULL);
- }
- }
- if (meta_release != NULL)
- {
- if (meta_release0 != 0)
- {
- hb_metadata_set_release_date(job->metadata, meta_release);
- }
- else
- {
- hb_metadata_set_release_date(job->metadata, NULL);
- }
- }
- if (meta_comment != NULL)
- {
- if (meta_comment0 != 0)
- {
- hb_metadata_set_comment(job->metadata, meta_comment);
- }
- else
- {
- hb_metadata_set_comment(job->metadata, NULL);
- }
- }
- if (meta_genre != NULL)
- {
- if (meta_genre0 != 0)
- {
- hb_metadata_set_genre(job->metadata, meta_genre);
- }
- else
- {
- hb_metadata_set_genre(job->metadata, NULL);
- }
- }
- if (meta_desc != NULL)
+
+ if (mastering_dict != NULL)
 {
- if (meta_desc0 != 0)
- {
- hb_metadata_set_description(job->metadata, meta_desc);
- }
- else
+ result = json_unpack_ex(mastering_dict, &error, 0,
+ "{"
+ // DisplayPrimaries32
+ "s:ii,ii,ii,ii,ii,ii,"
+ // WhitePoint2,
+ "s:i,i,i,i,"
+ // MinLuminance, MaxLuminance, HasPrimaries, HasLuminance
+ "s:i,i,s:i,i,s:b,s:b"
+ "}",
+ "DisplayPrimaries", unpack_i(&job->mastering.display_primaries00.num),
+ unpack_i(&job->mastering.display_primaries00.den),
+ unpack_i(&job->mastering.display_primaries01.num),
+ unpack_i(&job->mastering.display_primaries01.den),
+ unpack_i(&job->mastering.display_primaries10.num),
+ unpack_i(&job->mastering.display_primaries10.den),
+ unpack_i(&job->mastering.display_primaries11.num),
+ unpack_i(&job->mastering.display_primaries11.den),
+ unpack_i(&job->mastering.display_primaries20.num),
+ unpack_i(&job->mastering.display_primaries20.den),
+ unpack_i(&job->mastering.display_primaries21.num),
+ unpack_i(&job->mastering.display_primaries21.den),
+ "WhitePoint", unpack_i(&job->mastering.white_point0.num),
+ unpack_i(&job->mastering.white_point0.den),
+ unpack_i(&job->mastering.white_point1.num),
+ unpack_i(&job->mastering.white_point1.den),
+ "MinLuminance", unpack_i(&job->mastering.min_luminance.num),
+ unpack_i(&job->mastering.min_luminance.den),
+ "MaxLuminance", unpack_i(&job->mastering.max_luminance.num),
+ unpack_i(&job->mastering.max_luminance.den),
+ "HasPrimaries", unpack_b(&job->mastering.has_primaries),
+ "HasLuminance", unpack_b(&job->mastering.has_luminance)
+ );
+ if (result < 0)
 {
- hb_metadata_set_description(job->metadata, NULL);
+ hb_error("hb_dict_to_job: failed to parse mastering_dict: %s", error.text);
+ goto fail;
 }
 }
- if (meta_long_desc != NULL)
+
+ if (coll_dict != NULL)
 {
- if (meta_long_desc0 != 0)
- {
- hb_metadata_set_long_description(job->metadata, meta_long_desc);
- }
- else
+ result = json_unpack_ex(coll_dict, &error, 0,
+ // {MaxCLL, MaxFALL}
+ "{s:i, s:i}",
+ "MaxCLL", unpack_u(&job->coll.max_cll),
+ "MaxFALL", unpack_u(&job->coll.max_fall)
+ );
+ if (result < 0)
 {
- hb_metadata_set_long_description(job->metadata, NULL);
+ hb_error("hb_dict_to_job: failed to parse coll_dict: %s", error.text);
+ goto fail;
 }
 }
 
@@ -1541,7 +1466,7 @@
 }
 if (name != NULL)
 {
- audio.out.name = strdup(name);
+ audio.out.name = name;
 }
 if (audio.in.track >= 0)
 {
@@ -1611,7 +1536,7 @@
 sub_config = subtitle->config;
 if (name != NULL)
 {
- sub_config.name = strdup(name);
+ sub_config.name = name;
 }
 result = json_unpack_ex(subtitle_dict, &error, 0,
 "{s?b, s?b, s?b, s?I}",
@@ -1662,7 +1587,7 @@
 }
 if (name != NULL)
 {
- sub_config.name = strdup(name);
+ sub_config.name = name;
 }
 sub_config.offset = offset;
 sub_config.dest = burn ? RENDERSUB : PASSTHRUSUB;
@@ -1765,10 +1690,13 @@
 "s:{"
 // Geometry {Width, Height, PAR {Num, Den}},
 "s:{s:i, s:i, s:{s:i, s:i}},"
- // AnamorphicMode, Keep, ItuPAR, Modulus, MaxWidth, MaxHeight,
- "s:i, s?i, s?b, s:i, s:i, s:i,"
+ // AnamorphicMode, Flags, Keep, ItuPAR, Modulus, MaxWidth, MaxHeight,
+ // DisplayWidth, DisplayHeight
+ "s:i, s?i, s?i, s?b, s?i, s?i, s?i, s?i, s?i"
 // Crop Top, Bottom, Left, Right
 "s?iiii"
+ // Pad Top, Bottom, Left, Right
+ "s?iiii"
 " }"
 "}",
 "SourceGeometry",
@@ -1785,15 +1713,22 @@
 "Num", unpack_i(&ui_geo.geometry.par.num),
 "Den", unpack_i(&ui_geo.geometry.par.den),
 "AnamorphicMode", unpack_i(&ui_geo.mode),
+ "Flags", unpack_i(&ui_geo.flags),
 "Keep", unpack_i(&ui_geo.keep),
 "ItuPAR", unpack_b(&ui_geo.itu_par),
 "Modulus", unpack_i(&ui_geo.modulus),
 "MaxWidth", unpack_i(&ui_geo.maxWidth),
 "MaxHeight", unpack_i(&ui_geo.maxHeight),
+ "DisplayWidth", unpack_i(&ui_geo.displayWidth),
+ "DisplayHeight", unpack_i(&ui_geo.displayHeight),
 "Crop", unpack_i(&ui_geo.crop0),
 unpack_i(&ui_geo.crop1),
 unpack_i(&ui_geo.crop2),
- unpack_i(&ui_geo.crop3)
+ unpack_i(&ui_geo.crop3),
+ "Pad", unpack_i(&ui_geo.pad0),
+ unpack_i(&ui_geo.pad1),
+ unpack_i(&ui_geo.pad2),
+ unpack_i(&ui_geo.pad3)
 );
 hb_value_free(&dict);
 
@@ -1935,6 +1870,18 @@
 return result;
 }
 
+hb_image_t * hb_get_preview3_json(hb_handle_t * h, int picture, const char *json_job)
+{
+ hb_image_t * image;
+ hb_dict_t * job_dict;
+
+ job_dict = hb_value_json(json_job);
+ image = hb_get_preview3(h, picture, job_dict);
+ hb_value_free(&job_dict);
+
+ return image;
+}
+
 char* hb_get_preview_params_json(int title_idx, int preview_idx,
 int deinterlace, hb_geometry_settings_t *settings)
 {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/hbavfilter.c -> HandBrake-1.5.1.tar.xz/libhb/hbavfilter.c Changed

@@ -15,6 +15,10 @@
 #include "handbrake/hbavfilter.h"
 #include "handbrake/avfilter_priv.h"
 
+#if HB_PROJECT_FEATURE_QSV
+#include "handbrake/qsv_common.h"
+#endif
+
 struct hb_avfilter_graph_s
 {
 AVFilterGraph * avgraph;
@@ -24,10 +28,11 @@
 char * settings;
 AVFrame * frame;
 AVRational out_time_base;
+ hb_job_t * job;
 };
 
 static AVFilterContext * append_filter( hb_avfilter_graph_t * graph,
- const char * name, const char * args)
+ const char * name, const char * args, AVBufferSrcParameters *par)
 {
 AVFilterContext * filter;
 int result;
@@ -38,6 +43,16 @@
 {
 return NULL;
 }
+
+ if (par)
+ {
+ result = av_buffersrc_parameters_set(filter, par);
+ if (result < 0)
+ {
+ return NULL;
+ }
+ }
+
 if (graph->last != NULL)
 {
 result = avfilter_link(graph->last, 0, filter, 0);
@@ -55,12 +70,13 @@
 hb_avfilter_graph_t *
 hb_avfilter_graph_init(hb_value_t * settings, hb_filter_init_t * init)
 {
- hb_avfilter_graph_t * graph;
- AVFilterInOut * in = NULL, * out = NULL;
- AVFilterContext * avfilter;
- char * settings_str;
- int result;
- char * filter_args;
+ hb_avfilter_graph_t * graph;
+ AVFilterInOut * in = NULL, * out = NULL;
+ AVBufferSrcParameters * par = NULL;
+ AVFilterContext * avfilter;
+ char * settings_str;
+ int result;
+ char * filter_args;
 
 graph = calloc(1, sizeof(hb_avfilter_graph_t));
 if (graph == NULL)
@@ -75,6 +91,7 @@
 goto fail;
 }
 
+ graph->job = init->job;
 graph->settings = settings_str;
 graph->avgraph = avfilter_graph_alloc();
 if (graph->avgraph == NULL)
@@ -82,9 +99,6 @@
 hb_error("hb_avfilter_graph_init: avfilter_graph_alloc failed");
 goto fail;
 }
-
- av_opt_set(graph->avgraph, "scale_sws_opts", "lanczos+accurate_rnd", 0);
-
 result = avfilter_graph_parse2(graph->avgraph, settings_str, &in, &out);
 if (result < 0 || in == NULL || out == NULL)
 {
@@ -94,15 +108,57 @@
 }
 
 // Build filter input
- filter_args = hb_strdup_printf(
- "width=%d:height=%d:pix_fmt=%d:sar=%d/%d:"
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_hw_filters_are_enabled(graph->job))
+ {
+ par = av_buffersrc_parameters_alloc();
+ filter_args = hb_strdup_printf(
+ "video_size=%dx%d:pix_fmt=%d:sar=%d/%d:"
 "time_base=%d/%d:frame_rate=%d/%d",
- init->geometry.width, init->geometry.height, init->pix_fmt,
+ init->geometry.width, init->geometry.height, AV_PIX_FMT_QSV,
 init->geometry.par.num, init->geometry.par.den,
 init->time_base.num, init->time_base.den,
 init->vrate.num, init->vrate.den);
 
- avfilter = append_filter(graph, "buffer", filter_args);
+ AVBufferRef *hb_hw_frames_ctx = NULL;
+
+ result = hb_create_ffmpeg_pool(graph->job, init->geometry.width, init->geometry.height, init->pix_fmt, 32, 0, &hb_hw_frames_ctx);
+ if (result < 0)
+ {
+ hb_error("hb_create_ffmpeg_pool failed");
+ goto fail;
+ }
+ par->hw_frames_ctx = hb_hw_frames_ctx;
+ // TODO: need to pass correct alignment for the scale_qsv output frame
+ int out_alignment = 0;
+ switch (graph->job->vcodec)
+ {
+ case HB_VCODEC_QSV_H264:
+ out_alignment = 16;
+ break;
+ case HB_VCODEC_QSV_H265_10BIT:
+ case HB_VCODEC_QSV_H265:
+ out_alignment = 32;
+ break;
+ default:
+ out_alignment = 0;
+ break;
+ }
+ graph->avgraph->opaque = (void*)(intptr_t)out_alignment;
+ }
+ else
+#endif
+ {
+ filter_args = hb_strdup_printf(
+ "width=%d:height=%d:pix_fmt=%d:sar=%d/%d:"
+ "time_base=%d/%d:frame_rate=%d/%d",
+ init->geometry.width, init->geometry.height, init->pix_fmt,
+ init->geometry.par.num, init->geometry.par.den,
+ init->time_base.num, init->time_base.den,
+ init->vrate.num, init->vrate.den);
+ }
+ avfilter = append_filter(graph, "buffer", filter_args, par);
+ av_free(par);
 free(filter_args);
 if (avfilter == NULL)
 {
@@ -120,7 +176,7 @@
 graph->last = out->filter_ctx;
 
 // Build filter output
- avfilter = append_filter(graph, "buffersink", NULL);
+ avfilter = append_filter(graph, "buffersink", NULL, 0);
 if (avfilter == NULL)
 {
 hb_error("hb_avfilter_graph_init: failed to create buffer output filter");
@@ -161,6 +217,7 @@
 return graph;
 
 fail:
+ av_free(par);
 avfilter_inout_free(&in);
 avfilter_inout_free(&out);
 hb_avfilter_graph_close(&graph);
@@ -224,8 +281,18 @@
 {
 if (in != NULL)
 {
- hb_video_buffer_to_avframe(graph->frame, in);
- return av_buffersrc_add_frame(graph->input, graph->frame);
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_hw_filters_are_enabled(graph->job))
+ {
+ hb_video_buffer_to_avframe(in->qsv_details.frame, in);
+ return hb_avfilter_add_frame(graph, in->qsv_details.frame);
+ }
+ else
+#endif
+ {
+ hb_video_buffer_to_avframe(graph->frame, in);
+ return av_buffersrc_add_frame(graph->input, graph->frame);
+ }
 }
 else
 {
@@ -241,7 +308,17 @@
 if (result >= 0)
 {
 hb_buffer_t * buf;
- buf = hb_avframe_to_video_buffer(graph->frame, graph->out_time_base);
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_hw_filters_are_enabled(graph->job))
+ {
+ buf = hb_qsv_copy_avframe_to_video_buffer(graph->job, graph->frame, 1);
+ hb_avframe_set_video_buffer_flags(buf, graph->frame, graph->out_time_base);
+ }
+ else
+#endif
+ {
+ buf = hb_avframe_to_video_buffer(graph->frame, graph->out_time_base);
+ }
 av_frame_unref(graph->frame);
 return buf;
 }
@@ -267,6 +344,8 @@
 case HB_FILTER_CROP_SCALE:
 case HB_FILTER_PAD:
 case HB_FILTER_ROTATE:
+ case HB_FILTER_COLORSPACE:
+ case HB_FILTER_FORMAT:
 {
 settings = pv->avfilters;
 } break;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/hbffmpeg.c -> HandBrake-1.5.1.tar.xz/libhb/hbffmpeg.c Changed

@@ -43,6 +43,7 @@
 frame->color_trc = hb_colr_tra_hb_to_ff(buf->f.color_transfer);
 frame->colorspace = hb_colr_mat_hb_to_ff(buf->f.color_matrix);
 frame->color_range = buf->f.color_range;
+ frame->chroma_location = buf->f.chroma_location;
 }
 
 void hb_avframe_set_video_buffer_flags(hb_buffer_t * buf, AVFrame *frame,
@@ -76,12 +77,13 @@
 {
 buf->s.flags |= PIC_FLAG_REPEAT_FRAME;
 }
- buf->s.frametype = get_frame_type(frame->pict_type);
- buf->f.fmt = frame->format;
- buf->f.color_prim = hb_colr_pri_ff_to_hb(frame->color_primaries);
- buf->f.color_transfer = hb_colr_tra_ff_to_hb(frame->color_trc);
- buf->f.color_matrix = hb_colr_mat_ff_to_hb(frame->colorspace);
- buf->f.color_range = frame->color_range;
+ buf->s.frametype = get_frame_type(frame->pict_type);
+ buf->f.fmt = frame->format;
+ buf->f.color_prim = hb_colr_pri_ff_to_hb(frame->color_primaries);
+ buf->f.color_transfer = hb_colr_tra_ff_to_hb(frame->color_trc);
+ buf->f.color_matrix = hb_colr_mat_ff_to_hb(frame->colorspace);
+ buf->f.color_range = frame->color_range;
+ buf->f.chroma_location = frame->chroma_location;
 }
 
 hb_buffer_t * hb_avframe_to_video_buffer(AVFrame *frame, AVRational time_base)
@@ -118,21 +120,9 @@
 return buf;
 }
 
-static int handle_jpeg(enum AVPixelFormat *format)
-{
- switch (*format)
- {
- case AV_PIX_FMT_YUVJ420P: *format = AV_PIX_FMT_YUV420P; return 1;
- case AV_PIX_FMT_YUVJ422P: *format = AV_PIX_FMT_YUV422P; return 1;
- case AV_PIX_FMT_YUVJ444P: *format = AV_PIX_FMT_YUV444P; return 1;
- case AV_PIX_FMT_YUVJ440P: *format = AV_PIX_FMT_YUV440P; return 1;
- default: return 0;
- }
-}
-
 struct SwsContext*
-hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat,
- int dstW, int dstH, enum AVPixelFormat dstFormat,
+hb_sws_get_context(int srcW, int srcH, enum AVPixelFormat srcFormat, int srcRange,
+ int dstW, int dstH, enum AVPixelFormat dstFormat, int dstRange,
 int flags, int colorspace)
 {
 struct SwsContext * ctx;
@@ -140,10 +130,6 @@
 ctx = sws_alloc_context();
 if ( ctx )
 {
- int srcRange, dstRange;
-
- srcRange = handle_jpeg(&srcFormat);
- dstRange = handle_jpeg(&dstFormat);
 flags |= SWS_FULL_CHR_H_INT | SWS_FULL_CHR_H_INP;
 
 av_opt_set_int(ctx, "srcw", srcW, 0);
@@ -423,6 +409,62 @@
 }
 }
 
+static hb_rational_t hb_rational_ff_to_hb(AVRational rational)
+{
+ hb_rational_t hb_rational = {rational.num, rational.den};
+ return hb_rational;
+}
+
+static AVRational hb_rational_hb_to_ff(hb_rational_t rational)
+{
+ AVRational ff_rational = {rational.num, rational.den};
+ return ff_rational;
+}
+
+hb_mastering_display_metadata_t hb_mastering_ff_to_hb(AVMasteringDisplayMetadata mastering)
+{
+ hb_mastering_display_metadata_t hb_mastering;
+
+ for (int i = 0; i < 3; i++)
+ {
+ hb_mastering.display_primariesi0 = hb_rational_ff_to_hb(mastering.display_primariesi0);
+ hb_mastering.display_primariesi1 = hb_rational_ff_to_hb(mastering.display_primariesi1);
+ }
+
+ hb_mastering.white_point0 = hb_rational_ff_to_hb(mastering.white_point0);
+ hb_mastering.white_point1 = hb_rational_ff_to_hb(mastering.white_point1);
+
+ hb_mastering.min_luminance = hb_rational_ff_to_hb(mastering.min_luminance);
+ hb_mastering.max_luminance = hb_rational_ff_to_hb(mastering.max_luminance);
+
+ hb_mastering.has_primaries = mastering.has_primaries;
+ hb_mastering.has_luminance = mastering.has_luminance;
+
+ return hb_mastering;
+}
+
+AVMasteringDisplayMetadata hb_mastering_hb_to_ff(hb_mastering_display_metadata_t mastering)
+{
+ AVMasteringDisplayMetadata ff_mastering;
+
+ for (int i = 0; i < 3; i++)
+ {
+ ff_mastering.display_primariesi0 = hb_rational_hb_to_ff(mastering.display_primariesi0);
+ ff_mastering.display_primariesi1 = hb_rational_hb_to_ff(mastering.display_primariesi1);
+ }
+
+ ff_mastering.white_point0 = hb_rational_hb_to_ff(mastering.white_point0);
+ ff_mastering.white_point1 = hb_rational_hb_to_ff(mastering.white_point1);
+
+ ff_mastering.min_luminance = hb_rational_hb_to_ff(mastering.min_luminance);
+ ff_mastering.max_luminance = hb_rational_hb_to_ff(mastering.max_luminance);
+
+ ff_mastering.has_primaries = mastering.has_primaries;
+ ff_mastering.has_luminance = mastering.has_luminance;
+
+ return ff_mastering;
+}
+
 uint64_t hb_ff_mixdown_xlat(int hb_mixdown, int *downmix_mode)
 {
 uint64_t ff_layout = 0;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/lang.c -> HandBrake-1.5.1.tar.xz/libhb/lang.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/lapsharp.c -> HandBrake-1.5.1.tar.xz/libhb/lapsharp.c Changed

@@ -1,6 +1,6 @@
 /* lapsharp.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -39,7 +39,7 @@
 };
 
 // Isotropic Laplacian kernel (isolap)
-// Minimial directionality, sharpens all edges similarly
+// Minimal directionality, sharpens all edges similarly
 // size = 3, coef = 1.0 / 5
 static const int kernel_isolap =
 {
@@ -62,7 +62,7 @@
 };
 
 // Isotropic Laplacian of Gaussian kernel (isolog)
-// Minimial directionality, plus noise and grain rejection
+// Minimal directionality, plus noise and grain rejection
 // σ ~= 1.2
 // size = 5, coef = 1.0 / 15
 static const int kernel_isolog =
@@ -291,10 +291,11 @@
 
 hb_frame_buffer_mirror_stride(in);
 out = hb_frame_buffer_init(pv->output.pix_fmt, in->f.width, in->f.height);
- out->f.color_prim = pv->output.color_prim;
- out->f.color_transfer = pv->output.color_transfer;
- out->f.color_matrix = pv->output.color_matrix;
- out->f.color_range = pv->output.color_range ;
+ out->f.color_prim = pv->output.color_prim;
+ out->f.color_transfer = pv->output.color_transfer;
+ out->f.color_matrix = pv->output.color_matrix;
+ out->f.color_range = pv->output.color_range;
+ out->f.chroma_location = pv->output.chroma_location;
 
 int c;
 for (c = 0; c < 3; c++)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/module.defs -> HandBrake-1.5.1.tar.xz/libhb/module.defs Changed

@@ -1,7 +1,7 @@
 __deps__ := A52DEC BZIP2 LIBVPX FFMPEG FREETYPE LAME LIBASS LIBDCA \
     LIBDVDREAD LIBDVDNAV LIBICONV LIBSAMPLERATE LIBTHEORA LIBVORBIS LIBOGG \
-    LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBMFX LIBGNURX JANSSON \
-    HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D
+    LIBXML2 X264 X265 ZLIB LIBBLURAY FDKAAC LIBVPL LIBGNURX JANSSON \
+    HARFBUZZ LIBOPUS LIBSPEEX LIBDAV1D LIBJPEGTURBO
 
 ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
     __deps__ += FONTCONFIG
@@ -45,13 +45,26 @@
 LIBHB.GCC.D += __LIBHB__ USE_PTHREAD
 LIBHB.GCC.I += $(LIBHB.build/) $(CONTRIB.build/)include
 
+ifeq (1,$(FEATURE.qsv))
+    LIBHB.GCC.I += $(CONTRIB.build/)include/vpl
+endif
+
 ifneq (,$(filter $(HOST.system),freebsd netbsd))
     LIBHB.GCC.I += $(LOCALBASE)/include
     LIBHB.GCC.I += $(LOCALBASE)/include/libxml2
 else ifneq (,$(filter $(HOST.system),darwin cygwin mingw))
     LIBHB.GCC.I += $(CONTRIB.build/)include/libxml2
 else
-    LIBHB.GCC.I += /usr/include/libxml2
+    LIBHB.libxml2 := $(shell $(PKGCONFIG.exe) --silence-errors --cflags libxml2)
+    ifeq (,$(LIBHB.libxml2))
+        LIBHB.libxml2 := $(shell $(PKGCONFIG.exe) --silence-errors --cflags libxml-2.0)
+    endif
+    ifneq (,$(LIBHB.libxml2))
+        LIBHB.libxml2 := $(patsubst -I%,%,$(LIBHB.libxml2))
+        LIBHB.GCC.I += $(LIBHB.libxml2)
+    else
+        LIBHB.GCC.I += /usr/include/libxml2
+    endif
 endif
 
 ifeq ($(HOST.system),cygwin)
@@ -104,8 +117,8 @@
 
 LIBHB.dll.libs = $(foreach n, \
         ass avformat avfilter avcodec avutil swresample postproc dvdnav dvdread \
-        freetype mp3lame swscale vpx theora vorbis vorbisenc ogg \
-        x264 xml2 bluray jansson harfbuzz opus speex dav1d, \
+        freetype mp3lame swscale vpx theora vorbis vorbisenc ogg x264 xml2 \
+        bluray jansson harfbuzz opus speex dav1d turbojpeg zimg, \
         $(CONTRIB.build/)lib/lib$(n).a )
 
 ifeq (1,$(FEATURE.fdk_aac))
@@ -113,7 +126,7 @@
 endif
 
 ifeq (1,$(FEATURE.qsv))
-LIBHB.dll.libs += $(CONTRIB.build/)lib/libmfx.a
+LIBHB.dll.libs += $(CONTRIB.build/)lib/libvpl.a
 endif
 
 ifeq (1,$(FEATURE.x265))
@@ -161,7 +174,10 @@
 endif
 
 LIBHB.GCC.args.extra.dylib++ += -Wl,--out-implib,$(LIBHB.lib)
-LIBHB.GCC.l += bcrypt ws2_32 uuid ole32
+LIBHB.GCC.l += bcrypt ws2_32 uuid ole32 gdi32
+ifeq (1,$(FEATURE.mf))
+    LIBHB.GCC.l += mfplat strmiids
+endif
 ifeq ($(HAS.dlfcn),1)
     LIBHB.GCC.l += dl
 endif

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/mt_frame_filter.c -> HandBrake-1.5.1.tar.xz/libhb/mt_frame_filter.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/muxavformat.c -> HandBrake-1.5.1.tar.xz/libhb/muxavformat.c Changed

@@ -1,6 +1,6 @@
 /* muxavformat.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -47,6 +47,8 @@
 
 AVFormatContext * oc;
 AVRational time_base;
+ AVPacket * pkt;
+ AVPacket * empty_pkt;
 
 int ntracks;
 hb_mux_data_t ** tracks;
@@ -54,41 +56,60 @@
 
 enum
 {
- META_TITLE,
- META_ARTIST,
- META_DIRECTOR,
- META_COMPOSER,
- META_RELEASE_DATE,
- META_COMMENT,
- META_ALBUM,
- META_GENRE,
- META_DESCRIPTION,
- META_SYNOPSIS,
- META_LAST
-};
-
-enum
-{
+ META_HB,
 META_MUX_MP4,
 META_MUX_MKV,
 META_MUX_WEBM,
 META_MUX_LAST
 };
 
-const char *metadata_keysMETA_LASTMETA_MUX_LAST =
+const char *metadata_keysMETA_MUX_LAST =
 {
- {"title", "TITLE"},
- {"artist", "ARTIST"},
- {"album_artist", "DIRECTOR"},
- {"composer", "COMPOSER"},
- {"date", "DATE_RELEASED"},
- {"comment", "SUMMARY"},
- {"album", NULL},
- {"genre", "GENRE"},
- {"description", "DESCRIPTION"},
- {"synopsis", "SYNOPSIS"}
+ {"Name", "title", "TITLE"},
+ {"Artist", "artist", "ARTIST"},
+ {"AlbumArtist", "album_artist", "DIRECTOR"},
+ {"Composer", "composer", "COMPOSER"},
+ {"ReleaseDate", "date", "DATE_RELEASED"},
+ {"Comment", "comment", "SUMMARY"},
+ {"Album", "album", NULL},
+ {"Genre", "genre", "GENRE"},
+ {"Description", "description", "DESCRIPTION"},
+ {"LongDescription", "synopsis", "SYNOPSIS"},
+ {NULL}
 };
 
+static const char * lookup_meta_mux_key(int meta_mux, const char * hb_key)
+{
+ int ii;
+
+ for (ii = 0; metadata_keysiiMETA_HB != NULL; ii++)
+ {
+ if (!strcmp(hb_key, metadata_keysiiMETA_HB))
+ {
+ return metadata_keysiimeta_mux;
+ }
+ }
+ return NULL;
+}
+
+const char * hb_lookup_meta_key(const char * mux_key)
+{
+ int ii, jj;
+
+ for (ii = 0; metadata_keysiiMETA_HB != NULL; ii++)
+ {
+ for (jj = 0; jj < META_MUX_LAST; jj++)
+ {
+ if (metadata_keysiijj != NULL &&
+ !strcmp(mux_key, metadata_keysiijj))
+ {
+ return metadata_keysiiMETA_HB;
+ }
+ }
+ }
+ return NULL;
+}
+
 static char* lookup_lang_code(int mux, char *iso639_2)
 {
 iso639_lang_t *lang;
@@ -104,7 +125,8 @@
 // MKV lang codes should be ISO-639-2B if it exists,
 // else ISO-639-2
 lang = lang_for_code2( iso639_2 );
- out = lang->iso639_2b ? lang->iso639_2b : lang->iso639_2;
+ out = lang->iso639_2b && *lang->iso639_2b ? lang->iso639_2b :
+ lang->iso639_2;
 break;
 default:
 break;
@@ -135,6 +157,15 @@
 uint8_t need_fonts = 0;
 char *lang;
 
+ m->pkt = av_packet_alloc();
+ m->empty_pkt = av_packet_alloc();
+
+ if (m->pkt == NULL || m->empty_pkt == NULL)
+ {
+ hb_error("muxavformat: av_packet_alloc failed");
+ goto error;
+ }
+
 max_tracks = 1 + hb_list_count( job->list_audio ) +
 hb_list_count( job->list_subtitle );
 m->tracks = calloc(max_tracks, sizeof(hb_mux_data_t*));
@@ -153,9 +184,9 @@
 
 av_dict_set(&av_opts, "brand", "mp42", 0);
 if (job->mp4_optimize)
- av_dict_set(&av_opts, "movflags", "faststart+disable_chpl", 0);
+ av_dict_set(&av_opts, "movflags", "faststart+disable_chpl+write_colr", 0);
 else
- av_dict_set(&av_opts, "movflags", "+disable_chpl", 0);
+ av_dict_set(&av_opts, "movflags", "+disable_chpl+write_colr", 0);
 break;
 
 case HB_MUX_AV_MKV:
@@ -165,6 +196,7 @@
 m->time_base.den = 1000;
 muxer_name = "matroska";
 meta_mux = META_MUX_MKV;
+ av_dict_set(&av_opts, "default_mode", "passthrough", 0);
 break;
 
 case HB_MUX_AV_WEBM:
@@ -174,6 +206,7 @@
 m->time_base.den = 1000;
 muxer_name = "webm";
 meta_mux = META_MUX_WEBM;
+ av_dict_set(&av_opts, "default_mode", "passthrough", 0);
 break;
 
 default:
@@ -194,8 +227,13 @@
 &m->oc->interrupt_callback, NULL);
 if( ret < 0 )
 {
+ if( ret == -2 ) 
+ {
+ hb_error( "avio_open2 failed, errno -2: Could not write to indicated output file. Please check destination path and file permissions" );
+ }
+ else
 hb_error( "avio_open2 failed, errno %d", ret);
- goto error;
+ goto error;
 }
 
 /* Video track */
@@ -221,6 +259,7 @@
 case HB_VCODEC_X264_8BIT:
 case HB_VCODEC_X264_10BIT:
 case HB_VCODEC_QSV_H264:
+ case HB_VCODEC_VT_H264:
 track->st->codecpar->codec_id = AV_CODEC_ID_H264;
 if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
 {
@@ -266,7 +305,7 @@
 
 case HB_VCODEC_FFMPEG_VCE_H264:
 case HB_VCODEC_FFMPEG_NVENC_H264:
- case HB_VCODEC_FFMPEG_VT_H264:
+ case HB_VCODEC_FFMPEG_MF_H264:
 track->st->codecpar->codec_id = AV_CODEC_ID_H264;
 if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
 {
@@ -377,6 +416,8 @@
 case HB_VCODEC_X265_16BIT:
 case HB_VCODEC_QSV_H265:
 case HB_VCODEC_QSV_H265_10BIT:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
 track->st->codecpar->codec_id = AV_CODEC_ID_HEVC;
 if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
 {
@@ -402,7 +443,7 @@
 
 case HB_VCODEC_FFMPEG_VCE_H265:
 case HB_VCODEC_FFMPEG_NVENC_H265:
- case HB_VCODEC_FFMPEG_VT_H265:
+ case HB_VCODEC_FFMPEG_MF_H265:
 track->st->codecpar->codec_id = AV_CODEC_ID_HEVC;
 if (job->mux == HB_MUX_AV_MP4 && job->inline_parameter_sets)
 {
@@ -442,6 +483,43 @@
 track->st->codecpar->height = job->height;
 track->st->disposition |= AV_DISPOSITION_DEFAULT;
 
+ track->st->codecpar->color_primaries = hb_output_color_prim(job);
+ track->st->codecpar->color_trc = hb_output_color_transfer(job);
+ track->st->codecpar->color_space = hb_output_color_matrix(job);
+ track->st->codecpar->color_range = job->color_range;
+ track->st->codecpar->chroma_location = job->chroma_location;
+
+ if (job->color_transfer == HB_COLR_TRA_SMPTEST2084)
+ {
+ if (job->mastering.has_primaries || job->mastering.has_luminance)
+ {
+ AVMasteringDisplayMetadata mastering = hb_mastering_hb_to_ff(job->mastering);
+
+ uint8_t *mastering_data = av_malloc(sizeof(AVMasteringDisplayMetadata));
+ memcpy(mastering_data, &mastering, sizeof(AVMasteringDisplayMetadata));
+
+ av_stream_add_side_data(track->st,
+ AV_PKT_DATA_MASTERING_DISPLAY_METADATA,
+ mastering_data,
+ sizeof(AVMasteringDisplayMetadata));
+ }
+
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ AVContentLightMetadata coll;
+ coll.MaxCLL = job->coll.max_cll;
+ coll.MaxFALL = job->coll.max_fall;
+
+ uint8_t *coll_data = av_malloc(sizeof(AVContentLightMetadata));
+ memcpy(coll_data, &coll, sizeof(AVContentLightMetadata));
+
+ av_stream_add_side_data(track->st,
+ AV_PKT_DATA_CONTENT_LIGHT_LEVEL,
+ coll_data,
+ sizeof(AVContentLightMetadata));
+ }
+ }
+
 hb_rational_t vrate = job->vrate;
 
 // If the vrate is the internal clock rate, there's a good chance
@@ -513,6 +591,9 @@
 case HB_ACODEC_FFTRUEHD:
 track->st->codecpar->codec_id = AV_CODEC_ID_TRUEHD;
 break;
+ case HB_ACODEC_MP2:
+ track->st->codecpar->codec_id = AV_CODEC_ID_MP2;
+ break;
 case HB_ACODEC_LAME:
 case HB_ACODEC_MP3:
 track->st->codecpar->codec_id = AV_CODEC_ID_MP3;
@@ -622,7 +703,7 @@
 ret = av_bsf_alloc(bsf, &ctx);
 if (ret < 0)
 {
- hb_error("AAC bistream filter: alloc failure");
+ hb_error("AAC bitstream filter: alloc failure");
 goto error;
 }
 ctx->time_base_in.num = 1;
@@ -646,7 +727,7 @@
 ret = av_bsf_init(track->bitstream_context);
 if (ret < 0)
 {
- hb_error("bistream filter: init failure");
+ hb_error("bitstream filter: init failure");
 goto error;
 }
 }
@@ -853,6 +934,17 @@
 track->st->codecpar->codec_id = AV_CODEC_ID_HDMV_PGS_SUBTITLE;
 } break;
 
+ case DVBSUB:
+ {
+ track->st->codecpar->codec_id = AV_CODEC_ID_DVB_SUBTITLE;
+ if (subtitle->extradata != NULL)
+ {
+ priv_size = subtitle->extradata_size;
+ priv_data = av_malloc(priv_size + AV_INPUT_BUFFER_PADDING_SIZE);
+ memcpy(priv_data, subtitle->extradata, priv_size);
+ }
+ } break;
+
 case CC608SUB:
 case CC708SUB:
 case TX3GSUB:
@@ -1022,75 +1114,31 @@
 }
 }
 
- if( job->metadata )
+ if( job->metadata && job->metadata->dict )
 {
- hb_metadata_t *md = job->metadata;
-
 hb_deep_log(2, "Writing Metadata to output file...");
- if (md->name &&
- metadata_keysMETA_TITLEmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_TITLEmeta_mux, md->name, 0);
- }
- if (md->artist &&
- metadata_keysMETA_ARTISTmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_ARTISTmeta_mux, md->artist, 0);
- }
- if (md->album_artist &&
- metadata_keysMETA_DIRECTORmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_DIRECTORmeta_mux,
- md->album_artist, 0);
- }
- if (md->composer &&
- metadata_keysMETA_COMPOSERmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_COMPOSERmeta_mux,
- md->composer, 0);
- }
- if (md->release_date &&
- metadata_keysMETA_RELEASE_DATEmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_RELEASE_DATEmeta_mux,
- md->release_date, 0);
- }
- if (md->comment &&
- metadata_keysMETA_COMMENTmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_COMMENTmeta_mux, md->comment, 0);
- }
- if (!md->name && md->album &&
- metadata_keysMETA_ALBUMmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_ALBUMmeta_mux, md->album, 0);
- }
- if (md->genre &&
- metadata_keysMETA_GENREmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_GENREmeta_mux, md->genre, 0);
- }
- if (md->description &&
- metadata_keysMETA_DESCRIPTIONmeta_mux != NULL)
- {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_DESCRIPTIONmeta_mux,
- md->description, 0);
- }
- if (md->long_description &&
- metadata_keysMETA_SYNOPSISmeta_mux != NULL)
+ hb_dict_iter_t iter = hb_dict_iter_init(job->metadata->dict);
+
+ while (iter != HB_DICT_ITER_DONE)
 {
- av_dict_set(&m->oc->metadata,
- metadata_keysMETA_SYNOPSISmeta_mux,
- md->long_description, 0);
+ const char * key;
+ hb_value_t * val;
+
+ hb_dict_iter_next_ex(job->metadata->dict, &iter, &key, &val);
+ if (key != NULL && val != NULL)
+ {
+ const char * str = hb_value_get_string(val);
+
+ if (str != NULL)
+ {
+ const char * mux_key = lookup_meta_mux_key(meta_mux, key);
+
+ if (mux_key != NULL)
+ {
+ av_dict_set(&m->oc->metadata, mux_key, str, 0);
+ }
+ }
+ }
 }
 }
 
@@ -1170,7 +1218,6 @@
 
 static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *buf)
 {
- AVPacket pkt;
 int64_t dts, pts, duration = AV_NOPTS_VALUE;
 hb_job_t * job = m->job;
 uint8_t * sub_out = NULL;
@@ -1193,17 +1240,16 @@
 // subtitle that was written
 if (track->duration > 0)
 {
- AVPacket empty_pkt;
 uint8_t empty2 = {0,0};
 
- av_init_packet(&empty_pkt);
- empty_pkt.data = empty;
- empty_pkt.size = 2;
- empty_pkt.dts = track->duration;
- empty_pkt.pts = track->duration;
- empty_pkt.duration = 90;
- empty_pkt.stream_index = track->st->index;
- av_interleaved_write_frame(m->oc, &empty_pkt);
+ m->empty_pkt->data = empty;
+ m->empty_pkt->size = 2;
+ m->empty_pkt->dts = track->duration;
+ m->empty_pkt->pts = track->duration;
+ m->empty_pkt->duration = 90;
+ m->empty_pkt->stream_index = track->st->index;
+ av_interleaved_write_frame(m->oc, m->empty_pkt);
+ av_packet_unref(m->empty_pkt);
 }
 }
 return 0;
@@ -1276,30 +1322,29 @@
 }
 }
 
- av_init_packet(&pkt);
- pkt.data = buf->data;
- pkt.size = buf->size;
- pkt.dts = dts;
- pkt.pts = pts;
- pkt.duration = duration;
+ m->pkt->data = buf->data;
+ m->pkt->size = buf->size;
+ m->pkt->dts = dts;
+ m->pkt->pts = pts;
+ m->pkt->duration = duration;
 
 if (track->type == MUX_TYPE_VIDEO)
 {
 if ((buf->s.frametype == HB_FRAME_IDR) ||
 (buf->s.flags & HB_FLAG_FRAMETYPE_KEY))
 {
- pkt.flags |= AV_PKT_FLAG_KEY;
+ m->pkt->flags |= AV_PKT_FLAG_KEY;
 }
 #ifdef AV_PKT_FLAG_DISPOSABLE
 if (!(buf->s.flags & HB_FLAG_FRAMETYPE_REF))
 {
- pkt.flags |= AV_PKT_FLAG_DISPOSABLE;
+ m->pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
 }
 #endif
 }
 else if (buf->s.frametype & HB_FRAME_MASK_KEY)
 {
- pkt.flags |= AV_PKT_FLAG_KEY;
+ m->pkt->flags |= AV_PKT_FLAG_KEY;
 }
 
 switch (track->type)
@@ -1323,7 +1368,7 @@
 // make sure we're not writing a chapter that has 0 length
 if (chapter != NULL &&
 track->prev_chapter_tc != AV_NOPTS_VALUE &&
- track->prev_chapter_tc < pkt.pts)
+ track->prev_chapter_tc < m->pkt->pts)
 {
 char title1024;
 if (chapter->title != NULL)
@@ -1335,11 +1380,11 @@
 snprintf(title, 1023, "Chapter %d",
 track->current_chapter);
 }
- add_chapter(m, track->prev_chapter_tc, pkt.pts, title);
+ add_chapter(m, track->prev_chapter_tc, m->pkt->pts, title);
 }
 }
 track->current_chapter = buf->s.new_chap;
- track->prev_chapter_tc = pkt.pts;
+ track->prev_chapter_tc = m->pkt->pts;
 }
 } break;
 
@@ -1350,17 +1395,16 @@
 /* Write an empty sample */
 if ( track->duration < pts )
 {
- AVPacket empty_pkt;
 uint8_t empty2 = {0,0};
 
- av_init_packet(&empty_pkt);
- empty_pkt.data = empty;
- empty_pkt.size = 2;
- empty_pkt.dts = track->duration;
- empty_pkt.pts = track->duration;
- empty_pkt.duration = pts - track->duration;
- empty_pkt.stream_index = track->st->index;
- int ret = av_interleaved_write_frame(m->oc, &empty_pkt);
+ m->empty_pkt->data = empty;
+ m->empty_pkt->size = 2;
+ m->empty_pkt->dts = track->duration;
+ m->empty_pkt->pts = track->duration;
+ m->empty_pkt->duration = pts - track->duration;
+ m->empty_pkt->stream_index = track->st->index;
+ int ret = av_interleaved_write_frame(m->oc, m->empty_pkt);
+ av_packet_unref(m->empty_pkt);
 if (ret < 0)
 {
 char errstr64;
@@ -1401,14 +1445,14 @@
 memcpy(sub_out + 2 + buffersize, styleatom, stylesize);
 sub_out0 = (buffersize >> 8) & 0xff;
 sub_out1 = buffersize & 0xff;
- pkt.data = sub_out;
- pkt.size = buffersize + stylesize + 2;
+ m->pkt->data = sub_out;
+ m->pkt->size = buffersize + stylesize + 2;
 }
 free(buffer);
 free(styleatom);
 }
 }
- if (pkt.data == NULL)
+ if (m->pkt->data == NULL)
 {
 // Memory allocation failure!
 hb_error("avformatMux: subtitle memory allocation failure");
@@ -1421,19 +1465,19 @@
 default:
 break;
 }
- track->duration = pts + pkt.duration;
+ track->duration = pts + m->pkt->duration;
 
 if (track->bitstream_context)
 {
 int ret;
- ret = av_bsf_send_packet(track->bitstream_context, &pkt);
+ ret = av_bsf_send_packet(track->bitstream_context, m->pkt);
 if (ret < 0)
 {
 hb_error("avformatMux: track %d av_bsf_send_packet failed",
 track->st->index);
 return ret;
 }
- ret = av_bsf_receive_packet(track->bitstream_context, &pkt);
+ ret = av_bsf_receive_packet(track->bitstream_context, m->pkt);
 if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF)
 {
 return 0;
@@ -1446,8 +1490,9 @@
 }
 }
 
- pkt.stream_index = track->st->index;
- int ret = av_interleaved_write_frame(m->oc, &pkt);
+ m->pkt->stream_index = track->st->index;
+ int ret = av_interleaved_write_frame(m->oc, m->pkt);
+ av_packet_unref(m->pkt);
 if (sub_out != NULL)
 {
 free(sub_out);
@@ -1563,6 +1608,8 @@
 av_write_trailer(m->oc);
 avio_close(m->oc->pb);
 avformat_free_context(m->oc);
+ av_packet_free(&m->pkt);
+ av_packet_free(&m->empty_pkt);
 free(m->tracks);
 m->oc = NULL;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/muxcommon.c -> HandBrake-1.5.1.tar.xz/libhb/muxcommon.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/nal_units.c -> HandBrake-1.5.1.tar.xz/libhb/nal_units.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/nlmeans.c -> HandBrake-1.5.1.tar.xz/libhb/nlmeans.c Changed

@@ -1,7 +1,7 @@
 /* nlmeans.c
 
 Copyright (c) 2013 Dirk Farin
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -714,16 +714,19 @@
 int dst_w,
 int dst_h,
 int dx,
- int dy)
+ int dy,
+ int n)
 {
 const int bw = w + 2 * border;
- for (int y = 0; y < dst_h; y++)
+ const int n_half = (n-1) /2;
+
+ for (int y = 0; y < dst_h + n; y++)
 {
- const uint8_t *p1 = src_pre + y*bw;
- const uint8_t *p2 = compare_pre + (y+dy)*bw + dx;
+ const uint8_t *p1 = src_pre + (y-n_half )*bw - n_half;
+ const uint8_t *p2 = compare_pre + (y-n_half+dy)*bw - n_half + dx;
 uint32_t *out = integral + (y*integral_stride);
 
- for (int x = 0; x < dst_w; x++)
+ for (int x = 0; x < dst_w + n; x++)
 {
 int diff = *p1 - *p2;
 *out = *(out-1) + diff * diff;
@@ -736,7 +739,7 @@
 {
 out = integral + y*integral_stride;
 
- for (int x = 0; x < dst_w; x++)
+ for (int x = 0; x < dst_w + n; x++)
 {
 *out += *(out - integral_stride);
 out++;
@@ -762,7 +765,6 @@
 const float weight_fact_table,
 const int diff_max)
 {
- const int n_half = (n-1) /2;
 const int r_half = (r-1) /2;
 
 // Source image
@@ -773,11 +775,11 @@
 const int bw = w + 2 * border;
 
 // Allocate temporary pixel sums
- struct PixelSum *tmp_data = calloc(dst_w * dst_h, sizeof(struct PixelSum));
+ struct PixelSum *tmp_data = calloc((dst_w + n) * (dst_h + n), sizeof(struct PixelSum));
 
 // Allocate integral image
- const int integral_stride = ((dst_w + 15) / 16 * 16) + 2 * 16;
- uint32_t* const integral_mem = calloc(integral_stride * (dst_h+1), sizeof(uint32_t));
+ const int integral_stride = ((dst_w + n + 15) / 16 * 16) + 2 * 16;
+ uint32_t* const integral_mem = calloc(integral_stride * (dst_h + n + 1), sizeof(uint32_t));
 uint32_t* const integral = integral_mem + integral_stride + 16;
 
 // Iterate through available frames
@@ -798,9 +800,9 @@
 // Apply special weight tuning to origin patch
 if (dx == 0 && dy == 0 && f == 0)
 {
- for (int y = n_half; y < dst_h-n + n_half; y++)
+ for (int y = 0; y < dst_h; y++)
 {
- for (int x = n_half; x < dst_w-n + n_half; x++)
+ for (int x = 0; x < dst_w; x++)
 {
 tmp_datay*dst_w + x.weight_sum += origin_tune;
 tmp_datay*dst_w + x.pixel_sum += origin_tune * srcy*bw + x;
@@ -821,18 +823,17 @@
 dst_w,
 dst_h,
 dx,
- dy);
+ dy,
+ n);
 
 // Average displacement
- for (int y = 0; y <= dst_h-n; y++)
+ for (int y = 0; y <= dst_h; y++)
 {
 const uint32_t *integral_ptr1 = integral + (y -1)*integral_stride - 1;
 const uint32_t *integral_ptr2 = integral + (y+n-1)*integral_stride - 1;
 
- for (int x = 0; x <= dst_w-n; x++)
+ for (int x = 0; x <= dst_w; x++)
 {
- const int xc = x + n_half;
- const int yc = y + n_half;
 
 // Difference between patches
 const int diff = (uint32_t)(integral_ptr2n - integral_ptr20 - integral_ptr1n + integral_ptr10);
@@ -845,8 +846,8 @@
 //float weight = exp(-diff*weightFact);
 const float weight = exptablediffidx;
 
- tmp_datayc*dst_w + xc.weight_sum += weight;
- tmp_datayc*dst_w + xc.pixel_sum += weight * compare(yc+dy)*bw + xc + dx;
+ tmp_datay*dst_w + x.weight_sum += weight;
+ tmp_datay*dst_w + x.pixel_sum += weight * compare(y+dy)*bw + x + dx;
 }
 
 integral_ptr1++;
@@ -857,26 +858,11 @@
 }
 }
 
- // Copy edges
- for (int y = 0; y < dst_h; y++)
- {
- for (int x = 0; x < n_half; x++)
- {
- *(dst + y * dst_s + x) = *(src + y * bw - x - 1);
- *(dst + y * dst_s - x + (dst_w - 1)) = *(src + y * bw + x + dst_w);
- }
- }
- for (int y = 0; y < n_half; y++)
- {
- memcpy(dst + y*dst_s, src - (y+1)*bw, dst_w);
- memcpy(dst + (dst_h-y-1)*dst_s, src + (y+dst_h)*bw, dst_w);
- }
-
- // Copy main image
+ // Copy image without border
 uint8_t result;
- for (int y = n_half; y < dst_h-n_half; y++)
+ for (int y = 0; y < dst_h; y++)
 {
- for (int x = n_half; x < dst_w-n_half; x++)
+ for (int x = 0; x < dst_w; x++)
 {
 result = (uint8_t)(tmp_datay*dst_w + x.pixel_sum / tmp_datay*dst_w + x.weight_sum);
 *(dst + y*dst_s + x) = result ? result : *(src + y*bw + x);
@@ -1118,11 +1104,11 @@
 hb_buffer_t *buf;
 buf = hb_frame_buffer_init(pv->output.pix_fmt,
 frame->width, frame->height);
- buf->f.color_prim = pv->output.color_prim;
- buf->f.color_transfer = pv->output.color_transfer;
- buf->f.color_matrix = pv->output.color_matrix;
- buf->f.color_range = pv->output.color_range ;
-
+ buf->f.color_prim = pv->output.color_prim;
+ buf->f.color_transfer = pv->output.color_transfer;
+ buf->f.color_matrix = pv->output.color_matrix;
+ buf->f.color_range = pv->output.color_range;
+ buf->f.chroma_location = pv->output.chroma_location;
 
 NLMeansFunctions *functions = &pv->functions;
 
@@ -1176,7 +1162,7 @@
 for (int c = 0; c < 3; c++)
 {
 // Extend copy of plane with extra border and place in buffer
- const int border = ((pv->rangec + 2) / 2 + 15) / 16 * 16;
+ const int border = ((pv->patch_sizec + 2) / 2 + 15) / 16 * 16;
 nlmeans_alloc(buf->planec.data,
 buf->planec.width,
 buf->planec.stride,
@@ -1255,10 +1241,11 @@
 hb_buffer_t *buf;
 buf = hb_frame_buffer_init(pv->output.pix_fmt,
 frame->width, frame->height);
- buf->f.color_prim = pv->output.color_prim;
- buf->f.color_transfer = pv->output.color_transfer;
- buf->f.color_matrix = pv->output.color_matrix;
- buf->f.color_range = pv->output.color_range ;
+ buf->f.color_prim = pv->output.color_prim;
+ buf->f.color_transfer = pv->output.color_transfer;
+ buf->f.color_matrix = pv->output.color_matrix;
+ buf->f.color_range = pv->output.color_range;
+ buf->f.chroma_location = pv->output.chroma_location;
 
 NLMeansFunctions *functions = &pv->functions;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/nlmeans_x86.c -> HandBrake-1.5.1.tar.xz/libhb/nlmeans_x86.c Changed

@@ -1,7 +1,7 @@
 /* nlmeans_x86.c
 
 Copyright (c) 2013 Dirk Farin
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -28,20 +28,22 @@
 int dst_w,
 int dst_h,
 int dx,
- int dy)
+ int dy,
+ int n)
 {
 const __m128i zero = _mm_set1_epi8(0);
 const int bw = w + 2 * border;
+ const int n_half = (n-1) /2;
 
- for (int y = 0; y < dst_h; y++)
+ for (int y = 0; y < dst_h + n; y++)
 {
 __m128i prevadd = _mm_set1_epi32(0);
 
- const uint8_t *p1 = src_pre + y*bw;
- const uint8_t *p2 = compare_pre + (y+dy)*bw + dx;
+ const uint8_t *p1 = src_pre + (y-n_half )*bw - n_half;
+ const uint8_t *p2 = compare_pre + (y-n_half+dy)*bw - n_half + dx;
 uint32_t *out = integral + (y*integral_stride);
 
- for (int x = 0; x < dst_w; x += 16)
+ for (int x = 0; x < dst_w + n; x += 16)
 {
 __m128i pa, pb;
 __m128i pla, plb;
@@ -123,7 +125,7 @@
 {
 out = integral + y*integral_stride;
 
- for (int x = 0; x < dst_w; x += 16)
+ for (int x = 0; x < dst_w + n; x += 16)
 {
 *((__m128i*)out) = _mm_add_epi32(*(__m128i*)(out-integral_stride),
 *(__m128i*)(out));

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/nvenc_common.c -> HandBrake-1.5.1.tar.xz/libhb/nvenc_common.c Changed

@@ -1,6 +1,6 @@
 /* nvenc_common.c
 *
- * Copyright (c) 2003-2020 HandBrake Team
+ * Copyright (c) 2003-2022 HandBrake Team
 * This file is part of the HandBrake source code.
 * Homepage: <http://handbrake.fr/>.
 * It may be used under the terms of the GNU General Public License v2.
@@ -15,26 +15,7 @@
 #include <ffnvcodec/dynlink_loader.h>
 #endif
 
-int hb_check_nvenc_available();
-
-int hb_nvenc_h264_available()
-{
- #if HB_PROJECT_FEATURE_NVENC
- return hb_check_nvenc_available();
- #else
- return 0;
- #endif
-}
-
-int hb_nvenc_h265_available()
-{
- #if HB_PROJECT_FEATURE_NVENC
- return hb_check_nvenc_available();
- #else
- return 0;
- #endif
-}
-
+static int is_nvenc_available = -1;
 
 int hb_check_nvenc_available()
 {
@@ -42,6 +23,11 @@
 {
 return 0;
 }
+ 
+ if (is_nvenc_available != -1) 
+ {
+ return is_nvenc_available;
+ }
 
 #if HB_PROJECT_FEATURE_NVENC
 uint32_t nvenc_ver;
@@ -55,9 +41,11 @@
 
 NVENCSTATUS apiErr = nvenc_dl->NvEncodeAPIGetMaxSupportedVersion(&nvenc_ver);
 if (apiErr != NV_ENC_SUCCESS) {
+ is_nvenc_available = 0;
 return 0;
 } else {
- hb_log("Nvenc version %d.%d\n", nvenc_ver >> 4, nvenc_ver & 0xf);
+ hb_deep_log(1, "NVENC version %d.%d\n", nvenc_ver >> 4, nvenc_ver & 0xf);
+ is_nvenc_available = 1;
 return 1;
 }
 
@@ -66,3 +54,47 @@
 return 0;
 #endif
 }
+
+int hb_nvenc_h264_available()
+{
+ #if HB_PROJECT_FEATURE_NVENC
+ return hb_check_nvenc_available();
+ #else
+ return is_nvenc_available;
+ #endif
+}
+
+int hb_nvenc_h265_available()
+{
+ #if HB_PROJECT_FEATURE_NVENC
+ return hb_check_nvenc_available();
+ #else
+ return is_nvenc_available;
+ #endif
+}
+
+char * hb_map_nvenc_preset_name (const char * preset){
+
+ if (preset == NULL)
+ {
+ return "p4";
+ }
+
+ if (strcmp(preset, "fastest") == 0) {
+ return "p1";
+ } else if (strcmp(preset, "faster") == 0) {
+ return "p2";
+ } else if (strcmp(preset, "fast") == 0) {
+ return "p3";
+ } else if (strcmp(preset, "medium") == 0) {
+ return "p4";
+ } else if (strcmp(preset, "slow") == 0) {
+ return "p5";
+ } else if (strcmp(preset, "slower") == 0) {
+ return "p6";
+ } else if (strcmp(preset, "slowest") == 0) {
+ return "p7";
+ }
+
+ return "p4"; // Default to Medium
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/pad.c -> HandBrake-1.5.1.tar.xz/libhb/pad.c Changed

@@ -15,7 +15,9 @@
 
 const char pad_template =
 "width=^"HB_INT_REG"$:height=^"HB_INT_REG"$:color=^"HB_ALL_REG"$:"
- "x=^"HB_INT_REG"$:y=^"HB_INT_REG"$";
+ "x=^"HB_INT_REG"$:y=^"HB_INT_REG"$:"
+ "top=^"HB_INT_REG"$:bottom=^"HB_INT_REG"$:"
+ "left=^"HB_INT_REG"$:right=^"HB_INT_REG"$";
 
 hb_filter_object_t hb_filter_pad =
 {
@@ -50,15 +52,37 @@
 hb_dict_t * settings = filter->settings;
 
 int width = -1, height = -1, rgb = 0;
+ int top = -1, bottom = -1, left = -1, right = -1;
 int x = -1, y = -1;
 char * color = NULL;
 
+ hb_dict_extract_int(&top, settings, "top");
+ hb_dict_extract_int(&bottom, settings, "bottom");
+ hb_dict_extract_int(&left, settings, "left");
+ hb_dict_extract_int(&right, settings, "right");
+
 hb_dict_extract_int(&width, settings, "width");
 hb_dict_extract_int(&height, settings, "height");
 hb_dict_extract_string(&color, settings, "color");
 hb_dict_extract_int(&x, settings, "x");
 hb_dict_extract_int(&y, settings, "y");
 
+ if (x < 0)
+ {
+ x = left;
+ }
+ if (y < 0)
+ {
+ y = top;
+ }
+ if (top >= 0 && bottom >= 0 && height < 0)
+ {
+ height = init->geometry.height + top + bottom;
+ }
+ if (left >= 0 && right >= 0 && width < 0)
+ {
+ width = init->geometry.width + left + right;
+ }
 if (color != NULL)
 {
 char * end;
@@ -90,14 +114,15 @@
 {
 snprintf(y_str, 20, "%d", y);
 }
- if (width < 0)
+ if (width < init->geometry.width)
 {
 width = init->geometry.width;
 }
- if (height < 0)
+ if (height < init->geometry.height)
 {
 height = init->geometry.height;
 }
+
 hb_dict_t * avfilter = hb_dict_init();
 hb_dict_t * avsettings = hb_dict_init();

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/param.c -> HandBrake-1.5.1.tar.xz/libhb/param.c Changed

@@ -1,6 +1,6 @@
 /* param.c
 *
- * Copyright (c) 2003-2020 HandBrake Team
+ * Copyright (c) 2003-2022 HandBrake Team
 * This file is part of the HandBrake source code
 * Homepage: <http://handbrake.fr/>.
 * It may be used under the terms of the GNU General Public License v2.
@@ -94,6 +94,7 @@
 
 static hb_filter_param_t chroma_smooth_presets =
 {
+ { 0, "Off", "off", NULL },
 { 1, "Custom", "custom", NULL },
 { 2, "Ultralight", "ultralight", NULL },
 { 3, "Light", "light", NULL },
@@ -115,6 +116,17 @@
 { 0, NULL, NULL, NULL }
 };
 
+static hb_filter_param_t colorspace_presets =
+{
+ { 0, "Off", "off", NULL },
+ { 1, "Custom", "custom", NULL },
+ { 2, "BT.2020", "bt2020", "primaries=bt2020:transfer=bt2020-10:matrix=bt2020ncl:tonemap=hable:desat=0" },
+ { 3, "BT.709", "bt709", "primaries=bt709:transfer=bt709:matrix=bt709:tonemap=hable:desat=0" },
+ { 4, "BT.601 SMPTE-C", "bt601-6-525", "primaries=smpte170m:transfer=bt709:matrix=smpte170m:tonemap=hable:desat=0" },
+ { 5, "BT.601 EBU", "bt601-6-625", "primaries=bt470bg:transfer=bt709:matrix=smpte170m:tonemap=hable:desat=0" },
+ { 0, NULL, NULL, NULL }
+};
+
 static hb_filter_param_t unsharp_presets =
 {
 { 1, "Custom", "custom", NULL },
@@ -237,6 +249,9 @@
 sizeof(chroma_smooth_presets) / sizeof(hb_filter_param_t),
 sizeof(chroma_smooth_tunes) / sizeof(hb_filter_param_t), },
 
+ { HB_FILTER_COLORSPACE, colorspace_presets, NULL,
+ sizeof(colorspace_presets) / sizeof(hb_filter_param_t), 0, },
+
 { HB_FILTER_UNSHARP, unsharp_presets, unsharp_tunes,
 sizeof(unsharp_presets) / sizeof(hb_filter_param_t),
 sizeof(unsharp_tunes) / sizeof(hb_filter_param_t), },
@@ -1259,6 +1274,7 @@
 case HB_FILTER_DETELECINE:
 case HB_FILTER_HQDN3D:
 case HB_FILTER_DEINTERLACE:
+ case HB_FILTER_COLORSPACE:
 settings = generate_generic_settings(filter_id, preset,
 tune, custom);
 break;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/platform/macosx/encca_aac.c -> HandBrake-1.5.1.tar.xz/libhb/platform/macosx/encca_aac.c Changed

HandBrake-1.5.1.tar.xz/libhb/platform/macosx/encvt.c Added

@@ -0,0 +1,1793 @@
+/* encvt.c
+
+ Copyright (c) 2003-2022 HandBrake Team
+ This file is part of the HandBrake source code
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License v2.
+ For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
+ */
+
+#include "handbrake/handbrake.h"
+
+#include <VideoToolbox/VideoToolbox.h>
+#include <CoreMedia/CoreMedia.h>
+#include <CoreVideo/CoreVideo.h>
+
+int encvt_init(hb_work_object_t *, hb_job_t *);
+int encvt_work(hb_work_object_t *, hb_buffer_t **, hb_buffer_t **);
+void encvt_close(hb_work_object_t *);
+
+hb_work_object_t hb_encvt =
+{
+ WORK_ENCVT,
+ "VideoToolbox encoder (Apple)",
+ encvt_init,
+ encvt_work,
+ encvt_close
+};
+
+#define FRAME_INFO_MAX2 (8) // 2^8 = 256; 90000/256 = 352 frames/sec
+#define FRAME_INFO_MIN2 (17) // 2^17 = 128K; 90000/131072 = 1.4 frames/sec
+#define FRAME_INFO_SIZE (1 << (FRAME_INFO_MIN2 - FRAME_INFO_MAX2 + 1))
+#define FRAME_INFO_MASK (FRAME_INFO_SIZE - 1)
+
+struct hb_work_private_s
+{
+ hb_job_t *job;
+
+ CMFormatDescriptionRef format;
+ VTCompressionSessionRef session;
+
+ CMSimpleQueueRef queue;
+ hb_chapter_queue_t *chapter_queue;
+
+ // DTS calculation
+ int frameno_in;
+ int frameno_out;
+ int64_t dts_delay;
+
+ struct
+ {
+ int64_t start;
+ } frame_infoFRAME_INFO_SIZE;
+
+ // Multipass
+ VTMultiPassStorageRef passStorage;
+ CMItemCount timeRangeCount;
+ const CMTimeRange *timeRangeArray;
+ int remainingPasses;
+
+ struct hb_vt_param
+ {
+ CMVideoCodecType codec;
+ uint64_t registryID;
+
+ OSType pixelFormat;
+ int32_t timescale;
+
+ double quality;
+ int averageBitRate;
+ double expectedFrameRate;
+
+ int profile;
+ CFStringRef profileLevel;
+
+ int maxFrameDelayCount;
+ int maxKeyFrameInterval;
+ CFBooleanRef allowFrameReordering;
+ CFBooleanRef allowTemporalCompression;
+ CFBooleanRef prioritizeEncodingSpeedOverQuality;
+ struct
+ {
+ int maxrate;
+ int bufsize;
+ }
+ vbv;
+ struct
+ {
+ int prim;
+ int matrix;
+ int transfer;
+ int chromaLocation;
+ CFDataRef masteringDisplay;
+ CFDataRef contentLightLevel;
+ }
+ color;
+ SInt32 width;
+ SInt32 height;
+ struct
+ {
+ SInt32 num;
+ SInt32 den;
+ }
+ par;
+ enum
+ {
+ HB_VT_FIELDORDER_PROGRESSIVE = 0,
+ HB_VT_FIELDORDER_TFF,
+ HB_VT_FIELDORDER_BFF,
+ }
+ fieldDetail;
+ struct
+ {
+ CFStringRef entropyMode;
+ int maxSliceBytes;
+ }
+ h264;
+ }
+ settings;
+};
+
+void hb_vt_param_default(struct hb_vt_param *param)
+{
+ param->quality = -1;
+ param->vbv.maxrate = 0;
+ param->vbv.bufsize = 0;
+ param->maxFrameDelayCount = kVTUnlimitedFrameDelayCount;
+ param->allowFrameReordering = kCFBooleanTrue;
+ param->allowTemporalCompression = kCFBooleanTrue;
+ param->prioritizeEncodingSpeedOverQuality = kCFBooleanFalse;
+ param->fieldDetail = HB_VT_FIELDORDER_PROGRESSIVE;
+}
+
+// used to pass the compression session
+// to the next job
+typedef struct vt_interjob_s
+{
+ VTCompressionSessionRef session;
+ VTMultiPassStorageRef passStorage;
+ CMSimpleQueueRef queue;
+ CMFormatDescriptionRef format;
+} vt_interjob_t;
+
+enum
+{
+ HB_VT_H264_PROFILE_BASELINE = 0,
+ HB_VT_H264_PROFILE_MAIN,
+ HB_VT_H264_PROFILE_HIGH,
+ HB_VT_H264_PROFILE_NB,
+};
+
+static struct
+{
+ const char *name;
+ const CFStringRef levelHB_VT_H264_PROFILE_NB;
+}
+hb_vt_h264_levels =
+{
+ { "auto", { CFSTR("H264_Baseline_AutoLevel"), CFSTR("H264_Main_AutoLevel"), CFSTR("H264_High_AutoLevel"), }, },
+ { "1.3", { CFSTR("H264_Baseline_1_3"), CFSTR("H264_Baseline_1_3"), CFSTR("H264_Baseline_1_3"), }, },
+ { "3.0", { CFSTR("H264_Baseline_3_0"), CFSTR("H264_Main_3_0" ), CFSTR("H264_High_3_0" ), }, },
+ { "3.1", { CFSTR("H264_Baseline_3_1"), CFSTR("H264_Main_3_1" ), CFSTR("H264_High_3_1" ), }, },
+ { "3.2", { CFSTR("H264_Baseline_3_2"), CFSTR("H264_Main_3_2" ), CFSTR("H264_High_3_2" ), }, },
+ { "4.0", { CFSTR("H264_Baseline_4_0"), CFSTR("H264_Main_4_0" ), CFSTR("H264_High_4_0" ), }, },
+ { "4.1", { CFSTR("H264_Baseline_4_1"), CFSTR("H264_Main_4_1" ), CFSTR("H264_High_4_1" ), }, },
+ { "4.2", { CFSTR("H264_Baseline_4_2"), CFSTR("H264_Main_4_2" ), CFSTR("H264_High_4_2" ), }, },
+ { "5.0", { CFSTR("H264_Baseline_5_0"), CFSTR("H264_Main_5_0" ), CFSTR("H264_High_5_0" ), }, },
+ { "5.1", { CFSTR("H264_Baseline_5_1"), CFSTR("H264_Main_5_1" ), CFSTR("H264_High_5_1" ), }, },
+ { "5.2", { CFSTR("H264_Baseline_5_2"), CFSTR("H264_Main_5_2" ), CFSTR("H264_High_5_2" ), }, },
+ { NULL, { NULL, NULL, NULL, }, },
+};
+
+enum
+{
+ HB_VT_H265_PROFILE_MAIN = 0,
+ HB_VT_H265_PROFILE_MAIN_10,
+ HB_VT_H265_PROFILE_NB,
+};
+
+static struct
+{
+ const char *name;
+ const CFStringRef levelHB_VT_H265_PROFILE_NB;
+}
+hb_vt_h265_levels =
+{
+ { "auto", { CFSTR("HEVC_Main_AutoLevel"), CFSTR("HEVC_Main10_AutoLevel") }, }
+};
+
+/*
+ * see comments in definition of 'frame_info' in pv struct for description
+ * of what these routines are doing.
+ */
+static void save_frame_info(hb_work_private_t *pv, hb_buffer_t *in)
+{
+ int i = pv->frameno_in & FRAME_INFO_MASK;
+ pv->frame_infoi.start = in->s.start;
+}
+
+static int64_t get_frame_start(hb_work_private_t * pv, int64_t frameno)
+{
+ int i = frameno & FRAME_INFO_MASK;
+ return pv->frame_infoi.start;
+}
+
+static void compute_dts_offset(hb_work_private_t *pv, hb_buffer_t *buf)
+{
+ if (pv->job->areBframes)
+ {
+ if ((pv->frameno_in) == pv->job->areBframes)
+ {
+ pv->dts_delay = buf->s.start;
+ pv->job->config.init_delay = pv->dts_delay;
+ }
+ }
+}
+
+static CFStringRef hb_vt_colr_pri_xlat(int color_prim)
+{
+ switch (color_prim)
+ {
+ case HB_COLR_PRI_BT2020:
+ return kCMFormatDescriptionColorPrimaries_ITU_R_2020;
+ case HB_COLR_PRI_BT709:
+ return kCMFormatDescriptionColorPrimaries_ITU_R_709_2;
+ case HB_COLR_PRI_EBUTECH:
+ return kCMFormatDescriptionColorPrimaries_EBU_3213;
+ case HB_COLR_PRI_SMPTEC:
+ return kCMFormatDescriptionColorPrimaries_SMPTE_C;
+ default:
+ return NULL;
+ }
+}
+
+static CFStringRef hb_vt_colr_tra_xlat(int color_transfer)
+{
+ switch (color_transfer)
+ {
+ case HB_COLR_TRA_BT709:
+ return kCMFormatDescriptionTransferFunction_ITU_R_709_2;
+ case HB_COLR_TRA_SMPTE240M:
+ return kCMFormatDescriptionTransferFunction_SMPTE_240M_1995;
+ case HB_COLR_TRA_SMPTEST2084:
+ return kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
+ case HB_COLR_TRA_LINEAR:
+ if (__builtin_available(macOS 10.14, *)) { return kCVImageBufferTransferFunction_Linear; }
+ case HB_COLR_TRA_ARIB_STD_B67:
+ return kCVImageBufferTransferFunction_ITU_R_2100_HLG;
+ case HB_COLR_TRA_GAMMA22:
+ return kCVImageBufferTransferFunction_UseGamma;
+ case HB_COLR_TRA_GAMMA28:
+ return kCVImageBufferTransferFunction_UseGamma;
+ case HB_COLR_TRA_BT2020_10:
+ case HB_COLR_TRA_BT2020_12:
+ return kCVImageBufferTransferFunction_ITU_R_2020;
+ default:
+ return NULL;
+ }
+}
+
+static CFNumberRef hb_vt_colr_gamma_xlat(int color_transfer)
+{
+ Float32 gamma = 0;
+ switch (color_transfer)
+ {
+ case HB_COLR_TRA_GAMMA22:
+ gamma = 2.2;
+ case HB_COLR_TRA_GAMMA28:
+ gamma = 2.8;
+ }
+
+ return gamma > 0 ? CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma) : NULL;
+}
+
+static CFStringRef hb_vt_colr_mat_xlat(int color_matrix)
+{
+ switch (color_matrix)
+ {
+ case HB_COLR_MAT_BT2020_NCL:
+ return kCMFormatDescriptionYCbCrMatrix_ITU_R_2020;
+ case HB_COLR_MAT_BT709:
+ return kCMFormatDescriptionYCbCrMatrix_ITU_R_709_2;
+ case HB_COLR_MAT_SMPTE170M:
+ return kCMFormatDescriptionYCbCrMatrix_ITU_R_601_4;
+ case HB_COLR_MAT_SMPTE240M:
+ return kCMFormatDescriptionYCbCrMatrix_SMPTE_240M_1995;
+ default:
+ return NULL;
+ }
+}
+
+static CFStringRef hb_vt_chroma_loc_xlat(int chroma_location)
+{
+ switch (chroma_location)
+ {
+ case AVCHROMA_LOC_LEFT:
+ return kCVImageBufferChromaLocation_Left;
+ case AVCHROMA_LOC_CENTER:
+ return kCVImageBufferChromaLocation_Center;
+ case AVCHROMA_LOC_TOPLEFT:
+ return kCVImageBufferChromaLocation_TopLeft;
+ case AVCHROMA_LOC_TOP:
+ return kCVImageBufferChromaLocation_Top;
+ case AVCHROMA_LOC_BOTTOMLEFT:
+ return kCVImageBufferChromaLocation_BottomLeft;
+ case AVCHROMA_LOC_BOTTOM:
+ return kCVImageBufferChromaLocation_Bottom;
+ default:
+ return NULL;
+ }
+}
+
+static void hb_vt_add_color_tag(CVPixelBufferRef pxbuffer, hb_job_t *job)
+{
+ CFStringRef prim = hb_vt_colr_pri_xlat(job->color_prim);
+ CFStringRef transfer = hb_vt_colr_tra_xlat(job->color_transfer);
+ CFNumberRef gamma = hb_vt_colr_gamma_xlat(job->color_transfer);
+ CFStringRef matrix = hb_vt_colr_mat_xlat(job->color_matrix);
+ CFStringRef chroma_loc = hb_vt_chroma_loc_xlat(job->chroma_location);
+
+ if (prim)
+ {
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferColorPrimariesKey, prim, kCVAttachmentMode_ShouldPropagate);
+ }
+ if (transfer)
+ {
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferTransferFunctionKey, transfer, kCVAttachmentMode_ShouldPropagate);
+ }
+ if (gamma)
+ {
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferGammaLevelKey, gamma, kCVAttachmentMode_ShouldPropagate);
+ CFRelease(gamma);
+ }
+ if (matrix)
+ {
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferYCbCrMatrixKey, matrix, kCVAttachmentMode_ShouldPropagate);
+ }
+ if (chroma_loc)
+ {
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferChromaLocationTopFieldKey, chroma_loc, kCVAttachmentMode_ShouldPropagate);
+ CVBufferSetAttachment(pxbuffer, kCVImageBufferChromaLocationBottomFieldKey, chroma_loc, kCVAttachmentMode_ShouldPropagate);
+ }
+}
+
+static inline int64_t rescale(hb_rational_t q, int b)
+{
+ return av_rescale(q.num, b, q.den);
+}
+
+static CFDataRef hb_vt_mastering_display_xlat(hb_mastering_display_metadata_t mastering)
+{
+ CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 24);
+
+ const int chromaDen = 50000;
+ const int lumaDen = 10000;
+
+ uint16_t display_primaries_gx = CFSwapInt16HostToBig(rescale(mastering.display_primaries10, chromaDen));
+ uint16_t display_primaries_gy = CFSwapInt16HostToBig(rescale(mastering.display_primaries11, chromaDen));
+ uint16_t display_primaries_bx = CFSwapInt16HostToBig(rescale(mastering.display_primaries20, chromaDen));
+ uint16_t display_primaries_by = CFSwapInt16HostToBig(rescale(mastering.display_primaries21, chromaDen));
+ uint16_t display_primaries_rx = CFSwapInt16HostToBig(rescale(mastering.display_primaries00, chromaDen));
+ uint16_t display_primaries_ry = CFSwapInt16HostToBig(rescale(mastering.display_primaries01, chromaDen));
+
+ uint16_t white_point_x = CFSwapInt16HostToBig(rescale(mastering.white_point0, chromaDen));
+ uint16_t white_point_y = CFSwapInt16HostToBig(rescale(mastering.white_point1, chromaDen));
+
+ uint32_t max_display_mastering_luminance = CFSwapInt32HostToBig(rescale(mastering.max_luminance, lumaDen));
+ uint32_t min_display_mastering_luminance = CFSwapInt32HostToBig(rescale(mastering.min_luminance, lumaDen));
+
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_gx, 2);
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_gy, 2);
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_bx, 2);
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_by, 2);
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_rx, 2);
+ CFDataAppendBytes(data, (UInt8 *)&display_primaries_ry, 2);
+
+ CFDataAppendBytes(data, (UInt8 *)&white_point_x, 2);
+ CFDataAppendBytes(data, (UInt8 *)&white_point_y, 2);
+
+ CFDataAppendBytes(data, (UInt8 *)&max_display_mastering_luminance, 4);
+ CFDataAppendBytes(data, (UInt8 *)&min_display_mastering_luminance, 4);
+
+ return data;
+}
+
+static CFDataRef hb_vt_content_light_level_xlat(hb_content_light_metadata_t coll)
+{
+ CFMutableDataRef data = CFDataCreateMutable(kCFAllocatorDefault, 4);
+
+ uint16_t MaxCLL = CFSwapInt16HostToBig(coll.max_cll);
+ uint16_t MaxFALL = CFSwapInt16HostToBig(coll.max_fall);
+
+ CFDataAppendBytes(data, (UInt8 *)&MaxCLL, 2);
+ CFDataAppendBytes(data, (UInt8 *)&MaxFALL, 2);
+
+ return data;
+}
+
+static OSType hb_vt_get_cv_pixel_format(hb_job_t* job)
+{
+ if (job->output_pix_fmt == AV_PIX_FMT_NV12)
+ {
+ return job->color_range == AVCOL_RANGE_JPEG ?
+ kCVPixelFormatType_420YpCbCr8BiPlanarFullRange :
+ kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
+ }
+ else if (job->output_pix_fmt == AV_PIX_FMT_YUV420P)
+ {
+ return job->output_pix_fmt == AVCOL_RANGE_JPEG ?
+ kCVPixelFormatType_420YpCbCr8PlanarFullRange :
+ kCVPixelFormatType_420YpCbCr8Planar;
+ }
+ else if (job->output_pix_fmt == AV_PIX_FMT_BGRA)
+ {
+ return kCVPixelFormatType_32BGRA;
+ }
+ else if (job->output_pix_fmt == AV_PIX_FMT_P010LE)
+ {
+ return job->output_pix_fmt == AVCOL_RANGE_JPEG ?
+ kCVPixelFormatType_420YpCbCr10BiPlanarFullRange :
+ kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+static int hb_vt_settings_xlat(hb_work_private_t *pv, hb_job_t *job)
+{
+ /* Set global default values. */
+ hb_vt_param_default(&pv->settings);
+
+ pv->settings.codec = job->vcodec == HB_VCODEC_VT_H264 ? kCMVideoCodecType_H264 : kCMVideoCodecType_HEVC;
+ pv->settings.pixelFormat = hb_vt_get_cv_pixel_format(job);
+ pv->settings.timescale = 90000;
+
+ // set the preset
+ if (job->encoder_preset != NULL && *job->encoder_preset != '\0')
+ {
+ if (!strcasecmp(job->encoder_profile, "speed"))
+ {
+ pv->settings.prioritizeEncodingSpeedOverQuality = kCFBooleanTrue;
+ }
+ }
+
+ // set the profile and level before initializing the session
+ if (job->encoder_profile != NULL && *job->encoder_profile != '\0')
+ {
+ if (job->vcodec == HB_VCODEC_VT_H264)
+ {
+ if (!strcasecmp(job->encoder_profile, "baseline"))
+ {
+ pv->settings.profile = HB_VT_H264_PROFILE_BASELINE;
+ }
+ else if (!strcasecmp(job->encoder_profile, "main") ||
+ !strcasecmp(job->encoder_profile, "auto"))
+ {
+ pv->settings.profile = HB_VT_H264_PROFILE_MAIN;
+ }
+ else if (!strcasecmp(job->encoder_profile, "high"))
+ {
+ pv->settings.profile = HB_VT_H264_PROFILE_HIGH;
+ }
+ else
+ {
+ hb_error("encvt_Init: invalid profile '%s'", job->encoder_profile);
+ return -1;
+ }
+ }
+ else if (job->vcodec == HB_VCODEC_VT_H265)
+ {
+ if (!strcasecmp(job->encoder_profile, "main") ||
+ !strcasecmp(job->encoder_profile, "auto"))
+ {
+ pv->settings.profile = HB_VT_H265_PROFILE_MAIN;
+ }
+ else
+ {
+ hb_error("encvt_Init: invalid profile '%s'", job->encoder_profile);
+ return -1;
+ }
+ }
+ else if (job->vcodec == HB_VCODEC_VT_H265_10BIT)
+ {
+ if (!strcasecmp(job->encoder_profile, "main") ||
+ !strcasecmp(job->encoder_profile, "auto"))
+ {
+ pv->settings.profile = HB_VT_H265_PROFILE_MAIN_10;
+ }
+ else
+ {
+ hb_error("encvt_Init: invalid profile '%s'", job->encoder_profile);
+ return -1;
+ }
+ }
+ }
+ else
+ {
+ if (job->vcodec == HB_VCODEC_VT_H264)
+ {
+ pv->settings.profile = HB_VT_H264_PROFILE_HIGH;
+ }
+ else if (job->vcodec == HB_VCODEC_VT_H265)
+ {
+ pv->settings.profile = HB_VT_H265_PROFILE_MAIN;
+ }
+ else if (job->vcodec == HB_VCODEC_VT_H265_10BIT)
+ {
+ pv->settings.profile = HB_VT_H265_PROFILE_MAIN_10;
+ }
+ }
+
+ if (job->encoder_level != NULL && *job->encoder_level != '\0' && job->vcodec == HB_VCODEC_VT_H264)
+ {
+ int i;
+ for (i = 0; hb_vt_h264_levelsi.name != NULL; i++)
+ {
+ if (!strcasecmp(job->encoder_level, hb_vt_h264_levelsi.name))
+ {
+ pv->settings.profileLevel = hb_vt_h264_levelsi.levelpv->settings.profile;
+ break;
+ }
+ }
+ if (hb_vt_h264_levelsi.name == NULL)
+ {
+ hb_error("encvt_Init: invalid level '%s'", job->encoder_level);
+ *job->die = 1;
+ return -1;
+ }
+ }
+ else
+ {
+ if (job->vcodec == HB_VCODEC_VT_H264)
+ {
+ pv->settings.profileLevel = hb_vt_h264_levels0.levelpv->settings.profile;
+ }
+ else if (job->vcodec == HB_VCODEC_VT_H265 || job->vcodec == HB_VCODEC_VT_H265_10BIT)
+ {
+ pv->settings.profileLevel = hb_vt_h265_levels0.levelpv->settings.profile;
+ }
+ }
+
+ /* Compute the frame rate and output bit rate. */
+ pv->settings.expectedFrameRate = (double)job->vrate.num / (double)job->vrate.den;
+
+ if (job->vquality > HB_INVALID_VIDEO_QUALITY)
+ {
+ pv->settings.quality = job->vquality / 100;
+ hb_log("encvt_Init: encoding with constant quality %f",
+ pv->settings.quality * 100);
+ }
+ else if (job->vbitrate > 0)
+ {
+ pv->settings.averageBitRate = job->vbitrate * 1000;
+ hb_log("encvt_Init: encoding with output bitrate %d Kbps",
+ pv->settings.averageBitRate / 1000);
+ }
+ else
+ {
+ hb_error("encvt_Init: invalid rate control (bitrate %d, quality %f)",
+ job->vbitrate, job->vquality);
+ }
+
+ int fps = pv->settings.expectedFrameRate + 0.5;
+ pv->settings.width = job->width;
+ pv->settings.height = job->height;
+ pv->settings.par.num = job->par.num;
+ pv->settings.par.den = job->par.den;
+ pv->settings.maxKeyFrameInterval = fps * 10 + 1;
+
+ pv->settings.color.prim = hb_output_color_prim(job);
+ pv->settings.color.transfer = hb_output_color_transfer(job);
+ pv->settings.color.matrix = hb_output_color_matrix(job);
+ pv->settings.color.chromaLocation = job->chroma_location;
+
+ /* HDR10 Static metadata */
+ if (job->color_transfer == HB_COLR_TRA_SMPTEST2084)
+ {
+ /* Mastering display metadata */
+ if (job->mastering.has_primaries && job->mastering.has_luminance)
+ {
+ pv->settings.color.masteringDisplay = hb_vt_mastering_display_xlat(job->mastering);
+ }
+
+ /* Content light level */
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ pv->settings.color.contentLightLevel = hb_vt_content_light_level_xlat(job->coll);
+ }
+ }
+
+ return 0;
+}
+
+static int hb_vt_parse_options(hb_work_private_t *pv, hb_job_t *job)
+{
+ hb_dict_t *opts = NULL;
+ if (job->encoder_options != NULL && *job->encoder_options)
+ {
+ opts = hb_encopts_to_dict(job->encoder_options, job->vcodec);
+ }
+
+ hb_dict_iter_t iter;
+ for (iter = hb_dict_iter_init(opts);
+ iter != HB_DICT_ITER_DONE;
+ iter = hb_dict_iter_next(opts, iter))
+ {
+ const char *key = hb_dict_iter_key(iter);
+ hb_value_t *value = hb_dict_iter_value(iter);
+
+ if (!strcmp(key, "keyint"))
+ {
+ int keyint = hb_value_get_int(value);
+ if (keyint >= 0)
+ {
+ pv->settings.maxKeyFrameInterval = keyint;
+ }
+ }
+ else if (!strcmp(key, "bframes"))
+ {
+ int enabled = hb_value_get_bool(value);
+ pv->settings.allowFrameReordering = enabled ? kCFBooleanTrue : kCFBooleanFalse;
+ }
+ else if (!strcmp(key, "cabac"))
+ {
+ int enabled = hb_value_get_bool(value);
+ pv->settings.h264.entropyMode = enabled ? kVTH264EntropyMode_CABAC : kVTH264EntropyMode_CAVLC;
+ }
+ else if (!strcmp(key, "vbv-bufsize"))
+ {
+ int bufsize = hb_value_get_int(value);
+ if (bufsize > 0)
+ {
+ pv->settings.vbv.bufsize = bufsize;
+ }
+ }
+ else if (!strcmp(key, "vbv-maxrate"))
+ {
+ int maxrate = hb_value_get_int(value);
+ if (maxrate > 0)
+ {
+ pv->settings.vbv.maxrate = maxrate;
+ }
+ }
+ else if (!strcmp(key, "slice-max-size"))
+ {
+ int slice_max_size = hb_value_get_bool(value);
+ if (slice_max_size > 0)
+ {
+ pv->settings.h264.maxSliceBytes = slice_max_size;
+ }
+ }
+ else if (!strcmp(key, "max-frame-delay"))
+ {
+ int maxdelay = hb_value_get_bool(value);
+ if (maxdelay > 0)
+ {
+ pv->settings.maxFrameDelayCount = maxdelay;
+ }
+ }
+ else if (!strcmp(key, "gpu-registryid"))
+ {
+ uint64_t registryID = hb_value_get_int(value);
+ if (registryID > 0)
+ {
+ pv->settings.registryID = registryID;
+ }
+ }
+
+ }
+ hb_dict_free(&opts);
+
+ /* Sanitize interframe settings */
+ switch (pv->settings.maxKeyFrameInterval)
+ {
+ case 1:
+ pv->settings.allowTemporalCompression = kCFBooleanFalse;
+ case 2:
+ pv->settings.allowFrameReordering = kCFBooleanFalse;
+ default:
+ break;
+ }
+ switch (pv->settings.maxFrameDelayCount)
+ {
+ case 0:
+ pv->settings.allowTemporalCompression = kCFBooleanFalse;
+ case 1:
+ pv->settings.allowFrameReordering = kCFBooleanFalse;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
+void pixelBufferReleasePlanarBytesCallback(
+ void *releaseRefCon,
+ const void *dataPtr,
+ size_t dataSize,
+ size_t numberOfPlanes,
+ const void *planeAddresses)
+{
+ hb_buffer_t *buf = (hb_buffer_t *)releaseRefCon;
+ hb_buffer_close(&buf);
+}
+
+static OSStatus wrap_buf(hb_work_private_t *pv, hb_buffer_t *buf, CVPixelBufferRef *pix_buf)
+{
+ OSStatus err;
+ int numberOfPlanes = pv->settings.pixelFormat == kCVPixelFormatType_420YpCbCr8Planar ||
+ pv->settings.pixelFormat == kCVPixelFormatType_420YpCbCr8PlanarFullRange ? 3 : 2;
+
+ void *planeBaseAddress3 = {buf->plane0.data, buf->plane1.data, buf->plane2.data};
+ size_t planeWidth3 = {buf->plane0.width, buf->plane1.width, buf->plane2.width};
+ size_t planeHeight3 = {buf->plane0.height, buf->plane1.height, buf->plane2.height};
+ size_t planeBytesPerRow3 = {buf->plane0.stride, buf->plane1.stride, buf->plane2.stride};
+
+ err = CVPixelBufferCreateWithPlanarBytes(
+ kCFAllocatorDefault,
+ buf->f.width,
+ buf->f.height,
+ pv->settings.pixelFormat,
+ buf->data,
+ 0,
+ numberOfPlanes,
+ planeBaseAddress,
+ planeWidth,
+ planeHeight,
+ planeBytesPerRow,
+ &pixelBufferReleasePlanarBytesCallback,
+ buf,
+ NULL,
+ pix_buf);
+
+ hb_vt_add_color_tag(*pix_buf, pv->job);
+
+ return err;
+}
+
+void hb_vt_compression_output_callback(
+ void *outputCallbackRefCon,
+ void *sourceFrameRefCon,
+ OSStatus status,
+ VTEncodeInfoFlags infoFlags,
+ CMSampleBufferRef sampleBuffer)
+{
+ OSStatus err;
+
+ if (sourceFrameRefCon)
+ {
+ CVPixelBufferRef pixelbuffer = sourceFrameRefCon;
+ CVPixelBufferRelease(pixelbuffer);
+ }
+
+ if (status != noErr)
+ {
+ hb_log("VTCompressionSession: hb_vt_compression_output_callback called error");
+ }
+ else
+ {
+ CFRetain(sampleBuffer);
+ CMSimpleQueueRef queue = outputCallbackRefCon;
+ err = CMSimpleQueueEnqueue(queue, sampleBuffer);
+ if (err)
+ {
+ hb_log("VTCompressionSession: hb_vt_compression_output_callback queue full");
+ }
+ }
+}
+
+static OSStatus init_vtsession(hb_work_object_t *w, hb_job_t *job, hb_work_private_t *pv, int cookieOnly)
+{
+ OSStatus err = noErr;
+ CFNumberRef cfValue = NULL;
+
+ CFMutableDictionaryRef encoderSpecifications = CFDictionaryCreateMutable(
+ kCFAllocatorDefault,
+ 2,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
+
+ CFDictionaryAddValue(encoderSpecifications, kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder, kCFBooleanTrue);
+
+ if (pv->settings.registryID > 0)
+ {
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType,
+ &pv->settings.registryID);
+ if (__builtin_available(macOS 10.14, *))
+ {
+ CFDictionaryAddValue(encoderSpecifications, kVTVideoEncoderSpecification_RequiredEncoderGPURegistryID, cfValue);
+ }
+ CFRelease(cfValue);
+ }
+
+ CMSimpleQueueCreate(kCFAllocatorDefault, 200, &pv->queue);
+
+ err = VTCompressionSessionCreate(
+ kCFAllocatorDefault,
+ pv->settings.width,
+ pv->settings.height,
+ pv->settings.codec,
+ encoderSpecifications,
+ NULL,
+ NULL,
+ &hb_vt_compression_output_callback,
+ pv->queue,
+ &pv->session);
+
+ if (err != noErr)
+ {
+ hb_log("Error creating a VTCompressionSession err=%"PRId64"", (int64_t)err);
+ CFRelease(encoderSpecifications);
+ return err;
+ }
+
+ // Print the actual encoderID
+ if (cookieOnly == 0)
+ {
+ CFStringRef encoderID;
+ err = VTSessionCopyProperty(pv->session,
+ kVTCompressionPropertyKey_EncoderID,
+ kCFAllocatorDefault,
+ &encoderID);
+
+ if (err == noErr)
+ {
+ static const int VAL_BUF_LEN = 256;
+ char valBufVAL_BUF_LEN;
+
+ Boolean haveStr = CFStringGetCString(encoderID,
+ valBuf,
+ VAL_BUF_LEN,
+ kCFStringEncodingUTF8);
+ if (haveStr)
+ {
+ hb_log("encvt_Init: %s", valBuf);
+ }
+ CFRelease(encoderID);
+ }
+ }
+
+ CFDictionaryRef supportedProps = NULL;
+ err = VTCopySupportedPropertyDictionaryForEncoder(pv->settings.width,
+ pv->settings.height,
+ pv->settings.codec,
+ encoderSpecifications,
+ NULL,
+ &supportedProps);
+
+ if (err != noErr)
+ {
+ hb_log("Error retrieving the supported property dictionary err=%"PRId64"", (int64_t)err);
+ CFRelease(encoderSpecifications);
+ return err;
+ }
+
+ CFRelease(encoderSpecifications);
+
+ // Offline encoders (such as Handbrake) should set RealTime property to False, as it disconnects the relationship
+ // between encoder speed and target video frame rate, explicitly setting RealTime to false encourages VideoToolbox
+ // to use the fastest mode, while adhering to the required output quality/bitrate and favorQualityOverSpeed settings
+ err = VTSessionSetProperty(pv->session, kVTCompressionPropertyKey_RealTime , kCFBooleanFalse);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_RealTime failed");
+ }
+
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_AllowFrameReordering,
+ pv->settings.allowFrameReordering);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_AllowFrameReordering failed");
+ }
+
+ if (__builtin_available(macOS 11, *))
+ {
+ if (CFDictionaryContainsKey(supportedProps, kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality))
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality,
+ pv->settings.prioritizeEncodingSpeedOverQuality);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality failed");
+ }
+ }
+ }
+
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
+ &pv->settings.maxKeyFrameInterval);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_MaxKeyFrameInterval,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_MaxKeyFrameInterval failed");
+ }
+
+ if (pv->settings.maxFrameDelayCount >= 0)
+ {
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
+ &pv->settings.maxFrameDelayCount);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_MaxFrameDelayCount,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_MaxFrameDelayCount failed");
+ }
+ }
+
+ if (pv->settings.vbv.maxrate > 0 &&
+ pv->settings.vbv.bufsize > 0)
+ {
+ float seconds = ((float)pv->settings.vbv.bufsize /
+ (float)pv->settings.vbv.maxrate);
+ int bytes = pv->settings.vbv.maxrate * 125 * seconds;
+ CFNumberRef size = CFNumberCreate(kCFAllocatorDefault,
+ kCFNumberIntType, &bytes);
+ CFNumberRef duration = CFNumberCreate(kCFAllocatorDefault,
+ kCFNumberFloatType, &seconds);
+ CFMutableArrayRef dataRateLimits = CFArrayCreateMutable(kCFAllocatorDefault, 2,
+ &kCFTypeArrayCallBacks);
+ CFArrayAppendValue(dataRateLimits, size);
+ CFArrayAppendValue(dataRateLimits, duration);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_DataRateLimits,
+ dataRateLimits);
+ CFRelease(size);
+ CFRelease(duration);
+ CFRelease(dataRateLimits);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_DataRateLimits failed");
+ }
+ }
+
+ if (pv->settings.fieldDetail != HB_VT_FIELDORDER_PROGRESSIVE)
+ {
+ int count = 2;
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &count);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_FieldCount,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_FieldCount failed");
+ }
+
+ CFStringRef cfStringValue = NULL;
+
+ switch (pv->settings.fieldDetail)
+ {
+ case HB_VT_FIELDORDER_BFF:
+ cfStringValue = kCMFormatDescriptionFieldDetail_TemporalBottomFirst;
+ break;
+ case HB_VT_FIELDORDER_TFF:
+ default:
+ cfStringValue = kCMFormatDescriptionFieldDetail_TemporalTopFirst;
+ break;
+ }
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_FieldDetail,
+ cfStringValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_FieldDetail failed");
+ }
+ }
+
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_ColorPrimaries,
+ hb_vt_colr_pri_xlat(pv->settings.color.prim));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_ColorPrimaries failed");
+ }
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_TransferFunction,
+ hb_vt_colr_tra_xlat(pv->settings.color.transfer));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_TransferFunction failed");
+ }
+ err = VTSessionSetProperty(pv->session,
+ CFSTR("GammaLevel"),
+ hb_vt_colr_gamma_xlat(pv->settings.color.transfer));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: GammaLevel failed");
+ }
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_YCbCrMatrix,
+ hb_vt_colr_mat_xlat(pv->settings.color.matrix));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_YCbCrMatrix failed");
+ }
+ err = VTSessionSetProperty(pv->session,
+ CFSTR("ChromaLocationTopField"),
+ hb_vt_chroma_loc_xlat(pv->settings.color.chromaLocation));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: ChromaLocationTopField failed");
+ }
+ err = VTSessionSetProperty(pv->session,
+ CFSTR("ChromaLocationBottomField"),
+ hb_vt_chroma_loc_xlat(pv->settings.color.chromaLocation));
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: ChromaLocationBottomField failed");
+ }
+
+ if (CFDictionaryContainsKey(supportedProps, kVTCompressionPropertyKey_MasteringDisplayColorVolume) &&
+ pv->settings.color.masteringDisplay != NULL)
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_MasteringDisplayColorVolume,
+ pv->settings.color.masteringDisplay);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_MasteringDisplayColorVolume failed");
+ }
+ }
+
+ if (CFDictionaryContainsKey(supportedProps, kVTCompressionPropertyKey_MasteringDisplayColorVolume) &&
+ pv->settings.color.contentLightLevel != NULL)
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_ContentLightLevelInfo,
+ pv->settings.color.contentLightLevel);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_ContentLightLevelInfo failed");
+ }
+ }
+
+ if (__builtin_available(macOS 11.0, *))
+ {
+ if (CFDictionaryContainsKey(supportedProps, kVTCompressionPropertyKey_HDRMetadataInsertionMode) &&
+ (pv->settings.color.masteringDisplay != NULL || pv->settings.color.contentLightLevel != NULL))
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_HDRMetadataInsertionMode,
+ kVTHDRMetadataInsertionMode_Auto);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_HDRMetadataInsertionMode failed");
+ }
+ }
+ }
+
+ CFNumberRef parNum = CFNumberCreate(kCFAllocatorDefault,
+ kCFNumberSInt32Type,
+ &pv->settings.par.num);
+ CFNumberRef parDen = CFNumberCreate(kCFAllocatorDefault,
+ kCFNumberSInt32Type,
+ &pv->settings.par.den);
+ CFMutableDictionaryRef pixelAspectRatio = CFDictionaryCreateMutable(kCFAllocatorDefault, 2,
+ &kCFTypeDictionaryKeyCallBacks,
+ &kCFTypeDictionaryValueCallBacks);
+ CFDictionaryAddValue(pixelAspectRatio,
+ kCMFormatDescriptionKey_PixelAspectRatioHorizontalSpacing,
+ parNum);
+ CFDictionaryAddValue(pixelAspectRatio,
+ kCMFormatDescriptionKey_PixelAspectRatioVerticalSpacing,
+ parDen);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_PixelAspectRatio,
+ pixelAspectRatio);
+ CFRelease(parNum);
+ CFRelease(parDen);
+ CFRelease(pixelAspectRatio);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_PixelAspectRatio failed");
+ }
+
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType,
+ &pv->settings.expectedFrameRate);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_ExpectedFrameRate,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_ExpectedFrameRate failed");
+ }
+
+ if (pv->settings.quality > -1)
+ {
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType,
+ &pv->settings.quality);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_Quality,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_Quality failed");
+ }
+ }
+ else
+ {
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
+ &pv->settings.averageBitRate);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_AverageBitRate,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_AverageBitRate failed");
+ }
+
+ }
+
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_ProfileLevel,
+ pv->settings.profileLevel);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_ProfileLevel failed");
+ }
+
+ if (pv->settings.codec == kCMVideoCodecType_H264)
+ {
+ if (pv->settings.h264.entropyMode)
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_H264EntropyMode,
+ pv->settings.h264.entropyMode);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_H264EntropyMode failed");
+ }
+ }
+ if (pv->settings.h264.maxSliceBytes)
+ {
+ cfValue = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType,
+ &pv->settings.h264.maxSliceBytes);
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_MaxH264SliceBytes,
+ cfValue);
+ CFRelease(cfValue);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_MaxH264SliceBytes failed");
+ }
+ }
+ }
+
+ if (supportedProps)
+ {
+ CFRelease(supportedProps);
+ }
+
+ // Multi-pass
+ if (job->pass_id == HB_PASS_ENCODE_1ST && cookieOnly == 0)
+ {
+ const char *filename = hb_get_temporary_filename("videotoolbox.log");
+
+ CFStringRef path = CFStringCreateWithCString(kCFAllocatorDefault, filename, kCFStringEncodingUTF8);
+ CFURLRef url = CFURLCreateWithFileSystemPath(NULL, path, kCFURLPOSIXPathStyle, FALSE);
+ err = VTMultiPassStorageCreate(kCFAllocatorDefault, url, kCMTimeRangeInvalid, NULL, &pv->passStorage);
+
+ if (err != noErr)
+ {
+ return err;
+ }
+ else
+ {
+ err = VTSessionSetProperty(pv->session,
+ kVTCompressionPropertyKey_MultiPassStorage,
+ pv->passStorage);
+ if (err != noErr)
+ {
+ hb_log("VTSessionSetProperty: kVTCompressionPropertyKey_MultiPassStorage failed");
+ }
+
+ err = VTCompressionSessionBeginPass(pv->session, 0, 0);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSessionBeginPass failed");
+ }
+ }
+
+ CFRelease(path);
+ CFRelease(url);
+ }
+
+ err = VTCompressionSessionPrepareToEncodeFrames(pv->session);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSessionPrepareToEncodeFrames failed");
+ return err;
+ }
+
+ CFBooleanRef allowFrameReordering;
+ err = VTSessionCopyProperty(pv->session,
+ kVTCompressionPropertyKey_AllowFrameReordering,
+ kCFAllocatorDefault,
+ &allowFrameReordering);
+ if (err != noErr)
+ {
+ hb_log("VTSessionCopyProperty: kVTCompressionPropertyKey_AllowFrameReordering failed");
+ }
+ else
+ {
+ if (CFBooleanGetValue(allowFrameReordering))
+ {
+ job->areBframes = job->vcodec == HB_VCODEC_VT_H265 || job->vcodec == HB_VCODEC_VT_H265_10BIT ? 2 : 1;
+ }
+ CFRelease(allowFrameReordering);
+ }
+
+ return err;
+}
+
+static void set_h264_cookie(hb_work_object_t *w, CMFormatDescriptionRef format)
+{
+ CFDictionaryRef extentions = CMFormatDescriptionGetExtensions(format);
+ if (!extentions)
+ {
+ hb_log("VTCompressionSession: Format Description Extensions error");
+ }
+ else
+ {
+ CFDictionaryRef atoms = CFDictionaryGetValue(extentions, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms);
+ CFDataRef magicCookie = CFDictionaryGetValue(atoms, CFSTR("avcC"));
+
+ const uint8_t *avcCAtom = CFDataGetBytePtr(magicCookie);
+
+ SInt64 i;
+ int8_t spsCount = (avcCAtom5 & 0x1f);
+ uint8_t ptrPos = 6;
+ uint8_t spsPos = 0;
+ for (i = 0; i < spsCount; i++) {
+ uint16_t spsSize = (avcCAtomptrPos++ << 8) & 0xff00;
+ spsSize += avcCAtomptrPos++ & 0xff;
+ memcpy(w->config->h264.sps + spsPos, avcCAtom+ptrPos, spsSize);;
+ ptrPos += spsSize;
+ spsPos += spsSize;
+ }
+ w->config->h264.sps_length = spsPos;
+
+ int8_t ppsCount = avcCAtomptrPos++;
+ uint8_t ppsPos = 0;
+ for (i = 0; i < ppsCount; i++)
+ {
+ uint16_t ppsSize = (avcCAtomptrPos++ << 8) & 0xff00;
+ ppsSize += avcCAtomptrPos++ & 0xff;
+ memcpy(w->config->h264.pps + ppsPos, avcCAtom+ptrPos, ppsSize);;
+
+ ptrPos += ppsSize;
+ ppsPos += ppsSize;
+ }
+ w->config->h264.pps_length = ppsPos;
+ }
+}
+
+static void set_h265_cookie(hb_work_object_t *w, CMFormatDescriptionRef format)
+{
+ CFDictionaryRef extensions = CMFormatDescriptionGetExtensions(format);
+ if (!extensions)
+ {
+ hb_log("VTCompressionSession: Format Description Extensions error");
+ }
+ else
+ {
+ CFDictionaryRef atoms = CFDictionaryGetValue(extensions, kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms);
+ CFDataRef magicCookie = CFDictionaryGetValue(atoms, CFSTR("hvcC"));
+ if (!magicCookie)
+ {
+ hb_log("VTCompressionSession: HEVC Magic Cookie error");
+ }
+
+ const uint8_t *hvcCAtom = CFDataGetBytePtr(magicCookie);
+ uint16_t size = CFDataGetLength(magicCookie);
+ memcpy(w->config->h265.headers, hvcCAtom, size);
+ w->config->h265.headers_length = size;
+ }
+}
+
+static OSStatus create_cookie(hb_work_object_t *w, hb_job_t *job, hb_work_private_t *pv)
+{
+ OSStatus err;
+ CVPixelBufferRef pix_buf = NULL;
+ CVPixelBufferPoolRef pool = NULL;
+
+ err = init_vtsession(w, job, pv, 1);
+ if (err != noErr)
+ {
+ return err;
+ }
+
+ pool = VTCompressionSessionGetPixelBufferPool(pv->session);
+
+ if (pool == NULL)
+ {
+ hb_log("VTCompressionSession: VTCompressionSessionGetPixelBufferPool error");
+ }
+
+ err = CVPixelBufferPoolCreatePixelBuffer(NULL, pool, &pix_buf);
+
+ if (kCVReturnSuccess != err)
+ {
+ hb_log("VTCompressionSession: CVPixelBufferPoolCreatePixelBuffer error");
+ }
+
+ CMTime pts = CMTimeMake(0, pv->settings.timescale);
+ CMTime duration = CMTimeMake(pv->settings.timescale, pv->settings.timescale);
+ err = VTCompressionSessionEncodeFrame(
+ pv->session,
+ pix_buf,
+ pts,
+ duration,
+ NULL,
+ NULL,
+ NULL);
+ if (noErr != err)
+ {
+ hb_log("VTCompressionSession: VTCompressionSessionEncodeFrame error");
+ }
+ err = VTCompressionSessionCompleteFrames(pv->session, kCMTimeIndefinite);
+ if (noErr != err)
+ {
+ hb_log("VTCompressionSession: VTCompressionSessionCompleteFrames error");
+ }
+ CMSampleBufferRef sampleBuffer = (CMSampleBufferRef)CMSimpleQueueDequeue(pv->queue);
+
+ if (!sampleBuffer)
+ {
+ hb_log("VTCompressionSession: sampleBuffer == NULL");
+ goto fail;
+ }
+ else
+ {
+ CMFormatDescriptionRef format = CMSampleBufferGetFormatDescription(sampleBuffer);
+ if (!format)
+ {
+ hb_log("VTCompressionSession: Format Description error");
+ }
+ else
+ {
+ pv->format = format;
+ CFRetain(pv->format);
+
+ if (pv->settings.codec == kCMVideoCodecType_H264)
+ {
+ set_h264_cookie(w, format);
+ }
+ else
+ {
+ set_h265_cookie(w, format);
+ }
+ }
+ CFRelease(sampleBuffer);
+ }
+
+fail:
+ CVPixelBufferRelease(pix_buf);
+ VTCompressionSessionInvalidate(pv->session);
+ CFRelease(pv->session);
+ CFRelease(pv->queue);
+ pv->session = NULL;
+ pv->queue = NULL;
+
+ return err;
+}
+
+static OSStatus reuse_vtsession(hb_work_object_t *w, hb_job_t * job, hb_work_private_t *pv)
+{
+ OSStatus err = noErr;
+
+ hb_interjob_t *interjob = hb_interjob_get(job->h);
+ vt_interjob_t *context = interjob->vt_context;
+
+ if (job->vcodec == HB_VCODEC_VT_H264)
+ {
+ set_h264_cookie(w, context->format);
+ }
+ else
+ {
+ set_h265_cookie(w, context->format);
+ }
+
+ pv->queue = context->queue;
+ pv->session = context->session;
+ pv->passStorage = context->passStorage;
+
+ if (err != noErr)
+ {
+ hb_log("Error reusing a VTCompressionSession err=%"PRId64"", (int64_t)err);
+ return err;
+ }
+
+ // This should tell us the time range the encoder thinks it can enhance in the second pass
+ // currently we ignore this, because it would mean storing the frames from the first pass
+ // somewhere on disk.
+ // And it seems the range is always the entire movie duration.
+ err = VTCompressionSessionGetTimeRangesForNextPass(pv->session, &pv->timeRangeCount, &pv->timeRangeArray);
+
+ if (err != noErr)
+ {
+ hb_log("Error beginning a VTCompressionSession final pass err=%"PRId64"", (int64_t)err);
+ return err;
+ }
+
+ err = VTCompressionSessionBeginPass(pv->session, kVTCompressionSessionBeginFinalPass, 0);
+
+ if (err != noErr)
+ {
+ hb_log("Error beginning a VTCompressionSession final pass err=%"PRId64"", (int64_t)err);
+ return err;
+ }
+
+ CFBooleanRef allowFrameReordering;
+ err = VTSessionCopyProperty(pv->session,
+ kVTCompressionPropertyKey_AllowFrameReordering,
+ kCFAllocatorDefault,
+ &allowFrameReordering);
+ if (err != noErr)
+ {
+ hb_log("VTSessionCopyProperty: kVTCompressionPropertyKey_AllowFrameReordering failed");
+ }
+ else
+ {
+ if (CFBooleanGetValue(allowFrameReordering))
+ {
+ job->areBframes = job->vcodec == HB_VCODEC_VT_H265 || job->vcodec == HB_VCODEC_VT_H265_10BIT ? 2 : 1;
+ }
+ CFRelease(allowFrameReordering);
+ }
+
+ interjob->vt_context = NULL;
+ free(context);
+
+ return err;
+}
+
+int encvt_init(hb_work_object_t *w, hb_job_t *job)
+{
+ OSStatus err;
+ hb_work_private_t *pv = calloc(1, sizeof(hb_work_private_t));
+ w->private_data = pv;
+
+ pv->job = job;
+ pv->chapter_queue = hb_chapter_queue_init();
+
+ err = hb_vt_settings_xlat(pv, job);
+ if (err != noErr)
+ {
+ *job->die = 1;
+ return -1;
+ }
+
+ err = hb_vt_parse_options(pv, job);
+ if (err != noErr)
+ {
+ *job->die = 1;
+ return -1;
+ }
+
+ pv->remainingPasses = job->pass_id == HB_PASS_ENCODE_1ST ? 1 : 0;
+
+ if (job->pass_id != HB_PASS_ENCODE_2ND)
+ {
+ err = create_cookie(w, job, pv);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSession: Magic Cookie Error err=%"PRId64"", (int64_t)err);
+ *job->die = 1;
+ return -1;
+ }
+
+ err = init_vtsession(w, job, pv, 0);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSession: Error creating a VTCompressionSession err=%"PRId64"", (int64_t)err);
+ *job->die = 1;
+ return -1;
+ }
+ }
+ else
+ {
+ err = reuse_vtsession(w, job, pv);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSession: Error reusing a VTCompressionSession err=%"PRId64"", (int64_t)err);
+ *job->die = 1;
+ return -1;
+ }
+ }
+
+ return 0;
+}
+
+void encvt_close(hb_work_object_t * w)
+{
+ hb_work_private_t *pv = w->private_data;
+
+ if (pv == NULL)
+ {
+ // Not initialized
+ return;
+ }
+
+ hb_chapter_queue_close(&pv->chapter_queue);
+
+ if (pv->remainingPasses == 0 || *pv->job->die)
+ {
+ if (pv->session)
+ {
+ VTCompressionSessionInvalidate(pv->session);
+ CFRelease(pv->session);
+ }
+ if (pv->passStorage)
+ {
+ VTMultiPassStorageClose(pv->passStorage);
+ CFRelease(pv->passStorage);
+ }
+ if (pv->queue)
+ {
+ CFRelease(pv->queue);
+ }
+ if (pv->format)
+ {
+ CFRelease(pv->format);
+ }
+ }
+
+ if (pv->settings.color.masteringDisplay)
+ {
+ CFRelease(pv->settings.color.masteringDisplay);
+ }
+ if (pv->settings.color.contentLightLevel)
+ {
+ CFRelease(pv->settings.color.contentLightLevel);
+ }
+
+ free(pv);
+ w->private_data = NULL;
+}
+
+static hb_buffer_t * extract_buf(CMSampleBufferRef sampleBuffer, hb_work_object_t *w)
+{
+ OSStatus err;
+ hb_work_private_t *pv = w->private_data;
+ hb_buffer_t *buf = NULL;
+
+ CMItemCount samplesNum = CMSampleBufferGetNumSamples(sampleBuffer);
+ if (samplesNum > 1)
+ {
+ hb_log("VTCompressionSession: more than 1 sample in sampleBuffer = %ld", samplesNum);
+ }
+
+ CMBlockBufferRef buffer = CMSampleBufferGetDataBuffer(sampleBuffer);
+ if (buffer)
+ {
+ size_t sampleSize = CMBlockBufferGetDataLength(buffer);
+ buf = hb_buffer_init(sampleSize);
+
+ err = CMBlockBufferCopyDataBytes(buffer, 0, sampleSize, buf->data);
+
+ if (err != kCMBlockBufferNoErr)
+ {
+ hb_log("VTCompressionSession: CMBlockBufferCopyDataBytes error");
+ }
+
+ buf->s.frametype = HB_FRAME_IDR;
+ buf->s.flags |= HB_FLAG_FRAMETYPE_REF;
+
+ CFArrayRef attachmentsArray = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, 0);
+ if (CFArrayGetCount(attachmentsArray))
+ {
+ CFDictionaryRef dict = CFArrayGetValueAtIndex(attachmentsArray, 0);
+ CFBooleanRef notSync;
+ if (CFDictionaryGetValueIfPresent(dict, kCMSampleAttachmentKey_NotSync,(const void **) &notSync))
+ {
+ Boolean notSyncValue = CFBooleanGetValue(notSync);
+ if (notSyncValue)
+ {
+ CFBooleanRef b;
+ if (CFDictionaryGetValueIfPresent(dict, kCMSampleAttachmentKey_PartialSync, NULL))
+ {
+ buf->s.frametype = HB_FRAME_I;
+ }
+ else if (CFDictionaryGetValueIfPresent(dict, kCMSampleAttachmentKey_IsDependedOnByOthers,(const void **) &b))
+ {
+ Boolean bv = CFBooleanGetValue(b);
+ if (bv)
+ {
+ buf->s.frametype = HB_FRAME_P;
+ }
+ else
+ {
+ buf->s.frametype = HB_FRAME_B;
+ buf->s.flags &= ~HB_FLAG_FRAMETYPE_REF;
+ }
+ }
+ else
+ {
+ buf->s.frametype = HB_FRAME_P;
+ }
+ }
+ }
+ }
+
+ CMTime presentationTimeStamp = CMSampleBufferGetPresentationTimeStamp(sampleBuffer);
+ CMTime duration = CMSampleBufferGetDuration(sampleBuffer);
+
+ buf->s.start = presentationTimeStamp.value;
+ buf->s.stop = presentationTimeStamp.value + buf->s.duration;
+ buf->s.duration = duration.value;
+
+ // Use the cached frame info to get the start time of Nth frame
+ // Note that start Nth frame != start time this buffer since the
+ // output buffers have rearranged start times.
+ if (pv->frameno_out < pv->job->areBframes)
+ {
+ buf->s.renderOffset = get_frame_start(pv, pv->frameno_out) - pv->dts_delay;
+ }
+ else
+ {
+ buf->s.renderOffset = get_frame_start(pv, pv->frameno_out - pv->job->areBframes);
+ }
+ pv->frameno_out++;
+
+ if (buf->s.frametype == HB_FRAME_IDR)
+ {
+ hb_chapter_dequeue(pv->chapter_queue, buf);
+ }
+ }
+
+ return buf;
+}
+
+static hb_buffer_t *vt_encode(hb_work_object_t *w, hb_buffer_t *in)
+{
+ OSStatus err;
+ hb_work_private_t *pv = w->private_data;
+ hb_job_t *job = pv->job;
+
+ // Create a CVPixelBuffer to wrap the frame data
+ CVPixelBufferRef pix_buffer = NULL;
+ err = wrap_buf(pv, in, &pix_buffer);
+
+ if (kCVReturnSuccess != err)
+ {
+ hb_log("VTCompressionSession: CVPixelBuffer error");
+ }
+ else
+ {
+ CFDictionaryRef frameProperties = NULL;
+ if (in->s.new_chap && job->chapter_markers)
+ {
+ // chapters have to start with an IDR frame
+ const void *keys1 = { kVTEncodeFrameOptionKey_ForceKeyFrame };
+ const void *values1 = { kCFBooleanTrue };
+
+ frameProperties = CFDictionaryCreate(NULL, keys, values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+ hb_chapter_enqueue(pv->chapter_queue, in);
+ }
+
+ // VideoToolbox DTS are greater than PTS
+ // So we remember the PTS values and compute DTS ourselves.
+ save_frame_info(pv, in);
+ compute_dts_offset(pv, in);
+ pv->frameno_in++;
+
+ // Send the frame to be encoded
+ err = VTCompressionSessionEncodeFrame(
+ pv->session,
+ pix_buffer,
+ CMTimeMake(in->s.start, pv->settings.timescale),
+ CMTimeMake(in->s.duration, pv->settings.timescale),
+ frameProperties,
+ pix_buffer,
+ NULL);
+
+ if (err)
+ {
+ hb_log("VTCompressionSession: VTCompressionSessionEncodeFrame error");
+ }
+
+ if (frameProperties)
+ {
+ CFRelease(frameProperties);
+ }
+ }
+
+ if (pv->frameno_in <= pv->job->areBframes)
+ {
+ // dts_delay not yet set. queue up buffers till it is set.
+ return NULL;
+ }
+
+ // Return a frame if ready
+ CMSampleBufferRef sampleBuffer = (CMSampleBufferRef)CMSimpleQueueDequeue(pv->queue);
+ hb_buffer_t *buf_out = NULL;
+
+ if (sampleBuffer)
+ {
+ buf_out = extract_buf(sampleBuffer, w);
+ CFRelease(sampleBuffer);
+ }
+
+ return buf_out;
+}
+
+int encvt_work(hb_work_object_t *w, hb_buffer_t **buf_in, hb_buffer_t **buf_out)
+{
+ hb_work_private_t *pv = w->private_data;
+ hb_buffer_t *in = *buf_in;
+
+ if (in->s.flags & HB_BUF_FLAG_EOF)
+ {
+ // EOF on input. Flush any frames still in the decoder then
+ // send the eof downstream to tell the muxer we're done.
+ CMSampleBufferRef sampleBuffer = NULL;
+ hb_buffer_list_t list;
+
+ hb_buffer_list_clear(&list);
+ VTCompressionSessionCompleteFrames(pv->session, kCMTimeIndefinite);
+
+ while ((sampleBuffer = (CMSampleBufferRef) CMSimpleQueueDequeue(pv->queue)))
+ {
+ hb_buffer_t *buf = extract_buf(sampleBuffer, w);
+ CFRelease(sampleBuffer);
+
+ if (buf)
+ {
+ hb_buffer_list_append(&list, buf);
+ }
+ else
+ {
+ break;
+ }
+ }
+
+ // add the EOF to the end of the chain
+ hb_buffer_list_append(&list, in);
+
+ *buf_out = hb_buffer_list_clear(&list);
+ *buf_in = NULL;
+
+ hb_job_t *job = pv->job;
+
+ if (job->pass_id == HB_PASS_ENCODE_1ST)
+ {
+ OSStatus err = noErr;
+ Boolean furtherPassesRequestedOut;
+ err = VTCompressionSessionEndPass(pv->session,
+ &furtherPassesRequestedOut,
+ 0);
+ if (err != noErr)
+ {
+ hb_log("VTCompressionSessionEndPass error");
+ }
+
+ // Save the sessions and the related context
+ // for the next pass.
+ vt_interjob_t *context = (vt_interjob_t *)malloc(sizeof(vt_interjob_t));
+ context->session = pv->session;
+ context->passStorage = pv->passStorage;
+ context->queue = pv->queue;
+ context->format = pv->format;
+
+ hb_interjob_t *interjob = hb_interjob_get(job->h);
+ interjob->vt_context = context;
+ }
+ else if (job->pass_id == HB_PASS_ENCODE_2ND)
+ {
+ VTCompressionSessionEndPass(pv->session,
+ NULL,
+ 0);
+ }
+
+ return HB_WORK_DONE;
+ }
+
+ // Not EOF - encode the packet
+ *buf_out = vt_encode(w, in);
+ // Take ownership of the input buffer, avoid a memcpy
+ *buf_in = NULL;
+ return HB_WORK_OK;
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/platform/macosx/vt_common.c -> HandBrake-1.5.1.tar.xz/libhb/platform/macosx/vt_common.c Changed

@@ -1,63 +1,274 @@
 /* vt_common.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
 For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 */
 
-#include "handbrake/handbrake.h"
 #include "vt_common.h"
+#include "handbrake/hbffmpeg.h"
 
 #include <VideoToolbox/VideoToolbox.h>
 #include <CoreMedia/CoreMedia.h>
 #include <CoreVideo/CoreVideo.h>
 
-//#define VT_STATS
+#pragma mark - Availability
 
-#ifdef VT_STATS
-static void toggle_vt_gva_stats(bool state)
+static OSStatus encoder_properties(CMVideoCodecType codecType, CFStringRef *encoderIDOut, CFDictionaryRef *supportedPropertiesOut)
 {
- CFPropertyListRef cf_state = state ? kCFBooleanTrue : kCFBooleanFalse;
- CFPreferencesSetValue(CFSTR("gvaEncoderPerf"), cf_state, CFSTR("com.apple.GVAEncoder"), kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
- CFPreferencesSetValue(CFSTR("gvaEncoderPSNR"), cf_state, CFSTR("com.apple.GVAEncoder"), kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
- CFPreferencesSetValue(CFSTR("gvaEncoderSSIM"), cf_state, CFSTR("com.apple.GVAEncoder"), kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
+ const void *keys1 = { kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder };
+ const void *values1 = { kCFBooleanTrue };
+ CFDictionaryRef specification = CFDictionaryCreate(NULL, keys, values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
- //CFPreferencesSetValue(CFSTR("gvaEncoderStats"), cf_state, CFSTR("com.apple.GVAEncoder"), kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
- //CFPreferencesSetValue(CFSTR("gvaDebug"), cf_state, CFSTR("com.apple.AppleGVA"), kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
+ OSStatus err = VTCopySupportedPropertyDictionaryForEncoder(1920, 1080,
+ codecType, specification,
+ encoderIDOut,
+ supportedPropertiesOut);
+ CFRelease(specification);
+ return err;
 }
+
+static int is_hardware_encoder_available(CMVideoCodecType codecType, CFStringRef level)
+{
+ Boolean found = false;
+ CFStringRef encoderIDOut;
+ CFDictionaryRef supportedPropertiesOut;
+
+ OSStatus err = encoder_properties(codecType, &encoderIDOut, &supportedPropertiesOut);
+
+ if (err == noErr)
+ {
+ if (level != NULL)
+ {
+ CFDictionaryRef profiles = CFDictionaryGetValue(supportedPropertiesOut, kVTCompressionPropertyKey_ProfileLevel);
+ if (profiles != NULL)
+ {
+ CFArrayRef listOfValues = CFDictionaryGetValue(profiles, kVTPropertySupportedValueListKey);
+ if (listOfValues != NULL)
+ {
+ found = CFArrayContainsValue(listOfValues, CFRangeMake(0, CFArrayGetCount(listOfValues)), level);
+ }
+ }
+ }
+ else
+ {
+ found = true;
+ }
+
+ CFRelease(encoderIDOut);
+ CFRelease(supportedPropertiesOut);
+ }
+ return found;
+}
+
+static int vt_h264_available;
+static int vt_h265_available;
+static int vt_h265_10bit_available;
+
+int hb_vt_is_encoder_available(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_VT_H264:
+ {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ vt_h264_available = is_hardware_encoder_available(kCMVideoCodecType_H264, NULL);
+ });
+ return vt_h264_available;
+ }
+ case HB_VCODEC_VT_H265:
+ {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ vt_h265_available = is_hardware_encoder_available(kCMVideoCodecType_HEVC, NULL);
+ });
+ return vt_h265_available;
+ }
+ case HB_VCODEC_VT_H265_10BIT:
+ {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ if (__builtin_available (macOS 11, *))
+ {
+ vt_h265_10bit_available = is_hardware_encoder_available(kCMVideoCodecType_HEVC, kVTProfileLevel_HEVC_Main10_AutoLevel);
+ }
+ else
+ {
+ vt_h265_10bit_available = 0;
+ }
+ });
+ return vt_h265_10bit_available;
+ }
+ }
+ return 0;
+}
+
+#pragma mark - Constant Quality
+
+static int is_constant_quality_available(CMVideoCodecType codecType)
+{
+#if defined(__aarch64__)
+ if (__builtin_available (macOS 11, *))
+ {
+ CFStringRef encoderIDOut;
+ CFDictionaryRef supportedPropertiesOut;
+
+ OSStatus err = encoder_properties(codecType, &encoderIDOut, &supportedPropertiesOut);
+
+ if (err == noErr)
+ {
+ Boolean keyExists;
+ CFBooleanRef value = kCFBooleanFalse;
+ keyExists = CFDictionaryGetValueIfPresent(supportedPropertiesOut,
+ kVTCompressionPropertyKey_Quality,
+ (const void **)&value);
+
+ CFRelease(encoderIDOut);
+ CFRelease(supportedPropertiesOut);
+
+ if (keyExists)
+ {
+ return 1;
+ }
+ }
+ }
 #endif
+ return 0;
+}
 
-static const CFStringRef encoder_id_h264 = CFSTR("com.apple.videotoolbox.videoencoder.h264.gva");
-static const CFStringRef encoder_id_h265 = CFSTR("com.apple.videotoolbox.videoencoder.hevc.gva");
+static int vt_h264_constant_quality;
+static int vt_h265_constant_quality;
 
-int encvt_available(CFStringRef encoder)
+int hb_vt_is_constant_quality_available(int encoder)
 {
- CFArrayRef encoder_list;
- VTCopyVideoEncoderList(NULL, &encoder_list);
- CFIndex size = CFArrayGetCount(encoder_list);
+ switch (encoder)
+ {
+ case HB_VCODEC_VT_H264:
+ {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ vt_h264_constant_quality = is_constant_quality_available(kCMVideoCodecType_H264);
+ });
+ return vt_h264_constant_quality;
 
- for (CFIndex i = 0; i < size; i++ )
+ }
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ {
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ vt_h265_constant_quality = is_constant_quality_available(kCMVideoCodecType_HEVC);
+ });
+ return vt_h265_constant_quality;
+ }
+ }
+ return 0;
+}
+
+int hb_vt_is_two_pass_available(int encoder)
+{
+ switch (encoder)
 {
- CFDictionaryRef encoder_dict = CFArrayGetValueAtIndex(encoder_list, i);
- CFStringRef encoder_id = CFDictionaryGetValue(encoder_dict, kVTVideoEncoderSpecification_EncoderID);
- if (CFEqual(encoder_id, encoder))
+ case HB_VCODEC_VT_H264:
 {
- CFRelease(encoder_list);
 return 1;
 }
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ {
+#if defined(__aarch64__)
+ if (__builtin_available (macOS 12, *))
+ {
+ return 1;
+ }
+#endif
+ return 0;
+ }
 }
- CFRelease(encoder_list);
 return 0;
+
 }
 
-int hb_vt_h264_is_available()
+#pragma mark - Settings
+
+static const char * const vt_h26x_preset_name =
+{
+ "speed", "quality", NULL
+};
+
+static const char * const vt_h264_profile_name =
 {
- return encvt_available(encoder_id_h264);
+ "auto", "baseline", "main", "high", NULL
+};
+
+static const char * const vt_h265_profile_name =
+{
+ "auto", NULL
+};
+
+static const char * vt_h264_level_names =
+{
+ "auto", "1.3", "3.0", "3.1", "3.2", "4.0", "4.1", "4.2", "5.0", "5.1", "5.2", NULL
+};
+
+static const char * const vt_h265_level_names =
+{
+ "auto", NULL,
+};
+
+static const enum AVPixelFormat vt_h26x_pix_fmts =
+{
+ AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat vt_h265_10bit_pix_fmts =
+{
+ AV_PIX_FMT_P010LE, AV_PIX_FMT_NONE
+};
+
+const int* hb_vt_get_pix_fmts(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ return vt_h26x_pix_fmts;
+ case HB_VCODEC_VT_H265_10BIT:
+ return vt_h265_10bit_pix_fmts;
+ }
+ return NULL;
 }
 
-int hb_vt_h265_is_available()
+const char* const* hb_vt_preset_get_names(int encoder)
 {
- return encvt_available(encoder_id_h265);
+ return vt_h26x_preset_name;
+}
+
+const char* const* hb_vt_profile_get_names(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_VT_H264:
+ return vt_h264_profile_name;
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return vt_h265_profile_name;
+ }
+ return NULL;
+}
+
+const char* const* hb_vt_level_get_names(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_VT_H264:
+ return vt_h264_level_names;
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ return vt_h265_level_names;
+ }
+ return NULL;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/platform/macosx/vt_common.h -> HandBrake-1.5.1.tar.xz/libhb/platform/macosx/vt_common.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/plist.c -> HandBrake-1.5.1.tar.xz/libhb/plist.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/ports.c -> HandBrake-1.5.1.tar.xz/libhb/ports.c Changed

@@ -1,6 +1,6 @@
 /* ports.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -283,8 +283,12 @@
 return "Intel microarchitecture Airmont";
 case HB_CPU_PLATFORM_INTEL_KBL:
 return "Intel microarchitecture Kaby Lake";
+ case HB_CPU_PLATFORM_INTEL_CML:
+ return "Intel microarchitecture Comet Lake";
 case HB_CPU_PLATFORM_INTEL_ICL:
 return "Intel microarchitecture Ice Lake";
+ case HB_CPU_PLATFORM_INTEL_TGL:
+ return "Intel microarchitecture Tiger Lake";
 default:
 return NULL;
 }
@@ -375,8 +379,18 @@
 case 0x9E:
 hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_KBL;
 break;
+ case 0xA5:
+ case 0xA6:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_CML;
+ break;
+ case 0x7D:
 case 0x7E:
 hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_ICL;
+ break;
+ case 0x8C:
+ case 0x8D:
+ hb_cpu_info.platform = HB_CPU_PLATFORM_INTEL_TGL;
+ break;
 default:
 break;
 }
@@ -449,7 +463,7 @@
 
 #elif defined(SYS_DARWIN) || defined(SYS_FREEBSD) || defined(SYS_NETBSD) || defined(SYS_OPENBSD)
 size_t length = sizeof( cpu_count );
-#ifdef SYS_OPENBSD || defined(SYS_NETBSD)
+#if defined SYS_OPENBSD || defined(SYS_NETBSD)
 int mib2 = { CTL_HW, HW_NCPU };
 if( sysctl(mib, 2, &cpu_count, &length, NULL, 0) )
 #else
@@ -633,7 +647,7 @@
 else
 base = strdup("/tmp");
 #endif
- /* I prefer to remove evntual last '/' (for cygwin) */
+ /* I prefer to remove eventual last '/' (for cygwin) */
 if( basestrlen(base)-1 == '/' )
 basestrlen(base)-1 = '\0';
 
@@ -644,7 +658,7 @@
 }
 
 /************************************************************************
- * Get a tempory filename for HB
+ * Get a temporary filename for HB
 ***********************************************************************/
 char * hb_get_temporary_filename( char *fmt, ... )
 {
@@ -852,7 +866,7 @@
 * hb_thread_func()
 ************************************************************************
 * We use it as the root routine for any thread, for two reasons:
- * + To set the thread priority on OS X (pthread_setschedparam() could
+ * + To set the thread priority on macOS (pthread_setschedparam() could
 * be called from hb_thread_init(), but it's nicer to do it as we
 * are sure it is done before the real routine starts)
 * + Get informed when the thread exits, so we know whether
@@ -862,8 +876,9 @@
 {
 hb_thread_t * t = (hb_thread_t *) _t;
 
-#if defined( SYS_DARWIN ) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined(SYS_NETBSD)
- /* Set the thread priority */
+#if (defined( SYS_DARWIN ) && !defined(__aarch64__)) || defined( SYS_FREEBSD ) || defined ( __FreeBSD__ ) || defined(SYS_NETBSD)
+ /* Set the thread priority
+ Do not change priority on Darwin arm systems */
 struct sched_param param;
 memset( &param, 0, sizeof( struct sched_param ) );
 param.sched_priority = t->priority;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/preset.c -> HandBrake-1.5.1.tar.xz/libhb/preset.c Changed

@@ -1,6 +1,6 @@
 /* preset.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -13,10 +13,6 @@
 #include "handbrake/plist.h"
 #include "handbrake/lang.h"
 
-#if HB_PROJECT_FEATURE_QSV
-#include "handbrake/qsv_common.h"
-#endif
-
 #if defined(SYS_LINUX)
 #define HB_PRESET_PLIST_FILE "ghb/presets"
 #define HB_PRESET_JSON_FILE "ghb/presets.json"
@@ -50,6 +46,7 @@
 PRESET_DO_PARTIAL,
 PRESET_DO_NEXT,
 PRESET_DO_SKIP,
+ PRESET_DO_SKIP_LEVEL,
 PRESET_DO_DELETE,
 PRESET_DO_DONE
 };
@@ -94,7 +91,7 @@
 if (type != HB_PRESET_TYPE_ALL &&
 type != hb_value_get_int(hb_dict_get(preset, "Type")))
 {
- return PRESET_DO_NEXT;
+ return PRESET_DO_SKIP;
 }
 
 // Strip leading '/'
@@ -106,7 +103,7 @@
 {
 next = strchr(name, '/');
 if (next == NULL)
- return PRESET_DO_SKIP;
+ return PRESET_DO_SKIP_LEVEL;
 next++;
 name = next;
 }
@@ -118,7 +115,7 @@
 else
 len = strlen(name);
 if (len <= 0)
- return PRESET_DO_SKIP;
+ return PRESET_DO_SKIP_LEVEL;
 
 preset_name = hb_value_get_string(hb_dict_get(preset, "PresetName"));
 if (strlen(preset_name) > len)
@@ -132,7 +129,7 @@
 else
 return PRESET_DO_PARTIAL;
 }
- return PRESET_DO_NEXT;
+ return PRESET_DO_SKIP;
 }
 
 static int do_preset_search(hb_value_t *preset, preset_do_context_t *do_ctx)
@@ -148,7 +145,7 @@
 }
 
 result = preset_cmp_idx(preset, idx, ctx->name, ctx->type);
- if (ctx->recurse && result == PRESET_DO_SKIP)
+ if (ctx->recurse && result == PRESET_DO_SKIP_LEVEL)
 {
 result = preset_cmp_idx(preset, 0, ctx->name, ctx->type);
 ctx->last_match_idx = idx;
@@ -161,6 +158,10 @@
 {
 ctx->last_match_idx = -1;
 }
+ if (ctx->recurse && result == PRESET_DO_SKIP)
+ {
+ return PRESET_DO_NEXT;
+ }
 
 return result;
 }
@@ -230,9 +231,9 @@
 continue;
 }
 ii++;
- if (result == PRESET_DO_SKIP)
+ if (result == PRESET_DO_SKIP_LEVEL)
 return PRESET_DO_NEXT;
- if (result != PRESET_DO_NEXT)
+ if (result != PRESET_DO_NEXT && result != PRESET_DO_SKIP)
 return result;
 }
 return PRESET_DO_NEXT;
@@ -969,10 +970,15 @@
 make_default = (!burn && behavior->make_default) ||
 (!has_default_subtitle(list) &&
 subtitle->config.default_track);
+
+ if (!behavior->one_burned || hb_subtitle_can_pass(subtitle->source, mux))
+ {
+ add_subtitle(list, t, make_default, 0 /*!force*/, burn, subtitle->name);
+ }
+
 behavior->burn_first &= !burn;
 behavior->one_burned |= burn;
 behavior->usedt = 1;
- add_subtitle(list, t, make_default, 0 /*!force*/, burn, subtitle->name);
 }
 }
 
@@ -1122,7 +1128,7 @@
 if (first_audio_lang != NULL &&
 foreign_first_audio && strncmp(first_audio_lang, pref_lang, 4))
 {
- // First audio lang does not match the preferred subittle lang.
+ // First audio lang does not match the preferred subtitle lang.
 // Preset says to add pref lang subtitle.
 // Foreign audio search is not necessary since entire audio track
 // is foreign.
@@ -1258,10 +1264,18 @@
 hb_video_framerate_get_limits(&clock_min, &clock_max, &clock);
 
 // Create new filters
- filters_dict = hb_dict_init();
- hb_dict_set(job_dict, "Filters", filters_dict);
- filter_list = hb_value_array_init();
- hb_dict_set(filters_dict, "FilterList", filter_list);
+ filters_dict = hb_dict_get(job_dict, "Filters");
+ if (filters_dict == NULL)
+ {
+ filters_dict = hb_dict_init();
+ hb_dict_set(job_dict, "Filters", filters_dict);
+ }
+ filter_list = hb_dict_get(filters_dict, "FilterList");
+ if (filter_list == NULL)
+ {
+ filter_list = hb_value_array_init();
+ hb_dict_set(filters_dict, "FilterList", filter_list);
+ }
 
 // Detelecine filter
 hb_value_t *detel_val = hb_dict_get(preset, "PictureDetelecine");
@@ -1537,7 +1551,9 @@
 hb_error("Invalid rotate filter settings (%s)", rotate);
 return -1;
 }
- else if (!hb_dict_get_bool(filter_settings, "disable"))
+ else if (!hb_dict_get_bool(filter_settings, "disable") &&
+ (hb_dict_get_int(filter_settings, "angle") != 0 ||
+ hb_dict_get_bool(filter_settings, "hflip")))
 {
 filter_dict = hb_dict_init();
 hb_dict_set(filter_dict, "ID", hb_value_int(HB_FILTER_ROTATE));
@@ -1559,15 +1575,77 @@
 hb_add_filter2(filter_list, filter_dict);
 }
 
- // Pad filter
- char *pad = hb_value_get_string_xform(hb_dict_get(preset, "PicturePad"));
- if (pad != NULL)
+ // Pad filter requires knowing crop/scale settings
+ hb_dict_t * scale_filter, * scale_settings = NULL;
+ scale_filter = hb_filter_dict_find(filter_list, HB_FILTER_CROP_SCALE);
+ if (scale_filter != NULL)
+ {
+ scale_settings = hb_dict_get(scale_filter, "Settings");
+ }
+
+ char * pad_params = NULL;
+ const char * pad_mode = hb_dict_get_string(preset, "PicturePadMode");
+ if (pad_mode != NULL && strcmp(pad_mode, "none"))
+ {
+ // Preset values used by the GUI and built-in presets
+ int pad4 = {0,};
+ const char * color;
+
+ if (!strcmp(pad_mode, "custom"))
+ {
+ pad0 = hb_dict_get_int(preset, "PicturePadTop");
+ pad1 = hb_dict_get_int(preset, "PicturePadBottom");
+ pad2 = hb_dict_get_int(preset, "PicturePadLeft");
+ pad3 = hb_dict_get_int(preset, "PicturePadRight");
+ }
+
+ if (scale_settings != NULL)
+ {
+ int fillwidth, fillheight;
+
+ int width = hb_dict_get_int(scale_settings, "width");
+ int height = hb_dict_get_int(scale_settings, "height");
+ int maxWidth = hb_dict_get_int(preset, "PictureWidth");
+ int maxHeight = hb_dict_get_int(preset, "PictureHeight");
+
+ fillwidth = fillheight = !strcmp(pad_mode, "fill");
+ fillheight = fillheight || !strcmp(pad_mode, "letterbox");
+ fillwidth = fillwidth || !strcmp(pad_mode, "pillarbox");
+
+ if (fillwidth && maxWidth > 0)
+ {
+ pad2 = (maxWidth - width) / 2;
+ pad3 = maxWidth - width - pad2;
+ }
+ if (fillheight && maxHeight > 0)
+ {
+ pad0 = (maxHeight - height) / 2;
+ pad1 = maxHeight - height - pad0;
+ }
+ }
+ color = hb_dict_get_string(preset, "PicturePadColor");
+ if (color == NULL)
+ {
+ color = "black";
+ }
+
+ pad_params =
+ hb_strdup_printf("top=%d:bottom=%d:left=%d:right=%d:color=%s",
+ pad0, pad1, pad2, pad3, color);
+ }
+ else
+ {
+ // Preset value used by the CLI
+ pad_params =
+ hb_value_get_string_xform(hb_dict_get(preset, "PicturePad"));
+ }
+ if (pad_params != NULL)
 {
 filter_settings = hb_generate_filter_settings(HB_FILTER_PAD,
- NULL, NULL, pad);
+ NULL, NULL, pad_params);
 if (filter_settings == NULL)
 {
- hb_error("Invalid pad filter settings (%s)", pad);
+ hb_error("Invalid pad filter settings (%s)", pad_params);
 return -1;
 }
 else if (!hb_dict_get_bool(filter_settings, "disable"))
@@ -1581,8 +1659,38 @@
 {
 hb_value_free(&filter_settings);
 }
+ free(pad_params);
+ }
+
+ // Colorspace filter
+ const char *colorspace = hb_value_get_string(hb_dict_get(preset, "PictureColorspacePreset"));
+ if (colorspace != NULL &&
+ strcasecmp(colorspace, "off"))
+ {
+ const char * colorspace_custom = hb_value_get_string(
+ hb_dict_get(preset, "PictureColorspaceCustom"));
+ filter_settings = hb_generate_filter_settings(HB_FILTER_COLORSPACE,
+ colorspace, NULL, colorspace_custom);
+ if (filter_settings == NULL)
+ {
+ hb_error("Invalid colorspace filter settings (%s%s%s)",
+ colorspace,
+ colorspace_custom ? "," : "",
+ colorspace_custom ? colorspace_custom : "");
+ return -1;
+ }
+ else if (!hb_dict_get_bool(filter_settings, "disable"))
+ {
+ filter_dict = hb_dict_init();
+ hb_dict_set(filter_dict, "ID", hb_value_int(HB_FILTER_COLORSPACE));
+ hb_dict_set(filter_dict, "Settings", filter_settings);
+ hb_add_filter2(filter_list, filter_dict);
+ }
+ else
+ {
+ hb_value_free(&filter_settings);
+ }
 }
- free(pad);
 
 hb_value_t *fr_value = hb_dict_get(preset, "VideoFramerate");
 int vrate_den = get_video_framerate(fr_value);
@@ -1666,7 +1774,7 @@
 video_dict = hb_dict_get(job_dict, "Video");
 hb_dict_set(video_dict, "Encoder", hb_value_string(encoder->short_name));
 
- color_matrix_code = hb_value_get_int(hb_dict_get(preset, "VideoColorMatrixCodeOveride"));
+ color_matrix_code = hb_value_get_int(hb_dict_get(preset, "VideoColorMatrixCodeOverride"));
 if (color_matrix_code != 0)
 {
 int color_prim, color_transfer, color_matrix;
@@ -1778,23 +1886,23 @@
 {
 qsv = hb_dict_init();
 hb_dict_set(video_dict, "QSV", qsv);
+ qsv = hb_dict_get(video_dict, "QSV");
 }
 if ((value = hb_dict_get(preset, "VideoQSVDecode")) != NULL)
 {
 hb_dict_set(qsv, "Decode",
 hb_value_xform(value, HB_VALUE_TYPE_BOOL));
 }
- if ((value = hb_dict_get(preset, "VideoQSVLowPower")) != NULL)
+ if ((value = hb_dict_get(preset, "VideoQSVAsyncDepth")) != NULL)
 {
- hb_dict_set(qsv, "LowPower",
- hb_value_xform(value, HB_VALUE_TYPE_BOOL));
+ hb_dict_set(qsv, "AsyncDepth",
+ hb_value_xform(value, HB_VALUE_TYPE_INT));
 }
- if ((value = hb_dict_get(preset, "VideoQSVAsyncDepth")) != NULL)
+ if ((value = hb_dict_get(preset, "VideoQSVAdapterIndex")) != NULL)
 {
- hb_dict_set(qsv, "AsyncDepth",
+ hb_dict_set(qsv, "AdapterIndex",
 hb_value_xform(value, HB_VALUE_TYPE_INT));
 }
-
 return 0;
 }
 
@@ -1846,7 +1954,8 @@
 return 0;
 }
 
-int hb_preset_apply_title(hb_handle_t *h, int title_index,
+
+int hb_preset_apply_dimensions(hb_handle_t *h, int title_index,
 const hb_dict_t *preset, hb_dict_t *job_dict)
 {
 // Apply preset settings that requires the title
@@ -1854,56 +1963,84 @@
 if (title == NULL)
 return -1;
 
- int chapters = hb_value_get_bool(hb_dict_get(preset, "ChapterMarkers"));
- if (hb_list_count(title->list_chapter) <= 1)
- chapters = 0;
+ hb_dict_t * filter_dict;
+ hb_dict_t * filters_dict = hb_dict_get(job_dict, "Filters");
+ hb_value_array_t * filter_list = hb_dict_get(filters_dict, "FilterList");
 
- // Set "Destination" settings in job
- hb_dict_t *dest_dict = hb_dict_get(job_dict, "Destination");
- hb_dict_set(dest_dict, "ChapterMarkers", hb_value_bool(chapters));
-
- hb_dict_t *filters_dict = hb_dict_get(job_dict, "Filters");
- hb_value_array_t *filter_list = hb_dict_get(filters_dict, "FilterList");
+ // Rotate filter settings must be known prior to applying crop/scale
+ char * rotate = hb_value_get_string_xform(
+ hb_dict_get(preset, "PictureRotate"));
+ hb_dict_t * rotate_settings = NULL;
+ if (rotate != NULL)
+ {
+ rotate_settings = hb_generate_filter_settings(HB_FILTER_ROTATE,
+ NULL, NULL, rotate);
+ if (rotate_settings == NULL)
+ {
+ hb_error("Invalid rotate filter settings (%s)", rotate);
+ return -1;
+ }
+ else if (!hb_dict_get_bool(rotate_settings, "disable") &&
+ (hb_dict_get_int(rotate_settings, "angle") != 0 ||
+ hb_dict_get_bool(rotate_settings, "hflip")))
+ {
+ filter_dict = hb_dict_init();
+ hb_dict_set(filter_dict, "ID", hb_value_int(HB_FILTER_ROTATE));
+ hb_dict_set(filter_dict, "Settings", rotate_settings);
+ hb_add_filter2(filter_list, filter_dict);
+ }
+ else
+ {
+ hb_value_free(&rotate_settings);
+ }
+ free(rotate);
+ }
 
 // Calculate default job geometry settings
- hb_geometry_t srcGeo, resultGeo;
+ hb_geometry_crop_t srcGeo;
+ hb_geometry_t resultGeo;
 hb_geometry_settings_t geo;
- int keep_aspect;
+ int keep_aspect, allow_upscaling, use_maximum_size;
+
+ srcGeo.geometry = title->geometry;
+ memcpy(srcGeo.crop, title->crop, sizeof(geo.crop));
+
+ if (rotate_settings != NULL)
+ {
+ int angle = hb_dict_get_int(rotate_settings, "angle");
+ int hflip = hb_dict_get_bool(rotate_settings, "hflip");
+ hb_rotate_geometry(&srcGeo, &srcGeo, angle, hflip);
+ }
 
- srcGeo = title->geometry;
 if (!hb_value_get_bool(hb_dict_get(preset, "PictureAutoCrop")))
 {
- geo.crop0 = hb_value_get_int(hb_dict_get(preset, "PictureTopCrop"));
- geo.crop1 = hb_value_get_int(hb_dict_get(preset, "PictureBottomCrop"));
- geo.crop2 = hb_value_get_int(hb_dict_get(preset, "PictureLeftCrop"));
- geo.crop3 = hb_value_get_int(hb_dict_get(preset, "PictureRightCrop"));
+ geo.crop0 = hb_dict_get_int(preset, "PictureTopCrop");
+ geo.crop1 = hb_dict_get_int(preset, "PictureBottomCrop");
+ geo.crop2 = hb_dict_get_int(preset, "PictureLeftCrop");
+ geo.crop3 = hb_dict_get_int(preset, "PictureRightCrop");
 }
 else
 {
- memcpy(geo.crop, title->crop, sizeof(geo.crop));
+ memcpy(geo.crop, srcGeo.crop, sizeof(geo.crop));
 }
+
+ const char * pad_mode;
+ pad_mode = hb_dict_get_string(preset, "PicturePadMode");
+ if (pad_mode != NULL && !strcmp(pad_mode, "custom"))
+ {
+ geo.pad0 = hb_value_get_int(hb_dict_get(preset, "PicturePadTop"));
+ geo.pad1 = hb_value_get_int(hb_dict_get(preset, "PicturePadBottom"));
+ geo.pad2 = hb_value_get_int(hb_dict_get(preset, "PicturePadLeft"));
+ geo.pad3 = hb_value_get_int(hb_dict_get(preset, "PicturePadRight"));
+ }
+ else
+ {
+ memset(geo.pad, 0, sizeof(geo.pad));
+ }
+
 geo.modulus = hb_value_get_int(hb_dict_get(preset, "PictureModulus"));
 if (geo.modulus < 2)
 geo.modulus = 2;
- if (hb_value_get_bool(hb_dict_get(preset, "PictureLooseCrop")))
- {
- // Crop a few extra pixels to avoid scaling to fit Modulus
- int extra1, extra2, crop_width, crop_height, width, height;
-
- crop_width = srcGeo.width - geo.crop2 - geo.crop3;
- crop_height = srcGeo.height - geo.crop0 - geo.crop1;
- width = MULTIPLE_MOD_DOWN(crop_width, geo.modulus);
- height = MULTIPLE_MOD_DOWN(crop_height, geo.modulus);
-
- extra1 = EVEN((crop_height - height) / 2);
- extra2 = crop_height - height - extra1;
- geo.crop0 += extra1;
- geo.crop1 += extra2;
- extra1 = EVEN((crop_width - width) / 2);
- extra2 = crop_width - width - extra1;
- geo.crop2 += extra1;
- geo.crop3 += extra2;
- }
 hb_value_t *ana_mode_value = hb_dict_get(preset, "PicturePAR");
 if (hb_value_type(ana_mode_value) == HB_VALUE_TYPE_STRING)
 {
@@ -1924,81 +2061,172 @@
 geo.mode = hb_value_get_int(hb_dict_get(preset, "PicturePAR"));
 }
 keep_aspect = hb_value_get_bool(hb_dict_get(preset, "PictureKeepRatio"));
- if (geo.mode == HB_ANAMORPHIC_STRICT ||
- geo.mode == HB_ANAMORPHIC_LOOSE ||
- geo.mode == HB_ANAMORPHIC_AUTO)
- {
- keep_aspect = 1;
- }
 geo.keep = keep_aspect * HB_KEEP_DISPLAY_ASPECT;
+ allow_upscaling = hb_dict_get_bool(preset, "PictureAllowUpscaling");
+ use_maximum_size = hb_dict_get_bool(preset, "PictureUseMaximumSize");
+ geo.flags = 0;
+ geo.flags |= allow_upscaling * HB_GEO_SCALE_UP;
+ geo.flags |= use_maximum_size * HB_GEO_SCALE_BEST;
+
 geo.itu_par = hb_value_get_bool(hb_dict_get(preset, "PictureItuPAR"));
 geo.maxWidth = hb_value_get_int(hb_dict_get(preset, "PictureWidth"));
 geo.maxHeight = hb_value_get_int(hb_dict_get(preset, "PictureHeight"));
 geo.geometry = title->geometry;
 int width = hb_value_get_int(hb_dict_get(preset, "PictureForceWidth"));
 int height = hb_value_get_int(hb_dict_get(preset, "PictureForceHeight"));
+
 if (width > 0)
 {
 geo.geometry.width = width;
 geo.keep |= HB_KEEP_WIDTH;
 }
- else
- {
- geo.geometry.width -= geo.crop2 + geo.crop3;
- }
 if (height > 0)
 {
 geo.geometry.height = height;
 geo.keep |= HB_KEEP_HEIGHT;
 }
- else
- {
- geo.geometry.height -= geo.crop0 + geo.crop1;
- }
- if (geo.mode == HB_ANAMORPHIC_CUSTOM && !keep_aspect)
+
+ geo.geometry.par.num = hb_dict_get_int(preset, "PicturePARWidth");
+ geo.geometry.par.den = hb_dict_get_int(preset, "PicturePARHeight");
+
+ int display_width = hb_dict_get_int(preset, "PictureDARWidth");
+ if (display_width <= 0)
 {
- int dar_width;
- dar_width = hb_value_get_int(hb_dict_get(preset, "PictureDARWidth"));
- if (dar_width > 0)
- {
- geo.geometry.par.num = dar_width;
- geo.geometry.par.den = geo.geometry.width;
- }
- else
- {
- geo.geometry.par.num =
- hb_value_get_int(hb_dict_get(preset, "PicturePARWidth"));
- geo.geometry.par.den =
- hb_value_get_int(hb_dict_get(preset, "PicturePARHeight"));
- }
+ display_width = ((double)geo.geometry.par.num / geo.geometry.par.den) * geo.geometry.width + 0.5;
 }
- hb_set_anamorphic_size2(&srcGeo, &geo, &resultGeo);
+ geo.displayWidth = display_width;
+ geo.displayHeight = geo.geometry.height;
+
+ hb_set_anamorphic_size2(&srcGeo.geometry, &geo, &resultGeo);
+
 hb_dict_t *par_dict = hb_dict_get(job_dict, "PAR");
 hb_dict_set(par_dict, "Num", hb_value_int(resultGeo.par.num));
 hb_dict_set(par_dict, "Den", hb_value_int(resultGeo.par.den));
 par_dict = NULL;
 
- hb_dict_t *filter_dict;
- hb_dict_t *filter_settings;
+ hb_dict_t * scale_settings;
 
- filter_settings = hb_dict_init();
- hb_dict_set(filter_settings, "width", hb_value_int(resultGeo.width));
- hb_dict_set(filter_settings, "height", hb_value_int(resultGeo.height));
- hb_dict_set(filter_settings, "crop-top", hb_value_int(geo.crop0));
- hb_dict_set(filter_settings, "crop-bottom", hb_value_int(geo.crop1));
- hb_dict_set(filter_settings, "crop-left", hb_value_int(geo.crop2));
- hb_dict_set(filter_settings, "crop-right", hb_value_int(geo.crop3));
- if (hb_validate_filter_settings(HB_FILTER_CROP_SCALE, filter_settings))
+ scale_settings = hb_dict_init();
+ hb_dict_set(scale_settings, "width", hb_value_int(resultGeo.width));
+ hb_dict_set(scale_settings, "height", hb_value_int(resultGeo.height));
+ hb_dict_set(scale_settings, "crop-top", hb_value_int(geo.crop0));
+ hb_dict_set(scale_settings, "crop-bottom", hb_value_int(geo.crop1));
+ hb_dict_set(scale_settings, "crop-left", hb_value_int(geo.crop2));
+ hb_dict_set(scale_settings, "crop-right", hb_value_int(geo.crop3));
+ if (hb_validate_filter_settings(HB_FILTER_CROP_SCALE, scale_settings))
 {
- hb_error("hb_preset_apply_title: Internal error, invalid CROP_SCALE");
- hb_value_free(&filter_settings);
+ hb_error("hb_preset_apply_dimensions: Internal error, invalid CROP_SCALE");
+ hb_value_free(&scale_settings);
 goto fail;
 }
 
 filter_dict = hb_dict_init();
 hb_dict_set(filter_dict, "ID", hb_value_int(HB_FILTER_CROP_SCALE));
- hb_dict_set(filter_dict, "Settings", filter_settings);
+ hb_dict_set(filter_dict, "Settings", scale_settings);
 hb_add_filter2(filter_list, filter_dict);
+
+ // Pad filter requires knowing crop/scale settings
+ char * pad_params = NULL;
+ if (pad_mode != NULL && strcmp(pad_mode, "none"))
+ {
+ // Preset values used by the GUI and built-in presets
+ int pad4 = {0,};
+ const char * color;
+
+ if (!strcmp(pad_mode, "custom"))
+ {
+ pad0 = hb_dict_get_int(preset, "PicturePadTop");
+ pad1 = hb_dict_get_int(preset, "PicturePadBottom");
+ pad2 = hb_dict_get_int(preset, "PicturePadLeft");
+ pad3 = hb_dict_get_int(preset, "PicturePadRight");
+ }
+
+ if (scale_settings != NULL)
+ {
+ int fillwidth, fillheight;
+
+ int width = hb_dict_get_int(scale_settings, "width");
+ int height = hb_dict_get_int(scale_settings, "height");
+ int maxWidth = hb_dict_get_int(preset, "PictureWidth");
+ int maxHeight = hb_dict_get_int(preset, "PictureHeight");
+
+ fillwidth = fillheight = !strcmp(pad_mode, "fill");
+ fillheight = fillheight || !strcmp(pad_mode, "letterbox");
+ fillwidth = fillwidth || !strcmp(pad_mode, "pillarbox");
+
+ if (fillwidth && maxWidth > 0)
+ {
+ pad2 = (maxWidth - width) / 2;
+ pad3 = maxWidth - width - pad2;
+ }
+ if (fillheight && maxHeight > 0)
+ {
+ pad0 = (maxHeight - height) / 2;
+ pad1 = maxHeight - height - pad0;
+ }
+ }
+ color = hb_dict_get_string(preset, "PicturePadColor");
+ if (color == NULL)
+ {
+ color = "black";
+ }
+
+ pad_params =
+ hb_strdup_printf("top=%d:bottom=%d:left=%d:right=%d:color=%s",
+ pad0, pad1, pad2, pad3, color);
+ }
+ else
+ {
+ // Preset value used by the CLI
+ pad_params =
+ hb_value_get_string_xform(hb_dict_get(preset, "PicturePad"));
+ }
+ if (pad_params != NULL)
+ {
+ hb_dict_t * filter_settings;
+ filter_settings = hb_generate_filter_settings(HB_FILTER_PAD,
+ NULL, NULL, pad_params);
+ if (filter_settings == NULL)
+ {
+ hb_error("Invalid pad filter settings (%s)", pad_params);
+ return -1;
+ }
+ else if (!hb_dict_get_bool(filter_settings, "disable"))
+ {
+ filter_dict = hb_dict_init();
+ hb_dict_set(filter_dict, "ID", hb_value_int(HB_FILTER_PAD));
+ hb_dict_set(filter_dict, "Settings", filter_settings);
+ hb_add_filter2(filter_list, filter_dict);
+ }
+ else
+ {
+ hb_value_free(&filter_settings);
+ }
+ free(pad_params);
+ }
+
+ return 0;
+
+fail:
+ return -1;
+}
+
+int hb_preset_apply_title(hb_handle_t *h, int title_index,
+ const hb_dict_t *preset, hb_dict_t *job_dict)
+{
+ // Apply preset settings that requires the title
+ hb_title_t *title = hb_find_title_by_index(h, title_index);
+ if (title == NULL)
+ return -1;
+
+ int chapters = hb_value_get_bool(hb_dict_get(preset, "ChapterMarkers"));
+ if (hb_list_count(title->list_chapter) <= 1)
+ chapters = 0;
+
+ // Set "Destination" settings in job
+ hb_dict_t *dest_dict = hb_dict_get(job_dict, "Destination");
+ hb_dict_set(dest_dict, "ChapterMarkers", hb_value_bool(chapters));
+
 // Audio settings
 if (hb_preset_job_add_audio(h, title_index, preset, job_dict) != 0)
 {
@@ -2046,6 +2274,9 @@
 if (hb_preset_apply_video(preset, job_dict) < 0)
 goto fail;
 
+ if (hb_preset_apply_dimensions(h, title_index, preset, job_dict) < 0)
+ goto fail;
+
 if (hb_preset_apply_filters(preset, job_dict) < 0)
 goto fail;
 
@@ -2220,6 +2451,9 @@
 enc = hb_video_encoder_get_short_name(vcodec);
 val = hb_value_string(enc);
 hb_dict_set(preset, "VideoEncoder", val);
+
+ int disabled = hb_video_encoder_is_supported(vcodec) == 0;
+ hb_dict_set_bool(preset, "PresetDisabled", disabled);
 }
 val = hb_dict_get(preset, "VideoFramerate");
 if (val != NULL)
@@ -2535,6 +2769,24 @@
 }
 }
 
+static void import_pic_settings_44_0_0(hb_value_t *preset)
+{
+ int uses_pic = hb_dict_get_int(preset, "UsesPictureSettings");
+
+ if (uses_pic != 1)
+ {
+ hb_dict_set_int(preset, "PictureWidth", 0);
+ hb_dict_set_int(preset, "PictureHeight", 0);
+ }
+ hb_dict_remove(preset, "UsesPictureSettings");
+
+ const char * pic_par = hb_dict_get_string(preset, "PicturePAR");
+ if (!strcasecmp(pic_par, "loose"))
+ {
+ hb_dict_set(preset, "PicturePAR", hb_value_string("auto"));
+ }
+}
+
 static void import_lang_list_40_0_0(hb_value_t *preset)
 {
 hb_value_array_t * lang_list;
@@ -3099,6 +3351,8 @@
 
 copy = hb_value_array_init();
 hb_dict_set(preset, "AudioCopyMask", copy);
+ if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowMP2Pass")))
+ hb_value_array_append(copy, hb_value_string("copy:mp2"));
 if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowMP3Pass")))
 hb_value_array_append(copy, hb_value_string("copy:mp3"));
 if (hb_value_get_bool(hb_dict_get(preset, "AudioAllowAACPass")))
@@ -3184,9 +3438,16 @@
 }
 }
 
+static void import_44_0_0(hb_value_t *preset)
+{
+ import_pic_settings_44_0_0(preset);
+}
+
 static void import_40_0_0(hb_value_t *preset)
 {
 import_lang_list_40_0_0(preset);
+
+ import_44_0_0(preset);
 }
 
 static void import_35_0_0(hb_value_t *preset)
@@ -3318,6 +3579,11 @@
 import_40_0_0(preset);
 result = 1;
 }
+ else if (cmpVersion(major, minor, micro, 44, 0, 0) <= 0)
+ {
+ import_44_0_0(preset);
+ result = 1;
+ }
 preset_clean(preset, hb_preset_template);
 }
 return result;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/qsv_common.c -> HandBrake-1.5.1.tar.xz/libhb/qsv_common.c Changed

@@ -1,12 +1,13 @@
 /* qsv_common.c
 *
- * Copyright (c) 2003-2020 HandBrake Team
+ * Copyright (c) 2003-2022 HandBrake Team
 * This file is part of the HandBrake source code.
 * Homepage: <http://handbrake.fr/>.
 * It may be used under the terms of the GNU General Public License v2.
 * For full terms see the file COPYING file or visit http://www.gnu.org/licenses/gpl-2.0.html
 */
 
+#include "handbrake/handbrake.h"
 #include "handbrake/project.h"
 
 #if HB_PROJECT_FEATURE_QSV
@@ -27,19 +28,64 @@
 #include "libavfilter/buffersink.h"
 #include "libavutil/hwcontext_qsv.h"
 #include "libavutil/hwcontext.h"
+#include "vpl/mfxadapter.h"
+
+typedef struct hb_qsv_adapter_details
+{
+ // DirectX index
+ int index;
+ // QSV info for each codec
+ hb_qsv_info_t *hb_qsv_info_avc;
+ hb_qsv_info_t *hb_qsv_info_hevc;
+ // API versions
+ mfxVersion qsv_software_version;
+ mfxVersion qsv_hardware_version;
+ // AVC implementations
+ hb_qsv_info_t qsv_software_info_avc;
+ hb_qsv_info_t qsv_hardware_info_avc;
+ // HEVC implementations
+ hb_qsv_info_t qsv_software_info_hevc;
+ hb_qsv_info_t qsv_hardware_info_hevc;
+} hb_qsv_adapter_details_t;
 
-// QSV info for each codec
-static hb_qsv_info_t *hb_qsv_info_avc = NULL;
-static hb_qsv_info_t *hb_qsv_info_hevc = NULL;
-// API versions
-static mfxVersion qsv_software_version = { .Version = 0, };
-static mfxVersion qsv_hardware_version = { .Version = 0, };
-// AVC implementations
-static hb_qsv_info_t qsv_software_info_avc = { .available = 0, .codec_id = MFX_CODEC_AVC, .implementation = MFX_IMPL_SOFTWARE, };
-static hb_qsv_info_t qsv_hardware_info_avc = { .available = 0, .codec_id = MFX_CODEC_AVC, .implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY, };
-// HEVC implementations
-static hb_qsv_info_t qsv_software_info_hevc = { .available = 0, .codec_id = MFX_CODEC_HEVC, .implementation = MFX_IMPL_SOFTWARE, };
-static hb_qsv_info_t qsv_hardware_info_hevc = { .available = 0, .codec_id = MFX_CODEC_HEVC, .implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY, };
+// QSV info about adapters
+#if defined(_WIN32) || defined(__MINGW32__)
+static mfxAdaptersInfo g_qsv_adapters_info;
+static const char* hb_qsv_get_adapter_type(const mfxAdapterInfo* info);
+#endif
+int hb_qsv_get_platform(int adapter_index);
+static hb_list_t *g_qsv_adapters_list = NULL;
+static hb_list_t *g_qsv_adapters_details_list = NULL;
+static int g_adapter_index = 0;
+static int g_default_adapter_index = 0;
+static int qsv_init_result = -2;
+
+static void init_adapter_details(hb_qsv_adapter_details_t *adapter_details)
+{
+ adapter_details->index = 0;
+ // QSV info for each codec
+ adapter_details->hb_qsv_info_avc = NULL;
+ adapter_details->hb_qsv_info_hevc = NULL;
+ // API versions
+ adapter_details->qsv_software_version.Version = 0;
+ adapter_details->qsv_hardware_version.Version = 0;
+ // AVC implementations
+ adapter_details->qsv_software_info_avc.available = 0;
+ adapter_details->qsv_software_info_avc.codec_id = MFX_CODEC_AVC;
+ adapter_details->qsv_software_info_avc.implementation = MFX_IMPL_SOFTWARE;
+
+ adapter_details->qsv_hardware_info_avc.available = 0;
+ adapter_details->qsv_hardware_info_avc.codec_id = MFX_CODEC_AVC;
+ adapter_details->qsv_hardware_info_avc.implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY;
+ // HEVC implementations
+ adapter_details->qsv_software_info_hevc.available = 0;
+ adapter_details->qsv_software_info_hevc.codec_id = MFX_CODEC_HEVC;
+ adapter_details->qsv_software_info_hevc.implementation = MFX_IMPL_SOFTWARE;
+
+ adapter_details->qsv_hardware_info_hevc.available = 0;
+ adapter_details->qsv_hardware_info_hevc.codec_id = MFX_CODEC_HEVC;
+ adapter_details->qsv_hardware_info_hevc.implementation = MFX_IMPL_HARDWARE_ANY|MFX_IMPL_VIA_ANY;
+}
 
 // QSV-supported profile and level lists (not all exposed to the user)
 static hb_triplet_t hb_qsv_h264_profiles =
@@ -61,6 +107,19 @@
 { "Main Still Picture", "mainstillpicture", MFX_PROFILE_HEVC_MAINSP, },
 { NULL, },
 };
+static hb_triplet_t hb_qsv_vpp_scale_modes =
+{
+ { "lowpower", "low_power", MFX_SCALING_MODE_LOWPOWER, },
+ { "hq", "hq", MFX_SCALING_MODE_QUALITY, },
+ { NULL, },
+};
+static hb_triplet_t hb_qsv_vpp_interpolation_methods =
+{
+ { "nearest", "nearest", MFX_INTERPOLATION_NEAREST_NEIGHBOR, },
+ { "bilinear", "bilinear", MFX_INTERPOLATION_BILINEAR, },
+ { "advanced", "advanced", MFX_INTERPOLATION_ADVANCED, },
+ { NULL, },
+};
 static hb_triplet_t hb_qsv_h264_levels =
 {
 { "1.0", "1.0", MFX_LEVEL_AVC_1, },
@@ -100,28 +159,108 @@
 { NULL, },
 };
 
+#if defined(_WIN32) || defined(__MINGW32__)
+static const enum AVPixelFormat hb_qsv_pix_fmts =
+{
+ AV_PIX_FMT_NV12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat hb_qsv_10bit_pix_fmts =
+{
+ AV_PIX_FMT_P010LE, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+#else
+static const enum AVPixelFormat hb_qsv_pix_fmts =
+{
+ AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+
+static const enum AVPixelFormat hb_qsv_10bit_pix_fmts =
+{
+ AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV420P, AV_PIX_FMT_NONE
+};
+#endif
+
+#define MFX_IMPL_VIA_MASK(impl) (0x0f00 & (impl))
+
 // check available Intel Media SDK version against a minimum
 #define HB_CHECK_MFX_VERSION(MFX_VERSION, MAJOR, MINOR) \
- (MFX_VERSION.Major == MAJOR && MFX_VERSION.Minor >= MINOR)
+ ((MFX_VERSION.Major * 1000 + MFX_VERSION.Minor) >= (MAJOR * 1000 + MINOR))
 
-/*
- * Determine the "generation" of QSV hardware based on the CPU microarchitecture.
- * Anything unknown is assumed to be more recent than the latest known generation.
- * This avoids having to order the hb_cpu_platform enum depending on QSV hardware.
- */
-enum
+int hb_qsv_get_adapter_index()
 {
- QSV_G0, // third party hardware
- QSV_G1, // Sandy Bridge or equivalent
- QSV_G2, // Ivy Bridge or equivalent
- QSV_G3, // Haswell or equivalent
- QSV_G4, // Broadwell or equivalent
- QSV_G5, // Skylake or equivalent
- QSV_G6, // Kaby Lake or equivalent
- QSV_G7, // Ice Lake or equivalent
- QSV_FU, // always last (future processors)
-};
-static int qsv_hardware_generation(int cpu_platform)
+ return g_adapter_index;
+}
+
+static int hb_qsv_set_default_adapter_index(int adapter_index)
+{
+ g_default_adapter_index = adapter_index;
+ return 0;
+}
+
+static int hb_qsv_get_default_adapter_index()
+{
+ return g_default_adapter_index;
+}
+
+hb_list_t* hb_qsv_adapters_list()
+{
+ return g_qsv_adapters_list;
+}
+
+static hb_qsv_adapter_details_t* hb_qsv_get_adapters_details_by_index(int adapter_index)
+{
+ for (int i = 0; i < hb_list_count(g_qsv_adapters_details_list); i++)
+ {
+ hb_qsv_adapter_details_t *details = hb_list_item(g_qsv_adapters_details_list, i);
+ if (details->index == adapter_index || adapter_index == -1)
+ {
+ return details;
+ }
+ }
+ return NULL;
+}
+
+static int qsv_impl_set_preferred(hb_qsv_adapter_details_t *details, const char *name)
+{
+ if (name == NULL || details == NULL)
+ {
+ return -1;
+ }
+ if (!strcasecmp(name, "software"))
+ {
+ if (details->qsv_software_info_avc.available)
+ {
+ details->hb_qsv_info_avc = &details->qsv_software_info_avc;
+ }
+ if (details->qsv_software_info_hevc.available)
+ {
+ details->hb_qsv_info_hevc = &details->qsv_software_info_hevc;
+ }
+ return 0;
+ }
+ if (!strcasecmp(name, "hardware"))
+ {
+ if (details->qsv_hardware_info_avc.available)
+ {
+ details->hb_qsv_info_avc = &details->qsv_hardware_info_avc;
+ }
+ if (details->qsv_hardware_info_hevc.available)
+ {
+ details->hb_qsv_info_hevc = &details->qsv_hardware_info_hevc;
+ }
+ return 0;
+ }
+ return -1;
+}
+
+int hb_qsv_impl_set_preferred(const char *name)
+{
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(hb_qsv_get_adapter_index());
+ return qsv_impl_set_preferred(details, name);
+}
+
+int hb_qsv_hardware_generation(int cpu_platform)
 {
 switch (cpu_platform)
 {
@@ -140,9 +279,12 @@
 case HB_CPU_PLATFORM_INTEL_SKL:
 return QSV_G5;
 case HB_CPU_PLATFORM_INTEL_KBL:
+ case HB_CPU_PLATFORM_INTEL_CML:
 return QSV_G6;
 case HB_CPU_PLATFORM_INTEL_ICL:
 return QSV_G7;
+ case HB_CPU_PLATFORM_INTEL_TGL:
+ return QSV_G8;
 default:
 return QSV_FU;
 }
@@ -151,7 +293,7 @@
 /*
 * Determine whether a given mfxIMPL is hardware-accelerated.
 */
-static int qsv_implementation_is_hardware(mfxIMPL implementation)
+int hb_qsv_implementation_is_hardware(mfxIMPL implementation)
 {
 return MFX_IMPL_BASETYPE(implementation) != MFX_IMPL_SOFTWARE;
 }
@@ -162,25 +304,49 @@
 {
 return 0;
 }
+ 
+ if (qsv_init_result >= 0){
+ // This method gets called a lot. Don't probe hardware each time.
+ return qsv_init_result; 
+ }
 
- return ((hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H264) ? HB_VCODEC_QSV_H264 : 0) |
- (hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H265) ? HB_VCODEC_QSV_H265 : 0) |
- (hb_qsv_video_encoder_is_enabled(HB_VCODEC_QSV_H265_10BIT) ? HB_VCODEC_QSV_H265_10BIT : 0));
+ int result = hb_qsv_info_init();
+ if (result != 0)
+ {
+ hb_log("qsv: not available on this system");
+ qsv_init_result = -1;
+ return qsv_init_result;
+ }
+
+ qsv_init_result = ((hb_qsv_video_encoder_is_enabled(hb_qsv_get_adapter_index(), HB_VCODEC_QSV_H264) ? HB_VCODEC_QSV_H264 : 0) |
+ (hb_qsv_video_encoder_is_enabled(hb_qsv_get_adapter_index(), HB_VCODEC_QSV_H265) ? HB_VCODEC_QSV_H265 : 0) |
+ (hb_qsv_video_encoder_is_enabled(hb_qsv_get_adapter_index(), HB_VCODEC_QSV_H265_10BIT) ? HB_VCODEC_QSV_H265_10BIT : 0));
+ 
+ return qsv_init_result;
 }
 
-int hb_qsv_video_encoder_is_enabled(int encoder)
+int hb_qsv_video_encoder_is_enabled(int adapter_index, int encoder)
 {
- switch (encoder)
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(adapter_index);
+
+ if (details)
 {
- case HB_VCODEC_QSV_H264:
- return hb_qsv_info_avc != NULL && hb_qsv_info_avc->available;
- case HB_VCODEC_QSV_H265_10BIT:
- if (qsv_hardware_generation(hb_get_cpu_platform()) < QSV_G6)
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return details->hb_qsv_info_avc != NULL && details->hb_qsv_info_avc->available;
+ case HB_VCODEC_QSV_H265_10BIT:
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_index)) < QSV_G6)
+ return 0;
+ case HB_VCODEC_QSV_H265:
+ return details->hb_qsv_info_hevc != NULL && details->hb_qsv_info_hevc->available;
+ default:
 return 0;
- case HB_VCODEC_QSV_H265:
- return hb_qsv_info_hevc != NULL && hb_qsv_info_hevc->available;
- default:
- return 0;
+ }
+ }
+ else
+ {
+ return 0;
 }
 }
 
@@ -277,7 +443,7 @@
 extCodingOption2->NumMbPerSlice = 2040; // 1920x1088/4
 }
 
-static int query_capabilities(mfxSession session, mfxVersion version, hb_qsv_info_t *info)
+static int query_capabilities(mfxSession session, int index, mfxVersion version, hb_qsv_info_t *info)
 {
 /*
 * MFXVideoENCODE_Query(mfxSession, mfxVideoParam *in, mfxVideoParam *out);
@@ -305,11 +471,13 @@
 /* Reset capabilities before querying */
 info->capabilities = 0;
 
+#if !HB_QSV_ONEVPL
 /* Load required MFX plug-ins */
- if ((mfxPluginList = hb_qsv_load_plugins(info, session, version)) == NULL)
+ if ((mfxPluginList = hb_qsv_load_plugins(index, info, session, version)) == NULL)
 {
 return 0; // the required plugin(s) couldn't be loaded
 }
+#endif
 
 /*
 * First of all, check availability of an encoder for
@@ -320,12 +488,14 @@
 */
 if (HB_CHECK_MFX_VERSION(version, HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR))
 {
+#if !HB_QSV_ONEVPL
 if (info->implementation & MFX_IMPL_AUDIO)
 {
 /* Not yet supported */
 return 0;
 }
 else
+#endif
 {
 mfxStatus mfxRes;
 init_video_param(&inputParam);
@@ -354,7 +524,7 @@
 * about it - however, it may fail for other encoders (ignore)
 */
 fprintf(stderr,
- "hb_qsv_info_init: MFXVideoENCODE_Init failed"
+ "query_capabilities: MFXVideoENCODE_Init failed"
 " (0x%"PRIX32", 0x%"PRIX32", %d)\n",
 info->codec_id, info->implementation, status);
 }
@@ -367,29 +537,30 @@
 /* Don't check capabilities for unavailable encoders */
 return 0;
 }
-
+#if !HB_QSV_ONEVPL
 if (info->implementation & MFX_IMPL_AUDIO)
 {
 /* We don't have any audio capability checks yet */
 return 0;
 }
 else
+#endif
 {
 /* Implementation-specific features that can't be queried */
 if (info->codec_id == MFX_CODEC_AVC || info->codec_id == MFX_CODEC_HEVC)
 {
- if (qsv_implementation_is_hardware(info->implementation))
+ if (hb_qsv_implementation_is_hardware(info->implementation))
 {
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G3)
 {
 info->capabilities |= HB_QSV_CAP_B_REF_PYRAMID;
 }
 if (info->codec_id == MFX_CODEC_HEVC &&
- qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G7)
+ (hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G7))
 {
 info->capabilities |= HB_QSV_CAP_LOWPOWER_ENCODE;
 }
- }
+ }
 else
 {
 if (HB_CHECK_MFX_VERSION(version, 1, 6))
@@ -491,7 +662,7 @@
 * about it - however, it may fail for other encoders (ignore)
 */
 fprintf(stderr,
- "hb_qsv_info_init: mfxExtVideoSignalInfo check"
+ "query_capabilities: mfxExtVideoSignalInfo check"
 " failed (0x%"PRIX32", 0x%"PRIX32", %d)\n",
 info->codec_id, info->implementation, status);
 }
@@ -523,7 +694,7 @@
 * about it - however, it may fail for other encoders (ignore)
 */
 fprintf(stderr,
- "hb_qsv_info_init: mfxExtCodingOption check"
+ "query_capabilities: mfxExtCodingOption check"
 " failed (0x%"PRIX32", 0x%"PRIX32", %d)\n",
 info->codec_id, info->implementation, status);
 }
@@ -572,16 +743,16 @@
 * - MBBRC requires G3 hardware (Haswell or equivalent)
 * - ExtBRC requires G2 hardware (Ivy Bridge or equivalent)
 */
- if (qsv_implementation_is_hardware(info->implementation) &&
- qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_implementation_is_hardware(info->implementation) &&
+ hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G3)
 {
 if (extCodingOption2.MBBRC)
 {
 info->capabilities |= HB_QSV_CAP_OPTION2_MBBRC;
 }
 }
- if (qsv_implementation_is_hardware(info->implementation) &&
- qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G2)
+ if (hb_qsv_implementation_is_hardware(info->implementation) &&
+ hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G2)
 {
 if (extCodingOption2.ExtBRC)
 {
@@ -596,8 +767,8 @@
 */
 if (HB_CHECK_MFX_VERSION(version, 1, 7))
 {
- if (qsv_implementation_is_hardware(info->implementation) &&
- qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_implementation_is_hardware(info->implementation) &&
+ hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G3)
 {
 if (extCodingOption2.Trellis)
 {
@@ -642,15 +813,29 @@
 else
 {
 fprintf(stderr,
- "hb_qsv_info_init: mfxExtCodingOption2 check failed (0x%"PRIX32", 0x%"PRIX32", %d)\n",
+ "query_capabilities: mfxExtCodingOption2 check failed (0x%"PRIX32", 0x%"PRIX32", %d)\n",
 info->codec_id, info->implementation, status);
 }
 }
+ if (HB_CHECK_MFX_VERSION(version, 1, 19))
+ {
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G7)
+ {
+ info->capabilities |= HB_QSV_CAP_VPP_SCALING;
+ }
+ }
+ if (HB_CHECK_MFX_VERSION(version, 1, 33))
+ {
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(index)) >= QSV_G7)
+ {
+ info->capabilities |= HB_QSV_CAP_VPP_INTERPOLATION;
+ }
+ }
 }
-
+#if !HB_QSV_ONEVPL
 /* Unload MFX plug-ins */
 hb_qsv_unload_plugins(&mfxPluginList, session, version);
-
+#endif
 return 0;
 }
 
@@ -662,104 +847,172 @@
 return hb_display_init(DRM_INTEL_DRIVER_NAME, VA_INTEL_DRIVER_NAMES);
 }
 
-int hb_qsv_info_init()
-{
- static int init_done = 0;
- if (init_done)
- return 0;
- init_done = 1;
+#if defined(_WIN32) || defined(__MINGW32__)
+static int hb_qsv_query_adapters(mfxAdaptersInfo* adapters_info);
+static int hb_qsv_make_adapters_list(const mfxAdaptersInfo* adapters_info, hb_list_t **qsv_adapters_list);
+static int hb_qsv_make_adapters_details_list(const mfxAdaptersInfo* adapters_info, hb_list_t **hb_qsv_adapter_details_list);
 
- /*
- * First, check for any MSDK version to determine whether one or
- * more implementations are present; then check if we can use them.
- *
- * I've had issues using a NULL version with some combinations of
- * hardware and driver, so use a low version number (1.0) instead.
- */
- mfxSession session;
- mfxVersion version = { .Major = 1, .Minor = 0, };
-#if defined(SYS_LINUX) || defined(SYS_FREEBSD)
- mfxIMPL hw_preference = MFX_IMPL_VIA_ANY;
-#else
- mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11;
-#endif
+mfxIMPL hb_qsv_dx_index_to_impl(int dx_index)
+{
+ mfxIMPL impl;
 
- // check for software fallback
- if (MFXInit(MFX_IMPL_SOFTWARE, &version, &session) == MFX_ERR_NONE)
+ switch (dx_index)
 {
- // Media SDK software found, but check that our minimum is supported
- MFXQueryVersion(session, &qsv_software_version);
- if (HB_CHECK_MFX_VERSION(qsv_software_version,
- HB_QSV_MINVERSION_MAJOR,
- HB_QSV_MINVERSION_MINOR))
 {
- query_capabilities(session, qsv_software_version, &qsv_software_info_avc);
- query_capabilities(session, qsv_software_version, &qsv_software_info_hevc);
- // now that we know which hardware encoders are
- // available, we can set the preferred implementation
- hb_qsv_impl_set_preferred("software");
+ case 0:
+ impl = MFX_IMPL_HARDWARE;
+ break;
+ case 1:
+ impl = MFX_IMPL_HARDWARE2;
+ break;
+ case 2:
+ impl = MFX_IMPL_HARDWARE3;
+ break;
+ case 3:
+ impl = MFX_IMPL_HARDWARE4;
+ break;
+
+ default:
+ // try searching on all display adapters
+ impl = MFX_IMPL_HARDWARE_ANY;
+ break;
 }
- MFXClose(session);
 }
+ return impl;
+}
+#endif
 
- // check for actual hardware support
- do{
- if (MFXInit(MFX_IMPL_HARDWARE_ANY | hw_preference, &version, &session) == MFX_ERR_NONE)
+static int hb_qsv_collect_adapters_details(hb_list_t *qsv_adapters_list, hb_list_t *hb_qsv_adapter_details_list)
+{
+ for (int i = 0; i < hb_list_count(hb_qsv_adapter_details_list); i++)
+ {
+ int *dx_index = (int *)hb_list_item(qsv_adapters_list, i);
+ hb_qsv_adapter_details_t *details = hb_list_item(hb_qsv_adapter_details_list, i);
+ details->index = *dx_index;
+ /*
+ * First, check for any MSDK version to determine whether one or
+ * more implementations are present; then check if we can use them.
+ *
+ * I've had issues using a NULL version with some combinations of
+ * hardware and driver, so use a low version number (1.0) instead.
+ */
+ mfxSession session;
+ mfxVersion version = { .Major = 1, .Minor = 0, };
+#if defined(_WIN32) || defined(__MINGW32__)
+ mfxIMPL hw_preference = MFX_IMPL_VIA_D3D11;
+#else
+ mfxIMPL hw_preference = MFX_IMPL_VIA_ANY;
+#endif
+ // check for software fallback
+ if (MFXInit(MFX_IMPL_SOFTWARE, &version, &session) == MFX_ERR_NONE)
 {
- // On linux, the handle to the VA display must be set.
- // This code is essentiall a NOP other platforms.
- hb_display_t * display = hb_qsv_display_init();
-
- if (display != NULL)
- {
- MFXVideoCORE_SetHandle(session, display->mfxType,
- (mfxHDL)display->handle);
- }
- // Media SDK hardware found, but check that our minimum is supported
- //
- // Note: this-party hardware (QSV_G0) is unsupported for the time being
- MFXQueryVersion(session, &qsv_hardware_version);
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G1 &&
- HB_CHECK_MFX_VERSION(qsv_hardware_version,
- HB_QSV_MINVERSION_MAJOR,
- HB_QSV_MINVERSION_MINOR))
+ // Media SDK software found, but check that our minimum is supported
+ MFXQueryVersion(session, &details->qsv_software_version);
+ if (HB_CHECK_MFX_VERSION(details->qsv_software_version,
+ HB_QSV_MINVERSION_MAJOR,
+ HB_QSV_MINVERSION_MINOR))
 {
- query_capabilities(session, qsv_hardware_version, &qsv_hardware_info_avc);
- qsv_hardware_info_avc.implementation = MFX_IMPL_HARDWARE_ANY | hw_preference;
- query_capabilities(session, qsv_hardware_version, &qsv_hardware_info_hevc);
- qsv_hardware_info_hevc.implementation = MFX_IMPL_HARDWARE_ANY | hw_preference;
+ query_capabilities(session, details->index, details->qsv_software_version, &details->qsv_software_info_avc);
+ query_capabilities(session, details->index, details->qsv_software_version, &details->qsv_software_info_hevc);
 // now that we know which hardware encoders are
 // available, we can set the preferred implementation
- hb_qsv_impl_set_preferred("hardware");
+ qsv_impl_set_preferred(details, "software");
 }
- hb_display_close(&display);
 MFXClose(session);
- hw_preference = 0;
 }
- else
- {
-#if !defined(SYS_LINUX) && !defined(SYS_FREEBSD)
- // Windows only: After D3D11 we will try D3D9
- if (hw_preference == MFX_IMPL_VIA_D3D11)
- hw_preference = MFX_IMPL_VIA_D3D9;
- else
+ // check for actual hardware support
+ do{
+#if defined(_WIN32) || defined(__MINGW32__)
+ mfxIMPL hw_impl = hb_qsv_dx_index_to_impl(details->index);
+#else
+ mfxIMPL hw_impl = MFX_IMPL_HARDWARE_ANY;
 #endif
+ if (MFXInit(hw_impl | hw_preference, &version, &session) == MFX_ERR_NONE)
+ {
+ // On linux, the handle to the VA display must be set.
+ // This code is essentially a NOP other platforms.
+ hb_display_t * display = hb_qsv_display_init();
+
+ if (display != NULL)
+ {
+ MFXVideoCORE_SetHandle(session, display->mfxType,
+ (mfxHDL)display->handle);
+ }
+ // Media SDK hardware found, but check that our minimum is supported
+ //
+ // Note: this-party hardware (QSV_G0) is unsupported for the time being
+ MFXQueryVersion(session, &details->qsv_hardware_version);
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(*dx_index)) >= QSV_G1 &&
+ HB_CHECK_MFX_VERSION(details->qsv_hardware_version,
+ HB_QSV_MINVERSION_MAJOR,
+ HB_QSV_MINVERSION_MINOR))
+ {
+ query_capabilities(session, details->index, details->qsv_hardware_version, &details->qsv_hardware_info_avc);
+ details->qsv_hardware_info_avc.implementation = hw_impl | hw_preference;
+ query_capabilities(session, details->index, details->qsv_hardware_version, &details->qsv_hardware_info_hevc);
+ details->qsv_hardware_info_hevc.implementation = hw_impl | hw_preference;
+ // now that we know which hardware encoders are
+ // available, we can set the preferred implementation
+ qsv_impl_set_preferred(details, "hardware");
+ }
+ hb_display_close(&display);
+ MFXClose(session);
 hw_preference = 0;
+ }
+ else
+ {
+#if defined(_WIN32) || defined(__MINGW32__)
+ // Windows only: After D3D11 we will try D3D9
+ if (hw_preference == MFX_IMPL_VIA_D3D11)
+ hw_preference = MFX_IMPL_VIA_D3D9;
+ else
+#endif
+ hw_preference = 0;
+ }
 }
+ while(hw_preference != 0);
 }
- while(hw_preference != 0);
-
- // success
 return 0;
 }
 
-static void log_capabilities(int log_level, uint64_t caps, const char *prefix)
+static void log_decoder_capabilities(const int log_level, const hb_qsv_adapter_details_t *adapter_details, const char *prefix)
+{
+ char buffer128 = "";
+
+ if (hb_qsv_decode_h264_is_supported(adapter_details->index))
+ {
+ strcat(buffer, " h264");
+ }
+
+ if (hb_qsv_decode_h265_10_bit_is_supported(adapter_details->index))
+ {
+ strcat(buffer, " hevc (8bit: yes, 10bit: yes)");
+ }
+ else if (hb_qsv_decode_h265_is_supported(adapter_details->index))
+ {
+ strcat(buffer, " hevc (8bit: yes, 10bit: no)");
+ }
+
+ if (hb_qsv_decode_av1_is_supported(adapter_details->index))
+ {
+ strcat(buffer, " av1 (8bit: yes, 10bit: yes)");
+ }
+
+ hb_deep_log(log_level, "%s%s", prefix,
+ strnlen(buffer, 1) ? buffer : " no decode support");
+}
+
+static void log_encoder_capabilities(const int log_level, const uint64_t caps, const char *prefix)
 {
 /*
 * Note: keep the string short, as it may be logged by default.
 */
 char buffer128 = "";
 
+ if (caps & HB_QSV_CAP_LOWPOWER_ENCODE)
+ {
+ strcat(buffer, " lowpower");
+ }
 /* B-Pyramid, with or without direct control (BRefType) */
 if (caps & HB_QSV_CAP_B_REF_PYRAMID)
 {
@@ -835,89 +1088,132 @@
 strnlen(buffer, 1) ? buffer : " standard feature set");
 }
 
-void hb_qsv_info_print()
+static void hb_qsv_adapter_info_print(const hb_qsv_adapter_details_t *adapter_details)
 {
- // is QSV available and usable?
- hb_log("Intel Quick Sync Video support: %s",
- hb_qsv_available() ? "yes": "no");
+ if (adapter_details->qsv_hardware_version.Version)
+ {
+ hb_log(" - Intel Media SDK hardware: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ adapter_details->qsv_hardware_version.Major, adapter_details->qsv_hardware_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
 
- if (hb_qsv_available())
+ if (adapter_details->qsv_software_version.Version)
 {
- // also print the details
- if (qsv_hardware_version.Version)
+ hb_deep_log(3, " - Intel Media SDK software: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
+ adapter_details->qsv_software_version.Major, adapter_details->qsv_software_version.Minor,
+ HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ }
+
+ log_decoder_capabilities(1, adapter_details, " - Decode support: ");
+
+ if (adapter_details->hb_qsv_info_avc != NULL && adapter_details->hb_qsv_info_avc->available)
+ {
+ hb_log(" - H.264 encoder: yes");
+ hb_log(" - preferred implementation: %s %s",
+ hb_qsv_impl_get_name(adapter_details->hb_qsv_info_avc->implementation),
+ hb_qsv_impl_get_via_name(adapter_details->hb_qsv_info_avc->implementation));
+ if (adapter_details->qsv_hardware_info_avc.available)
 {
- hb_log(" - Intel Media SDK hardware: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
- qsv_hardware_version.Major, qsv_hardware_version.Minor,
- HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ log_encoder_capabilities(1, adapter_details->qsv_hardware_info_avc.capabilities,
+ " - capabilities (hardware): ");
 }
-
- if (qsv_software_version.Version)
+ if (adapter_details->qsv_software_info_avc.available)
 {
- hb_log(" - Intel Media SDK software: API %"PRIu16".%"PRIu16" (minimum: %"PRIu16".%"PRIu16")",
- qsv_software_version.Major, qsv_software_version.Minor,
- HB_QSV_MINVERSION_MAJOR, HB_QSV_MINVERSION_MINOR);
+ log_encoder_capabilities(3, adapter_details->qsv_software_info_avc.capabilities,
+ " - capabilities (software): ");
 }
-
- if (hb_qsv_info_avc != NULL && hb_qsv_info_avc->available)
+ }
+ else
+ {
+ hb_log(" - H.264 encoder: no");
+ }
+ if (adapter_details->hb_qsv_info_hevc != NULL && adapter_details->hb_qsv_info_hevc->available)
+ {
+ hb_log(" - H.265 encoder: yes (8bit: yes, 10bit: %s)", (hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_details->index)) < QSV_G6) ? "no" : "yes" );
+ hb_log(" - preferred implementation: %s %s",
+ hb_qsv_impl_get_name(adapter_details->hb_qsv_info_hevc->implementation),
+ hb_qsv_impl_get_via_name(adapter_details->hb_qsv_info_hevc->implementation));
+ if (adapter_details->qsv_hardware_info_hevc.available)
 {
- hb_log(" - H.264 encoder: yes");
- hb_log(" - preferred implementation: %s %s",
- hb_qsv_impl_get_name(hb_qsv_info_avc->implementation),
- hb_qsv_impl_get_via_name(hb_qsv_info_avc->implementation));
- if (qsv_hardware_info_avc.available)
- {
- log_capabilities(1, qsv_hardware_info_avc.capabilities,
- " - capabilities (hardware): ");
- }
- if (qsv_software_info_avc.available)
- {
- log_capabilities(1, qsv_software_info_avc.capabilities,
- " - capabilities (software): ");
- }
+ log_encoder_capabilities(1, adapter_details->qsv_hardware_info_hevc.capabilities,
+ " - capabilities (hardware): ");
 }
- else
+ if (adapter_details->qsv_software_info_hevc.available)
 {
- hb_log(" - H.264 encoder: no");
+ log_encoder_capabilities(3, adapter_details->qsv_software_info_hevc.capabilities,
+ " - capabilities (software): ");
 }
- if (hb_qsv_info_hevc != NULL && hb_qsv_info_hevc->available)
+ }
+ else
+ {
+ hb_log(" - H.265 encoder: no");
+ }
+}
+
+void hb_qsv_info_print()
+{
+ // is QSV available and usable?
+ if (hb_qsv_available())
+ {
+#if defined(_WIN32) || defined(__MINGW32__)
+ if (g_qsv_adapters_list && hb_list_count(g_qsv_adapters_list))
 {
- hb_log(" - H.265 encoder: yes (8bit: yes, 10bit: %s)", (qsv_hardware_generation(hb_get_cpu_platform()) < QSV_G6) ? "no" : "yes" );
- hb_log(" - preferred implementation: %s %s",
- hb_qsv_impl_get_name(hb_qsv_info_hevc->implementation),
- hb_qsv_impl_get_via_name(hb_qsv_info_hevc->implementation));
- if (qsv_hardware_info_hevc.available)
+ char gpu_list_str256 = "";
+ for (int i = 0; i < hb_list_count(g_qsv_adapters_list); i++)
 {
- log_capabilities(1, qsv_hardware_info_hevc.capabilities,
- " - capabilities (hardware): ");
- }
- if (qsv_software_info_hevc.available)
- {
- log_capabilities(1, qsv_software_info_hevc.capabilities,
- " - capabilities (software): ");
+ char value_str256;
+ int *value = hb_list_item(g_qsv_adapters_list, i);
+ sprintf(value_str, "%d", *value);
+ if (i > 0)
+ strcat(gpu_list_str, ", ");
+ strcat(gpu_list_str, value_str);
 }
+ hb_log("Intel Quick Sync Video support: yes, gpu list: %s", gpu_list_str);
 }
 else
+#endif
 {
- hb_log(" - H.265 encoder: no");
+ hb_log("Intel Quick Sync Video support: yes");
 }
+ // also print the details about all QSV adapters
+ for (int i = 0; i < hb_list_count(g_qsv_adapters_details_list); i++)
+ {
+ const hb_qsv_adapter_details_t *details = hb_list_item(g_qsv_adapters_details_list, i);
+#if defined(_WIN32) || defined(__MINGW32__)
+ mfxAdapterInfo* info = &g_qsv_adapters_info.Adaptersi;
+ hb_log("Intel Quick Sync Video %s adapter with index %d", hb_qsv_get_adapter_type(info), details->index);
+#endif
+ hb_qsv_adapter_info_print(details);
+ }
+ }
+ else
+ {
+ hb_log("Intel Quick Sync Video support: no");
 }
 }
 
-hb_qsv_info_t* hb_qsv_info_get(int encoder)
+hb_qsv_info_t* hb_qsv_encoder_info_get(int adapter_index, int encoder)
 {
- switch (encoder)
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(adapter_index);
+
+ if (details)
 {
- case HB_VCODEC_QSV_H264:
- return hb_qsv_info_avc;
- case HB_VCODEC_QSV_H265_10BIT:
- case HB_VCODEC_QSV_H265:
- return hb_qsv_info_hevc;
- default:
- return NULL;
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ return details->hb_qsv_info_avc;
+ case HB_VCODEC_QSV_H265_10BIT:
+ case HB_VCODEC_QSV_H265:
+ return details->hb_qsv_info_hevc;
+ default:
+ return NULL;
+ }
 }
+ return NULL;
 }
 
-hb_list_t* hb_qsv_load_plugins(hb_qsv_info_t *info, mfxSession session, mfxVersion version)
+#if !HB_QSV_ONEVPL
+hb_list_t* hb_qsv_load_plugins(int index, hb_qsv_info_t *info, mfxSession session, mfxVersion version)
 {
 hb_list_t *mfxPluginList = hb_list_init();
 if (mfxPluginList == NULL)
@@ -928,10 +1224,10 @@
 
 if (HB_CHECK_MFX_VERSION(version, 1, 8))
 {
- if (info->codec_id == MFX_CODEC_HEVC && !(qsv_hardware_generation(hb_get_cpu_platform()) < QSV_G5))
+ if (info->codec_id == MFX_CODEC_HEVC && !(hb_qsv_hardware_generation(hb_qsv_get_platform(index)) < QSV_G5))
 {
 if (HB_CHECK_MFX_VERSION(version, 1, 15) &&
- qsv_implementation_is_hardware(info->implementation))
+ hb_qsv_implementation_is_hardware(info->implementation))
 {
 if (MFXVideoUSER_Load(session, &MFX_PLUGINID_HEVCE_HW, 0) == MFX_ERR_NONE)
 {
@@ -972,6 +1268,7 @@
 }
 hb_list_close(_l);
 }
+#endif
 
 const char* hb_qsv_decode_get_codec_name(enum AVCodecID codec_id)
 {
@@ -986,48 +1283,174 @@
 case AV_CODEC_ID_MPEG2VIDEO:
 return "mpeg2_qsv";
 
+ case AV_CODEC_ID_AV1:
+ return "av1_qsv";
+
 default:
 return NULL;
 }
 }
 
+int hb_qsv_decode_h264_is_supported(int adapter_index)
+{
+ return hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_index)) >= QSV_G1;
+}
+
+int hb_qsv_decode_h265_is_supported(int adapter_index)
+{
+ return hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_index)) >= QSV_G5;
+}
+
+int hb_qsv_decode_h265_10_bit_is_supported(int adapter_index)
+{
+ return hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_index)) >= QSV_G6;
+}
+
+int hb_qsv_decode_av1_is_supported(int adapter_index)
+{
+ return hb_qsv_hardware_generation(hb_qsv_get_platform(adapter_index)) >= QSV_G8;
+}
+
+int hb_qsv_decode_codec_supported_codec(int adapter_index, int video_codec_param, int pix_fmt)
+{
+ switch (video_codec_param)
+ {
+ case AV_CODEC_ID_H264:
+ if (pix_fmt == AV_PIX_FMT_NV12 ||
+ pix_fmt == AV_PIX_FMT_YUV420P ||
+ pix_fmt == AV_PIX_FMT_YUVJ420P)
+ {
+ return hb_qsv_decode_h264_is_supported(adapter_index);
+ }
+ break;
+ case AV_CODEC_ID_HEVC:
+ if (pix_fmt == AV_PIX_FMT_NV12 ||
+ pix_fmt == AV_PIX_FMT_YUV420P ||
+ pix_fmt == AV_PIX_FMT_YUVJ420P)
+ {
+ return hb_qsv_decode_h265_is_supported(adapter_index);
+ }
+ else if (pix_fmt == AV_PIX_FMT_P010LE ||
+ pix_fmt == AV_PIX_FMT_YUV420P10)
+ {
+ return hb_qsv_decode_h265_10_bit_is_supported(adapter_index);
+ }
+ break;
+ case AV_CODEC_ID_AV1:
+ if (pix_fmt == AV_PIX_FMT_NV12 ||
+ pix_fmt == AV_PIX_FMT_P010LE ||
+ pix_fmt == AV_PIX_FMT_YUV420P ||
+ pix_fmt == AV_PIX_FMT_YUVJ420P ||
+ pix_fmt == AV_PIX_FMT_YUV420P10)
+ {
+ return hb_qsv_decode_av1_is_supported(adapter_index);
+ }
+ break;
+ default:
+ return 0;
+ }
+ return 0;
+}
+
+int hb_qsv_setup_job(hb_job_t *job)
+{
+#if defined(_WIN32) || defined(__MINGW32__)
+ if (job->qsv.ctx && job->qsv.ctx->dx_index >= 0)
+ {
+ hb_qsv_param_parse_dx_index(job, job->qsv.ctx->dx_index);
+ }
+ hb_qsv_parse_adapter_index(job);
+#endif
+ int async_depth_default = hb_qsv_param_default_async_depth();
+ if (job->qsv.async_depth <= 0 || job->qsv.async_depth > async_depth_default)
+ {
+ job->qsv.async_depth = async_depth_default;
+ }
+ // Make sure QSV Decode is only True if the selected QSV adapter supports decode.
+ job->qsv.decode = job->qsv.decode && hb_qsv_available();
+ return 0;
+}
+
 int hb_qsv_decode_is_enabled(hb_job_t *job)
 {
 return ((job != NULL && job->qsv.decode) &&
 (job->title->video_decode_support & HB_DECODE_SUPPORT_QSV)) &&
- (job->vcodec == HB_VCODEC_QSV_H265 ? (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G5) : 1) &&
- (job->vcodec == HB_VCODEC_QSV_H265_10BIT ? (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G6) : 1);
+ hb_qsv_decode_codec_supported_codec(hb_qsv_get_adapter_index(),
+ job->title->video_codec_param, job->input_pix_fmt);
 }
 
 static int hb_dxva2_device_check();
 static int hb_d3d11va_device_check();
 
+int hb_qsv_hw_filters_are_enabled(hb_job_t *job)
+{
+ return job && job->qsv.ctx && job->qsv.ctx->qsv_filters_are_enabled;
+}
+
+int hb_qsv_is_enabled(hb_job_t *job)
+{
+ return hb_qsv_decode_is_enabled(job) || hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
+}
+
+static int hb_qsv_get_bit_depth_by_codec(int codec_id)
+{
+ int pix_fmt_bit_depth = 0;
+
+ switch (codec_id)
+ {
+ case HB_VCODEC_QSV_H264:
+ case HB_VCODEC_QSV_H265_8BIT:
+ pix_fmt_bit_depth = 8;
+ break;
+ case HB_VCODEC_QSV_H265_10BIT:
+ pix_fmt_bit_depth = 10;
+ break;
+ default:
+ break;
+ }
+ return pix_fmt_bit_depth;
+}
+
 int hb_qsv_full_path_is_enabled(hb_job_t *job)
 {
 static int device_check_completed = 0;
- static int device_check_succeded = 0;
- int filter_count = hb_list_count(job->list_filter);
+ static int device_check_succeeded = 0;
+ int qsv_full_path_is_enabled = 0;
+ hb_qsv_info_t *info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
 
 if(!device_check_completed)
 {
- device_check_succeded = ((hb_d3d11va_device_check() >= 0)
- || (hb_dxva2_device_check() == 0)) ? 1 : 0;
+ device_check_succeeded = (hb_d3d11va_device_check() >= 0) ? 1 : 0;
 device_check_completed = 1;
 }
- return (hb_qsv_decode_is_enabled(job) &&
- hb_qsv_info_get(job->vcodec) &&
- device_check_succeded &&
- (filter_count == 0));
+
+ int title_bit_depth = hb_get_bit_depth(job->title->pix_fmt);
+ int pix_fmt_bit_depth = hb_qsv_get_bit_depth_by_codec(job->vcodec);
+
+ if (pix_fmt_bit_depth != title_bit_depth)
+ {
+ return 0;
+ }
+
+ qsv_full_path_is_enabled = (hb_qsv_decode_is_enabled(job) &&
+ info && hb_qsv_implementation_is_hardware(info->implementation) &&
+ device_check_succeeded && job->qsv.ctx && !job->qsv.ctx->num_cpu_filters);
+ return qsv_full_path_is_enabled;
 }
 
 int hb_qsv_copyframe_is_slow(int encoder)
 {
- hb_qsv_info_t *info = hb_qsv_info_get(encoder);
- if (info != NULL && qsv_implementation_is_hardware(info->implementation))
+ hb_qsv_info_t *info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), encoder);
+ if (info != NULL && hb_qsv_implementation_is_hardware(info->implementation))
 {
- // we should really check the driver version, but since it's not
- // available, checking the API version is the best we can do :-(
- return !HB_CHECK_MFX_VERSION(qsv_hardware_version, 1, 7);
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(hb_qsv_get_adapter_index());
+ if (details)
+ {
+ // we should really check the driver version, but since it's not
+ // available, checking the API version is the best we can do :-(
+ return !HB_CHECK_MFX_VERSION(details->qsv_hardware_version, 1, 7);
+ }
+ return 0;
 }
 return 0;
 }
@@ -1138,7 +1561,7 @@
 return v;
 }
 
-int hb_qsv_param_parse(hb_qsv_param_t *param, hb_qsv_info_t *info,
+int hb_qsv_param_parse(hb_qsv_param_t *param, hb_qsv_info_t *info, hb_job_t *job,
 const char *key, const char *value)
 {
 float fvalue;
@@ -1623,7 +2046,57 @@
 return HB_QSV_PARAM_UNSUPPORTED;
 }
 }
- else
+#if defined(_WIN32) || defined(__MINGW32__)
+ else if (!strcasecmp(key, "gpu"))
+ {
+ // Check if was parsed already in decoder initialization
+ if (job->qsv.ctx && !job->qsv.ctx->qsv_device)
+ {
+ int gpu_index = hb_qsv_atoi(value, &error);
+ if (!error)
+ {
+ hb_qsv_param_parse_dx_index(job, gpu_index);
+ }
+ }
+ }
+#endif
+ else if (!strcasecmp(key, "scalingmode") ||
+ !strcasecmp(key, "vpp-sm"))
+ {
+ // Already parsed it in decoder but need to check support
+ if (info->capabilities & HB_QSV_CAP_VPP_SCALING)
+ {
+ hb_triplet_t *mode = NULL;
+ mode = hb_triplet4key(hb_qsv_vpp_scale_modes, value);
+ if (!mode)
+ {
+ error = HB_QSV_PARAM_BAD_VALUE;
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else if (!strcasecmp(key, "interpolationmethod") ||
+ !strcasecmp(key, "vpp-im"))
+ {
+ // Already parsed it in decoder but need to check support
+ if (info->capabilities & HB_QSV_CAP_VPP_INTERPOLATION)
+ {
+ hb_triplet_t *method = NULL;
+ method = hb_triplet4key(hb_qsv_vpp_interpolation_methods, value);
+ if (!method)
+ {
+ error = HB_QSV_PARAM_BAD_VALUE;
+ }
+ }
+ else
+ {
+ return HB_QSV_PARAM_UNSUPPORTED;
+ }
+ }
+ else
 {
 /*
 * TODO:
@@ -1653,7 +2126,7 @@
 
 /* HEVC10 supported starting from KBL/G6 */
 if (profile->value == MFX_PROFILE_HEVC_MAIN10 &&
- qsv_hardware_generation(hb_get_cpu_platform()) < QSV_G6)
+ hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) < QSV_G6)
 {
 hb_log("qsv: HEVC Main10 is not supported on this platform");
 profile = NULL;
@@ -1670,11 +2143,11 @@
 }
 param->videoParam->mfx.CodecProfile = profile->value;
 }
- /* HEVC 10 bits defautls to Main 10 */
+ /* HEVC 10 bits defaults to Main 10 */
 else if (((profile_key != NULL && !strcasecmp(profile_key, "auto")) || profile_key == NULL) &&
 codec == HB_VCODEC_QSV_H265_10BIT &&
 param->videoParam->mfx.CodecId == MFX_CODEC_HEVC &&
- qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G6)
+ hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G6)
 {
 profile = &hb_qsv_h265_profiles1;
 param->videoParam->mfx.CodecProfile = profile->value;
@@ -1726,7 +2199,7 @@
 
 const char* const* hb_qsv_preset_get_names()
 {
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G3)
 {
 return hb_qsv_preset_names2;
 }
@@ -1765,22 +2238,41 @@
 }
 }
 
+const int* hb_qsv_get_pix_fmts(int encoder)
+{
+ switch (encoder)
+ {
+ case HB_VCODEC_QSV_H264:
+ case HB_VCODEC_QSV_H265:
+ return hb_qsv_pix_fmts;
+ case HB_VCODEC_QSV_H265_10BIT:
+ return hb_qsv_10bit_pix_fmts;
+
+ default:
+ return hb_qsv_pix_fmts;
+ }
+}
+
 const char* hb_qsv_video_quality_get_name(uint32_t codec)
 {
 uint64_t caps = 0;
- switch (codec)
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(hb_qsv_get_adapter_index());
+ if (details)
 {
- case HB_VCODEC_QSV_H264:
- if (hb_qsv_info_avc != NULL) caps = hb_qsv_info_avc->capabilities;
- break;
+ switch (codec)
+ {
+ case HB_VCODEC_QSV_H264:
+ if (details->hb_qsv_info_avc != NULL) caps = details->hb_qsv_info_avc->capabilities;
+ break;
 
- case HB_VCODEC_QSV_H265_10BIT:
- case HB_VCODEC_QSV_H265:
- if (hb_qsv_info_hevc != NULL) caps = hb_qsv_info_hevc->capabilities;
- break;
+ case HB_VCODEC_QSV_H265_10BIT:
+ case HB_VCODEC_QSV_H265:
+ if (details->hb_qsv_info_hevc != NULL) caps = details->hb_qsv_info_hevc->capabilities;
+ break;
 
- default:
- break;
+ default:
+ break;
+ }
 }
 return (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? "ICQ" : "QP";
 }
@@ -1789,25 +2281,29 @@
 float *granularity, int *direction)
 {
 uint64_t caps = 0;
- switch (codec)
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(hb_qsv_get_adapter_index());
+ if (details)
 {
- case HB_VCODEC_QSV_H265_10BIT:
- case HB_VCODEC_QSV_H265:
- if (hb_qsv_info_hevc != NULL) caps = hb_qsv_info_hevc->capabilities;
- *direction = 1;
- *granularity = 1.;
- *low = (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? 1. : 0.;
- *high = 51.;
- break;
+ switch (codec)
+ {
+ case HB_VCODEC_QSV_H265_10BIT:
+ case HB_VCODEC_QSV_H265:
+ if (details->hb_qsv_info_hevc != NULL) caps = details->hb_qsv_info_hevc->capabilities;
+ *direction = 1;
+ *granularity = 1.;
+ *low = (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? 1. : 0.;
+ *high = 51.;
+ break;
 
- case HB_VCODEC_QSV_H264:
- default:
- if (hb_qsv_info_avc != NULL) caps = hb_qsv_info_avc->capabilities;
- *direction = 1;
- *granularity = 1.;
- *low = (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? 1. : 0.;
- *high = 51.;
- break;
+ case HB_VCODEC_QSV_H264:
+ default:
+ if (details->hb_qsv_info_avc != NULL) caps = details->hb_qsv_info_avc->capabilities;
+ *direction = 1;
+ *granularity = 1.;
+ *low = (caps & HB_QSV_CAP_RATECONTROL_ICQ) ? 1. : 0.;
+ *high = 51.;
+ break;
+ }
 }
 }
 
@@ -1825,7 +2321,7 @@
 }
 else
 {
- hb_error("hb_qsv_param_default_preset: invalid pointer(s)");
+ hb_error("hb_qsv_param_default_preset: invalid pointer(s) param=%p videoParam=%p info=%p preset=%p", param, videoParam, info, preset);
 return -1;
 }
 if (preset != NULL && preset0 != '\0')
@@ -1859,7 +2355,7 @@
 * LookAhead: 0 (off)
 * LookAheadDepth: Not Applicable
 */
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G3)
 {
 param->rc.lookahead = 0;
 param->videoParam->mfx.NumRefFrame = 1;
@@ -1884,7 +2380,14 @@
 }
 else if (!strcasecmp(preset, "speed"))
 {
- if (qsv_hardware_generation(hb_get_cpu_platform()) >= QSV_G3)
+ if (hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G7)
+ {
+ // Since IceLake only
+ param->rc.lookahead = 0;
+ param->videoParam->mfx.NumRefFrame = 1;
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_7;
+ }
+ else if (hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G3)
 {
 /*
 * HSW TargetUsage: 6
@@ -1930,6 +2433,11 @@
 return 0;
 }
 
+int hb_qsv_param_default_async_depth()
+{
+ return hb_qsv_hardware_generation(hb_qsv_get_platform(hb_qsv_get_adapter_index())) >= QSV_G7 ? 6 : HB_QSV_ASYNC_DEPTH_DEFAULT;
+}
+
 int hb_qsv_param_default(hb_qsv_param_t *param, mfxVideoParam *videoParam,
 hb_qsv_info_t *info)
 {
@@ -2021,7 +2529,7 @@
 param->videoParam->Protected = 0; // reserved, must be 0
 param->videoParam->NumExtParam = 0;
 param->videoParam->IOPattern = MFX_IOPATTERN_IN_SYSTEM_MEMORY;
- param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_2;
+ param->videoParam->mfx.TargetUsage = MFX_TARGETUSAGE_BALANCED;
 param->videoParam->mfx.GopOptFlag = MFX_GOP_CLOSED;
 param->videoParam->mfx.NumThread = 0; // deprecated, must be 0
 param->videoParam->mfx.EncodedOrder = 0; // input is in display order
@@ -2030,8 +2538,9 @@
 param->videoParam->mfx.NumRefFrame = 0; // use Media SDK default
 param->videoParam->mfx.GopPicSize = 0; // use Media SDK default
 param->videoParam->mfx.GopRefDist = 0; // use Media SDK default
+ param->videoParam->mfx.LowPower = MFX_CODINGOPTION_OFF; // use Media SDK default
 // introduced in API 1.1
- param->videoParam->AsyncDepth = HB_QSV_ASYNC_DEPTH_DEFAULT;
+ param->videoParam->AsyncDepth = hb_qsv_param_default_async_depth();
 // introduced in API 1.3
 param->videoParam->mfx.BRCParamMultiplier = 0; // no multiplier
 
@@ -2053,6 +2562,10 @@
 {
 param->videoParam->ExtParamparam->videoParam->NumExtParam++ = (mfxExtBuffer*)&param->codingOption2;
 }
+ if (info->capabilities & HB_QSV_CAP_LOWPOWER_ENCODE)
+ {
+ param->videoParam->mfx.LowPower = MFX_CODINGOPTION_ON;
+ }
 }
 else
 {
@@ -2210,39 +2723,6 @@
 return frametype;
 }
 
-int hb_qsv_impl_set_preferred(const char *name)
-{
- if (name == NULL)
- {
- return -1;
- }
- if (!strcasecmp(name, "software"))
- {
- if (qsv_software_info_avc.available)
- {
- hb_qsv_info_avc = &qsv_software_info_avc;
- }
- if (qsv_software_info_hevc.available)
- {
- hb_qsv_info_hevc = &qsv_software_info_hevc;
- }
- return 0;
- }
- if (!strcasecmp(name, "hardware"))
- {
- if (qsv_hardware_info_avc.available)
- {
- hb_qsv_info_avc = &qsv_hardware_info_avc;
- }
- if (qsv_hardware_info_hevc.available)
- {
- hb_qsv_info_hevc = &qsv_hardware_info_hevc;
- }
- return 0;
- }
- return -1;
-}
-
 const char* hb_qsv_impl_get_name(int impl)
 {
 switch (MFX_IMPL_BASETYPE(impl))
@@ -2287,20 +2767,17 @@
 void hb_qsv_force_workarounds()
 {
 #define FORCE_WORKAROUNDS ~(HB_QSV_CAP_OPTION2_BREFTYPE)
- qsv_software_info_avc.capabilities &= FORCE_WORKAROUNDS;
- qsv_hardware_info_avc.capabilities &= FORCE_WORKAROUNDS;
- qsv_software_info_hevc.capabilities &= FORCE_WORKAROUNDS;
- qsv_hardware_info_hevc.capabilities &= FORCE_WORKAROUNDS;
+ hb_qsv_adapter_details_t* details = hb_qsv_get_adapters_details_by_index(hb_qsv_get_adapter_index());
+ if (details)
+ {
+ details->qsv_software_info_avc.capabilities &= FORCE_WORKAROUNDS;
+ details->qsv_hardware_info_avc.capabilities &= FORCE_WORKAROUNDS;
+ details->qsv_software_info_hevc.capabilities &= FORCE_WORKAROUNDS;
+ details->qsv_hardware_info_hevc.capabilities &= FORCE_WORKAROUNDS;
+ }
 #undef FORCE_WORKAROUNDS
 }
 
-AVBufferRef *enc_hw_frames_ctx = NULL;
-extern EncQSVFramesContext hb_enc_qsv_frames_ctx;
-AVBufferRef *hb_hw_device_ctx = NULL;
-char *qsv_device = NULL;
-mfxHDL device_manager_handle = NULL;
-mfxHandleType device_handle_type = MFX_HANDLE_D3D11_DEVICE;
-
 #if defined(_WIN32) || defined(__MINGW32__)
 // Direct X
 #define COBJMACROS
@@ -2317,6 +2794,163 @@
 typedef HRESULT WINAPI pDirect3DCreate9Ex(UINT, IDirect3D9Ex **);
 typedef HRESULT(WINAPI *HB_PFN_CREATE_DXGI_FACTORY)(REFIID riid, void **ppFactory);
 
+int hb_qsv_info_init()
+{
+ // Collect the information about qsv adapters
+ g_qsv_adapters_info.Adapters = NULL;
+ g_qsv_adapters_info.NumAlloc = 0;
+ g_qsv_adapters_info.NumActual = 0;
+ int err = hb_qsv_query_adapters(&g_qsv_adapters_info);
+ if (err)
+ {
+ return -1;
+ }
+ hb_qsv_make_adapters_list(&g_qsv_adapters_info, &g_qsv_adapters_list);
+ hb_qsv_make_adapters_details_list(&g_qsv_adapters_info, &g_qsv_adapters_details_list);
+ hb_qsv_collect_adapters_details(g_qsv_adapters_list, g_qsv_adapters_details_list);
+ return 0;
+}
+
+int hb_qsv_set_adapter_index(int adapter_index)
+{
+ if (g_adapter_index == adapter_index)
+ return 0;
+
+ for (int i = 0; i < g_qsv_adapters_info.NumActual; i++)
+ {
+ mfxAdapterInfo* info = &g_qsv_adapters_info.Adaptersi;
+ if (info && (info->Number == adapter_index))
+ {
+ g_adapter_index = adapter_index;
+ return 0;
+ }
+ }
+ hb_error("hb_qsv_set_adapter_index: incorrect qsv device index %d", adapter_index);
+ return -1;
+}
+
+int qsv_map_mfx_platform_codename(int mfx_platform_codename)
+{
+ int platform = HB_CPU_PLATFORM_UNSPECIFIED;
+
+ switch (mfx_platform_codename)
+ {
+ case MFX_PLATFORM_SANDYBRIDGE:
+ platform = HB_CPU_PLATFORM_INTEL_SNB;
+ break;
+ case MFX_PLATFORM_IVYBRIDGE:
+ platform = HB_CPU_PLATFORM_INTEL_IVB;
+ break;
+ case MFX_PLATFORM_HASWELL:
+ platform = HB_CPU_PLATFORM_INTEL_HSW;
+ break;
+ case MFX_PLATFORM_BAYTRAIL:
+ case MFX_PLATFORM_BROADWELL:
+ platform = HB_CPU_PLATFORM_INTEL_BDW;
+ break;
+ case MFX_PLATFORM_CHERRYTRAIL:
+ platform = HB_CPU_PLATFORM_INTEL_CHT;
+ break;
+ case MFX_PLATFORM_SKYLAKE:
+ platform = HB_CPU_PLATFORM_INTEL_SKL;
+ break;
+ case MFX_PLATFORM_APOLLOLAKE:
+ case MFX_PLATFORM_KABYLAKE:
+ platform = HB_CPU_PLATFORM_INTEL_KBL;
+ break;
+#if (MFX_VERSION >= 1025)
+ case MFX_PLATFORM_GEMINILAKE:
+ case MFX_PLATFORM_COFFEELAKE:
+ case MFX_PLATFORM_CANNONLAKE:
+ platform = HB_CPU_PLATFORM_INTEL_KBL;
+ break;
+#endif
+#if (MFX_VERSION >= 1027)
+ case MFX_PLATFORM_ICELAKE:
+ platform = HB_CPU_PLATFORM_INTEL_ICL;
+ break;
+#endif
+#if (MFX_VERSION >= 1031)
+ case MFX_PLATFORM_ELKHARTLAKE:
+ case MFX_PLATFORM_JASPERLAKE:
+ case MFX_PLATFORM_TIGERLAKE:
+ case MFX_PLATFORM_ROCKETLAKE:
+ case MFX_PLATFORM_ALDERLAKE_S:
+ platform = HB_CPU_PLATFORM_INTEL_TGL;
+ break;
+#endif
+ default:
+ platform = HB_CPU_PLATFORM_UNSPECIFIED;
+ }
+ return platform;
+}
+
+static void hb_qsv_free_adapters_details()
+{
+ for (int i = 0; i < hb_list_count(g_qsv_adapters_details_list); i++)
+ {
+ hb_qsv_adapter_details_t *details = hb_list_item(g_qsv_adapters_details_list, i);
+ if (details->index)
+ {
+ av_free(details);
+ }
+ }
+}
+
+static const char* hb_qsv_get_adapter_type(const mfxAdapterInfo* info)
+{
+ if (info)
+ {
+ return (info->Platform.MediaAdapterType == MFX_MEDIA_INTEGRATED) ? "integrated" :
+ (info->Platform.MediaAdapterType == MFX_MEDIA_DISCRETE) ? "discrete" : "unknown";
+ }
+ return NULL;
+}
+
+int hb_qsv_get_platform(int adapter_index)
+{
+ for (int i = 0; i < g_qsv_adapters_info.NumActual; i++)
+ {
+ mfxAdapterInfo* info = &g_qsv_adapters_info.Adaptersi;
+ // find DirectX adapter with given index in list of QSV adapters
+ // if -1 use first adapter with highest priority
+ if (info && ((info->Number == adapter_index) || (adapter_index == -1)))
+ {
+ return qsv_map_mfx_platform_codename(info->Platform.CodeName);
+ }
+ }
+ return HB_CPU_PLATFORM_UNSPECIFIED;
+}
+
+int hb_qsv_param_parse_dx_index(hb_job_t *job, const int dx_index)
+{
+ for (int i = 0; i < g_qsv_adapters_info.NumActual; i++)
+ {
+ mfxAdapterInfo* info = &g_qsv_adapters_info.Adaptersi;
+ // find DirectX adapter with given index in list of QSV adapters
+ // if -1 use first adapter with highest priority
+ if (info && ((info->Number == dx_index) || (dx_index == -1)))
+ {
+ if (job->qsv.ctx && !job->qsv.ctx->qsv_device)
+ {
+ job->qsv.ctx->qsv_device = av_mallocz_array(32, sizeof(*job->qsv.ctx->qsv_device));
+ if (!job->qsv.ctx->qsv_device)
+ {
+ hb_error("hb_qsv_param_parse_dx_index: failed to allocate memory for qsv device");
+ return -1;
+ }
+ }
+ sprintf(job->qsv.ctx->qsv_device, "%u", info->Number);
+ job->qsv.ctx->dx_index = info->Number;
+ hb_log("qsv: %s qsv adapter with index %s has been selected", hb_qsv_get_adapter_type(info), job->qsv.ctx->qsv_device);
+ hb_qsv_set_adapter_index(info->Number);
+ return 0;
+ }
+ }
+ hb_error("qsv: hb_qsv_param_parse_dx_index incorrect qsv device index %d", dx_index);
+ return -1;
+}
+
 static int hb_dxva2_device_create9(HMODULE d3dlib, UINT adapter, IDirect3D9 **d3d9_out)
 {
 pDirect3DCreate9 *createD3D = (pDirect3DCreate9 *)hb_dlsym(d3dlib, "Direct3DCreate9");
@@ -2355,7 +2989,7 @@
 return 0;
 }
 
-static int hb_d3d11va_device_check()
+static int hb_d3d11va_device_create(int adapter_id, ID3D11Device** d3d11_out)
 {
 HANDLE d3dlib, dxgilib;
 
@@ -2379,39 +3013,53 @@
 
 HRESULT hr;
 IDXGIAdapter *pAdapter = NULL;
- int adapter_id = 0;
 IDXGIFactory2 *pDXGIFactory;
 hr = mCreateDXGIFactory(&IID_IDXGIFactory2, (void **)&pDXGIFactory);
+ if (FAILED(hr)) {
+ hb_error("hb_d3d11va_create_device: mCreateDXGIFactory returned %d", hr);
+ return -1;
+ }
+
+ if (adapter_id == -1)
+ {
+ adapter_id = 0;
+ }
+
 while (IDXGIFactory2_EnumAdapters(pDXGIFactory, adapter_id++, &pAdapter) != DXGI_ERROR_NOT_FOUND)
 {
- ID3D11Device* g_pd3dDevice = NULL;
+ ID3D11Device* pd3dDevice = NULL;
 DXGI_ADAPTER_DESC adapterDesc;
 
- hr = mD3D11CreateDevice(pAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, NULL, 0, D3D11_SDK_VERSION, &g_pd3dDevice, NULL, NULL);
- if (FAILED(hr)) {
- hb_error("hb_d3d11va_device_check: D3D11CreateDevice returned %d", hr);
- continue;
- }
-
 hr = IDXGIAdapter2_GetDesc(pAdapter, &adapterDesc);
- if (FAILED(hr)) {
+ if (SUCCEEDED(hr)) {
+ if (adapterDesc.VendorId == 0x8086) {
+ hr = mD3D11CreateDevice(pAdapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, D3D11_CREATE_DEVICE_VIDEO_SUPPORT, NULL, 0, D3D11_SDK_VERSION, &pd3dDevice, NULL, NULL);
+ if (SUCCEEDED(hr)) {
+ IDXGIFactory2_Release(pDXGIFactory);
+ *d3d11_out = (ID3D11Device *)pd3dDevice;
+ return adapter_id - 1;
+ } else {
+ hb_error("hb_d3d11va_device_check: D3D11CreateDevice returned %d", hr);
+ }
+ }
+ } else {
 hb_error("hb_d3d11va_device_check: IDXGIAdapter2_GetDesc returned %d", hr);
- continue;
 }
 
 if (pAdapter)
 IDXGIAdapter_Release(pAdapter);
-
- if (adapterDesc.VendorId == 0x8086) {
- IDXGIFactory2_Release(pDXGIFactory);
- hb_log("hb_d3d11va_device_check: QSV adapter with id %d has been found", adapter_id - 1);
- return adapter_id - 1;
- }
 }
+
 IDXGIFactory2_Release(pDXGIFactory);
 return -1;
 }
 
+static int hb_d3d11va_device_check()
+{
+ ID3D11Device* d3d11 = NULL;
+ return hb_d3d11va_device_create(-1, &d3d11);
+}
+
 static int hb_dxva2_device_check()
 {
 HRESULT hr;
@@ -2527,125 +3175,578 @@
 
 static int hb_qsv_find_surface_idx(const QSVMid *mids, const int nb_mids, const QSVMid *mid)
 {
- if(mids)
+ if (mids)
 {
- const QSVMid *m = &mids0;
- if (m->texture != mid->texture)
- return -1;
 int i;
 for (i = 0; i < nb_mids; i++) {
- m = &midsi;
- if ( m->handle == mid->handle )
+ const QSVMid *m = &midsi;
+ if ((m->handle_pair->first == mid->handle_pair->first) &&
+ (m->handle_pair->second == mid->handle_pair->second))
 return i;
 }
 }
 return -1;
 }
 
-int hb_qsv_replace_surface_mid(const QSVMid *mid, mfxFrameSurface1 *surface)
+int hb_qsv_replace_surface_mid(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const QSVMid *mid, mfxFrameSurface1 *surface)
 {
- int ret = hb_qsv_find_surface_idx(hb_enc_qsv_frames_ctx.mids, hb_enc_qsv_frames_ctx.nb_mids, mid);
+ if (!hb_enc_qsv_frames_ctx || !surface)
+ return -1;
+
+ int ret = hb_qsv_find_surface_idx(hb_enc_qsv_frames_ctx->mids, hb_enc_qsv_frames_ctx->nb_mids, mid);
 if (ret < 0)
 {
- ret = hb_qsv_find_surface_idx(hb_enc_qsv_frames_ctx.mids2, hb_enc_qsv_frames_ctx.nb_mids, mid);
- if (ret < 0)
+ hb_error("hb_qsv_replace_surface_mid: Surface with MemId=%p has not been found in the pool", mid);
+ return -1;
+ }
+ else
+ {
+ surface->Data.MemId = &hb_enc_qsv_frames_ctx->midsret;
+ }
+ return 0;
+}
+
+int hb_qsv_release_surface_from_pool_by_surface_pointer(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const mfxFrameSurface1 *surface)
+{
+ if (!hb_enc_qsv_frames_ctx || !surface)
+ return -1;
+
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx->hw_frames_ctx->data;
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+
+ for(int i = 0; i < hb_enc_qsv_frames_ctx->nb_mids; i++)
+ {
+ mfxFrameSurface1 *pool_surface = &frames_hwctx->surfacesi;
+ if(surface == pool_surface)
+ {
+ ff_qsv_atomic_dec(&hb_enc_qsv_frames_ctx->pooli);
+ return 0;
+ }
+ }
+ return -1;
+}
+
+int hb_qsv_get_mid_by_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, mfxFrameSurface1 *surface, QSVMid **out_mid)
+{
+ if (!hb_enc_qsv_frames_ctx || !surface)
+ return -1;
+
+ QSVMid *mid = NULL;
+ 
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx->hw_frames_ctx->data;
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+ // find the first available surface in the pool
+ int count = 0;
+ while(1)
+ {
+ if(count > 30)
+ {
+ hb_error("hb_qsv_get_mid_by_surface_from_pool has not been found or busy", mid);
+ hb_qsv_sleep(10); // prevent hang when all surfaces all used
+ count = 0;
+ }
+
+ for(int i = 0; i < hb_enc_qsv_frames_ctx->nb_mids; i++)
+ {
+ mid = &hb_enc_qsv_frames_ctx->midsi;
+ mfxFrameSurface1 *pool_surface = &frames_hwctx->surfacesi;
+ if( (pool_surface->Data.Locked == 0) && (surface == pool_surface))
+ {
+ *out_mid = mid;
+ return 0;
+ }
+ }
+ count++;
+ }
+}
+
+int hb_qsv_get_free_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, AVFrame* frame, QSVMid** out_mid)
+{
+ if (!hb_enc_qsv_frames_ctx || !frame)
+ return -1;
+
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx->hw_frames_ctx->data;
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+
+ // find the first available surface in the pool
+ int count = 0;
+ while(1)
+ {
+ if(count > 30)
+ {
+ hb_qsv_sleep(10); // prevent hang when all surfaces all used
+ count = 0;
+ }
+
+ int ret = av_hwframe_get_buffer(hb_enc_qsv_frames_ctx->hw_frames_ctx, frame, 0);
+ if (ret)
 {
- hb_error("encqsv: Surface with MemId=%p has not been found in the pool\n", mid);
 return -1;
 }
 else
 {
- surface->Data.MemId = &hb_enc_qsv_frames_ctx.mids2ret;
+ mfxFrameSurface1 *output_surface = (mfxFrameSurface1 *)frame->data3;
+ for(int i = 0; i < hb_enc_qsv_frames_ctx->nb_mids; i++)
+ {
+ QSVMid* mid = &hb_enc_qsv_frames_ctx->midsi;
+ mfxFrameSurface1* cur_surface = &frames_hwctx->surfacesi;
+ if(cur_surface == output_surface)
+ {
+ if((hb_enc_qsv_frames_ctx->pooli == 0) && (output_surface->Data.Locked == 0))
+ {
+ *out_mid = mid;
+ ff_qsv_atomic_inc(&hb_enc_qsv_frames_ctx->pooli);
+ return 0;
+ }
+ else
+ {
+ // we need to do unref if surface is not taken to be used, otherwise -12.
+ av_frame_unref(frame);
+ break;
+ }
+ }
+ }
 }
+ count++;
 }
- else
+}
+
+static int hb_qsv_allocate_dx11_encoder_pool(HBQSVFramesContext* frames_ctx, ID3D11Device *device, ID3D11Texture2D* input_texture)
+{
+ D3D11_TEXTURE2D_DESC desc = { 0 };
+ ID3D11Texture2D_GetDesc(input_texture, &desc);
+ desc.ArraySize = 1;
+ desc.BindFlags = D3D11_BIND_RENDER_TARGET;
+
+ for (size_t i = 0; i < frames_ctx->nb_mids; i++)
 {
- surface->Data.MemId = &hb_enc_qsv_frames_ctx.midsret;
+ ID3D11Texture2D* texture;
+ HRESULT hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture);
+ if (hr != S_OK)
+ {
+ hb_error("hb_qsv_allocate_dx11_encoder_pool: ID3D11Device_CreateTexture2D error");
+ return -1;
+ }
+
+ QSVMid *mid = &frames_ctx->midsi;
+ mid->handle_pair->first = texture;
+ mid->handle_pair->second = 0;
 }
 return 0;
 }
 
-int hb_qsv_release_surface_from_pool(const QSVMid *mid)
+static int hb_qsv_get_dx_device(hb_job_t *job)
 {
- int ret = hb_qsv_find_surface_idx(hb_enc_qsv_frames_ctx.mids, hb_enc_qsv_frames_ctx.nb_mids, mid);
- if (ret < 0)
+ AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)job->qsv.ctx->hb_hw_device_ctx->data;
+ AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
+ mfxSession parent_session = device_hwctx->session;
+
+ if (job->qsv.ctx->device_manager_handle == NULL)
 {
- ret = hb_qsv_find_surface_idx(hb_enc_qsv_frames_ctx.mids2, hb_enc_qsv_frames_ctx.nb_mids, mid);
- if (ret < 0)
+ mfxIMPL device_impl;
+ int err = MFXQueryIMPL(parent_session, &device_impl);
+ if (err != MFX_ERR_NONE)
 {
- hb_error("encqsv: Surface with MemId=%p has not been found in the pool\n", mid);
+ hb_error("hb_qsv_get_dx_device: no impl could be retrieved");
 return -1;
 }
+
+ if (MFX_IMPL_VIA_D3D11 == MFX_IMPL_VIA_MASK(device_impl))
+ {
+ job->qsv.ctx->device_manager_handle_type = MFX_HANDLE_D3D11_DEVICE;
+ }
+ else if (MFX_IMPL_VIA_D3D9 == MFX_IMPL_VIA_MASK(device_impl))
+ {
+ job->qsv.ctx->device_manager_handle_type = MFX_HANDLE_D3D9_DEVICE_MANAGER;
+ }
 else
 {
- ff_qsv_atomic_dec(&hb_enc_qsv_frames_ctx.pool2ret);
+ hb_error("hb_qsv_get_dx_device: unsupported impl");
+ return -1;
+ }
+
+ err = MFXVideoCORE_GetHandle(parent_session, job->qsv.ctx->device_manager_handle_type, &job->qsv.ctx->device_manager_handle);
+ if (err != MFX_ERR_NONE)
+ {
+ hb_error("hb_qsv_get_dx_device: no supported hw handle could be retrieved "
+ "from the session\n");
+ return -1;
+ }
+ if (job->qsv.ctx->device_manager_handle_type == MFX_HANDLE_D3D11_DEVICE)
+ {
+ ID3D11Device *device = (ID3D11Device *)job->qsv.ctx->device_manager_handle;
+ ID3D11Texture2D* input_texture = job->qsv.ctx->hb_dec_qsv_frames_ctx->input_texture;
+ err = hb_qsv_allocate_dx11_encoder_pool(job->qsv.ctx->hb_dec_qsv_frames_ctx, device, input_texture);
+ if (err < 0)
+ {
+ hb_error("hb_qsv_get_dx_device: hb_qsv_allocate_dx11_encoder_pool failed");
+ return -1;
+ }
+ if (job->qsv.ctx->device_context == NULL)
+ {
+ ID3D11Device_GetImmediateContext(device, (ID3D11DeviceContext *)&job->qsv.ctx->device_context);
+ if (!job->qsv.ctx->device_context)
+ return -1;
+ }
 }
 }
- else
+ return 0;
+}
+
+static int hb_qsv_make_adapters_list(const mfxAdaptersInfo* adapters_info, hb_list_t **qsv_adapters_list)
+{
+ int max_generation = QSV_G0;
+ int default_adapter = 0;
+
+ if (!qsv_adapters_list)
+ {
+ hb_error("hb_qsv_make_adapters_list: destination pointer is NULL");
+ return -1;
+ }
+ if (*qsv_adapters_list)
 {
- ff_qsv_atomic_dec(&hb_enc_qsv_frames_ctx.poolret);
+ hb_error("hb_qsv_make_adapters_list: qsv_adapters_list is allocated already");
+ return -1;
+ }
+ hb_list_t *list = hb_list_init();
+ if (list == NULL)
+ {
+ hb_error("hb_qsv_make_adapters_list: hb_list_init() failed");
+ return -1;
 }
+ for (int i = 0; i < adapters_info->NumActual; i++)
+ {
+ mfxAdapterInfo* info = &adapters_info->Adaptersi;
+ if (info)
+ {
+ int generation = hb_qsv_hardware_generation(qsv_map_mfx_platform_codename(info->Platform.CodeName));
+ // select default QSV adapter
+ if (generation > max_generation || info->Platform.MediaAdapterType == MFX_MEDIA_DISCRETE)
+ {
+ max_generation = generation;
+ default_adapter = info->Number;
+ }
+ hb_list_add(list, (void*)&info->Number);
+ }
+ }
+ hb_qsv_set_default_adapter_index(default_adapter);
+ hb_qsv_set_adapter_index(default_adapter);
+ *qsv_adapters_list = list;
 return 0;
 }
 
-void hb_qsv_get_free_surface_from_pool(const int start_index, const int end_index, QSVMid **out_mid, mfxFrameSurface1 **out_surface)
+static int hb_qsv_make_adapters_details_list(const mfxAdaptersInfo* adapters_info, hb_list_t **hb_qsv_adapters_details_list)
 {
- QSVMid *mid = NULL;
- mfxFrameSurface1 *output_surface = NULL;
+ if (*hb_qsv_adapters_details_list)
+ {
+ hb_error("hb_qsv_make_adapters_details_list: hb_qsv_adapter_details_list is allocated already");
+ return -1;
+ }
+ hb_list_t *list = hb_list_init();
+ if (list == NULL)
+ {
+ hb_error("hb_qsv_make_adapters_details_list: hb_list_init() failed");
+ return -1;
+ }
+ for (int i = 0; i < adapters_info->NumActual; i++)
+ {
+ mfxAdapterInfo* info = &adapters_info->Adaptersi;
+ if (info)
+ {
+ hb_qsv_adapter_details_t* adapter_details = av_mallocz(sizeof(hb_qsv_adapter_details_t));
+ if (!adapter_details)
+ {
+ hb_error("hb_qsv_make_adapters_details_list: adapter_details allocation failed");
+ return -1;
+ }
+ init_adapter_details(adapter_details);
+ hb_list_add(list, (void*)adapter_details);
+ }
+ }
+ *hb_qsv_adapters_details_list = list;
+ return 0;
+}
 
- AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx.hw_frames_ctx->data;
- AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
+static int hb_qsv_query_adapters(mfxAdaptersInfo* adapters_info)
+{
+ // Get number of Intel graphics adapters
+ mfxU32 num_adapters_available = 0;
+ mfxStatus sts = MFXQueryAdaptersNumber(&num_adapters_available);
+ if (sts != MFX_ERR_NONE)
+ {
+ hb_error("hb_qsv_query_adapters: failed to get number of Intel graphics adapters %d", sts);
+ return -1;
+ }
 
- AVHWFramesContext *frames_ctx2 = (AVHWFramesContext*)hb_enc_qsv_frames_ctx.hw_frames_ctx2->data;
- AVQSVFramesContext *frames_hwctx2 = frames_ctx2->hwctx;
+ if (num_adapters_available > 0)
+ {
+ adapters_info->Adapters = av_mallocz_array(num_adapters_available, sizeof(*adapters_info->Adapters));
+ if (adapters_info->Adapters)
+ {
+ adapters_info->NumActual = 0;
+ adapters_info->NumAlloc = num_adapters_available;
+ // Collect information about Intel graphics adapters
+ sts = MFXQueryAdapters(NULL, adapters_info);
+ if (sts != MFX_ERR_NONE)
+ {
+ hb_error("hb_qsv_query_adapters: failed to collect information about Intel graphics adapters %d", sts);
+ return -1;
+ }
+ }
+ }
+ return 0;
+}
+
+void hb_qsv_get_free_surface_from_pool_with_range(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const int start_index, const int end_index, QSVMid** out_mid, mfxFrameSurface1** out_surface)
+{
+ AVHWFramesContext *frames_ctx = (AVHWFramesContext*)hb_enc_qsv_frames_ctx->hw_frames_ctx->data;
+ AVQSVFramesContext *frames_hwctx = frames_ctx->hwctx;
 
 // find the first available surface in the pool
 int count = 0;
 while(1)
 {
- if(count > 30)
+ if (count > 30)
 {
 hb_qsv_sleep(10); // prevent hang when all surfaces all used
 count = 0;
 }
 
- for(int i = start_index; i < end_index; i++)
+ for (int i = start_index; i < end_index; i++)
 {
- if(hb_enc_qsv_frames_ctx.pooli == 0)
+ if ((hb_enc_qsv_frames_ctx->pooli == 0) && (frames_hwctx->surfacesi.Data.Locked == 0))
 {
- mid = &hb_enc_qsv_frames_ctx.midsi;
- output_surface = &frames_hwctx->surfacesi;
- if(output_surface->Data.Locked == 0)
- {
- *out_mid = mid;
- *out_surface = output_surface;
- ff_qsv_atomic_inc(&hb_enc_qsv_frames_ctx.pooli);
- return;
- }
+ *out_mid = &hb_enc_qsv_frames_ctx->midsi;
+ *out_surface = &frames_hwctx->surfacesi;
+ ff_qsv_atomic_inc(&hb_enc_qsv_frames_ctx->pooli);
+ return;
 }
 }
+ count++;
+ }
+}
+
+static ID3D11Texture2D* hb_qsv_create_dx11_texture_with_bytes(ID3D11Device* device, const byte* bytes, int stride, int width, int height, DXGI_FORMAT texture_format)
+{
+ if (device == NULL)
+ {
+ hb_error("hb_qsv_create_dx11_texture_with_bytes: device is NULL");
+ return NULL;
+ }
+
+ ID3D11Texture2D* tex;
+ D3D11_TEXTURE2D_DESC tdesc;
+ D3D11_SUBRESOURCE_DATA tbsd;
+ HRESULT hr;
+
+ tbsd.pSysMem = (void *)bytes;
+ tbsd.SysMemPitch = stride;
 
- for(int i = start_index; i < end_index; i++)
+ tdesc.Width = width;
+ tdesc.Height = height;
+ tdesc.MipLevels = 1;
+ tdesc.ArraySize = 1;
+ tdesc.SampleDesc.Count = 1;
+ tdesc.SampleDesc.Quality = 0;
+ tdesc.Usage = D3D11_USAGE_DEFAULT;
+ tdesc.Format = texture_format;
+ tdesc.BindFlags = D3D11_BIND_SHADER_RESOURCE;
+ tdesc.CPUAccessFlags = 0;
+ tdesc.MiscFlags = 0;
+
+ hr = ID3D11Device_CreateTexture2D(device, &tdesc, &tbsd, &tex);
+ if (FAILED(hr))
+ {
+ hb_error("CreateTexture: ID3D11Device_CreateTexture2D failed", hr);
+ return NULL;
+ }
+ return tex;
+}
+
+static int hb_qsv_copy_surface(hb_qsv_context *ctx, void* output_surface, int output_index, void* input_surface, int input_index)
+{
+ if(!ctx)
+ {
+ hb_error("hb_qsv_copy_surface: qsv context is NULL");
+ return -1;
+ }
+
+ if (ctx->device_manager_handle_type == MFX_HANDLE_D3D9_DEVICE_MANAGER)
+ {
+ IDirect3DDevice9 *pDevice = NULL;
+ HANDLE handle;
+
+ HRESULT result = lock_device((IDirect3DDeviceManager9 *)ctx->device_manager_handle, 1, &pDevice, &handle);
+ if (FAILED(result))
 {
- if(hb_enc_qsv_frames_ctx.pool2i == 0)
- {
- mid = &hb_enc_qsv_frames_ctx.mids2i;
- output_surface = &frames_hwctx2->surfacesi;
- if(output_surface->Data.Locked == 0)
- {
- *out_mid = mid;
- *out_surface = output_surface;
- ff_qsv_atomic_inc(&hb_enc_qsv_frames_ctx.pool2i);
- return;
- }
- }
+ hb_error("hb_qsv_copy_surface: lock_device failed %d", result);
+ return -1;
+ }
+ result = IDirect3DDevice9_StretchRect(pDevice, input_surface, 0, output_surface, 0, D3DTEXF_LINEAR);
+ if (FAILED(result))
+ {
+ hb_error("hb_qsv_copy_surface: IDirect3DDevice9_StretchRect failed %d", result);
+ return -1;
+ }
+ result = unlock_device((IDirect3DDeviceManager9 *)ctx->device_manager_handle, handle);
+ if (FAILED(result))
+ {
+ hb_error("hb_qsv_copy_surface: unlock_device failed %d", result);
+ return -1;
+ }
+ }
+ else if (ctx->device_manager_handle_type == MFX_HANDLE_D3D11_DEVICE)
+ {
+ ID3D11DeviceContext_CopySubresourceRegion((ID3D11DeviceContext *)ctx->device_context, output_surface, output_index, 0, 0, 0, input_surface, input_index, NULL);
+ ID3D11DeviceContext_Flush((ID3D11DeviceContext *)ctx->device_context);
+ }
+ else
+ {
+ hb_error("hb_qsv_copy_surface: incorrect device type %d", ctx->device_manager_handle_type);
+ return -1;
+ }
+ return 0;
+}
+
+int hb_qsv_attach_surface_to_video_buffer(hb_job_t *job, hb_buffer_t* buf, int is_vpp)
+{
+ QSVMid *mid = NULL;
+ mfxFrameSurface1 *surface = NULL;
+ HBQSVFramesContext *hb_qsv_frames_ctx = NULL;
+
+ if (is_vpp)
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_vpp_qsv_frames_ctx;
+ }
+ else
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_dec_qsv_frames_ctx;
+ }
+
+ if (job->qsv.ctx->device_manager_handle_type == MFX_HANDLE_D3D11_DEVICE)
+ {
+ DXGI_FORMAT texture_format;
+ ID3D11Texture2D* output_surface;
+ D3D11_TEXTURE2D_DESC desc = { 0 };
+ if (job->input_pix_fmt == AV_PIX_FMT_NV12)
+ {
+ texture_format = DXGI_FORMAT_NV12;
+ }
+ else if(job->input_pix_fmt == AV_PIX_FMT_P010)
+ {
+ texture_format = DXGI_FORMAT_P010;
+ }
+ else
+ {
+ hb_error("hb_qsv_attach_surface_to_video_buffer: unsupported texture_format=%d", job->input_pix_fmt);
+ return -1;
+ }
+ hb_qsv_get_free_surface_from_pool_with_range(hb_qsv_frames_ctx, 0, HB_QSV_POOL_SURFACE_SIZE, &mid, &surface);
+ output_surface = mid->handle_pair->first;
+ ID3D11Texture2D_GetDesc(output_surface, &desc);
+ ID3D11Texture2D* blank_surface = hb_qsv_create_dx11_texture_with_bytes(job->qsv.ctx->device_manager_handle, buf->data, buf->plane0.stride, desc.Width, desc.Height, texture_format);
+ if (!blank_surface)
+ {
+ hb_error("hb_qsv_attach_surface_to_video_buffer: hb_qsv_create_dx11_texture_with_bytes() failed");
+ return -1;
+ }
+ mfxHDLPair* output_pair = (mfxHDLPair*)surface->Data.MemId;
+ int output_index = (int)(intptr_t)output_pair->second == MFX_INFINITE ? 0 : (int)(intptr_t)output_pair->second;
+ int ret = hb_qsv_copy_surface(job->qsv.ctx, output_surface, output_index, blank_surface, 0);
+ if (ret < 0)
+ {
+ hb_error("hb_qsv_attach_surface_to_video_buffer: hb_qsv_copy_surface() failed");
+ return -1;
 }
+ ID3D11Texture2D_Release(blank_surface);
+ }
 
- count++;
+ // alloc new frame
+ buf->qsv_details.frame = av_frame_alloc();
+ if (!buf->qsv_details.frame) {
+ hb_error("hb_qsv_attach_surface_to_video_buffer: av_frame_alloc() failed");
+ return -1;
 }
+
+ buf->qsv_details.frame->data3 = (uint8_t*)surface;
+ buf->qsv_details.qsv_frames_ctx = hb_qsv_frames_ctx;
+ buf->qsv_details.qsv_atom = 0;
+ buf->qsv_details.ctx = job->qsv.ctx;
+ return 0;
 }
 
-hb_buffer_t* hb_qsv_copy_frame(AVFrame *frame, hb_qsv_context *qsv_ctx)
+int hb_qsv_copy_video_buffer_to_video_buffer(hb_job_t *job, hb_buffer_t* in, hb_buffer_t* out, int is_vpp)
+{
+ // alloc new frame
+ out->qsv_details.frame = av_frame_alloc();
+ if (!out->qsv_details.frame)
+ {
+ hb_error("hb_qsv_copy_video_buffer_to_video_buffer: av_frame_alloc() failed");
+ return -1;
+ }
+
+ if (!in->qsv_details.frame)
+ {
+ hb_error("hb_qsv_copy_video_buffer_to_video_buffer: in->qsv_details.frame is NULL");
+ return -1;
+ }
+
+ mfxFrameSurface1* input_surface = (mfxFrameSurface1*)in->qsv_details.frame->data3;
+ mfxHDLPair* input_pair = (mfxHDLPair*)input_surface->Data.MemId;
+
+ out->qsv_details.frame->format = in->qsv_details.frame->format;
+ out->qsv_details.frame->width = in->qsv_details.frame->width;
+ out->qsv_details.frame->height = in->qsv_details.frame->height;
+ out->qsv_details.frame->channels = in->qsv_details.frame->channels;
+ out->qsv_details.frame->channel_layout = in->qsv_details.frame->channel_layout;
+ out->qsv_details.frame->nb_samples = in->qsv_details.frame->nb_samples;
+
+ int ret = av_frame_copy_props(out->qsv_details.frame, in->qsv_details.frame);
+ if (ret < 0)
+ {
+ hb_error("hb_qsv_copy_video_buffer_to_video_buffer: av_frame_copy_props error %d", ret);
+ return -1;
+ }
+
+ QSVMid *mid = NULL;
+ mfxFrameSurface1 *surface = NULL;
+ HBQSVFramesContext *hb_qsv_frames_ctx = NULL;
+
+ if (is_vpp)
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_vpp_qsv_frames_ctx;
+ }
+ else
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_dec_qsv_frames_ctx;
+ }
+
+ if (job->qsv.ctx->device_manager_handle_type == MFX_HANDLE_D3D11_DEVICE)
+ {
+ hb_qsv_get_free_surface_from_pool_with_range(hb_qsv_frames_ctx, 0, HB_QSV_POOL_SURFACE_SIZE, &mid, &surface);
+ mfxHDLPair* output_pair = (mfxHDLPair*)surface->Data.MemId;
+ int input_index = (int)(intptr_t)input_pair->second == MFX_INFINITE ? 0 : (int)(intptr_t)input_pair->second;
+ int output_index = (int)(intptr_t)output_pair->second == MFX_INFINITE ? 0 : (int)(intptr_t)output_pair->second;
+ int ret = hb_qsv_copy_surface(job->qsv.ctx, mid->handle_pair->first, output_index, input_pair->first, input_index);
+ if (ret < 0)
+ {
+ hb_error("hb_qsv_copy_video_buffer_to_video_buffer: hb_qsv_copy_surface() failed");
+ return -1;
+ }
+ }
+ else
+ {
+ hb_error("hb_qsv_copy_video_buffer_to_video_buffer: device_manager_handle_type unsupported=%d", job->qsv.ctx->device_manager_handle_type);
+ }
+
+ out->qsv_details.frame->data3 = (uint8_t*)surface;
+ out->qsv_details.qsv_frames_ctx = hb_qsv_frames_ctx;
+ out->qsv_details.qsv_atom = 0;
+ out->qsv_details.ctx = job->qsv.ctx;
+ return 0;
+}
+
+hb_buffer_t* hb_qsv_copy_avframe_to_video_buffer(hb_job_t *job, AVFrame *frame, const int is_vpp)
 {
 hb_buffer_t *out;
 out = hb_frame_buffer_init(frame->format, frame->width, frame->height);
@@ -2657,102 +3758,107 @@
 return out;
 }
 
- // copy content of input frame
- av_frame_copy(out->qsv_details.frame, frame);
- // but no copy the sufrace pointer, it will be added later from the pool
- out->qsv_details.frame->data3 = 0;
+ out->qsv_details.frame->format = frame->format;
+ out->qsv_details.frame->width = frame->width;
+ out->qsv_details.frame->height = frame->height;
+ out->qsv_details.frame->channels = frame->channels;
+ out->qsv_details.frame->channel_layout = frame->channel_layout;
+ out->qsv_details.frame->nb_samples = frame->nb_samples;
 
+ int ret = av_frame_copy_props(out->qsv_details.frame, frame);
+ if (ret < 0)
+ {
+ hb_error("hb_qsv_copy_avframe_to_video_buffer: av_frame_copy_props error %d", ret);
+ }
+ 
 QSVMid *mid = NULL;
 mfxFrameSurface1* output_surface = NULL;
+ HBQSVFramesContext* hb_qsv_frames_ctx = NULL;
 
- hb_qsv_get_free_surface_from_pool(0, HB_POOL_SURFACE_SIZE - HB_POOL_ENCODER_SIZE, &mid, &output_surface);
-
- static const mfxHandleType handle_types = {
- MFX_HANDLE_VA_DISPLAY,
- MFX_HANDLE_D3D11_DEVICE,
- MFX_HANDLE_D3D9_DEVICE_MANAGER
- };
-
- int i;
+ if (is_vpp)
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_vpp_qsv_frames_ctx;
+ }
+ else
+ {
+ hb_qsv_frames_ctx = job->qsv.ctx->hb_dec_qsv_frames_ctx;
+ }
 
- AVHWDeviceContext *device_ctx = (AVHWDeviceContext*)hb_hw_device_ctx->data;
- AVQSVDeviceContext *device_hwctx = device_ctx->hwctx;
- mfxSession parent_session = device_hwctx->session;
+ if (!is_vpp && hb_qsv_hw_filters_are_enabled(job))
+ {
+ ret = hb_qsv_get_free_surface_from_pool(hb_qsv_frames_ctx, out->qsv_details.frame, &mid);
+ if (ret < 0)
+ return out;
+ output_surface = (mfxFrameSurface1*)out->qsv_details.frame->data3;
+ }
+ else
+ {
+ hb_qsv_get_free_surface_from_pool_with_range(hb_qsv_frames_ctx, 0, HB_QSV_POOL_SURFACE_SIZE, &mid, &output_surface);
+ }
 
- if (device_manager_handle == NULL)
+ if (job->qsv.ctx->device_manager_handle_type == MFX_HANDLE_D3D9_DEVICE_MANAGER)
 {
- for (i = 0; i < 3; i++)
+ mfxFrameSurface1* input_surface = (mfxFrameSurface1*)frame->data3;
+ mfxHDLPair* input_pair = (mfxHDLPair*)input_surface->Data.MemId;
+ // copy all surface fields
+ *output_surface = *input_surface;
+ output_surface->Info.CropW = frame->width;
+ output_surface->Info.CropH = frame->height;
+ if (hb_qsv_hw_filters_are_enabled(job))
 {
- int err = MFXVideoCORE_GetHandle(parent_session, handle_typesi, &device_manager_handle);
- if (err == MFX_ERR_NONE)
- {
- device_handle_type = handle_typesi;
- break;
- }
- device_manager_handle = NULL;
+ output_surface->Data.MemId = mid->handle_pair;
 }
-
- if (!device_manager_handle)
+ else
 {
- hb_error("hb_qsv_copy_frame: no supported hw handle could be retrieved "
- "from the session\n");
- return out;
+ // replace the mem id to mem id from the pool
+ output_surface->Data.MemId = mid;
 }
- }
-
- if (device_handle_type == MFX_HANDLE_D3D9_DEVICE_MANAGER)
- {
- IDirect3DDevice9 *pDevice = NULL;
- HANDLE handle;
-
- HRESULT result = lock_device((IDirect3DDeviceManager9 *)device_manager_handle, 0, &pDevice, &handle);
- if (FAILED(result))
+ // copy input surface to surface from the pool
+ ret = hb_qsv_copy_surface(job->qsv.ctx, mid->handle_pair->first, 0, input_pair->first, 0);
+ if (ret < 0)
 {
- hb_error("hb_qsv_copy_frame: lock_device failded %d", result);
- return out;
+ hb_error("hb_qsv_copy_avframe_to_video_buffer: hb_qsv_copy_surface() failed");
+ return -1;
 }
-
+ }
+ else if (job->qsv.ctx->device_manager_handle_type == MFX_HANDLE_D3D11_DEVICE)
+ {
 mfxFrameSurface1* input_surface = (mfxFrameSurface1*)frame->data3;
-
+ mfxHDLPair* input_pair = (mfxHDLPair*)input_surface->Data.MemId;
+ // Need to pass 0 instead of MFX_INFINITE to DirectX as index of surface
+ int input_index = (int)(intptr_t)input_pair->second == MFX_INFINITE ? 0 : (int)(intptr_t)input_pair->second;
+ int output_index = (int)(intptr_t)mid->handle_pair->second == MFX_INFINITE ? 0 : (int)(intptr_t)mid->handle_pair->second;
 // copy all surface fields
 *output_surface = *input_surface;
- // replace the mem id to mem id from the pool
- output_surface->Data.MemId = mid;
- // copy input sufrace to sufrace from the pool
- result = IDirect3DDevice9_StretchRect(pDevice, input_surface->Data.MemId, 0, mid->handle, 0, D3DTEXF_LINEAR);
- if (FAILED(result))
+ output_surface->Info.CropW = frame->width;
+ output_surface->Info.CropH = frame->height;
+ if (hb_qsv_hw_filters_are_enabled(job))
 {
- hb_error("hb_qsv_copy_frame: IDirect3DDevice9_StretchRect failded %d", result);
- return out;
+ // Make sure that we pass handle_pair to scale_qsv
+ output_surface->Data.MemId = mid->handle_pair;
 }
- result = unlock_device((IDirect3DDeviceManager9 *)device_manager_handle, handle);
- if (FAILED(result))
+ else
 {
- hb_error("hb_qsv_copy_frame: unlock_device failded %d", result);
- return out;
+ // Make sure that we pass QSVMid to QSV encoder
+ output_surface->Data.MemId = mid;
+ }
+ // copy input surface to surface from the pool
+ ret = hb_qsv_copy_surface(job->qsv.ctx, mid->handle_pair->first, output_index, input_pair->first, input_index);
+ if (ret < 0)
+ {
+ hb_error("hb_qsv_copy_avframe_to_video_buffer: hb_qsv_copy_surface() failed");
+ return -1;
 }
 }
 else
 {
- ID3D11DeviceContext *device_context = NULL;
- ID3D11Device *device = (ID3D11Device *)device_manager_handle;
- ID3D11Device_GetImmediateContext(device, &device_context);
- if (!device_context)
- return out;
-
- mfxFrameSurface1* input_surface = (mfxFrameSurface1*)frame->data3;
-
- // copy all surface fields
- *output_surface = *input_surface;
- // replace the mem id to mem id from the pool
- output_surface->Data.MemId = mid;
- // copy input sufrace to sufrace from the pool
- ID3D11DeviceContext_CopySubresourceRegion(device_context, mid->texture, (uint64_t)mid->handle, 0, 0, 0, hb_enc_qsv_frames_ctx.input_texture, (uint64_t)input_surface->Data.MemId, NULL);
+ hb_error("hb_qsv_copy_avframe_to_video_buffer: incorrect mfx impl");
+ return out;
 }
-
 out->qsv_details.frame->data3 = (uint8_t*)output_surface;
- out->qsv_details.qsv_atom = 0;
- out->qsv_details.ctx = qsv_ctx;
+ out->qsv_details.qsv_frames_ctx = hb_qsv_frames_ctx;
+ out->qsv_details.qsv_atom = 0;
+ out->qsv_details.ctx = job->qsv.ctx;
 return out;
 }
 
@@ -2772,29 +3878,57 @@
 av_buffer_unref(&s->hw_frames_ctx);
 }
 
-void hb_qsv_uninit_enc()
+void hb_qsv_uninit_enc(hb_job_t *job)
 {
- if(enc_hw_frames_ctx)
- av_buffer_unref(&enc_hw_frames_ctx);
-
- enc_hw_frames_ctx = NULL;
- hb_hw_device_ctx = NULL;
- qsv_device = NULL;
- device_manager_handle = NULL;
+ if(job->qsv.ctx && job->qsv.ctx->hb_dec_qsv_frames_ctx)
+ {
+ av_buffer_unref(&job->qsv.ctx->hb_dec_qsv_frames_ctx->hw_frames_ctx);
+ job->qsv.ctx->hb_dec_qsv_frames_ctx->hw_frames_ctx = NULL;
+ av_free(job->qsv.ctx->hb_dec_qsv_frames_ctx);
+ job->qsv.ctx->hb_dec_qsv_frames_ctx = NULL;
+ }
+ if(job->qsv.ctx && job->qsv.ctx->hb_vpp_qsv_frames_ctx)
+ {
+ av_buffer_unref(&job->qsv.ctx->hb_vpp_qsv_frames_ctx->hw_frames_ctx);
+ job->qsv.ctx->hb_vpp_qsv_frames_ctx->hw_frames_ctx = NULL;
+ av_free(job->qsv.ctx->hb_vpp_qsv_frames_ctx);
+ job->qsv.ctx->hb_vpp_qsv_frames_ctx = NULL;
+ }
+ if (job->qsv.ctx->device_context)
+ {
+ ID3D11DeviceContext_Release((ID3D11DeviceContext *)job->qsv.ctx->device_context);
+ job->qsv.ctx->device_context = NULL;
+ }
+ if (job->qsv.ctx)
+ {
+ job->qsv.ctx->hb_hw_device_ctx = NULL;
+ if (job->qsv.ctx->qsv_device)
+ {
+ av_free(job->qsv.ctx->qsv_device);
+ job->qsv.ctx->qsv_device = NULL;
+ }
+ }
+ job->qsv.ctx->device_manager_handle = NULL;
 }
 
-static int qsv_device_init(AVCodecContext *s)
+static int qsv_device_init(hb_job_t *job)
 {
 int err;
 AVDictionary *dict = NULL;
 
- if (qsv_device) {
- err = av_dict_set(&dict, "child_device", qsv_device, 0);
+ if (job->qsv.ctx && job->qsv.ctx->qsv_device)
+ {
+ err = av_dict_set(&dict, "child_device", job->qsv.ctx->qsv_device, 0);
 if (err < 0)
 return err;
 }
+ else
+ {
+ av_dict_set(&dict, "vendor", "0x8086", 0);
+ }
+ av_dict_set(&dict, "child_device_type", "d3d11va", 0);
 
- err = av_hwdevice_ctx_create(&hb_hw_device_ctx, AV_HWDEVICE_TYPE_QSV,
+ err = av_hwdevice_ctx_create(&job->qsv.ctx->hb_hw_device_ctx, AV_HWDEVICE_TYPE_QSV,
 0, dict, 0);
 if (err < 0) {
 hb_error("qsv_device_init: error creating a QSV device %d", err);
@@ -2808,100 +3942,186 @@
 return err;
 }
 
-static int qsv_init(AVCodecContext *s)
+int hb_qsv_parse_adapter_index(hb_job_t *job)
+{
+ int ret = 0;
+
+ if (job->encoder_options != NULL && *job->encoder_options)
+ {
+ hb_dict_t *options_list;
+ options_list = hb_encopts_to_dict(job->encoder_options, job->vcodec);
+ hb_dict_iter_t iter;
+ for (iter = hb_dict_iter_init(options_list);
+ iter != HB_DICT_ITER_DONE;
+ iter = hb_dict_iter_next(options_list, iter))
+ {
+ const char *key = hb_dict_iter_key(iter);
+ if (!strcasecmp(key, "gpu"))
+ {
+ hb_value_t *value = hb_dict_iter_value(iter);
+ char *str = hb_value_get_string_xform(value);
+ int dx_index = hb_qsv_atoi(str, &ret);
+ free(str);
+ if (!ret)
+ {
+ hb_qsv_param_parse_dx_index(job, dx_index);
+ }
+ }
+ }
+ hb_dict_free(&options_list);
+ }
+ return 0;
+}
+
+int hb_create_ffmpeg_pool(hb_job_t *job, int coded_width, int coded_height, enum AVPixelFormat sw_pix_fmt, int pool_size, int extra_hw_frames, AVBufferRef **out_hw_frames_ctx)
 {
 AVHWFramesContext *frames_ctx;
 AVQSVFramesContext *frames_hwctx;
 
- int ret;
+ AVBufferRef *hw_frames_ctx = *out_hw_frames_ctx;
+
+ int ret = 0;
 
- if (!hb_hw_device_ctx) {
- ret = qsv_device_init(s);
+ if (job->qsv.ctx && !job->qsv.ctx->hb_hw_device_ctx) {
+ // parse and use user-specified encoder options for decoder, if present
+ if (job->encoder_options != NULL && *job->encoder_options)
+ {
+ hb_dict_t *options_list;
+ options_list = hb_encopts_to_dict(job->encoder_options, job->vcodec);
+
+ hb_dict_iter_t iter;
+ for (iter = hb_dict_iter_init(options_list);
+ iter != HB_DICT_ITER_DONE;
+ iter = hb_dict_iter_next(options_list, iter))
+ {
+ const char *key = hb_dict_iter_key(iter);
+ if ((!strcasecmp(key, "scalingmode") || !strcasecmp(key, "vpp-sm")) && hb_qsv_hw_filters_are_enabled(job))
+ {
+ hb_qsv_info_t *info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
+ if (info && (info->capabilities & HB_QSV_CAP_VPP_SCALING))
+ {
+ hb_value_t *value = hb_dict_iter_value(iter);
+ char *mode_key = hb_value_get_string_xform(value);
+ hb_triplet_t *mode = NULL;
+ if (mode_key != NULL)
+ {
+ mode = hb_triplet4key(hb_qsv_vpp_scale_modes, mode_key);
+ }
+ if (mode != NULL)
+ {
+ job->qsv.ctx->vpp_scale_mode = mode->key;
+ }
+ }
+ }
+ if ((!strcasecmp(key, "interpolationmethod") || !strcasecmp(key, "vpp-im")) && hb_qsv_hw_filters_are_enabled(job))
+ {
+ hb_qsv_info_t *info = hb_qsv_encoder_info_get(hb_qsv_get_adapter_index(), job->vcodec);
+ if (info && (info->capabilities & HB_QSV_CAP_VPP_INTERPOLATION))
+ {
+ hb_value_t *value = hb_dict_iter_value(iter);
+ char *mode_key = hb_value_get_string_xform(value);
+ hb_triplet_t *mode = NULL;
+ if (mode_key != NULL)
+ {
+ mode = hb_triplet4key(hb_qsv_vpp_interpolation_methods, mode_key);
+ }
+ if (mode != NULL)
+ {
+ job->qsv.ctx->vpp_interpolation_method = mode->key;
+ }
+ }
+ }
+ }
+ hb_dict_free(&options_list);
+ }
+
+ if (!job->qsv.ctx->qsv_device)
+ hb_qsv_param_parse_dx_index(job, hb_qsv_get_adapter_index());
+
+ ret = qsv_device_init(job);
 if (ret < 0)
 return ret;
 }
 
- av_buffer_unref(&s->hw_frames_ctx);
- s->hw_frames_ctx = av_hwframe_ctx_alloc(hb_hw_device_ctx);
- if (!s->hw_frames_ctx)
+ av_buffer_unref(&hw_frames_ctx);
+ hw_frames_ctx = av_hwframe_ctx_alloc(job->qsv.ctx->hb_hw_device_ctx);
+ if (!hw_frames_ctx)
 return AVERROR(ENOMEM);
 
- frames_ctx = (AVHWFramesContext*)s->hw_frames_ctx->data;
+ *out_hw_frames_ctx = hw_frames_ctx;
+
+ frames_ctx = (AVHWFramesContext*)hw_frames_ctx->data;
 frames_hwctx = frames_ctx->hwctx;
 
- frames_ctx->width = FFALIGN(s->coded_width, 32);
- frames_ctx->height = FFALIGN(s->coded_height, 32);
+ frames_ctx->width = FFALIGN(coded_width, 32);
+ frames_ctx->height = FFALIGN(coded_height, 32);
 frames_ctx->format = AV_PIX_FMT_QSV;
- frames_ctx->sw_format = s->sw_pix_fmt;
- frames_ctx->initial_pool_size = 32 + s->extra_hw_frames;
+ frames_ctx->sw_format = sw_pix_fmt;
+ frames_ctx->initial_pool_size = pool_size;
+ if (extra_hw_frames >= 0)
+ frames_ctx->initial_pool_size += extra_hw_frames;
 frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
 
- ret = av_hwframe_ctx_init(s->hw_frames_ctx);
+ ret = av_hwframe_ctx_init(hw_frames_ctx);
 if (ret < 0) {
- hb_error("qsv_init: av_hwframe_ctx_init failed %d", ret);
+ hb_error("hb_create_ffmpeg_pool: av_hwframe_ctx_init failed %d", ret);
 return ret;
 }
+ return 0;
+}
 
- hb_enc_qsv_frames_ctx.input_texture = frames_hwctx->texture;
+int hb_qsv_hw_frames_init(AVCodecContext *s)
+{
+ AVHWFramesContext *frames_ctx;
+ AVQSVFramesContext *frames_hwctx;
+ AVBufferRef *hw_frames_ctx;
+ int ret;
 
- av_buffer_unref(&enc_hw_frames_ctx);
- enc_hw_frames_ctx = av_hwframe_ctx_alloc(hb_hw_device_ctx);
- if (!enc_hw_frames_ctx)
- return AVERROR(ENOMEM);
+ hb_job_t *job = s->opaque;
+ if (!job) {
+ hb_error("hb_qsv_hw_frames_init: job is NULL");
+ return -1;
+ }
 
- hb_enc_qsv_frames_ctx.hw_frames_ctx = enc_hw_frames_ctx;
- frames_ctx = (AVHWFramesContext*)enc_hw_frames_ctx->data;
- frames_hwctx = frames_ctx->hwctx;
+ HBQSVFramesContext *hb_dec_qsv_frames_ctx = job->qsv.ctx->hb_dec_qsv_frames_ctx;
+ int coded_width = s->coded_width;
+ int coded_height = s->coded_height;
+ enum AVPixelFormat sw_pix_fmt = s->sw_pix_fmt;
+ int extra_hw_frames = s->extra_hw_frames;
+ AVBufferRef **out_hw_frames_ctx = &s->hw_frames_ctx;
 
- frames_ctx->width = FFALIGN(s->coded_width, 32);
- frames_ctx->height = FFALIGN(s->coded_height, 32);
- frames_ctx->format = AV_PIX_FMT_QSV;
- frames_ctx->sw_format = s->sw_pix_fmt;
- frames_ctx->initial_pool_size = HB_POOL_SURFACE_SIZE;
- frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
-
- ret = av_hwframe_ctx_init(enc_hw_frames_ctx);
+ ret = hb_create_ffmpeg_pool(job, coded_width, coded_height, sw_pix_fmt, HB_QSV_POOL_FFMPEG_SURFACE_SIZE, extra_hw_frames, out_hw_frames_ctx);
 if (ret < 0) {
- hb_error("qsv_init: av_hwframe_ctx_init failed %d", ret);
+ hb_error("hb_qsv_hw_frames_init: hb_create_ffmpeg_pool decoder failed %d", ret);
 return ret;
 }
 
- enc_hw_frames_ctx = av_hwframe_ctx_alloc(hb_hw_device_ctx);
- if (!enc_hw_frames_ctx)
- return AVERROR(ENOMEM);
-
- hb_enc_qsv_frames_ctx.hw_frames_ctx2 = enc_hw_frames_ctx;
- frames_ctx = (AVHWFramesContext*)enc_hw_frames_ctx->data;
+ hw_frames_ctx = *out_hw_frames_ctx;
+ frames_ctx = (AVHWFramesContext*)hw_frames_ctx->data;
 frames_hwctx = frames_ctx->hwctx;
+ mfxHDLPair* handle_pair = (mfxHDLPair*)frames_hwctx->surfaces0.Data.MemId;
+ hb_dec_qsv_frames_ctx->input_texture = ((size_t)handle_pair->second != MFX_INFINITE) ? handle_pair->first : NULL;
 
- frames_ctx->width = FFALIGN(s->coded_width, 32);
- frames_ctx->height = FFALIGN(s->coded_height, 32);
- frames_ctx->format = AV_PIX_FMT_QSV;
- frames_ctx->sw_format = s->sw_pix_fmt;
- frames_ctx->initial_pool_size = HB_POOL_SURFACE_SIZE;
- frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
-
- ret = av_hwframe_ctx_init(enc_hw_frames_ctx);
+ ret = hb_create_ffmpeg_pool(job, coded_width, coded_height, sw_pix_fmt, HB_QSV_POOL_SURFACE_SIZE, extra_hw_frames, &hb_dec_qsv_frames_ctx->hw_frames_ctx);
 if (ret < 0) {
- hb_error("qsv_init: av_hwframe_ctx_init failed %d", ret);
+ hb_error("hb_qsv_hw_frames_init: hb_create_ffmpeg_pool qsv surface allocation failed %d", ret);
 return ret;
 }
 
 /* allocate the memory ids for the external frames */
- av_buffer_unref(&hb_enc_qsv_frames_ctx.mids_buf);
- hb_enc_qsv_frames_ctx.mids_buf = hb_qsv_create_mids(hb_enc_qsv_frames_ctx.hw_frames_ctx);
- if (!hb_enc_qsv_frames_ctx.mids_buf)
- return AVERROR(ENOMEM);
- av_buffer_unref(&hb_enc_qsv_frames_ctx.mids_buf2);
- hb_enc_qsv_frames_ctx.mids_buf2 = hb_qsv_create_mids(hb_enc_qsv_frames_ctx.hw_frames_ctx2);
- if (!hb_enc_qsv_frames_ctx.mids_buf2)
+ av_buffer_unref(&hb_dec_qsv_frames_ctx->mids_buf);
+ hb_dec_qsv_frames_ctx->mids_buf = hb_qsv_create_mids(hb_dec_qsv_frames_ctx->hw_frames_ctx);
+ if (!hb_dec_qsv_frames_ctx->mids_buf)
 return AVERROR(ENOMEM);
+ hb_dec_qsv_frames_ctx->mids = (QSVMid*)hb_dec_qsv_frames_ctx->mids_buf->data;
+ hb_dec_qsv_frames_ctx->nb_mids = frames_hwctx->nb_surfaces;
+ memset(hb_dec_qsv_frames_ctx->pool, 0, hb_dec_qsv_frames_ctx->nb_mids * sizeof(hb_dec_qsv_frames_ctx->pool0));
 
- hb_enc_qsv_frames_ctx.mids = (QSVMid*)hb_enc_qsv_frames_ctx.mids_buf->data;
- hb_enc_qsv_frames_ctx.mids2 = (QSVMid*)hb_enc_qsv_frames_ctx.mids_buf2->data;
- hb_enc_qsv_frames_ctx.nb_mids = frames_hwctx->nb_surfaces;
- memset(hb_enc_qsv_frames_ctx.pool, 0, hb_enc_qsv_frames_ctx.nb_mids * sizeof(hb_enc_qsv_frames_ctx.pool0));
- memset(hb_enc_qsv_frames_ctx.pool2, 0, hb_enc_qsv_frames_ctx.nb_mids * sizeof(hb_enc_qsv_frames_ctx.pool20));
+ ret = hb_qsv_get_dx_device(job);
+ if (ret < 0) {
+ hb_error("qsv_init: hb_qsv_get_dx_device failed %d", ret);
+ return ret;
+ }
 return 0;
 }
 
@@ -2917,12 +4137,11 @@
 {
 while (*pix_fmts != AV_PIX_FMT_NONE) {
 if (*pix_fmts == AV_PIX_FMT_QSV) {
- int ret = qsv_init(s);
+ int ret = hb_qsv_hw_frames_init(s);
 if (ret < 0) {
 hb_error("hb_qsv_get_format: QSV hwaccel initialization failed");
 return AV_PIX_FMT_NONE;
 }
-
 if (s->hw_frames_ctx) {
 s->hw_frames_ctx = av_buffer_ref(s->hw_frames_ctx);
 if (!s->hw_frames_ctx)
@@ -2975,24 +4194,131 @@
 return (qsv_encoder_enabled && qsv_decoder_enabled);
 }
 
+int hb_qsv_sanitize_filter_list(hb_job_t *job)
+{
+ /*
+ * When QSV's VPP is used for filtering, not all CPU filters
+ * are supported, so we need to do a little extra setup here.
+ */
+ if (job->vcodec & HB_VCODEC_QSV_MASK)
+ {
+ int i = 0;
+ int num_cpu_filters = 0;
+ if (job->list_filter != NULL && hb_list_count(job->list_filter) > 0)
+ {
+ for (i = 0; i < hb_list_count(job->list_filter); i++)
+ {
+ hb_filter_object_t *filter = hb_list_item(job->list_filter, i);
+
+ switch (filter->id)
+ {
+ // cropping and scaling always done via VPP filter
+ case HB_FILTER_CROP_SCALE:
+ break;
+
+ case HB_FILTER_DEINTERLACE:
+ case HB_FILTER_ROTATE:
+ case HB_FILTER_RENDER_SUB:
+ case HB_FILTER_AVFILTER:
+ num_cpu_filters++;
+ break;
+ default:
+ num_cpu_filters++;
+ break;
+ }
+ }
+ }
+ job->qsv.ctx->num_cpu_filters = num_cpu_filters;
+ job->qsv.ctx->qsv_filters_are_enabled = ((hb_list_count(job->list_filter) == 1) && hb_qsv_full_path_is_enabled(job)) ? 1 : 0;
+ if (job->qsv.ctx->qsv_filters_are_enabled)
+ {
+ job->qsv.ctx->hb_vpp_qsv_frames_ctx = av_mallocz(sizeof(HBQSVFramesContext));
+ if (!job->qsv.ctx->hb_vpp_qsv_frames_ctx)
+ {
+ hb_error( "sanitize_qsv: HBQSVFramesContext vpp alloc failed" );
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
 #else // other OS
 
-hb_buffer_t* hb_qsv_copy_frame(AVFrame *frame, hb_qsv_context *qsv_ctx)
+int hb_qsv_get_platform(int adapter_index)
 {
- return NULL;
+ return hb_get_cpu_platform();
 }
 
-void hb_qsv_get_free_surface_from_pool(const int start_index, const int end_index, QSVMid **out_mid, mfxFrameSurface1 **out_surface)
+int hb_qsv_info_init()
 {
- return;
+ if (g_qsv_adapters_list)
+ {
+ hb_error("hb_qsv_info_init: qsv_adapters_list is allocated already");
+ return -1;
+ }
+ g_qsv_adapters_list = hb_list_init();
+ if (g_qsv_adapters_list == NULL)
+ {
+ hb_error("hb_qsv_info_init: g_qsv_adapters_list allocation failed");
+ return -1;
+ }
+ if (g_qsv_adapters_details_list)
+ {
+ hb_error("hb_qsv_info_init: g_qsv_adapters_details_list is allocated already");
+ return -1;
+ }
+ g_qsv_adapters_details_list = hb_list_init();
+ if (g_qsv_adapters_details_list == NULL)
+ {
+ hb_error("hb_qsv_info_init: g_qsv_adapters_details_list allocation failed");
+ return -1;
+ }
+ static int adapter_index = 0;
+ static hb_qsv_adapter_details_t adapter_details;
+ init_adapter_details(&adapter_details);
+ hb_list_add(g_qsv_adapters_list, (void*)&adapter_index);
+ hb_list_add(g_qsv_adapters_details_list, (void*)&adapter_details);
+ hb_qsv_collect_adapters_details(g_qsv_adapters_list, g_qsv_adapters_details_list);
+ return 0;
+}
+
+int hb_create_ffmpeg_pool(hb_job_t *job, int coded_width, int coded_height, enum AVPixelFormat sw_pix_fmt, int pool_size, int extra_hw_frames, AVBufferRef **out_hw_frames_ctx)
+{
+ return -1;
+}
+
+int hb_qsv_hw_frames_init(AVCodecContext *s)
+{
+ return -1;
 }
 
-int hb_qsv_replace_surface_mid(const QSVMid *mid, mfxFrameSurface1 *surface)
+int hb_qsv_attach_surface_to_video_buffer(hb_job_t *job, hb_buffer_t* buf, int is_vpp)
 {
 return -1;
 }
 
-int hb_qsv_release_surface_from_pool(const QSVMid *mid)
+int hb_qsv_copy_video_buffer_to_video_buffer(hb_job_t *job, hb_buffer_t* in, hb_buffer_t* out, int is_vpp)
+{
+ return -1;
+}
+
+hb_buffer_t* hb_qsv_copy_avframe_to_video_buffer(hb_job_t *job, AVFrame *frame, int is_vpp)
+{
+ return NULL;
+}
+
+int hb_qsv_get_free_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, AVFrame* frame, QSVMid** out_mid)
+{
+ return -1;
+}
+
+void hb_qsv_get_free_surface_from_pool_with_range(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const int start_index, const int end_index, QSVMid** out_mid, mfxFrameSurface1** out_surface)
+{
+ return;
+}
+
+int hb_qsv_replace_surface_mid(HBQSVFramesContext* hb_qsv_frames_ctx, const QSVMid *mid, mfxFrameSurface1 *surface)
 {
 return -1;
 }
@@ -3011,7 +4337,7 @@
 {
 }
 
-void hb_qsv_uninit_enc()
+void hb_qsv_uninit_enc(hb_job_t *job)
 {
 }
 
@@ -3029,13 +4355,84 @@
 {
 return -1;
 }
+
+int hb_qsv_get_mid_by_surface_from_pool(HBQSVFramesContext* hb_enc_qsv_frames_ctx, mfxFrameSurface1 *surface, QSVMid **out_mid)
+{
+}
+
+int hb_qsv_release_surface_from_pool_by_surface_pointer(HBQSVFramesContext* hb_enc_qsv_frames_ctx, const mfxFrameSurface1 *surface)
+{
+ return -1;
+}
+
 #endif
 
-#else
+hb_qsv_context* hb_qsv_context_init()
+{
+ if (!hb_qsv_available()) {
+ return 0;
+ }
+ 
+ hb_qsv_context *ctx;
+ ctx = av_mallocz(sizeof(hb_qsv_context));
+ if (!ctx)
+ {
+ hb_error( "hb_qsv_context_init: qsv ctx alloc failed" );
+ return NULL;
+ }
+ ctx->dx_index = hb_qsv_get_default_adapter_index();
+ hb_qsv_add_context_usage(ctx, 0);
+ return ctx;
+}
+
+void hb_qsv_context_uninit(hb_job_t *job)
+{
+ hb_qsv_context *ctx = job->qsv.ctx;
+ if ( ctx == NULL )
+ {
+ hb_error( "hb_qsv_context_uninit: ctx is NULL" );
+ return;
+ }
+ /* QSV context cleanup and MFXClose */
+ hb_qsv_context_clean(ctx, hb_qsv_full_path_is_enabled(job));
+ av_free(ctx);
+ job->qsv.ctx = NULL;
+
+ /* Structures below are needed until the end life of the process
+ It has been collected once in hb_qsv_info_init() and no need to recollect every time.
+ */
+#if 0
+ if (g_qsv_adapters_details_list)
+ {
+#if defined(_WIN32) || defined(__MINGW32__)
+ hb_qsv_free_adapters_details(g_qsv_adapters_details_list);
+#endif
+ hb_list_close(&g_qsv_adapters_details_list);
+ g_qsv_adapters_details_list = NULL;
+ }
+ if (g_qsv_adapters_list)
+ {
+ hb_list_close(&g_qsv_adapters_list);
+ g_qsv_adapters_list = NULL;
+ }
+#if defined(_WIN32) || defined(__MINGW32__)
+ if (g_qsv_adapters_info.Adapters)
+ {
+ av_free(g_qsv_adapters_info.Adapters);
+ }
+ g_qsv_adapters_info.Adapters = NULL;
+ g_qsv_adapters_info.NumAlloc = 0;
+ g_qsv_adapters_info.NumActual = 0;
+#endif
+#endif
+ g_adapter_index = hb_qsv_get_default_adapter_index();
+}
+
+#else // HB_PROJECT_FEATURE_QSV
 
 int hb_qsv_available()
 {
- return 0;
+ return -1;
 }
 
 #endif // HB_PROJECT_FEATURE_QSV

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/qsv_filter.c -> HandBrake-1.5.1.tar.xz/libhb/qsv_filter.c Changed

@@ -62,6 +62,7 @@
     mfxExtVPPFrameRateConversion   frc_config;
 };
 
+#if !HB_QSV_ONEVPL
 static int hb_qsv_filter_init( hb_filter_object_t * filter,
                                hb_filter_init_t * init );
 
@@ -165,7 +166,7 @@
          * same; however, due to some versions of FFmpeg not applying the H.264
          * "crop rect" properly, there can be a mismatch.
          *
-         * Since we want the same bahevior regardless of whether we're using
+         * Since we want the same behavior regardless of whether we're using
          * software or hardware-accelerated decoding, prefer the FFmpeg values.
          *
          * Note that since CropW/CropH may be higher than the decode values, we
@@ -339,6 +340,7 @@
     }
     return 0;
 }
+#endif
 
 static int hb_qsv_filter_init( hb_filter_object_t * filter,
                                hb_filter_init_t * init )
@@ -461,8 +463,8 @@
         // closing local stuff
         qsv_filter_close(qsv,HB_QSV_VPP_DEFAULT);
 
-        // closing the commong stuff
-        hb_qsv_context_clean(qsv);
+        // closing the common stuff
+        hb_qsv_context_clean(qsv,hb_qsv_full_path_is_enabled(pv->job));
     }
     hb_buffer_list_close(&pv->list);
     free( pv );

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/qsv_filter_pp.c -> HandBrake-1.5.1.tar.xz/libhb/qsv_filter_pp.c Changed

@@ -36,8 +36,9 @@
 #include "handbrake/qsv_filter.h"
 #include "handbrake/qsv_libav.h"
 #include "handbrake/qsv_memory.h"
+#include "handbrake/qsv_common.h"
 
-
+#if !HB_QSV_ONEVPL
 static int hb_qsv_filter_pre_init( hb_filter_object_t * filter,
 hb_filter_init_t * init );
 static int hb_qsv_filter_pre_work( hb_filter_object_t * filter,
@@ -54,7 +55,6 @@
 static hb_filter_info_t * hb_qsv_filter_post_info(hb_filter_object_t * filter);
 static void hb_qsv_filter_post_close( hb_filter_object_t * filter );
 
-
 hb_filter_object_t hb_filter_qsv_pre =
 {
 .id = HB_FILTER_QSV_PRE,
@@ -79,7 +79,6 @@
 .info = hb_qsv_filter_post_info,
 };
 
-
 static int filter_pre_init( hb_qsv_context* qsv, hb_filter_private_t * pv ){
 mfxStatus sts = MFX_ERR_NONE;
 int i=0;
@@ -287,15 +286,15 @@
 // PIX_FMT_NV12, ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
 pv->sws_context_from_nv12 = hb_sws_get_context(
 pv->job->title->geometry.width, pv->job->title->geometry.height,
- AV_PIX_FMT_NV12,
+ AV_PIX_FMT_NV12, pv->job->color_range,
 pv->job->title->geometry.width, pv->job->title->geometry.height,
- AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV420P, pv->job->color_range,
 SWS_LANCZOS|SWS_ACCURATE_RND, SWS_CS_DEFAULT);
 pv->sws_context_to_nv12 = hb_sws_get_context(
 pv->job->title->geometry.width, pv->job->title->geometry.height,
- AV_PIX_FMT_YUV420P,
+ AV_PIX_FMT_YUV420P, pv->job->color_range,
 pv->job->title->geometry.width, pv->job->title->geometry.height,
- AV_PIX_FMT_NV12,
+ AV_PIX_FMT_NV12, pv->job->color_range,
 SWS_LANCZOS|SWS_ACCURATE_RND, SWS_CS_DEFAULT);
 return 0;
 }
@@ -519,8 +518,8 @@
 // closing local stuff
 qsv_filter_close(qsv,HB_QSV_VPP_USER);
 
- // closing the commong stuff
- hb_qsv_context_clean(qsv);
+ // closing the common stuff
+ hb_qsv_context_clean(qsv,hb_qsv_full_path_is_enabled(pv->job));
 }
 hb_cond_close(&pv->pre.frame_completed);
 hb_lock_close(&pv->pre.frame_completed_lock);
@@ -815,6 +814,7 @@
 
 return sts;
 }
+#endif
 
 mfxExtBuffer* get_ext_buffer(mfxExtBuffer** buffers, mfxU32 buffers_num, mfxU32 buffer_id){
 int i = 0;
@@ -878,9 +878,9 @@
 unlock_frame(task->processor.alloc,task->in);
 return sts;
 }
-
+#if !HB_QSV_ONEVPL
 qsv_nv12_to_yuv420(task->pv->sws_context_from_nv12,task->pv->pre.out, task->in, task->processor.core);
-
+#endif
 // signal: input is prepared, converted from pipeline into internal buffer
 hb_lock(task->pv->pre.frame_completed_lock);
 task->pv->pre.frame_go = 1;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/qsv_libav.c -> HandBrake-1.5.1.tar.xz/libhb/qsv_libav.c Changed

@@ -207,7 +207,7 @@
     }
 }
 
-int hb_qsv_context_clean(hb_qsv_context * qsv)
+int hb_qsv_context_clean(hb_qsv_context * qsv, int full_job)
 {
     int is_active = 0;
     mfxStatus sts = MFX_ERR_NONE;
@@ -235,10 +235,12 @@
         if (qsv->pipes)
             hb_qsv_pipe_list_clean(&qsv->pipes);
 
-        if (qsv->mfx_session) {
-            // Intentionally leave it because the decode session closed first and encoder session hangs
-            //sts = MFXClose(qsv->mfx_session);
-            //HB_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+        if (qsv->mfx_session && !full_job) {
+            // MFXClose() fails in the media_driver under Linux when encoding interrupted
+#if defined(_WIN32) || defined(__MINGW32__)
+            sts = MFXClose(qsv->mfx_session);
+            HB_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
+#endif
             qsv->mfx_session = 0;
         }
     }
@@ -585,7 +587,7 @@
     return sts;
 }
 
-void hb_qsv_wait_on_sync(hb_qsv_context *qsv, hb_qsv_stage *stage)
+int hb_qsv_wait_on_sync(hb_qsv_context *qsv, hb_qsv_stage *stage)
 {
     int iter = 0;
     mfxStatus sts = MFX_ERR_NONE;
@@ -602,10 +604,11 @@
                     hb_qsv_sleep(10);
                     continue;
                 }
-                HB_QSV_CHECK_RET(sts, MFX_ERR_NONE, sts);
+                HB_QSV_CHECK_RESULT(sts, MFX_ERR_NONE, sts);
                 break;
             }
         }
+    return 0;
 }
 
 #endif // HB_PROJECT_FEATURE_QSV

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/qsv_memory.c -> HandBrake-1.5.1.tar.xz/libhb/qsv_memory.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/reader.c -> HandBrake-1.5.1.tar.xz/libhb/reader.c Changed

@@ -1,6 +1,6 @@
 /* reader.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -279,6 +279,13 @@
 else
 {
 int count = hb_list_count(job->title->list_chapter);
+
+ if (job->chapter_end > count || job->chapter_start > count || job->chapter_start > job->chapter_end)
+ {
+ hb_error("Invalid chapter start/end indexes");
+ return 1;
+ }
+
 if (count == 0 || count <= job->chapter_end)
 {
 r->duration = job->title->duration;
@@ -315,7 +322,7 @@
 // fifos that will be needed (+1 for null terminator)
 r->fifos = calloc(count + 1, sizeof(hb_fifo_t*));
 
- // The stream needs to be open before starting the reader thead
+ // The stream needs to be open before starting the reader thread
 // to prevent a race with decoders that may share information
 // with the reader. Specifically avcodec needs this.
 if ( hb_reader_open( r ) )

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/rendersub.c -> HandBrake-1.5.1.tar.xz/libhb/rendersub.c Changed

@@ -1,6 +1,6 @@
 /* rendersub.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -22,7 +22,7 @@
 int sws_width;
 int sws_height;
 
- // VOBSUB
+ // VOBSUB && PGSSUB
 hb_list_t * sub_list; // List of active subs
 
 // SSA
@@ -188,13 +188,112 @@
 }
 }
 
-// applies subtitle 'sub' YUVA420P buffer into destination 'buf'
-// 'buf' is currently YUV420P, but in future will be other formats as well
+static void blend8on1x( hb_buffer_t *dst, hb_buffer_t *src, int left, int top, int shift )
+{
+ int xx, yy;
+ int ww, hh;
+ int x0, y0;
+ int max;
+
+ uint8_t *y_in;
+ uint8_t *u_in;
+ uint8_t *v_in;
+ uint8_t *a_in;
+
+ uint16_t *y_out;
+ uint16_t *u_out;
+ uint16_t *v_out;
+ uint16_t alpha;
+
+ x0 = y0 = 0;
+ if( left < 0 )
+ {
+ x0 = -left;
+ }
+ if( top < 0 )
+ {
+ y0 = -top;
+ }
+
+ ww = src->f.width;
+ if( src->f.width - x0 > dst->f.width - left )
+ {
+ ww = dst->f.width - left + x0;
+ }
+ hh = src->f.height;
+ if( src->f.height - y0 > dst->f.height - top )
+ {
+ hh = dst->f.height - top + y0;
+ }
+
+ max = (256 << shift) -1;
+
+ // Blend luma
+ for( yy = y0; yy < hh; yy++ )
+ {
+ y_in = src->plane0.data + yy * src->plane0.stride;
+ y_out = (uint16_t*)(dst->plane0.data + ( yy + top ) * dst->plane0.stride);
+ a_in = src->plane3.data + yy * src->plane3.stride;
+ for( xx = x0; xx < ww; xx++ )
+ {
+ alpha = a_inxx << shift;
+ /*
+ * Merge the luminance and alpha with the picture
+ */
+ y_outleft + xx =
+ ( (uint32_t)y_outleft + xx * ( max - alpha ) +
+ ((uint32_t)y_inxx << shift) * alpha ) / max;
+ }
+ }
+
+ // Blend U & V
+ int hshift = 0;
+ int wshift = 0;
+ if( dst->plane1.height < dst->plane0.height )
+ hshift = 1;
+ if( dst->plane1.width < dst->plane0.width )
+ wshift = 1;
+
+ for( yy = y0 >> hshift; yy < hh >> hshift; yy++ )
+ {
+ u_in = src->plane1.data + yy * src->plane1.stride;
+ u_out = (uint16_t*)(dst->plane1.data + ( yy + ( top >> hshift ) ) * dst->plane1.stride);
+ v_in = src->plane2.data + yy * src->plane2.stride;
+ v_out = (uint16_t*)(dst->plane2.data + ( yy + ( top >> hshift ) ) * dst->plane2.stride);
+ a_in = src->plane3.data + ( yy << hshift ) * src->plane3.stride;
+
+ for( xx = x0 >> wshift; xx < ww >> wshift; xx++ )
+ {
+ alpha = a_inxx << wshift << shift;
+
+ // Blend averge U and alpha
+ u_out(left >> wshift) + xx =
+ ( (uint32_t)u_out(left >> wshift) + xx * ( max - alpha ) +
+ ((uint32_t)u_inxx << shift) * alpha ) / max;
+
+ // Blend V and alpha
+ v_out(left >> wshift) + xx =
+ ( (uint32_t)v_out(left >> wshift) + xx * ( max - alpha ) +
+ ((uint32_t)v_inxx << shift) * alpha ) / max;
+ }
+ }
+}
+
 // Assumes that the input destination buffer has the same dimensions
 // as the original title dimensions
 static void ApplySub( hb_filter_private_t * pv, hb_buffer_t * buf, hb_buffer_t * sub )
 {
- blend( buf, sub, sub->f.x, sub->f.y );
+ switch (pv->output.pix_fmt) {
+ case AV_PIX_FMT_YUV420P10:
+ blend8on1x(buf, sub, sub->f.x, sub->f.y, 2);
+ break;
+ case AV_PIX_FMT_YUV420P12:
+ blend8on1x(buf, sub, sub->f.x, sub->f.y, 4);
+ break;
+ default:
+ blend(buf, sub, sub->f.x, sub->f.y);
+ break;
+ }
 }
 
 static hb_buffer_t * ScaleSubtitle(hb_filter_private_t *pv,
@@ -249,8 +348,8 @@
 if (pv->sws!= NULL)
 sws_freeContext(pv->sws);
 pv->sws = hb_sws_get_context(
- sub->f.width, sub->f.height, sub->f.fmt,
- scaled->f.width, scaled->f.height, sub->f.fmt,
+ sub->f.width, sub->f.height, sub->f.fmt, AVCOL_RANGE_MPEG,
+ scaled->f.width, scaled->f.height, sub->f.fmt, AVCOL_RANGE_MPEG,
 SWS_LANCZOS|SWS_ACCURATE_RND, SWS_CS_DEFAULT);
 pv->sws_width = width;
 pv->sws_height = height;
@@ -345,6 +444,8 @@
 int ii;
 hb_buffer_t *sub, *next;
 
+ // Note that VOBSUBs can overlap in time.
+ // I.e. more than one may be rendered to the screen at once.
 for( ii = 0; ii < hb_list_count(pv->sub_list); )
 {
 sub = hb_list_item( pv->sub_list, ii );
@@ -462,7 +563,7 @@
 unsigned g = ( frame->color >> 16 ) & 0xff;
 unsigned b = ( frame->color >> 8 ) & 0xff;
 
- int yuv = hb_rgb2yuv((r << 16) | (g << 8) | b );
+ int yuv = hb_rgb2yuv_bt709((r << 16) | (g << 8) | b );
 
 unsigned frameY = (yuv >> 16) & 0xff;
 unsigned frameV = (yuv >> 8 ) & 0xff;
@@ -577,7 +678,7 @@
 }
 
 ass_set_use_margins( pv->renderer, 0 );
- ass_set_hinting( pv->renderer, ASS_HINTING_LIGHT ); // VLC 1.0.4 uses this
+ ass_set_hinting( pv->renderer, ASS_HINTING_NONE );
 ass_set_font_scale( pv->renderer, 1.0 );
 ass_set_line_spacing( pv->renderer, 1.0 );
 
@@ -602,7 +703,7 @@
 ass_set_frame_size( pv->renderer, width, height);
 
 double par = (double)job->par.num / job->par.den;
- ass_set_aspect_ratio( pv->renderer, 1, par );
+ ass_set_pixel_aspect( pv->renderer, par );
 
 return 0;
 }
@@ -713,6 +814,7 @@
 static void process_sub(hb_filter_private_t *pv, hb_buffer_t *sub)
 {
 int64_t start, dur;
+ int size;
 char *ssa, *tmp;
 
 // libass expects every chunk to have a unique sequence number
@@ -729,7 +831,8 @@
 // do not need to do special processing for stop == AV_NOPTS_VALUE
 start = sub->s.start;
 dur = sub->s.stop - sub->s.start;
- ass_process_chunk(pv->ssaTrack, ssa, sub->size, start, dur);
+ size = strlen(ssa);
+ ass_process_chunk(pv->ssaTrack, ssa, size, start, dur);
 free(ssa);
 }
 
@@ -1011,6 +1114,7 @@
 return cc608sub_post_init( filter, job );
 }
 
+ case DVBSUB:
 case PGSSUB:
 {
 return pgssub_post_init( filter, job );
@@ -1050,6 +1154,7 @@
 return textsub_work( filter, buf_in, buf_out );
 }
 
+ case DVBSUB:
 case PGSSUB:
 {
 return pgssub_work( filter, buf_in, buf_out );
@@ -1092,6 +1197,7 @@
 textsub_close( filter );
 } break;
 
+ case DVBSUB:
 case PGSSUB:
 {
 pgssub_close( filter );

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/rotate.c -> HandBrake-1.5.1.tar.xz/libhb/rotate.c Changed

@@ -62,10 +62,11 @@
 
     hb_dict_t        * settings = filter->settings;
 
+    hb_rational_t par    = init->geometry.par;
     int           width  = init->geometry.width;
     int           height = init->geometry.height;
     const char *  trans  = NULL;
-    int           angle  = 0, flip = 0, hflip = 0, vflip = 0, tmp;
+    int           angle  = 0, flip = 0, hflip = 0, vflip = 0;
 
     hb_dict_extract_int(&angle, settings, "angle");
     hb_dict_extract_bool(&flip, settings, "hflip");
@@ -88,10 +89,11 @@
             hflip = flip;
             break;
         case 90:
-            trans  = clock;
-            tmp    = width;
-            width  = height;
-            height = tmp;
+            trans   = clock;
+            width   = init->geometry.height;
+            height  = init->geometry.width;
+            par.num = init->geometry.par.den;
+            par.den = init->geometry.par.num;
             break;
         case 180:
             vflip = 1;
@@ -99,9 +101,10 @@
             break;
         case 270:
             trans  = cclock;
-            tmp    = width;
-            width  = height;
-            height = tmp;
+            width   = init->geometry.height;
+            height  = init->geometry.width;
+            par.num = init->geometry.par.den;
+            par.den = init->geometry.par.num;
             break;
         default:
             break;
@@ -138,8 +141,9 @@
         pv->avfilters = hb_value_null();
     }
 
-    init->geometry.width = width;
+    init->geometry.width  = width;
     init->geometry.height = height;
+    init->geometry.par    = par;
     pv->output = *init;
 
     return 0;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/scan.c -> HandBrake-1.5.1.tar.xz/libhb/scan.c Changed

@@ -1,6 +1,6 @@
 /* scan.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -844,7 +844,7 @@
 
 if( data->store_previews )
 {
- hb_save_preview( data->h, title->index, i, vid_buf );
+ hb_save_preview( data->h, title->index, i, vid_buf, HB_PREVIEW_FORMAT_JPG );
 }
 
 /* Detect black borders */
@@ -1002,15 +1002,42 @@
 }
 title->video_bitrate = vid_info.bitrate;
 
- if( vid_info.geometry.par.num && vid_info.geometry.par.den )
+ if (data->dvd || data->bd)
 {
+ // DVD/BD doesn't have a container PAR, but it has container DAR
+ // which can be used to compute container PAR
+ hb_reduce(&title->geometry.par.num, &title->geometry.par.den,
+ title->geometry.height * title->container_dar.num,
+ title->geometry.width * title->container_dar.den);
+ }
+ if (vid_info.geometry.par.num && vid_info.geometry.par.den)
+ {
+ // title->geometry.par is initially container PAR, but
+ // the video stream almost always also supplies PAR and
+ // is generally more reliable, so use it.
+ //
+ // Check if container PAR and video stream PAR are in agreement
+ if (title->geometry.par.num && title->geometry.par.den &&
+ title->geometry.par.num != vid_info.geometry.par.num &&
+ title->geometry.par.den != vid_info.geometry.par.den)
+ {
+ hb_log("WARNING: Video PAR %d:%d != container PAR %d:%d",
+ vid_info.geometry.par.num, vid_info.geometry.par.den,
+ title->geometry.par.num, title->geometry.par.den);
+ }
 title->geometry.par = vid_info.geometry.par;
 }
+ else if (!title->geometry.par.num || !title->geometry.par.den)
+ {
+ // No video PAR found, assume 1:1
+ title->geometry.par.num = title->geometry.par.den = 1;
+ }
 title->pix_fmt = vid_info.pix_fmt;
 title->color_prim = vid_info.color_prim;
 title->color_transfer = vid_info.color_transfer;
 title->color_matrix = vid_info.color_matrix;
 title->color_range = vid_info.color_range;
+ title->chroma_location = vid_info.chroma_location;
 
 title->video_decode_support = vid_info.video_decode_support;
 
@@ -1058,12 +1085,34 @@
 }
 
 hb_log( "scan: %d previews, %dx%d, %.3f fps, autocrop = %d/%d/%d/%d, "
- "aspect %s, PAR %d:%d",
+ "aspect %s, PAR %d:%d, color profile: %d-%d-%d, chroma location: %s",
 npreviews, title->geometry.width, title->geometry.height,
 (float)title->vrate.num / title->vrate.den,
 title->crop0, title->crop1, title->crop2, title->crop3,
 aspect_to_string(&title->dar),
- title->geometry.par.num, title->geometry.par.den);
+ title->geometry.par.num, title->geometry.par.den,
+ title->color_prim, title->color_transfer, title->color_matrix,
+ av_chroma_location_name(title->chroma_location));
+
+ if (title->mastering.has_primaries || title->mastering.has_luminance)
+ {
+ hb_log("scan: mastering display metadata: r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) min_luminance=%f, max_luminance=%f",
+ hb_q2d(title->mastering.display_primaries00),
+ hb_q2d(title->mastering.display_primaries01),
+ hb_q2d(title->mastering.display_primaries10),
+ hb_q2d(title->mastering.display_primaries11),
+ hb_q2d(title->mastering.display_primaries20),
+ hb_q2d(title->mastering.display_primaries21),
+ hb_q2d(title->mastering.white_point0), hb_q2d(title->mastering.white_point1),
+ hb_q2d(title->mastering.min_luminance), hb_q2d(title->mastering.max_luminance));
+ }
+
+ if (title->coll.max_cll || title->coll.max_fall)
+ {
+ hb_log("scan: content light level: max_cll=%u, max_fall=%u",
+ title->coll.max_cll,
+ title->coll.max_fall);
+ }
 
 if (title->video_decode_support != HB_DECODE_SUPPORT_SW)
 {
@@ -1276,6 +1325,9 @@
 case HB_ACODEC_FFFLAC:
 codec_name = "FLAC";
 break;
+ case HB_ACODEC_MP2:
+ codec_name = "MPEG";
+ break;
 case HB_ACODEC_MP3:
 codec_name = "MP3";
 break;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/ssautil.c -> HandBrake-1.5.1.tar.xz/libhb/ssautil.c Changed

@@ -1,6 +1,6 @@
 /* ssautil.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -383,7 +383,7 @@
 return NULL;
 }
 
-typedef struct ssa_style_indicies_s
+typedef struct ssa_style_indices_s
 {
 int style_name_index;
 int font_name_index;
@@ -395,9 +395,9 @@
 int bold_index;
 int italic_index;
 int underline_index;
-} ssa_style_indicies_t;
+} ssa_style_indices_t;
 
-static void fill_field_indicies(char **fields, ssa_style_indicies_t * indices)
+static void fill_field_indices(char **fields, ssa_style_indices_t * indices)
 {
 indices->style_name_index = field_index(fields, "Name");
 indices->font_name_index = field_index(fields, "Fontname");
@@ -412,7 +412,7 @@
 }
 
 static int add_style(hb_subtitle_style_context_t *ctx,
- char ** style, ssa_style_indicies_t *field_indices)
+ char ** style, ssa_style_indices_t *field_indices)
 {
 const char * name;
 const char * value;
@@ -600,9 +600,9 @@
 
 if (fields != NULL)
 {
- ssa_style_indicies_t field_indices;
+ ssa_style_indices_t field_indices;
 
- fill_field_indicies(fields, &field_indices);
+ fill_field_indices(fields, &field_indices);
 
 pos = strstr(pos, "\nStyle:");
 while (pos != NULL)
@@ -743,7 +743,7 @@
 {
 if (ctx->style_start < utf8_end_pos)
 {
- if (!tx3g_update_style_atoms(ctx, utf8_end_pos - 1))
+ if (!tx3g_update_style_atoms(ctx, utf8_end_pos))
 {
 return 0;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/stream.c -> HandBrake-1.5.1.tar.xz/libhb/stream.c Changed

@@ -1,6 +1,6 @@
 /* stream.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -50,8 +50,8 @@
 st(0x00, U, 0, 0, NULL),
 st(0x01, V, WORK_DECAVCODECV, AV_CODEC_ID_MPEG1VIDEO, "MPEG1"),
 st(0x02, V, WORK_DECAVCODECV, AV_CODEC_ID_MPEG2VIDEO, "MPEG2"),
- st(0x03, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2, "MPEG1"),
- st(0x04, A, HB_ACODEC_FFMPEG, AV_CODEC_ID_MP2, "MPEG2"),
+ st(0x03, A, HB_ACODEC_MP2, AV_CODEC_ID_MP2, "MPEG1"),
+ st(0x04, A, HB_ACODEC_MP2, AV_CODEC_ID_MP2, "MPEG2"),
 st(0x05, N, 0, 0, "ISO 13818-1 private section"),
 st(0x06, U, 0, 0, "ISO 13818-1 PES private data"),
 st(0x07, N, 0, 0, "ISO 13522 MHEG"),
@@ -85,7 +85,7 @@
 
 st(0x8a, A, HB_ACODEC_DCA, AV_CODEC_ID_DTS, "DTS"),
 
- st(0x90, S, WORK_DECPGSSUB, 0, "PGS Subtitle"),
+ st(0x90, S, WORK_DECAVSUB, AV_CODEC_ID_HDMV_PGS_SUBTITLE, "PGS Subtitle"),
 // 0x91 can be AC3 or BD Interactive Graphics Stream.
 st(0x91, U, 0, 0, "AC3/IGS"),
 st(0x92, N, 0, 0, "Subtitle"),
@@ -122,6 +122,7 @@
 int64_t scr;
 int header_len;
 int packet_len;
+ int stuffing_len;
 } hb_pes_info_t;
 
 typedef struct {
@@ -153,9 +154,11 @@
 int next; // next pointer for list
 // hb_ts_stream_t points to a list of
 // hb_pes_stream_t
- hb_buffer_t *probe_buf;
- int probe_next_size;
- int probe_count;
+ hb_buffer_t * probe_buf;
+ int probe_next_size;
+ int probe_count;
+ uint8_t * extradata;
+ int extradata_size;
 } hb_pes_stream_t;
 
 struct hb_stream_s
@@ -216,7 +219,7 @@
 hb_title_t *title;
 
 AVFormatContext *ffmpeg_ic;
- AVPacket ffmpeg_pkt;
+ AVPacket *ffmpeg_pkt;
 uint8_t ffmpeg_video_id;
 
 uint32_t reg_desc; // 4 byte registration code that identifies
@@ -663,6 +666,16 @@
 }
 }
 }
+ if ( d->pes.list )
+ {
+ for (i = 0; i < d->pes.count; i++)
+ {
+ if (d->pes.listi.extradata)
+ {
+ free(d->pes.listi.extradata);
+ }
+ }
+ }
 }
 
 static void hb_stream_delete( hb_stream_t *d )
@@ -1805,7 +1818,7 @@
 * hb_stream_chapter
 ***********************************************************************
 * Return the number of the chapter that we are currently in. We store
- * the chapter number starting from 0, so + 1 for the real chpater num.
+ * the chapter number starting from 0, so + 1 for the real chapter num.
 **********************************************************************/
 int hb_stream_chapter( hb_stream_t * src_stream )
 {
@@ -1913,14 +1926,14 @@
 break;
 }
 }
- if ( st2codecpes->stream_type.name )
- {
- return st2codecpes->stream_type.name;
- }
 if ( pes->codec_name0 != 0 )
 {
 return pes->codec_name;
 }
+ if ( st2codecpes->stream_type.name )
+ {
+ return st2codecpes->stream_type.name;
+ }
 if ( pes->codec & HB_ACODEC_FF_MASK )
 {
 AVCodec * codec = avcodec_find_decoder( pes->codec_param );
@@ -1976,34 +1989,59 @@
 subtitle->timebase.num = 1;
 subtitle->timebase.den = 90000;
 
- switch ( pes->codec )
+ switch (pes->codec)
 {
- case WORK_DECPGSSUB:
- subtitle->source = PGSSUB;
- subtitle->format = PICTURESUB;
- subtitle->config.dest = RENDERSUB;
- break;
- case WORK_DECVOBSUB:
- subtitle->source = VOBSUB;
- subtitle->format = PICTURESUB;
- subtitle->config.dest = RENDERSUB;
- break;
+ case WORK_DECAVSUB:
+ {
+ switch (pes->codec_param)
+ {
+ case AV_CODEC_ID_DVB_SUBTITLE:
+ subtitle->source = DVBSUB;
+ subtitle->format = PICTURESUB;
+ subtitle->config.dest = RENDERSUB;
+ if (pes->extradata != NULL)
+ {
+ subtitle->extradata = malloc(pes->extradata_size);
+ subtitle->extradata_size = pes->extradata_size;
+ memcpy(subtitle->extradata, pes->extradata,
+ pes->extradata_size);
+ }
+ break;
+ case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
+ subtitle->source = PGSSUB;
+ subtitle->format = PICTURESUB;
+ subtitle->config.dest = RENDERSUB;
+ break;
+ case AV_CODEC_ID_DVD_SUBTITLE:
+ subtitle->source = VOBSUB;
+ subtitle->format = PICTURESUB;
+ subtitle->config.dest = RENDERSUB;
+ break;
+ default:
+ // Unrecognized, don't add to list
+ hb_log("unrecognized subtitle!");
+ free( subtitle );
+ return;
+ }
+ } break;
 default:
 // Unrecognized, don't add to list
 hb_log("unrecognized subtitle!");
 free( subtitle );
 return;
 }
+
 lang = lang_for_code( pes->lang_code );
 snprintf(subtitle->lang, sizeof( subtitle->lang ), "%s %s",
 strlen(lang->native_name) ? lang->native_name : lang->eng_name,
 hb_subsource_name(subtitle->source));
 snprintf(subtitle->iso639_2, sizeof( subtitle->iso639_2 ), "%s",
 lang->iso639_2);
- subtitle->reg_desc = stream->reg_desc;
- subtitle->stream_type = pes->stream_type;
+ subtitle->reg_desc = stream->reg_desc;
+ subtitle->stream_type = pes->stream_type;
 subtitle->substream_type = pes->stream_id_ext;
- subtitle->codec = pes->codec;
+ subtitle->codec = pes->codec;
+ subtitle->codec_param = pes->codec_param;
 
 // Create a default palette since vob files do not include the
 // vobsub palette.
@@ -2605,13 +2643,39 @@
 
 case 0x59: // DVB Subtitleing descriptor
 {
- // We don't currently process subtitles from
- // TS or PS streams. Set stream 'kind' to N
+ int lang_count = len / 8;
+
 stream->pes.listpes_idx.stream_type = 0x00;
- stream->pes.listpes_idx.stream_kind = N;
+ stream->pes.listpes_idx.stream_kind = S;
+ stream->pes.listpes_idx.codec = WORK_DECAVSUB;
+ stream->pes.listpes_idx.codec_param = AV_CODEC_ID_DVB_SUBTITLE;
 strncpy(stream->pes.listpes_idx.codec_name,
 "DVB Subtitling", 80);
- bits_skip(bb, 8 * len);
+ if (lang_count > 0)
+ {
+ uint8_t * extradata = malloc(5);
+ char code3;
+
+ stream->pes.listpes_idx.extradata = extradata;
+ stream->pes.listpes_idx.extradata_size = 5;
+ code0 = bits_get(bb, 8);
+ code1 = bits_get(bb, 8);
+ code2 = bits_get(bb, 8);
+
+ extradata4 = bits_get(bb, 8);
+ *extradata++ = bits_get(bb, 8);
+ *extradata++ = bits_get(bb, 8);
+ *extradata++ = bits_get(bb, 8);
+ *extradata++ = bits_get(bb, 8);
+
+ stream->pes.listpes_idx.lang_code =
+ lang_to_code(lang_for_code2(code));
+ bits_skip(bb, 8 * (len - 8));
+ }
+ else
+ {
+ bits_skip(bb, 8 * len);
+ }
 } break;
 
 case 0x6a: // DVB AC-3 descriptor
@@ -2930,7 +2994,8 @@
 }
 
 bits_skip(bb, 8 * 4);
- pes_info->packet_len = bits_get(bb, 16);
+ pes_info->packet_len = bits_get(bb, 16);
+ pes_info->stuffing_len = 0;
 
 /*
 * This would normally be an error. But the decoders can generally
@@ -3147,6 +3212,22 @@
 pes_info->header_len += 4;
 }
 }
+ if ( pes_info->stream_id == 0xbd && stream->hb_stream_type == transport )
+ {
+ if ( bits_bytes_left(bb) < 2 )
+ {
+ return 0;
+ }
+ int ssid = bits_peek(bb, 8);
+ if ( ssid == 0x20 )
+ {
+ // DVB (subtitles)
+ bits_skip(bb, 8);
+ pes_info->bd_substream_id = bits_get(bb, 8);
+ pes_info->header_len += 2;
+ pes_info->stuffing_len = 1;
+ }
+ }
 return 1;
 }
 
@@ -3237,7 +3318,15 @@
 return 0;
 }
 pes_info->packet_len = bits_get(&bb, 16);
- pes_info->header_len = bb.pos >> 3;
+ if ( pes_info->stream_id == 0xbe )
+ {
+ // Skip all stuffing
+ pes_info->header_len = 6 + pes_info->packet_len;
+ }
+ else
+ {
+ pes_info->header_len = bb.pos >> 3;
+ }
 return 1;
 }
 }
@@ -3834,7 +3923,8 @@
 int idx = update_ps_streams( stream, pes_info.stream_id,
 pes_info.bd_substream_id, 0, -1 );
 stream->pes.listidx.stream_kind = S;
- stream->pes.listidx.codec = WORK_DECVOBSUB;
+ stream->pes.listidx.codec = WORK_DECAVSUB;
+ stream->pes.listidx.codec_param = AV_CODEC_ID_DVD_SUBTITLE;
 strncpy(stream->pes.listidx.codec_name,
 "DVD Subtitle", 80);
 continue;
@@ -3916,8 +4006,8 @@
 // (which do not have a program stream map) may use
 // this for other types of video.
 //
- // Also, the hddvd tards decided to use 0xe2 and 0xe3 for
- // h.264 video :( and the twits decided not to put a
+ // Also, the hddvd folks decided to use 0xe2 and 0xe3 for
+ // h.264 video :( and the folks decided not to put a
 // program stream map in the stream :'(
 //
 // So set this to an unknown stream type and probe.
@@ -4154,6 +4244,7 @@
 { "eac3" , AV_CODEC_ID_EAC3 },
 { "h264" , AV_CODEC_ID_H264 },
 { "m4v" , AV_CODEC_ID_MPEG4 },
+ { "mp2" , AV_CODEC_ID_MP2 },
 { "mp3" , AV_CODEC_ID_MP3 },
 { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO },
 { "cavsvideo", AV_CODEC_ID_CAVS },
@@ -4602,8 +4693,21 @@
 uint8_t *tdat = b->data + ts_stream->packet_offset;
 int es_size = b->size - ts_stream->packet_offset;
 
+ if (ts_stream->packet_len >= ts_stream->pes_info.packet_len + 6)
+ {
+ // Remove trailing stuffing bytes (DVB subtitles)
+ es_size -= ts_stream->pes_info.stuffing_len;
+ }
 if (es_size <= 0)
 {
+ if (ts_stream->pes_info.packet_len > 0 &&
+ ts_stream->packet_len >= ts_stream->pes_info.packet_len + 6)
+ {
+ ts_stream->pes_info_valid = 0;
+ ts_stream->packet_len = 0;
+ }
+ b->size = 0;
+ ts_stream->packet_offset = 0;
 return NULL;
 }
 
@@ -4670,6 +4774,7 @@
 stream->ts.pcr = AV_NOPTS_VALUE;
 buf->s.start = ts_stream->pes_info.pts;
 buf->s.renderOffset = ts_stream->pes_info.dts;
+ buf->s.duration = (int64_t)AV_NOPTS_VALUE;
 }
 else
 {
@@ -5132,8 +5237,14 @@
 title->opaque_priv = (void*)info_ic;
 stream->ffmpeg_ic = info_ic;
 stream->hb_stream_type = ffmpeg;
- av_init_packet(&stream->ffmpeg_pkt);
 stream->chapter_end = INT64_MAX;
+ stream->ffmpeg_pkt = av_packet_alloc();
+
+ if (stream->ffmpeg_pkt == NULL)
+ {
+ hb_error("stream: av_packet_alloc failed");
+ goto fail;
+ }
 
 if ( !scan )
 {
@@ -5174,7 +5285,7 @@
 static void ffmpeg_close( hb_stream_t *d )
 {
 avformat_close_input( &d->ffmpeg_ic );
- av_packet_unref(&d->ffmpeg_pkt);
+ av_packet_free(&d->ffmpeg_pkt);
 }
 
 // Track names can be in multiple metadata entries, one per
@@ -5296,6 +5407,10 @@
 audio->config.in.codec = HB_ACODEC_FFFLAC;
 } break;
 
+ case AV_CODEC_ID_MP2:
+ audio->config.in.codec = HB_ACODEC_MP2;
+ break;
+
 case AV_CODEC_ID_MP3:
 audio->config.in.codec = HB_ACODEC_MP3;
 break;
@@ -5465,20 +5580,31 @@
 switch ( codecpar->codec_id )
 {
 case AV_CODEC_ID_DVD_SUBTITLE:
- subtitle->format = PICTURESUB;
- subtitle->source = VOBSUB;
- subtitle->config.dest = RENDERSUB; // By default render (burn-in) the VOBSUB.
- subtitle->codec = WORK_DECVOBSUB;
+ subtitle->format = PICTURESUB;
+ subtitle->source = VOBSUB;
+ subtitle->config.dest = RENDERSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = AV_CODEC_ID_DVD_SUBTITLE;
 if (ffmpeg_parse_vobsub_extradata(codecpar, subtitle))
+ {
 hb_log( "add_ffmpeg_subtitle: malformed extradata for VOB subtitle track; "
 "subtitle colors likely to be wrong" );
+ }
+ break;
+ case AV_CODEC_ID_DVB_SUBTITLE:
+ subtitle->format = PICTURESUB;
+ subtitle->source = DVBSUB;
+ subtitle->config.dest = RENDERSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = codecpar->codec_id;
 break;
 case AV_CODEC_ID_TEXT:
 case AV_CODEC_ID_SUBRIP:
- subtitle->format = TEXTSUB;
- subtitle->source = UTF8SUB;
+ subtitle->format = TEXTSUB;
+ subtitle->source = UTF8SUB;
 subtitle->config.dest = PASSTHRUSUB;
- subtitle->codec = WORK_DECUTF8SUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = codecpar->codec_id;
 break;
 case AV_CODEC_ID_MOV_TEXT: // TX3G
 subtitle->format = TEXTSUB;
@@ -5487,22 +5613,25 @@
 subtitle->codec = WORK_DECTX3GSUB;
 break;
 case AV_CODEC_ID_ASS:
- subtitle->format = TEXTSUB;
- subtitle->source = SSASUB;
+ subtitle->format = TEXTSUB;
+ subtitle->source = SSASUB;
 subtitle->config.dest = PASSTHRUSUB;
- subtitle->codec = WORK_DECSSASUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = codecpar->codec_id;
 break;
 case AV_CODEC_ID_HDMV_PGS_SUBTITLE:
- subtitle->format = PICTURESUB;
- subtitle->source = PGSSUB;
+ subtitle->format = PICTURESUB;
+ subtitle->source = PGSSUB;
 subtitle->config.dest = RENDERSUB;
- subtitle->codec = WORK_DECPGSSUB;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = codecpar->codec_id;
 break;
 case AV_CODEC_ID_EIA_608:
- subtitle->format = TEXTSUB;
- subtitle->source = CC608SUB;
+ subtitle->format = TEXTSUB;
+ subtitle->source = CC608SUB;
 subtitle->config.dest = PASSTHRUSUB;
- subtitle->codec = WORK_DECCC608;
+ subtitle->codec = WORK_DECAVSUB;
+ subtitle->codec_param = codecpar->codec_id;
 subtitle->attributes = HB_SUBTITLE_ATTR_CC;
 break;
 default:
@@ -5615,53 +5744,12 @@
 AVDictionaryEntry *tag = NULL;
 while ( (tag = av_dict_get(m, "", tag, AV_DICT_IGNORE_SUFFIX)) )
 {
- if ( !strcasecmp( "TITLE", tag->key ) )
- {
- hb_metadata_set_name(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "ARTIST", tag->key ) )
- {
- hb_metadata_set_artist(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "DIRECTOR", tag->key ) ||
- !strcasecmp( "album_artist", tag->key ) )
- {
- hb_metadata_set_album_artist(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "COMPOSER", tag->key ) )
- {
- hb_metadata_set_composer(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "DATE_RELEASED", tag->key ) ||
- !strcasecmp( "date", tag->key ) )
- {
- hb_metadata_set_release_date(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "SUMMARY", tag->key ) ||
- !strcasecmp( "comment", tag->key ) )
- {
- hb_metadata_set_comment(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "GENRE", tag->key ) )
- {
- hb_metadata_set_genre(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "DESCRIPTION", tag->key ) )
- {
- hb_metadata_set_description(title->metadata, tag->value);
- result = 1;
- }
- else if ( !strcasecmp( "SYNOPSIS", tag->key ) )
+ const char * hb_key;
+
+ hb_key = hb_lookup_meta_key(tag->key);
+ if (hb_key != NULL)
 {
- hb_metadata_set_long_description(title->metadata, tag->value);
- result = 1;
+ hb_update_meta_dict(title->metadata->dict, hb_key, tag->value);
 }
 }
 return result;
@@ -5705,10 +5793,14 @@
 title->video_codec == 0 )
 {
 AVCodecParameters *codecpar = st->codecpar;
- if ( codecpar->format != AV_PIX_FMT_YUV420P &&
+ // Check for unsupported color space.
+ // Exclude 'NONE' from check since we may not know this
+ // information yet.
+ if ( codecpar->format != AV_PIX_FMT_NONE &&
 !sws_isSupportedInput( codecpar->format ) )
 {
- hb_log( "ffmpeg_title_scan: Unsupported color space" );
+ hb_log( "ffmpeg_title_scan: Unsupported color space (%d)",
+ codecpar->format );
 continue;
 }
 title->video_id = i;
@@ -5749,6 +5841,19 @@
 }
 break;
 }
+ case AV_PKT_DATA_MASTERING_DISPLAY_METADATA:
+ {
+ AVMasteringDisplayMetadata *mastering = (AVMasteringDisplayMetadata *)sd.data;
+ title->mastering = hb_mastering_ff_to_hb(*mastering);
+ break;
+ }
+ case AV_PKT_DATA_CONTENT_LIGHT_LEVEL:
+ {
+ AVContentLightMetadata *coll = (AVContentLightMetadata *)sd.data;
+ title->coll.max_cll = coll->MaxCLL;
+ title->coll.max_fall = coll->MaxFALL;
+ break;
+ }
 default:
 break;
 }
@@ -5883,7 +5988,7 @@
 // XXX the VC1 codec doesn't mark key frames so to get previews
 // we do it ourselves here. The decoder gets messed up if it
 // doesn't get a SEQ header first so we consider that to be a key frame.
- pkt = stream->ffmpeg_pkt.data;
+ pkt = stream->ffmpeg_pkt->data;
 if ( !pkt0 && !pkt1 && pkt2 == 1 && pkt3 == 0x0f )
 return 1;
 
@@ -5898,7 +6003,7 @@
 // depending on whether it's main or advanced profile then whether
 // there are bframes or not so we have to look at the sequence
 // header to get that.
- pkt = stream->ffmpeg_pkt.data;
+ pkt = stream->ffmpeg_pkt->data;
 uint8_t *seqhdr = stream->ffmpeg_ic->streamsstream->ffmpeg_video_id->codecpar->extradata;
 int pshift = 2;
 if ( ( seqhdr3 & 0x02 ) == 0 )
@@ -5916,7 +6021,7 @@
 default:
 break;
 }
- return ( stream->ffmpeg_pkt.flags & AV_PKT_FLAG_KEY );
+ return ( stream->ffmpeg_pkt->flags & AV_PKT_FLAG_KEY );
 }
 
 hb_buffer_t * hb_ffmpeg_read( hb_stream_t *stream )
@@ -5925,7 +6030,7 @@
 hb_buffer_t * buf;
 
 again:
- if ( ( err = av_read_frame( stream->ffmpeg_ic, &stream->ffmpeg_pkt )) < 0 )
+ if ( ( err = av_read_frame( stream->ffmpeg_ic, stream->ffmpeg_pkt )) < 0 )
 {
 // av_read_frame can return EAGAIN. In this case, it expects
 // to be called again to get more data.
@@ -5936,7 +6041,7 @@
 // XXX the following conditional is to handle avi files that
 // use M$ 'packed b-frames' and occasionally have negative
 // sizes for the null frames these require.
- if ( err != AVERROR(ENOMEM) || stream->ffmpeg_pkt.size >= 0 )
+ if ( err != AVERROR(ENOMEM) || stream->ffmpeg_pkt->size >= 0 )
 {
 // error or eof
 if (err != AVERROR_EOF)
@@ -5949,7 +6054,7 @@
 return NULL;
 }
 }
- if ( stream->ffmpeg_pkt.stream_index == stream->ffmpeg_video_id )
+ if ( stream->ffmpeg_pkt->stream_index == stream->ffmpeg_video_id )
 {
 if ( stream->need_keyframe )
 {
@@ -5959,14 +6064,15 @@
 // or we've looked through 50 video frames without finding one.
 if ( ! ffmpeg_is_keyframe( stream ) && ++stream->need_keyframe < 50 )
 {
- av_packet_unref(&stream->ffmpeg_pkt);
+ av_packet_unref(stream->ffmpeg_pkt);
 goto again;
 }
 stream->need_keyframe = 0;
 }
 ++stream->frames;
 }
- if ( stream->ffmpeg_pkt.size <= 0 )
+ AVStream *s = stream->ffmpeg_ic->streamsstream->ffmpeg_pkt->stream_index;
+ if ( stream->ffmpeg_pkt->size <= 0 )
 {
 // M$ "invalid and inefficient" packed b-frames require 'null frames'
 // following them to preserve the timing (since the packing puts two
@@ -5979,18 +6085,34 @@
 else
 {
 // sometimes we get absurd sizes from ffmpeg
- if ( stream->ffmpeg_pkt.size >= (1 << 27) )
+ if ( stream->ffmpeg_pkt->size >= (1 << 27) )
 {
- hb_log( "ffmpeg_read: pkt too big: %d bytes", stream->ffmpeg_pkt.size );
- av_packet_unref(&stream->ffmpeg_pkt);
+ hb_log( "ffmpeg_read: pkt too big: %d bytes", stream->ffmpeg_pkt->size );
+ av_packet_unref(stream->ffmpeg_pkt);
 return hb_ffmpeg_read( stream );
 }
- buf = hb_buffer_init( stream->ffmpeg_pkt.size );
- memcpy( buf->data, stream->ffmpeg_pkt.data, stream->ffmpeg_pkt.size );
+ switch (s->codecpar->codec_type)
+ {
+ case AVMEDIA_TYPE_SUBTITLE:
+ // Some ffmpeg subtitle decoders expect a null terminated
+ // string, but the null is not included in the packet size.
+ // WTF ffmpeg.
+ buf = hb_buffer_init(stream->ffmpeg_pkt->size + 1);
+ memcpy(buf->data, stream->ffmpeg_pkt->data,
+ stream->ffmpeg_pkt->size);
+ buf->datastream->ffmpeg_pkt->size = 0;
+ buf->size = stream->ffmpeg_pkt->size;
+ break;
+ default:
+ buf = hb_buffer_init(stream->ffmpeg_pkt->size);
+ memcpy(buf->data, stream->ffmpeg_pkt->data,
+ stream->ffmpeg_pkt->size);
+ break;
+ }
 
 const uint8_t *palette;
 int size;
- palette = av_packet_get_side_data(&stream->ffmpeg_pkt,
+ palette = av_packet_get_side_data(stream->ffmpeg_pkt,
 AV_PKT_DATA_PALETTE, &size);
 if (palette != NULL)
 {
@@ -5998,20 +6120,19 @@
 memcpy( buf->palette->data, palette, size );
 }
 }
- if (stream->ffmpeg_pkt.flags & AV_PKT_FLAG_DISCARD)
+ if (stream->ffmpeg_pkt->flags & AV_PKT_FLAG_DISCARD)
 {
 buf->s.flags |= HB_FLAG_DISCARD;
 }
- buf->s.id = stream->ffmpeg_pkt.stream_index;
+ buf->s.id = stream->ffmpeg_pkt->stream_index;
 
 // compute a conversion factor to go from the ffmpeg
 // timebase for the stream to HB's 90kHz timebase.
- AVStream *s = stream->ffmpeg_ic->streamsstream->ffmpeg_pkt.stream_index;
 double tsconv = (double)90000. * s->time_base.num / s->time_base.den;
 int64_t offset = 90000LL * ffmpeg_initial_timestamp(stream) / AV_TIME_BASE;
 
- buf->s.start = av_to_hb_pts(stream->ffmpeg_pkt.pts, tsconv, offset);
- buf->s.renderOffset = av_to_hb_pts(stream->ffmpeg_pkt.dts, tsconv, offset);
+ buf->s.start = av_to_hb_pts(stream->ffmpeg_pkt->pts, tsconv, offset);
+ buf->s.renderOffset = av_to_hb_pts(stream->ffmpeg_pkt->dts, tsconv, offset);
 if ( buf->s.renderOffset >= 0 && buf->s.start == AV_NOPTS_VALUE )
 {
 buf->s.start = buf->s.renderOffset;
@@ -6029,7 +6150,7 @@
 * libav avcodec_decode_video2() needs AVPacket flagged with AV_PKT_FLAG_KEY
 * for some codecs. For example, sequence of PNG in a mov container.
 */
- if (stream->ffmpeg_pkt.flags & AV_PKT_FLAG_KEY)
+ if (stream->ffmpeg_pkt->flags & AV_PKT_FLAG_KEY)
 {
 buf->s.flags |= HB_FLAG_FRAMETYPE_KEY;
 buf->s.frametype = HB_FRAME_I;
@@ -6043,12 +6164,16 @@
 case AVMEDIA_TYPE_SUBTITLE:
 {
 // Fill out stop and duration for subtitle packets
- int64_t pkt_duration = stream->ffmpeg_pkt.duration;
+ int64_t pkt_duration = stream->ffmpeg_pkt->duration;
 if (pkt_duration != AV_NOPTS_VALUE)
 {
 buf->s.duration = av_to_hb_pts(pkt_duration, tsconv, 0);
 buf->s.stop = buf->s.start + buf->s.duration;
 }
+ else
+ {
+ buf->s.duration = (int64_t)AV_NOPTS_VALUE;
+ }
 buf->s.type = SUBTITLE_BUF;
 } break;
 
@@ -6065,7 +6190,7 @@
 * (roughly 3 million years at our 90KHz clock rate) so the test
 * below handles both the chapters & no chapters case.
 */
- if ( stream->ffmpeg_pkt.stream_index == stream->ffmpeg_video_id &&
+ if ( stream->ffmpeg_pkt->stream_index == stream->ffmpeg_video_id &&
 buf->s.start >= stream->chapter_end )
 {
 hb_chapter_t *chapter = hb_list_item( stream->title->list_chapter,
@@ -6089,7 +6214,7 @@
 } else {
 buf->s.new_chap = 0;
 }
- av_packet_unref(&stream->ffmpeg_pkt);
+ av_packet_unref(stream->ffmpeg_pkt);
 return buf;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/sync.c -> HandBrake-1.5.1.tar.xz/libhb/sync.c Changed

@@ -1,6 +1,6 @@
 /* sync.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -150,6 +150,7 @@
 int stream_count;
 sync_stream_t * streams;
 int found_first_pts;
+ int flush;
 
 // SCR adjustments
 scr_t scrSCR_HASH_SZ;
@@ -193,6 +194,7 @@
 static void SortedQueueBuffer( sync_stream_t * stream, hb_buffer_t * buf );
 static hb_buffer_t * sanitizeSubtitle(sync_stream_t * stream,
 hb_buffer_t * sub);
+static int OutputBuffer( sync_common_t * common );
 
 static void saveChap( sync_stream_t * stream, hb_buffer_t * buf )
 {
@@ -369,16 +371,44 @@
 {
 if (buf == NULL)
 {
- buf = hb_frame_buffer_init(AV_PIX_FMT_YUV420P,
+ buf = hb_frame_buffer_init(stream->common->job->input_pix_fmt,
 stream->common->job->title->geometry.width,
 stream->common->job->title->geometry.height);
- memset(buf->plane0.data, 0x00, buf->plane0.size);
- memset(buf->plane1.data, 0x80, buf->plane1.size);
- memset(buf->plane2.data, 0x80, buf->plane2.size);
+ uint8_t *planes4;
+ ptrdiff_t linesizes4;
+ for (int i = 0; i <= buf->f.max_plane; ++i)
+ {
+ planesi = buf->planei.data;
+ linesizesi = buf->planei.stride;
+ }
+ av_image_fill_black(planes, linesizes, stream->common->job->input_pix_fmt,
+ stream->common->job->color_range, buf->f.width, buf->f.height);
+ buf->f.color_prim = stream->common->job->title->color_prim;
+ buf->f.color_transfer = stream->common->job->title->color_transfer;
+ buf->f.color_matrix = stream->common->job->title->color_matrix;
+ buf->f.color_range = stream->common->job->color_range;
+ buf->f.chroma_location = stream->common->job->chroma_location;
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_full_path_is_enabled(stream->common->job) && !hb_qsv_hw_filters_are_enabled(stream->common->job))
+ {
+ hb_qsv_attach_surface_to_video_buffer(stream->common->job, buf, 0);
+ }
+#endif
 }
 else
 {
- buf = hb_buffer_dup(buf);
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_full_path_is_enabled(stream->common->job) && !hb_qsv_hw_filters_are_enabled(stream->common->job))
+ {
+ hb_buffer_t *temp = hb_buffer_dup(buf);
+ hb_qsv_copy_video_buffer_to_video_buffer(stream->common->job, buf, temp, 0);
+ buf = temp;
+ }
+ else
+#endif
+ {
+ buf = hb_buffer_dup(buf);
+ }
 }
 buf->s.start = next_pts;
 next_pts += frame_dur;
@@ -453,8 +483,19 @@
 buf = hb_list_item(other_stream->in_queue, 0);
 if (buf->s.start < pts)
 {
- hb_list_rem(other_stream->in_queue, buf);
- hb_buffer_close(&buf);
+ if (other_stream->type == SYNC_TYPE_SUBTITLE &&
+ buf->s.stop > pts)
+ {
+ // Subtitle ends after start time, keep sub and
+ // adjust it's start time
+ buf->s.start = pts;
+ break;
+ }
+ else
+ {
+ hb_list_rem(other_stream->in_queue, buf);
+ hb_buffer_close(&buf);
+ }
 }
 else
 {
@@ -1119,6 +1160,7 @@
 }
 // Only SSA subs can overlap
 if (stream->subtitle.subtitle->source != SSASUB &&
+ stream->subtitle.subtitle->source != IMPORTSSA &&
 stream->subtitle.subtitle->config.dest == PASSTHRUSUB &&
 buf->s.start <= stream->last_pts)
 {
@@ -1170,122 +1212,9 @@
 {
 hb_buffer_t * buf;
 
- if (!stream->common->found_first_pts)
- {
- checkFirstPts(stream->common);
- }
- if (stream->next_pts == (int64_t)AV_NOPTS_VALUE)
- {
- // Initialize next_pts, it is used to make timestamp corrections
- buf = hb_list_item(stream->in_queue, 0);
- if (buf != NULL)
- {
- stream->next_pts = buf->s.start;
- }
- }
- fixStreamTimestamps(stream);
 buf = hb_list_item(stream->in_queue, 0);
- if (buf != NULL)
- {
- hb_list_rem(stream->in_queue, buf);
- if (!stream->first_frame)
- {
- if (buf->s.start >= 0)
- {
- switch (stream->type)
- {
- case SYNC_TYPE_VIDEO:
- hb_log("sync: first pts video is %"PRId64,
- buf->s.start);
- break;
- case SYNC_TYPE_AUDIO:
- hb_log("sync: first pts audio 0x%x is %"PRId64,
- stream->audio.audio->id, buf->s.start);
- break;
- case SYNC_TYPE_SUBTITLE:
- hb_log("sync: first pts subtitle 0x%x is %"PRId64,
- stream->subtitle.subtitle->id, buf->s.start);
- break;
- default:
- break;
- }
- stream->first_frame = 1;
- stream->first_pts = buf->s.start;
- stream->min_frame_duration = buf->s.duration;
- }
- stream->next_pts = buf->s.start;
- }
- if (stream->type == SYNC_TYPE_AUDIO)
- {
- buf = FilterAudioFrame(stream, buf);
- if (buf == NULL)
- {
- // FilterAudioFrame can consume the buffer with no output
- continue;
- }
- }
- int64_t subtitle_last_pts = AV_NOPTS_VALUE;
- if (stream->type == SYNC_TYPE_SUBTITLE)
- {
- buf = sanitizeSubtitle(stream, buf);
- if (buf == NULL)
- {
- // sanitizeSubtitle can consume the buffer with no output
- continue;
- }
- // sanitizeSubtitle can return a list of subtitles.
- // Find the pts of the last subtitle in the list
- hb_buffer_t * sub = buf;
- while (sub != NULL)
- {
- subtitle_last_pts = sub->s.start;
- sub = sub->next;
- }
- }
- if (stream->type == SYNC_TYPE_AUDIO ||
- stream->type == SYNC_TYPE_VIDEO)
- {
- buf->s.start = stream->next_pts;
- buf->s.stop = stream->next_pts + buf->s.duration;
- stream->last_pts = stream->next_pts;
- stream->next_pts += buf->s.duration;
- }
- else
- {
- stream->next_pts =
- stream->last_pts = subtitle_last_pts;
- }
-
- if (buf->s.stop > 0)
- {
- stream->current_duration = buf->s.stop - stream->first_pts;
- }
- stream->frame_count++;
- if (buf->s.duration > 0 &&
- stream->min_frame_duration > buf->s.duration)
- {
- stream->min_frame_duration = buf->s.duration;
- }
- if (stream->max_frame_duration < buf->s.duration)
- {
- stream->max_frame_duration = buf->s.duration;
- }
- if (buf->s.start < 0)
- {
- // The pipeline can't handle negative timestamps
- // and it is sometimes not possible to avoid one
- // at the start of the video. There can be a
- // significant delay before we see the first buffers
- // from all streams. We can't buffer indefinitely
- // until we have seen the first PTS for all streams
- // so sometimes we may start before we have seen
- // the earliest PTS
- saveChap(stream, buf);
- hb_buffer_close(&buf);
- }
- restoreChap(stream, buf);
- fifo_push(stream->fifo_out, buf);
- }
+ hb_list_rem(stream->in_queue, buf);
+ hb_buffer_close(&buf);
 }
 fifo_push(stream->fifo_out, hb_buffer_eof_init());
 }
@@ -1304,14 +1233,18 @@
 }
 }
 
+ if (!common->found_first_pts)
+ {
+ checkFirstPts(common);
+ }
+
+ common->flush = 1;
+ while (OutputBuffer(common));
+
 // Flush all streams
 for (ii = 0; ii < common->stream_count; ii++)
 {
 sync_stream_t * stream = &common->streamsii;
- if (stream->done)
- {
- continue;
- }
 streamFlush(stream);
 }
 }
@@ -1469,7 +1402,6 @@
 {
 continue;
 }
- fifo_push(stream->fifo_out, hb_buffer_eof_init());
 fifo_push(stream->fifo_in, hb_buffer_eof_init());
 stream->done = 1;
 }
@@ -1484,16 +1416,17 @@
 // timestamp correction. In this scenario, we forego lowest PTS and pull
 // the next lowest PTS that has enough buffers in the queue to perform
 // timestamp correction.
-static void OutputBuffer( sync_common_t * common )
+static int OutputBuffer( sync_common_t * common )
 {
- int ii, full;
+ int ii, more;
 int64_t pts;
 sync_stream_t * out_stream;
 hb_buffer_t * buf;
+ int out_count = 0;
 
 do
 {
- full = 0;
+ more = 0;
 out_stream = NULL;
 pts = INT64_MAX;
 
@@ -1515,7 +1448,8 @@
 // low, do not do normal PTS interleaving with this queue.
 // Except for subtitles which are not processed for gaps
 // and overlaps.
- if (hb_list_count(stream->in_queue) > min)
+ if ((common->flush && hb_list_count(stream->in_queue) > 0) ||
+ hb_list_count(stream->in_queue) > min)
 {
 buf = hb_list_item(stream->in_queue, 0);
 if (buf->s.start < pts)
@@ -1526,9 +1460,10 @@
 }
 // But continue output of buffers as long as one of the queues
 // is above the maximum queue level.
- if(hb_list_count(stream->in_queue) > stream->max_len)
+ if ((common->flush && hb_list_count(stream->in_queue) > 0) ||
+ hb_list_count(stream->in_queue) > stream->max_len)
 {
- full = 1;
+ more = 1;
 }
 }
 if (out_stream == NULL)
@@ -1588,8 +1523,7 @@
 out_stream->frame_count = 0;
 }
 }
- else if (common->wait_for_pts &&
- out_stream->type != SYNC_TYPE_SUBTITLE)
+ else if (common->wait_for_pts)
 {
 if (buf->s.start >= common->pts_to_start)
 {
@@ -1661,7 +1595,6 @@
 break;
 }
 out_stream->done = 1;
- fifo_push(out_stream->fifo_out, hb_buffer_eof_init());
 terminateSubtitleStreams(common);
 flushStreams(common);
 continue;
@@ -1674,7 +1607,6 @@
 out_stream->frame_count);
 common->stop_pts = buf->s.start;
 out_stream->done = 1;
- fifo_push(out_stream->fifo_out, hb_buffer_eof_init());
 terminateSubtitleStreams(common);
 flushStreams(common);
 continue;
@@ -1797,20 +1729,10 @@
 }
 restoreChap(out_stream, buf);
 fifo_push(out_stream->fifo_out, buf);
- } while (full);
-}
-
-static void FlushBuffer( sync_common_t * common )
-{
- hb_lock(common->mutex);
+ out_count++;
+ } while (more);
 
- if (!common->found_first_pts)
- {
- checkFirstPts(common);
- }
- OutputBuffer(common);
-
- hb_unlock(common->mutex);
+ return out_count;
 }
 
 static void Synchronize( sync_stream_t * stream )
@@ -2341,11 +2263,12 @@
 // Merge overlapping subtitles since mpv tx3g does not support them
 pv->stream->subtitle.sanitizer.merge = 1;
 }
- // PGS subtitles don't need to be linked because there are explicit
+ // PGS & DVB subtitles don't need to be linked because there are explicit
 // "clear" subtitle packets that indicate the end time of the
 // previous subtitle
 if (subtitle->config.dest == PASSTHRUSUB &&
- subtitle->source != PGSSUB)
+ subtitle->source != PGSSUB &&
+ subtitle->source != DVBSUB)
 {
 // Fill in stop time when it is missing
 pv->stream->subtitle.sanitizer.link = 1;
@@ -2951,6 +2874,10 @@
 hb_buffer_list_append(&out_list, sub);
 sub = hb_buffer_list_rem_head(&list);
 }
+ if (sub != NULL)
+ {
+ hb_buffer_close(&sub);
+ }
 return hb_buffer_list_clear(&out_list);
 }
 
@@ -3001,9 +2928,21 @@
 hb_work_private_t * pv = w->private_data;
 hb_buffer_t * in = *buf_in;
 
+#if HB_PROJECT_FEATURE_QSV
+ // Fix of LA case allowing use of LA up to 40 in full encode path,
+ // as currently for such support we cannot allocate >64 slices per texture
+ // due to MSFT limitation, not impacting other cases
+ if (pv->common->job->qsv.ctx && (pv->common->job->qsv.ctx->la_is_enabled == 1)
+ && pv->common->job->qsv.ctx->full_path_is_enabled)
+ {
+ pv->stream->max_len = SYNC_MIN_VIDEO_QUEUE_LEN;
+ pv->common->job->qsv.ctx->la_is_enabled++;
+ }
+#endif
+
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 if (in->s.flags & HB_BUF_FLAG_EOF)
@@ -3028,7 +2967,7 @@
 
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 return HB_WORK_OK;
@@ -3094,7 +3033,7 @@
 
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 if (in->s.flags & HB_BUF_FLAG_EOF)
@@ -3110,7 +3049,7 @@
 
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 return HB_WORK_OK;
@@ -3216,7 +3155,7 @@
 
 if (job->indepth_scan)
 {
- // Progress for indept scan is handled by reader
+ // Progress for indepth scan is handled by reader
 // frame_count is used during indepth_scan
 // to find start & end points.
 return;
@@ -3281,7 +3220,7 @@
 
 if (job->indepth_scan)
 {
- // Progress for indept scan is handled by reader
+ // Progress for indepth scan is handled by reader
 // frame_count is used during indepth_scan
 // to find start & end points.
 return;
@@ -3374,7 +3313,7 @@
 
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 if (in->s.flags & HB_BUF_FLAG_EOF)
@@ -3399,7 +3338,7 @@
 
 if (pv->stream->done)
 {
- FlushBuffer(pv->stream->common);
+ flushStreamsLock(pv->common);
 return HB_WORK_DONE;
 }
 return HB_WORK_OK;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/taskset.c -> HandBrake-1.5.1.tar.xz/libhb/taskset.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/unsharp.c -> HandBrake-1.5.1.tar.xz/libhb/unsharp.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/vce_common.c -> HandBrake-1.5.1.tar.xz/libhb/vce_common.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/vfr.c -> HandBrake-1.5.1.tar.xz/libhb/vfr.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/libhb/work.c -> HandBrake-1.5.1.tar.xz/libhb/work.c Changed

@@ -1,6 +1,6 @@
 /* work.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -42,7 +42,7 @@
 /**
 * Allocates work object and launches work thread with work_func.
 * @param jobs Handle to hb_list_t.
- * @param die Handle to user inititated exit indicator.
+ * @param die Handle to user initiated exit indicator.
 * @param error Handle to error indicator.
 */
 hb_thread_t * hb_work_init( hb_list_t * jobs, volatile int * die, hb_error_code * error, hb_job_t ** job )
@@ -141,6 +141,12 @@
 hb_job_close(&job);
 job = new_job;
 }
+#if HB_PROJECT_FEATURE_QSV
+ if (hb_qsv_available())
+ {
+ hb_qsv_setup_job(job);
+ }
+#endif
 hb_job_setup_passes(job->h, job, passes);
 hb_job_close(&job);
 
@@ -288,11 +294,18 @@
 break;
 #endif
 #ifdef __APPLE__
- case HB_VCODEC_FFMPEG_VT_H264:
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ w = hb_get_work(h, WORK_ENCVT);
+ break;
+#endif
+#if HB_PROJECT_FEATURE_MF
+ case HB_VCODEC_FFMPEG_MF_H264:
 w = hb_get_work(h, WORK_ENCAVCODEC);
 w->codec_param = AV_CODEC_ID_H264;
 break;
- case HB_VCODEC_FFMPEG_VT_H265:
+ case HB_VCODEC_FFMPEG_MF_H265:
 w = hb_get_work(h, WORK_ENCAVCODEC);
 w->codec_param = AV_CODEC_ID_HEVC;
 break;
@@ -427,13 +440,13 @@
 #if HB_PROJECT_FEATURE_QSV
 if (hb_qsv_decode_is_enabled(job))
 {
- hb_log(" + decoder: %s",
- hb_qsv_decode_get_codec_name(title->video_codec_param));
+ hb_log(" + decoder: %s %d-bit (%s)",
+ hb_qsv_decode_get_codec_name(title->video_codec_param), hb_get_bit_depth(job->input_pix_fmt), av_get_pix_fmt_name(job->input_pix_fmt));
 }
 else
 #endif
 {
- hb_log(" + decoder: %s", title->video_codec_name);
+ hb_log(" + decoder: %s %d-bit (%s)", title->video_codec_name, hb_get_bit_depth(job->input_pix_fmt), av_get_pix_fmt_name(job->input_pix_fmt));
 }
 
 if( title->video_bitrate )
@@ -537,8 +550,11 @@
 case HB_VCODEC_FFMPEG_VCE_H265:
 case HB_VCODEC_FFMPEG_NVENC_H264:
 case HB_VCODEC_FFMPEG_NVENC_H265:
- case HB_VCODEC_FFMPEG_VT_H264:
- case HB_VCODEC_FFMPEG_VT_H265:
+ case HB_VCODEC_VT_H264:
+ case HB_VCODEC_VT_H265:
+ case HB_VCODEC_VT_H265_10BIT:
+ case HB_VCODEC_FFMPEG_MF_H264:
+ case HB_VCODEC_FFMPEG_MF_H265:
 hb_log(" + profile: %s", job->encoder_profile);
 default:
 break;
@@ -560,9 +576,12 @@
 case HB_VCODEC_FFMPEG_VCE_H265:
 case HB_VCODEC_FFMPEG_NVENC_H264:
 case HB_VCODEC_FFMPEG_NVENC_H265:
- case HB_VCODEC_FFMPEG_VT_H264:
+ case HB_VCODEC_VT_H264:
 // VT h.265 currently only supports auto level
- // case HB_VCODEC_FFMPEG_VT_H265:
+ // case HB_VCODEC_VT_H265:
+ // MF h.264/h.265 currently only supports auto level
+ // case HB_VCODEC_FFMPEG_MF_H264:
+ // case HB_VCODEC_FFMPEG_MF_H265:
 hb_log(" + level: %s", job->encoder_level);
 default:
 break;
@@ -593,6 +612,31 @@
 
 hb_log(" + color profile: %d-%d-%d",
 job->color_prim, job->color_transfer, job->color_matrix);
+ hb_log(" + chroma location: %s",
+ av_chroma_location_name(job->chroma_location));
+
+
+ if (job->color_transfer == HB_COLR_TRA_SMPTEST2084)
+ {
+ if (job->mastering.has_primaries || job->mastering.has_luminance)
+ {
+ hb_log(" + mastering display metadata: r(%5.4f,%5.4f) g(%5.4f,%5.4f) b(%5.4f %5.4f) wp(%5.4f, %5.4f) min_luminance=%f, max_luminance=%f",
+ hb_q2d(job->mastering.display_primaries00),
+ hb_q2d(job->mastering.display_primaries01),
+ hb_q2d(job->mastering.display_primaries10),
+ hb_q2d(job->mastering.display_primaries11),
+ hb_q2d(job->mastering.display_primaries20),
+ hb_q2d(job->mastering.display_primaries21),
+ hb_q2d(job->mastering.white_point0), hb_q2d(job->mastering.white_point1),
+ hb_q2d(job->mastering.min_luminance), hb_q2d(job->mastering.max_luminance));
+ }
+ if (job->coll.max_cll && job->coll.max_fall)
+ {
+ hb_log(" + content light level: max_cll=%u, max_fall=%u",
+ job->coll.max_cll,
+ job->coll.max_fall);
+ }
+ }
 }
 
 if (job->indepth_scan)
@@ -703,7 +747,8 @@
 {
 hb_log( " + dynamic range compression: %f", audio->config.out.dynamic_range_compression );
 }
- if (hb_audio_dither_is_supported(audio->config.out.codec))
+ if (hb_audio_dither_is_supported(audio->config.out.codec,
+ audio->config.in.sample_bit_depth))
 {
 hb_log(" + dither: %s",
 hb_audio_dither_get_description(audio->config.out.dither_method));
@@ -1203,7 +1248,8 @@
 }
 
 /* sense-check the requested dither */
- if (hb_audio_dither_is_supported(audio->config.out.codec))
+ if (hb_audio_dither_is_supported(audio->config.out.codec,
+ audio->config.in.sample_bit_depth))
 {
 if (audio->config.out.dither_method ==
 hb_audio_dither_get_default())
@@ -1224,179 +1270,10 @@
 return 0;
 }
 
-static int sanitize_qsv( hb_job_t * job )
+static void sanitize_filter_list(hb_job_t *job, hb_geometry_t src_geo)
 {
-#if HB_PROJECT_FEATURE_QSV
-#if 0 // TODO: re-implement QSV VPP filtering and QSV zerocopy path
- int i;
+ hb_list_t *list = job->list_filter;
 
- /*
- * XXX: mfxCoreInterface's CopyFrame doesn't work in old drivers, and our
- * workaround is really slow. If we have validated CPU-based filters in
- * the list and we can't use CopyFrame, disable QSV decoding until a
- * better solution is implemented.
- */
- if (hb_qsv_copyframe_is_slow(job->vcodec))
- {
- if (job->list_filter != NULL)
- {
- int encode_only = 0;
- for (i = 0; i < hb_list_count(job->list_filter) && !encode_only; i++)
- {
- hb_filter_object_t *filter = hb_list_item(job->list_filter, i);
- switch (filter->id)
- {
- // validated, CPU-based filters
- case HB_FILTER_ROTATE:
- case HB_FILTER_RENDER_SUB:
- case HB_FILTER_AVFILTER:
- encode_only = 1;
- break;
-
- // CPU-based deinterlace (validated)
- case HB_FILTER_DEINTERLACE:
- {
- int mode = hb_dict_get_int(filter->settings, "mode");
- if (!(mode & MODE_DEINTERLACE_QSV))
- {
- encode_only = 1;
- }
- } break;
-
- // other filters will be removed
- default:
- break;
- }
- }
- if (encode_only)
- {
- hb_log("do_job: QSV: possible CopyFrame bug, using encode-only path");
- if (hb_get_cpu_platform() >= HB_CPU_PLATFORM_INTEL_IVB)
- {
- hb_log("do_job: QSV: please update your Intel graphics driver to version 9.18.10.3257 or later");
- }
- job->qsv.decode = 0;
- }
- }
- }
-
- /*
- * When QSV's VPP is used for filtering, not all CPU filters
- * are supported, so we need to do a little extra setup here.
- */
- if (job->vcodec & HB_VCODEC_QSV_MASK)
- {
- int vpp_settings7;
- int num_cpu_filters = 0;
- hb_filter_object_t *filter;
- // default values for VPP filter
- vpp_settings0 = job->title->geometry.width;
- vpp_settings1 = job->title->geometry.height;
- vpp_settings2 = job->title->crop0;
- vpp_settings3 = job->title->crop1;
- vpp_settings4 = job->title->crop2;
- vpp_settings5 = job->title->crop3;
- vpp_settings6 = 0; // deinterlace: off
- if (job->list_filter != NULL && hb_list_count(job->list_filter) > 0)
- {
- while (hb_list_count(job->list_filter) > num_cpu_filters)
- {
- filter = hb_list_item(job->list_filter, num_cpu_filters);
- switch (filter->id)
- {
- // cropping and scaling always done via VPP filter
- case HB_FILTER_CROP_SCALE:
- hb_dict_extract_int(&vpp_settings0, filter->settings,
- "width");
- hb_dict_extract_int(&vpp_settings1, filter->settings,
- "height");
- hb_dict_extract_int(&vpp_settings2, filter->settings,
- "crop-top");
- hb_dict_extract_int(&vpp_settings3, filter->settings,
- "crop-bottom");
- hb_dict_extract_int(&vpp_settings4, filter->settings,
- "crop-left");
- hb_dict_extract_int(&vpp_settings5, filter->settings,
- "crop-right");
-
- hb_list_rem(job->list_filter, filter);
- hb_filter_close(&filter);
- break;
-
- // pick VPP or CPU deinterlace depending on settings
- case HB_FILTER_DEINTERLACE:
- {
- int mode = hb_dict_get_int(filter->settings, "mode");
- if (mode & MODE_DEINTERLACE_QSV)
- {
- // deinterlacing via VPP filter
- vpp_settings6 = 1;
- hb_list_rem(job->list_filter, filter);
- hb_filter_close(&filter);
- }
- else
- {
- // validated
- num_cpu_filters++;
- }
- } break;
-
- // then, validated filters
- case HB_FILTER_ROTATE: // TODO: use Media SDK for this
- case HB_FILTER_RENDER_SUB:
- case HB_FILTER_AVFILTER:
- num_cpu_filters++;
- break;
-
- // finally, drop all unsupported filters
- default:
- hb_log("do_job: QSV: full path, removing unsupported filter '%s'",
- filter->name);
- hb_list_rem(job->list_filter, filter);
- hb_filter_close(&filter);
- break;
- }
- }
- if (num_cpu_filters > 0)
- {
- // we need filters to copy to system memory and back
- filter = hb_filter_init(HB_FILTER_QSV_PRE);
- hb_add_filter_dict(job, filter, NULL);
- filter = hb_filter_init(HB_FILTER_QSV_POST);
- hb_add_filter_dict(job, filter, NULL);
- }
- if (vpp_settings0 != job->title->geometry.width ||
- vpp_settings1 != job->title->geometry.height ||
- vpp_settings2 >= 1 /* crop */ ||
- vpp_settings3 >= 1 /* crop */ ||
- vpp_settings4 >= 1 /* crop */ ||
- vpp_settings5 >= 1 /* crop */ ||
- vpp_settings6 >= 1 /* deinterlace */)
- {
- // we need the VPP filter
- hb_dict_t * dict = hb_dict_init();
- hb_dict_set(dict, "width", hb_value_int(vpp_settings0));
- hb_dict_set(dict, "height", hb_value_int(vpp_settings1));
- hb_dict_set(dict, "crop-top", hb_value_int(vpp_settings2));
- hb_dict_set(dict, "crop-bottom", hb_value_int(vpp_settings3));
- hb_dict_set(dict, "crop-left", hb_value_int(vpp_settings4));
- hb_dict_set(dict, "crop-right", hb_value_int(vpp_settings5));
- hb_dict_set(dict, "deinterlace", hb_value_int(vpp_settings6));
-
- filter = hb_filter_init(HB_FILTER_QSV);
- hb_add_filter_dict(job, filter, dict);
- hb_value_free(&dict);
- }
- }
- }
-#endif // QSV VPP filtering and QSV zerocopy path
-#endif // HB_PROJECT_FEATURE_QSV
-
- return 0;
-}
-
-static void sanitize_filter_list(hb_list_t *list, hb_geometry_t src_geo)
-{
 // Add selective deinterlacing mode if comb detection is enabled
 if (hb_filter_find(list, HB_FILTER_COMB_DETECT) != NULL)
 {
@@ -1459,6 +1336,54 @@
 }
 }
 }
+
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+ // sanitize_qsv looks for subtitle render filter, so must happen after
+ // sanitize_subtitle
+ if (hb_qsv_is_enabled(job))
+ {
+ hb_qsv_sanitize_filter_list(job);
+ // In case of video memory need to set formats after satitize filters 
+ // to ensure that full QSV pipeline supported
+ if (hb_qsv_full_path_is_enabled(job))
+ {
+ // Formats supported in QSV pipeline via video memory
+ if (job->input_pix_fmt == AV_PIX_FMT_YUV420P10)
+ {
+ job->input_pix_fmt = AV_PIX_FMT_P010LE;
+ }
+ else if (job->input_pix_fmt == AV_PIX_FMT_YUV420P)
+ {
+ job->input_pix_fmt = AV_PIX_FMT_NV12;
+ }
+ }
+ }
+#endif
+
+ if (hb_video_encoder_pix_fmt_is_supported(job->vcodec, job->input_pix_fmt) == 0)
+ {
+ // Some encoders require a specific input pixel format
+ // that could be different from the current pipeline format.
+ const int *encoder_pix_fmts = hb_video_encoder_get_pix_fmts(job->vcodec);
+ int encoder_pix_fmt = *encoder_pix_fmts;
+
+#if HB_PROJECT_FEATURE_QSV && (defined( _WIN32 ) || defined( __MINGW32__ ))
+ if (!hb_qsv_full_path_is_enabled(job))
+ {
+ // Formats supported by QSV pipeline via system memory
+ if (encoder_pix_fmt != AV_PIX_FMT_YUV420P10 &&
+ encoder_pix_fmt != AV_PIX_FMT_YUV420P)
+ {
+ // TODO: skip the first AV_PIX_FMT_NV12 or AV_PIX_FMT_P010LE formats, prefer second format for system memory
+ encoder_pix_fmts++;
+ encoder_pix_fmt = *encoder_pix_fmts;
+ }
+ }
+#endif
+
+ hb_filter_object_t *filter = hb_filter_init(HB_FILTER_FORMAT);
+ hb_add_filter(job, filter, hb_strdup_printf("format=%s", av_get_pix_fmt_name(encoder_pix_fmt)));
+ }
 }
 
 /**
@@ -1518,42 +1443,31 @@
 *job->die = 1;
 goto cleanup;
 }
-
- // sanitize_qsv looks for subtitle render filter, so must happen after
- // sanitize_subtitle
- result = sanitize_qsv(job);
- if (result)
- {
- *job->done_error = HB_ERROR_WRONG_INPUT;
- *job->die = 1;
- goto cleanup;
- }
 // Filters have an effect on settings.
 // So initialize the filters and update the job.
 if (job->list_filter && hb_list_count(job->list_filter))
 {
 hb_filter_init_t init;
 
- sanitize_filter_list(job->list_filter, title->geometry);
+ // Select the optimal pixel format
+ // for the pipeline
+ job->input_pix_fmt = hb_get_best_pix_fmt(job);
+
+ sanitize_filter_list(job, title->geometry);
 
 memset(&init, 0, sizeof(init));
 init.time_base.num = 1;
 init.time_base.den = 90000;
 init.job = job;
- // TODO: When more complete pix format support is complete this
- // needs to be updated to reflect the pix_fmt output by
- // decavcodec.c. This may be different than title->pix_fmt
- // since we will likely only support planar YUV color formats.
- init.pix_fmt = AV_PIX_FMT_YUV420P;
+ init.pix_fmt = job->input_pix_fmt;
+
 init.color_prim = title->color_prim;
 init.color_transfer = title->color_transfer;
 init.color_matrix = title->color_matrix;
- init.color_range = title->color_range;
- init.geometry.width = title->geometry.width;
- init.geometry.height = title->geometry.height;
-
- init.geometry.par = job->par;
- memcpy(init.crop, title->crop, sizeof(int4));
+ init.color_range = AVCOL_RANGE_MPEG;
+ init.chroma_location = title->chroma_location;
+ init.geometry = title->geometry;
+ memset(init.crop, 0, sizeof(int4));
 init.vrate = job->vrate;
 init.cfr = 0;
 init.grayscale = 0;
@@ -1572,9 +1486,18 @@
 }
 i++;
 }
+ job->output_pix_fmt = init.pix_fmt;
+ job->color_prim = init.color_prim;
+ job->color_transfer = init.color_transfer;
+ job->color_matrix = init.color_matrix;
+ job->color_range = init.color_range;
+ job->chroma_location = init.chroma_location;
 job->width = init.geometry.width;
 job->height = init.geometry.height;
- job->par = init.geometry.par;
+ // job->par is supplied by the frontend.
+ //
+ // The filter chain does not know what the final desired PAR is.
+ // job->par = init.geometry.par;
 memcpy(job->crop, init.crop, sizeof(int4));
 job->vrate = init.vrate;
 job->cfr = init.cfr;
@@ -1626,33 +1549,14 @@
 hb_reduce(&job->vrate.num, &job->vrate.den,
 job->vrate.num, job->vrate.den);
 
-#if HB_PROJECT_FEATURE_QSV
-#if 0 // TODO: re-implement QSV zerocopy path
- if (hb_qsv_decode_is_enabled(job) && (job->vcodec & HB_VCODEC_QSV_MASK))
- {
- job->fifo_mpeg2 = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
- job->fifo_raw = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
- if (!job->indepth_scan)
- {
- // When doing subtitle indepth scan, the pipeline ends at sync
- job->fifo_sync = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
- job->fifo_render = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
- job->fifo_mpeg4 = hb_fifo_init( FIFO_MINI, FIFO_MINI_WAKE );
- }
- }
- else
-#endif // QSV zerocopy path
-#endif
+ job->fifo_mpeg2 = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+ job->fifo_raw = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+ if (!job->indepth_scan)
 {
- job->fifo_mpeg2 = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
- job->fifo_raw = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
- if (!job->indepth_scan)
- {
- // When doing subtitle indepth scan, the pipeline ends at sync
- job->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
- job->fifo_render = NULL; // Attached to filter chain
- job->fifo_mpeg4 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
- }
+ // When doing subtitle indepth scan, the pipeline ends at sync
+ job->fifo_sync = hb_fifo_init( FIFO_SMALL, FIFO_SMALL_WAKE );
+ job->fifo_render = NULL; // Attached to filter chain
+ job->fifo_mpeg4 = hb_fifo_init( FIFO_LARGE, FIFO_LARGE_WAKE );
 }
 
 result = sanitize_audio(job);
@@ -1979,8 +1883,15 @@
 {
 analyze_subtitle_scan(job);
 }
-
 hb_buffer_pool_free();
+#if HB_PROJECT_FEATURE_QSV
+ if (!job->indepth_scan &&
+ (job->pass_id != HB_PASS_ENCODE_1ST) &&
+ hb_qsv_is_enabled(job))
+ {
+ hb_qsv_context_uninit(job);
+ }
+#endif
 }
 
 static inline void copy_chapter( hb_buffer_t * dst, hb_buffer_t * src )
@@ -2085,7 +1996,7 @@
 * Loops calling work function for associated filter object.
 * Sleeps when fifo is full.
 * Monitors work done indicator.
- * Exits loop when work indiactor is set.
+ * Exits loop when work indicator is set.
 * @param _w Handle to work object.
 */
 static void filter_loop( void * _f )

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/activity.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/activity.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "Activity2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Activity2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Activity2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Activity2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Activity2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Activity2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/addqueue.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/addqueue.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "AddQueue2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "AddQueue2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "AddQueue2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "AddQueue2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "AddQueue2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "AddQueue2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/addtitlestoqueue.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "AddTitlesToQueue.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "AddQueue2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "AddQueue2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "AddTitlesToQueue@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "AddQueue2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "AddQueue2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/encode.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/encode.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "encode.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Encode-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Encode-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "encode@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Encode-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Encode-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/pauseencode.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/pauseencode.imageset/Contents.json Changed

@@ -1,47 +1,57 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "pauseencode.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "PauseEncode-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "PauseEncode-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "pauseencode@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "PauseEncode-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "PauseEncode-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "template-rendering-intent" : "original"
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/presets.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/presets.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "Presets2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Presets2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Presets2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Presets2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Presets2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Presets2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/preview.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/preview.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "Preview2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Preview2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Preview2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Preview2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Preview2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Preview2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/showqueue.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/showqueue.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "ShowQueue2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "ShowQueue2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "ShowQueue2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "ShowQueue2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "ShowQueue2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "ShowQueue2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/source.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/source.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "Source2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Source2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Source2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "Source2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "Source2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "Source2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Assets.xcassets/stopencode.imageset/Contents.json -> HandBrake-1.5.1.tar.xz/macosx/Assets.xcassets/stopencode.imageset/Contents.json Changed

@@ -1,44 +1,54 @@
 {
   "images" : 
     {
-      "idiom" : "universal",
       "filename" : "StopEncode2.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "StopEncode2-Dark.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "StopEncode2-Dark.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "StopEncode2@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
-      "filename" : "StopEncode2-Dark@2x.png",
       "appearances" : 
         {
           "appearance" : "luminosity",
           "value" : "dark"
         }
       ,
+      "filename" : "StopEncode2-Dark@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
       "scale" : "3x"
+    },
+    {
+      "appearances" : 
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ,
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ,
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/AddPreset.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/AddPreset.xib Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Audio.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Audio.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -15,16 +15,17 @@
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
 <arrayController objectClassName="HBAudioTrack" preservesSelection="NO" avoidsEmptySelection="NO" id="rzb-Si-Kpf">
+ <classReference key="objectClass" className="HBAudioTrack"/>
 <connections>
 <binding destination="-2" name="contentArray" keyPath="self.audio.tracks" id="W0u-41-zX4"/>
 </connections>
 </arrayController>
- <view id="LOv-5G-86T">
- <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <view misplaced="YES" id="LOv-5G-86T">
+ <rect key="frame" x="0.0" y="0.0" width="902" height="184"/>
 <autoresizingMask key="autoresizingMask"/>
 <subviews>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vFP-nq-IQg">
- <rect key="frame" x="110" y="282" width="132" height="27"/>
+ <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vFP-nq-IQg">
+ <rect key="frame" x="109" y="145" width="134" height="27"/>
 <string key="toolTip">Configure audio tracks Selection Behavior. These settings affect which tracks will be added to the audio tracks list, and the settings used for each track.</string>
 <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="aYF-d5-Ya6">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -39,8 +40,8 @@
 </binding>
 </connections>
 </button>
- <button toolTip="Reload the audio tracks list using the configured Selection Behavior." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wcL-rL-aYS">
- <rect key="frame" x="240" y="282" width="62" height="27"/>
+ <button toolTip="Reload the audio tracks list using the configured Selection Behavior." verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wcL-rL-aYS">
+ <rect key="frame" x="239" y="145" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Reload" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="q2P-Tg-cBJ">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -54,8 +55,8 @@
 </binding>
 </connections>
 </button>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-M5-2Rq">
- <rect key="frame" x="17" y="285" width="88" height="22"/>
+ <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jrP-M5-2Rq">
+ <rect key="frame" x="16" y="148" width="90" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="82" id="VHA-F2-mvU"/>
 </constraints>
@@ -87,23 +88,22 @@
 </binding>
 </connections>
 </popUpButton>
- <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yzu-Rk-hTv">
- <rect key="frame" x="20" y="20" width="886" height="258"/>
+ <scrollView wantsLayer="YES" misplaced="YES" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yzu-Rk-hTv">
+ <rect key="frame" x="20" y="20" width="862" height="122"/>
 <string key="toolTip">Audio tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the audio Selection Behavior dialog.</string>
 <clipView key="contentView" id="2VK-QX-oZ0">
- <rect key="frame" x="1" y="0.0" width="884" height="257"/>
+ <rect key="frame" x="1" y="1" width="860" height="120"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="25" rowSizeStyle="automatic" headerView="jdT-w6-s4n" viewBased="YES" id="yix-PF-sqH">
- <rect key="frame" x="0.0" y="0.0" width="885" height="234"/>
- <autoresizingMask key="autoresizingMask"/>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" multipleSelection="NO" autosaveColumns="NO" rowHeight="25" rowSizeStyle="automatic" headerView="jdT-w6-s4n" viewBased="YES" id="yix-PF-sqH">
+ <rect key="frame" x="0.0" y="0.0" width="860" height="97"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
- <tableColumn width="298" minWidth="40" maxWidth="1000" id="7sz-4X-5jA">
+ <tableColumn width="289" minWidth="40" maxWidth="1000" id="7sz-4X-5jA">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Track">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -115,11 +115,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="wJH-tU-zL6">
- <rect key="frame" x="1" y="1" width="298" height="25"/>
+ <rect key="frame" x="1" y="1" width="289" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Audio language and type." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6iN-2G-JDF">
- <rect key="frame" x="0.0" y="1" width="298" height="22"/>
+ <rect key="frame" x="-1" y="1" width="291" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="ExA-Sd-3dO">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
 
@@ -134,15 +134,14 @@
 </subviews>
 <constraints>
 <constraint firstAttribute="trailing" secondItem="6iN-2G-JDF" secondAttribute="trailing" constant="3" id="5te-yc-q0S"/>
- <constraint firstItem="6iN-2G-JDF" firstAttribute="top" secondItem="wJH-tU-zL6" secondAttribute="top" constant="3" id="WkD-VZ-ui5"/>
 <constraint firstItem="6iN-2G-JDF" firstAttribute="leading" secondItem="wJH-tU-zL6" secondAttribute="leading" constant="3" id="fmf-0N-RWE"/>
+ <constraint firstItem="6iN-2G-JDF" firstAttribute="centerY" secondItem="wJH-tU-zL6" secondAttribute="centerY" id="wRO-d6-uP9"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="143" minWidth="120" maxWidth="1000" id="lnO-sZ-6xv">
+ <tableColumn width="125" minWidth="120" maxWidth="1000" id="lnO-sZ-6xv">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Codec">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -154,11 +153,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="8ed-5g-y6e">
- <rect key="frame" x="302" y="1" width="143" height="25"/>
+ <rect key="frame" x="293" y="1" width="125" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Audio encoder." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tYY-w7-ZIq">
- <rect key="frame" x="0.0" y="1" width="143" height="22"/>
+ <rect key="frame" x="-1" y="1" width="127" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="eIX-Zp-DHh">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
 
@@ -182,14 +181,13 @@
 <constraints>
 <constraint firstAttribute="trailing" secondItem="tYY-w7-ZIq" secondAttribute="trailing" constant="3" id="8et-C2-Mkm"/>
 <constraint firstItem="tYY-w7-ZIq" firstAttribute="leading" secondItem="8ed-5g-y6e" secondAttribute="leading" constant="3" id="g29-Ym-Y7V"/>
- <constraint firstItem="tYY-w7-ZIq" firstAttribute="top" secondItem="8ed-5g-y6e" secondAttribute="top" constant="3" id="rlT-3F-1BJ"/>
+ <constraint firstItem="tYY-w7-ZIq" firstAttribute="centerY" secondItem="8ed-5g-y6e" secondAttribute="centerY" id="kfL-FF-XW2"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="128" minWidth="120" maxWidth="3.4028234663852886e+38" id="qS7-Xr-9N8">
+ <tableColumn width="110" minWidth="110" maxWidth="3.4028234663852886e+38" id="qS7-Xr-9N8">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Mixdown">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -201,11 +199,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="JWs-Gl-4kd">
- <rect key="frame" x="448" y="1" width="128" height="25"/>
+ <rect key="frame" x="421" y="1" width="110" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LLW-KN-65P">
- <rect key="frame" x="0.0" y="1" width="128" height="22"/>
+ <rect key="frame" x="-1" y="1" width="112" height="22"/>
 <string key="toolTip">Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.
 
 Dolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility.</string>
@@ -240,15 +238,14 @@
 </subviews>
 <constraints>
 <constraint firstItem="LLW-KN-65P" firstAttribute="leading" secondItem="JWs-Gl-4kd" secondAttribute="leading" constant="3" id="70M-44-T1f"/>
- <constraint firstItem="LLW-KN-65P" firstAttribute="top" secondItem="JWs-Gl-4kd" secondAttribute="top" constant="3" id="SZw-G0-gDR"/>
+ <constraint firstItem="LLW-KN-65P" firstAttribute="centerY" secondItem="JWs-Gl-4kd" secondAttribute="centerY" id="TQf-C4-qZ7"/>
 <constraint firstAttribute="trailing" secondItem="LLW-KN-65P" secondAttribute="trailing" constant="3" id="UgM-NH-jNp"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="74" minWidth="74" maxWidth="3.4028234663852886e+38" id="jub-Uq-qYL">
+ <tableColumn width="82" minWidth="74" maxWidth="3.4028234663852886e+38" id="jub-Uq-qYL">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Samplerate">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -260,11 +257,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="iQl-Lr-pqe">
- <rect key="frame" x="579" y="1" width="74" height="25"/>
+ <rect key="frame" x="534" y="1" width="82" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Audio sample rate in kilohertz (kHz). Auto is recommended." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QA9-1y-Pyj">
- <rect key="frame" x="0.0" y="1" width="74" height="22"/>
+ <rect key="frame" x="-1" y="1" width="84" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="ewo-F6-Dcj">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
 
@@ -292,16 +289,15 @@
 </popUpButton>
 </subviews>
 <constraints>
- <constraint firstItem="QA9-1y-Pyj" firstAttribute="top" secondItem="iQl-Lr-pqe" secondAttribute="top" constant="3" id="OCI-qu-zuA"/>
+ <constraint firstItem="QA9-1y-Pyj" firstAttribute="centerY" secondItem="iQl-Lr-pqe" secondAttribute="centerY" id="30O-ax-ixc"/>
 <constraint firstItem="QA9-1y-Pyj" firstAttribute="leading" secondItem="iQl-Lr-pqe" secondAttribute="leading" constant="3" id="V4d-Tf-drr"/>
 <constraint firstAttribute="trailing" secondItem="QA9-1y-Pyj" secondAttribute="trailing" constant="3" id="qk1-Zn-1SE"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="74" minWidth="74" maxWidth="3.4028234663852886e+38" id="obP-lK-sY0">
+ <tableColumn width="79" minWidth="74" maxWidth="3.4028234663852886e+38" id="obP-lK-sY0">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Bitrate">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -313,11 +309,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="Acc-Cw-PLD">
- <rect key="frame" x="656" y="1" width="74" height="25"/>
+ <rect key="frame" x="619" y="1" width="79" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qg1-iw-07b">
- <rect key="frame" x="0.0" y="1" width="74" height="22"/>
+ <rect key="frame" x="-1" y="1" width="81" height="22"/>
 <string key="toolTip">Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible.</string>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="HcR-KC-NJF">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -345,16 +341,15 @@
 </popUpButton>
 </subviews>
 <constraints>
- <constraint firstItem="Qg1-iw-07b" firstAttribute="top" secondItem="Acc-Cw-PLD" secondAttribute="top" constant="3" id="KMN-A8-iff"/>
+ <constraint firstItem="Qg1-iw-07b" firstAttribute="centerY" secondItem="Acc-Cw-PLD" secondAttribute="centerY" id="EM0-ML-v5p"/>
 <constraint firstItem="Qg1-iw-07b" firstAttribute="leading" secondItem="Acc-Cw-PLD" secondAttribute="leading" constant="3" id="btr-Z1-Bnr"/>
 <constraint firstAttribute="trailing" secondItem="Qg1-iw-07b" secondAttribute="trailing" constant="3" id="mHq-TV-BtU"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="58" minWidth="58" maxWidth="100" id="5xO-DR-4cR">
+ <tableColumn width="62.5" minWidth="58" maxWidth="100" id="5xO-DR-4cR">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Gain">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -366,11 +361,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="wfV-Pi-jHd">
- <rect key="frame" x="733" y="1" width="58" height="25"/>
+ <rect key="frame" x="701" y="1" width="63" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField toolTip="Audio gain in decibels (dB). Increases or decreases audio volume." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2c7-G5-4KL">
- <rect key="frame" x="25" y="6" width="32" height="14"/>
+ <rect key="frame" x="25" y="6" width="37" height="14"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="Q4T-80-wxf">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="uNn-5A-2RM"/>
 
@@ -395,8 +390,12 @@
 </binding>
 </connections>
 </textField>
- <slider toolTip="Audio gain in decibels (dB). Increases or decreases audio volume." horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gtC-MM-esd">
+ <slider toolTip="Audio gain in decibels (dB). Increases or decreases audio volume." horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="gtC-MM-esd">
 <rect key="frame" x="3" y="2" width="22" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="12" id="2JB-4G-Xta"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="F1c-4e-dD1"/>
+ </constraints>
 <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="-5" maxValue="16" doubleValue="0.25" numberOfTickMarks="21" allowsTickMarkValuesOnly="YES" sliderType="circular" id="BBQ-FP-aQN">
 <accessibility description="Gain"/>
 </sliderCell>
@@ -428,9 +427,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="58" minWidth="58" maxWidth="100" id="eAS-E5-fip">
+ <tableColumn width="60.5" minWidth="58" maxWidth="100" id="eAS-E5-fip">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="DRC">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -442,10 +440,10 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="RMf-U7-5Td">
- <rect key="frame" x="794" y="1" width="58" height="25"/>
+ <rect key="frame" x="766.5" y="1" width="60" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="o3M-fP-6Ps">
+ <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="o3M-fP-6Ps">
 <rect key="frame" x="3" y="2" width="22" height="22"/>
 <string key="toolTip">Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.
 
@@ -453,7 +451,11 @@
 1: Apply DRC according to the compression hints embedded in the source track.
 
 Values greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion.</string>
- <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="4" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nII-CW-aWc">
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="E8p-B6-e6P"/>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="12" id="qOQ-M0-V5B"/>
+ </constraints>
+ <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="4" doubleValue="1.8666666666666667" numberOfTickMarks="16" allowsTickMarkValuesOnly="YES" sliderType="circular" id="nII-CW-aWc">
 <accessibility description="DRC"/>
 </sliderCell>
 <connections>
@@ -474,7 +476,7 @@
 </connections>
 </slider>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yPh-4R-HRQ">
- <rect key="frame" x="25" y="6" width="32" height="14"/>
+ <rect key="frame" x="25" y="6" width="34" height="14"/>
 <string key="toolTip">Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.
 
 0: Do not apply DRC.
@@ -518,7 +520,6 @@
 </tableColumn>
 <tableColumn width="28" minWidth="28" maxWidth="28" id="WwV-DO-6f9">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
 </tableHeaderCell>
@@ -529,13 +530,12 @@
 </textFieldCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
- <tableCellView id="x5p-AD-24B">
- <rect key="frame" x="855" y="1" width="28" height="25"/>
+ <tableCellView misplaced="YES" id="x5p-AD-24B">
+ <rect key="frame" x="830" y="1" width="28" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wec-NB-vnQ">
- <rect key="frame" x="-3" y="-2" width="34" height="27"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wec-NB-vnQ">
+ <rect key="frame" x="-4" y="-2" width="37" height="27"/>
 <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSActionTemplate" imagePosition="only" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="SiM-VW-aCt">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -546,6 +546,11 @@
 </connections>
 </button>
 </subviews>
+ <constraints>
+ <constraint firstItem="wec-NB-vnQ" firstAttribute="leading" secondItem="x5p-AD-24B" secondAttribute="leading" constant="2" id="ASQ-xc-zUg"/>
+ <constraint firstItem="wec-NB-vnQ" firstAttribute="centerY" secondItem="x5p-AD-24B" secondAttribute="centerY" id="EUB-rb-1As"/>
+ <constraint firstAttribute="trailing" secondItem="wec-NB-vnQ" secondAttribute="trailing" constant="2" id="Fe3-yD-Crz"/>
+ </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
@@ -564,16 +569,16 @@
 </tableView>
 </subviews>
 </clipView>
- <scroller key="horizontalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Pf5-Yq-6oL">
- <rect key="frame" x="1" y="241" width="884" height="16"/>
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="Pf5-Yq-6oL">
+ <rect key="frame" x="1" y="106" width="860" height="15"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="1ow-7B-J0g">
 <rect key="frame" x="224" y="17" width="15" height="102"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <tableHeaderView key="headerView" id="jdT-w6-s4n">
- <rect key="frame" x="0.0" y="0.0" width="885" height="23"/>
+ <tableHeaderView key="headerView" wantsLayer="YES" id="jdT-w6-s4n">
+ <rect key="frame" x="0.0" y="0.0" width="860" height="23"/>
 <autoresizingMask key="autoresizingMask"/>
 </tableHeaderView>
 </scrollView>
@@ -591,7 +596,7 @@
 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="wcL-rL-aYS" secondAttribute="trailing" constant="20" symbolic="YES" id="vyK-Mq-fbl"/>
 <constraint firstItem="jrP-M5-2Rq" firstAttribute="baseline" secondItem="vFP-nq-IQg" secondAttribute="baseline" id="y3i-kl-lge"/>
 </constraints>
- <point key="canvasLocation" x="336" y="53"/>
+ <point key="canvasLocation" x="208" y="127"/>
 </view>
 <menu id="hyy-qd-qpe">
 <items>
@@ -622,6 +627,6 @@
 </menu>
 </objects>
 <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
 </resources>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/AudioDefaults.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/AudioDefaults.xib Changed

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14868" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14868"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
 <customObject id="-2" userLabel="File's Owner" customClass="HBAudioDefaultsController">
 <connections>
- <outlet property="showAllButton" destination="QAt-5X-NBT" id="3IW-6r-piX"/>
 <outlet property="tableController" destination="ZBe-aP-wvq" id="HBN-Z2-bbo"/>
 <outlet property="tracksController" destination="I6S-EX-Dvu" id="oEz-8a-ef7"/>
 <outlet property="window" destination="kwM-lz-5lG" id="rob-Fo-JhL"/>
@@ -19,78 +18,17 @@
 <window title="Audio Selection Behaviour" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" visibleAtLaunch="NO" animationBehavior="default" id="kwM-lz-5lG">
 <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
 <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="175" y="825" width="794" height="474"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+ <rect key="contentRect" x="54" y="544" width="800" height="474"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
 <view key="contentView" id="ZP2-Cp-K5w">
- <rect key="frame" x="0.0" y="0.0" width="794" height="474"/>
+ <rect key="frame" x="0.0" y="0.0" width="823" height="474"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="fPg-3n-1TN">
- <rect key="frame" x="10" y="438" width="138" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Jsz-Er-bsF">
- <rect key="frame" x="10" y="414" width="138" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oiD-QI-wly">
- <rect key="frame" x="151" y="433" width="256" height="22"/>
- <string key="toolTip">Track Selection Behavior.
-
-None will not select any audio tracks by default.
-
-First Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.
-
-All Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source.</string>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="cNR-3T-9di"/>
- </constraints>
- <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="Kwy-lU-VuU">
- <items>
- <menuItem title="None" state="on" id="mvw-Hg-JFM"/>
- <menuItem title="First Matching Selected Languages" id="jDd-Ji-7Sm"/>
- <menuItem title="All Matching Selected Languages" id="GZP-q7-SYy"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="fPg-3n-1TN" id="nyV-Vs-N4Z"/>
- <binding destination="-2" name="selectedIndex" keyPath="self.settings.trackSelectionBehavior" id="sKn-Mr-Hce"/>
- <outlet property="nextKeyView" destination="Of7-71-Ci6" id="jgQ-nK-YLu"/>
- </connections>
- </popUpButton>
- <button toolTip="Show all audio languages in the Languages list." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QAt-5X-NBT">
- <rect key="frame" x="154" y="263" width="71" height="23"/>
- <constraints>
- <constraint firstAttribute="width" constant="71" id="Oxw-OO-Jaq"/>
- <constraint firstAttribute="height" constant="21" id="WOD-xe-KmQ"/>
- </constraints>
- <buttonCell key="cell" type="smallSquare" title="Show All" bezelStyle="smallSquare" imagePosition="overlaps" alignment="center" controlSize="small" borderStyle="border" inset="3" id="PiQ-bA-7P1">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
- 
- </buttonCell>
- <accessibility description="Show all audio languages"/>
- <connections>
- <action selector="edit:" target="-2" id="13y-nD-hEj"/>
- <outlet property="nextKeyView" destination="vUx-OV-W5T" id="fma-A5-pRA"/>
- </connections>
- </button>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sC2-52-liU">
- <rect key="frame" x="717" y="14" width="62" height="27"/>
+ <rect key="frame" x="745" y="13" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="kDe-1L-VkD">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <string key="keyEquivalent" base64-UTF8="YES">
 DQ
 </string>
@@ -100,128 +38,268 @@
 <outlet property="nextKeyView" destination="oiD-QI-wly" id="1gO-sY-HNE"/>
 </connections>
 </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="vUx-OV-W5T">
- <rect key="frame" x="575" y="412" width="46" height="18"/>
- <string key="toolTip">Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="MP3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="sdZ-Rx-JoG">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="Fj1-2v-43m"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowMP3Passthru" id="rVF-G7-BYA"/>
- <outlet property="nextKeyView" destination="fzd-MO-xaB" id="1fb-a1-B25"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="fzd-MO-xaB">
- <rect key="frame" x="575" y="394" width="45" height="18"/>
- <string key="toolTip">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="AAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="cUX-iP-UAs">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="4LE-EX-uwv"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowAACPassthru" id="nsQ-cP-JyI"/>
- <outlet property="nextKeyView" destination="fgl-Ev-ELt" id="Exn-Wt-M4D"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="fgl-Ev-ELt">
- <rect key="frame" x="575" y="376" width="44" height="18"/>
- <string key="toolTip">Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="VnE-3R-bUf">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="939-Ac-M99"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowAC3Passthru" id="Aig-Ok-RyG"/>
- <outlet property="nextKeyView" destination="E93-Md-aWa" id="Yv5-Xs-mbs"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="E93-Md-aWa">
- <rect key="frame" x="575" y="358" width="44" height="18"/>
- <string key="toolTip">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="DTS" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="8mC-Wx-myL">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="fDC-wm-Xdh"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowDTSPassthru" id="IWX-ek-0Bd"/>
- <outlet property="nextKeyView" destination="IxI-o9-jMs" id="sBB-lF-vtE"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="IxI-o9-jMs">
- <rect key="frame" x="575" y="340" width="66" height="18"/>
- <string key="toolTip">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="DTS-HD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="LX6-kc-5vq">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="S8M-P1-c2B"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowDTSHDPassthru" id="w77-9v-vIh"/>
- <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="rAA-cB-Ma5"/>
- </connections>
- </button>
- <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="l4i-pd-Cbk">
- <rect key="frame" x="472" y="414" width="100" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Auto Passthru:" id="s6s-EH-5CB">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <popUpButton toolTip="Audio encoder to use when a track suitable for passthru is unavailable." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LdN-Cx-ZJY">
- <rect key="frame" x="575" y="293" width="66" height="22"/>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Pw-Kq-eMN">
+ <rect key="frame" x="507" y="312" width="234" height="118"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OkV-lt-k7P">
+ <rect key="frame" x="0.0" y="24" width="234" height="94"/>
+ <subviews>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="l4i-pd-Cbk">
+ <rect key="frame" x="-2" y="80" width="100" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Auto Passthru:" id="s6s-EH-5CB">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WFJ-He-GIV">
+ <rect key="frame" x="104" y="0.0" width="130" height="94"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="55H-sv-jYf">
+ <rect key="frame" x="0.0" y="0.0" width="64" height="94"/>
+ <subviews>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="vUx-OV-W5T">
+ <rect key="frame" x="-1" y="79" width="45" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="MP3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="sdZ-Rx-JoG">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="Fj1-2v-43m"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowMP3Passthru" id="rVF-G7-BYA"/>
+ <outlet property="nextKeyView" destination="fzd-MO-xaB" id="1fb-a1-B25"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="fzd-MO-xaB">
+ <rect key="frame" x="-1" y="59" width="44" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="AAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="cUX-iP-UAs">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="4LE-EX-uwv"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowAACPassthru" id="nsQ-cP-JyI"/>
+ <outlet property="nextKeyView" destination="fgl-Ev-ELt" id="Exn-Wt-M4D"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="fgl-Ev-ELt">
+ <rect key="frame" x="-1" y="39" width="43" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="VnE-3R-bUf">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="939-Ac-M99"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowAC3Passthru" id="Aig-Ok-RyG"/>
+ <outlet property="nextKeyView" destination="E93-Md-aWa" id="Yv5-Xs-mbs"/>
+ </connections>
+ </button>
+ <button horizontalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="E93-Md-aWa">
+ <rect key="frame" x="-1" y="19" width="65" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="DTS" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="8mC-Wx-myL">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="fDC-wm-Xdh"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowDTSPassthru" id="IWX-ek-0Bd"/>
+ <outlet property="nextKeyView" destination="IxI-o9-jMs" id="sBB-lF-vtE"/>
+ </connections>
+ </button>
+ <button horizontalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="IxI-o9-jMs">
+ <rect key="frame" x="-1" y="-1" width="65" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="DTS-HD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="LX6-kc-5vq">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="S8M-P1-c2B"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowDTSHDPassthru" id="w77-9v-vIh"/>
+ <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="rAA-cB-Ma5"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hmB-iB-sbe">
+ <rect key="frame" x="70" y="20" width="60" height="74"/>
+ <subviews>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="os0-Jl-OXF">
+ <rect key="frame" x="-1" y="59" width="61" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="TrueHD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="z9d-P3-6UP">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="tU2-ar-p5a"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowTrueHDPassthru" id="3fh-cT-PtB"/>
+ <outlet property="nextKeyView" destination="0HY-xB-cvO" id="TYi-8L-gT4"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="0HY-xB-cvO">
+ <rect key="frame" x="-1" y="39" width="49" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="FLAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="naS-No-CdV">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="SFz-OO-EgN"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowFLACPassthru" id="wCD-CW-AEP"/>
+ <outlet property="nextKeyView" destination="BK7-c4-kkk" id="Pt4-9c-oQl"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="BK7-c4-kkk">
+ <rect key="frame" x="-1" y="19" width="55" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports E-AC3. This permits E-AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="E-AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="u9h-dn-wcK">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="83N-qg-BsJ"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowEAC3Passthru" id="vcL-wd-H1f"/>
+ <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="scB-D1-Zvp"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="GHJ-25-kZl">
+ <rect key="frame" x="-1" y="-1" width="45" height="16"/>
+ <string key="toolTip">Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled.</string>
+ <buttonCell key="cell" type="check" title="MP2" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="Z8O-AS-UdA">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="i2Z-jt-9Zf"/>
+ <binding destination="-2" name="value" keyPath="self.settings.allowMP2Passthru" id="tWz-Ef-iMQ"/>
+ <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="PRg-PI-p5Z"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ePQ-pq-eNY">
+ <rect key="frame" x="0.0" y="0.0" width="151" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="248" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Tth-IR-7cU">
+ <rect key="frame" x="-2" y="1" width="100" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Passthru Fallback:" id="AQe-Sg-Qgh">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Audio encoder to use when a track suitable for passthru is unavailable." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LdN-Cx-ZJY">
+ <rect key="frame" x="100" y="-4" width="55" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="Item" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="UJy-A2-Bb1" id="OqD-Tf-29c">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="PtB-Wp-B9X">
+ <items>
+ <menuItem title="Item" state="on" id="UJy-A2-Bb1"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="Tth-IR-7cU" id="eOb-bG-eUP"/>
+ <binding destination="-2" name="content" keyPath="self.settings.audioEncoderFallbacks" id="71J-tI-ct9">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBFallbackEncodersTransformer</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedValue" keyPath="self.settings.encoderFallback" previousBinding="71J-tI-ct9" id="vA7-D4-O6Y">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">HBFallbackEncoderTransformer</string>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="uF5-6E-EIe" id="gaK-Cr-XA9"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
 <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Ka4-YN-iLe"/>
+ <constraint firstItem="Tth-IR-7cU" firstAttribute="width" secondItem="l4i-pd-Cbk" secondAttribute="width" id="vuM-84-08f"/>
 </constraints>
- <popUpButtonCell key="cell" type="push" title="Item" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="UJy-A2-Bb1" id="OqD-Tf-29c">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="PtB-Wp-B9X">
- <items>
- <menuItem title="Item" state="on" id="UJy-A2-Bb1"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="Tth-IR-7cU" id="eOb-bG-eUP"/>
- <binding destination="-2" name="content" keyPath="self.settings.audioEncoderFallbacks" id="71J-tI-ct9">
- <dictionary key="options">
- <string key="NSValueTransformerName">HBFallbackEncodersTransformer</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="selectedValue" keyPath="self.settings.encoderFallback" previousBinding="71J-tI-ct9" id="vA7-D4-O6Y">
- <dictionary key="options">
- <string key="NSValueTransformerName">HBFallbackEncoderTransformer</string>
- </dictionary>
- </binding>
- <outlet property="nextKeyView" destination="uF5-6E-EIe" id="gaK-Cr-XA9"/>
- </connections>
- </popUpButton>
- <textField horizontalHuggingPriority="248" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Tth-IR-7cU">
- <rect key="frame" x="472" y="298" width="100" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Passthru Fallback:" id="AQe-Sg-Qgh">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="600" translatesAutoresizingMaskIntoConstraints="NO" id="RtZ-Cz-5mG">
- <rect key="frame" x="18" y="230" width="253" height="14"/>
+ <rect key="frame" x="18" y="264" width="253" height="14"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Audio encoder settings for each selected track:" id="007-WM-RmC">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
 </textField>
 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="N4q-sT-WgW">
- <rect key="frame" x="18" y="51" width="54" height="21"/>
+ <rect key="frame" x="17" y="48" width="54" height="21"/>
 <segmentedCell key="cell" controlSize="small" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="otA-K4-TxM">
- 
+ 
 <segments>
 <segment toolTip="Add Audio Track" image="NSAddTemplate" width="24">
 <nil key="label"/>
@@ -236,61 +314,21 @@
 <outlet property="nextKeyView" destination="sC2-52-liU" id="mmR-bd-cFG"/>
 </connections>
 </segmentedControl>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="os0-Jl-OXF">
- <rect key="frame" x="646" y="412" width="62" height="18"/>
- <string key="toolTip">Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="TrueHD" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="z9d-P3-6UP">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="tU2-ar-p5a"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowTrueHDPassthru" id="3fh-cT-PtB"/>
- <outlet property="nextKeyView" destination="0HY-xB-cvO" id="TYi-8L-gT4"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="0HY-xB-cvO">
- <rect key="frame" x="646" y="394" width="50" height="18"/>
- <string key="toolTip">Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="FLAC" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="naS-No-CdV">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="SFz-OO-EgN"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowFLACPassthru" id="wCD-CW-AEP"/>
- <outlet property="nextKeyView" destination="BK7-c4-kkk" id="Pt4-9c-oQl"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="BK7-c4-kkk">
- <rect key="frame" x="646" y="376" width="56" height="18"/>
- <string key="toolTip">Enable this if your playback device supports E-AC3. This permits E-AC3 passthru to be selected when automatic passthru selecion is enabled.</string>
- <buttonCell key="cell" type="check" title="E-AC3" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="u9h-dn-wcK">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <accessibilityConnection property="title" destination="l4i-pd-Cbk" id="83N-qg-BsJ"/>
- <binding destination="-2" name="value" keyPath="self.settings.allowEAC3Passthru" id="vcL-wd-H1f"/>
- <outlet property="nextKeyView" destination="LdN-Cx-ZJY" id="scB-D1-Zvp"/>
- </connections>
- </button>
 <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="26" horizontalPageScroll="10" verticalLineScroll="26" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hGL-Ew-UVJ">
- <rect key="frame" x="20" y="79" width="754" height="143"/>
+ <rect key="frame" x="20" y="75" width="783" height="181"/>
 <clipView key="contentView" id="jkU-Fi-GCv">
- <rect key="frame" x="1" y="0.0" width="752" height="142"/>
+ <rect key="frame" x="1" y="1" width="781" height="179"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" headerView="IbE-bD-EWJ" viewBased="YES" id="ZsG-T1-vGv">
- <rect key="frame" x="0.0" y="0.0" width="752" height="119"/>
- <autoresizingMask key="autoresizingMask"/>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" tableStyle="plain" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="24" rowSizeStyle="automatic" headerView="IbE-bD-EWJ" viewBased="YES" id="ZsG-T1-vGv">
+ <rect key="frame" x="0.0" y="0.0" width="781" height="156"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
- <tableColumn width="254" minWidth="143" maxWidth="1000" id="pR9-d4-SNf">
+ <tableColumn width="284.5" minWidth="143" maxWidth="1000" id="pR9-d4-SNf">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" title="Codec">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -302,14 +340,14 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="UBy-AR-7XQ">
- <rect key="frame" x="1" y="1" width="254" height="24"/>
+ <rect key="frame" x="1" y="1" width="284" height="24"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Audio encoder." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6lx-af-rBL">
- <rect key="frame" x="0.0" y="0.0" width="254" height="22"/>
+ <rect key="frame" x="-1" y="1" width="286" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="t8s-X1-tQV">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="3Re-GO-fwv"/>
 </popUpButtonCell>
 <accessibility description="Codec"/>
@@ -331,9 +369,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="151" minWidth="128" maxWidth="3.4028234663852886e+38" id="0kT-0J-3k2">
+ <tableColumn width="149.5" minWidth="128" maxWidth="3.4028234663852886e+38" id="0kT-0J-3k2">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Mixdown">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -345,17 +382,17 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="uS1-Fd-V9I">
- <rect key="frame" x="258" y="1" width="151" height="24"/>
+ <rect key="frame" x="288.5" y="1" width="150" height="24"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="igm-hS-rrD">
- <rect key="frame" x="0.0" y="0.0" width="151" height="22"/>
+ <rect key="frame" x="-1" y="1" width="152" height="22"/>
 <string key="toolTip">Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.
 
 Dolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility.</string>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="2JY-Ie-KSg">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="cKk-6o-udN"/>
 </popUpButtonCell>
 <accessibility description="Mixdown"/>
@@ -382,9 +419,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="111" minWidth="74" maxWidth="3.4028234663852886e+38" id="LxC-Qx-psh">
+ <tableColumn width="109.5" minWidth="74" maxWidth="3.4028234663852886e+38" id="LxC-Qx-psh">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Samplerate">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -396,14 +432,14 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="5No-Mm-bpD">
- <rect key="frame" x="412" y="1" width="111" height="24"/>
+ <rect key="frame" x="441" y="1" width="109" height="24"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Audio sample rate in kilohertz (kHz). Auto is recommended." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r80-yv-59n">
- <rect key="frame" x="0.0" y="0.0" width="111" height="22"/>
+ <rect key="frame" x="-1" y="1" width="111" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="pdm-QA-coL">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="xhO-vr-WJF"/>
 </popUpButtonCell>
 <accessibility description="Samplerate"/>
@@ -427,9 +463,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="96" minWidth="74" maxWidth="3.4028234663852886e+38" id="vhn-7C-4aZ">
+ <tableColumn width="95.5" minWidth="74" maxWidth="3.4028234663852886e+38" id="vhn-7C-4aZ">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Bitrate">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -441,15 +476,15 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="Bxd-gI-dFS">
- <rect key="frame" x="526" y="1" width="96" height="24"/>
+ <rect key="frame" x="553.5" y="1" width="96" height="24"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hHP-dw-nba">
- <rect key="frame" x="0.0" y="0.0" width="96" height="22"/>
+ <rect key="frame" x="-1" y="1" width="98" height="22"/>
 <string key="toolTip">Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible.</string>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="U8n-oy-hkv">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="pWk-70-S7v"/>
 </popUpButtonCell>
 <accessibility description="Bitrate"/>
@@ -472,9 +507,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="N7h-CJ-quV">
+ <tableColumn width="62" minWidth="61" maxWidth="3.4028234663852886e+38" id="N7h-CJ-quV">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Gain">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -486,14 +520,14 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="fhc-Nv-0Oh">
- <rect key="frame" x="625" y="1" width="61" height="28"/>
+ <rect key="frame" x="652" y="1" width="62" height="28"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField toolTip="Audio gain in decibels (dB). Increases or decreases audio volume." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xnA-03-Bul">
- <rect key="frame" x="31" y="7" width="29" height="14"/>
+ <rect key="frame" x="31" y="7" width="30" height="14"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="OVr-Jm-VrK">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="xHc-m4-rcn"/>
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -523,9 +557,8 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn width="61" minWidth="61" maxWidth="3.4028234663852886e+38" id="zX9-T9-wKy">
+ <tableColumn width="62" minWidth="61" maxWidth="3.4028234663852886e+38" id="zX9-T9-wKy">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="DRC">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -537,7 +570,7 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="t2K-5D-xsX">
- <rect key="frame" x="689" y="1" width="61" height="27"/>
+ <rect key="frame" x="717" y="1" width="62" height="27"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <slider horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DGi-Dl-5nh">
@@ -556,7 +589,7 @@
 </connections>
 </slider>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BaY-Lo-8xn">
- <rect key="frame" x="31" y="7" width="29" height="14"/>
+ <rect key="frame" x="31" y="7" width="30" height="14"/>
 <string key="toolTip">Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.
 
 0: Do not apply DRC.
@@ -565,7 +598,7 @@
 Values greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion.</string>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="MiI-OV-waZ">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" groupingSize="0" minimumIntegerDigits="0" maximumIntegerDigits="42" id="FR6-Cx-d2s"/>
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -599,34 +632,34 @@
 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="140" id="4LW-Vv-px8"/>
 </constraints>
 <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="ToF-HP-PBf">
- <rect key="frame" x="1" y="126" width="752" height="16"/>
+ <rect key="frame" x="1" y="124" width="824" height="15"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="Dhw-4v-YLa">
 <rect key="frame" x="224" y="17" width="15" height="102"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <tableHeaderView key="headerView" id="IbE-bD-EWJ">
- <rect key="frame" x="0.0" y="0.0" width="752" height="23"/>
+ <tableHeaderView key="headerView" wantsLayer="YES" id="IbE-bD-EWJ">
+ <rect key="frame" x="0.0" y="0.0" width="781" height="23"/>
 <autoresizingMask key="autoresizingMask"/>
 </tableHeaderView>
 </scrollView>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="uF5-6E-EIe">
- <rect key="frame" x="80" y="53" width="246" height="18"/>
+ <rect key="frame" x="80" y="51" width="245" height="16"/>
 <string key="toolTip">Only the primary audio track will be encoded with the full encoder list. All additional audio tracks will be encoded with first encoder only.</string>
 <buttonCell key="cell" type="check" title="Use only first encoder for secondary audio" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="66v-2g-DHn">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <binding destination="-2" name="value" keyPath="self.settings.secondaryEncoderMode" id="Umc-CV-pJy"/>
 </connections>
 </button>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kJY-av-BYf">
- <rect key="frame" x="657" y="14" width="62" height="27"/>
+ <rect key="frame" x="685" y="13" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Jn4-1L-J1g">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <string key="keyEquivalent" base64-UTF8="YES">
 Gw
 </string>
@@ -635,163 +668,215 @@
 <action selector="cancel:" target="-2" id="Vkr-zh-YAJ"/>
 </connections>
 </button>
- <scrollView toolTip="Select the languages to use with the Track Selection Behavior setting." wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aTC-39-h6S">
- <rect key="frame" x="154" y="293" width="250" height="135"/>
- <clipView key="contentView" id="TdE-Sh-NcS">
- <rect key="frame" x="1" y="1" width="248" height="133"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" viewBased="YES" id="Of7-71-Ci6">
- <rect key="frame" x="0.0" y="0.0" width="248" height="133"/>
- <autoresizingMask key="autoresizingMask"/>
- <size key="intercellSpacing" width="3" height="2"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
- <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
- <tableColumns>
- <tableColumn identifier="checkBox" width="245" minWidth="16" maxWidth="1000" id="G44-XP-6xE">
- <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- 
- <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
- </tableHeaderCell>
- <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" lineBreakMode="truncatingMiddle" inset="2" id="6by-yL-8VC">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
- <prototypeCellViews>
- <tableCellView id="haT-6q-XQu">
- <rect key="frame" x="1" y="1" width="245" height="17"/>
+ <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M11-Ls-RrL">
+ <rect key="frame" x="19" y="18" width="18" height="19"/>
+ <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sOl-fj-Vc8">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="openUserGuide:" target="-2" id="6x5-4X-rQB"/>
+ </connections>
+ </button>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mON-8C-X5t">
+ <rect key="frame" x="20" y="294" width="431" height="160"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dYR-Xt-Vb4">
+ <rect key="frame" x="0.0" y="144" width="351" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="fPg-3n-1TN">
+ <rect key="frame" x="-2" y="1" width="138" height="14"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Track Selection Behavior:" id="GbM-vm-RC2">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oiD-QI-wly">
+ <rect key="frame" x="138" y="-4" width="217" height="22"/>
+ <string key="toolTip">Track Selection Behavior.
+
+None will not select any audio tracks by default.
+
+First Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.
+
+All Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source.</string>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="mvw-Hg-JFM" id="21e-KY-8TR">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="Kwy-lU-VuU">
+ <items>
+ <menuItem title="None" state="on" id="mvw-Hg-JFM"/>
+ <menuItem title="First Matching Selected Languages" id="jDd-Ji-7Sm"/>
+ <menuItem title="All Matching Selected Languages" id="GZP-q7-SYy"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="fPg-3n-1TN" id="nyV-Vs-N4Z"/>
+ <binding destination="-2" name="selectedIndex" keyPath="self.settings.trackSelectionBehavior" id="sKn-Mr-Hce"/>
+ <outlet property="nextKeyView" destination="Of7-71-Ci6" id="jgQ-nK-YLu"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GSL-ZN-P2c">
+ <rect key="frame" x="0.0" y="0.0" width="431" height="136"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="Jsz-Er-bsF">
+ <rect key="frame" x="-2" y="122" width="138" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Languages:" id="mAT-Jp-SG1">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <scrollView toolTip="Select the languages to use with the Track Selection Behavior setting." wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aTC-39-h6S">
+ <rect key="frame" x="142" y="0.0" width="289" height="136"/>
+ <clipView key="contentView" ambiguous="YES" id="TdE-Sh-NcS">
+ <rect key="frame" x="1" y="1" width="287" height="134"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" columnReordering="NO" columnResizing="NO" autosaveColumns="NO" rowHeight="14" viewBased="YES" id="Of7-71-Ci6">
+ <rect key="frame" x="0.0" y="0.0" width="287" height="134"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="F5N-kV-6cy">
- <rect key="frame" x="0.0" y="0.0" width="22" height="19"/>
- <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="NOa-yY-z7A">
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn identifier="checkBox" width="217" minWidth="16" maxWidth="1000" id="G44-XP-6xE">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <buttonCell key="dataCell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" lineBreakMode="truncatingMiddle" inset="2" id="6by-yL-8VC">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <prototypeCellViews>
+ <tableCellView id="haT-6q-XQu">
+ <rect key="frame" x="1" y="1" width="226" height="17"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="F5N-kV-6cy">
+ <rect key="frame" x="2" y="2" width="14" height="16"/>
+ <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="NOa-yY-z7A">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="haT-6q-XQu" name="value" keyPath="objectValue.isSelected" id="iqC-IJ-lPN"/>
+ <binding destination="haT-6q-XQu" name="toolTip" keyPath="objectValue.language" id="hyE-CO-x5w"/>
+ </connections>
+ </button>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qqA-7S-cT9">
+ <rect key="frame" x="15" y="2" width="210" height="14"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="XKL-2e-Dlv">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="haT-6q-XQu" name="value" keyPath="objectValue.language" id="4SZ-Qu-swV"/>
+ </connections>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="qqA-7S-cT9" secondAttribute="trailing" constant="3" id="0VW-tG-QqT"/>
+ <constraint firstItem="qqA-7S-cT9" firstAttribute="centerY" secondItem="haT-6q-XQu" secondAttribute="centerY" id="Pck-z1-IQ5"/>
+ <constraint firstItem="qqA-7S-cT9" firstAttribute="leading" secondItem="F5N-kV-6cy" secondAttribute="trailing" constant="2" id="ftC-wK-cXx"/>
+ <constraint firstItem="F5N-kV-6cy" firstAttribute="top" secondItem="haT-6q-XQu" secondAttribute="top" constant="1" id="l7i-WR-pj7"/>
+ <constraint firstItem="F5N-kV-6cy" firstAttribute="leading" secondItem="haT-6q-XQu" secondAttribute="leading" constant="3" id="zf1-cU-AmQ"/>
+ </constraints>
+ <connections>
+ <outlet property="textField" destination="qqA-7S-cT9" id="wHA-8l-Rbu"/>
+ </connections>
+ </tableCellView>
+ </prototypeCellViews>
 <connections>
- <binding destination="haT-6q-XQu" name="value" keyPath="objectValue.isSelected" id="iqC-IJ-lPN"/>
- <binding destination="haT-6q-XQu" name="toolTip" keyPath="objectValue.language" id="hyE-CO-x5w"/>
+ <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
 </connections>
- </button>
- <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qqA-7S-cT9">
- <rect key="frame" x="17" y="2" width="227" height="14"/>
- <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="XKL-2e-Dlv">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="haT-6q-XQu" name="value" keyPath="objectValue.language" id="4SZ-Qu-swV"/>
- </connections>
- </textField>
- </subviews>
- <constraints>
- <constraint firstAttribute="trailing" secondItem="qqA-7S-cT9" secondAttribute="trailing" constant="3" id="0VW-tG-QqT"/>
- <constraint firstItem="qqA-7S-cT9" firstAttribute="centerY" secondItem="haT-6q-XQu" secondAttribute="centerY" id="Pck-z1-IQ5"/>
- <constraint firstItem="qqA-7S-cT9" firstAttribute="leading" secondItem="F5N-kV-6cy" secondAttribute="trailing" constant="-1" id="ftC-wK-cXx"/>
- <constraint firstItem="F5N-kV-6cy" firstAttribute="top" secondItem="haT-6q-XQu" secondAttribute="top" constant="1" id="l7i-WR-pj7"/>
- <constraint firstItem="qqA-7S-cT9" firstAttribute="baseline" secondItem="F5N-kV-6cy" secondAttribute="baseline" id="wfS-Eh-IH4"/>
- <constraint firstItem="F5N-kV-6cy" firstAttribute="leading" secondItem="haT-6q-XQu" secondAttribute="leading" constant="3" id="zf1-cU-AmQ"/>
- </constraints>
+ </tableColumn>
+ </tableColumns>
 <connections>
- <outlet property="textField" destination="qqA-7S-cT9" id="wHA-8l-Rbu"/>
+ <accessibilityConnection property="title" destination="Jsz-Er-bsF" id="qgm-4v-94Y"/>
+ <binding destination="ZBe-aP-wvq" name="content" keyPath="arrangedObjects" id="ak7-UG-Fqe"/>
+ <outlet property="dataSource" destination="ZBe-aP-wvq" id="Xy6-f7-IyO"/>
+ <outlet property="delegate" destination="ZBe-aP-wvq" id="zNm-1U-ikF"/>
 </connections>
- </tableCellView>
- </prototypeCellViews>
- <connections>
- <binding destination="ZBe-aP-wvq" name="value" keyPath="arrangedObjects.isSelected" id="fRp-oC-H6C"/>
- </connections>
- </tableColumn>
- </tableColumns>
- <connections>
- <accessibilityConnection property="title" destination="Jsz-Er-bsF" id="qgm-4v-94Y"/>
- <binding destination="ZBe-aP-wvq" name="content" keyPath="arrangedObjects" id="ak7-UG-Fqe"/>
- <outlet property="dataSource" destination="ZBe-aP-wvq" id="Xy6-f7-IyO"/>
- <outlet property="delegate" destination="ZBe-aP-wvq" id="zNm-1U-ikF"/>
- </connections>
- </tableView>
- </subviews>
- </clipView>
+ </tableView>
+ </subviews>
+ </clipView>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="7Rp-Nn-e0h"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="136" id="u5x-I4-dLx"/>
+ </constraints>
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
+ <rect key="frame" x="1" y="157" width="258" height="15"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <accessibility description="Audio Track Languages"/>
+ </scrollView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
 <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="7Rp-Nn-e0h"/>
+ <constraint firstItem="fPg-3n-1TN" firstAttribute="width" secondItem="Jsz-Er-bsF" secondAttribute="width" id="5ux-xc-S6f"/>
 </constraints>
- <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="bXf-U5-ogz">
- <rect key="frame" x="1" y="118" width="248" height="16"/>
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="BWM-rq-VTg">
- <autoresizingMask key="autoresizingMask"/>
- </scroller>
- <accessibility description="Audio Track Languages"/>
- <connections>
- <outlet property="nextKeyView" destination="QAt-5X-NBT" id="u00-fZ-W1s"/>
- </connections>
- </scrollView>
- <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="M11-Ls-RrL">
- <rect key="frame" x="20" y="19" width="18" height="19"/>
- <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="sOl-fj-Vc8">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
- </buttonCell>
- <connections>
- <action selector="openUserGuide:" target="-2" id="6x5-4X-rQB"/>
- </connections>
- </button>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstItem="0HY-xB-cvO" firstAttribute="top" secondItem="os0-Jl-OXF" secondAttribute="bottom" constant="6" id="1Kg-ZM-dIQ"/>
- <constraint firstItem="fPg-3n-1TN" firstAttribute="top" secondItem="ZP2-Cp-K5w" secondAttribute="top" constant="22" id="1TC-iB-tBM"/>
 <constraint firstItem="kJY-av-BYf" firstAttribute="width" secondItem="sC2-52-liU" secondAttribute="width" id="3US-QJ-5QL"/>
- <constraint firstAttribute="trailing" secondItem="os0-Jl-OXF" secondAttribute="trailing" constant="88" id="4bS-Yo-TSN"/>
- <constraint firstItem="fgl-Ev-ELt" firstAttribute="top" secondItem="fzd-MO-xaB" secondAttribute="bottom" constant="6" id="66e-Qk-ajP"/>
- <constraint firstItem="os0-Jl-OXF" firstAttribute="baseline" secondItem="vUx-OV-W5T" secondAttribute="baseline" id="7N7-5F-zWF"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="RtZ-Cz-5mG" secondAttribute="trailing" constant="20" symbolic="YES" id="7dT-AF-zH9"/>
+ <constraint firstItem="mON-8C-X5t" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" symbolic="YES" id="84z-cH-d09"/>
+ <constraint firstItem="kJY-av-BYf" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="M11-Ls-RrL" secondAttribute="trailing" constant="12" symbolic="YES" id="864-c4-BeW"/>
 <constraint firstItem="M11-Ls-RrL" firstAttribute="top" secondItem="N4q-sT-WgW" secondAttribute="bottom" constant="15" id="AOo-Sb-GZW"/>
 <constraint firstAttribute="trailing" secondItem="sC2-52-liU" secondAttribute="trailing" constant="20" id="B62-ty-pmI"/>
- <constraint firstItem="Jsz-Er-bsF" firstAttribute="width" secondItem="fPg-3n-1TN" secondAttribute="width" id="DTG-Dg-ju5"/>
- <constraint firstItem="os0-Jl-OXF" firstAttribute="leading" secondItem="vUx-OV-W5T" secondAttribute="trailing" constant="30" id="Fmc-Z0-yQZ"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="8Pw-Kq-eMN" secondAttribute="trailing" constant="20" id="Fu8-nq-Vft"/>
 <constraint firstAttribute="bottom" secondItem="M11-Ls-RrL" secondAttribute="bottom" constant="20" id="G1B-eX-eqE"/>
- <constraint firstItem="QAt-5X-NBT" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="bottom" constant="8" id="Gc4-RW-fsh"/>
- <constraint firstItem="IxI-o9-jMs" firstAttribute="leading" secondItem="E93-Md-aWa" secondAttribute="leading" id="HtK-To-0EQ"/>
- <constraint firstItem="fPg-3n-1TN" firstAttribute="baseline" secondItem="oiD-QI-wly" secondAttribute="baseline" id="Ixv-MD-yaN"/>
 <constraint firstItem="uF5-6E-EIe" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="trailing" constant="13" id="J0L-CA-XLI"/>
- <constraint firstItem="LdN-Cx-ZJY" firstAttribute="leading" secondItem="Tth-IR-7cU" secondAttribute="trailing" constant="8" id="J5S-TP-Bn4"/>
- <constraint firstItem="aTC-39-h6S" firstAttribute="top" secondItem="Jsz-Er-bsF" secondAttribute="top" id="JGp-Ee-U2U"/>
- <constraint firstItem="l4i-pd-Cbk" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="top" id="LEE-zN-6Nn"/>
 <constraint firstItem="kJY-av-BYf" firstAttribute="baseline" secondItem="sC2-52-liU" secondAttribute="baseline" id="LdH-5O-jKo"/>
- <constraint firstItem="LdN-Cx-ZJY" firstAttribute="baseline" secondItem="Tth-IR-7cU" secondAttribute="baseline" id="Lpv-O6-woq"/>
- <constraint firstItem="BK7-c4-kkk" firstAttribute="leading" secondItem="0HY-xB-cvO" secondAttribute="leading" id="N4x-g8-IIS"/>
 <constraint firstItem="RtZ-Cz-5mG" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="R53-5h-0vJ"/>
 <constraint firstAttribute="bottom" secondItem="sC2-52-liU" secondAttribute="bottom" constant="20" id="RRW-Y5-912"/>
- <constraint firstItem="vUx-OV-W5T" firstAttribute="leading" secondItem="l4i-pd-Cbk" secondAttribute="trailing" constant="8" id="RmT-3c-K9e"/>
- <constraint firstItem="aTC-39-h6S" firstAttribute="top" secondItem="oiD-QI-wly" secondAttribute="bottom" constant="8" id="SNx-1k-9Uf"/>
- <constraint firstItem="BK7-c4-kkk" firstAttribute="top" secondItem="0HY-xB-cvO" secondAttribute="bottom" constant="6" id="VVW-dq-3ff"/>
- <constraint firstItem="fgl-Ev-ELt" firstAttribute="leading" secondItem="fzd-MO-xaB" secondAttribute="leading" id="WS0-eR-HKh"/>
- <constraint firstItem="fzd-MO-xaB" firstAttribute="leading" secondItem="vUx-OV-W5T" secondAttribute="leading" id="Xtx-ud-2Ie"/>
- <constraint firstItem="RtZ-Cz-5mG" firstAttribute="top" secondItem="QAt-5X-NBT" secondAttribute="bottom" constant="20" id="Xwx-lx-KHL"/>
- <constraint firstItem="E93-Md-aWa" firstAttribute="leading" secondItem="fgl-Ev-ELt" secondAttribute="leading" id="YeR-2U-oWh"/>
- <constraint firstItem="Tth-IR-7cU" firstAttribute="width" secondItem="l4i-pd-Cbk" secondAttribute="width" id="Z0M-ak-Mll"/>
- <constraint firstItem="aTC-39-h6S" firstAttribute="leading" secondItem="QAt-5X-NBT" secondAttribute="leading" id="aO7-nw-AjV"/>
- <constraint firstItem="Jsz-Er-bsF" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="leading" id="bPd-p5-Z94"/>
- <constraint firstItem="LdN-Cx-ZJY" firstAttribute="top" secondItem="IxI-o9-jMs" secondAttribute="bottom" constant="29" id="cCv-9s-FHB"/>
- <constraint firstItem="0HY-xB-cvO" firstAttribute="leading" secondItem="os0-Jl-OXF" secondAttribute="leading" id="dtd-xw-QCP"/>
- <constraint firstItem="hGL-Ew-UVJ" firstAttribute="top" secondItem="LdN-Cx-ZJY" secondAttribute="bottom" constant="74" id="e7V-pM-tjy"/>
+ <constraint firstItem="8Pw-Kq-eMN" firstAttribute="leading" secondItem="mON-8C-X5t" secondAttribute="trailing" constant="56" id="Wad-TB-7OD"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="uF5-6E-EIe" secondAttribute="trailing" constant="20" symbolic="YES" id="cEr-2s-7rp"/>
 <constraint firstItem="M11-Ls-RrL" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="leading" id="fBT-WX-Q5Z"/>
 <constraint firstAttribute="trailing" secondItem="hGL-Ew-UVJ" secondAttribute="trailing" constant="20" id="glz-Tw-AyY"/>
- <constraint firstItem="vUx-OV-W5T" firstAttribute="baseline" secondItem="l4i-pd-Cbk" secondAttribute="baseline" id="j0t-pv-Wfy"/>
- <constraint firstItem="E93-Md-aWa" firstAttribute="top" secondItem="fgl-Ev-ELt" secondAttribute="bottom" constant="6" id="jeE-jg-jxu"/>
 <constraint firstItem="hGL-Ew-UVJ" firstAttribute="top" secondItem="RtZ-Cz-5mG" secondAttribute="bottom" constant="8" id="jhe-0p-LYz"/>
- <constraint firstItem="Tth-IR-7cU" firstAttribute="leading" secondItem="l4i-pd-Cbk" secondAttribute="leading" id="mrj-X0-EFm"/>
+ <constraint firstItem="mON-8C-X5t" firstAttribute="top" secondItem="ZP2-Cp-K5w" secondAttribute="top" constant="20" symbolic="YES" id="kni-de-kzf"/>
 <constraint firstItem="uF5-6E-EIe" firstAttribute="centerY" secondItem="N4q-sT-WgW" secondAttribute="centerY" id="nJR-6O-xLy"/>
- <constraint firstItem="IxI-o9-jMs" firstAttribute="top" secondItem="E93-Md-aWa" secondAttribute="bottom" constant="6" id="pR6-Bh-P94"/>
- <constraint firstItem="aTC-39-h6S" firstAttribute="leading" secondItem="Jsz-Er-bsF" secondAttribute="trailing" constant="8" id="pV4-BK-VLF"/>
- <constraint firstItem="fzd-MO-xaB" firstAttribute="top" secondItem="vUx-OV-W5T" secondAttribute="bottom" constant="6" id="rMw-EM-QAG"/>
- <constraint firstItem="oiD-QI-wly" firstAttribute="leading" secondItem="fPg-3n-1TN" secondAttribute="trailing" constant="8" id="t8C-sb-QkU"/>
 <constraint firstItem="sC2-52-liU" firstAttribute="leading" secondItem="kJY-av-BYf" secondAttribute="trailing" constant="8" id="vZI-9R-5tO"/>
- <constraint firstItem="fPg-3n-1TN" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="12" id="vb4-Zo-R8r"/>
 <constraint firstItem="N4q-sT-WgW" firstAttribute="top" secondItem="hGL-Ew-UVJ" secondAttribute="bottom" constant="8" id="w2O-Xt-Vdr"/>
- <constraint firstItem="l4i-pd-Cbk" firstAttribute="leading" secondItem="aTC-39-h6S" secondAttribute="trailing" constant="70" id="wiP-c8-LfG"/>
+ <constraint firstItem="RtZ-Cz-5mG" firstAttribute="top" secondItem="GSL-ZN-P2c" secondAttribute="bottom" constant="16" id="wcv-WR-Xhf"/>
+ <constraint firstItem="OkV-lt-k7P" firstAttribute="top" secondItem="aTC-39-h6S" secondAttribute="top" id="xZ9-Ez-b8b"/>
 <constraint firstItem="hGL-Ew-UVJ" firstAttribute="leading" secondItem="ZP2-Cp-K5w" secondAttribute="leading" constant="20" id="yag-PB-aqP"/>
 <constraint firstItem="hGL-Ew-UVJ" firstAttribute="leading" secondItem="N4q-sT-WgW" secondAttribute="leading" id="zUn-OY-n5b"/>
 </constraints>
@@ -799,7 +884,7 @@
 <connections>
 <outlet property="initialFirstResponder" destination="oiD-QI-wly" id="Vxi-xi-P0d"/>
 </connections>
- <point key="canvasLocation" x="119" y="-141"/>
+ <point key="canvasLocation" x="-1518" y="-211"/>
 </window>
 <arrayController objectClassName="HBLang" id="ZBe-aP-wvq" userLabel="Languages Table Controller" customClass="HBLanguageArrayController">
 <declaredKeys>
@@ -826,7 +911,7 @@
 </arrayController>
 </objects>
 <resources>
- <image name="NSAddTemplate" width="11" height="11"/>
- <image name="NSRemoveTemplate" width="11" height="11"/>
+ <image name="NSAddTemplate" width="14" height="13"/>
+ <image name="NSRemoveTemplate" width="14" height="4"/>
 </resources>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/ChaptersTitles.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/ChaptersTitles.xib Changed

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -16,11 +15,11 @@
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
 <view id="qs9-Xl-pXA">
- <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <rect key="frame" x="0.0" y="0.0" width="970" height="322"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <button toolTip="Add a chapter markers track to the video." translatesAutoresizingMaskIntoConstraints="NO" id="7Xf-c0-jsr">
- <rect key="frame" x="17" y="288" width="146" height="18"/>
+ <rect key="frame" x="19" y="290" width="145" height="16"/>
 <buttonCell key="cell" type="check" title="Create chapter markers" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lJL-wX-DVP">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -35,7 +34,7 @@
 </connections>
 </button>
 <button toolTip="Import a list of chapter names from a CSV file." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ron-3B-rYg">
- <rect key="frame" x="671" y="282" width="121" height="28"/>
+ <rect key="frame" x="714" y="283" width="123" height="27"/>
 <buttonCell key="cell" type="push" title="Import Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PM3-Ue-0kW">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -50,7 +49,7 @@
 </connections>
 </button>
 <button toolTip="Export the list of chapter names to a CSV file." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3SP-6e-RPS">
- <rect key="frame" x="790" y="282" width="121" height="28"/>
+ <rect key="frame" x="833" y="283" width="123" height="27"/>
 <buttonCell key="cell" type="push" title="Export Chapters…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="h0O-zg-OF9">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -65,21 +64,20 @@
 </connections>
 </button>
 <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lqY-aE-MZi">
- <rect key="frame" x="20" y="20" width="886" height="258"/>
+ <rect key="frame" x="20" y="20" width="930" height="260"/>
 <clipView key="contentView" id="3Pi-zz-fFg">
- <rect key="frame" x="1" y="0.0" width="884" height="257"/>
+ <rect key="frame" x="1" y="1" width="928" height="258"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="16" headerView="0rK-Rs-NTb" viewBased="YES" id="InF-gR-Lia">
- <rect key="frame" x="0.0" y="0.0" width="884" height="234"/>
- <autoresizingMask key="autoresizingMask"/>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="16" headerView="0rK-Rs-NTb" viewBased="YES" id="InF-gR-Lia">
+ <rect key="frame" x="0.0" y="0.0" width="928" height="235"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
 <tableColumn identifier="index" editable="NO" width="45" minWidth="40" maxWidth="1000" id="0iF-eL-NOC">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Index">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -122,7 +120,6 @@
 </tableColumn>
 <tableColumn identifier="timestamp" editable="NO" width="72" minWidth="10" maxWidth="3.4028234663852886e+38" id="NlF-th-Cg9" userLabel="Timestamp">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Start">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -169,7 +166,6 @@
 </tableColumn>
 <tableColumn identifier="duration" editable="NO" width="69" minWidth="10" maxWidth="3.4028234663852886e+38" id="QVB-Cw-DJD">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Duration">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -214,9 +210,8 @@
 </binding>
 </connections>
 </tableColumn>
- <tableColumn identifier="title" width="686" minWidth="77.217290000000006" maxWidth="1000" id="Z6H-lJ-ipr">
+ <tableColumn identifier="title" width="730" minWidth="77.217290000000006" maxWidth="1000" id="Z6H-lJ-ipr">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Title">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -228,11 +223,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="yZu-QP-dyq">
- <rect key="frame" x="196" y="1" width="686" height="17"/>
+ <rect key="frame" x="196" y="1" width="730" height="17"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rpj-MP-nnZ">
- <rect key="frame" x="0.0" y="1" width="686" height="15"/>
+ <rect key="frame" x="0.0" y="1" width="730" height="15"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="Title" id="UjY-nz-uSt">
 
@@ -266,15 +261,15 @@
 </subviews>
 </clipView>
 <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="O2b-uL-5ea">
- <rect key="frame" x="1" y="241" width="884" height="16"/>
+ <rect key="frame" x="1" y="244" width="884" height="15"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="yp0-pp-Yw7">
 <rect key="frame" x="869" y="17" width="16" height="246"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <tableHeaderView key="headerView" id="0rK-Rs-NTb">
- <rect key="frame" x="0.0" y="0.0" width="884" height="23"/>
+ <tableHeaderView key="headerView" wantsLayer="YES" id="0rK-Rs-NTb">
+ <rect key="frame" x="0.0" y="0.0" width="928" height="23"/>
 <autoresizingMask key="autoresizingMask"/>
 </tableHeaderView>
 </scrollView>
@@ -293,7 +288,7 @@
 <constraint firstItem="7Xf-c0-jsr" firstAttribute="leading" secondItem="lqY-aE-MZi" secondAttribute="leading" id="xvS-rd-BVF"/>
 <constraint firstItem="7Xf-c0-jsr" firstAttribute="leading" secondItem="qs9-Xl-pXA" secondAttribute="leading" constant="20" symbolic="YES" id="zIR-UV-LXe"/>
 </constraints>
- <point key="canvasLocation" x="113" y="149"/>
+ <point key="canvasLocation" x="73" y="149"/>
 </view>
 <userDefaultsController representsSharedInstance="YES" id="coy-s6-QLx"/>
 <arrayController objectClassName="HBChapter" editable="NO" id="Gv0-qM-nu4">

HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBCroppingView.xib Added

@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="HBCroppingController">
+ <connections>
+ <outlet property="view" destination="G0m-eh-cUI" id="suz-o9-DS9"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <userDefaultsController representsSharedInstance="YES" id="vUw-ux-GVV"/>
+ <view wantsLayer="YES" id="G0m-eh-cUI">
+ <rect key="frame" x="0.0" y="0.0" width="198" height="124"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RXb-dd-41D">
+ <rect key="frame" x="20" y="20" width="158" height="84"/>
+ <subviews>
+ <popUpButton toolTip="Rotate the picture clockwise in 90 degree increments." horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cWv-q0-EN9">
+ <rect key="frame" x="-4" y="64" width="166" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="Pqk-fS-pyy" id="rRi-AL-IKl">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="Q04-FI-Vi6">
+ <items>
+ <menuItem title="None" state="on" id="Pqk-fS-pyy"/>
+ <menuItem title="Automatic" tag="1" id="sUG-Cw-nQU"/>
+ <menuItem title="Custom" tag="2" id="dD5-og-dxx"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.cropMode" id="YYm-Ox-FuZ"/>
+ </connections>
+ </popUpButton>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="3IY-Qm-KMJ">
+ <rect key="frame" x="0.0" y="0.0" width="158" height="60"/>
+ <subviews>
+ <textField toolTip="Left edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="Td7-sa-0TV">
+ <rect key="frame" x="0.0" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="iF7-Kp-18L">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="4eK-Cz-G5y"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop left"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="yDf-4g-FLl">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="3wv-2f-6xB"/>
+ </connections>
+ </textField>
+ <textField toolTip="Bottom edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="6Gj-ZU-E1E">
+ <rect key="frame" x="54" y="2" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XSa-sK-bkZ">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="Ob3-hm-TP9"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop bottom"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="oN8-74-lk0">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="srC-rj-gXM"/>
+ </connections>
+ </textField>
+ <textField toolTip="Right edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="php-p6-Nz6">
+ <rect key="frame" x="108" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XLL-Lm-ivc">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="KaO-A4-kXq"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop right"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="Pbe-2e-W29">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="VwH-vn-EsZ"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="y7P-yk-q46">
+ <rect key="frame" x="143" y="18" width="15" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="SA2-eh-4Jb">
+ 
+ </stepperCell>
+ <accessibility description="Crop right"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="Wsh-SC-RmH">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="JQM-oa-Ucm"/>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="8e5-zI-IBg">
+ <rect key="frame" x="89" y="38" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="c11-EG-77U">
+ 
+ </stepperCell>
+ <accessibility description="Crop top"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="bJl-KS-VCU">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="o4T-Q0-FG9"/>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="Yua-R6-mWU">
+ <rect key="frame" x="35" y="18" width="15" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="yPe-lP-KfM">
+ 
+ </stepperCell>
+ <accessibility description="Crop left"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="Idt-Df-QOQ">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="dBc-zu-QOM"/>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="sWf-fq-lvl">
+ <rect key="frame" x="89" y="-1" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="w45-AO-bJL">
+ 
+ </stepperCell>
+ <accessibility description="Crop bottom"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="kwp-8o-xAt">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="Cir-0Q-phe"/>
+ </connections>
+ </stepper>
+ <textField toolTip="Top edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="Cp5-xz-x1h">
+ <rect key="frame" x="54" y="40" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="WKu-TR-fzG">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="Zhe-d6-XZG"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop top"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="Mfe-8c-gIn">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="kH1-Bw-UWp"/>
+ </connections>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="height" constant="60" id="fwG-bv-NtO"/>
+ <constraint firstAttribute="width" constant="158" id="ph6-P5-diB"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="RXb-dd-41D" secondAttribute="bottom" constant="20" symbolic="YES" id="0xo-XX-onz"/>
+ <constraint firstItem="RXb-dd-41D" firstAttribute="top" secondItem="G0m-eh-cUI" secondAttribute="top" constant="20" symbolic="YES" id="5Hd-UT-PWu"/>
+ <constraint firstItem="RXb-dd-41D" firstAttribute="leading" secondItem="G0m-eh-cUI" secondAttribute="leading" constant="20" symbolic="YES" id="Y0r-vG-Ppl"/>
+ <constraint firstAttribute="trailing" secondItem="RXb-dd-41D" secondAttribute="trailing" constant="20" symbolic="YES" id="lql-tL-Lc3"/>
+ </constraints>
+ <point key="canvasLocation" x="-641" y="28"/>
+ </view>
+ </objects>
+</document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBEncodingProgressHUDController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBEncodingProgressHUDController.xib Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBFiltersViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBFiltersViewController.xib Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBPictureHUDController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBPictureHUDController.xib Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBPictureViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBPictureViewController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.59" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.59"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -16,736 +16,1880 @@
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
 <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="875" height="335"/>
+ <rect key="frame" x="0.0" y="0.0" width="752" height="347"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="Mri-4y-8rX">
- <rect key="frame" x="296" y="184" width="281" height="155"/>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P5q-5e-xlx">
+ <rect key="frame" x="20" y="295" width="324" height="36"/>
 <subviews>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Mke-9L-LvB">
- <rect key="frame" x="192" y="68" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="jWe-et-eOH">
- 
- </stepperCell>
- <accessibility description="Crop top"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vKA-Sa-wGh">
+ <rect key="frame" x="-2" y="22" width="112" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Source Dimensions" id="Trk-C5-Npx">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
 <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="mtZ-Ty-n6s" id="HQZ-ek-iiD">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="mtZ-Ty-n6s">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropTop" previousBinding="4Z9-jd-EzH" id="c0Z-ZT-9Cf"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxTopCrop" id="4Z9-jd-EzH"/>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="CH3-db-KT5"/>
 </connections>
- </stepper>
- <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RTr-3u-52l">
- <rect key="frame" x="76" y="96" width="205" height="43"/>
- <string key="toolTip">Cropping mode.
-
-Automatic detects and removes black borders from the video.
-
-Custom allows for manual settings.</string>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="19" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jHq-W6-De6">
+ <rect key="frame" x="0.0" y="0.0" width="324" height="14"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZtF-Dr-Q9I">
+ <rect key="frame" x="0.0" y="0.0" width="100" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="y0c-bm-peD">
+ <rect key="frame" x="-2" y="0.0" width="74" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Storage Size:" id="ZZ9-XW-Uib">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Zfk-xb-1A1"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Rw8-Yc-JRg">
+ <rect key="frame" x="71" y="0.0" width="31" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="0 x 0" id="ZTy-fJ-cDa">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.sourceStorageSize" id="SGn-b9-JVZ">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">-</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="2" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lJ7-rP-yaL">
+ <rect key="frame" x="119" y="0.0" width="96" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="So8-97-LO3">
+ <rect key="frame" x="-2" y="0.0" width="71" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Display Size:" id="1AB-bM-qTs">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="HGZ-Jt-Dkm"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xdm-1k-xBq">
+ <rect key="frame" x="67" y="0.0" width="31" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="0 x 0" id="byr-LI-ap5">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.sourceDisplaySize" id="hTi-U4-PGY">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">-</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="woK-zN-dbx">
+ <rect key="frame" x="234" y="0.0" width="90" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="i1a-eO-STO">
+ <rect key="frame" x="-2" y="0.0" width="74" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Aspect Ratio:" id="Lz1-Cx-d30">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="npL-hT-m8l"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ibg-YD-AVt">
+ <rect key="frame" x="74" y="0.0" width="18" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="1:1" id="lIt-eN-Uyd">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.sourceAspectRatio" id="3Ze-5A-gL3">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">-</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="equalSpacing" orientation="horizontal" alignment="top" spacing="23" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OFE-0G-Zqz">
+ <rect key="frame" x="20" y="88" width="710" height="187"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zU5-gT-j2i">
+ <rect key="frame" x="0.0" y="35" width="218" height="152"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VhD-q6-iLb">
+ <rect key="frame" x="-2" y="138" width="133" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Orientation &amp; Cropping" id="u2U-SJ-szy">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Udw-X6-gKh"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sru-ia-7VY">
+ <rect key="frame" x="0.0" y="116" width="134" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="752" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="Kpm-FM-DTT">
+ <rect key="frame" x="-2" y="0.0" width="56" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Flipping:" id="ewx-pd-ANc">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="5ic-vm-Bks"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KMy-hS-iIJ">
+ <rect key="frame" x="60" y="0.0" width="74" height="14"/>
+ <subviews>
+ <button toolTip="Flips (mirrors) the picture on the horizontal axis" translatesAutoresizingMaskIntoConstraints="NO" id="xNB-9k-4uD">
+ <rect key="frame" x="-1" y="-1" width="75" height="16"/>
+ <buttonCell key="cell" type="check" title="Horizontal" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="EqJ-eR-Fz7">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="Kpm-FM-DTT" id="esE-4E-aQH"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="bH7-u3-5hf">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.flip" id="Mr0-EY-YrZ"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Uev-zj-FIR">
+ <rect key="frame" x="0.0" y="92" width="110" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="752" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="0rN-RP-Om4">
+ <rect key="frame" x="-2" y="1" width="56" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Rotation:" id="vb2-DA-Pgr">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="2Ug-ef-N1t"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="12" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WTL-cc-yu9">
+ <rect key="frame" x="60" y="0.0" width="50" height="16"/>
+ <subviews>
+ <popUpButton toolTip="Rotate the picture clockwise in 90 degree increments" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ffe-SL-kPm">
+ <rect key="frame" x="-4" y="-4" width="58" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="0°" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="qsi-r7-kNQ" id="rYp-cI-T3D">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="9Va-7k-Mbw">
+ <items>
+ <menuItem title="0°" state="on" id="qsi-r7-kNQ"/>
+ <menuItem title="90°" tag="90" id="V1G-sQ-eqd"/>
+ <menuItem title="180°" tag="180" id="1zy-53-Bvd"/>
+ <menuItem title="270°" tag="270" id="tIU-4H-3Xm"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="0rN-RP-Om4" id="iR5-sy-qGz"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="bb9-f1-br5">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.angle" id="SOt-bQ-857"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZkN-1w-lLe">
+ <rect key="frame" x="0.0" y="0.0" width="218" height="84"/>
+ <subviews>
+ <textField horizontalHuggingPriority="753" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="Aea-Uc-JnZ">
+ <rect key="frame" x="-2" y="69" width="56" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Cropping:" id="zsq-Le-41g">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="iFD-nI-C9u"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Bc-mZ-CrZ">
+ <rect key="frame" x="60" y="0.0" width="158" height="84"/>
+ <subviews>
+ <popUpButton toolTip="How to apply crop settings" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vfx-ON-9ys">
+ <rect key="frame" x="-4" y="64" width="86" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="fau-iA-M1E" id="aLo-pd-S8D">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="lAz-Mg-cB2">
+ <items>
+ <menuItem title="None" state="on" id="fau-iA-M1E"/>
+ <menuItem title="Automatic" tag="1" id="7rG-Qv-khx"/>
+ <menuItem title="Custom" tag="2" id="LQm-LK-6tr"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="Aea-Uc-JnZ" id="YWb-gj-suw"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="GQ3-A2-lUX">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.cropMode" id="fOc-OY-z5A"/>
+ </connections>
+ </popUpButton>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="xfh-Wp-ZQz">
+ <rect key="frame" x="0.0" y="0.0" width="158" height="60"/>
+ <subviews>
+ <textField toolTip="Left edge cropping amount in pixels" verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="LTu-ic-Ty9">
+ <rect key="frame" x="0.0" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XZs-gj-hoo">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="WoC-YC-H5L"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop left"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="VO1-zV-9wC" id="cLF-xX-27c">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="2fq-yE-LSA">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="VO1-zV-9wC"/>
+ </connections>
+ </textField>
+ <textField toolTip="Bottom edge cropping amount in pixels" verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="1Z0-JT-vst">
+ <rect key="frame" x="54" y="2" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="DzX-1f-HsP">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="r1c-KK-4uF"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop bottom"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="iza-Pd-Pzx" id="azA-0v-Uln">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="ob5-QF-mOC">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="iza-Pd-Pzx"/>
+ </connections>
+ </textField>
+ <textField toolTip="Right edge cropping amount in pixels" verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="wsq-TS-cC6">
+ <rect key="frame" x="108" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CIG-PU-RMT">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="rtx-vd-c05"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop right"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="VJg-CI-vn6" id="QdC-DW-XAs">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="krD-da-wuz">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="VJg-CI-vn6"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="Ddg-4D-el9">
+ <rect key="frame" x="143" y="18" width="15" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="QFM-0O-SjJ">
+ 
+ </stepperCell>
+ <accessibility description="Crop right"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="v1c-lQ-Iil" id="01l-KQ-My7">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="v1c-lQ-Iil"/>
+ <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="NJi-37-m7W">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="Mke-9L-LvB">
+ <rect key="frame" x="89" y="38" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="jWe-et-eOH">
+ 
+ </stepperCell>
+ <accessibility description="Crop top"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="5Zy-md-B3T" id="l62-x9-yib">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="5Zy-md-B3T"/>
+ <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="mA8-MT-U6L">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="r9l-cH-pFW">
+ <rect key="frame" x="35" y="18" width="15" height="23"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="Z4J-oE-seK">
+ 
+ </stepperCell>
+ <accessibility description="Crop left"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="kYV-av-Iau" id="N5r-yD-uW4">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="kYV-av-Iau"/>
+ <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="d5o-v4-Wdb">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="6W6-RI-fBx">
+ <rect key="frame" x="89" y="-1" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="Fll-IT-6Ex">
+ 
+ </stepperCell>
+ <accessibility description="Crop bottom"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="wAQ-9J-HFt" id="WhX-QQ-Lo1">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="wAQ-9J-HFt"/>
+ <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="S7N-Uj-ONm">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <textField toolTip="Top edge cropping amount in pixels" verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" id="41c-48-2XJ">
+ <rect key="frame" x="54" y="40" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CZs-y7-1JV">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="FyD-ad-rqf"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Crop top"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="E2f-qi-W88" id="6CR-Jr-aq2">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="x0H-9t-WiF">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customCropEnabled" id="E2f-qi-W88"/>
+ </connections>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="height" constant="60" id="KLa-lj-WRq"/>
+ <constraint firstAttribute="width" constant="158" id="fWY-zW-mQg"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
 <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="205" id="nnb-NE-THM"/>
+ <constraint firstItem="0rN-RP-Om4" firstAttribute="width" secondItem="Kpm-FM-DTT" secondAttribute="width" id="icS-mH-aJq"/>
+ <constraint firstItem="Aea-Uc-JnZ" firstAttribute="width" secondItem="0rN-RP-Om4" secondAttribute="width" id="td2-F7-rj7"/>
 </constraints>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="205" height="20"/>
- <size key="intercellSpacing" width="2" height="3"/>
- <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" controlSize="small" inset="2" id="S7K-vF-t1n">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="Automatic" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="b3y-yE-sYc">
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3sU-eh-1ja">
+ <rect key="frame" x="241" y="0.0" width="248" height="187"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Or0-9o-QjY">
+ <rect key="frame" x="-2" y="173" width="119" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Resolution &amp; Scaling" id="aVx-b3-2AK">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="2ak-CQ-JHg"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uO6-48-Dmb">
+ <rect key="frame" x="0.0" y="149" width="231" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="752" verticalHuggingPriority="750" horizontalCompressionResistancePriority="752" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="PJL-Y6-9ZV">
+ <rect key="frame" x="-2" y="1" width="92" height="14"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Resolution Limit:" id="d0T-QG-WXU">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="sr7-jY-1tu"/>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="the-i1-S1D">
+ <rect key="frame" x="92" y="-4" width="143" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="gWL-mx-RIK" id="pzu-rp-72l">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="0gK-D5-trU">
+ <items>
+ <menuItem title="None" state="on" id="gWL-mx-RIK"/>
+ <menuItem title="4320p 8K Ultra HD" tag="1" id="Vrx-BH-ry2"/>
+ <menuItem title="2160p 4K Ultra HD" tag="2" id="1Zm-mM-8Tb"/>
+ <menuItem title="1440p 2.5K Quad HD" tag="3" id="2ax-HE-Amt"/>
+ <menuItem title="1080p HD" tag="4" id="qzy-K8-2tY"/>
+ <menuItem title="720p HD" tag="5" id="Xao-1P-xPT"/>
+ <menuItem title="576p PAL SD" tag="6" id="yue-jq-T1X"/>
+ <menuItem title="480p NTSC SD" tag="7" id="21C-Hg-mk4"/>
+ <menuItem title="Custom" tag="8" id="Xun-U2-N6F"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="PJL-Y6-9ZV" id="Vpy-Sj-eLs"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="Hqh-h4-HtI">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.resolutionLimitMode" id="rWA-EQ-pdm"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="7" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QW6-1e-ZMT">
+ <rect key="frame" x="96" y="122" width="128" height="19"/>
+ <subviews>
+ <textField toolTip="The maximum width that the video will be stored at." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NRy-vc-8qX">
+ <rect key="frame" x="0.0" y="0.0" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="gNB-FK-Qtf"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="7sC-hq-aeg">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="Vpt-IG-MaA"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Maximum width"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.maxWidth" id="VMN-Ha-9Wu">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="who-FI-Crq">
+ <rect key="frame" x="59" y="3" width="10" height="14"/>
+ <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="5Tj-xw-QuU">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="d7H-E9-cYR">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <textField toolTip="The maximum height that the video will be stored at." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FGm-oJ-FVW">
+ <rect key="frame" x="74" y="0.0" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="EEm-90-oEg"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="fUD-KJ-7OF">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="XiK-t7-aeD"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Maximum height"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.maxHeight" id="guG-f0-XBM">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.picture.customResolutionLimitEnabled" id="0Qi-HN-Rn7">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gTO-xc-fNR">
+ <rect key="frame" x="0.0" y="98" width="174" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="751" verticalHuggingPriority="750" horizontalCompressionResistancePriority="752" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="JBo-0E-AsU">
+ <rect key="frame" x="-2" y="1" width="92" height="14"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anamorphic:" id="8vS-Mw-bny">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="MVb-7T-IbY"/>
+ </connections>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w1f-3S-up0">
+ <rect key="frame" x="92" y="-4" width="86" height="22"/>
+ <string key="toolTip">Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.
+
+Automatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.
+
+None disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.
+
+Custom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production.</string>
+ <popUpButtonCell key="cell" type="push" title="Automatic" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="4" inset="2" selectedItem="JyN-AK-Hae" id="vx1-8S-fyc">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="qSV-uB-Iup">
+ <items>
+ <menuItem title="Automatic" state="on" tag="4" id="JyN-AK-Hae"/>
+ <menuItem title="Off" id="1O3-th-4M5"/>
+ <menuItem title="Custom" tag="3" id="f12-Dh-fDw"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="JBo-0E-AsU" id="b1p-96-aIC"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="RrW-07-vat">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.anamorphicMode" id="ugL-AX-WF2"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Lle-QN-4aa">
+ <rect key="frame" x="0.0" y="71" width="248" height="19"/>
+ <subviews>
+ <textField horizontalHuggingPriority="751" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="hei-Cd-vcN">
+ <rect key="frame" x="-2" y="2" width="92" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Pixel Aspect:" id="SPg-s0-Oh0">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Ghz-q6-1Y1"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Jh-a4-mTP">
+ <rect key="frame" x="96" y="0.0" width="152" height="19"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LWv-Y9-b0S">
+ <rect key="frame" x="0.0" y="0.0" width="54" height="19"/>
+ <string key="toolTip">Pixel aspect defines the shape of the pixels.
+
+A 1:1 ratio defines a square pixel. Other values define rectangulars shapers.
+Players will scale the image in order to achieve the specified aspect.</string>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="vO5-oD-AgX"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XYg-xi-ExT">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="jW5-N6-2cB"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pixel Aspect Numerator"/>
+ <connections>
+ <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="IKb-wD-kbq"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture.isCustomAnamorphicEnabled" previousBinding="IKb-wD-kbq" id="YBM-SS-h09"/>
+ <binding destination="-2" name="value" keyPath="self.picture.parNum" id="PEZ-GB-67M">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="iuc-JG-bhU">
+ <rect key="frame" x="56" y="-2" width="15" height="22"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="1" maxValue="65535" doubleValue="64" id="QXh-re-pS9">
+ 
+ </stepperCell>
+ <accessibility description="Storage Width"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="cgg-8R-M4v">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.isCustomAnamorphicEnabled" previousBinding="cgg-8R-M4v" id="7Xk-lk-SC0">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.parNum" id="qgJ-RU-Tl2">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="Hkl-7Z-J2e" id="XaN-VN-Lhb"/>
+ </connections>
+ </stepper>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="IVk-ye-fOe">
+ <rect key="frame" x="71" y="3" width="10" height="14"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="6" id="nJL-sF-Y30"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title=":" id="uuL-JR-73C">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="IKl-6V-I4V"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nQe-Vq-Og2">
+ <rect key="frame" x="83" y="0.0" width="54" height="19"/>
+ <string key="toolTip">Pixel aspect defines the shape of the pixels.
+
+A 1:1 ratio defines a square pixel. Other values define rectangulars shapers.
+Players will scale the image in order to achieve the specified aspect.</string>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="Oyt-9j-v6B"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="0ho-7Y-adD">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="gd7-JE-NQS"/>
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pixel Aspect Denominator"/>
+ <connections>
+ <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="005-Zc-3cV"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture.isCustomAnamorphicEnabled" previousBinding="005-Zc-3cV" id="nRg-4c-96b"/>
+ <binding destination="-2" name="value" keyPath="self.picture.parDen" id="J0G-CR-z1t">
+ <dictionary key="options">
+ <bool key="NSConditionallySetsEditable" value="YES"/>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3HN-8C-yAS">
+ <rect key="frame" x="139" y="-2" width="15" height="22"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" minValue="64" maxValue="65535" doubleValue="64" id="KRj-Qv-Gaa">
+ 
+ </stepperCell>
+ <accessibility description="Storage Height"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="4mV-5m-HjP">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.isCustomAnamorphicEnabled" previousBinding="4mV-5m-HjP" id="H2y-wf-eQc">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.parDen" id="Zo5-kL-gcs">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9ZE-cV-x9d">
+ <rect key="frame" x="0.0" y="44" width="248" height="19"/>
+ <subviews>
+ <textField horizontalHuggingPriority="751" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="9oG-zm-Y0W">
+ <rect key="frame" x="-2" y="2" width="92" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Scaled Size:" id="L7V-2e-qf9">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Epa-CR-f64"/>
+ <outlet property="nextKeyView" destination="9hH-As-JSa" id="XO3-A3-WZr"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8L9-DZ-yiv">
+ <rect key="frame" x="96" y="0.0" width="152" height="19"/>
+ <subviews>
+ <textField verticalHuggingPriority="751" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9hH-As-JSa">
+ <rect key="frame" x="0.0" y="0.0" width="54" height="19"/>
+ <string key="toolTip">Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings</string>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="wh9-zM-6T3"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="fVv-0N-MQB">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="6jd-2b-RPM"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Scaled Width"/>
+ <connections>
+ <accessibilityConnection property="title" destination="9oG-zm-Y0W" id="lTZ-u6-eUU"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="HGq-yI-bDz">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.useMaximumSize" previousBinding="HGq-yI-bDz" id="Kyp-hm-g9P">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.width" id="bnG-9o-Z70">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="FwZ-6T-zJe" id="FVz-Ke-KDt"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FwZ-6T-zJe">
+ <rect key="frame" x="56" y="-2" width="15" height="22"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" minValue="32" maxValue="20480" doubleValue="64" id="NP7-P2-Qga">
+ 
+ </stepperCell>
+ <accessibility description="Storage Width"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="CiU-c8-Ky6">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.useMaximumSize" previousBinding="CiU-c8-Ky6" id="ec2-Mf-QmZ">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.width" id="YIT-Kn-ldY"/>
+ <outlet property="nextKeyView" destination="Hkl-7Z-J2e" id="uHh-Lp-0GY"/>
+ </connections>
+ </stepper>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="uqQ-uA-3xF">
+ <rect key="frame" x="71" y="3" width="10" height="14"/>
+ <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="hN1-S9-zl8">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description=" "/>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="ZS2-6w-9e6"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hkl-7Z-J2e">
+ <rect key="frame" x="83" y="0.0" width="54" height="19"/>
+ <string key="toolTip">Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings</string>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="tPa-O8-VxI"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="ZHl-Y5-C5P">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Ts7-R5-Oye"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Storage Height"/>
+ <connections>
+ <accessibilityConnection property="title" destination="uqQ-uA-3xF" id="Cho-Kz-bXA"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="nha-oa-kQ8">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.height" id="SEV-F4-Swk">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.useMaximumSize" previousBinding="nha-oa-kQ8" id="VB0-6p-7L5">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="2s0-5k-fjU" id="D8H-ff-R52"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2s0-5k-fjU">
+ <rect key="frame" x="139" y="-2" width="15" height="22"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" minValue="32" maxValue="20480" doubleValue="64" id="MwK-aS-Oaf">
+ 
+ </stepperCell>
+ <accessibility description="Storage Height"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="wcZ-Lg-5Y2">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.height" id="tRc-Sm-9Dc"/>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.useMaximumSize" previousBinding="wcZ-Lg-5Y2" id="R7E-zr-9Vr">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button toolTip="Use highest resolution permitted by above settings" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fjj-ZH-nqb">
+ <rect key="frame" x="95" y="21" width="87" height="16"/>
+ <buttonCell key="cell" type="check" title="Optimal Size" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="FUA-5p-imC">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
 </buttonCell>
- <buttonCell type="radio" title="Custom:" imagePosition="left" alignment="left" controlSize="small" inset="2" id="zmf-MM-j1I">
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="6hS-sA-J2I">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.useMaximumSize" id="hu9-Sk-Q4S"/>
+ </connections>
+ </button>
+ <button toolTip="If not enabled, scaled dimensions will be limited to source dimensions" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ROS-UT-TiG">
+ <rect key="frame" x="95" y="-1" width="105" height="16"/>
+ <buttonCell key="cell" type="check" title="Allow Upscaling" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="0kU-Uy-P4P">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
 </buttonCell>
- </column>
- </cells>
- <connections>
- <accessibilityConnection property="title" destination="Bmd-c8-9hp" id="1MC-Bp-IrM"/>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="aaX-en-7S9">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="selectedIndex" keyPath="self.picture.autocrop" id="0hd-Rk-0R0">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </matrix>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r9l-cH-pFW">
- <rect key="frame" x="134" y="45" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="Z4J-oE-seK">
- 
- </stepperCell>
- <accessibility description="v"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="erl-nf-Xs5" id="UPJ-QD-Izo">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="erl-nf-Xs5">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropLeft" previousBinding="ygC-Mk-gae" id="YCc-wM-Iep"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxLeftCrop" id="ygC-Mk-gae"/>
- </connections>
- </stepper>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6W6-RI-fBx">
- <rect key="frame" x="192" y="22" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="Fll-IT-6Ex">
- 
- </stepperCell>
- <accessibility description="Crop bottom"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="ZKT-as-B7p" id="UHe-hi-SJo">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="ZKT-as-B7p">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropBottom" previousBinding="9V7-cf-abT" id="oaG-Bl-ag8"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxBottomCrop" id="9V7-cf-abT"/>
- </connections>
- </stepper>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="Bmd-c8-9hp">
- <rect key="frame" x="18" y="123" width="56" height="14"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Cropping:" id="haC-cO-jDm">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="fkJ-hW-R19"/>
- </connections>
- </textField>
- <textField toolTip="Right edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wsq-TS-cC6">
- <rect key="frame" x="213" y="47" width="36" height="19"/>
- <constraints>
- <constraint firstAttribute="width" constant="36" id="FKh-P6-rGY"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CIG-PU-RMT">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Crop right"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="o5T-kF-JlS" id="XqO-Pq-WZZ">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="o5T-kF-JlS">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropRight" id="krD-da-wuz">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ddg-4D-el9">
- <rect key="frame" x="248" y="45" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="59" id="QFM-0O-SjJ">
- 
- </stepperCell>
- <accessibility description="Crop right"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="qtl-2n-uKP" id="WyG-bu-8aC">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="qtl-2n-uKP">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropRight" previousBinding="X5t-bh-W3a" id="s5w-KS-LX0"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxRightCrop" id="X5t-bh-W3a"/>
- </connections>
- </stepper>
- <textField toolTip="Bottom edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1Z0-JT-vst">
- <rect key="frame" x="157" y="24" width="36" height="19"/>
- <constraints>
- <constraint firstAttribute="width" constant="36" id="3ia-1j-BcT"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="DzX-1f-HsP">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Crop bottom"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="wVJ-Yz-azk" id="Gzx-Ql-84O">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="wVJ-Yz-azk">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropBottom" id="ob5-QF-mOC">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField toolTip="Top edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="41c-48-2XJ">
- <rect key="frame" x="157" y="70" width="36" height="19"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="Hwm-6X-gI5">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.allowUpscaling" id="XAr-LD-Kzc"/>
+ </connections>
+ </button>
+ </subviews>
 <constraints>
- <constraint firstAttribute="width" constant="36" id="iB8-cV-2Mf"/>
+ <constraint firstItem="PJL-Y6-9ZV" firstAttribute="width" secondItem="9oG-zm-Y0W" secondAttribute="width" id="AUU-G1-gDf"/>
+ <constraint firstItem="JBo-0E-AsU" firstAttribute="width" secondItem="9oG-zm-Y0W" secondAttribute="width" id="NjT-Pg-miH"/>
+ <constraint firstItem="fjj-ZH-nqb" firstAttribute="leading" secondItem="the-i1-S1D" secondAttribute="leading" id="ift-aJ-cvi"/>
+ <constraint firstItem="ROS-UT-TiG" firstAttribute="leading" secondItem="the-i1-S1D" secondAttribute="leading" id="lhU-j7-Agx"/>
+ <constraint firstItem="JBo-0E-AsU" firstAttribute="width" secondItem="hei-Cd-vcN" secondAttribute="width" id="lic-qU-sk5"/>
+ <constraint firstItem="QW6-1e-ZMT" firstAttribute="leading" secondItem="the-i1-S1D" secondAttribute="leading" id="npA-3w-7jD"/>
 </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CZs-y7-1JV">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Crop top"/>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="Pyj-gb-8gd" id="lb7-GI-AEb">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="Pyj-gb-8gd">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropTop" id="x0H-9t-WiF">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField toolTip="Left edge cropping amount in pixels." verticalHuggingPriority="750" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LTu-ic-Ty9">
- <rect key="frame" x="99" y="47" width="36" height="19"/>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EGb-Zz-WQd">
+ <rect key="frame" x="512" y="30" width="198" height="157"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Qow-nB-nRv">
+ <rect key="frame" x="-2" y="143" width="49" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Borders" id="ywF-EG-IYr">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="U5c-Up-RGf"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="i16-mF-pVp">
+ <rect key="frame" x="0.0" y="119" width="161" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="omM-pe-wBc">
+ <rect key="frame" x="-2" y="1" width="36" height="14"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Fill:" id="iqM-GW-fCe">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="bmp-ED-1qJ"/>
+ </connections>
+ </textField>
+ <popUpButton toolTip="Add a border around the video" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vKr-fn-Ujh">
+ <rect key="frame" x="36" y="-4" width="129" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="None" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="6Qy-ik-hiE" id="pIS-xy-kBb">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="whl-q2-Xhg">
+ <items>
+ <menuItem title="None" state="on" id="6Qy-ik-hiE"/>
+ <menuItem title="Height (Letterbox)" tag="2" id="p7U-Ee-kt4"/>
+ <menuItem title="Width (Pillarbox)" tag="3" id="W5p-nd-4WK"/>
+ <menuItem title="Width &amp; Height" tag="1" id="N5d-nG-TZV"/>
+ <menuItem title="Custom" tag="4" id="owa-gb-koC"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="omM-pe-wBc" id="p92-ne-yJH"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="qVL-Iz-Eng">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.padMode" id="E8O-8m-Ycw"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="OHL-2S-XXO">
+ <rect key="frame" x="40" y="51" width="158" height="60"/>
+ <subviews>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="09f-sT-7la">
+ <rect key="frame" x="89" y="38" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="atZ-cf-YyH">
+ 
+ </stepperCell>
+ <accessibility description="Pad top"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="CAo-hv-bh0" id="KSa-a4-J6M">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="CAo-hv-bh0"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padTop" id="8d7-qj-FAc">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <textField toolTip="Top edge border amount in pixels" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Jp-gt-DbX">
+ <rect key="frame" x="54" y="40" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="0yJ-2J-ept">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="P5C-Bq-g5Y"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pad top"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="SwR-DL-b5m" id="lVp-we-eR4">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="SwR-DL-b5m"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padTop" id="QSp-61-LWu">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <textField toolTip="Bottom edge border amount in pixels" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WfM-tx-rC5">
+ <rect key="frame" x="54" y="2" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="Wfu-ZW-M6N">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="87o-Sq-Vz0"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pad bottom"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="kV2-gA-2LZ" id="KPh-5o-Edh">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="kV2-gA-2LZ"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padBottom" id="DN4-KZ-LRc">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <textField toolTip="Right edge border amount in pixels" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ck0-Gu-lGg">
+ <rect key="frame" x="108" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="TIQ-pu-KHa">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="2oO-Js-S4B"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pad right"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="ShA-25-nnU" id="pgD-t1-oHq">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="ShA-25-nnU"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padRight" id="sut-JO-hwX">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="iZc-Ks-efB">
+ <rect key="frame" x="35" y="19" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="Rzf-mS-h9z">
+ 
+ </stepperCell>
+ <accessibility description="Pad left"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="Eeu-oX-5bY" id="J0x-4g-UzQ">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="Eeu-oX-5bY"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padLeft" id="nx1-oX-bu3">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <textField toolTip="Left edge border amount in pixels" verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="36" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l2V-GK-BgU">
+ <rect key="frame" x="0.0" y="21" width="36" height="19"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="iYd-5t-kFE">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" formatWidth="-1" groupingSize="0" minimumIntegerDigits="1" maximumIntegerDigits="42" id="qgq-Hw-brX"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Pad left"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="dSZ-yP-vN4" id="WmF-Z3-s0l">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="dSZ-yP-vN4"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padLeft" id="sg1-tR-fnw">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">0</string>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uoH-Hv-lNp">
+ <rect key="frame" x="143" y="19" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="xS2-KN-fds">
+ 
+ </stepperCell>
+ <accessibility description="Pad right"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="Liw-rE-s9k" id="B63-DW-wOQ">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="Liw-rE-s9k"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padRight" id="QDb-Kk-2BQ">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="zVm-0W-Jxg">
+ <rect key="frame" x="89" y="0.0" width="15" height="22"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" maxValue="20480" id="tcI-lL-sqJ">
+ 
+ </stepperCell>
+ <accessibility description="Pad bottom"/>
+ <connections>
+ <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="B3O-AZ-2ok" id="baO-u0-iqo">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled" keyPath="self.picture.customPadEnabled" id="B3O-AZ-2ok"/>
+ <binding destination="-2" name="value" keyPath="self.picture.padBottom" id="dab-Us-bui">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="height" constant="60" id="Cfe-bp-87s"/>
+ <constraint firstAttribute="width" constant="158" id="a0u-Rp-4fD"/>
+ </constraints>
+ </customView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="65d-Xd-JdE">
+ <rect key="frame" x="0.0" y="27" width="117" height="16"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="250" translatesAutoresizingMaskIntoConstraints="NO" id="kJM-a0-qcw">
+ <rect key="frame" x="-2" y="1" width="36" height="14"/>
+ <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" alignment="right" title="Color:" id="OCX-n7-THw">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="hpx-il-Wvu"/>
+ </connections>
+ </textField>
+ <popUpButton toolTip="Color of the border added around the video" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BjH-qa-mJM">
+ <rect key="frame" x="36" y="-4" width="85" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="Black" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="EM5-tR-x3U" id="5s0-hb-jQV">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="fl4-RH-rr1">
+ <items>
+ <menuItem title="Black" state="on" id="EM5-tR-x3U"/>
+ <menuItem title="Dark Gray" tag="1" id="pWs-NL-FVO"/>
+ <menuItem title="Gray" tag="2" id="K6n-ea-Zty"/>
+ <menuItem title="White" tag="3" id="fQM-vV-sUg"/>
+ <menuItem title="Custom" tag="4" id="vzz-ej-1nx"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="kJM-a0-qcw" id="1lJ-63-tbl"/>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="0dP-gX-cK8">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="selectedTag" keyPath="self.picture.padColorMode" id="N4L-g5-8Hw"/>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.padMode" previousBinding="0dP-gX-cK8" id="z6M-e9-xh3">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <textField toolTip="Custom border color" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aby-WS-tzS">
+ <rect key="frame" x="40" y="0.0" width="86" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="86" id="6fv-RG-oTt"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="dDb-IZ-euS">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Custom border color"/>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.picture.customPadColorEnabled" id="sJA-5B-OHR">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.padColorCustom" id="zjV-LV-ksP"/>
+ </connections>
+ </textField>
+ </subviews>
 <constraints>
- <constraint firstAttribute="width" constant="36" id="g6w-uS-3jp"/>
+ <constraint firstItem="OHL-2S-XXO" firstAttribute="leading" secondItem="omM-pe-wBc" secondAttribute="trailing" constant="8" id="h9O-n8-r22"/>
+ <constraint firstItem="aby-WS-tzS" firstAttribute="leading" secondItem="BjH-qa-mJM" secondAttribute="leading" id="hfo-Oq-tlg"/>
+ <constraint firstItem="omM-pe-wBc" firstAttribute="width" secondItem="kJM-a0-qcw" secondAttribute="width" id="zHE-aJ-LPo"/>
 </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XZs-gj-hoo">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F25-0x-6Ny">
+ <rect key="frame" x="20" y="27" width="508" height="41"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xWj-2Z-c5a">
+ <rect key="frame" x="-2" y="27" width="99" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Final Dimensions" id="Ux1-Pc-XSD">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
- <accessibility description="Crop left"/>
 <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="7NV-4H-eCu" id="oXG-X9-P7q">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="enabled" keyPath="self.picture.autocrop" id="7NV-4H-eCu">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.cropLeft" id="2fq-yE-LSA">
- <dictionary key="options">
- <string key="NSNullPlaceholder">0</string>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="5gd-3E-ShT"/>
 </connections>
 </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="16" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Wr1-bA-qVV">
+ <rect key="frame" x="0.0" y="0.0" width="508" height="19"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="3" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Tv-E1-W8A">
+ <rect key="frame" x="0.0" y="2" width="100" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ec5-Zy-ccd">
+ <rect key="frame" x="-2" y="0.0" width="74" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Storage Size:" id="kOg-k4-0N2">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="j0J-rF-MxS"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="749-LV-gA6">
+ <rect key="frame" x="71" y="0.0" width="31" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="0 x 0" id="c9F-IW-Rln">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.storageSize" id="ePc-i4-vPZ">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">-</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fzu-gf-GNJ">
+ <rect key="frame" x="116" y="0.0" width="286" height="19"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcB-TE-iFk">
+ <rect key="frame" x="-2" y="2" width="71" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Display Size:" id="WBD-tH-x3h">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="f4T-WF-ZSb"/>
+ </connections>
+ </textField>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FHJ-9w-6BA">
+ <rect key="frame" x="71" y="0.0" width="137" height="19"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ag1-Tk-hCm">
+ <rect key="frame" x="0.0" y="0.0" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="qca-mb-bKn"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="xla-nI-boO">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Vk7-cS-5iS"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Display width"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="WdY-WX-2we">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.displayWidth" id="QvD-YU-eyJ">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.keepAspectRatio" previousBinding="WdY-WX-2we" id="gMb-Mz-v3v">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <outlet property="nextKeyView" destination="jru-UG-Rf6" id="2PI-1U-54b"/>
+ </connections>
+ </textField>
+ <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jru-UG-Rf6">
+ <rect key="frame" x="56" y="-2" width="15" height="22"/>
+ <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="2" minValue="64" maxValue="20480" doubleValue="64" id="9gQ-W0-q4W">
+ 
+ </stepperCell>
+ <accessibility description="Display width"/>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="eX0-Np-IVz">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="enabled2" keyPath="self.picture.keepAspectRatio" previousBinding="eX0-Np-IVz" id="2fr-Fd-Ywe">
+ <dictionary key="options">
+ <integer key="NSMultipleValuesPlaceholder" value="-1"/>
+ <integer key="NSNoSelectionPlaceholder" value="-1"/>
+ <integer key="NSNotApplicablePlaceholder" value="-1"/>
+ <integer key="NSNullPlaceholder" value="-1"/>
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.displayWidth" id="TE4-wJ-dSs">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </stepper>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="E5O-kn-GYm">
+ <rect key="frame" x="71" y="3" width="10" height="14"/>
+ <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="C6R-PR-3gu">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description=" "/>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="YjI-CI-02L"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="751" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eEF-b3-4o9">
+ <rect key="frame" x="83" y="0.0" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="XAc-pJ-P2R"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="64t-lh-wQS">
+ <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="nbw-Gv-QSY"/>
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <accessibility description="Display height"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.displayHeight" id="aiv-VD-uF6">
+ <dictionary key="options">
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button toolTip="Changing the displays size will stretch the video" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tHu-FW-tzx">
+ <rect key="frame" x="211" y="1" width="75" height="16"/>
+ <buttonCell key="cell" type="check" title="Automatic" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="eOi-50-jLK">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.picture" id="Fgo-vH-aZx">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.picture.keepAspectRatio" id="nug-eI-33q"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kVA-lv-7eu">
+ <rect key="frame" x="418" y="2" width="90" height="14"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vnF-ty-KXF">
+ <rect key="frame" x="-2" y="0.0" width="74" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="Aspect Ratio:" id="5Vi-N9-9kM">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Fvh-Cn-IOT"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0C9-5A-hFI">
+ <rect key="frame" x="74" y="0.0" width="18" height="14"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" title="1:1" id="dnG-b9-LQR">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.picture.displayAspectRatio" id="2jg-kg-z9e">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">-</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
- <constraints>
- <constraint firstItem="LTu-ic-Ty9" firstAttribute="leading" secondItem="Bmd-c8-9hp" secondAttribute="trailing" constant="27" id="1CD-SF-3ne"/>
- <constraint firstAttribute="trailing" secondItem="Mke-9L-LvB" secondAttribute="trailing" constant="76" id="28v-SD-i5m"/>
- <constraint firstItem="Bmd-c8-9hp" firstAttribute="leading" secondItem="Mri-4y-8rX" secondAttribute="leading" constant="20" id="2og-D9-eRi"/>
- <constraint firstItem="Bmd-c8-9hp" firstAttribute="top" secondItem="RTr-3u-52l" secondAttribute="top" constant="2" id="3Rp-09-iy5"/>
- <constraint firstAttribute="bottom" secondItem="1Z0-JT-vst" secondAttribute="bottom" constant="24" id="3uz-Kd-oJj"/>
- <constraint firstItem="Mke-9L-LvB" firstAttribute="leading" secondItem="41c-48-2XJ" secondAttribute="trailing" constant="1" id="8t6-SC-3I7"/>
- <constraint firstItem="1Z0-JT-vst" firstAttribute="leading" secondItem="41c-48-2XJ" secondAttribute="leading" id="DL3-J2-q8X"/>
- <constraint firstItem="Mke-9L-LvB" firstAttribute="centerY" secondItem="41c-48-2XJ" secondAttribute="centerY" id="EBx-Hx-m7A"/>
- <constraint firstItem="6W6-RI-fBx" firstAttribute="leading" secondItem="1Z0-JT-vst" secondAttribute="trailing" constant="1" id="Ig6-np-JIv"/>
- <constraint firstItem="Ddg-4D-el9" firstAttribute="leading" secondItem="wsq-TS-cC6" secondAttribute="trailing" constant="1" id="JUM-DW-Ax2"/>
- <constraint firstAttribute="trailing" secondItem="RTr-3u-52l" secondAttribute="trailing" id="Kmh-ck-ddn"/>
- <constraint firstItem="1Z0-JT-vst" firstAttribute="top" secondItem="LTu-ic-Ty9" secondAttribute="bottom" constant="4" id="LcO-SU-clL"/>
- <constraint firstItem="LTu-ic-Ty9" firstAttribute="top" secondItem="41c-48-2XJ" secondAttribute="bottom" constant="4" id="Oeg-QA-EpY"/>
- <constraint firstItem="wsq-TS-cC6" firstAttribute="baseline" secondItem="LTu-ic-Ty9" secondAttribute="baseline" id="TSx-tN-5sz"/>
- <constraint firstItem="r9l-cH-pFW" firstAttribute="leading" secondItem="LTu-ic-Ty9" secondAttribute="trailing" constant="1" id="UdC-WZ-Oq7"/>
- <constraint firstItem="6W6-RI-fBx" firstAttribute="centerY" secondItem="1Z0-JT-vst" secondAttribute="centerY" id="WEw-3s-Bak"/>
- <constraint firstItem="RTr-3u-52l" firstAttribute="leading" secondItem="Bmd-c8-9hp" secondAttribute="trailing" constant="4" id="WMd-GK-erY"/>
- <constraint firstItem="wsq-TS-cC6" firstAttribute="leading" secondItem="r9l-cH-pFW" secondAttribute="trailing" constant="66" id="a57-oU-J2m"/>
- <constraint firstItem="41c-48-2XJ" firstAttribute="top" secondItem="RTr-3u-52l" secondAttribute="bottom" constant="7" id="cRS-oF-I8k"/>
- <constraint firstAttribute="trailing" secondItem="Ddg-4D-el9" secondAttribute="trailing" constant="20" id="nJp-9K-MPE"/>
- <constraint firstItem="Bmd-c8-9hp" firstAttribute="top" secondItem="Mri-4y-8rX" secondAttribute="top" constant="18" id="sgt-V6-NJP"/>
- <constraint firstItem="r9l-cH-pFW" firstAttribute="centerY" secondItem="LTu-ic-Ty9" secondAttribute="centerY" id="uPP-7j-B8i"/>
- <constraint firstItem="wsq-TS-cC6" firstAttribute="centerY" secondItem="Ddg-4D-el9" secondAttribute="centerY" id="vYN-3g-xVL"/>
- </constraints>
- <accessibility description="Cropping"/>
- </customView>
- <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LWv-Y9-b0S">
- <rect key="frame" x="98" y="246" width="54" height="19"/>
- <string key="toolTip">Display width. This is the number of pixels wide your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect.</string>
- <constraints>
- <constraint firstAttribute="width" constant="54" id="9Cw-j4-ab2"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XYg-xi-ExT">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="jW5-N6-2cB"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Display Width"/>
- <connections>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="IKb-wD-kbq"/>
- <binding destination="-2" name="value" keyPath="self.picture.displayWidth" id="j71-Y5-RpA"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="IKb-wD-kbq" id="S0y-AY-6DT">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <outlet property="nextKeyView" destination="JC3-5O-BXA" id="oN1-b9-dyt"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nQe-Vq-Og2">
- <rect key="frame" x="180" y="246" width="54" height="19"/>
- <string key="toolTip">Display height. This is the number of pixels tall your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect.</string>
- <constraints>
- <constraint firstAttribute="width" constant="54" id="oRF-SD-pEX"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="0ho-7Y-adD">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="gd7-JE-NQS"/>
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Display Height"/>
- <connections>
- <binding destination="-2" name="value" keyPath="self.picture.height" id="zm8-6D-NYY"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" id="8ix-ds-9fO">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <outlet property="nextKeyView" destination="JC3-5O-BXA" id="Ly3-4t-fIs"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JC3-5O-BXA">
- <rect key="frame" x="98" y="219" width="54" height="19"/>
- <string key="toolTip">Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback.</string>
- <constraints>
- <constraint firstAttribute="width" constant="54" id="SMO-4B-I1G"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="w99-9Y-YN4">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="ygx-uC-eb0"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Pixel Aspect Ration Numerator"/>
- <connections>
- <accessibilityConnection property="title" destination="vOY-Ix-eha" id="Gac-U9-X6e"/>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="IP2-ew-IdV"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="IP2-ew-IdV" id="lWR-hz-s9a">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.parWidth" id="GT0-y1-Tr0"/>
- <outlet property="nextKeyView" destination="rFi-0b-3BX" id="IBQ-5n-k0g"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="vOY-Ix-eha">
- <rect key="frame" x="18" y="222" width="74" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="PAR:" id="gVj-RG-PcL">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="VwV-bW-PBZ"/>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FwZ-6T-zJe">
- <rect key="frame" x="153" y="298" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="NP7-P2-Qga">
- 
- </stepperCell>
- <accessibility description="Storage Width"/>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="CiU-c8-Ky6">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxWidth" id="rzD-bT-FPn"/>
- <binding destination="-2" name="value" keyPath="self.picture.width" previousBinding="rzD-bT-FPn" id="0U8-Dc-QvL"/>
- <outlet property="nextKeyView" destination="Hkl-7Z-J2e" id="uHh-Lp-0GY"/>
- </connections>
- </stepper>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ns0-ar-I7c">
- <rect key="frame" x="95" y="156" width="56" height="22"/>
- <string key="toolTip">Ensure storage dimensions are multiples of this value. Higher values are only necessary for compatibility with certain legacy devices. Set to 2 unless you have a specific compatibility concern.</string>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="aED-d6-HLo"/>
- </constraints>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" id="H0L-sP-ky8">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="und-OA-MLn">
- <items>
- <menuItem title="16" id="uTT-yC-MFJ"/>
- <menuItem title="8" id="Lbl-i2-YJg"/>
- <menuItem title="4" id="MgF-Gw-0fD"/>
- <menuItem title="2" id="OWb-6v-ggg"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="tHY-g2-oWj" id="SpR-VQ-gX1"/>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="haa-fs-kQM">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="selectedValue" keyPath="self.picture.modulus" id="lCQ-i3-hQ0"/>
- </connections>
- </popUpButton>
- <textField verticalHuggingPriority="751" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9hH-As-JSa">
- <rect key="frame" x="98" y="300" width="56" height="19"/>
- <string key="toolTip">Video storage width. This is the number of pixels wide to be encoded. Storage width may differ from display width depending on anamorphic settings.</string>
- <constraints>
- <constraint firstAttribute="width" constant="56" id="ALR-s1-L2M"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="fVv-0N-MQB">
- <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="6jd-2b-RPM"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Storage Width"/>
- <connections>
- <accessibilityConnection property="title" destination="9oG-zm-Y0W" id="lTZ-u6-eUU"/>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="HGq-yI-bDz">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.width" id="Ws8-no-nOU">
- <dictionary key="options">
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- <outlet property="nextKeyView" destination="FwZ-6T-zJe" id="FVz-Ke-KDt"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="JBo-0E-AsU">
- <rect key="frame" x="18" y="187" width="74" height="14"/>
- <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Anamorphic:" id="8vS-Mw-bny">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="MVb-7T-IbY"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="uqQ-uA-3xF">
- <rect key="frame" x="173" y="303" width="10" height="14"/>
- <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="hN1-S9-zl8">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description=" "/>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="IVk-ye-fOe">
- <rect key="frame" x="161" y="249" width="10" height="14"/>
- <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="uuL-JR-73C">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="sKT-h2-mAF">
- <rect key="frame" x="161" y="222" width="10" height="14"/>
- <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="cNr-IZ-H9j">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="w1f-3S-up0">
- <rect key="frame" x="95" y="182" width="90" height="22"/>
- <string key="toolTip">Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.
-
-Off disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.
-
-Auto maximizes storage resolution while preserving the original display aspect ratio. Recommended.
-
-Loose is similar to Auto, but attempts to preserve the storage aspect ratio. This can result in a slight storage resolution loss compared to Auto.
-
-Custom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production.</string>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="84" id="avw-sh-hdv"/>
- </constraints>
- <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" inset="2" id="vx1-8S-fyc">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="qSV-uB-Iup">
- <items>
- <menuItem title="Off" id="1O3-th-4M5"/>
- <menuItem title="Auto" tag="4" id="JyN-AK-Hae"/>
- <menuItem title="Loose" tag="2" id="Uiw-Nb-u5X"/>
- <menuItem title="Custom" tag="3" id="f12-Dh-fDw"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="JBo-0E-AsU" id="b1p-96-aIC"/>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="RrW-07-vat">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="selectedTag" keyPath="self.picture.anamorphicMode" id="ugL-AX-WF2"/>
- </connections>
- </popUpButton>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="tHY-g2-oWj">
- <rect key="frame" x="18" y="161" width="74" height="14"/>
- <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Modulus:" id="jXn-fo-wNU">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="fh5-vf-5Tr"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="9oG-zm-Y0W">
- <rect key="frame" x="18" y="303" width="74" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Storage Size:" id="L7V-2e-qf9">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Epa-CR-f64"/>
- <outlet property="nextKeyView" destination="9hH-As-JSa" id="XO3-A3-WZr"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="251" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="hei-Cd-vcN">
- <rect key="frame" x="18" y="249" width="74" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Display Size:" id="SPg-s0-Oh0">
- 
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Ghz-q6-1Y1"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hkl-7Z-J2e">
- <rect key="frame" x="187" y="300" width="56" height="19"/>
- <string key="toolTip">Video storage height. This is the number of pixels tall to be encoded. Storage height may differ from display height depending on anamorphic settings.</string>
- <constraints>
- <constraint firstAttribute="width" constant="56" id="DlL-Br-Zgg"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="ZHl-Y5-C5P">
- <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Ts7-R5-Oye"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Storage Height"/>
- <connections>
- <accessibilityConnection property="title" destination="uqQ-uA-3xF" id="Cho-Kz-bXA"/>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="nha-oa-kQ8">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.height" id="SEV-F4-Swk">
- <dictionary key="options">
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- <outlet property="nextKeyView" destination="2s0-5k-fjU" id="D8H-ff-R52"/>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" preferredMaxLayoutWidth="200" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rFi-0b-3BX">
- <rect key="frame" x="180" y="219" width="54" height="19"/>
- <string key="toolTip">Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback.</string>
- <constraints>
- <constraint firstAttribute="width" constant="54" id="aaK-0g-Qkk"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="QSZ-2r-Ydl">
- <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Tzx-xq-0zo"/>
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <accessibility description="Pixel Aspect Ratio Denominator"/>
- <connections>
- <binding destination="-2" name="editable" keyPath="self.picture.customAnamorphicEnabled" id="BXi-rt-OOn"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspect" previousBinding="BXi-rt-OOn" id="c3e-8E-4E8">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.parHeight" id="Bwn-Hk-CGG"/>
- </connections>
- </textField>
- <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2s0-5k-fjU">
- <rect key="frame" x="242" y="298" width="15" height="22"/>
- <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="MwK-aS-Oaf">
- 
- </stepperCell>
- <accessibility description="Storage Height"/>
- <connections>
- <binding destination="-2" name="enabled" keyPath="self.picture" id="wcZ-Lg-5Y2">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.height" previousBinding="yUT-oM-ZsK" id="kln-nB-kei"/>
- <binding destination="-2" name="maxValue" keyPath="self.picture.maxHeight" id="yUT-oM-ZsK"/>
- </connections>
- </stepper>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="6G0-MW-iVa">
- <rect key="frame" x="95" y="278" width="119" height="18"/>
- <string key="toolTip">Keep Aspect Ratio maintains the original display aspect of the source. Disabling this may result in a stretched or squeezed picture.</string>
- <buttonCell key="cell" type="check" title="Keep Aspect Ratio" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="hcF-CZ-p0E">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="-2" name="enabled2" keyPath="self.picture" previousBinding="6Hg-VH-mTD" id="itG-f4-cLz">
- <dictionary key="options">
- <integer key="NSMultipleValuesPlaceholder" value="-1"/>
- <integer key="NSNoSelectionPlaceholder" value="-1"/>
- <integer key="NSNotApplicablePlaceholder" value="-1"/>
- <integer key="NSNullPlaceholder" value="-1"/>
- <string key="NSValueTransformerName">NSIsNotNil</string>
- </dictionary>
- </binding>
- <binding destination="-2" name="value" keyPath="self.picture.keepDisplayAspect" id="xNv-0O-F7Q"/>
- <binding destination="-2" name="enabled" keyPath="self.picture.keepDisplayAspectEditable" id="6Hg-VH-mTD"/>
- </connections>
- </button>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstItem="hei-Cd-vcN" firstAttribute="leading" secondItem="9oG-zm-Y0W" secondAttribute="leading" id="3w5-XP-fGc"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ns0-ar-I7c" secondAttribute="trailing" constant="20" symbolic="YES" id="4d7-AW-HE0"/>
- <constraint firstItem="IVk-ye-fOe" firstAttribute="leading" secondItem="LWv-Y9-b0S" secondAttribute="trailing" constant="11" id="5CN-RX-tbh"/>
- <constraint firstItem="FwZ-6T-zJe" firstAttribute="centerY" secondItem="uqQ-uA-3xF" secondAttribute="centerY" id="5Xb-UM-UVq"/>
- <constraint firstItem="Mri-4y-8rX" firstAttribute="leading" secondItem="2s0-5k-fjU" secondAttribute="trailing" constant="41" id="7Fu-rw-NQ5"/>
- <constraint firstItem="w1f-3S-up0" firstAttribute="leading" secondItem="JBo-0E-AsU" secondAttribute="trailing" constant="8" id="7Ui-hg-NUd"/>
- <constraint firstItem="9oG-zm-Y0W" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="8y0-eK-p1d"/>
- <constraint firstItem="nQe-Vq-Og2" firstAttribute="baseline" secondItem="IVk-ye-fOe" secondAttribute="baseline" id="A1k-oZ-jxT"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Mri-4y-8rX" secondAttribute="trailing" constant="20" symbolic="YES" id="A8h-Xo-Yf7"/>
- <constraint firstItem="vOY-Ix-eha" firstAttribute="baseline" secondItem="JC3-5O-BXA" secondAttribute="baseline" id="AHl-Mc-RL4"/>
- <constraint firstItem="vOY-Ix-eha" firstAttribute="leading" secondItem="hei-Cd-vcN" secondAttribute="leading" id="CAl-vA-hzG"/>
- <constraint firstItem="hei-Cd-vcN" firstAttribute="width" secondItem="9oG-zm-Y0W" secondAttribute="width" id="CnQ-29-ukc"/>
- <constraint firstItem="ns0-ar-I7c" firstAttribute="top" secondItem="w1f-3S-up0" secondAttribute="bottom" constant="8" id="D8p-hR-m8g"/>
- <constraint firstItem="rFi-0b-3BX" firstAttribute="baseline" secondItem="sKT-h2-mAF" secondAttribute="baseline" id="Ddc-yP-13V"/>
- <constraint firstItem="9oG-zm-Y0W" firstAttribute="baseline" secondItem="9hH-As-JSa" secondAttribute="baseline" id="FuM-gJ-Ws1"/>
- <constraint firstItem="LWv-Y9-b0S" firstAttribute="leading" secondItem="hei-Cd-vcN" secondAttribute="trailing" constant="8" id="JgQ-R2-S4d"/>
- <constraint firstItem="sKT-h2-mAF" firstAttribute="leading" secondItem="JC3-5O-BXA" secondAttribute="trailing" constant="11" id="L9V-AS-0qe"/>
- <constraint firstItem="uqQ-uA-3xF" firstAttribute="baseline" secondItem="Hkl-7Z-J2e" secondAttribute="baseline" id="LO9-aK-AVh"/>
- <constraint firstItem="FwZ-6T-zJe" firstAttribute="centerY" secondItem="9hH-As-JSa" secondAttribute="centerY" id="OPq-WV-0rN"/>
- <constraint firstItem="LWv-Y9-b0S" firstAttribute="baseline" secondItem="IVk-ye-fOe" secondAttribute="baseline" id="OtX-mc-oar"/>
- <constraint firstItem="6G0-MW-iVa" firstAttribute="top" secondItem="9hH-As-JSa" secondAttribute="bottom" constant="7" id="PvA-DS-muN"/>
- <constraint firstItem="ns0-ar-I7c" firstAttribute="leading" secondItem="tHY-g2-oWj" secondAttribute="trailing" constant="8" id="QVv-qJ-Ofs"/>
- <constraint firstItem="tHY-g2-oWj" firstAttribute="leading" secondItem="JBo-0E-AsU" secondAttribute="leading" id="UN8-rQ-FOt"/>
- <constraint firstItem="nQe-Vq-Og2" firstAttribute="leading" secondItem="IVk-ye-fOe" secondAttribute="trailing" constant="11" id="W1D-bO-dgc"/>
- <constraint firstItem="hei-Cd-vcN" firstAttribute="baseline" secondItem="LWv-Y9-b0S" secondAttribute="baseline" id="W4D-1v-rYx"/>
- <constraint firstItem="JBo-0E-AsU" firstAttribute="leading" secondItem="vOY-Ix-eha" secondAttribute="leading" id="WxP-rx-Z3C"/>
- <constraint firstItem="Mri-4y-8rX" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="6G0-MW-iVa" secondAttribute="trailing" constant="8" symbolic="YES" id="XHg-AE-MAw"/>
- <constraint firstItem="JBo-0E-AsU" firstAttribute="baseline" secondItem="w1f-3S-up0" secondAttribute="baseline" id="XjT-JQ-Ydo"/>
- <constraint firstItem="LWv-Y9-b0S" firstAttribute="top" secondItem="6G0-MW-iVa" secondAttribute="bottom" constant="16" id="Y9M-iu-Gn4"/>
- <constraint firstItem="JBo-0E-AsU" firstAttribute="width" secondItem="vOY-Ix-eha" secondAttribute="width" id="YQF-rZ-wB0"/>
- <constraint firstItem="vOY-Ix-eha" firstAttribute="width" secondItem="hei-Cd-vcN" secondAttribute="width" id="ZE9-sd-nm4"/>
- <constraint firstItem="tHY-g2-oWj" firstAttribute="width" secondItem="JBo-0E-AsU" secondAttribute="width" id="bfA-bN-xmc"/>
- <constraint firstItem="Mri-4y-8rX" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="-4" id="cwh-LP-c8Z"/>
- <constraint firstItem="w1f-3S-up0" firstAttribute="top" secondItem="JC3-5O-BXA" secondAttribute="bottom" constant="16" id="d8Q-sV-Al9"/>
- <constraint firstItem="JC3-5O-BXA" firstAttribute="leading" secondItem="vOY-Ix-eha" secondAttribute="trailing" constant="8" id="fde-NK-LLZ"/>
- <constraint firstItem="Hkl-7Z-J2e" firstAttribute="leading" secondItem="uqQ-uA-3xF" secondAttribute="trailing" constant="6" id="gkW-Lu-BH7"/>
- <constraint firstItem="6G0-MW-iVa" firstAttribute="leading" secondItem="9hH-As-JSa" secondAttribute="leading" id="gyR-Lu-st4"/>
- <constraint firstItem="JC3-5O-BXA" firstAttribute="top" secondItem="LWv-Y9-b0S" secondAttribute="bottom" constant="8" id="gzL-GN-orP"/>
- <constraint firstItem="uqQ-uA-3xF" firstAttribute="leading" secondItem="FwZ-6T-zJe" secondAttribute="trailing" constant="9" id="hir-dB-x3n"/>
- <constraint firstItem="tHY-g2-oWj" firstAttribute="baseline" secondItem="ns0-ar-I7c" secondAttribute="baseline" id="jqR-W6-d9k"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="w1f-3S-up0" secondAttribute="trailing" constant="20" symbolic="YES" id="rHw-Bp-bfe"/>
- <constraint firstItem="JC3-5O-BXA" firstAttribute="baseline" secondItem="sKT-h2-mAF" secondAttribute="baseline" id="rhM-x4-rx4"/>
- <constraint firstItem="2s0-5k-fjU" firstAttribute="centerY" secondItem="Hkl-7Z-J2e" secondAttribute="centerY" id="usl-bK-BhB"/>
- <constraint firstItem="rFi-0b-3BX" firstAttribute="leading" secondItem="sKT-h2-mAF" secondAttribute="trailing" constant="11" id="v5K-aK-eKg"/>
- <constraint firstItem="9hH-As-JSa" firstAttribute="leading" secondItem="9oG-zm-Y0W" secondAttribute="trailing" constant="8" id="vkW-yC-lfd"/>
- <constraint firstItem="9oG-zm-Y0W" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="18" id="vuz-LJ-1fi"/>
- <constraint firstItem="FwZ-6T-zJe" firstAttribute="leading" secondItem="9hH-As-JSa" secondAttribute="trailing" constant="1" id="xqZ-an-1yf"/>
- <constraint firstItem="2s0-5k-fjU" firstAttribute="leading" secondItem="Hkl-7Z-J2e" secondAttribute="trailing" constant="1" id="zKn-1Z-8Ea"/>
+ <constraint firstItem="OFE-0G-Zqz" firstAttribute="top" secondItem="P5q-5e-xlx" secondAttribute="bottom" constant="20" id="4kr-AG-ZBf"/>
+ <constraint firstItem="F25-0x-6Ny" firstAttribute="top" secondItem="OFE-0G-Zqz" secondAttribute="bottom" constant="20" id="A7a-6c-BcB"/>
+ <constraint firstItem="P5q-5e-xlx" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="Agb-r4-XDh"/>
+ <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="F25-0x-6Ny" secondAttribute="bottom" constant="20" id="EgU-o8-5Ft"/>
+ <constraint firstItem="F25-0x-6Ny" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="KwO-RI-iDs"/>
+ <constraint firstItem="OFE-0G-Zqz" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="SP3-l7-QPV"/>
+ <constraint firstItem="P5q-5e-xlx" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="16" id="SR8-ag-lX0"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="OFE-0G-Zqz" secondAttribute="trailing" constant="20" symbolic="YES" id="gdQ-9j-1VW"/>
 </constraints>
 <connections>
 <outlet property="nextKeyView" destination="9oG-zm-Y0W" id="qo2-0g-l82"/>
 </connections>
- <point key="canvasLocation" x="152.5" y="-52.5"/>
+ <point key="canvasLocation" x="-358" y="-237.5"/>
 </customView>
- <userDefaultsController representsSharedInstance="YES" id="UZ0-eg-oV8"/>
 </objects>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBPlayerHUDController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBPlayerHUDController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.55" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.55"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -10,7 +10,7 @@
 <connections>
 <outlet property="currentTimeLabel" destination="uYx-2C-8et" id="8fD-0Q-308"/>
 <outlet property="playButton" destination="mLA-ei-4sK" id="Eag-8h-xCG"/>
- <outlet property="remaingTimeLabel" destination="PVD-pq-1ZG" id="CFb-is-Tcd"/>
+ <outlet property="remainingTimeLabel" destination="PVD-pq-1ZG" id="v4Q-DM-8bq"/>
 <outlet property="slider" destination="lBp-JT-ehn" id="cNv-P0-agY"/>
 <outlet property="tracksSelection" destination="Vj1-Za-AUV" id="8Se-0H-ILD"/>
 <outlet property="view" destination="xT7-Bx-eCV" id="GXR-ZH-hT6"/>
@@ -20,11 +20,11 @@
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
 <customView hidden="YES" id="xT7-Bx-eCV" userLabel="Playback Controls" customClass="HBHUDView">
- <rect key="frame" x="0.0" y="0.0" width="476" height="100"/>
+ <rect key="frame" x="0.0" y="0.0" width="476" height="96"/>
 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
 <subviews>
 <slider toolTip="Drag to change timeline position." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lBp-JT-ehn">
- <rect key="frame" x="69" y="20" width="338" height="15"/>
+ <rect key="frame" x="67" y="13" width="342" height="20"/>
 <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="100" tickMarkPosition="above" sliderType="linear" id="mMk-re-3u5"/>
 <accessibility description="Timeline"/>
 <connections>
@@ -32,7 +32,7 @@
 </connections>
 </slider>
 <button toolTip="Toggle Play/Pause" translatesAutoresizingMaskIntoConstraints="NO" id="mLA-ei-4sK">
- <rect key="frame" x="212" y="46" width="36" height="36"/>
+ <rect key="frame" x="212" y="42" width="36" height="36"/>
 <constraints>
 <constraint firstAttribute="height" constant="36" id="X8s-nz-Azm"/>
 <constraint firstAttribute="width" constant="36" id="mCt-hw-6Cl"/>
@@ -47,7 +47,7 @@
 </connections>
 </button>
 <button toolTip="Go To Beginning" translatesAutoresizingMaskIntoConstraints="NO" id="WuP-9l-8AN">
- <rect key="frame" x="170" y="51" width="32" height="26"/>
+ <rect key="frame" x="170" y="47" width="32" height="26"/>
 <constraints>
 <constraint firstAttribute="height" constant="26" id="LYj-zA-LDX"/>
 <constraint firstAttribute="width" constant="32" id="uKO-gw-ffy"/>
@@ -62,7 +62,7 @@
 </connections>
 </button>
 <button toolTip="Go To End" translatesAutoresizingMaskIntoConstraints="NO" id="CQ0-pk-SFk">
- <rect key="frame" x="258" y="51" width="32" height="26"/>
+ <rect key="frame" x="258" y="47" width="32" height="26"/>
 <constraints>
 <constraint firstAttribute="height" constant="26" id="QM8-Iv-2Dj"/>
 <constraint firstAttribute="width" constant="32" id="phm-QW-jOq"/>
@@ -77,7 +77,7 @@
 </connections>
 </button>
 <textField toolTip="Time remaining." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="PVD-pq-1ZG">
- <rect key="frame" x="413" y="20" width="53" height="14"/>
+ <rect key="frame" x="413" y="16" width="53" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="00:00:00" id="6A0-9h-5UY">
 
 <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -86,7 +86,7 @@
 <accessibility description="Time Remaining"/>
 </textField>
 <textField toolTip="Current timeline position." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="uYx-2C-8et">
- <rect key="frame" x="10" y="20" width="53" height="14"/>
+ <rect key="frame" x="10" y="16" width="53" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="00:00:00" id="dGi-LK-P1E">
 
 <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -95,7 +95,7 @@
 <accessibility description="Current Timeline Position"/>
 </textField>
 <slider toolTip="Drag to change volume." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gzA-no-jdv">
- <rect key="frame" x="34" y="57" width="65" height="15"/>
+ <rect key="frame" x="32" y="50" width="69" height="20"/>
 <constraints>
 <constraint firstAttribute="width" constant="65" id="bu2-Fj-XwN"/>
 </constraints>
@@ -106,7 +106,7 @@
 </connections>
 </slider>
 <button toolTip="Exit player and return to still image previews." translatesAutoresizingMaskIntoConstraints="NO" id="84p-08-fGK" userLabel="Stop Button">
- <rect key="frame" x="426" y="56" width="30" height="15"/>
+ <rect key="frame" x="436" y="50" width="20" height="20"/>
 <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="hWC-BU-ynp">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -117,7 +117,7 @@
 </connections>
 </button>
 <button toolTip="Mute Volume" translatesAutoresizingMaskIntoConstraints="NO" id="euL-Tg-dmT">
- <rect key="frame" x="12" y="55" width="18" height="18"/>
+ <rect key="frame" x="12" y="51" width="18" height="18"/>
 <constraints>
 <constraint firstAttribute="width" constant="18" id="T8H-oI-ZPM"/>
 <constraint firstAttribute="height" constant="18" id="gbJ-wm-eO2"/>
@@ -132,7 +132,7 @@
 </connections>
 </button>
 <button toolTip="Full Volume" translatesAutoresizingMaskIntoConstraints="NO" id="Kiv-cL-wYI">
- <rect key="frame" x="103" y="55" width="18" height="18"/>
+ <rect key="frame" x="103" y="51" width="18" height="18"/>
 <constraints>
 <constraint firstAttribute="width" constant="18" id="BMZ-v1-tgu"/>
 <constraint firstAttribute="height" constant="18" id="kB7-1B-FDd"/>
@@ -147,9 +147,9 @@
 </connections>
 </button>
 <popUpButton toolTip="Enable or disable tracks." translatesAutoresizingMaskIntoConstraints="NO" id="Vj1-Za-AUV">
- <rect key="frame" x="335" y="53" width="74" height="20"/>
+ <rect key="frame" x="334" y="48" width="86" height="22"/>
 <constraints>
- <constraint firstAttribute="width" constant="68" id="5FX-cP-Cps"/>
+ <constraint firstAttribute="width" constant="78" id="5FX-cP-Cps"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" title="Tracks" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="1" imageScaling="proportionallyDown" inset="2" pullsDown="YES" autoenablesItems="NO" altersStateOfSelectedItem="NO" id="uwd-kr-YUM">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -170,10 +170,9 @@
 <constraint firstItem="mLA-ei-4sK" firstAttribute="centerY" secondItem="CQ0-pk-SFk" secondAttribute="centerY" id="5iK-al-YML"/>
 <constraint firstAttribute="trailing" secondItem="PVD-pq-1ZG" secondAttribute="trailing" constant="12" id="6dk-cb-v2e"/>
 <constraint firstItem="WuP-9l-8AN" firstAttribute="leading" secondItem="Kiv-cL-wYI" secondAttribute="trailing" constant="49" id="79A-5g-U7Q"/>
- <constraint firstAttribute="bottom" secondItem="PVD-pq-1ZG" secondAttribute="bottom" constant="20" id="9cE-Nk-kcB"/>
+ <constraint firstAttribute="bottom" secondItem="PVD-pq-1ZG" secondAttribute="bottom" constant="16" id="9cE-Nk-kcB"/>
 <constraint firstItem="uYx-2C-8et" firstAttribute="leading" secondItem="xT7-Bx-eCV" secondAttribute="leading" constant="12" id="EmN-mc-qMr"/>
 <constraint firstItem="lBp-JT-ehn" firstAttribute="leading" secondItem="uYx-2C-8et" secondAttribute="trailing" constant="8" id="Grx-ac-rC2"/>
- <constraint firstItem="84p-08-fGK" firstAttribute="firstBaseline" secondItem="Vj1-Za-AUV" secondAttribute="firstBaseline" id="H0w-KP-ye3"/>
 <constraint firstItem="euL-Tg-dmT" firstAttribute="centerY" secondItem="gzA-no-jdv" secondAttribute="centerY" id="HTx-V5-2xM"/>
 <constraint firstItem="euL-Tg-dmT" firstAttribute="top" secondItem="xT7-Bx-eCV" secondAttribute="top" constant="27" id="K07-g0-aA4"/>
 <constraint firstItem="Vj1-Za-AUV" firstAttribute="leading" secondItem="CQ0-pk-SFk" secondAttribute="trailing" constant="48" id="KlG-3j-Fev"/>
@@ -186,9 +185,10 @@
 <constraint firstItem="CQ0-pk-SFk" firstAttribute="centerY" secondItem="Vj1-Za-AUV" secondAttribute="centerY" id="fcb-yb-zym"/>
 <constraint firstItem="CQ0-pk-SFk" firstAttribute="leading" secondItem="mLA-ei-4sK" secondAttribute="trailing" constant="10" id="fnn-T8-f6u"/>
 <constraint firstItem="gzA-no-jdv" firstAttribute="centerY" secondItem="Kiv-cL-wYI" secondAttribute="centerY" id="ipl-TU-6il"/>
- <constraint firstAttribute="bottom" secondItem="uYx-2C-8et" secondAttribute="bottom" constant="20" id="lVk-4b-i7C"/>
+ <constraint firstAttribute="bottom" secondItem="uYx-2C-8et" secondAttribute="bottom" constant="16" id="lVk-4b-i7C"/>
 <constraint firstItem="84p-08-fGK" firstAttribute="leading" secondItem="Vj1-Za-AUV" secondAttribute="trailing" constant="20" id="leh-vT-GXl"/>
 <constraint firstItem="Kiv-cL-wYI" firstAttribute="leading" secondItem="gzA-no-jdv" secondAttribute="trailing" constant="4" id="n5u-wZ-juV"/>
+ <constraint firstItem="84p-08-fGK" firstAttribute="centerY" secondItem="Vj1-Za-AUV" secondAttribute="centerY" id="pdv-6D-Oqe"/>
 <constraint firstItem="84p-08-fGK" firstAttribute="top" secondItem="xT7-Bx-eCV" secondAttribute="top" constant="29" id="skk-2D-f35"/>
 <constraint firstItem="gzA-no-jdv" firstAttribute="leading" secondItem="euL-Tg-dmT" secondAttribute="trailing" constant="4" id="vyV-Ai-ba8"/>
 <constraint firstItem="euL-Tg-dmT" firstAttribute="leading" secondItem="xT7-Bx-eCV" secondAttribute="leading" constant="12" id="z5G-Dw-ebP"/>
@@ -197,7 +197,7 @@
 </customView>
 </objects>
 <resources>
- <image name="NSStopProgressFreestandingTemplate" width="14" height="14"/>
+ <image name="NSStopProgressFreestandingTemplate" width="15" height="15"/>
 <image name="NextTemplate" width="48" height="48"/>
 <image name="PlayTemplate" width="48" height="48"/>
 <image name="PrevTemplate" width="48" height="48"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBQueueInfoViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBQueueInfoViewController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19158" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19158"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -22,18 +22,19 @@
 <rect key="frame" x="0.0" y="0.0" width="488" height="335"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Z14-gh-hWn">
- <rect key="frame" x="420" y="3" width="64" height="32"/>
+ <button toolTip="Open the job in the main window for editing" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Z14-gh-hWn">
+ <rect key="frame" x="427" y="3" width="58" height="32"/>
 <buttonCell key="cell" type="push" title="Edit" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="erY-5X-50l">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
 </buttonCell>
 <connections>
 <action selector="editItem:" target="-2" id="ozj-G7-6d5"/>
+ <binding destination="-2" name="enabled" keyPath="self.canEdit" id="nuW-8z-gyx"/>
 </connections>
 </button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oq4-g0-srt">
- <rect key="frame" x="348" y="3" width="75" height="32"/>
+ <button toolTip="Reset the job state" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oq4-g0-srt">
+ <rect key="frame" x="363" y="3" width="69" height="32"/>
 <buttonCell key="cell" type="push" title="Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="hgl-N3-x4S">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -44,13 +45,13 @@
 </connections>
 </button>
 <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MXt-Cb-20x">
- <rect key="frame" x="0.0" y="39" width="488" height="296"/>
+ <rect key="frame" x="0.0" y="38" width="488" height="297"/>
 <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="kkx-XF-sYr" customClass="HBFlippedClipView">
- <rect key="frame" x="0.0" y="0.0" width="488" height="296"/>
+ <rect key="frame" x="0.0" y="0.0" width="488" height="297"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <view translatesAutoresizingMaskIntoConstraints="NO" id="Akt-r1-6fP">
- <rect key="frame" x="0.0" y="200" width="488" height="96"/>
+ <rect key="frame" x="0.0" y="201" width="488" height="96"/>
 <subviews>
 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="250" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VVC-g8-nGU">
 <rect key="frame" x="12" y="8" width="464" height="80"/>
@@ -160,7 +161,7 @@
 </scroller>
 </scrollView>
 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="gAc-tj-J9f">
- <rect key="frame" x="0.0" y="36" width="488" height="5"/>
+ <rect key="frame" x="0.0" y="35" width="488" height="5"/>
 </box>
 </subviews>
 <constraints>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBQueueTableViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBQueueTableViewController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19455" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19455"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -24,16 +24,15 @@
 <rect key="frame" x="1" y="1" width="543" height="150"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" columnSelection="YES" autosaveColumns="NO" rowHeight="22" viewBased="YES" id="VV7-t7-Ufd" customClass="HBTableView">
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" tableStyle="plain" alternatingRowBackgroundColors="YES" autosaveColumns="NO" rowHeight="22" viewBased="YES" id="VV7-t7-Ufd" customClass="HBTableView">
 <rect key="frame" x="0.0" y="0.0" width="543" height="150"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
 <tableColumn width="540" minWidth="40" maxWidth="3000" id="QfC-OR-ahq">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -71,7 +70,7 @@
 </buttonCell>
 </button>
 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="7OO-Ut-UrC">
- <rect key="frame" x="3" y="35" width="16" height="16"/>
+ <rect key="frame" x="3" y="32" width="16" height="22"/>
 <constraints>
 <constraint firstAttribute="height" constant="16" id="V3u-Yw-S0G"/>
 <constraint firstAttribute="width" constant="16" id="dDq-xC-fYL"/>
@@ -141,7 +140,7 @@
 </buttonCell>
 </button>
 <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kNw-fy-iYB">
- <rect key="frame" x="3" y="3" width="16" height="16"/>
+ <rect key="frame" x="3" y="0.0" width="16" height="22"/>
 <constraints>
 <constraint firstAttribute="width" constant="16" id="Sg7-eg-u2l"/>
 <constraint firstAttribute="height" constant="16" id="udI-Cr-8CG"/>
@@ -247,6 +246,19 @@
 <action selector="removeCompleted:" target="-2" id="nUM-Me-Fr2"/>
 </connections>
 </menuItem>
+ <menuItem isSeparatorItem="YES" id="gAB-qh-tsQ"/>
+ <menuItem title="Move to Bottom" id="HwR-LP-IK8">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="moveSelectedQueueItemsToBottom:" target="-2" id="YLg-ZK-de9"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Move to Top" id="NN5-Yq-Cth">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="moveSelectedQueueItemsToTop:" target="-2" id="6GU-to-Keg"/>
+ </connections>
+ </menuItem>
 </items>
 <point key="canvasLocation" x="-152" y="642"/>
 </menu>
@@ -254,6 +266,6 @@
 <resources>
 <image name="Delete" width="16" height="16"/>
 <image name="DeleteHighlightPressed" width="16" height="16"/>
- <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
 </resources>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBSummaryViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBSummaryViewController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.68" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.68"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -18,23 +18,23 @@
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
 <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="883" height="366"/>
+ <rect key="frame" x="0.0" y="0.0" width="883" height="367"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
 <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="V6l-Pf-x6b">
 <rect key="frame" x="20" y="18" width="843" height="334"/>
 <subviews>
 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="13" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ksS-7u-OU5">
- <rect key="frame" x="0.0" y="181" width="259" height="153"/>
+ <rect key="frame" x="0.0" y="157" width="259" height="177"/>
 <subviews>
 <stackView distribution="fill" orientation="vertical" alignment="trailing" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="t30-II-1w2">
- <rect key="frame" x="0.0" y="81" width="189" height="72"/>
+ <rect key="frame" x="0.0" y="81" width="218" height="96"/>
 <subviews>
 <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vuy-Er-bln">
- <rect key="frame" x="0.0" y="54" width="189" height="18"/>
+ <rect key="frame" x="0.0" y="80" width="218" height="16"/>
 <subviews>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bpr-UY-4al" userLabel="Format">
- <rect key="frame" x="-2" y="2" width="45" height="14"/>
+ <rect key="frame" x="-2" y="1" width="45" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Format:" id="RXJ-DZ-4mh">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -45,7 +45,7 @@
 </connections>
 </textField>
 <popUpButton toolTip="Container format. Video, audio, and other tracks are combined into a single file of this type. Affects compatibility." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="txV-1R-WoD">
- <rect key="frame" x="46" y="-3" width="146" height="22"/>
+ <rect key="frame" x="45" y="-4" width="177" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="em9-IL-zmS"/>
 </constraints>
@@ -84,10 +84,25 @@
 </customSpacing>
 </stackView>
 <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="M1l-8s-m3Z">
- <rect key="frame" x="49" y="0.0" width="140" height="48"/>
+ <rect key="frame" x="49" y="0.0" width="169" height="74"/>
 <subviews>
+ <button toolTip="Copy metadata from source to output" translatesAutoresizingMaskIntoConstraints="NO" id="eJx-BO-rhL" userLabel="Passthru Metadata">
+ <rect key="frame" x="-1" y="59" width="170" height="16"/>
+ <buttonCell key="cell" type="check" title="Passthru Common Metadata" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="CZZ-bW-jZc">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.job" id="65Y-RB-cvj">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.job.metadataPassthru" id="gB5-R3-zaI"/>
+ </connections>
+ </button>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="lUi-Oc-208">
- <rect key="frame" x="-3" y="33" width="103" height="18"/>
+ <rect key="frame" x="-1" y="39" width="102" height="16"/>
 <string key="toolTip">Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file.</string>
 <buttonCell key="cell" type="check" title="Web Optimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="wcc-5d-Dgj">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -108,7 +123,7 @@
 </connections>
 </button>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="fPv-Vw-I89">
- <rect key="frame" x="-3" y="15" width="100" height="18"/>
+ <rect key="frame" x="-1" y="19" width="98" height="16"/>
 <string key="toolTip">Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists.</string>
 <buttonCell key="cell" type="check" title="Align A/V Start" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="De0-Je-MAm">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -129,7 +144,7 @@
 </connections>
 </button>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="QKv-GR-d2g">
- <rect key="frame" x="-3" y="-3" width="109" height="18"/>
+ <rect key="frame" x="-1" y="-1" width="108" height="16"/>
 <string key="toolTip">Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility.</string>
 <buttonCell key="cell" type="check" title="iPod 5G Support" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="zz5-qY-GSA">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -154,19 +169,14 @@
 <integer value="1000"/>
 <integer value="1000"/>
 <integer value="1000"/>
+ <integer value="1000"/>
 </visibilityPriorities>
 <customSpacing>
 <real value="3.4028234663852886e+38"/>
 <real value="3.4028234663852886e+38"/>
 <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
 </customSpacing>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.job.mp4OptionsEnabled" id="Boc-dA-C5S">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
 </stackView>
 </subviews>
 <constraints>
@@ -195,7 +205,7 @@
 <binding destination="-2" name="textColor" keyPath="self.labelColor" id="oGS-ya-5m8"/>
 </connections>
 </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="yRE-5c-FhX">
+ <textField horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="yRE-5c-FhX">
 <rect key="frame" x="47" y="0.0" width="214" height="14"/>
 <constraints>
 <constraint firstAttribute="width" constant="210" id="gqV-xA-TUl"/>
@@ -234,7 +244,7 @@
 <binding destination="-2" name="textColor" keyPath="self.labelColor" id="Y59-Gp-EZi"/>
 </connections>
 </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="BHq-Mt-3eA">
+ <textField horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="BHq-Mt-3eA">
 <rect key="frame" x="47" y="0.0" width="214" height="14"/>
 <textFieldCell key="cell" controlSize="mini" selectable="YES" sendsActionOnEndEditing="YES" title="None" id="RIB-ME-Yhh">
 
@@ -270,7 +280,7 @@
 <binding destination="-2" name="textColor" keyPath="self.labelColor" id="EMw-0U-JBu"/>
 </connections>
 </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Jaw-pH-rhf">
+ <textField horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Jaw-pH-rhf">
 <rect key="frame" x="47" y="0.0" width="214" height="14"/>
 <textFieldCell key="cell" controlSize="mini" selectable="YES" sendsActionOnEndEditing="YES" title="None" id="xmy-Jl-mR4">
 
@@ -332,9 +342,32 @@
 <constraint firstAttribute="bottom" secondItem="V6l-Pf-x6b" secondAttribute="bottom" constant="18" id="7oG-cF-ubM"/>
 <constraint firstAttribute="trailing" secondItem="V6l-Pf-x6b" secondAttribute="trailing" constant="20" id="Tjh-em-eBh"/>
 <constraint firstItem="V6l-Pf-x6b" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="XPg-bY-4Pm"/>
- <constraint firstItem="V6l-Pf-x6b" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="14" id="YMe-A4-2v9"/>
+ <constraint firstItem="V6l-Pf-x6b" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="15" id="YMe-A4-2v9"/>
 </constraints>
 <point key="canvasLocation" x="-88.5" y="-145"/>
 </customView>
+ <button id="JNB-kV-52S">
+ <rect key="frame" x="0.0" y="0.0" width="102" height="16"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <string key="toolTip">Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file.</string>
+ <buttonCell key="cell" type="check" title="Web Optimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="ma8-UR-dx2">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="enabled" keyPath="self.job" id="GM1-ep-4mM">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="value" keyPath="self.job.mp4HttpOptimize" id="oQw-Gl-n8O"/>
+ <binding destination="-2" name="hidden" keyPath="self.job.mp4OptionsEnabled" previousBinding="GM1-ep-4mM" id="JOB-2s-UOH">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ <point key="canvasLocation" x="-211" y="-402"/>
+ </button>
 </objects>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBTitleSelection.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBTitleSelection.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -23,9 +23,9 @@
 <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
 <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
 <rect key="contentRect" x="196" y="240" width="554" height="250"/>
- <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
 <value key="minSize" type="size" width="300" height="200"/>
- <view key="contentView" id="se5-gp-TjO">
+ <view key="contentView" misplaced="YES" id="se5-gp-TjO">
 <rect key="frame" x="0.0" y="0.0" width="554" height="250"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
@@ -45,7 +45,7 @@
 </connections>
 </textField>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="TFh-c7-W2w">
- <rect key="frame" x="477" y="14" width="62" height="28"/>
+ <rect key="frame" x="476" y="13" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Add" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mOe-XL-tl1">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -58,14 +58,14 @@
 </connections>
 </button>
 <scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="10" verticalLineScroll="18" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a1K-L9-fU9">
- <rect key="frame" x="20" y="57" width="514" height="151"/>
+ <rect key="frame" x="20" y="55" width="514" height="153"/>
 <clipView key="contentView" id="dTc-E7-D15">
- <rect key="frame" x="1" y="0.0" width="512" height="150"/>
+ <rect key="frame" x="1" y="1" width="512" height="151"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" autosaveName="HBTitleSelectionTable" rowHeight="14" headerView="sEp-Wn-EWq" viewBased="YES" floatsGroupRows="NO" id="wM9-Ln-dr0">
- <rect key="frame" x="0.0" y="0.0" width="512" height="127"/>
- <autoresizingMask key="autoresizingMask"/>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" alternatingRowBackgroundColors="YES" columnReordering="NO" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" autosaveName="HBTitleSelectionTable" rowHeight="14" headerView="sEp-Wn-EWq" viewBased="YES" floatsGroupRows="NO" id="wM9-Ln-dr0">
+ <rect key="frame" x="0.0" y="0.0" width="512" height="128"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="4"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <tableViewGridLines key="gridStyleMask" vertical="YES"/>
@@ -73,7 +73,6 @@
 <tableColumns>
 <tableColumn identifier="index" width="40" minWidth="40" maxWidth="40" id="4XY-C0-SwE">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right" title="Title">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -120,7 +119,6 @@
 </tableColumn>
 <tableColumn identifier="title" width="373" minWidth="40" maxWidth="2000" id="FQY-Ye-g0f">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Name">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -136,7 +134,7 @@
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="LSj-el-4SZ">
- <rect key="frame" x="0.0" y="-2" width="372" height="20"/>
+ <rect key="frame" x="2" y="-1" width="368" height="17"/>
 <buttonCell key="cell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="JqJ-5C-Yhw">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -161,7 +159,6 @@
 </tableColumn>
 <tableColumn identifier="duration" width="90" minWidth="90" maxWidth="90" id="a6r-ky-REh">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Duration">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
@@ -216,20 +213,20 @@
 </subviews>
 </clipView>
 <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="KUp-wz-bHB">
- <rect key="frame" x="1" y="134" width="502" height="16"/>
+ <rect key="frame" x="1" y="87" width="507" height="15"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
 <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="iFv-s2-21F">
 <rect key="frame" x="224" y="17" width="15" height="102"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <tableHeaderView key="headerView" id="sEp-Wn-EWq">
+ <tableHeaderView key="headerView" wantsLayer="YES" id="sEp-Wn-EWq">
 <rect key="frame" x="0.0" y="0.0" width="512" height="23"/>
 <autoresizingMask key="autoresizingMask"/>
 </tableHeaderView>
 </scrollView>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="t5w-9e-K60">
- <rect key="frame" x="417" y="14" width="62" height="28"/>
+ <rect key="frame" x="416" y="13" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jHg-nh-9NJ">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/HBTrackTitleViewController.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/HBTrackTitleViewController.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17154" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17154"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -18,7 +18,7 @@
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2TT-sX-tpi">
- <rect key="frame" x="8" y="37" width="38" height="14"/>
+ <rect key="frame" x="8" y="36" width="38" height="14"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="clipping" title="Name:" id="eBw-qE-Hyb">
 
 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -35,6 +35,7 @@
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
+ <accessibility description="Track name"/>
 <connections>
 <binding destination="-2" name="value" keyPath="self.track.title" id="Ftg-oB-tDT"/>
 </connections>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/MainMenu.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/MainMenu.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 </dependencies>
 <objects>
 <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -302,6 +302,19 @@
 </connections>
 </menuItem>
 <menuItem isSeparatorItem="YES" id="uFS-Tj-SCh"/>
+ <menuItem title="Switch to Next Title" keyEquivalent="" id="viv-aA-SoB">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="switchToNextTitle:" target="-1" id="DHf-of-5V8"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Switch to Previous Title" keyEquivalent="" id="zgj-Iv-4xJ">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="switchToPreviousTitle:" target="-1" id="RHw-0V-BRR"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="yua-nt-2OC"/>
 <menuItem title="Show Toolbar" keyEquivalent="t" id="IsV-5A-bqx">
 <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
 <connections>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/MainWindow.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/MainWindow.xib Changed

@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="19529" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="19529"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
 <customObject id="-2" userLabel="File's Owner" customClass="HBController">
 <connections>
+ <outlet property="audioTab" destination="1475" id="KFs-lZ-jXC"/>
 <outlet property="bottomConstrain" destination="Unb-Sk-dKC" id="f1i-gz-VIc"/>
- <outlet property="fAudioTab" destination="1475" id="AJX-Da-Tfc"/>
- <outlet property="fChaptersTitlesTab" destination="1989" id="df9-TK-GBD"/>
- <outlet property="fFiltersTab" destination="0UB-bG-kwS" id="9at-ML-tDd"/>
- <outlet property="fMainTabView" destination="1474" id="sl5-BZ-ymC"/>
- <outlet property="fPictureTab" destination="eij-Sn-QmJ" id="Ccp-rO-nqD"/>
- <outlet property="fRipIndicator" destination="1373" id="an5-ng-etT"/>
- <outlet property="fScanHorizontalLine" destination="3205" id="W26-Wu-2YJ"/>
- <outlet property="fScanIndicator" destination="3203" id="cG1-SY-gbt"/>
- <outlet property="fSrcDVD2Field" destination="1539" id="pxg-Wl-Mn7"/>
- <outlet property="fSrcTitlePopUp" destination="1541" id="glh-1k-i69"/>
- <outlet property="fStatusField" destination="1123" id="mPD-cg-5dk"/>
- <outlet property="fSubtitlesTab" destination="5194" id="PF0-qx-Iu4"/>
- <outlet property="fVideoTab" destination="1477" id="hFY-kK-afW"/>
+ <outlet property="chaptersTab" destination="1989" id="Qic-V7-Bqk"/>
+ <outlet property="destinationPathControl" destination="PJi-21-hie" id="AwZ-Ws-K0u"/>
+ <outlet property="filtersTab" destination="0UB-bG-kwS" id="8wc-MY-h6a"/>
+ <outlet property="mainTabView" destination="1474" id="LnD-zT-6M5"/>
 <outlet property="openSourceToolbarItem" destination="8r8-nZ-dYs" id="cEL-nv-D9F"/>
 <outlet property="openTitleView" destination="lZQ-gl-3wX" id="Wh6-fB-pWi"/>
 <outlet property="pauseToolbarItem" destination="wTQ-KF-5KW" id="htw-tK-A0X"/>
+ <outlet property="pictureTab" destination="eij-Sn-QmJ" id="8Ww-MT-bhs"/>
 <outlet property="presetsItem" destination="qhv-9l-2FH" id="bEZ-nH-M9d"/>
 <outlet property="presetsPopup" destination="bWH-Lp-mKY" id="vot-gQ-hLV"/>
+ <outlet property="progressField" destination="XL7-L5-bkf" id="DCJ-FQ-VIv"/>
 <outlet property="ripToolbarItem" destination="byg-kj-sEM" id="C7B-wO-F1Q"/>
+ <outlet property="scanHorizontalLine" destination="3205" id="9af-9F-Sst"/>
+ <outlet property="scanIndicator" destination="3203" id="dh4-U8-kDp"/>
 <outlet property="showQueueToolbarItem" destination="HCx-ku-nF7" id="CC6-Yu-j7N"/>
+ <outlet property="sourceLabel" destination="1539" id="C8K-CB-tqm"/>
+ <outlet property="statusField" destination="1123" id="ujy-WJ-FLy"/>
+ <outlet property="subtitlesTab" destination="5194" id="G40-yx-m4P"/>
 <outlet property="summaryTab" destination="BA0-eg-2Ka" id="wh5-Js-weO"/>
+ <outlet property="titlePopUp" destination="1541" id="543-h9-MCd"/>
+ <outlet property="videoTab" destination="1477" id="oWL-hy-Yj4"/>
 <outlet property="window" destination="21" id="qib-ZH-aNm"/>
 </connections>
 </customObject>
@@ -39,63 +40,63 @@
 <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
 <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
 <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="41" y="572" width="885" height="600"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+ <rect key="contentRect" x="81" y="385" width="885" height="600"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
 <view key="contentView" id="2" customClass="HBFocusRingView">
 <rect key="frame" x="0.0" y="0.0" width="885" height="600"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <tabView controlSize="small" translatesAutoresizingMaskIntoConstraints="NO" id="1474">
- <rect key="frame" x="13" y="116" width="859" height="382"/>
+ <rect key="frame" x="13" y="87" width="859" height="415"/>
 <constraints>
 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="334" id="Jdl-tV-liS"/>
 </constraints>
 <tabViewItems>
 <tabViewItem label="Summary" identifier="" id="BA0-eg-2Ka">
 <view key="view" id="BjX-E2-6tb">
- <rect key="frame" x="10" y="29" width="839" height="340"/>
+ <rect key="frame" x="10" y="29" width="839" height="373"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Dimensions" identifier="2" id="eij-Sn-QmJ" userLabel="PictureTab">
 <view key="view" id="nvx-9b-6fF">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Filters" identifier="" id="0UB-bG-kwS">
 <view key="view" id="JAj-E3-Cq2">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Video" identifier="1" id="1477">
 <view key="view" id="1478">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Audio" identifier="3" id="1475">
 <view key="view" id="1476">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Subtitles" identifier="4" id="5194">
 <view key="view" id="5195">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 <tabViewItem label="Chapters" identifier="5" id="1989">
 <view key="view" id="1990">
- <rect key="frame" x="10" y="29" width="836" height="337"/>
+ <rect key="frame" x="10" y="25" width="839" height="377"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 </tabViewItem>
 </tabViewItems>
 </tabView>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1538">
+ <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1538">
 <rect key="frame" x="18" y="570" width="48" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Source:" id="4905">
 
@@ -108,7 +109,7 @@
 </connections>
 </textField>
 <textField horizontalHuggingPriority="1000" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1540">
- <rect key="frame" x="18" y="540" width="33" height="14"/>
+ <rect key="frame" x="18" y="543" width="33" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Title:" id="4907">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -119,13 +120,13 @@
 </connections>
 </textField>
 <popUpButton toolTip="Source range selection. By default, all chapters are selected and the entire source is encoded." horizontalHuggingPriority="1000" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5513">
- <rect key="frame" x="518" y="536" width="84" height="22"/>
+ <rect key="frame" x="517" y="537" width="86" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="78" id="Zs8-pX-H7V"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="5514">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="5515"/>
 </popUpButtonCell>
 <accessibility description="Range Selection"/>
@@ -141,7 +142,7 @@
 </connections>
 </popUpButton>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1552">
- <rect key="frame" x="18" y="94" width="52" height="14"/>
+ <rect key="frame" x="18" y="64" width="52" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="Save As:" id="4913">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -152,7 +153,7 @@
 </connections>
 </textField>
 <textField horizontalHuggingPriority="1000" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1553">
- <rect key="frame" x="754" y="540" width="57" height="14"/>
+ <rect key="frame" x="754" y="543" width="57" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Duration:" id="4914">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -167,12 +168,12 @@
 </connections>
 </textField>
 <textField toolTip="Duration of the selected source range in Hours:Minutes:Seconds." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1554">
- <rect key="frame" x="811" y="540" width="56" height="14"/>
+ <rect key="frame" x="811" y="543" width="56" height="14"/>
 <constraints>
 <constraint firstAttribute="width" constant="52" id="YAI-9M-gNt"/>
 </constraints>
 <textFieldCell key="cell" controlSize="small" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" title="00:00:00" id="4915">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" red="0.76630436999999996" green="0.0" blue="0.0" alpha="0.0" colorSpace="calibratedRGB"/>
 </textFieldCell>
@@ -193,7 +194,7 @@
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="xNw-RS-Hhf"/>
 </constraints>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" usesSingleLineMode="YES" id="4906">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
 </textFieldCell>
@@ -202,9 +203,9 @@
 </connections>
 </textField>
 <textField toolTip="File name. This is what your new video will be named." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1561">
- <rect key="frame" x="76" y="91" width="347" height="19"/>
+ <rect key="frame" x="76" y="62" width="347" height="19"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="4919">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -223,9 +224,9 @@
 </connections>
 </textField>
 <textField hidden="YES" toolTip="First second to encode." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5491" userLabel="Time Start Encoding Field">
- <rect key="frame" x="607" y="537" width="58" height="19"/>
+ <rect key="frame" x="607" y="541" width="58" height="19"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="5492">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -246,12 +247,12 @@
 </connections>
 </textField>
 <textField hidden="YES" toolTip="First frame to encode." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5521" userLabel="Frame Start Encoding Field">
- <rect key="frame" x="607" y="537" width="58" height="19"/>
+ <rect key="frame" x="607" y="541" width="58" height="19"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="right" drawsBackground="YES" id="5522">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Wpt-92-R1O">
 <real key="minimum" value="0.0"/>
 </numberFormatter>
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -271,9 +272,9 @@
 </connections>
 </textField>
 <textField hidden="YES" toolTip="Last second to encode." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5493" userLabel="Time End Encoding Field">
- <rect key="frame" x="683" y="537" width="58" height="19"/>
+ <rect key="frame" x="683" y="541" width="58" height="19"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="5494">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -294,12 +295,12 @@
 </connections>
 </textField>
 <textField hidden="YES" toolTip="Last frame to encode." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5523" userLabel="Frame End Encoding Field">
- <rect key="frame" x="683" y="537" width="58" height="19"/>
+ <rect key="frame" x="683" y="541" width="58" height="19"/>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="5524">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="WrK-kN-ZN0">
 <real key="minimum" value="0.0"/>
 </numberFormatter>
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -319,7 +320,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="1627">
- <rect key="frame" x="18" y="510" width="45" height="14"/>
+ <rect key="frame" x="18" y="513" width="45" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Preset:" id="4923">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -330,7 +331,7 @@
 </connections>
 </textField>
 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="1628">
- <rect key="frame" x="470" y="515" width="395" height="5"/>
+ <rect key="frame" x="470" y="517" width="395" height="5"/>
 </box>
 <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="3205">
 <rect key="frame" x="127" y="575" width="738" height="5"/>
@@ -345,12 +346,12 @@
 </constraints>
 </progressIndicator>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="5505">
- <rect key="frame" x="667" y="540" width="14" height="14"/>
+ <rect key="frame" x="667" y="543" width="14" height="14"/>
 <constraints>
 <constraint firstAttribute="width" constant="10" id="oZA-uv-S2L"/>
 </constraints>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="–" id="5506">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -363,13 +364,13 @@
 </connections>
 </textField>
 <popUpButton toolTip="First chapter to encode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1545" userLabel="Chapter Start">
- <rect key="frame" x="604" y="536" width="64" height="22"/>
+ <rect key="frame" x="603" y="537" width="66" height="22"/>
 <constraints>
 <constraint firstAttribute="width" constant="58" id="LYd-Am-GKJ"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1547" id="4910">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="1546">
 <items>
 <menuItem state="on" id="1547"/>
@@ -388,13 +389,13 @@
 </connections>
 </popUpButton>
 <popUpButton toolTip="Last chapter to encode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1548" userLabel="Chapter End">
- <rect key="frame" x="680" y="536" width="64" height="22"/>
+ <rect key="frame" x="679" y="537" width="66" height="22"/>
 <constraints>
 <constraint firstAttribute="width" constant="58" id="zhJ-ur-lHA"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="1550" id="4911">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="1549">
 <items>
 <menuItem state="on" id="1550"/>
@@ -412,14 +413,14 @@
 </binding>
 </connections>
 </popUpButton>
- <popUpButton toolTip="Video angle to encode. Only applicable to multi-angle DVD and Blu-ray." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5181">
- <rect key="frame" x="418" y="536" width="44" height="22"/>
+ <popUpButton toolTip="Video angle to encode. Only applicable to multi-angle DVD and Blu-ray." horizontalHuggingPriority="1000" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="5181">
+ <rect key="frame" x="417" y="537" width="46" height="22"/>
 <constraints>
 <constraint firstAttribute="width" constant="38" id="xGF-g4-jWh"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="5184" id="5182">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="5183">
 <items>
 <menuItem state="on" id="5184"/>
@@ -433,14 +434,20 @@
 <string key="NSValueTransformerName">NSIsNotNil</string>
 </dictionary>
 </binding>
- <binding destination="-2" name="selectedValue" keyPath="self.job.angle" previousBinding="If4-Fp-R0g" id="3Gk-ma-r2w">
+ <binding destination="-2" name="selectedValue" keyPath="self.job.angle" previousBinding="aID-g7-zTF" id="Iat-pL-ttI">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder" base64-UTF8="YES">
+IA
+</string>
+ </dictionary>
+ </binding>
+ <binding destination="-2" name="content" keyPath="self.job.angles" id="aID-g7-zTF">
 <dictionary key="options">
 <string key="NSNullPlaceholder" base64-UTF8="YES">
 IA
 </string>
 </dictionary>
 </binding>
- <binding destination="-2" name="content" keyPath="self.job.angles" id="If4-Fp-R0g"/>
 <binding destination="5676" name="hidden" keyPath="values.UseDvdNav" previousBinding="pA6-GK-w84" id="Ocv-Hr-bje">
 <dictionary key="options">
 <string key="NSValueTransformerName">NSNegateBoolean</string>
@@ -449,16 +456,16 @@
 </connections>
 </popUpButton>
 <popUpButton horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="1541">
- <rect key="frame" x="54" y="536" width="310" height="22"/>
+ <rect key="frame" x="53" y="537" width="312" height="22"/>
 <string key="toolTip">Title, or video clip, to encode. The longest title is selected by default.
 
 Blu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature.</string>
 <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="270" id="Kfe-4R-KRB"/>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="220" id="Kfe-4R-KRB"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="4908">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="1542"/>
 <connections>
 <accessibilityConnection property="title" destination="1540" id="8YI-Kk-J0w"/>
@@ -475,24 +482,26 @@
 </connections>
 </popUpButton>
 <pathControl verticalHuggingPriority="750" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PJi-21-hie">
- <rect key="frame" x="471" y="91" width="328" height="20"/>
+ <rect key="frame" x="471" y="61" width="328" height="20"/>
 <constraints>
 <constraint firstAttribute="width" constant="328" id="Q5R-FC-z1x"/>
 </constraints>
 <pathCell key="cell" controlSize="small" selectable="YES" alignment="left" id="5Bk-66-HFW">
- 
+ 
 <url key="url" string="file://localhost/Applications/"/>
 </pathCell>
 <accessibility description="Destination folder path"/>
 <connections>
 <binding destination="-2" name="value" keyPath="self.job.outputURL" id="FQU-UV-RCI"/>
+ <outlet property="delegate" destination="-2" id="jfV-bp-JaV"/>
+ <outlet property="menu" destination="my5-n7-OFP" id="CXO-BG-nnJ"/>
 </connections>
 </pathControl>
 <button toolTip="Browse to select a new destination path for your encode." horizontalHuggingPriority="1000" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1562">
- <rect key="frame" x="796" y="86" width="74" height="27"/>
+ <rect key="frame" x="795" y="55" width="76" height="27"/>
 <buttonCell key="cell" type="push" title="Browse…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" inset="2" id="4920">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <accessibility description="Browse Destination"/>
 <connections>
@@ -505,7 +514,7 @@
 </connections>
 </button>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="50" translatesAutoresizingMaskIntoConstraints="NO" id="gfs-4j-YSE">
- <rect key="frame" x="441" y="94" width="22" height="14"/>
+ <rect key="frame" x="441" y="64" width="22" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="To:" id="rfK-nQ-Aq2">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -516,48 +525,49 @@
 </connections>
 </textField>
 <box autoresizesSubviews="NO" borderType="line" title="Box" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="d0E-xw-bxh">
- <rect key="frame" x="-7" y="-4" width="899" height="81"/>
+ <rect key="frame" x="-7" y="-4" width="899" height="52"/>
 <view key="contentView" id="idQ-Ti-X2a">
- <rect key="frame" x="3" y="3" width="893" height="75"/>
+ <rect key="frame" x="3" y="3" width="893" height="46"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <progressIndicator wantsLayer="YES" verticalHuggingPriority="750" maxValue="1" bezeled="NO" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="1373">
- <rect key="frame" x="24" y="15" width="845" height="11"/>
- </progressIndicator>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="3000" translatesAutoresizingMaskIntoConstraints="NO" id="1123">
- <rect key="frame" x="22" y="29" width="849" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="xDK-Ed-GEv"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="DO NOT TRANSLATE THIS NIB FILE" id="4846">
- 
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="3000" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1123">
+ <rect key="frame" x="22" y="24" width="849" height="14"/>
+ <textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Encoding Job 1: Test.mp4" usesSingleLineMode="YES" id="4846">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="3000" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XL7-L5-bkf">
+ <rect key="frame" x="22" y="10" width="849" height="14"/>
+ <textFieldCell key="cell" controlSize="small" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="left" title="Progress" usesSingleLineMode="YES" id="KUR-YZ-Da8">
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
 </textField>
 </subviews>
 <constraints>
- <constraint firstItem="1373" firstAttribute="top" secondItem="1123" secondAttribute="bottom" constant="4" id="05I-yD-zGd"/>
- <constraint firstItem="1123" firstAttribute="top" secondItem="idQ-Ti-X2a" secondAttribute="top" constant="16" id="SEd-Ur-o24"/>
+ <constraint firstItem="XL7-L5-bkf" firstAttribute="top" secondItem="1123" secondAttribute="bottom" id="4mE-qY-tI5"/>
+ <constraint firstAttribute="trailing" secondItem="XL7-L5-bkf" secondAttribute="trailing" constant="24" id="9FM-Xe-XF0"/>
+ <constraint firstItem="1123" firstAttribute="top" secondItem="idQ-Ti-X2a" secondAttribute="top" constant="8" id="SEd-Ur-o24"/>
+ <constraint firstItem="XL7-L5-bkf" firstAttribute="leading" secondItem="idQ-Ti-X2a" secondAttribute="leading" constant="24" id="SNp-DD-HgR"/>
 <constraint firstAttribute="trailing" secondItem="1123" secondAttribute="trailing" constant="24" id="VYX-jz-5IE"/>
 <constraint firstItem="1123" firstAttribute="leading" secondItem="idQ-Ti-X2a" secondAttribute="leading" constant="24" id="W5K-34-8HI"/>
- <constraint firstAttribute="bottom" secondItem="1373" secondAttribute="bottom" constant="16" id="mrc-nZ-d8a"/>
- <constraint firstAttribute="trailing" secondItem="1373" secondAttribute="trailing" constant="24" id="pFB-8q-Iuf"/>
- <constraint firstItem="1373" firstAttribute="leading" secondItem="idQ-Ti-X2a" secondAttribute="leading" constant="24" id="uHd-le-njc"/>
 </constraints>
 </view>
 <constraints>
- <constraint firstAttribute="height" constant="75" id="Jqz-kV-yCt"/>
+ <constraint firstAttribute="height" constant="46" id="Jqz-kV-yCt"/>
 </constraints>
 </box>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bWH-Lp-mKY">
- <rect key="frame" x="66" y="505" width="210" height="22"/>
+ <popUpButton verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="bWH-Lp-mKY">
+ <rect key="frame" x="65" y="508" width="212" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="204" id="k4L-Sa-g4b"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" title="Selected Preset" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="4hk-61-M1H">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="X2f-Tk-x0c">
 <items>
 <menuItem title="Selected Preset" state="on" hidden="YES" id="OYP-3T-FnA">
@@ -578,7 +588,7 @@
 </connections>
 </popUpButton>
 <textField horizontalHuggingPriority="1000" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="5180">
- <rect key="frame" x="374" y="540" width="41" height="14"/>
+ <rect key="frame" x="374" y="543" width="41" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Angle:" id="5185">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -594,7 +604,7 @@
 </connections>
 </textField>
 <textField horizontalHuggingPriority="1000" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="4NG-AB-JWs">
- <rect key="frame" x="472" y="540" width="43" height="14"/>
+ <rect key="frame" x="472" y="543" width="43" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Range:" id="IxV-PW-oYh">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -604,11 +614,11 @@
 <binding destination="-2" name="textColor" keyPath="self.labelColor" id="NpP-Z0-hPs"/>
 </connections>
 </textField>
- <button toolTip="Reload the encoding settings for the currently selected preset. Modifications will be discarded." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AhR-pK-Oz4">
- <rect key="frame" x="276" y="502" width="62" height="27"/>
+ <button toolTip="Reload the encoding settings for the currently selected preset. Modifications will be discarded." verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="AhR-pK-Oz4">
+ <rect key="frame" x="275" y="504" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Reload" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cgS-BU-Nfd">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <action selector="reloadPreset:" target="-2" id="v7a-73-wrT"/>
@@ -620,11 +630,11 @@
 <binding destination="5676" name="hidden" keyPath="values.HBHideButtons" previousBinding="pER-xA-jjU" id="wOC-Ys-6ZR"/>
 </connections>
 </button>
- <button toolTip="Save New Preset…" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2vD-zN-YMe">
- <rect key="frame" x="336" y="502" width="124" height="27"/>
+ <button toolTip="Save New Preset…" verticalHuggingPriority="750" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="2vD-zN-YMe">
+ <rect key="frame" x="335" y="504" width="126" height="27"/>
 <buttonCell key="cell" type="push" title="Save New Preset…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="IOU-3L-nvB">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <action selector="showAddPresetPanel:" target="-2" id="QgW-qo-eKy"/>
@@ -647,7 +657,6 @@
 <constraint firstItem="1548" firstAttribute="baseline" secondItem="1553" secondAttribute="baseline" id="5U2-Lr-4Qc"/>
 <constraint firstItem="5180" firstAttribute="baseline" secondItem="5181" secondAttribute="baseline" id="7rI-Pr-24u"/>
 <constraint firstItem="5181" firstAttribute="leading" secondItem="5180" secondAttribute="trailing" constant="8" id="88n-hD-lCW"/>
- <constraint firstItem="AhR-pK-Oz4" firstAttribute="top" secondItem="1541" secondAttribute="bottom" constant="13" id="9np-TF-f0W"/>
 <constraint firstItem="bWH-Lp-mKY" firstAttribute="baseline" secondItem="1627" secondAttribute="baseline" id="A8O-c5-J59"/>
 <constraint firstItem="d0E-xw-bxh" firstAttribute="leading" secondItem="2" secondAttribute="leading" constant="-4" id="ANc-YO-rUk"/>
 <constraint firstItem="5523" firstAttribute="leading" secondItem="1548" secondAttribute="leading" id="BFc-Em-mCW"/>
@@ -677,7 +686,6 @@
 <constraint firstItem="1561" firstAttribute="leading" secondItem="1552" secondAttribute="trailing" constant="8" id="TLF-qk-2Eq"/>
 <constraint firstItem="bWH-Lp-mKY" firstAttribute="top" secondItem="1541" secondAttribute="bottom" constant="13" id="Tex-Li-ACD"/>
 <constraint firstItem="5513" firstAttribute="baseline" secondItem="1545" secondAttribute="baseline" id="TiQ-ye-MeD"/>
- <constraint firstItem="2vD-zN-YMe" firstAttribute="top" secondItem="5181" secondAttribute="bottom" constant="13" id="UJb-D1-3pm"/>
 <constraint firstItem="1539" firstAttribute="leading" secondItem="1538" secondAttribute="trailing" constant="8" id="Ue2-hw-ZPH"/>
 <constraint firstItem="1562" firstAttribute="leading" secondItem="PJi-21-hie" secondAttribute="trailing" constant="2" id="UgJ-hP-CRv"/>
 <constraint firstAttribute="bottom" secondItem="d0E-xw-bxh" secondAttribute="bottom" id="Unb-Sk-dKC"/>
@@ -723,84 +731,104 @@
 <allowedToolbarItems>
 <toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="ZEH-cS-zXY"/>
 <toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="wjB-Tl-5qq"/>
- <toolbarItem implicitItemIdentifier="DE791733-5430-4B2F-B91D-ACAA95BAF7F0" label="Open Source" paletteLabel="Open Source" toolTip="Open Source" tag="-1" image="source" id="8r8-nZ-dYs">
+ <toolbarItem implicitItemIdentifier="DE791733-5430-4B2F-B91D-ACAA95BAF7F0" label="Open Source" paletteLabel="Open Source" toolTip="Open Source" tag="-1" image="source" sizingBehavior="auto" id="8r8-nZ-dYs">
 <connections>
 <action selector="browseSources:" target="-2" id="zi1-Tk-0YL"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="10063EA1-C821-4363-8F59-7840853EB568" label="Start" paletteLabel="Start Encoding" toolTip="Start Encoding" tag="-1" image="encode" id="byg-kj-sEM">
+ <toolbarItem implicitItemIdentifier="10063EA1-C821-4363-8F59-7840853EB568" label="Start" paletteLabel="Start Encoding" toolTip="Start Encoding" tag="-1" image="encode" sizingBehavior="auto" id="byg-kj-sEM">
 <connections>
 <action selector="toggleStartCancel:" target="-2" id="6gH-Cz-Nuo"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="B4A5CE50-6CD5-4CD0-B639-E1516E1C85C1" label="Pause" paletteLabel="Pause Encoding" toolTip="Pause Encoding" tag="-1" image="pauseencode" id="wTQ-KF-5KW">
+ <toolbarItem implicitItemIdentifier="B4A5CE50-6CD5-4CD0-B639-E1516E1C85C1" label="Pause" paletteLabel="Pause Encoding" toolTip="Pause Encoding" tag="-1" image="pauseencode" sizingBehavior="auto" id="wTQ-KF-5KW">
 <connections>
 <action selector="togglePauseResume:" target="-2" id="AN1-8V-lc1"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="3B6A53EE-F973-41A7-A0DF-AEBD73DAC28E" label="Add To Queue" paletteLabel="Add To Queue" toolTip="Add To Queue" tag="-1" image="addqueue" id="DZZ-Fe-wjw">
- <size key="minSize" width="32" height="32"/>
- <size key="maxSize" width="32" height="32"/>
- <connections>
- <action selector="addToQueue:" target="-2" id="TRB-HE-1GW"/>
- </connections>
- </toolbarItem>
- <toolbarItem implicitItemIdentifier="A5F62853-5047-43C2-AD64-73654B0E34B2" label="Add Titles To Queue" paletteLabel="Add Titles To Queue" toolTip="Add Titles To Queue" image="addtitlestoqueue" id="38K-hd-P5J">
- <size key="minSize" width="57" height="32"/>
- <size key="maxSize" width="58" height="32"/>
- <popUpButton key="view" imageHugsTitle="YES" id="pJJ-0V-TQq">
- <rect key="frame" x="28" y="14" width="58" height="32"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" heightSizable="YES"/>
- <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="addtitlestoqueue" alignment="center" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="BAK-n3-eIN">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" id="QCi-1O-Msg">
- <items>
- <menuItem state="on" image="addtitlestoqueue" hidden="YES" id="MCy-je-2nL"/>
- <menuItem title="Add Title To Queue" id="L8z-c6-E1u">
- <connections>
- <action selector="addToQueue:" target="-2" id="0SF-Rk-zUS"/>
- </connections>
- </menuItem>
- <menuItem isSeparatorItem="YES" id="skM-c5-4GF"/>
- <menuItem title="Add Titles To Queue…" id="046-kc-MnL">
- <connections>
- <action selector="addTitlesToQueue:" target="-2" id="xaX-YI-n9f"/>
- </connections>
- </menuItem>
- <menuItem title="Add All Titles To Queue" id="INL-y9-Gwp">
- <connections>
- <action selector="addAllTitlesToQueue:" target="-2" id="su3-wU-Lps"/>
- </connections>
- </menuItem>
- </items>
- </menu>
- </popUpButtonCell>
- </popUpButton>
+ <toolbarItem implicitItemIdentifier="E1B0B8C6-5C5C-460A-B432-3AB62BC9AB73" label="Add To Queue" paletteLabel="Add To Queue" tag="-1" title="Box" sizingBehavior="auto" id="Qoa-tj-Rj2">
+ <nil key="toolTip"/>
+ <box key="view" misplaced="YES" boxType="custom" borderType="none" cornerRadius="4" title="Box" titlePosition="noTitle" id="zcd-K2-F7w">
+ <rect key="frame" x="41" y="14" width="0.0" height="0.0"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <view key="contentView" id="NhD-WW-G5l">
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <button toolTip="Add To Queue" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="3xl-Xh-n9j">
+ <rect key="frame" x="0.0" y="0.0" width="32" height="32"/>
+ <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="addqueue" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="yzg-VQ-SnB">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="addToQueue:" target="-2" id="wLI-1P-AYf"/>
+ <binding destination="-2" name="enabled" keyPath="self.job" id="tDb-Oc-lDY">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNotNil</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </button>
+ <box horizontalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="kRL-I4-HJp">
+ <rect key="frame" x="33" y="6" width="5" height="22"/>
+ </box>
+ <popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="gwb-YP-xyr">
+ <rect key="frame" x="32" y="7" width="20" height="20"/>
+ <popUpButtonCell key="cell" type="bevel" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="g0i-2U-hqb">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" id="0Xl-pO-QOe">
+ <items>
+ <menuItem state="on" hidden="YES" id="JOe-MY-c1i"/>
+ <menuItem title="Add Titles To Queue…" id="iVg-1G-9ym">
+ <connections>
+ <action selector="addTitlesToQueue:" target="-2" id="0po-as-L9y"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Add All Titles To Queue" id="a37-Yd-bYR">
+ <connections>
+ <action selector="addAllTitlesToQueue:" target="-2" id="mL6-rG-Pkm"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ </popUpButton>
+ </subviews>
+ <constraints>
+ <constraint firstItem="kRL-I4-HJp" firstAttribute="top" secondItem="NhD-WW-G5l" secondAttribute="top" constant="4" id="FO4-89-5ce"/>
+ <constraint firstItem="gwb-YP-xyr" firstAttribute="top" secondItem="NhD-WW-G5l" secondAttribute="top" constant="5" id="LBD-Qe-eLI"/>
+ <constraint firstItem="kRL-I4-HJp" firstAttribute="centerY" secondItem="gwb-YP-xyr" secondAttribute="centerY" id="PxS-5j-xiL"/>
+ <constraint firstAttribute="trailing" secondItem="gwb-YP-xyr" secondAttribute="trailing" id="R7W-Eg-nl2"/>
+ <constraint firstAttribute="bottom" secondItem="gwb-YP-xyr" secondAttribute="bottom" constant="7" id="RZN-uF-6Cx"/>
+ <constraint firstAttribute="bottom" secondItem="3xl-Xh-n9j" secondAttribute="bottom" id="RjM-ni-SFx"/>
+ <constraint firstItem="kRL-I4-HJp" firstAttribute="leading" secondItem="3xl-Xh-n9j" secondAttribute="trailing" constant="3" id="dw2-v1-fKy"/>
+ <constraint firstItem="gwb-YP-xyr" firstAttribute="leading" secondItem="kRL-I4-HJp" secondAttribute="trailing" constant="1" id="fib-zk-9gL"/>
+ <constraint firstItem="3xl-Xh-n9j" firstAttribute="top" secondItem="NhD-WW-G5l" secondAttribute="top" id="kub-fW-5rb"/>
+ <constraint firstItem="3xl-Xh-n9j" firstAttribute="leading" secondItem="NhD-WW-G5l" secondAttribute="leading" id="sJy-TP-ETa"/>
+ </constraints>
+ </view>
+ </box>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="29BB9965-48E8-4B07-97B2-3C3706F3D150" label="Queue" paletteLabel="Show Queue Window" toolTip="Show Queue Window" tag="-1" image="showqueue" id="HCx-ku-nF7" customClass="HBToolbarBadgedItem">
- <size key="minSize" width="32" height="32"/>
- <size key="maxSize" width="32" height="32"/>
+ <toolbarItem implicitItemIdentifier="29BB9965-48E8-4B07-97B2-3C3706F3D150" label="Queue" paletteLabel="Show Queue Window" toolTip="Show Queue Window" tag="-1" image="showqueue" sizingBehavior="auto" id="HCx-ku-nF7" customClass="HBToolbarBadgedItem">
 <connections>
 <action selector="showQueueWindow:" target="-1" id="vZB-dY-DbD"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="90131A42-4120-458B-A63F-04A8D7486202" label="Preview" paletteLabel="Show Preview Window" toolTip="Show Preview Window" tag="-1" image="preview" id="dK4-jt-v4K">
+ <toolbarItem implicitItemIdentifier="90131A42-4120-458B-A63F-04A8D7486202" label="Preview" paletteLabel="Show Preview Window" toolTip="Show Preview Window" tag="-1" image="preview" sizingBehavior="auto" id="dK4-jt-v4K">
 <connections>
 <action selector="showPreviewWindow:" target="-2" id="uci-BT-5bQ"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="AC64166E-55C9-431A-8085-74C960AAF1D5" label="Activity" paletteLabel="Show Activity Window" toolTip="Show Activity Window" tag="-1" image="activity" id="p7Q-L3-zcW">
+ <toolbarItem implicitItemIdentifier="AC64166E-55C9-431A-8085-74C960AAF1D5" label="Activity" paletteLabel="Show Activity Window" toolTip="Show Activity Window" tag="-1" image="activity" sizingBehavior="auto" id="p7Q-L3-zcW">
 <connections>
 <action selector="showOutputPanel:" target="-1" id="TxI-PX-wlm"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="27166A18-3AC0-4FD9-B76C-B1702BA05D47" label="Presets" paletteLabel="Show Presets List" toolTip="Show Presets List" image="presets" id="qhv-9l-2FH">
- <size key="minSize" width="32" height="32"/>
- <size key="maxSize" width="32" height="32"/>
+ <toolbarItem implicitItemIdentifier="27166A18-3AC0-4FD9-B76C-B1702BA05D47" label="Presets" paletteLabel="Show Presets List" toolTip="Show Presets List" image="presets" sizingBehavior="auto" id="qhv-9l-2FH">
 <button key="view" verticalHuggingPriority="750" id="kdj-uK-UE0">
 <rect key="frame" x="35" y="14" width="32" height="32"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <autoresizingMask key="autoresizingMask"/>
 <buttonCell key="cell" type="bevel" bezelStyle="rounded" image="presets" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="b1r-Ra-EmB">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -814,8 +842,8 @@
 <defaultToolbarItems>
 <toolbarItem reference="8r8-nZ-dYs"/>
 <toolbarItem reference="ZEH-cS-zXY"/>
+ <toolbarItem reference="Qoa-tj-Rj2"/>
 <toolbarItem reference="ZEH-cS-zXY"/>
- <toolbarItem reference="DZZ-Fe-wjw"/>
 <toolbarItem reference="byg-kj-sEM"/>
 <toolbarItem reference="wTQ-KF-5KW"/>
 <toolbarItem reference="wjB-Tl-5qq"/>
@@ -828,18 +856,18 @@
 <connections>
 <outlet property="delegate" destination="-2" id="M3v-Rc-7Ca"/>
 </connections>
- <point key="canvasLocation" x="2460" y="-738"/>
+ <point key="canvasLocation" x="2330" y="-1079"/>
 </window>
 <userDefaultsController representsSharedInstance="YES" id="5676"/>
 <customView id="lZQ-gl-3wX" userLabel="Open Panel View">
- <rect key="frame" x="0.0" y="0.0" width="230" height="46"/>
+ <rect key="frame" x="0.0" y="-2" width="234" height="48"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
 <customView translatesAutoresizingMaskIntoConstraints="NO" id="nHs-z7-brO">
- <rect key="frame" x="11" y="0.0" width="208" height="46"/>
+ <rect key="frame" x="10" y="0.0" width="214" height="48"/>
 <subviews>
 <button toolTip="Scan only the specified title instead of all titles." translatesAutoresizingMaskIntoConstraints="NO" id="DN4-48-aOI">
- <rect key="frame" x="18" y="14" width="112" height="18"/>
+ <rect key="frame" x="18" y="15" width="116" height="18"/>
 <buttonCell key="cell" type="check" title="Scan only title:" bezelStyle="regularSquare" imagePosition="left" inset="2" id="eQA-t2-FcV">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -849,7 +877,7 @@
 </connections>
 </button>
 <textField toolTip="Title to scan." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="3w9-Iu-3u2">
- <rect key="frame" x="136" y="12" width="52" height="22"/>
+ <rect key="frame" x="142" y="13" width="52" height="21"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="52" id="BGA-yJ-Apd"/>
 </constraints>
@@ -893,11 +921,21 @@
 </constraints>
 <point key="canvasLocation" x="458.5" y="-571"/>
 </customView>
+ <menu id="my5-n7-OFP">
+ <items>
+ <menuItem title="Reveal in Finder" id="rK6-EB-N9Z">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="revealPathItemInFinder:" target="-2" id="f0R-px-ugx"/>
+ </connections>
+ </menuItem>
+ </items>
+ <point key="canvasLocation" x="2190" y="-1537"/>
+ </menu>
 </objects>
 <resources>
 <image name="activity" width="32" height="32"/>
 <image name="addqueue" width="32" height="32"/>
- <image name="addtitlestoqueue" width="32" height="31"/>
 <image name="encode" width="32" height="32"/>
 <image name="pauseencode" width="32" height="32"/>
 <image name="presets" width="32" height="32"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Preferences.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Preferences.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -21,11 +21,11 @@
 <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Preferences">
 <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
 <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="136" y="318" width="500" height="200"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
- <value key="minSize" type="size" width="212" height="107"/>
+ <rect key="contentRect" x="136" y="318" width="580" height="200"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+ <value key="minSize" type="size" width="580" height="108"/>
 <view key="contentView" id="6">
- <rect key="frame" x="0.0" y="0.0" width="500" height="200"/>
+ <rect key="frame" x="0.0" y="0.0" width="580" height="200"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 </view>
 <connections>
@@ -35,697 +35,1040 @@
 </window>
 <userDefaultsController representsSharedInstance="YES" id="61" userLabel="Shared Defaults"/>
 <customView id="233" userLabel="General">
- <rect key="frame" x="0.0" y="0.0" width="500" height="421"/>
+ <rect key="frame" x="0.0" y="0.0" width="580" height="402"/>
 <autoresizingMask key="autoresizingMask"/>
 <subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="2nU-46-chy">
- <rect key="frame" x="15" y="0.0" width="470" height="421"/>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="18" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TQb-nF-3BD">
+ <rect key="frame" x="70" y="20" width="441" height="362"/>
 <subviews>
- <button horizontalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="244">
- <rect key="frame" x="93" y="263" width="85" height="18"/>
- <buttonCell key="cell" type="check" title="Send file to:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="306">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBSendToAppEnabled" id="Kff-6m-jt9"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="450">
- <rect key="frame" x="381" y="257" width="74" height="27"/>
- <buttonCell key="cell" type="push" title="Browse…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="451">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
- </buttonCell>
- <connections>
- <action selector="browseSendToApp:" target="-2" id="455"/>
- </connections>
- </button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="fF9-Q1-vYr">
- <rect key="frame" x="114" y="174" width="45" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Format:" id="3dN-MN-DcP">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="RQc-sb-xRW"/>
- </connections>
- </textField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="457">
- <rect key="frame" x="93" y="281" width="151" height="18"/>
- <buttonCell key="cell" type="check" title="Play System Alert Sound" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="458">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBAlertWhenDoneSound" id="5A8-fz-MEz"/>
- </connections>
- </button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="751" verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LKY-ui-YVw">
- <rect key="frame" x="163" y="76" width="274" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Drag labels to Format to compose a naming format." id="dQ6-Dh-9sD">
- 
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="DLn-Xh-Zkh">
- <rect key="frame" x="113" y="53" width="198" height="18"/>
- <buttonCell key="cell" type="check" title="Replace underscores with spaces" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="pUi-lK-cHw">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="NEY-u9-7gj"/>
- <binding destination="61" name="value" keyPath="values.HBAutoNamingRemoveUnderscore" id="8eN-wY-VqG"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="239">
- <rect key="frame" x="93" y="195" width="188" height="18"/>
- <buttonCell key="cell" type="check" title="Automatically name output files" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="302">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.DefaultAutoNaming" id="262"/>
- </connections>
- </button>
- <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="242">
- <rect key="frame" x="18" y="324" width="72" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="When Done:" id="304">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="248" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="448">
- <rect key="frame" x="178" y="265" width="195" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="None" id="449">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- <connections>
- <binding destination="61" name="value" keyPath="values.SendCompletedEncodeToApp" id="453"/>
- </connections>
- </textFieldCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBSendToApp" id="f36-PN-c5F">
- <dictionary key="options">
- <string key="NSNullPlaceholder">None</string>
- </dictionary>
- </binding>
- </connections>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="275">
- <rect key="frame" x="18" y="387" width="72" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="At Launch:" id="307">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="276">
- <rect key="frame" x="18" y="220" width="72" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Output Files:" id="308">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <tokenField toolTip="Drag labels to the Format field to compose a naming format." horizontalHuggingPriority="249" verticalHuggingPriority="249" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tk3-Ig-fFI">
- <rect key="frame" x="163" y="98" width="289" height="65"/>
- <constraints>
- <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="46" id="adq-dM-HeA"/>
- </constraints>
- <tokenFieldCell key="cell" controlSize="small" selectable="YES" allowsUndo="NO" alignment="left" allowsEditingTextAttributes="YES" id="cjy-yP-lqT">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </tokenFieldCell>
- <connections>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="uxo-hQ-6mt"/>
- <outlet property="delegate" destination="-2" id="P3H-mA-QsB"/>
- </connections>
- </tokenField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="GNx-QT-RSv">
- <rect key="frame" x="113" y="35" width="178" height="18"/>
- <buttonCell key="cell" type="check" title="Remove common punctuation" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="wo5-iR-2mb">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="670-dr-Vj0"/>
- <binding destination="61" name="value" keyPath="values.HBAutoNamingRemovePunctuation" id="aDU-h4-vOD"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="ibT-yk-a1x">
- <rect key="frame" x="93" y="385" width="154" height="18"/>
- <buttonCell key="cell" type="check" title="Show Open Source panel" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="Zqz-Kn-xOS">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBShowOpenPanelAtLaunch" id="hsG-Dx-Mf3"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="486">
- <rect key="frame" x="94" y="220" width="126" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Default MP4 Extension:" id="487">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="289">
- <rect key="frame" x="223" y="215" width="68" height="22"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="62" id="trV-eu-Vh2"/>
- </constraints>
- <popUpButtonCell key="cell" type="push" title="Auto" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="292" id="309">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="290">
- <items>
- <menuItem title="Auto" state="on" id="292"/>
- <menuItem title=".m4v" id="484"/>
- <menuItem title=".mp4" id="485"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="486" id="3J0-Cd-s8X"/>
- <binding destination="61" name="selectedValue" keyPath="values.DefaultMpegExtension" id="490"/>
- </connections>
- </popUpButton>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="491">
- <rect key="frame" x="93" y="319" width="157" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Notification" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2" imageScaling="proportionallyDown" inset="2" selectedItem="499" id="492">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="493">
- <items>
- <menuItem title="Do Nothing" id="494"/>
- <menuItem title="Alert" tag="1" id="495"/>
- <menuItem title="Notification" state="on" tag="2" id="499"/>
- <menuItem title="Alert And Notification" tag="3" id="496"/>
- <menuItem title="Put Computer To Sleep" tag="4" id="497"/>
- <menuItem title="Shut Down Computer" tag="5" id="498"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="242" id="fOv-gS-Cui"/>
- <binding destination="61" name="selectedTag" keyPath="values.HBAlertWhenDone" id="xxK-qX-yth"/>
- </connections>
- </popUpButton>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="zXr-lf-3A4">
- <rect key="frame" x="113" y="17" width="160" height="18"/>
- <buttonCell key="cell" type="check" title="Change case to Title Case" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="ggR-Zs-P8G">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="OIc-Z7-E7O"/>
- <binding destination="61" name="value" keyPath="values.HBAutoNamingTitleCase" id="xRh-dS-r4w"/>
- </connections>
- </button>
- <tokenField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6aa-GX-TuM">
- <rect key="frame" x="165" y="171" width="285" height="19"/>
- <constraints>
- <constraint firstAttribute="width" constant="285" id="UgZ-NZ-28V"/>
- </constraints>
- <tokenFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="left" drawsBackground="YES" allowsEditingTextAttributes="YES" id="dHt-ry-PKg">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </tokenFieldCell>
- <connections>
- <accessibilityConnection property="title" destination="fF9-Q1-vYr" id="EWY-KP-WsI"/>
- <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="VeX-1Z-Ejc"/>
- <binding destination="61" name="value" keyPath="values.HBAutoNamingFormat" id="Sf1-9q-Gag">
- <dictionary key="options">
- <bool key="NSContinuouslyUpdatesValue" value="YES"/>
- <bool key="NSValidatesImmediately" value="YES"/>
- </dictionary>
- </binding>
- <outlet property="delegate" destination="-2" id="3bd-m3-Fz5"/>
- </connections>
- </tokenField>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="243">
- <rect key="frame" x="93" y="367" width="230" height="18"/>
- <buttonCell key="cell" type="check" title="Automatically check for updates weekly" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="305">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="410" name="value" keyPath="updater.automaticallyChecksForUpdates" id="rsY-XJ-el2"/>
- </connections>
- </button>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="WwH-AE-z8q">
- <rect key="frame" x="93" y="299" width="190" height="18"/>
- <buttonCell key="cell" type="check" title="Reset to &quot;Do nothing&quot; on launch" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="Uxv-oN-c1r">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBResetWhenDoneOnLaunch" id="mQx-nk-zXN"/>
- </connections>
- </button>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="F3c-q6-MdR">
+ <rect key="frame" x="0.0" y="328" width="304" height="34"/>
+ <subviews>
+ <textField verticalHuggingPriority="749" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="275">
+ <rect key="frame" x="-2" y="0.0" width="72" height="34"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="At Launch:" id="307">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w2G-Yb-S06">
+ <rect key="frame" x="76" y="0.0" width="228" height="34"/>
+ <subviews>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="ibT-yk-a1x">
+ <rect key="frame" x="-1" y="19" width="153" height="16"/>
+ <buttonCell key="cell" type="check" title="Show Open Source panel" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="Zqz-Kn-xOS">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBShowOpenPanelAtLaunch" id="hsG-Dx-Mf3"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="243">
+ <rect key="frame" x="-1" y="-1" width="229" height="16"/>
+ <buttonCell key="cell" type="check" title="Automatically check for updates weekly" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="305">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="410" name="value" keyPath="updater.automaticallyChecksForUpdates" id="rsY-XJ-el2"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Ogp-hO-ybK">
+ <rect key="frame" x="0.0" y="307" width="441" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Aee-4F-nXp">
+ <rect key="frame" x="0.0" y="215" width="265" height="76"/>
+ <subviews>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="749" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="242">
+ <rect key="frame" x="-2" y="0.0" width="72" height="76"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="When Done:" id="304">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7rd-rU-DLx">
+ <rect key="frame" x="76" y="0.0" width="189" height="76"/>
+ <subviews>
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="491">
+ <rect key="frame" x="-4" y="56" width="153" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="Notification" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="2" imageScaling="proportionallyDown" inset="2" selectedItem="499" id="492">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="493">
+ <items>
+ <menuItem title="Do Nothing" id="494"/>
+ <menuItem title="Alert" tag="1" id="495"/>
+ <menuItem title="Notification" state="on" tag="2" id="499"/>
+ <menuItem title="Alert And Notification" tag="3" id="496"/>
+ <menuItem title="Put Computer To Sleep" tag="4" id="497"/>
+ <menuItem title="Shut Down Computer" tag="5" id="498"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="242" id="fOv-gS-Cui"/>
+ <binding destination="61" name="selectedTag" keyPath="values.HBAlertWhenDone" id="xxK-qX-yth"/>
+ </connections>
+ </popUpButton>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="WwH-AE-z8q">
+ <rect key="frame" x="-1" y="39" width="190" height="16"/>
+ <buttonCell key="cell" type="check" title="Reset to &quot;Do nothing&quot; on launch" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="Uxv-oN-c1r">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBResetWhenDoneOnLaunch" id="mQx-nk-zXN"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="457">
+ <rect key="frame" x="-1" y="19" width="150" height="16"/>
+ <buttonCell key="cell" type="check" title="Play System Alert Sound" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" inset="2" id="458">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBAlertWhenDoneSound" id="5A8-fz-MEz"/>
+ </connections>
+ </button>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="R3c-rh-gAX">
+ <rect key="frame" x="0.0" y="0.0" width="189" height="14"/>
+ <subviews>
+ <button horizontalHuggingPriority="248" translatesAutoresizingMaskIntoConstraints="NO" id="244">
+ <rect key="frame" x="-1" y="-1" width="86" height="16"/>
+ <buttonCell key="cell" type="check" title="Send file to:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="306">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBSendToAppEnabled" id="Kff-6m-jt9"/>
+ </connections>
+ </button>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="448">
+ <rect key="frame" x="89" y="0.0" width="32" height="14"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="None" id="449">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.SendCompletedEncodeToApp" id="453"/>
+ </connections>
+ </textFieldCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBSendToApp" id="f36-PN-c5F">
+ <dictionary key="options">
+ <string key="NSNullPlaceholder">None</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="450">
+ <rect key="frame" x="119" y="-7" width="76" height="25"/>
+ <buttonCell key="cell" type="push" title="Browse…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="451">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="browseSendToApp:" target="-2" id="455"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="nji-Au-Qm6">
+ <rect key="frame" x="0.0" y="194" width="441" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cgC-1f-KdT">
+ <rect key="frame" x="0.0" y="0.0" width="441" height="178"/>
+ <subviews>
+ <textField horizontalHuggingPriority="249" verticalHuggingPriority="749" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="276">
+ <rect key="frame" x="-2" y="0.0" width="72" height="178"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Output Files:" id="308">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5rX-nV-cnr">
+ <rect key="frame" x="76" y="0.0" width="365" height="178"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qlP-Qk-4OU">
+ <rect key="frame" x="0.0" y="164" width="181" height="14"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="486">
+ <rect key="frame" x="-2" y="0.0" width="126" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Default MP4 Extension:" id="487">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="289">
+ <rect key="frame" x="126" y="-4" width="59" height="20"/>
+ <popUpButtonCell key="cell" type="push" title="Auto" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="292" id="309">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="290">
+ <items>
+ <menuItem title="Auto" state="on" id="292"/>
+ <menuItem title=".m4v" id="484"/>
+ <menuItem title=".mp4" id="485"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="486" id="3J0-Cd-s8X"/>
+ <binding destination="61" name="selectedValue" keyPath="values.DefaultMpegExtension" id="490"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="239">
+ <rect key="frame" x="-1" y="143" width="187" height="16"/>
+ <buttonCell key="cell" type="check" title="Automatically name output files" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="302">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.DefaultAutoNaming" id="262"/>
+ </connections>
+ </button>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" horizontalHuggingPriority="750" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eM6-W0-cC4">
+ <rect key="frame" x="16" y="100" width="349" height="38"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="fF9-Q1-vYr">
+ <rect key="frame" x="-2" y="0.0" width="45" height="38"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Format:" id="3dN-MN-DcP">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="RQc-sb-xRW"/>
+ </connections>
+ </textField>
+ <tokenField horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6aa-GX-TuM">
+ <rect key="frame" x="49" y="0.0" width="300" height="38"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="300" id="PN0-BF-dcA"/>
+ <constraint firstAttribute="height" constant="38" id="hvh-Ma-kry"/>
+ </constraints>
+ <tokenFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="left" drawsBackground="YES" allowsEditingTextAttributes="YES" id="dHt-ry-PKg">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </tokenFieldCell>
+ <connections>
+ <accessibilityConnection property="title" destination="fF9-Q1-vYr" id="EWY-KP-WsI"/>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="VeX-1Z-Ejc"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingFormat" id="Sf1-9q-Gag">
+ <dictionary key="options">
+ <bool key="NSContinuouslyUpdatesValue" value="YES"/>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ <outlet property="delegate" destination="-2" id="3bd-m3-Fz5"/>
+ </connections>
+ </tokenField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <tokenField toolTip="Drag labels to the Format field to compose a naming format." horizontalHuggingPriority="1000" verticalHuggingPriority="249" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Tk3-Ig-fFI">
+ <rect key="frame" x="63" y="80" width="304" height="14"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="300" id="GPI-Do-VPV"/>
+ </constraints>
+ <tokenFieldCell key="cell" controlSize="small" selectable="YES" allowsUndo="NO" alignment="left" allowsEditingTextAttributes="YES" id="cjy-yP-lqT">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </tokenFieldCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="uxo-hQ-6mt"/>
+ <outlet property="delegate" destination="-2" id="P3H-mA-QsB"/>
+ </connections>
+ </tokenField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="751" verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LKY-ui-YVw">
+ <rect key="frame" x="63" y="60" width="274" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Drag labels to Format to compose a naming format." id="dQ6-Dh-9sD">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="DLn-Xh-Zkh">
+ <rect key="frame" x="-1" y="39" width="197" height="16"/>
+ <buttonCell key="cell" type="check" title="Replace underscores with spaces" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="pUi-lK-cHw">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="NEY-u9-7gj"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingRemoveUnderscore" id="8eN-wY-VqG"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="GNx-QT-RSv">
+ <rect key="frame" x="-1" y="19" width="177" height="16"/>
+ <buttonCell key="cell" type="check" title="Remove common punctuation" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="wo5-iR-2mb">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="670-dr-Vj0"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingRemovePunctuation" id="aDU-h4-vOD"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="zXr-lf-3A4">
+ <rect key="frame" x="-1" y="-1" width="159" height="16"/>
+ <buttonCell key="cell" type="check" title="Change case to Title Case" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="ggR-Zs-P8G">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="enabled" keyPath="values.DefaultAutoNaming" id="OIc-Z7-E7O"/>
+ <binding destination="61" name="value" keyPath="values.HBAutoNamingTitleCase" id="xRh-dS-r4w"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="Tk3-Ig-fFI" firstAttribute="leading" secondItem="6aa-GX-TuM" secondAttribute="leading" id="60J-wg-oit"/>
+ <constraint firstItem="LKY-ui-YVw" firstAttribute="leading" secondItem="Tk3-Ig-fFI" secondAttribute="leading" id="HJJ-o9-poS"/>
+ <constraint firstItem="eM6-W0-cC4" firstAttribute="leading" secondItem="239" secondAttribute="leading" constant="16" id="jtQ-an-NFv"/>
+ </constraints>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstItem="243" firstAttribute="top" secondItem="ibT-yk-a1x" secondAttribute="bottom" constant="6" symbolic="YES" id="0Ve-he-TUP"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="289" secondAttribute="trailing" constant="20" id="0Wh-5B-G4F"/>
- <constraint firstItem="Tk3-Ig-fFI" firstAttribute="leading" secondItem="6aa-GX-TuM" secondAttribute="leading" id="1Kf-en-5q9"/>
- <constraint firstItem="zXr-lf-3A4" firstAttribute="leading" secondItem="fF9-Q1-vYr" secondAttribute="leading" id="1Lb-sk-9ki"/>
- <constraint firstItem="289" firstAttribute="leading" secondItem="486" secondAttribute="trailing" constant="8" id="1qy-Pe-xFN"/>
- <constraint firstItem="WwH-AE-z8q" firstAttribute="top" secondItem="491" secondAttribute="bottom" constant="8" symbolic="YES" id="2A5-Gb-oze"/>
- <constraint firstItem="GNx-QT-RSv" firstAttribute="top" secondItem="DLn-Xh-Zkh" secondAttribute="bottom" constant="6" symbolic="YES" id="2IG-sk-Jld"/>
- <constraint firstItem="6aa-GX-TuM" firstAttribute="top" secondItem="239" secondAttribute="bottom" constant="8" id="2g9-dj-Ag0"/>
- <constraint firstItem="Tk3-Ig-fFI" firstAttribute="trailing" secondItem="6aa-GX-TuM" secondAttribute="trailing" id="Cq4-kH-dOA"/>
- <constraint firstItem="WwH-AE-z8q" firstAttribute="leading" secondItem="491" secondAttribute="leading" id="DKM-br-yrj"/>
- <constraint firstItem="242" firstAttribute="width" secondItem="275" secondAttribute="width" id="E4X-tC-q2a"/>
- <constraint firstAttribute="trailing" secondItem="6aa-GX-TuM" secondAttribute="trailing" constant="20" id="EMh-P5-J2G"/>
- <constraint firstItem="491" firstAttribute="leading" secondItem="242" secondAttribute="trailing" constant="8" id="F1e-gf-NbH"/>
- <constraint firstItem="486" firstAttribute="top" secondItem="244" secondAttribute="bottom" constant="32" id="M5X-Yf-YF1"/>
- <constraint firstItem="486" firstAttribute="baseline" secondItem="276" secondAttribute="baseline" id="OYy-IV-I03"/>
- <constraint firstItem="275" firstAttribute="leading" secondItem="2nU-46-chy" secondAttribute="leading" constant="20" id="PGp-iB-THM"/>
- <constraint firstItem="fF9-Q1-vYr" firstAttribute="leading" secondItem="239" secondAttribute="leading" constant="20" id="SS9-uQ-6Go"/>
- <constraint firstItem="276" firstAttribute="width" secondItem="242" secondAttribute="width" id="SZO-Nh-DzR"/>
- <constraint firstItem="448" firstAttribute="baseline" secondItem="450" secondAttribute="baseline" id="Slf-d8-VGD"/>
- <constraint firstItem="242" firstAttribute="baseline" secondItem="491" secondAttribute="baseline" id="U5Q-C2-9Ka"/>
- <constraint firstItem="DLn-Xh-Zkh" firstAttribute="leading" secondItem="fF9-Q1-vYr" secondAttribute="leading" id="Ulo-m6-kkm"/>
- <constraint firstItem="491" firstAttribute="top" secondItem="243" secondAttribute="bottom" constant="30" id="WRD-Bt-DIB"/>
- <constraint firstItem="450" firstAttribute="leading" secondItem="448" secondAttribute="trailing" constant="15" id="WXk-Mq-Ak0"/>
- <constraint firstItem="244" firstAttribute="leading" secondItem="491" secondAttribute="leading" id="X9l-qe-zBa"/>
- <constraint firstItem="Tk3-Ig-fFI" firstAttribute="top" secondItem="6aa-GX-TuM" secondAttribute="bottom" constant="8" id="Ylo-U4-kLF"/>
- <constraint firstItem="239" firstAttribute="leading" secondItem="486" secondAttribute="leading" id="ZVo-li-WxS"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="239" secondAttribute="trailing" constant="20" symbolic="YES" id="a53-c6-s3J"/>
- <constraint firstItem="275" firstAttribute="top" secondItem="2nU-46-chy" secondAttribute="top" constant="20" id="aoK-bz-eFO"/>
- <constraint firstAttribute="trailing" secondItem="450" secondAttribute="trailing" constant="20" id="bST-TU-O33"/>
- <constraint firstItem="GNx-QT-RSv" firstAttribute="leading" secondItem="fF9-Q1-vYr" secondAttribute="leading" id="c0N-JJ-FGV"/>
- <constraint firstItem="457" firstAttribute="leading" secondItem="491" secondAttribute="leading" id="d0u-Se-Uyi"/>
- <constraint firstItem="486" firstAttribute="leading" secondItem="276" secondAttribute="trailing" constant="8" id="eXu-ae-cA9"/>
- <constraint firstItem="LKY-ui-YVw" firstAttribute="top" secondItem="Tk3-Ig-fFI" secondAttribute="bottom" constant="8" id="ewW-8a-c9I"/>
- <constraint firstItem="zXr-lf-3A4" firstAttribute="top" secondItem="GNx-QT-RSv" secondAttribute="bottom" constant="6" symbolic="YES" id="fI8-ee-3cT"/>
- <constraint firstItem="DLn-Xh-Zkh" firstAttribute="top" secondItem="LKY-ui-YVw" secondAttribute="bottom" constant="8" id="fNX-6U-TeD"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="DLn-Xh-Zkh" secondAttribute="trailing" constant="20" id="gCa-HW-eo3"/>
- <constraint firstItem="LKY-ui-YVw" firstAttribute="leading" secondItem="Tk3-Ig-fFI" secondAttribute="leading" id="gcQ-Hz-gy2"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="491" secondAttribute="trailing" constant="20" id="h9K-S8-eCN"/>
- <constraint firstItem="244" firstAttribute="baseline" secondItem="448" secondAttribute="baseline" id="hAS-qo-neE"/>
- <constraint firstItem="448" firstAttribute="leading" secondItem="244" secondAttribute="trailing" constant="4" id="hAq-zP-I6D"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="457" secondAttribute="trailing" constant="20" id="hGh-nX-2C5"/>
- <constraint firstItem="242" firstAttribute="leading" secondItem="275" secondAttribute="leading" id="hSW-pY-6RE"/>
- <constraint firstItem="239" firstAttribute="top" secondItem="486" secondAttribute="bottom" constant="10" id="i6e-VH-ibw"/>
- <constraint firstItem="244" firstAttribute="top" secondItem="457" secondAttribute="bottom" constant="6" symbolic="YES" id="jEg-eN-8hf"/>
- <constraint firstItem="6aa-GX-TuM" firstAttribute="baseline" secondItem="fF9-Q1-vYr" secondAttribute="baseline" id="kC4-Tb-uCJ"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="243" secondAttribute="trailing" constant="20" id="kNV-vU-z80"/>
- <constraint firstItem="457" firstAttribute="top" secondItem="WwH-AE-z8q" secondAttribute="bottom" constant="6" id="ka2-NF-4Mz"/>
- <constraint firstAttribute="bottom" secondItem="zXr-lf-3A4" secondAttribute="bottom" constant="20" id="mvs-MH-FCb"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="zXr-lf-3A4" secondAttribute="trailing" constant="20" id="niq-u4-9mZ"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="LKY-ui-YVw" secondAttribute="trailing" constant="20" id="oxZ-nJ-DLU"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="WwH-AE-z8q" secondAttribute="trailing" constant="20" id="pVc-gd-Mm2"/>
- <constraint firstItem="276" firstAttribute="leading" secondItem="242" secondAttribute="leading" id="q9f-VN-fRs"/>
- <constraint firstItem="275" firstAttribute="baseline" secondItem="ibT-yk-a1x" secondAttribute="baseline" id="r7T-Yv-IHv"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="GNx-QT-RSv" secondAttribute="trailing" constant="20" id="sJl-TF-Qbn"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ibT-yk-a1x" secondAttribute="trailing" constant="20" id="sq8-gG-xIc"/>
- <constraint firstItem="ibT-yk-a1x" firstAttribute="leading" secondItem="275" secondAttribute="trailing" constant="8" id="tqZ-7b-kDL"/>
- <constraint firstItem="243" firstAttribute="leading" secondItem="ibT-yk-a1x" secondAttribute="leading" id="vNZ-am-3Cl"/>
- <constraint firstItem="486" firstAttribute="baseline" secondItem="289" secondAttribute="baseline" id="vgu-QJ-kiv"/>
- <constraint firstItem="6aa-GX-TuM" firstAttribute="leading" secondItem="fF9-Q1-vYr" secondAttribute="trailing" constant="8" id="zdm-yq-Mc8"/>
+ <constraint firstItem="Ogp-hO-ybK" firstAttribute="leading" secondItem="TQb-nF-3BD" secondAttribute="leading" id="0Jk-4f-Cw7"/>
+ <constraint firstAttribute="trailing" secondItem="nji-Au-Qm6" secondAttribute="trailing" id="Krg-wA-xJW"/>
+ <constraint firstItem="nji-Au-Qm6" firstAttribute="leading" secondItem="TQb-nF-3BD" secondAttribute="leading" id="Pbj-AK-XSD"/>
+ <constraint firstItem="242" firstAttribute="width" secondItem="276" secondAttribute="width" id="SFu-Ft-qsY"/>
+ <constraint firstAttribute="trailing" secondItem="Ogp-hO-ybK" secondAttribute="trailing" id="XUE-eg-gaC"/>
+ <constraint firstItem="242" firstAttribute="width" secondItem="275" secondAttribute="width" id="ggL-zI-piR"/>
 </constraints>
- </customView>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstAttribute="bottom" secondItem="2nU-46-chy" secondAttribute="bottom" id="In3-7y-sfL"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2nU-46-chy" secondAttribute="trailing" id="Sbm-nJ-a0H"/>
- <constraint firstItem="2nU-46-chy" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="233" secondAttribute="leading" id="auL-28-oGS"/>
- <constraint firstItem="2nU-46-chy" firstAttribute="centerX" secondItem="233" secondAttribute="centerX" id="cyU-le-zvE"/>
- <constraint firstItem="2nU-46-chy" firstAttribute="top" secondItem="233" secondAttribute="top" id="lro-oX-OdV"/>
+ <constraint firstItem="TQb-nF-3BD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="233" secondAttribute="leading" constant="20" symbolic="YES" id="IFf-Zh-Oen"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="TQb-nF-3BD" secondAttribute="trailing" id="Lbr-eY-CDB"/>
+ <constraint firstItem="TQb-nF-3BD" firstAttribute="centerX" secondItem="233" secondAttribute="centerX" id="ZE4-er-nq4"/>
+ <constraint firstAttribute="bottom" secondItem="TQb-nF-3BD" secondAttribute="bottom" constant="20" symbolic="YES" id="czc-wV-7ee"/>
+ <constraint firstItem="TQb-nF-3BD" firstAttribute="top" secondItem="233" secondAttribute="top" constant="20" symbolic="YES" id="u4A-xM-w8P"/>
 </constraints>
- <point key="canvasLocation" x="298" y="-127"/>
+ <point key="canvasLocation" x="48" y="-129"/>
 </customView>
 <customView id="236" userLabel="Advanced">
- <rect key="frame" x="0.0" y="0.0" width="454" height="316"/>
+ <rect key="frame" x="0.0" y="0.0" width="580" height="424"/>
 <autoresizingMask key="autoresizingMask"/>
 <subviews>
- <customView translatesAutoresizingMaskIntoConstraints="NO" id="4UU-uq-R9U">
- <rect key="frame" x="16" y="0.0" width="422" height="316"/>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="16" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OVb-Af-BVd">
+ <rect key="frame" x="79" y="20" width="422" height="387"/>
 <subviews>
- <popUpButton toolTip="Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="363">
- <rect key="frame" x="164" y="139" width="90" height="22"/>
- <popUpButtonCell key="cell" type="push" title="Standard" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="369" id="364">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="365">
- <items>
- <menuItem title="Minimised" id="370"/>
- <menuItem title="Standard" state="on" tag="1" id="369"/>
- <menuItem title="Extended" tag="2" id="368"/>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="371" id="awk-S1-w3X"/>
- <binding destination="61" name="selectedTag" keyPath="values.LoggingLevel" id="uEG-ln-cb1"/>
- </connections>
- </popUpButton>
- <popUpButton toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="387">
- <rect key="frame" x="284" y="277" width="60" height="22"/>
- <popUpButtonCell key="cell" type="push" title="0.25" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="4" imageScaling="proportionallyDown" inset="2" selectedItem="391" id="388">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="389">
- <items>
- <menuItem title="1.0" tag="1" id="394"/>
- <menuItem title="0.50" tag="2" id="393"/>
- <menuItem title="0.25" state="on" tag="4" id="391">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="0.20" tag="5" id="390">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="395" id="NVF-jL-QpH"/>
- <binding destination="61" name="selectedTag" keyPath="values.HBx264CqSliderFractional" id="XKV-6r-lP5"/>
- </connections>
- </popUpButton>
- <button toolTip="Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="398">
- <rect key="frame" x="72" y="175" width="219" height="18"/>
- <buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.UseDvdNav" id="400"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="347">
- <rect key="frame" x="72" y="121" width="256" height="18"/>
- <buttonCell key="cell" type="check" title="Store Activity Logs in same location as video" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="348">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.EncodeLogLocation" id="349"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="442">
- <rect key="frame" x="-2" y="177" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="DVD Reader:" id="443">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="248" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="IV7-SY-HLR">
- <rect key="frame" x="-2" y="248" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Title Scan:" id="c0L-TU-WML">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="jPa-4p-Y29">
- <rect key="frame" x="-2" y="282" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Encoder:" id="cqp-xU-GOe">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="350">
- <rect key="frame" x="-2" y="144" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Activity Logs:" id="351">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="371">
- <rect key="frame" x="73" y="144" width="88" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Verbosity Level:" id="372">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="359">
- <rect key="frame" x="73" y="226" width="195" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Number of picture previews to scan:" id="360">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="463">
- <rect key="frame" x="73" y="248" width="228" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Ignore DVD and Blu-ray titles shorter than:" id="464">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="UXr-op-aKN">
- <rect key="frame" x="352" y="248" width="49" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="klQ-DW-Kc6">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="395">
- <rect key="frame" x="73" y="282" width="208" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Constant Quality fractional granularity:" id="396">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Minimum title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="480">
- <rect key="frame" x="307" y="245" width="40" height="19"/>
- <constraints>
- <constraint firstAttribute="width" constant="40" id="y5Z-y6-LMm"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="481">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <accessibilityConnection property="title" destination="463" id="7YR-Pi-GBe"/>
- <binding destination="61" name="value" keyPath="values.MinTitleScanSeconds" id="483"/>
- </connections>
- </textField>
- <popUpButton toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="352">
- <rect key="frame" x="271" y="221" width="56" height="22"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="ASh-ct-Imw"/>
- </constraints>
- <popUpButtonCell key="cell" type="push" title="15" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="356" id="353">
- <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
- <menu key="menu" title="OtherViews" id="354">
- <items>
- <menuItem title="10" id="355"/>
- <menuItem title="15" state="on" id="356"/>
- <menuItem title="20" id="357"/>
- <menuItem title="25" id="361">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="30" id="362">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="35" id="514">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="40" id="515">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="45" id="516">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="50" id="517">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="55" id="518">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- <menuItem title="60" id="519">
- <modifierMask key="keyEquivalentModifierMask"/>
- </menuItem>
- </items>
- </menu>
- </popUpButtonCell>
- <connections>
- <accessibilityConnection property="title" destination="359" id="83c-8K-HW6"/>
- <binding destination="61" name="selectedValue" keyPath="values.PreviewsNumber" id="358"/>
- </connections>
- </popUpButton>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ndp-Xh-ohY">
- <rect key="frame" x="72" y="103" width="342" height="18"/>
- <buttonCell key="cell" type="check" title="Remove old logs from main Activity Logs folder after 30 days" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lgn-RF-k0d">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBClearOldLogs" id="98r-xV-IVB"/>
- </connections>
- </button>
- <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="I0X-1x-9qe">
- <rect key="frame" x="0.0" y="205" width="422" height="5"/>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vWO-gM-Ipq">
+ <rect key="frame" x="0.0" y="326" width="410" height="61"/>
+ <subviews>
+ <textField horizontalHuggingPriority="248" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="IV7-SY-HLR">
+ <rect key="frame" x="-2" y="44" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Scan:" id="c0L-TU-WML">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dmh-H9-na9">
+ <rect key="frame" x="79" y="0.0" width="331" height="61"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="250" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WJs-Wy-S1o">
+ <rect key="frame" x="0.0" y="42" width="331" height="19"/>
+ <subviews>
+ <textField toolTip="Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="463">
+ <rect key="frame" x="-2" y="2" width="228" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Ignore DVD and Blu-ray titles shorter than:" id="464">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField toolTip="Minimum title duration in seconds. Shorter titles will be skipped." verticalHuggingPriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="480">
+ <rect key="frame" x="230" y="0.0" width="50" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="DCn-qW-TPY"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="481">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <accessibilityConnection property="title" destination="463" id="7YR-Pi-GBe"/>
+ <binding destination="61" name="value" keyPath="values.MinTitleScanSeconds" id="483"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="UXr-op-aKN">
+ <rect key="frame" x="284" y="2" width="49" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="seconds" id="klQ-DW-Kc6">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="O8F-xH-gTY">
+ <rect key="frame" x="0.0" y="20" width="238" height="16"/>
+ <subviews>
+ <textField toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="359">
+ <rect key="frame" x="-2" y="1" width="195" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Number of picture previews to scan:" id="360">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time." verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="352">
+ <rect key="frame" x="195" y="-4" width="47" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="15" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="356" id="353">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="354">
+ <items>
+ <menuItem title="10" id="355"/>
+ <menuItem title="15" state="on" id="356"/>
+ <menuItem title="20" id="357"/>
+ <menuItem title="25" id="361">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="30" id="362">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="35" id="514">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="40" id="515">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="45" id="516">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="50" id="517">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="55" id="518">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="60" id="519">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="359" id="83c-8K-HW6"/>
+ <binding destination="61" name="selectedValue" keyPath="values.PreviewsNumber" id="358"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button toolTip="Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)." verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="398">
+ <rect key="frame" x="-1" y="-1" width="218" height="16"/>
+ <buttonCell key="cell" type="check" title="Use libdvdnav (instead of libdvdread)" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="399">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.UseDvdNav" id="400"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="1000" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="ETV-cg-RgU">
+ <rect key="frame" x="0.0" y="307" width="422" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tQh-6O-iM2">
+ <rect key="frame" x="0.0" y="277" width="422" height="16"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="jPa-4p-Y29">
+ <rect key="frame" x="-2" y="1" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Encoder:" id="cqp-xU-GOe">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jxx-8p-Riz">
+ <rect key="frame" x="79" y="0.0" width="343" height="16"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" horizontalHuggingPriority="249" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hdb-ng-C9T">
+ <rect key="frame" x="0.0" y="0.0" width="260" height="16"/>
+ <subviews>
+ <textField toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="395">
+ <rect key="frame" x="-2" y="1" width="208" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Constant Quality fractional granularity:" id="396">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments." horizontalHuggingPriority="750" verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="387">
+ <rect key="frame" x="208" y="-4" width="56" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="0.25" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="4" imageScaling="proportionallyDown" inset="2" selectedItem="391" id="388">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="389">
+ <items>
+ <menuItem title="1.0" tag="1" id="394"/>
+ <menuItem title="0.50" tag="2" id="393"/>
+ <menuItem title="0.25" state="on" tag="4" id="391">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem title="0.20" tag="5" id="390">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="395" id="NVF-jL-QpH"/>
+ <binding destination="61" name="selectedTag" keyPath="values.HBx264CqSliderFractional" id="XKV-6r-lP5"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="1000" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="VIv-34-shj">
+ <rect key="frame" x="0.0" y="258" width="422" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FOD-gy-lzc">
+ <rect key="frame" x="0.0" y="230" width="331" height="14"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="ufI-Bw-KRl">
+ <rect key="frame" x="-2" y="0.0" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Preset:" id="wiP-Ia-DfB">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mAx-W7-fQr">
+ <rect key="frame" x="78" y="-1" width="253" height="16"/>
+ <buttonCell key="cell" type="check" title="Keep preset edits when selecting a new title" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="L3N-te-KLg">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBKeepPresetEdits" id="hVZ-Oi-NoC"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="1000" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="0OI-K4-nd9">
+ <rect key="frame" x="0.0" y="211" width="422" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SV2-pU-Zy5">
+ <rect key="frame" x="0.0" y="136" width="399" height="61"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="251" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="sRQ-Oe-1xH">
+ <rect key="frame" x="-2" y="44" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Queue:" id="FKi-zh-5gc">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="P8c-PO-rqP">
+ <rect key="frame" x="79" y="0.0" width="320" height="61"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="B4I-9g-QVt">
+ <rect key="frame" x="0.0" y="42" width="308" height="19"/>
+ <subviews>
+ <button verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="htF-lD-ZBh">
+ <rect key="frame" x="-1" y="1" width="231" height="16"/>
+ <buttonCell key="cell" type="check" title="Pause queue if disk space is lower than:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="yG9-mz-tqQ">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBQueuePauseIfLowSpace" id="GWr-Dv-XBh"/>
+ </connections>
+ </button>
+ <textField toolTip="Minimum free space on destination disk." horizontalHuggingPriority="1000" verticalHuggingPriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PaR-zw-opS">
+ <rect key="frame" x="236" y="0.0" width="50" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="QfS-RV-sxI"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Qph-AN-EnT">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <accessibilityConnection property="title" destination="463" id="YME-4F-SDY"/>
+ <binding destination="61" name="value" keyPath="values.HBQueueMinFreeSpace" id="xrN-DJ-ihe"/>
+ </connections>
+ </textField>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="Koh-5H-cdo">
+ <rect key="frame" x="290" y="2" width="20" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="GB" id="FZE-ZR-g93">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Ls7-9W-hx0">
+ <rect key="frame" x="-1" y="21" width="321" height="16"/>
+ <buttonCell key="cell" type="check" title="Always clear completed items after an encode completes" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="BPU-E2-N8l">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBQueueAutoClearCompletedItems" id="REM-0C-RXQ"/>
+ </connections>
+ </button>
+ <stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ExZ-Gs-Uis">
+ <rect key="frame" x="0.0" y="0.0" width="220" height="16"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="qkp-nA-8ES">
+ <rect key="frame" x="-2" y="1" width="184" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Number of simultaneous encodes:" id="iGS-b5-ip7">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores." verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="MLd-Te-AbW">
+ <rect key="frame" x="184" y="-4" width="40" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="1" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="l8v-ns-6UR" id="Ehf-WH-7od">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="TpU-3v-fhx">
+ <items>
+ <menuItem title="1" state="on" tag="1" id="l8v-ns-6UR"/>
+ <menuItem title="2" tag="2" id="JcO-br-AXz"/>
+ <menuItem title="3" tag="3" id="ZGL-FR-zSW"/>
+ <menuItem title="4" tag="4" id="nTJ-DB-eOd">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="qkp-nA-8ES" id="Zgd-vO-nh8"/>
+ <binding destination="61" name="selectedTag" keyPath="values.HBQueueWorkerCounts" id="Ghu-LG-z3R"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="1000" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="I0X-1x-9qe">
+ <rect key="frame" x="0.0" y="117" width="422" height="5"/>
+ </box>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ywq-ob-I2a">
+ <rect key="frame" x="0.0" y="47" width="418" height="56"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="400" translatesAutoresizingMaskIntoConstraints="NO" id="350">
+ <rect key="frame" x="-2" y="41" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Activity Logs:" id="351">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="1000" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BDw-49-Vil">
+ <rect key="frame" x="79" y="0.0" width="339" height="56"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Id7-c4-iCn">
+ <rect key="frame" x="0.0" y="40" width="168" height="16"/>
+ <subviews>
+ <textField toolTip="Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="371">
+ <rect key="frame" x="-2" y="1" width="88" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Verbosity Level:" id="372">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <popUpButton toolTip="Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="363">
+ <rect key="frame" x="86" y="-4" width="86" height="22"/>
+ <popUpButtonCell key="cell" type="push" title="Standard" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" tag="1" imageScaling="proportionallyDown" inset="2" selectedItem="369" id="364">
+ <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <menu key="menu" title="OtherViews" id="365">
+ <items>
+ <menuItem title="Minimised" id="370"/>
+ <menuItem title="Standard" state="on" tag="1" id="369"/>
+ <menuItem title="Extended" tag="2" id="368"/>
+ </items>
+ </menu>
+ </popUpButtonCell>
+ <connections>
+ <accessibilityConnection property="title" destination="371" id="awk-S1-w3X"/>
+ <binding destination="61" name="selectedTag" keyPath="values.LoggingLevel" id="uEG-ln-cb1"/>
+ </connections>
+ </popUpButton>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <button verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="347">
+ <rect key="frame" x="-1" y="19" width="255" height="16"/>
+ <buttonCell key="cell" type="check" title="Store Activity Logs in same location as video" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="348">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.EncodeLogLocation" id="349"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Ndp-Xh-ohY">
+ <rect key="frame" x="-1" y="-1" width="340" height="16"/>
+ <buttonCell key="cell" type="check" title="Remove old logs from main Activity Logs folder after 30 days" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="lgn-RF-k0d">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBClearOldLogs" id="98r-xV-IVB"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <box verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="756-9v-KSX">
+ <rect key="frame" x="0.0" y="28" width="422" height="5"/>
 </box>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="sRQ-Oe-1xH">
- <rect key="frame" x="-2" y="71" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Queue:" id="FKi-zh-5gc">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="htF-lD-ZBh">
- <rect key="frame" x="72" y="69" width="232" height="18"/>
- <buttonCell key="cell" type="check" title="Pause queue if disk space is lower than:" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="yG9-mz-tqQ">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBQueuePauseIfLowSpace" id="GWr-Dv-XBh"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="Koh-5H-cdo">
- <rect key="frame" x="355" y="71" width="20" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="GB" id="FZE-ZR-g93">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <textField toolTip="Minimum free space on destination disk." verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="PaR-zw-opS">
- <rect key="frame" x="310" y="68" width="40" height="19"/>
- <constraints>
- <constraint firstAttribute="width" constant="40" id="uuf-kg-lmG"/>
- </constraints>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="Qph-AN-EnT">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- <connections>
- <accessibilityConnection property="title" destination="463" id="YME-4F-SDY"/>
- <binding destination="61" name="value" keyPath="values.HBQueueMinFreeSpace" id="xrN-DJ-ihe"/>
- </connections>
- </textField>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Ls7-9W-hx0">
- <rect key="frame" x="72" y="51" width="322" height="18"/>
- <buttonCell key="cell" type="check" title="Always clear completed items after an encode completes" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="BPU-E2-N8l">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBQueueAutoClearCompletedItems" id="REM-0C-RXQ"/>
- </connections>
- </button>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="6NP-6w-Wa6">
- <rect key="frame" x="-2" y="19" width="71" height="14"/>
- <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Summary:" id="GQJ-go-PoN">
- 
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tTD-8F-0aT">
- <rect key="frame" x="72" y="17" width="136" height="18"/>
- <buttonCell key="cell" type="check" title="Show preview images" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="Aao-Tf-JeJ">
- <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
- </buttonCell>
- <connections>
- <binding destination="61" name="value" keyPath="values.HBShowSummaryPreview" id="NcJ-BV-BdB"/>
- </connections>
- </button>
+ <stackView distribution="fill" orientation="horizontal" alignment="firstBaseline" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="750" verticalHuggingPriority="1000" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7c9-5I-bdX">
+ <rect key="frame" x="0.0" y="0.0" width="213" height="14"/>
+ <subviews>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="251" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="6NP-6w-Wa6">
+ <rect key="frame" x="-2" y="0.0" width="75" height="14"/>
+ <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Summary:" id="GQJ-go-PoN">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <button verticalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="tTD-8F-0aT">
+ <rect key="frame" x="78" y="-1" width="135" height="16"/>
+ <buttonCell key="cell" type="check" title="Show preview images" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="Aao-Tf-JeJ">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="61" name="value" keyPath="values.HBShowSummaryPreview" id="NcJ-BV-BdB"/>
+ </connections>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstItem="jPa-4p-Y29" firstAttribute="leading" secondItem="4UU-uq-R9U" secondAttribute="leading" id="0XL-N8-hhe"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="363" secondAttribute="trailing" constant="20" id="0by-WQ-IEO"/>
- <constraint firstItem="442" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="0y2-cf-8RZ"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ls7-9W-hx0" secondAttribute="trailing" id="1mz-JE-wO6"/>
- <constraint firstItem="tTD-8F-0aT" firstAttribute="firstBaseline" secondItem="6NP-6w-Wa6" secondAttribute="firstBaseline" id="4SA-QV-ZJw"/>
- <constraint firstItem="359" firstAttribute="baseline" secondItem="352" secondAttribute="baseline" id="7tL-h8-5AB"/>
- <constraint firstItem="395" firstAttribute="baseline" secondItem="387" secondAttribute="baseline" id="80j-Xc-t7X"/>
- <constraint firstItem="tTD-8F-0aT" firstAttribute="leading" secondItem="6NP-6w-Wa6" secondAttribute="trailing" constant="8" id="BFP-es-G5m"/>
- <constraint firstItem="347" firstAttribute="leading" secondItem="371" secondAttribute="leading" id="Bwa-R1-Sg0"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="UXr-op-aKN" secondAttribute="trailing" id="CRS-Yq-1Ur"/>
- <constraint firstItem="htF-lD-ZBh" firstAttribute="baseline" secondItem="sRQ-Oe-1xH" secondAttribute="baseline" id="DMh-iO-Tvh"/>
- <constraint firstItem="sRQ-Oe-1xH" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="DYV-81-ZgI"/>
- <constraint firstItem="6NP-6w-Wa6" firstAttribute="leading" secondItem="sRQ-Oe-1xH" secondAttribute="leading" id="Dcs-HM-CpI"/>
- <constraint firstItem="IV7-SY-HLR" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="Ekr-Q8-lG6"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="347" secondAttribute="trailing" id="G8s-yJ-mYX"/>
- <constraint firstItem="371" firstAttribute="leading" secondItem="350" secondAttribute="trailing" constant="8" id="GOV-QT-45K"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="398" secondAttribute="trailing" constant="20" id="H0U-AP-LwY"/>
- <constraint firstItem="Koh-5H-cdo" firstAttribute="leading" secondItem="PaR-zw-opS" secondAttribute="trailing" constant="7" id="Hd0-hx-WId"/>
- <constraint firstItem="350" firstAttribute="baseline" secondItem="371" secondAttribute="baseline" id="KJC-CV-ZFy"/>
- <constraint firstItem="Ndp-Xh-ohY" firstAttribute="top" secondItem="347" secondAttribute="bottom" constant="6" id="Kgc-7G-m3M"/>
- <constraint firstItem="463" firstAttribute="top" secondItem="395" secondAttribute="bottom" constant="20" id="LNo-ir-2Ih"/>
- <constraint firstItem="jPa-4p-Y29" firstAttribute="top" secondItem="4UU-uq-R9U" secondAttribute="top" constant="20" id="Mib-9l-uBL"/>
- <constraint firstItem="371" firstAttribute="top" secondItem="398" secondAttribute="bottom" constant="20" id="Mt3-Wx-Kuh"/>
- <constraint firstAttribute="bottom" secondItem="tTD-8F-0aT" secondAttribute="bottom" constant="20" id="NEV-0p-AMk"/>
- <constraint firstItem="Ls7-9W-hx0" firstAttribute="leading" secondItem="htF-lD-ZBh" secondAttribute="leading" id="PdO-BP-qSB"/>
- <constraint firstItem="442" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="Pqh-h0-NeI"/>
- <constraint firstItem="Ls7-9W-hx0" firstAttribute="top" secondItem="htF-lD-ZBh" secondAttribute="bottom" constant="6" id="Rs7-bD-PiT"/>
- <constraint firstItem="UXr-op-aKN" firstAttribute="leading" secondItem="480" secondAttribute="trailing" constant="7" id="TR5-Sj-PDx"/>
- <constraint firstItem="htF-lD-ZBh" firstAttribute="leading" secondItem="sRQ-Oe-1xH" secondAttribute="trailing" constant="8" id="TW2-Vp-Dg8"/>
- <constraint firstItem="tTD-8F-0aT" firstAttribute="top" secondItem="Ls7-9W-hx0" secondAttribute="bottom" constant="22" id="TZq-90-UKk"/>
- <constraint firstItem="I0X-1x-9qe" firstAttribute="top" secondItem="359" secondAttribute="bottom" constant="18" id="VUn-iF-GUU"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ndp-Xh-ohY" secondAttribute="trailing" id="W8N-xj-n7t"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="387" secondAttribute="trailing" id="WCG-H7-Rbj"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="352" secondAttribute="trailing" id="WEZ-OQ-4u6"/>
- <constraint firstItem="350" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="YOl-6b-esm"/>
- <constraint firstItem="347" firstAttribute="top" secondItem="371" secondAttribute="bottom" constant="8" id="YZg-Na-mfE"/>
- <constraint firstItem="359" firstAttribute="leading" secondItem="463" secondAttribute="leading" id="aat-Pn-NFf"/>
- <constraint firstAttribute="trailing" secondItem="I0X-1x-9qe" secondAttribute="trailing" id="abk-lH-95N"/>
- <constraint firstItem="363" firstAttribute="leading" secondItem="371" secondAttribute="trailing" constant="8" id="ao3-b4-L3n"/>
- <constraint firstItem="6NP-6w-Wa6" firstAttribute="width" secondItem="sRQ-Oe-1xH" secondAttribute="width" id="bGh-e1-j1Z"/>
- <constraint firstItem="480" firstAttribute="baseline" secondItem="UXr-op-aKN" secondAttribute="baseline" id="bpm-N7-n6P"/>
- <constraint firstItem="395" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="trailing" constant="8" id="caX-fe-X6B"/>
- <constraint firstItem="IV7-SY-HLR" firstAttribute="baseline" secondItem="463" secondAttribute="baseline" id="dGu-2J-ulw"/>
- <constraint firstItem="398" firstAttribute="leading" secondItem="442" secondAttribute="trailing" constant="8" id="eps-Ux-xp1"/>
- <constraint firstItem="IV7-SY-HLR" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="gET-Go-zxJ"/>
- <constraint firstItem="398" firstAttribute="top" secondItem="I0X-1x-9qe" secondAttribute="bottom" constant="17" id="gdO-Fj-mGh"/>
- <constraint firstItem="PaR-zw-opS" firstAttribute="leading" secondItem="htF-lD-ZBh" secondAttribute="trailing" constant="8" id="h3H-QH-Yvf"/>
- <constraint firstItem="387" firstAttribute="leading" secondItem="395" secondAttribute="trailing" constant="8" id="hPc-oW-N0X"/>
- <constraint firstItem="jPa-4p-Y29" firstAttribute="baseline" secondItem="395" secondAttribute="baseline" id="hTL-Uk-IQQ"/>
- <constraint firstItem="PaR-zw-opS" firstAttribute="baseline" secondItem="Koh-5H-cdo" secondAttribute="baseline" id="hiG-dl-OXa"/>
- <constraint firstItem="sRQ-Oe-1xH" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="hqp-8U-592"/>
- <constraint firstItem="350" firstAttribute="leading" secondItem="jPa-4p-Y29" secondAttribute="leading" id="ij3-90-HPL"/>
- <constraint firstItem="480" firstAttribute="leading" secondItem="463" secondAttribute="trailing" constant="8" id="jCH-kU-onJ"/>
- <constraint firstItem="398" firstAttribute="baseline" secondItem="442" secondAttribute="baseline" id="jgZ-xm-mR7"/>
- <constraint firstItem="463" firstAttribute="leading" secondItem="IV7-SY-HLR" secondAttribute="trailing" constant="8" id="n94-r1-Eio"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Koh-5H-cdo" secondAttribute="trailing" id="sEI-yd-xdc"/>
- <constraint firstItem="371" firstAttribute="baseline" secondItem="363" secondAttribute="baseline" id="sKu-bO-LUe"/>
- <constraint firstItem="Ndp-Xh-ohY" firstAttribute="leading" secondItem="347" secondAttribute="leading" id="tCO-d0-lRc"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="tTD-8F-0aT" secondAttribute="trailing" id="tz0-KT-IAR"/>
- <constraint firstItem="352" firstAttribute="leading" secondItem="359" secondAttribute="trailing" constant="8" id="u50-Ic-0EB"/>
- <constraint firstItem="htF-lD-ZBh" firstAttribute="top" secondItem="Ndp-Xh-ohY" secondAttribute="bottom" constant="22" id="ujO-hF-lGo"/>
- <constraint firstItem="463" firstAttribute="baseline" secondItem="480" secondAttribute="baseline" id="ulv-OM-ioh"/>
- <constraint firstItem="359" firstAttribute="top" secondItem="463" secondAttribute="bottom" constant="8" id="uzg-mY-YoJ"/>
- <constraint firstItem="PaR-zw-opS" firstAttribute="baseline" secondItem="htF-lD-ZBh" secondAttribute="baseline" id="wLK-IO-wMW"/>
- <constraint firstItem="I0X-1x-9qe" firstAttribute="leading" secondItem="4UU-uq-R9U" secondAttribute="leading" id="zfW-ta-RNq"/>
+ <constraint firstItem="IV7-SY-HLR" firstAttribute="width" secondItem="350" secondAttribute="width" id="4Bz-gv-uid"/>
+ <constraint firstItem="I0X-1x-9qe" firstAttribute="leading" secondItem="OVb-Af-BVd" secondAttribute="leading" id="4Uo-Zn-IQY"/>
+ <constraint firstAttribute="trailing" secondItem="I0X-1x-9qe" secondAttribute="trailing" id="98y-iP-aJm"/>
+ <constraint firstItem="ufI-Bw-KRl" firstAttribute="width" secondItem="jPa-4p-Y29" secondAttribute="width" id="Isc-qn-kaM"/>
+ <constraint firstItem="tQh-6O-iM2" firstAttribute="trailing" secondItem="I0X-1x-9qe" secondAttribute="trailing" id="NsF-aU-gLY"/>
+ <constraint firstAttribute="trailing" secondItem="ETV-cg-RgU" secondAttribute="trailing" id="SDr-k0-JBP"/>
+ <constraint firstAttribute="trailing" secondItem="VIv-34-shj" secondAttribute="trailing" id="cyy-bN-Avo"/>
+ <constraint firstItem="ETV-cg-RgU" firstAttribute="leading" secondItem="OVb-Af-BVd" secondAttribute="leading" id="kCm-uu-XAz"/>
+ <constraint firstItem="350" firstAttribute="width" secondItem="sRQ-Oe-1xH" secondAttribute="width" id="mhs-ln-Axe"/>
+ <constraint firstAttribute="trailing" secondItem="756-9v-KSX" secondAttribute="trailing" id="mnl-VH-8Jc"/>
+ <constraint firstItem="756-9v-KSX" firstAttribute="leading" secondItem="OVb-Af-BVd" secondAttribute="leading" id="nE5-gC-Etm"/>
+ <constraint firstItem="VIv-34-shj" firstAttribute="leading" secondItem="OVb-Af-BVd" secondAttribute="leading" id="oCQ-Ko-ZX7"/>
+ <constraint firstItem="jPa-4p-Y29" firstAttribute="width" secondItem="IV7-SY-HLR" secondAttribute="width" id="wfJ-1q-hrR"/>
+ <constraint firstItem="sRQ-Oe-1xH" firstAttribute="width" secondItem="6NP-6w-Wa6" secondAttribute="width" id="zDM-j8-4YX"/>
 </constraints>
- </customView>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
 </subviews>
 <constraints>
- <constraint firstItem="4UU-uq-R9U" firstAttribute="top" secondItem="236" secondAttribute="top" id="UlP-ye-wD2"/>
- <constraint firstAttribute="bottom" secondItem="4UU-uq-R9U" secondAttribute="bottom" id="a8K-YA-Tsb"/>
- <constraint firstItem="4UU-uq-R9U" firstAttribute="centerX" secondItem="236" secondAttribute="centerX" id="dwu-su-pTx"/>
- <constraint firstItem="4UU-uq-R9U" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="236" secondAttribute="leading" priority="750" constant="16" id="iT8-1K-bUI"/>
- <constraint firstItem="4UU-uq-R9U" firstAttribute="leading" secondItem="236" secondAttribute="leading" constant="16" id="llp-tm-9Or"/>
- <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="4UU-uq-R9U" secondAttribute="trailing" priority="750" constant="16" id="yAs-3j-mb6"/>
+ <constraint firstItem="OVb-Af-BVd" firstAttribute="top" secondItem="236" secondAttribute="top" constant="17" id="DlK-j8-M1r"/>
+ <constraint firstItem="OVb-Af-BVd" firstAttribute="centerX" secondItem="236" secondAttribute="centerX" id="Upb-rX-dDx"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="OVb-Af-BVd" secondAttribute="trailing" id="epc-g8-2iG"/>
+ <constraint firstAttribute="bottom" secondItem="OVb-Af-BVd" secondAttribute="bottom" constant="20" symbolic="YES" id="rfw-rz-rC5"/>
+ <constraint firstItem="OVb-Af-BVd" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="236" secondAttribute="leading" id="ws0-YM-nwc"/>
 </constraints>
- <point key="canvasLocation" x="452" y="-534.5"/>
+ <point key="canvasLocation" x="64" y="-632"/>
 </customView>
 <customObject id="410" userLabel="Updater" customClass="SPUStandardUpdaterController"/>
 </objects>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Presets.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Presets.xib Changed

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
 <customObject id="-2" userLabel="File's Owner" customClass="HBPresetsViewController">
 <connections>
+ <outlet property="actionsControl" destination="K9F-81-kPO" id="cAi-q4-950"/>
 <outlet property="outlineView" destination="00W-tb-wgY" id="T3u-ix-uIb"/>
 <outlet property="treeController" destination="ohT-Pp-wBT" id="YGP-sN-dS3"/>
 <outlet property="view" destination="Hz6-mo-xeY" id="xR8-5v-xDQ"/>
@@ -15,29 +16,28 @@
 </customObject>
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="230" height="325"/>
+ <customView misplaced="YES" id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="300" height="328"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
 <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="10" verticalLineScroll="16" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uad-bt-uKD">
- <rect key="frame" x="3" y="33" width="224" height="266"/>
+ <rect key="frame" x="6" y="36" width="287" height="266"/>
 <string key="toolTip">Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.
 
 Overrides all encode settings. Settings may be further adjusted after selecting a preset.</string>
 <clipView key="contentView" id="Rcx-jI-nnq">
- <rect key="frame" x="1" y="1" width="222" height="264"/>
+ <rect key="frame" x="1" y="1" width="285" height="264"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" outlineTableColumn="jhC-ge-H1w" id="00W-tb-wgY">
- <rect key="frame" x="0.0" y="0.0" width="222" height="264"/>
+ <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" tableStyle="plain" columnReordering="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="16" autoresizesOutlineColumn="YES" outlineTableColumn="jhC-ge-H1w" id="00W-tb-wgY">
+ <rect key="frame" x="0.0" y="0.0" width="285" height="264"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
- <tableColumn identifier="name" width="219" minWidth="16" maxWidth="1000" id="jhC-ge-H1w">
+ <tableColumn identifier="name" width="282" minWidth="180" maxWidth="1000" id="jhC-ge-H1w">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
@@ -49,11 +49,11 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="czB-kB-CXf" customClass="HBPresetCellView">
- <rect key="frame" x="1" y="1" width="219" height="14"/>
+ <rect key="frame" x="1" y="1" width="282" height="14"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VdJ-Vk-fzJ">
- <rect key="frame" x="0.0" y="0.0" width="219" height="14"/>
+ <rect key="frame" x="0.0" y="0.0" width="282" height="14"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="oBC-Nh-TwB">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -75,6 +75,7 @@
 </textField>
 </subviews>
 <constraints>
+ <constraint firstAttribute="trailing" secondItem="VdJ-Vk-fzJ" secondAttribute="trailing" constant="2" id="8cE-cE-M6l"/>
 <constraint firstItem="VdJ-Vk-fzJ" firstAttribute="centerY" secondItem="czB-kB-CXf" secondAttribute="centerY" id="d3q-z9-Eh5"/>
 <constraint firstItem="VdJ-Vk-fzJ" firstAttribute="centerX" secondItem="czB-kB-CXf" secondAttribute="centerX" id="g5E-fI-10e"/>
 <constraint firstItem="VdJ-Vk-fzJ" firstAttribute="leading" secondItem="czB-kB-CXf" secondAttribute="leading" constant="2" id="itw-vB-Yk6"/>
@@ -96,40 +97,45 @@
 </outlineView>
 </subviews>
 </clipView>
- <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="RAh-Ad-miy">
- <rect key="frame" x="-100" y="-100" width="222" height="16"/>
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="RAh-Ad-miy">
+ <rect key="frame" x="1" y="250" width="296" height="15"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="xU9-j2-UAo">
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="xU9-j2-UAo">
 <rect key="frame" x="-15" y="17" width="16" height="0.0"/>
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
 <accessibility description="Presets"/>
 </scrollView>
- <button toolTip="Create a new custom preset based on the currently selected settings." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kfi-wq-mgV">
- <rect key="frame" x="3" y="3" width="24" height="23"/>
- <constraints>
- <constraint firstAttribute="height" constant="21" id="CJg-Q0-O5t"/>
- <constraint firstAttribute="width" constant="24" id="p55-di-frd"/>
- </constraints>
- <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSAddTemplate" imagePosition="only" alignment="center" state="on" borderStyle="border" inset="3" id="OJ3-1k-3DY">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
- </buttonCell>
- <accessibility description="New Preset"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jCz-Aw-giC">
+ <rect key="frame" x="126" y="308" width="47" height="14"/>
+ <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Presets" id="r4V-6L-SO8">
+ 
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="K9F-81-kPO">
+ <rect key="frame" x="3" y="6" width="71" height="24"/>
+ <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="momentary" id="0di-xq-jgi">
+ 
+ <segments>
+ <segment toolTip="Create a new custom preset based on the currently selected settings." image="NSAddTemplate" width="32"/>
+ <segment toolTip="Delete the selected preset." image="NSRemoveTemplate" width="32" tag="1"/>
+ </segments>
+ </segmentedCell>
 <connections>
- <action selector="addNewPreset:" target="-2" id="TYV-vH-8hk"/>
- <binding destination="-2" name="enabled" keyPath="self.enabled" id="lmV-Y3-JoF"/>
+ <action selector="segmentedActions:" target="-2" id="uIz-ng-DTh"/>
 </connections>
- </button>
+ </segmentedControl>
 <popUpButton toolTip="Show additional options." translatesAutoresizingMaskIntoConstraints="NO" id="Ybq-Zt-sta">
- <rect key="frame" x="58" y="4" width="35" height="22"/>
+ <rect key="frame" x="76" y="4" width="51" height="25"/>
 <constraints>
- <constraint firstAttribute="width" constant="35" id="ROP-Ic-SbK"/>
+ <constraint firstAttribute="width" constant="44" id="ROP-Ic-SbK"/>
 </constraints>
- <popUpButtonCell key="cell" type="smallSquare" bezelStyle="smallSquare" imagePosition="only" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="2JY-O9-FR6">
+ <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="2JY-O9-FR6">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="Presets Action Menu" id="LQk-kD-5sj">
 <items>
 <menuItem state="on" image="NSActionTemplate" hidden="YES" id="KPx-Ep-mb4"/>
@@ -165,47 +171,21 @@
 </popUpButtonCell>
 <accessibility description="Additional Options"/>
 </popUpButton>
- <button toolTip="Delete the selected preset." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="b3V-8w-euU">
- <rect key="frame" x="26" y="3" width="24" height="23"/>
- <constraints>
- <constraint firstAttribute="width" constant="24" id="B0h-bJ-KtI"/>
- </constraints>
- <buttonCell key="cell" type="smallSquare" bezelStyle="smallSquare" image="NSRemoveTemplate" imagePosition="only" alignment="left" borderStyle="border" inset="3" id="Kb1-6u-550">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
- </buttonCell>
- <accessibility description="Delete Preset"/>
- <connections>
- <action selector="deletePreset:" target="-2" id="b6N-h7-25y"/>
- <binding destination="ohT-Pp-wBT" name="enabled" keyPath="canRemove" id="WNd-yX-UEH"/>
- </connections>
- </button>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jCz-Aw-giC">
- <rect key="frame" x="92" y="305" width="47" height="14"/>
- <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Presets" id="r4V-6L-SO8">
- 
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
 </subviews>
 <constraints>
- <constraint firstItem="kfi-wq-mgV" firstAttribute="bottom" secondItem="b3V-8w-euU" secondAttribute="bottom" id="1dB-xo-p39"/>
- <constraint firstItem="b3V-8w-euU" firstAttribute="top" secondItem="Ybq-Zt-sta" secondAttribute="top" id="6P9-lr-Dic"/>
- <constraint firstAttribute="trailing" secondItem="uad-bt-uKD" secondAttribute="trailing" constant="3" id="Awe-NX-Pxq"/>
+ <constraint firstItem="Ybq-Zt-sta" firstAttribute="leading" secondItem="K9F-81-kPO" secondAttribute="trailing" constant="8" symbolic="YES" id="0fg-bb-Kxm"/>
+ <constraint firstItem="K9F-81-kPO" firstAttribute="top" secondItem="uad-bt-uKD" secondAttribute="bottom" constant="8" id="13f-Rt-TWz"/>
+ <constraint firstAttribute="trailing" secondItem="uad-bt-uKD" secondAttribute="trailing" constant="6" id="Awe-NX-Pxq"/>
 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Ybq-Zt-sta" secondAttribute="trailing" constant="20" id="MTA-L0-QDh"/>
 <constraint firstItem="jCz-Aw-giC" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="NYS-NA-dEh"/>
- <constraint firstAttribute="bottom" secondItem="kfi-wq-mgV" secondAttribute="bottom" constant="4" id="Rsn-71-jKi"/>
- <constraint firstItem="uad-bt-uKD" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="3" id="UV6-xv-JfW"/>
- <constraint firstItem="kfi-wq-mgV" firstAttribute="top" secondItem="b3V-8w-euU" secondAttribute="top" id="Vji-my-7O6"/>
- <constraint firstItem="kfi-wq-mgV" firstAttribute="top" secondItem="uad-bt-uKD" secondAttribute="bottom" constant="8" id="VuV-22-Ur9"/>
+ <constraint firstItem="uad-bt-uKD" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="6" id="UV6-xv-JfW"/>
+ <constraint firstItem="K9F-81-kPO" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="6" id="VW4-WQ-izC"/>
 <constraint firstItem="jCz-Aw-giC" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="6" id="WCV-tV-CtJ"/>
- <constraint firstItem="b3V-8w-euU" firstAttribute="leading" secondItem="kfi-wq-mgV" secondAttribute="trailing" constant="-1" id="bhQ-Pb-gsQ"/>
- <constraint firstItem="kfi-wq-mgV" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="3" id="dhx-Bz-GhP"/>
+ <constraint firstItem="Ybq-Zt-sta" firstAttribute="centerY" secondItem="K9F-81-kPO" secondAttribute="centerY" id="cKG-ER-z11"/>
 <constraint firstItem="uad-bt-uKD" firstAttribute="top" secondItem="jCz-Aw-giC" secondAttribute="bottom" constant="6" id="jy6-AG-t3l"/>
- <constraint firstItem="Ybq-Zt-sta" firstAttribute="leading" secondItem="b3V-8w-euU" secondAttribute="trailing" constant="8" id="k1Z-q1-OXB"/>
+ <constraint firstAttribute="bottom" secondItem="K9F-81-kPO" secondAttribute="bottom" constant="8" id="y22-EC-5uA"/>
 </constraints>
- <point key="canvasLocation" x="21" y="276"/>
+ <point key="canvasLocation" x="-15" y="-7"/>
 </customView>
 <treeController objectClassName="HBPreset" childrenKeyPath="children" leafKeyPath="isLeaf" id="ohT-Pp-wBT">
 <declaredKeys>
@@ -220,8 +200,8 @@
 </treeController>
 </objects>
 <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
- <image name="NSAddTemplate" width="11" height="11"/>
- <image name="NSRemoveTemplate" width="11" height="11"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
+ <image name="NSAddTemplate" width="14" height="13"/>
+ <image name="NSRemoveTemplate" width="14" height="4"/>
 </resources>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Queue.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Queue.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -19,8 +19,8 @@
 <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
 <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
 <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
- <rect key="contentRect" x="157" y="863" width="584" height="424"/>
- <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1177"/>
+ <rect key="contentRect" x="157" y="515" width="584" height="424"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
 <value key="minSize" type="size" width="320" height="240"/>
 <view key="contentView" id="2577">
 <rect key="frame" x="0.0" y="0.0" width="584" height="424"/>
@@ -28,12 +28,12 @@
 </view>
 <toolbar key="toolbar" implicitIdentifier="0FE76B40-49B7-48AE-B44E-D1B8034BC88A" explicitIdentifier="HBQueueToolbar" displayMode="iconAndLabel" sizeMode="regular" id="ZVb-ld-0UP">
 <allowedToolbarItems>
- <toolbarItem implicitItemIdentifier="609C5CFE-D854-4567-9CC2-70E109CBA332" explicitItemIdentifier="HBQueueStartCancelToolbarIdentifier" label="Start" paletteLabel="Start/Cancel" toolTip="Start Encoding" tag="-1" image="encode" id="SX6-mq-Hck">
+ <toolbarItem implicitItemIdentifier="609C5CFE-D854-4567-9CC2-70E109CBA332" explicitItemIdentifier="HBQueueStartCancelToolbarIdentifier" label="Start" paletteLabel="Start/Cancel" toolTip="Start Encoding" tag="-1" image="encode" sizingBehavior="auto" id="SX6-mq-Hck">
 <connections>
 <action selector="toggleStartCancel:" target="-2" id="ABS-fA-RwJ"/>
 </connections>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="7DB01500-5492-42BC-BDEE-55E9EF3765A1" explicitItemIdentifier="HBQueuePauseResumeToolbarIdentifier" label="Pause" paletteLabel="Pause/Resume" toolTip="Pause Encoding" tag="-1" image="pauseencode" id="s7o-pK-heI">
+ <toolbarItem implicitItemIdentifier="7DB01500-5492-42BC-BDEE-55E9EF3765A1" explicitItemIdentifier="HBQueuePauseResumeToolbarIdentifier" label="Pause" paletteLabel="Pause/Resume" toolTip="Pause Encoding" tag="-1" image="pauseencode" sizingBehavior="auto" id="s7o-pK-heI">
 <connections>
 <action selector="togglePauseResume:" target="-2" id="bmr-hx-loD"/>
 </connections>
@@ -43,8 +43,8 @@
 <toolbarItem implicitItemIdentifier="E914B732-9FA4-42E0-AFA6-353A8ACC406B" label="Action" paletteLabel="Action" image="NSActionTemplate" sizingBehavior="auto" id="DCB-WP-NRs">
 <nil key="toolTip"/>
 <popUpButton key="view" verticalHuggingPriority="750" id="Wfu-Hw-JBC">
- <rect key="frame" x="1" y="14" width="40" height="24"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <rect key="frame" x="0.0" y="14" width="54" height="25"/>
+ <autoresizingMask key="autoresizingMask"/>
 <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="Zxj-rr-UnA">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -81,12 +81,10 @@
 </popUpButtonCell>
 </popUpButton>
 </toolbarItem>
- <toolbarItem implicitItemIdentifier="938D3EC6-1547-4AAB-86AF-B3FD3C7AF8BD" label="When Done" paletteLabel="When Done" toolTip="Action to perform when encoding is complete." id="a3c-kV-98E">
- <size key="minSize" width="100" height="25"/>
- <size key="maxSize" width="200" height="25"/>
+ <toolbarItem implicitItemIdentifier="938D3EC6-1547-4AAB-86AF-B3FD3C7AF8BD" label="When Done" paletteLabel="When Done" toolTip="Action to perform when encoding is complete." sizingBehavior="auto" id="a3c-kV-98E">
 <popUpButton key="view" verticalHuggingPriority="750" id="rfS-M1-CnB">
- <rect key="frame" x="0.0" y="14" width="200" height="25"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <rect key="frame" x="0.0" y="14" width="177" height="25"/>
+ <autoresizingMask key="autoresizingMask"/>
 <popUpButtonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="pch-jl-VXA">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -109,8 +107,8 @@
 <toolbarItem implicitItemIdentifier="963C2AD9-6708-4781-9411-3111E9713E3B" label="Details" paletteLabel="Details" image="details" sizingBehavior="auto" id="DfN-Iw-bzy">
 <nil key="toolTip"/>
 <button key="view" verticalHuggingPriority="750" id="KyK-r0-0eJ">
- <rect key="frame" x="6" y="14" width="32" height="25"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <rect key="frame" x="9" y="14" width="27" height="23"/>
+ <autoresizingMask key="autoresizingMask"/>
 <buttonCell key="cell" type="roundTextured" bezelStyle="texturedRounded" image="details" imagePosition="only" alignment="center" lineBreakMode="truncatingTail" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="BjZ-aR-Hpe">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
 
@@ -124,22 +122,21 @@
 <defaultToolbarItems>
 <toolbarItem reference="SX6-mq-Hck"/>
 <toolbarItem reference="s7o-pK-heI"/>
- <toolbarItem reference="rHN-a0-oZQ"/>
- <toolbarItem reference="DCB-WP-NRs"/>
- <toolbarItem reference="a3c-kV-98E"/>
 <toolbarItem reference="QuV-M8-cet"/>
+ <toolbarItem reference="a3c-kV-98E"/>
+ <toolbarItem reference="DCB-WP-NRs"/>
 <toolbarItem reference="DfN-Iw-bzy"/>
 </defaultToolbarItems>
 </toolbar>
 <connections>
 <outlet property="delegate" destination="-2" id="2579"/>
 </connections>
- <point key="canvasLocation" x="-948" y="-24"/>
+ <point key="canvasLocation" x="-884" y="-251"/>
 </window>
 <userDefaultsController representsSharedInstance="YES" id="z2J-h1-IDv"/>
 </objects>
 <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
 <image name="details" width="15" height="12"/>
 <image name="encode" width="32" height="32"/>
 <image name="pauseencode" width="32" height="32"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Subtitles.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Subtitles.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15400" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15400"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -14,18 +14,18 @@
 </customObject>
 <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
 <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="926" height="322"/>
+ <customView misplaced="YES" id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="902" height="176"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
- <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2Tb-KC-Ugi">
- <rect key="frame" x="17" y="285" width="88" height="22"/>
+ <popUpButton verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Tb-KC-Ugi">
+ <rect key="frame" x="16" y="140" width="90" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="82" id="LnC-EY-WyR"/>
 </constraints>
 <popUpButtonCell key="cell" type="push" title="Tracks" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" pullsDown="YES" id="8ZD-D6-TLA">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="Fr7-eG-NuL">
 <items>
 <menuItem title="Tracks" state="on" hidden="YES" id="TJO-RZ-jgb"/>
@@ -56,12 +56,12 @@
 </binding>
 </connections>
 </popUpButton>
- <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QsM-28-Pya">
- <rect key="frame" x="110" y="282" width="132" height="27"/>
+ <button verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QsM-28-Pya">
+ <rect key="frame" x="109" y="137" width="134" height="27"/>
 <string key="toolTip">Configure subtitle tracks Selection Behavior. These settings affect which tracks will be added to the subtitle tracks list, and the settings used for each track.</string>
 <buttonCell key="cell" type="push" title="Selection Behavior…" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="oxg-bs-1si">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <action selector="showSettingsSheet:" target="-2" id="IA5-Hf-clS"/>
@@ -72,11 +72,11 @@
 </binding>
 </connections>
 </button>
- <button toolTip="Reload the subtitles tracks list using the configured Selection Behavior." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vxx-gk-9kY">
- <rect key="frame" x="240" y="282" width="62" height="27"/>
+ <button toolTip="Reload the subtitles tracks list using the configured Selection Behavior." verticalHuggingPriority="750" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vxx-gk-9kY">
+ <rect key="frame" x="239" y="137" width="64" height="27"/>
 <buttonCell key="cell" type="push" title="Reload" bezelStyle="rounded" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jG8-uo-1tv">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <action selector="addTracksFromDefaults:" target="-2" id="MNV-gt-ylF"/>
@@ -87,29 +87,28 @@
 </binding>
 </connections>
 </button>
- <scrollView wantsLayer="YES" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-rH-vof">
- <rect key="frame" x="20" y="20" width="886" height="258"/>
+ <scrollView wantsLayer="YES" misplaced="YES" autohidesScrollers="YES" horizontalLineScroll="27" horizontalPageScroll="10" verticalLineScroll="27" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Syo-rH-vof">
+ <rect key="frame" x="20" y="20" width="862" height="116"/>
 <string key="toolTip">Subtitle tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the subtitle Selection Behavior dialog.</string>
 <clipView key="contentView" id="ljc-nW-Cnc">
- <rect key="frame" x="1" y="0.0" width="884" height="257"/>
+ <rect key="frame" x="1" y="1" width="860" height="114"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" headerView="IiW-3a-Drv" viewBased="YES" id="0yM-wE-D2x">
- <rect key="frame" x="0.0" y="0.0" width="885" height="234"/>
- <autoresizingMask key="autoresizingMask"/>
+ <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" columnReordering="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="25" rowSizeStyle="automatic" headerView="IiW-3a-Drv" viewBased="YES" id="0yM-wE-D2x">
+ <rect key="frame" x="0.0" y="0.0" width="860" height="91"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <size key="intercellSpacing" width="3" height="2"/>
 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
 <tableColumns>
- <tableColumn identifier="track" editable="NO" width="290" minWidth="40" maxWidth="1000" id="N3S-st-yGv">
+ <tableColumn identifier="track" editable="NO" width="286" minWidth="40" maxWidth="1000" id="N3S-st-yGv">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Track">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.33333299" alpha="1" colorSpace="calibratedWhite"/>
 </tableHeaderCell>
 <popUpButtonCell key="dataCell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="border" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="kzn-6s-3Ka">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="Umu-1b-U1Z">
 <items>
 <menuItem title="Pop Up" id="cSW-OC-qKA"/>
@@ -119,14 +118,14 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="EZp-rc-7mo">
- <rect key="frame" x="1" y="1" width="290" height="25"/>
+ <rect key="frame" x="1" y="1" width="286" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Subtitles language and type." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Tf3-cP-TGw">
- <rect key="frame" x="0.0" y="1" width="290" height="22"/>
+ <rect key="frame" x="-1" y="1" width="288" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="JWk-Ab-hdY">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="0GR-vf-sZq">
 <items>
 <menuItem title="Item 1" id="yDg-DK-z5D"/>
@@ -145,32 +144,31 @@
 <constraints>
 <constraint firstItem="Tf3-cP-TGw" firstAttribute="leading" secondItem="EZp-rc-7mo" secondAttribute="leading" constant="3" id="SjK-h4-jBa"/>
 <constraint firstAttribute="trailing" secondItem="Tf3-cP-TGw" secondAttribute="trailing" constant="3" id="Z2W-qa-AON"/>
- <constraint firstItem="Tf3-cP-TGw" firstAttribute="top" secondItem="EZp-rc-7mo" secondAttribute="top" constant="3" id="nLT-E9-asy"/>
+ <constraint firstItem="Tf3-cP-TGw" firstAttribute="centerY" secondItem="EZp-rc-7mo" secondAttribute="centerY" id="bNw-5g-dhI"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
 <tableColumn identifier="forced" width="76" minWidth="70" maxWidth="3.4028229999999999e+38" id="klV-Gy-igk">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Forced Only">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="JLr-Qi-X0X">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="zKg-by-KFV">
- <rect key="frame" x="294" y="1" width="76" height="25"/>
+ <rect key="frame" x="290" y="1" width="76" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <button toolTip="Forced Only. Use only subtitles marked as “forced” in the selected source track." translatesAutoresizingMaskIntoConstraints="NO" id="HC5-ql-Vcr">
- <rect key="frame" x="26" y="2" width="23" height="21"/>
+ <rect key="frame" x="28" y="5" width="20" height="16"/>
 <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="SPR-9q-XBK">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <accessibility description="Forced subtitles only"/>
 <connections>
@@ -181,7 +179,6 @@
 </subviews>
 <constraints>
 <constraint firstItem="HC5-ql-Vcr" firstAttribute="centerY" secondItem="zKg-by-KFV" secondAttribute="centerY" id="Bnl-uV-Fds"/>
- <constraint firstItem="HC5-ql-Vcr" firstAttribute="top" secondItem="zKg-by-KFV" secondAttribute="top" constant="5" id="LGF-pz-TTr"/>
 <constraint firstItem="HC5-ql-Vcr" firstAttribute="leading" secondItem="zKg-by-KFV" secondAttribute="leading" constant="29" id="OGP-N0-fSq"/>
 <constraint firstItem="HC5-ql-Vcr" firstAttribute="centerX" secondItem="zKg-by-KFV" secondAttribute="centerX" id="mvF-fX-bf0"/>
 </constraints>
@@ -190,25 +187,24 @@
 </tableColumn>
 <tableColumn identifier="burned" width="64" minWidth="64" maxWidth="3.4028229999999999e+38" id="fIe-Fg-ufj">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Burned In">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="R9w-Bn-CCt">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="gxH-yz-YRK">
- <rect key="frame" x="373" y="1" width="64" height="25"/>
+ <rect key="frame" x="369" y="1" width="64" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <button toolTip="Burned In. Make the selected subtitles permanent by overlaying them onto the video track." translatesAutoresizingMaskIntoConstraints="NO" id="zpm-9Z-Hsq">
- <rect key="frame" x="20" y="2" width="23" height="21"/>
+ <rect key="frame" x="22" y="5" width="20" height="16"/>
 <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="s2E-1o-mGs">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <accessibility description="Burned In"/>
 <connections>
@@ -225,32 +221,30 @@
 <constraint firstItem="zpm-9Z-Hsq" firstAttribute="centerX" secondItem="gxH-yz-YRK" secondAttribute="centerX" id="Xbu-8p-kJ7"/>
 <constraint firstItem="zpm-9Z-Hsq" firstAttribute="centerY" secondItem="gxH-yz-YRK" secondAttribute="centerY" id="nLs-iU-WUw"/>
 <constraint firstItem="zpm-9Z-Hsq" firstAttribute="leading" secondItem="gxH-yz-YRK" secondAttribute="leading" constant="23" id="php-Zc-NnF"/>
- <constraint firstItem="zpm-9Z-Hsq" firstAttribute="top" secondItem="gxH-yz-YRK" secondAttribute="top" constant="5" id="ylD-H0-wie"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
 <tableColumn identifier="default" width="51" minWidth="51" maxWidth="3.4028229999999999e+38" id="fvq-pE-sOC">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="center" title="Default">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <buttonCell key="dataCell" type="check" title="Check" bezelStyle="regularSquare" imagePosition="only" alignment="left" controlSize="small" continuous="YES" inset="2" id="ooy-Sh-Edm">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="mQ6-s6-Zm2">
- <rect key="frame" x="440" y="1" width="51" height="25"/>
+ <rect key="frame" x="436" y="1" width="51" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <button toolTip="Default flag. Mark the selected subtitles track as the default to be displayed on playback." translatesAutoresizingMaskIntoConstraints="NO" id="mdO-Qu-3Pb">
- <rect key="frame" x="14" y="4" width="22" height="18"/>
+ <rect key="frame" x="19" y="5" width="14" height="16"/>
 <buttonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" controlSize="small" state="on" inset="2" id="kwl-qH-Dgo">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- 
+ 
 </buttonCell>
 <accessibility description="Default"/>
 <connections>
@@ -266,15 +260,14 @@
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn identifier="srt_lang" width="171" minWidth="10" maxWidth="3.4028229999999999e+38" id="9ka-9O-WDj">
+ <tableColumn identifier="srt_lang" width="158.5" minWidth="10" maxWidth="3.4028229999999999e+38" id="9ka-9O-WDj">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Language">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <popUpButtonCell key="dataCell" type="bevel" title="Pop Up" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" continuous="YES" state="on" borderStyle="bezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="vHW-fn-RSG" id="2Qz-Lh-O8g">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="UOP-xa-WpP">
 <items>
 <menuItem title="Pop Up" state="on" id="vHW-fn-RSG"/>
@@ -284,14 +277,14 @@
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="4bh-my-GeM">
- <rect key="frame" x="494" y="1" width="171" height="25"/>
+ <rect key="frame" x="490" y="1" width="159" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Language of the selected SRT/SSA format source track. Not applicable to other formats." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Inz-O5-B8g">
- <rect key="frame" x="0.0" y="0.0" width="171" height="22"/>
+ <rect key="frame" x="-1" y="1" width="161" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="zIn-sc-xak">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="YpS-Pf-abd">
 <items>
 <menuItem title="Item 1" id="Rj8-KI-k4L"/>
@@ -313,35 +306,34 @@
 </popUpButton>
 </subviews>
 <constraints>
- <constraint firstAttribute="bottom" secondItem="Inz-O5-B8g" secondAttribute="bottom" constant="3" id="CII-4f-7Y0"/>
+ <constraint firstItem="Inz-O5-B8g" firstAttribute="centerY" secondItem="4bh-my-GeM" secondAttribute="centerY" id="3Cd-LX-xuq"/>
 <constraint firstItem="Inz-O5-B8g" firstAttribute="leading" secondItem="4bh-my-GeM" secondAttribute="leading" constant="3" id="CnV-f5-Gtx"/>
 <constraint firstAttribute="trailing" secondItem="Inz-O5-B8g" secondAttribute="trailing" constant="3" id="NhM-0h-zLT"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn identifier="srt_charcode" width="113" minWidth="10" maxWidth="3.4028229999999999e+38" id="1Qg-We-ltR">
+ <tableColumn identifier="srt_charcode" width="115" minWidth="10" maxWidth="3.4028229999999999e+38" id="1Qg-We-ltR">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Encoding">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <popUpButtonCell key="dataCell" type="bevel" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" continuous="YES" borderStyle="bezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="AdJ-Mv-JI2">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" title="OtherViews" id="ABd-Ec-K2L"/>
 </popUpButtonCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="ZBK-cc-m0z">
- <rect key="frame" x="668" y="1" width="113" height="25"/>
+ <rect key="frame" x="651.5" y="1" width="115" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <popUpButton toolTip="Character encoding/codeset of the selected SRT/SSA format source track. Not applicable to other formats." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QV0-kE-4yR">
- <rect key="frame" x="0.0" y="0.0" width="113" height="22"/>
+ <rect key="frame" x="-1" y="1" width="117" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="jFr-2c-3Vv">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 <menu key="menu" id="u4x-JX-Hma">
 <items>
 <menuItem title="Item 1" id="dap-ee-kor"/>
@@ -359,35 +351,34 @@
 </popUpButton>
 </subviews>
 <constraints>
- <constraint firstAttribute="bottom" secondItem="QV0-kE-4yR" secondAttribute="bottom" constant="3" id="3cY-6P-m7C"/>
 <constraint firstAttribute="trailing" secondItem="QV0-kE-4yR" secondAttribute="trailing" constant="3" id="56f-EX-8Xt"/>
+ <constraint firstItem="QV0-kE-4yR" firstAttribute="centerY" secondItem="ZBK-cc-m0z" secondAttribute="centerY" id="VnC-oi-pgx"/>
 <constraint firstItem="QV0-kE-4yR" firstAttribute="leading" secondItem="ZBK-cc-m0z" secondAttribute="leading" constant="3" id="W3d-o2-suN"/>
 </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
- <tableColumn identifier="srt_offset" width="68" minWidth="10" maxWidth="3.4028229999999999e+38" id="Fgh-pZ-6uu">
+ <tableColumn identifier="srt_offset" width="57.5" minWidth="10" maxWidth="3.4028229999999999e+38" id="Fgh-pZ-6uu">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Offset">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
 </tableHeaderCell>
 <textFieldCell key="dataCell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" continuous="YES" sendsActionOnEndEditing="YES" alignment="center" title="Text" id="QRj-KI-a03">
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
 <tableCellView id="9tV-iL-oaF">
- <rect key="frame" x="784" y="1" width="68" height="17"/>
+ <rect key="frame" x="769.5" y="1" width="57" height="17"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField toolTip="Positive or negative offset in milliseconds (ms) for the selected SRT/SSA format source track. Not applicable to other formats." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aJi-zQ-0cg">
- <rect key="frame" x="0.0" y="-3" width="68" height="14"/>
+ <rect key="frame" x="0.0" y="-3" width="57" height="14"/>
 <textFieldCell key="cell" controlSize="small" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="0" id="hhH-c3-gD0">
 <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="Jui-oB-oVO"/>
- 
+ 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
 </textFieldCell>
@@ -403,9 +394,9 @@
 </textField>
 </subviews>
 <constraints>
- <constraint firstItem="aJi-zQ-0cg" firstAttribute="top" secondItem="9tV-iL-oaF" secondAttribute="top" constant="6" id="AHN-d6-URf"/>
 <constraint firstItem="aJi-zQ-0cg" firstAttribute="centerX" secondItem="9tV-iL-oaF" secondAttribute="centerX" id="Dqo-dR-xOW"/>
 <constraint firstItem="aJi-zQ-0cg" firstAttribute="leading" secondItem="9tV-iL-oaF" secondAttribute="leading" constant="2" id="bUg-SG-Q9K"/>
+ <constraint firstItem="aJi-zQ-0cg" firstAttribute="top" secondItem="9tV-iL-oaF" secondAttribute="top" constant="6" id="oXx-Vj-wkT"/>
 </constraints>
 <connections>
 <outlet property="textField" destination="aJi-zQ-0cg" id="WSP-oS-jCs"/>
@@ -415,7 +406,6 @@
 </tableColumn>
 <tableColumn width="28" minWidth="28" maxWidth="28" id="9QI-EX-yTT">
 <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- 
 <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
 </tableHeaderCell>
@@ -426,16 +416,15 @@
 </textFieldCell>
 <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
 <prototypeCellViews>
- <tableCellView id="FiE-Us-vj1">
- <rect key="frame" x="855" y="1" width="28" height="25"/>
+ <tableCellView misplaced="YES" id="FiE-Us-vj1">
+ <rect key="frame" x="830" y="1" width="28" height="25"/>
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bFt-wX-C9J">
- <rect key="frame" x="-3" y="-2" width="34" height="27"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bFt-wX-C9J">
+ <rect key="frame" x="-4" y="-2" width="37" height="27"/>
 <buttonCell key="cell" type="push" bezelStyle="rounded" image="NSActionTemplate" imagePosition="only" alignment="center" controlSize="small" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="A3l-TZ-bBd">
 <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- 
+ 
 </buttonCell>
 <connections>
 <action selector="showAdditionalSettingsPopOver:" target="-2" id="lYo-do-opD"/>
@@ -443,6 +432,11 @@
 </connections>
 </button>
 </subviews>
+ <constraints>
+ <constraint firstItem="bFt-wX-C9J" firstAttribute="centerY" secondItem="FiE-Us-vj1" secondAttribute="centerY" id="HvX-qj-Lkx"/>
+ <constraint firstItem="bFt-wX-C9J" firstAttribute="leading" secondItem="FiE-Us-vj1" secondAttribute="leading" constant="2" id="ec9-Mx-7wu"/>
+ <constraint firstAttribute="trailing" secondItem="bFt-wX-C9J" secondAttribute="trailing" constant="2" id="lR2-PN-R4w"/>
+ </constraints>
 </tableCellView>
 </prototypeCellViews>
 </tableColumn>
@@ -468,8 +462,8 @@
 <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="GfM-TU-Tmr">
 <autoresizingMask key="autoresizingMask"/>
 </scroller>
- <tableHeaderView key="headerView" id="IiW-3a-Drv">
- <rect key="frame" x="0.0" y="0.0" width="885" height="23"/>
+ <tableHeaderView key="headerView" wantsLayer="YES" id="IiW-3a-Drv">
+ <rect key="frame" x="0.0" y="0.0" width="860" height="23"/>
 <autoresizingMask key="autoresizingMask"/>
 </tableHeaderView>
 </scrollView>
@@ -487,9 +481,10 @@
 <constraint firstItem="2Tb-KC-Ugi" firstAttribute="baseline" secondItem="QsM-28-Pya" secondAttribute="baseline" id="jnV-Dq-iyH"/>
 <constraint firstAttribute="bottom" secondItem="Syo-rH-vof" secondAttribute="bottom" constant="20" symbolic="YES" id="mQT-2H-f1T"/>
 </constraints>
- <point key="canvasLocation" x="222" y="138"/>
+ <point key="canvasLocation" x="230" y="122"/>
 </customView>
 <arrayController objectClassName="HBSubtitlesTrack" id="ssY-jQ-Nev">
+ <classReference key="objectClass" className="HBSubtitlesTrack"/>
 <connections>
 <binding destination="-2" name="contentArray" keyPath="self.subtitles.tracks" id="mlB-F3-p89"/>
 </connections>
@@ -529,6 +524,6 @@
 </menu>
 </objects>
 <resources>
- <image name="NSActionTemplate" width="14" height="14"/>
+ <image name="NSActionTemplate" width="15" height="15"/>
 </resources>
 </document>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/SubtitlesDefaults.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/SubtitlesDefaults.xib Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Base.lproj/Video.xib -> HandBrake-1.5.1.tar.xz/macosx/Base.lproj/Video.xib Changed

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
 <dependencies>
 <deployment identifier="macosx"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15504"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
 <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
 </dependencies>
 <objects>
@@ -24,7 +24,7 @@
 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
 <subviews>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="150" translatesAutoresizingMaskIntoConstraints="NO" id="gfa-Hb-cDP">
- <rect key="frame" x="294" y="343" width="45" height="14"/>
+ <rect key="frame" x="294" y="345" width="45" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Quality:" id="F3s-qR-qeE">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -35,13 +35,14 @@
 </connections>
 </textField>
 <textField toolTip="Average Bitrate varies quality to ensure the data rate remains relatively consistent throughout the video." verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A3o-Zx-OfM">
- <rect key="frame" x="498" y="294" width="78" height="19"/>
+ <rect key="frame" x="501" y="298" width="78" height="19"/>
 <constraints>
 <constraint firstAttribute="width" constant="78" id="EZ2-qD-5pb"/>
 </constraints>
 <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="eQl-KB-XJu">
 <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="TQJ-nd-2BX">
- <real key="minimum" value="0.0"/>
+ <real key="minimum" value="1"/>
+ <real key="maximum" value="1000000"/>
 </numberFormatter>
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -57,11 +58,11 @@
 <string key="NSValueTransformerName">NSIsNotNil</string>
 </dictionary>
 </binding>
- <binding destination="-2" name="value" keyPath="self.video.avgBitrate" id="c27-4i-SiJ">
+ <binding destination="-2" name="value" keyPath="self.video.avgBitrate" id="YEC-nC-Y5Q">
 <dictionary key="options">
 <bool key="NSContinuouslyUpdatesValue" value="YES"/>
- <string key="NSNotApplicablePlaceholder">0</string>
- <string key="NSNullPlaceholder">0</string>
+ <integer key="NSNotApplicablePlaceholder" value="0"/>
+ <integer key="NSNullPlaceholder" value="0"/>
 <bool key="NSRaisesForNotApplicableKeys" value="NO"/>
 <bool key="NSValidatesImmediately" value="YES"/>
 </dictionary>
@@ -74,7 +75,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="50" translatesAutoresizingMaskIntoConstraints="NO" id="Pai-3Q-Gs3">
- <rect key="frame" x="521" y="343" width="11" height="14"/>
+ <rect key="frame" x="524" y="345" width="11" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="0" id="bvD-W7-O0N">
 <numberFormatter key="formatter" formatterBehavior="default10_4" numberStyle="decimal" minimumIntegerDigits="1" maximumIntegerDigits="2000000000" maximumFractionDigits="3" id="wYW-16-bWA"/>
 
@@ -88,7 +89,7 @@
 </connections>
 </textField>
 <popUpButton toolTip="Framerate (Frames Per Second). Number of pictures displayed during each second of video." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9tc-EO-QMd">
- <rect key="frame" x="114" y="312" width="149" height="22"/>
+ <rect key="frame" x="113" y="315" width="151" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="0VS-Ah-Q3S">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
 
@@ -115,7 +116,7 @@
 </connections>
 </popUpButton>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="bnV-aE-FVh">
- <rect key="frame" x="358" y="270" width="111" height="18"/>
+ <rect key="frame" x="360" y="274" width="110" height="16"/>
 <string key="toolTip">2-pass encoding analyzes the entire source video before encoding. The information gathered enables the encoder to make more informed decisions about quality and data rate in Average Bitrate mode.</string>
 <buttonCell key="cell" type="check" title="2-pass encoding" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="nPA-nO-Eik">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -148,7 +149,7 @@
 </connections>
 </button>
 <button toolTip="Turbo first pass speeds up the first pass of a 2-pass encode for a slight penalty to analysis." translatesAutoresizingMaskIntoConstraints="NO" id="olm-zg-k9Y">
- <rect key="frame" x="495" y="270" width="104" height="18"/>
+ <rect key="frame" x="500" y="274" width="103" height="16"/>
 <buttonCell key="cell" type="check" title="Turbo first pass" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="vSc-VB-NEv">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -186,7 +187,7 @@
 </connections>
 </button>
 <popUpButton toolTip="Video encoder. Determines video type and settings used during encoding." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xwK-Yu-a1e">
- <rect key="frame" x="114" y="338" width="149" height="22"/>
+ <rect key="frame" x="113" y="339" width="151" height="22"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="143" id="8aS-6C-FvY"/>
 </constraints>
@@ -216,7 +217,7 @@
 </connections>
 </popUpButton>
 <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="bAn-iZ-ieF">
- <rect key="frame" x="18" y="317" width="93" height="14"/>
+ <rect key="frame" x="18" y="321" width="93" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Framerate (FPS):" id="SJc-tv-AMH">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -227,7 +228,7 @@
 </connections>
 </textField>
 <textField horizontalHuggingPriority="249" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="rOd-nt-22T">
- <rect key="frame" x="18" y="343" width="93" height="14"/>
+ <rect key="frame" x="18" y="345" width="93" height="14"/>
 <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="right" title="Video Encoder:" id="Mrb-6Q-0YM">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -238,7 +239,7 @@
 </connections>
 </textField>
 <slider horizontalHuggingPriority="1000" verticalHuggingPriority="749" horizontalCompressionResistancePriority="200" translatesAutoresizingMaskIntoConstraints="NO" id="GPu-Ht-bKg">
- <rect key="frame" x="361" y="320" width="539" height="15"/>
+ <rect key="frame" x="359" y="322" width="543" height="17"/>
 <string key="toolTip">Constant Quality varies bitrate to ensure visual quality remains relatively consistent throughout the video.
 
 Adjust the quality slider to the right to increase quality or to the left to decrease quality, in small increments of plus or minus 1-2.
@@ -271,7 +272,7 @@
 </connections>
 </slider>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="60" translatesAutoresizingMaskIntoConstraints="NO" id="1au-ZO-l1i">
- <rect key="frame" x="496" y="343" width="21" height="14"/>
+ <rect key="frame" x="499" y="345" width="21" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="RF:" id="rRB-9F-pHn">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -284,7 +285,7 @@
 </connections>
 </textField>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Vae-sv-7Up">
- <rect key="frame" x="343" y="341" width="110" height="18"/>
+ <rect key="frame" x="344" y="344.5" width="111" height="15"/>
 <buttonCell key="cell" type="radio" title="Constant Quality" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="ZjL-cY-O5f">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -307,7 +308,7 @@
 </connections>
 </button>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="brN-9J-qa1">
- <rect key="frame" x="343" y="294" width="143" height="18"/>
+ <rect key="frame" x="344" y="299.5" width="144" height="15"/>
 <buttonCell key="cell" type="radio" title="Average Bitrate (kbps):" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="VQe-CK-YDR">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -326,7 +327,7 @@
 </connections>
 </button>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Fc1-EX-DWd">
- <rect key="frame" x="115" y="293" width="121" height="18"/>
+ <rect key="frame" x="116" y="298.5" width="120" height="15"/>
 <buttonCell key="cell" type="radio" title="Variable Framerate" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="zZo-75-1WG">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -345,7 +346,7 @@
 </connections>
 </button>
 <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Y3k-tv-pIb">
- <rect key="frame" x="115" y="271" width="127" height="18"/>
+ <rect key="frame" x="116" y="276.5" width="126" height="15"/>
 <buttonCell key="cell" type="radio" title="Constant Framerate" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="6Dd-IP-Pwt">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
 
@@ -360,14 +361,14 @@
 </connections>
 </button>
 <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="h2m-9o-ibu">
- <rect key="frame" x="0.0" y="20" width="920" height="237"/>
+ <rect key="frame" x="0.0" y="22" width="920" height="237"/>
 <subviews>
 <customView id="6Tf-Wn-haS" userLabel="x264/x264 presets view">
 <rect key="frame" x="0.0" y="33" width="920" height="204"/>
 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
 <subviews>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="w5n-Cd-ztl">
- <rect key="frame" x="58" y="155" width="42" height="14"/>
+ <rect key="frame" x="58" y="158" width="42" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Preset:" id="QWu-rv-zfM">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -378,7 +379,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="O1a-XY-efg">
- <rect key="frame" x="58" y="132" width="42" height="14"/>
+ <rect key="frame" x="58" y="135" width="42" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Tune:" id="fzT-im-zKN">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -389,7 +390,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="LUQ-6T-KDP">
- <rect key="frame" x="58" y="106" width="42" height="14"/>
+ <rect key="frame" x="58" y="111" width="42" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Profile:" id="Hho-GY-qOR">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -400,7 +401,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="200" translatesAutoresizingMaskIntoConstraints="NO" id="Axj-zl-Cyb">
- <rect key="frame" x="58" y="80" width="42" height="14"/>
+ <rect key="frame" x="58" y="87" width="42" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Level:" id="sTM-lk-DBC">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -411,7 +412,7 @@
 </connections>
 </textField>
 <popUpButton toolTip="Video encoder tune. Further adjusts encoder preset to optimize settings for specific scenarios." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cXd-X7-OhB">
- <rect key="frame" x="103" y="127" width="130" height="22"/>
+ <rect key="frame" x="102" y="129" width="132" height="22"/>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="DM4-nK-RoT">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
 
@@ -433,7 +434,7 @@
 </connections>
 </popUpButton>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="kh8-d2-hSD">
- <rect key="frame" x="103" y="101" width="130" height="22"/>
+ <rect key="frame" x="102" y="105" width="132" height="22"/>
 <string key="toolTip">Video encoder profile. Sets and ensures compliance with the specified video compression standard profile. Overrides all other settings.</string>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="Pod-LO-yvB">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -452,7 +453,7 @@
 </connections>
 </popUpButton>
 <popUpButton verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8CM-4G-oId">
- <rect key="frame" x="103" y="75" width="130" height="22"/>
+ <rect key="frame" x="102" y="81" width="132" height="22"/>
 <string key="toolTip">Video encoder level. Sets and ensures compliance with the specified video compression standard level. Overrides all other settings.</string>
 <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" arrowPosition="arrowAtCenter" preferredEdge="maxY" id="hlv-UO-sPl">
 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
@@ -471,7 +472,7 @@
 </connections>
 </popUpButton>
 <button translatesAutoresizingMaskIntoConstraints="NO" id="stU-Fo-Avu">
- <rect key="frame" x="248" y="130" width="88" height="18"/>
+ <rect key="frame" x="250" y="134" width="87" height="16"/>
 <string key="toolTip">Fast Decode uses settings that reduce CPU usage during playback of the encoded video. Useful for devices that struggle to play video without stuttering.</string>
 <buttonCell key="cell" type="check" title="Fast Decode" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="EcY-w1-bc8">
 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -488,7 +489,7 @@
 </connections>
 </button>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="300" translatesAutoresizingMaskIntoConstraints="NO" id="t4D-CZ-8G3">
- <rect key="frame" x="248" y="106" width="104" height="14"/>
+ <rect key="frame" x="248" y="111" width="104" height="14"/>
 <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Additional Options:" id="ja7-Zr-y1P">
 
 <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -499,7 +500,7 @@
 </connections>
 </textField>
 <textField horizontalHuggingPriority="240" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rbo-w6-ENd">
- <rect key="frame" x="358" y="78" width="542" height="42"/>
+ <rect key="frame" x="358" y="83" width="542" height="42"/>
 <string key="toolTip">Additional video encoder options. For advanced use only.
 
 Syntax: option-1=foo:opt2=bar,baz</string>
@@ -519,7 +520,7 @@
 </connections>
 </textField>
 <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="SOa-xA-qAq">
- <rect key="frame" x="237" y="155" width="54" height="14"/>
+ <rect key="frame" x="237" y="158" width="54" height="14"/>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="A77-A3-lQn"/>
 </constraints>
@@ -533,8 +534,8 @@
 <binding destination="-2" name="value" keyPath="self.video.preset" id="pVA-9B-hDu"/>
 </connections>
 </textField>
- <textField toolTip="Displays all internal video encoder options." horizontalHuggingPriority="240" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="1000" translatesAutoresizingMaskIntoConstraints="NO" id="dwn-bf-Ua0">
- <rect key="frame" x="18" y="12" width="884" height="50"/>
+ <textField toolTip="Displays all internal video encoder options." horizontalHuggingPriority="240" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dwn-bf-Ua0">
+ <rect key="frame" x="18" y="12" width="884" height="57"/>
 <constraints>
 <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="aXf-QV-oea"/>
 </constraints>
@@ -562,7 +563,7 @@
 <rect key="frame" x="119" y="185" width="781" height="5"/>
 </box>
 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="fue-2d-Bjn">
- <rect key="frame" x="106" y="155" width="124" height="18"/>
+ <rect key="frame" x="104" y="155" width="128" height="20"/>
 <string key="toolTip">Video encoder preset. Adjusts encoder settings to balance compression efficiency and encoding speed. Slower encoder presets may use settings that are less compatible with certain devices.</string>
 <constraints>
 <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="124" id="1VD-1X-Ivb"/>
@@ -708,7 +709,7 @@
 <constraint firstItem="Fc1-EX-DWd" firstAttribute="leading" secondItem="9tc-EO-QMd" secondAttribute="leading" id="ich-lj-Kpj"/>
 <constraint firstAttribute="trailing" secondItem="h2m-9o-ibu" secondAttribute="trailing" id="kS2-4n-24U"/>
 <constraint firstItem="gfa-Hb-cDP" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Y3k-tv-pIb" secondAttribute="trailing" constant="8" symbolic="YES" id="kXy-RO-xGg"/>
- <constraint firstItem="rOd-nt-22T" firstAttribute="top" secondItem="wAC-5p-nXb" secondAttribute="top" constant="18" id="lZs-Yt-3BK"/>
+ <constraint firstItem="rOd-nt-22T" firstAttribute="top" secondItem="wAC-5p-nXb" secondAttribute="top" constant="16" id="lZs-Yt-3BK"/>
 <constraint firstItem="Vae-sv-7Up" firstAttribute="firstBaseline" secondItem="1au-ZO-l1i" secondAttribute="firstBaseline" id="m6s-yk-F1V"/>
 <constraint firstAttribute="trailing" secondItem="GPu-Ht-bKg" secondAttribute="trailing" constant="20" id="sL1-if-zZ9"/>
 <constraint firstItem="Pai-3Q-Gs3" firstAttribute="baseline" secondItem="1au-ZO-l1i" secondAttribute="baseline" id="sVB-mt-wYZ"/>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAVPlayer.m -> HandBrake-1.5.1.tar.xz/macosx/HBAVPlayer.m Changed

@@ -12,12 +12,12 @@
 static void *HBAVPlayerRateContext = &HBAVPlayerRateContext;
 static void *HBAVPlayerItemStatusContext = &HBAVPlayerItemStatusContext;
 
-typedef void (^HBRateObverser)(void);
-typedef void (^HBPlayableObverser)(void);
+typedef void (^HBRateObserver)(void);
+typedef void (^HBPlayableObserver)(void);
 
 @interface HBAVPlayerRateObserver : NSObject
 
-@property (nonatomic, copy) HBRateObverser block;
+@property (nonatomic, copy) HBRateObserver block;
 
 - (void)postNotification;
 
@@ -38,7 +38,7 @@
 @property (nonatomic, strong) AVPlayer *player;
 
 @property (nonatomic, strong) NSMutableSet<HBAVPlayerRateObserver *> *rateObservers;
-@property (nonatomic, strong) NSMutableSet<HBPlayableObverser> *playableObservers;
+@property (nonatomic, strong) NSMutableSet<HBPlayableObserver> *playableObservers;
 
 @property (nonatomic, readwrite, getter=isPlayable) BOOL playable;
 @property (nonatomic, readwrite, getter=isLoaded) BOOL loaded;
@@ -122,7 +122,7 @@
 {
 _loaded = loaded;
 
- for (HBPlayableObverser block in self.playableObservers)
+ for (HBPlayableObserver block in self.playableObservers)
 {
 block();
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAddCategoryController.h -> HandBrake-1.5.1.tar.xz/macosx/HBAddCategoryController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAddCategoryController.m -> HandBrake-1.5.1.tar.xz/macosx/HBAddCategoryController.m Changed

@@ -6,9 +6,6 @@
 
 #import "HBAddCategoryController.h"
 
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
-
 @interface HBAddCategoryController () <NSTextFieldDelegate>
 
 @property (nonatomic, strong) IBOutlet NSTextField *name;
@@ -36,14 +33,14 @@
 {
 super windowDidLoad;
 
- NSNotificationCenter defaultCenter addObserver:self
- selector:@selector(controlTextDidChange:)
- name:NSControlTextDidChangeNotification object:nil;
+ NSNotificationCenter.defaultCenter addObserver:self
+ selector:@selector(controlTextDidChange:)
+ name:NSControlTextDidChangeNotification object:self.name;
 }
 
 - (void)dealloc
 {
- NSNotificationCenter defaultCenter removeObserver:self name:NSControlTextDidChangeNotification object:nil;
+ NSNotificationCenter.defaultCenter removeObserver:self name:NSControlTextDidChangeNotification object:self.name;
 }
 
 - (void)controlTextDidChange:(NSNotification *)obj {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAddPresetController.h -> HandBrake-1.5.1.tar.xz/macosx/HBAddPresetController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAddPresetController.m -> HandBrake-1.5.1.tar.xz/macosx/HBAddPresetController.m Changed

@@ -11,17 +11,6 @@
 #import "HBAudioDefaultsController.h"
 #import "HBSubtitlesDefaultsController.h"
 
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
-
-@import HandBrakeKit;
-
-typedef NS_ENUM(NSUInteger, HBAddPresetControllerMode) {
-    HBAddPresetControllerModeNone,
-    HBAddPresetControllerModeCustom,
-    HBAddPresetControllerModeSourceMaximum,
-};
-
 @interface HBAddPresetController ()
 
 @property (nonatomic, unsafe_unretained) IBOutlet NSTextField *name;
@@ -44,7 +33,7 @@
 @property (nonatomic) int width;
 @property (nonatomic) int height;
 
-@property (nonatomic) BOOL defaultToCustom;
+@property (nonatomic) HBPictureResolutionLimitMode resolutionLimitMode;
 
 @property (nonatomic, readwrite, strong) NSWindowController *defaultsController;
 
@@ -53,7 +42,7 @@
 
 @implementation HBAddPresetController
 
-- (instancetype)initWithPreset:(HBPreset *)preset presetManager:(HBPresetsManager *)manager customWidth:(int)customWidth customHeight:(int)customHeight defaultToCustom:(BOOL)defaultToCustom
+- (instancetype)initWithPreset:(HBPreset *)preset presetManager:(HBPresetsManager *)manager customWidth:(int)customWidth customHeight:(int)customHeight resolutionLimitMode:(HBPictureResolutionLimitMode)resolutionLimitMode
 {
     self = super initWithWindowNibName:@"AddPreset";
     if (self)
@@ -64,7 +53,7 @@
         _manager = manager;
         _width = customWidth;
         _height = customHeight;
-        _defaultToCustom = defaultToCustom;
+        _resolutionLimitMode = resolutionLimitMode;
     }
     return self;
 }
@@ -87,24 +76,34 @@
     // Populate the preset picture settings popup.
     // Use NSMenuItem tag to store preset values for each option.
 
-    // Default to Source Maximum
-    HBAddPresetControllerMode mode = HBAddPresetControllerModeSourceMaximum;
-
     self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"None", @"Add preset window -> picture setting");
-    self.picSettingsPopUp lastItem setTag:HBAddPresetControllerModeNone;
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitModeNone;
 
-    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Custom", @"Add preset window -> picture setting");
-    self.picSettingsPopUp lastItem setTag:HBAddPresetControllerModeCustom;
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"4320p 8K Ultra HD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode8K;
 
-    if (self.defaultToCustom)
-    {
-        mode = HBAddPresetControllerModeCustom;
-    }
-    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Source Maximum", @"Add preset window -> picture setting");
-    self.picSettingsPopUp lastItem setTag:HBAddPresetControllerModeSourceMaximum;
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"2160p 4K Ultra HD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode4K;
+
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"1440p 2.5K Quad HD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode1440p;
+
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"1080p HD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode1080p;
+
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"720p HD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode720p;
+
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"576p PAL SD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode576p;
 
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"480p NTSC SD", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitMode480p;
 
-    self.picSettingsPopUp selectItemWithTag:mode;
+    self.picSettingsPopUp addItemWithTitle:NSLocalizedString(@"Custom", @"Add preset window -> picture setting");
+    self.picSettingsPopUp.lastItem setTag:HBPictureResolutionLimitModeCustom;
+
+    self.picSettingsPopUp selectItemWithTag:self.resolutionLimitMode;
 
     // Initialize custom height and width settings to current values
     self.picWidth setIntValue:self.width;
@@ -162,20 +161,13 @@
 
 - (IBAction)addPresetPicDropdownChanged:(id)sender
 {
-    if (self.picSettingsPopUp.selectedItem.tag == HBAddPresetControllerModeCustom)
-    {
-        self.picWidthHeightBox.hidden = NO;
-    }
-    else
-    {
-        self.picWidthHeightBox.hidden = YES;
-    }
+    self.picWidthHeightBox.hidden = self.picSettingsPopUp.selectedItem.tag != HBPictureResolutionLimitModeCustom;
 }
 
 - (IBAction)showAudioSettingsSheet:(id)sender
 {
     HBAudioDefaults *defaults = HBAudioDefaults alloc init;
-    defaults applyPreset:self.mutablePreset;
+    defaults applyPreset:self.mutablePreset error:NULL;
 
     self.defaultsController = HBAudioDefaultsController alloc initWithSettings:defaults;
 
@@ -191,7 +183,7 @@
 - (IBAction)showSubtitlesSettingsSheet:(id)sender
 {
     HBSubtitlesDefaults *defaults = HBSubtitlesDefaults alloc init;
-    defaults applyPreset:self.mutablePreset;
+    defaults applyPreset:self.mutablePreset error:NULL;
 
     self.defaultsController = HBSubtitlesDefaultsController alloc initWithSettings:defaults;
 
@@ -220,20 +212,45 @@
         newPreset.name = self.name.stringValue;
         newPreset.presetDescription = self.desc.stringValue;
 
-        if (self.picSettingsPopUp.selectedTag == HBAddPresetControllerModeSourceMaximum)
-        {
-            newPreset@"PictureWidth" = @0;
-            newPreset@"PictureHeight" = @0;
+        switch (self.picSettingsPopUp.selectedTag) {
+            case HBPictureResolutionLimitModeNone:
+                newPreset@"PictureWidth" = @0;
+                newPreset@"PictureHeight" = @0;
+                break;
+            case HBPictureResolutionLimitMode8K:
+                newPreset@"PictureWidth" = @7680;
+                newPreset@"PictureHeight" = @4320;
+                break;
+            case HBPictureResolutionLimitMode4K:
+                newPreset@"PictureWidth" = @3840;
+                newPreset@"PictureHeight" = @2160;
+                break;
+            case HBPictureResolutionLimitMode1440p:
+                newPreset@"PictureWidth" = @2560;
+                newPreset@"PictureHeight" = @1440;
+                break;
+            case HBPictureResolutionLimitMode1080p:
+                newPreset@"PictureWidth" = @1920;
+                newPreset@"PictureHeight" = @1080;
+                break;
+            case HBPictureResolutionLimitMode720p:
+                newPreset@"PictureWidth" = @1280;
+                newPreset@"PictureHeight" = @720;
+                break;
+            case HBPictureResolutionLimitMode576p:
+                newPreset@"PictureWidth" = @720;
+                newPreset@"PictureHeight" = @576;
+                break;
+            case HBPictureResolutionLimitMode480p:
+                newPreset@"PictureWidth" = @720;
+                newPreset@"PictureHeight" = @480;
+                break;
+            case HBPictureResolutionLimitModeCustom:
+            default:
+                newPreset@"PictureWidth" = @(self.picWidth.integerValue);
+                newPreset@"PictureHeight" = @(self.picHeight.integerValue);
+                break;
         }
-        else
-        {
-            // Get the user set picture size
-            newPreset@"PictureWidth" = @(self.picWidth.integerValue);
-            newPreset@"PictureHeight" = @(self.picHeight.integerValue);
-        }
-
-        //Get the whether or not to apply pic Size and Cropping (includes Anamorphic)
-        newPreset@"UsesPictureSettings" = @(self.picSettingsPopUp.selectedTag);
 
         // Always use Picture Filter settings for the preset
         newPreset@"UsesPictureFilters" = @YES;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAppDelegate.m -> HandBrake-1.5.1.tar.xz/macosx/HBAppDelegate.m Changed

@@ -6,24 +6,23 @@
 
 #import "HBAppDelegate.h"
 
+@import HandBrakeKit;
+
 #import "HBQueue.h"
 
 #import "HBUtilities.h"
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
 #import "HBPresetsMenuBuilder.h"
 
 #import "HBPreferencesController.h"
 #import "HBQueueController.h"
+#import "HBQueueDockTileController.h"
 #import "HBOutputPanelController.h"
 #import "HBController.h"
 
-@import HandBrakeKit;
-
 #define PRESET_FILE @"UserPresets.json"
 #define QUEUE_FILE @"Queue.hbqueue"
 
-@interface HBAppDelegate ()
+@interface HBAppDelegate () <NSMenuItemValidation>
 
 @property (nonatomic, strong) HBPresetsManager *presetsManager;
 @property (nonatomic, strong) HBPresetsMenuBuilder *presetsMenuBuilder;
@@ -33,6 +32,7 @@
 
 @property (nonatomic, strong) HBQueue *queue;
 @property (nonatomic, strong) HBQueueController *queueController;
+@property (nonatomic, strong) HBQueueDockTileController *queueDockTileController;
 
 @property (nonatomic, strong) HBOutputPanelController *outputPanel;
 
@@ -50,14 +50,14 @@
 // Register the default preferences
 HBPreferencesController registerUserDefaults;
 
+ _outputPanel = HBOutputPanelController alloc init;
+
 HBCore initGlobal;
 HBCore registerErrorHandler:^(NSString *error) {
 fprintf(stderr, "error: %s\n", error.UTF8String);
 };
 HBCore setDVDNav:NSUserDefaults.standardUserDefaults boolForKey:HBUseDvdNav;
 
- _outputPanel = HBOutputPanelController alloc init;
-
 // we init the HBPresetsManager
 NSURL *appSupportURL = HBUtilities.appSupportURL;
 _presetsManager = HBPresetsManager alloc initWithURL:appSupportURL URLByAppendingPathComponent:PRESET_FILE;
@@ -66,6 +66,7 @@
 _queue = HBQueue alloc initWithURL:appSupportURL URLByAppendingPathComponent:QUEUE_FILE;
 _queueController = HBQueueController alloc initWithQueue:_queue;
 _queueController.delegate = self;
+ _queueDockTileController = HBQueueDockTileController alloc initWithQueue:_queue dockTile:NSApplication.sharedApplication.dockTile image:NSApplication.sharedApplication.applicationIconImage;
 _mainController = HBController alloc initWithDelegate:self queue:_queue presetsManager:_presetsManager;
 }
 return self;
@@ -84,6 +85,7 @@
 
 - (void)applicationDidFinishLaunching:(NSNotification *)notification
 {
+ NSApplication.sharedApplication.automaticCustomizeTouchBarMenuItemEnabled = YES;
 NSUserDefaults *ud = NSUserDefaults.standardUserDefaults;
 
 // Reset "When done" action
@@ -92,10 +94,6 @@
 ud setInteger:HBDoneActionDoNothing forKey:HBAlertWhenDone;
 }
 
- if (@available (macOS 10.12.2, *))
- {
- NSApplication.sharedApplication.automaticCustomizeTouchBarMenuItemEnabled = YES;
- }
 
 self.presetsMenuBuilder = HBPresetsMenuBuilder alloc initWithMenu:self.presetsMenu
 action:@selector(selectPresetFromMenu:)
@@ -103,30 +101,12 @@
 presetsManager:self.presetsManager;
 self.presetsMenuBuilder build;
 
- // Get the number of HandBrake instances currently running
- NSUInteger instances = NSRunningApplication runningApplicationsWithBundleIdentifier:NSBundle.mainBundle.bundleIdentifier.count;
-
 // Open debug output window now if it was visible when HB was closed
 if (ud boolForKey:@"OutputPanelIsOpen")
 {
 self showOutputPanel:nil;
 }
 
- // On Screen Notification
- // We check to see if there is already another instance of hb running.
- if (instances > 1)
- {
- NSAlert *alert = NSAlert alloc init;
- alert setMessageText:NSLocalizedString(@"There is already an instance of HandBrake running.", @"Queue -> Multiple instances alert message");
- alert setInformativeText:NSLocalizedString(@"The queue will be shared between the instances.", @"Queue -> Multiple instances alert informative text");
- alert runModal;
- }
- else
- {
- self.queue setEncodingJobsAsPending;
- self.queue removeCompletedAndCancelledItems;
- }
-
 // Now we re-check the queue array to see if there are
 // any remaining encodes to be done
 if (self.queue.items.count)
@@ -153,15 +133,7 @@
 self cleanEncodeLogs;
 }
 
- // If we are a single instance it is safe to clean up the previews if there are any
- // left over. This is a bit of a kludge but will prevent a build up of old instance
- // live preview cruft. No danger of removing an active preview directory since they
- // are created later in HBPreviewController if they don't exist at the moment a live
- // preview encode is initiated.
- if (instances == 1)
- {
- self cleanPreviews;
- }
+ self cleanPreviews;
 });
 }
 
@@ -206,10 +178,10 @@
 HBCore closeGlobal;
 }
 
-- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
+- (void)application:(NSApplication *)sender openURLs:(nonnull NSArray<NSURL *> *)urls
 {
- self.mainController openURL:NSURL fileURLWithPath:filenames.firstObject;
- NSApp replyToOpenOrPrint:NSApplicationDelegateReplySuccess;
+ self.mainController openURL:urls.firstObject;
+ //NSApp replyToOpenOrPrint:NSApplicationDelegateReplySuccess;
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudio.h -> HandBrake-1.5.1.tar.xz/macosx/HBAudio.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudioDefaults.h -> HandBrake-1.5.1.tar.xz/macosx/HBAudioDefaults.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudioDefaults.m -> HandBrake-1.5.1.tar.xz/macosx/HBAudioDefaults.m Changed

@@ -106,6 +106,15 @@
     _allowDTSPassthru = allowDTSPassthru;
 }
 
+- (void)setAllowMP2Passthru:(BOOL)allowMP2Passthru
+{
+    if (allowMP2Passthru != _allowMP2Passthru)
+    {
+        self.undo prepareWithInvocationTarget:self setAllowMP2Passthru:_allowMP2Passthru;
+    }
+    _allowMP2Passthru = allowMP2Passthru;
+}
+
 - (void)setAllowMP3Passthru:(BOOL)allowMP3Passthru
 {
     if (allowMP3Passthru != _allowMP3Passthru)
@@ -174,7 +183,7 @@
 
 #pragma mark - HBPresetCoding
 
-- (void)applyPreset:(HBPreset *)preset
+- (BOOL)applyPreset:(HBPreset *)preset error:(NSError * __autoreleasing *)outError
 {
     // Track selection behavior
     if (preset@"AudioTrackSelectionBehavior" isEqualToString:@"first")
@@ -204,6 +213,7 @@
     self.allowDTSHDPassthru  = NO;
     self.allowEAC3Passthru   = NO;
     self.allowFLACPassthru   = NO;
+    self.allowMP2Passthru    = NO;
     self.allowMP3Passthru    = NO;
     self.allowTrueHDPassthru = NO;
 
@@ -233,6 +243,9 @@
                 case HB_ACODEC_FLAC_PASS:
                     self.allowFLACPassthru = YES;
                     break;
+                case HB_ACODEC_MP2_PASS:
+                    self.allowMP2Passthru = YES;
+                    break;
                 case HB_ACODEC_MP3_PASS:
                     self.allowMP3Passthru = YES;
                     break;
@@ -287,11 +300,13 @@
         newTrack.gain = track@"AudioTrackGainSlider" doubleValue;
         self insertObject:newTrack inTracksArrayAtIndex:self countOfTracksArray;
     }
+
+    return YES;
 }
 
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings
 {
-    self applyPreset:preset;
+    self applyPreset:preset error:NULL;
 }
 
 - (void)writeToPreset:(HBMutablePreset *)preset
@@ -333,6 +348,10 @@
     {
         copyMask addObject:@(hb_audio_encoder_get_short_name(HB_ACODEC_DCA_PASS));
     }
+    if (self.allowMP2Passthru)
+    {
+        copyMask addObject:@(hb_audio_encoder_get_short_name(HB_ACODEC_MP2_PASS));
+    }
     if (self.allowMP3Passthru)
     {
         copyMask addObject:@(hb_audio_encoder_get_short_name(HB_ACODEC_MP3_PASS));
@@ -422,6 +441,7 @@
         copy->_allowEAC3Passthru = _allowEAC3Passthru;
         copy->_allowDTSHDPassthru = _allowDTSHDPassthru;
         copy->_allowDTSPassthru = _allowDTSPassthru;
+        copy->_allowMP2Passthru = _allowMP2Passthru;
         copy->_allowMP3Passthru = _allowMP3Passthru;
         copy->_allowTrueHDPassthru = _allowTrueHDPassthru;
         copy->_allowFLACPassthru = _allowFLACPassthru;
@@ -455,6 +475,7 @@
     encodeBool(_allowEAC3Passthru);
     encodeBool(_allowDTSHDPassthru);
     encodeBool(_allowDTSPassthru);
+    encodeBool(_allowMP2Passthru);
     encodeBool(_allowMP3Passthru);
     encodeBool(_allowTrueHDPassthru);
     encodeBool(_allowFLACPassthru);
@@ -482,6 +503,7 @@
     decodeBool(_allowEAC3Passthru);
     decodeBool(_allowDTSHDPassthru);
     decodeBool(_allowDTSPassthru);
+    decodeBool(_allowMP2Passthru);
     decodeBool(_allowMP3Passthru);
     decodeBool(_allowTrueHDPassthru);
     decodeBool(_allowFLACPassthru);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudioDefaultsController.m -> HandBrake-1.5.1.tar.xz/macosx/HBAudioDefaultsController.m Changed

@@ -18,7 +18,6 @@
 @property (nonatomic, readonly, strong) HBLanguagesSelection *languagesList;
 
 @property (nonatomic, unsafe_unretained) IBOutlet HBLanguageArrayController *tableController;
-@property (nonatomic, unsafe_unretained) IBOutlet NSButton *showAllButton;
 
 @property (nonatomic, unsafe_unretained) IBOutlet NSArrayController *tracksController;
 
@@ -39,41 +38,11 @@
     return self;
 }
 
-- (void)windowDidLoad
-{
-    self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBAudioDefaultsContext;
-
-    if (self.settings.trackSelectionLanguages.count)
-    {
-        self.tableController.showSelectedOnly = YES;
-    }
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if (context == HBAudioDefaultsContext)
-    {
-        if (keyPath isEqualToString:@"tableController.showSelectedOnly")
-        {
-            self.showAllButton setState:!self.tableController.showSelectedOnly;
-        }
-    }
-    else
-    {
-        super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
-    }
-}
-
-- (IBAction)edit:(id)sender
-{
-    self.tableController.showSelectedOnly = !self.tableController.showSelectedOnly;
-}
-
 - (IBAction)addTrack:(id)sender
 {
     if (sender selectedSegment)
     {
-        if (self.tracksController arrangedObjects count && self.tracksController.selectionIndex != NSNotFound)
+        if (self.tracksController.arrangedObjects count && self.tracksController.selectionIndex != NSNotFound)
         {
             self.tracksController removeObjectAtArrangedObjectIndex:self.tracksController.selectionIndex;
         }
@@ -97,15 +66,7 @@
 
 - (IBAction)openUserGuide:(id)sender
 {
-    NSWorkspace sharedWorkspace openURL:HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html";
-}
-
-- (void)dealloc
-{
-    @try {
-        self removeObserver:self forKeyPath:@"tableController.showSelectedOnly" context:HBAudioDefaultsContext;
-    } @catch (NSException * __unused exception) {}
-
+    NSWorkspace.sharedWorkspace openURL:HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html";
 }
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudioTrack.m -> HandBrake-1.5.1.tar.xz/macosx/HBAudioTrack.m Changed

@@ -29,7 +29,7 @@
         _container = HB_MUX_MKV;
         _sampleRate = 0;
         _bitRate = 160;
-        _mixdown = HB_AMIXDOWN_DOLBYPLII;
+        _mixdown = HB_AMIXDOWN_STEREO;
     }
     return self;
 }
@@ -66,7 +66,7 @@
         }
         else
         {
-            self.encoder = self sanatizeEncoderValue:self.encoder;
+            self.encoder = self sanitizeEncoderValue:self.encoder;
         }
     }
     else
@@ -115,7 +115,7 @@
     {
         if (self.encoder)
         {
-            self.encoder = self sanatizeEncoderValue:self.encoder;
+            self.encoder = self sanitizeEncoderValue:self.encoder;
         }
     }
 }
@@ -131,9 +131,9 @@
     if (!(self.undo.isUndoing || self.undo.isRedoing) && !self.validating)
     {
         self.validating = YES;
-        self.mixdown = self sanatizeMixdownValue:self.mixdown;
-        self.sampleRate = self sanatizeSamplerateValue:self.sampleRate;
-        self.bitRate = self sanatizeBitrateValue:self.bitRate;
+        self.mixdown = self sanitizeMixdownValue:self.mixdown;
+        self.sampleRate = self sanitizeSamplerateValue:self.sampleRate;
+        self.bitRate = self sanitizeBitrateValue:self.bitRate;
         self.delegate encoderChanged;
         self.validating = NO;
     }
@@ -150,7 +150,7 @@
     if (!(self.undo.isUndoing || self.undo.isRedoing) && !self.validating)
     {
         self.validating = YES;
-        self.bitRate = self sanatizeBitrateValue:self.bitRate;
+        self.bitRate = self sanitizeBitrateValue:self.bitRate;
         self.validating = NO;
     }
 }
@@ -166,7 +166,7 @@
     if (!(self.undo.isUndoing || self.undo.isRedoing) && !self.validating)
     {
         self.validating = YES;
-        self.bitRate = self sanatizeBitrateValue:self.bitRate;
+        self.bitRate = self sanitizeBitrateValue:self.bitRate;
         self.validating = NO;
     }
 }
@@ -237,7 +237,7 @@
 
 #pragma mark - Validation
 
-- (int)sanatizeEncoderValue:(int)proposedEncoder
+- (int)sanitizeEncoderValue:(int)proposedEncoder
 {
     if (proposedEncoder)
     {
@@ -270,7 +270,7 @@
     }
 }
 
-- (int)sanatizeMixdownValue:(int)proposedMixdown
+- (int)sanitizeMixdownValue:(int)proposedMixdown
 {
     HBTitleAudioTrack *sourceTrack = _dataSource sourceTrackAtIndex:_sourceTrackIdx;
     uint64_t channelLayout = sourceTrack.channelLayout;
@@ -282,7 +282,7 @@
     return proposedMixdown;
 }
 
-- (int)sanatizeSamplerateValue:(int)proposedSamplerate
+- (int)sanitizeSamplerateValue:(int)proposedSamplerate
 {
     if (self.encoder & HB_ACODEC_PASS_FLAG)
     {
@@ -295,7 +295,7 @@
     return proposedSamplerate;
 }
 
-- (int)sanatizeBitrateValue:(int)proposedBitrate
+- (int)sanitizeBitrateValue:(int)proposedBitrate
 {
     if (self.encoder & HB_ACODEC_PASS_FLAG)
     {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAudioTrackPreset.m -> HandBrake-1.5.1.tar.xz/macosx/HBAudioTrackPreset.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBAutoNamer.m -> HandBrake-1.5.1.tar.xz/macosx/HBAutoNamer.m Changed

@@ -6,7 +6,6 @@
 
 #import "HBAutoNamer.h"
 
-#import "HBJob.h"
 #import "HBJob+HBAdditions.h"
 #import "HBPreferencesKeys.h"
 
@@ -90,6 +89,7 @@
 {
     NSNotificationCenter defaultCenter addObserver:self selector:@selector(updateFileExtension:) name:HBAudioEncoderChangedNotification object:self.job.audio;
     NSNotificationCenter defaultCenter addObserver:self selector:@selector(updateFileExtension:) name:HBChaptersChangedNotification object:self.job;
+    NSNotificationCenter defaultCenter addObserver:self selector:@selector(updateFileExtension:) name:HBContainerChangedNotification object:self.job;
     NSNotificationCenter defaultCenter addObserver:self selector:@selector(updateFileExtension:) name:HBRangeChangedNotification object:self.job.range;
 }
 
@@ -97,6 +97,7 @@
 {
     NSNotificationCenter defaultCenter removeObserver:self name:HBAudioEncoderChangedNotification object:self.job.audio;
     NSNotificationCenter defaultCenter removeObserver:self name:HBChaptersChangedNotification object:self.job;
+    NSNotificationCenter defaultCenter removeObserver:self name:HBContainerChangedNotification object:self.job;
     NSNotificationCenter defaultCenter removeObserver:self name:HBRangeChangedNotification object:_job.range;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBChapterTitlesController.m -> HandBrake-1.5.1.tar.xz/macosx/HBChapterTitlesController.m Changed

@@ -323,18 +323,18 @@
                 csv appendFormat:@"%ld,",idx + 1;
                 idx++;
 
-                NSString *sanatizedTitle = chapter.title stringByReplacingOccurrencesOfString:@"\"" withString:@"\"\"";
+                NSString *sanitizedTitle = chapter.title stringByReplacingOccurrencesOfString:@"\"" withString:@"\"\"";
 
                 // If the title contains any commas or quotes, add quotes
-                if (sanatizedTitle containsString:@"," || sanatizedTitle containsString:@"\"")
+                if (sanitizedTitle containsString:@"," || sanitizedTitle containsString:@"\"")
                 {
                     csv appendString:@"\"";
-                    csv appendString:sanatizedTitle;
+                    csv appendString:sanitizedTitle;
                     csv appendString:@"\"";
                 }
                 else
                 {
-                    csv appendString:sanatizedTitle;
+                    csv appendString:sanitizedTitle;
                 }
                 csv appendString:@"\n";
             }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBController.h -> HandBrake-1.5.1.tar.xz/macosx/HBController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBController.m -> HandBrake-1.5.1.tar.xz/macosx/HBController.m Changed

@@ -13,10 +13,8 @@
 #import "NSWindow+HBAdditions.h"
 
 #import "HBQueue.h"
+#import "HBQueueWorker.h"
 
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
-#import "HBMutablePreset.h"
 #import "HBPresetsMenuBuilder.h"
 
 #import "HBSummaryViewController.h"
@@ -43,110 +41,93 @@
 static void *HBControllerScanCoreContext = &HBControllerScanCoreContext;
 static void *HBControllerLogLevelContext = &HBControllerLogLevelContext;
 
-@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate, NSDraggingDestination, NSPopoverDelegate>
-{
- IBOutlet NSTabView *fMainTabView;
+@interface HBController () <HBPresetsViewControllerDelegate, HBTitleSelectionDelegate, NSMenuItemValidation, NSDraggingDestination, NSPopoverDelegate, NSPathControlDelegate>
 
- // Picture controller
- HBPictureViewController * fPictureViewController;
- IBOutlet NSTabViewItem * fPictureTab;
+@property (nonatomic, readonly, strong) HBCore *core;
+@property (nonatomic, readonly, strong) HBAppDelegate *delegate;
 
- // Filters controller
- HBFiltersViewController * fFiltersViewController;
- IBOutlet NSTabViewItem * fFiltersTab;
+@property (nonatomic, weak) IBOutlet NSTextField *sourceLabel;
+@property (nonatomic, weak) IBOutlet NSPopUpButton *titlePopUp;
+@property (nonatomic, weak) IBOutlet NSPathControl *destinationPathControl;
 
- // Video view controller
- HBVideoController * fVideoController;
- IBOutlet NSTabViewItem * fVideoTab;
+@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstrain;
+@property (nonatomic, readwrite) NSColor *labelColor;
 
- // Subtitles view controller
- HBSubtitlesController * fSubtitlesViewController;
- IBOutlet NSTabViewItem * fSubtitlesTab;
+/// Whether the window is visible or occluded,
+/// useful to avoid updating the UI needlessly
+@property (nonatomic) BOOL visible;
+@property (nonatomic) BOOL suppressCopyProtectionWarning;
 
- // Audio view controller
- HBAudioController * fAudioController;
- IBOutlet NSTabViewItem * fAudioTab;
+#pragma mark - Scan UI
 
- // Chapters view controller
- HBChapterTitlesController * fChapterTitlesController;
- IBOutlet NSTabViewItem * fChaptersTitlesTab;
+@property (nonatomic, weak) IBOutlet NSProgressIndicator *scanIndicator;
+@property (nonatomic, weak) IBOutlet NSBox *scanHorizontalLine;
 
- // Picture Preview
- HBPreviewController * fPreviewController;
+#pragma mark - Controllers
 
- // Source box
- IBOutlet NSProgressIndicator * fScanIndicator;
- IBOutlet NSBox * fScanHorizontalLine;
+@property (nonatomic, readonly, strong) HBSummaryViewController *summaryController;
+@property (nonatomic, readonly, strong) HBPictureViewController *pictureViewController;
+@property (nonatomic, readonly, strong) HBFiltersViewController *filtersViewController;
+@property (nonatomic, readonly, strong) HBVideoController *videoController;
+@property (nonatomic, readonly, strong) HBAudioController *audioController;
+@property (nonatomic, readonly, strong) HBSubtitlesController *subtitlesViewController;
+@property (nonatomic, readonly, strong) HBChapterTitlesController *chapterTitlesController;
 
- IBOutlet NSTextField * fSrcDVD2Field;
- IBOutlet NSPopUpButton * fSrcTitlePopUp;
+@property (nonatomic, strong) IBOutlet NSTabView *mainTabView;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *summaryTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *pictureTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *filtersTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *videoTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *audioTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *subtitlesTab;
+@property (nonatomic, strong) IBOutlet NSTabViewItem *chaptersTab;
 
- // Bottom
- IBOutlet NSTextField * fStatusField;
- IBOutlet NSProgressIndicator * fRipIndicator;
+@property (nonatomic, readonly, strong) HBPreviewController *previewController;
+@property (nonatomic, strong) HBTitleSelectionController *titlesSelectionController;
 
- // User Preset
- HBPresetsManager * presetManager;
- HBPresetsViewController * fPresetsView;
-}
+#pragma mark - Presets
 
-@property (nonatomic, strong) IBOutlet NSLayoutConstraint *bottomConstrain;
+@property (nonatomic, readonly, strong) HBPresetsManager *presetManager;
+@property (nonatomic, readonly, strong) HBPresetsMenuBuilder *presetsMenuBuilder;
+@property (nonatomic, readonly, strong) HBPresetsViewController *presetView;
 
-@property (nonatomic, strong) HBPresetsMenuBuilder *presetsMenuBuilder;
+@property (nonatomic, readonly, strong) NSPopover *presetsPopover;
 @property (nonatomic, strong) IBOutlet NSPopUpButton *presetsPopup;
 
-@property (nonatomic, strong) IBOutlet NSToolbarItem *presetsItem;
-@property (nonatomic, strong) NSPopover *presetsPopover;
-
-@property (nonatomic, strong) HBSummaryViewController *summaryController;
-@property (nonatomic, strong) IBOutlet NSTabViewItem *summaryTab;
+@property (nonatomic, nullable, strong) HBPreset *selectedPreset;
+@property (nonatomic, strong) HBPreset *currentPreset;
 
-@property (nonatomic, weak) IBOutlet HBToolbarBadgedItem *showQueueToolbarItem;
+#pragma mark - Open panel accessory view
 
 @property (nonatomic, weak) IBOutlet NSView *openTitleView;
-@property (nonatomic, readwrite) BOOL scanSpecificTitle;
-@property (nonatomic, readwrite) NSInteger scanSpecificTitleIdx;
+@property (nonatomic) BOOL scanSpecificTitle;
+@property (nonatomic) NSInteger scanSpecificTitleIdx;
 
-@property (nonatomic, readwrite, strong) HBTitleSelectionController *titlesSelectionController;
+#pragma mark - Job
 
-/// The current job.
-@property (nonatomic, nullable) HBJob *job;
-@property (nonatomic, nullable) HBAutoNamer *autoNamer;
-
-/// The selected preset.
-@property (nonatomic, nullable, strong) HBPreset *selectedPreset;
-
-/// The current modified preset.
-@property (nonatomic, strong) HBPreset *currentPreset;
-
-/// The current destination.
 @property (nonatomic, strong) NSURL *destinationURL;
 
-/// The HBCore used for scanning.
-@property (nonatomic, strong) HBCore *core;
-
-/// The app delegate.
-@property (nonatomic, strong) HBAppDelegate *delegate;
-
-/// The queue.
-@property (nonatomic, weak) HBQueue *queue;
+@property (nonatomic, nullable) HBJob *job;
+@property (nonatomic, nullable) HBAutoNamer *autoNamer;
 
-/// Whether the window is visible or occluded,
-/// useful to avoid updating the UI needlessly
-@property (nonatomic) BOOL visible;
+#pragma mark - Queue
 
-/// Queue progress info
-@property (nonatomic, copy) NSString *progressInfo;
-@property (nonatomic) double progress;
+@property (nonatomic, readonly, weak) HBQueue *queue;
+@property (nonatomic) id observerToken;
 
-@property (nonatomic, readwrite) NSColor *labelColor;
+#define WINDOW_HEIGHT_OFFSET 30
+@property (nonatomic) IBOutlet NSTextField *statusField;
+@property (nonatomic) IBOutlet NSTextField *progressField;
+@property (nonatomic, copy) NSString *progress;
 
-// Alerts
-@property (nonatomic) BOOL suppressCopyProtectionWarning;
+#pragma mark - Toolbar
 
 @property (nonatomic) IBOutlet NSToolbarItem *openSourceToolbarItem;
 @property (nonatomic) IBOutlet NSToolbarItem *ripToolbarItem;
 @property (nonatomic) IBOutlet NSToolbarItem *pauseToolbarItem;
+@property (nonatomic) IBOutlet NSToolbarItem *presetsItem;
+
+@property (nonatomic, weak) IBOutlet HBToolbarBadgedItem *showQueueToolbarItem;
 
 @end
 
@@ -156,9 +137,6 @@
 - (void)_touchBar_validateUserInterfaceItems;
 @end
 
-#define WINDOW_HEIGHT_OFFSET_INIT 48
-#define WINDOW_HEIGHT_OFFSET 30
-
 @implementation HBController
 
 - (instancetype)initWithDelegate:(HBAppDelegate *)delegate queue:(HBQueue *)queue presetsManager:(HBPresetsManager *)manager
@@ -171,20 +149,18 @@
 _core = HBCore alloc initWithLogLevel:loggingLevel name:@"ScanCore";
 
 // Inits the controllers
- fPreviewController = HBPreviewController alloc init;
- fPreviewController.documentController = self;
+ _previewController = HBPreviewController alloc init;
+ _previewController.documentController = self;
 
 _delegate = delegate;
 _queue = queue;
 
- presetManager = manager;
+ _presetManager = manager;
 _selectedPreset = manager.defaultPreset;
 _currentPreset = manager.defaultPreset;
 
 _scanSpecificTitleIdx = 1;
-
- // Progress
- _progressInfo = @"";
+ _progress = @"";
 
 // Check to see if the last destination has been set, use if so, if not, use Movies
 #ifdef __SANDBOX_ENABLED__
@@ -196,11 +172,9 @@
 #else
 _destinationURL = NSUserDefaults.standardUserDefaults URLForKey:HBLastDestinationDirectoryURL;
 #endif
-
 if (!_destinationURL || NSFileManager.defaultManager fileExistsAtPath:_destinationURL.path isDirectory:nil == NO)
 {
- _destinationURL = NSURL fileURLWithPath:NSSearchPathForDirectoriesInDomains(NSMoviesDirectory, NSUserDomainMask, YES) firstObject
- isDirectory:YES;
+ _destinationURL = HBUtilities.defaultDestinationURL;
 }
 
 #ifdef __SANDBOX_ENABLED__
@@ -213,129 +187,114 @@
 
 - (void)windowDidLoad
 {
- if (@available (macOS 10.12, *))
+ self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+
+ if (@available (macOS 11, *))
 {
- self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+ self.window.toolbarStyle = NSWindowToolbarStyleExpanded;
 }
 
 self enableUI:NO;
 
 // Bottom
- fStatusField.font = NSFont monospacedDigitSystemFontOfSize:NSFont.smallSystemFontSize weight:NSFontWeightRegular;
- fRipIndicator.hidden = YES;
+ self.statusField.stringValue = @"";
+ self.progressField.font = NSFont monospacedDigitSystemFontOfSize:NSFont.smallSystemFontSize weight:NSFontWeightRegular;
 self updateProgress;
 
 // Register HBController's Window as a receiver for files/folders drag & drop operations
- self.window registerForDraggedTypes:@(NSString *)kUTTypeFileURL;
- fMainTabView registerForDraggedTypes:@(NSString *)kUTTypeFileURL;
+ self.window registerForDraggedTypes:@NSPasteboardTypeFileURL;
+ self.mainTabView registerForDraggedTypes:@NSPasteboardTypeFileURL;
 
- fPresetsView = HBPresetsViewController alloc initWithPresetManager:presetManager;
- fPresetsView.delegate = self;
+ _presetView = HBPresetsViewController alloc initWithPresetManager:self.presetManager;
+ _presetView.delegate = self;
 
 // Set up the presets popover
- self.presetsPopover = NSPopover alloc init;
+ _presetsPopover = NSPopover alloc init;
 
- self.presetsPopover.contentViewController = fPresetsView;
- self.presetsPopover.contentSize = NSMakeSize(294, 580);
- self.presetsPopover.animates = YES;
+ _presetsPopover.contentViewController = self.presetView;
+ _presetsPopover.contentSize = NSMakeSize(300, 580);
+ _presetsPopover.animates = YES;
 
 // AppKit will close the popover when the user interacts with a user interface element outside the popover.
 // note that interacting with menus or panels that become key only when needed will not cause a transient popover to close.
- self.presetsPopover.behavior = NSPopoverBehaviorSemitransient;
- self.presetsPopover.delegate = self;
+ _presetsPopover.behavior = NSPopoverBehaviorSemitransient;
+ _presetsPopover.delegate = self;
 
- fPresetsView view;
+ self.presetView view;
 
- // Set up the summary view
- self.summaryController = HBSummaryViewController alloc init;
+ // Setup the view controllers
+ _summaryController = HBSummaryViewController alloc init;
 self.summaryTab.view = self.summaryController.view;
 
- // Set up the chapters title view
- fChapterTitlesController = HBChapterTitlesController alloc init;
- fChaptersTitlesTab setView:fChapterTitlesController view;
+ _pictureViewController = HBPictureViewController alloc init;
+ self.pictureTab.view = self.pictureViewController.view;
 
- // setup the subtitles view
- fSubtitlesViewController = HBSubtitlesController alloc init;
- fSubtitlesTab setView:fSubtitlesViewController view;
+ _filtersViewController = HBFiltersViewController alloc init;
+ self.filtersTab.view = self.filtersViewController.view;
 
- // setup the audio controller
- fAudioController = HBAudioController alloc init;
- fAudioTab setView:fAudioController view;
+ _videoController = HBVideoController alloc init;
+ self.videoTab.view = self.videoController.view;
 
- // setup the video view controller
- fVideoController = HBVideoController alloc init;
- fVideoTab setView:fVideoController view;
+ _audioController = HBAudioController alloc init;
+ self.audioTab.view = self.audioController.view;
 
- // setup the picture view controller
- fPictureViewController = HBPictureViewController alloc init;
- fPictureTab setView:fPictureViewController view;
+ _subtitlesViewController = HBSubtitlesController alloc init;
+ self.subtitlesTab.view = self.subtitlesViewController.view;
 
- // setup the filters view controller
- fFiltersViewController = HBFiltersViewController alloc init;
- fFiltersTab setView:fFiltersViewController view;
+ _chapterTitlesController = HBChapterTitlesController alloc init;
+ self.chaptersTab.view = self.chapterTitlesController.view;
 
 // Add the observers
-
 self.core addObserver:self forKeyPath:@"state"
 options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
 context:HBControllerScanCoreContext;
 
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidStartNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidStartNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
 self.bottomConstrain.animator.constant = 0;
- self->fRipIndicator.hidden = NO;
 };
 
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
 self.bottomConstrain.animator.constant = -WINDOW_HEIGHT_OFFSET;
- self->fRipIndicator.hidden = YES;
+ self.statusField.stringValue = @"";
+ self.progress = @"";
+ self updateProgress;
 };
 
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueProgressNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
- HBQueueItem *item = self.queue.currentItem;
- NSString *info;
- if (item)
- {
- info = NSString stringWithFormat:NSLocalizedString(@"Encoding %@\n%@", @""),
- self.queue.currentItem.outputFileName,
- note.userInfoHBQueueProgressNotificationInfoKey;
- }
- else
- {
- info = note.userInfoHBQueueProgressNotificationInfoKey;
- }
- self.progressInfo = info;
- self.progress = note.userInfoHBQueueProgressNotificationPercentKey doubleValue;
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidStartItemNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self setUpQueueObservers; };
 
- if (self->_visible)
- {
- self updateProgress;
- }
- };
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteItemNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self setUpQueueObservers; };
 
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidChangeStateNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
- self updateQueueUI;
- };
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidChangeStateNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self updateQueueUI; };
 
 self updateQueueUI;
 
 // Presets menu
- self.presetsMenuBuilder = HBPresetsMenuBuilder alloc initWithMenu:self.presetsPopup.menu
- action:@selector(selectPresetFromMenu:)
- size:NSFont smallSystemFontSize
- presetsManager:presetManager;
+ _presetsMenuBuilder = HBPresetsMenuBuilder alloc initWithMenu:self.presetsPopup.menu
+ action:@selector(selectPresetFromMenu:)
+ size:NSFont smallSystemFontSize
+ presetsManager:self.presetManager;
 self.presetsMenuBuilder build;
 
 // Log level
 NSUserDefaultsController.sharedUserDefaultsController addObserver:self forKeyPath:@"values.LoggingLevel"
 options:0 context:HBControllerLogLevelContext;
 
- self.bottomConstrain.constant = -WINDOW_HEIGHT_OFFSET_INIT;
+ self.bottomConstrain.constant = -WINDOW_HEIGHT_OFFSET;
 
 self.window recalculateKeyViewLoop;
 }
 
-#pragma mark -
-#pragma mark Drag & drop handling
+#pragma mark - Drag & drop handling
 
 - (nullable NSArray<NSURL *> *)fileURLsFromPasteboard:(NSPasteboard *)pasteboard
 {
@@ -381,11 +340,8 @@
 {
 HBState state = changeNSKeyValueChangeNewKey intValue;
 self updateToolbarButtonsStateForScanCore:state;
- if (@available(macOS 10.12.2, *))
- {
- self _touchBar_updateButtonsStateForScanCore:state;
- self _touchBar_validateUserInterfaceItems;
- }
+ self _touchBar_updateButtonsStateForScanCore:state;
+ self _touchBar_validateUserInterfaceItems;
 }
 else if (context == HBControllerLogLevelContext)
 {
@@ -401,11 +357,10 @@
 {
 self updateToolbarButtonsState;
 self.window.toolbar validateVisibleItems;
- if (@available(macOS 10.12.2, *))
- {
- self _touchBar_updateQueueButtonsState;
- self _touchBar_validateUserInterfaceItems;
- }
+
+ self _touchBar_updateQueueButtonsState;
+ self _touchBar_validateUserInterfaceItems;
+
 NSUInteger count = self.queue.pendingItemsCount;
 self.showQueueToolbarItem.badgeValue = count ? @(count).stringValue : @"";
 }
@@ -466,7 +421,7 @@
 self.labelColor = NSColor disabledControlTextColor;
 }
 
- fPresetsView.enabled = enabled;
+ self.presetView.enabled = enabled;
 }
 
 - (void)setNilValueForKey:(NSString *)key
@@ -477,6 +432,90 @@
 }
 }
 
+#pragma mark - Queue progress
+
+- (void)windowDidChangeOcclusionState:(NSNotification *)notification
+{
+ if (self.window.occlusionState & NSWindowOcclusionStateVisible)
+ {
+ self.visible = YES;
+ self updateProgress;
+ }
+ else
+ {
+ self.visible = NO;
+ }
+}
+
+- (void)updateProgress
+{
+ self.progressField.stringValue = self.progress;
+}
+
+- (void)setUpQueueObservers
+{
+ self removeQueueObservers;
+
+ if (self->_queue.workingItemsCount > 1)
+ {
+ self setUpForMultipleWorkers;
+ }
+ else if (self->_queue.workingItemsCount == 1)
+ {
+ self setUpForSingleWorker;
+ }
+}
+
+- (void)setUpForMultipleWorkers
+{
+ self.statusField.stringValue = NSString stringWithFormat:NSLocalizedString(@"Encoding %lu Jobs", @""), self.queue.workingItemsCount;
+ self.progress = NSLocalizedString(@"Working", @"");
+ self updateProgress;
+}
+
+- (void)setUpForSingleWorker
+{
+ HBQueueJobItem *firstWorkingItem = nil;
+ for (HBQueueJobItem *item in self.queue.items)
+ {
+ if (item.state == HBQueueItemStateWorking)
+ {
+ firstWorkingItem = item;
+ break;
+ }
+ }
+
+ if (firstWorkingItem)
+ {
+ HBQueueWorker *worker = self.queue workerForItem:firstWorkingItem;
+
+ if (worker)
+ {
+ self.observerToken = NSNotificationCenter.defaultCenter addObserverForName:HBQueueWorkerProgressNotification
+ object:worker queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
+ self.progress = note.userInfoHBQueueWorkerProgressNotificationInfoKey;
+
+ if (self->_visible)
+ {
+ self updateProgress;
+ }
+ };
+ }
+ }
+
+ self.statusField.stringValue = NSString stringWithFormat:NSLocalizedString(@"Encoding Job: %@", @""), firstWorkingItem.outputFileName;
+}
+
+- (void)removeQueueObservers
+{
+ if (self.observerToken)
+ {
+ NSNotificationCenter.defaultCenter removeObserver:self.observerToken;
+ self.observerToken = nil;
+ }
+}
+
 #pragma mark - UI Validation
 
 - (BOOL)validateUserIterfaceItemForAction:(SEL)action
@@ -597,6 +636,11 @@
 {
 return self.selectedPreset && self.selectedPreset.isBuiltIn == NO;
 }
+ if (action == @selector(switchToNextTitle:) ||
+ action == @selector(switchToPreviousTitle:))
+ {
+ return self.core.titles.count > 1 && self.job != nil;
+ }
 
 return YES;
 }
@@ -633,16 +677,16 @@
 - (void)scanURL:(NSURL *)fileURL titleIndex:(NSUInteger)index completionHandler:(void(^)(NSArray<HBTitle *> *titles))completionHandler
 {
 // Save the current settings
- if (self.job)
- {
- self.currentPreset = self createPresetFromCurrentSettings;
- }
+ self updateCurrentPreset;
 
 self.job = nil;
- fSrcTitlePopUp removeAllItems;
+ self.titlePopUp removeAllItems;
 self.window.representedURL = nil;
 self.window.title = NSLocalizedString(@"HandBrake", @"Main Window -> title");
 
+ // Clear the undo manager, we can't undo this action
+ self.window.undoManager removeAllActions;
+
 NSURL *mediaURL = HBUtilities mediaURLFromURL:fileURL;
 
 NSError *outError = NULL;
@@ -651,7 +695,7 @@
 BOOL canScan = self.core canScan:mediaURL error:&outError;
 
 // Notify the user that we don't support removal of copy protection.
- if (canScan && outError code == 101 && !self.suppressCopyProtectionWarning)
+ if (canScan && outError.code == 101 && !self.suppressCopyProtectionWarning)
 {
 self.suppressCopyProtectionWarning = YES;
 if (self runCopyProtectionAlert == NSAlertFirstButtonReturn)
@@ -677,23 +721,23 @@
 previews:hb_num_previews minDuration:min_title_duration_seconds keepPreviews:YES
 progressHandler:^(HBState state, HBProgress progress, NSString *info)
 {
- self->fSrcDVD2Field.stringValue = info;
- self->fScanIndicator.hidden = NO;
- self->fScanHorizontalLine.hidden = YES;
- self->fScanIndicator.doubleValue = progress.percent;
+ self.sourceLabel.stringValue = info;
+ self.scanIndicator.hidden = NO;
+ self.scanHorizontalLine.hidden = YES;
+ self.scanIndicator.doubleValue = progress.percent;
 }
 completionHandler:^(HBCoreResult result)
 {
- self->fScanHorizontalLine.hidden = NO;
- self->fScanIndicator.hidden = YES;
- self->fScanIndicator.indeterminate = NO;
- self->fScanIndicator.doubleValue = 0.0;
+ self.scanHorizontalLine.hidden = NO;
+ self.scanIndicator.hidden = YES;
+ self.scanIndicator.indeterminate = NO;
+ self.scanIndicator.doubleValue = 0.0;
 
- if (result == HBCoreResultDone)
+ if (result.code == HBCoreResultCodeDone)
 {
 for (HBTitle *title in self.core.titles)
 {
- self->fSrcTitlePopUp addItemWithTitle:title.description;
+ self.titlePopUp addItemWithTitle:title.description;
 }
 self.window.representedURL = mediaURL;
 self.window.title = mediaURL.lastPathComponent;
@@ -701,7 +745,7 @@
 else
 {
 // We display a message if a valid source was not chosen
- self->fSrcDVD2Field.stringValue = NSLocalizedString(@"No Valid Source Found", @"Main Window -> Info text");
+ self.sourceLabel.stringValue = NSLocalizedString(@"No Valid Source Found", @"Main Window -> Info text");
 }
 
 // Set the last searched source directory in the prefs here
@@ -715,11 +759,13 @@
 }
 
 completionHandler(self.core.titles);
+
+ // Clear the undo manager, the completion handle
+ // set the job in the main window
+ // and don't want to make it undoable
+ self.window.undoManager removeAllActions;
 self.window.toolbar validateVisibleItems;
- if (@available(macOS 10.12.2, *))
- {
- self _touchBar_validateUserInterfaceItems;
- }
+ self _touchBar_validateUserInterfaceItems;
 };
 }
 else
@@ -730,11 +776,13 @@
 
 - (void)openURL:(NSURL *)fileURL titleIndex:(NSUInteger)index
 {
+ self showWindow:self;
+
 self scanURL:fileURL titleIndex:index completionHandler:^(NSArray<HBTitle *> *titles)
 {
 if (titles.count)
 {
- NSDocumentController sharedDocumentController noteNewRecentDocumentURL:fileURL;
+ NSDocumentController.sharedDocumentController noteNewRecentDocumentURL:fileURL;
 
 HBTitle *featuredTitle = titles.firstObject;
 for (HBTitle *title in titles)
@@ -746,7 +794,16 @@
 }
 
 HBJob *job = self jobFromTitle:featuredTitle;
- self.job = job;
+ if (job)
+ {
+ self.job = job;
+ }
+ else
+ {
+ self.job = nil;
+ self.titlePopUp removeAllItems;
+ self.sourceLabel.stringValue = NSLocalizedString(@"No Valid Preset", @"Main Window -> Info text");
+ }
 }
 };
 }
@@ -789,8 +846,11 @@
 job.title = titles.firstObject;
 }
 
- self.selectedPreset = nil;
 self.job = job;
+ job.undo = self.window.undoManager;
+
+ self.currentPreset = self createPresetFromCurrentSettings;
+ self.selectedPreset = nil;
 
 handler(YES);
 }
@@ -799,6 +859,7 @@
 handler(NO);
 }
 };
+ self showWindow:self;
 }
 else
 {
@@ -809,23 +870,26 @@
 - (HBJob *)jobFromTitle:(HBTitle *)title
 {
 // If there is already a title load, save the current settings to a preset
- if (self.job)
+ // Save the current settings
+ self updateCurrentPreset;
+
+ HBJob *job = HBJob alloc initWithTitle:title preset:self.currentPreset;
+ if (job)
 {
- self.currentPreset = self createPresetFromCurrentSettings;
- }
+ job.outputURL = self.destinationURL;
 
- HBJob *job = HBJob alloc initWithTitle:title andPreset:self.currentPreset;
- job.outputURL = self.destinationURL;
+ // If the source is not a stream, and autonaming is disabled,
+ // keep the existing file name.
+ if (self.job.outputFileName.length == 0 || title.isStream || NSUserDefaults.standardUserDefaults boolForKey:HBDefaultAutoNaming)
+ {
+ job.outputFileName = job.defaultName;
+ }
+ else
+ {
+ job.outputFileName = self.job.outputFileName;
+ }
 
- // If the source is not a stream, and autonaming is disabled,
- // keep the existing file name.
- if (self.job.outputFileName.length == 0 || title.isStream || NSUserDefaults.standardUserDefaults boolForKey:HBDefaultAutoNaming)
- {
- job.outputFileName = job.defaultName;
- }
- else
- {
- job.outputFileName = self.job.outputFileName;
+ job.undo = self.window.undoManager;
 }
 
 return job;
@@ -864,58 +928,55 @@
 
 - (void)setJob:(HBJob *)job
 {
- self removeJobObservers;
-
- // Clear the undo manager
- _job.undo removeAllActions;
- _job.undo = nil;
+ if (job != _job)
+ {
+ self.window.undoManager prepareWithInvocationTarget:self setJob:_job;
+ }
 
- // Retain the new job
+ self removeJobObservers;
 _job = job;
 
- job.undo = self.window.undoManager;
-
 // Set the jobs info to the view controllers
 self.summaryController.job = job;
- fPictureViewController.picture = job.picture;
- fFiltersViewController.filters = job.filters;
- fVideoController.video = job.video;
- fAudioController.audio = job.audio;
- fSubtitlesViewController.subtitles = job.subtitles;
- fChapterTitlesController.job = job;
+ self.pictureViewController.picture = job.picture;
+ self.filtersViewController.filters = job.filters;
+ self.videoController.video = job.video;
+ self.audioController.audio = job.audio;
+ self.subtitlesViewController.subtitles = job.subtitles;
+ self.chapterTitlesController.job = job;
 
 if (job)
 {
 HBPreviewGenerator *generator = HBPreviewGenerator alloc initWithCore:self.core job:job;
- fPreviewController.generator = generator;
+ self.previewController.generator = generator;
 self.summaryController.generator = generator;
 
 HBTitle *title = job.title;
 
 // Update the title selection popup.
- fSrcTitlePopUp selectItemWithTitle:title.description;
+ self.titlePopUp selectItemWithTitle:title.description;
 
 // Grok the output file name from title.name upon title change
 if (title.isStream && self.core.titles.count > 1)
 {
 // Change the source to read out the parent folder also
- fSrcDVD2Field.stringValue = NSString stringWithFormat:@"%@/%@, %@", title.url.URLByDeletingLastPathComponent.lastPathComponent, title.name, title.shortFormatDescription;
+ self.sourceLabel.stringValue = NSString stringWithFormat:@"%@/%@, %@", title.url.URLByDeletingLastPathComponent.lastPathComponent,
+ title.name, title.shortFormatDescription;
 }
 else
 {
- fSrcDVD2Field.stringValue = NSString stringWithFormat:@"%@, %@", title.name, title.shortFormatDescription;
+ self.sourceLabel.stringValue = NSString stringWithFormat:@"%@, %@", title.name, title.shortFormatDescription;
 }
 }
 else
 {
- fPreviewController.generator invalidate;
- fPreviewController.generator = nil;
+ self.previewController.generator invalidate;
+ self.previewController.generator = nil;
 self.summaryController.generator = nil;
 }
- fPreviewController.picture = job.picture;
+ self.previewController.picture = job.picture;
 
 self enableUI:(job != nil);
-
 self addJobObservers;
 }
 
@@ -962,6 +1023,20 @@
 
 #pragma mark - GUI Controls Changed Methods
 
+- (void)setDestinationURL:(NSURL *)destinationURL
+{
+ self.job.outputURL = destinationURL;
+ _destinationURL = destinationURL;
+
+ // Save this path to the prefs so that on next browse destination window it opens there
+ NSUserDefaults.standardUserDefaults setObject:HBUtilities bookmarkFromURL:destinationURL
+ forKey:HBLastDestinationDirectoryBookmark;
+ NSUserDefaults.standardUserDefaults setURL:destinationURL
+ forKey:HBLastDestinationDirectoryURL;
+
+
+}
+
 - (IBAction)browseDestination:(id)sender
 {
 // Open a panel to let the user choose and update the text field
@@ -980,19 +1055,54 @@
 {
 if (result == NSModalResponseOK)
 {
- self.job.outputURL = panel.URL;
 self.destinationURL = panel.URL;
-
- // Save this path to the prefs so that on next browse destination window it opens there
- NSUserDefaults.standardUserDefaults setObject:HBUtilities bookmarkFromURL:panel.URL
- forKey:HBLastDestinationDirectoryBookmark;
- NSUserDefaults.standardUserDefaults setURL:panel.URL
- forKey:HBLastDestinationDirectoryURL;
-
 }
 };
 }
 
+- (NSDragOperation)pathControl:(NSPathControl *)pathControl validateDrop:(id <NSDraggingInfo>)info
+{
+ NSPasteboard *pboard = info.draggingPasteboard;
+
+ if (pboard availableTypeFromArray:@NSPasteboardTypeFileURL)
+ {
+ NSURL *destinationURL = pboard readObjectsForClasses:@NSURL class options:nil firstObject;
+ if (destinationURL.hasDirectoryPath)
+ {
+ return NSDragOperationGeneric;
+ }
+ }
+
+ return NSDragOperationNone;
+}
+
+- (BOOL)pathControl:(NSPathControl *)pathControl acceptDrop:(id <NSDraggingInfo>)info
+{
+ NSPasteboard *pboard = info.draggingPasteboard;
+
+ if (pboard availableTypeFromArray:@NSPasteboardTypeFileURL)
+ {
+ NSURL *destinationURL = pboard readObjectsForClasses:@NSURL class options:nil firstObject;
+ if (destinationURL.hasDirectoryPath)
+ {
+ self.destinationURL = destinationURL;
+ }
+ return YES;
+ }
+
+ return NO;
+}
+
+- (IBAction)revealPathItemInFinder:(id)sender
+{
+ NSURL *URL = self.destinationPathControl.clickedPathItem.URL;
+ if (URL == nil)
+ {
+ URL = self.destinationURL;
+ }
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:@URL;
+}
+
 - (IBAction)titlePopUpChanged:(NSPopUpButton *)sender
 {
 HBTitle *title = self.core.titlessender.indexOfSelectedItem;
@@ -1026,25 +1136,34 @@
 }
 }
 
-#pragma mark - Queue progress
-
-- (void)windowDidChangeOcclusionState:(NSNotification *)notification
+- (IBAction)switchToNextTitle:(id)sender
 {
- if (self.window occlusionState & NSWindowOcclusionStateVisible)
- {
- self.visible = YES;
- self updateProgress;
- }
- else
+ NSArray<HBTitle *> *titles = self.core.titles;
+ if (titles && self.job)
 {
- self.visible = NO;
+ NSUInteger index = titles indexOfObject:self.job.title;
+ if (index != NSNotFound && index < titles.count - 1)
+ {
+ HBTitle *title = titlesindex + 1;
+ HBJob *job = self jobFromTitle:title;
+ self.job = job;
+ }
 }
 }
 
-- (void)updateProgress
+- (IBAction)switchToPreviousTitle:(id)sender
 {
- fStatusField.stringValue = self.progressInfo;
- fRipIndicator.doubleValue = self.progress;
+ NSArray<HBTitle *> *titles = self.core.titles;
+ if (titles && self.job)
+ {
+ NSUInteger index = titles indexOfObject:self.job.title;
+ if (index != NSNotFound && index > 0)
+ {
+ HBTitle *title = titlesindex - 1;
+ HBJob *job = self jobFromTitle:title;
+ self.job = job;
+ }
+ }
 }
 
 #pragma mark - Job Handling
@@ -1057,7 +1176,7 @@
 */
 - (void)runDestinationAlerts:(HBJob *)job completionHandler:(void (^ __nullable)(NSModalResponse returnCode))handler
 {
- if (NSFileManager defaultManager fileExistsAtPath:job.outputURL.path == 0)
+ if (NSFileManager.defaultManager fileExistsAtPath:job.outputURL.path == NO)
 {
 NSAlert *alert = NSAlert alloc init;
 alert setMessageText:NSLocalizedString(@"Warning!", @"Invalid destination alert -> message");
@@ -1074,15 +1193,18 @@
 alert setAlertStyle:NSAlertStyleCritical;
 alert beginSheetModalForWindow:self.window completionHandler:handler;
 }
- else if (NSFileManager defaultManager fileExistsAtPath:job.completeOutputURL.path)
+ else if (NSFileManager.defaultManager fileExistsAtPath:job.completeOutputURL.path)
 {
 NSAlert *alert = NSAlert alloc init;
 alert setMessageText:NSLocalizedString(@"A file already exists at the selected destination.", @"File already exists alert -> message");
 alert setInformativeText:NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists alert -> informative text"), job.completeOutputURL.path;
 alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button");
 alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert setAlertStyle:NSAlertStyleCritical;
-
 alert beginSheetModalForWindow:self.window completionHandler:handler;
 }
 else if (_queue itemExistAtURL:job.completeOutputURL)
@@ -1092,8 +1214,11 @@
 alert setInformativeText:NSString stringWithFormat:NSLocalizedString(@"Do you want to overwrite %@?", @"File already exists in queue alert -> informative text"), job.completeOutputURL.path;
 alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists in queue alert -> first button");
 alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists in queue alert -> second button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert setAlertStyle:NSAlertStyleCritical;
-
 alert beginSheetModalForWindow:self.window completionHandler:handler;
 }
 else
@@ -1200,11 +1325,14 @@
 
 for (HBTitle *title in titles)
 {
- HBJob *job = HBJob alloc initWithTitle:title andPreset:preset;
+ HBJob *job = HBJob alloc initWithTitle:title preset:preset;
 job.outputURL = self.destinationURL;
 job.outputFileName = job.defaultName;
 job.title = nil;
- jobs addObject:job;
+ if (job)
+ {
+ jobs addObject:job;
+ }
 }
 
 NSMutableSet<NSURL *> *destinations = NSMutableSet alloc init;
@@ -1250,6 +1378,10 @@
 alert setInformativeText:NSLocalizedString(@"One or more file already exists. Do you want to overwrite?", @"File already exists alert -> informative text");
 alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"File already exists alert -> first button");
 alert addButtonWithTitle:NSLocalizedString(@"Overwrite", @"File already exists alert -> second button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert setAlertStyle:NSAlertStyleCritical;
 
 alert beginSheetModalForWindow:self.window completionHandler:^(NSModalResponse returnCode) {
@@ -1274,21 +1406,33 @@
 
 - (IBAction)showPreviewWindow:(id)sender
 {
-	fPreviewController showWindow:sender;
+	self.previewController showWindow:sender;
 }
 
 - (IBAction)showTabView:(id)sender
 {
 NSInteger tag = sender tag;
- fMainTabView selectTabViewItemAtIndex:tag;
+ self.mainTabView selectTabViewItemAtIndex:tag;
 }
 
 #pragma mark - Presets View Controller Delegate
 
 - (void)selectionDidChange
 {
- self.selectedPreset = fPresetsView.selectedPreset;
- self applyPreset:fPresetsView.selectedPreset;
+ if (self.job)
+ {
+ BOOL success = self doApplyPreset:self.presetView.selectedPreset;
+ if (success == YES)
+ {
+ self.selectedPreset = self.presetView.selectedPreset;
+ }
+ }
+ else
+ {
+ self.currentPreset = self.presetView.selectedPreset;
+ self.selectedPreset = self.presetView.selectedPreset;
+ self.window.undoManager removeAllActions;
+ }
 }
 
 #pragma mark - Presets
@@ -1322,9 +1466,7 @@
 {
 if (selectedPreset != _selectedPreset)
 {
- NSUndoManager *undo = self.window.undoManager;
- undo prepareWithInvocationTarget:self setSelectedPreset:_selectedPreset;
-
+ self.window.undoManager prepareWithInvocationTarget:self setSelectedPreset:_selectedPreset;
 _selectedPreset = selectedPreset;
 }
 }
@@ -1335,9 +1477,7 @@
 
 if (currentPreset != _currentPreset)
 {
- NSUndoManager *undo = self.window.undoManager;
- undo prepareWithInvocationTarget:self setCurrentPreset:_currentPreset;
-
+ self.window.undoManager prepareWithInvocationTarget:self setCurrentPreset:_currentPreset;
 _currentPreset = currentPreset;
 }
 }
@@ -1347,54 +1487,66 @@
 HBPreset *preset = self.selectedPreset ? self.selectedPreset : self.currentPreset;
 if (preset)
 {
- self applyPreset:preset;
+ self doApplyPreset:preset;
 }
 }
 
 - (void)applyPreset:(HBPreset *)preset
 {
- NSParameterAssert(preset);
+ BOOL success = self doApplyPreset:preset;
+ if (success == YES)
+ {
+ self.selectedPreset = preset;
+ self.presetView.selectedPreset = preset;
+ }
+}
+
+- (BOOL)doApplyPreset:(HBPreset *)preset
+{
+ BOOL success = NO;
 
 if (self.job)
 {
- self.currentPreset = preset;
-
 // Remove the job observer so we don't update the file name
 // too many times while the preset is being applied
 self removeJobObservers;
 
- // Apply the preset to the current job
- self.job applyPreset:self.currentPreset;
+ NSError *error = nil;
+ success = self.job applyPreset:preset error:&error;
 
 self addJobObservers;
 
- self.autoNamer updateFileExtension;
-
- // If Auto Naming is on, update the destination
- self.autoNamer updateFileName;
+ if (success == NO)
+ {
+ self presentError:error;
+ }
+ else
+ {
+ self.currentPreset = preset;
+ self.autoNamer updateFileExtension;
+ // If Auto Naming is on, update the destination
+ self.autoNamer updateFileName;
+ }
 }
+
+ return success;
 }
 
 - (IBAction)showAddPresetPanel:(id)sender
 {
 self.window HB_endEditing;
 
- BOOL defaultToCustom = ((self.job.picture.width + self.job.picture.cropRight + self.job.picture.cropLeft) < self.job.picture.sourceWidth) ||
- ((self.job.picture.height + self.job.picture.cropTop + self.job.picture.cropBottom) < self.job.picture.sourceHeight);
-
 // Show the add panel
 HBAddPresetController *addPresetController = HBAddPresetController alloc initWithPreset:self createPresetFromCurrentSettings
- presetManager:presetManager
- customWidth:self.job.picture.width
- customHeight:self.job.picture.height
- defaultToCustom:defaultToCustom;
+ presetManager:self.presetManager
+ customWidth:self.job.picture.maxWidth
+ customHeight:self.job.picture.maxHeight
+ resolutionLimitMode:self.job.picture.resolutionLimitMode;
 
 self.window beginSheet:addPresetController.window completionHandler:^(NSModalResponse returnCode) {
 if (returnCode == NSModalResponseOK)
 {
- self.selectedPreset = addPresetController.preset;
 self applyPreset:addPresetController.preset;
- self->fPresetsView.selectedPreset = addPresetController.preset;
 }
 };
 }
@@ -1406,12 +1558,30 @@
 return preset;
 }
 
+- (void)updateCurrentPreset
+{
+ if (self.job)
+ {
+ if (NSUserDefaults.standardUserDefaults boolForKey:HBKeepPresetEdits == NO)
+ {
+ if (self.selectedPreset)
+ {
+ self.currentPreset = self.selectedPreset;
+ }
+ }
+ else
+ {
+ self.currentPreset = self createPresetFromCurrentSettings;
+ }
+ }
+}
+
 - (IBAction)showRenamePresetPanel:(id)sender
 {
 self.window HB_endEditing;
 
 __block HBRenamePresetController *renamePresetController = HBRenamePresetController alloc initWithPreset:self.selectedPreset
- presetManager:presetManager;
+ presetManager:self.presetManager;
 self.window beginSheet:renamePresetController.window completionHandler:^(NSModalResponse returnCode) {
 if (returnCode == NSModalResponseOK)
 {
@@ -1425,69 +1595,65 @@
 
 - (IBAction)exportPreset:(id)sender
 {
- fPresetsView.selectedPreset = self.selectedPreset;
- fPresetsView exportPreset:sender;
+ self.presetView.selectedPreset = self.selectedPreset;
+ self.presetView exportPreset:sender;
 }
 
 - (IBAction)importPreset:(id)sender
 {
- fPresetsView importPreset:sender;
+ self.presetView importPreset:sender;
 }
 
 #pragma mark - Preset Menu
 
 - (IBAction)selectDefaultPreset:(id)sender
 {
- self.selectedPreset = presetManager.defaultPreset;
- self applyPreset:presetManager.defaultPreset;
- fPresetsView.selectedPreset = presetManager.defaultPreset;
+ self applyPreset:self.presetManager.defaultPreset;
 }
 
 - (IBAction)setDefaultPreset:(id)sender
 {
- presetManager setDefaultPreset:self.selectedPreset;
+ self.presetManager setDefaultPreset:self.selectedPreset;
 }
 
 - (IBAction)savePreset:(id)sender
 {
 self.window HB_endEditing;
 
- NSIndexPath *indexPath = presetManager indexPathOfPreset:self.selectedPreset;
+ NSIndexPath *indexPath = self.presetManager indexPathOfPreset:self.selectedPreset;
 if (indexPath)
 {
 HBMutablePreset *preset = self createPresetFromCurrentSettings;
 preset.name = self.selectedPreset.name;
 preset.isDefault = self.selectedPreset.isDefault;
 
- presetManager replacePresetAtIndexPath:indexPath withPreset:preset;
+ self.presetManager replacePresetAtIndexPath:indexPath withPreset:preset;
 
 self.job.presetName = preset.name;
 self.selectedPreset = preset;
- fPresetsView.selectedPreset = preset;
+ self.presetView.selectedPreset = preset;
 
+ self.presetManager savePresets;
 self.window.undoManager removeAllActions;
 }
 }
 
 - (IBAction)deletePreset:(id)sender
 {
- fPresetsView.selectedPreset = self.selectedPreset;
- fPresetsView deletePreset:self;
+ self.presetView.selectedPreset = self.selectedPreset;
+ self.presetView deletePreset:self;
 }
 
 - (IBAction)insertCategory:(id)sender
 {
- fPresetsView insertCategory:sender;
+ self.presetView insertCategory:sender;
 }
 
 - (IBAction)selectPresetFromMenu:(id)sender
 {
 // Retrieve the preset stored in the NSMenuItem
 HBPreset *preset = sender representedObject;
-
- self.selectedPreset = preset;
 self applyPreset:preset;
- fPresetsView.selectedPreset = preset;
 }
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBCore.h -> HandBrake-1.5.1.tar.xz/macosx/HBCore.h Changed

@@ -5,6 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
+#import <CoreGraphics/CoreGraphics.h>
 
 @class HBJob;
 @class HBPicture;
@@ -36,12 +37,21 @@
 };
 
 // These constants specify the result of a scan or encode.
-typedef NS_ENUM(NSUInteger, HBCoreResult) {
- HBCoreResultDone,
- HBCoreResultCanceled,
- HBCoreResultFailed,
+typedef NS_ENUM(NSUInteger, HBCoreResultCode) {
+ HBCoreResultCodeDone = 0,
+ HBCoreResultCodeCanceled = 1,
+ HBCoreResultCodeWrongInput = 2,
+ HBCoreResultCodeInit = 3,
+ HBCoreResultCodeUnknown = 4,
+ HBCoreResultCodeRead = 5
 };
 
+struct HBCoreResult {
+ float avgFps;
+ HBCoreResultCode code;
+};
+typedef struct HBCoreResult HBCoreResult;
+
 typedef void (^HBCoreProgressHandler)(HBState state, HBProgress progress, NSString *info);
 typedef void (^HBCoreCompletionHandler)(HBCoreResult result);
 
@@ -177,18 +187,11 @@
 * into an CGImage.
 *
 * @param index the index of the desired image.
- * @param title Handle to hb_title_t of desired title
- * @param frame a HBPicture instance that describe the image's frame.
- * @param deinterlace whether the preview image must be deinterlaced or not.
+ * @param job a HBJob instance.
 *
 * @return a CGImageRef of the wanted image, NULL if the index is out of bounds.
 */
-- (nullable CGImageRef)copyImageAtIndex:(NSUInteger)index
- forTitle:(HBTitle *)title
- pictureFrame:(HBPicture *)frame
- deinterlace:(BOOL)deinterlace
- rotate:(int)angle
- flipped:(BOOL)flipped CF_RETURNS_RETAINED;
+- (nullable CGImageRef)copyImageAtIndex:(NSUInteger)index job:(HBJob *)job CF_RETURNS_RETAINED;
 
 /**
 * Returns the counts of the available previews images.

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBCore.m -> HandBrake-1.5.1.tar.xz/macosx/HBCore.m Changed

@@ -10,6 +10,7 @@
 #import "HBDVDDetector.h"
 #import "HBUtilities.h"
 #import "HBImageUtilities.h"
+#import "HBDirectUtilities.h"
 
 #import "HBStateFormatter+Private.h"
 #import "HBTitle+Private.h"
@@ -66,6 +67,7 @@
 
 @end
 
+HB_OBJC_DIRECT_MEMBERS
 @implementation HBCore
 
 + (void)setDVDNav:(BOOL)enabled
@@ -102,7 +104,7 @@
     if (self)
     {
         _name = @"HBCore";
-        _automaticallyPreventSleep = YES;
+        _automaticallyPreventSleep = NO;
         _state = HBStateIdle;
         _updateTimerQueue = queue;
         _titles = @;
@@ -320,7 +322,9 @@
 
     HBUtilities writeToActivityLog:"%s scan done", self.name.UTF8String;
 
-    return (self.titles.count > 0) ? HBCoreResultDone : HBCoreResultFailed;
+    HBCoreResult result = {0};
+    result.code = (self.titles.count > 0) ? HBCoreResultCodeDone : HBCoreResultCodeUnknown;
+    return result;
 }
 
 - (void)cancelScan
@@ -331,31 +335,19 @@
 
 #pragma mark - Preview images
 
-- (CGImageRef)copyImageAtIndex:(NSUInteger)index
-                      forTitle:(HBTitle *)title
-                  pictureFrame:(HBPicture *)frame
-                   deinterlace:(BOOL)deinterlace
-                        rotate:(int)angle
-                       flipped:(BOOL)flipped CF_RETURNS_RETAINED
+- (nullable CGImageRef)copyImageAtIndex:(NSUInteger)index job:(HBJob *)job CF_RETURNS_RETAINED
 {
     CGImageRef img = NULL;
 
-    hb_geometry_settings_t geo;
-    memset(&geo, 0, sizeof(geo));
-    geo.geometry.width = frame.displayWidth;
-    geo.geometry.height = frame.height;
-    // ignore the par.
-    geo.geometry.par.num = 1;
-    geo.geometry.par.den = 1;
-    int crop4 = {frame.cropTop, frame.cropBottom, frame.cropLeft, frame.cropRight};
-    memcpy(geo.crop, crop, sizeof(int4));
-
-    hb_image_t *image = hb_get_preview2(_hb_handle, title.index, (int)index, &geo, deinterlace);
+    hb_job_t *hb_job = job.hb_job;
+    hb_dict_t *job_dict = hb_job_to_dict(hb_job);
+    hb_job_close(&hb_job);
+    hb_image_t *image = hb_get_preview3(_hb_handle, (int)index, job_dict);
 
     if (image)
     {
         // Create an CGImageRef and copy the libhb image into it.
-        // The image data returned by hb_get_preview2 is 4 bytes per pixel, BGRA format.
+        // The image data returned by hb_get_preview3 is 4 bytes per pixel, BGRA format.
         // Alpha is ignored.
         CFMutableDataRef imgData = CFDataCreateMutable(kCFAllocatorDefault, 0);
         CFDataSetLength(imgData, 3 * image->width * image->height);
@@ -378,9 +370,9 @@
         CGDataProviderRef provider = CGDataProviderCreateWithCFData(imgData);
 
         CGBitmapInfo bitmapInfo = kCGBitmapByteOrderDefault | kCGImageAlphaNone;
-        CGColorSpaceRef colorSpace = copyColorSpace(title.hb_title->color_prim,
-                                                    title.hb_title->color_transfer,
-                                                    title.hb_title->color_matrix);
+        CGColorSpaceRef colorSpace = copyColorSpace(image->color_prim,
+                                                    image->color_transfer,
+                                                    image->color_matrix);
 
         img = CGImageCreate(image->width,
                             image->height,
@@ -401,16 +393,9 @@
         hb_image_close(&image);
     }
 
-    if (img && (angle || flipped))
-    {
-        CGImageRef rotatedImg = CGImageRotated(img, angle, flipped);
-        CGImageRelease(img);
-        return rotatedImg;
-    }
-    else
-    {
-        return img;
-    }
+    hb_value_free(&job_dict);
+
+    return img;
 }
 
 - (NSUInteger)imagesCountForTitle:(HBTitle *)title
@@ -472,19 +457,17 @@
         hb_rem(_hb_handle, job);
     }
 
-    HBCoreResult result = HBCoreResultDone;
-    switch (_hb_state->param.working.error)
+    HBCoreResult result = {_hb_state->param.working.rate_avg, (HBCoreResultCode)_hb_state->param.working.error};
+
+    switch (result.code)
     {
-        case HB_ERROR_NONE:
-            result = HBCoreResultDone;
+        case HBCoreResultCodeDone:
             HBUtilities writeToActivityLog:"%s work done", self.name.UTF8String;
             break;
-        case HB_ERROR_CANCELED:
-            result = HBCoreResultCanceled;
+        case HBCoreResultCodeCanceled:
             HBUtilities writeToActivityLog:"%s work canceled", self.name.UTF8String;
             break;
         default:
-            result = HBCoreResultFailed;
             HBUtilities writeToActivityLog:"%s work failed", self.name.UTF8String;
             break;
     }

HandBrake-1.5.1.tar.xz/macosx/HBCroppingController.h Added

HandBrake-1.5.1.tar.xz/macosx/HBCroppingController.m Added

HandBrake-1.5.1.tar.xz/macosx/HBDirectUtilities.h Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDockTextField.h -> HandBrake-1.5.1.tar.xz/macosx/HBDockTextField.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDockTextField.m -> HandBrake-1.5.1.tar.xz/macosx/HBDockTextField.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDockTile.h -> HandBrake-1.5.1.tar.xz/macosx/HBDockTile.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBDockTile.m -> HandBrake-1.5.1.tar.xz/macosx/HBDockTile.m Changed

@@ -7,8 +7,6 @@
 #import "HBDockTile.h"
 #import "HBDockTextField.h"
 
-NSString *dockTilePercentFormat = @"%2.1f%%";
-
 @interface HBDockTile ()
 
 @property (nonatomic, strong) NSDockTile *dockTile;
@@ -34,39 +32,56 @@
 _image = image;
 
 NSImageView *iv = NSImageView alloc init;
- iv setImage:_image;
- dockTile setContentView:iv;
+ iv.image = _image;
+ dockTile.contentView = iv;
 
- _percentField = HBDockTextField alloc initWithFrame:NSMakeRect(0.0f, 32.0f, dockTile size.width, 30.0f);
+ _percentField = HBDockTextField alloc initWithFrame:NSMakeRect(0.0f, 32.0f, dockTile.size.width, 30.0f);
 _percentField changeGradientColors:NSColor colorWithDeviceRed:0.4f green:0.6f blue:0.4f alpha:1.0f endColor:NSColor colorWithDeviceRed:0.2f green:0.4f blue:0.2f alpha:1.0f;
 iv addSubview:_percentField;
 
- _timeField = HBDockTextField alloc initWithFrame:NSMakeRect(0.0f, 0.0f, dockTile size.width, 30.0f);
+ _timeField = HBDockTextField alloc initWithFrame:NSMakeRect(0.0f, 0.0f, dockTile.size.width, 30.0f);
 _timeField changeGradientColors:NSColor colorWithDeviceRed:0.6f green:0.4f blue:0.4f alpha:1.0f endColor:NSColor colorWithDeviceRed:0.4f green:0.2f blue:0.2f alpha:1.0f;
 iv addSubview:_timeField;
 }
 return self;
 }
 
-- (void)updateDockIcon:(double)progress withETA:(NSString *)etaStr
+- (void)setStringValue:(NSString *)stringValue
+{
+ if (stringValue.length)
+ {
+ _timeField.hidden = NO;
+ _timeField.stringValue = stringValue;
+ }
+ else
+ {
+ _timeField.hidden = YES;
+ _timeField.stringValue = @"";
+ }
+
+ _percentField.hidden = YES;
+ _dockTile display;
+}
+
+- (void)setProgress:(double)progress ETA:(NSString *)etaStr
 {
 if (progress < 0.0 || progress > 1.0)
 {
- _percentField setHidden:YES;
- _timeField setHidden:YES;
+ _percentField.hidden = YES;
+ _timeField.hidden =YES;
 }
 else
 {
- _percentField setTextToDisplay:NSString stringWithFormat:dockTilePercentFormat, progress * 100;
- _percentField setHidden:NO;
- _timeField setTextToDisplay:etaStr;
- _timeField setHidden:NO;
+ _percentField.stringValue = NSString stringWithFormat:@"%2.1f%%", progress * 100;
+ _percentField.hidden = NO;
+ _timeField.stringValue = etaStr;
+ _timeField.hidden =NO;
 }
 
 _dockTile display;
 }
 
-- (void)updateDockIcon:(double)progress hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds
+- (void)setProgress:(double)progress hours:(NSInteger)hours minutes:(NSInteger)minutes seconds:(NSInteger)seconds
 {
 // ETA format is XXX:XX:XX when ETA is greater than one hour
 // XX:XX when ETA is greater than 0 (minutes or seconds)
@@ -87,8 +102,7 @@
 etaStr = @"~";
 }
 
- self updateDockIcon:progress withETA:etaStr;
-
+ self setProgress:progress ETA:etaStr;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilePromiseProvider.h -> HandBrake-1.5.1.tar.xz/macosx/HBFilePromiseProvider.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilePromiseProvider.m -> HandBrake-1.5.1.tar.xz/macosx/HBFilePromiseProvider.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilters+UIAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/HBFilters+UIAdditions.h Changed

@@ -5,7 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
-#import "HBFilters.h"
+#import <HandBrakeKit/HBFilters.h>
 
 @interface HBFilters (UIAdditions)
 
@@ -24,6 +24,9 @@
 + (NSDictionary *)nlmeansTunesDict;
 + (NSDictionary *)denoiseTypesDict;
 
++ (NSDictionary *)chromaSmoothPresetDict;
++ (NSDictionary *)chromaSmoothTunesDict;
+
 + (NSDictionary *)sharpenPresetDict;
 + (NSDictionary *)sharpenTunesDict;
 + (NSDictionary *)sharpenTypesDict;
@@ -31,33 +34,49 @@
 + (NSDictionary *)deblockPresetDict;
 + (NSDictionary *)deblockTunesDict;
 
-- (BOOL)customDetelecineSelected;
++ (NSDictionary *)colorspacePresetDict;
+
+@property (nonatomic, readonly) BOOL customDetelecineSelected;
 
 @property (nonatomic, readonly) BOOL customCombDetectionSelected;
 
-- (BOOL)deinterlaceEnabled;
-- (BOOL)customDeinterlaceSelected;
+@property (nonatomic, readonly) BOOL deinterlaceEnabled;
+@property (nonatomic, readonly) BOOL customDeinterlaceSelected;
+
+@property (nonatomic, readonly) BOOL chromaSmoothEnabled;
+@property (nonatomic, readonly) BOOL customChromaSmoothSelected;
+
+@property (nonatomic, readonly) BOOL sharpenEnabled;
+@property (nonatomic, readonly) BOOL customSharpenSelected;
+@property (nonatomic, readonly) BOOL sharpenTunesAvailable;
+
+@property (nonatomic, readonly) BOOL deblockTunesAvailable;
+@property (nonatomic, readonly) BOOL customDeblockSelected;
+
+@property (nonatomic, readonly) BOOL customColorspaceSelected;
+
+@property (nonatomic, readonly) NSArray<NSString *> *detelecineSettings;
 
-- (BOOL)sharpenEnabled;
-- (BOOL)customSharpenSelected;
-- (BOOL)sharpenTunesAvailable;
+@property (nonatomic, readonly) NSArray<NSString *> *combDetectionSettings;
 
-- (BOOL)deblockTunesAvailable;
-- (BOOL)customDeblockSelected;
+@property (nonatomic, readonly) NSArray<NSString *> *deinterlaceTypes;
+@property (nonatomic, readonly) NSArray<NSString *> *deinterlacePresets;
 
-@property (nonatomic, readonly) NSArray *detelecineSettings;
+@property (nonatomic, readonly) NSArray<NSString *> *denoiseTypes;
+@property (nonatomic, readonly) NSArray<NSString *> *denoisePresets;
+@property (nonatomic, readonly) NSArray<NSString *> *denoiseTunes;
 
-@property (nonatomic, readonly) NSArray *combDetectionSettings;
+@property (nonatomic, readonly) NSArray<NSString *> *chromaSmoothPresets;
+@property (nonatomic, readonly) NSArray<NSString *> *chromaSmoothTunes;
 
-@property (nonatomic, readonly) NSArray *deinterlaceTypes;
-@property (nonatomic, readonly) NSArray *deinterlacePresets;
+@property (nonatomic, readonly) NSArray<NSString *> *sharpenTypes;
+@property (nonatomic, readonly) NSArray<NSString *> *sharpenPresets;
+@property (nonatomic, readonly) NSArray<NSString *> *sharpenTunes;
 
-@property (nonatomic, readonly) NSArray *sharpenTypes;
-@property (nonatomic, readonly) NSArray *sharpenPresets;
-@property (nonatomic, readonly) NSArray *sharpenTunes;
+@property (nonatomic, readonly) NSArray<NSString *> *deblockPresets;
+@property (nonatomic, readonly) NSArray<NSString *> *deblockTunes;
 
-@property (nonatomic, readonly) NSArray *deblockPresets;
-@property (nonatomic, readonly) NSArray *deblockTunes;
+@property (nonatomic, readonly) NSArray<NSString *> *colorspacePresets;
 
 @end
 
@@ -91,6 +110,12 @@
 @interface HBDenoiseTransformer : HBGenericDictionaryTransformer
 @end
 
+@interface HBChromaSmoothTransformer : HBGenericDictionaryTransformer
+@end
+
+@interface HBChromaSmoothTuneTransformer : HBGenericDictionaryTransformer
+@end
+
 @interface HBSharpenPresetTransformer : HBGenericDictionaryTransformer
 @end
 
@@ -105,3 +130,6 @@
 
 @interface HBDeblockTransformer : HBGenericDictionaryTransformer
 @end
+
+@interface HBColorspaceTransformer : HBGenericDictionaryTransformer
+@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilters+UIAdditions.m -> HandBrake-1.5.1.tar.xz/macosx/HBFilters+UIAdditions.m Changed

@@ -178,6 +178,30 @@
 
 @end
 
+@implementation HBChromaSmoothTransformer
+
+- (instancetype)init
+{
+    if (self = super init)
+        self.dict = HBFilters chromaSmoothPresetDict;
+
+    return self;
+}
+
+@end
+
+@implementation HBChromaSmoothTuneTransformer
+
+- (instancetype)init
+{
+    if (self = super init)
+        self.dict = HBFilters chromaSmoothTunesDict;
+
+    return self;
+}
+
+@end
+
 @implementation HBSharpenPresetTransformer
 
 - (instancetype)init
@@ -238,6 +262,18 @@
 
 @end
 
+@implementation HBColorspaceTransformer
+
+- (instancetype)init
+{
+    if (self = super init)
+        self.dict = HBFilters colorspacePresetDict;
+
+    return self;
+}
+
+@end
+
 static NSDictionary *detelecinePresetsDict = nil;
 
 static NSDictionary *combDetectionPresetsDict = nil;
@@ -250,6 +286,9 @@
 static NSDictionary *nlmeansTunesDict = nil;
 static NSDictionary *denoiseTypesDict = nil;
 
+static NSDictionary *chromaSmoothPresetDict = nil;
+static NSDictionary *chromaSmoothTunesDict = nil;
+
 static NSDictionary *sharpenPresetDict = nil;
 static NSDictionary *sharpenTunesDict = nil;
 static NSDictionary *sharpenTypesDict = nil;
@@ -257,6 +296,8 @@
 static NSDictionary *deblockPresetDict = nil;
 static NSDictionary *deblockTunesDict = nil;
 
+static NSDictionary *colorspacePresetDict = nil;
+
 @implementation HBFilters (UIAdditions)
 
 #pragma mark - Valid values
@@ -343,6 +384,24 @@
     return denoiseTypesDict;
 }
 
++ (NSDictionary *)chromaSmoothPresetDict
+{
+    if (!chromaSmoothPresetDict)
+    {
+        chromaSmoothPresetDict = filterParamsToNamesDict(hb_filter_param_get_presets, HB_FILTER_CHROMA_SMOOTH);
+    }
+    return chromaSmoothPresetDict;
+}
+
++ (NSDictionary *)chromaSmoothTunesDict
+{
+    if (!chromaSmoothTunesDict)
+    {
+        chromaSmoothTunesDict = filterParamsToNamesDict(hb_filter_param_get_tunes, HB_FILTER_CHROMA_SMOOTH);
+    }
+    return chromaSmoothTunesDict;
+}
+
 + (NSDictionary *)sharpenPresetDict
 {
     if (!sharpenPresetDict)
@@ -396,6 +455,15 @@
     return deblockTunesDict;
 }
 
++ (NSDictionary *)colorspacePresetDict
+{
+    if (!colorspacePresetDict)
+    {
+        colorspacePresetDict = filterParamsToNamesDict(hb_filter_param_get_presets, HB_FILTER_COLORSPACE);
+    }
+    return colorspacePresetDict;
+}
+
 - (NSArray *)detelecineSettings
 {
     return filterParamsToNamesArray(hb_filter_param_get_presets, HB_FILTER_DETELECINE);
@@ -433,6 +501,16 @@
     return filterParamsToNamesArray(hb_filter_param_get_tunes, HB_FILTER_NLMEANS);
 }
 
+- (NSArray *)chromaSmoothPresets
+{
+    return filterParamsToNamesArray(hb_filter_param_get_presets, HB_FILTER_CHROMA_SMOOTH);
+}
+
+- (NSArray *)chromaSmoothTunes
+{
+    return filterParamsToNamesArray(hb_filter_param_get_tunes, HB_FILTER_CHROMA_SMOOTH);
+}
+
 - (NSArray *)sharpenTypes
 {
     return @HBKitLocalizedString(@"Off", @"HBFilters -> filter display name"), HBKitLocalizedString(@"Unsharp", @"HBFilters -> filter display name"), HBKitLocalizedString(@"Lapsharp", @"HBFilters -> filter display name");
@@ -472,6 +550,11 @@
     return filterParamsToNamesArray(hb_filter_param_get_tunes, HB_FILTER_DEBLOCK);
 }
 
+- (NSArray *)colorspacePresets
+{
+    return filterParamsToNamesArray(hb_filter_param_get_presets, HB_FILTER_COLORSPACE);
+}
+
 - (BOOL)customDetelecineSelected
 {
     return self.detelecine isEqualToString:@"custom" ? YES : NO;
@@ -492,6 +575,11 @@
     return !self.denoise isEqualToString:@"off";
 }
 
+- (BOOL)chromaSmoothEnabled
+{
+    return !self.chromaSmooth isEqualToString:@"off";
+}
+
 - (BOOL)sharpenEnabled
 {
     return !self.sharpen isEqualToString:@"off";
@@ -512,6 +600,11 @@
     return self.denoise isEqualToString:@"nlmeans" && !self.denoisePreset isEqualToString:@"custom";
 }
 
+- (BOOL)customChromaSmoothSelected
+{
+    return self.chromaSmooth isEqualToString:@"custom";
+}
+
 - (BOOL)customSharpenSelected
 {
     return self.sharpenPreset isEqualToString:@"custom" && self sharpenEnabled;
@@ -532,4 +625,9 @@
     return self.deblock isEqualToString:@"custom";
 }
 
+- (BOOL)customColorspaceSelected
+{
+    return self.colorspace isEqualToString:@"custom";
+}
+
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilters.h -> HandBrake-1.5.1.tar.xz/macosx/HBFilters.h Changed

@@ -5,7 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
-#import "HBPresetCoding.h"
+#import <HandBrakeKit/HBPresetCoding.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -31,6 +31,10 @@
 @property (nonatomic, readwrite, copy) NSString *denoiseTune;
 @property (nonatomic, readwrite, copy) NSString *denoiseCustomString;
 
+@property (nonatomic, readwrite, copy) NSString *chromaSmooth;
+@property (nonatomic, readwrite, copy) NSString *chromaSmoothTune;
+@property (nonatomic, readwrite, copy) NSString *chromaSmoothCustomString;
+
 @property (nonatomic, readwrite, copy) NSString *sharpen;
 @property (nonatomic, readwrite, copy) NSString *sharpenPreset;
 @property (nonatomic, readwrite, copy) NSString *sharpenTune;
@@ -42,8 +46,8 @@
 
 @property (nonatomic, readwrite) BOOL grayscale;
 
-@property (nonatomic, readwrite) int rotate;
-@property (nonatomic, readwrite) BOOL flip;
+@property (nonatomic, readwrite, copy) NSString *colorspace;
+@property (nonatomic, readwrite, copy) NSString *colorspaceCustomString;
 
 @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBFilters.m -> HandBrake-1.5.1.tar.xz/macosx/HBFilters.m Changed

@@ -38,6 +38,9 @@
         _denoiseCustomString = @"";
         _denoisePreset = @"medium";
         _denoiseTune = @"none";
+        _chromaSmooth = @"off";
+        _chromaSmoothTune = @"off";
+        _chromaSmoothCustomString = @"";
         _sharpen = @"off";
         _sharpenCustomString = @"";
         _sharpenPreset = @"medium";
@@ -45,6 +48,8 @@
         _deblock = @"off";
         _deblockTune = @"none";
         _deblockCustomString = @"";
+        _colorspace = @"off";
+        _colorspaceCustomString = @"";
 
         _notificationsEnabled = YES;
     }
@@ -61,6 +66,110 @@
     }
 }
 
+#define LAPSHARP_DEFAULT_PRESET      "medium"
+#define UNSHARP_DEFAULT_PRESET       "medium"
+#define CHROMA_SMOOTH_DEFAULT_PRESET "medium"
+#define NLMEANS_DEFAULT_PRESET       "medium"
+#define DEINTERLACE_DEFAULT_PRESET   "default"
+#define DECOMB_DEFAULT_PRESET        "default"
+#define DETELECINE_DEFAULT_PRESET    "default"
+#define COMB_DETECT_DEFAULT_PRESET   "default"
+#define HQDN3D_DEFAULT_PRESET        "medium"
+#define DEBLOCK_DEFAULT_PRESET       "medium"
+#define COLORSPACE_DEFAULT_PRESET    "bt709"
+
+- (NSString *)filterKeysDescription:(int)filter_id
+{
+    char **keys = hb_filter_get_keys(filter_id);
+    char  *colon = "";
+
+    NSMutableString *result = NSMutableString alloc init;
+    result appendString:HBKitLocalizedString(@"Syntax: ", @"HBFilters -> invalid filter custom settings error recovery suggestion");
+
+    for (int ii = 0; keysii != NULL; ii++)
+    {
+        int c = tolower(keysii0);
+        result appendFormat:@"%s%s=%c", colon, keysii, c;
+        colon = ":";
+    }
+    hb_str_vfree(keys);
+
+    result appendString:@"\n\n";
+    result appendString:HBKitLocalizedString(@"Default: ", @"HBFilters -> invalid filter custom settings error recovery suggestion");
+
+    const char *preset = "default";
+    switch (filter_id)
+    {
+        case HB_FILTER_UNSHARP:
+            preset = UNSHARP_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_LAPSHARP:
+            preset = LAPSHARP_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_CHROMA_SMOOTH:
+            preset = CHROMA_SMOOTH_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_NLMEANS:
+            preset = NLMEANS_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_DEINTERLACE:
+            preset = DEINTERLACE_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_DECOMB:
+            preset = DECOMB_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_DETELECINE:
+            preset = DETELECINE_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_HQDN3D:
+            preset = HQDN3D_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_COMB_DETECT:
+            preset = COMB_DETECT_DEFAULT_PRESET;
+            break;
+        case HB_FILTER_DEBLOCK:
+            preset = DEBLOCK_DEFAULT_PRESET;
+            break;
+        default:
+            break;
+    }
+    switch (filter_id)
+    {
+        case HB_FILTER_DEINTERLACE:
+        case HB_FILTER_NLMEANS:
+        case HB_FILTER_CHROMA_SMOOTH:
+        case HB_FILTER_COLORSPACE:
+        case HB_FILTER_UNSHARP:
+        case HB_FILTER_LAPSHARP:
+        case HB_FILTER_DECOMB:
+        case HB_FILTER_DETELECINE:
+        case HB_FILTER_HQDN3D:
+        case HB_FILTER_COMB_DETECT:
+        case HB_FILTER_DEBLOCK:
+        {
+            hb_dict_t *settings;
+            settings = hb_generate_filter_settings(filter_id, preset, NULL, NULL);
+            char *str = hb_filter_settings_string(filter_id, settings);
+            hb_value_free(&settings);
+
+            char **split = hb_str_vsplit(str, ':');
+            colon = "";
+
+            for (int ii = 0; splitii != NULL; ii++)
+            {
+                result appendFormat:@"%s%s", colon, splitii;
+                colon = ":";
+            }
+            hb_str_vfree(split);
+            free(str);
+        } break;
+        default:
+            break;
+    }
+
+    return result;
+}
+
 #pragma mark - Detelecine
 
 - (void)setDetelecine:(NSString *)detelecine
@@ -120,7 +229,7 @@
             {
                 NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid custom detelecine settings.",
                                                                                         @"HBFilters -> invalid detelecine custom string description"),
-                                           NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Syntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0",                                                                                                            @"HBJob -> invalid detelecine custom settings error recovery suggestion")};
+                                           NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                 *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
             }
         }
@@ -187,7 +296,7 @@
             {
                 NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid custom comb detect settings.",
                                                                                         @"HBFilters -> invalid comb detect custom string description"),
-                                           NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16",                                                                                                            @"HBJob -> invalid comb detect custom settings error recovery suggestion")};
+                                           NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                 *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
             }
         }
@@ -298,14 +407,14 @@
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid Yadif custom settings.",
                                                                                             @"HBFilters -> invalid Yadif custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Yadif syntax: mode=m:parity=p\n\nYadif default: mode=3",                                                                                                            @"HBJob -> invalid Yadif custom settings error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
                 else if (filter_id == HB_FILTER_DECOMB)
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid Decomb custom settings.",
                                                                                             @"HBFilters -> invalid Decomb custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7",                                                                                                            @"HBJob -> invalid Decomb custom settings error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
             }
@@ -416,14 +525,14 @@
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid custom HQDN3D settings",
                                                                                             @"HBFilters -> invalid denoise custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nDefault settings: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3",                                                                                                            @"HBJob -> invalid name error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
                 else if (filter_id == HB_FILTER_NLMEANS)
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid custom NLMeans settings",
                                                                                             @"HBFilters -> invalid denoise custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nDefault settings: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0",                                                                                                            @"HBJob -> invalid name error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
             }
@@ -433,6 +542,92 @@
     return retval;
 }
 
+#pragma mark - Chroma Smooth
+
+- (void)setChromaSmooth:(NSString *)chromaSmooth
+{
+    if (!chromaSmooth isEqualToString:_chromaSmooth)
+    {
+        self.undo prepareWithInvocationTarget:self setChromaSmooth:_chromaSmooth;
+    }
+    if (chromaSmooth)
+    {
+        _chromaSmooth = chromaSmooth copy;
+    }
+    else
+    {
+        _chromaSmooth = @"off";
+    }
+
+    self postChangedNotification;
+}
+
+- (void)setChromaSmoothTune:(NSString *)chromaSmoothTune
+{
+    if (!chromaSmoothTune isEqualToString:_chromaSmoothTune)
+    {
+        self.undo prepareWithInvocationTarget:self setChromaSmoothTune:_chromaSmoothTune;
+    }
+    if (chromaSmoothTune)
+    {
+        _chromaSmoothTune = chromaSmoothTune copy;
+    }
+    else
+    {
+        _chromaSmoothTune = @"none";
+    }
+
+    self postChangedNotification;
+}
+
+- (void)setChromaSmoothCustomString:(NSString *)chromaSmoothCustomString
+{
+    if (!chromaSmoothCustomString isEqualToString:_chromaSmoothCustomString)
+    {
+        self.undo prepareWithInvocationTarget:self setChromaSmoothCustomString:_chromaSmoothCustomString;
+    }
+    if (chromaSmoothCustomString)
+    {
+        _chromaSmoothCustomString = chromaSmoothCustomString copy;
+    }
+    else
+    {
+        _chromaSmoothCustomString = @"";
+    }
+
+    self postChangedNotification;
+}
+
+- (BOOL)validateChromaSmoothCustomString:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+    BOOL retval = YES;
+
+    if (nil != *ioValue)
+    {
+        NSString *customValue = *ioValue;
+
+        int filter_id = HB_FILTER_CHROMA_SMOOTH;
+        hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
+                                                             "custom",
+                                                             NULL,
+                                                             customValue.UTF8String);
+
+        if (filter_dict == NULL)
+        {
+            retval = NO;
+            if (outError)
+            {
+                    NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid chroma smooth custom settings.",
+                                                                                               @"HBFilters -> invalid chroma smooth custom string description"),
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
+                    *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
+            }
+        }
+    }
+
+    return retval;
+}
+
 #pragma mark - Sharpen
 
 - (void)setSharpen:(NSString *)sharpen
@@ -567,14 +762,14 @@
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid unsharp custom settings.",
                                                                                             @"HBFilters -> invalid unsharp custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Unsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7",                                                                                                            @"HBJob -> invalid unsharp custom settings error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
                 else if (filter_id == HB_FILTER_LAPSHARP)
                 {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid lapsharp custom settings.",
                                                                                             @"HBFilters -> invalid lapsharp custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Lapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap",                                                                                                            @"HBJob -> invalid lapsharp custom settings error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
                 }
             }
@@ -661,7 +856,7 @@
             {
                     NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid deblock custom settings.",
                                                                                                @"HBFilters -> invalid deblock custom string description"),
-                                               NSLocalizedRecoverySuggestionErrorKey: HBKitLocalizedString(@"Deblock syntax: strength=s:thresh=t:blocksize=b",                                                                                                            @"HBJob -> invalid deblock custom settings error recovery suggestion")};
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
                     *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
             }
         }
@@ -682,30 +877,74 @@
     self postChangedNotification;
 }
 
-#pragma mark - Rotate
+#pragma mark - Colorspace
 
-- (void)setRotate:(int)rotate
+- (void)setColorspace:(NSString *)colorspace
 {
-    if (rotate != _rotate)
+    if (!colorspace isEqualToString:_colorspace)
+    {
+        self.undo prepareWithInvocationTarget:self setColorspace:_colorspace;
+    }
+    if (colorspace)
     {
-        self.undo prepareWithInvocationTarget:self setRotate:_rotate;
+        _colorspace = colorspace copy;
     }
-    _rotate = rotate;
+    else
+    {
+        _colorspace = @"off";
+    }
+
     self postChangedNotification;
 }
 
-#pragma mark - Flip
-
-- (void)setFlip:(BOOL)flip
+- (void)setColorspaceCustomString:(NSString *)colorspaceCustomString
 {
-    if (flip != _flip)
+    if (!colorspaceCustomString isEqualToString:_colorspaceCustomString)
+    {
+        self.undo prepareWithInvocationTarget:self setColorspaceCustomString:_colorspaceCustomString;
+    }
+    if (colorspaceCustomString)
+    {
+        _colorspaceCustomString = colorspaceCustomString copy;
+    }
+    else
     {
-        self.undo prepareWithInvocationTarget:self setFlip:_flip;
+        _colorspaceCustomString = @"";
     }
-    _flip = flip;
+
     self postChangedNotification;
 }
 
+- (BOOL)validateColorspaceCustomString:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+    BOOL retval = YES;
+
+    if (nil != *ioValue)
+    {
+        NSString *customValue = *ioValue;
+
+        int filter_id = HB_FILTER_COLORSPACE;
+        hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
+                                                             "custom",
+                                                             NULL,
+                                                             customValue.UTF8String);
+
+        if (filter_dict == NULL)
+        {
+            retval = NO;
+            if (outError)
+            {
+                    NSDictionary *userInfo = @{NSLocalizedDescriptionKey: HBKitLocalizedString(@"Invalid colorspace custom settings.",
+                                                                                               @"HBFilters -> invalid chroma smooth custom string description"),
+                                               NSLocalizedRecoverySuggestionErrorKey: self filterKeysDescription:filter_id};
+                    *outError = NSError errorWithDomain:@"HBFilterError" code:0 userInfo:userInfo;
+            }
+        }
+    }
+
+    return retval;
+}
+
 #pragma mark - KVO
 
 + (NSSet *)keyPathsForValuesAffectingValueForKey:(NSString *)key
@@ -714,7 +953,7 @@
 
     if (key isEqualToString:@"summary")
     {
-        retval = NSSet setWithObjects:@"detelecine", @"detelecineCustomString", @"deinterlace", @"deinterlacePreset", @"deinterlaceCustomString", @"denoise", @"denoisePreset", @"denoiseTune", @"denoiseCustomString", @"deblock", @"deblockTune", @"deblockCustomString", @"grayscale", @"sharpen", @"sharpenPreset", @"sharpenTune", @"sharpenCustomString", nil;
+        retval = NSSet setWithObjects:@"detelecine", @"detelecineCustomString", @"deinterlace", @"deinterlacePreset", @"deinterlaceCustomString", @"denoise", @"denoisePreset", @"denoiseTune", @"denoiseCustomString", @"deblock", @"deblockTune", @"deblockCustomString", @"grayscale", @"sharpen", @"sharpenPreset", @"sharpenTune", @"sharpenCustomString", @"chromaSmooth", @"chromaSmoothTune", @"chromaSmoothCustomString", @"colorspace", @"colorspaceCustomString", nil;
     }
     else if (key isEqualToString:@"customDetelecineSelected")
     {
@@ -733,6 +972,11 @@
     {
         retval = NSSet setWithObject:@"denoise";
     }
+    else if (key isEqualToString:@"chromaSmoothEnabled" ||
+             key isEqualToString:@"customChromaSmoothSelected")
+    {
+        retval = NSSet setWithObject:@"chromaSmooth";
+    }
     else if (key isEqualToString:@"sharpenTunesAvailable" ||
              key isEqualToString:@"customSharpenSelected")
     {
@@ -758,6 +1002,10 @@
     {
         retval = NSSet setWithObjects:@"deinterlace", @"deinterlacePreset", nil;
     }
+    else if (key isEqualToString:@"customColorspaceSelected")
+    {
+        retval = NSSet setWithObject:@"colorspace";
+    }
     else
     {
         retval = NSSet set;
@@ -790,6 +1038,10 @@
         copy->_denoiseTune = _denoiseTune copy;
         copy->_denoiseCustomString = _denoiseCustomString copy;
 
+        copy->_chromaSmooth = _chromaSmooth copy;
+        copy->_chromaSmoothTune = _chromaSmoothTune copy;
+        copy->_chromaSmoothCustomString = _chromaSmoothCustomString copy;
+
         copy->_sharpen = _sharpen copy;
         copy->_sharpenPreset = _sharpenPreset copy;
         copy->_sharpenTune = _sharpenTune copy;
@@ -800,8 +1052,9 @@
         copy->_deblockCustomString = _deblockCustomString copy;
 
         copy->_grayscale = _grayscale;
-        copy->_rotate = _rotate;
-        copy->_flip = _flip;
+
+        copy->_colorspace = _colorspace copy;
+        copy->_colorspaceCustomString = _colorspaceCustomString copy;
     }
 
     return copy;
@@ -833,6 +1086,10 @@
     encodeObject(_denoiseTune);
     encodeObject(_denoiseCustomString);
 
+    encodeObject(_chromaSmooth);
+    encodeObject(_chromaSmoothTune);
+    encodeObject(_chromaSmoothCustomString);
+
     encodeObject(_sharpen);
     encodeObject(_sharpenPreset);
     encodeObject(_sharpenTune);
@@ -843,8 +1100,9 @@
     encodeObject(_deblockCustomString);
 
     encodeBool(_grayscale);
-    encodeInt(_rotate);
-    encodeBool(_flip);
+
+    encodeObject(_colorspace);
+    encodeObject(_colorspaceCustomString);
 }
 
 - (instancetype)initWithCoder:(NSCoder *)decoder
@@ -866,6 +1124,10 @@
     decodeObjectOrFail(_denoiseTune, NSString);
     decodeObjectOrFail(_denoiseCustomString, NSString);
 
+    decodeObjectOrFail(_chromaSmooth, NSString);
+    decodeObjectOrFail(_chromaSmoothTune, NSString);
+    decodeObjectOrFail(_chromaSmoothCustomString, NSString);
+
     decodeObjectOrFail(_sharpen, NSString);
     decodeObjectOrFail(_sharpenPreset, NSString);
     decodeObjectOrFail(_sharpenTune, NSString);
@@ -876,8 +1138,9 @@
     decodeObjectOrFail(_deblockCustomString, NSString);
 
     decodeBool(_grayscale);
-    decodeInt(_rotate); if (_rotate != 0 && _rotate != 90 && _rotate != 180 && _rotate != 270) { goto fail; }
-    decodeBool(_flip);
+
+    decodeObjectOrFail(_colorspace, NSString);
+    decodeObjectOrFail(_colorspaceCustomString, NSString);
 
     _notificationsEnabled = YES;
 
@@ -906,6 +1169,10 @@
     preset@"PictureDenoiseTune" = self.denoiseTune;
     preset@"PictureDenoiseCustom" = self.denoiseCustomString;
 
+    preset@"PictureChromaSmoothPreset" = self.chromaSmooth;
+    preset@"PictureChromaSmoothTune" = self.chromaSmoothTune;
+    preset@"PictureChromaSmoothCustom" = self.chromaSmoothCustomString;
+
     preset@"PictureSharpenFilter" = self.sharpen;
     preset@"PictureSharpenPreset" = self.sharpenPreset;
     preset@"PictureSharpenTune" = self.sharpenTune;
@@ -916,7 +1183,9 @@
     preset@"PictureDeblockCustom" = self.deblockCustomString;
 
     preset@"VideoGrayScale" = @(self.grayscale);
-    preset@"PictureRotate" = NSString stringWithFormat:@"angle=%d:hflip=%d", self.rotate, self.flip;
+
+    preset@"PictureColorspacePreset" = self.colorspace;
+    preset@"PictureColorspaceCustom" = self.colorspaceCustomString;
 }
 
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings
@@ -945,6 +1214,11 @@
         self.denoiseTune = preset@"PictureDenoiseTune";
         self.denoiseCustomString = preset@"PictureDenoiseCustom";
 
+        // Chroma Smooth
+        self.chromaSmooth = preset@"PictureChromaSmoothPreset";
+        self.chromaSmoothTune = preset@"PictureChromaSmoothTune";
+        self.chromaSmoothCustomString = preset@"PictureChromaSmoothCustom";
+
         // Sharpen
         self.sharpen = preset@"PictureSharpenFilter";
         self.sharpenPreset = preset@"PictureSharpenPreset";
@@ -958,14 +1232,9 @@
 
         self.grayscale = preset@"VideoGrayScale" boolValue;
 
-        // Rotate
-        NSString *rotate = preset@"PictureRotate";
-        hb_dict_t *hbdict = hb_parse_filter_settings(rotate.UTF8String);
-        NSDictionary *dict = NSDictionary alloc initWithHBDict:hbdict;
-        hb_value_free(&hbdict);
-
-        self.rotate = dict@"angle" intValue;
-        self.flip = dict@"hflip" boolValue;
+        // Colorspace
+        self.colorspace = preset@"PictureColorspacePreset";
+        self.colorspaceCustomString = preset@"PictureColorspaceCustom";
     }
 
     self.notificationsEnabled = YES;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBHUDView.m -> HandBrake-1.5.1.tar.xz/macosx/HBHUDView.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBImageUtilities.h -> HandBrake-1.5.1.tar.xz/macosx/HBImageUtilities.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBImageUtilities.m -> HandBrake-1.5.1.tar.xz/macosx/HBImageUtilities.m Changed

@@ -5,7 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import "HBImageUtilities.h"
-#import <Cocoa/Cocoa.h>
+#import <CoreVideo/CoreVideo.h>
 #include "handbrake/handbrake.h"
 
 CGImageRef CreateScaledCGImageFromCGImage(CGImageRef image, CGFloat thumbnailHeight)
@@ -113,82 +113,118 @@
 
 CGColorSpaceRef copyColorSpace(int primaries, int transfer, int matrix)
 {
- CFStringRef primariesKey = NULL;
+ CFStringRef primariesValue = NULL;
 switch (primaries)
 {
 case HB_COLR_PRI_EBUTECH:
- primariesKey = kCVImageBufferColorPrimaries_EBU_3213;
+ primariesValue = kCVImageBufferColorPrimaries_EBU_3213;
 break;
 
 case HB_COLR_PRI_SMPTEC:
- primariesKey = kCVImageBufferColorPrimaries_SMPTE_C;
+ primariesValue = kCVImageBufferColorPrimaries_SMPTE_C;
 break;
 
 case HB_COLR_PRI_BT2020:
- primariesKey = kCVImageBufferColorPrimaries_ITU_R_2020;
+ primariesValue = kCVImageBufferColorPrimaries_ITU_R_2020;
 break;
 
 case HB_COLR_PRI_BT709:
 default:
- primariesKey = kCVImageBufferColorPrimaries_ITU_R_709_2;
+ primariesValue = kCVImageBufferColorPrimaries_ITU_R_709_2;
 }
 
- CFStringRef transferKey = NULL;
+ CFStringRef transferValue = NULL;
+ CFNumberRef gammaValue = NULL;
 switch (transfer)
 {
+ case HB_COLR_TRA_GAMMA22:
+ {
+ transferValue = kCVImageBufferTransferFunction_UseGamma;
+ Float32 gamma = 2.2;
+ gammaValue = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma);
+ break;
+ }
+
+ case HB_COLR_TRA_GAMMA28:
+ {
+ transferValue = kCVImageBufferTransferFunction_UseGamma;
+ Float32 gamma = 2.8;
+ gammaValue = CFNumberCreate(NULL, kCFNumberFloat32Type, &gamma);
+ break;
+ }
+
 case HB_COLR_TRA_SMPTE240M:
- transferKey = kCVImageBufferTransferFunction_SMPTE_240M_1995;
+ transferValue = kCVImageBufferTransferFunction_SMPTE_240M_1995;
 break;
 
+ case HB_COLR_TRA_LINEAR:
+ if (@available(macOS 10.14, *)) {
+ transferValue = kCVImageBufferTransferFunction_Linear;
+ break;
+ }
+
 case HB_COLR_TRA_BT2020_10:
 case HB_COLR_TRA_BT2020_12:
- transferKey = kCVImageBufferTransferFunction_ITU_R_2020;
+ transferValue = kCVImageBufferTransferFunction_ITU_R_2020;
 break;
 
 case HB_COLR_TRA_SMPTEST2084:
- if (@available(macOS 10.13, *)) {
- transferKey = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
+ transferValue = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ;
 break;
- }
 
 case HB_COLR_TRA_ARIB_STD_B67:
- if (@available(macOS 10.13, *)) {
- transferKey = kCVImageBufferTransferFunction_ITU_R_2100_HLG;
+ transferValue = kCVImageBufferTransferFunction_ITU_R_2100_HLG;
+ break;
+
+ case HB_COLR_TRA_SMPTE428:
+ transferValue = kCVImageBufferTransferFunction_SMPTE_ST_428_1;
 break;
- }
 
 case HB_COLR_TRA_BT709:
 default:
- transferKey = kCVImageBufferTransferFunction_ITU_R_709_2;
+ transferValue = kCVImageBufferTransferFunction_ITU_R_709_2;
 }
 
- CFStringRef matrixKey = NULL;
+ CFStringRef matrixValue = NULL;
 switch (matrix)
 {
 case HB_COLR_MAT_SMPTE170M:
- matrixKey = kCVImageBufferYCbCrMatrix_ITU_R_601_4;
+ matrixValue = kCVImageBufferYCbCrMatrix_ITU_R_601_4;
 break;
 
 case HB_COLR_MAT_SMPTE240M:
- matrixKey = kCVImageBufferYCbCrMatrix_SMPTE_240M_1995;
+ matrixValue = kCVImageBufferYCbCrMatrix_SMPTE_240M_1995;
 break;
 
 case HB_COLR_MAT_BT2020_NCL:
 case HB_COLR_MAT_BT2020_CL:
- matrixKey = kCVImageBufferYCbCrMatrix_ITU_R_2020;
+ matrixValue = kCVImageBufferYCbCrMatrix_ITU_R_2020;
 break;
 
 case HB_COLR_MAT_BT709:
 default:
- matrixKey = kCVImageBufferYCbCrMatrix_ITU_R_709_2;;
+ matrixValue = kCVImageBufferYCbCrMatrix_ITU_R_709_2;
 }
 
- const void *keys3 = { kCVImageBufferColorPrimariesKey, kCVImageBufferTransferFunctionKey, kCVImageBufferYCbCrMatrixKey };
- const void *values3 = { primariesKey, transferKey, matrixKey};
- CFDictionaryRef attachments = CFDictionaryCreate(NULL, keys, values, 3, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ CGColorSpaceRef colorSpace = NULL;
+ if (transferValue == kCVImageBufferTransferFunction_UseGamma)
+ {
+ const void *keys4 = { kCVImageBufferColorPrimariesKey, kCVImageBufferTransferFunctionKey, kCVImageBufferYCbCrMatrixKey, kCVImageBufferGammaLevelKey };
+ const void *values4 = { primariesValue, transferValue, matrixValue, gammaValue };
+ CFDictionaryRef attachments = CFDictionaryCreate(NULL, keys, values, 4, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+
+ colorSpace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
+ CFRelease(attachments);
+ }
+ else
+ {
+ const void *keys3 = { kCVImageBufferColorPrimariesKey, kCVImageBufferTransferFunctionKey, kCVImageBufferYCbCrMatrixKey };
+ const void *values3 = { primariesValue, transferValue, matrixValue };
+ CFDictionaryRef attachments = CFDictionaryCreate(NULL, keys, values, 3, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 
- CGColorSpaceRef colorSpace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
- CFRelease(attachments);
+ colorSpace = CVImageBufferCreateColorSpaceFromAttachments(attachments);
+ CFRelease(attachments);
+ }
 
 return colorSpace;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJob+HBJobConversion.m -> HandBrake-1.5.1.tar.xz/macosx/HBJob+HBJobConversion.m Changed

@@ -16,6 +16,15 @@
 #import "HBTitle+Private.h"
 #import "HBMutablePreset.h"
 
+#import "HBRange.h"
+#import "HBVideo.h"
+#import "HBPicture.h"
+#import "HBFilters.h"
+#import "HBAudio.h"
+#import "HBSubtitles.h"
+
+#import "NSDictionary+HBAdditions.h"
+
 @implementation HBJob (HBJobConversion)
 
 - (NSDictionary *)jobDict
@@ -118,6 +127,11 @@
         job->chapter_markers = 0;
     }
 
+    if (self.metadataPassthru == NO && job->metadata && job->metadata->dict)
+    {
+        hb_dict_clear(job->metadata->dict);
+    }
+
     if (job->vcodec & HB_VCODEC_H264_MASK)
     {
         // iPod 5G atom
@@ -173,8 +187,8 @@
     }
 
     // Picture Size Settings
-    job->par.num = self.picture.parWidth;
-    job->par.den = self.picture.parHeight;
+    job->par.num = self.picture.parNum;
+    job->par.den = self.picture.parDen;
 
     // Video settings
     // Framerate
@@ -334,6 +348,10 @@
     {
         job->acodec_copy_mask |= HB_ACODEC_DCA_PASS;
     }
+    if (audioDefaults.allowMP2Passthru)
+    {
+        job->acodec_copy_mask |= HB_ACODEC_MP2_PASS;
+    }
     if (audioDefaults.allowMP3Passthru)
     {
         job->acodec_copy_mask |= HB_ACODEC_MP3_PASS;
@@ -406,10 +424,9 @@
     }
 
     // Now lets call the filters if applicable.
-    // The order of the filters is critical
+    hb_filter_object_t *filter;
 
     // Detelecine
-    hb_filter_object_t *filter;
     if (!self.filters.detelecine isEqualToString:@"off")
     {
         int filter_id = HB_FILTER_DETELECINE;
@@ -453,6 +470,24 @@
         hb_value_free(&filter_dict);
     }
 
+    // Add framerate shaping filter
+    filter = hb_filter_init(HB_FILTER_VFR);
+    hb_add_filter(job, filter, NSString stringWithFormat:@"mode=%d:rate=%d/%d",
+                                 fps_mode, fps_num, fps_den UTF8String);
+
+    // Deblock
+    if (!self.filters.deblock isEqualToString:@"off")
+    {
+        int filter_id = HB_FILTER_DEBLOCK;
+        hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
+                                                             self.filters.deblock.UTF8String,
+                                                             self.filters.deblockTune.UTF8String,
+                                                             self.filters.deblockCustomString.UTF8String);
+        filter = hb_filter_init(filter_id);
+        hb_add_filter_dict(job, filter, filter_dict);
+        hb_value_free(&filter_dict);
+    }
+
     // Denoise
     if (!self.filters.denoise isEqualToString:@"off")
     {
@@ -471,14 +506,14 @@
         hb_dict_free(&filter_dict);
     }
 
-    // Deblock
-    if (!self.filters.deblock isEqualToString:@"off")
+    // Chroma Smooth
+    if (!self.filters.chromaSmooth isEqualToString:@"off")
     {
-        int filter_id = HB_FILTER_DEBLOCK;
+        int filter_id = HB_FILTER_CHROMA_SMOOTH;
         hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
-                                                             self.filters.deblock.UTF8String,
-                                                             self.filters.deblockTune.UTF8String,
-                                                             self.filters.deblockCustomString.UTF8String);
+                                                             self.filters.chromaSmooth.UTF8String,
+                                                             self.filters.chromaSmoothTune.UTF8String,
+                                                             self.filters.chromaSmoothCustomString.UTF8String);
         filter = hb_filter_init(filter_id);
         hb_add_filter_dict(job, filter, filter_dict);
         hb_value_free(&filter_dict);
@@ -511,30 +546,71 @@
         hb_dict_free(&filter_dict);
     }
 
-    // Add grayscale filter
+    // Grayscale
     if (self.filters.grayscale)
     {
         filter = hb_filter_init(HB_FILTER_GRAYSCALE);
         hb_add_filter(job, filter, NULL);
     }
 
-    // Add rotate filter
-    if (self.filters.rotate || self.filters.flip)
+    // Rotate
+    if (self.picture.angle || self.picture.flip)
     {
         int filter_id = HB_FILTER_ROTATE;
         hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
                                                              NULL, NULL,
-                                                             NSString stringWithFormat:@"angle=%d:hflip=%d", self.filters.rotate, self.filters.flip.UTF8String);
+                                                             NSString stringWithFormat:@"angle=%d:hflip=%d",
+                                                              self.picture.angle, self.picture.flip.UTF8String);
 
         filter = hb_filter_init(filter_id);
         hb_add_filter_dict(job, filter, filter_dict);
         hb_dict_free(&filter_dict);
     }
 
-    // Add framerate shaping filter
-    filter = hb_filter_init(HB_FILTER_VFR);
-    hb_add_filter(job, filter, NSString stringWithFormat:@"mode=%d:rate=%d/%d",
-                                 fps_mode, fps_num, fps_den UTF8String);
+    // Pad
+    if (self.picture.padMode != HBPicturePadModeNone)
+    {
+        int filter_id = HB_FILTER_PAD;
+        NSString *color;
+        switch (self.picture.padColorMode) {
+            case HBPicturePadColorModeBlack:
+                color = @"black";
+                break;
+            case HBPicturePadColorModeDarkGray:
+                color = @"darkslategray";
+                break;
+            case HBPicturePadColorModeGray:
+                color = @"slategray";
+                break;
+            case HBPicturePadColorModeWhite:
+                color = @"white";
+                break;
+            case HBPicturePadColorModeCustom:
+                color = self.picture.padColorCustom;
+                break;
+        }
+        
+        NSString *settings = NSString stringWithFormat:@"color=%@:top=%d:bottom=%d:left=%d:right=%d",
+                              color, self.picture.padTop, self.picture.padBottom, self.picture.padLeft, self.picture.padRight;
+        hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id, NULL, NULL, settings.UTF8String);
+
+        filter = hb_filter_init(filter_id);
+        hb_add_filter_dict(job, filter, filter_dict);
+        hb_dict_free(&filter_dict);
+    }
+
+    // Colorspace
+    if (!self.filters.colorspace isEqualToString:@"off")
+    {
+        int filter_id = HB_FILTER_COLORSPACE;
+        hb_dict_t *filter_dict = hb_generate_filter_settings(filter_id,
+                                                             self.filters.colorspace.UTF8String,
+                                                             NULL,
+                                                             self.filters.colorspaceCustomString.UTF8String);
+        filter = hb_filter_init(filter_id);
+        hb_add_filter_dict(job, filter, filter_dict);
+        hb_value_free(&filter_dict);
+    }
 
     return job;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJob+UIAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/HBJob+UIAdditions.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJob+UIAdditions.m -> HandBrake-1.5.1.tar.xz/macosx/HBJob+UIAdditions.m Changed

@@ -21,6 +21,13 @@
 #import "HBAudioTransformers.h"
 #import "HBLocalizationUtilities.h"
 
+#import "HBRange.h"
+#import "HBVideo.h"
+#import "HBPicture.h"
+#import "HBFilters.h"
+#import "HBAudio.h"
+#import "HBSubtitles.h"
+
 #include "handbrake/handbrake.h"
 
 // Text Styles
@@ -72,15 +79,15 @@
         NSString *title = nil;
         if (container->format & HB_MUX_MASK_MP4)
         {
-            title = HBKitLocalizedString(@"MP4 File", @"HBJob -> Format display name");
+            title = @"MP4";
         }
         else if (container->format & HB_MUX_MASK_MKV)
         {
-            title = HBKitLocalizedString(@"MKV File", @"HBJob -> Format display name");
+            title = @"MKV";
         }
         else if (container->format & HB_MUX_MASK_WEBM)
         {
-            title = HBKitLocalizedString(@"WebM File", @"HBJob -> Format display name");
+            title = @"WebM";
         }
         else
         {
@@ -98,12 +105,21 @@
 {
     if (!detailAttr)
     {
+        
+        CGFloat indent = 100;
+        NSBundle *bundle = NSBundle bundleForClass:HBJob class;
+        NSString *currentLocalization = bundle.preferredLocalizations.firstObject;
+        if (currentLocalization hasPrefix:@"de")
+        {
+            indent = 120;
+        }
+        
         // Attributes
         NSMutableParagraphStyle *ps = NSParagraphStyle.defaultParagraphStyle mutableCopy;
-        ps.headIndent = 88.0;
+        ps.headIndent = indent;
         ps.paragraphSpacing = 1.0;
-        ps.tabStops = @NSTextTab alloc initWithType:NSRightTabStopType location:88,
-                        NSTextTab alloc initWithType:NSLeftTabStopType location:90;
+        ps.tabStops = @NSTextTab alloc initWithType:NSRightTabStopType location:indent - 2,
+                        NSTextTab alloc initWithType:NSLeftTabStopType location:indent;
 
         detailAttr = @{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize,
                        NSParagraphStyleAttributeName: ps,
@@ -205,7 +221,27 @@
     NSMutableAttributedString *attrString = NSMutableAttributedString alloc init;
     NSMutableString *options = NSMutableString string;
 
-    options appendString:@(hb_container_get_name(self.container));
+    NSString *containerName;
+
+    if (self.container & HB_MUX_MASK_MP4)
+    {
+        containerName = @"MP4";
+    }
+    else if (self.container & HB_MUX_MASK_MKV)
+    {
+        containerName = @"MKV";
+    }
+    else if (self.container & HB_MUX_MASK_WEBM)
+    {
+        containerName = @"WebM";
+    }
+    else
+    {
+        containerName = @(hb_container_get_name(self.container));
+    }
+
+    options appendString:containerName;
+
 
     if (self.chaptersEnabled)
     {
@@ -272,10 +308,6 @@
     NSMutableAttributedString *attrString = NSMutableAttributedString alloc init;
 
     NSString *pictureInfo = self.picture.summary;
-    if (self.picture.keepDisplayAspect)
-    {
-        pictureInfo = pictureInfo stringByAppendingString:HBKitLocalizedString(@" Keep Aspect Ratio", @"Dimensions description");
-    }
     attrString appendString:@"\t"      withAttributes:detailAttr;
     attrString appendString:HBKitLocalizedString(@"Dimensions:", @"Dimensions description") withAttributes:detailBoldAttr;
     attrString appendString:@" \t"             withAttributes:detailAttr;
@@ -361,7 +393,22 @@
         }
 
         summary appendString:@")";
+    }
 
+    // Chroma Smooth
+    if (!filters.chromaSmooth isEqualToString:@"off")
+    {
+        summary appendFormat:@", %@ (%@", HBKitLocalizedString(@"Chroma Smooth", @"Filters description"), HBFilters chromaSmoothPresetDict allKeysForObject:filters.chromaSmooth firstObject;
+        if (!filters.chromaSmooth isEqualToString:@"custom")
+        {
+            summary appendFormat:@", %@", HBFilters chromaSmoothTunesDict allKeysForObject:filters.chromaSmoothTune firstObject;
+        }
+        else
+        {
+            summary appendFormat:@", %@", filters.chromaSmoothCustomString;
+        }
+
+        summary appendString:@")";
     }
 
     // Sharpen
@@ -395,6 +442,18 @@
         summary appendFormat:@", %@", HBKitLocalizedString(@"Grayscale", @"Filters description");
     }
 
+    // Colorspace
+    if (!filters.colorspace isEqualToString:@"off")
+    {
+        summary appendFormat:@", %@ (%@", HBKitLocalizedString(@"Colorspace", @"Filters description"), HBFilters colorspacePresetDict allKeysForObject:filters.colorspace firstObject;
+        if (filters.colorspace isEqualToString:@"custom")
+        {
+            summary appendFormat:@", %@", filters.colorspaceCustomString;
+        }
+
+        summary appendString:@")";
+    }
+
     if (summary hasPrefix:@", ")
     {
         summary deleteCharactersInRange:NSMakeRange(0, 2);
@@ -920,6 +979,13 @@
         }
     }
 
+    // Chroma Smooth
+    if (!filters.chromaSmooth isEqualToString:@"off")
+    {
+        summary appendString:HBKitLocalizedString(@"Chroma Smooth", @"HBJob -> filters short description");
+        summary appendString:@", ";
+    }
+
     // Sharpen
     if (!filters.sharpen isEqualToString:@"off")
     {
@@ -938,10 +1004,10 @@
         summary appendString:@", ";
     }
 
-    // Rotation
-    if (filters.rotate || filters.flip)
+    // Colorspace
+    if (!filters.colorspace isEqualToString:@"off")
     {
-        summary appendString:HBKitLocalizedString(@"Rotation", @"HBJob -> filters short description");
+        summary appendString:HBKitLocalizedString(@"Colorspace", @"HBJob -> filters short description");
         summary appendString:@", ";
     }
 
@@ -972,15 +1038,15 @@
     int container = value intValue;
     if (container & HB_MUX_MASK_MP4)
     {
-        return HBKitLocalizedString(@"MP4 File", @"HBJob -> Format display name");
+        return @"MP4";
     }
     else if (container & HB_MUX_MASK_MKV)
     {
-        return HBKitLocalizedString(@"MKV File", @"HBJob -> Format display name");
+        return @"MKV";
     }
     else if (container & HB_MUX_MASK_WEBM)
     {
-        return HBKitLocalizedString(@"WebM File", @"HBJob -> Format display name");
+        return @"WebM";
     }
     else
     {
@@ -1003,15 +1069,15 @@
 
 - (id)reverseTransformedValue:(id)value
 {
-    if (value isEqualToString:HBKitLocalizedString(@"MP4 File", @"HBJob -> Format display name"))
+    if (value isEqualToString:@"MP4")
     {
         return @(HB_MUX_AV_MP4);
     }
-    else if (value isEqualToString:HBKitLocalizedString(@"MKV File", @"HBJob -> Format display name"))
+    else if (value isEqualToString:@"MKV")
     {
         return @(HB_MUX_AV_MKV);
     }
-    else if (value isEqualToString:HBKitLocalizedString(@"WebM File", @"HBJob -> Format display name"))
+    else if (value isEqualToString:@"WebM")
     {
         return @(HB_MUX_AV_WEBM);
     }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJob.h -> HandBrake-1.5.1.tar.xz/macosx/HBJob.h Changed

@@ -6,20 +6,18 @@
 
 #import <Foundation/Foundation.h>
 
-@class HBPreset;
-@class HBMutablePreset;
+@class HBPreset, HBMutablePreset;
 @class HBTitle;
+@class HBVideo;
+@class HBRange;
+@class HBPicture;
+@class HBFilters;
+@class HBAudio;
+@class HBSubtitles;
+@class HBChapter;
 
-#import "HBRange.h"
-#import "HBVideo.h"
-#import "HBPicture.h"
-#import "HBFilters.h"
-
-#import "HBAudio.h"
-#import "HBSubtitles.h"
-#import "HBChapter.h"
-
-#import "HBSecurityAccessToken.h"
+#import <HandBrakeKit/HBPresetCoding.h>
+#import <HandBrakeKit/HBSecurityAccessToken.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -31,13 +29,14 @@
 */
 @interface HBJob : NSObject <NSSecureCoding, NSCopying, HBPresetCoding, HBSecurityScope>
 
-- (instancetype)initWithTitle:(HBTitle *)title andPreset:(HBPreset *)preset;
-
-- (void)applyPreset:(HBPreset *)preset;
+- (nullable instancetype)initWithTitle:(HBTitle *)title preset:(HBPreset *)preset;
 
 @property (nonatomic, readwrite, weak, nullable) HBTitle *title;
 @property (nonatomic, readonly) int titleIdx;
 
+// Whether the source is a single file or a DVD-Video/Blu-ray
+@property (nonatomic, readonly, getter=isStream) BOOL stream;
+
 @property (nonatomic, readwrite, copy) NSString *presetName;
 
 /// The file URL of the source.
@@ -72,6 +71,8 @@
 @property (nonatomic, readwrite) BOOL chaptersEnabled;
 @property (nonatomic, readonly) NSArray<HBChapter *> *chapterTitles;
 
+@property (nonatomic, readwrite) BOOL metadataPassthru;
+
 @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJob.m -> HandBrake-1.5.1.tar.xz/macosx/HBJob.m Changed

@@ -45,7 +45,7 @@
 
 @implementation HBJob
 
-- (instancetype)initWithTitle:(HBTitle *)title andPreset:(HBPreset *)preset
+- (nullable instancetype)initWithTitle:(HBTitle *)title preset:(HBPreset *)preset
 {
 self = super init;
 if (self) {
@@ -54,6 +54,7 @@
 
 _title = title;
 _titleIdx = title.index;
+ _stream = title.isStream;
 
 _name = title.name copy;
 _fileURL = title.url;
@@ -70,10 +71,13 @@
 _subtitles = HBSubtitles alloc initWithJob:self;
 
 _chapterTitles = title.chapters copy;
-
+ _metadataPassthru = YES;
 _presetName = @"";
 
- self applyPreset:preset;
+ if (self applyPreset:preset error:NULL == NO)
+ {
+ return nil;
+ }
 }
 
 return self;
@@ -81,29 +85,45 @@
 
 #pragma mark - HBPresetCoding
 
-- (void)applyPreset:(HBPreset *)preset
+- (BOOL)applyPreset:(HBPreset *)preset error:(NSError * __autoreleasing *)outError
 {
 NSAssert(self.title, @"HBJob: calling applyPreset: without a valid title loaded");
 
- self.presetName = preset.name;
 NSDictionary *jobSettings = self.title jobSettingsWithPreset:preset;
 
- self.container = hb_container_get_from_name(preset@"FileFormat" UTF8String);
+ if (jobSettings)
+ {
+ self.presetName = preset.name;
 
- // MP4 specifics options.
- self.mp4HttpOptimize = preset@"Mp4HttpOptimize" boolValue;
- self.mp4iPodCompatible = preset@"Mp4iPodCompatible" boolValue;
+ self.container = hb_container_get_from_name(preset@"FileFormat" UTF8String);
+
+ // MP4 specifics options.
+ self.mp4HttpOptimize = preset@"Mp4HttpOptimize" boolValue;
+ self.mp4iPodCompatible = preset@"Mp4iPodCompatible" boolValue;
 
- self.alignAVStart = preset@"AlignAVStart" boolValue;
+ self.alignAVStart = preset@"AlignAVStart" boolValue;
 
- // Chapter Markers
- self.chaptersEnabled = preset@"ChapterMarkers" boolValue;
+ self.chaptersEnabled = preset@"ChapterMarkers" boolValue;
+ self.metadataPassthru = preset@"MetadataPassthrough" boolValue;
+
+ self.audio applyPreset:preset jobSettings:jobSettings;
+ self.subtitles applyPreset:preset jobSettings:jobSettings;
+ self.video applyPreset:preset jobSettings:jobSettings;
+ self.picture applyPreset:preset jobSettings:jobSettings;
+ self.filters applyPreset:preset jobSettings:jobSettings;
+
+ return YES;
+ }
+ else
+ {
+ if (outError != NULL)
+ {
+ *outError = NSError errorWithDomain:@"HBError" code:0 userInfo:@{NSLocalizedDescriptionKey: NSLocalizedString(@"Invalid preset", @"HBJob -> invalid preset"),
+ NSLocalizedRecoverySuggestionErrorKey: NSLocalizedString(@"The preset is not a valid, try to select a different one.", @"Job preset -> invalid preset recovery suggestion")};
+ }
 
- self.audio applyPreset:preset jobSettings:jobSettings;
- self.subtitles applyPreset:preset jobSettings:jobSettings;
- self.video applyPreset:preset jobSettings:jobSettings;
- self.picture applyPreset:preset jobSettings:jobSettings;
- self.filters applyPreset:preset jobSettings:jobSettings;
+ return NO;
+ }
 }
 
 - (void)writeToPreset:(HBMutablePreset *)preset
@@ -111,12 +131,14 @@
 preset.name = self.presetName;
 
 preset@"FileFormat" = @(hb_container_get_short_name(self.container));
- preset@"ChapterMarkers" = @(self.chaptersEnabled);
+
 // MP4 specifics options.
 preset@"Mp4HttpOptimize" = @(self.mp4HttpOptimize);
+ preset@"AlignAVStart" = @(self.alignAVStart);
 preset@"Mp4iPodCompatible" = @(self.mp4iPodCompatible);
 
- preset@"AlignAVStart" = @(self.alignAVStart);
+ preset@"ChapterMarkers" = @(self.chaptersEnabled);
+ preset@"MetadataPassthrough" = @(self.metadataPassthru);
 
 @self.video, self.filters, self.picture, self.audio, self.subtitles makeObjectsPerformSelector:@selector(writeToPreset:)
 withObject:preset;
@@ -283,6 +305,16 @@
 NSNotificationCenter defaultCenter postNotificationName:HBChaptersChangedNotification object:self;
 }
 
+- (void)setMetadataPassthru:(BOOL)metadataPassthru
+{
+ if (metadataPassthru != _metadataPassthru)
+ {
+ self.undo prepareWithInvocationTarget:self setMetadataPassthru:_metadataPassthru;
+ }
+ _metadataPassthru = metadataPassthru;
+ NSNotificationCenter defaultCenter postNotificationName:HBContainerChangedNotification object:self;
+}
+
 - (NSString *)description
 {
 return self.name;
@@ -350,6 +382,7 @@
 copy->_name = _name copy;
 copy->_presetName = _presetName copy;
 copy->_titleIdx = _titleIdx;
+ copy->_stream = _stream;
 
 copy->_fileURLBookmark = _fileURLBookmark copy;
 copy->_outputURLFolderBookmark = _outputURLFolderBookmark copy;
@@ -378,6 +411,8 @@
 
 copy->_chaptersEnabled = _chaptersEnabled;
 copy->_chapterTitles = NSArray alloc initWithArray:_chapterTitles copyItems:YES;
+
+ copy->_metadataPassthru = _metadataPassthru;
 }
 
 return copy;
@@ -397,6 +432,7 @@
 encodeObject(_name);
 encodeObject(_presetName);
 encodeInt(_titleIdx);
+ encodeBool(_stream);
 
 #ifdef __SANDBOX_ENABLED__
 if (!_fileURLBookmark)
@@ -439,6 +475,8 @@
 
 encodeBool(_chaptersEnabled);
 encodeObject(_chapterTitles);
+
+ encodeBool(_metadataPassthru);
 }
 
 - (instancetype)initWithCoder:(NSCoder *)decoder
@@ -450,36 +488,14 @@
 decodeObjectOrFail(_name, NSString);
 decodeObjectOrFail(_presetName, NSString);
 decodeInt(_titleIdx); if (_titleIdx < 0) { goto fail; }
+ decodeBool(_stream);
 
 #ifdef __SANDBOX_ENABLED__
 decodeObject(_fileURLBookmark, NSData)
-
- if (_fileURLBookmark)
- {
- _fileURL = HBUtilities URLFromBookmark:_fileURLBookmark;
- }
-
- if (!_fileURL)
- {
- decodeObjectOrFail(_fileURL, NSURL);
- }
-
 decodeObject(_outputURLFolderBookmark, NSData)
-
- if (_outputURLFolderBookmark)
- {
- _outputURL = HBUtilities URLFromBookmark:_outputURLFolderBookmark;
- }
-
- if (!_outputURL)
- {
- decodeObject(_outputURL, NSURL);
- }
-#else
+#endif
 decodeObjectOrFail(_fileURL, NSURL);
 decodeObject(_outputURL, NSURL);
-#endif
-
 decodeObject(_outputFileName, NSString);
 
 decodeInt(_container); if (_container != HB_MUX_MP4 && _container != HB_MUX_MKV && _container != HB_MUX_WEBM) { goto fail; }
@@ -504,6 +520,8 @@
 decodeBool(_chaptersEnabled);
 decodeCollectionOfObjectsOrFail(_chapterTitles, NSArray, HBChapter);
 
+ decodeBool(_metadataPassthru);
+
 return self;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJobOutputFileWriter.h -> HandBrake-1.5.1.tar.xz/macosx/HBJobOutputFileWriter.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBJobOutputFileWriter.m -> HandBrake-1.5.1.tar.xz/macosx/HBJobOutputFileWriter.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBLanguagesSelection.h -> HandBrake-1.5.1.tar.xz/macosx/HBLanguagesSelection.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBLanguagesSelection.m -> HandBrake-1.5.1.tar.xz/macosx/HBLanguagesSelection.m Changed

@@ -5,6 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import "HBLanguagesSelection.h"
+#import "HBPasteboardItem.h"
 #include "handbrake/lang.h"
 
 @implementation HBLang
@@ -140,8 +141,6 @@
 
 @end
 
-NSString *kHBLanguagesDragRowsType = @"kHBLanguagesDragRowsType";
-
 @implementation HBLanguageArrayController
 
 - (void)setShowSelectedOnly:(BOOL)showSelectedOnly
@@ -171,17 +170,16 @@
 
 - (void)awakeFromNib
 {
-	self.tableView registerForDraggedTypes:@kHBLanguagesDragRowsType;
-	self.isDragginEnabled = YES;
+	self.tableView registerForDraggedTypes:@tableViewIndex;
+	self.isDraggingEnabled = YES;
 }
 
 #pragma mark - NSTableView Delegate
 
-- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
+- (nullable id <NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row
 {
- if (self.isDragginEnabled)
-	{
- NSData *data = nil;
+ if (self.isDraggingEnabled)
+ {
 if (self.showSelectedOnly)
 {
 // If the show selected only filter
@@ -191,27 +189,14 @@
 self.showSelectedOnly = NO;
 NSArray *unfilteredArray = self arrangedObjects;
 
- NSMutableIndexSet *unfilteredIndexes = NSMutableIndexSet indexSet;
- NSUInteger currentIndex = rowIndexes firstIndex;
- while (currentIndex != NSNotFound)
- {
- NSUInteger newIndex = unfilteredArray indexOfObject:filteredArraycurrentIndex;
- unfilteredIndexes addIndex:newIndex;
- currentIndex = rowIndexes indexGreaterThanIndex:currentIndex;
- }
-
- data = NSKeyedArchiver archivedDataWithRootObject:unfilteredIndexes;
- }
- else
- {
- data = NSKeyedArchiver archivedDataWithRootObject:rowIndexes;
+ row = unfilteredArray indexOfObject:filteredArrayrow;
 }
-
- pboard declareTypes:@kHBLanguagesDragRowsType owner:self;
- pboard setData:data forType:kHBLanguagesDragRowsType;
+ return HBPasteboardItem alloc initWithIndex:row;
+ }
+ else
+ {
+ return nil;
 }
-
- return self.isDragginEnabled;
 }
 
 - (NSDragOperation)tableView:(NSTableView *)view
@@ -222,10 +207,10 @@
 NSDragOperation dragOp = NSDragOperationNone;
 
 // if drag source is our own table view, it's a move or a copy
- if (info draggingSource == view)
+ if (info.draggingSource == view)
 	{
 		// At a minimum, allow move
-		dragOp = NSDragOperationMove;
+		dragOp = NSDragOperationMove;
 }
 
 view setDropRow:row dropOperation:NSTableViewDropAbove;
@@ -235,25 +220,28 @@
 
 - (BOOL)tableView:(NSTableView *)view acceptDrop:(id <NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
 {
- if ((info draggingSourceOperationMask == NSDragOperationCopy))
+ if (info.draggingSourceOperationMask == NSDragOperationCopy)
 {
 return NO;
 }
 
- if (info draggingSource == view)
+ if (info.draggingSource == view)
 {
- // Get the index set from the pasteBoard.
- NSData *rowData = info draggingPasteboard dataForType:kHBLanguagesDragRowsType;
- NSIndexSet *indexSet = NSKeyedUnarchiver unarchiveObjectWithData:rowData;
+ NSMutableIndexSet *indexes = NSMutableIndexSet alloc init;
+ for (NSPasteboardItem *item in info.draggingPasteboard.pasteboardItems)
+ {
+ NSNumber *index = item propertyListForType:tableViewIndex;
+ indexes addIndex:index.integerValue;
+ }
 
- NSUInteger i = indexSet countOfIndexesInRange:NSMakeRange(0, row);
+ NSUInteger i = indexes countOfIndexesInRange:NSMakeRange(0, row);
 
 // Rearrange the objects.
- self moveObjectsInArrangedObjectsFromIndexes:indexSet toIndex:row;
+ self moveObjectsInArrangedObjectsFromIndexes:indexes toIndex:row;
 
 // Update the selection.
 row -= i;
- NSIndexSet *selectionSet = NSIndexSet indexSetWithIndexesInRange:NSMakeRange(row, indexSet count);
+ NSIndexSet *selectionSet = NSIndexSet indexSetWithIndexesInRange:NSMakeRange(row, indexes.count);
 view selectRowIndexes:selectionSet byExtendingSelection:NO;
 
 		return YES;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBMutablePreset.h -> HandBrake-1.5.1.tar.xz/macosx/HBMutablePreset.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBOutputFileWriter.m -> HandBrake-1.5.1.tar.xz/macosx/HBOutputFileWriter.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBOutputPanelController.m -> HandBrake-1.5.1.tar.xz/macosx/HBOutputPanelController.m Changed

HandBrake-1.5.1.tar.xz/macosx/HBPasteboardItem.h Added

HandBrake-1.5.1.tar.xz/macosx/HBPasteboardItem.m Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPicture+UIAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/HBPicture+UIAdditions.h Changed

@@ -5,7 +5,7 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
-#import "HBPicture.h"
+#import <HandBrakeKit/HBPicture.h>
 
 @interface HBPicture (UIAdditions)
 
@@ -16,15 +16,13 @@
 @property (nonatomic, readonly) NSString *shortInfo;
 @property (nonatomic, readonly) NSString *summary;
 
-@property (nonatomic, readonly) int maxWidth;
-@property (nonatomic, readonly) int maxHeight;
+@property (nonatomic, readonly, getter=isCustomCropEnabled) BOOL customCropEnabled;
 
-@property (nonatomic, readonly) int maxTopCrop;
-@property (nonatomic, readonly) int maxBottomCrop;
-@property (nonatomic, readonly) int maxLeftCrop;
-@property (nonatomic, readonly) int maxRightCrop;
+@property (nonatomic, readonly, getter=isCustomResolutionLimitEnabled) BOOL customResolutionLimitEnabled;
+
+@property (nonatomic, readonly, getter=isCustomPadEnabled) BOOL customPadEnabled;
+@property (nonatomic, readonly, getter=isCustomPadColorEnabled) BOOL customPadColorEnabled;
 
-@property (nonatomic, readonly, getter=isKeepDisplayAspectEditable) BOOL keepDisplayAspectEditable;
 @property (nonatomic, readonly, getter=isCustomAnamorphicEnabled) BOOL customAnamorphicEnabled;
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPicture+UIAdditions.m -> HandBrake-1.5.1.tar.xz/macosx/HBPicture+UIAdditions.m Changed

@@ -12,47 +12,136 @@
 
 @implementation HBPicture (UIAdditions)
 
-@dynamic maxHeight;
-@dynamic maxWidth;
+#pragma mark - Editable state
 
-@dynamic maxTopCrop;
-@dynamic maxBottomCrop;
-@dynamic maxLeftCrop;
-@dynamic maxRightCrop;
++ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomCropEnabled
+{
+ return NSSet setWithObjects:@"cropMode", nil;
+}
 
-#pragma mark - Editable state
+- (BOOL)isCustomCropEnabled
+{
+ return self.cropMode == HBPictureCropModeCustom;
+}
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingKeepDisplayAspectEditable
++ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomResolutionLimitEnabled
+{
+ return NSSet setWithObjects:@"resolutionLimitMode", nil;
+}
+
+- (BOOL)isCustomResolutionLimitEnabled
+{
+ return self.resolutionLimitMode == HBPictureResolutionLimitModeCustom;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomAnamorphicEnabled
 {
 return NSSet setWithObjects:@"anamorphicMode", nil;
 }
 
-- (BOOL)isKeepDisplayAspectEditable
+- (BOOL)isCustomAnamorphicEnabled
+{
+ return self.anamorphicMode == HBPictureAnarmophicModeCustom;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomPadEnabled
+{
+ return NSSet setWithObjects:@"padMode", nil;
+}
+
+- (BOOL)isCustomPadEnabled
+{
+ return self.padMode == HBPicturePadModeCustom;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomPadColorEnabled
+{
+ return NSSet setWithObjects:@"padColorMode", nil;
+}
+
+- (BOOL)isCustomPadColorEnabled
+{
+ return self.padColorMode == HBPicturePadColorModeCustom;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingInfo
+{
+ return NSSet setWithObjects:@"parWidth", @"parHeight", @"displayWidth", @"width", @"height",@"anamorphicMode", @"cropTop", @"cropBottom", @"cropLeft", @"cropRight", nil;
+}
+
+#pragma mark - Labels
+
+- (NSString *)sourceStorageSize
+{
+ return NSString stringWithFormat:@"%dx%d", self.sourceWidth, self.sourceHeight;
+}
+
+- (NSString *)sourceDisplaySize
+{
+ return NSString stringWithFormat:@"%dx%d", self.sourceDisplayWidth, self.sourceHeight;
+}
+
+- (NSString *)sourceAspectRatio
+{
+ return FormattedDisplayAspect(self.sourceWidth * self.sourceParNum, self.sourceHeight * self.sourceParDen);
+}
+
+static NSString * FormattedDisplayAspect(double disp_width, double disp_height)
 {
- if (self.anamorphicMode == HB_ANAMORPHIC_AUTO ||
- self.anamorphicMode == HB_ANAMORPHIC_LOOSE)
+ NSString *str;
+
+ int iaspect = disp_width * 9 / disp_height;
+ if (disp_width / disp_height > 1.9)
+ {
+ // x.x:1
+ str = NSString stringWithFormat:@"%.2f:1", disp_width / disp_height;
+ }
+ else if (iaspect >= 15)
 {
- return NO;
+ // x.x:9
+ str = NSString stringWithFormat:@"%.4g:9", disp_width * 9 / disp_height;
+ }
+ else if (iaspect >= 9)
+ {
+ // x.x:3
+ str = NSString stringWithFormat:@"%.4g:3", disp_width * 3 / disp_height;
 }
 else
 {
- return YES;
+ // 1:x.x
+ str = NSString stringWithFormat:@"1:%.2f", disp_height / disp_width;
 }
+ return str;
 }
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingCustomAnamorphicEnabled
+- (NSString *)storageSize
 {
- return NSSet setWithObjects:@"anamorphicMode", nil;
+ return NSString stringWithFormat:@"%dx%d", self.storageWidth, self.storageHeight;
 }
 
-- (BOOL)isCustomAnamorphicEnabled
++ (NSSet<NSString *> *)keyPathsForValuesAffectingStorageSize
 {
- return self.anamorphicMode == HB_ANAMORPHIC_CUSTOM;
+ return NSSet setWithObjects:@"storageWidth", @"storageHeight", nil;
 }
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingInfo
+- (NSString *)displaySize
 {
- return NSSet setWithObjects:@"parWidth", @"parHeight", @"displayWidth", @"width", @"height",@"anamorphicMode", @"cropTop", @"cropBottom", @"cropLeft", @"cropRight", nil;
+ return NSString stringWithFormat:@"%dx%d", self.displayWidth, self.displayHeight;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingDisplaySize
+{
+ return NSSet setWithObjects:@"displayWidth", @"displayHeight", nil;
+}
+
+- (NSString *)displayAspectRatio
+{
+ return FormattedDisplayAspect(self.displayWidth, self.displayHeight);
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingDisplayAspectRatio
+{
+ return NSSet setWithObjects:@"displayWidth", @"displayHeight", nil;
 }
 
 - (NSString *)info
@@ -63,29 +152,23 @@
 (@"Source: %dx%d, ", @"HBPicture -> short info"),
 self.sourceWidth, self.sourceHeight;
 
- if (self.anamorphicMode == HB_ANAMORPHIC_AUTO)
- {
- sizeInfo = NSString stringWithFormat:HBKitLocalizedString
- (@"%@Output: %dx%d, Anamorphic: %dx%d Auto", @"HBPicture -> short info"),
- sizeInfo, self.width, self.height, self.displayWidth, self.height;
- }
- else if (self.anamorphicMode == HB_ANAMORPHIC_LOOSE) // Loose Anamorphic
+ if (self.anamorphicMode == HBPictureAnarmophicModeAuto)
 {
 sizeInfo = NSString stringWithFormat:HBKitLocalizedString
- (@"%@Output: %dx%d, Anamorphic: %dx%d Loose", @"HBPicture -> short info"),
- sizeInfo, self.width, self.height, self.displayWidth, self.height;
+ (@"%@Output: %dx%d, Anamorphic: %dx%d Automatic", @"HBPicture -> short info"),
+ sizeInfo, self.storageWidth, self.storageHeight, self.displayWidth, self.displayHeight;
 }
- else if (self.anamorphicMode == HB_ANAMORPHIC_CUSTOM) // Custom Anamorphic
+ else if (self.anamorphicMode == HBPictureAnarmophicModeCustom)
 {
 sizeInfo = NSString stringWithFormat:HBKitLocalizedString
 (@"%@Output: %dx%d, Anamorphic: %dx%d Custom", @"HBPicture -> short info"),
- sizeInfo, self.width, self.height, self.displayWidth, self.height;
+ sizeInfo, self.storageWidth, self.storageHeight, self.displayWidth, self.displayHeight;
 }
 else // No Anamorphic
 {
 sizeInfo = NSString stringWithFormat:HBKitLocalizedString
 (@"%@Output: %dx%d", @"HBPicture -> short info"),
- sizeInfo, self.width, self.height;
+ sizeInfo, self.storageWidth, self.storageHeight;
 }
 
 return sizeInfo;
@@ -93,23 +176,25 @@
 
 - (NSString *)shortInfo
 {
- return NSString stringWithFormat:HBKitLocalizedString(@"%dx%d Storage, %dx%d Display", @"HBPicture -> short info"), self.width, self.height, self.displayWidth, self.height;
-}
-
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingSummary
-{
- return NSSet setWithObjects:@"parWidth", @"parHeight", @"displayWidth", @"width", @"height",@"anamorphicMode", @"cropTop", @"cropBottom", @"cropLeft", @"cropRight", nil;
+ return NSString stringWithFormat:HBKitLocalizedString(@"%dx%d Storage, %dx%d Display", @"HBPicture -> short info"),
+ self.storageWidth, self.storageHeight, self.displayWidth, self.height;
 }
 
 - (NSString *)summary
 {
 NSMutableString *summary = NSMutableString stringWithString:@"";
 summary appendString:self.info;
- summary appendFormat:HBKitLocalizedString(@", Modulus: %d", @"HBPicture -> summary"), self.modulus;
- summary appendFormat:HBKitLocalizedString(@", Crop: %@ %d/%d/%d/%d", @"HBPicture -> summary"),
- self.autocrop ? HBKitLocalizedString(@"Auto", @"HBPicture -> summary") : HBKitLocalizedString(@"Custom", @"HBPicture -> summary"),
- self.cropTop, self.cropBottom,
- self.cropLeft, self.cropRight;
+ if (self.cropMode != HBPictureCropModeNone && (self.cropTop && self.cropBottom && self.cropLeft && self.cropRight))
+ {
+ summary appendFormat:HBKitLocalizedString(@", Crop: %@ %d/%d/%d/%d", @"HBPicture -> summary"),
+ self.cropMode ? HBKitLocalizedString(@"Automatic", @"HBPicture -> summary") : HBKitLocalizedString(@"Custom", @"HBPicture -> summary"),
+ self.cropTop, self.cropBottom, self.cropLeft, self.cropRight;
+ }
+ if (self.padMode != HBPicturePadModeNone && (self.padTop && self.padBottom && self.padLeft && self.padRight))
+ {
+ summary appendFormat:HBKitLocalizedString(@", Border: %d/%d/%d/%d", @"HBPicture -> summary"),
+ self.padTop, self.padBottom, self.padLeft, self.padRight;
+ }
 
 return summary copy;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPicture.h -> HandBrake-1.5.1.tar.xz/macosx/HBPicture.h Changed

@@ -5,12 +5,30 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
-#import "HBPresetCoding.h"
+#import <HandBrakeKit/HBPresetCoding.h>
 
 @class HBTitle;
 
 NS_ASSUME_NONNULL_BEGIN
 
+typedef NS_ENUM(NSUInteger, HBPictureCropMode) {
+ HBPictureCropModeNone,
+ HBPictureCropModeAutomatic,
+ HBPictureCropModeCustom
+};
+
+typedef NS_ENUM(NSUInteger, HBPictureResolutionLimitMode) {
+ HBPictureResolutionLimitModeNone,
+ HBPictureResolutionLimitMode8K,
+ HBPictureResolutionLimitMode4K,
+ HBPictureResolutionLimitMode1440p,
+ HBPictureResolutionLimitMode1080p,
+ HBPictureResolutionLimitMode720p,
+ HBPictureResolutionLimitMode576p,
+ HBPictureResolutionLimitMode480p,
+ HBPictureResolutionLimitModeCustom,
+};
+
 typedef NS_ENUM(NSUInteger, HBPictureAnarmophicMode) {
 HBPictureAnarmophicModeNone,
 HBPictureAnarmophicModeStrict,
@@ -19,6 +37,22 @@
 HBPictureAnarmophicModeAuto
 };
 
+typedef NS_ENUM(NSUInteger, HBPicturePadMode) {
+ HBPicturePadModeNone,
+ HBPicturePadModeFill,
+ HBPicturePadModeFillHeight,
+ HBPicturePadModeFillWidth,
+ HBPicturePadModeCustom
+};
+
+typedef NS_ENUM(NSUInteger, HBPicturePadColorMode) {
+ HBPicturePadColorModeBlack,
+ HBPicturePadColorModeDarkGray,
+ HBPicturePadColorModeGray,
+ HBPicturePadColorModeWhite,
+ HBPicturePadColorModeCustom,
+};
+
 extern NSString * const HBPictureChangedNotification;
 
 /**
@@ -26,35 +60,66 @@
 */
 @interface HBPicture : NSObject <NSSecureCoding, NSCopying>
 
-@property (nonatomic, readwrite) int width;
-@property (nonatomic, readwrite) int height;
-
-@property (nonatomic, readwrite) BOOL keepDisplayAspect;
-@property (nonatomic, readwrite) HBPictureAnarmophicMode anamorphicMode;
-@property (nonatomic, readwrite) int modulus;
+/**
+ * Source
+ */
+@property (nonatomic, readonly) int sourceWidth;
+@property (nonatomic, readonly) int sourceHeight;
+@property (nonatomic, readonly) int sourceParNum;
+@property (nonatomic, readonly) int sourceParDen;
+@property (nonatomic, readonly) int sourceDisplayWidth;
 
 /**
- * Custom anamorphic settings
+ * Rotate
 */
-@property (nonatomic, readwrite) int displayWidth;
-@property (nonatomic, readwrite) int parWidth;
-@property (nonatomic, readwrite) int parHeight;
+@property (nonatomic, readwrite) int angle;
+@property (nonatomic, readwrite) BOOL flip;
 
 /**
- * Crop settings
+ * Crop
 */
-@property (nonatomic, readwrite) BOOL autocrop;
+@property (nonatomic, readwrite) HBPictureCropMode cropMode;
 @property (nonatomic, readwrite) int cropTop;
 @property (nonatomic, readwrite) int cropBottom;
 @property (nonatomic, readwrite) int cropLeft;
 @property (nonatomic, readwrite) int cropRight;
 
 /**
- * Source size
+ * Size
 */
-@property (nonatomic, readonly) int sourceWidth;
-@property (nonatomic, readonly) int sourceHeight;
-@property (nonatomic, readonly) int sourceDisplayWidth;
+@property (nonatomic, readwrite) HBPictureResolutionLimitMode resolutionLimitMode;
+@property (nonatomic, readwrite) int maxWidth;
+@property (nonatomic, readwrite) int maxHeight;
+@property (nonatomic, readwrite) BOOL allowUpscaling;
+@property (nonatomic, readwrite) BOOL useMaximumSize;
+
+@property (nonatomic, readwrite) HBPictureAnarmophicMode anamorphicMode;
+
+@property (nonatomic, readwrite) int parNum;
+@property (nonatomic, readwrite) int parDen;
+@property (nonatomic, readwrite) int width;
+@property (nonatomic, readwrite) int height;
+
+/**
+ * Pad
+ */
+@property (nonatomic, readwrite) HBPicturePadMode padMode;
+@property (nonatomic, readwrite) int padTop;
+@property (nonatomic, readwrite) int padBottom;
+@property (nonatomic, readwrite) int padLeft;
+@property (nonatomic, readwrite) int padRight;
+@property (nonatomic, readwrite) HBPicturePadColorMode padColorMode;
+@property (nonatomic, readwrite) NSString *padColorCustom;
+
+/**
+ * Output sizes
+ */
+@property (nonatomic, readonly) int storageWidth;
+@property (nonatomic, readonly) int storageHeight;
+
+@property (nonatomic, readwrite) BOOL keepAspectRatio;
+@property (nonatomic, readwrite) int displayWidth;
+@property (nonatomic, readonly) int displayHeight;
 
 @property (nonatomic, readwrite, weak, nullable) NSUndoManager *undo;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPicture.m -> HandBrake-1.5.1.tar.xz/macosx/HBPicture.m Changed

@@ -9,6 +9,7 @@
 
 #import "HBCodingUtilities.h"
 #import "HBMutablePreset.h"
+#import "NSDictionary+HBAdditions.h"
 
 #include "handbrake/handbrake.h"
 
@@ -16,20 +17,19 @@
 
 @interface HBPicture ()
 
-@property (nonatomic, readwrite, getter=isValidating) BOOL validating;
+@property (nonatomic, readwrite, getter=isUpdating) BOOL updating;
 @property (nonatomic, readwrite, getter=areNotificationsEnabled) BOOL notificationsEnabled;
 
-@property (nonatomic, readwrite) int keep;
-@property (nonatomic, readwrite) BOOL darUpdated;
-
-@property (nonatomic, readonly) int sourceParNum;
-@property (nonatomic, readonly) int sourceParDen;
+@property (nonatomic, readonly) int modulus;
 
 @property (nonatomic, readonly) int autoCropTop;
 @property (nonatomic, readonly) int autoCropBottom;
 @property (nonatomic, readonly) int autoCropLeft;
 @property (nonatomic, readonly) int autoCropRight;
 
+@property (nonatomic, readwrite) int storageWidth;
+@property (nonatomic, readwrite) int storageHeight;
+
 @end
 
 @implementation HBPicture
@@ -40,20 +40,26 @@
 if (self)
 {
 // Set some values if we ever need a fake instance
- _width = 1280;
- _height = 720;
-
- _sourceWidth = 1280;
- _sourceHeight = 720;
-
- _anamorphicMode = HBPictureAnarmophicModeNone;
- _modulus = 2;
-
- _parWidth = 1;
- _parHeight = 1;
+ _sourceWidth = 1920;
+ _sourceHeight = 1080;
 _sourceParNum = 1;
 _sourceParDen = 1;
+ _maxWidth = 1920;
+ _maxHeight = 1080;
+ _parNum = 1;
+ _parDen = 1;
+ _width = 1920;
+ _height = 1080;
+ _storageWidth = 1920;
+ _storageHeight = 1080;
+ _keepAspectRatio = YES;
+ _displayWidth = 1920;
+ _displayHeight = 1080;
+ _anamorphicMode = HBPictureAnarmophicModeNone;
 
+ _padMode = HBPicturePadModeNone;
+ _padColorMode = HBPicturePadColorModeBlack;
+ _padColorCustom = @"";
 }
 return self;
 }
@@ -77,7 +83,7 @@
 _autoCropLeft = title.autoCropLeft;
 _autoCropRight = title.autoCropRight;
 
- self validateSettings;
+ self updatePictureSettings:0;
 
 _notificationsEnabled = YES;
 }
@@ -88,12 +94,220 @@
 {
 if (self.areNotificationsEnabled)
 {
- NSNotificationCenter defaultCenter postNotification: NSNotification notificationWithName:HBPictureChangedNotification
+ NSNotificationCenter.defaultCenter postNotification:NSNotification notificationWithName:HBPictureChangedNotification
 object:self
 userInfo:nil;
 }
 }
 
+#pragma mark - Rotate
+
+- (void)setAngle:(int)angle
+{
+ if (angle != _angle)
+ {
+ self.undo prepareWithInvocationTarget:self setAngle:_angle;
+ }
+ int prev_angle = _angle;
+ _angle = angle;
+
+ if (!(self.undo.isUndoing || self.undo.isRedoing))
+ {
+ self applyRotation:prev_angle flip:self.flip;
+ }
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+
+ self postChangedNotification;
+}
+
+#pragma mark - Flip
+
+- (void)setFlip:(BOOL)flip
+{
+ if (flip != _flip)
+ {
+ self.undo prepareWithInvocationTarget:self setFlip:_flip;
+ }
+ int prev_flip = _flip;
+ _flip = flip;
+
+ if (!(self.undo.isUndoing || self.undo.isRedoing))
+ {
+ self applyRotation:self.angle flip:prev_flip;
+ }
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:HB_KEEP_WIDTH;
+ }
+
+ self postChangedNotification;
+}
+
+#pragma mark - Resolution limit
+
+- (void)setResolutionLimitMode:(HBPictureResolutionLimitMode)resolutionLimit
+{
+ if (resolutionLimit != _resolutionLimitMode)
+ {
+ self.undo prepareWithInvocationTarget:self setResolutionLimitMode:_resolutionLimitMode;
+ }
+ _resolutionLimitMode = resolutionLimit;
+
+ if (!(self.undo.isUndoing || self.undo.isRedoing))
+ {
+ switch (resolutionLimit) {
+ case HBPictureResolutionLimitModeNone:
+ self.maxWidth = 0;
+ self.maxHeight = 0;
+ break;
+ case HBPictureResolutionLimitMode8K:
+ self.maxWidth = 7680;
+ self.maxHeight = 4320;
+ break;
+ case HBPictureResolutionLimitMode4K:
+ self.maxWidth = 3840;
+ self.maxHeight = 2160;
+ break;
+ case HBPictureResolutionLimitMode1440p:
+ self.maxWidth = 2560;
+ self.maxHeight = 1440;
+ break;
+ case HBPictureResolutionLimitMode1080p:
+ self.maxWidth = 1920;
+ self.maxHeight = 1080;
+ break;
+ case HBPictureResolutionLimitMode720p:
+ self.maxWidth = 1280;
+ self.maxHeight = 720;
+ break;
+ case HBPictureResolutionLimitMode576p:
+ self.maxWidth = 720;
+ self.maxHeight = 576;
+ break;
+ case HBPictureResolutionLimitMode480p:
+ self.maxWidth = 720;
+ self.maxHeight = 480;
+ break;
+ case HBPictureResolutionLimitModeCustom:
+ break;
+ }
+ }
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:HB_KEEP_HEIGHT;
+ }
+}
+
+- (void)setMaxWidth:(int)maxWidth
+{
+ if (maxWidth != _maxWidth)
+ {
+ self.undo prepareWithInvocationTarget:self setMaxWidth:_maxWidth;
+ }
+ _maxWidth = maxWidth;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+}
+
+- (BOOL)validateMaxWidth:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
+ {
+ int value = *ioValue intValue;
+
+ if (value >= HB_MAX_WIDTH)
+ {
+ value = HB_MAX_WIDTH;
+ }
+ else if (value <= HB_MIN_WIDTH)
+ {
+ value = HB_MIN_WIDTH;
+ }
+
+ *ioValue = @(MULTIPLE_MOD_DOWN(value, self.modulus));
+ }
+
+ return retval;
+}
+
+- (void)setMaxHeight:(int)maxHeight
+{
+ if (maxHeight != _maxHeight)
+ {
+ self.undo prepareWithInvocationTarget:self setMaxHeight:_maxHeight;
+ }
+ _maxHeight = maxHeight;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+}
+
+- (BOOL)validateMaxHeight:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
+ {
+ int value = *ioValue intValue;
+
+ if (value >= HB_MAX_HEIGHT)
+ {
+ value = HB_MAX_HEIGHT;
+ }
+ else if (value <= HB_MIN_HEIGHT)
+ {
+ value = HB_MIN_HEIGHT;
+ }
+
+ *ioValue = @(MULTIPLE_MOD_DOWN(value, self.modulus));
+ }
+
+ return retval;
+}
+
+- (void)setAllowUpscaling:(BOOL)allowUpscaling
+{
+ if (allowUpscaling != _allowUpscaling)
+ {
+ self.undo prepareWithInvocationTarget:self setAllowUpscaling:_allowUpscaling;
+ }
+ _allowUpscaling = allowUpscaling;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+}
+
+- (void)setUseMaximumSize:(BOOL)useMaximumSize
+{
+ if (useMaximumSize != _useMaximumSize)
+ {
+ self.undo prepareWithInvocationTarget:self setUseMaximumSize:_useMaximumSize;
+ }
+ _useMaximumSize = useMaximumSize;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+}
+
+#pragma mark - Size
+
 - (void)setWidth:(int)width
 {
 if (width != _width)
@@ -102,10 +316,9 @@
 }
 _width = width;
 
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self.keep |= HB_KEEP_WIDTH;
- self validateSettings;
+ self updatePictureSettings:HB_KEEP_WIDTH;
 }
 }
 
@@ -115,20 +328,18 @@
 
 if (nil != *ioValue)
 {
+ hb_geometry_t resultGeo;
+ hb_geometry_settings_t uiGeo;
+ bzero(&uiGeo, sizeof(uiGeo));
+
 int value = *ioValue intValue;
- int roundedValue = value - (value % self.modulus);
+ uiGeo.geometry.width = value;
 
- if (value >= self.maxWidth)
- {
- *ioValue = @(self.maxWidth);
- }
- else if (value <= 32)
- {
- *ioValue = @32;
- }
- else if (value != roundedValue)
+ self calculatePictureSettings:&resultGeo uiGeo:&uiGeo mode:HB_KEEP_WIDTH;
+
+ if (value != resultGeo.width)
 {
- *ioValue = @(roundedValue);
+ *ioValue = @(resultGeo.width);
 }
 }
 
@@ -141,11 +352,11 @@
 {
 self.undo prepareWithInvocationTarget:self setHeight:_height;
 }
+
 _height = height;
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self.keep |= HB_KEEP_HEIGHT;
- self validateSettings;
+ self updatePictureSettings:HB_KEEP_HEIGHT;
 }
 }
 
@@ -155,66 +366,98 @@
 
 if (nil != *ioValue)
 {
+ hb_geometry_t resultGeo;
+ hb_geometry_settings_t uiGeo;
+ bzero(&uiGeo, sizeof(uiGeo));
+
 int value = *ioValue intValue;
- int roundedValue = value - (value % self.modulus);
+ uiGeo.geometry.height = value;
 
- if (value >= self.maxHeight)
- {
- *ioValue = @(self.maxHeight);
- }
- else if (value <= 32)
- {
- *ioValue = @32;
- }
- else if (value != roundedValue)
+ self calculatePictureSettings:&resultGeo uiGeo:&uiGeo mode:HB_KEEP_HEIGHT;
+
+ if (value != resultGeo.height)
 {
- *ioValue = @(roundedValue);
+ *ioValue = @(resultGeo.height);
 }
 }
 
 return retval;
 }
 
-- (void)setDisplayWidth:(int)displayWidth
+- (void)setParNum:(int)parWidth
 {
- if (displayWidth != _displayWidth)
+ if (parWidth != _parNum)
 {
- self.undo prepareWithInvocationTarget:self setDisplayWidth:_displayWidth;
+ self.undo prepareWithInvocationTarget:self setParNum:_parNum;
 }
- _displayWidth = displayWidth;
- if (!self.isValidating)
+ _parNum = parWidth;
+ if (!self.isUpdating)
 {
- self.darUpdated = YES;
- self validateSettings;
+ self updatePictureSettings:HB_KEEP_HEIGHT;
 }
 }
 
-- (void)setParWidth:(int)parWidth
+- (BOOL)validateParNum:(id *)ioValue error:(NSError * __autoreleasing *)outError
 {
- if (parWidth != _parWidth)
- {
- self.undo prepareWithInvocationTarget:self setParWidth:_parWidth;
- }
- _parWidth = parWidth;
- if (!self.isValidating)
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
 {
- self validateSettings;
+ int value = *ioValue intValue;
+
+ if (value < 1)
+ {
+ value = 1;
+ }
+ else if (value > UINT16_MAX)
+ {
+ value = UINT16_MAX;
+ }
+
+ *ioValue = @(value);
 }
+
+ return retval;
 }
 
-- (void)setParHeight:(int)parHeight
+- (void)setParDen:(int)parHeight
 {
- if (parHeight != _parHeight)
+ if (parHeight != _parDen)
+ {
+ self.undo prepareWithInvocationTarget:self setParDen:_parDen;
+ }
+ _parDen = parHeight;
+ if (!self.isUpdating)
 {
- self.undo prepareWithInvocationTarget:self setParHeight:_parHeight;
+ self updatePictureSettings:HB_KEEP_HEIGHT;
 }
- _parHeight = parHeight;
- if (!self.isValidating)
+}
+
+- (BOOL)validateParDen:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
 {
- self validateSettings;
+ int value = *ioValue intValue;
+
+ if (value < 1)
+ {
+ value = 1;
+ }
+ else if (value > UINT16_MAX)
+ {
+ value = UINT16_MAX;
+ }
+
+ *ioValue = @(value);
 }
+
+ return retval;
 }
 
+#pragma mark - Crop
+
 - (void)setCropTop:(int)cropTop
 {
 if (cropTop != _cropTop)
@@ -222,9 +465,9 @@
 self.undo prepareWithInvocationTarget:self setCropTop:_cropTop;
 }
 _cropTop = cropTop;
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
@@ -235,9 +478,9 @@
 self.undo prepareWithInvocationTarget:self setCropBottom:_cropBottom;
 }
 _cropBottom = cropBottom;
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
@@ -248,9 +491,9 @@
 self.undo prepareWithInvocationTarget:self setCropLeft:_cropLeft;
 }
 _cropLeft = cropLeft;
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
@@ -261,9 +504,9 @@
 self.undo prepareWithInvocationTarget:self setCropRight:_cropRight;
 }
 _cropRight = cropRight;
- if (!self.isValidating)
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
@@ -298,114 +541,234 @@
 int value = *ioValue intValue;
 if (value >= maxCrop)
 {
- *ioValue = @(maxCrop);
+ value = maxCrop;
 }
 else if (value < 0)
 {
- *ioValue = @0;
+ value = 0;
 }
+
+ *ioValue = @(MULTIPLE_MOD_DOWN(value, self.modulus));
 }
 }
 
-- (void)setAutocrop:(BOOL)autocrop
+- (void)setCropMode:(HBPictureCropMode)cropMode
 {
- if (autocrop != _autocrop)
+ if (cropMode != _cropMode)
 {
- self.undo prepareWithInvocationTarget:self setAutocrop:_autocrop;
+ self.undo prepareWithInvocationTarget:self setCropMode:_cropMode;
 }
- _autocrop = autocrop;
- if (autocrop && !self.isValidating)
+ _cropMode = cropMode;
+
+ if (cropMode != HBPictureCropModeCustom && !self.isUpdating)
 {
 if (!(self.undo.isUndoing || self.undo.isRedoing))
 {
- self.validating = YES;
- // Reset the crop values to those determined right after scan
- self.cropTop = self.autoCropTop;
- self.cropBottom = self.autoCropBottom;
- self.cropLeft = self.autoCropLeft;
- self.cropRight = self.autoCropRight;
- self.validating = NO;
+ self.updating = YES;
+ if (cropMode == HBPictureCropModeAutomatic)
+ {
+ // Reset the crop values to those determined right after scan
+ hb_geometry_crop_t geo = {0,};
+ geo.crop0 = self.autoCropTop;
+ geo.crop1 = self.autoCropBottom;
+ geo.crop2 = self.autoCropLeft;
+ geo.crop3 = self.autoCropRight;
+ hb_rotate_geometry(&geo, &geo, self.angle, self.flip);
+ self.cropTop = geo.crop0;
+ self.cropBottom = geo.crop1;
+ self.cropLeft = geo.crop2;
+ self.cropRight = geo.crop3;
+ self.updating = NO;
+ }
+ else if (cropMode == HBPictureCropModeNone)
+ {
+ self.cropTop = 0;
+ self.cropBottom = 0;
+ self.cropLeft = 0;
+ self.cropRight = 0;
+ }
 }
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
-- (void)setAnamorphicMode:(HBPictureAnarmophicMode)anamorphicMode
+#pragma mark - Pad
+
+- (void)setPadTop:(int)padTop
 {
- if (anamorphicMode != _anamorphicMode)
+ if (padTop != _padTop)
 {
- self.undo prepareWithInvocationTarget:self setAnamorphicMode:_anamorphicMode;
+ self.undo prepareWithInvocationTarget:self setPadTop:_padTop;
 }
- _anamorphicMode = anamorphicMode;
-
- if (self.anamorphicMode == HB_ANAMORPHIC_AUTO ||
- self.anamorphicMode == HB_ANAMORPHIC_LOOSE)
+ _padTop = padTop;
+ if (!self.isUpdating)
 {
- self.keepDisplayAspect = YES;
+ self updatePictureSettings:0;
 }
+}
 
- if (!self.isValidating)
+- (void)setPadBottom:(int)padBottom
+{
+ if (padBottom != _padBottom)
+ {
+ self.undo prepareWithInvocationTarget:self setPadBottom:_padBottom;
+ }
+ _padBottom = padBottom;
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
-- (void)setKeepDisplayAspect:(BOOL)keepDisplayAspect
+- (void)setPadLeft:(int)padLeft
 {
- if (keepDisplayAspect != _keepDisplayAspect)
+ if (padLeft != _padLeft)
 {
- self.undo prepareWithInvocationTarget:self setKeepDisplayAspect:_keepDisplayAspect;
+ self.undo prepareWithInvocationTarget:self setPadLeft:_padLeft;
 }
- _keepDisplayAspect = keepDisplayAspect;
- if (!self.isValidating)
+ _padLeft = padLeft;
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
-- (void)setModulus:(int)modulus
+- (void)setPadRight:(int)padRight
 {
- if (modulus != _modulus)
+ if (padRight != _padRight)
 {
- self.undo prepareWithInvocationTarget:self setModulus:_modulus;
+ self.undo prepareWithInvocationTarget:self setPadRight:_padRight;
 }
- _modulus = modulus;
- if (!self.isValidating)
+ _padRight = padRight;
+ if (!self.isUpdating)
 {
- self validateSettings;
+ self updatePictureSettings:0;
 }
 }
 
-#pragma mark - Max sizes
+- (BOOL)validatePadTop:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ self validatePad:ioValue max:self.maxTopPad;
+ return YES;
+}
+
+- (BOOL)validatePadBottom:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ self validatePad:ioValue max:self.maxBottomPad;
+ return YES;
+}
+
+- (BOOL)validatePadLeft:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ self validatePad:ioValue max:self.maxLeftPad;
+ return YES;
+}
+
+- (BOOL)validatePadRight:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ self validatePad:ioValue max:self.maxRightPad;
+ return YES;
+}
+
+- (void)validatePad:(NSNumber **)ioValue max:(int)maxPad
+{
+ if (nil != *ioValue)
+ {
+ int value = *ioValue intValue;
+ if (value >= maxPad)
+ {
+ value = maxPad;
+ }
+ else if (value < 0)
+ {
+ value = 0;
+ }
+
+ *ioValue = @(MULTIPLE_MOD_DOWN(value, self.modulus));
+ }
+}
+
+- (void)setPadMode:(HBPicturePadMode)padMode
+{
+ if (padMode != _padMode)
+ {
+ self.undo prepareWithInvocationTarget:self setPadMode:_padMode;
+ }
+ _padMode = padMode;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
+}
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxWidth
+- (void)setPadColorMode:(HBPicturePadColorMode)padColorMode
 {
- return NSSet setWithObjects:@"cropTop", @"cropBottom", @"cropLeft", @"cropRight", nil;
+ if (padColorMode != _padColorMode)
+ {
+ self.undo prepareWithInvocationTarget:self setPadColorMode:_padColorMode;
+ }
+ _padColorMode = padColorMode;
+
+ if (!self.isUpdating)
+ {
+ self postChangedNotification;
+ }
 }
 
-- (int)maxWidth
+- (void)setPadColorCustom:(NSString *)padColorCustom
 {
- return self.sourceWidth - self.cropRight - self.cropLeft;
+ if (padColorCustom != _padColorCustom)
+ {
+ self.undo prepareWithInvocationTarget:self setPadColorCustom:_padColorCustom;
+ }
+ _padColorCustom = padColorCustom;
+
+ if (!self.isUpdating)
+ {
+ self postChangedNotification;
+ }
 }
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxHeight
+#pragma mark - Anamorphic
+
+- (void)setAnamorphicMode:(HBPictureAnarmophicMode)anamorphicMode
 {
- return NSSet setWithObjects:@"cropTop", @"cropBottom", @"cropLeft", @"cropRight", nil;
+ if (anamorphicMode != _anamorphicMode)
+ {
+ self.undo prepareWithInvocationTarget:self setAnamorphicMode:_anamorphicMode;
+ }
+ _anamorphicMode = anamorphicMode;
+
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
 }
 
-- (int)maxHeight
+- (void)setKeepAspectRatio:(BOOL)keepAspectRatio
 {
- return self.sourceHeight - self.cropTop - self.cropBottom;
+ if (keepAspectRatio != _keepAspectRatio)
+ {
+ self.undo prepareWithInvocationTarget:self setKeepAspectRatio:_keepAspectRatio;
+ }
+ _keepAspectRatio = keepAspectRatio;
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:0;
+ }
 }
 
-+ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxTopCrop
+- (int)modulus
 {
- return NSSet setWithObjects:@"cropBottom", nil;
+ return 2;
 }
 
+#pragma mark - Max sizes
+
 - (int)maxTopCrop
 {
- return self.sourceHeight - self.cropBottom - 32;
+ return self.sourceHeight - self.cropBottom - HB_MIN_HEIGHT;
 }
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingMaxBottomCrop
@@ -415,7 +778,7 @@
 
 - (int)maxBottomCrop
 {
- return self.sourceHeight - self.cropTop - 32;
+ return self.sourceHeight - self.cropTop - HB_MIN_HEIGHT;
 }
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingMaxLeftCrop
@@ -425,7 +788,7 @@
 
 - (int)maxLeftCrop
 {
- return self.sourceWidth - self.cropRight - 32;
+ return self.sourceWidth - self.cropRight - HB_MIN_WIDTH;
 }
 
 + (NSSet<NSString *> *)keyPathsForValuesAffectingMaxRightCrop
@@ -435,83 +798,366 @@
 
 - (int)maxRightCrop
 {
- return self.sourceWidth - self.cropLeft - 32;
+ return self.sourceWidth - self.cropLeft - HB_MIN_WIDTH;
 }
 
-- (int)sourceDisplayWidth
++ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxTopPad
 {
- return (int) (self.sourceWidth * self.sourceParNum / (double)self.sourceParDen);
+ return NSSet setWithObjects:@"padBottom, maxHeight, height", nil;
 }
 
-- (void)setNilValueForKey:(NSString *)key
+- (int)maxPadWidth
 {
- if (key isEqualToString:@"width" || key isEqualToString:@"height")
- {
- self setValue:@64 forKey:key;
- }
- else
- {
- self setValue:@0 forKey:key;
- }
+ return self.maxWidth > 0 ? self.maxWidth : HB_MAX_WIDTH;
+}
+
+- (int)maxPadHeight
+{
+ return self.maxHeight > 0 ? self.maxHeight : HB_MAX_HEIGHT;
+}
+
+- (int)maxTopPad
+{
+ return self.maxPadHeight - HB_MIN_HEIGHT - self.padBottom;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxBottomPad
+{
+ return NSSet setWithObjects:@"padTop, maxHeight, height", nil;
+}
+
+- (int)maxBottomPad
+{
+ return self.maxPadHeight - HB_MIN_HEIGHT - self.padTop;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxLeftPad
+{
+ return NSSet setWithObjects:@"padRight, maxWidth, width", nil;
+}
+
+- (int)maxLeftPad
+{
+ return self.maxPadWidth - HB_MIN_WIDTH - self.padRight;
+}
+
++ (NSSet<NSString *> *)keyPathsForValuesAffectingMaxRightPad
+{
+ return NSSet setWithObjects:@"padLeft, maxWidth, width", nil;
+}
+
+- (int)maxRightPad
+{
+ return self.maxPadWidth - HB_MIN_WIDTH - self.padLeft;
+}
+
+- (int)sourceDisplayWidth
+{
+ return (int)(self.sourceWidth * self.sourceParNum / (double)self.sourceParDen);
+}
+
+static const char * padModeToString(HBPicturePadMode padMode)
+{
+ switch (padMode)
+ {
+ case HBPicturePadModeFill:
+ return "fill";
+ break;
+ case HBPicturePadModeFillHeight:
+ return "letterbox";
+ break;
+ case HBPicturePadModeFillWidth:
+ return "pillarbox";
+ break;
+ case HBPicturePadModeCustom:
+ return "custom";
+ break;
+ default:
+ return "none";
+ break;
+ }
+}
+
+#pragma mark - Output sizes
+
+- (void)setStorageWidth:(int)storageWidth
+{
+ if (storageWidth != _storageWidth)
+ {
+ self.undo prepareWithInvocationTarget:self setStorageWidth:_storageWidth;
+ }
+ _storageWidth = storageWidth;
+}
+
+- (void)setStorageHeight:(int)storageHeight
+{
+ if (storageHeight != _storageHeight)
+ {
+ self.undo prepareWithInvocationTarget:self setStorageHeight:_storageHeight;
+ }
+ _storageHeight = storageHeight;
+}
+
+- (void)setDisplayWidth:(int)displayWidth
+{
+ if (displayWidth != _displayWidth)
+ {
+ self.undo prepareWithInvocationTarget:self setDisplayWidth:_displayWidth;
+ }
+ _displayWidth = displayWidth;
+ if (!self.isUpdating)
+ {
+ self updatePictureSettings:HB_KEEP_DISPLAY_WIDTH;
+ }
+}
+
+- (BOOL)validateDisplayWidth:(id *)ioValue error:(NSError * __autoreleasing *)outError
+{
+ BOOL retval = YES;
+
+ if (nil != *ioValue)
+ {
+ int value = *ioValue intValue;
+ if (value <= 0)
+ {
+ value = HB_MIN_WIDTH;
+ }
+ else if (value > HB_MAX_WIDTH)
+ {
+ value = HB_MAX_WIDTH;
+ }
+
+ hb_geometry_t resultGeo;
+ hb_geometry_settings_t uiGeo;
+ bzero(&uiGeo, sizeof(uiGeo));
+
+ uiGeo.displayWidth = value;
+
+ self calculatePictureSettings:&resultGeo uiGeo:&uiGeo mode:HB_KEEP_DISPLAY_WIDTH;
+
+ int displayWidth = ((double)resultGeo.par.num / resultGeo.par.den) * resultGeo.width + 0.5;
+
+ if (*ioValue intValue != displayWidth)
+ {
+ *ioValue = @(displayWidth);
+ }
+ }
+
+ return retval;
+}
+
+- (void)setDisplayHeight:(int)displayHeight
+{
+ if (displayHeight != _displayHeight)
+ {
+ self.undo prepareWithInvocationTarget:self setDisplayHeight:_displayHeight;
+ }
+ _displayHeight = displayHeight;
+}
+
+- (void)setNilValueForKey:(NSString *)key
+{
+ if (key isEqualToString:@"width" || key isEqualToString:@"height")
+ {
+ self setValue:@64 forKey:key;
+ }
+ else if (key isEqualToString:@"parNum" || key isEqualToString:@"parDen")
+ {
+ self setValue:@1 forKey:key;
+ }
+ else
+ {
+ self setValue:@0 forKey:key;
+ }
+}
+
+#pragma mark - Picture Update Logic
+
+- (void)applyRotation:(int)prev_angle flip:(BOOL)prev_hflip
+{
+ int angle, hflip;
+
+ hb_geometry_crop_t geo;
+
+ // First normalize current settings to 0 angle 0 hflip
+ geo.geometry.width = self.width;
+ geo.geometry.height = self.height;
+ geo.geometry.par.num = self.parNum;
+ geo.geometry.par.den = self.parDen;
+ geo.crop0 = self.cropTop;
+ geo.crop1 = self.cropBottom;
+ geo.crop2 = self.cropLeft;
+ geo.crop3 = self.cropRight;
+
+ geo.pad0 = self.padTop;
+ geo.pad1 = self.padBottom;
+ geo.pad2 = self.padLeft;
+ geo.pad3 = self.padRight;
+ // Normally hflip is applied, then rotation.
+ // To revert, must apply rotation then hflip.
+ hb_rotate_geometry(&geo, &geo, 360 - prev_angle, 0);
+ hb_rotate_geometry(&geo, &geo, 0, prev_hflip);
+
+ // If there is a title, reset to title width/height so that
+ // dimension limits get properly re-applied
+ geo.geometry.width = self.sourceWidth;
+ geo.geometry.height = self.sourceHeight;
+
+ // rotate dimensions to new angle and hflip
+ angle = self.angle;
+ hflip = self.flip;
+ hb_rotate_geometry(&geo, &geo, angle, hflip);
+
+ self.width = geo.geometry.width - geo.crop2 - geo.crop3;
+ self.height = geo.geometry.height - geo.crop2 - geo.crop3;
+ self.parNum = geo.geometry.par.num;
+ self.parDen = geo.geometry.par.den;
+ self.cropTop = geo.crop0;
+ self.cropBottom = geo.crop1;
+ self.cropLeft = geo.crop2;
+ self.cropRight = geo.crop3;
+
+ self.padTop = geo.pad0;
+ self.padBottom = geo.pad1;
+ self.padLeft = geo.pad2;
+ self.padRight = geo.pad3;
+}
+
+- (void)applyPad:(const hb_geometry_settings_t *)geo result:(hb_geometry_t *)result
+{
+ bool fillwidth, fillheight;
+ int pad4 = {0,};
+
+ fillwidth = fillheight = self.padMode == HBPicturePadModeFill;
+ fillheight = fillheight || (self.padMode == HBPicturePadModeFillHeight);
+ fillwidth = fillwidth || (self.padMode == HBPicturePadModeFillWidth);
+
+ if (self.padMode == HBPicturePadModeCustom)
+ {
+ pad0 = self.padTop;
+ pad1 = self.padBottom;
+ pad2 = self.padLeft;
+ pad3 = self.padRight;
+ }
+
+ if (fillheight && geo->maxHeight > 0)
+ {
+ pad0 = (geo->maxHeight - result->height) / 2;
+ pad1 = geo->maxHeight - result->height - pad0;
+ }
+ if (fillwidth && geo->maxWidth > 0)
+ {
+ pad2 = (geo->maxWidth - result->width) / 2;
+ pad3 = geo->maxWidth - result->width - pad2;
+ }
+
+ self.padTop = pad0;
+ self.padBottom = pad1;
+ self.padLeft = pad2;
+ self.padRight = pad3;
+
+ result->width += pad2 + pad3;
+ result->height += pad0 + pad1;
+}
+
+- (void)calculatePictureSettings:(hb_geometry_t *)resultGeo uiGeo:(hb_geometry_settings_t *)uiGeo mode:(int)mode
+{
+ bool keep_aspect;
+ bool autoscale, upscale;
+ bool keep_width = (mode & HB_KEEP_WIDTH);
+ bool keep_height = (mode & HB_KEEP_HEIGHT);
+ bool keep_display_width = (mode & HB_KEEP_DISPLAY_WIDTH);
+ const char *pad_mode;
+
+ hb_geometry_crop_t srcGeo;
+
+ srcGeo.geometry.width = self.sourceWidth;
+ srcGeo.geometry.height = self.sourceHeight;
+ srcGeo.geometry.par.num = self.sourceParNum;
+ srcGeo.geometry.par.den = self.sourceParDen;
+ srcGeo.crop0 = self.autoCropTop;
+ srcGeo.crop1 = self.autoCropBottom;
+ srcGeo.crop2 = self.autoCropLeft;
+ srcGeo.crop3 = self.autoCropRight;
+
+ // Rotate title dimensions so that they align with the current
+ // orientation of dimensions tab settings
+ hb_rotate_geometry(&srcGeo, &srcGeo, self.angle, self.flip);
+
+ pad_mode = padModeToString(self.padMode);
+ autoscale = self.useMaximumSize;
+ upscale = self.allowUpscaling;
+ keep_aspect = self.keepAspectRatio;
+
+ if (keep_display_width) { uiGeo->keep |= HB_KEEP_DISPLAY_WIDTH; }
+ if (keep_width) { uiGeo->keep |= HB_KEEP_WIDTH; }
+ if (keep_height) { uiGeo->keep |= HB_KEEP_HEIGHT; }
+ if (keep_aspect) { uiGeo->keep |= HB_KEEP_DISPLAY_ASPECT; }
+ if (!strcmp(pad_mode, "custom")) { uiGeo->keep |= HB_KEEP_PAD; }
+
+ if (upscale) { uiGeo->flags |= HB_GEO_SCALE_UP; }
+ if (autoscale) { uiGeo->flags |= HB_GEO_SCALE_BEST; }
+
+ uiGeo->mode = (int)self.anamorphicMode;
+ uiGeo->modulus = self.modulus;
+ uiGeo->geometry.width = uiGeo->geometry.width ? uiGeo->geometry.width : self.width;
+ uiGeo->geometry.height = uiGeo->geometry.height ? uiGeo->geometry.height : self.height;
+ uiGeo->maxWidth = self.maxWidth;
+ uiGeo->maxHeight = self.maxHeight;
+ uiGeo->geometry.par.num = self.parNum;
+ uiGeo->geometry.par.den = self.parDen;
+ uiGeo->displayWidth = uiGeo->displayWidth ? uiGeo->displayWidth : self.displayWidth;
+ uiGeo->displayHeight = self.displayHeight;
+
+ uiGeo->pad0 = self.padTop;
+ uiGeo->pad1 = self.padBottom;
+ uiGeo->pad2 = self.padLeft;
+ uiGeo->pad3 = self.padRight;
+
+ uiGeo->crop0 = self.cropTop;
+ uiGeo->crop1 = self.cropBottom;
+ uiGeo->crop2 = self.cropLeft;
+ uiGeo->crop3 = self.cropRight;
+
+ // hb_set_anamorphic_size2 will adjust par, dar, and width/height
+ // and enforce resolution limits
+ hb_set_anamorphic_size2(&srcGeo.geometry, uiGeo, resultGeo);
 }
 
-#pragma mark - Picture Update Logic
-
 /**
 * Validates the settings through hb_set_anamorphic_size2,
 * each setters calls this after setting its value.
 */
-- (void)validateSettings
+- (void)updatePictureSettings:(int)mode
 {
- self.validating = YES;
+ self.updating = YES;
+
 if (!(self.undo.isUndoing || self.undo.isRedoing))
 {
- self.keep |= self.keepDisplayAspect * HB_KEEP_DISPLAY_ASPECT;
-
- hb_geometry_t srcGeo, resultGeo;
+ hb_geometry_t resultGeo;
 hb_geometry_settings_t uiGeo;
+ bzero(&uiGeo, sizeof(uiGeo));
 
- srcGeo.width = self.sourceWidth;
- srcGeo.height = self.sourceHeight;
- srcGeo.par.num = self.sourceParNum;
- srcGeo.par.den = self.sourceParDen;
-
- uiGeo.mode = (int)self.anamorphicMode;
- uiGeo.keep = self.keep;
- uiGeo.itu_par = 0;
- uiGeo.modulus = self.modulus;
-
- int crop4 = {self.cropTop, self.cropBottom, self.cropLeft, self.cropRight};
- memcpy(uiGeo.crop, crop, sizeof(int4));
- uiGeo.geometry.width = self.width;
- uiGeo.geometry.height = self.height;
- // Modulus added to maxWidth/maxHeight to allow a small amount of
- // upscaling to the next mod boundary.
- uiGeo.maxWidth = self.sourceWidth - crop2 - crop3 + self.modulus - 1;
- uiGeo.maxHeight = self.sourceHeight - crop0 - crop1 + self.modulus - 1;
-
- hb_rational_t par = {self.parWidth, self.parHeight};
- uiGeo.geometry.par = par;
- if (self.anamorphicMode == HB_ANAMORPHIC_CUSTOM && self.darUpdated)
- {
- uiGeo.geometry.par.num = self.displayWidth;
- uiGeo.geometry.par.den = uiGeo.geometry.width;
- }
- hb_set_anamorphic_size2(&srcGeo, &uiGeo, &resultGeo);
-
- int display_width;
- display_width = resultGeo.width * resultGeo.par.num / resultGeo.par.den;
+ self calculatePictureSettings:&resultGeo uiGeo:&uiGeo mode:mode;
 
 self.width = resultGeo.width;
 self.height = resultGeo.height;
- self.parWidth = resultGeo.par.num;
- self.parHeight = resultGeo.par.den;
- self.displayWidth = display_width;
+
+ self.parNum = resultGeo.par.num;
+ self.parDen = resultGeo.par.den;
+
+ uiGeo.maxWidth = self.maxWidth;
+ uiGeo.maxHeight = self.maxHeight;
+ self applyPad:&uiGeo result:&resultGeo;
+
+ self.displayWidth = ((double)resultGeo.par.num / resultGeo.par.den) * resultGeo.width + 0.5;
+ self.displayHeight = resultGeo.height;
+
+ self.storageWidth = resultGeo.width;
+ self.storageHeight = resultGeo.height;
 }
- self.validating = NO;
- self.keep = 0;
- self.darUpdated = NO;
 
+ self.updating = NO;
 self postChangedNotification;
 }
 
@@ -523,32 +1169,50 @@
 
 if (copy)
 {
- copy->_width = _width;
- copy->_height = _height;
+ copy->_sourceWidth = _sourceWidth;
+ copy->_sourceHeight = _sourceHeight;
+ copy->_sourceParNum = _sourceParNum;
+ copy->_sourceParDen = _sourceParDen;
 
- copy->_keepDisplayAspect = _keepDisplayAspect;
- copy->_anamorphicMode = _anamorphicMode;
- copy->_modulus = _modulus;
+ copy->_autoCropTop = _autoCropTop;
+ copy->_autoCropBottom = _autoCropBottom;
+ copy->_autoCropLeft = _autoCropLeft;
+ copy->_autoCropRight = _autoCropRight;
 
- copy->_displayWidth = _displayWidth;
- copy->_parWidth = _parWidth;
- copy->_parHeight = _parHeight;
+ copy->_angle = _angle;
+ copy->_flip = _flip;
 
- copy->_autocrop = _autocrop;
+ copy->_cropMode = _cropMode;
 copy->_cropTop = _cropTop;
 copy->_cropBottom = _cropBottom;
 copy->_cropLeft = _cropLeft;
 copy->_cropRight = _cropRight;
 
- copy->_autoCropTop = _autoCropTop;
- copy->_autoCropBottom = _autoCropBottom;
- copy->_autoCropLeft = _autoCropLeft;
- copy->_autoCropRight = _autoCropRight;
+ copy->_resolutionLimitMode = _resolutionLimitMode;
+ copy->_maxWidth = _maxWidth;
+ copy->_maxHeight = _maxHeight;
+ copy->_allowUpscaling = _allowUpscaling;
+ copy->_useMaximumSize = _useMaximumSize;
 
- copy->_sourceWidth = _sourceWidth;
- copy->_sourceHeight = _sourceHeight;
- copy->_sourceParNum = _sourceParNum;
- copy->_sourceParDen = _sourceParDen;
+ copy->_anamorphicMode = _anamorphicMode;
+ copy->_parNum = _parNum;
+ copy->_parDen = _parDen;
+ copy->_width = _width;
+ copy->_height = _height;
+
+ copy->_padMode = _padMode;
+ copy->_padTop = _padTop;
+ copy->_padBottom = _padBottom;
+ copy->_padLeft = _padLeft;
+ copy->_padRight = _padRight;
+ copy->_padColorMode = _padColorMode;
+ copy->_padColorCustom = _padColorCustom copy;
+
+ copy->_storageWidth = _storageWidth;
+ copy->_storageHeight = _storageHeight;
+ copy->_keepAspectRatio = _keepAspectRatio;
+ copy->_displayWidth = _displayWidth;
+ copy->_displayHeight = _displayHeight;
 
 copy->_notificationsEnabled = _notificationsEnabled;
 }
@@ -565,71 +1229,124 @@
 
 - (void)encodeWithCoder:(NSCoder *)coder
 {
- coder encodeInt:1 forKey:@"HBPictureVersion";
+ coder encodeInt:3 forKey:@"HBPictureVersion";
 
- encodeInt(_width);
- encodeInt(_height);
+ encodeInt(_sourceWidth);
+ encodeInt(_sourceHeight);
+ encodeInt(_sourceParNum);
+ encodeInt(_sourceParDen);
 
- encodeBool(_keepDisplayAspect);
- encodeInteger(_anamorphicMode);
- encodeInt(_modulus);
+ encodeInt(_autoCropTop);
+ encodeInt(_autoCropBottom);
+ encodeInt(_autoCropLeft);
+ encodeInt(_autoCropRight);
 
- encodeInt(_displayWidth);
- encodeInt(_parWidth);
- encodeInt(_parHeight);
+ encodeInt(_angle);
+ encodeBool(_flip);
 
- encodeBool(_autocrop);
+ encodeInteger(_cropMode);
 encodeInt(_cropTop);
 encodeInt(_cropBottom);
 encodeInt(_cropLeft);
 encodeInt(_cropRight);
 
- encodeInt(_autoCropTop);
- encodeInt(_autoCropBottom);
- encodeInt(_autoCropLeft);
- encodeInt(_autoCropRight);
+ encodeInteger(_resolutionLimitMode);
+ encodeInt(_maxWidth);
+ encodeInt(_maxHeight);
+ encodeBool(_allowUpscaling);
+ encodeBool(_useMaximumSize);
 
- encodeInt(_sourceWidth);
- encodeInt(_sourceHeight);
- encodeInt(_sourceParNum);
- encodeInt(_sourceParDen);
+ encodeInteger(_anamorphicMode);
+ encodeInt(_parNum);
+ encodeInt(_parDen);
+ encodeInt(_width);
+ encodeInt(_height);
+
+ encodeInteger(_padMode);
+ encodeInt(_padTop);
+ encodeInt(_padBottom);
+ encodeInt(_padLeft);
+ encodeInt(_padRight);
+ encodeInteger(_padColorMode);
+ encodeObject(_padColorCustom);
+
+ encodeBool(_keepAspectRatio);
+ encodeInt(_storageWidth);
+ encodeInt(_storageHeight);
+ encodeInt(_displayWidth);
+ encodeInt(_displayHeight);
 }
 
 - (instancetype)initWithCoder:(NSCoder *)decoder
 {
 self = super init;
 
- decodeInt(_width); if (_width < 0) { goto fail; }
- decodeInt(_height); if (_height < 0) { goto fail; }
+ decodeInt(_sourceWidth); if (_sourceWidth < 0) { goto fail; }
+ decodeInt(_sourceHeight); if (_sourceHeight < 0) { goto fail; }
+ decodeInt(_sourceParNum); if (_sourceParNum < 0) { goto fail; }
+ decodeInt(_sourceParDen); if (_sourceParDen < 0) { goto fail; }
+
+ decodeInt(_autoCropTop); if (_autoCropTop < 0 || _autoCropTop > _sourceHeight) { goto fail; }
+ decodeInt(_autoCropBottom); if (_autoCropBottom < 0 || _autoCropBottom > _sourceHeight) { goto fail; }
+ decodeInt(_autoCropLeft); if (_autoCropLeft < 0 || _autoCropLeft > _sourceWidth) { goto fail; }
+ decodeInt(_autoCropRight); if (_autoCropRight < 0 || _autoCropLeft > _sourceWidth) { goto fail; }
+
+ decodeInt(_angle); if (_angle != 0 && _angle != 90 && _angle != 180 && _angle != 270) { goto fail; }
+ decodeBool(_flip);
+
+ decodeInteger(_cropMode);
+ if (_cropMode < HBPictureCropModeNone || _cropMode > HBPictureCropModeCustom)
+ {
+ goto fail;
+ }
+ decodeInt(_cropTop); if (_cropTop < 0 || _cropTop > _sourceHeight) { goto fail; }
+ decodeInt(_cropBottom); if (_cropBottom < 0 || _cropBottom > _sourceHeight) { goto fail; }
+ decodeInt(_cropLeft); if (_cropLeft < 0 || _cropLeft > _sourceWidth) { goto fail; }
+ decodeInt(_cropRight); if (_cropRight < 0 || _cropRight > _sourceWidth) { goto fail; }
+
+ decodeInteger(_resolutionLimitMode);
+ if (_resolutionLimitMode < HBPictureResolutionLimitModeNone || _resolutionLimitMode > HBPictureResolutionLimitModeCustom)
+ {
+ goto fail;
+ }
+ decodeInt(_maxWidth); if (_maxWidth < 0 || _maxWidth > HB_MAX_WIDTH) { goto fail; }
+ decodeInt(_maxHeight); if (_maxHeight < 0 || _maxHeight > HB_MAX_HEIGHT) { goto fail; }
+ decodeBool(_allowUpscaling);
+ decodeBool(_useMaximumSize);
 
- decodeBool(_keepDisplayAspect);
 decodeInteger(_anamorphicMode);
 if (_anamorphicMode < HBPictureAnarmophicModeNone || _anamorphicMode > HBPictureAnarmophicModeAuto)
 {
 goto fail;
 }
 
- decodeInt(_modulus); if (_modulus < 2 || _modulus > 16) { goto fail; }
+ decodeInt(_parNum); if (_parNum < 0) { goto fail; }
+ decodeInt(_parDen); if (_parDen < 0) { goto fail; }
+ decodeInt(_width); if (_width < 0 || _maxWidth > HB_MAX_WIDTH) { goto fail; }
+ decodeInt(_height); if (_height < 0 || _maxHeight > HB_MAX_HEIGHT) { goto fail; }
 
- decodeInt(_displayWidth); if (_displayWidth < 0) { goto fail; }
- decodeInt(_parWidth); if (_parWidth < 0) { goto fail; }
- decodeInt(_parHeight); if (_parHeight < 0) { goto fail; }
-
- decodeBool(_autocrop);
- decodeInt(_cropTop); if (_cropTop < 0) { goto fail; }
- decodeInt(_cropBottom); if (_cropBottom < 0) { goto fail; }
- decodeInt(_cropLeft); if (_cropLeft < 0) { goto fail; }
- decodeInt(_cropRight); if (_cropRight < 0) { goto fail; }
+ decodeInteger(_padMode);
+ if (_padMode < HBPicturePadModeNone || _padMode > HBPicturePadModeCustom)
+ {
+ goto fail;
+ }
+ decodeInt(_padTop); if (_padTop < 0 || _padTop > HB_MAX_HEIGHT) { goto fail; }
+ decodeInt(_padBottom); if (_padBottom < 0 || _padBottom > HB_MAX_HEIGHT) { goto fail; }
+ decodeInt(_padLeft); if (_padLeft < 0 || _padLeft > HB_MAX_WIDTH) { goto fail; }
+ decodeInt(_padRight); if (_padRight < 0 || _padRight > HB_MAX_WIDTH) { goto fail; }
+ decodeInteger(_padColorMode);
+ if (_padColorMode < HBPicturePadColorModeBlack || _padColorMode > HBPicturePadColorModeCustom)
+ {
+ goto fail;
+ }
+ decodeObject(_padColorCustom, NSString);
 
- decodeInt(_autoCropTop); if (_autoCropTop < 0) { goto fail; }
- decodeInt(_autoCropBottom); if (_autoCropBottom < 0) { goto fail; }
- decodeInt(_autoCropLeft); if (_autoCropLeft < 0) { goto fail; }
- decodeInt(_autoCropRight); if (_autoCropRight < 0) { goto fail; }
+ decodeInt(_storageWidth); if (_storageWidth < 0) { goto fail; }
+ decodeInt(_storageHeight); if (_storageHeight < 0) { goto fail; }
 
- decodeInt(_sourceWidth); if (_sourceWidth < 0) { goto fail; }
- decodeInt(_sourceHeight); if (_sourceHeight < 0) { goto fail; }
- decodeInt(_sourceParNum); if (_sourceParNum < 0) { goto fail; }
- decodeInt(_sourceParDen); if (_sourceParDen < 0) { goto fail; }
+ decodeBool(_keepAspectRatio);
+ decodeInt(_displayWidth); if (_displayWidth < 0) { goto fail; }
+ decodeInt(_displayHeight); if (_displayHeight < 0) { goto fail; }
 
 _notificationsEnabled = YES;
 
@@ -643,8 +1360,15 @@
 
 - (void)writeToPreset:(HBMutablePreset *)preset
 {
- preset@"PictureKeepRatio" = @(self.keepDisplayAspect);
- preset@"PictureModulus" = @(self.modulus);
+ preset@"PictureRotate" = NSString stringWithFormat:@"angle=%d:hflip=%d", self.angle, self.flip;
+
+ preset@"PictureWidth" = @(self.maxWidth);
+ preset@"PictureHeight" = @(self.maxHeight);
+
+ preset@"PictureAllowUpscaling" = @(self.allowUpscaling);
+ preset@"PictureUseMaximumSize" = @(self.useMaximumSize);
+
+ preset@"PictureKeepRatio" = @(self.keepAspectRatio);
 
 switch (self.anamorphicMode) {
 case HB_ANAMORPHIC_NONE:
@@ -660,21 +1384,59 @@
 preset@"PicturePAR" = @"custom";
 break;
 default:
- preset@"PicturePAR" = @"loose";
+ preset@"PicturePAR" = @"auto";
 break;
 }
 
 // PAR
- preset@"PicturePARWidth" = @(self.parWidth);
- preset@"PicturePARHeight" = @(self.parHeight);
+ preset@"PicturePARWidth" = @(self.parNum);
+ preset@"PicturePARHeight" = @(self.parDen);
+
+ // Display width
+ preset@"PictureDARWidth" = @(self.displayWidth);
 
 // Set crop settings
- preset@"PictureAutoCrop" = @(self.autocrop);
+ preset@"PictureAutoCrop" = @((BOOL)(self.cropMode == HBPictureCropModeAutomatic));
 
 preset@"PictureTopCrop" = @(self.cropTop);
 preset@"PictureBottomCrop" = @(self.cropBottom);
 preset@"PictureLeftCrop" = @(self.cropLeft);
 preset@"PictureRightCrop" = @(self.cropRight);
+
+ // Pad
+ preset@"PicturePadMode" = @(padModeToString(self.padMode));
+ if (self.padMode == HBPicturePadModeCustom)
+ {
+ preset@"PicturePadTop" = @(self.padTop);
+ preset@"PicturePadBottom" = @(self.padBottom);
+ preset@"PicturePadLeft" = @(self.padLeft);
+ preset@"PicturePadRight" = @(self.padRight);
+ }
+ else
+ {
+ preset@"PicturePadTop" = @0;
+ preset@"PicturePadBottom" = @0;
+ preset@"PicturePadLeft" = @0;
+ preset@"PicturePadRight" = @0;
+ }
+
+ switch (self.padColorMode) {
+ case HBPicturePadColorModeBlack:
+ preset@"PicturePadColor" = @"black";
+ break;
+ case HBPicturePadColorModeDarkGray:
+ preset@"PicturePadColor" = @"darkslategray";
+ break;
+ case HBPicturePadColorModeGray:
+ preset@"PicturePadColor" = @"slategray";
+ break;
+ case HBPicturePadColorModeWhite:
+ preset@"PicturePadColor" = @"white";
+ break;
+ case HBPicturePadColorModeCustom:
+ preset@"PicturePadColor" = self.padColorCustom;
+ break;
+ }
 }
 
 - (void)applyPreset:(HBPreset *)preset jobSettings:(NSDictionary *)settings
@@ -682,6 +1444,8 @@
 NSDictionary<NSString *, NSNumber *> *par = settings@"PAR";
 NSDictionary<NSString *, id> *filterList = settings@"Filters"@"FilterList";
 NSDictionary<NSString *, NSNumber *> *cropScale = nil;
+ NSDictionary<NSString *, id> *pad = nil;
+ NSDictionary<NSString *, id> *rotate = nil;
 
 for (NSDictionary *dict in filterList)
 {
@@ -689,85 +1453,146 @@
 {
 cropScale = dict@"Settings";
 }
- }
-
- self.validating = YES;
- self.notificationsEnabled = NO;
-
-
- // Check to see if UsesPictureSettings is greater than 0, as 0 means use picture sizing "None"
- // (2 is use max for source and 1 is use exact size when the preset was created) and the
- // preset completely ignores any picture sizing values in the preset.
- if (cropScale && preset@"UsesPictureSettings" intValue)
- {
- // If Cropping is set to custom, then recall all four crop values from
- // when the preset was created and apply them
- if (preset@"PictureAutoCrop" boolValue)
+ if (dict@"ID" intValue == HB_FILTER_PAD)
 {
- self.autocrop = YES;
-
- // Here we use the auto crop values determined right after scan
- self.cropTop = cropScale@"crop-top" intValue;
- self.cropBottom = cropScale@"crop-bottom" intValue;
- self.cropLeft = cropScale@"crop-left" intValue;
- self.cropRight = cropScale@"crop-right" intValue;
+ pad = dict@"Settings";
 }
- else
+ if (dict@"ID" intValue == HB_FILTER_ROTATE)
 {
- self.autocrop = NO;
-
- // Here we use the custom crop values saved at the time the preset was saved
- self.cropTop = preset@"PictureTopCrop" intValue;
- self.cropBottom = preset@"PictureBottomCrop" intValue;
- self.cropLeft = preset@"PictureLeftCrop" intValue;
- self.cropRight = preset@"PictureRightCrop" intValue;
+ rotate = dict@"Settings";
 }
+ }
 
- // Set modulus
- if (preset@"PictureModulus")
- {
- self.modulus = preset@"PictureModulus" intValue;
- }
- else
- {
- self.modulus = 16;
- }
+ // Dimensions are taken as they are
+ // from the hb_job dict
 
- if (self.modulus <= 0 || self.modulus > 16)
- {
- self.modulus = 2;
- }
+ self.updating = YES;
+ self.notificationsEnabled = NO;
 
- // Assume max picture settings initially.
- self.keepDisplayAspect = preset@"PictureKeepRatio" boolValue;
+ // Rotate
+ self.angle = rotate@"angle" intValue;
+ self.flip = rotate@"hflip" boolValue;
 
- if (preset@"PicturePAR" isEqualToString:@"off")
- {
- self.anamorphicMode = HB_ANAMORPHIC_NONE;
- }
- else if (preset@"PicturePAR" isEqualToString:@"auto")
- {
- self.anamorphicMode = HB_ANAMORPHIC_AUTO;
- }
- else if (preset@"PicturePAR" isEqualToString:@"custom")
+ // Crop
+ int ct = cropScale@"crop-top" intValue;
+ int cb = cropScale@"crop-bottom" intValue;
+ int cl = cropScale@"crop-left" intValue;
+ int cr = cropScale@"crop-right" intValue;
+
+ if (preset@"PictureAutoCrop" boolValue)
+ {
+ self.cropMode = HBPictureCropModeAutomatic;
+ }
+ else
+ {
+ if (ct == 0 && cb == 0 && cl == 0 && cr == 0)
 {
- self.anamorphicMode = HB_ANAMORPHIC_CUSTOM;
+ self.cropMode = HBPictureCropModeNone;
 }
 else
 {
- self.anamorphicMode = HB_ANAMORPHIC_LOOSE;
+ self.cropMode = HBPictureCropModeCustom;
 }
+ }
 
- self.parWidth = par@"Num" intValue;
- self.parHeight = par@"Den" intValue;
+ self.cropTop = ct;
+ self.cropBottom = cb;
+ self.cropLeft = cl;
+ self.cropRight = cr;
 
- self.width = cropScale@"width" intValue;
- self.height = cropScale@"height" intValue;
+ // Resolution
+ self.maxWidth = preset@"PictureWidth" intValue;
+ self.maxHeight = preset@"PictureHeight" intValue;
 
- self.displayWidth = self.width * self.parWidth / self.parHeight;
+ if (self.maxWidth == 0 && self.maxHeight == 0)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitModeNone;
+ }
+ else if (self.maxWidth == 7680 && self.maxHeight == 4320)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode8K;
+ }
+ else if (self.maxWidth == 3840 && self.maxHeight == 2160)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode4K;
+ }
+ else if (self.maxWidth == 2560 && self.maxHeight == 1440)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode1440p;
+ }
+ else if (self.maxWidth == 1920 && self.maxHeight == 1080)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode1080p;
+ }
+ else if (self.maxWidth == 1280 && self.maxHeight == 720)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode720p;
+ }
+ else if (self.maxWidth == 720 && self.maxHeight == 576)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode576p;
+ }
+ else if (self.maxWidth == 720 && self.maxHeight == 480)
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitMode480p;
+ }
+ else
+ {
+ self.resolutionLimitMode = HBPictureResolutionLimitModeCustom;
+ }
+
+ if (preset@"PicturePAR" isEqualToString:@"auto")
+ {
+ self.anamorphicMode = HBPictureAnarmophicModeAuto;
+ }
+ else if (preset@"PicturePAR" isEqualToString:@"custom")
+ {
+ self.anamorphicMode = HBPictureAnarmophicModeCustom;
+ }
+ else
+ {
+ self.anamorphicMode = HBPictureAnarmophicModeNone;
 }
 
- self.validating = NO;
+ self.parNum = par@"Num" intValue;
+ self.parDen = par@"Den" intValue;
+
+ self.width = cropScale@"width" intValue;
+ self.height = cropScale@"height" intValue;
+
+ self.keepAspectRatio = preset@"PictureKeepRatio" boolValue;
+ self.allowUpscaling = preset@"PictureAllowUpscaling" boolValue;
+ self.useMaximumSize = preset@"PictureUseMaximumSize" boolValue;
+
+ // Pad
+ NSString *padMode = preset@"PicturePadMode";
+ if (padMode isEqualToString:@"fill") { self.padMode = HBPicturePadModeFill; }
+ else if (padMode isEqualToString:@"letterbox") { self.padMode = HBPicturePadModeFillHeight; }
+ else if (padMode isEqualToString:@"pillarbox") { self.padMode = HBPicturePadModeFillWidth; }
+ else if (padMode isEqualToString:@"custom") { self.padMode = HBPicturePadModeCustom; }
+ else { self.padMode = HBPicturePadModeNone; }
+
+ NSString *padColor = preset@"PicturePadColor";
+ if (padColor isEqualToString:@"black") { self.padColorMode = HBPicturePadColorModeBlack; }
+ else if (padColor isEqualToString:@"darkslategray") { self.padColorMode = HBPicturePadColorModeDarkGray; }
+ else if (padColor isEqualToString:@"slategray") { self.padColorMode = HBPicturePadColorModeGray; }
+ else if (padColor isEqualToString:@"white") { self.padColorMode = HBPicturePadColorModeWhite; }
+ else if (padColor.length) { self.padMode = HBPicturePadModeCustom; self.padColorCustom = padColor; }
+ else { self.padColorMode = HBPicturePadColorModeBlack; self.padColorCustom = @""; }
+
+ self.padTop = pad@"top" intValue;
+ self.padBottom = pad@"bottom" intValue;
+ self.padLeft = pad@"left" intValue;
+ self.padRight = pad@"right" intValue;
+
+ // Final dimensions
+ self.storageWidth = self.width + self.padLeft + self.padRight;
+ self.storageHeight = self.height + self.padTop + self.padBottom;
+
+ self.displayWidth = ((double)self.parNum / self.parDen) * self.storageWidth + 0.5;
+ self.displayHeight = self.storageHeight;
+
+ self.updating = NO;
 self.notificationsEnabled = YES;
 
 self postChangedNotification;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPictureHUDController.h -> HandBrake-1.5.1.tar.xz/macosx/HBPictureHUDController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPictureHUDController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPictureHUDController.m Changed

@@ -83,21 +83,15 @@
         }
     }
 
-    if (@available(macOS 10.12.2, *))
-    {
-        self _touchBar_reloadScrubberData;
-        self _touchBar_validateUserInterfaceItems;
-    }
+    self _touchBar_reloadScrubberData;
+    self _touchBar_validateUserInterfaceItems;
 }
 
 - (void)setSelectedIndex:(NSUInteger)selectedIndex
 {
     _selectedIndex = selectedIndex;
     self.slider.integerValue = selectedIndex;
-    if (@available(macOS 10.12.2, *))
-    {
-        self _touchBar_updateScrubberSelectedIndex:selectedIndex;
-    }
+    self _touchBar_updateScrubberSelectedIndex:selectedIndex;
     self.delegate displayPreviewAtIndex:self.selectedIndex;
 }
 
@@ -122,10 +116,7 @@
     {
         self.scaleToScreenButton.title = NSLocalizedString(@"Actual Scale", @"Picture HUD -> scale button");
     }
-    if (@available(macOS 10.12.2, *))
-    {
-        self _touchBar_updateFitToView:fitToView;
-    }
+    self _touchBar_updateFitToView:fitToView;
 }
 
 - (BOOL)validateUserIterfaceItemForAction:(SEL)action
@@ -154,9 +145,9 @@
     self.fitToView = !self.fitToView;
 }
 
-- (IBAction)showPictureSettings:(id)sender
+- (IBAction)showCroppingSettings:(id)sender
 {
-    self.delegate showPictureSettings;
+    self.delegate showCroppingSettings:sender;
 }
 
 - (IBAction)createMoviePreview:(id)sender

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPictureViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPictureViewController.m Changed

@@ -27,20 +27,10 @@
     if (self)
     {
         _labelColor = NSColor disabledControlTextColor;
-        self addObserver:self forKeyPath:@"self.picture.modulus" options:NSKeyValueObservingOptionInitial context:HBPictureViewControllerContext;
     }
     return self;
 }
 
-- (void)dealloc
-{
-    @try
-    {
-        self removeObserver:self forKeyPath:@"self.picture.modulus" context:HBPictureViewControllerContext;
-    }
-    @catch (NSException * __unused exception) {}
-}
-
 - (void)setPicture:(HBPicture *)picture
 {
     _picture = picture;
@@ -56,24 +46,4 @@
 
 }
 
-#pragma mark - KVO
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if (context == HBPictureViewControllerContext)
-    {
-        // Set the increment here, it's not possible with bindings.
-        if (keyPath isEqualToString:@"self.picture.modulus")
-        {
-            self.widthStepper setIncrement:self.picture.modulus;
-            self.heightStepper setIncrement:self.picture.modulus;
-        }
-    }
-    else
-    {
-        super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
-    }
-}
-
-
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPlayerHUDController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPlayerHUDController.m Changed

@@ -15,7 +15,7 @@
 @property (nonatomic, weak) IBOutlet NSSlider *volumeSlider;
 
 @property (nonatomic, weak) IBOutlet NSTextField *currentTimeLabel;
-@property (nonatomic, weak) IBOutlet NSTextField *remaingTimeLabel;
+@property (nonatomic, weak) IBOutlet NSTextField *remainingTimeLabel;
 
 @property (nonatomic, weak) IBOutlet NSPopUpButton *tracksSelection;
 
@@ -74,10 +74,7 @@
         self.slider setMaxValue:duration;
         self.slider setDoubleValue:0.0;
 
-        if (@available(macOS 10.12.2, *))
-        {
-            self _touchBar_updateMaxDuration:duration;
-        }
+        self _touchBar_updateMaxDuration:duration;
 
         self.player.volume = self.volumeSlider.floatValue;
 
@@ -202,12 +199,9 @@
 
         self.slider.doubleValue = currentTime;
         self.currentTimeLabel.attributedStringValue = self _timeToTimecode:currentTime.HB_smallMonospacedString;
-        self.remaingTimeLabel.attributedStringValue = self _timeToTimecode:duration - currentTime.HB_smallMonospacedString;
+        self.remainingTimeLabel.attributedStringValue = self _timeToTimecode:duration - currentTime.HB_smallMonospacedString;
 
-        if (@available(macOS 10.12.2, *))
-        {
-            self _touchBar_updateTime:currentTime duration:duration;
-        }
+        self _touchBar_updateTime:currentTime duration:duration;
     }
 }
 
@@ -223,10 +217,7 @@
         self.playButton.image = NSImage imageNamed:@"PlayTemplate";
     }
 
-    if (@available(macOS 10.12.2, *))
-    {
-        self _touchBar_updatePlayState:playing;
-    }
+    self _touchBar_updatePlayState:playing;
 }
 
 - (IBAction)playPauseToggle:(id)sender

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreferencesController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreferencesController.m Changed

@@ -5,6 +5,8 @@
 
 #import "HBPreferencesController.h"
 
+@import HandBrakeKit.HBUtilities;
+
 NSString * const HBShowOpenPanelAtLaunch              = @"HBShowOpenPanelAtLaunch";
 NSString * const HBShowSummaryPreview                 = @"HBShowSummaryPreview";
 
@@ -38,6 +40,9 @@
 NSString * const HBQueuePauseIfLowSpace          = @"HBQueuePauseIfLowSpace";
 NSString * const HBQueueMinFreeSpace             = @"HBQueueMinFreeSpace";
 NSString * const HBQueueAutoClearCompletedItems  = @"HBQueueAutoClearCompletedItems";
+NSString * const HBQueueWorkerCounts             = @"HBQueueWorkerCounts";
+
+NSString * const HBKeepPresetEdits               = @"HBKeepPresetEdits";
 
 #define TOOLBAR_GENERAL     @"TOOLBAR_GENERAL"
 #define TOOLBAR_ADVANCED    @"TOOLBAR_ADVANCED"
@@ -76,13 +81,12 @@
  */
 + (void)registerUserDefaults
 {
-    NSString *moviesDirectory = NSSearchPathForDirectoriesInDomains(NSMoviesDirectory, NSUserDomainMask, YES) firstObject;
-    NSURL *moviesURL = NSURL fileURLWithPath:moviesDirectory isDirectory:YES;
+    NSURL *moviesURL = HBUtilities.defaultDestinationURL;
 
-    NSUserDefaults standardUserDefaults registerDefaults:@{
+    NSUserDefaults.standardUserDefaults registerDefaults:@{
         HBShowOpenPanelAtLaunch:            @YES,
         HBShowSummaryPreview:               @YES,
-        HBDefaultMpegExtension:             @"Auto",
+        HBDefaultMpegExtension:             @".mp4",
         HBUseDvdNav:                        @YES,
         HBLastDestinationDirectoryURL:      NSKeyedArchiver archivedDataWithRootObject:moviesURL,
         HBLastSourceDirectoryURL:           NSKeyedArchiver archivedDataWithRootObject:moviesURL,
@@ -99,8 +103,10 @@
         HBCqSliderFractional:               @2,
         HBQueuePauseIfLowSpace:             @YES,
         HBQueueMinFreeSpace:                @"2",
-        HBQueueAutoClearCompletedItems:     @NO
-        };
+        HBQueueAutoClearCompletedItems:     @NO,
+        HBQueueWorkerCounts:                @1,
+        HBKeepPresetEdits:                  @YES
+    };
 
     // Overwrite the update check interval because previous versions
     // could be set to a daily check.
@@ -138,12 +144,17 @@
  */
 - (void)windowDidLoad
 {
-    NSToolbar *toolbar = NSToolbar alloc initWithIdentifier: @"Preferences Toolbar";
-    toolbar setDelegate: self;
-    toolbar setAllowsUserCustomization: NO;
-    toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel;
-    toolbar setSizeMode: NSToolbarSizeModeRegular;
-    self window setToolbar: toolbar;
+    if (@available (macOS 11, *))
+    {
+        self.window.toolbarStyle = NSWindowToolbarStylePreference;
+    }
+
+    NSToolbar *toolbar = NSToolbar alloc initWithIdentifier:@"Preferences Toolbar";
+    toolbar.delegate = self;
+    toolbar.allowsUserCustomization = NO;
+    toolbar.displayMode = NSToolbarDisplayModeIconAndLabel;
+    toolbar.sizeMode = NSToolbarSizeModeRegular;
+    self.window.toolbar = toolbar;
 
     // Format token field initialization
     self.formatTokenField setTokenizingCharacterSet:NSCharacterSet characterSetWithCharactersInString:@"%%";
@@ -153,7 +164,7 @@
     self.builtInTokenField setTokenizingCharacterSet:NSCharacterSet characterSetWithCharactersInString:@"%%";
     self.builtInTokenField setStringValue:self.buildInFormatTokens componentsJoinedByString:@"%%";
 
-    toolbar setSelectedItemIdentifier: TOOLBAR_GENERAL;
+    toolbar.selectedItemIdentifier = TOOLBAR_GENERAL;
     self setPrefView:nil;
 }
 
@@ -161,17 +172,27 @@
      itemForItemIdentifier: (NSString *)ident
  willBeInsertedIntoToolbar: (BOOL)flag
 {
-    if ( ident isEqualToString:TOOLBAR_GENERAL )
+    if (ident isEqualToString:TOOLBAR_GENERAL)
     {
+        NSImage *image = NSImage imageNamed:NSImageNamePreferencesGeneral;
+        if (@available (macOS 11, *))
+        {
+            image = NSImage imageWithSystemSymbolName:@"gearshape" accessibilityDescription:@"General preferences";
+        }
         return self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"General", @"Preferences General Toolbar Item")
-                                         image:NSImage imageNamed:NSImageNamePreferencesGeneral;
+                                         image:image;
     }
-    else if ( ident isEqualToString:TOOLBAR_ADVANCED )
+    else if (ident isEqualToString:TOOLBAR_ADVANCED)
     {
+        NSImage *image = NSImage imageNamed:NSImageNameAdvanced;
+        if (@available (macOS 11, *))
+        {
+            image = NSImage imageWithSystemSymbolName:@"gearshape.2" accessibilityDescription:@"General preferences";
+        }
         return self toolbarItemWithIdentifier:ident
                                          label:NSLocalizedString(@"Advanced", @"Preferences Advanced Toolbar Item")
-                                         image:NSImage imageNamed:NSImageNameAdvanced;
+                                         image:image;
     }
 
     return nil;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreferencesKeys.h -> HandBrake-1.5.1.tar.xz/macosx/HBPreferencesKeys.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreset.h -> HandBrake-1.5.1.tar.xz/macosx/HBPreset.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreset.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreset.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPresetCoding.h -> HandBrake-1.5.1.tar.xz/macosx/HBPresetCoding.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPresetsManager.m -> HandBrake-1.5.1.tar.xz/macosx/HBPresetsManager.m Changed

@@ -49,7 +49,7 @@
 
 - (void)nodeDidChange:(HBTreeNode *)node
 {
-    NSNotificationCenter.defaultCenter postNotificationName:HBPresetsChangedNotification object:nil;
+    NSNotificationCenter.defaultCenter postNotificationName:HBPresetsChangedNotification object:self;
 }
 
 - (void)treeDidRemoveNode:(HBTreeNode *)node
@@ -296,7 +296,7 @@
     __block HBPreset *normalPreset = nil;
     __block HBPreset *firstUserPreset = nil;
     __block HBPreset *firstBuiltInPreset = nil;
-    __block BOOL defaultAlreadySetted = NO;
+    __block BOOL defaultAlreadySet = NO;
 
     // Search for a possible new default preset
     // Try to use "Normal" or the first user preset.
@@ -320,7 +320,7 @@
         if (obj isDefault)
         {
             self.defaultPreset = obj;
-            defaultAlreadySetted = YES;
+            defaultAlreadySet = YES;
         }
 
         if (obj isDefault)
@@ -329,7 +329,7 @@
         }
     };
 
-    if (defaultAlreadySetted)
+    if (defaultAlreadySet)
     {
         self.defaultPreset.isDefault = YES;
         return;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPresetsMenuBuilder.m -> HandBrake-1.5.1.tar.xz/macosx/HBPresetsMenuBuilder.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPresetsViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPresetsViewController.m Changed

@@ -30,11 +30,19 @@
 {
 self.textField.textColor = NSColor selectedControlTextColor;
 }
+ else if (self.objectValue isSupported == NO)
+ {
+ self.textField.textColor = NSColor disabledControlTextColor;
+ }
 else
 {
 self.textField.textColor = NSColor systemBlueColor;
 }
 }
+ else if (self.objectValue isSupported == NO)
+ {
+ self.textField.textColor = NSColor disabledControlTextColor;
+ }
 else
 {
 self.textField.textColor = NSColor controlTextColor;
@@ -48,6 +56,7 @@
 @property (nonatomic, strong) HBPresetsManager *presets;
 @property (nonatomic, readwrite) HBPreset *selectedPresetInternal;
 @property (nonatomic, unsafe_unretained) IBOutlet NSTreeController *treeController;
+@property (nonatomic, weak) IBOutlet NSSegmentedControl *actionsControl;
 
 /**
 * Helper var for drag & drop
@@ -83,13 +92,8 @@
 {
 super viewDidLoad;
 
- if (NSAppKitVersionNumber >= NSAppKitVersionNumber10_10 && NSAppKitVersionNumber < 1651)
- {
- self.view.appearance = NSAppearance appearanceNamed:NSAppearanceNameAqua;
- }
-
 // drag and drop support
-	self.outlineView registerForDraggedTypes:@kHandBrakeInternalPBoardType, (NSString *)kUTTypeFileURL;
+	self.outlineView registerForDraggedTypes:@kHandBrakeInternalPBoardType, NSPasteboardTypeFileURL;
 self.outlineView setDraggingSourceOperationMask:NSDragOperationCopy forLocal:NO;
 self.outlineView setDraggingSourceOperationMask:NSDragOperationMove forLocal:YES;
 
@@ -98,6 +102,8 @@
 
 self.treeController setSelectionIndexPath:self.presets indexPathOfPreset:self.selectedPreset;
 self.treeController addObserver:self forKeyPath:@"selectedObjects" options:NSKeyValueObservingOptionNew context:HBPresetsViewControllerContext;
+
+ self.actionsControl setEnabled:self.enabled forSegment:0;
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -105,11 +111,12 @@
 if (context == HBPresetsViewControllerContext)
 {
 HBPreset *selectedNode = self.treeController.selectedObjects.firstObject;
- if (selectedNode && selectedNode.isLeaf && selectedNode != self.selectedPresetInternal)
+ if (selectedNode && selectedNode.isLeaf && selectedNode.isSupported && selectedNode != self.selectedPresetInternal)
 {
 self.selectedPresetInternal = selectedNode;
 self.delegate selectionDidChange;
 }
+ self.actionsControl setEnabled:selectedNode != nil forSegment:1;
 }
 else
 {
@@ -131,7 +138,8 @@
 }
 if (action == @selector(setDefault:))
 {
- if (!self.treeController.selectedObjects.firstObject isLeaf)
+ if (!self.treeController.selectedObjects.firstObject isLeaf ||
+ !self.treeController.selectedObjects.firstObject isSupported)
 {
 return NO;
 }
@@ -140,6 +148,12 @@
 return YES;
 }
 
+- (void)setEnabled:(BOOL)enabled
+{
+ _enabled = enabled;
+ self.actionsControl setEnabled:enabled forSegment:0;
+}
+
 #pragma mark - Import Export Preset(s)
 
 - (nonnull NSString *)fileNameForPreset:(HBPreset *)preset
@@ -294,7 +308,7 @@
 
 - (IBAction)clicked:(id)sender
 {
- if (self.delegate && self.treeController.selectedObjects.firstObject isLeaf)
+ if (self.delegate && self.treeController.selectedObjects.firstObject isLeaf && self.treeController.selectedObjects.firstObject isSupported)
 {
 self.delegate selectionDidChange;
 }
@@ -308,6 +322,18 @@
 }
 }
 
+- (IBAction)segmentedActions:(NSSegmentedControl *)sender
+{
+ if (sender.selectedSegment == 0)
+ {
+ self addNewPreset:self;
+ }
+ else
+ {
+ self deletePreset:self;
+ }
+}
+
 - (IBAction)addNewPreset:(id)sender
 {
 if (self.delegate)
@@ -336,6 +362,10 @@
 alert addButtonWithTitle:NSLocalizedString(@"Delete Preset", @"Delete preset alert -> first button");
 }
 
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert addButtonWithTitle:NSLocalizedString(@"Cancel", @"Delete preset alert -> second button");
 
 NSInteger status = alert runModal;
@@ -442,17 +472,11 @@
 }
 
 - (id<NSPasteboardWriting>)outlineView:(NSOutlineView *)outlineView
- pasteboardWriterForItem:(id)item {
- if (@available(macOS 10.12, *))
- {
- HBFilePromiseProvider *filePromise = HBFilePromiseProvider alloc initWithFileType:@"public.text" delegate:self;
- filePromise.userInfo = item representedObject;
- return filePromise;
- }
- else
- {
- return NSPasteboardItem alloc initWithPasteboardPropertyList:@1 ofType:kHandBrakeInternalPBoardType;
- }
+ pasteboardWriterForItem:(id)item
+{
+ HBFilePromiseProvider *filePromise = HBFilePromiseProvider alloc initWithFileType:@"public.text" delegate:self;
+ filePromise.userInfo = item representedObject;
+ return filePromise;
 }
 
 - (nonnull NSString *)filePromiseProvider:(nonnull NSFilePromiseProvider *)filePromiseProvider fileNameForType:(nonnull NSString *)fileType
@@ -486,7 +510,7 @@
 result = NSDragOperationCopy;
 }
 }
- else if (self.dragNodesArray allSatisfy:^BOOL(id _Nonnull object) { return object representedObject isBuiltIn == NO; })
+ else if (self.dragNodesArray HB_allSatisfy:^BOOL(id _Nonnull object) { return object representedObject isBuiltIn == NO; })
 {
 if (item representedObject isBuiltIn ||
 (item representedObject isLeaf && index == -1) ||
@@ -573,7 +597,7 @@
 		self handleInternalDrops:pboard withIndexPath:indexPath;
 		result = YES;
 	}
- else if (pboard availableTypeFromArray:@(NSString *)kUTTypeFileURL)
+ else if (pboard availableTypeFromArray:@NSPasteboardTypeFileURL)
 {
 self handleExternalDrops:pboard withIndexPath:indexPath;
 result = YES;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewController.m Changed

@@ -6,7 +6,7 @@
 
 #import "HBPreviewController.h"
 #import "HBPreviewGenerator.h"
-#import "HBPictureController.h"
+#import "HBCroppingController.h"
 
 #import "HBController.h"
 #import "HBPreviewView.h"
@@ -27,7 +27,7 @@
 #define MIN_WIDTH 480.0
 #define MIN_HEIGHT 360.0
 
-@interface HBPreviewController () <HBPreviewGeneratorDelegate, HBPictureHUDControllerDelegate, HBEncodingProgressHUDControllerDelegate, HBPlayerHUDControllerDelegate>
+@interface HBPreviewController () <NSMenuItemValidation, HBPreviewGeneratorDelegate, HBPictureHUDControllerDelegate, HBEncodingProgressHUDControllerDelegate, HBPlayerHUDControllerDelegate>
 
 @property (nonatomic, readonly) HBPictureHUDController *pictureHUD;
 @property (nonatomic, readonly) HBEncodingProgressHUDController *encodingHUD;
@@ -40,7 +40,7 @@
 
 @property (nonatomic) id<HBPlayer> player;
 
-@property (nonatomic) HBPictureController *pictureSettingsWindow;
+@property (nonatomic) NSPopover *croppingPopover;
 
 @property (nonatomic) NSPoint windowCenterPoint;
 @property (nonatomic, weak) IBOutlet HBPreviewView *previewView;
@@ -57,7 +57,10 @@
 
 - (void)windowDidLoad
 {
- self.window.contentView setWantsLayer:YES;
+ self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+ self.window.excludedFromWindowsMenu = YES;
+ self.window.acceptsMouseMovedEvents = YES;
+ self.window.contentView.wantsLayer = YES;
 
 // Read the window center position
 // We need the center and we can't use the
@@ -75,9 +78,6 @@
 self.windowCenterPoint = self.window HB_centerPoint;
 }
 
- self.window.excludedFromWindowsMenu = YES;
- self.window.acceptsMouseMovedEvents = YES;
-
 _pictureHUD = HBPictureHUDController alloc init;
 self.pictureHUD.delegate = self;
 _encodingHUD = HBEncodingProgressHUDController alloc init;
@@ -143,7 +143,8 @@
 - (void)setPicture:(HBPicture *)picture
 {
 _picture = picture;
- self.pictureSettingsWindow.picture = _picture;
+ self.croppingPopover close;
+ self.croppingPopover = nil;
 }
 
 - (void)setGenerator:(HBPreviewGenerator *)generator
@@ -207,7 +208,6 @@
 self.player pause;
 }
 
- self.pictureSettingsWindow close;
 self.generator purgeImageCache;
 }
 
@@ -412,7 +412,7 @@
 CATransaction begin;
 CABasicAnimation *fadeInAnimation = CABasicAnimation animationWithKeyPath:@"opacity";
 fadeInAnimation.fromValue = @(hud.layer.presentationLayer opacity);
- fadeInAnimation.toValue = @(1.0);
+ fadeInAnimation.toValue = @1.0;
 fadeInAnimation.beginTime = 0.0;
 fadeInAnimation.duration = ANIMATION_DUR;
 
@@ -430,7 +430,7 @@
 CATransaction begin;
 CABasicAnimation *fadeOutAnimation = CABasicAnimation animationWithKeyPath:@"opacity";
 fadeOutAnimation.fromValue = @(hud.layer.presentationLayer opacity);
- fadeOutAnimation.toValue = @(0.0);
+ fadeOutAnimation.toValue = @0.0;
 fadeOutAnimation.beginTime = 0.0;
 fadeOutAnimation.duration = ANIMATION_DUR;
 
@@ -481,21 +481,22 @@
 if (self.generator && self.window.isVisible)
 {
 CGImageRef image = self.generator copyImageAtIndex:idx shouldCache:YES;
- self.previewView.image = image;
- CFRelease(image);
+ if (image)
+ {
+ self.previewView.image = image;
+ CFRelease(image);
+ }
 }
 }
 
-- (void)showPictureSettings
+- (void)showCroppingSettings:(id)sender
 {
- if (self.pictureSettingsWindow == nil)
- {
- self.pictureSettingsWindow = HBPictureController alloc init;
- self.pictureSettingsWindow.previewController = self;
- }
-
- self.pictureSettingsWindow.picture = self.picture;
- self.pictureSettingsWindow showWindow:self;
+ HBCroppingController *croppingController = HBCroppingController alloc initWithPicture:self.picture;
+ self.croppingPopover = NSPopover alloc init;
+ self.croppingPopover.behavior = NSPopoverBehaviorTransient;
+ self.croppingPopover.contentViewController = croppingController;
+ self.croppingPopover.appearance = NSAppearance appearanceNamed:NSAppearanceNameVibrantDark;
+ self.croppingPopover showRelativeToRect:sender bounds ofView:sender preferredEdge:NSMaxYEdge;
 }
 
 #pragma mark - Encoding mode

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewGenerator.h -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewGenerator.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewGenerator.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewGenerator.m Changed

@@ -79,7 +79,7 @@
  *
  * @param index picture index in title.
  */
-- (CGImageRef) copyImageAtIndex: (NSUInteger) index shouldCache: (BOOL) cache
+- (nullable CGImageRef) copyImageAtIndex: (NSUInteger) index shouldCache: (BOOL) cache
 {
     if (index >= self.imagesCount)
     {
@@ -92,15 +92,7 @@
 
     if (!theImage)
     {
-        HBFilters *filters = self.job.filters;
-        BOOL deinterlace = (!filters.deinterlace isEqualToString:@"off");
-
-        theImage = (CGImageRef)self.scanCore copyImageAtIndex:index
-                                                           forTitle:self.job.title
-                                                       pictureFrame:self.job.picture
-                                                        deinterlace:deinterlace
-                                                        rotate:self.job.filters.rotate
-                                                       flipped:self.job.filters.flip;
+        theImage = self.scanCore copyImageAtIndex:index job:self.job;
         if (cache && theImage)
         {
             // The cost is the number of pixels of the image
@@ -127,7 +119,7 @@
 
 - (CGSize)imageSize
 {
-    return CGSizeMake(self.job.picture.displayWidth, self.job.picture.height);
+    return CGSizeMake(self.job.picture.displayWidth, self.job.picture.displayHeight);
 }
 
 - (void)imagesSettingsDidChange
@@ -190,12 +182,7 @@
 
         if (image == NULL)
         {
-            image = (CGImageRef)self.scanCore copyImageAtIndex:index
-                                                       forTitle:self.job.title
-                                                   pictureFrame:self.job.picture
-                                                    deinterlace:NO
-                                                         rotate:self.job.filters.rotate
-                                                        flipped:self.job.filters.flip;
+            image = self.scanCore copyImageAtIndex:index job:self.job;
             CFAutorelease(image);
         }
 
@@ -276,6 +263,7 @@
     // Init the libhb core
     NSInteger level = NSUserDefaults.standardUserDefaults integerForKey:HBLoggingLevel;
     self.core = HBCore alloc initWithLogLevel:level name:@"PreviewCore";
+    self.core.automaticallyPreventSleep = YES;
 
     HBStateFormatter *formatter = HBStateFormatter alloc init;
     formatter.twoLines = NO;
@@ -292,7 +280,7 @@
          }
        completionHandler:^(HBCoreResult result) {
            // Encode done, call the delegate and close libhb handle
-           if (result == HBCoreResultDone)
+           if (result.code == HBCoreResultCodeDone)
            {
                self.delegate didCreateMovieAtURL:destURL;
            }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewView.h -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewView.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewView.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewView.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBPreviewViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBPreviewViewController.m Changed

@@ -120,7 +120,7 @@
         CATransaction begin;
         CABasicAnimation *fadeInAnimation = CABasicAnimation animationWithKeyPath:@"opacity";
         fadeInAnimation.fromValue = @(hud.layer.presentationLayer.opacity);
-        fadeInAnimation.toValue = @(1.0);
+        fadeInAnimation.toValue = @1.0;
         fadeInAnimation.beginTime = 0.0;
         fadeInAnimation.duration = ANIMATION_DUR;
 
@@ -138,7 +138,7 @@
         CATransaction begin;
         CABasicAnimation *fadeOutAnimation = CABasicAnimation animationWithKeyPath:@"opacity";
         fadeOutAnimation.fromValue = @(hud.layer.presentationLayer.opacity);
-        fadeOutAnimation.toValue = @(0.0);
+        fadeOutAnimation.toValue = @0.0;
         fadeOutAnimation.beginTime = 0.0;
         fadeOutAnimation.duration = ANIMATION_DUR;
 
@@ -182,9 +182,12 @@
     if (self.generator && self.visible)
     {
         CGImageRef fPreviewImage = self.generator copyImageAtIndex:self.selectedIndex shouldCache:YES;
-        self.previewView.image = fPreviewImage;
-        CFRelease(fPreviewImage);
-        self.previewView.layer.opacity = 1;
+        if (fPreviewImage)
+        {
+            self.previewView.image = fPreviewImage;
+            CFRelease(fPreviewImage);
+            self.previewView.layer.opacity = 1;
+        }
     }
     else
     {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueue.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueue.h Changed

@@ -6,13 +6,13 @@
 
 #import <Foundation/Foundation.h>
 
-#import "HBDistributedArray.h"
 #import "HBQueueItem.h"
+#import "HBQueueJobItem.h"
+#import "HBQueueActionItem.h"
+#import "HBQueueWorker.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSString * const HBQueueDidChangeStateNotification;
-
 extern NSString * const HBQueueDidAddItemNotification;
 extern NSString * const HBQueueDidRemoveItemNotification;
 extern NSString * const HBQueueDidChangeItemNotification;
@@ -22,49 +22,43 @@
 extern NSString * const HBQueueItemNotificationSourceIndexesKey; // NSArray<NSNumber *>
 extern NSString * const HBQueueItemNotificationTargetIndexesKey; // NSArray<NSNumber *>
 
-extern NSString * const HBQueueReloadItemsNotification;
-
 extern NSString * const HBQueueLowSpaceAlertNotification;
 
-extern NSString * const HBQueueProgressNotification;
-extern NSString * const HBQueueProgressNotificationPercentKey; // NSNumber - double
-extern NSString * const HBQueueProgressNotificationHoursKey; // NSNumber - double
-extern NSString * const HBQueueProgressNotificationMinutesKey; // NSNumber - double
-extern NSString * const HBQueueProgressNotificationSecondsKey; // NSNumber - double
-extern NSString * const HBQueueProgressNotificationInfoKey; // NSString
-
 extern NSString * const HBQueueDidStartNotification;
 extern NSString * const HBQueueDidCompleteNotification;
+extern NSString * const HBQueueDidChangeStateNotification;
 
 extern NSString * const HBQueueDidStartItemNotification;
 extern NSString * const HBQueueDidCompleteItemNotification;
-extern NSString * const HBQueueItemNotificationItemKey; // HBQueueItem
+extern NSString * const HBQueueItemNotificationItemKey; // HBQueueJobItem
 
 @interface HBQueue : NSObject
 
 - (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithURL:(NSURL *)queueURL;
+- (instancetype)initWithURL:(NSURL *)fileURL;
 
-@property (nonatomic, readonly) HBDistributedArray<HBQueueItem *> *items;
+@property (nonatomic, readonly) NSArray<id<HBQueueItem>> *items;
 
-@property (nonatomic, nullable) HBQueueItem *currentItem;
+@property (nonatomic, readonly) NSUInteger pendingItemsCount;
+@property (nonatomic, readonly) NSUInteger failedItemsCount;
+@property (nonatomic, readonly) NSUInteger completedItemsCount;
+@property (nonatomic, readonly) NSUInteger workingItemsCount;
 
-@property (nonatomic) NSUInteger pendingItemsCount;
-@property (nonatomic) NSUInteger failedItemsCount;
-@property (nonatomic) NSUInteger completedItemsCount;
+@property (nonatomic, readonly) NSUInteger workersCount;
 
 @property (nonatomic) NSUndoManager *undoManager;
 
 - (void)addJob:(HBJob *)job;
 - (void)addJobs:(NSArray<HBJob *> *)jobs;
 
-- (void)addItems:(NSArray<HBQueueItem *> *)items atIndexes:(NSIndexSet *)indexes;
-- (void)removeItemAtIndex:(NSUInteger)index;
+- (void)addItems:(NSArray<id<HBQueueItem>> *)items atIndexes:(NSIndexSet *)indexes;
 - (void)removeItemsAtIndexes:(NSIndexSet *)indexes;
-- (void)moveItems:(NSArray<HBQueueItem *> *)items toIndex:(NSUInteger)index;
+- (void)moveItems:(NSArray<id<HBQueueItem>> *)items toIndex:(NSUInteger)index;
 
 - (BOOL)itemExistAtURL:(NSURL *)url;
 
+- (void)prepareItemForEditingAtIndex:(NSUInteger)index;
+
 - (void)removeAllItems;
 - (void)removeCompletedAndCancelledItems;
 - (void)removeNotWorkingItems;
@@ -74,15 +68,14 @@
 - (void)resetAllItems;
 - (void)resetFailedItems;
 
-- (void)setEncodingJobsAsPending;
-
 @property (nonatomic, readonly) BOOL canEncode;
 @property (nonatomic, readonly) BOOL isEncoding;
 
 - (void)start;
-- (void)cancelCurrentItemAndContinue;
+- (void)cancelCurrentAndContinue;
+- (void)cancelCurrentAndStop;
 - (void)finishCurrentAndStop;
-- (void)cancelCurrentItemAndStop;
+- (void)cancelItemsAtIndexes:(NSIndexSet *)indexes;
 
 @property (nonatomic, readonly) BOOL canPause;
 - (void)pause;
@@ -90,6 +83,8 @@
 @property (nonatomic, readonly) BOOL canResume;
 - (void)resume;
 
+- (nullable HBQueueWorker *)workerForItem:(HBQueueJobItem *)item;
+
 @end
 
 NS_ASSUME_NONNULL_END

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueue.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueue.m Changed

@@ -6,13 +6,14 @@
 
 #import "HBQueue.h"
 #import "HBRemoteCore.h"
+#import "HBQueueWorker.h"
 
 #import "HBPreferencesKeys.h"
 #import "NSArray+HBAdditions.h"
-#import "HBJobOutputFileWriter.h"
+
+#import <IOKit/pwr_mgt/IOPMLib.h>
 
 static void *HBQueueContext = &HBQueueContext;
-static void *HBQueueLogLevelContext = &HBQueueLogLevelContext;
 
 NSString * const HBQueueDidChangeStateNotification = @"HBQueueDidChangeStateNotification";
 
@@ -20,23 +21,14 @@
 NSString * const HBQueueDidRemoveItemNotification = @"HBQueueDidRemoveItemNotification";
 NSString * const HBQueueDidChangeItemNotification = @"HBQueueDidChangeItemNotification";
 
-NSString * const HBQueueItemNotificationIndexesKey = @"HBQueueReloadItemsNotification";
+NSString * const HBQueueItemNotificationIndexesKey = @"HBQueueItemNotificationIndexesKey";
 
 NSString * const HBQueueDidMoveItemNotification = @"HBQueueDidMoveItemNotification";
 NSString * const HBQueueItemNotificationSourceIndexesKey = @"HBQueueItemNotificationSourceIndexesKey";
 NSString * const HBQueueItemNotificationTargetIndexesKey = @"HBQueueItemNotificationTargetIndexesKey";
 
-NSString * const HBQueueReloadItemsNotification = @"HBQueueReloadItemsNotification";
-
 NSString * const HBQueueLowSpaceAlertNotification = @"HBQueueLowSpaceAlertNotification";
 
-NSString * const HBQueueProgressNotification = @"HBQueueProgressNotification";
-NSString * const HBQueueProgressNotificationPercentKey = @"HBQueueProgressNotificationPercentKey";
-NSString * const HBQueueProgressNotificationHoursKey = @"HBQueueProgressNotificationHoursKey";
-NSString * const HBQueueProgressNotificationMinutesKey = @"HBQueueProgressNotificationMinutesKey";
-NSString * const HBQueueProgressNotificationSecondsKey = @"HBQueueProgressNotificationSecondsKey";
-NSString * const HBQueueProgressNotificationInfoKey = @"HBQueueProgressNotificationInfoKey";
-
 NSString * const HBQueueDidStartNotification = @"HBQueueDidStartNotification";
 NSString * const HBQueueDidCompleteNotification = @"HBQueueDidCompleteNotification";
 
@@ -46,68 +38,152 @@
 
 @interface HBQueue ()
 
-@property (nonatomic, readonly) HBRemoteCore *core;
-@property (nonatomic) BOOL stop;
+@property (nonatomic, readonly) NSURL *fileURL;
+
+@property (nonatomic, readonly) NSMutableArray<id<HBQueueItem>> *itemsInternal;
+@property (nonatomic, readonly) NSArray<HBQueueWorker *> *workers;
 
-@property (nonatomic, nullable) HBJobOutputFileWriter *currentLog;
+@property (nonatomic) IOPMAssertionID assertionID;
+
+@property (nonatomic) NSUInteger pendingItemsCount;
+@property (nonatomic) NSUInteger failedItemsCount;
+@property (nonatomic) NSUInteger completedItemsCount;
+@property (nonatomic) NSUInteger workingItemsCount;
 
 @end
 
 @implementation HBQueue
 
-- (instancetype)initWithURL:(NSURL *)queueURL
+- (void)setUpWorkers
 {
- self = super init;
- if (self)
+ NSArray<NSString *> *xpcServiceNames = @@"fr.handbrake.HandBrakeXPCService", @"fr.handbrake.HandBrakeXPCService2",
+ @"fr.handbrake.HandBrakeXPCService3", @"fr.handbrake.HandBrakeXPCService4";
+
+ NSMutableArray<HBQueueWorker *> *workers = NSMutableArray alloc init;
+ for (NSString *xpcServiceName in xpcServiceNames)
 {
- NSInteger loggingLevel = NSUserDefaults.standardUserDefaults integerForKey:HBLoggingLevel;
+ HBQueueWorker *worker = HBQueueWorker alloc initWithXPCServiceName:xpcServiceName;
+ workers addObject:worker;
+ }
+ _workers = workers copy;
+}
+
+- (void)setUpObservers
+{
+ for (HBQueueWorker *worker in _workers)
+ {
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueWorkerDidChangeStateNotification
+ object:worker
+ queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeStateNotification object:self;
+ };
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueWorkerDidStartItemNotification
+ object:worker
+ queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
+ self updateStats;
+ HBQueueJobItem *item = note.userInfoHBQueueWorkerItemNotificationItemKey;
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidStartItemNotification object:self userInfo:@{HBQueueItemNotificationItemKey: item};
+ };
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueWorkerDidCompleteItemNotification
+ object:worker
+ queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
+ self updateStats;
+ HBQueueJobItem *item = note.userInfoHBQueueWorkerItemNotificationItemKey;
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteItemNotification object:self userInfo:@{HBQueueItemNotificationItemKey: item};
+ self completedItem:item;
+ };
+ }
 
- // Init a separate instance of libhb for the queue
- _core = HBRemoteCore alloc initWithLogLevel:loggingLevel name:@"QueueCore";
- _core.automaticallyPreventSleep = NO;
+ NSUserDefaultsController.sharedUserDefaultsController addObserver:self forKeyPath:@"values.HBQueueWorkerCounts"
+ options:0 context:HBQueueContext;
+}
 
- _items = HBDistributedArray alloc initWithURL:queueURL class:HBQueueItem class;
- _undoManager = NSUndoManager alloc init;
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == HBQueueContext)
+ {
+ if (self.isEncoding)
+ {
+ self encodeNextQueueItem;
+ }
+ }
+ else
+ {
+ super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
+ }
+}
 
- // Set up the observers
- NSNotificationCenter defaultCenter addObserver:self selector:@selector(reloadQueue) name:HBDistributedArrayChanged object:_items;
+- (instancetype)initWithURL:(NSURL *)fileURL
+{
+ self = super init;
+ if (self)
+ {
+ _fileURL = fileURL;
+ _itemsInternal = self load;
+ _undoManager = NSUndoManager alloc init;
+ _assertionID = -1;
 
+ self setEncodingJobsAsPending;
+ self removeCompletedAndCancelledItems;
 self updateStats;
 
- // Set up observers
- self.core addObserver:self forKeyPath:@"state"
- options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
- context:HBQueueContext;
-
- NSUserDefaultsController.sharedUserDefaultsController addObserver:self forKeyPath:@"values.LoggingLevel"
- options:0 context:HBQueueLogLevelContext;
+ self setUpWorkers;
+ self setUpObservers;
 }
 return self;
 }
 
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+#pragma mark - Load and save
+
+- (NSMutableArray *)load
 {
- if (context == HBQueueContext)
- {
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeStateNotification object:self;
- }
- else if (context == HBQueueLogLevelContext)
+ NSError *error;
+
+ NSData *queue = NSData dataWithContentsOfURL:self.fileURL;
+ NSKeyedUnarchiver *unarchiver = NSKeyedUnarchiver alloc initForReadingWithData:queue;
+ unarchiver.requiresSecureCoding = YES;
+
+ NSSet *objectClasses = NSSet setWithObjects:NSMutableArray class, HBQueueJobItem class, HBQueueActionStopItem class, nil;
+
+ NSArray *loadedItems = unarchiver decodeTopLevelObjectOfClasses:objectClasses
+ forKey:NSKeyedArchiveRootObjectKey
+ error:&error;
+
+ if (error)
 {
- self.core.logLevel = NSUserDefaults.standardUserDefaults integerForKey:HBLoggingLevel;
+ HBUtilities writeErrorToActivityLog:error;
 }
- else
+
+ unarchiver finishDecoding;
+
+ return loadedItems ? loadedItems mutableCopy : NSMutableArray array;
+}
+
+- (void)save
+{
+ if (!NSKeyedArchiver archiveRootObject:self.itemsInternal toFile:self.fileURL.path)
 {
- super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
+ HBUtilities writeToActivityLog:"Failed to write the queue to disk";
 }
 }
 
-- (void)dealloc
+#pragma mark - Public methods
+
+- (NSArray<id<HBQueueItem>> *)items
 {
- self.core removeObserver:self forKeyPath:@"state";
- self.core invalidate;
+ return self.itemsInternal;
 }
 
-#pragma mark - Public methods
+- (NSUInteger)workersCount
+{
+ NSUInteger count = NSUserDefaults.standardUserDefaults integerForKey:HBQueueWorkerCounts;
+ return count > 0 && count <= 4 ? count : 1;
+}
 
 - (void)addJob:(HBJob *)item
 {
@@ -119,16 +195,21 @@
 {
 NSParameterAssert(jobs);
 
- NSMutableArray<HBQueueItem *> *itemsToAdd = NSMutableArray array;
+ NSMutableArray<HBQueueJobItem *> *itemsToAdd = NSMutableArray array;
 for (HBJob *job in jobs)
 {
- HBQueueItem *item = HBQueueItem alloc initWithJob:job;
+ HBQueueJobItem *item = HBQueueJobItem alloc initWithJob:job;
 itemsToAdd addObject:item;
 }
 if (itemsToAdd.count)
 {
- NSIndexSet *indexes = NSIndexSet indexSetWithIndexesInRange:NSMakeRange(self.items.count, itemsToAdd.count);
+ NSIndexSet *indexes = NSIndexSet indexSetWithIndexesInRange:NSMakeRange(self.itemsInternal.count, itemsToAdd.count);
 self addItems:itemsToAdd atIndexes:indexes;
+
+ if (self.isEncoding && self.countOfEncodings < self.workersCount)
+ {
+ self encodeNextQueueItem;
+ }
 }
 }
 
@@ -136,9 +217,10 @@
 {
 NSParameterAssert(url);
 
- for (HBQueueItem *item in self.items)
+ for (HBQueueJobItem *item in self.itemsInternal)
 {
- if ((item.state == HBQueueItemStateReady || item.state == HBQueueItemStateWorking)
+ if (item isKindOfClass:HBQueueJobItem class && 
+ (item.state == HBQueueItemStateReady || item.state == HBQueueItemStateWorking)
 && item.completeOutputURL isEqualTo:url)
 {
 return YES;
@@ -147,18 +229,17 @@
 return NO;
 }
 
-- (void)addItems:(NSArray<HBQueueItem *> *)items atIndexes:(NSIndexSet *)indexes
+- (void)addItems:(NSArray<id<HBQueueItem>> *)items atIndexes:(NSIndexSet *)indexes
 {
 NSParameterAssert(items);
 NSParameterAssert(indexes);
- self.items beginTransaction;
 
 // Forward
 NSUInteger currentIndex = indexes.firstIndex;
 NSUInteger currentObjectIndex = 0;
 while (currentIndex != NSNotFound)
 {
- self.items insertObject:itemscurrentObjectIndex atIndex:currentIndex;
+ self.itemsInternal insertObject:itemscurrentObjectIndex atIndex:currentIndex;
 currentIndex = indexes indexGreaterThanIndex:currentIndex;
 currentObjectIndex++;
 }
@@ -181,12 +262,24 @@
 }
 
 self updateStats;
- self.items commit;
+ self save;
 }
 
-- (void)removeItemAtIndex:(NSUInteger)index
+- (void)prepareItemForEditingAtIndex:(NSUInteger)index
 {
- self removeItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ HBQueueJobItem *item = self.itemsInternalindex;
+ NSIndexSet *indexes = NSIndexSet indexSetWithIndex:index;
+
+ if (item.state == HBQueueItemStateWorking)
+ {
+ self cancelItemsAtIndexes:indexes;
+ }
+
+ item.state = HBQueueItemStateRescanning;
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeItemNotification
+ object:self
+ userInfo:@{HBQueueItemNotificationIndexesKey: NSIndexSet indexSetWithIndex:index};
+ self updateStats;
 }
 
 - (void)removeItemsAtIndexes:(NSIndexSet *)indexes
@@ -198,13 +291,11 @@
 return;
 }
 
- self.items beginTransaction;
+ NSArray<id<HBQueueItem>> *removeItems = self.itemsInternal objectsAtIndexes:indexes;
 
- NSArray<HBQueueItem *> *removeItems = self.items objectsAtIndexes:indexes;
-
- if (self.items.count > indexes.lastIndex)
+ if (self.itemsInternal.count > indexes.lastIndex)
 {
- self.items removeObjectsAtIndexes:indexes;
+ self.itemsInternal removeObjectsAtIndexes:indexes;
 }
 
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidRemoveItemNotification object:self userInfo:@{HBQueueItemNotificationIndexesKey: indexes};
@@ -225,27 +316,25 @@
 }
 
 self updateStats;
- self.items commit;
+ self save;
 }
 
-- (void)moveItems:(NSArray<HBQueueItem *> *)items toIndex:(NSUInteger)index
+- (void)moveItems:(NSArray<id<HBQueueItem>> *)items toIndex:(NSUInteger)index
 {
- self.items beginTransaction;
-
 NSMutableArray<NSNumber *> *source = NSMutableArray array;
 NSMutableArray<NSNumber *> *dest = NSMutableArray array;
 
 for (id object in items.reverseObjectEnumerator)
 {
- NSUInteger sourceIndex = self.items indexOfObject:object;
- self.items removeObjectAtIndex:sourceIndex;
+ NSUInteger sourceIndex = self.itemsInternal indexOfObject:object;
+ self.itemsInternal removeObjectAtIndex:sourceIndex;
 
 if (sourceIndex < index)
 {
 index--;
 }
 
- self.items insertObject:object atIndex:index;
+ self.itemsInternal insertObject:object atIndex:index;
 
 source addObject:@(index);
 dest addObject:@(sourceIndex);
@@ -271,13 +360,11 @@
 }
 }
 
- self.items commit;
+ self save;
 }
 
 - (void)moveQueueItemsAtIndexes:(NSArray *)source toIndexes:(NSArray *)dest
 {
- self.items beginTransaction;
-
 NSMutableArray<NSNumber *> *newSource = NSMutableArray array;
 NSMutableArray<NSNumber *> *newDest = NSMutableArray array;
 
@@ -289,9 +376,9 @@
 newSource addObject:@(destIndex);
 newDest addObject:@(sourceIndex);
 
- id obj = self.items objectAtIndex:sourceIndex;
- self.items removeObjectAtIndex:sourceIndex;
- self.items insertObject:obj atIndex:destIndex;
+ id obj = self.itemsInternal objectAtIndex:sourceIndex;
+ self.itemsInternal removeObjectAtIndex:sourceIndex;
+ self.itemsInternal insertObject:obj atIndex:destIndex;
 }
 
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidMoveItemNotification
@@ -314,7 +401,7 @@
 }
 }
 
- self.items commit;
+ self save;
 }
 
 /**
@@ -323,13 +410,12 @@
 */
 - (void)removeCompletedAndCancelledItems
 {
- self.items beginTransaction;
- NSIndexSet *indexes = self.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
+ NSIndexSet *indexes = self.itemsInternal HB_indexesOfObjectsUsingBlock:^BOOL(id<HBQueueItem> item) {
 return (item.state == HBQueueItemStateCompleted || item.state == HBQueueItemStateCanceled);
 };
 self removeItemsAtIndexes:indexes;
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidRemoveItemNotification object:self userInfo:@{@"indexes": indexes};
- self.items commit;
+ self save;
 }
 
 /**
@@ -337,47 +423,36 @@
 */
 - (void)removeAllItems
 {
- self.items beginTransaction;
- self removeItemsAtIndexes:NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, self.items.count);
- self.items commit;
+ self removeItemsAtIndexes:NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, self.itemsInternal.count);
+ self save;
 }
 
 - (void)removeNotWorkingItems
 {
- self.items beginTransaction;
- NSIndexSet *indexes = self.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
- return (item.state != HBQueueItemStateWorking);
+ NSIndexSet *indexes = self.itemsInternal HB_indexesOfObjectsUsingBlock:^BOOL(id<HBQueueItem> item) {
+ return (item.state != HBQueueItemStateWorking && item.state != HBQueueItemStateRescanning);
 };
 self removeItemsAtIndexes:indexes;
- self.items commit;
 }
 
 - (void)removeCompletedItems
 {
- self.items beginTransaction;
- NSIndexSet *indexes = self.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
+ NSIndexSet *indexes = self.itemsInternal HB_indexesOfObjectsUsingBlock:^BOOL(id<HBQueueItem> item) {
 return (item.state == HBQueueItemStateCompleted);
 };
 self removeItemsAtIndexes:indexes;
- self.items commit;
 }
 
 - (void)resetItemsAtIndexes:(NSIndexSet *)indexes
 {
- if (self.items beginTransaction == HBDistributedArrayContentReload)
- {
- // Do not execute the action if the array changed.
- self.items commit;
- return;
- }
-
 NSMutableIndexSet *updatedIndexes = NSMutableIndexSet indexSet;
 
 NSUInteger currentIndex = indexes.firstIndex;
 while (currentIndex != NSNotFound) {
- HBQueueItem *item = self.itemscurrentIndex;
+ id<HBQueueItem> item = self.itemsInternalcurrentIndex;
 
- if (item.state == HBQueueItemStateCanceled || item.state == HBQueueItemStateCompleted || item.state == HBQueueItemStateFailed)
+ if (item.state == HBQueueItemStateCanceled || item.state == HBQueueItemStateCompleted ||
+ item.state == HBQueueItemStateFailed || item.state == HBQueueItemStateRescanning)
 {
 item.state = HBQueueItemStateReady;
 updatedIndexes addIndex:currentIndex;
@@ -387,27 +462,23 @@
 
 self updateStats;
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeItemNotification object:self userInfo:@{HBQueueItemNotificationIndexesKey: indexes};
- self.items commit;
+ self save;
 }
 
 - (void)resetAllItems
 {
- self.items beginTransaction;
- NSIndexSet *indexes = self.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
- return (item.state != HBQueueItemStateWorking);
+ NSIndexSet *indexes = self.itemsInternal HB_indexesOfObjectsUsingBlock:^BOOL(id<HBQueueItem> item) {
+ return (item.state != HBQueueItemStateWorking && item.state != HBQueueItemStateRescanning);
 };
 self resetItemsAtIndexes:indexes;
- self.items commit;
 }
 
 - (void)resetFailedItems
 {
- self.items beginTransaction;
- NSIndexSet *indexes = self.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
+ NSIndexSet *indexes = self.itemsInternal HB_indexesOfObjectsUsingBlock:^BOOL(id<HBQueueItem> item) {
 return (item.state == HBQueueItemStateFailed);
 };
 self resetItemsAtIndexes:indexes;
- self.items commit;
 }
 
 /**
@@ -416,14 +487,12 @@
 */
 - (void)setEncodingJobsAsPending
 {
- self.items beginTransaction;
-
 NSMutableIndexSet *indexes = NSMutableIndexSet indexSet;
 NSUInteger idx = 0;
- for (HBQueueItem *item in self.items)
+ for (id<HBQueueItem> item in self.itemsInternal)
 {
 // We want to keep any queue item that is pending or was previously being encoded
- if (item.state == HBQueueItemStateWorking)
+ if (item.state == HBQueueItemStateWorking || item.state == HBQueueItemStateRescanning)
 {
 item.state = HBQueueItemStateReady;
 indexes addIndex:idx;
@@ -432,8 +501,7 @@
 }
 
 self updateStats;
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeItemNotification object:self userInfo:@{HBQueueItemNotificationIndexesKey: indexes};
- self.items commit;
+ self save;
 }
 
 - (BOOL)canEncode
@@ -443,70 +511,148 @@
 
 - (BOOL)isEncoding
 {
- HBState s = self.core.state;
- return self.currentItem || (s == HBStateScanning) || (s == HBStatePaused) || (s == HBStateWorking) || (s == HBStateMuxing) || (s == HBStateSearching);
+ BOOL isEncoding = NO;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ isEncoding |= worker.isEncoding;
+ }
+
+ return isEncoding;
+}
+
+- (NSUInteger)countOfEncodings
+{
+ NSUInteger count = 0;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ count += worker.isEncoding ? 1 : 0;
+ }
+
+ return count;
 }
 
 - (BOOL)canPause
 {
- HBState s = self.core.state;
- return (s == HBStateWorking || s == HBStateMuxing);
+ BOOL canPause = NO;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ if (worker.isEncoding)
+ {
+ canPause |= worker.canPause;
+ }
+ }
+
+ return canPause;
 }
 
 - (void)pause
 {
- self.currentItem pausedAtDate:NSDate date;
- self.core pause;
- self.core allowSleep;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ if (worker.canPause)
+ {
+ worker pause;
+ }
+ }
+ self allowSleep;
 }
 
 - (BOOL)canResume
 {
- return self.core.state == HBStatePaused;
+ BOOL canResume = NO;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ if (worker.isEncoding)
+ {
+ canResume |= worker.canResume;
+ }
+ }
+
+ return canResume;
 }
 
 - (void)resume
 {
- self.currentItem resumedAtDate:NSDate date;
- self.core resume;
- self.core preventSleep;
+ for (HBQueueWorker *worker in self.workers)
+ {
+ if (worker.canResume)
+ {
+ worker resume;
+ }
+ }
+ self preventSleep;
 }
 
-#pragma mark - Private queue editing methods
+#pragma mark - Sleep
 
-/**
- * Reloads the queue, this is called
- * when another HandBrake instance modifies the queue
- */
-- (void)reloadQueue
+- (void)preventSleep
 {
- self updateStats;
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueReloadItemsNotification object:self;
+ if (_assertionID != -1)
+ {
+ // nothing to do
+ return;
+ }
+
+ CFStringRef reasonForActivity= CFSTR("HandBrake is currently scanning and/or encoding");
+
+ IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertPreventUserIdleSystemSleep,
+ kIOPMAssertionLevelOn, reasonForActivity, &_assertionID);
+
+ if (success != kIOReturnSuccess)
+ {
+ HBUtilities writeToActivityLog:"HBRemoteCore: failed to prevent system sleep";
+ }
+}
+
+- (void)allowSleep
+{
+ if (_assertionID == -1)
+ {
+ // nothing to do
+ return;
+ }
+
+ IOReturn success = IOPMAssertionRelease(_assertionID);
+
+ if (success == kIOReturnSuccess)
+ {
+ _assertionID = -1;
+ }
 }
 
+#pragma mark - Private queue editing methods
+
 - (void)updateStats
 {
- NSUInteger pendingCount = 0, failedCount = 0, completedCount = 0;
+ NSUInteger pendingCount = 0, failedCount = 0, completedCount = 0, workingCount = 0;
 
- for (HBQueueItem *item in self.items)
+ for (HBQueueJobItem *item in self.itemsInternal)
 {
- if (item.state == HBQueueItemStateReady)
- {
- pendingCount++;
- }
- else if (item.state == HBQueueItemStateCompleted)
- {
- completedCount++;
- }
- else if (item.state == HBQueueItemStateFailed)
+ if (item isKindOfClass:HBQueueJobItem class)
 {
- failedCount++;
+ if (item.state == HBQueueItemStateReady)
+ {
+ pendingCount++;
+ }
+ else if (item.state == HBQueueItemStateCompleted)
+ {
+ completedCount++;
+ }
+ else if (item.state == HBQueueItemStateFailed)
+ {
+ failedCount++;
+ }
+ else if (item.state == HBQueueItemStateWorking)
+ {
+ workingCount++;
+ }
 }
 }
 
 self.pendingItemsCount = pendingCount;
 self.failedItemsCount = failedCount;
 self.completedItemsCount = completedCount;
+ self.workingItemsCount = workingCount;
 
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeStateNotification object:self;
 }
@@ -542,9 +688,9 @@
 /**
 * Used to get the next pending queue item and return it if found
 */
-- (HBQueueItem *)getNextPendingQueueItem
+- (id<HBQueueItem>)nextPendingQueueItem
 {
- for (HBQueueItem *item in self.items)
+ for (id<HBQueueItem> item in self.itemsInternal)
 {
 if (item.state == HBQueueItemStateReady)
 {
@@ -554,12 +700,37 @@
 return nil;
 }
 
+- (HBQueueWorker *)firstAvailableWorker
+{
+ for (HBQueueWorker *worker in self.workers)
+ {
+ if (worker.isEncoding == NO)
+ {
+ return worker;
+ }
+ }
+ return nil;
+}
+
+- (void)addStopAction
+{
+
+ id<HBQueueItem> nextItem = self.nextPendingQueueItem;
+ NSUInteger index = nextItem ? self.itemsInternal indexOfObject:nextItem : self.itemsInternal.count;
+
+ if (nextItem isKindOfClass:HBQueueActionStopItem class == NO)
+ {
+ HBQueueActionStopItem *stopItem = HBQueueActionStopItem alloc init;
+ self addItems:@stopItem atIndexes:NSIndexSet indexSetWithIndex:index;
+ }
+}
+
 - (void)start
 {
 if (self.canEncode)
 {
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidStartNotification object:self;
- self.core preventSleep;
+ self preventSleep;
 self encodeNextQueueItem;
 }
 }
@@ -569,267 +740,142 @@
 */
 - (void)encodeNextQueueItem
 {
- self.items beginTransaction;
+ id<HBQueueItem> nextItem = self.nextPendingQueueItem;
 
 // since we have completed an encode, we go to the next
- if (self.stop)
+ if (nextItem isKindOfClass:HBQueueActionStopItem class)
 {
- HBUtilities writeToActivityLog:"Queue manually stopped";
-
- self.stop = NO;
- self.core allowSleep;
-
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteNotification object:self;
+ if (self.isEncoding == NO)
+ {
+ HBUtilities writeToActivityLog:"Queue manually stopped";
+ NSUInteger index = self.itemsInternal indexOfObject:nextItem;
+ self removeItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ self allowSleep;
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteNotification object:self;
+ }
 }
 else
 {
 // Check to see if there are any more pending items in the queue
- HBQueueItem *nextItem = self getNextPendingQueueItem;
+ HBQueueJobItem *nextJobItem = self.nextPendingQueueItem;
+ HBQueueWorker *worker = self.firstAvailableWorker;
 
- if (nextItem && self isDiskSpaceLowAtURL:nextItem.outputURL)
+ if (nextJobItem && self isDiskSpaceLowAtURL:nextJobItem.outputURL)
 {
- // Disk space is low, show an alert
 HBUtilities writeToActivityLog:"Queue Stopped, low space on destination disk";
- self.core allowSleep;
+ self allowSleep;
+
+ if (self.isEncoding == NO)
+ {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteNotification object:self;
+ }
+ else
+ {
+ self pause;
+ }
 
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteNotification object:self;
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueLowSpaceAlertNotification object:self;
 }
 // If we still have more pending items in our queue, lets go to the next one
- else if (nextItem)
+ else if (nextJobItem && worker && self.countOfEncodings < self.workersCount)
 {
- // now we mark the queue item as working so another instance can not come along and try to scan it while we are scanning
- nextItem.startedDate = NSDate date;
- nextItem.state = HBQueueItemStateWorking;
+ worker encodeItem:nextJobItem;
 
- // Tell HB to output a new activity log file for this encode
- self.currentLog = HBJobOutputFileWriter alloc initWithJob:nextItem.job;
- if (self.currentLog)
- {
- nextItem.activityLogURL = self.currentLog.url;
+ // Erase undo manager history
+ self.undoManager removeAllActions;
 
- dispatch_queue_t mainQueue = dispatch_get_main_queue();
- self.core.stderrRedirect addListener:self.currentLog queue:mainQueue;
- self.core.stdoutRedirect addListener:self.currentLog queue:mainQueue;
+ if (self.firstAvailableWorker)
+ {
+ self encodeNextQueueItem;
 }
-
- self.currentItem = nextItem;
- NSIndexSet *indexes = NSIndexSet indexSetWithIndex:self.items indexOfObject:nextItem;
-
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidStartItemNotification object:self userInfo:@{HBQueueItemNotificationItemKey: nextItem,
- HBQueueItemNotificationIndexesKey: indexes};
-
- // now we can go ahead and scan the new pending queue item
- self encodeItem:nextItem;
-
- // erase undo manager history
- self.undoManager removeAllActions;
 }
- else
+ else if (self.isEncoding == NO)
 {
 HBUtilities writeToActivityLog:"Queue Done, there are no more pending encodes";
- self.core allowSleep;
+ self allowSleep;
 
 NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteNotification object:self;
 }
 }
 
- self updateStats;
-
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidChangeStateNotification object:self;
-
- self.items commit;
+ self save;
 }
 
-- (void)completedItem:(HBQueueItem *)item result:(HBCoreResult)result
+- (void)completedItem:(id<HBQueueItem>)item
 {
 NSParameterAssert(item);
- self.items beginTransaction;
-
- item.endedDate = NSDate date;
-
- // Since we are done with this encode, tell output to stop writing to the
- // individual encode log.
- self.core.stderrRedirect removeListener:self.currentLog;
- self.core.stdoutRedirect removeListener:self.currentLog;
-
- self.currentLog = nil;
-
- // Mark the encode just finished
- switch (result) {
- case HBCoreResultDone:
- item.state = HBQueueItemStateCompleted;
- break;
- case HBCoreResultCanceled:
- item.state = HBQueueItemStateCanceled;
- break;
- default:
- item.state = HBQueueItemStateFailed;
- break;
- }
-
- // Update UI
- NSString *info = nil;
- switch (result) {
- case HBCoreResultDone:
- info = NSLocalizedString(@"Encode Finished.", @"Queue status");
- break;
- case HBCoreResultCanceled:
- info = NSLocalizedString(@"Encode Canceled.", @"Queue status");
- break;
- default:
- info = NSLocalizedString(@"Encode Failed.", @"Queue status");
- break;
- }
-
- self.currentItem = nil;
-
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueProgressNotification object:self userInfo:@{HBQueueProgressNotificationPercentKey: @1.0,
- HBQueueProgressNotificationInfoKey: info};
-
- NSUInteger index = self.items indexOfObject:item;
- NSIndexSet *indexes = index != NSNotFound ? NSIndexSet indexSetWithIndex:index : NSIndexSet indexSet;
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueDidCompleteItemNotification object:self userInfo:@{HBQueueItemNotificationItemKey: item,
- HBQueueItemNotificationIndexesKey: indexes};
-
- self.items commit;
+ self save;
+ self encodeNextQueueItem;
 }
 
 /**
- * Here we actually tell hb_scan to perform the source scan, using the path to source and title number
+ * Cancels the current job
 */
-- (void)encodeItem:(HBQueueItem *)item
+- (void)doCancelAll
 {
- NSParameterAssert(item);
-
- // Progress handler
- void (^progressHandler)(HBState state, HBProgress progress, NSString *info) = ^(HBState state, HBProgress progress, NSString *info)
+ for (HBQueueWorker *worker in self.workers)
 {
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueProgressNotification object:self userInfo:@{HBQueueProgressNotificationPercentKey: @0,
- HBQueueProgressNotificationInfoKey: info};
- };
-
- // Completion handler
- void (^completionHandler)(HBCoreResult result) = ^(HBCoreResult result)
- {
- if (result == HBCoreResultDone)
+ if (worker.isEncoding)
 {
- self realEncodeItem:item;
+ worker cancel;
 }
- else
- {
- self completedItem:item result:result;
- self encodeNextQueueItem;
- }
- };
-
- item.job refreshSecurityScopedResources;
-
- // Only scan 10 previews before an encode - additional previews are
- // only useful for autocrop and static previews, which are already taken care of at this point
- self.core scanURL:item.fileURL
- titleIndex:item.job.titleIdx
- previews:10
- minDuration:0
- keepPreviews:NO
- progressHandler:progressHandler
- completionHandler:completionHandler;
+ }
 }
 
 /**
- * This assumes that we have re-scanned and loaded up a new queue item to send to libhb
+ * Cancels the current job and starts processing the next in queue.
 */
-- (void)realEncodeItem:(HBQueueItem *)item
+- (void)cancelCurrentAndContinue
 {
- NSParameterAssert(item);
-
- HBJob *job = item.job;
-
- NSParameterAssert(job);
-
- // Progress handler
- void (^progressHandler)(HBState state, HBProgress progress, NSString *info) = ^(HBState state, HBProgress progress, NSString *info)
- {
- if (state == HBStateMuxing)
- {
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueProgressNotification
- object:self
- userInfo:@{HBQueueProgressNotificationPercentKey: @1,
- HBQueueProgressNotificationInfoKey: info};
- }
- else
- {
- NSNotificationCenter.defaultCenter postNotificationName:HBQueueProgressNotification
- object:self
- userInfo:@{HBQueueProgressNotificationPercentKey: @(progress.percent),
- HBQueueProgressNotificationHoursKey: @(progress.hours),
- HBQueueProgressNotificationMinutesKey: @(progress.minutes),
- HBQueueProgressNotificationSecondsKey: @(progress.seconds),
- HBQueueProgressNotificationInfoKey: info};
- }
- };
-
- // Completion handler
- void (^completionHandler)(HBCoreResult result) = ^(HBCoreResult result)
- {
- self completedItem:item result:result;
-
- if (NSUserDefaults.standardUserDefaults boolForKey:HBQueueAutoClearCompletedItems)
- {
- self removeCompletedItems;
- }
-
- self encodeNextQueueItem;
- };
-
- // We should be all setup so let 'er rip
- self.core encodeJob:job progressHandler:progressHandler completionHandler:completionHandler;
+ self doCancelAll;
 }
 
 /**
- * Cancels the current job
+ * Cancels the current job and stops libhb from processing the remaining encodes.
 */
-- (void)doCancelCurrentItem
+- (void)cancelCurrentAndStop
 {
- if (self.core.state == HBStateScanning)
+ if (self.isEncoding)
 {
- self.core cancelScan;
- }
- else
- {
- self.core cancelEncode;
+ self addStopAction;
+ self doCancelAll;
 }
 }
 
 /**
- * Cancels the current job and starts processing the next in queue.
+ * Finishes the current job and stops libhb from processing the remaining encodes.
 */
-- (void)cancelCurrentItemAndContinue
+- (void)finishCurrentAndStop
 {
- self doCancelCurrentItem;
+ if (self.isEncoding)
+ {
+ self addStopAction;
+ }
 }
 
-/**
- * Cancels the current job and stops libhb from processing the remaining encodes.
- */
-- (void)cancelCurrentItemAndStop
+- (void)cancelItemsAtIndexes:(NSIndexSet *)indexes
 {
- if (self.core.state != HBStateIdle)
- {
- self.stop = YES;
- self doCancelCurrentItem;
+ NSArray<id<HBQueueItem>> *items = self.items objectsAtIndexes:indexes;
+
+ for (HBQueueJobItem *item in items) {
+ for (HBQueueWorker *worker in self.workers) {
+ if (worker.item == item) {
+ worker cancel;
+ }
+ }
 }
 }
 
-/**
- * Finishes the current job and stops libhb from processing the remaining encodes.
- */
-- (void)finishCurrentAndStop
+- (nullable HBQueueWorker *)workerForItem:(HBQueueJobItem *)item
 {
- if (self.core.state != HBStateIdle)
+ for (HBQueueWorker *worker in self.workers)
 {
- self.stop = YES;
+ if (worker.item == item)
+ {
+ return worker;
+ }
 }
+ return nil;
 }
 
 @end

HandBrake-1.5.1.tar.xz/macosx/HBQueueActionItem.h Added

HandBrake-1.5.1.tar.xz/macosx/HBQueueActionItem.m Added

@@ -0,0 +1,68 @@
+/* HBQueueActionItem.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBQueueActionItem.h"
+#import "HBCodingUtilities.h"
+
+@implementation HBQueueActionStopItem
+
+#pragma mark - NSSecureCoding
+
+- (instancetype)init
+{
+ self = super init;
+ if (self) {
+ _state = HBQueueItemStateReady;
+ }
+ return self;
+}
+
+- (NSString *)title
+{
+ return NSLocalizedString(@"Stop", @"Queue -> Stop action");
+}
+
+- (BOOL)hasFileRepresentation
+{
+ return NO;
+}
+
+- (NSAttributedString *)attributedDescription
+{
+ return NSAttributedString alloc initWithString:NSLocalizedString(@"Stop action.", @"Queue -> Stop action")
+ attributes:@{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize};
+}
+
+- (NSImage *)image
+{
+ return NSImage imageNamed:@"EncodeCanceled";
+}
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+static NSString *versionKey = @"HBQueueActionItemVersion";
+
+- (void)encodeWithCoder:(nonnull NSCoder *)coder {
+ coder encodeInt:1 forKey:versionKey;
+ encodeInteger(_state);
+}
+
+- (nullable instancetype)initWithCoder:(nonnull NSCoder *)decoder {
+ int version = decoder decodeIntForKey:versionKey;
+
+ if (version == 1 && (self = super init))
+ {
+ decodeInteger(_state); if (_state < HBQueueItemStateReady || _state > HBQueueItemStateRescanning) { goto fail; }
+ return self;
+ }
+fail:
+ return nil;
+}
+
+@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueController.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueController.m Changed

@@ -9,18 +9,18 @@
 #import "HBAppDelegate.h"
 
 #import "HBQueue.h"
+#import "HBQueueWorker.h"
 #import "HBQueueTableViewController.h"
 #import "HBQueueDetailsViewController.h"
 #import "HBQueueInfoViewController.h"
 #import "HBQueueMultiSelectionViewController.h"
 
-#import "HBDockTile.h"
 #import "HBPreferencesKeys.h"
 #import "NSArray+HBAdditions.h"
 
 @import HandBrakeKit;
 
-@interface HBQueueController () <NSUserNotificationCenterDelegate, HBQueueTableViewControllerDelegate, HBQueueDetailsViewControllerDelegate>
+@interface HBQueueController () <NSToolbarItemValidation, NSMenuItemValidation, NSUserNotificationCenterDelegate, HBQueueTableViewControllerDelegate, HBQueueDetailsViewControllerDelegate>
 
 @property (nonatomic) NSSplitViewController *splitViewController;
 @property (nonatomic) HBQueueTableViewController *tableViewController;
@@ -32,11 +32,11 @@
 /// useful to avoid updating the UI needlessly
 @property (nonatomic) BOOL visible;
 
-@property (nonatomic, readonly) HBDockTile *dockTile;
-
 @property (nonatomic) IBOutlet NSToolbarItem *ripToolbarItem;
 @property (nonatomic) IBOutlet NSToolbarItem *pauseToolbarItem;
 
+@property (nonatomic, readonly) dispatch_queue_t sendQueue;
+
 @end
 
 @interface HBQueueController (TouchBar) <NSTouchBarProvider, NSTouchBarDelegate>
@@ -54,11 +54,9 @@
 if (self = super initWithWindowNibName:@"Queue")
 {
 _queue = queue;
+ _sendQueue = dispatch_queue_create("fr.handbrake.SendToQueue", DISPATCH_QUEUE_SERIAL);
 
- // Load the dockTile and instantiate initial text fields
- _dockTile = HBDockTile alloc initWithDockTile:NSApplication.sharedApplication.dockTile
- image:NSApplication.sharedApplication.applicationIconImage;
- __block double dockIconProgress;
+ NSUserNotificationCenter.defaultUserNotificationCenter.delegate = self;
 
 NSNotificationCenter.defaultCenter addObserverForName:HBQueueLowSpaceAlertNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
 self queueLowDiskSpaceAlert;
@@ -68,30 +66,9 @@
 self queueCompletedAlerts;
 };
 
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueProgressNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
- // Update dock icon
- double progress = note.userInfoHBQueueProgressNotificationPercentKey doubleValue;
-
-#define dockTileUpdateFrequency 0.1f
-
- if (dockIconProgress < 100.0 * progress)
- {
- double hours = note.userInfoHBQueueProgressNotificationHoursKey doubleValue;
- double minutes = note.userInfoHBQueueProgressNotificationMinutesKey doubleValue;
- double seconds = note.userInfoHBQueueProgressNotificationSecondsKey doubleValue;
-
- self.dockTile updateDockIcon:progress hours:hours minutes:minutes seconds:seconds;
- dockIconProgress += dockTileUpdateFrequency;
- }
- };
-
 NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteItemNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
- // Restore dock icon
- self.dockTile updateDockIcon:-1.0 withETA:@"";
- dockIconProgress = 0;
-
 // Run the per item notification and actions
- HBQueueItem *item = note.userInfoHBQueueItemNotificationItemKey;
+ HBQueueJobItem *item = note.userInfoHBQueueItemNotificationItemKey;
 if (item.state == HBQueueItemStateCompleted)
 {
 self sendToExternalApp:item;
@@ -102,8 +79,6 @@
 self itemCompletedAlerts:item;
 }
 };
-
- NSUserNotificationCenter.defaultUserNotificationCenter.delegate = self;
 }
 
 return self;
@@ -116,9 +91,12 @@
 
 - (void)windowDidLoad
 {
- if (@available (macOS 10.12, *))
+ self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+
+ if (@available (macOS 11, *))
 {
- self.window.tabbingMode = NSWindowTabbingModeDisallowed;
+ self.window.toolbarStyle = NSWindowToolbarStyleUnified;
+ self.window.titlebarSeparatorStyle = NSTitlebarSeparatorStyleLine;
 }
 
 // Set up the child view controllers
@@ -154,8 +132,8 @@
 NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidChangeStateNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
 self updateUI;
 };
- self updateUI;
 
+ self updateUI;
 self tableViewDidSelectItemsAtIndexes:NSIndexSet indexSet;
 }
 
@@ -164,29 +142,35 @@
 self updateToolbarButtonsState;
 self.window.toolbar validateVisibleItems;
 
- if (@available(macOS 10.12.2, *))
- {
- self _touchBar_updateButtonsState;
- self _touchBar_validateUserInterfaceItems;
- }
+ self _touchBar_updateButtonsState;
+ self _touchBar_validateUserInterfaceItems;
 
- NSString *string;
+ NSString *subtitle;
 if (self.queue.pendingItemsCount == 0)
 {
 self.window.title = NSLocalizedString(@"Queue", @"Queue window title");
+ subtitle = NSLocalizedString(@"No encode pending", @"Queue status");
 }
 else
 {
 if (self.queue.pendingItemsCount == 1)
 {
- string = NSString stringWithFormat: NSLocalizedString(@"%d encode pending", @"Queue status"), self.queue.pendingItemsCount;
+ subtitle = NSString stringWithFormat: NSLocalizedString(@"%lu encode pending", @"Queue status"), (unsigned long)self.queue.pendingItemsCount;
 }
 else
 {
- string = NSString stringWithFormat: NSLocalizedString(@"%d encodes pending", @"Queue status"), self.queue.pendingItemsCount;
+ subtitle = NSString stringWithFormat: NSLocalizedString(@"%lu encodes pending", @"Queue status"), (unsigned long)self.queue.pendingItemsCount;
 }
 
- self.window.title = NSString stringWithFormat: NSLocalizedString(@"Queue (%@)", @"Queue window title"), string;
+ if (@available(macOS 11, *)) {} else
+ {
+ self.window.title = NSString stringWithFormat: NSLocalizedString(@"Queue (%@)", @"Queue window title"), subtitle;
+ }
+ }
+
+ if (@available(macOS 11, *))
+ {
+ self.window.subtitle = subtitle;
 }
 }
 
@@ -305,115 +289,86 @@
 */
 - (void)removeQueueItemsAtIndexes:(NSIndexSet *)indexes
 {
- if (self.queue.items beginTransaction == HBDistributedArrayContentReload)
- {
- // Do not execture the action if the array changed.
- self.queue.items commit;
- return;
- }
-
 if (indexes.count)
 {
 NSMutableIndexSet *mutableIndexes = indexes mutableCopy;
 // if this is a currently encoding job, we need to be sure to alert the user,
 // to let them decide to cancel it first, then if they do, we can come back and
 // remove it
- NSIndexSet *workingIndexes = self.queue.items indexesOfObjectsUsingBlock:^BOOL(HBQueueItem *item) {
+ NSIndexSet *workingIndexes = self.queue.items HB_indexesOfObjectsUsingBlock:^BOOL(HBQueueJobItem *item) {
 return item.state == HBQueueItemStateWorking;
 };
 
- if (mutableIndexes containsIndexes:workingIndexes)
+ NSIndexSet *workingSelectedIndexes = workingIndexes HB_intersectionWith:indexes;
+ mutableIndexes removeIndexes:workingSelectedIndexes;
+
+ if (workingSelectedIndexes.count)
 {
- mutableIndexes removeIndexes:workingIndexes;
- NSArray<HBQueueItem *> *workingItems = self.queue.items filteredArrayUsingBlock:^BOOL(HBQueueItem *item) {
- return item.state == HBQueueItemStateWorking;
- };
+ NSString *alertTitle = NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It?", @"Queue Stop Alert -> stop and remove message");
+
+ // Which window to attach the sheet to?
+ NSWindow *targetWindow = self.window;
 
- if (self.queue.currentItem && workingItems containsObject:self.queue.currentItem)
+ NSAlert *alert = NSAlert alloc init;
+ alert setMessageText:alertTitle;
+ alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Stop Alert -> stop and remove informative text");
+ alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Stop Alert -> stop and remove first button");
+ alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", @"Queue Stop Alert -> stop and remove second button");
+ if (@available(macOS 11, *))
 {
- NSString *alertTitle = NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Remove It?", @"Queue Stop Alert -> stop and remove message");
-
- // Which window to attach the sheet to?
- NSWindow *targetWindow = self.window;
-
- NSAlert *alert = NSAlert alloc init;
- alert setMessageText:alertTitle;
- alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Stop Alert -> stop and remove informative text");
- alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Stop Alert -> stop and remove first button");
- alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Delete", @"Queue Stop Alert -> stop and remove second button");
- alert setAlertStyle:NSAlertStyleCritical;
-
- alert beginSheetModalForWindow:targetWindow completionHandler:^(NSModalResponse returnCode) {
- if (returnCode == NSAlertSecondButtonReturn)
- {
- self.queue.items beginTransaction;
-
- NSInteger index = self.queue.items indexOfObject:self.queue.currentItem;
- self.queue cancelCurrentItemAndContinue;
-
- self.queue removeItemAtIndex:index;
- self.queue.items commit;
- }
- };
+ alert.buttons.lastObject.hasDestructiveAction = true;
 }
+ alert setAlertStyle:NSAlertStyleCritical;
+
+ alert beginSheetModalForWindow:targetWindow completionHandler:^(NSModalResponse returnCode) {
+ if (returnCode == NSAlertSecondButtonReturn)
+ {
+ self.queue cancelItemsAtIndexes:workingSelectedIndexes;
+ self.queue removeItemsAtIndexes:workingSelectedIndexes;
+ }
+ };
 }
 
 // remove the non working items immediately
 self.queue removeItemsAtIndexes:mutableIndexes;
 }
- self.queue.items commit;
 }
 
-- (void)doEditQueueItem:(HBQueueItem *)item
+- (void)doEditQueueItem:(HBQueueJobItem *)item
 {
- NSParameterAssert(item);
- self.queue.items beginTransaction;
-
- if (item == self.queue.currentItem)
- {
- self.queue cancelCurrentItemAndContinue;
- }
- else
- {
- item.state = HBQueueItemStateWorking;
- }
+ self.queue prepareItemForEditingAtIndex:self.queue.items indexOfObject:item;
 
 self.delegate openJob:item.job copy completionHandler:^(BOOL result) {
- self.queue.items beginTransaction;
- if (result)
+ NSInteger index = self.queue.items indexOfObject:item;
+ if (index != NSNotFound)
 {
- // Now that source is loaded and settings applied, delete the queue item from the queue
- NSInteger index = self.queue.items indexOfObject:item;
- item.state = HBQueueItemStateReady;
- self.queue removeItemAtIndex:index;
+ self.queue resetItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ if (result)
+ {
+ // Now that source is loaded and settings applied, delete the queue item from the queue
+ self.queue removeItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ }
+ else
+ {
+ NSBeep();
+ }
 }
 else
 {
- item.state = HBQueueItemStateFailed;
- NSBeep();
+ item.state = HBQueueItemStateReady;
 }
- self.queue.items commit;
 };
-
- self.queue.items commit;
 }
 
 /**
 * Send the selected queue item back to the main window for rescan and possible edit.
 */
-- (void)editQueueItem:(HBQueueItem *)item
+- (void)editQueueItem:(HBQueueJobItem *)item
 {
- if (self.queue.items beginTransaction == HBDistributedArrayContentReload)
- {
- // Do not execture the action if the array changed.
- self.queue.items commit;
- return;
- }
-
 // if this is a currently encoding item, we need to be sure to alert the user,
 // to let them decide to cancel it first, then if they do, we can come back and
 // remove it
- if (item == self.queue.currentItem)
+ if (item.state == HBQueueItemStateWorking)
 {
 NSString *alertTitle = NSString stringWithFormat:NSLocalizedString(@"Stop This Encode and Edit It?", @"Queue Edit Alert -> stop and edit message");
 
@@ -425,6 +380,10 @@
 alert setInformativeText:NSLocalizedString(@"Your movie will be lost if you don't continue encoding.", @"Queue Edit Alert -> stop and edit informative text");
 alert addButtonWithTitle:NSLocalizedString(@"Keep Encoding", @"Queue Edit Alert -> stop and edit first button");
 alert addButtonWithTitle:NSLocalizedString(@"Stop Encoding and Edit", @"Queue Edit Alert -> stop and edit second button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert setAlertStyle:NSAlertStyleCritical;
 
 alert beginSheetModalForWindow:docWindow completionHandler:^(NSModalResponse returnCode) {
@@ -434,12 +393,10 @@
 }
 };
 }
- else if (item.state != HBQueueItemStateWorking)
+ else if (item.state != HBQueueItemStateWorking && item.state != HBQueueItemStateRescanning)
 {
 self doEditQueueItem:item;
 }
-
- self.queue.items commit;
 }
 
 - (void)resetQueueItemsAtIndexes:(NSIndexSet *)indexes
@@ -458,7 +415,7 @@
 if (path isKindOfClass:NSString class && path.length)
 {
 NSURL *fileURL = NSURL fileURLWithPath:path;
- NSWorkspace sharedWorkspace activateFileViewerSelectingURLs:@fileURL;
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:@fileURL;
 }
 }
 
@@ -481,43 +438,48 @@
 *
 * @param job the job of the file to send
 */
-- (void)sendToExternalApp:(HBQueueItem *)item
+- (void)sendToExternalApp:(HBQueueJobItem *)item
 {
 // This end of encode action is called as each encode rolls off of the queue
 if (NSUserDefaults.standardUserDefaults boolForKey:HBSendToAppEnabled == YES)
 {
+ NSURL *outputURL = item.outputURL;
+ NSString *completeOutputPath = item.completeOutputURL.path;
+
+ dispatch_async(_sendQueue, ^{
 #ifdef __SANDBOX_ENABLED__
- BOOL accessingSecurityScopedResource = item.outputURL startAccessingSecurityScopedResource;
+ BOOL accessingSecurityScopedResource = outputURL startAccessingSecurityScopedResource;
 #endif
 
- NSWorkspace *workspace = NSWorkspace.sharedWorkspace;
- NSString *app = workspace fullPathForApplication:NSUserDefaults.standardUserDefaults objectForKey:HBSendToApp;
+ NSWorkspace *workspace = NSWorkspace.sharedWorkspace;
+ NSString *app = workspace fullPathForApplication:NSUserDefaults.standardUserDefaults objectForKey:HBSendToApp;
 
- if (app)
- {
- if (!workspace openFile:item.completeOutputURL.path withApplication:app)
+ if (app)
 {
- HBUtilities writeToActivityLog:"Failed to send file to: %s", app;
+ if (!workspace openFile:completeOutputPath withApplication:app)
+ {
+ HBUtilities writeToActivityLog:"Failed to send file to: %s", app;
+ }
+ }
+ else
+ {
+ HBUtilities writeToActivityLog:"Send file to: app not found";
 }
- }
- else
- {
- HBUtilities writeToActivityLog:"Send file to: app not found";
- }
 
 #ifdef __SANDBOX_ENABLED__
- if (accessingSecurityScopedResource)
- {
- item.outputURL stopAccessingSecurityScopedResource;
- }
+ if (accessingSecurityScopedResource)
+ {
+ outputURL stopAccessingSecurityScopedResource;
+ }
 #endif
+ });
 }
 }
 
 /**
 * Runs the alert for a single job
 */
-- (void)itemCompletedAlerts:(HBQueueItem *)item
+- (void)itemCompletedAlerts:(HBQueueJobItem *)item
 {
 NSUserDefaults *ud = NSUserDefaults.standardUserDefaults;
 
@@ -697,14 +659,22 @@
 alert setInformativeText:NSLocalizedString(@"Select Continue Encoding to dismiss this dialog without making changes.", @"Queue Alert -> cancel rip informative text");
 alert addButtonWithTitle:NSLocalizedString(@"Continue Encoding", @"Queue Alert -> cancel rip first button");
 alert addButtonWithTitle:NSLocalizedString(@"Skip Current Job", @"Queue Alert -> cancel rip second button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert addButtonWithTitle:NSLocalizedString(@"Stop After Current Job", @"Queue Alert -> cancel rip third button");
 alert addButtonWithTitle:NSLocalizedString(@"Stop All", @"Queue Alert -> cancel rip fourth button");
+ if (@available(macOS 11, *))
+ {
+ alert.buttons.lastObject.hasDestructiveAction = true;
+ }
 alert setAlertStyle:NSAlertStyleCritical;
 
 alert beginSheetModalForWindow:window completionHandler:^(NSModalResponse returnCode) {
 if (returnCode == NSAlertSecondButtonReturn)
 {
- self.queue cancelCurrentItemAndContinue;
+ self.queue cancelCurrentAndContinue;
 }
 else if (returnCode == NSAlertThirdButtonReturn)
 {
@@ -712,7 +682,7 @@
 }
 else if (returnCode == NSAlertThirdButtonReturn + 1)
 {
- self.queue cancelCurrentItemAndStop;
+ self.queue cancelCurrentAndStop;
 }
 };
 }
@@ -751,7 +721,7 @@
 }
 else
 {
- NSArray<HBQueueItem *> *items = self.queue.items objectsAtIndexes:indexes;
+ NSArray<id<HBQueueItem>> *items = self.queue.items objectsAtIndexes:indexes;
 self.infoViewController.item = items.firstObject;
 self switchToViewController:self.infoViewController;
 }
@@ -776,9 +746,12 @@
 }
 }
 
-- (void)tableViewEditItem:(HBQueueItem *)item
+- (void)tableViewEditItem:(id<HBQueueItem>)item
 {
- self editQueueItem:item;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ self editQueueItem:item;
+ }
 }
 
 - (void)tableViewRemoveItemsAtIndexes:(nonnull NSIndexSet *)indexes
@@ -790,15 +763,21 @@
 self resetQueueItemsAtIndexes:indexes;
 }
 
-- (void)detailsViewEditItem:(nonnull HBQueueItem *)item
+- (void)detailsViewEditItem:(nonnull id<HBQueueItem>)item
 {
- self editQueueItem:item;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ self editQueueItem:item;
+ }
 }
 
-- (void)detailsViewResetItem:(nonnull HBQueueItem *)item
+- (void)detailsViewResetItem:(nonnull id<HBQueueItem>)item
 {
- NSUInteger index = self.queue.items indexOfObject:item;
- self resetQueueItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ NSUInteger index = self.queue.items indexOfObject:item;
+ self resetQueueItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
+ }
 }
 
 - (IBAction)resetAll:(id)sender

HandBrake-1.5.1.tar.xz/macosx/HBQueueDockTileController.h Added

HandBrake-1.5.1.tar.xz/macosx/HBQueueDockTileController.m Added

@@ -0,0 +1,121 @@
+/* HBQueueDockTileController.m
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBQueueDockTileController.h"
+
+#import "HBDockTile.h"
+#import "HBQueue.h"
+
+#define dockTileUpdateFrequency 0.1f
+
+@interface HBQueueDockTileController ()
+
+@property (nonatomic, readonly) HBQueue *queue;
+@property (nonatomic, readonly) HBDockTile *dockTile;
+@property (nonatomic) double progress;
+
+@property (nonatomic) id observerToken;
+
+@end
+
+@implementation HBQueueDockTileController
+
+- (instancetype)initWithQueue:(HBQueue *)queue dockTile:(id)dockTile image:(NSImage *)image
+{
+ self = super init;
+ if (self)
+ {
+ _queue = queue;
+ _dockTile = HBDockTile alloc initWithDockTile:dockTile image:image;
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidStartItemNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self setUpObservers; };
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteItemNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self setUpObservers; };
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidChangeStateNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self setUpObservers; };
+
+ NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidCompleteNotification
+ object:_queue queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) { self.dockTile.stringValue = @""; };
+ }
+ return self;
+}
+
+- (void)setUpObservers
+{
+ self removeObservers;
+
+ if (self->_queue.workingItemsCount > 1)
+ {
+ self setUpForMultipleWorkers;
+ }
+ else if (self->_queue.workingItemsCount == 1)
+ {
+ self setUpForSingleWorker;
+ }
+}
+
+- (void)setUpForMultipleWorkers
+{
+ self.dockTile.stringValue = NSString stringWithFormat:@"%lu - %lu", self.queue.workingItemsCount, self.queue.pendingItemsCount;
+ self.progress = 0;
+}
+
+- (void)setUpForSingleWorker
+{
+ self.progress = 0;
+ HBQueueJobItem *firstWorkingItem = nil;
+ for (HBQueueJobItem *item in self.queue.items)
+ {
+ if (item.state == HBQueueItemStateWorking)
+ {
+ firstWorkingItem = item;
+ break;
+ }
+ }
+
+ if (firstWorkingItem)
+ {
+ HBQueueWorker *worker = self.queue workerForItem:firstWorkingItem;
+
+ if (worker)
+ {
+
+ self.observerToken = NSNotificationCenter.defaultCenter addObserverForName:HBQueueWorkerProgressNotification
+ object:worker queue:NSOperationQueue.mainQueue
+ usingBlock:^(NSNotification * _Nonnull note) {
+ double progress = note.userInfoHBQueueWorkerProgressNotificationPercentKey doubleValue;
+
+ if (self.progress < 100.0 * progress)
+ {
+ double hours = note.userInfoHBQueueWorkerProgressNotificationHoursKey doubleValue;
+ double minutes = note.userInfoHBQueueWorkerProgressNotificationMinutesKey doubleValue;
+ double seconds = note.userInfoHBQueueWorkerProgressNotificationSecondsKey doubleValue;
+
+ self.dockTile setProgress:progress hours:hours minutes:minutes seconds:seconds;
+ self.progress += dockTileUpdateFrequency;
+ }
+ };
+ }
+ }
+}
+
+- (void)removeObservers
+{
+ if (self.observerToken)
+ {
+ NSNotificationCenter.defaultCenter removeObserver:self.observerToken;
+ self.observerToken = nil;
+ }
+}
+
+@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueInfoViewController.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueueInfoViewController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueInfoViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueInfoViewController.m Changed

@@ -5,7 +5,9 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import "HBQueueInfoViewController.h"
-#import "HBQueue.h"
+#import "HBQueueJobItem.h"
+
+static void *HBQueueInfoViewControllerContext = &HBQueueInfoViewControllerContext;
 
 @interface HBQueueInfoViewController ()
 
@@ -18,6 +20,7 @@
 @property (nonatomic, weak) id<HBQueueDetailsViewControllerDelegate> delegate;
 
 @property (nonatomic) BOOL canReset;
+@property (nonatomic) BOOL canEdit;
 
 @end
 
@@ -33,51 +36,26 @@
 return self;
 }
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
+{
 super viewDidLoad;
- self updateLabels;
- self setUpObservers;
+ self updateUI;
+ self addObserver:self forKeyPath:@"item.state" options:0 context:HBQueueInfoViewControllerContext;
 }
 
-- (void)setUpObservers
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
- // It would be easier to just KVO the item state property,
- // But we can't because the item is a NSProxy.
- NSNotificationCenter * __weak center = NSNotificationCenter.defaultCenter;
-
- center addObserverForName:HBQueueDidStartItemNotification
- object:nil
- queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note)
- {
- HBQueueItem *startedItem = note.userInfoHBQueueItemNotificationItemKey;
-
- if (startedItem == self.item)
- {
- self updateUI;
- }
- };
-
- center addObserverForName:HBQueueDidCompleteItemNotification
- object:nil
- queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note)
- {
- HBQueueItem *completedItem = note.userInfoHBQueueItemNotificationItemKey;
-
- if (completedItem == self.item)
- {
- self updateUI;
- }
- };
-
- center addObserverForName:HBQueueDidChangeItemNotification
- object:nil
- queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note)
- {
- self updateUI;
- };
-
+ if (context == HBQueueInfoViewControllerContext)
+ {
+ self updateUI;
+ }
+ else
+ {
+ super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
+ }
 }
 
+
 - (void)updateUI
 {
 self updateLabels;
@@ -89,18 +67,30 @@
 
 - (void)updateReset
 {
- self.canReset = self.item && (self.item.state != HBQueueItemStateWorking && self.item.state != HBQueueItemStateReady);
+ self.canReset = self.item && (self.item.state != HBQueueItemStateWorking &&
+ self.item.state != HBQueueItemStateRescanning && self.item.state != HBQueueItemStateReady);
+ self.canEdit = self.item && self.item.hasFileRepresentation;
 }
 
 - (void)updateLabels
 {
 if (self.item)
 {
- self.statisticsLabel.hidden = self.item.startedDate == nil;
- self.statisticsHeader.hidden = self.item.startedDate == nil;
- self.summaryLabel.hidden = NO;
+ if (self.item isKindOfClass:HBQueueJobItem class)
+ {
+ HBQueueJobItem *jobItem = (HBQueueJobItem *)self.item;
+ self.statisticsLabel.hidden = jobItem.startedDate == nil;
+ self.statisticsHeader.hidden = jobItem.startedDate == nil;
+
+ self.statisticsLabel.attributedStringValue = jobItem.attributedStatistics;
+ }
+ else
+ {
+ self.statisticsLabel.hidden = YES;
+ self.statisticsHeader.hidden = YES;
+ }
 
- self.statisticsLabel.attributedStringValue = self.item.attributedStatistics;
+ self.summaryLabel.hidden = NO;
 self.summaryLabel.attributedStringValue = self.item.attributedDescription;
 
 dispatch_async(dispatch_get_main_queue(), ^{
@@ -126,10 +116,9 @@
 self updateDivider;
 }
 
-- (void)setItem:(HBQueueItem *)item
+- (void)setItem:(id<HBQueueItem>)item
 {
 _item = item;
- self updateUI;
 }
 
 - (IBAction)editItem:(id)sender

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItem.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueueItem.h Changed

@@ -1,67 +1,37 @@
-/* HBQueueItem.m $
+/* HBQueueItem.h $
 
 This file is part of the HandBrake source code.
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License. */
 
-#import <Foundation/Foundation.h>
-#import "HBDistributedArray.h"
-
-@import HandBrakeKit;
+#import <Cocoa/Cocoa.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-/**
- * A flag to indicate the item's state
- */
+
+/// A flag to indicate the item's state
 typedef NS_ENUM(NSUInteger, HBQueueItemState) {
 HBQueueItemStateReady,
 HBQueueItemStateWorking,
 HBQueueItemStateCompleted,
 HBQueueItemStateCanceled,
- HBQueueItemStateFailed
+ HBQueueItemStateFailed,
+ HBQueueItemStateRescanning
 };
 
-@interface HBQueueItem : NSObject<NSSecureCoding, HBUniqueObject>
-
-- (instancetype)init NS_UNAVAILABLE;
-- (instancetype)initWithJob:(HBJob *)job;
-
-@property (nonatomic, readonly) HBJob *job;
+@protocol HBQueueItem <NSObject, NSSecureCoding>
 
-/// Current state of the job.
+/// Current state of the item.
 @property (nonatomic) HBQueueItemState state;
 
-/// The file URL of the source.
-@property (nonatomic, readonly) NSURL *fileURL;
-
-/// The directory URL at which the new file will be created.
-@property (nonatomic, readonly, copy) NSURL *outputURL;
-
-/// The name of the new file that will be created.
-@property (nonatomic, readonly, copy) NSString *outputFileName;
-
-/// The file URL at which the new file will be created.
-@property (nonatomic, readonly, copy) NSURL *completeOutputURL;
-
-/// The file URL at which the new file will be created.
-@property (nonatomic, copy, nullable) NSURL *activityLogURL;
-
-@property (nonatomic) NSTimeInterval encodeDuration;
-@property (nonatomic) NSTimeInterval pauseDuration;
-
-@property (nonatomic, nullable) NSDate *startedDate;
-@property (nonatomic, nullable) NSDate *endedDate;
-
-- (void)pausedAtDate:(NSDate *)date;
-- (void)resumedAtDate:(NSDate *)date;
-
-@property (nonatomic, readonly) NSUInteger fileSize;
+/// Whether the item has a file representation on disk or not.
+@property (nonatomic, readonly) BOOL hasFileRepresentation;
 
+/// The title of the item.
+@property (nonatomic, readonly) NSString *title;
 @property (nonatomic, readonly) NSAttributedString *attributedDescription;
 
-@property (nonatomic, readonly, nullable) NSAttributedString *attributedStatistics;
-
+@property (nonatomic, readonly) NSImage *image;
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItemView.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueueItemView.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItemView.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueItemView.m Changed

@@ -5,7 +5,6 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import "HBQueueItemView.h"
-#import "HBQueueItem.h"
 
 @interface HBQueueItemView ()
 
@@ -15,7 +14,7 @@
 
 @implementation HBQueueItemView
 
-- (void)setItem:(HBQueueItem *)item
+- (void)setItem:(id<HBQueueItem>)item
 {
 _item = item;
 self reload;
@@ -32,7 +31,7 @@
 
 - (void)HB_updateLabel
 {
- self.textField.stringValue = _item.outputFileName;
+ self.textField.stringValue = _item.title;
 }
 
 - (void)HB_updateState
@@ -56,9 +55,13 @@
 state = NSImage imageNamed:@"EncodeFailed";
 label = NSLocalizedString(@"Encode failed", @"HBQueueItemView -> Encode state accessibility label");
 break;
+ case HBQueueItemStateRescanning:
+ state = NSImage imageNamed:@"EncodeWorking0";
+ label = NSLocalizedString(@"Rescanning for editing", @"HBQueueItemView -> Encode state accessibility label");
+ break;
 default:
- state = NSImage imageNamed:@"JobSmall";
- NSLocalizedString(@"Encode ready", @"HBQueueItemView -> Encode state accessibility label");
+ state = _item.image;
+ label = NSLocalizedString(@"Encode ready", @"HBQueueItemView -> Encode state accessibility label");
 break;
 }
 
@@ -75,7 +78,7 @@
 darkAqua = self.effectiveAppearance bestMatchFromAppearancesWithNames:@NSAppearanceNameDarkAqua == NSAppearanceNameDarkAqua ? YES : NO;
 }
 
- if (_item.state == HBQueueItemStateCompleted)
+ if (_item.state == HBQueueItemStateCompleted && _item.hasFileRepresentation)
 {
 _removeButton setAction: @selector(revealQueueItem:);
 if (self.backgroundStyle == NSBackgroundStyleEmphasized)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItemWorkingView.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueueItemWorkingView.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueItemWorkingView.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueItemWorkingView.m Changed

@@ -6,8 +6,8 @@
 
 #import "HBQueueItemWorkingView.h"
 
-#import "HBQueueItem.h"
-#import "HBQueue.h"
+#import "HBQueueJobItem.h"
+#import "HBQueueWorker.h"
 
 #import "HBAttributedStringAdditions.h"
 
@@ -23,29 +23,26 @@
 
 @implementation HBQueueItemWorkingView
 
-- (void)setUpObservers
+- (void)setUpObserversWithWorker:(HBQueueWorker *)worker
 {
     NSNotificationCenter * __weak center = NSNotificationCenter.defaultCenter;
 
-    self.progressToken = center addObserverForName:HBQueueProgressNotification
-                                             object:nil
+    self.progressToken = center addObserverForName:HBQueueWorkerProgressNotification
+                                             object:worker
                                               queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note)
                           {
-                              NSString *progressInfo = note.userInfoHBQueueProgressNotificationInfoKey;
-                              double progress = note.userInfoHBQueueProgressNotificationPercentKey doubleValue;
+                              NSString *progressInfo = note.userInfoHBQueueWorkerProgressNotificationInfoKey;
+                              double progress = note.userInfoHBQueueWorkerProgressNotificationPercentKey doubleValue;
 
                               self.progressField.stringValue = progressInfo;
                               self.progressBar.doubleValue = progress;
                           };
 
-    self.completedToken = center addObserverForName:HBQueueDidCompleteItemNotification
-                                              object:nil
+    self.completedToken = center addObserverForName:HBQueueWorkerDidCompleteItemNotification
+                                              object:worker
                                                queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note)
                            {
-                               HBQueueItem *completedItem = note.userInfoHBQueueItemNotificationItemKey;
-                               if (completedItem == self.item) {
-                                   self removeObservers;
-                               }
+                                self removeObservers;
                            };
 
     self.progressField.font = NSFont monospacedDigitSystemFontOfSize:NSFont.smallSystemFontSize weight:NSFontWeightRegular;
@@ -70,18 +67,16 @@
     self removeObservers;
 }
 
-- (void)setItem:(HBQueueItem *)item
+- (void)setWorker:(HBQueueWorker *)worker
 {
-    self removeObservers;
+    self setUpObserversWithWorker:worker;
+}
 
+- (void)setItem:(HBQueueJobItem *)item
+{
+    self removeObservers;
     self.progressField.stringValue = @"";
-
     super setItem:item;
-
-    if (item.state == HBQueueItemStateWorking)
-    {
-        self setUpObservers;
-    }
 }
 
 @end

HandBrake-1.5.1.tar.xz/macosx/HBQueueJobItem.h Added

@@ -0,0 +1,57 @@
+/* HBQueueJobItem.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
+#import "HBQueueItem.h"
+
+@import HandBrakeKit;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HBQueueJobItem : NSObject<HBQueueItem>
+
+- (instancetype)init NS_UNAVAILABLE;
+- (instancetype)initWithJob:(HBJob *)job;
+
+@property (nonatomic, readonly) HBJob *job;
+
+/// Current state of the job.
+@property (nonatomic) HBQueueItemState state;
+
+/// The file URL of the source.
+@property (nonatomic, readonly) NSURL *fileURL;
+
+/// The directory URL at which the new file will be created.
+@property (nonatomic, readonly, copy) NSURL *outputURL;
+
+/// The name of the new file that will be created.
+@property (nonatomic, readonly, copy) NSString *outputFileName;
+
+/// The file URL at which the new file will be created.
+@property (nonatomic, readonly, copy) NSURL *completeOutputURL;
+
+/// The file URL at which the new file will be created.
+@property (nonatomic, copy, nullable) NSURL *activityLogURL;
+
+@property (nonatomic, readonly) NSTimeInterval encodeDuration;
+@property (nonatomic, readonly) NSTimeInterval pauseDuration;
+
+@property (nonatomic, nullable) NSDate *startedDate;
+@property (nonatomic, nullable) NSDate *endedDate;
+
+- (void)pausedAtDate:(NSDate *)date;
+- (void)resumedAtDate:(NSDate *)date;
+
+@property (nonatomic, readonly) double avgFps;
+@property (nonatomic, readonly) NSUInteger fileSize;
+@property (nonatomic, readonly) NSAttributedString *attributedDescription;
+@property (nonatomic, readonly, nullable) NSAttributedString *attributedStatistics;
+
+- (void)setDoneWithResult:(HBCoreResult)result;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/HBQueueJobItem.m Added

@@ -0,0 +1,349 @@
+/* HBQueueJobItem.m $
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBQueueJobItem.h"
+
+#import "HBCodingUtilities.h"
+#import "HBAttributedStringAdditions.h"
+
+static NSDateFormatter *_dateFormatter = nil;
+static NSNumberFormatter *_numberFormatter = nil;
+static NSByteCountFormatter *_byteFormatter = nil;
+
+static NSDictionary *detailAttr;
+static NSDictionary *detailBoldAttr;
+static NSDictionary *shortHeightAttr;
+
+@interface HBQueueJobItem ()
+
+@property (nonatomic) NSTimeInterval encodeDuration;
+@property (nonatomic) NSTimeInterval pauseDuration;
+
+@property (nonatomic, nullable) NSDate *pausedDate;
+@property (nonatomic, nullable) NSDate *resumedDate;
+
+@property (nonatomic) double avgFps;
+@property (nonatomic) NSUInteger fileSize;
+@property (nonatomic) NSUInteger sourceFileSize;
+
+@property (nonatomic, readwrite, nullable) NSAttributedString *attributedStatistics;
+
+@end
+
+@implementation HBQueueJobItem
+
++ (void)initialize
+{
+ if (self == HBQueueJobItem class) {
+ _dateFormatter = NSDateFormatter alloc init;
+ _dateFormatter.dateStyle = NSDateFormatterLongStyle;
+ _dateFormatter.timeStyle = NSDateFormatterLongStyle;
+
+ _numberFormatter = NSNumberFormatter alloc init;
+ _numberFormatter.numberStyle = NSNumberFormatterDecimalStyle;
+ _numberFormatter.maximumFractionDigits = 2;
+
+ _byteFormatter = NSByteCountFormatter alloc init;
+
+ CGFloat indent = 100;
+ NSBundle *bundle = NSBundle bundleForClass:HBQueueJobItem class;
+ NSString *currentLocalization = bundle.preferredLocalizations.firstObject;
+ if (currentLocalization hasPrefix:@"de")
+ {
+ indent = 120;
+ }
+ else if (currentLocalization hasPrefix:@"fr" || currentLocalization hasPrefix:@"pt")
+ {
+ indent = 114;
+ }
+
+ // Attributes
+ NSMutableParagraphStyle *ps = NSParagraphStyle.defaultParagraphStyle mutableCopy;
+ ps.headIndent = indent;
+ ps.paragraphSpacing = 1.0;
+ ps.tabStops = @NSTextTab alloc initWithType:NSRightTabStopType location:indent - 2,
+ NSTextTab alloc initWithType:NSLeftTabStopType location:indent;
+
+ detailAttr = @{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize,
+ NSParagraphStyleAttributeName: ps,
+ NSForegroundColorAttributeName: NSColor.labelColor};
+
+ detailBoldAttr = @{NSFontAttributeName: NSFont systemFontOfSize:NSFont.smallSystemFontSize,
+ NSParagraphStyleAttributeName: ps,
+ NSForegroundColorAttributeName: NSColor.labelColor};
+
+ shortHeightAttr = @{NSFontAttributeName: NSFont systemFontOfSize:6.0};
+ }
+}
+
+@synthesize job = _job;
+@synthesize attributedDescription = _attributedDescription;
+
+- (instancetype)initWithJob:(HBJob *)job
+{
+ self = super init;
+ if (self)
+ {
+ _job = job;
+ }
+ return self;
+}
+
+#pragma mark - Properties
+
+- (void)setState:(HBQueueItemState)state
+{
+ _state = state;
+ if (state == HBQueueItemStateReady)
+ {
+ self resetStatistics;
+ self.activityLogURL = nil;
+ }
+}
+
+- (NSString *)title
+{
+ return _job.outputFileName;
+}
+
+- (BOOL)hasFileRepresentation
+{
+ return YES;
+}
+
+- (NSImage *)image
+{
+ return NSImage imageNamed:@"JobSmall";;
+}
+
+- (NSURL *)fileURL
+{
+ return _job.fileURL;
+}
+
+- (NSString *)outputFileName
+{
+ return _job.outputFileName;
+}
+
+- (NSURL *)outputURL
+{
+ return _job.outputURL;
+}
+
+- (NSURL *)completeOutputURL
+{
+ return _job.completeOutputURL;
+}
+
+- (NSAttributedString *)attributedDescription
+{
+ if (_attributedDescription == nil) {
+ _attributedDescription = _job.attributedDescription;
+ }
+ return _attributedDescription;
+}
+
+- (NSAttributedString *)attributedStatistics
+{
+ if (self.endedDate == nil && self.startedDate == nil)
+ {
+ return nil;
+ }
+
+ if (_attributedStatistics == nil)
+ {
+ NSMutableAttributedString *attrString = NSMutableAttributedString alloc init;
+
+ if (self.startedDate)
+ {
+ attrString appendString:@"\t" withAttributes:detailAttr;
+ attrString appendString:NSLocalizedString(@"Started at:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ attrString appendString:_dateFormatter stringFromDate:self.startedDate withAttributes:detailAttr;
+ }
+
+ if (self.startedDate && self.endedDate)
+ {
+ attrString appendString:@"\n\t" withAttributes:detailAttr;
+ attrString appendString:NSLocalizedString(@"Ended at:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ attrString appendString:_dateFormatter stringFromDate:self.endedDate withAttributes:detailAttr;
+ attrString appendString:@"\n\n" withAttributes:shortHeightAttr;
+ attrString appendString:@"\t" withAttributes:detailAttr;
+
+ attrString appendString:NSLocalizedString(@"Run time:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ uint64_t encodeDuration = (uint64_t)self.encodeDuration;
+ attrString appendString:NSString stringWithFormat:@"%02lld:%02lld:%02lld", encodeDuration / 3600, (encodeDuration/ 60) % 60, encodeDuration % 60 withAttributes:detailAttr;
+ attrString appendString:@"\n\t" withAttributes:detailAttr;
+ attrString appendString:NSLocalizedString(@"Paused time:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ uint64_t pauseDuration = (uint64_t)self.pauseDuration;
+ attrString appendString:NSString stringWithFormat:@"%02lld:%02lld:%02lld", pauseDuration / 3600, (pauseDuration/ 60) % 60, pauseDuration % 60 withAttributes:detailAttr;
+
+ if (self.avgFps > 0)
+ {
+ attrString appendString:@"\n\t" withAttributes:detailAttr;
+ attrString appendString:NSLocalizedString(@"Average speed:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ NSString *formattedAvgFps = _numberFormatter stringFromNumber:@(self.avgFps);
+ attrString appendString:NSString stringWithFormat:NSLocalizedString(@"%@ fps", @"Job statistics"), formattedAvgFps withAttributes:detailAttr;
+ }
+
+ attrString appendString:@"\n\n" withAttributes:shortHeightAttr;
+ attrString appendString:@"\t" withAttributes:detailAttr;
+
+ attrString appendString:NSLocalizedString(@"Size:", @"Job statistics") withAttributes:detailBoldAttr;
+ attrString appendString:@" \t" withAttributes:detailAttr;
+ attrString appendString:_byteFormatter stringFromByteCount:self.fileSize withAttributes:detailAttr;
+
+ if (self.job.isStream)
+ {
+ double difference = 100.f / self.sourceFileSize * self.fileSize;
+ NSString *formattedDifference = _numberFormatter stringFromNumber:@(difference);
+ attrString appendString:NSString stringWithFormat:NSLocalizedString(@" (%@ %% of the source file)", @"Job statistics"), formattedDifference withAttributes:detailAttr;
+ }
+ }
+
+ _attributedStatistics = attrString;
+ }
+
+ return _attributedStatistics;
+}
+
+#pragma mark - Statistics
+
+- (void)resetStatistics
+{
+ self.pausedDate = nil;
+ self.resumedDate = nil;
+ self.startedDate = nil;
+ self.endedDate = nil;
+ self.encodeDuration = 0;
+ self.pauseDuration = 0;
+ self.avgFps = 0;
+ self.fileSize = 0;
+ self.attributedStatistics = nil;
+}
+
+- (void)pausedAtDate:(NSDate *)date
+{
+ self.pausedDate = date;
+}
+
+- (void)resumedAtDate:(NSDate *)date
+{
+ self.resumedDate = date;
+ self.pauseDuration += self.resumedDate timeIntervalSinceDate:self.pausedDate;
+ self.pausedDate = nil;
+}
+
+- (void)setStartedDate:(NSDate *)startedDate
+{
+ _startedDate = startedDate;
+ self.attributedStatistics = nil;
+}
+
+- (void)setEndedDate:(NSDate *)endedDate
+{
+ _endedDate = endedDate;
+ if (endedDate && self.pausedDate)
+ {
+ self resumedAtDate:endedDate;
+ }
+ if (endedDate && self.startedDate)
+ {
+ self.encodeDuration = self.endedDate timeIntervalSinceDate:self.startedDate;
+ self.encodeDuration -= self.pauseDuration;
+ }
+
+ NSDictionary<NSURLResourceKey, id> *values;
+
+ self.completeOutputURL removeCachedResourceValueForKey:NSURLFileSizeKey;
+ values = self.completeOutputURL resourceValuesForKeys:@NSURLFileSizeKey error:NULL;
+ self.fileSize = valuesNSURLFileSizeKey integerValue;
+
+ self.fileURL removeCachedResourceValueForKey:NSURLFileSizeKey;
+ values = self.fileURL resourceValuesForKeys:@NSURLFileSizeKey error:NULL;
+ self.sourceFileSize = valuesNSURLFileSizeKey integerValue;
+
+ self.attributedStatistics = nil;
+}
+
+- (void)setDoneWithResult:(HBCoreResult)result
+{
+ self.avgFps = result.avgFps;
+
+ switch (result.code) {
+ case HBCoreResultCodeDone:
+ self.state = HBQueueItemStateCompleted;
+ break;
+ case HBCoreResultCodeCanceled:
+ self.state = HBQueueItemStateCanceled;
+ break;
+ default:
+ self.state = HBQueueItemStateFailed;
+ break;
+ }
+}
+
+#pragma mark - NSSecureCoding
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+static NSString *versionKey = @"HBQueueItemVersion";
+
+- (void)encodeWithCoder:(nonnull NSCoder *)coder
+{
+ coder encodeInt:1 forKey:versionKey;
+ encodeInteger(_state);
+ encodeObject(_job);
+
+ encodeObject(_activityLogURL);
+
+ encodeDouble(_encodeDuration);
+ encodeDouble(_pauseDuration);
+ encodeDouble(_avgFps);
+
+ encodeObject(_startedDate);
+ encodeObject(_endedDate);
+
+ encodeInteger(_fileSize);
+ encodeInteger(_sourceFileSize);
+}
+
+- (nullable instancetype)initWithCoder:(nonnull NSCoder *)decoder
+{
+ int version = decoder decodeIntForKey:versionKey;
+
+ if (version == 1 && (self = super init))
+ {
+ decodeInteger(_state); if (_state < HBQueueItemStateReady || _state > HBQueueItemStateRescanning) { goto fail; }
+ decodeObjectOrFail(_job, HBJob);
+
+ decodeObject(_activityLogURL, NSURL);
+
+ decodeDouble(_encodeDuration);
+ decodeDouble(_pauseDuration);
+ decodeDouble(_avgFps);
+
+ decodeObject(_startedDate, NSDate);
+ decodeObject(_endedDate, NSDate);
+
+ decodeInteger(_fileSize);
+ decodeInteger(_sourceFileSize);
+
+ return self;
+ }
+fail:
+ return nil;
+}
+
+@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueMultiSelectionViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueMultiSelectionViewController.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueTableViewController.h -> HandBrake-1.5.1.tar.xz/macosx/HBQueueTableViewController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBQueueTableViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBQueueTableViewController.m Changed

@@ -6,19 +6,17 @@
 
 #import "HBQueueTableViewController.h"
 
+#import "HBQueue.h"
 #import "HBTableView.h"
 #import "HBQueueItemView.h"
+#import "HBQueueItemWorkingView.h"
+#import "NSArray+HBAdditions.h"
+#import "HBPasteboardItem.h"
 
-// Pasteboard type for or drag operations
-#define HBQueueDragDropPboardType @"HBQueueCustomTableViewPboardType"
-
-@interface HBQueueTableViewController () <NSTableViewDataSource, NSTableViewDelegate, HBQueueItemViewDelegate>
+@interface HBQueueTableViewController () <NSMenuItemValidation, NSTableViewDataSource, NSTableViewDelegate, HBQueueItemViewDelegate>
 
 @property (nonatomic, weak, readonly) HBQueue *queue;
-@property (nonatomic) NSArray<HBQueueItem *> *dragNodesArray;
-
 @property (nonatomic, strong) id<HBQueueTableViewControllerDelegate> delegate;
-
 @property (nonatomic, weak) IBOutlet HBTableView *tableView;
 
 @end
@@ -45,16 +43,9 @@
 super viewDidLoad;
 
 // lets setup our queue list table view for drag and drop here
- self.tableView registerForDraggedTypes:@HBQueueDragDropPboardType;
- self.tableView setDraggingSourceOperationMask:NSDragOperationEvery forLocal:YES;
+ self.tableView registerForDraggedTypes:@tableViewIndex;
 self.tableView setVerticalMotionCanBeginDrag:YES;
 
- // Reloads the queue, this is called
- // when another HandBrake instances modifies the queue
- NSNotificationCenter.defaultCenter addObserverForName:HBQueueReloadItemsNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
- self.tableView reloadData;
- };
-
 NSNotificationCenter.defaultCenter addObserverForName:HBQueueDidAddItemNotification object:_queue queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull note) {
 NSIndexSet *indexes = note.userInfoHBQueueItemNotificationIndexesKey;
 self.tableView insertRowsAtIndexes:indexes withAnimation:NSTableViewAnimationSlideDown;
@@ -86,10 +77,12 @@
 
 typedef void (^HBUpdateHeight)(NSNotification *note);
 HBUpdateHeight updateHeight = ^void(NSNotification *note) {
- NSIndexSet *indexes = note.userInfoHBQueueItemNotificationIndexesKey;
- NSIndexSet *columnIndexes = NSIndexSet indexSetWithIndex:0;
- if (indexes.count)
+ HBQueueJobItem *item = note.userInfoHBQueueItemNotificationItemKey;
+ NSUInteger index = self.queue.items indexOfObject:item;
+ if (index != NSNotFound)
 {
+ NSIndexSet *indexes = NSIndexSet indexSetWithIndex:index;
+ NSIndexSet *columnIndexes = NSIndexSet indexSetWithIndex:0;
 self.tableView reloadDataForRowIndexes:indexes columnIndexes:columnIndexes;
 self.tableView noteHeightOfRowsWithIndexesChanged:indexes;
 }
@@ -111,6 +104,20 @@
 self.delegate tableViewRemoveItemsAtIndexes:targetedRows;
 }
 
+- (IBAction)moveSelectedQueueItemsToTop:(id)sender
+{
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ NSArray *items = self.queue.items objectsAtIndexes:indexes;
+ self.queue moveItems:items toIndex:0;
+}
+
+- (IBAction)moveSelectedQueueItemsToBottom:(id)sender
+{
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ NSArray *items = self.queue.items objectsAtIndexes:indexes;
+ self.queue moveItems:items toIndex:self.queue.items.count;
+}
+
 /**
 * Show the finished encode in the finder
 */
@@ -121,12 +128,19 @@
 
 NSUInteger currentIndex = targetedRows.firstIndex;
 while (currentIndex != NSNotFound) {
- NSURL *url = self.queue.items objectAtIndex:currentIndex completeOutputURL;
- urls addObject:url;
+ id<HBQueueItem> item = self.queue.items objectAtIndex:currentIndex;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ NSURL *url = (HBQueueJobItem *)item completeOutputURL;
+ urls addObject:url;
+ }
 currentIndex = targetedRows indexGreaterThanIndex:currentIndex;
 }
 
- NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ if (urls.count)
+ {
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ }
 }
 
 - (IBAction)revealSelectedQueueItemsSources:(id)sender
@@ -136,12 +150,19 @@
 
 NSUInteger currentIndex = targetedRows.firstIndex;
 while (currentIndex != NSNotFound) {
- NSURL *url = self.queue.items objectAtIndex:currentIndex fileURL;
- urls addObject:url;
+ id<HBQueueItem> item = self.queue.items objectAtIndex:currentIndex;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ NSURL *url = (HBQueueJobItem *)item fileURL;
+ urls addObject:url;
+ }
 currentIndex = targetedRows indexGreaterThanIndex:currentIndex;
 }
 
- NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ if (urls.count)
+ {
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ }
 }
 
 - (IBAction)revealSelectedQueueItemsActivityLogs:(id)sender
@@ -151,15 +172,22 @@
 
 NSUInteger currentIndex = targetedRows.firstIndex;
 while (currentIndex != NSNotFound) {
- NSURL *url = self.queue.items objectAtIndex:currentIndex activityLogURL;
- if (url)
+ id<HBQueueItem> item = self.queue.items objectAtIndex:currentIndex;
+ if (item isKindOfClass:HBQueueJobItem class)
 {
- urls addObject:url;
+ NSURL *url = (HBQueueJobItem *)item activityLogURL;
+ if (url)
+ {
+ urls addObject:url;
+ }
 }
 currentIndex = targetedRows indexGreaterThanIndex:currentIndex;
 }
 
- NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ if (urls.count)
+ {
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:urls;
+ }
 }
 
 /**
@@ -180,7 +208,7 @@
 - (IBAction)editSelectedQueueItem:(id)sender
 {
 NSInteger row = self.tableView.clickedRow;
- HBQueueItem *item = self.queue.items objectAtIndex:row;
+ HBQueueJobItem *item = self.queue.items objectAtIndex:row;
 if (item)
 {
 self.delegate tableViewEditItem:item;
@@ -203,22 +231,54 @@
 {
 SEL action = menuItem.action;
 
- if (action == @selector(editSelectedQueueItem:) ||
- action == @selector(removeSelectedQueueItem:) ||
- action == @selector(revealSelectedQueueItems:) ||
- action == @selector(revealSelectedQueueItemsSources:))
+ if (action == @selector(editSelectedQueueItem:)) {
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ return indexes.count == 1 && self.queue.itemsindexes.firstIndex.hasFileRepresentation;
+ }
+
+ if (action == @selector(removeSelectedQueueItem:) ||
+ action == @selector(moveSelectedQueueItemsToBottom:) ||
+ action == @selector(moveSelectedQueueItemsToTop:))
 {
- return (self.tableView.selectedRow != -1 || self.tableView.clickedRow != -1);
+ return self.tableView.targetedRowIndexes.count > 0;
 }
 
- if (action == @selector(revealSelectedQueueItemsActivityLogs:))
+ if (action == @selector(revealSelectedQueueItemsSources:))
 {
- return (self.tableView.selectedRow != -1 || self.tableView.clickedRow != -1);
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ if (indexes.count == 0) { return NO; }
+ NSArray<id<HBQueueItem>> *items = self.queue.items objectsAtIndexes:indexes;
+
+ return items HB_containsWhere:^BOOL(id<HBQueueItem> _Nonnull object) {
+ return object.hasFileRepresentation;
+ };
+ }
+
+ if (action == @selector(revealSelectedQueueItemsActivityLogs:) ||
+ action == @selector(revealSelectedQueueItems:))
+ {
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ if (indexes.count == 0) { return NO; }
+ NSArray<id<HBQueueItem>> *items = self.queue.items objectsAtIndexes:indexes;
+
+ return items HB_containsWhere:^BOOL(id<HBQueueItem> _Nonnull object) {
+ return object.hasFileRepresentation &&
+ (object.state == HBQueueItemStateWorking || object.state == HBQueueItemStateFailed ||
+ object.state == HBQueueItemStateCanceled || object.state == HBQueueItemStateCompleted);
+ };
 }
 
 if (action == @selector(resetJobState:))
 {
- return self.tableView.targetedRowIndexes.count > 0;
+ NSIndexSet *indexes = self.tableView.targetedRowIndexes;
+ if (indexes.count == 0) { return NO; }
+ NSArray<id<HBQueueItem>> *items = self.queue.items objectsAtIndexes:indexes;
+
+ return items HB_containsWhere:^BOOL(id<HBQueueItem> _Nonnull object) {
+ return object.hasFileRepresentation &&
+ (object.state == HBQueueItemStateFailed || object.state == HBQueueItemStateCanceled ||
+ object.state == HBQueueItemStateCompleted);
+ };
 }
 
 if (action == @selector(removeAll:))
@@ -238,16 +298,27 @@
 
 - (NSView *)tableView:(NSTableView *)tableView
 viewForTableColumn:(NSTableColumn *)tableColumn
- row:(NSInteger)row {
+ row:(NSInteger)row
+{
 
- HBQueueItem *item = self.queue.itemsrow;
+ id<HBQueueItem> item = self.queue.itemsrow;
+ HBQueueItemView *view = nil;
 
- HBQueueItemView *view = item.state == HBQueueItemStateWorking && item == self.queue.currentItem ?
- tableView makeViewWithIdentifier:@"MainWorkingCell" owner:self :
- tableView makeViewWithIdentifier:@"MainCell" owner:self;
+ if (item.state == HBQueueItemStateWorking)
+ {
+ HBQueueItemWorkingView *workingView = tableView makeViewWithIdentifier:@"MainWorkingCell" owner:self;
+ HBQueueWorker *worker = self.queue workerForItem:item;
+ workingView.item = item;
+ workingView.worker = worker;
+ view = workingView;
+ }
+ else
+ {
+ view = tableView makeViewWithIdentifier:@"MainCell" owner:self;
+ view.item = item;
+ }
 
 view.delegate = self;
- view.item = item;
 
 return view;
 }
@@ -259,21 +330,24 @@
 
 - (CGFloat)tableView:(NSTableView *)tableView heightOfRow:(NSInteger)row
 {
- HBQueueItem *item = self.queue.itemsrow;
- return item.state == HBQueueItemStateWorking && item == self.queue.currentItem ? 58 : 22;
+ id<HBQueueItem> item = self.queue.itemsrow;
+ return item.state == HBQueueItemStateWorking ? 58 : 22;
 }
 
 #pragma mark NSQueueItemView delegate
 
-- (void)removeQueueItem:(nonnull HBQueueItem *)item
+- (void)removeQueueItem:(nonnull id<HBQueueItem>)item
 {
 NSUInteger index = self.queue.items indexOfObject:item;
 self.delegate tableViewRemoveItemsAtIndexes:NSIndexSet indexSetWithIndex:index;
 }
 
-- (void)revealQueueItem:(nonnull HBQueueItem *)item
+- (void)revealQueueItem:(nonnull id<HBQueueItem>)item
 {
- NSWorkspace sharedWorkspace activateFileViewerSelectingURLs:@item.completeOutputURL;
+ if (item isKindOfClass:HBQueueJobItem class)
+ {
+ NSWorkspace.sharedWorkspace activateFileViewerSelectingURLs:@(HBQueueJobItem *)item completeOutputURL;
+ }
 }
 
 #pragma mark NSTableView delegate
@@ -289,50 +363,39 @@
 self removeSelectedQueueItem:tableView;
 }
 
-- (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard *)pboard
+- (nullable id <NSPasteboardWriting>)tableView:(NSTableView *)tableView pasteboardWriterForRow:(NSInteger)row
 {
- NSArray<HBQueueItem *> *items = self.queue.items objectsAtIndexes:rowIndexes;
- // Dragging is only allowed of the pending items.
- if (items0.state != HBQueueItemStateReady)
- {
- return NO;
- }
-
- self.dragNodesArray = items;
-
- // Provide data for our custom type, and simple NSStrings.
- pboard declareTypes:@HBQueueDragDropPboardType owner:self;
-
- // the actual data doesn't matter since DragDropSimplePboardType drags aren't recognized by anyone but us!.
- pboard setData:NSData data forType:HBQueueDragDropPboardType;
-
- return YES;
+ return HBPasteboardItem alloc initWithIndex:row;
 }
 
 - (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id<NSDraggingInfo>)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation
 {
- // Don't allow dropping ONTO an item since they can't really contain any children.
- BOOL isOnDropTypeProposal = dropOperation == NSTableViewDropOn;
- if (isOnDropTypeProposal)
- {
- return NSDragOperationNone;
- }
+ NSDragOperation dragOp = NSDragOperationNone;
 
- // We do not let the user drop a pending item before or *above*
- // already finished or currently encoding items.
- NSInteger encodingRow = self.queue.currentItem ? self.queue.items indexOfObject:self.queue.currentItem : NSNotFound;
- if (encodingRow != NSNotFound && row <= encodingRow)
+ // if drag source is our own table view, it's a move or a copy
+ if (info.draggingSource == tableView)
 {
- return NSDragOperationNone;
- row = MAX(row, encodingRow);
+ // At a minimum, allow move
+ dragOp = NSDragOperationMove;
 }
 
- return NSDragOperationMove;
+ tableView setDropRow:row dropOperation:NSTableViewDropAbove;
+
+ return dragOp;
 }
 
 - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id<NSDraggingInfo>)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation
 {
- self.queue moveItems:self.dragNodesArray toIndex:row;
+ NSMutableIndexSet *indexes = NSMutableIndexSet alloc init;
+ for (NSPasteboardItem *item in info.draggingPasteboard.pasteboardItems)
+ {
+ NSNumber *index = item propertyListForType:tableViewIndex;
+ indexes addIndex:index.integerValue;
+ }
+
+ NSArray *items = self.queue.items objectsAtIndexes:indexes;
+ self.queue moveItems:items toIndex:row;
+
 return YES;
 }

HandBrake-1.5.1.tar.xz/macosx/HBQueueWorker.h Added

@@ -0,0 +1,47 @@
+/* HBQueueWorker.h
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import <Foundation/Foundation.h>
+
+#import "HBQueueJobItem.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString * const HBQueueWorkerDidChangeStateNotification;
+
+extern NSString * const HBQueueWorkerProgressNotification;
+extern NSString * const HBQueueWorkerProgressNotificationPercentKey; // NSNumber - double
+extern NSString * const HBQueueWorkerProgressNotificationHoursKey; // NSNumber - double
+extern NSString * const HBQueueWorkerProgressNotificationMinutesKey; // NSNumber - double
+extern NSString * const HBQueueWorkerProgressNotificationSecondsKey; // NSNumber - double
+extern NSString * const HBQueueWorkerProgressNotificationInfoKey; // NSString
+
+extern NSString * const HBQueueWorkerDidStartItemNotification;
+extern NSString * const HBQueueWorkerDidCompleteItemNotification;
+extern NSString * const HBQueueWorkerItemNotificationItemKey; // HBQueueItem
+
+@interface HBQueueWorker : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+- (instancetype)initWithXPCServiceName:(NSString *)serviceName;
+
+@property (nonatomic, nullable, readonly) HBQueueJobItem *item;
+
+- (void)encodeItem:(HBQueueJobItem *)item;
+- (void)cancel;
+
+@property (nonatomic, readonly) BOOL canEncode;
+@property (nonatomic, readonly) BOOL isEncoding;
+
+@property (nonatomic, readonly) BOOL canPause;
+- (void)pause;
+
+@property (nonatomic, readonly) BOOL canResume;
+- (void)resume;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/HBQueueWorker.m Added

@@ -0,0 +1,259 @@
+/* HBQueueWorker.h
+
+ This file is part of the HandBrake source code.
+ Homepage: <http://handbrake.fr/>.
+ It may be used under the terms of the GNU General Public License. */
+
+#import "HBQueueWorker.h"
+
+#import "HBRemoteCore.h"
+#import "HBJobOutputFileWriter.h"
+#import "HBPreferencesKeys.h"
+
+static void *HBQueueWorkerContext = &HBQueueWorkerContext;
+static void *HBQueueWorkerLogLevelContext = &HBQueueWorkerLogLevelContext;
+
+NSString * const HBQueueWorkerDidChangeStateNotification = @"HBQueueWorkerDidChangeStateNotification";
+
+NSString * const HBQueueWorkerProgressNotification = @"HBQueueWorkerProgressNotification";
+NSString * const HBQueueWorkerProgressNotificationPercentKey = @"HBQueueWorkerProgressNotificationPercentKey";
+NSString * const HBQueueWorkerProgressNotificationHoursKey = @"HBQueueWorkerProgressNotificationHoursKey";
+NSString * const HBQueueWorkerProgressNotificationMinutesKey = @"HBQueueWorkerProgressNotificationMinutesKey";
+NSString * const HBQueueWorkerProgressNotificationSecondsKey = @"HBQueueWorkerProgressNotificationSecondsKey";
+NSString * const HBQueueWorkerProgressNotificationInfoKey = @"HBQueueWorkerProgressNotificationInfoKey";
+
+NSString * const HBQueueWorkerDidStartItemNotification = @"HBQueueWorkerDidStartItemNotification";
+NSString * const HBQueueWorkerDidCompleteItemNotification = @"HBQueueWorkerDidCompleteItemNotification";
+NSString * const HBQueueWorkerItemNotificationItemKey = @"HBQueueWorkerItemNotificationItemKey";
+
+@interface HBQueueWorker ()
+
+@property (nonatomic, readonly) HBRemoteCore *core;
+
+@property (nonatomic, nullable) HBQueueJobItem *item;
+@property (nonatomic, nullable) HBJobOutputFileWriter *currentLog;
+
+@end
+
+@implementation HBQueueWorker
+
+- (instancetype)initWithXPCServiceName:(NSString *)serviceName
+{
+ self = super init;
+ if (self)
+ {
+ NSInteger loggingLevel = NSUserDefaults.standardUserDefaults integerForKey:HBLoggingLevel;
+ _core = HBRemoteCore alloc initWithLogLevel:loggingLevel name:serviceName serviceName:serviceName;
+
+ // Set up observers
+ self.core addObserver:self forKeyPath:@"state"
+ options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
+ context:HBQueueWorkerContext;
+
+ NSUserDefaultsController.sharedUserDefaultsController addObserver:self forKeyPath:@"values.LoggingLevel"
+ options:0 context:HBQueueWorkerLogLevelContext;
+ }
+ return self;
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if (context == HBQueueWorkerContext)
+ {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerDidChangeStateNotification object:self;
+ }
+ else if (context == HBQueueWorkerLogLevelContext)
+ {
+ self.core.logLevel = NSUserDefaults.standardUserDefaults integerForKey:HBLoggingLevel;
+ }
+ else
+ {
+ super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
+ }
+}
+
+- (void)dealloc
+{
+ self.core removeObserver:self forKeyPath:@"state" context:HBQueueWorkerContext;
+ NSUserDefaultsController.sharedUserDefaultsController removeObserver:self forKeyPath:@"values.LoggingLevel" context:HBQueueWorkerLogLevelContext;
+ self.core invalidate;
+}
+
+- (BOOL)canEncode
+{
+ return self.item == nil;
+}
+
+- (BOOL)isEncoding
+{
+ return self.item != nil;
+}
+
+- (BOOL)canPause
+{
+ HBState s = self.core.state;
+ return (s == HBStateWorking || s == HBStateMuxing);
+}
+
+- (void)pause
+{
+ self.item pausedAtDate:NSDate date;
+ self.core pause;
+}
+
+- (BOOL)canResume
+{
+ return self.core.state == HBStatePaused;
+}
+
+- (void)resume
+{
+ self.item resumedAtDate:NSDate date;
+ self.core resume;
+}
+
+- (void)completedItem:(HBQueueJobItem *)item result:(HBCoreResult)result
+{
+ NSParameterAssert(item);
+
+ item.endedDate = NSDate date;
+
+ // Since we are done with this encode, tell output to stop writing to the
+ // individual encode log.
+ self.core.stderrRedirect removeListener:self.currentLog;
+ self.core.stdoutRedirect removeListener:self.currentLog;
+
+ self.currentLog = nil;
+
+ // Mark the encode just finished
+ self.item setDoneWithResult:result;
+ self.item = nil;
+
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerProgressNotification
+ object:self
+ userInfo:@{HBQueueWorkerProgressNotificationPercentKey: @1.0,
+ HBQueueWorkerProgressNotificationInfoKey: @""};
+
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerDidCompleteItemNotification
+ object:self
+ userInfo:@{HBQueueWorkerItemNotificationItemKey: item};
+}
+
+/**
+ * Here we actually tell hb_scan to perform the source scan, using the path to source and title number
+ */
+- (void)encodeItem:(HBQueueJobItem *)item
+{
+ NSParameterAssert(item);
+
+ // now we mark the queue item as working so another instance can not come along and try to scan it while we are scanning
+ item.startedDate = NSDate date;
+ item.state = HBQueueItemStateWorking;
+
+ self.item = item;
+
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerDidStartItemNotification
+ object:self
+ userInfo:@{HBQueueWorkerItemNotificationItemKey: item};
+
+ // Tell HB to output a new activity log file for this encode
+ self.currentLog = HBJobOutputFileWriter alloc initWithJob:item.job;
+ if (self.currentLog)
+ {
+ item.activityLogURL = self.currentLog.url;
+
+ dispatch_queue_t mainQueue = dispatch_get_main_queue();
+ self.core.stderrRedirect addListener:self.currentLog queue:mainQueue;
+ self.core.stdoutRedirect addListener:self.currentLog queue:mainQueue;
+ }
+
+ // Progress handler
+ void (^progressHandler)(HBState state, HBProgress progress, NSString *info) = ^(HBState state, HBProgress progress, NSString *info)
+ {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerProgressNotification
+ object:self
+ userInfo:@{HBQueueWorkerProgressNotificationPercentKey: @0,
+ HBQueueWorkerProgressNotificationInfoKey: info};
+ };
+
+ // Completion handler
+ void (^completionHandler)(HBCoreResult result) = ^(HBCoreResult result)
+ {
+ if (result.code == HBCoreResultCodeDone)
+ {
+ self realEncodeItem:item;
+ }
+ else
+ {
+ self completedItem:item result:result;
+ }
+ };
+
+ item.job refreshSecurityScopedResources;
+
+ // Only scan 10 previews before an encode - additional previews are
+ // only useful for autocrop and static previews, which are already taken care of at this point
+ self.core scanURL:item.fileURL
+ titleIndex:item.job.titleIdx
+ previews:10
+ minDuration:0
+ keepPreviews:NO
+ progressHandler:progressHandler
+ completionHandler:completionHandler;
+}
+
+/**
+ * This assumes that we have re-scanned and loaded up a new queue item to send to libhb
+ */
+- (void)realEncodeItem:(HBQueueJobItem *)item
+{
+ HBJob *job = item.job;
+
+ // Progress handler
+ void (^progressHandler)(HBState state, HBProgress progress, NSString *info) = ^(HBState state, HBProgress progress, NSString *info)
+ {
+ if (state == HBStateMuxing)
+ {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerProgressNotification
+ object:self
+ userInfo:@{HBQueueWorkerProgressNotificationPercentKey: @1,
+ HBQueueWorkerProgressNotificationInfoKey: info};
+ }
+ else
+ {
+ NSNotificationCenter.defaultCenter postNotificationName:HBQueueWorkerProgressNotification
+ object:self
+ userInfo:@{HBQueueWorkerProgressNotificationPercentKey: @(progress.percent),
+ HBQueueWorkerProgressNotificationHoursKey: @(progress.hours),
+ HBQueueWorkerProgressNotificationMinutesKey: @(progress.minutes),
+ HBQueueWorkerProgressNotificationSecondsKey: @(progress.seconds),
+ HBQueueWorkerProgressNotificationInfoKey: info};
+ }
+ };
+
+ // Completion handler
+ void (^completionHandler)(HBCoreResult result) = ^(HBCoreResult result)
+ {
+ self completedItem:item result:result;
+ };
+
+ // We should be all setup so let 'er rip
+ self.core encodeJob:job progressHandler:progressHandler completionHandler:completionHandler;
+}
+
+/**
+ * Cancels the current job
+ */
+- (void)cancel
+{
+ if (self.core.state == HBStateScanning)
+ {
+ self.core cancelScan;
+ }
+ else
+ {
+ self.core cancelEncode;
+ }
+}
+
+@end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRange+UIAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/HBRange+UIAdditions.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRedirect.m -> HandBrake-1.5.1.tar.xz/macosx/HBRedirect.m Changed

@@ -3,18 +3,19 @@
 It may be used under the terms of the GNU General Public License. */
 
 #import "HBRedirect.h"
+#import "HBDirectUtilities.h"
 
+HB_OBJC_DIRECT_MEMBERS
 @interface HBOutputRedirectListenerEntry : NSObject
-{
-@public
- id<HBOutputRedirectListening> listener;
- dispatch_queue_t queue;
-}
+
+@property (nonatomic, readonly) id<HBOutputRedirectListening> listener;
+@property (nonatomic, readonly) dispatch_queue_t queue;
 
 - (instancetype)initWithListener:(id<HBOutputRedirectListening>)listener queue:(dispatch_queue_t)queue;
 
 @end
 
+HB_OBJC_DIRECT_MEMBERS
 @implementation HBOutputRedirectListenerEntry
 
 - (instancetype)initWithListener:(id<HBOutputRedirectListening>)entryListener queue:(dispatch_queue_t)entryQueue
@@ -22,14 +23,15 @@
 self = super init;
 if (self)
 {
- self->listener = entryListener;
- self->queue = entryQueue;
+ _listener = entryListener;
+ _queue = entryQueue;
 }
 return self;
 }
 
 @end
 
+HB_OBJC_DIRECT_MEMBERS
 @interface HBRedirect ()
 
 /// Set that contains all registered listeners for this output.
@@ -40,6 +42,7 @@
 
 @end
 
+HB_OBJC_DIRECT_MEMBERS
 @implementation HBRedirect
 
 /**
@@ -62,7 +65,7 @@
 {
 for (HBOutputRedirectListenerEntry *entry in _listenerEntries)
 {
- if (entry->listener == listener)
+ if (entry.listener == listener)
 {
 return entry;
 }
@@ -137,8 +140,8 @@
 {
 for (HBOutputRedirectListenerEntry *entry in _listenerEntries)
 {
- dispatch_async(entry->queue, ^{
- entry->listener redirect:string type:self->_type;
+ dispatch_async(entry.queue, ^{
+ entry.listener redirect:string type:self->_type;
 });
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRemoteCore.h -> HandBrake-1.5.1.tar.xz/macosx/HBRemoteCore.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRemoteCore.m -> HandBrake-1.5.1.tar.xz/macosx/HBRemoteCore.m Changed

@@ -5,7 +5,6 @@
 #import "HBRemoteCore.h"
 #import "HBRemoteCoreProtocol.h"
 #import "HBPreferencesKeys.h"
-#import <IOKit/pwr_mgt/IOPMLib.h>
 
 @import HandBrakeKit;
 
@@ -18,12 +17,11 @@
 
 @property (nonatomic, readonly) NSInteger level;
 @property (nonatomic, readonly, copy) NSString *name;
+@property (nonatomic, readonly, copy) NSString *serviceName;
 
 @property (nonatomic, readwrite, copy) HBCoreProgressHandler progressHandler;
 @property (nonatomic, readwrite, copy) HBCoreCompletionHandler completionHandler;
 
-@property (nonatomic, readwrite) IOPMAssertionID assertionID;
-
 @end
 
 @implementation HBRemoteCore
@@ -36,16 +34,29 @@
 _state = HBStateIdle;
 _stdoutRedirect = HBRedirect.stdoutRedirect;
 _stderrRedirect = HBRedirect.stderrRedirect;
- _assertionID = -1;
+ _automaticallyPreventSleep = NO;
+ _level = 1;
+ _name = @"HandBrakeXPC";
+ _serviceName = @"fr.handbrake.HandBrakeXPCService";
+ }
+ return self;
+}
 
- self connect;
+- (instancetype)initWithLogLevel:(NSInteger)level name:(NSString *)name serviceName:(NSString *)serviceName
+{
+ self = self init;
+ if (self)
+ {
+ _level = level;
+ _name = name copy;
+ _serviceName = serviceName copy;
 }
 return self;
 }
 
 - (void)connect
 {
- _connection = NSXPCConnection alloc initWithServiceName:@"fr.handbrake.HandBrakeXPCService";
+ _connection = NSXPCConnection alloc initWithServiceName:self.serviceName;
 _connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(HBRemoteCoreProtocol);
 
 _connection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(HBRemoteProgressProtocol);
@@ -73,6 +84,10 @@
 };
 
 _connection resume;
+
+ _proxy setDVDNav:NSUserDefaults.standardUserDefaults boolForKey:HBUseDvdNav;
+ _proxy setUpWithLogLevel:self.level name:self.name;
+ _proxy setAutomaticallyPreventSleep:self.automaticallyPreventSleep;
 }
 
 - (void)invalidate
@@ -87,6 +102,7 @@
 {
 _proxy setDVDNav:NSUserDefaults.standardUserDefaults boolForKey:HBUseDvdNav;
 _proxy setUpWithLogLevel:self.level name:self.name;
+ _proxy setAutomaticallyPreventSleep:self.automaticallyPreventSleep;
 
 HBCoreCompletionHandler handler = self.completionHandler;
 
@@ -97,25 +113,14 @@
 
 if (handler)
 {
- handler(HBCoreResultFailed);
+ HBCoreResult result = {0, HBCoreResultCodeUnknown};
+ result.code = HBCoreResultCodeUnknown;
+ handler(result);
 }
 
 self forwardError:@"XPC: Service did crash\n";
 }
 
-- (instancetype)initWithLogLevel:(NSInteger)level name:(NSString *)name
-{
- self = self init;
- if (self)
- {
- _level = level;
- _name = name;
- _proxy setDVDNav:NSUserDefaults.standardUserDefaults boolForKey:HBUseDvdNav;
- _proxy setUpWithLogLevel:level name:name;
- }
- return self;
-}
-
 - (void)updateState:(HBState)state {
 dispatch_sync(dispatch_get_main_queue(), ^{
 self.state = state;
@@ -128,60 +133,28 @@
 _proxy setLogLevel:logLevel;
 }
 
-- (void)preventSleep
+- (void)setAutomaticallyPreventSleep:(BOOL)automaticallyPreventSleep
 {
- if (_assertionID != -1)
- {
- // nothing to do
- return;
- }
-
- CFStringRef reasonForActivity= CFSTR("HandBrake is currently scanning and/or encoding");
-
- IOReturn success = IOPMAssertionCreateWithName(kIOPMAssertPreventUserIdleSystemSleep,
- kIOPMAssertionLevelOn, reasonForActivity, &_assertionID);
-
- if (success != kIOReturnSuccess)
- {
- HBUtilities writeToActivityLog:"HBRemoteCore: failed to prevent system sleep";
- }
+ _automaticallyPreventSleep = automaticallyPreventSleep;
+ _proxy setAutomaticallyPreventSleep:automaticallyPreventSleep;
 }
 
 - (void)allowSleep
 {
- if (_assertionID == -1)
- {
- // nothing to do
- return;
- }
-
- IOReturn success = IOPMAssertionRelease(_assertionID);
-
- if (success == kIOReturnSuccess)
- {
- _assertionID = -1;
- }
+ _proxy allowSleep;
 }
 
-- (void)preventAutoSleep
+- (void)preventSleep
 {
- if (self.automaticallyPreventSleep)
- {
- self preventSleep;
- }
+ _proxy preventSleep;
 }
 
-- (void)allowAutoSleep
+- (void)scanURL:(NSURL *)url titleIndex:(NSUInteger)index previews:(NSUInteger)previewsNum minDuration:(NSUInteger)seconds keepPreviews:(BOOL)keepPreviews progressHandler:(nonnull HBCoreProgressHandler)progressHandler completionHandler:(nonnull HBCoreCompletionHandler)completionHandler
 {
- if (self.automaticallyPreventSleep)
+ if (!_connection)
 {
- self allowSleep;
+ self connect;
 }
-}
-
-- (void)scanURL:(NSURL *)url titleIndex:(NSUInteger)index previews:(NSUInteger)previewsNum minDuration:(NSUInteger)seconds keepPreviews:(BOOL)keepPreviews progressHandler:(nonnull HBCoreProgressHandler)progressHandler completionHandler:(nonnull HBCoreCompletionHandler)completionHandler
-{
- self preventAutoSleep;
 
 #ifdef __SANDBOX_ENABLED__
 __block HBSecurityAccessToken *token = HBSecurityAccessToken tokenWithObject:url;
@@ -208,7 +181,6 @@
 #ifdef __SANDBOX_ENABLED__
 token = nil;
 #endif
- weakSelf allowAutoSleep;
 handler(result);
 });
 };
@@ -221,8 +193,6 @@
 
 - (void)encodeJob:(HBJob *)job progressHandler:(HBCoreProgressHandler)progressHandler completionHandler:(HBCoreCompletionHandler)completionHandler
 {
- self preventAutoSleep;
-
 #ifdef __SANDBOX_ENABLED__
 __block HBSecurityAccessToken *token = HBSecurityAccessToken tokenWithObject:job;
 
@@ -265,7 +235,6 @@
 #ifdef __SANDBOX_ENABLED__
 token = nil;
 #endif
- weakSelf allowAutoSleep;
 handler(result);
 });
 };
@@ -282,7 +251,6 @@
 
 dispatch_sync(dispatch_get_main_queue(), ^{
 HBProgress progress = {currentProgress , hours, minutes, seconds};
- weakSelf.state = state;
 weakSelf.progressHandler(state, progress, info);
 });
 }
@@ -302,13 +270,11 @@
 - (void)pause
 {
 _proxy pauseEncode;
- self allowAutoSleep;
 }
 
 - (void)resume
 {
 _proxy resumeEncode;
- self preventAutoSleep;
 }
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRenamePresetController.h -> HandBrake-1.5.1.tar.xz/macosx/HBRenamePresetController.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBRenamePresetController.m -> HandBrake-1.5.1.tar.xz/macosx/HBRenamePresetController.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBStateFormatter.h -> HandBrake-1.5.1.tar.xz/macosx/HBStateFormatter.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSubtitles.h -> HandBrake-1.5.1.tar.xz/macosx/HBSubtitles.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSubtitlesDefaults.h -> HandBrake-1.5.1.tar.xz/macosx/HBSubtitlesDefaults.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSubtitlesDefaults.m -> HandBrake-1.5.1.tar.xz/macosx/HBSubtitlesDefaults.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSubtitlesDefaultsController.m -> HandBrake-1.5.1.tar.xz/macosx/HBSubtitlesDefaultsController.m Changed

@@ -17,7 +17,6 @@
 
 @property (nonatomic, readonly) HBLanguagesSelection *languagesList;
 @property (nonatomic, unsafe_unretained) IBOutlet HBLanguageArrayController *tableController;
-@property (nonatomic, unsafe_unretained) IBOutlet NSButton *showAllButton;
 
 @end
 
@@ -35,36 +34,6 @@
     return self;
 }
 
-- (void)windowDidLoad
-{
-    self addObserver:self forKeyPath:@"tableController.showSelectedOnly" options:0 context:HBSubtitlesDefaultsContext;
-
-    if (self.settings.trackSelectionLanguages.count)
-    {
-        self.tableController.showSelectedOnly = YES;
-    }
-}
-
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
-{
-    if (context == HBSubtitlesDefaultsContext)
-    {
-        if (keyPath isEqualToString:@"tableController.showSelectedOnly")
-        {
-            self.showAllButton setState:!self.tableController.showSelectedOnly;
-        }
-    }
-    else
-    {
-        super observeValueForKeyPath:keyPath ofObject:object change:change context:context;
-    }
-}
-
-- (IBAction)edit:(id)sender
-{
-    self.tableController.showSelectedOnly = !self.tableController.showSelectedOnly;
-}
-
 - (IBAction)ok:(id)sender
 {
     self.settings.trackSelectionLanguages = self.languagesList.selectedLanguages mutableCopy;
@@ -78,14 +47,7 @@
 
 - (IBAction)openUserGuide:(id)sender
 {
-    NSWorkspace sharedWorkspace openURL:HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html";
-}
-
-- (void)dealloc
-{
-    @try {
-        self removeObserver:self forKeyPath:@"tableController.showSelectedOnly" context:HBSubtitlesDefaultsContext;
-    } @catch (NSException * __unused exception) {}
+    NSWorkspace.sharedWorkspace openURL:HBUtilities.documentationURL URLByAppendingPathComponent:@"advanced/audio-subtitle-defaults.html";
 }
 
 @end

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSubtitlesTrack.m -> HandBrake-1.5.1.tar.xz/macosx/HBSubtitlesTrack.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBSummaryViewController.m -> HandBrake-1.5.1.tar.xz/macosx/HBSummaryViewController.m Changed

@@ -193,7 +193,9 @@
         _job addObserver:self forKeyPath:@"video.frameRate" options:0 context:HBSummaryViewControllerVideoContext;
         _job addObserver:self forKeyPath:@"video.frameRateMode" options:0 context:HBSummaryViewControllerVideoContext;
         _job addObserver:self forKeyPath:@"filters.deinterlace" options:0 context:HBSummaryViewControllerFiltersContext;
-        _job addObserver:self forKeyPath:@"filters.rotate" options:0 context:HBSummaryViewControllerFiltersContext;
+        _job addObserver:self forKeyPath:@"filters.colorspace" options:0 context:HBSummaryViewControllerFiltersContext;
+        _job addObserver:self forKeyPath:@"filters.grayscale" options:0 context:HBSummaryViewControllerFiltersContext;
+        _job addObserver:self forKeyPath:@"filters.angle" options:0 context:HBSummaryViewControllerFiltersContext;
         _job addObserver:self forKeyPath:@"filters.flip" options:0 context:HBSummaryViewControllerFiltersContext;
         _job addObserver:self forKeyPath:@"audio.tracks" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:HBSummaryViewControllerAudioContext;
         _job addObserver:self forKeyPath:@"subtitles.tracks" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:HBSummaryViewControllerSubsContext;
@@ -216,7 +218,9 @@
         _job removeObserver:self forKeyPath:@"video.frameRate" context:HBSummaryViewControllerVideoContext;
         _job removeObserver:self forKeyPath:@"video.frameRateMode" context:HBSummaryViewControllerVideoContext;
         _job removeObserver:self forKeyPath:@"filters.deinterlace" context:HBSummaryViewControllerFiltersContext;
-        _job removeObserver:self forKeyPath:@"filters.rotate" context:HBSummaryViewControllerFiltersContext;
+        _job removeObserver:self forKeyPath:@"filters.colorspace" context:HBSummaryViewControllerFiltersContext;
+        _job removeObserver:self forKeyPath:@"filters.grayscale" context:HBSummaryViewControllerFiltersContext;
+        _job removeObserver:self forKeyPath:@"filters.angle" context:HBSummaryViewControllerFiltersContext;
         _job removeObserver:self forKeyPath:@"filters.flip" context:HBSummaryViewControllerFiltersContext;
         _job removeObserver:self forKeyPath:@"audio.tracks" context:HBSummaryViewControllerAudioContext;
         _job removeObserver:self forKeyPath:@"subtitles.tracks" context:HBSummaryViewControllerSubsContext;
@@ -230,7 +234,7 @@
 {
     if (self.tracksReloadInQueue == NO)
     {
-        NSRunLoop mainRunLoop performSelector:@selector(updateTracksLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
+        NSRunLoop.mainRunLoop performSelector:@selector(updateTracksLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
         self.tracksReloadInQueue = YES;
     }
 }
@@ -239,7 +243,7 @@
 {
     if (self.filtersReloadInQueue == NO)
     {
-        NSRunLoop mainRunLoop performSelector:@selector(updateFiltersLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
+        NSRunLoop.mainRunLoop performSelector:@selector(updateFiltersLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
         self.filtersReloadInQueue = YES;
     }
 }
@@ -250,7 +254,7 @@
     // to avoid reloading the same image multiple times.
     if (self.pictureReloadInQueue == NO)
     {
-        NSRunLoop mainRunLoop performSelector:@selector(updatePictureLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
+        NSRunLoop.mainRunLoop performSelector:@selector(updatePictureLabel) target:self argument:nil order:0 modes:@NSDefaultRunLoopMode;
         self.pictureReloadInQueue = YES;
     }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBTitle+Private.h -> HandBrake-1.5.1.tar.xz/macosx/HBTitle+Private.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBTitle.h -> HandBrake-1.5.1.tar.xz/macosx/HBTitle.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBTitle.m -> HandBrake-1.5.1.tar.xz/macosx/HBTitle.m Changed

@@ -18,29 +18,33 @@
 
 @interface HBMetadata ()
 
-@property (nonatomic, readonly) hb_metadata_t *hb_metadata;
-@property (nonatomic, copy) NSString *releaseDate;
+@property (nonatomic, readonly, nullable) hb_metadata_t *metadata;
+@property (nonatomic, copy, nullable) NSString *releaseDate;
 
 @end
 
 @implementation HBMetadata
-- (instancetype)initWithMetadata:(hb_metadata_t *)data
+- (instancetype)initWithMetadata:(hb_metadata_t *)metadata
 {
     self = super init;
     if (self)
     {
-        _hb_metadata = data;
+        _metadata = metadata;
     }
     return self;
 }
 
 - (NSString *)releaseDate
 {
-    if (self.hb_metadata->release_date == nil)
+    if (_metadata && _metadata->dict)
     {
-        return nil;
+        const char *releaseDate = hb_dict_get_string(_metadata->dict, "ReleaseDate");
+        if (releaseDate)
+        {
+            return @(releaseDate);
+        }
     }
-    return @(self.hb_metadata->release_date);
+    return nil;
 }
 
 @end
@@ -229,12 +233,7 @@
 
         if (_bookmark)
         {
-            _fileURL =  HBUtilities URLFromBookmark:_bookmark;
-
-            if (!_fileURL)
-            {
-                decodeObjectOrFail(_fileURL, NSURL);
-            }
+            decodeObjectOrFail(_fileURL, NSURL);
         }
 #else
         decodeObject(_fileURL, NSURL);
@@ -502,7 +501,8 @@
                 {
                     title = @(chapter->title);
                 }
-                else
+
+                if (title == NULL)
                 {
                     title = NSString stringWithFormat:HBKitLocalizedString(@"Chapter %d", "Title -> chapter name"), i + 1;
                 }
@@ -521,11 +521,11 @@
     return _chapters;
 }
 
-- (NSDictionary *)jobSettingsWithPreset:(HBPreset *)preset
+- (nullable NSDictionary *)jobSettingsWithPreset:(HBPreset *)preset
 {
     NSDictionary *result = nil;
 
-    hb_dict_t *hb_preset = preset content.hb_value;
+    hb_dict_t *hb_preset = preset.content.hb_value;
     hb_dict_t *job = hb_preset_job_init(self.hb_handle, self.hb_title->index, hb_preset);
 
     if (job)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBUtilities.h -> HandBrake-1.5.1.tar.xz/macosx/HBUtilities.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBUtilities.m -> HandBrake-1.5.1.tar.xz/macosx/HBUtilities.m Changed

@@ -35,9 +35,14 @@
     return appSupportURL;
 }
 
++ (NSURL *)defaultDestinationURL
+{
+    return NSFileManager.defaultManager URLsForDirectory:NSMoviesDirectory inDomains:NSUserDomainMask firstObject;
+}
+
 + (NSURL *)documentationURL
 {
-    return NSURL URLWithString:@"https://handbrake.fr/docs/en/1.3.0/";
+    return NSURL URLWithString:@"https://handbrake.fr/docs/";
 }
 
 + (void)writeToActivityLog:(const char *)format, ...
@@ -97,7 +102,10 @@
     NSError *error;
     BOOL isStale;
 
-    NSURL *url = NSURL URLByResolvingBookmarkData:bookmark options:NSURLBookmarkResolutionWithSecurityScope relativeToURL:nil bookmarkDataIsStale:&isStale error:&error;
+    NSURL *url = NSURL URLByResolvingBookmarkData:bookmark
+                                           options:NSURLBookmarkResolutionWithSecurityScope | NSURLBookmarkResolutionWithoutMounting
+                                     relativeToURL:nil
+                               bookmarkDataIsStale:&isStale error:&error;
 
     if (error)
     {
@@ -146,7 +154,7 @@
             NSUInteger n = URL.path stringByAppendingString: @"/"
                             completePathIntoString: &mpgname caseSensitive: YES
                             matchesIntoArray: nil
-                            filterTypes: @@"mpg";
+                            filterTypes: @@"mpg", @"ts";
             if (n > 0)
             {
                 // Found an mpeg inside the eyetv package, make it our scan path

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBVideo+UIAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/HBVideo+UIAdditions.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBVideo+UIAdditions.m -> HandBrake-1.5.1.tar.xz/macosx/HBVideo+UIAdditions.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBVideo.h -> HandBrake-1.5.1.tar.xz/macosx/HBVideo.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HBVideo.m -> HandBrake-1.5.1.tar.xz/macosx/HBVideo.m Changed

@@ -149,7 +149,7 @@
 {
 if (frameRate != _frameRate)
 {
- (HBVideo *)self.undo prepareWithInvocationTarget:self setFrameRate:_frameRate;
+ self.undo prepareWithInvocationTarget:self setFrameRate:_frameRate;
 }
 _frameRate = frameRate;
 self postChangedNotification;
@@ -286,21 +286,12 @@
 
 - (void)validateQualityType
 {
- if (self.qualityType != 0)
+ if (self.qualityType != 0 && !hb_video_quality_is_supported(self.encoder))
 {
- int direction;
- float minValue, maxValue, granularity;
- hb_video_quality_get_limits(self.encoder,
- &minValue, &maxValue, &granularity, &direction);
-
- if (minValue == 0 && maxValue == 0)
- {
- self.qualityType = 0;
- }
+ self.qualityType = 0;
 }
 
- if ((self.encoder & HB_VCODEC_FFMPEG_VT_H264) ||
- (self.encoder & HB_VCODEC_FFMPEG_VT_H265))
+ if (!hb_video_twopass_is_supported(self.encoder))
 {
 self.twoPass = NO;
 }
@@ -309,8 +300,13 @@
 - (void)validatePresetsSettings
 {
 NSArray *presets = self.presets;
- if (presets.count && !presets containsObject:self.preset) {
- if (presets.count > self.mediumPresetIndex)
+ if (presets.count && !presets containsObject:self.preset)
+ {
+ if (self.encoder & HB_VCODEC_VT_MASK)
+ {
+ self.preset = self.presets.lastObject;
+ }
+ else if (presets.count > self.mediumPresetIndex)
 {
 self.preset = presetsself.mediumPresetIndex;
 }
@@ -364,7 +360,7 @@
 return NSSet setWithObjects:@"encoder", nil;
 }
 
-- (NSArray *)presets
+- (NSArray<NSString *> *)presets
 {
 NSMutableArray *temp = NSMutableArray array;
 
@@ -651,7 +647,7 @@
 * for the fVidQualityMatrix. It should also be noted that any preset that used the deprecated Target Size
 * setting of 0 would set us to 0 or ABR since ABR is now tagged 0. Fortunately this does not affect any built-in
 * presets since they all use Constant Quality or Average Bitrate.*/
- if (qualityType == -1)
+ if (qualityType == -1 || hb_video_quality_is_supported(self.encoder) == 0)
 {
 qualityType = 0;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.entitlements -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.entitlements Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/project.pbxproj -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.xcodeproj/project.pbxproj Changed

@@ -34,15 +34,13 @@
 		1C7776A5202301D5001C31EB /* HBRenamePresetController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1C7776A3202301D5001C31EB /* HBRenamePresetController.xib */; };
 		1CBC683420BE014800A26CC2 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CBC683320BE014800A26CC2 /* liblzma.a */; };
 		1CBC683520BE014800A26CC2 /* liblzma.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CBC683320BE014800A26CC2 /* liblzma.a */; };
+		1CDCF0C3241F28D400FB62C6 /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CDCF0C1241F28D400FB62C6 /* libturbojpeg.a */; };
+		1CDCF0C4241F28D400FB62C6 /* libturbojpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CDCF0C1241F28D400FB62C6 /* libturbojpeg.a */; };
 		22DD2C4B177B95DA00EF50D3 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DD2C49177B94DB00EF50D3 /* libvpx.a */; };
 		273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202214ADB8650021BE6D /* IOKit.framework */; };
-		273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202514ADB8A40021BE6D /* libz.dylib */; };
-		273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202714ADB8BE0021BE6D /* libbz2.dylib */; };
-		273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202914ADB8D60021BE6D /* libiconv.dylib */; };
 		273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F202F14ADB9790021BE6D /* AudioToolbox.framework */; };
 		273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F203214ADB9F00021BE6D /* CoreServices.framework */; };
 		273F203C14ADBC210021BE6D /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 273F203B14ADBC210021BE6D /* Cocoa.framework */; };
-		273F208914ADBE3B0021BE6D /* fakexcode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 273F208514ADBE3B0021BE6D /* fakexcode.cpp */; };
 		273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208614ADBE3B0021BE6D /* parsecsv.c */; };
 		273F208B14ADBE3B0021BE6D /* test.c in Sources */ = {isa = PBXBuildFile; fileRef = 273F208814ADBE3B0021BE6D /* test.c */; };
 		273F20AC14ADBE670021BE6D /* HBController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F208F14ADBE670021BE6D /* HBController.m */; };
@@ -51,7 +49,7 @@
 		273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
 		273F20B514ADBE670021BE6D /* HBPreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A014ADBE670021BE6D /* HBPreferencesController.m */; };
 		273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20A414ADBE670021BE6D /* HBPreviewController.m */; };
-		273F20BA14ADBE670021BE6D /* HBPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20AA14ADBE670021BE6D /* HBPictureController.m */; };
+		273F20BA14ADBE670021BE6D /* HBCroppingController.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F20AA14ADBE670021BE6D /* HBCroppingController.m */; };
 		273F218B14ADDDA10021BE6D /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 273F217C14ADDDA10021BE6D /* InfoPlist.strings */; };
 		27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72414B1019100B785E4 /* libhandbrake.a */; };
 		27D6C74414B102DA00B785E4 /* libass.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D6C72814B102DA00B785E4 /* libass.a */; };
@@ -81,6 +79,7 @@
 		A91119A41C7DD614001C463C /* HBSubtitlesDefaults.h in Headers */ = {isa = PBXBuildFile; fileRef = A9F4728B1976BAA70009EC65 /* HBSubtitlesDefaults.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91485FE1F61296100374C12 /* HBFiltersViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A91485FD1F61296100374C12 /* HBFiltersViewController.m */; };
 		A914BCB31BC441C700157917 /* HBPreviewView.m in Sources */ = {isa = PBXBuildFile; fileRef = A914BCB21BC441C700157917 /* HBPreviewView.m */; };
+		A9150DAE243F7BE200694870 /* HBQueueDockTileController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9150DAD243F7BE200694870 /* HBQueueDockTileController.m */; };
 		A916180E1C845161000556C6 /* NSDictionary+HBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A93B0DF71C804CF50051A3FA /* NSDictionary+HBAdditions.m */; };
 		A916C9921C84498F00C7B560 /* HBDockTextField.m in Sources */ = {isa = PBXBuildFile; fileRef = 46AB433415F98A2B009C0961 /* HBDockTextField.m */; };
 		A916C9931C8449A100C7B560 /* HBAddPresetController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9E2FD251A21BC4A000E8D3F /* HBAddPresetController.m */; };
@@ -180,40 +179,63 @@
 		A91CE2FE1C7DB99D0068F46F /* HBTreeNode.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D488A31996270300E9B1BA /* HBTreeNode.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */ = {isa = PBXBuildFile; fileRef = A91D54851E378ABD006D0997 /* HBSecurityAccessToken.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91D54881E378ABD006D0997 /* HBSecurityAccessToken.m in Sources */ = {isa = PBXBuildFile; fileRef = A91D54861E378ABD006D0997 /* HBSecurityAccessToken.m */; };
+		A91D84E426676647008987A0 /* HandBrakeXPCService1-InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A91D84E226676647008987A0 /* HandBrakeXPCService1-InfoPlist.strings */; };
+		A91D84E726676647008987A0 /* HandBrakeXPCService2-InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A91D84E526676647008987A0 /* HandBrakeXPCService2-InfoPlist.strings */; };
+		A91D84EA26676647008987A0 /* HandBrakeXPCService3-InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A91D84E826676647008987A0 /* HandBrakeXPCService3-InfoPlist.strings */; };
+		A91D84ED26676647008987A0 /* HandBrakeXPCService4-InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A91D84EB26676647008987A0 /* HandBrakeXPCService4-InfoPlist.strings */; };
 		A91F97351D7B2A4E00D82DCE /* HBAudioTransformers.h in Headers */ = {isa = PBXBuildFile; fileRef = A91F97331D7B2A4E00D82DCE /* HBAudioTransformers.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A91F97361D7B2A4E00D82DCE /* HBAudioTransformers.m in Sources */ = {isa = PBXBuildFile; fileRef = A91F97341D7B2A4E00D82DCE /* HBAudioTransformers.m */; };
 		A92268781A6E555500A8D5C5 /* HBAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A92268771A6E555500A8D5C5 /* HBAppDelegate.m */; };
 		A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = A9294CC71DC4BBF7004D3415 /* HBJob+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
 		A92B148220CA9F7700146FD8 /* HBHUDView.m in Sources */ = {isa = PBXBuildFile; fileRef = A92B148120CA9F7600146FD8 /* HBHUDView.m */; };
+		A93341B7243E1583003A82C2 /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
+		A93341B8243E1583003A82C2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39B22FDE8EE00DFCAEA /* main.m */; };
+		A93341B9243E1583003A82C2 /* HandBrakeXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39922FDE8EE00DFCAEA /* HandBrakeXPCService.m */; };
+		A93341BA243E1583003A82C2 /* HBRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = A954010222FF397000F83A5F /* HBRedirect.m */; };
+		A93341BC243E1583003A82C2 /* HandBrakeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9736F021C7DA5FE008F1D18 /* HandBrakeKit.framework */; };
+		A93341C8243E158B003A82C2 /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
+		A93341C9243E158B003A82C2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39B22FDE8EE00DFCAEA /* main.m */; };
+		A93341CA243E158B003A82C2 /* HandBrakeXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39922FDE8EE00DFCAEA /* HandBrakeXPCService.m */; };
+		A93341CB243E158B003A82C2 /* HBRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = A954010222FF397000F83A5F /* HBRedirect.m */; };
+		A93341CD243E158B003A82C2 /* HandBrakeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9736F021C7DA5FE008F1D18 /* HandBrakeKit.framework */; };
+		A93341CF243E158B003A82C2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A919992A23003CFC0037F526 /* Localizable.strings */; };
+		A93341D9243E158E003A82C2 /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
+		A93341DA243E158E003A82C2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39B22FDE8EE00DFCAEA /* main.m */; };
+		A93341DB243E158E003A82C2 /* HandBrakeXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39922FDE8EE00DFCAEA /* HandBrakeXPCService.m */; };
+		A93341DC243E158E003A82C2 /* HBRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = A954010222FF397000F83A5F /* HBRedirect.m */; };
+		A93341DE243E158E003A82C2 /* HandBrakeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9736F021C7DA5FE008F1D18 /* HandBrakeKit.framework */; };
+		A93341E0243E158E003A82C2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A919992A23003CFC0037F526 /* Localizable.strings */; };
+		A93341EE243E15BE003A82C2 /* HandBrakeXPCService2.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A93341C4243E1583003A82C2 /* HandBrakeXPCService2.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A93341EF243E15BE003A82C2 /* HandBrakeXPCService3.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A93341D5243E158B003A82C2 /* HandBrakeXPCService3.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A93341F0243E15BE003A82C2 /* HandBrakeXPCService4.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A93341E6243E158E003A82C2 /* HandBrakeXPCService4.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A93341F1243E15CE003A82C2 /* HandBrakeXPCService.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A964D39522FDE8EE00DFCAEA /* HandBrakeXPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A937EECB1C6C7C0300EEAE6D /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = A937EECA1C6C7C0300EEAE6D /* dsa_pub.pem */; };
-		A939854F22315575001DCAEB /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A939854D2231556D001DCAEB /* Sparkle.framework */; };
-		A939855022315592001DCAEB /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A939854D2231556D001DCAEB /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		A939855622315638001DCAEB /* org.sparkle-project.InstallerConnection.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = A939855222315628001DCAEB /* org.sparkle-project.InstallerConnection.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		A939855722315638001DCAEB /* org.sparkle-project.InstallerLauncher.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = A939855322315628001DCAEB /* org.sparkle-project.InstallerLauncher.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		A939855822315638001DCAEB /* org.sparkle-project.InstallerStatus.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = A939855422315628001DCAEB /* org.sparkle-project.InstallerStatus.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
-		A939855A22315993001DCAEB /* org.sparkle-project.Downloader.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = A939855922315987001DCAEB /* org.sparkle-project.Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A939DD8B1FC8826A00135F2A /* HBPresetsMenuBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A939DD8A1FC8826A00135F2A /* HBPresetsMenuBuilder.m */; };
 		A93B49221DA3AA6900DD70A3 /* HBToolbarBadgedItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A93B49211DA3AA6900DD70A3 /* HBToolbarBadgedItem.m */; };
 		A93E0ED31972957000FD67FB /* HBVideoController.m in Sources */ = {isa = PBXBuildFile; fileRef = A93E0ED11972957000FD67FB /* HBVideoController.m */; };
+		A942B66D250BB1FE00049203 /* HBQueueActionItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A942B66C250BB1FE00049203 /* HBQueueActionItem.m */; };
 		A943874122ED911B005F701B /* HBJob+HBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A943874022ED911B005F701B /* HBJob+HBAdditions.m */; };
+		A9442D2424DAC04E005EDF62 /* org.sparkle-project.Downloader.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A9442D1824DAC03A005EDF62 /* org.sparkle-project.Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A9442D2524DAC04E005EDF62 /* org.sparkle-project.InstallerConnection.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A9442D1424DAC03A005EDF62 /* org.sparkle-project.InstallerConnection.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A9442D2624DAC04E005EDF62 /* org.sparkle-project.InstallerLauncher.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A9442D1224DAC03A005EDF62 /* org.sparkle-project.InstallerLauncher.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		A9442D2724DAC04E005EDF62 /* org.sparkle-project.InstallerStatus.xpc in Copy Files */ = {isa = PBXBuildFile; fileRef = A9442D1624DAC03A005EDF62 /* org.sparkle-project.InstallerStatus.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A94A98F51C858EFB004BA9BA /* HBDictTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A94A98F41C858EFB004BA9BA /* HBDictTests.m */; };
 		A94DC2DE20CADA2C00EAC8FD /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = A94DC2DC20CADA2C00EAC8FD /* MainWindow.xib */; };
 		A95121E61B5F7BE700FD773D /* NSArray+HBAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A95121E51B5F7BE700FD773D /* NSArray+HBAdditions.m */; };
+		A951D9CA243E5B50002579F2 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A919992A23003CFC0037F526 /* Localizable.strings */; };
 		A954010022FF240E00F83A5F /* HBOutputRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = 273F209E14ADBE670021BE6D /* HBOutputRedirect.m */; };
 		A954010322FF397000F83A5F /* HBRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = A954010222FF397000F83A5F /* HBRedirect.m */; };
 		A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A95512881A320A12001BFC6F /* libjansson.a */; };
 		A957EBCD218DBE5900007988 /* HBAutoNamer.m in Sources */ = {isa = PBXBuildFile; fileRef = A957EBCC218DBE5900007988 /* HBAutoNamer.m */; };
 		A958EAC222E24D6400D83AF4 /* HBQueueTableViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A958EAC422E24D6400D83AF4 /* HBQueueTableViewController.xib */; };
 		A958EAC522E24D6800D83AF4 /* HBQueueInfoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A958EAC722E24D6800D83AF4 /* HBQueueInfoViewController.xib */; };
-		A95BA15D220C968500A2F9F9 /* HBQueueItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BA15C220C968500A2F9F9 /* HBQueueItem.m */; };
-		A95BA161220CA5DB00A2F9F9 /* HBDistributedArray.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BA160220CA5DB00A2F9F9 /* HBDistributedArray.m */; };
+		A95BA15D220C968500A2F9F9 /* HBQueueJobItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A95BA15C220C968500A2F9F9 /* HBQueueJobItem.m */; };
 		A95BC1E71CD2548A008D6A33 /* volHighTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A95BC1E51CD2548A008D6A33 /* volHighTemplate.pdf */; };
 		A95BC1E81CD2548A008D6A33 /* volLowTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A95BC1E61CD2548A008D6A33 /* volLowTemplate.pdf */; };
 		A96127DF22E0994E0086E6DC /* HBQueueInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96127DD22E0994E0086E6DC /* HBQueueInfoViewController.m */; };
 		A96127E422E09ADD0086E6DC /* HBQueueTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96127E222E09ADD0086E6DC /* HBQueueTableViewController.m */; };
 		A964D39A22FDE8EE00DFCAEA /* HandBrakeXPCService.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39922FDE8EE00DFCAEA /* HandBrakeXPCService.m */; };
 		A964D39C22FDE8EE00DFCAEA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D39B22FDE8EE00DFCAEA /* main.m */; };
-		A964D3A022FDE8EE00DFCAEA /* HandBrakeXPCService.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = A964D39522FDE8EE00DFCAEA /* HandBrakeXPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		A964D3A822FDE91B00DFCAEA /* HBRemoteCore.m in Sources */ = {isa = PBXBuildFile; fileRef = A964D3A722FDE91B00DFCAEA /* HBRemoteCore.m */; };
 		A96664B01CCE45BF00DA4A57 /* HBPlayerHUDController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96664AE1CCE45BF00DA4A57 /* HBPlayerHUDController.m */; };
 		A96664B51CCE48F700DA4A57 /* HBPictureHUDController.m in Sources */ = {isa = PBXBuildFile; fileRef = A96664B31CCE48F700DA4A57 /* HBPictureHUDController.m */; };
@@ -228,6 +250,9 @@
 		A973E109216E74AC00D498EC /* HBImageUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = A9CE0A931F57EC4600724577 /* HBImageUtilities.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A973E10C216E74E900D498EC /* HBThumbnailItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = A973E10B216E74E900D498EC /* HBThumbnailItemView.m */; };
 		A975B02220F7AF29004675CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A975B02020F7AF29004675CC /* Localizable.strings */; };
+		A97D8DCF24DBD3C000B16AF5 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A91CE2D11C7DABDA0068F46F /* libz.tbd */; };
+		A97D8DD024DBD3EF00B16AF5 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A91CE2CF1C7DABCE0068F46F /* libbz2.tbd */; };
+		A97D8DD124DBD3F800B16AF5 /* libiconv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = A91CE2D31C7DABE40068F46F /* libiconv.tbd */; };
 		A97ECB8222E1D85500570935 /* HBQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = A97ECB8122E1D85500570935 /* HBQueue.m */; };
 		A97ED7F522EC5BE900AEF29B /* HBQueueMultiSelectionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A97ED7F322EC5BE900AEF29B /* HBQueueMultiSelectionViewController.m */; };
 		A97ED7F622EC5BE900AEF29B /* HBQueueMultiSelectionViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A97ED7F422EC5BE900AEF29B /* HBQueueMultiSelectionViewController.xib */; };
@@ -238,10 +263,13 @@
 		A98C29C41977B10600AF5DED /* HBLanguagesSelection.m in Sources */ = {isa = PBXBuildFile; fileRef = A98C29C31977B10600AF5DED /* HBLanguagesSelection.m */; };
 		A9906B2C1A710920001D82D5 /* HBQueueController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9906B2B1A710920001D82D5 /* HBQueueController.m */; };
 		A990C55322FF4FBA00E07CE2 /* HandBrakeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9736F021C7DA5FE008F1D18 /* HandBrakeKit.framework */; };
+		A9935865256C346F00A6875E /* libzimg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9935852256C346F00A6875E /* libzimg.a */; };
+		A9935866256C347800A6875E /* libzimg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A9935852256C346F00A6875E /* libzimg.a */; };
 		A99F40CF1B624E7E00750170 /* HBPictureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A99F40CD1B624E7E00750170 /* HBPictureViewController.m */; };
 		A9A0CBE81CCEA3670045B3DF /* HBPlayerTrack.m in Sources */ = {isa = PBXBuildFile; fileRef = A9A0CBE61CCEA1D10045B3DF /* HBPlayerTrack.m */; };
 		A9A25D9C21182741005A8A0F /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A25D9B21182741005A8A0F /* CoreMedia.framework */; };
 		A9A25D9D21182753005A8A0F /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9A25D9B21182741005A8A0F /* CoreMedia.framework */; };
+		A9A5F7D5243DD90100C82EC8 /* HBQueueWorker.m in Sources */ = {isa = PBXBuildFile; fileRef = A9A5F7D4243DD90100C82EC8 /* HBQueueWorker.m */; };
 		A9A7E27C1FE2A0B5006BE79F /* HBPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A9A7E27A1FE2A0B5006BE79F /* HBPreviewViewController.m */; };
 		A9A96B8220CAD2C200A39AFB /* HBPictureHUDController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96B8420CAD2C200A39AFB /* HBPictureHUDController.xib */; };
 		A9A96B8520CAD2CC00A39AFB /* HBEncodingProgressHUDController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96B8720CAD2CC00A39AFB /* HBEncodingProgressHUDController.xib */; };
@@ -258,7 +286,7 @@
 		A9A96BCE20CAD61F00A39AFB /* SubtitlesDefaults.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BCC20CAD61F00A39AFB /* SubtitlesDefaults.xib */; };
 		A9A96BD120CAD62500A39AFB /* ChaptersTitles.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BCF20CAD62500A39AFB /* ChaptersTitles.xib */; };
 		A9A96BD420CAD63000A39AFB /* Queue.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BD220CAD63000A39AFB /* Queue.xib */; };
-		A9A96BD720CAD64300A39AFB /* PictureSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BD520CAD64200A39AFB /* PictureSettings.xib */; };
+		A9A96BD720CAD64300A39AFB /* HBCroppingView.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BD520CAD64200A39AFB /* HBCroppingView.xib */; };
 		A9A96BDA20CAD64B00A39AFB /* PicturePreview.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BD820CAD64B00A39AFB /* PicturePreview.xib */; };
 		A9A96BDD20CAD66000A39AFB /* OutputPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BDB20CAD66000A39AFB /* OutputPanel.xib */; };
 		A9A96BE020CAD66500A39AFB /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9A96BDE20CAD66500A39AFB /* Preferences.xib */; };
@@ -271,11 +299,14 @@
 		A9ABD1A71E2A0F7500EC8B65 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */; };
 		A9ABD1A91E2A0F8200EC8B65 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */; };
 		A9ABD1AA1E2A0F8F00EC8B65 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */; };
+		A9B304892671288D001FFEDE /* HBDirectUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = A9B304882671288D001FFEDE /* HBDirectUtilities.h */; };
 		A9B3B63922E2EA58001CEB9A /* HBQueueItemWorkingView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9B3B63822E2EA58001CEB9A /* HBQueueItemWorkingView.m */; };
 		A9B5568522FFE4870050D582 /* HBRedirect.m in Sources */ = {isa = PBXBuildFile; fileRef = A954010222FF397000F83A5F /* HBRedirect.m */; };
 		A9B6B9EE217B38D200B957AE /* HBLocalizationUtilities.h in Headers */ = {isa = PBXBuildFile; fileRef = A9B6B9ED217B38D200B957AE /* HBLocalizationUtilities.h */; };
 		A9B6B9F1217B408E00B957AE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A9B6B9EF217B408E00B957AE /* InfoPlist.strings */; };
 		A9B6B9F4217B408E00B957AE /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A9B6B9F2217B408E00B957AE /* Localizable.strings */; };
+		A9BB1C2124DAD3EA007CD416 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = A9442CF024DABFED005EDF62 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		A9BB1C6924DAD869007CD416 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9442CF024DABFED005EDF62 /* Sparkle.framework */; };
 		A9BC24C91A69293E007DC41A /* HBAttributedStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BC24C81A69293E007DC41A /* HBAttributedStringAdditions.m */; };
 		A9C3A50123C7A66100269CA3 /* HBFilePromiseProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C3A50023C7A66100269CA3 /* HBFilePromiseProvider.m */; };
 		A9C61F9E22E31CDB00C28E7C /* HBFlippedClipView.m in Sources */ = {isa = PBXBuildFile; fileRef = A9C61F9D22E31CDB00C28E7C /* HBFlippedClipView.m */; };
@@ -289,6 +320,7 @@
 		A9DF49271C884C4E008AC14A /* HBJobTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A9DF49221C884C4E008AC14A /* HBJobTests.m */; };
 		A9DF49281C884C4E008AC14A /* HBJobUndoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A9DF49231C884C4E008AC14A /* HBJobUndoTests.m */; };
 		A9DF492A1C884C4E008AC14A /* HBPresetsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = A9DF49261C884C4E008AC14A /* HBPresetsTests.m */; };
+		A9E05A082529E77F000E0E9A /* HBPasteboardItem.m in Sources */ = {isa = PBXBuildFile; fileRef = A9E05A072529E77F000E0E9A /* HBPasteboardItem.m */; };
 		A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */; };
 		A9E1468016BC2AD800C307BC /* NextTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467C16BC2AD800C307BC /* NextTemplate.pdf */; };
 		A9E1468116BC2AD800C307BC /* PauseTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = A9E1467D16BC2AD800C307BC /* PauseTemplate.pdf */; };
@@ -319,6 +351,188 @@
 			remoteGlobalIDString = 273F203814ADBC200021BE6D;
 			remoteInfo = HandBrake;
 		};
+		A93341E8243E15B2003A82C2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A93341B5243E1583003A82C2;
+			remoteInfo = HandBrakeXPCService2;
+		};
+		A93341EA243E15B4003A82C2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A93341C6243E158B003A82C2;
+			remoteInfo = HandBrakeXPCService3;
+		};
+		A93341EC243E15B6003A82C2 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = A93341D7243E158E003A82C2;
+			remoteInfo = HandBrakeXPCService4;
+		};
+		A9442CEF24DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 8DC2EF5B0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		A9442CF124DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 61B5F90209C4CEE200B25A18;
+			remoteInfo = "Sparkle Test App";
+		};
+		A9442CF324DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 612279D90DB5470200AB99EA;
+			remoteInfo = "Sparkle Unit Tests";
+		};
+		A9442CF524DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5D06E8D00FD68C7C005AE3F6;
+			remoteInfo = BinaryDelta;
+		};
+		A9442CF724DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 55C14BB7136EEF1500649790;
+			remoteInfo = Autoupdate;
+		};
+		A9442CF924DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 726B2B5D1C645FC900388755;
+			remoteInfo = "UI Tests";
+		};
+		A9442CFD24DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5AE13FB31E0D9E07000D2C2C;
+			remoteInfo = generate_appcast;
+		};
+		A9442CFF24DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5AB8F19F214DA72000A1187F;
+			remoteInfo = generate_keys;
+		};
+		A9442D0124DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 5A5ADED7214EDE4900DF0099;
+			remoteInfo = sign_update;
+		};
+		A9442D0324DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EA4311EA229D651300A5503D;
+			remoteInfo = bsdiff;
+		};
+		A9442D0524DABFED005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = EA4311A0229D5FBC00A5503D;
+			remoteInfo = ed25519;
+		};
+		A9442D1124DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 726E07AD1CAF08D6001A286B;
+			remoteInfo = SparkleInstallerLauncher;
+		};
+		A9442D1324DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 724BB36C1D31D0B7005D534A;
+			remoteInfo = SparkleInstallerConnection;
+		};
+		A9442D1524DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 724BB3931D333832005D534A;
+			remoteInfo = SparkleInstallerStatus;
+		};
+		A9442D1724DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 726E07EF1CAF37BD001A286B;
+			remoteInfo = SparkleDownloader;
+		};
+		A9442D1924DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 726E4A161C86C88F00C57C6A;
+			remoteInfo = TestAppHelper;
+		};
+		A9442D1B24DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 72D9549E1CBB415B006F28BD;
+			remoteInfo = "sparkle-cli";
+		};
+		A9442D1D24DAC03A005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 721C24451CB753E6005440CB;
+			remoteInfo = "Installer Progress";
+		};
+		A9442D2824DAC097005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		A9442D2A24DAC097005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07EE1CAF37BD001A286B;
+			remoteInfo = SparkleDownloader;
+		};
+		A9442D2C24DAC097005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB36B1D31D0B7005D534A;
+			remoteInfo = SparkleInstallerConnection;
+		};
+		A9442D2E24DAC097005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07AC1CAF08D6001A286B;
+			remoteInfo = SparkleInstallerLauncher;
+		};
+		A9442D3024DAC097005EDF62 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB3921D333832005D534A;
+			remoteInfo = SparkleInstallerStatus;
+		};
 		A964D39E22FDE8EE00DFCAEA /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 273F1FE014AD9DA40021BE6D /* Project object */;
@@ -373,22 +587,26 @@
 			dstSubfolderSpec = 10;
 			files = (
 				A9736F181C7DA5FE008F1D18 /* HandBrakeKit.framework in CopyFiles */,
-				A939855022315592001DCAEB /* Sparkle.framework in CopyFiles */,
+				A9BB1C2124DAD3EA007CD416 /* Sparkle.framework in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		A939855522315630001DCAEB /* CopyFiles */ = {
+		A939855522315630001DCAEB /* Copy Files */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
 			dstSubfolderSpec = 16;
 			files = (
-				A939855622315638001DCAEB /* org.sparkle-project.InstallerConnection.xpc in CopyFiles */,
-				A939855722315638001DCAEB /* org.sparkle-project.InstallerLauncher.xpc in CopyFiles */,
-				A964D3A022FDE8EE00DFCAEA /* HandBrakeXPCService.xpc in CopyFiles */,
-				A939855822315638001DCAEB /* org.sparkle-project.InstallerStatus.xpc in CopyFiles */,
-				A939855A22315993001DCAEB /* org.sparkle-project.Downloader.xpc in CopyFiles */,
+				A93341F1243E15CE003A82C2 /* HandBrakeXPCService.xpc in Copy Files */,
+				A93341EE243E15BE003A82C2 /* HandBrakeXPCService2.xpc in Copy Files */,
+				A93341EF243E15BE003A82C2 /* HandBrakeXPCService3.xpc in Copy Files */,
+				A93341F0243E15BE003A82C2 /* HandBrakeXPCService4.xpc in Copy Files */,
+				A9442D2424DAC04E005EDF62 /* org.sparkle-project.Downloader.xpc in Copy Files */,
+				A9442D2524DAC04E005EDF62 /* org.sparkle-project.InstallerConnection.xpc in Copy Files */,
+				A9442D2624DAC04E005EDF62 /* org.sparkle-project.InstallerLauncher.xpc in Copy Files */,
+				A9442D2724DAC04E005EDF62 /* org.sparkle-project.InstallerStatus.xpc in Copy Files */,
 			);
+			name = "Copy Files";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXCopyFilesBuildPhase section */
@@ -401,14 +619,12 @@
 		1C7776A0202300DC001C31EB /* HBRenamePresetController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBRenamePresetController.m; sourceTree = "<group>"; };
 		1C7776A1202300DC001C31EB /* HBRenamePresetController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBRenamePresetController.h; sourceTree = "<group>"; };
 		1CBC683320BE014800A26CC2 /* liblzma.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblzma.a; path = external/contrib/lib/liblzma.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		1CDCF0C1241F28D400FB62C6 /* libturbojpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libturbojpeg.a; path = external/contrib/lib/libturbojpeg.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		22CC9E74191EBEA500C69D81 /* libx265.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libx265.a; path = external/contrib/lib/libx265.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		22DD2C49177B94DB00EF50D3 /* libvpx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libvpx.a; path = external/contrib/lib/libvpx.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		271BA4C014B119F800BC1D2C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; name = Info.plist; path = external/macosx/Info.plist; sourceTree = BUILT_PRODUCTS_DIR; };
 		273F1FFF14ADAE950021BE6D /* HandBrakeCLI */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = HandBrakeCLI; sourceTree = BUILT_PRODUCTS_DIR; };
 		273F202214ADB8650021BE6D /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
-		273F202514ADB8A40021BE6D /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		273F202714ADB8BE0021BE6D /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
-		273F202914ADB8D60021BE6D /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		273F202F14ADB9790021BE6D /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		273F203214ADB9F00021BE6D /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
 		273F203914ADBC210021BE6D /* HandBrake.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HandBrake.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -416,7 +632,6 @@
 		273F203E14ADBC210021BE6D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		273F203F14ADBC210021BE6D /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		273F204014ADBC210021BE6D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		273F208514ADBE3B0021BE6D /* fakexcode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fakexcode.cpp; sourceTree = "<group>"; };
 		273F208614ADBE3B0021BE6D /* parsecsv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = parsecsv.c; sourceTree = "<group>"; };
 		273F208714ADBE3B0021BE6D /* parsecsv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = parsecsv.h; sourceTree = "<group>"; };
 		273F208814ADBE3B0021BE6D /* test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = test.c; sourceTree = "<group>"; };
@@ -437,8 +652,8 @@
 		273F20A214ADBE670021BE6D /* HBPresetsManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresetsManager.m; sourceTree = "<group>"; };
 		273F20A314ADBE670021BE6D /* HBPreviewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreviewController.h; sourceTree = "<group>"; };
 		273F20A414ADBE670021BE6D /* HBPreviewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewController.m; sourceTree = "<group>"; };
-		273F20A914ADBE670021BE6D /* HBPictureController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPictureController.h; sourceTree = "<group>"; };
-		273F20AA14ADBE670021BE6D /* HBPictureController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPictureController.m; sourceTree = "<group>"; };
+		273F20A914ADBE670021BE6D /* HBCroppingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBCroppingController.h; sourceTree = "<group>"; };
+		273F20AA14ADBE670021BE6D /* HBCroppingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBCroppingController.m; sourceTree = "<group>"; };
 		273F20BD14ADC09F0021BE6D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		275916DA14B2AB27007211E9 /* native.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = native.xcconfig; sourceTree = "<group>"; };
 		277EFE8D17ED5628001D4A6A /* supplemental.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = supplemental.xcconfig; sourceTree = "<group>"; };
@@ -478,7 +693,7 @@
 		A90713C72242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		A90713C82242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Subtitles.strings; sourceTree = "<group>"; };
 		A90713C92242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Video.strings; sourceTree = "<group>"; };
-		A90713CA2242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/PictureSettings.strings; sourceTree = "<group>"; };
+		A90713CA2242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
 		A90713CB2242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/HBFiltersViewController.strings; sourceTree = "<group>"; };
 		A90713CC2242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MainWindow.strings; sourceTree = "<group>"; };
 		A90713CD2242693B00372AA0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Preferences.strings; sourceTree = "<group>"; };
@@ -505,6 +720,8 @@
 		A91485FD1F61296100374C12 /* HBFiltersViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBFiltersViewController.m; sourceTree = "<group>"; };
 		A914BCB11BC441C700157917 /* HBPreviewView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPreviewView.h; sourceTree = "<group>"; };
 		A914BCB21BC441C700157917 /* HBPreviewView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewView.m; sourceTree = "<group>"; };
+		A9150DAC243F7BE200694870 /* HBQueueDockTileController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueDockTileController.h; sourceTree = "<group>"; };
+		A9150DAD243F7BE200694870 /* HBQueueDockTileController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueDockTileController.m; sourceTree = "<group>"; };
 		A9160A331AE7A165009A7818 /* HBCodingUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBCodingUtilities.h; sourceTree = "<group>"; };
 		A91726E5197291BC00D1AFEF /* HBChapterTitlesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBChapterTitlesController.h; sourceTree = "<group>"; };
 		A91726E6197291BC00D1AFEF /* HBChapterTitlesController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBChapterTitlesController.m; sourceTree = "<group>"; };
@@ -524,11 +741,31 @@
 		A91AFD0B1A948827009BECED /* HBOutputFileWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBOutputFileWriter.m; sourceTree = "<group>"; };
 		A91AFD0D1A949472009BECED /* HBJobOutputFileWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBJobOutputFileWriter.h; sourceTree = "<group>"; };
 		A91AFD0E1A949472009BECED /* HBJobOutputFileWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBJobOutputFileWriter.m; sourceTree = "<group>"; };
+		A91CAB412707267000006BEA /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A91CAB532707267200006BEA /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A91CAB54270726B000006BEA /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Localizable.strings; sourceTree = "<group>"; };
+		A91CAB55270726B300006BEA /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Localizable.strings; sourceTree = "<group>"; };
 		A91CE2CF1C7DABCE0068F46F /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
 		A91CE2D11C7DABDA0068F46F /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
 		A91CE2D31C7DABE40068F46F /* libiconv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libiconv.tbd; path = usr/lib/libiconv.tbd; sourceTree = SDKROOT; };
 		A91D54851E378ABD006D0997 /* HBSecurityAccessToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBSecurityAccessToken.h; sourceTree = "<group>"; };
 		A91D54861E378ABD006D0997 /* HBSecurityAccessToken.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBSecurityAccessToken.m; sourceTree = "<group>"; };
+		A91D84E326676647008987A0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = "it.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D84E626676647008987A0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = "it.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D84E926676647008987A0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = "it.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D84EC26676647008987A0 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = "it.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D8503266766FF008987A0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = "de.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D8504266766FF008987A0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = "de.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D8505266766FF008987A0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = "de.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D8506266766FF008987A0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = "de.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D850A26676733008987A0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D850B26676733008987A0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D850C26676733008987A0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D850D26676733008987A0 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D851126676752008987A0 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D851226676752008987A0 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D851326676752008987A0 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		A91D851426676752008987A0 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
 		A91F97331D7B2A4E00D82DCE /* HBAudioTransformers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioTransformers.h; sourceTree = "<group>"; };
 		A91F97341D7B2A4E00D82DCE /* HBAudioTransformers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioTransformers.m; sourceTree = "<group>"; };
 		A92268761A6E555500A8D5C5 /* HBAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAppDelegate.h; sourceTree = "<group>"; };
@@ -540,12 +777,11 @@
 		A932E26E198833920047D13E /* HBAudioDefaultsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaultsController.m; sourceTree = "<group>"; };
 		A932E271198834130047D13E /* HBAudioDefaults.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudioDefaults.h; sourceTree = "<group>"; };
 		A932E272198834130047D13E /* HBAudioDefaults.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudioDefaults.m; sourceTree = "<group>"; };
+		A93341C4243E1583003A82C2 /* HandBrakeXPCService2.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = HandBrakeXPCService2.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		A93341D5243E158B003A82C2 /* HandBrakeXPCService3.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = HandBrakeXPCService3.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		A93341E6243E158E003A82C2 /* HandBrakeXPCService4.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = HandBrakeXPCService4.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
 		A937EECA1C6C7C0300EEAE6D /* dsa_pub.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dsa_pub.pem; sourceTree = "<group>"; };
 		A939854D2231556D001DCAEB /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Sparkle/Sparkle.framework; sourceTree = "<group>"; };
-		A939855222315628001DCAEB /* org.sparkle-project.InstallerConnection.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerConnection.xpc"; path = "Sparkle/org.sparkle-project.InstallerConnection.xpc"; sourceTree = SOURCE_ROOT; };
-		A939855322315628001DCAEB /* org.sparkle-project.InstallerLauncher.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerLauncher.xpc"; path = "Sparkle/org.sparkle-project.InstallerLauncher.xpc"; sourceTree = SOURCE_ROOT; };
-		A939855422315628001DCAEB /* org.sparkle-project.InstallerStatus.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.InstallerStatus.xpc"; path = "Sparkle/org.sparkle-project.InstallerStatus.xpc"; sourceTree = SOURCE_ROOT; };
-		A939855922315987001DCAEB /* org.sparkle-project.Downloader.xpc */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.xpc-service"; name = "org.sparkle-project.Downloader.xpc"; path = "Sparkle/org.sparkle-project.Downloader.xpc"; sourceTree = SOURCE_ROOT; };
 		A939DD891FC8826A00135F2A /* HBPresetsMenuBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPresetsMenuBuilder.h; sourceTree = "<group>"; };
 		A939DD8A1FC8826A00135F2A /* HBPresetsMenuBuilder.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBPresetsMenuBuilder.m; sourceTree = "<group>"; };
 		A93B0DF61C804CF50051A3FA /* NSDictionary+HBAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+HBAdditions.h"; sourceTree = "<group>"; };
@@ -557,8 +793,12 @@
 		A93FD4731A62ABE800A6AC43 /* HBAudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAudio.h; sourceTree = "<group>"; };
 		A93FD4741A62ABE800A6AC43 /* HBAudio.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAudio.m; sourceTree = "<group>"; };
 		A941ACB91CD75B4E0029D06A /* HBHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBHUD.h; sourceTree = "<group>"; };
+		A942B668250BA70400049203 /* HBQueueItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueItem.h; sourceTree = "<group>"; };
+		A942B66B250BB1FE00049203 /* HBQueueActionItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueActionItem.h; sourceTree = "<group>"; };
+		A942B66C250BB1FE00049203 /* HBQueueActionItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueActionItem.m; sourceTree = "<group>"; };
 		A943873F22ED911B005F701B /* HBJob+HBAdditions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "HBJob+HBAdditions.h"; sourceTree = "<group>"; };
 		A943874022ED911B005F701B /* HBJob+HBAdditions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "HBJob+HBAdditions.m"; sourceTree = "<group>"; };
+		A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Sparkle/Sparkle.xcodeproj; sourceTree = "<group>"; };
 		A945CC3122ED7C6A00E9C2E3 /* HBPreferencesKeys.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreferencesKeys.h; sourceTree = "<group>"; };
 		A94A98F41C858EFB004BA9BA /* HBDictTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDictTests.m; sourceTree = "<group>"; };
 		A94DC2DD20CADA2C00EAC8FD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainWindow.xib; sourceTree = "<group>"; };
@@ -578,6 +818,7 @@
 		A954010122FF397000F83A5F /* HBRedirect.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBRedirect.h; sourceTree = "<group>"; };
 		A954010222FF397000F83A5F /* HBRedirect.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBRedirect.m; sourceTree = "<group>"; };
 		A95512881A320A12001BFC6F /* libjansson.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjansson.a; path = external/contrib/lib/libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		A9551FD5250E08000018E596 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		A957EBCB218DBE5900007988 /* HBAutoNamer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBAutoNamer.h; sourceTree = "<group>"; };
 		A957EBCC218DBE5900007988 /* HBAutoNamer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBAutoNamer.m; sourceTree = "<group>"; };
 		A958605B2216A5E5002092B1 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -585,10 +826,8 @@
 		A958EAC622E24D6800D83AF4 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBQueueInfoViewController.xib; sourceTree = "<group>"; };
 		A9597A281A49749D00007771 /* HBRange+UIAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HBRange+UIAdditions.h"; sourceTree = "<group>"; };
 		A9597A291A49749D00007771 /* HBRange+UIAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HBRange+UIAdditions.m"; sourceTree = "<group>"; };
-		A95BA15B220C968500A2F9F9 /* HBQueueItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueItem.h; sourceTree = "<group>"; };
-		A95BA15C220C968500A2F9F9 /* HBQueueItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueItem.m; sourceTree = "<group>"; };
-		A95BA15F220CA5DB00A2F9F9 /* HBDistributedArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBDistributedArray.h; sourceTree = "<group>"; };
-		A95BA160220CA5DB00A2F9F9 /* HBDistributedArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDistributedArray.m; sourceTree = "<group>"; };
+		A95BA15B220C968500A2F9F9 /* HBQueueJobItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueJobItem.h; sourceTree = "<group>"; };
+		A95BA15C220C968500A2F9F9 /* HBQueueJobItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueJobItem.m; sourceTree = "<group>"; };
 		A95BC1E51CD2548A008D6A33 /* volHighTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = volHighTemplate.pdf; sourceTree = "<group>"; };
 		A95BC1E61CD2548A008D6A33 /* volLowTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = volLowTemplate.pdf; sourceTree = "<group>"; };
 		A95CB2FB217B6D07001E9F51 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -604,7 +843,7 @@
 		A9637D9620F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		A9637D9720F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Subtitles.strings; sourceTree = "<group>"; };
 		A9637D9820F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Video.strings; sourceTree = "<group>"; };
-		A9637D9920F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/PictureSettings.strings; sourceTree = "<group>"; };
+		A9637D9920F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
 		A9637D9A20F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBFiltersViewController.strings; sourceTree = "<group>"; };
 		A9637D9B20F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainWindow.strings; sourceTree = "<group>"; };
 		A9637D9C20F7A252001EAE7C /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Preferences.strings; sourceTree = "<group>"; };
@@ -667,6 +906,9 @@
 		A97ED7FA22EC5E9300AEF29B /* HBQueueDetailsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HBQueueDetailsViewController.xib; sourceTree = "<group>"; };
 		A98036CB1CCA91DD007661AA /* HBAVPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAVPlayer.h; sourceTree = "<group>"; };
 		A98036CC1CCA91DD007661AA /* HBAVPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAVPlayer.m; sourceTree = "<group>"; };
+		A9884FA4243E544800B61738 /* HandBrakeXPCService2.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HandBrakeXPCService2.plist; sourceTree = "<group>"; };
+		A9884FA6243E544E00B61738 /* HandBrakeXPCService3.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HandBrakeXPCService3.plist; sourceTree = "<group>"; };
+		A9884FA8243E545400B61738 /* HandBrakeXPCService4.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HandBrakeXPCService4.plist; sourceTree = "<group>"; };
 		A988AF9B1BC7C35F00932543 /* HBChapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBChapter.h; sourceTree = "<group>"; };
 		A988AF9C1BC7C35F00932543 /* HBChapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBChapter.m; sourceTree = "<group>"; };
 		A98C29C21977B10600AF5DED /* HBLanguagesSelection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBLanguagesSelection.h; sourceTree = "<group>"; };
@@ -677,6 +919,8 @@
 		A990C55222FF4EBA00E07CE2 /* HandBrakeXPCService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HandBrakeXPCService.entitlements; sourceTree = "<group>"; };
 		A990D9051A64562200139032 /* HBJob+HBJobConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "HBJob+HBJobConversion.h"; sourceTree = "<group>"; };
 		A990D9061A64562200139032 /* HBJob+HBJobConversion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "HBJob+HBJobConversion.m"; sourceTree = "<group>"; };
+		A9935852256C346F00A6875E /* libzimg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzimg.a; path = external/contrib/lib/libzimg.a; sourceTree = "<group>"; };
+		A9935867256C349B00A6875E /* libzimg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzimg.a; path = external/contrib/lib/libzimg.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		A99422DE1B1887B000DDB077 /* NSJSONSerialization+HBAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSJSONSerialization+HBAdditions.h"; sourceTree = "<group>"; };
 		A99422DF1B1887B000DDB077 /* NSJSONSerialization+HBAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSJSONSerialization+HBAdditions.m"; sourceTree = "<group>"; };
 		A997D8EB1A4ABB0900E19B6F /* HBPresetCoding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPresetCoding.h; sourceTree = "<group>"; };
@@ -685,6 +929,8 @@
 		A9A0CBE51CCEA1D10045B3DF /* HBPlayerTrack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBPlayerTrack.h; sourceTree = "<group>"; };
 		A9A0CBE61CCEA1D10045B3DF /* HBPlayerTrack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPlayerTrack.m; sourceTree = "<group>"; };
 		A9A25D9B21182741005A8A0F /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		A9A5F7D3243DD90100C82EC8 /* HBQueueWorker.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueWorker.h; sourceTree = "<group>"; };
+		A9A5F7D4243DD90100C82EC8 /* HBQueueWorker.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueWorker.m; sourceTree = "<group>"; };
 		A9A70DB621FB1A980038085A /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = ../en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		A9A7E2791FE2A0B5006BE79F /* HBPreviewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPreviewViewController.h; sourceTree = "<group>"; };
 		A9A7E27A1FE2A0B5006BE79F /* HBPreviewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBPreviewViewController.m; sourceTree = "<group>"; };
@@ -706,7 +952,7 @@
 		A9A96BCD20CAD61F00A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SubtitlesDefaults.xib; sourceTree = "<group>"; };
 		A9A96BD020CAD62500A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ChaptersTitles.xib; sourceTree = "<group>"; };
 		A9A96BD320CAD63000A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Queue.xib; sourceTree = "<group>"; };
-		A9A96BD620CAD64200A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PictureSettings.xib; sourceTree = "<group>"; };
+		A9A96BD620CAD64200A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HBCroppingView.xib; sourceTree = "<group>"; };
 		A9A96BD920CAD64B00A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/PicturePreview.xib; sourceTree = "<group>"; };
 		A9A96BDC20CAD66000A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/OutputPanel.xib; sourceTree = "<group>"; };
 		A9A96BDF20CAD66500A39AFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/Preferences.xib; sourceTree = "<group>"; };
@@ -720,6 +966,7 @@
 		A9AB9AA721181CC700BB3C7E /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
 		A9ABD1A51E2A0F0700EC8B65 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		A9ABD1A81E2A0F8200EC8B65 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		A9B304882671288D001FFEDE /* HBDirectUtilities.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBDirectUtilities.h; sourceTree = "<group>"; };
 		A9B34D74197696FE00871B7D /* DiskArbitration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiskArbitration.framework; path = System/Library/Frameworks/DiskArbitration.framework; sourceTree = SDKROOT; };
 		A9B3B63722E2EA58001CEB9A /* HBQueueItemWorkingView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBQueueItemWorkingView.h; sourceTree = "<group>"; };
 		A9B3B63822E2EA58001CEB9A /* HBQueueItemWorkingView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBQueueItemWorkingView.m; sourceTree = "<group>"; };
@@ -747,6 +994,7 @@
 		A9D0FA751C1C284D0003F2A9 /* HBFocusRingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBFocusRingView.h; sourceTree = "<group>"; };
 		A9D0FA761C1C284D0003F2A9 /* HBFocusRingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBFocusRingView.m; sourceTree = "<group>"; };
 		A9D1E41618262364002F6424 /* HBPreviewGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPreviewGenerator.m; sourceTree = "<group>"; };
+		A9D2DDE524B3B1C2009C92DA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		A9D3634F2209C08500D8EFEA /* HBQueueItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBQueueItemView.h; sourceTree = "<group>"; };
 		A9D363502209C08500D8EFEA /* HBQueueItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBQueueItemView.m; sourceTree = "<group>"; };
 		A9D3E2F3234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/HBPictureHUDController.strings; sourceTree = "<group>"; };
@@ -762,7 +1010,7 @@
 		A9D3E300234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/PicturePreview.strings; sourceTree = "<group>"; };
 		A9D3E301234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/AudioDefaults.strings; sourceTree = "<group>"; };
 		A9D3E302234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainWindow.strings; sourceTree = "<group>"; };
-		A9D3E303234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/PictureSettings.strings; sourceTree = "<group>"; };
+		A9D3E303234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
 		A9D3E304234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/HBTrackTitleViewController.strings; sourceTree = "<group>"; };
 		A9D3E305234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Subtitles.strings; sourceTree = "<group>"; };
 		A9D3E306234A119400F39385 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Queue.strings; sourceTree = "<group>"; };
@@ -798,6 +1046,8 @@
 		A9DF49221C884C4E008AC14A /* HBJobTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBJobTests.m; sourceTree = "<group>"; };
 		A9DF49231C884C4E008AC14A /* HBJobUndoTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBJobUndoTests.m; sourceTree = "<group>"; };
 		A9DF49261C884C4E008AC14A /* HBPresetsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBPresetsTests.m; sourceTree = "<group>"; };
+		A9E05A062529E77F000E0E9A /* HBPasteboardItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HBPasteboardItem.h; sourceTree = "<group>"; };
+		A9E05A072529E77F000E0E9A /* HBPasteboardItem.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HBPasteboardItem.m; sourceTree = "<group>"; };
 		A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = /System/Library/Frameworks/QuartzCore.framework; sourceTree = "<absolute>"; };
 		A9E1467C16BC2AD800C307BC /* NextTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = NextTemplate.pdf; sourceTree = "<group>"; };
 		A9E1467D16BC2AD800C307BC /* PauseTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = PauseTemplate.pdf; sourceTree = "<group>"; };
@@ -807,7 +1057,7 @@
 		A9E2FD241A21BC4A000E8D3F /* HBAddPresetController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBAddPresetController.h; sourceTree = "<group>"; };
 		A9E2FD251A21BC4A000E8D3F /* HBAddPresetController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBAddPresetController.m; sourceTree = "<group>"; };
 		A9E52CD7218DD52A00E17B86 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ExceptionAlert.xib; sourceTree = "<group>"; };
-		A9E8F80423003B2F00AA14E9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		A9E8F80423003B2F00AA14E9 /* HandBrakeXPCService1.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = HandBrakeXPCService1.plist; sourceTree = "<group>"; };
 		A9EA43661A2210C400785E95 /* HBTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBTableView.h; sourceTree = "<group>"; };
 		A9EA43671A2210C400785E95 /* HBTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBTableView.m; sourceTree = "<group>"; };
 		A9F217E41E2F897D00C10C6E /* HandBrake.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = HandBrake.entitlements; sourceTree = "<group>"; };
@@ -827,7 +1077,7 @@
 		A9F5E33B2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/MainMenu.strings; sourceTree = "<group>"; };
 		A9F5E33C2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Subtitles.strings; sourceTree = "<group>"; };
 		A9F5E33D2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Video.strings; sourceTree = "<group>"; };
-		A9F5E33E2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/PictureSettings.strings; sourceTree = "<group>"; };
+		A9F5E33E2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
 		A9F5E33F2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/HBFiltersViewController.strings; sourceTree = "<group>"; };
 		A9F5E3402215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Preferences.strings; sourceTree = "<group>"; };
 		A9F5E3412215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/MainWindow.strings; sourceTree = "<group>"; };
@@ -846,8 +1096,114 @@
 		A9F5E34E2215D85A0046FA4B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/ChaptersTitles.strings; sourceTree = "<group>"; };
 		A9F7102419A475EC00F61301 /* HBDockTile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HBDockTile.h; sourceTree = "<group>"; };
 		A9F7102519A475EC00F61301 /* HBDockTile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HBDockTile.m; sourceTree = "<group>"; };
+		D0530E9B2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/AddPreset.strings; sourceTree = "<group>"; };
+		D0530E9C2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Audio.strings; sourceTree = "<group>"; };
+		D0530E9D2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/AudioDefaults.strings; sourceTree = "<group>"; };
+		D0530E9E2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/ChaptersTitles.strings; sourceTree = "<group>"; };
+		D0530E9F2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/ExceptionAlert.strings; sourceTree = "<group>"; };
+		D0530EA02706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBAddCategoryController.strings; sourceTree = "<group>"; };
+		D0530EA12706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
+		D0530EA22706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBEncodingProgressHUDController.strings; sourceTree = "<group>"; };
+		D0530EA32706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBFiltersViewController.strings; sourceTree = "<group>"; };
+		D0530EA42706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBPictureHUDController.strings; sourceTree = "<group>"; };
+		D0530EA52706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBPictureViewController.strings; sourceTree = "<group>"; };
+		D0530EA62706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBPlayerHUDController.strings; sourceTree = "<group>"; };
+		D0530EA72706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBPreviewViewController.strings; sourceTree = "<group>"; };
+		D0530EA82706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBQueueInfoViewController.strings; sourceTree = "<group>"; };
+		D0530EA92706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBQueueTableViewController.strings; sourceTree = "<group>"; };
+		D0530EAA2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBRenamePresetController.strings; sourceTree = "<group>"; };
+		D0530EAB2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBSummaryViewController.strings; sourceTree = "<group>"; };
+		D0530EAC2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBTitleSelection.strings; sourceTree = "<group>"; };
+		D0530EAD2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/HBTrackTitleViewController.strings; sourceTree = "<group>"; };
+		D0530EAE2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		D0530EAF2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/MainWindow.strings; sourceTree = "<group>"; };
+		D0530EB02706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/OutputPanel.strings; sourceTree = "<group>"; };
+		D0530EB12706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/PicturePreview.strings; sourceTree = "<group>"; };
+		D0530EB22706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Preferences.strings; sourceTree = "<group>"; };
+		D0530EB32706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Presets.strings; sourceTree = "<group>"; };
+		D0530EB42706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Queue.strings; sourceTree = "<group>"; };
+		D0530EB52706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Subtitles.strings; sourceTree = "<group>"; };
+		D0530EB62706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/SubtitlesDefaults.strings; sourceTree = "<group>"; };
+		D0530EB72706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Video.strings; sourceTree = "<group>"; };
+		D0530EBB2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		D0530EBC2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Localizable.strings; sourceTree = "<group>"; };
+		D0530EBD2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = "zh.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0530EBE2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = "zh.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0530EBF2706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = "zh.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0530EC02706DF6A00CB946A /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = "zh.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
 		D062DF6422FAE05700A65A9E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBQueueTableViewController.strings; sourceTree = "<group>"; };
 		D062DF6522FAE06000A65A9E /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HBQueueInfoViewController.strings; sourceTree = "<group>"; };
+		D0A8A0322706E3710008018A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		D0A8A0332706E3710008018A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0A8A0342706E3710008018A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0A8A0352706E3710008018A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0A8A0362706E3710008018A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0B806A426E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/AddPreset.strings; sourceTree = "<group>"; };
+		D0B806A526E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Audio.strings; sourceTree = "<group>"; };
+		D0B806A626E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/AudioDefaults.strings; sourceTree = "<group>"; };
+		D0B806A726E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/ChaptersTitles.strings; sourceTree = "<group>"; };
+		D0B806A826E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/ExceptionAlert.strings; sourceTree = "<group>"; };
+		D0B806A926E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBAddCategoryController.strings; sourceTree = "<group>"; };
+		D0B806AA26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBCroppingView.strings; sourceTree = "<group>"; };
+		D0B806AB26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBEncodingProgressHUDController.strings; sourceTree = "<group>"; };
+		D0B806AC26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBFiltersViewController.strings; sourceTree = "<group>"; };
+		D0B806AD26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBPictureHUDController.strings; sourceTree = "<group>"; };
+		D0B806AE26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBPictureViewController.strings; sourceTree = "<group>"; };
+		D0B806AF26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBPlayerHUDController.strings; sourceTree = "<group>"; };
+		D0B806B026E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBPreviewViewController.strings; sourceTree = "<group>"; };
+		D0B806B126E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBQueueInfoViewController.strings; sourceTree = "<group>"; };
+		D0B806B226E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBQueueTableViewController.strings; sourceTree = "<group>"; };
+		D0B806B326E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBRenamePresetController.strings; sourceTree = "<group>"; };
+		D0B806B426E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBSummaryViewController.strings; sourceTree = "<group>"; };
+		D0B806B526E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBTitleSelection.strings; sourceTree = "<group>"; };
+		D0B806B626E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/HBTrackTitleViewController.strings; sourceTree = "<group>"; };
+		D0B806B726E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		D0B806B826E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/MainWindow.strings; sourceTree = "<group>"; };
+		D0B806B926E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/OutputPanel.strings; sourceTree = "<group>"; };
+		D0B806BA26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/PicturePreview.strings; sourceTree = "<group>"; };
+		D0B806BB26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Preferences.strings; sourceTree = "<group>"; };
+		D0B806BC26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Presets.strings; sourceTree = "<group>"; };
+		D0B806BD26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Queue.strings; sourceTree = "<group>"; };
+		D0B806BE26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Subtitles.strings; sourceTree = "<group>"; };
+		D0B806BF26E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/SubtitlesDefaults.strings; sourceTree = "<group>"; };
+		D0B806C026E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Video.strings; sourceTree = "<group>"; };
+		D0B806C426E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		D0B806C526E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = co.lproj/Localizable.strings; sourceTree = "<group>"; };
+		D0B806C626E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = "co.lproj/HandBrakeXPCService1-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0B806C726E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = "co.lproj/HandBrakeXPCService2-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0B806C826E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = "co.lproj/HandBrakeXPCService3-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0B806C926E7F2760013D332 /* co */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = co; path = "co.lproj/HandBrakeXPCService4-InfoPlist.strings"; sourceTree = "<group>"; };
+		D0DA2AAD24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		D0DA2AB124B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBPictureHUDController.strings"; sourceTree = "<group>"; };
+		D0DA2AB224B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		D0DA2AB624B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Presets.strings"; sourceTree = "<group>"; };
+		D0DA2AB724B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/MainMenu.strings"; sourceTree = "<group>"; };
+		D0DA2AB824B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBPlayerHUDController.strings"; sourceTree = "<group>"; };
+		D0DA2AB924B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBAddCategoryController.strings"; sourceTree = "<group>"; };
+		D0DA2ABA24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBFiltersViewController.strings"; sourceTree = "<group>"; };
+		D0DA2ABB24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBQueueTableViewController.strings"; sourceTree = "<group>"; };
+		D0DA2ABC24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/AddPreset.strings"; sourceTree = "<group>"; };
+		D0DA2ABD24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/PicturePreview.strings"; sourceTree = "<group>"; };
+		D0DA2ABE24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBSummaryViewController.strings"; sourceTree = "<group>"; };
+		D0DA2ABF24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/AudioDefaults.strings"; sourceTree = "<group>"; };
+		D0DA2AC024B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/MainWindow.strings"; sourceTree = "<group>"; };
+		D0DA2AC124B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBCroppingView.strings"; sourceTree = "<group>"; };
+		D0DA2AC224B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBTrackTitleViewController.strings"; sourceTree = "<group>"; };
+		D0DA2AC324B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Subtitles.strings"; sourceTree = "<group>"; };
+		D0DA2AC424B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Queue.strings"; sourceTree = "<group>"; };
+		D0DA2AC524B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBTitleSelection.strings"; sourceTree = "<group>"; };
+		D0DA2AC624B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBRenamePresetController.strings"; sourceTree = "<group>"; };
+		D0DA2AC724B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBPreviewViewController.strings"; sourceTree = "<group>"; };
+		D0DA2AC824B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SubtitlesDefaults.strings"; sourceTree = "<group>"; };
+		D0DA2AC924B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Audio.strings"; sourceTree = "<group>"; };
+		D0DA2ACA24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/ChaptersTitles.strings"; sourceTree = "<group>"; };
+		D0DA2ACB24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBQueueInfoViewController.strings"; sourceTree = "<group>"; };
+		D0DA2ACC24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Preferences.strings"; sourceTree = "<group>"; };
+		D0DA2ACD24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/OutputPanel.strings"; sourceTree = "<group>"; };
+		D0DA2ACE24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/ExceptionAlert.strings"; sourceTree = "<group>"; };
+		D0DA2ACF24B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBEncodingProgressHUDController.strings"; sourceTree = "<group>"; };
+		D0DA2AD024B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/HBPictureViewController.strings"; sourceTree = "<group>"; };
+		D0DA2AD124B384AD003ACA30 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Video.strings"; sourceTree = "<group>"; };
 		D0DC8F672331573500C12A24 /* libdav1d.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdav1d.a; path = external/contrib/lib/libdav1d.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		D86C9DD41C6D372500F06F1B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -857,6 +1213,9 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A97D8DD124DBD3F800B16AF5 /* libiconv.tbd in Frameworks */,
+				A97D8DD024DBD3EF00B16AF5 /* libbz2.tbd in Frameworks */,
+				A97D8DCF24DBD3C000B16AF5 /* libz.tbd in Frameworks */,
 				A9A25D9C21182741005A8A0F /* CoreMedia.framework in Frameworks */,
 				A9AB9AA821181CC700BB3C7E /* CoreVideo.framework in Frameworks */,
 				A9AB9AA621181CA900BB3C7E /* VideoToolbox.framework in Frameworks */,
@@ -866,9 +1225,6 @@
 				273F203014ADB9790021BE6D /* AudioToolbox.framework in Frameworks */,
 				273F203314ADB9F00021BE6D /* CoreServices.framework in Frameworks */,
 				273F202314ADB8650021BE6D /* IOKit.framework in Frameworks */,
-				273F202814ADB8BE0021BE6D /* libbz2.dylib in Frameworks */,
-				273F202A14ADB8D60021BE6D /* libiconv.dylib in Frameworks */,
-				273F202614ADB8A40021BE6D /* libz.dylib in Frameworks */,
 				A900E6BE1D7B1B6800CB6C0A /* libopus.a in Frameworks */,
 				27D6C72614B1019100B785E4 /* libhandbrake.a in Frameworks */,
 				27D6C74414B102DA00B785E4 /* libass.a in Frameworks */,
@@ -880,6 +1236,7 @@
 				27D6C75014B102DA00B785E4 /* libdvdnav.a in Frameworks */,
 				27D6C75214B102DA00B785E4 /* libdvdread.a in Frameworks */,
 				1C53DE8C20BD598D006BBCA8 /* libspeex.a in Frameworks */,
+				1CDCF0C3241F28D400FB62C6 /* libturbojpeg.a in Frameworks */,
 				27D6C75814B102DA00B785E4 /* libfreetype.a in Frameworks */,
 				27D6C75A14B102DA00B785E4 /* libfribidi.a in Frameworks */,
 				27D6C75F14B102DA00B785E4 /* libmp3lame.a in Frameworks */,
@@ -897,6 +1254,7 @@
 				27D6C77314B102DA00B785E4 /* libxml2.a in Frameworks */,
 				A955128B1A320B02001BFC6F /* libjansson.a in Frameworks */,
 				1C6D76551CD7733300F5B943 /* libharfbuzz.a in Frameworks */,
+				A9935865256C346F00A6875E /* libzimg.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -904,10 +1262,34 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A9BB1C6924DAD869007CD416 /* Sparkle.framework in Frameworks */,
 				273F203C14ADBC210021BE6D /* Cocoa.framework in Frameworks */,
 				A9E1467B16BC2ABD00C307BC /* QuartzCore.framework in Frameworks */,
 				A9736F171C7DA5FE008F1D18 /* HandBrakeKit.framework in Frameworks */,
-				A939854F22315575001DCAEB /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341BB243E1583003A82C2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341BC243E1583003A82C2 /* HandBrakeKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341CC243E158B003A82C2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341CD243E158B003A82C2 /* HandBrakeKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341DD243E158E003A82C2 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341DE243E158E003A82C2 /* HandBrakeKit.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -946,6 +1328,7 @@
 				A91CE2B91C7DABBC0068F46F /* libbluray.a in Frameworks */,
 				D0DC8F69233159C700C12A24 /* libdav1d.a in Frameworks */,
 				A91CE2BA1C7DABBC0068F46F /* libdvdnav.a in Frameworks */,
+				1CDCF0C4241F28D400FB62C6 /* libturbojpeg.a in Frameworks */,
 				A91CE2BB1C7DABBC0068F46F /* libdvdread.a in Frameworks */,
 				1C6D76561CD7733400F5B943 /* libharfbuzz.a in Frameworks */,
 				A91CE2BD1C7DABBC0068F46F /* libfreetype.a in Frameworks */,
@@ -962,6 +1345,7 @@
 				A91CE2C81C7DABBC0068F46F /* libx264.a in Frameworks */,
 				A91CE2C91C7DABBC0068F46F /* libx265.a in Frameworks */,
 				A91CE2CA1C7DABBC0068F46F /* libxml2.a in Frameworks */,
+				A9935866256C347800A6875E /* libzimg.a in Frameworks */,
 				A91CE2B11C7DAA530068F46F /* libhandbrake.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -980,6 +1364,7 @@
 		271BA4C714B1236D00BC1D2C /* Static Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				1CDCF0C1241F28D400FB62C6 /* libturbojpeg.a */,
 				1C280BF320BD58DD00D5ECC2 /* libspeex.a */,
 				1CBC683320BE014800A26CC2 /* liblzma.a */,
 				1C0695AA20BD193D001543DA /* libpostproc.a */,
@@ -990,6 +1375,7 @@
 				27D6C72A14B102DA00B785E4 /* libavformat.a */,
 				27D6C72B14B102DA00B785E4 /* libavutil.a */,
 				27D6C72C14B102DA00B785E4 /* libbluray.a */,
+				D0DC8F672331573500C12A24 /* libdav1d.a */,
 				27D6C72E14B102DA00B785E4 /* libdvdnav.a */,
 				27D6C72F14B102DA00B785E4 /* libdvdread.a */,
 				27D6C73214B102DA00B785E4 /* libfreetype.a */,
@@ -1007,6 +1393,7 @@
 				A95512881A320A12001BFC6F /* libjansson.a */,
 				A9E165511C523016003EF30E /* libavfilter.a */,
 				1C15C82B1CD7722500368223 /* libharfbuzz.a */,
+				A9935867256C349B00A6875E /* libzimg.a */,
 			);
 			name = "Static Libraries";
 			sourceTree = "<group>";
@@ -1031,7 +1418,6 @@
 				27D6C72314B1013400B785E4 /* Products (external) */,
 				273F20CD14ADC8E60021BE6D /* Resources */,
 				273F203414ADBAC30021BE6D /* Frameworks */,
-				A9398551223155EF001DCAEB /* XPCService */,
 				277A3FCF14AE848400A835E4 /* xcconfig */,
 			);
 			sourceTree = "<group>";
@@ -1044,6 +1430,9 @@
 				A9736F021C7DA5FE008F1D18 /* HandBrakeKit.framework */,
 				A9736F0B1C7DA5FE008F1D18 /* HandBrakeKitTests.xctest */,
 				A964D39522FDE8EE00DFCAEA /* HandBrakeXPCService.xpc */,
+				A93341C4243E1583003A82C2 /* HandBrakeXPCService2.xpc */,
+				A93341D5243E158B003A82C2 /* HandBrakeXPCService3.xpc */,
+				A93341E6243E158E003A82C2 /* HandBrakeXPCService4.xpc */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1051,7 +1440,6 @@
 		273F200214ADAE950021BE6D /* HandBrakeCLI */ = {
 			isa = PBXGroup;
 			children = (
-				273F208514ADBE3B0021BE6D /* fakexcode.cpp */,
 				273F208614ADBE3B0021BE6D /* parsecsv.c */,
 				273F208714ADBE3B0021BE6D /* parsecsv.h */,
 				273F208814ADBE3B0021BE6D /* test.c */,
@@ -1063,7 +1451,8 @@
 		273F203414ADBAC30021BE6D /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				D0DC8F672331573500C12A24 /* libdav1d.a */,
+				A9935852256C346F00A6875E /* libzimg.a */,
+				A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */,
 				A9A25D9B21182741005A8A0F /* CoreMedia.framework */,
 				A9AB9AA721181CC700BB3C7E /* CoreVideo.framework */,
 				A9AB9AA4211819A500BB3C7E /* VideoToolbox.framework */,
@@ -1079,9 +1468,6 @@
 				273F202214ADB8650021BE6D /* IOKit.framework */,
 				A9E1467A16BC2ABD00C307BC /* QuartzCore.framework */,
 				273F203D14ADBC210021BE6D /* Other Frameworks */,
-				273F202714ADB8BE0021BE6D /* libbz2.dylib */,
-				273F202914ADB8D60021BE6D /* libiconv.dylib */,
-				273F202514ADB8A40021BE6D /* libz.dylib */,
 				273F20CE14ADC9210021BE6D /* Bundled */,
 			);
 			name = Frameworks;
@@ -1209,8 +1595,13 @@
 			children = (
 				A97ECB8022E1D85500570935 /* HBQueue.h */,
 				A97ECB8122E1D85500570935 /* HBQueue.m */,
-				A95BA15B220C968500A2F9F9 /* HBQueueItem.h */,
-				A95BA15C220C968500A2F9F9 /* HBQueueItem.m */,
+				A942B668250BA70400049203 /* HBQueueItem.h */,
+				A942B66B250BB1FE00049203 /* HBQueueActionItem.h */,
+				A942B66C250BB1FE00049203 /* HBQueueActionItem.m */,
+				A95BA15B220C968500A2F9F9 /* HBQueueJobItem.h */,
+				A95BA15C220C968500A2F9F9 /* HBQueueJobItem.m */,
+				A9A5F7D3243DD90100C82EC8 /* HBQueueWorker.h */,
+				A9A5F7D4243DD90100C82EC8 /* HBQueueWorker.m */,
 				A9AA447C1970726500D7DEFC /* HBQueueController.h */,
 				A9906B2B1A710920001D82D5 /* HBQueueController.m */,
 				A9A96BD220CAD63000A39AFB /* Queue.xib */,
@@ -1230,6 +1621,8 @@
 				A97ED7F822EC5E9300AEF29B /* HBQueueDetailsViewController.h */,
 				A97ED7F922EC5E9300AEF29B /* HBQueueDetailsViewController.m */,
 				A97ED7FA22EC5E9300AEF29B /* HBQueueDetailsViewController.xib */,
+				A9150DAC243F7BE200694870 /* HBQueueDockTileController.h */,
+				A9150DAD243F7BE200694870 /* HBQueueDockTileController.m */,
 			);
 			name = Queue;
 			sourceTree = "<group>";
@@ -1241,9 +1634,9 @@
 				A903C55F1CCE78060026B0ED /* NSWindow+HBAdditions.m */,
 				A914BCB11BC441C700157917 /* HBPreviewView.h */,
 				A914BCB21BC441C700157917 /* HBPreviewView.m */,
-				273F20A914ADBE670021BE6D /* HBPictureController.h */,
-				273F20AA14ADBE670021BE6D /* HBPictureController.m */,
-				A9A96BD520CAD64200A39AFB /* PictureSettings.xib */,
+				273F20A914ADBE670021BE6D /* HBCroppingController.h */,
+				273F20AA14ADBE670021BE6D /* HBCroppingController.m */,
+				A9A96BD520CAD64200A39AFB /* HBCroppingView.xib */,
 				273F20A314ADBE670021BE6D /* HBPreviewController.h */,
 				273F20A414ADBE670021BE6D /* HBPreviewController.m */,
 				A9A96BD820CAD64B00A39AFB /* PicturePreview.xib */,
@@ -1272,6 +1665,7 @@
 				A98F38041C7DCA7E00E469C8 /* HBStateFormatter+Private.h */,
 				A91D54851E378ABD006D0997 /* HBSecurityAccessToken.h */,
 				A91D54861E378ABD006D0997 /* HBSecurityAccessToken.m */,
+				A9B304882671288D001FFEDE /* HBDirectUtilities.h */,
 			);
 			name = Others;
 			sourceTree = "<group>";
@@ -1285,8 +1679,6 @@
 				A964D3A722FDE91B00DFCAEA /* HBRemoteCore.m */,
 				A9C3A4FF23C7A66100269CA3 /* HBFilePromiseProvider.h */,
 				A9C3A50023C7A66100269CA3 /* HBFilePromiseProvider.m */,
-				A95BA15F220CA5DB00A2F9F9 /* HBDistributedArray.h */,
-				A95BA160220CA5DB00A2F9F9 /* HBDistributedArray.m */,
 				A9706CB51AC1437800BAEAA8 /* HBExceptionAlertController.h */,
 				A9706CB61AC1437800BAEAA8 /* HBExceptionAlertController.m */,
 				A9E52CD6218DD52A00E17B86 /* ExceptionAlert.xib */,
@@ -1295,6 +1687,8 @@
 				A943873F22ED911B005F701B /* HBJob+HBAdditions.h */,
 				A943874022ED911B005F701B /* HBJob+HBAdditions.m */,
 				273F20BD14ADC09F0021BE6D /* main.m */,
+				A9E05A062529E77F000E0E9A /* HBPasteboardItem.h */,
+				A9E05A072529E77F000E0E9A /* HBPasteboardItem.m */,
 			);
 			name = Others;
 			sourceTree = "<group>";
@@ -1322,17 +1716,6 @@
 			name = "Audio Defaults";
 			sourceTree = "<group>";
 		};
-		A9398551223155EF001DCAEB /* XPCService */ = {
-			isa = PBXGroup;
-			children = (
-				A939855922315987001DCAEB /* org.sparkle-project.Downloader.xpc */,
-				A939855222315628001DCAEB /* org.sparkle-project.InstallerConnection.xpc */,
-				A939855322315628001DCAEB /* org.sparkle-project.InstallerLauncher.xpc */,
-				A939855422315628001DCAEB /* org.sparkle-project.InstallerStatus.xpc */,
-			);
-			path = XPCService;
-			sourceTree = "<group>";
-		};
 		A93E6F2E1CD774960096C0DE /* Player */ = {
 			isa = PBXGroup;
 			children = (
@@ -1363,6 +1746,31 @@
 			name = Presets;
 			sourceTree = "<group>";
 		};
+		A9442CDE24DABFED005EDF62 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				A9442CF024DABFED005EDF62 /* Sparkle.framework */,
+				A9442CF824DABFED005EDF62 /* Autoupdate */,
+				A9442D1224DAC03A005EDF62 /* org.sparkle-project.InstallerLauncher.xpc */,
+				A9442D1424DAC03A005EDF62 /* org.sparkle-project.InstallerConnection.xpc */,
+				A9442D1624DAC03A005EDF62 /* org.sparkle-project.InstallerStatus.xpc */,
+				A9442D1824DAC03A005EDF62 /* org.sparkle-project.Downloader.xpc */,
+				A9442CF224DABFED005EDF62 /* Sparkle Test App.app */,
+				A9442D1A24DAC03A005EDF62 /* TestAppHelper.xpc */,
+				A9442CF424DABFED005EDF62 /* Sparkle Unit Tests.xctest */,
+				A9442CF624DABFED005EDF62 /* BinaryDelta */,
+				A9442D1C24DAC03A005EDF62 /* sparkle.app */,
+				A9442D1E24DAC03A005EDF62 /* Updater.app */,
+				A9442CFA24DABFED005EDF62 /* UI Tests.xctest */,
+				A9442CFE24DABFED005EDF62 /* generate_appcast */,
+				A9442D0024DABFED005EDF62 /* generate_keys */,
+				A9442D0224DABFED005EDF62 /* sign_update */,
+				A9442D0424DABFED005EDF62 /* libbsdiff.a */,
+				A9442D0624DABFED005EDF62 /* libed25519.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		A952392E199A647F00588AEF /* Presets */ = {
 			isa = PBXGroup;
 			children = (
@@ -1406,7 +1814,14 @@
 				A964D39822FDE8EE00DFCAEA /* HandBrakeXPCService.h */,
 				A964D39922FDE8EE00DFCAEA /* HandBrakeXPCService.m */,
 				A964D39B22FDE8EE00DFCAEA /* main.m */,
-				A9E8F80423003B2F00AA14E9 /* Info.plist */,
+				A9E8F80423003B2F00AA14E9 /* HandBrakeXPCService1.plist */,
+				A91D84E226676647008987A0 /* HandBrakeXPCService1-InfoPlist.strings */,
+				A9884FA4243E544800B61738 /* HandBrakeXPCService2.plist */,
+				A91D84E526676647008987A0 /* HandBrakeXPCService2-InfoPlist.strings */,
+				A9884FA6243E544E00B61738 /* HandBrakeXPCService3.plist */,
+				A91D84E826676647008987A0 /* HandBrakeXPCService3-InfoPlist.strings */,
+				A9884FA8243E545400B61738 /* HandBrakeXPCService4.plist */,
+				A91D84EB26676647008987A0 /* HandBrakeXPCService4-InfoPlist.strings */,
 				A919992A23003CFC0037F526 /* Localizable.strings */,
 			);
 			path = HandBrakeXPCService;
@@ -1647,6 +2062,7 @@
 				A91CE2FD1C7DB99D0068F46F /* HBMutablePreset.h in Headers */,
 				A91F97351D7B2A4E00D82DCE /* HBAudioTransformers.h in Headers */,
 				A98B8E241C7DD2A200B810C9 /* HBPresetCoding.h in Headers */,
+				A9B304892671288D001FFEDE /* HBDirectUtilities.h in Headers */,
 				A9294CC91DC4BBF7004D3415 /* HBJob+Private.h in Headers */,
 				A91D54871E378ABD006D0997 /* HBSecurityAccessToken.h in Headers */,
 				A91CE2FE1C7DB99D0068F46F /* HBTreeNode.h in Headers */,
@@ -1700,19 +2116,78 @@
 				273F203614ADBC200021BE6D /* Frameworks */,
 				273F203714ADBC200021BE6D /* Resources */,
 				273F20CA14ADC86C0021BE6D /* CopyFiles */,
-				A939855522315630001DCAEB /* CopyFiles */,
+				A939855522315630001DCAEB /* Copy Files */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 				A91CE2EF1C7DB40D0068F46F /* PBXTargetDependency */,
+				A9442D2924DAC097005EDF62 /* PBXTargetDependency */,
+				A9442D2B24DAC097005EDF62 /* PBXTargetDependency */,
+				A9442D2D24DAC097005EDF62 /* PBXTargetDependency */,
+				A9442D2F24DAC097005EDF62 /* PBXTargetDependency */,
+				A9442D3124DAC097005EDF62 /* PBXTargetDependency */,
 				A964D39F22FDE8EE00DFCAEA /* PBXTargetDependency */,
+				A93341E9243E15B2003A82C2 /* PBXTargetDependency */,
+				A93341EB243E15B4003A82C2 /* PBXTargetDependency */,
+				A93341ED243E15B6003A82C2 /* PBXTargetDependency */,
 			);
 			name = HandBrake;
 			productName = HandBrake;
 			productReference = 273F203914ADBC210021BE6D /* HandBrake.app */;
 			productType = "com.apple.product-type.application";
 		};
+		A93341B5243E1583003A82C2 /* HandBrakeXPCService2 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A93341BF243E1583003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService2" */;
+			buildPhases = (
+				A93341B6243E1583003A82C2 /* Sources */,
+				A93341BB243E1583003A82C2 /* Frameworks */,
+				A93341BD243E1583003A82C2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = HandBrakeXPCService2;
+			productName = HandBrakeXPCService;
+			productReference = A93341C4243E1583003A82C2 /* HandBrakeXPCService2.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		A93341C6243E158B003A82C2 /* HandBrakeXPCService3 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A93341D0243E158B003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService3" */;
+			buildPhases = (
+				A93341C7243E158B003A82C2 /* Sources */,
+				A93341CC243E158B003A82C2 /* Frameworks */,
+				A93341CE243E158B003A82C2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = HandBrakeXPCService3;
+			productName = HandBrakeXPCService;
+			productReference = A93341D5243E158B003A82C2 /* HandBrakeXPCService3.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		A93341D7243E158E003A82C2 /* HandBrakeXPCService4 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = A93341E1243E158E003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService4" */;
+			buildPhases = (
+				A93341D8243E158E003A82C2 /* Sources */,
+				A93341DD243E158E003A82C2 /* Frameworks */,
+				A93341DF243E158E003A82C2 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = HandBrakeXPCService4;
+			productName = HandBrakeXPCService;
+			productReference = A93341E6243E158E003A82C2 /* HandBrakeXPCService4.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
 		A964D39422FDE8EE00DFCAEA /* HandBrakeXPCService */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = A964D3A522FDE8EE00DFCAEA /* Build configuration list for PBXNativeTarget "HandBrakeXPCService" */;
@@ -1775,7 +2250,7 @@
 			isa = PBXProject;
 			attributes = {
 				CLASSPREFIX = HB;
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1310;
 				ORGANIZATIONNAME = HandBrake;
 				TargetAttributes = {
 					273F203814ADBC200021BE6D = {
@@ -1821,10 +2296,19 @@
 				it,
 				fr,
 				ru,
+				"pt-BR",
+				co,
+				zh,
 			);
 			mainGroup = 273F1FDE14AD9DA40021BE6D;
 			productRefGroup = 273F200014ADAE950021BE6D /* Products */;
 			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = A9442CDE24DABFED005EDF62 /* Products */;
+					ProjectRef = A9442CDD24DABFED005EDF62 /* Sparkle.xcodeproj */;
+				},
+			);
 			projectRoot = "";
 			targets = (
 				273F216E14ADD2170021BE6D /* external */,
@@ -1834,10 +2318,142 @@
 				A9736F0A1C7DA5FE008F1D18 /* HandBrakeKitTests */,
 				273F203814ADBC200021BE6D /* HandBrake */,
 				A964D39422FDE8EE00DFCAEA /* HandBrakeXPCService */,
+				A93341B5243E1583003A82C2 /* HandBrakeXPCService2 */,
+				A93341C6243E158B003A82C2 /* HandBrakeXPCService3 */,
+				A93341D7243E158E003A82C2 /* HandBrakeXPCService4 */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXReferenceProxy section */
+		A9442CF024DABFED005EDF62 /* Sparkle.framework */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.framework;
+			path = Sparkle.framework;
+			remoteRef = A9442CEF24DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CF224DABFED005EDF62 /* Sparkle Test App.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = "Sparkle Test App.app";
+			remoteRef = A9442CF124DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CF424DABFED005EDF62 /* Sparkle Unit Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "Sparkle Unit Tests.xctest";
+			remoteRef = A9442CF324DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CF624DABFED005EDF62 /* BinaryDelta */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = BinaryDelta;
+			remoteRef = A9442CF524DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CF824DABFED005EDF62 /* Autoupdate */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = Autoupdate;
+			remoteRef = A9442CF724DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CFA24DABFED005EDF62 /* UI Tests.xctest */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.cfbundle;
+			path = "UI Tests.xctest";
+			remoteRef = A9442CF924DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442CFE24DABFED005EDF62 /* generate_appcast */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = generate_appcast;
+			remoteRef = A9442CFD24DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D0024DABFED005EDF62 /* generate_keys */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = generate_keys;
+			remoteRef = A9442CFF24DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D0224DABFED005EDF62 /* sign_update */ = {
+			isa = PBXReferenceProxy;
+			fileType = "compiled.mach-o.executable";
+			path = sign_update;
+			remoteRef = A9442D0124DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D0424DABFED005EDF62 /* libbsdiff.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libbsdiff.a;
+			remoteRef = A9442D0324DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D0624DABFED005EDF62 /* libed25519.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libed25519.a;
+			remoteRef = A9442D0524DABFED005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1224DAC03A005EDF62 /* org.sparkle-project.InstallerLauncher.xpc */ = {
+			isa = PBXReferenceProxy;
+			fileType = "wrapper.xpc-service";
+			path = "org.sparkle-project.InstallerLauncher.xpc";
+			remoteRef = A9442D1124DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1424DAC03A005EDF62 /* org.sparkle-project.InstallerConnection.xpc */ = {
+			isa = PBXReferenceProxy;
+			fileType = "wrapper.xpc-service";
+			path = "org.sparkle-project.InstallerConnection.xpc";
+			remoteRef = A9442D1324DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1624DAC03A005EDF62 /* org.sparkle-project.InstallerStatus.xpc */ = {
+			isa = PBXReferenceProxy;
+			fileType = "wrapper.xpc-service";
+			path = "org.sparkle-project.InstallerStatus.xpc";
+			remoteRef = A9442D1524DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1824DAC03A005EDF62 /* org.sparkle-project.Downloader.xpc */ = {
+			isa = PBXReferenceProxy;
+			fileType = "wrapper.xpc-service";
+			path = "org.sparkle-project.Downloader.xpc";
+			remoteRef = A9442D1724DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1A24DAC03A005EDF62 /* TestAppHelper.xpc */ = {
+			isa = PBXReferenceProxy;
+			fileType = "wrapper.xpc-service";
+			path = TestAppHelper.xpc;
+			remoteRef = A9442D1924DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1C24DAC03A005EDF62 /* sparkle.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = sparkle.app;
+			remoteRef = A9442D1B24DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		A9442D1E24DAC03A005EDF62 /* Updater.app */ = {
+			isa = PBXReferenceProxy;
+			fileType = wrapper.application;
+			path = Updater.app;
+			remoteRef = A9442D1D24DAC03A005EDF62 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
 /* Begin PBXResourcesBuildPhase section */
 		273F203714ADBC200021BE6D /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -1866,7 +2482,7 @@
 				A91AD3471FB5D9AA00AEA822 /* AddPreset.xib in Resources */,
 				A9E1468216BC2AD800C307BC /* PlayTemplate.pdf in Resources */,
 				A9A96BAD20CAD5A200A39AFB /* MainMenu.xib in Resources */,
-				A9A96BD720CAD64300A39AFB /* PictureSettings.xib in Resources */,
+				A9A96BD720CAD64300A39AFB /* HBCroppingView.xib in Resources */,
 				A9A96BD120CAD62500A39AFB /* ChaptersTitles.xib in Resources */,
 				A91AD3441FB5D9A500AEA822 /* HBAddCategoryController.xib in Resources */,
 				A9AB054D233CC60B00F26894 /* HBTrackTitleViewController.xib in Resources */,
@@ -1889,10 +2505,38 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		A93341BD243E1583003A82C2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A951D9CA243E5B50002579F2 /* Localizable.strings in Resources */,
+				A91D84E726676647008987A0 /* HandBrakeXPCService2-InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341CE243E158B003A82C2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A91D84EA26676647008987A0 /* HandBrakeXPCService3-InfoPlist.strings in Resources */,
+				A93341CF243E158B003A82C2 /* Localizable.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341DF243E158E003A82C2 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341E0243E158E003A82C2 /* Localizable.strings in Resources */,
+				A91D84ED26676647008987A0 /* HandBrakeXPCService4-InfoPlist.strings in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		A964D39322FDE8EE00DFCAEA /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A91D84E426676647008987A0 /* HandBrakeXPCService1-InfoPlist.strings in Resources */,
 				A919992823003CFC0037F526 /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1944,7 +2588,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				273F208914ADBE3B0021BE6D /* fakexcode.cpp in Sources */,
 				273F208A14ADBE3B0021BE6D /* parsecsv.c in Sources */,
 				273F208B14ADBE3B0021BE6D /* test.c in Sources */,
 			);
@@ -1956,9 +2599,9 @@
 			files = (
 				A9C3A50123C7A66100269CA3 /* HBFilePromiseProvider.m in Sources */,
 				A954010322FF397000F83A5F /* HBRedirect.m in Sources */,
-				A95BA161220CA5DB00A2F9F9 /* HBDistributedArray.m in Sources */,
 				A916C99B1C844A0800C7B560 /* HBTableView.m in Sources */,
 				A916C9991C8449E200C7B560 /* main.m in Sources */,
+				A942B66D250BB1FE00049203 /* HBQueueActionItem.m in Sources */,
 				A973E10C216E74E900D498EC /* HBThumbnailItemView.m in Sources */,
 				A916C9981C8449DB00C7B560 /* HBTitleSelectionController.m in Sources */,
 				A943874122ED911B005F701B /* HBJob+HBAdditions.m in Sources */,
@@ -2000,23 +2643,59 @@
 				273F20B314ADBE670021BE6D /* HBOutputPanelController.m in Sources */,
 				A9C61F9E22E31CDB00C28E7C /* HBFlippedClipView.m in Sources */,
 				273F20B414ADBE670021BE6D /* HBOutputRedirect.m in Sources */,
-				A95BA15D220C968500A2F9F9 /* HBQueueItem.m in Sources */,
+				A95BA15D220C968500A2F9F9 /* HBQueueJobItem.m in Sources */,
 				A964D3A822FDE91B00DFCAEA /* HBRemoteCore.m in Sources */,
 				A9D0FA771C1C284D0003F2A9 /* HBFocusRingView.m in Sources */,
 				A91AFD0C1A948827009BECED /* HBOutputFileWriter.m in Sources */,
 				A9D363512209C08600D8EFEA /* HBQueueItemView.m in Sources */,
+				A9E05A082529E77F000E0E9A /* HBPasteboardItem.m in Sources */,
 				A95121E61B5F7BE700FD773D /* NSArray+HBAdditions.m in Sources */,
 				A96664B51CCE48F700DA4A57 /* HBPictureHUDController.m in Sources */,
 				A957EBCD218DBE5900007988 /* HBAutoNamer.m in Sources */,
 				A96127DF22E0994E0086E6DC /* HBQueueInfoViewController.m in Sources */,
 				A97ECB8222E1D85500570935 /* HBQueue.m in Sources */,
 				A92B148220CA9F7700146FD8 /* HBHUDView.m in Sources */,
+				A9150DAE243F7BE200694870 /* HBQueueDockTileController.m in Sources */,
 				A9B3B63922E2EA58001CEB9A /* HBQueueItemWorkingView.m in Sources */,
 				A914BCB31BC441C700157917 /* HBPreviewView.m in Sources */,
 				273F20B714ADBE670021BE6D /* HBPreviewController.m in Sources */,
 				A9D1E41718262364002F6424 /* HBPreviewGenerator.m in Sources */,
-				273F20BA14ADBE670021BE6D /* HBPictureController.m in Sources */,
+				273F20BA14ADBE670021BE6D /* HBCroppingController.m in Sources */,
 				A9CF25F71990D6820023F727 /* HBPresetsViewController.m in Sources */,
+				A9A5F7D5243DD90100C82EC8 /* HBQueueWorker.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341B6243E1583003A82C2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341B7243E1583003A82C2 /* HBOutputRedirect.m in Sources */,
+				A93341B8243E1583003A82C2 /* main.m in Sources */,
+				A93341B9243E1583003A82C2 /* HandBrakeXPCService.m in Sources */,
+				A93341BA243E1583003A82C2 /* HBRedirect.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341C7243E158B003A82C2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341C8243E158B003A82C2 /* HBOutputRedirect.m in Sources */,
+				A93341C9243E158B003A82C2 /* main.m in Sources */,
+				A93341CA243E158B003A82C2 /* HandBrakeXPCService.m in Sources */,
+				A93341CB243E158B003A82C2 /* HBRedirect.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		A93341D8243E158E003A82C2 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				A93341D9243E158E003A82C2 /* HBOutputRedirect.m in Sources */,
+				A93341DA243E158E003A82C2 /* main.m in Sources */,
+				A93341DB243E158E003A82C2 /* HandBrakeXPCService.m in Sources */,
+				A93341DC243E158E003A82C2 /* HBRedirect.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2095,6 +2774,46 @@
 			target = 273F203814ADBC200021BE6D /* HandBrake */;
 			targetProxy = A91CE2FF1C7DBA2C0068F46F /* PBXContainerItemProxy */;
 		};
+		A93341E9243E15B2003A82C2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A93341B5243E1583003A82C2 /* HandBrakeXPCService2 */;
+			targetProxy = A93341E8243E15B2003A82C2 /* PBXContainerItemProxy */;
+		};
+		A93341EB243E15B4003A82C2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A93341C6243E158B003A82C2 /* HandBrakeXPCService3 */;
+			targetProxy = A93341EA243E15B4003A82C2 /* PBXContainerItemProxy */;
+		};
+		A93341ED243E15B6003A82C2 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = A93341D7243E158E003A82C2 /* HandBrakeXPCService4 */;
+			targetProxy = A93341EC243E15B6003A82C2 /* PBXContainerItemProxy */;
+		};
+		A9442D2924DAC097005EDF62 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = Sparkle;
+			targetProxy = A9442D2824DAC097005EDF62 /* PBXContainerItemProxy */;
+		};
+		A9442D2B24DAC097005EDF62 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = SparkleDownloader;
+			targetProxy = A9442D2A24DAC097005EDF62 /* PBXContainerItemProxy */;
+		};
+		A9442D2D24DAC097005EDF62 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = SparkleInstallerConnection;
+			targetProxy = A9442D2C24DAC097005EDF62 /* PBXContainerItemProxy */;
+		};
+		A9442D2F24DAC097005EDF62 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = SparkleInstallerLauncher;
+			targetProxy = A9442D2E24DAC097005EDF62 /* PBXContainerItemProxy */;
+		};
+		A9442D3124DAC097005EDF62 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = SparkleInstallerStatus;
+			targetProxy = A9442D3024DAC097005EDF62 /* PBXContainerItemProxy */;
+		};
 		A964D39F22FDE8EE00DFCAEA /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			target = A964D39422FDE8EE00DFCAEA /* HandBrakeXPCService */;
@@ -2131,6 +2850,9 @@
 				A9F5E3442215D85A0046FA4B /* it */,
 				A90713D02242693B00372AA0 /* fr */,
 				A9D3E308234A119400F39385 /* ru */,
+				D0DA2AC624B384AD003ACA30 /* pt-BR */,
+				D0B806B326E7F2760013D332 /* co */,
+				D0530EAA2706DF6A00CB946A /* zh */,
 			);
 			name = HBRenamePresetController.xib;
 			sourceTree = "<group>";
@@ -2151,6 +2873,9 @@
 				A9F5E3472215D85A0046FA4B /* it */,
 				A90713D32242693B00372AA0 /* fr */,
 				A9D3E2FF234A119400F39385 /* ru */,
+				D0DA2ABE24B384AD003ACA30 /* pt-BR */,
+				D0B806B426E7F2760013D332 /* co */,
+				D0530EAB2706DF6A00CB946A /* zh */,
 			);
 			name = HBSummaryViewController.xib;
 			sourceTree = "<group>";
@@ -2163,6 +2888,9 @@
 				A919992C23003D720037F526 /* fr */,
 				A919992D23003D730037F526 /* de */,
 				A9D3E315234A11E600F39385 /* ru */,
+				A9D2DDE524B3B1C2009C92DA /* pt-BR */,
+				A91CAB54270726B000006BEA /* zh */,
+				A91CAB55270726B300006BEA /* co */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -2175,6 +2903,9 @@
 				A9F5E3462215D85A0046FA4B /* it */,
 				A90713D22242693B00372AA0 /* fr */,
 				A9D3E2FB234A119400F39385 /* ru */,
+				D0DA2AB924B384AD003ACA30 /* pt-BR */,
+				D0B806A926E7F2760013D332 /* co */,
+				D0530EA02706DF6A00CB946A /* zh */,
 			);
 			name = HBAddCategoryController.xib;
 			sourceTree = "<group>";
@@ -2187,10 +2918,69 @@
 				A9F5E3382215D85A0046FA4B /* it */,
 				A90713C42242693B00372AA0 /* fr */,
 				A9D3E2FE234A119400F39385 /* ru */,
+				D0DA2ABC24B384AD003ACA30 /* pt-BR */,
+				D0B806A426E7F2760013D332 /* co */,
+				D0530E9B2706DF6A00CB946A /* zh */,
 			);
 			name = AddPreset.xib;
 			sourceTree = "<group>";
 		};
+		A91D84E226676647008987A0 /* HandBrakeXPCService1-InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A91D84E326676647008987A0 /* it */,
+				A91D8503266766FF008987A0 /* de */,
+				A91D850A26676733008987A0 /* fr */,
+				D0A8A0332706E3710008018A /* ru */,
+				A91D851126676752008987A0 /* pt-BR */,
+				D0B806C626E7F2760013D332 /* co */,
+				D0530EBD2706DF6A00CB946A /* zh */,
+			);
+			name = "HandBrakeXPCService1-InfoPlist.strings";
+			sourceTree = "<group>";
+		};
+		A91D84E526676647008987A0 /* HandBrakeXPCService2-InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A91D84E626676647008987A0 /* it */,
+				A91D8504266766FF008987A0 /* de */,
+				A91D850B26676733008987A0 /* fr */,
+				D0A8A0342706E3710008018A /* ru */,
+				A91D851226676752008987A0 /* pt-BR */,
+				D0B806C726E7F2760013D332 /* co */,
+				D0530EBE2706DF6A00CB946A /* zh */,
+			);
+			name = "HandBrakeXPCService2-InfoPlist.strings";
+			sourceTree = "<group>";
+		};
+		A91D84E826676647008987A0 /* HandBrakeXPCService3-InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A91D84E926676647008987A0 /* it */,
+				A91D8505266766FF008987A0 /* de */,
+				A91D850C26676733008987A0 /* fr */,
+				D0A8A0352706E3710008018A /* ru */,
+				A91D851326676752008987A0 /* pt-BR */,
+				D0B806C826E7F2760013D332 /* co */,
+				D0530EBF2706DF6A00CB946A /* zh */,
+			);
+			name = "HandBrakeXPCService3-InfoPlist.strings";
+			sourceTree = "<group>";
+		};
+		A91D84EB26676647008987A0 /* HandBrakeXPCService4-InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				A91D84EC26676647008987A0 /* it */,
+				A91D8506266766FF008987A0 /* de */,
+				A91D850D26676733008987A0 /* fr */,
+				D0A8A0362706E3710008018A /* ru */,
+				A91D851426676752008987A0 /* pt-BR */,
+				D0B806C926E7F2760013D332 /* co */,
+				D0530EC02706DF6A00CB946A /* zh */,
+			);
+			name = "HandBrakeXPCService4-InfoPlist.strings";
+			sourceTree = "<group>";
+		};
 		A94DC2DC20CADA2C00EAC8FD /* MainWindow.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -2199,6 +2989,9 @@
 				A9F5E3412215D85A0046FA4B /* it */,
 				A90713CC2242693B00372AA0 /* fr */,
 				A9D3E302234A119400F39385 /* ru */,
+				D0DA2AC024B384AD003ACA30 /* pt-BR */,
+				D0B806B826E7F2760013D332 /* co */,
+				D0530EAF2706DF6A00CB946A /* zh */,
 			);
 			name = MainWindow.xib;
 			sourceTree = "<group>";
@@ -2211,6 +3004,9 @@
 				D062DF6422FAE05700A65A9E /* de */,
 				A963D9962349D5E7001ED0EC /* fr */,
 				A9D3E2FD234A119400F39385 /* ru */,
+				D0DA2ABB24B384AD003ACA30 /* pt-BR */,
+				D0B806B226E7F2760013D332 /* co */,
+				D0530EA92706DF6A00CB946A /* zh */,
 			);
 			name = HBQueueTableViewController.xib;
 			sourceTree = "<group>";
@@ -2223,6 +3019,9 @@
 				D062DF6522FAE06000A65A9E /* de */,
 				A963D9982349D5E7001ED0EC /* fr */,
 				A9D3E30D234A119400F39385 /* ru */,
+				D0DA2ACB24B384AD003ACA30 /* pt-BR */,
+				D0B806B126E7F2760013D332 /* co */,
+				D0530EA82706DF6A00CB946A /* zh */,
 			);
 			name = HBQueueInfoViewController.xib;
 			sourceTree = "<group>";
@@ -2234,6 +3033,9 @@
 				A958605B2216A5E5002092B1 /* it */,
 				A90713DB2242697B00372AA0 /* fr */,
 				A9D3E314234A11C800F39385 /* ru */,
+				A9551FD5250E08000018E596 /* pt-BR */,
+				A91CAB412707267000006BEA /* co */,
+				A91CAB532707267200006BEA /* zh */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -2246,6 +3048,9 @@
 				A9F5E3422215D85A0046FA4B /* it */,
 				A90713CE2242693B00372AA0 /* fr */,
 				A9D3E2F3234A119400F39385 /* ru */,
+				D0DA2AB124B384AD003ACA30 /* pt-BR */,
+				D0B806AD26E7F2760013D332 /* co */,
+				D0530EA42706DF6A00CB946A /* zh */,
 			);
 			name = HBPictureHUDController.xib;
 			sourceTree = "<group>";
@@ -2258,6 +3063,9 @@
 				A9F5E3352215D85A0046FA4B /* it */,
 				A90713C12242693B00372AA0 /* fr */,
 				A9D3E311234A119400F39385 /* ru */,
+				D0DA2ACF24B384AD003ACA30 /* pt-BR */,
+				D0B806AB26E7F2760013D332 /* co */,
+				D0530EA22706DF6A00CB946A /* zh */,
 			);
 			name = HBEncodingProgressHUDController.xib;
 			sourceTree = "<group>";
@@ -2270,6 +3078,9 @@
 				A9F5E34D2215D85A0046FA4B /* it */,
 				A90713D92242693B00372AA0 /* fr */,
 				A9D3E2FA234A119400F39385 /* ru */,
+				D0DA2AB824B384AD003ACA30 /* pt-BR */,
+				D0B806AF26E7F2760013D332 /* co */,
+				D0530EA62706DF6A00CB946A /* zh */,
 			);
 			name = HBPlayerHUDController.xib;
 			sourceTree = "<group>";
@@ -2282,6 +3093,9 @@
 				A9F5E33B2215D85A0046FA4B /* it */,
 				A90713C72242693B00372AA0 /* fr */,
 				A9D3E2F9234A119400F39385 /* ru */,
+				D0DA2AB724B384AD003ACA30 /* pt-BR */,
+				D0B806B726E7F2760013D332 /* co */,
+				D0530EAE2706DF6A00CB946A /* zh */,
 			);
 			name = MainMenu.xib;
 			sourceTree = "<group>";
@@ -2294,6 +3108,9 @@
 				A9F5E3372215D85A0046FA4B /* it */,
 				A90713C32242693B00372AA0 /* fr */,
 				A9D3E2F8234A119400F39385 /* ru */,
+				D0DA2AB624B384AD003ACA30 /* pt-BR */,
+				D0B806BC26E7F2760013D332 /* co */,
+				D0530EB32706DF6A00CB946A /* zh */,
 			);
 			name = Presets.xib;
 			sourceTree = "<group>";
@@ -2306,6 +3123,9 @@
 				A9F5E3362215D85A0046FA4B /* it */,
 				A90713C22242693B00372AA0 /* fr */,
 				A9D3E307234A119400F39385 /* ru */,
+				D0DA2AC524B384AD003ACA30 /* pt-BR */,
+				D0B806B526E7F2760013D332 /* co */,
+				D0530EAC2706DF6A00CB946A /* zh */,
 			);
 			name = HBTitleSelection.xib;
 			sourceTree = "<group>";
@@ -2318,6 +3138,9 @@
 				A9F5E34C2215D85A0046FA4B /* it */,
 				A90713D82242693B00372AA0 /* fr */,
 				A9D3E312234A119400F39385 /* ru */,
+				D0DA2AD024B384AD003ACA30 /* pt-BR */,
+				D0B806AE26E7F2760013D332 /* co */,
+				D0530EA52706DF6A00CB946A /* zh */,
 			);
 			name = HBPictureViewController.xib;
 			sourceTree = "<group>";
@@ -2330,6 +3153,9 @@
 				A9F5E33F2215D85A0046FA4B /* it */,
 				A90713CB2242693B00372AA0 /* fr */,
 				A9D3E2FC234A119400F39385 /* ru */,
+				D0DA2ABA24B384AD003ACA30 /* pt-BR */,
+				D0B806AC26E7F2760013D332 /* co */,
+				D0530EA32706DF6A00CB946A /* zh */,
 			);
 			name = HBFiltersViewController.xib;
 			sourceTree = "<group>";
@@ -2342,6 +3168,9 @@
 				A9F5E33D2215D85A0046FA4B /* it */,
 				A90713C92242693B00372AA0 /* fr */,
 				A9D3E313234A119400F39385 /* ru */,
+				D0DA2AD124B384AD003ACA30 /* pt-BR */,
+				D0B806C026E7F2760013D332 /* co */,
+				D0530EB72706DF6A00CB946A /* zh */,
 			);
 			name = Video.xib;
 			sourceTree = "<group>";
@@ -2354,6 +3183,9 @@
 				A9F5E3432215D85A0046FA4B /* it */,
 				A90713CF2242693B00372AA0 /* fr */,
 				A9D3E30B234A119400F39385 /* ru */,
+				D0DA2AC924B384AD003ACA30 /* pt-BR */,
+				D0B806A526E7F2760013D332 /* co */,
+				D0530E9C2706DF6A00CB946A /* zh */,
 			);
 			name = Audio.xib;
 			sourceTree = "<group>";
@@ -2366,6 +3198,9 @@
 				A9F5E34A2215D85A0046FA4B /* it */,
 				A90713D72242693B00372AA0 /* fr */,
 				A9D3E301234A119400F39385 /* ru */,
+				D0DA2ABF24B384AD003ACA30 /* pt-BR */,
+				D0B806A626E7F2760013D332 /* co */,
+				D0530E9D2706DF6A00CB946A /* zh */,
 			);
 			name = AudioDefaults.xib;
 			sourceTree = "<group>";
@@ -2378,6 +3213,9 @@
 				A9F5E33C2215D85A0046FA4B /* it */,
 				A90713C82242693B00372AA0 /* fr */,
 				A9D3E305234A119400F39385 /* ru */,
+				D0DA2AC324B384AD003ACA30 /* pt-BR */,
+				D0B806BE26E7F2760013D332 /* co */,
+				D0530EB52706DF6A00CB946A /* zh */,
 			);
 			name = Subtitles.xib;
 			sourceTree = "<group>";
@@ -2390,6 +3228,9 @@
 				A9F5E3492215D85A0046FA4B /* it */,
 				A90713D52242693B00372AA0 /* fr */,
 				A9D3E30A234A119400F39385 /* ru */,
+				D0DA2AC824B384AD003ACA30 /* pt-BR */,
+				D0B806BF26E7F2760013D332 /* co */,
+				D0530EB62706DF6A00CB946A /* zh */,
 			);
 			name = SubtitlesDefaults.xib;
 			sourceTree = "<group>";
@@ -2402,6 +3243,9 @@
 				A9F5E34E2215D85A0046FA4B /* it */,
 				A90713DA2242693B00372AA0 /* fr */,
 				A9D3E30C234A119400F39385 /* ru */,
+				D0DA2ACA24B384AD003ACA30 /* pt-BR */,
+				D0B806A726E7F2760013D332 /* co */,
+				D0530E9E2706DF6A00CB946A /* zh */,
 			);
 			name = ChaptersTitles.xib;
 			sourceTree = "<group>";
@@ -2414,11 +3258,14 @@
 				A9F5E34B2215D85A0046FA4B /* it */,
 				A90713D62242693B00372AA0 /* fr */,
 				A9D3E306234A119400F39385 /* ru */,
+				D0DA2AC424B384AD003ACA30 /* pt-BR */,
+				D0B806BD26E7F2760013D332 /* co */,
+				D0530EB42706DF6A00CB946A /* zh */,
 			);
 			name = Queue.xib;
 			sourceTree = "<group>";
 		};
-		A9A96BD520CAD64200A39AFB /* PictureSettings.xib */ = {
+		A9A96BD520CAD64200A39AFB /* HBCroppingView.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
 				A9A96BD620CAD64200A39AFB /* Base */,
@@ -2426,8 +3273,11 @@
 				A9F5E33E2215D85A0046FA4B /* it */,
 				A90713CA2242693B00372AA0 /* fr */,
 				A9D3E303234A119400F39385 /* ru */,
+				D0DA2AC124B384AD003ACA30 /* pt-BR */,
+				D0B806AA26E7F2760013D332 /* co */,
+				D0530EA12706DF6A00CB946A /* zh */,
 			);
-			name = PictureSettings.xib;
+			name = HBCroppingView.xib;
 			sourceTree = "<group>";
 		};
 		A9A96BD820CAD64B00A39AFB /* PicturePreview.xib */ = {
@@ -2438,6 +3288,9 @@
 				A9F5E3482215D85A0046FA4B /* it */,
 				A90713D42242693B00372AA0 /* fr */,
 				A9D3E300234A119400F39385 /* ru */,
+				D0DA2ABD24B384AD003ACA30 /* pt-BR */,
+				D0B806BA26E7F2760013D332 /* co */,
+				D0530EB12706DF6A00CB946A /* zh */,
 			);
 			name = PicturePreview.xib;
 			sourceTree = "<group>";
@@ -2450,6 +3303,9 @@
 				A9F5E3452215D85A0046FA4B /* it */,
 				A90713D12242693B00372AA0 /* fr */,
 				A9D3E30F234A119400F39385 /* ru */,
+				D0DA2ACD24B384AD003ACA30 /* pt-BR */,
+				D0B806B926E7F2760013D332 /* co */,
+				D0530EB02706DF6A00CB946A /* zh */,
 			);
 			name = OutputPanel.xib;
 			sourceTree = "<group>";
@@ -2462,6 +3318,9 @@
 				A9F5E3402215D85A0046FA4B /* it */,
 				A90713CD2242693B00372AA0 /* fr */,
 				A9D3E30E234A119400F39385 /* ru */,
+				D0DA2ACC24B384AD003ACA30 /* pt-BR */,
+				D0B806BB26E7F2760013D332 /* co */,
+				D0530EB22706DF6A00CB946A /* zh */,
 			);
 			name = Preferences.xib;
 			sourceTree = "<group>";
@@ -2474,6 +3333,9 @@
 				A9F5E3392215D85A0046FA4B /* it */,
 				A90713C52242693B00372AA0 /* fr */,
 				A9D3E309234A119400F39385 /* ru */,
+				D0DA2AC724B384AD003ACA30 /* pt-BR */,
+				D0B806B026E7F2760013D332 /* co */,
+				D0530EA72706DF6A00CB946A /* zh */,
 			);
 			name = HBPreviewViewController.xib;
 			sourceTree = "<group>";
@@ -2486,6 +3348,9 @@
 				A963D99C2349D636001ED0EC /* de */,
 				A963D9A02349D654001ED0EC /* it */,
 				A9D3E304234A119400F39385 /* ru */,
+				D0DA2AC224B384AD003ACA30 /* pt-BR */,
+				D0B806B626E7F2760013D332 /* co */,
+				D0530EAD2706DF6A00CB946A /* zh */,
 			);
 			name = HBTrackTitleViewController.xib;
 			sourceTree = "<group>";
@@ -2497,6 +3362,10 @@
 				A95CB2FB217B6D07001E9F51 /* en */,
 				A9F5E3302215D85A0046FA4B /* it */,
 				A90713BC2242693B00372AA0 /* fr */,
+				D0A8A0322706E3710008018A /* ru */,
+				D0DA2AAD24B384AD003ACA30 /* pt-BR */,
+				D0B806C426E7F2760013D332 /* co */,
+				D0530EBB2706DF6A00CB946A /* zh */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2508,6 +3377,9 @@
 				A9F5E3342215D85A0046FA4B /* it */,
 				A90713BD2242693B00372AA0 /* fr */,
 				A9D3E2F7234A119400F39385 /* ru */,
+				D0DA2AB224B384AD003ACA30 /* pt-BR */,
+				D0B806C526E7F2760013D332 /* co */,
+				D0530EBC2706DF6A00CB946A /* zh */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
@@ -2520,6 +3392,9 @@
 				A90713C62242693B00372AA0 /* fr */,
 				A90713DF22426AD100372AA0 /* de */,
 				A9D3E310234A119400F39385 /* ru */,
+				D0DA2ACE24B384AD003ACA30 /* pt-BR */,
+				D0B806A826E7F2760013D332 /* co */,
+				D0530E9F2706DF6A00CB946A /* zh */,
 			);
 			name = ExceptionAlert.xib;
 			sourceTree = "<group>";
@@ -2536,25 +3411,32 @@
 				CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_OSOBJECT_C_STYLE_CAST = YES;
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -2567,11 +3449,12 @@
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
+				EXTERNAL_O = 0;
 				EXTERNAL_SRC = ..;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = "$(EXTERNAL_O)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2598,7 +3481,7 @@
 					CFLocalizedString,
 					HBKitLocalizedString,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -2619,25 +3502,32 @@
 				CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_OSOBJECT_C_STYLE_CAST = YES;
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -2651,10 +3541,12 @@
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
+				EXTERNAL_O = s;
 				EXTERNAL_SRC = ..;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = "$(EXTERNAL_O)";
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
@@ -2677,7 +3569,7 @@
 					CFLocalizedString,
 					HBKitLocalizedString,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -2752,11 +3644,6 @@
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)",
-					"$(PROJECT_DIR)/Sparkle",
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -2764,7 +3651,7 @@
 				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
-					"@loader_path/../Frameworks",
+					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
@@ -2788,11 +3675,6 @@
 				CODE_SIGN_ENTITLEMENTS = "";
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)",
-					"$(PROJECT_DIR)/Sparkle",
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -2800,7 +3682,7 @@
 				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
-					"@loader_path/../Frameworks",
+					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
@@ -2832,6 +3714,744 @@
 			};
 			name = release;
 		};
+		A93341C0243E1583003A82C2 /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService2.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService2;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = debug;
+		};
+		A93341C1243E1583003A82C2 /* debug-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService2.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService2;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "debug-sandbox";
+		};
+		A93341C2243E1583003A82C2 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService2.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService2;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = release;
+		};
+		A93341C3243E1583003A82C2 /* release-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService2.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService2;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "release-sandbox";
+		};
+		A93341D1243E158B003A82C2 /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService3.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService3;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = debug;
+		};
+		A93341D2243E158B003A82C2 /* debug-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService3.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService3;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "debug-sandbox";
+		};
+		A93341D3243E158B003A82C2 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService3.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService3;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = release;
+		};
+		A93341D4243E158B003A82C2 /* release-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService3.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService3;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "release-sandbox";
+		};
+		A93341E2243E158E003A82C2 /* debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService4.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService4;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = debug;
+		};
+		A93341E3243E158E003A82C2 /* debug-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				DEVELOPMENT_TEAM = "";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService4.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService4;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "debug-sandbox";
+		};
+		A93341E4243E158E003A82C2 /* release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService4.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService4;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = release;
+		};
+		A93341E5243E158E003A82C2 /* release-sandbox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_ENTITLEMENTS = HandBrakeXPCService/HandBrakeXPCService.entitlements;
+				CODE_SIGN_IDENTITY = "-";
+				COMBINE_HIDPI_IMAGES = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				DEVELOPMENT_TEAM = "";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService4.plist;
+				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = fr.handbrake.HandBrakeXPCService4;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SKIP_INSTALL = YES;
+			};
+			name = "release-sandbox";
+		};
 		A964D3A122FDE8EE00DFCAEA /* debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -2874,7 +4494,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2885,7 +4504,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = HandBrakeXPCService/Info.plist;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService1.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -2940,7 +4559,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -2951,7 +4569,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = HandBrakeXPCService/Info.plist;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService1.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -3010,7 +4628,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = HandBrakeXPCService/Info.plist;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService1.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -3069,7 +4687,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				INFOPLIST_FILE = HandBrakeXPCService/Info.plist;
+				INFOPLIST_FILE = HandBrakeXPCService/HandBrakeXPCService1.plist;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/../../../../Frameworks";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -3146,7 +4764,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -3270,7 +4887,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -3357,25 +4973,32 @@
 				CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_OSOBJECT_C_STYLE_CAST = YES;
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -3389,11 +5012,12 @@
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
+				EXTERNAL_O = 0;
 				EXTERNAL_SRC = ..;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = "$(EXTERNAL_O)";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -3421,7 +5045,7 @@
 					CFLocalizedString,
 					HBKitLocalizedString,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -3498,7 +5122,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -3561,7 +5184,6 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -3601,11 +5223,6 @@
 				CODE_SIGN_ENTITLEMENTS = HandBrake.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)",
-					"$(PROJECT_DIR)/Sparkle",
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -3613,7 +5230,7 @@
 				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
-					"@loader_path/../Frameworks",
+					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
@@ -3636,25 +5253,32 @@
 				CLANG_ANALYZER_LOCALIZABILITY_EMPTY_CONTEXT = YES;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_OSOBJECT_C_STYLE_CAST = YES;
 				CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES;
 				CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES;
 				CLANG_ENABLE_MODULES = YES;
+				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
+				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES;
 				CLANG_WARN_ASSIGN_ENUM = YES;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_COMPLETION_HANDLER_MISUSE = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_FRAMEWORK_INCLUDE_PRIVATE_FROM_PUBLIC = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_INTERFACE_IVARS = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_SEMICOLON_BEFORE_METHOD_BODY = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
@@ -3669,10 +5293,12 @@
 				EXTERNAL_BUILD = "$(CONFIGURATION_BUILD_DIR)/external";
 				EXTERNAL_DRIVER = xcode;
 				EXTERNAL_JOBS = auto;
+				EXTERNAL_O = s;
 				EXTERNAL_SRC = ..;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = "$(EXTERNAL_O)";
 				GCC_PREPROCESSOR_DEFINITIONS = "__SANDBOX_ENABLED__=1";
 				GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
 				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
@@ -3696,7 +5322,7 @@
 					CFLocalizedString,
 					HBKitLocalizedString,
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				OTHER_LDFLAGS = (
 					"-filelist",
 					"$(EXTERNAL_BUILD)/macosx/osl.filelist.txt",
@@ -3863,11 +5489,6 @@
 				CODE_SIGN_ENTITLEMENTS = HandBrake.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				COMBINE_HIDPI_IMAGES = YES;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(SRCROOT)",
-					"$(PROJECT_DIR)/Sparkle",
-				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
 					"\"$(EXTERNAL_BUILD)/libhb\"",
@@ -3875,7 +5496,7 @@
 				);
 				INFOPLIST_FILE = "$(EXTERNAL_BUILD)/macosx/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
-					"@loader_path/../Frameworks",
+					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				LIBRARY_SEARCH_PATHS = (
@@ -3935,6 +5556,39 @@
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = release;
+		};
+		A93341BF243E1583003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService2" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A93341C0243E1583003A82C2 /* debug */,
+				A93341C1243E1583003A82C2 /* debug-sandbox */,
+				A93341C2243E1583003A82C2 /* release */,
+				A93341C3243E1583003A82C2 /* release-sandbox */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = release;
+		};
+		A93341D0243E158B003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService3" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A93341D1243E158B003A82C2 /* debug */,
+				A93341D2243E158B003A82C2 /* debug-sandbox */,
+				A93341D3243E158B003A82C2 /* release */,
+				A93341D4243E158B003A82C2 /* release-sandbox */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = release;
+		};
+		A93341E1243E158E003A82C2 /* Build configuration list for PBXNativeTarget "HandBrakeXPCService4" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A93341E2243E158E003A82C2 /* debug */,
+				A93341E3243E158E003A82C2 /* debug-sandbox */,
+				A93341E4243E158E003A82C2 /* release */,
+				A93341E5243E158E003A82C2 /* release-sandbox */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = release;
 		};
 		A964D3A522FDE8EE00DFCAEA /* Build configuration list for PBXNativeTarget "HandBrakeXPCService" */ = {
 			isa = XCConfigurationList;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme -> HandBrake-1.5.1.tar.xz/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme Changed

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/co.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/co.lproj/InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/co.lproj/Localizable.strings Added

@@ -0,0 +1,415 @@
+/* Video description */
+" - fastdecode" = " - discudificazione rapida";
+
+/* HBStateFormatter -> work time format */
+" (%.2f fps, avg %.2f fps, ETA %@)" = " (%1$.2f fps, mez. %2$.2f fps, tras. %3$@)";
+
+/* HBStateFormatter -> search time format
+   HBStateFormatter -> work time format */
+" (ETA %@)" = " (trascorsu %@)";
+
+/* HBJob -> video short description framerate */
+" FPS CFR" = " FPS CFR";
+
+/* HBJob -> video short description framerate */
+" FPS PFR" = " FPS PFR";
+
+/* Title short description -> audio format */
+", %d audio tracks" = ", %d traccie audio";
+
+/* Title short description -> subtitles format */
+", %d subtitles tracks" = ", %d traccie di sottutituli";
+
+/* Title short description -> audio format */
+", 1 audio track" = ", 1 traccia audio";
+
+/* Title short description -> subtitles format */
+", 1 subtitles track" = ", 1 traccia di sottutituli";
+
+/* Format description */
+", Align A/V Start" = ", Alineà u principiu di l’audio/video";
+
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = ", Bordu : %1$d/%2$d/%3$d/%4$d";
+
+/* HBJob -> subtitles short description */
+", Burned" = ", Intarsiatu";
+
+/* Format description */
+", Chapter Markers" = ", Marcatori di capitulu";
+
+/* HBPicture -> summary */
+", Crop: %@ %d/%d/%d/%d" = ", Runzicatura : %1$@ %2$d/%3$d/%4$d/%5$d";
+
+/* Format description */
+", iPod 5G Support" = ", Ghjestione di l’iPod 5G";
+
+/* Format description */
+", Web Optimized" = ", Megliuratu per u Web";
+
+/* HBStateFormatter -> work pass type format */
+"(subtitle scan)" = "(esplurazione di i sottutituli)";
+
+/* Title short description -> video format */
+"%.6g FPS" = "%.6g FPS";
+
+/* Audio description */
+"%@ ▸ Encoder: %@" = "%1$@ ▸ Cudificatore : %2$@";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d" = "%1$@Esciuta : %2$dx%3$d";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@Esciuta : %2$dx%3$d, Anamorficu : %4$dx%5$d Autumaticu";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Esciuta : %2$dx%3$d, Anamorficu : %4$dx%5$d Persunalizatu";
+
+/* HBPicture -> short info */
+"%dx%d Storage, %dx%d Display" = "%1$dx%2$d Allucamentu, %3$dx%4$d Affissera";
+
+/* HBJob -> audio short description */
+"+ %lu additional audio tracks" = "+ %lu traccie audio addiziunale";
+
+/* HBJob -> subtitles short description */
+"+ %lu additional subtitles tracks" = "+ %lu traccie di sottutituli addiziunale";
+
+/* HBJob -> audio short description */
+"+ 1 additional audio track" = "+ 1 traccia audio addiziunale";
+
+/* HBJob -> subtitles short description */
+"+ 1 additional subtitles track" = "+ 1 traccia di sottutituli addiziunale";
+
+/* Title description */
+"1 Foreign Language Search Pass - " = "1 passu di ricerca di lingua straniera - ";
+
+/* Title description */
+"2 Video Passes" = "2 passi video";
+
+/* Title description */
+"2 Video Passes First Turbo" = "2 passi video, u primu in modu Turbo";
+
+/* HBAudio -> Mixdown */
+"5.1 Channels" = "Canali 5.1";
+
+/* HBAudio -> Mixdown */
+"6.1 Channels" = "Canali 6.1";
+
+/* HBAudio -> Mixdown */
+"7.1 (5F/2R/LFE)" = "7.1 (5F/2R/LFE)";
+
+/* HBAudio -> Mixdown */
+"7.1 Channels" = "Canali 7.1";
+
+/* Audio description */
+"Audio:" = "Audio :";
+
+/* HBPicture -> summary */
+"Automatic" = "Autumaticu";
+
+/* Video description */
+"Bitrate: %d kbps" = "Flussu binariu : %d kbps";
+
+/* Subtitles description */
+"Burned In" = "Intarsiati";
+
+/* Title -> chapter name
+   Title description */
+"Chapter %d" = "Capitulu %d";
+
+/* HBJob -> chapters short description */
+"Chapter Markers" = "Marcatori di capitulu";
+
+/* HBRange -> display name */
+"Chapters" = "Capituli";
+
+/* Title description */
+"Chapters %d through %d" = "Capituli da %1$d fin’à %2$d";
+
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "Allisciata cromatica";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "Spaziu culorimetricu";
+
+/* HBJob -> filters short description */
+"Comb Detect" = "Abbentata di pettinera";
+
+/* Video description */
+"Constant Quality: %.2f %s" = "Qualità custente : %1$.2f %2$s";
+
+/* HBJob -> video short description framerate */
+"CRF" = "CRF";
+
+/* HBFilters -> custom display name
+   HBPicture -> summary */
+"Custom" = "Persunalizatu";
+
+/* Filters description
+   HBJob -> filters short description */
+"Deblock" = "Sblucchime";
+
+/* HBFilters -> filter display name */
+"Decomb" = "Dipettinera";
+
+/* Subtitles description */
+"Default" = "Predefinitu";
+
+/* Video description */
+"default settings" = "preferenze predefinite";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "Predefinizione : ";
+
+/* Filters description */
+"Denoise" = "Riduzzione di trostu";
+
+/* Destination description */
+"Destination:" = "Destinazione :";
+
+/* Dimensions description
+   HBJob -> filters short description */
+"Detelecine" = "Detelesinema";
+
+/* Dimensions description */
+"Dimensions:" = "Dimensioni :";
+
+/* HBAudio -> Mixdown */
+"Dolby Pro Logic II" = "Dolby Pro Logic II";
+
+/* HBAudio -> Mixdown */
+"Dolby Surround" = "Dolby Surround";
+
+/* Audio description */
+"DRC: %.2f" = "DRC : %.2f";
+
+/* Video description */
+"Encoder: %@, " = "Cudificatore : %@, ";
+
+/* HBStateFormatter -> work pass display name */
+"Encoding %@ " = "Cudificazione %@ ";
+
+/* Filters description */
+"Filters:" = "Filtri :";
+
+/* Subtitles description */
+"Forced Only" = "Sfurzatu solu";
+
+/* HBSubtitles -> search pass name */
+"Foreign Audio Search" = "Ricerca di traccia audio straniera";
+
+/* Format description */
+"Format:" = "Furmatu :";
+
+/* Video description */
+"Framerate: " = "Frequenza di fiure : ";
+
+/* HBRange -> display name */
+"Frames" = "Fiure";
+
+/* Title description */
+"Frames %d through %d" = "Fiure da %1$d fin’à %2$d";
+
+/* Audio description */
+"Gain: %.2f" = "Guadagnu : %.2f";
+
+/* Filters description
+   HBJob -> filters short description */
+"Grayscale" = "Scala di grisgiu";
+
+/* HBFilters -> filter display name */
+"HQDN3D" = "HQDN3D";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "Preferenze persunalizate d’allisciata cromatica inaccettevule.";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "Preferenze persunalizate di spaziu culorimetricu inaccettevule.";
+
+/* HBFilters -> invalid comb detect custom string description */
+"Invalid custom comb detect settings." = "Preferenze persunalizate di pettinera inaccettevule.";
+
+/* HBFilters -> invalid detelecine custom string description */
+"Invalid custom detelecine settings." = "Preferenze persunalizate di detelesinema inaccettevule.";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom HQDN3D settings" = "Preferenze persunalizate HQDN3D inaccettevule";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom NLMeans settings" = "Preferenze persunalizate NLMeans inaccettevule";
+
+/* HBFilters -> invalid deblock custom string description */
+"Invalid deblock custom settings." = "Preferenze persunalizate di sblucchime inaccettevule.";
+
+/* HBFilters -> invalid Decomb custom string description */
+"Invalid Decomb custom settings." = "Preferenze persunalizate di dipettinera inaccettevule.";
+
+/* HBFilters -> invalid lapsharp custom string description */
+"Invalid lapsharp custom settings." = "Preferenze persunalizate lapsharp inaccettevule.";
+
+/* HBJob -> invalid name error description */
+"Invalid name" = "Nome inaccettevule";
+
+/* HBFilters -> invalid unsharp custom string description */
+"Invalid unsharp custom settings." = "Preferenze persunalizate unsharp inaccettevule.";
+
+/* HBFilters -> invalid Yadif custom string description */
+"Invalid Yadif custom settings." = "Preferenze persunalizate Yadif inaccettevule.";
+
+/* HBFilters -> filter display name */
+"Lapsharp" = "Lapsharp";
+
+/* Video description */
+"Level: %@" = "Livellu : %@";
+
+/* Audio description */
+"Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "Mischiera : %1$@, Frequenza di campiunariu : %2$@, Flussu binariu : %3$d kbps";
+
+/* HBAudio -> Mixdown */
+"Mono" = "Mono";
+
+/* HBAudio -> Mixdown */
+"Mono (Left Only)" = "Mono (Solu à manca)";
+
+/* HBAudio -> Mixdown */
+"Mono (Right Only)" = "Mono (Solu à diritta)";
+
+/* HBStateFormatter -> pass display name */
+"Muxing…" = "Mischiu multiple…";
+
+/* HBFilters -> filter display name */
+"NLMeans" = "NLMeans";
+
+/* HBVideo -> tune */
+"none" = "nisunu";
+
+/* HBAudio -> Mixdown
+   HBAudio -> none track name
+   HBJob -> filters short description
+   HBSubtitles -> none track name */
+"None" = "Nisunu";
+
+/* HBFilters -> filter display name
+   HBFilters -> off display name */
+"Off" = "Fermata";
+
+/* Video description */
+"Options: %@" = "Ozzioni : %@";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d %@ of %d, %.2f %%" = "Passi %1$d %2$@ nant’à %3$d, %4$.2f %%";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d of %d, %.2f %%" = "Passi %1$d nant’à %2$d, %3$.2f %%";
+
+/* HBStateFormatter -> work first pass number format */
+"Pass 1" = "Passu 1";
+
+/* HBStateFormatter -> pass display name */
+"Paused" = "In pausa";
+
+/* Video description */
+"Peak %@ (constant frame rate)" = "Cresta %@ (frequenza di fiure custente)";
+
+/* Video description */
+"Peak %@ (may be lower)" = "Cresta %@ (pò esse inferiore)";
+
+/* Preset description */
+"Preset:" = "Prerigatura :";
+
+/* Video description */
+"Preset: %@" = "Prerigatura : %@";
+
+/* Video description */
+"Profile: %@" = "Prufilu : %@";
+
+/* Range description */
+"Range:" = "Stesa :";
+
+/* HBVideo -> frame rates display name */
+"Same as source" = "Listessa chì a fonte";
+
+/* Video description */
+"Same as source (constant)" = "Listessa chì a fonte (custente)";
+
+/* Video description */
+"Same as source (variable)" = "Listessa chì a fonte (variabile)";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d, preview %d…" = "Esplurazione di u titulu %1$d nant’à %2$d fighjulata %3$d…";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d…" = "Esplurazione di u titulu %1$d nant’à %2$d…";
+
+/* HBStateFormatter -> search pass display name */
+"Searching for start point:  %.2f %%" = "Ricerca di u puntu di principiu : %.2f %%";
+
+/* HBRange -> display name */
+"Seconds" = "Seconde";
+
+/* Title description */
+"Seconds %d through %d" = "Seconde %1$d fin’à %2$d";
+
+/* Filters description */
+"Sharpen" = "Arrutà";
+
+/* Source description */
+"Source:" = "Fonte :";
+
+/* HBPicture -> short info */
+"Source: %dx%d, " = "Fonte : %1$dx%2$d, ";
+
+/* HBAudio -> Mixdown */
+"Stereo" = "Stereo";
+
+/* Subtitles description */
+"Subtitles:" = "Sottutituli :";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "Sintassa : ";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't be empty." = "U nome di schedariu ùn pò micca esse viotu.";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't contain the / character." = "U nome di schedariu ùn pò micca cuntene u caratteru « / ».";
+
+/* Preset -> import error description */
+"The preset \"%@\" could not be imported." = "A prerigatura « %@ » ùn pò micca esse impurtata.";
+
+/* Preset -> import error reason */
+"The selected preset is invalid." = "A prerigatura selezziunata ùn hè micca accettevule.";
+
+/* Preset -> import error reason */
+"The selected preset was created with a newer version of HandBrake." = "A prerigatura selezziunata hè stata creata da una versione più recente d’HandBrake.";
+
+/* Title description */
+"Title %d, %@" = "Titulu %1$d, %2$@";
+
+/* Title description */
+"Title %d, %@, %@" = "Titulu %1$d, %2$@, %3$@";
+
+/* Video description */
+"Tune: " = "Rigatura : ";
+
+/* HBJob -> video short description encoder name
+   Video description */
+"Unknown" = "Scunnisciutu";
+
+/* HBFilters -> filter display name */
+"Unsharp" = "Unsharp";
+
+/* HBJob -> video short description framerate */
+"VFR" = "VFR";
+
+/* Video description */
+"Video Options:" = "Ozzioni video :";
+
+/* Video description */
+"Video:" = "Video :";
+
+/* HBFilters -> filter display name */
+"Yadif" = "Yadif";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKit/de.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/de.lproj/Localizable.strings Changed

@@ -14,9 +14,6 @@
 /* HBJob -> video short description framerate */
 " FPS PFR" = " BpS PFR";
 
-/* Dimensions description */
-" Keep Aspect Ratio" = " Bildformat erhalten";
-
 /* Title short description -> audio format */
 ", %d audio tracks" = ", %d Tonspuren";
 
@@ -32,6 +29,9 @@
 /* Format description */
 ", Align A/V Start" = ", A/V synchron";
 
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = ", Ränder: %1$d/%2$d/%3$d/%4$d";
+
 /* HBJob -> subtitles short description */
 ", Burned" = ", Eingebrannt";
 
@@ -44,14 +44,11 @@
 /* Format description */
 ", iPod 5G Support" = ", iPod 5G-Unterstützung";
 
-/* HBPicture -> summary */
-", Modulus: %d" = ", Modulus: %d";
-
 /* Format description */
 ", Web Optimized" = ", Web-optimiert";
 
 /* HBStateFormatter -> work pass type format */
-"(subtitle scan)" = "(Untertitelüberprüfung)";
+"(subtitle scan)" = "(Untertitelscan)";
 
 /* Title short description -> video format */
 "%.6g FPS" = "%.6g BpS";
@@ -63,13 +60,10 @@
 "%@Output: %dx%d" = "%1$@Anzeige: %2$dx%3$d";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Auto" = "%1$@Anzeige: %2$dx%3$d, Anamorphisch: %4$dx%5$d Auto";
-
-/* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Anzeige: %2$dx%3$d, Anamorphisch: %4$dx%5$d Eigene";
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@Anzeige %2$dx%3$d, Anamorph: %4$dx%5$d Automatisch";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Loose" = "%1$@Anzeige: %2$dx%3$d, Anamorphisch: %4$dx%5$d Loose";
+"%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Anzeige: %2$dx%3$d, Anamorph: %4$dx%5$d Eigene";
 
 /* HBPicture -> short info */
 "%dx%d Storage, %dx%d Display" = "%1$d x %2$d Original, %3$d x %4$d Anzeige";
@@ -111,7 +105,7 @@
 "Audio:" = "Audio:";
 
 /* HBPicture -> summary */
-"Auto" = "Auto";
+"Automatic" = "Automatisch";
 
 /* Video description */
 "Bitrate: %d kbps" = "Bitrate: %d kbps";
@@ -132,6 +126,14 @@
 /* Title description */
 "Chapters %d through %d" = "Kapitel %1$d bis %2$d";
 
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "Chroma-Glättung";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "Farbraum";
+
 /* HBJob -> filters short description */
 "Comb Detect" = "Comb Detect";
 
@@ -149,26 +151,23 @@
    HBJob -> filters short description */
 "Deblock" = "Deblock";
 
-/* HBJob -> invalid deblock custom settings error recovery suggestion */
-"Deblock syntax: strength=s:thresh=t:blocksize=b" = "Deblock-Syntax: strength=s:thresh=t:blocksize=b";
-
 /* HBFilters -> filter display name */
 "Decomb" = "Decomb";
 
-/* HBJob -> invalid Decomb custom settings error recovery suggestion */
-"Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7" = "Decomb-Syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb-Standard: mode=7";
-
 /* Subtitles description */
 "Default" = "Standard";
 
 /* Video description */
 "default settings" = "Standardeinstellungen";
 
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "Standard";
+
 /* Filters description */
 "Denoise" = "Entrauschen";
 
 /* Destination description */
-"Destination:" = "Ziel:";
+"Destination:" = "Ausgabe:";
 
 /* Dimensions description
    HBJob -> filters short description */
@@ -223,8 +222,11 @@
 /* HBFilters -> filter display name */
 "HQDN3D" = "HQDN3D";
 
-/* HBJob -> invalid name error recovery suggestion */
-"HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nDefault settings: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3" = "HQDN3D-Syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nStandardeinstellungen: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "Ungültige benutzerdefinierte Chroma-Glättungs-Einstellungen.";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "Ungültige benutzerdefinierte Farbraum-Einstellungen.";
 
 /* HBFilters -> invalid comb detect custom string description */
 "Invalid custom comb detect settings." = "Ungültige benutzerdefinierte Comb Detect-Einstellungen.";
@@ -250,6 +252,9 @@
 /* HBJob -> invalid name error description */
 "Invalid name" = "Ungültiger Name";
 
+/* HBJob -> invalid preset */
+"Invalid preset" = "Ungültige Voreinstellung";
+
 /* HBFilters -> invalid unsharp custom string description */
 "Invalid unsharp custom settings." = "Ungültige benutzerdefinierte Unscharf Maskieren-Einstellungen.";
 
@@ -259,18 +264,12 @@
 /* HBFilters -> filter display name */
 "Lapsharp" = "Lapsharp";
 
-/* HBJob -> invalid lapsharp custom settings error recovery suggestion */
-"Lapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap" = "Lapsharp-Syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp-Standard: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
-
 /* Video description */
 "Level: %@" = "Level: %@";
 
 /* Audio description */
 "Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "Abmischung: %1$@, Samplerate: %2$@, Bitrate: %3$d kbps";
 
-/* HBJob -> Format display name */
-"MKV File" = "MKV-Datei";
-
 /* HBAudio -> Mixdown */
 "Mono" = "Mono";
 
@@ -280,18 +279,12 @@
 /* HBAudio -> Mixdown */
 "Mono (Right Only)" = "Mono (Nur rechts)";
 
-/* HBJob -> Format display name */
-"MP4 File" = "MP4-Datei";
-
 /* HBStateFormatter -> pass display name */
 "Muxing…" = "Multiplexen …";
 
 /* HBFilters -> filter display name */
 "NLMeans" = "NLMeans";
 
-/* HBJob -> invalid name error recovery suggestion */
-"NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nDefault settings: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0" = "NLMeans-Syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nStandardeinstellungen: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0";
-
 /* HBVideo -> tune */
 "none" = "Keine";
 
@@ -338,9 +331,6 @@
 /* Range description */
 "Range:" = "Bereich:";
 
-/* HBJob -> filters short description */
-"Rotation" = "Drehung";
-
 /* HBVideo -> frame rates display name */
 "Same as source" = "Wie die Quelle";
 
@@ -380,11 +370,8 @@
 /* Subtitles description */
 "Subtitles:" = "Untertitel:";
 
-/* HBJob -> invalid comb detect custom settings error recovery suggestion */
-"Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16" = "Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nStandardeinstellungen: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
-
-/* HBJob -> invalid detelecine custom settings error recovery suggestion */
-"Syntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0" = "Syntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nStandardeinstellungen: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "Syntax:";
 
 /* HBJob -> invalid name error recovery suggestion */
 "The file name can't be empty." = "Der Dateiname darf nicht leer sein.";
@@ -395,6 +382,9 @@
 /* Preset -> import error description */
 "The preset \"%@\" could not be imported." = "Die Voreinstellung „%@“ konnte nicht importiert werden.";
 
+/* Job preset -> invalid preset recovery suggestion */
+"The preset is not a valid, try to select a different one." = "Die ausgewählte Voreinstellung ist ungültig, bitte versuchen eine andere zu wählen.";
+
 /* Preset -> import error reason */
 "The selected preset is invalid." = "Die ausgewählte Voreinstellung ist ungültig.";
 
@@ -417,9 +407,6 @@
 /* HBFilters -> filter display name */
 "Unsharp" = "Unscharf Maskier.";
 
-/* HBJob -> invalid unsharp custom settings error recovery suggestion */
-"Unsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7" = "Unscharf Maskieren-Syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnscharf Maskieren-Standardeinstellungen: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7";
-
 /* HBJob -> video short description framerate */
 "VFR" = "VFR";
 
@@ -429,12 +416,6 @@
 /* Video description */
 "Video:" = "Video:";
 
-/* HBJob -> Format display name */
-"WebM File" = "WebM-Datei";
-
 /* HBFilters -> filter display name */
 "Yadif" = "Yadif";
 
-/* HBJob -> invalid Yadif custom settings error recovery suggestion */
-"Yadif syntax: mode=m:parity=p\n\nYadif default: mode=3" = "Yadif-Syntax: mode=m:parity=p\n\nYadif-Standardeinstellungen: mode=3";
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKit/fr.lproj/InfoPlist.strings -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/fr.lproj/InfoPlist.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKit/fr.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/fr.lproj/Localizable.strings Changed

@@ -1,5 +1,5 @@
 /* Video description */
-" - fastdecode" = "- décodage rapide";
+" - fastdecode" = " - décodage rapide";
 
 /* HBStateFormatter -> work time format */
 " (%.2f fps, avg %.2f fps, ETA %@)" = " (%1$.2f fps, env. %2$.2f fps, ETA %3$@)";
@@ -14,9 +14,6 @@
 /* HBJob -> video short description framerate */
 " FPS PFR" = " FPS PFR";
 
-/* Dimensions description */
-" Keep Aspect Ratio" = "Conserver les proportions";
-
 /* Title short description -> audio format */
 ", %d audio tracks" = ", %d pistes audio";
 
@@ -32,6 +29,9 @@
 /* Format description */
 ", Align A/V Start" = ", Aligner. le début A/V";
 
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = ", Bordure : %1$d/%2$d/%3$d/%4$d";
+
 /* HBJob -> subtitles short description */
 ", Burned" = ", Incrusté";
 
@@ -44,9 +44,6 @@
 /* Format description */
 ", iPod 5G Support" = ", Prise en charge de l'iPod 5G";
 
-/* HBPicture -> summary */
-", Modulus: %d" = ", Module : %d";
-
 /* Format description */
 ", Web Optimized" = ", Optimisé pour le Web";
 
@@ -63,15 +60,12 @@
 "%@Output: %dx%d" = "%1$@Sortie : %2$dx%3$d";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Auto" = "%1$@Sortie : %2$dx%3$d, Anamorphique : %4$dx%5$d Auto";
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@Sortie : %2$dx%3$d, Anamorphique : %4$dx%5$d Automatique";
 
 /* HBPicture -> short info */
 "%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Sortie : %2$dx%3$d, Anamorphique : %4$dx%5$d Personnalisé";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Loose" = "%1$@Sortie : %2$dx%3$d, Anamorphique : %4$dx%5$d Perte";
-
-/* HBPicture -> short info */
 "%dx%d Storage, %dx%d Display" = "%1$dx%2$d Stockage, %3$dx%4$d Affichage";
 
 /* HBJob -> audio short description */
@@ -87,7 +81,7 @@
 "+ 1 additional subtitles track" = "+ 1 piste additionnelle de sous-titres";
 
 /* Title description */
-"1 Foreign Language Search Pass - " = "1 passe de recherche de langues étrangères -";
+"1 Foreign Language Search Pass - " = "1 passe de recherche de langues étrangères - ";
 
 /* Title description */
 "2 Video Passes" = "Vidéo 2 passes";
@@ -111,7 +105,7 @@
 "Audio:" = "Audio :";
 
 /* HBPicture -> summary */
-"Auto" = "Auto";
+"Automatic" = "Automatique";
 
 /* Video description */
 "Bitrate: %d kbps" = "Débit : %d kbps";
@@ -132,6 +126,14 @@
 /* Title description */
 "Chapters %d through %d" = "Chapitres %1$d à %2$d";
 
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "Lissage de la saturation";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "Espace colorimétrique";
+
 /* HBJob -> filters short description */
 "Comb Detect" = "Détection du peigne";
 
@@ -149,21 +151,18 @@
    HBJob -> filters short description */
 "Deblock" = "Débloquer";
 
-/* HBJob -> invalid deblock custom settings error recovery suggestion */
-"Deblock syntax: strength=s:thresh=t:blocksize=b" = "Syntaxe de l'anti-blocs : strength=s:thresh=t:blocksize=b";
-
 /* HBFilters -> filter display name */
 "Decomb" = "Suppression du peigne";
 
-/* HBJob -> invalid Decomb custom settings error recovery suggestion */
-"Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7" = "Syntaxe suppression du peigne : mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nSuppression du peigne par défaut : mode=7";
-
 /* Subtitles description */
 "Default" = "Défaut";
 
 /* Video description */
 "default settings" = "réglages par défaut";
 
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "Par défaut : ";
+
 /* Filters description */
 "Denoise" = "Réduction du bruit";
 
@@ -187,7 +186,7 @@
 "DRC: %.2f" = "DRC : %.2f";
 
 /* Video description */
-"Encoder: %@, " = "Encodeur : %@,";
+"Encoder: %@, " = "Encodeur : %@, ";
 
 /* HBStateFormatter -> work pass display name */
 "Encoding %@ " = "Encodage : %@ ";
@@ -205,7 +204,7 @@
 "Format:" = "Format :";
 
 /* Video description */
-"Framerate: " = "Taux de rafraichissement :";
+"Framerate: " = "Taux de rafraichissement : ";
 
 /* HBRange -> display name */
 "Frames" = "Images";
@@ -223,8 +222,11 @@
 /* HBFilters -> filter display name */
 "HQDN3D" = "HQDN3D";
 
-/* HBJob -> invalid name error recovery suggestion */
-"HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nDefault settings: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3" = "Syntaxe HQDN3D : y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nRéglage par défaut : y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "Réglage personnalisé de lissage de la saturation non valide.";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "Réglage personnalisé d'espace de couleur non valide.";
 
 /* HBFilters -> invalid comb detect custom string description */
 "Invalid custom comb detect settings." = "Réglage personnalisé de détection du peigne invalide.";
@@ -250,6 +252,9 @@
 /* HBJob -> invalid name error description */
 "Invalid name" = "Nom invalide";
 
+/* HBJob -> invalid preset */
+"Invalid preset" = "Préréglage non valide";
+
 /* HBFilters -> invalid unsharp custom string description */
 "Invalid unsharp custom settings." = "Réglage personnalisé du flou invalide.";
 
@@ -259,18 +264,12 @@
 /* HBFilters -> filter display name */
 "Lapsharp" = "Lapsharp";
 
-/* HBJob -> invalid lapsharp custom settings error recovery suggestion */
-"Lapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap" = "Syntaxe Lapsharp : y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp par défaut : y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
-
 /* Video description */
 "Level: %@" = "Niveau : %@";
 
 /* Audio description */
 "Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "Mixage : %1$@, Taux d'échantillon : %2$@, Débit: %3$dkbps";
 
-/* HBJob -> Format display name */
-"MKV File" = "Fichier MKV";
-
 /* HBAudio -> Mixdown */
 "Mono" = "Mono";
 
@@ -280,18 +279,12 @@
 /* HBAudio -> Mixdown */
 "Mono (Right Only)" = "Mono (à droite seulement)";
 
-/* HBJob -> Format display name */
-"MP4 File" = "Fichier MP4";
-
 /* HBStateFormatter -> pass display name */
-"Muxing…" = "Multiplexage...";
+"Muxing…" = "Multiplexage…";
 
 /* HBFilters -> filter display name */
 "NLMeans" = "NLMeans";
 
-/* HBJob -> invalid name error recovery suggestion */
-"NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nDefault settings: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0" = "Syntaxe NLMeans : y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nRéglage par défaut : y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0";
-
 /* HBVideo -> tune */
 "none" = "aucun";
 
@@ -338,9 +331,6 @@
 /* Range description */
 "Range:" = "Plage :";
 
-/* HBJob -> filters short description */
-"Rotation" = "Rotation";
-
 /* HBVideo -> frame rates display name */
 "Same as source" = "Comme la source";
 
@@ -354,7 +344,7 @@
 "Scanning title %d of %d, preview %d…" = "Lecture des titres %1$d sur %2$d, aperçu %3$d…";
 
 /* HBStateFormatter -> scan pass format */
-"Scanning title %d of %d…" = "Scan du titre %1$d sur %2$d ...";
+"Scanning title %d of %d…" = "Scan du titre %1$d sur %2$d …";
 
 /* HBStateFormatter -> search pass display name */
 "Searching for start point:  %.2f %%" = "Recherche du point de départ : %.2f %%";
@@ -380,21 +370,21 @@
 /* Subtitles description */
 "Subtitles:" = "Sous-titres :";
 
-/* HBJob -> invalid comb detect custom settings error recovery suggestion */
-"Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16" = "Syntaxe : mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDéfaut : mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
-
-/* HBJob -> invalid detelecine custom settings error recovery suggestion */
-"Syntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0" = "Syntaxe : skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDéfaut : skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "Syntaxe : ";
 
 /* HBJob -> invalid name error recovery suggestion */
 "The file name can't be empty." = "Le nom du fichier ne peut être vide.";
 
 /* HBJob -> invalid name error recovery suggestion */
-"The file name can't contain the / character." = "Le nom du fichier ne peut pas contenir le caractère \"/\"";
+"The file name can't contain the / character." = "Le nom du fichier ne peut pas contenir le caractère \"/\".";
 
 /* Preset -> import error description */
 "The preset \"%@\" could not be imported." = "Le préréglage \"%@\" n'a pas pu être importé.";
 
+/* Job preset -> invalid preset recovery suggestion */
+"The preset is not a valid, try to select a different one." = "Le préréglage n'est pas valide, essayez-en un autre.";
+
 /* Preset -> import error reason */
 "The selected preset is invalid." = "Le préréglage sélectionné est invalide.";
 
@@ -408,7 +398,7 @@
 "Title %d, %@, %@" = "Titre %1$d, %2$@, %3$@";
 
 /* Video description */
-"Tune: " = "Régler :";
+"Tune: " = "Régler : ";
 
 /* HBJob -> video short description encoder name
    Video description */
@@ -417,9 +407,6 @@
 /* HBFilters -> filter display name */
 "Unsharp" = "Flou";
 
-/* HBJob -> invalid unsharp custom settings error recovery suggestion */
-"Unsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7" = "Syntaxe du réglage Flou : y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nRéglage Flou par défaut: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7";
-
 /* HBJob -> video short description framerate */
 "VFR" = "VFR";
 
@@ -429,12 +416,6 @@
 /* Video description */
 "Video:" = "Vidéo :";
 
-/* HBJob -> Format display name */
-"WebM File" = "Fichier WebM";
-
 /* HBFilters -> filter display name */
 "Yadif" = "Yadif";
 
-/* HBJob -> invalid Yadif custom settings error recovery suggestion */
-"Yadif syntax: mode=m:parity=p\n\nYadif default: mode=3" = "Syntaxe YADIF : mode=m:parity=p\n\nYADIF par défaut: mode=3";
-

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKit/it.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/it.lproj/Localizable.strings Changed

@@ -14,9 +14,6 @@
 /* HBJob -> video short description framerate */
 " FPS PFR" = " FPS PFR";
 
-/* Dimensions description */
-" Keep Aspect Ratio" = " Mantieni rapporto dimensioni";
-
 /* Title short description -> audio format */
 ", %d audio tracks" = ", %d tracce audio";
 
@@ -32,6 +29,9 @@
 /* Format description */
 ", Align A/V Start" = ", allinea inizio A/V";
 
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = ", Bordo: %1$d/%2$d/%3$d/%4$d";
+
 /* HBJob -> subtitles short description */
 ", Burned" = ", sovraimpressi";
 
@@ -44,9 +44,6 @@
 /* Format description */
 ", iPod 5G Support" = ", supporto iPod 5G";
 
-/* HBPicture -> summary */
-", Modulus: %d" = ", Modulo: %d";
-
 /* Format description */
 ", Web Optimized" = ", ottimizza per web";
 
@@ -63,15 +60,12 @@
 "%@Output: %dx%d" = "%1$@Uscita: %2$dx%3$d";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Auto" = "%1$@Uscita: %2$dx%3$d, Anamorfico: %4$dx%5$d Auto";
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@Uscita: %2$dx%3$d, Anamorfico: %4$dx%5$d Automatico";
 
 /* HBPicture -> short info */
 "%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Uscita: %2$dx%3$d, Anamorfico: %4$dx%5$d Personalizzato";
 
 /* HBPicture -> short info */
-"%@Output: %dx%d, Anamorphic: %dx%d Loose" = "%1$@Uscita: %2$dx%3$d, Anamorfico: %4$dx%5$d Sciolto";
-
-/* HBPicture -> short info */
 "%dx%d Storage, %dx%d Display" = "%1$dx%2$d Archiviazione, %3$dx%4$d Visualizzazione";
 
 /* HBJob -> audio short description */
@@ -111,7 +105,7 @@
 "Audio:" = "Audio:";
 
 /* HBPicture -> summary */
-"Auto" = "Auto";
+"Automatic" = "Automatico";
 
 /* Video description */
 "Bitrate: %d kbps" = "Frequenza dati: %d kbps";
@@ -132,6 +126,14 @@
 /* Title description */
 "Chapters %d through %d" = "Capitoli da %1$d a %2$d";
 
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "Chroma Smooth";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "Spazio di colore";
+
 /* HBJob -> filters short description */
 "Comb Detect" = "Individuazione interlacciamento";
 
@@ -149,21 +151,18 @@
    HBJob -> filters short description */
 "Deblock" = "Deblock";
 
-/* HBJob -> invalid deblock custom settings error recovery suggestion */
-"Deblock syntax: strength=s:thresh=t:blocksize=b" = ": strength=s:thresh=t:blocksize=b";
-
 /* HBFilters -> filter display name */
 "Decomb" = "Decomb";
 
-/* HBJob -> invalid Decomb custom settings error recovery suggestion */
-"Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7" = "Decomb sintassi: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7";
-
 /* Subtitles description */
 "Default" = "Default";
 
 /* Video description */
 "default settings" = "impostazioni di default";
 
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "Default: ";
+
 /* Filters description */
 "Denoise" = "Denoise";
 
@@ -223,8 +222,11 @@
 /* HBFilters -> filter display name */
 "HQDN3D" = "HQDN3D";
 
-/* HBJob -> invalid name error recovery suggestion */
-"HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nDefault settings: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3" = "HQDN3D sintassi: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nImpostazioni di default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "Impostazioni personalizzate Chroma Smooth non valide.";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "Impostazioni personalizzate spazio di colore non valide.";
 
 /* HBFilters -> invalid comb detect custom string description */
 "Invalid custom comb detect settings." = "Impostazioni personalizzate di rilevazione interlacciato non valide.";
@@ -250,6 +252,9 @@
 /* HBJob -> invalid name error description */
 "Invalid name" = "Nome non valido";
 
+/* HBJob -> invalid preset */
+"Invalid preset" = "Preset non valido";
+
 /* HBFilters -> invalid unsharp custom string description */
 "Invalid unsharp custom settings." = "Impostazioni personalizzate unsharp non valide.";
 
@@ -259,18 +264,12 @@
 /* HBFilters -> filter display name */
 "Lapsharp" = "Lapsharp";
 
-/* HBJob -> invalid lapsharp custom settings error recovery suggestion */
-"Lapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap" = "Lapsharp sintassi: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
-
 /* Video description */
 "Level: %@" = "Livello: %@";
 
 /* Audio description */
 "Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "Missaggio: %1$@, Frequenza di campionamento: %2$@, Frequenza dati: %3$d kbps";
 
-/* HBJob -> Format display name */
-"MKV File" = "MKV File";
-
 /* HBAudio -> Mixdown */
 "Mono" = "Mono";
 
@@ -280,18 +279,12 @@
 /* HBAudio -> Mixdown */
 "Mono (Right Only)" = "Mono (Solo destro)";
 
-/* HBJob -> Format display name */
-"MP4 File" = "MP4 File";
-
 /* HBStateFormatter -> pass display name */
 "Muxing…" = "Unisco…";
 
 /* HBFilters -> filter display name */
 "NLMeans" = "NLMeans";
 
-/* HBJob -> invalid name error recovery suggestion */
-"NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nDefault settings: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0" = "NLMeans sintassi: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nDefault settings: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0";
-
 /* HBVideo -> tune */
 "none" = "nessuna";
 
@@ -306,7 +299,7 @@
 "Off" = "Spento";
 
 /* Video description */
-"Options: %@" = "Opzioni:";
+"Options: %@" = "Opzioni: %@";
 
 /* HBStateFormatter -> work pass number format */
 "Pass %d %@ of %d, %.2f %%" = "Passaggio %1$d %2$@ di %3$d, %4$.2f %%";
@@ -338,9 +331,6 @@
 /* Range description */
 "Range:" = "Intervallo:";
 
-/* HBJob -> filters short description */
-"Rotation" = "Rotazione";
-
 /* HBVideo -> frame rates display name */
 "Same as source" = "Uguale alla sorgente";
 
@@ -380,11 +370,8 @@
 /* Subtitles description */
 "Subtitles:" = "Sottotitoli:";
 
-/* HBJob -> invalid comb detect custom settings error recovery suggestion */
-"Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16" = "Sintassi: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
-
-/* HBJob -> invalid detelecine custom settings error recovery suggestion */
-"Syntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0" = "Sintassi: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "Sintassi:";
 
 /* HBJob -> invalid name error recovery suggestion */
 "The file name can't be empty." = "Il nome del documento non può essere vuoto.";
@@ -395,6 +382,9 @@
 /* Preset -> import error description */
 "The preset \"%@\" could not be imported." = "Il preset \"%@\" non può essere importato.";
 
+/* Job preset -> invalid preset recovery suggestion */
+"The preset is not a valid, try to select a different one." = "Il preset non è valido, prova a selezionarne un altro.";
+
 /* Preset -> import error reason */
 "The selected preset is invalid." = "Il preset selezionato non è valido.";
 
@@ -417,9 +407,6 @@
 /* HBFilters -> filter display name */
 "Unsharp" = "Unsharp";
 
-/* HBJob -> invalid unsharp custom settings error recovery suggestion */
-"Unsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7" = "Unsharp sintatti: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7";
-
 /* HBJob -> video short description framerate */
 "VFR" = "VFR";
 
@@ -429,12 +416,6 @@
 /* Video description */
 "Video:" = "Video:";
 
-/* HBJob -> Format display name */
-"WebM File" = "WebM File";
-
 /* HBFilters -> filter display name */
 "Yadif" = "Yadif";
 
-/* HBJob -> invalid Yadif custom settings error recovery suggestion */
-"Yadif syntax: mode=m:parity=p\n\nYadif default: mode=3" = "Yadif sintatti: mode=m:parity=p\n\nYadif default: mode=3";
-

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/pt-BR.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/pt-BR.lproj/InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/pt-BR.lproj/Localizable.strings Added

@@ -0,0 +1,421 @@
+/* Video description */
+" - fastdecode" = " - fastdecode";
+
+/* HBStateFormatter -> work time format */
+" (%.2f fps, avg %.2f fps, ETA %@)" = " (%1$.2f fps, avg %2$.2f fps, ETA %3$@)";
+
+/* HBStateFormatter -> search time format
+   HBStateFormatter -> work time format */
+" (ETA %@)" = " (ETA %@)";
+
+/* HBJob -> video short description framerate */
+" FPS CFR" = " FPS CFR";
+
+/* HBJob -> video short description framerate */
+" FPS PFR" = " FPS PFR";
+
+/* Title short description -> audio format */
+", %d audio tracks" = ", %d faixas de áudio";
+
+/* Title short description -> subtitles format */
+", %d subtitles tracks" = ", %d faixas de legendas";
+
+/* Title short description -> audio format */
+", 1 audio track" = ", 1 faixa de áudio";
+
+/* Title short description -> subtitles format */
+", 1 subtitles track" = ", 1 legen";
+
+/* Format description */
+", Align A/V Start" = ", Alinhar Começo do A/V";
+
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = ", Borda: %1$d/%2$d/%3$d/%4$d";
+
+/* HBJob -> subtitles short description */
+", Burned" = ", Queimado";
+
+/* Format description */
+", Chapter Markers" = ", Marcadores de Capítulos";
+
+/* HBPicture -> summary */
+", Crop: %@ %d/%d/%d/%d" = ", Corte: %1$@ %2$d/%3$d/%4$d/%5$d";
+
+/* Format description */
+", iPod 5G Support" = ", Compatível com iPod 5G";
+
+/* Format description */
+", Web Optimized" = ", Otimizado para Web";
+
+/* HBStateFormatter -> work pass type format */
+"(subtitle scan)" = "(escanear legendas)";
+
+/* Title short description -> video format */
+"%.6g FPS" = "%.6g FPS";
+
+/* Audio description */
+"%@ ▸ Encoder: %@" = "%1$@ ▸ Codificador: %2$@";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d" = "%1$@Saída: %2$dx%3$d";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@Saída: %2$dx%3$d, Anamórfico: %4$dx%5$d Automático";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@Saída: %2$dx%3$d, Anamórfico: %4$dx%5$d Customizado";
+
+/* HBPicture -> short info */
+"%dx%d Storage, %dx%d Display" = "%1$dx%2$d Armazenamento, %3$dx%4$d Mostrar";
+
+/* HBJob -> audio short description */
+"+ %lu additional audio tracks" = "+ %lu faixas adicionais de áudio";
+
+/* HBJob -> subtitles short description */
+"+ %lu additional subtitles tracks" = "+ %lu faixas adicionais de legendas";
+
+/* HBJob -> audio short description */
+"+ 1 additional audio track" = "+ 1 faixa adicional de áudio";
+
+/* HBJob -> subtitles short description */
+"+ 1 additional subtitles track" = "+ 1 faixa adicional de legendas";
+
+/* Title description */
+"1 Foreign Language Search Pass - " = "1 Passe de pesquisa em língua estrangeira -";
+
+/* Title description */
+"2 Video Passes" = "2 Passes de Vídeo";
+
+/* Title description */
+"2 Video Passes First Turbo" = "2 Vídeo Passe Primeiro Turbo";
+
+/* HBAudio -> Mixdown */
+"5.1 Channels" = "Canais 5.1";
+
+/* HBAudio -> Mixdown */
+"6.1 Channels" = "Canais 6.1";
+
+/* HBAudio -> Mixdown */
+"7.1 (5F/2R/LFE)" = "7.1 (5F/2R/LFE)";
+
+/* HBAudio -> Mixdown */
+"7.1 Channels" = "Canais 7.1";
+
+/* Audio description */
+"Audio:" = "Áudio:";
+
+/* HBPicture -> summary */
+"Automatic" = "Automático";
+
+/* Video description */
+"Bitrate: %d kbps" = "Bitrate: %d kbps";
+
+/* Subtitles description */
+"Burned In" = "Queimado Em";
+
+/* Title -> chapter name
+   Title description */
+"Chapter %d" = "Capítulo %d";
+
+/* HBJob -> chapters short description */
+"Chapter Markers" = "Marcadores de Capítulos";
+
+/* HBRange -> display name */
+"Chapters" = "Capítulos";
+
+/* Title description */
+"Chapters %d through %d" = "Capítulos %1$d até %2$d";
+
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "Suavização do croma";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "Espaço de cor";
+
+/* HBJob -> filters short description */
+"Comb Detect" = "Detecção de Pente";
+
+/* Video description */
+"Constant Quality: %.2f %s" = "Qualidade constante: %1$.2f %2$s";
+
+/* HBJob -> video short description framerate */
+"CRF" = "CRF";
+
+/* HBFilters -> custom display name
+   HBPicture -> summary */
+"Custom" = "Personalizado";
+
+/* Filters description
+   HBJob -> filters short description */
+"Deblock" = "Deblock";
+
+/* HBFilters -> filter display name */
+"Decomb" = "Decomb";
+
+/* Subtitles description */
+"Default" = "Padrão";
+
+/* Video description */
+"default settings" = "%s: Não pôde carregar as configurações abaixo. Valores padrão serão utilizados.\n\n%s";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "Padrão:";
+
+/* Filters description */
+"Denoise" = "Denoise";
+
+/* Destination description */
+"Destination:" = "Destino:";
+
+/* Dimensions description
+   HBJob -> filters short description */
+"Detelecine" = "Detelecina";
+
+/* Dimensions description */
+"Dimensions:" = "Dimensões:";
+
+/* HBAudio -> Mixdown */
+"Dolby Pro Logic II" = "Dolby Pro Logic II";
+
+/* HBAudio -> Mixdown */
+"Dolby Surround" = "Dolby Surround";
+
+/* Audio description */
+"DRC: %.2f" = "RDC: %.2f";
+
+/* Video description */
+"Encoder: %@, " = "Codificador de áudio.";
+
+/* HBStateFormatter -> work pass display name */
+"Encoding %@ " = "Codificação:";
+
+/* Filters description */
+"Filters:" = "Filtros:";
+
+/* Subtitles description */
+"Forced Only" = "Somente forçado";
+
+/* HBSubtitles -> search pass name */
+"Foreign Audio Search" = "Adicionar Pesquisa de Áudio Estrangeira";
+
+/* Format description */
+"Format:" = "Formato:";
+
+/* Video description */
+"Framerate: " = "Taxa de imagens:";
+
+/* HBRange -> display name */
+"Frames" = "Tempo de início em frames";
+
+/* Title description */
+"Frames %d through %d" = "Quadros %1$d através de %2$d";
+
+/* Audio description */
+"Gain: %.2f" = "Ganho: %.2f";
+
+/* Filters description
+   HBJob -> filters short description */
+"Grayscale" = "Escala de cinzas";
+
+/* HBFilters -> filter display name */
+"HQDN3D" = "HQDN3D";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "As configurações personalizadas da suavização do croma são inválidas.";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "As configurações personalizadas do espaço de cor são inválidas.";
+
+/* HBFilters -> invalid comb detect custom string description */
+"Invalid custom comb detect settings." = "Configurações inválidas de detecção de pentes personalizados.";
+
+/* HBFilters -> invalid detelecine custom string description */
+"Invalid custom detelecine settings." = "Configurações detelecina personalizadas inválidas.";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom HQDN3D settings" = "Configurações hqdn3D personalizadas inválidas";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom NLMeans settings" = "Configurações nlmeans personalizadas inválidas";
+
+/* HBFilters -> invalid deblock custom string description */
+"Invalid deblock custom settings." = "Configurações personalizadas de desbloco inválidas.";
+
+/* HBFilters -> invalid Decomb custom string description */
+"Invalid Decomb custom settings." = "Configurações personalizadas inválidas do Decomb.";
+
+/* HBFilters -> invalid lapsharp custom string description */
+"Invalid lapsharp custom settings." = "Configurações personalizadas inválidas do lapsharp.";
+
+/* HBJob -> invalid name error description */
+"Invalid name" = "Nome inválido";
+
+/* HBJob -> invalid preset */
+"Invalid preset" = "Predefinição inválida";
+
+/* HBFilters -> invalid unsharp custom string description */
+"Invalid unsharp custom settings." = "Configurações personalizadas inválidas desharp.";
+
+/* HBFilters -> invalid Yadif custom string description */
+"Invalid Yadif custom settings." = "Configurações personalizadas inválidas do Yadif.";
+
+/* HBFilters -> filter display name */
+"Lapsharp" = "Lapsharp";
+
+/* Video description */
+"Level: %@" = "Nível:";
+
+/* Audio description */
+"Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "Mixdown: %1$@, Samplerate: %2$@, Bitrate: %3$d kbps";
+
+/* HBAudio -> Mixdown */
+"Mono" = "Mono";
+
+/* HBAudio -> Mixdown */
+"Mono (Left Only)" = "Mono (somente à esquerda)";
+
+/* HBAudio -> Mixdown */
+"Mono (Right Only)" = "Mono (somente à direita)";
+
+/* HBStateFormatter -> pass display name */
+"Muxing…" = "Muxing...";
+
+/* HBFilters -> filter display name */
+"NLMeans" = "NLMeans";
+
+/* HBVideo -> tune */
+"none" = "nenhum";
+
+/* HBAudio -> Mixdown
+   HBAudio -> none track name
+   HBJob -> filters short description
+   HBSubtitles -> none track name */
+"None" = "Nenhum";
+
+/* HBFilters -> filter display name
+   HBFilters -> off display name */
+"Off" = "Desligado";
+
+/* Video description */
+"Options: %@" = "Opções...";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d %@ of %d, %.2f %%" = "Passe %1$d %2$@ de %3$d, %4$.2f %%";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d of %d, %.2f %%" = "Passe %1$d de %2$d, %3$.2f %%";
+
+/* HBStateFormatter -> work first pass number format */
+"Pass 1" = "Passe 1";
+
+/* HBStateFormatter -> pass display name */
+"Paused" = "Pausado";
+
+/* Video description */
+"Peak %@ (constant frame rate)" = "Pico %@ (taxa constante de quadros)";
+
+/* Video description */
+"Peak %@ (may be lower)" = "Pico %@ (pode ser menor)";
+
+/* Preset description */
+"Preset:" = "Predefinição:";
+
+/* Video description */
+"Preset: %@" = "Sem perfil";
+
+/* Video description */
+"Profile: %@" = "Perfil:";
+
+/* Range description */
+"Range:" = "Intervalo:";
+
+/* HBVideo -> frame rates display name */
+"Same as source" = "Igual a origem";
+
+/* Video description */
+"Same as source (constant)" = "O mesmo que a fonte (constante)";
+
+/* Video description */
+"Same as source (variable)" = "O mesmo que a fonte (variável)";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d, preview %d…" = "Título de digitalização %1$d de %2$d, pré-visualização %3$d...";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d…" = "Título de digitalização %1$d de %2$d...";
+
+/* HBStateFormatter -> search pass display name */
+"Searching for start point:  %.2f %%" = "Em busca de ponto de partida: %.2f %%";
+
+/* HBRange -> display name */
+"Seconds" = "Segundos";
+
+/* Title description */
+"Seconds %d through %d" = "Segundos %1$d através de %2$d";
+
+/* Filters description */
+"Sharpen" = "Afiar";
+
+/* Source description */
+"Source:" = "Fonte:";
+
+/* HBPicture -> short info */
+"Source: %dx%d, " = "Fonte: %1$dx%2$d, ";
+
+/* HBAudio -> Mixdown */
+"Stereo" = "Estéreo";
+
+/* Subtitles description */
+"Subtitles:" = "Legendas:";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "Sintaxe:";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't be empty." = "O nome do arquivo não pode ser vazio.";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't contain the / character." = "O nome do arquivo não pode conter o caracter /.";
+
+/* Preset -> import error description */
+"The preset \"%@\" could not be imported." = "A pré-definição \"%@\" não pôde ser importada.";
+
+/* Job preset -> invalid preset recovery suggestion */
+"The preset is not a valid, try to select a different one." = "A predefinição não é válida, tente escolher uma outra.";
+
+/* Preset -> import error reason */
+"The selected preset is invalid." = "A predefinição selecionada é inválida.";
+
+/* Preset -> import error reason */
+"The selected preset was created with a newer version of HandBrake." = "A predefinição selecionada foi criada com uma versão mais recente do HandBrake.";
+
+/* Title description */
+"Title %d, %@" = "Título %1$d, %2$@";
+
+/* Title description */
+"Title %d, %@, %@" = "Título %1$d, %2$@, %3$@";
+
+/* Video description */
+"Tune: " = "Música:";
+
+/* HBJob -> video short description encoder name
+   Video description */
+"Unknown" = "Desconhecido";
+
+/* HBFilters -> filter display name */
+"Unsharp" = "Unsharp";
+
+/* HBJob -> video short description framerate */
+"VFR" = "VFR";
+
+/* Video description */
+"Video Options:" = "Opções do Vïdeo:";
+
+/* Video description */
+"Video:" = "Video:";
+
+/* HBFilters -> filter display name */
+"Yadif" = "Yadif";
+

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/ru.lproj/InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/zh.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/zh.lproj/InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeKit/zh.lproj/Localizable.strings Added

@@ -0,0 +1,421 @@
+/* Video description */
+" - fastdecode" = " - 快速解码";
+
+/* HBStateFormatter -> work time format */
+" (%.2f fps, avg %.2f fps, ETA %@)" = "（%1$.2f fps，平均 %2$.2f fps，预计完成时间 %3$@）";
+
+/* HBStateFormatter -> search time format
+   HBStateFormatter -> work time format */
+" (ETA %@)" = "（预计完成时间 %@）";
+
+/* HBJob -> video short description framerate */
+" FPS CFR" = " FPS CFR";
+
+/* HBJob -> video short description framerate */
+" FPS PFR" = " FPS PFR";
+
+/* Title short description -> audio format */
+", %d audio tracks" = "， %d 条音轨";
+
+/* Title short description -> subtitles format */
+", %d subtitles tracks" = "，%d 条字幕轨道";
+
+/* Title short description -> audio format */
+", 1 audio track" = "，1 条音轨";
+
+/* Title short description -> subtitles format */
+", 1 subtitles track" = "，1 条字幕轨道";
+
+/* Format description */
+", Align A/V Start" = ", 对齐音视频开头";
+
+/* HBPicture -> summary */
+", Border: %d/%d/%d/%d" = "，边框：%1$d/%2$d/%3$d/%4$d";
+
+/* HBJob -> subtitles short description */
+", Burned" = "，已烧入";
+
+/* Format description */
+", Chapter Markers" = "，章节标记";
+
+/* HBPicture -> summary */
+", Crop: %@ %d/%d/%d/%d" = "，裁剪：%1$@ %2$d/%3$d/%4$d/%5$d";
+
+/* Format description */
+", iPod 5G Support" = ", iPod 5G 支持";
+
+/* Format description */
+", Web Optimized" = "，Web 优化";
+
+/* HBStateFormatter -> work pass type format */
+"(subtitle scan)" = "（字幕扫描）";
+
+/* Title short description -> video format */
+"%.6g FPS" = "%.6g FPS";
+
+/* Audio description */
+"%@ ▸ Encoder: %@" = "%1$@ ▸ 编码器：%2$@";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d" = "%1$@输出：%2$dx%3$d";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Automatic" = "%1$@输出：%2$dx%3$d，变形：%4$dx%5$d 自动";
+
+/* HBPicture -> short info */
+"%@Output: %dx%d, Anamorphic: %dx%d Custom" = "%1$@输出：%2$dx%3$d，变形：%4$dx%5$d 自定义";
+
+/* HBPicture -> short info */
+"%dx%d Storage, %dx%d Display" = "%1$dx%2$d 存储，%3$dx%4$d 显示";
+
+/* HBJob -> audio short description */
+"+ %lu additional audio tracks" = "+ %lu 个额外的音轨";
+
+/* HBJob -> subtitles short description */
+"+ %lu additional subtitles tracks" = "+ %lu 个额外的字幕轨道";
+
+/* HBJob -> audio short description */
+"+ 1 additional audio track" = "+ 1 个额外的音轨";
+
+/* HBJob -> subtitles short description */
+"+ 1 additional subtitles track" = "+ 1 个额外的字幕轨道";
+
+/* Title description */
+"1 Foreign Language Search Pass - " = "1 外语搜索 Pass - ";
+
+/* Title description */
+"2 Video Passes" = "2 Video Passes";
+
+/* Title description */
+"2 Video Passes First Turbo" = "2 Video Passes 首次加速";
+
+/* HBAudio -> Mixdown */
+"5.1 Channels" = "5.1 声道";
+
+/* HBAudio -> Mixdown */
+"6.1 Channels" = "6.1 声道";
+
+/* HBAudio -> Mixdown */
+"7.1 (5F/2R/LFE)" = "7.1 (5F/2R/LFE)";
+
+/* HBAudio -> Mixdown */
+"7.1 Channels" = "7.1 声道";
+
+/* Audio description */
+"Audio:" = "音频：";
+
+/* HBPicture -> summary */
+"Automatic" = "自动";
+
+/* Video description */
+"Bitrate: %d kbps" = "比特率：%dkbps";
+
+/* Subtitles description */
+"Burned In" = "烧入";
+
+/* Title -> chapter name
+   Title description */
+"Chapter %d" = "章节 %d";
+
+/* HBJob -> chapters short description */
+"Chapter Markers" = "章节标记";
+
+/* HBRange -> display name */
+"Chapters" = "章节";
+
+/* Title description */
+"Chapters %d through %d" = "章节 %1$d 到 %2$d";
+
+/* Filters description
+   HBJob -> filters short description */
+"Chroma Smooth" = "色度平滑";
+
+/* Filters description
+   HBJob -> filters short description */
+"Colorspace" = "色彩空间";
+
+/* HBJob -> filters short description */
+"Comb Detect" = "梳状检测";
+
+/* Video description */
+"Constant Quality: %.2f %s" = "恒定质量：%1$.2f %2$s";
+
+/* HBJob -> video short description framerate */
+"CRF" = "CRF";
+
+/* HBFilters -> custom display name
+   HBPicture -> summary */
+"Custom" = "自定义";
+
+/* Filters description
+   HBJob -> filters short description */
+"Deblock" = "去块效应";
+
+/* HBFilters -> filter display name */
+"Decomb" = "去梳状纹理";
+
+/* Subtitles description */
+"Default" = "默认";
+
+/* Video description */
+"default settings" = "默认设置";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Default: " = "默认：";
+
+/* Filters description */
+"Denoise" = "降噪";
+
+/* Destination description */
+"Destination:" = "目标：";
+
+/* Dimensions description
+   HBJob -> filters short description */
+"Detelecine" = "反胶卷过带";
+
+/* Dimensions description */
+"Dimensions:" = "尺寸：";
+
+/* HBAudio -> Mixdown */
+"Dolby Pro Logic II" = "Dolby Pro Logic II";
+
+/* HBAudio -> Mixdown */
+"Dolby Surround" = "Dolby Surround";
+
+/* Audio description */
+"DRC: %.2f" = "DRC：%.2f";
+
+/* Video description */
+"Encoder: %@, " = "编码器：%@，";
+
+/* HBStateFormatter -> work pass display name */
+"Encoding %@ " = "正在编码 %@ ";
+
+/* Filters description */
+"Filters:" = "滤镜：";
+
+/* Subtitles description */
+"Forced Only" = "仅强制";
+
+/* HBSubtitles -> search pass name */
+"Foreign Audio Search" = "外语音频搜索";
+
+/* Format description */
+"Format:" = "格式:";
+
+/* Video description */
+"Framerate: " = "帧率：";
+
+/* HBRange -> display name */
+"Frames" = "帧";
+
+/* Title description */
+"Frames %d through %d" = "帧 %1$d 到 %2$d";
+
+/* Audio description */
+"Gain: %.2f" = "增益：%.2f";
+
+/* Filters description
+   HBJob -> filters short description */
+"Grayscale" = "灰度";
+
+/* HBFilters -> filter display name */
+"HQDN3D" = "HQDN3D";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid chroma smooth custom settings." = "无效的色度平滑自定义设置。";
+
+/* HBFilters -> invalid chroma smooth custom string description */
+"Invalid colorspace custom settings." = "无效的色彩空间自定义设置。";
+
+/* HBFilters -> invalid comb detect custom string description */
+"Invalid custom comb detect settings." = "无效的自定义疏状检测设置。";
+
+/* HBFilters -> invalid detelecine custom string description */
+"Invalid custom detelecine settings." = "无效的自定义反胶卷过带设置。";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom HQDN3D settings" = "无效的自定义 HQDN3D 设置";
+
+/* HBFilters -> invalid denoise custom string description */
+"Invalid custom NLMeans settings" = "无效的自定义 NLMeans 设置";
+
+/* HBFilters -> invalid deblock custom string description */
+"Invalid deblock custom settings." = "无效的去块效应自定义设置。";
+
+/* HBFilters -> invalid Decomb custom string description */
+"Invalid Decomb custom settings." = "无效的 Decomb 自定义设置。";
+
+/* HBFilters -> invalid lapsharp custom string description */
+"Invalid lapsharp custom settings." = "无效的 Lapsharp 自定义设置。";
+
+/* HBJob -> invalid name error description */
+"Invalid name" = "无效的名称";
+
+/* HBJob -> invalid preset */
+"Invalid preset" = "无效的预设";
+
+/* HBFilters -> invalid unsharp custom string description */
+"Invalid unsharp custom settings." = "无效的 Unsharp 自定义设置。";
+
+/* HBFilters -> invalid Yadif custom string description */
+"Invalid Yadif custom settings." = "无效的 Yadif 自定义设置。";
+
+/* HBFilters -> filter display name */
+"Lapsharp" = "Lapsharp";
+
+/* Video description */
+"Level: %@" = "级别：%@";
+
+/* Audio description */
+"Mixdown: %@, Samplerate: %@, Bitrate: %d kbps" = "混音：%1$@，采样率：%2$@，比特率：%3$d kbps";
+
+/* HBAudio -> Mixdown */
+"Mono" = "单声道";
+
+/* HBAudio -> Mixdown */
+"Mono (Left Only)" = "单声道（仅左声道）";
+
+/* HBAudio -> Mixdown */
+"Mono (Right Only)" = "单声道（仅右声道）";
+
+/* HBStateFormatter -> pass display name */
+"Muxing…" = "Muxing…";
+
+/* HBFilters -> filter display name */
+"NLMeans" = "NLMeans";
+
+/* HBVideo -> tune */
+"none" = "无";
+
+/* HBAudio -> Mixdown
+   HBAudio -> none track name
+   HBJob -> filters short description
+   HBSubtitles -> none track name */
+"None" = "无";
+
+/* HBFilters -> filter display name
+   HBFilters -> off display name */
+"Off" = "关";
+
+/* Video description */
+"Options: %@" = "选项：%@";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d %@ of %d, %.2f %%" = "步骤 %1$d %2$@ of %3$d，%4$.2f %%";
+
+/* HBStateFormatter -> work pass number format */
+"Pass %d of %d, %.2f %%" = "步骤 %1$d of %2$d，%3$.2f %%";
+
+/* HBStateFormatter -> work first pass number format */
+"Pass 1" = "步骤 1";
+
+/* HBStateFormatter -> pass display name */
+"Paused" = "已暂停";
+
+/* Video description */
+"Peak %@ (constant frame rate)" = "峰值 %@（恒定帧率）";
+
+/* Video description */
+"Peak %@ (may be lower)" = "峰值 %@（可能更低）";
+
+/* Preset description */
+"Preset:" = "预设：";
+
+/* Video description */
+"Preset: %@" = "预设：%@";
+
+/* Video description */
+"Profile: %@" = "配置文件：%@";
+
+/* Range description */
+"Range:" = "范围：";
+
+/* HBVideo -> frame rates display name */
+"Same as source" = "与源视频相同";
+
+/* Video description */
+"Same as source (constant)" = "与源视频相同（恒定）";
+
+/* Video description */
+"Same as source (variable)" = "与源视频相同（可变）";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d, preview %d…" = "正在扫描标题 %1$d/%2$d，预览 %3$d…";
+
+/* HBStateFormatter -> scan pass format */
+"Scanning title %d of %d…" = "正在扫描标题 %1$d/%2$d…";
+
+/* HBStateFormatter -> search pass display name */
+"Searching for start point:  %.2f %%" = "搜索起始点：%.2f %%";
+
+/* HBRange -> display name */
+"Seconds" = "秒";
+
+/* Title description */
+"Seconds %d through %d" = "秒 %1$d 到 %2$d";
+
+/* Filters description */
+"Sharpen" = "锐化";
+
+/* Source description */
+"Source:" = "源：";
+
+/* HBPicture -> short info */
+"Source: %dx%d, " = "源：%1$dx%2$d，";
+
+/* HBAudio -> Mixdown */
+"Stereo" = "立体声";
+
+/* Subtitles description */
+"Subtitles:" = "字幕：";
+
+/* HBFilters -> invalid filter custom settings error recovery suggestion */
+"Syntax: " = "语法：";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't be empty." = "文件名不能为空。";
+
+/* HBJob -> invalid name error recovery suggestion */
+"The file name can't contain the / character." = "文件名不能包含 / 字符。";
+
+/* Preset -> import error description */
+"The preset \"%@\" could not be imported." = "无法导入预设 “%@”。";
+
+/* Job preset -> invalid preset recovery suggestion */
+"The preset is not a valid, try to select a different one." = "该预设不是有效的，尝试选择一个不同的预设。";
+
+/* Preset -> import error reason */
+"The selected preset is invalid." = "所选预设是无效的。";
+
+/* Preset -> import error reason */
+"The selected preset was created with a newer version of HandBrake." = "所选的预设是用较新版本的 HandBrake 创建的。";
+
+/* Title description */
+"Title %d, %@" = "标题 %1$d，%2$@";
+
+/* Title description */
+"Title %d, %@, %@" = "标题 %1$d，%2$@，%3$@";
+
+/* Video description */
+"Tune: " = "调优：";
+
+/* HBJob -> video short description encoder name
+   Video description */
+"Unknown" = "未知";
+
+/* HBFilters -> filter display name */
+"Unsharp" = "Unsharp";
+
+/* HBJob -> video short description framerate */
+"VFR" = "VFR";
+
+/* Video description */
+"Video Options:" = "视频选项：";
+
+/* Video description */
+"Video:" = "视频：";
+
+/* HBFilters -> filter display name */
+"Yadif" = "Yadif";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKitTests/HBJobTests.m -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKitTests/HBJobTests.m Changed

@@ -7,14 +7,7 @@
 #import <Cocoa/Cocoa.h>
 #import <XCTest/XCTest.h>
 
-#import "HBCore.h"
-#import "HBTitle.h"
-#import "HBJob.h"
-#import "HBPicture.h"
-#import "HBJob+UIAdditions.h"
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
-#import "HBMutablePreset.h"
+@import HandBrakeKit;
 
 @interface HBJobTests : XCTestCase
 
@@ -56,7 +49,7 @@
 
 self.title = self.core.titles.firstObject;
 
- self.job = HBJob alloc initWithTitle:self.title andPreset:self.preset;
+ self.job = HBJob alloc initWithTitle:self.title preset:self.preset;
 self.job.outputURL = NSURL fileURLWithPath:@"/" isDirectory:YES;
 self.job.outputFileName = @"Dest.mp4";
 }
@@ -79,7 +72,7 @@
 
 XCTAssertNotNil(self.title);
 
- HBJob *job = HBJob alloc initWithTitle:self.title andPreset:preset;
+ HBJob *job = HBJob alloc initWithTitle:self.title preset:preset;
 
 XCTAssertNotNil(self.job);
 
@@ -101,7 +94,7 @@
 
 - (void)testAutoCrop
 {
- XCTAssertEqual(self.preset@"PictureAutoCrop" boolValue, self.job.picture.autocrop);
+ XCTAssertEqual(self.preset@"PictureAutoCrop" boolValue, self.job.picture.cropMode);
 }
 
 - (void)testAutoCropValues
@@ -119,8 +112,6 @@
 {
 HBMutablePreset *preset = self.preset mutableCopy;
 
- preset@"UsesPictureSettings" = @1;
-
 preset@"PictureWidth" = @720;
 preset@"PictureHeight" = @576;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKitTests/HBJobUndoTests.m -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKitTests/HBJobUndoTests.m Changed

@@ -6,15 +6,7 @@
 
 #import <XCTest/XCTest.h>
 
-#import "HBCore.h"
-#import "HBTitle.h"
-#import "HBJob.h"
-#import "HBChapter.h"
-#import "HBAudioTrack.h"
-#import "HBSubtitlesTrack.h"
-#import "HBPicture.h"
-#import "HBPresetsManager.h"
-#import "HBPreset.h"
+@import HandBrakeKit;
 
 @interface HBJobUndoTests : XCTestCase
 
@@ -57,7 +49,7 @@
 
 self.title = self.core.titles.firstObject;
 
- self.job = HBJob alloc initWithTitle:self.title andPreset:self.preset;
+ self.job = HBJob alloc initWithTitle:self.title preset:self.preset;
 self.job.outputURL = NSURL fileURLWithPath:@"/" isDirectory:YES;
 self.job.outputFileName = @"Dest.mp4";
 
@@ -73,7 +65,7 @@
 if (obj.isLeaf)
 {
 undoManager beginUndoGrouping;
- self.modifiedJob applyPreset:obj;
+ self.modifiedJob applyPreset:obj error:NULL;
 undoManager endUndoGrouping;
 }
 };
@@ -143,10 +135,10 @@
 XCTAssertEqual(self.job.picture.height, self.modifiedJob.picture.height);
 
 XCTAssertEqual(self.job.picture.displayWidth, self.modifiedJob.picture.displayWidth);
- XCTAssertEqual(self.job.picture.parWidth, self.modifiedJob.picture.parWidth);
- XCTAssertEqual(self.job.picture.parHeight, self.modifiedJob.picture.parHeight);
+ XCTAssertEqual(self.job.picture.parNum, self.modifiedJob.picture.parNum);
+ XCTAssertEqual(self.job.picture.parDen, self.modifiedJob.picture.parDen);
 
- XCTAssertEqual(self.job.picture.autocrop, self.modifiedJob.picture.autocrop);
+ XCTAssertEqual(self.job.picture.cropMode, self.modifiedJob.picture.cropMode);
 
 XCTAssertEqual(self.job.picture.cropTop, self.modifiedJob.picture.cropTop);
 XCTAssertEqual(self.job.picture.cropBottom, self.modifiedJob.picture.cropBottom);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeKitTests/HBPresetsTests.m -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeKitTests/HBPresetsTests.m Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeXPCService/HBRemoteCoreProtocol.h -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HBRemoteCoreProtocol.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService.m -> HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService.m Changed

@@ -57,7 +57,6 @@
 
     _core = HBCore alloc initWithLogLevel:level queue:_queue;
     _core.name = name;
-    _core.automaticallyPreventSleep = NO;
 
     // Completion handler
     void (^completionHandler)(HBCoreResult result) = ^(HBCoreResult result)
@@ -72,15 +71,12 @@
     self.core addObserver:self forKeyPath:@"state"
                    options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial
                    context:HandBrakeXPCServiceContext;
-
-    NSProcessInfo.processInfo disableAutomaticTermination:@"Core started";
 }
 
 - (void)tearDown
 {
     _core = nil;
     HBCore closeGlobal;
-    NSProcessInfo.processInfo enableSuddenTermination;
 }
 
 - (void)setLogLevel:(NSInteger)logLevel
@@ -106,6 +102,13 @@
     });
 }
 
+- (void)setAutomaticallyPreventSleep:(BOOL)automaticallyPreventSleep
+{
+    dispatch_sync(_queue, ^{
+        self.core.automaticallyPreventSleep = automaticallyPreventSleep;
+    });
+}
+
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
     if (context == HandBrakeXPCServiceContext)
@@ -118,6 +121,20 @@
     }
 }
 
+- (void)preventSleep
+{
+    dispatch_sync(_queue, ^{
+        self.core preventSleep;
+    });
+}
+
+- (void)allowSleep
+{
+    dispatch_sync(_queue, ^{
+        self.core allowSleep;
+    });
+}
+
 - (void)scanURL:(NSURL *)url titleIndex:(NSUInteger)index previews:(NSUInteger)previewsNum minDuration:(NSUInteger)seconds keepPreviews:(BOOL)keepPreviews withReply:(void (^)(HBCoreResult))reply
 {
     dispatch_sync(_queue, ^{

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService1.plist Changed

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService2.plist Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService3.plist Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/HandBrakeXPCService4.plist Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/co.lproj/Localizable.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/de.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/de.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/de.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/de.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/fr.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/fr.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/fr.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/fr.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/it.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/it.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/it.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/it.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/pt-BR.lproj/Localizable.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/ru.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/ru.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/ru.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/ru.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj/HandBrakeXPCService1-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj/HandBrakeXPCService2-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj/HandBrakeXPCService3-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj/HandBrakeXPCService4-InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/HandBrakeXPCService/zh.lproj/Localizable.strings Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/Info.plist.m4 -> HandBrake-1.5.1.tar.xz/macosx/Info.plist.m4 Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/NSArray+HBAdditions.h -> HandBrake-1.5.1.tar.xz/macosx/NSArray+HBAdditions.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/NSArray+HBAdditions.m -> HandBrake-1.5.1.tar.xz/macosx/NSArray+HBAdditions.m Changed

@@ -8,7 +8,7 @@
 
 @implementation NSArray (HBAdditions)
 
-- (BOOL)allSatisfy:(BOOL (^)(id object))block
+- (BOOL)HB_allSatisfy:(BOOL (^)(id object))block
 {
     for (id object in self)
     {
@@ -20,7 +20,19 @@
     return YES;
 }
 
-- (NSArray *)filteredArrayUsingBlock:(BOOL (^)(id object))block
+- (BOOL)HB_containsWhere:(BOOL (^)(id object))block
+{
+   for (id object in self)
+   {
+       if (block(object) == YES)
+       {
+           return YES;
+       }
+   }
+   return NO;
+}
+
+- (NSArray *)HB_filteredArrayUsingBlock:(BOOL (^)(id object))block
 {
     NSMutableArray *filteredArray = NSMutableArray array;
     for (id object in self)
@@ -33,7 +45,7 @@
     return filteredArray copy;
 }
 
-- (NSIndexSet *)indexesOfObjectsUsingBlock:(BOOL (^)(id object))block
+- (NSIndexSet *)HB_indexesOfObjectsUsingBlock:(BOOL (^)(id object))block
 {
     NSMutableIndexSet *indexes = NSMutableIndexSet indexSet;
     NSUInteger i = 0;
@@ -49,3 +61,39 @@
 }
 
 @end
+
+@implementation NSIndexSet (HBAdditions)
+
+- (NSIndexSet *)HB_unionWith:(NSIndexSet *)indexSet
+{
+    NSMutableIndexSet *result = self mutableCopy;
+    result addIndexes:indexSet;
+    return result;
+}
+
+- (NSIndexSet *)HB_intersectionWith:(NSIndexSet *)indexSet
+{
+    NSMutableIndexSet *result = self mutableCopy;
+    result addIndexes:indexSet;
+    result removeIndexes:self HB_symmetricDifferenceWith:indexSet;
+    return result;
+}
+
+- (NSIndexSet *)HB_relativeComplementIn:(NSIndexSet *)universe
+{
+    NSMutableIndexSet *complement = universe mutableCopy;
+    complement removeIndexes:self;
+    return complement;
+}
+
+- (NSIndexSet *)HB_symmetricDifferenceWith:(NSIndexSet *)indexSet
+{
+    NSMutableIndexSet *a = self mutableCopy;
+    NSMutableIndexSet *b = indexSet mutableCopy;
+    a removeIndexes:indexSet;
+    b removeIndexes:self;
+    a addIndexes:b;
+    return a;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.clang-format Added

@@ -0,0 +1,45 @@
+AccessModifierOffset: -4
+AlignEscapedNewlinesLeft: true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackParameters: true
+BreakBeforeBinaryOperators: true
+BreakBeforeBraces: Linux
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+ColumnLimit: 0
+CommentPragmas: '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: false
+#DerivePointerAlignment: false
+DisableFormat: false
+#ForEachMacros: foreach,Q_FOREACH
+IndentCaseLabels: true
+IndentFunctionDeclarationAfterType: true
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: false
+Language: Cpp
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: All
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+#PointerAlignment: Right
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+Standard: Cpp03
+TabWidth: 4
+UseTab: Never

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/ISSUE_TEMPLATE Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/ISSUE_TEMPLATE/fixes-and-enhancements.md Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/ISSUE_TEMPLATE/sparkle-doesn-t-work-in-my-app-new.md Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/ISSUE_TEMPLATE/sparkle-doesn-t-work-in-my-app-old.md Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/pull_request_template.md Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/workflows Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/workflows/ci.yml Added

@@ -0,0 +1,106 @@
+name: Build & Tests
+
+on:
+  push:
+    branches:  2.x, master 
+  pull_request:
+    branches:  2.x, master 
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        xcode: 'xcode14.1', 'xcode13.4.1'
+        include:
+            - xcode: 'xcode13.4.1'
+              xcode-path: '/Applications/Xcode_13.4.1.app/Contents/Developer'
+              upload-dist: true
+              run-analyzer: true
+              macos: 'macos-12'
+            - xcode: 'xcode14.1'
+              xcode-path: '/Applications/Xcode_14.1.app/Contents/Developer'
+              upload-dist: false
+              run-analyzer: false
+              macos: 'macos-12'
+            
+    name: Build and Test Sparkle
+    runs-on: ${{ matrix.macos }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+          fetch-depth: 0
+      - name: Build Unit Tests
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+          xcodebuild build-for-testing -project Sparkle.xcodeproj -scheme Distribution -enableCodeCoverage YES -derivedDataPath build
+      - name: Run Unit Tests
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+          xcodebuild test-without-building -project Sparkle.xcodeproj -scheme Distribution -enableCodeCoverage YES -derivedDataPath build
+      - name: Build UI Tests
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+          xcodebuild build-for-testing -project Sparkle.xcodeproj -scheme UITests -configuration Debug -derivedDataPath build
+      - name: Run UI Tests
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+          xcodebuild test-without-building -project Sparkle.xcodeproj -scheme UITests -configuration Debug -derivedDataPath build
+
+      - name: Analyze Sparkle
+        if: ${{ matrix.run-analyzer && github.event_name == 'pull_request' }}
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+            xcodebuild analyze -project Sparkle.xcodeproj -quiet -scheme Sparkle -configuration Release -derivedDataPath analyze > anaylze_output.txt
+            
+      - name: Find Analyzed Warnings
+        if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' }}
+        id: findwarnings
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+            if grep -q "warning:" anaylze_output.txt; then
+                echo '::set-output name=analyzestatus::0'
+            else
+                echo '::set-output name=analyzestatus::1'
+            fi
+        
+      - name: Extract Analyzed Warnings
+        if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
+        id: warnings
+        run: |
+            echo ::set-output name=content::$(cat anaylze_output.txt)
+      
+      - name: Post Analyzed Warnings
+        if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
+        uses: mshick/add-pr-comment@v1
+        with:
+            allow-repeats: false
+            repo-token: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
+            repo-token-user-login: 'Sparkle-Bot'
+            message: "``` ${{ steps.warnings.outputs.content }} ```"
+        
+      - name: Build Release Distribution
+        env:
+          DEVELOPER_DIR: ${{ matrix.xcode-path }}
+        run: |
+          xcodebuild build -project Sparkle.xcodeproj -scheme Distribution -configuration Release -derivedDataPath build
+      - name: Archive Test Results
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-logs
+          path: build/Logs
+      - name: Upload Distribution
+        if: ${{ success() && matrix.upload-dist }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: Sparkle-distribution-${{ matrix.xcode }}.tar.xz
+          path: build/Build/Products/Release/sparkle-dist.tar.xz

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.github/workflows/create-draft-release.yml Added

@@ -0,0 +1,101 @@
+name: "Create Draft Release"
+
+env:
+ BUILDDIR: "build"
+ DEVELOPER_DIR: "/Applications/Xcode_13.4.1.app/Contents/Developer"
+
+on:
+ workflow_dispatch:
+ inputs:
+ marketingVersion:
+ description: "Marketing Version"
+ required: true
+ default: ""
+ 
+ prereleaseSuffix:
+ description: "Pre-release Suffix"
+ required: false
+ default: ""
+ 
+ buildVersion:
+ description: "Product Build"
+ required: true
+ default: ""
+
+concurrency: 
+ group: publish-release-${{ github.ref }}
+ cancel-in-progress: true
+
+jobs:
+ release:
+ name: "Publish binaries for release"
+ runs-on: macos-12
+
+ steps:
+ - name: "Checkout sources"
+ uses: actions/checkout@v3
+ with:
+ token: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
+ submodules: true
+ fetch-depth: 0
+ 
+ - name: "Extract latest changes from CHANGELOG"
+ run: |
+ ./Configurations/generate_latest_changes.py > latest-changes.txt
+ 
+ - name: "Overwrite project versions in project"
+ run: |
+ IFS='.' read major minor patch <<< "${{ github.event.inputs.marketingVersion }}"
+ sed -E -i '' "s/SPARKLE_VERSION_MAJOR =.+/SPARKLE_VERSION_MAJOR = $major/g" ./Configurations/ConfigCommon.xcconfig
+ sed -E -i '' "s/SPARKLE_VERSION_MINOR =.+/SPARKLE_VERSION_MINOR = $minor/g" ./Configurations/ConfigCommon.xcconfig
+ sed -E -i '' "s/SPARKLE_VERSION_PATCH =.+/SPARKLE_VERSION_PATCH = $patch/g" ./Configurations/ConfigCommon.xcconfig
+ 
+ if ! -z "${{ github.event.inputs.prereleaseSuffix }}" ; then
+ sed -E -i '' "s/SPARKLE_VERSION_SUFFIX =.*/SPARKLE_VERSION_SUFFIX = ${{ github.event.inputs.prereleaseSuffix }}/g" ./Configurations/ConfigCommon.xcconfig
+ else
+ sed -E -i '' "s/SPARKLE_VERSION_SUFFIX =.*/SPARKLE_VERSION_SUFFIX =/g" ./Configurations/ConfigCommon.xcconfig
+ fi
+ 
+ sed -E -i '' "s/CURRENT_PROJECT_VERSION =.+/CURRENT_PROJECT_VERSION = ${{ github.event.inputs.buildVersion }}/g" ./Configurations/ConfigCommon.xcconfig
+ git add ./Configurations/ConfigCommon.xcconfig
+
+ - name: "Determine if this is a pre-release version"
+ run: |
+ if ! -z "${{ github.event.inputs.prereleaseSuffix }}" ; then
+ echo "PRERELEASE_VERSION=true" >> $GITHUB_ENV
+ else
+ echo "PRERELEASE_VERSION=false" >> $GITHUB_ENV
+ fi
+
+ - name: "Set up git and create tag"
+ run: |
+ git config user.name Sparkle-Bot
+ git config user.email sparkle.project.bot@gmail.com
+ git tag "${{ github.event.inputs.marketingVersion }}${{ github.event.inputs.prereleaseSuffix }}"
+
+ - name: "Build release distribution"
+ run: make release
+ env:
+ GITHUB_ACTOR: ${{ github.actor }}
+ GITHUB_REPOSITORY: ${{ github.repository }}
+ GITHUB_TOKEN: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
+
+ - name: "Push the updated package description"
+ env:
+ GITHUB_TOKEN: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
+ run: git push
+
+ - name: "Draft a release"
+ uses: softprops/action-gh-release@v1
+ with:
+ draft: true
+ prerelease: ${{ env.PRERELEASE_VERSION }}
+ target_commitish: ${{ github.ref_name }}
+ name: "${{ github.event.inputs.marketingVersion }}${{ github.event.inputs.prereleaseSuffix }}"
+ tag_name: "${{ github.event.inputs.marketingVersion }}${{ github.event.inputs.prereleaseSuffix }}"
+ fail_on_unmatched_files: true
+ token: ${{ secrets.BOT_PERSONAL_ACCESS_TOKEN }}
+ body_path: latest-changes.txt
+ files: |
+ build/Build/Products/Release/Sparkle-*.tar.xz
+ build/Build/Products/Release/Sparkle-for-Swift-Package-Manager.zip

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.gitignore Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.gitmodules Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/.swiftlint.yml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/AgentConnection.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/AgentConnection.m Added

@@ -0,0 +1,118 @@
+//
+// AgentConnection.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/17/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "AgentConnection.h"
+#import "SPUMessageTypes.h"
+#import "SPUInstallerAgentProtocol.h"
+#import "SUInstallerAgentInitiationProtocol.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface AgentConnection () <NSXPCListenerDelegate, SUInstallerAgentInitiationProtocol>
+
+@property (nonatomic) NSXPCListener *xpcListener;
+@property (nonatomic, nullable) NSXPCConnection *activeConnection;
+@property (nonatomic, nullable) id<SPUInstallerAgentProtocol> agent;
+@property (nonatomic, weak) id<AgentConnectionDelegate> delegate;
+@property (nonatomic) BOOL connected;
+
+@end
+
+@implementation AgentConnection
+
+@synthesize xpcListener = _xpcListener;
+@synthesize activeConnection = _activeConnection;
+@synthesize agent = _agent;
+@synthesize delegate = _delegate;
+@synthesize connected = _connected;
+@synthesize invalidationError = _invalidationError;
+
+- (instancetype)initWithHostBundleIdentifier:(NSString *)bundleIdentifier delegate:(id<AgentConnectionDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ // Agents should always be the one that connect to daemons due to how mach bootstraps work
+ // For this reason, we are the ones that are creating a listener, not the agent
+ _xpcListener = NSXPCListener alloc initWithMachServiceName:SPUProgressAgentServiceNameForBundleIdentifier(bundleIdentifier);
+ _xpcListener.delegate = self;
+ _delegate = delegate;
+ }
+ return self;
+}
+
+- (void)startListener
+{
+ self.xpcListener resume;
+}
+
+- (void)invalidate
+{
+ self.delegate = nil;
+ 
+ self.activeConnection invalidate;
+ self.activeConnection = nil;
+ 
+ self.xpcListener invalidate;
+ self.xpcListener = nil;
+}
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
+{
+ if (self.activeConnection != nil) {
+ newConnection invalidate;
+ return NO;
+ }
+ 
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerAgentInitiationProtocol);
+ newConnection.exportedObject = self;
+ 
+ newConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol);
+ 
+ self.activeConnection = newConnection;
+ 
+ __weak AgentConnection *weakSelf = self;
+ newConnection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.activeConnection invalidate;
+ });
+ };
+ 
+ newConnection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.delegate agentConnectionDidInvalidate;
+ });
+ };
+ 
+ newConnection resume;
+ 
+ self.agent = newConnection.remoteObjectProxy;
+ 
+ return YES;
+}
+
+- (void)connectionDidInitiateWithReply:(void (^)(void))acknowledgement
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.connected = YES;
+ 
+ self.delegate agentConnectionDidInitiate;
+ self.delegate = nil;
+ });
+ 
+ acknowledgement();
+}
+
+- (void)connectionWillInvalidateWithError:(NSError *)error
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.invalidationError = error;
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/AppInstaller.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/AppInstaller.m Added

@@ -0,0 +1,642 @@
+//
+// AppInstaller.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/7/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "AppInstaller.h"
+#import "TerminationListener.h"
+#import "SUInstaller.h"
+#import "SUUpdateValidator.h"
+#import "SULog.h"
+#import "SULog+NSError.h"
+#import "SUHost.h"
+#import "SULocalizations.h"
+#import "SUStandardVersionComparator.h"
+#import "SPUMessageTypes.h"
+#import "SPUSecureCoding.h"
+#import "SPUInstallationInputData.h"
+#import "SUUnarchiver.h"
+#import "SUFileManager.h"
+#import "SPUInstallationInfo.h"
+#import "SUAppcastItem.h"
+#import "SUErrors.h"
+#import "SUInstallerCommunicationProtocol.h"
+#import "AgentConnection.h"
+#import "SPUInstallerAgentProtocol.h"
+#import "SPUInstallationType.h"
+#import "SPULocalCacheDirectory.h"
+
+
+#include "AppKitPrevention.h"
+
+#define FIRST_UPDATER_MESSAGE_TIMEOUT 18ull
+#define RETRIEVE_PROCESS_IDENTIFIER_TIMEOUT 8ull
+
+/**
+ * Show display progress UI after a delay from starting the final part of the installation.
+ * This should be long enough so that we don't show progress for very fast installations, but
+ * short enough so that we don't leave the user wondering why nothing is happening.
+ */
+static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
+
+@interface AppInstaller () <NSXPCListenerDelegate, SUInstallerCommunicationProtocol, AgentConnectionDelegate>
+
+@property (nonatomic) NSXPCListener* xpcListener;
+@property (nonatomic) NSXPCConnection *activeConnection;
+@property (nonatomic) id<SUInstallerCommunicationProtocol> communicator;
+@property (nonatomic) AgentConnection *agentConnection;
+@property (nonatomic) BOOL receivedUpdaterPong;
+
+@property (nonatomic, strong) TerminationListener *terminationListener;
+
+@property (nonatomic) SUUpdateValidator *updateValidator;
+
+@property (nonatomic, readonly, copy) NSString *hostBundleIdentifier;
+@property (nonatomic, readonly) NSString *homeDirectory;
+@property (nonatomic, readonly) NSString *userName;
+@property (nonatomic) SUHost *host;
+@property (nonatomic, copy) NSString *updateDirectoryPath;
+@property (nonatomic, copy) NSString *downloadName;
+@property (nonatomic, copy) NSString *decryptionPassword;
+@property (nonatomic, strong) SUSignatures *signatures;
+@property (nonatomic, copy) NSString *relaunchPath;
+@property (nonatomic, copy) NSString *installationType;
+@property (nonatomic, assign) BOOL shouldRelaunch;
+@property (nonatomic, assign) BOOL shouldShowUI;
+
+@property (nonatomic) id<SUInstallerProtocol> installer;
+@property (nonatomic) BOOL willCompleteInstallation;
+@property (nonatomic) BOOL receivedInstallationData;
+@property (nonatomic) BOOL finishedValidation;
+@property (nonatomic) BOOL agentInitiatedConnection;
+
+@property (nonatomic) dispatch_queue_t installerQueue;
+@property (nonatomic) BOOL performedStage1Installation;
+@property (nonatomic) BOOL performedStage2Installation;
+@property (nonatomic) BOOL performedStage3Installation;
+
+@end
+
+@implementation AppInstaller
+
+@synthesize xpcListener = _xpcListener;
+@synthesize activeConnection = _activeConnection;
+@synthesize communicator = _communicator;
+@synthesize agentConnection = _agentConnection;
+@synthesize receivedUpdaterPong = _receivedUpdaterPong;
+@synthesize hostBundleIdentifier = _hostBundleIdentifier;
+@synthesize homeDirectory = _homeDirectory;
+@synthesize userName = _userName;
+@synthesize terminationListener = _terminationListener;
+@synthesize updateValidator = _updateValidator;
+@synthesize host = _host;
+@synthesize updateDirectoryPath = _updateDirectoryPath;
+@synthesize downloadName = _downloadName;
+@synthesize decryptionPassword = _decryptionPassword;
+@synthesize signatures = _signatures;
+@synthesize relaunchPath = _relaunchPath;
+@synthesize installationType = _installationType;
+@synthesize shouldRelaunch = _shouldRelaunch;
+@synthesize shouldShowUI = _shouldShowUI;
+@synthesize installer = _installer;
+@synthesize willCompleteInstallation = _willCompleteInstallation;
+@synthesize receivedInstallationData = _receivedInstallationData;
+@synthesize installerQueue = _installerQueue;
+@synthesize performedStage1Installation = _performedStage1Installation;
+@synthesize performedStage2Installation = _performedStage2Installation;
+@synthesize performedStage3Installation = _performedStage3Installation;
+@synthesize finishedValidation = _finishedValidation;
+@synthesize agentInitiatedConnection = _agentInitiatedConnection;
+
+- (instancetype)initWithHostBundleIdentifier:(NSString *)hostBundleIdentifier homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName
+{
+ if (!(self = super init)) {
+ return nil;
+ }
+ 
+ _hostBundleIdentifier = hostBundleIdentifier copy;
+ 
+ _homeDirectory = homeDirectory copy;
+ _userName = userName copy;
+ 
+ _xpcListener = NSXPCListener alloc initWithMachServiceName:SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
+ _xpcListener.delegate = self;
+ 
+ _agentConnection = AgentConnection alloc initWithHostBundleIdentifier:hostBundleIdentifier delegate:self;
+ 
+ return self;
+}
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
+{
+ if (self.activeConnection != nil) {
+ SULog(SULogLevelDefault, @"Rejecting multiple connections...");
+ newConnection invalidate;
+ return NO;
+ }
+ 
+ self.activeConnection = newConnection;
+ 
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ newConnection.exportedObject = self;
+ 
+ newConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ 
+ __weak AppInstaller *weakSelf = self;
+ newConnection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.activeConnection invalidate;
+ });
+ };
+ 
+ newConnection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ AppInstaller *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ if (strongSelf.activeConnection != nil && !strongSelf.willCompleteInstallation) {
+ strongSelf cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Invalidation on remote port being called, and installation is not close enough to completion!" };
+ }
+ strongSelf.communicator = nil;
+ strongSelf.activeConnection = nil;
+ }
+ });
+ };
+ 
+ newConnection resume;
+ 
+ self.communicator = newConnection.remoteObjectProxy;
+ 
+ return YES;
+}
+
+- (void)start
+{
+ self.xpcListener resume;
+ self.agentConnection startListener;
+ 
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(FIRST_UPDATER_MESSAGE_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (!self.receivedInstallationData) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Timeout: installation data was never received" };
+ }
+ 
+ if (!self.agentConnection.connected) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Timeout: agent connection was never initiated" };
+ }
+ });
+}
+
+- (void)extractAndInstallUpdate
+{
+ self.communicator handleMessageWithIdentifier:SPUExtractionStarted data:NSData data;
+ 
+ NSString *archivePath = self.updateDirectoryPath stringByAppendingPathComponent:self.downloadName;
+ id<SUUnarchiverProtocol> unarchiver = SUUnarchiver unarchiverForPath:archivePath updatingHostBundlePath:self.host.bundlePath decryptionPassword:self.decryptionPassword expectingInstallationType:self.installationType;
+ 
+ NSError *unarchiverError = nil;
+ BOOL success = NO;
+ if (!unarchiver) {
+ unarchiverError = NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"No valid unarchiver was found for %@", archivePath };
+ 
+ success = NO;
+ } else {
+ self.updateValidator = SUUpdateValidator alloc initWithDownloadPath:archivePath signatures:self.signatures host:self.host;
+
+ // Delta & package updates will require validation before extraction
+ // Normal application updates are a bit more lenient allowing developers to change one of apple dev ID or EdDSA keys
+ BOOL needsPrevalidation = unarchiver class mustValidateBeforeExtraction || !self.installationType isEqualToString:SPUInstallationTypeApplication;
+
+ if (needsPrevalidation) {
+ success = self.updateValidator validateDownloadPathWithError:&unarchiverError;
+ } else {
+ success = YES;
+ }
+ }
+ 
+ if (!success) {
+ self unarchiverDidFailWithError:unarchiverError;
+ } else {
+ unarchiver
+ unarchiveWithCompletionBlock:^(NSError * _Nullable error) {
+ if (error != nil) {
+ self unarchiverDidFailWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to unarchive %@", archivePath, NSUnderlyingErrorKey: (NSError * _Nonnull)error };
+ } else {
+ self.communicator handleMessageWithIdentifier:SPUValidationStarted data:NSData data;
+ 
+ NSError *validationError = nil;
+ BOOL validationSuccess = self.updateValidator validateWithUpdateDirectory:self.updateDirectoryPath error:&validationError;
+ 
+ if (!validationSuccess) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Update validation was a failure", NSUnderlyingErrorKey: validationError };
+ } else {
+ self.communicator handleMessageWithIdentifier:SPUInstallationStartedStage1 data:NSData data;
+ 
+ self.finishedValidation = YES;
+ if (self.agentInitiatedConnection) {
+ self retrieveProcessIdentifierAndStartInstallation;
+ }
+ }
+ }
+ }
+ progressBlock:^(double progress) {
+ if (sizeof(progress) == sizeof(uint64_t)) {
+ uint64_t progressValue = CFSwapInt64HostToLittle(*(uint64_t *)&progress);
+ NSData *data = NSData dataWithBytes:&progressValue length:sizeof(progressValue);
+ 
+ self.communicator handleMessageWithIdentifier:SPUExtractedArchiveWithProgress data:data;
+ }
+ };
+ }
+}
+
+- (void)clearUpdateDirectory
+{
+ if (self.updateDirectoryPath != nil) {
+ NSError *theError = nil;
+ if (!SUFileManager alloc init removeItemAtURL:NSURL fileURLWithPath:self.updateDirectoryPath error:&theError) {
+ SULog(SULogLevelError, @"Couldn't remove update folder: %@.", theError);
+ }
+ self.updateDirectoryPath = nil;
+ }
+}
+
+- (void)unarchiverDidFailWithError:(NSError *)error
+{
+ SULog(SULogLevelError, @"Failed to unarchive file");
+ SULogError(error);
+ 
+ // No longer need update validator until next possible extraction (eg: if initial delta update fails)
+ self.updateValidator = nil;
+ 
+ // Client could try update again with different inputs
+ // Eg: one common case is if a delta update fails, client may want to fall back to regular update
+ // We really only need to set updateDirectoryPath to nil since that's the field we check if we've received installation data,
+ // but may as well set other fields to nil too
+ self clearUpdateDirectory;
+ self.downloadName = nil;
+ self.decryptionPassword = nil;
+ self.signatures = nil;
+ self.relaunchPath = nil;
+ self.host = nil;
+ 
+ NSData *archivedError = SPUArchiveRootObjectSecurely(error);
+ self.communicator handleMessageWithIdentifier:SPUArchiveExtractionFailed data:archivedError != nil ? archivedError : NSData data;
+}
+
+- (void)agentConnectionDidInitiate
+{
+ self.agentInitiatedConnection = YES;
+ if (self.finishedValidation) {
+ self retrieveProcessIdentifierAndStartInstallation;
+ }
+}
+
+- (void)agentConnectionDidInvalidate
+{
+ if (!self.finishedValidation || !self.agentInitiatedConnection) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: @"Error: Agent connection invalidated before installation began" };
+ 
+ NSError *agentError = self.agentConnection.invalidationError;
+ if (agentError != nil) {
+ userInfoNSUnderlyingErrorKey = agentError;
+ }
+ 
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:userInfo;
+ }
+}
+
+- (void)retrieveProcessIdentifierAndStartInstallation
+{
+ // We use the relaunch path for the bundle to listen for termination instead of the host path
+ // For a plug-in this makes a big difference; we want to wait until the app hosting the plug-in terminates
+ // Otherwise for an app, the relaunch path and host path should be identical
+ 
+ self.agentConnection.agent registerApplicationBundlePath:self.relaunchPath reply:^(NSNumber * _Nullable processIdentifier) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.terminationListener = TerminationListener alloc initWithProcessIdentifier:processIdentifier;
+ self startInstallation;
+ });
+ };
+ 
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(RETRIEVE_PROCESS_IDENTIFIER_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (self.terminationListener == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Timeout error: failed to retreive process identifier from agent" };
+ }
+ });
+}
+
+- (void)handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data
+{
+ if (identifier == SPUInstallationData && self.updateDirectoryPath == nil) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Mark that we have received the installation data
+ // Do not rely on eg: self.updateDirectoryPath != nil because we may set it to nil again if an early stage fails (i.e, archive extraction)
+ self.receivedInstallationData = YES;
+ 
+ SPUInstallationInputData *installationData = (SPUInstallationInputData *)SPUUnarchiveRootObjectSecurely(data, SPUInstallationInputData class);
+ if (installationData == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to unarchive input installation data" };
+ return;
+ }
+ 
+ NSString *installationType = installationData.installationType;
+ if (!SPUValidInstallationType(installationType)) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Received invalid installation type: %@", installationType };
+ return;
+ }
+ 
+ NSBundle *hostBundle = NSBundle bundleWithPath:installationData.hostBundlePath;
+ 
+ NSString *bundleIdentifier = hostBundle.bundleIdentifier;
+ if (bundleIdentifier == nil || !bundleIdentifier isEqualToString:self.hostBundleIdentifier) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Failed to match host bundle identifiers %@ and %@", self.hostBundleIdentifier, bundleIdentifier };
+ return;
+ }
+ 
+ // This will be important later
+ if (installationData.relaunchPath == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to obtain relaunch path from installation data" };
+ return;
+ }
+ 
+ // This installation path is specific to sparkle and the bundle identifier
+ NSString *rootCacheInstallationPath = SPULocalCacheDirectory cachePathForBundleIdentifier:bundleIdentifier stringByAppendingPathComponent:@"Installation";
+ 
+ SPULocalCacheDirectory removeOldItemsInDirectory:rootCacheInstallationPath;
+ 
+ NSString *cacheInstallationPath = SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootCacheInstallationPath;
+ if (cacheInstallationPath == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Failed to create installation cache directory in %@", rootCacheInstallationPath };
+ return;
+ }
+ 
+ // Move the download archive to somewhere where probably only we will be touching it
+ // This prevents eg: if a bug exists in the updater that removes files we are trying to install
+ // When this tool is ran as root, we are moving it into a directory that only root will have access to
+ NSURL *downloadURL = NSURL fileURLWithPath:installationData.updateDirectoryPath URLByAppendingPathComponent:installationData.downloadName;
+ 
+ NSURL *downloadDestinationURL = NSURL fileURLWithPath:cacheInstallationPath URLByAppendingPathComponent:installationData.downloadName;
+ 
+ NSError *moveError = nil;
+ if (!SUFileManager alloc init moveItemAtURL:downloadURL toURL:downloadDestinationURL error:&moveError) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to move download archive to new location", NSUnderlyingErrorKey: moveError };
+ return;
+ }
+ 
+ // Make sure the downloaded archive we moved over is a regular file and not a symbolic link placed by an attacker
+ NSError *attributesError = nil;
+ NSString *downloadDestinationPath = downloadDestinationURL.path;
+ if (downloadDestinationPath == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Failed to retrieve download archive path from %@", downloadDestinationURL };
+ 
+ return;
+ }
+ 
+ NSDictionary<NSString *, id> *archiveAttributes = NSFileManager defaultManager attributesOfItemAtPath:downloadDestinationPath error:&attributesError;
+ 
+ if (archiveAttributes == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Failed to retrieve download archive attributes from %@", downloadDestinationPath };
+ 
+ return;
+ }
+ 
+ if (!(NSString *)archiveAttributesNSFileType isEqualToString:NSFileTypeRegular) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Received bad archive file type: %@", archiveAttributesNSFileType };
+ return;
+ }
+ 
+ // Carry these properities separately rather than using the SUInstallationInputData object
+ // Some of our properties may slightly differ than our input and we don't want to make the mistake of using one of those
+ self.installationType = installationType;
+ self.relaunchPath = installationData.relaunchPath;
+ self.downloadName = installationData.downloadName;
+ self.signatures = installationData.signatures;
+ self.updateDirectoryPath = cacheInstallationPath;
+ self.host = SUHost alloc initWithBundle:hostBundle;
+ 
+ self extractAndInstallUpdate;
+ });
+ } else if (identifier == SPUSentUpdateAppcastItemData) {
+ SUAppcastItem *updateItem = (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, SUAppcastItem class);
+ if (updateItem != nil) {
+ SPUInstallationInfo *installationInfo = SPUInstallationInfo alloc initWithAppcastItem:updateItem canSilentlyInstall:self.installer canInstallSilently;
+ 
+ NSData *archivedData = SPUArchiveRootObjectSecurely(installationInfo);
+ if (archivedData != nil) {
+ self.agentConnection.agent registerInstallationInfoData:archivedData;
+ }
+ }
+ } else if (identifier == SPUResumeInstallationToStage2 && data.length == sizeof(uint8_t) * 2) {
+ // Because anyone can ask us to resume the installation, it may be wise to think about backwards compatibility here if IPC changes
+ uint8_t relaunch = *((const uint8_t *)data.bytes);
+ uint8_t showsUI = *((const uint8_t *)data.bytes + 1);
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // This flag has an impact on interactive type installations and showing UI progress during non-interactive installations
+ self.shouldShowUI = (BOOL)showsUI;
+ // Don't test if the application was alive initially, leave that to the progress agent if we decide to relaunch
+ self.shouldRelaunch = (BOOL)relaunch;
+ 
+ if (self.performedStage1Installation) {
+ // Resume the installation if we aren't done with stage 2 yet, and remind the client we are prepared to relaunch
+ dispatch_async(self.installerQueue, ^{
+ if (!self.performedStage2Installation) {
+ self performStage2Installation;
+ } else if (!self.performedStage3Installation) {
+ // If we already performed the 2nd stage, re-purpose this request to re-try sending another termination signal
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Don't check if the target is already terminated, leave that to the progress agent
+ // We could be slightly off if there were multiple instances running
+ self.agentConnection.agent sendTerminationSignal;
+ });
+ }
+ });
+ }
+ });
+ } else if (identifier == SPUCancelInstallation) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:0 error:nil;
+ });
+ } else if (identifier == SPUUpdaterAlivePong) {
+ self.receivedUpdaterPong = YES;
+ }
+}
+
+- (void)startInstallation
+{
+ self.willCompleteInstallation = YES;
+ 
+ self.installerQueue = dispatch_queue_create("org.sparkle-project.sparkle.installer", DISPATCH_QUEUE_SERIAL);
+ 
+ dispatch_async(self.installerQueue, ^{
+ NSError *installerError = nil;
+ id <SUInstallerProtocol> installer = SUInstaller installerForHost:self.host expectedInstallationType:self.installationType updateDirectory:self.updateDirectoryPath homeDirectory:self.homeDirectory userName:self.userName error:&installerError;
+ 
+ if (installer == nil) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to create installer instance", NSUnderlyingErrorKey: installerError };
+ });
+ return;
+ }
+ 
+ NSError *firstStageError = nil;
+ if (!installer performInitialInstallation:&firstStageError) {
+ self.installer = nil;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to start installer", NSUnderlyingErrorKey: firstStageError };
+ });
+ return;
+ }
+ 
+ uint8_t canPerformSilentInstall = (uint8_t)installer canInstallSilently;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.installer = installer;
+ 
+ uint8_t targetTerminated = (uint8_t)self.terminationListener.terminated;
+ 
+ uint8_t sendInformation = {canPerformSilentInstall, targetTerminated};
+ 
+ NSData *sendData = NSData dataWithBytes:sendInformation length:sizeof(sendInformation);
+ 
+ self.communicator handleMessageWithIdentifier:SPUInstallationFinishedStage1 data:sendData;
+ 
+ self.performedStage1Installation = YES;
+ 
+ // Stage 2 can still be run before we finish installation
+ // if the updater requests for it before the app is terminated
+ self finishInstallationAfterHostTermination;
+ });
+ });
+}
+
+- (void)performStage2Installation
+{
+ BOOL canPerformSecondStage = self.shouldShowUI || self.installer canInstallSilently;
+ if (canPerformSecondStage) {
+ self.performedStage2Installation = YES;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ uint8_t targetTerminated = (uint8_t)self.terminationListener.terminated;
+ 
+ NSData *sendData = NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated);
+ self.communicator handleMessageWithIdentifier:SPUInstallationFinishedStage2 data:sendData;
+ 
+ // Don't check if the target is already terminated, leave that to the progress agent
+ // We could be slightly off if there were multiple instances running
+ self.agentConnection.agent sendTerminationSignal;
+ });
+ } else {
+ self.installer = nil;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to resume installer on stage 2 because installation cannot be installed silently" };
+ });
+ }
+}
+
+- (void)finishInstallationAfterHostTermination
+{
+ self.terminationListener startListeningWithCompletion:^(BOOL success) {
+ if (!success) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to listen for application termination" };
+ return;
+ }
+ 
+ // Show our installer progress UI tool if only after a certain amount of time passes,
+ // and if our installer is silent (i.e, doesn't show progress on its own)
+ __block BOOL shouldShowUIProgress = YES;
+ if (self.shouldShowUI && self.installer canInstallSilently) {
+ // Ask the updater if it is still alive
+ // If they are, we will receive a pong response back
+ // Reset if we received a pong just to be on the safe side
+ self.receivedUpdaterPong = NO;
+ self.communicator handleMessageWithIdentifier:SPUUpdaterAlivePing data:NSData data;
+ 
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUDisplayProgressTimeDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ // Make sure we're still eligible for showing the installer progress
+ // Also if the updater process is still alive, showing the progress should not be our duty
+ // if the communicator object is nil, the updater definitely isn't alive. However, if it is not nil,
+ // this does not necessarily mean the updater is alive, so we should also check if we got a recent response back from the updater
+ if (shouldShowUIProgress && (!self.receivedUpdaterPong || self.communicator == nil)) {
+ self.agentConnection.agent showProgress;
+ }
+ });
+ }
+ 
+ dispatch_async(self.installerQueue, ^{
+ if (!self.performedStage2Installation) {
+ self performStage2Installation;
+ }
+ 
+ if (!self.performedStage2Installation) {
+ // We failed and we're going to exit shortly
+ return;
+ }
+ 
+ NSError *thirdStageError = nil;
+ if (!self.installer performFinalInstallationProgressBlock:nil error:&thirdStageError) {
+ self.installer performCleanup;
+ self.installer = nil;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to finalize installation", NSUnderlyingErrorKey: thirdStageError };
+ });
+ return;
+ }
+ 
+ self.performedStage3Installation = YES;
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Make sure to stop our displayed progress before we move onto cleanup & relaunch
+ // This will also stop the agent from broadcasting the status info service, which we want to do before
+ // we relaunch the app because the relaunched app could check the service upon launch..
+ self.agentConnection.agent stopProgress;
+ shouldShowUIProgress = NO;
+ 
+ self.communicator handleMessageWithIdentifier:SPUInstallationFinishedStage3 data:NSData data;
+ 
+ if (self.shouldRelaunch) {
+ // This will also signal to the agent that it will terminate soon
+ self.agentConnection.agent relaunchApplication;
+ }
+ 
+ self.installer performCleanup;
+ 
+ self cleanupAndExitWithStatus:EXIT_SUCCESS error:nil;
+ });
+ });
+ };
+}
+
+- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn))
+{
+ if (error != nil) {
+ SULogError(error);
+ 
+ NSData *errorData = SPUArchiveRootObjectSecurely((NSError * _Nonnull)error);
+ if (errorData != nil) {
+ self.communicator handleMessageWithIdentifier:SPUInstallerError data:errorData;
+ }
+ }
+ 
+ // It's nice to tell the other end we're invalidating
+ 
+ self.activeConnection invalidate;
+ self.activeConnection = nil;
+ 
+ self.xpcListener invalidate;
+ self.xpcListener = nil;
+ 
+ self.agentConnection invalidate;
+ self.agentConnection = nil;
+ 
+ self clearUpdateDirectory;
+ 
+ exit(status);
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUDeltaArchive.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUDeltaArchive.m Added

@@ -0,0 +1,121 @@
+//
+// SPUDeltaArchive.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/29/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDeltaArchive.h"
+#import "SPUDeltaArchiveProtocol.h"
+#import "SPUSparkleDeltaArchive.h"
+#import "SPUXarDeltaArchive.h"
+#import <CommonCrypto/CommonDigest.h>
+
+
+#include "AppKitPrevention.h"
+
+SPUDeltaCompressionMode SPUDeltaCompressionModeDefault = (SPUDeltaCompressionMode)UINT8_MAX;
+
+id<SPUDeltaArchiveProtocol> SPUDeltaArchiveReadPatchAndHeader(NSString *patchFile, SPUDeltaArchiveHeader * _Nullable __autoreleasing * _Nullable outHeader)
+{
+ id<SPUDeltaArchiveProtocol> sparkleArchive = SPUSparkleDeltaArchive alloc initWithPatchFileForReading:patchFile;
+ 
+ SPUDeltaArchiveHeader *header = sparkleArchive readHeader;
+ if (header == nil) {
+ NSError *archiveError = sparkleArchive.error;
+ if (archiveError != nil && archiveError.domain isEqualToString:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN && archiveError.code == SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_MAGIC) {
+ // Retry with XAR archive if the magic value is unexpected
+ sparkleArchive close;
+ 
+ id<SPUDeltaArchiveProtocol> xarArchive = SPUXarDeltaArchive alloc initWithPatchFileForReading:patchFile;
+ 
+ SPUDeltaArchiveHeader *xarHeader = xarArchive readHeader;
+ if (outHeader != NULL) {
+ *outHeader = xarHeader;
+ }
+ return xarArchive;
+ } else {
+ if (outHeader != NULL) {
+ *outHeader = nil;
+ }
+ return sparkleArchive;
+ }
+ } else {
+ if (outHeader != NULL) {
+ *outHeader = header;
+ }
+ return sparkleArchive;
+ }
+}
+
+@implementation SPUDeltaArchiveItem
+
+@synthesize relativeFilePath = _relativeFilePath;
+@synthesize itemFilePath = _itemFilePath;
+@synthesize clonedRelativePath = _clonedRelativePath;
+@synthesize sourcePath = _sourcePath;
+@synthesize commands = _commands;
+@synthesize xarContext = _xarContext;
+@synthesize mode = _mode;
+@synthesize codedDataLength = _codedDataLength;
+
+- (instancetype)initWithRelativeFilePath:(NSString *)relativeFilePath commands:(SPUDeltaItemCommands)commands mode:(uint16_t)mode
+{
+ self = super init;
+ if (self != nil) {
+ _relativeFilePath = relativeFilePath copy;
+ _commands = commands;
+ _mode = mode;
+ }
+ return self;
+}
+
+@end
+
+@implementation SPUDeltaArchiveHeader
+{
+ unsigned char _beforeTreeHashCC_SHA1_DIGEST_LENGTH;
+ unsigned char _afterTreeHashCC_SHA1_DIGEST_LENGTH;
+}
+
+@synthesize compression = _compression;
+@synthesize compressionLevel = _compressionLevel;
+@synthesize fileSystemCompression = _fileSystemCompression;
+@synthesize majorVersion = _majorVersion;
+@synthesize minorVersion = _minorVersion;
+
+- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash
+{
+ self = super init;
+ if (self != nil)
+ {
+ _compression = compression;
+ _compressionLevel = compressionLevel;
+ _fileSystemCompression = fileSystemCompression;
+ 
+ _majorVersion = majorVersion;
+ _minorVersion = minorVersion;
+ 
+ memcpy(_beforeTreeHash, beforeTreeHash, sizeof(_beforeTreeHash));
+ memcpy(_afterTreeHash, afterTreeHash, sizeof(_afterTreeHash));
+ }
+ return self;
+}
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+
+- (unsigned char *)beforeTreeHash
+{
+ return _beforeTreeHash;
+}
+
+- (unsigned char *)afterTreeHash
+{
+ return _afterTreeHash;
+}
+
+#pragma clang diagnostic pop
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUDeltaArchiveProtocol.h Added

@@ -0,0 +1,110 @@
+//
+// SPUDeltaArchiveProtocol.h
+// Autoupdate
+//
+// Created by Mayur Pawashe on 12/28/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SPUDeltaCompressionMode.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Attributes for an item we extract/write to the archive
+
+// Note: BinaryDiff cannot coexist together with Delete
+typedef NS_ENUM(uint8_t, SPUDeltaItemCommands) {
+ SPUDeltaItemCommandEndMarker = 0,
+ SPUDeltaItemCommandDelete = (1u << 0),
+ SPUDeltaItemCommandExtract = (1u << 1),
+ SPUDeltaItemCommandModifyPermissions = (1u << 2),
+ SPUDeltaItemCommandBinaryDiff = (1u << 3),
+ SPUDeltaItemCommandClone = (1u << 4),
+};
+
+// Represents header for our archive
+@interface SPUDeltaArchiveHeader : NSObject
+
+- (instancetype)initWithCompression:(SPUDeltaCompressionMode)compression compressionLevel:(uint8_t)compressionLevel fileSystemCompression:(bool)fileSystemCompression majorVersion:(uint16_t)majorVersion minorVersion:(uint16_t)minorVersion beforeTreeHash:(const unsigned char *)beforeTreeHash afterTreeHash:(const unsigned char *)afterTreeHash;
+
+@property (nonatomic, readonly) SPUDeltaCompressionMode compression;
+@property (nonatomic, readonly) uint8_t compressionLevel;
+@property (nonatomic, readonly) bool fileSystemCompression;
+@property (nonatomic, readonly) uint16_t majorVersion;
+@property (nonatomic, readonly) uint16_t minorVersion;
+@property (nonatomic, readonly) unsigned char *beforeTreeHash;
+@property (nonatomic, readonly) unsigned char *afterTreeHash;
+
+@end
+
+// Represents an item we read or write to in our delta archive
+@interface SPUDeltaArchiveItem : NSObject
+
+- (instancetype)initWithRelativeFilePath:(NSString *)relativeFilePath commands:(SPUDeltaItemCommands)commands mode:(uint16_t)mode;
+
+// The relative file path of the item, eg /Contents/MacOS/Foo
+@property (nonatomic, readonly) NSString *relativeFilePath;
+// For extraction, the path where the item will be extracted. For creation, the path to the item to add to the archive.
+@property (nonatomic, nullable) NSString *itemFilePath;
+// The relative file path of the originating item for clones. This may be null.
+// For example, if /Contents/Resources/hello/foo.txt moves to /Contents/Resources/hello2/foo.txt, the former is the relative path
+@property (nonatomic, nullable) NSString *clonedRelativePath;
+// The source path of the item to extract file metadata from such as file size.
+@property (nonatomic, nullable) NSString *sourcePath;
+// The commands that describe the actions to take for this item.
+@property (nonatomic, readonly) SPUDeltaItemCommands commands;
+// Provided change in permissions for item or tracking file mode for the item
+@property (nonatomic) uint16_t mode;
+
+// Private properties
+// xar_file context for Xar delta archiver
+@property (nonatomic, nullable) const void *xarContext;
+// Tracking length of item's data in data section, when encoding items and when extracting items
+@property (nonatomic) uint64_t codedDataLength;
+
+@end
+
+// A protocol for reading and writing binary delta patches
+// Operations must be done in order. The header must first be read or written before any other operations.
+// For reading, file items cannot be extracted out of order.
+@protocol SPUDeltaArchiveProtocol <NSObject>
+
+@property (nonatomic, readonly, class) BOOL maySupportSafeExtraction;
+
+// If non-nil, there was an error with reading or writing data from the archive
+@property (nonatomic, readonly, nullable) NSError *error;
+
+// Closes file for reading/writing, called in -dealloc if it's not called manually
+- (void)close;
+
+// For reading
+
+// Retrieves metadata for the archive including major/minor version and expected bundle hashes
+- (nullable SPUDeltaArchiveHeader *)readHeader;
+
+// Enumerate through items in the patch file and read the path, attributes, permissions (if permission attribute is available), and way to stop enumeration
+- (void)enumerateItems:(void (^)(SPUDeltaArchiveItem *item, BOOL *stop))itemHandler;
+
+// Extract a file item from the patch file to a destination file
+// The item's physical file path must be set as a destination
+- (BOOL)extractItem:(SPUDeltaArchiveItem *)item;
+
+// ------------
+
+// For writing
+
+// Set metadata for archive including major/minor version and expected bundle hashes
+- (void)writeHeader:(SPUDeltaArchiveHeader *)header;
+
+// Add item to patch file
+// Physical file path must be provided if there is an extract or binary delta attribute
+// Permissions are used only if there is a modify permissions attribute
+- (void)addItem:(SPUDeltaArchiveItem *)item;
+
+// Finishes encoding items after having added all of them
+- (void)finishEncodingItems;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUDeltaCompressionMode.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUInstallationInfo.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUInstallationInfo.m Added

@@ -0,0 +1,65 @@
+//
+//  SPUInstallationInfo.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 4/10/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUInstallationInfo.h"
+#import "SUAppcastItem.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SUAppcastItemKey = @"SUAppcastItem";
+static NSString *SUCanSilentlyInstallKey = @"SUCanSilentlyInstall";
+static NSString *SUSystemDomainKey = @"SUSystemDomain";
+
+@implementation SPUInstallationInfo
+
+@synthesize appcastItem = _appcastItem;
+@synthesize canSilentlyInstall = _canSilentlyInstall;
+@synthesize systemDomain = _systemDomain;
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall systemDomain:(BOOL)systemDomain
+{
+    self = super init;
+    if (self != nil) {
+        _appcastItem = appcastItem;
+        _canSilentlyInstall = canSilentlyInstall;
+        _systemDomain = systemDomain;
+    }
+    return self;
+}
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall
+{
+    return self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:NO;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    SUAppcastItem *appcastItem = decoder decodeObjectOfClass:SUAppcastItem class forKey:SUAppcastItemKey;
+    if (appcastItem == nil) {
+        return nil;
+    }
+    
+    BOOL canSilentlyInstall = decoder decodeBoolForKey:SUCanSilentlyInstallKey;
+    BOOL systemDomain = decoder decodeBoolForKey:SUSystemDomainKey;
+    return self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:systemDomain;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    coder encodeObject:self.appcastItem forKey:SUAppcastItemKey;
+    coder encodeBool:self.canSilentlyInstall forKey:SUCanSilentlyInstallKey;
+    coder encodeBool:self.systemDomain forKey:SUSystemDomainKey;
+}
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUInstallationInputData.h Added

@@ -0,0 +1,37 @@
+//
+// SPUInstallationInputData.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/24/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class SUSignatures;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SPUInstallationInputData : NSObject <NSSecureCoding>
+
+/*
+ * relaunchPath - path to application bundle to relaunch and listen for termination
+ * hostBundlePath - path to host bundle to update & replace
+ * updateDirectoryPath - path to update directory (i.e, temporary directory containing the new update archive)
+ * downloadName - name of update archive in update directory
+ * signatures - signatures for the update that came from the appcast item
+ * decryptionPassword - optional decryption password for dmg archives
+ */
+- (instancetype)initWithRelaunchPath:(NSString *)relaunchPath hostBundlePath:(NSString *)hostBundlePath updateDirectoryPath:(NSString *)updateDirectoryPath downloadName:(NSString *)downloadName installationType:(NSString *)installationType signatures:(SUSignatures * _Nullable)signatures decryptionPassword:(nullable NSString *)decryptionPassword;
+
+@property (nonatomic, copy, readonly) NSString *relaunchPath;
+@property (nonatomic, copy, readonly) NSString *hostBundlePath;
+@property (nonatomic, copy, readonly) NSString *updateDirectoryPath;
+@property (nonatomic, copy, readonly) NSString *downloadName;
+@property (nonatomic, copy, readonly) NSString *installationType;
+@property (nonatomic, readonly, nullable) SUSignatures *signatures; // nullable because although not using signatures is deprecated, it's still supported
+@property (nonatomic, copy, readonly, nullable) NSString *decryptionPassword;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUInstallationInputData.m Added

@@ -0,0 +1,106 @@
+//
+//  SPUInstallationInputData.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 3/24/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUInstallationInputData.h"
+#import "SPUInstallationType.h"
+#import "SUSignatures.h"
+
+#include "AppKitPrevention.h"
+
+static NSString *SURelaunchPathKey = @"SURelaunchPath";
+static NSString *SUHostBundlePathKey = @"SUHostBundlePath";
+static NSString *SUUpdateDirectoryPathKey = @"SUUpdateDirectoryPath";
+static NSString *SUDownloadNameKey = @"SUDownloadName";
+static NSString *SUSignaturesKey = @"SUSignatures";
+static NSString *SUDecryptionPasswordKey = @"SUDecryptionPassword";
+static NSString *SUInstallationTypeKey = @"SUInstallationType";
+
+@implementation SPUInstallationInputData
+
+@synthesize relaunchPath = _relaunchPath;
+@synthesize hostBundlePath = _hostBundlePath;
+@synthesize updateDirectoryPath = _updateDirectoryPath;
+@synthesize downloadName = _downloadName;
+@synthesize signatures = _signatures;
+@synthesize decryptionPassword = _decryptionPassword;
+@synthesize installationType = _installationType;
+
+- (instancetype)initWithRelaunchPath:(NSString *)relaunchPath hostBundlePath:(NSString *)hostBundlePath updateDirectoryPath:(NSString *)updateDirectoryPath downloadName:(NSString *)downloadName installationType:(NSString *)installationType signatures:(SUSignatures * _Nullable)signatures decryptionPassword:(nullable NSString *)decryptionPassword
+{
+    self = super init;
+    if (self != nil) {
+        _relaunchPath = relaunchPath copy;
+        _hostBundlePath = hostBundlePath copy;
+        _updateDirectoryPath = updateDirectoryPath copy;
+        _downloadName = downloadName copy;
+        
+        _installationType = installationType copy;
+        assert(SPUValidInstallationType(_installationType));
+        
+        _signatures = signatures;
+        _decryptionPassword = decryptionPassword copy;
+    }
+    return self;
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    NSString *relaunchPath = decoder decodeObjectOfClass:NSString class forKey:SURelaunchPathKey;
+    if (relaunchPath == nil) {
+        return nil;
+    }
+    
+    NSString *hostBundlePath = decoder decodeObjectOfClass:NSString class forKey:SUHostBundlePathKey;
+    if (hostBundlePath == nil) {
+        return nil;
+    }
+    
+    NSString *updateDirectoryPath = decoder decodeObjectOfClass:NSString class forKey:SUUpdateDirectoryPathKey;
+    if (updateDirectoryPath == nil) {
+        return nil;
+    }
+    
+    NSString *downloadName = decoder decodeObjectOfClass:NSString class forKey:SUDownloadNameKey;
+    if (downloadName == nil) {
+        return nil;
+    }
+    
+    NSString *installationType = decoder decodeObjectOfClass:NSString class forKey:SUInstallationTypeKey;
+    if (!SPUValidInstallationType(installationType)) {
+        return nil;
+    }
+    
+    SUSignatures *signatures = decoder decodeObjectOfClass:SUSignatures class forKey:SUSignaturesKey;
+    if (signatures == nil) {
+        return nil;
+    }
+    
+    NSString *decryptionPassword = decoder decodeObjectOfClass:NSString class forKey:SUDecryptionPasswordKey;
+    
+    return self initWithRelaunchPath:relaunchPath hostBundlePath:hostBundlePath updateDirectoryPath:updateDirectoryPath downloadName:downloadName installationType:installationType signatures:signatures decryptionPassword:decryptionPassword;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    coder encodeObject:self.relaunchPath forKey:SURelaunchPathKey;
+    coder encodeObject:self.hostBundlePath forKey:SUHostBundlePathKey;
+    coder encodeObject:self.updateDirectoryPath forKey:SUUpdateDirectoryPathKey;
+    coder encodeObject:self.installationType forKey:SUInstallationTypeKey;
+    coder encodeObject:self.downloadName forKey:SUDownloadNameKey;
+    coder encodeObject:self.signatures forKey:SUSignaturesKey;
+    if (self.decryptionPassword != nil) {
+        coder encodeObject:self.decryptionPassword forKey:SUDecryptionPasswordKey;
+    }
+}
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUMessageTypes.h Added

@@ -0,0 +1,49 @@
+//
+// SPUMessageTypes.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/11/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Order matters; higher stages have higher values.
+typedef NS_ENUM(int32_t, SPUInstallerMessageType)
+{
+ SPUInstallerNotStarted = 0,
+ SPUExtractionStarted = 1,
+ SPUExtractedArchiveWithProgress = 2,
+ SPUArchiveExtractionFailed = 3,
+ SPUValidationStarted = 4,
+ SPUInstallationStartedStage1 = 5,
+ SPUInstallationFinishedStage1 = 6,
+ SPUInstallationFinishedStage2 = 7,
+ SPUInstallationFinishedStage3 = 8,
+ SPUUpdaterAlivePing = 9,
+ SPUInstallerError = 10
+};
+
+typedef NS_ENUM(int32_t, SPUUpdaterMessageType)
+{
+ SPUInstallationData = 0,
+ SPUSentUpdateAppcastItemData = 1,
+ SPUResumeInstallationToStage2 = 2,
+ SPUUpdaterAlivePong = 3,
+ SPUCancelInstallation = 4
+};
+
+BOOL SPUInstallerMessageTypeIsLegal(SPUInstallerMessageType oldMessageType, SPUInstallerMessageType newMessageType);
+
+// Used by framework to communicate to installer (Autoupdate)
+NSString *SPUInstallerServiceNameForBundleIdentifier(NSString *bundleIdentifier);
+
+// Used by framework to communicate to progress agent tool (Updater)
+NSString *SPUStatusInfoServiceNameForBundleIdentifier(NSString *bundleIdentifier);
+
+// Used by progress agent tool to communicate to installer (Autoupdate)
+NSString *SPUProgressAgentServiceNameForBundleIdentifier(NSString *bundleIdentifier);
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUMessageTypes.m Added

@@ -0,0 +1,85 @@
+//
+//  SPUMessageTypes.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 3/11/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUMessageTypes.h"
+
+
+#include "AppKitPrevention.h"
+
+// Tags added to the bundle identifier which is used as Mach service names
+// These should be very short because of length restrictions
+#define SPARKLE_INSTALLER_TAG @"-spki"
+#define SPARKLE_STATUS_TAG @"-spks"
+#define SPARKLE_PROGRESS_TAG @"-spkp"
+
+// macOS 10.8 couldn't handle service names that are >= 64 characters,
+// but 10.9 raised this to >= 128 characters
+#define MAX_SERVICE_NAME_LENGTH 127u
+
+BOOL SPUInstallerMessageTypeIsLegal(SPUInstallerMessageType oldMessageType, SPUInstallerMessageType newMessageType)
+{
+    BOOL legal;
+    switch (newMessageType) {
+        case SPUInstallerNotStarted:
+            legal = (oldMessageType == SPUInstallerNotStarted);
+            break;
+        case SPUExtractionStarted:
+            legal = (oldMessageType == SPUInstallerNotStarted);
+            break;
+        case SPUExtractedArchiveWithProgress:
+        case SPUArchiveExtractionFailed:
+            legal = (oldMessageType == SPUExtractionStarted || oldMessageType == SPUExtractedArchiveWithProgress);
+            break;
+        case SPUValidationStarted:
+            legal = (oldMessageType == SPUExtractionStarted || oldMessageType == SPUExtractedArchiveWithProgress);
+            break;
+        case SPUInstallationStartedStage1:
+            legal = (oldMessageType == SPUValidationStarted);
+            break;
+        case SPUInstallationFinishedStage1:
+            legal = (oldMessageType == SPUInstallationStartedStage1);
+            break;
+        case SPUInstallationFinishedStage2:
+            legal = (oldMessageType == SPUInstallationFinishedStage1);
+            break;
+        case SPUInstallationFinishedStage3:
+            legal = (oldMessageType == SPUInstallationFinishedStage2);
+            break;
+        case SPUInstallerError:
+        case SPUUpdaterAlivePing:
+            // Having this state being dependent on other installation states would make the complicate our logic
+            // So just always allow these type of messages
+            legal = YES;
+            break;
+    }
+    return legal;
+}
+
+static NSString *SPUServiceNameWithTag(NSString *tagName, NSString *bundleIdentifier)
+{
+    NSString *serviceName = bundleIdentifier stringByAppendingString:tagName;
+    NSUInteger length = MIN(serviceName.length, MAX_SERVICE_NAME_LENGTH);
+    // If the service name is too long, cut off the beginning rather than cutting off the end
+    // This should lead to a more unique name
+    return serviceName substringFromIndex:serviceName.length - length;
+}
+
+NSString *SPUInstallerServiceNameForBundleIdentifier(NSString *bundleIdentifier)
+{
+    return SPUServiceNameWithTag(SPARKLE_INSTALLER_TAG, bundleIdentifier);
+}
+
+NSString *SPUStatusInfoServiceNameForBundleIdentifier(NSString *bundleIdentifier)
+{
+    return SPUServiceNameWithTag(SPARKLE_STATUS_TAG, bundleIdentifier);
+}
+
+NSString *SPUProgressAgentServiceNameForBundleIdentifier(NSString *bundleIdentifier)
+{
+    return SPUServiceNameWithTag(SPARKLE_PROGRESS_TAG, bundleIdentifier);
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUSparkleDeltaArchive.h Added

@@ -0,0 +1,107 @@
+//
+// SPUSparkleDeltaArchive.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/30/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import "SPUDeltaArchiveProtocol.h"
+#import "SPUDeltaCompressionMode.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+#define SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN @"Sparkle Delta Archive"
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_MAGIC 1
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_COMPRESSION_VALUE 2
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CHUNK_SIZE 3
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP 4
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES 5
+#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG 6
+
+/*
+ Modern container format for binary delta archives.
+ 
+ Delta archive format has four sections which are the header, the relative file path table, the commands, and the data blobs.
+ 
+ The relative file path table records all the file paths the archive needs to know about.
+ The commands are the operations to be recorded (eg: extract, clone, binary diff, delete).
+ The commands may additionally have more metadata such as file permission modes, relative path indexes in the case of clones, or file sizes for the data blobs.
+ The data blobs contain all file data from extract and binary diff outputs.
+ 
+ The implementation design of this archive is such that we do not seek backwards or skip ahead to fetch data.
+ We go through the archive when writing or reading from it in a single pass.
+ 
+ -- UNCOMPRESSED --
+ 
+ HEADER (part 1) 
+ magic (length: 4)
+ compression (length: 1)
+ metadata (See format below. length: 1)
+ 
+ -- METADATA --
+ compressionLevel (bits 0, 4)
+ (bits 5, 6 reserved)
+ fileSystemCompression (bit 7)
+ 
+ -- COMPRESSED --
+ 
+ HEADER (part 2)
+ majorVersion (length: 2)
+ minorVersion (length: 2)
+ beforeTreeHash (length: 40)
+ afterTreeHash (length: 40)
+ 
+ RELATIVE_FILE_PATH_TABLE 
+ sizeOfRelativeFilePathTable (length: 8 bytes)
+ List of null terminated path strings joined together (N paths)
+ 
+ COMMANDS 
+ Command 
+ Set of command types for entry (length: 1 byte)
+ Additional metadata for command (see below section)
+ (M commands where M <= N paths)
+ (Indexes for commands refer to indexes to relative file path table, excluding extraneous trailing entries in relative path table used for clones)
+ (Last command must be a ZERO COMMAND (a null terminating command))
+ 
+ COMMAND METADATA
+ COMMAND: DELETE
+ N/A: no additional data
+ 
+ COMMAND: MODIFY_PERMISSIONS
+ fileMode (length: 2)
+ 
+ COMMAND: CLONE_FILE
+ sourceRelativePathIndex (length: 4)
+ 
+ COMMAND: EXTRACT_FILE
+ dataLength (length: 8 for regular files, 2 for symbolic links, 0 for directories)
+ 
+ COMMAND: BINARY_DIFF_FILE
+ dataLength (length: 8)
+ 
+ Note: These command types may be OR'd or combined. In those cases, different commands
+ that have the same attribute (eg dataLength) are not repeated. This list of metadata is also
+ in order in what will be encoded/decoded first.
+ 
+ EXTRACT_FILE and BINARY_DIFF_FILE cannot be combined.
+ CLONE_FILE and EXTRACT_FILE cannot be combined.
+ MODIFY_PERMISSIONS can be combined with either CLONE_FILE, EXTRACT_FILE, BINARY_DIFF_FILE, or just by itself.
+ CLONE_FILE can be combined with BINARY_DIFF_FILE or just by itself.
+ DELETE can be combined with EXTRACT_FILE, or just by itself. It is only combined with EXTRACT_FILE when the file type (regular, directory, or symlink) changes.
+ 
+ DATA_BLOBS 
+ All raw binary data joined together
+ (P number of blobs where P <= M commands)
+ (Indexes for data blobs correspond to indexes for a filtered list of applicable commands (EXTRACT_FILE, BINARY_DIFF_FILE) that have data content)
+ */
+@interface SPUSparkleDeltaArchive : NSObject <SPUDeltaArchiveProtocol>
+
+- (instancetype)initWithPatchFileForWriting:(NSString *)patchFile;
+- (instancetype)initWithPatchFileForReading:(NSString *)patchFile;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUSparkleDeltaArchive.m Added

@@ -0,0 +1,1250 @@
+//
+// SPUSparkleDeltaArchive.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/30/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUSparkleDeltaArchive.h"
+#import <bzlib.h>
+#import <sys/stat.h>
+#import <CommonCrypto/CommonDigest.h>
+#import "SUBinaryDeltaCommon.h"
+#import <compression.h>
+
+#include "AppKitPrevention.h"
+
+#define SPARKLE_DELTA_FORMAT_MAGIC "spk!"
+#define PARTIAL_IO_CHUNK_SIZE 16384 // this must be >= PATH_MAX
+#define COMPRESSION_BUFFER_SIZE 65536
+#define SPARKLE_BZIP2_ERROR_DOMAIN @"Sparkle BZIP2"
+#define SPARKLE_COMPRESSION_ERROR_DOMAIN @"Sparkle Compression"
+
+typedef struct
+{
+ uint8_t compressionLevel : 4;
+ uint8_t reserved : 3;
+ bool fileSystemCompression : 1;
+} SparkleDeltaArchiveMetadata;
+
+@interface SPUSparkleDeltaArchive ()
+
+@property (nonatomic) FILE *file;
+@property (nonatomic) BZFILE *bzipFile;
+@property (nonatomic) compression_stream compressionStream;
+@property (nonatomic) BOOL initializedCompressionStream;
+@property (nonatomic, readonly) NSString *patchFile;
+@property (nonatomic) SPUDeltaCompressionMode compression;
+@property (nonatomic, readonly) BOOL writeMode;
+@property (nonatomic) NSError *error;
+@property (nonatomic) void *partialChunkBuffer;
+@property (nonatomic) void *compressionBuffer;
+
+@property (nonatomic) NSMutableArray<SPUDeltaArchiveItem *> *writableItems;
+
+@end
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+
+@implementation SPUSparkleDeltaArchive
+
+@synthesize file = _file;
+@synthesize bzipFile = _bzipFile;
+@synthesize compressionStream = _compressionStream;
+@synthesize initializedCompressionStream = _initializedCompressionStream;
+@synthesize patchFile = _patchFile;
+@synthesize compression = _compression;
+@synthesize writeMode = _writeMode;
+@synthesize writableItems = _writableItems;
+@synthesize error = _error;
+@synthesize partialChunkBuffer = _partialChunkBuffer;
+@synthesize compressionBuffer = _compressionBuffer;
+
++ (BOOL)maySupportSafeExtraction
+{
+ return YES;
+}
+
+- (instancetype)initWithPatchFileForWriting:(NSString *)patchFile
+{
+ self = super init;
+ if (self != nil) {
+ _patchFile = patchFile copy;
+ _writableItems = NSMutableArray array;
+ _writeMode = YES;
+ }
+ return self;
+}
+
+- (instancetype)initWithPatchFileForReading:(NSString *)patchFile
+{
+ self = super init;
+ if (self != nil) {
+ _patchFile = patchFile copy;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ self close;
+}
+
+- (void)close
+{
+ if (self.bzipFile != NULL) {
+ if (!self.writeMode) {
+ int bzerror = 0;
+ BZ2_bzReadClose(&bzerror, self.bzipFile);
+ }
+ 
+ self.bzipFile = NULL;
+ } else if (self.initializedCompressionStream) {
+ compression_stream_destroy(&_compressionStream);
+ self.initializedCompressionStream = NO;
+ }
+ 
+ if (self.file != NULL) {
+ fclose(self.file);
+ self.file = NULL;
+ }
+ 
+ free(self.partialChunkBuffer);
+ self.partialChunkBuffer = NULL;
+ 
+ free(self.compressionBuffer);
+ self.compressionBuffer = NULL;
+}
+
+- (BOOL)createBuffers
+{
+ self.partialChunkBuffer = calloc(1, PARTIAL_IO_CHUNK_SIZE);
+ if (self.partialChunkBuffer == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to calloc() %d bytes for partial chunk buffer.", PARTIAL_IO_CHUNK_SIZE };
+ return NO;
+ }
+ 
+ if (self.initializedCompressionStream) {
+ self.compressionBuffer = calloc(1, COMPRESSION_BUFFER_SIZE);
+ if (self.compressionBuffer == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to calloc() %d bytes for compression buffer.", COMPRESSION_BUFFER_SIZE };
+ return NO;
+ }
+ }
+ 
+ return YES;
+}
+
+- (BOOL)_readBuffer:(void *)buffer length:(int32_t)length
+{
+ if (self.error != nil) {
+ return NO;
+ }
+ 
+ switch (self.compression) {
+ case SPUDeltaCompressionModeNone: {
+ if (fread(buffer, (size_t)length, 1, self.file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read %d uncompressed bytes from archive.", length };
+ return NO;
+ } else {
+ return YES;
+ }
+ }
+ case SPUDeltaCompressionModeBzip2: {
+ int bzerror = 0;
+ int bytesRead = BZ2_bzRead(&bzerror, self.bzipFile, buffer, length);
+ 
+ switch (bzerror) {
+ case BZ_OK:
+ case BZ_STREAM_END:
+ if (bytesRead < length) {
+ self.error = NSError errorWithDomain:SPARKLE_BZIP2_ERROR_DOMAIN code:0 userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Only %d out of %d expected bytes were read from the bz2 archive.", bytesRead, length };
+ return NO;
+ } else {
+ return YES;
+ }
+ case BZ_IO_ERROR:
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Encountered unexpected IO error when reading compressed bytes from bz2 archive." };
+ return NO;
+ default:
+ self.error = NSError errorWithDomain:SPARKLE_BZIP2_ERROR_DOMAIN code:bzerror userInfo:@{ NSLocalizedDescriptionKey: @"Encountered unexpected error when reading compressed bytes from bz2 archive." };
+ return NO;
+ }
+ }
+ case SPUDeltaCompressionModeLZMA:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeZLIB: {
+ FILE *file = self.file;
+ void *compressionBuffer = self.compressionBuffer;
+ 
+ _compressionStream.dst_ptr = buffer;
+ _compressionStream.dst_size = (size_t)length;
+ 
+ while (_compressionStream.dst_size > 0) {
+ // Go through the current incomplete chunk before reading another one
+ 
+ if (_compressionStream.src_size == 0) {
+ size_t bytesRead = fread(compressionBuffer, 1, COMPRESSION_BUFFER_SIZE, file);
+ if (bytesRead < COMPRESSION_BUFFER_SIZE) {
+ if (feof(file) == 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read %d compressed raw bytes from archive.", length };
+ return NO;
+ }
+ }
+ 
+ // Reset source buffer
+ _compressionStream.src_ptr = compressionBuffer;
+ _compressionStream.src_size = bytesRead;
+ }
+ 
+ compression_status status = compression_stream_process(&_compressionStream, feof(file) != 0 ? COMPRESSION_STREAM_FINALIZE : 0);
+ if (status == COMPRESSION_STATUS_ERROR) {
+ self.error = NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read %d compressed bytes.", length };
+ return NO;
+ }
+ 
+ if (status == COMPRESSION_STATUS_END && _compressionStream.dst_size > 0) {
+ // We're expecting more bytes but we can't read any more bytes
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:-1 userInfo:@{ NSLocalizedDescriptionKey: @"Failed to decompress and read bytes because we reached EOF" };
+ return NO;
+ }
+ }
+ 
+ return YES;
+ }
+ }
+}
+
+static compression_algorithm _compressionAlgorithmForMode(SPUDeltaCompressionMode compressionMode)
+{
+ switch (compressionMode) {
+ case SPUDeltaCompressionModeLZMA:
+ return COMPRESSION_LZMA;
+ case SPUDeltaCompressionModeLZFSE:
+ return COMPRESSION_LZFSE;
+ case SPUDeltaCompressionModeLZ4:
+ return COMPRESSION_LZ4;
+ case SPUDeltaCompressionModeZLIB:
+ return COMPRESSION_ZLIB;
+ case SPUDeltaCompressionModeNone:
+ case SPUDeltaCompressionModeBzip2:
+ assert(false);
+ }
+ 
+ assert(false);
+}
+
+- (nullable SPUDeltaArchiveHeader *)readHeader
+{
+ NSString *patchFile = self.patchFile;
+ 
+ char patchFilePathPATH_MAX + 1 = {0};
+ if (!patchFile getFileSystemRepresentation:patchFilePath maxLength:sizeof(patchFilePath) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open and represent as a file system representation: %@", patchFile };
+ return nil;
+ }
+ 
+ FILE *file = fopen(patchFilePath, "rb");
+ if (file == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open patch file for writing value due to io error: %@", patchFile };
+ return nil;
+ }
+ 
+ self.file = file;
+ 
+ char magic5 = {0};
+ if (fread(magic, sizeof(magic) - 1, 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read magic value from patch file: %@", patchFile };
+ return nil;
+ }
+ 
+ if (strncmp(magic, SPARKLE_DELTA_FORMAT_MAGIC, sizeof(magic) - 1) != 0) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_MAGIC userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Patch file does not have '%@' magic value", @SPARKLE_DELTA_FORMAT_MAGIC };
+ return nil;
+ }
+ 
+ SPUDeltaCompressionMode compression = 0;
+ if (fread(&compression, sizeof(compression), 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read compression value from patch file: %@", patchFile };
+ return nil;
+ }
+ 
+ self.compression = compression;
+ 
+ SparkleDeltaArchiveMetadata metadata = {0};
+ if (fread(&metadata, sizeof(metadata), 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read compression level value from patch file: %@", patchFile };
+ return nil;
+ }
+ 
+ switch (compression) {
+ case SPUDeltaCompressionModeNone:
+ break;
+ case SPUDeltaCompressionModeBzip2: {
+ int bzerror = 0;
+ 
+ BZFILE *bzipFile = BZ2_bzReadOpen(&bzerror, file, 0, 0, NULL, 0);
+ if (bzipFile == NULL) {
+ switch (bzerror) {
+ case BZ_IO_ERROR:
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open patch as bz2 file due to io error: %@", patchFile };
+ break;
+ default:
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:bzerror userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open patch as bz2 file: %@", patchFile };
+ break;
+ }
+ return nil;
+ }
+ 
+ self.bzipFile = bzipFile;
+ 
+ break;
+ }
+ case SPUDeltaCompressionModeLZMA:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeZLIB: {
+ if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_DECODE, _compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
+ self.error = NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open compression stream for reading" };
+ return nil;
+ }
+ 
+ self.initializedCompressionStream = YES;
+ 
+ break;
+ }
+ default:
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_COMPRESSION_VALUE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Compression value read %d is not recognized.", compression };
+ return nil;
+ }
+ 
+ if (!self createBuffers) {
+ return nil;
+ }
+ 
+ uint16_t majorVersion = 0;
+ if (!self _readBuffer:&majorVersion length:sizeof(majorVersion)) {
+ return nil;
+ }
+ 
+ uint16_t minorVersion = 0;
+ if (!self _readBuffer:&minorVersion length:sizeof(minorVersion)) {
+ return nil;
+ }
+ 
+ unsigned char beforeTreeHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!self _readBuffer:beforeTreeHash length:sizeof(beforeTreeHash)) {
+ return nil;
+ }
+ 
+ unsigned char afterTreeHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!self _readBuffer:afterTreeHash length:sizeof(afterTreeHash)) {
+ return nil;
+ }
+ 
+ return SPUDeltaArchiveHeader alloc initWithCompression:compression compressionLevel:metadata.compressionLevel fileSystemCompression:metadata.fileSystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeTreeHash afterTreeHash:afterTreeHash;
+}
+
+- (NSArray<NSString *> *)_readRelativeFilePaths
+{
+ if (self.error != nil) {
+ return nil;
+ }
+ 
+ uint64_t filePathSectionSize = 0;
+ if (!self _readBuffer:&filePathSectionSize length:sizeof(filePathSectionSize)) {
+ return nil;
+ }
+ 
+ if (filePathSectionSize == 0) {
+ // Nothing has actually changed if there are no entries
+ return @;
+ }
+ 
+ char *fileTableData = calloc(1, filePathSectionSize);
+ if (fileTableData == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to calloc() %llu bytes for relative file paths.", filePathSectionSize };
+ return nil;
+ }
+ 
+ {
+ // Read all the paths in chunks
+ uint64_t bytesLeftoverToCopy = filePathSectionSize;
+ while (bytesLeftoverToCopy > 0) {
+ uint64_t currentBlockSize = (bytesLeftoverToCopy >= PARTIAL_IO_CHUNK_SIZE) ? PARTIAL_IO_CHUNK_SIZE : bytesLeftoverToCopy;
+ 
+ if (!self _readBuffer:fileTableData + (filePathSectionSize - bytesLeftoverToCopy) length:(int32_t)currentBlockSize) {
+ free(fileTableData);
+ return nil;
+ }
+ 
+ bytesLeftoverToCopy -= currentBlockSize;
+ }
+ }
+ 
+ // Read all relative file paths separated by null terminators
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ NSMutableArray<NSString *> *relativeFilePaths = NSMutableArray alloc init;
+ uint64_t currentStartIndex = 0;
+ for (uint64_t index = 0; index < filePathSectionSize; index++) {
+ if (fileTableDataindex == '\0') {
+ NSString *relativePath = fileManager stringWithFileSystemRepresentation:&fileTableDatacurrentStartIndex length:index - currentStartIndex;
+ if (relativePath == nil) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path cannot be decoded as a file system representation: %@", relativePath };
+ 
+ free(fileTableData);
+ return nil;
+ }
+ 
+ currentStartIndex = index + 1;
+ relativeFilePaths addObject:relativePath;
+ }
+ }
+ 
+ free(fileTableData);
+ 
+ return relativeFilePaths;
+}
+
+- (void)enumerateItems:(void (^)(SPUDeltaArchiveItem * _Nonnull, BOOL * _Nonnull))itemHandler
+{
+ // Parse all relative file paths
+ NSArray<NSString *> *relativeFilePaths = self _readRelativeFilePaths;
+ if (relativeFilePaths == nil) {
+ return;
+ }
+ 
+ if (relativeFilePaths.count == 0) {
+ // No diff changes
+ return;
+ }
+ 
+ if (relativeFilePaths.count > UINT32_MAX) {
+ // Very unlikely but we should guard against this
+ // Clones rely on 32-bit indexes
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"There are too many file entries to apply a patch for (more than %u)", UINT32_MAX };
+ return;
+ }
+ 
+ // Parse through all commands
+ NSMutableArray<SPUDeltaArchiveItem *> *archiveItems = NSMutableArray alloc init;
+ {
+ uint64_t currentItemIndex = 0;
+ while (YES) {
+ SPUDeltaItemCommands commands = 0;
+ if (!self _readBuffer:&commands length:sizeof(commands)) {
+ break;
+ }
+ 
+ // Test if we're done
+ if (commands == SPUDeltaItemCommandEndMarker) {
+ break;
+ }
+ 
+ // Check if we need to decode additional data
+ uint16_t decodedMode = 0;
+ uint64_t decodedDataLength = 0;
+ NSString *clonedRelativePath = nil;
+ 
+ if ((commands & SPUDeltaItemCommandClone) != 0) {
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ // Decode file permission changes for clone
+ if (!self _readBuffer:&decodedMode length:sizeof(decodedMode)) {
+ break;
+ }
+ }
+ 
+ // Decode relative file path for original source file
+ uint32_t cloneRelativePathIndex = 0;
+ if (!self _readBuffer:&cloneRelativePathIndex length:sizeof(cloneRelativePathIndex)) {
+ break;
+ }
+ 
+ if ((NSUInteger)cloneRelativePathIndex >= relativeFilePaths.count) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Index %u is past relative path table bounds of length %lu", cloneRelativePathIndex, (unsigned long)relativeFilePaths.count };
+ break;
+ }
+ 
+ clonedRelativePath = relativeFilePathscloneRelativePathIndex;
+ 
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ if (!self _readBuffer:&decodedDataLength length:sizeof(decodedDataLength)) {
+ break;
+ }
+ }
+ } else if ((commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ // Decode file permission changes if available
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ if (!self _readBuffer:&decodedMode length:sizeof(decodedMode)) {
+ break;
+ }
+ }
+ 
+ // Decode data length
+ if (!self _readBuffer:&decodedDataLength length:sizeof(decodedDataLength)) {
+ break;
+ }
+ } else if ((commands & SPUDeltaItemCommandExtract) != 0) {
+ // Decode permissions/mode
+ if (!self _readBuffer:&decodedMode length:sizeof(decodedMode)) {
+ break;
+ }
+ 
+ // Decode data length
+ // Length doesn't matter for directory names (we already track the name in the relative path)
+ if (S_ISREG(decodedMode)) {
+ if (!self _readBuffer:&decodedDataLength length:sizeof(decodedDataLength)) {
+ break;
+ }
+ } else if (S_ISLNK(decodedMode)) {
+ uint16_t decodedLinkLength = 0;
+ if (!self _readBuffer:&decodedLinkLength length:sizeof(decodedLinkLength)) {
+ break;
+ }
+ 
+ decodedDataLength = decodedLinkLength;
+ }
+ } else if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ // Decode file permissions
+ if (!self _readBuffer:&decodedMode length:sizeof(decodedMode)) {
+ break;
+ }
+ }
+ 
+ SPUDeltaArchiveItem *archiveItem = SPUDeltaArchiveItem alloc initWithRelativeFilePath:relativeFilePathscurrentItemIndex commands:commands mode:decodedMode;
+ 
+ archiveItem.codedDataLength = decodedDataLength;
+ archiveItem.clonedRelativePath = clonedRelativePath;
+ 
+ archiveItems addObject:archiveItem;
+ 
+ currentItemIndex++;
+ }
+ }
+ 
+ if (self.error != nil) {
+ return;
+ }
+ 
+ // Feed items back to caller
+ BOOL exitedEarly = NO;
+ for (SPUDeltaArchiveItem *item in archiveItems) {
+ itemHandler(item, &exitedEarly);
+ if (exitedEarly) {
+ break;
+ }
+ }
+}
+
+- (BOOL)extractItem:(SPUDeltaArchiveItem *)item
+{
+ NSString *itemFilePath = item.itemFilePath;
+ assert(itemFilePath != nil);
+ 
+ SPUDeltaItemCommands commands = item.commands;
+ assert((commands & SPUDeltaItemCommandExtract) != 0 || (commands & SPUDeltaItemCommandBinaryDiff) != 0);
+ 
+ uint16_t mode = item.mode;
+ 
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0 || S_ISREG(mode) || S_ISLNK(mode)) {
+ // Handle regular files
+ // Binary diffs are always on regular files only
+ 
+ uint64_t decodedLength = item.codedDataLength;
+ 
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0 || S_ISREG(mode)) {
+ // Regular files
+ 
+ fileManager removeItemAtPath:itemFilePath error:NULL;
+ 
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemFilePath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path to extract cannot be decoded and expressed as a file system representation: %@", itemFilePath };
+ return NO;
+ }
+ 
+ FILE *outputFile = fopen(itemFilePathString, "wb");
+ if (outputFile == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to fopen() %@", itemFilePath };
+ return NO;
+ }
+ 
+ if (decodedLength > 0) {
+ // Write out archive contents to file in chunks
+ 
+ uint64_t bytesLeftoverToCopy = decodedLength;
+ while (bytesLeftoverToCopy > 0) {
+ uint64_t currentBlockSize = (bytesLeftoverToCopy >= PARTIAL_IO_CHUNK_SIZE) ? PARTIAL_IO_CHUNK_SIZE : bytesLeftoverToCopy;
+ 
+ void *tempBuffer = self.partialChunkBuffer;
+ 
+ if (!self _readBuffer:tempBuffer length:(int32_t)currentBlockSize) {
+ break;
+ }
+ 
+ if (fwrite(tempBuffer, currentBlockSize, 1, outputFile) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to fwrite() %llu bytes during extraction.", currentBlockSize };
+ break;
+ }
+ 
+ bytesLeftoverToCopy -= currentBlockSize;
+ }
+ }
+ 
+ fclose(outputFile);
+ 
+ if (self.error != nil) {
+ return NO;
+ }
+ 
+ if ((commands & SPUDeltaItemCommandExtract) != 0 && chmod(itemFilePathString, mode) != 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to chmod() mode %d on %@", mode, itemFilePath };
+ return NO;
+ }
+ } else {
+ // Link files
+ 
+ if (PARTIAL_IO_CHUNK_SIZE < decodedLength) {
+ // Something is seriously wrong
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CHUNK_SIZE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"PARTIAL_IO_CHUNK_SIZE (%d) < decodedLength (%llu)", PARTIAL_IO_CHUNK_SIZE, decodedLength };
+ return NO;
+ }
+ 
+ if (decodedLength > PATH_MAX) {
+ // Link is too long
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Decoded length for link (%llu) is too long.", decodedLength };
+ return NO;
+ }
+ 
+ char bufferPATH_MAX + 1 = {0};
+ if (!self _readBuffer:buffer length:(int32_t)decodedLength) {
+ return NO;
+ }
+ 
+ NSString *destinationPath = fileManager stringWithFileSystemRepresentation:buffer length:decodedLength;
+ 
+ if (destinationPath == nil) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Destination path for link %@ cannot be created in a file system representation: %@",itemFilePath, destinationPath };
+ return NO;
+ }
+ 
+ fileManager removeItemAtPath:itemFilePath error:NULL;
+ 
+ NSError *createLinkError = nil;
+ if (!fileManager createSymbolicLinkAtPath:itemFilePath withDestinationPath:destinationPath error:&createLinkError) {
+ self.error = createLinkError;
+ return NO;
+ }
+ 
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemFilePath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Link path to extract cannot be decoded and expressed as a file system representation: %@", itemFilePath };
+ return NO;
+ }
+ 
+ // We shouldn't fail if setting permissions on symlinks fail
+ // Apple filesystems have file permissions for symbolic links but other linux file systems don't
+ // So this may have no effect on some file systems over the network
+ lchmod(itemFilePathString, mode);
+ }
+ } else if (S_ISDIR(mode)) {
+ NSError *createDirectoryError = nil;
+ if (!fileManager createDirectoryAtPath:itemFilePath withIntermediateDirectories:NO attributes:@{NSFilePosixPermissions: @(mode)} error:&createDirectoryError) {
+ self.error = createDirectoryError;
+ return NO;
+ }
+ }
+ 
+ return YES;
+}
+
+- (BOOL)_writeBuffer:(void *)buffer length:(int32_t)length
+{
+ if (self.error != nil) {
+ return NO;
+ }
+ 
+ switch (self.compression) {
+ case SPUDeltaCompressionModeNone: {
+ BOOL success = (fwrite(buffer, (size_t)length, 1, self.file) == 1);
+ if (!success) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to write %d uncompressed bytes.", length };
+ }
+ 
+ return success;
+ }
+ case SPUDeltaCompressionModeBzip2: {
+ int bzerror = 0;
+ BZ2_bzWrite(&bzerror, self.bzipFile, buffer, length);
+ switch (bzerror) {
+ case BZ_OK:
+ return YES;
+ case BZ_IO_ERROR:
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to write %d compressed bz2 bytes due to io error.", length };
+ return NO;
+ default:
+ self.error = NSError errorWithDomain:SPARKLE_BZIP2_ERROR_DOMAIN code:bzerror userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to write %d compressed bz2 bytes.", length };
+ return NO;
+ }
+ }
+ case SPUDeltaCompressionModeLZMA:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeZLIB: {
+ _compressionStream.src_ptr = buffer;
+ _compressionStream.src_size = (size_t)length;
+ 
+ FILE *file = self.file;
+ void *compressionBuffer = self.compressionBuffer;
+ while (_compressionStream.src_size > 0) {
+ // Reset destination buffer
+ _compressionStream.dst_ptr = compressionBuffer;
+ _compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
+ 
+ if (compression_stream_process(&_compressionStream, 0) == COMPRESSION_STATUS_ERROR) {
+ self.error = NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to write %d compressed bytes.", length };
+ return NO;
+ }
+ 
+ size_t compressedBytesWritten = (size_t)(_compressionStream.dst_ptr - (uint8_t *)compressionBuffer);
+ if (compressedBytesWritten > 0 && fwrite(compressionBuffer, compressedBytesWritten, 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to write %zu compressed bytes.", compressedBytesWritten };
+ return NO;
+ }
+ }
+ 
+ return YES;
+ }
+ }
+}
+
+- (void)writeHeader:(SPUDeltaArchiveHeader *)header
+{
+ char patchFilePathPATH_MAX + 1 = {0};
+ if (!self.patchFile getFileSystemRepresentation:patchFilePath maxLength:sizeof(patchFilePath) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open header and represent as a file system representation: %@", self.patchFile };
+ return;
+ }
+ 
+ FILE *file = fopen(patchFilePath, "wb");
+ if (file == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open patch file for writing: %@", self.patchFile };
+ return;
+ }
+ 
+ self.file = file;
+ 
+ char magic = SPARKLE_DELTA_FORMAT_MAGIC;
+ if (fwrite(magic, sizeof(magic) - 1, 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write magic value due to io error" };
+ return;
+ }
+ 
+ SPUDeltaCompressionMode compression = (header.compression == SPUDeltaCompressionModeDefault) ? SPUDeltaCompressionModeLZMA : header.compression;
+ 
+ self.compression = compression;
+ 
+ if (fwrite(&compression, sizeof(compression), 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write compression value due to io error" };
+ return;
+ }
+ 
+ // We only support configuring compression level for bzip2
+ uint8_t compressionLevel = 0;
+ switch (compression) {
+ case SPUDeltaCompressionModeBzip2:
+ // Only 1 - 9 are valid, 0 is a special case for using default 9
+ if (header.compressionLevel <= 0 || header.compressionLevel > 9) {
+ compressionLevel = 9;
+ } else {
+ compressionLevel = header.compressionLevel;
+ }
+ break;
+ // Some supported formats below have a documented level even though it's not customizable
+ // Let's record them in the archive
+ case SPUDeltaCompressionModeLZMA:
+ compressionLevel = 6;
+ break;
+ case SPUDeltaCompressionModeZLIB:
+ compressionLevel = 5;
+ break;
+ // These formats don't have any documented level or aren't applicable
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeNone:
+ compressionLevel = 0;
+ }
+ 
+ SparkleDeltaArchiveMetadata metadata = {.compressionLevel = compressionLevel, .fileSystemCompression = header.fileSystemCompression};
+ 
+ if (fwrite(&metadata, sizeof(metadata), 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write metadata value due to io error" };
+ return;
+ }
+ 
+ switch (compression) {
+ case SPUDeltaCompressionModeNone:
+ break;
+ case SPUDeltaCompressionModeBzip2: {
+ int bzerror = 0;
+ // Compression level can be 1 - 9
+ int blockSize100k = (int)compressionLevel;
+ 
+ BZFILE *bzipFile = BZ2_bzWriteOpen(&bzerror, file, blockSize100k, 0, 0);
+ if (bzipFile == NULL) {
+ switch (bzerror) {
+ case BZ_IO_ERROR:
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open bz2 stream for writing due to io error" };
+ break;
+ default:
+ self.error = NSError errorWithDomain:SPARKLE_BZIP2_ERROR_DOMAIN code:bzerror userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open bz2 stream for writing" };
+ break;
+ }
+ 
+ return;
+ }
+ 
+ self.bzipFile = bzipFile;
+ 
+ break;
+ }
+ case SPUDeltaCompressionModeLZMA:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeZLIB: {
+ if (compression_stream_init(&_compressionStream, COMPRESSION_STREAM_ENCODE, _compressionAlgorithmForMode(compression)) != COMPRESSION_STATUS_OK) {
+ self.error = NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: @"Failed to open compression stream for writing" };
+ 
+ return;
+ }
+ 
+ self.initializedCompressionStream = YES;
+ break;
+ }
+ }
+ 
+ if (!self createBuffers) {
+ return;
+ }
+ 
+ uint16_t majorVersion = header.majorVersion;
+ self _writeBuffer:&majorVersion length:sizeof(majorVersion);
+ 
+ uint16_t minorVersion = header.minorVersion;
+ self _writeBuffer:&minorVersion length:sizeof(minorVersion);
+ 
+ self _writeBuffer:header.beforeTreeHash length:CC_SHA1_DIGEST_LENGTH;
+ self _writeBuffer:header.afterTreeHash length:CC_SHA1_DIGEST_LENGTH;
+}
+
+- (void)addItem:(SPUDeltaArchiveItem *)item
+{
+ self.writableItems addObject:item;
+}
+
+- (void)finishEncodingItems
+{
+ if (self.error != nil) {
+ return;
+ }
+ 
+ NSMutableArray<SPUDeltaArchiveItem *> *writableItems = self.writableItems;
+ 
+ // Build relative path table for tracking file clones
+ NSMutableDictionary<NSString *, NSNumber *> *relativePathToIndexTable = NSMutableDictionary dictionary;
+ uint32_t currentRelativePathIndex = 0;
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ NSString *relativePath = item.relativeFilePath;
+ assert(relativePath != nil);
+ 
+ relativePathToIndexTablerelativePath = @(currentRelativePathIndex);
+ currentRelativePathIndex++;
+ }
+ 
+ // Clone commands reference relative file paths in this table but sometimes there may not
+ // be an entry if extraction for an original item was skipped. Fill out any missing file path entries.
+ // For example, if A.app has Contents/A and B.app has Contents/A and Contents/A and Contents/B,
+ // where A and B's contents are the same and A is the same in both apps, normally we would not record Contents/A because its extraction was skipped. However now B is a clone of A so we need a record for A.
+ NSMutableArray<NSString *> *newClonedPathEntries = NSMutableArray array;
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ NSString *clonedRelativePath = item.clonedRelativePath;
+ 
+ if (clonedRelativePath != nil && relativePathToIndexTableclonedRelativePath == nil) {
+ newClonedPathEntries addObject:clonedRelativePath;
+ 
+ relativePathToIndexTableclonedRelativePath = @(currentRelativePathIndex);
+ currentRelativePathIndex++;
+ }
+ }
+ 
+ if (relativePathToIndexTable.count > UINT32_MAX) {
+ // Very unlikely but we should guard against this
+ // Clones rely on 32-bit indexes
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"There are too many file entries to create a patch for (more than %u)", UINT32_MAX };
+ return;
+ }
+ 
+ // Compute length of path section to write
+ uint64_t totalPathLength = 0;
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ NSString *relativePath = item.relativeFilePath;
+ 
+ char relativePathStringPATH_MAX + 1 = {0};
+ if (!relativePath getFileSystemRepresentation:relativePathString maxLength:sizeof(relativePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path cannot be retrieved and expressed as a file system representation: %@", relativePath };
+ break;
+ }
+ 
+ totalPathLength += strlen(relativePathString) + 1;
+ }
+ for (NSString *clonedPathEntry in newClonedPathEntries) {
+ char relativePathStringPATH_MAX + 1 = {0};
+ if (!clonedPathEntry getFileSystemRepresentation:relativePathString maxLength:sizeof(relativePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path for clone cannot be retrieved and expressed as a file system representation: %@", clonedPathEntry };
+ break;
+ }
+ 
+ totalPathLength += strlen(relativePathString) + 1;
+ }
+ 
+ if (self.error != nil) {
+ return;
+ }
+ 
+ // Write total expected length of path section
+ if (!self _writeBuffer:&totalPathLength length:sizeof(totalPathLength)) {
+ return;
+ }
+ 
+ // Write all of the relative paths
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ NSString *relativePath = item.relativeFilePath;
+ 
+ char pathBufferPATH_MAX + 1 = {0};
+ if (!relativePath getFileSystemRepresentation:pathBuffer maxLength:PATH_MAX) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path cannot be encoded and expressed as a file system representation: %@", relativePath };
+ break;
+ }
+ 
+ if (!self _writeBuffer:pathBuffer length:(int32_t)strlen(pathBuffer) + 1) {
+ break;
+ }
+ }
+ for (NSString *clonedPathEntry in newClonedPathEntries) {
+ char pathBufferPATH_MAX + 1 = {0};
+ if (!clonedPathEntry getFileSystemRepresentation:pathBuffer maxLength:PATH_MAX) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path for clone cannot be encoded and expressed as a file system representation: %@", clonedPathEntry };
+ break;
+ }
+ 
+ if (!self _writeBuffer:pathBuffer length:(int32_t)strlen(pathBuffer) + 1) {
+ break;
+ }
+ }
+ 
+ if (self.error != nil) {
+ return;
+ }
+ 
+ // Encode the items
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ // Store commands
+ SPUDeltaItemCommands commands = item.commands;
+ if (!self _writeBuffer:&commands length:sizeof(commands)) {
+ break;
+ }
+ 
+ // Check if we need to encode additional data
+ if ((commands & SPUDeltaItemCommandClone) != 0) {
+ // Store any desired file permissions changes for the clone
+ // Clones can be binary diffs from other sources too. Since we are creating a
+ // new file in that case (rather than a copy) we want to store file mode as well
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ NSString *sourcePath = item.sourcePath;
+ assert(sourcePath != nil);
+ 
+ char sourcePathStringPATH_MAX + 1 = {0};
+ if (!sourcePath getFileSystemRepresentation:sourcePathString maxLength:sizeof(sourcePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path cannot be decoded and expressed as a file system representation while encoding cloned binary diff item: %@", sourcePath };
+ break;
+ }
+ 
+ struct stat fileInfo = {0};
+ if (lstat(sourcePathString, &fileInfo) != 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to lstat() on %@", sourcePath };
+ break;
+ }
+ 
+ uint16_t extractMode = fileInfo.st_mode;
+ uint16_t encodedMode;
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ encodedMode = (extractMode & ~PERMISSION_FLAGS) | item.mode;
+ } else {
+ encodedMode = extractMode;
+ }
+ 
+ item.mode = extractMode;
+ 
+ // Store file mode (including desired permissions)
+ if (!self _writeBuffer:&encodedMode length:sizeof(encodedMode)) {
+ break;
+ }
+ }
+ 
+ // Store index to relative path table
+ NSString *clonedRelativePath = item.clonedRelativePath;
+ assert(clonedRelativePath != nil);
+ 
+ NSNumber *relativePathIndex = relativePathToIndexTableclonedRelativePath;
+ if (relativePathIndex == nil) {
+ // We have quite a problem here
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative file path index for %@ could not be located", clonedRelativePath };
+ break;
+ }
+ 
+ uint32_t relativePathCIndex = relativePathIndex.unsignedIntValue;
+ if (!self _writeBuffer:&relativePathCIndex length:sizeof(relativePathCIndex)) {
+ break;
+ }
+ 
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ NSString *itemPath = item.itemFilePath;
+ assert(itemPath != nil);
+ 
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemPath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path cannot be decoded and expressed as a file system representation while encoding cloned binary diff item: %@", itemPath };
+ break;
+ }
+ 
+ struct stat fileInfo = {0};
+ if (lstat(itemFilePathString, &fileInfo) != 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to lstat() on %@", itemPath };
+ break;
+ }
+ 
+ uint64_t dataLength = (uint64_t)fileInfo.st_size;
+ if (!self _writeBuffer:&dataLength length:sizeof(dataLength)) {
+ break;
+ }
+ 
+ item.codedDataLength = dataLength;
+ }
+ } else if ((commands & SPUDeltaItemCommandExtract) != 0 || (commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ uint16_t extractMode = 0;
+ 
+ if ((commands & SPUDeltaItemCommandExtract) != 0 || (commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ NSString *sourcePath = item.sourcePath;
+ assert(sourcePath != nil);
+ 
+ char sourceFilePathStringPATH_MAX + 1 = {0};
+ if (!sourcePath getFileSystemRepresentation:sourceFilePathString maxLength:sizeof(sourceFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path cannot be decoded and expressed as a file system representation while encoding items: %@", sourcePath };
+ break;
+ }
+ 
+ struct stat sourceFileInfo = {0};
+ if (lstat(sourceFilePathString, &sourceFileInfo) != 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to lstat() on %@", sourcePath };
+ break;
+ }
+ 
+ // For symbolic links we always default to 0755 when adding new items
+ // Symbolic link permissions can get more easily lost when moving to other (linux) filesystems,
+ // so we only support the macOS default
+ if (S_ISLNK(sourceFileInfo.st_mode)) {
+ extractMode = (sourceFileInfo.st_mode & ~PERMISSION_FLAGS) | VALID_SYMBOLIC_LINK_PERMISSIONS;
+ } else {
+ extractMode = sourceFileInfo.st_mode;
+ }
+ 
+ uint16_t encodedMode;
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ encodedMode = (extractMode & ~PERMISSION_FLAGS) | item.mode;
+ } else {
+ encodedMode = extractMode;
+ }
+ 
+ item.mode = extractMode;
+ 
+ // Store file mode (including desired permissions)
+ if (!self _writeBuffer:&encodedMode length:sizeof(encodedMode)) {
+ break;
+ }
+ }
+ 
+ // Store data length
+ // Length doesn't matter for directory names (we already track the name in the relative path)
+ 
+ NSString *itemPath = item.itemFilePath;
+ assert(itemPath != nil);
+ 
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemPath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path cannot be decoded and expressed as a file system representation while encoding items: %@", itemPath };
+ break;
+ }
+ 
+ struct stat itemFileInfo = {0};
+ if (lstat(itemFilePathString, &itemFileInfo) != 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to lstat() on %@", itemPath };
+ break;
+ }
+ 
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0 || S_ISREG(extractMode)) {
+ uint64_t dataLength = (uint64_t)itemFileInfo.st_size;
+ if (!self _writeBuffer:&dataLength length:sizeof(dataLength)) {
+ break;
+ }
+ 
+ item.codedDataLength = dataLength;
+ } else if (S_ISLNK(extractMode)) {
+ off_t fileSize = itemFileInfo.st_size;
+ if (fileSize > UINT16_MAX) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Link path has a destination that is too long: %llu bytes", fileSize };
+ break;
+ }
+ 
+ uint16_t dataLength = (uint16_t)fileSize;
+ if (!self _writeBuffer:&dataLength length:sizeof(dataLength)) {
+ break;
+ }
+ 
+ item.codedDataLength = dataLength;
+ }
+ } else if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ // Store file permissions
+ uint16_t mode = item.mode;
+ if (!self _writeBuffer:&mode length:sizeof(mode)) {
+ break;
+ }
+ }
+ }
+ 
+ if (self.error != nil) {
+ return;
+ }
+ 
+ // Encode end command marker
+ SPUDeltaItemCommands endCommand = SPUDeltaItemCommandEndMarker;
+ if (!self _writeBuffer:&endCommand length:sizeof(endCommand)) {
+ return;
+ }
+ 
+ // Encode all of our file contents
+ void *tempBuffer = self.partialChunkBuffer;
+ for (SPUDeltaArchiveItem *item in writableItems) {
+ SPUDeltaItemCommands commands = item.commands;
+ if ((commands & SPUDeltaItemCommandExtract) != 0 || (commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ NSString *itemPath = item.itemFilePath;
+ assert(itemPath != nil);
+ 
+ mode_t extractMode = item.mode;
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0 || S_ISREG(extractMode)) {
+ // Write out file contents to archive in chunks
+ 
+ uint64_t totalItemSize = item.codedDataLength;
+ if (totalItemSize > 0) {
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemPath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Path to finish encoding cannot be decoded and expressed as a file system representation: %@", itemPath };
+ break;
+ }
+ 
+ FILE *inputFile = fopen(itemFilePathString, "rb");
+ if (inputFile == NULL) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open file for reading while encoding items: %@", itemPath };
+ break;
+ }
+ 
+ uint64_t bytesLeftoverToCopy = totalItemSize;
+ while (bytesLeftoverToCopy > 0) {
+ uint64_t currentBlockSize = (bytesLeftoverToCopy >= PARTIAL_IO_CHUNK_SIZE) ? PARTIAL_IO_CHUNK_SIZE : bytesLeftoverToCopy;
+ 
+ if (fread(tempBuffer, currentBlockSize, 1, inputFile) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read %llu chunk bytes while encoding items", currentBlockSize };
+ break;
+ }
+ 
+ if (!self _writeBuffer:tempBuffer length:(int32_t)currentBlockSize) {
+ break;
+ }
+ 
+ bytesLeftoverToCopy -= currentBlockSize;
+ }
+ 
+ fclose(inputFile);
+ 
+ if (self.error != nil) {
+ break;
+ }
+ }
+ } else if (S_ISLNK(extractMode)) {
+ char itemFilePathStringPATH_MAX + 1 = {0};
+ if (!itemPath getFileSystemRepresentation:itemFilePathString maxLength:sizeof(itemFilePathString) - 1) {
+ self.error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Link path to finish encoding cannot be decoded and expressed as a file system representation: %@", itemPath };
+ break;
+ }
+ 
+ char linkDestinationPATH_MAX + 1 = {0};
+ ssize_t linkDestinationLength = readlink(itemFilePathString, linkDestination, PATH_MAX);
+ if (linkDestinationLength < 0) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to readlink() file at %@", itemPath };
+ break;
+ }
+ 
+ if (!self _writeBuffer:linkDestination length:(int32_t)strlen(linkDestination)) {
+ break;
+ }
+ }
+ }
+ }
+ 
+ // Close up and write final data to compressed streams
+ 
+ if (self.bzipFile != NULL) {
+ int bzerror = 0;
+ BZ2_bzWriteClose64(&bzerror, self.bzipFile, 0, NULL, NULL, NULL, NULL);
+ if (bzerror == BZ_IO_ERROR) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write and close bzip2 file due to IO error" };
+ return;
+ }
+ } else if (self.initializedCompressionStream) {
+ void *compressionBuffer = self.compressionBuffer;
+ FILE *file = self.file;
+ 
+ _compressionStream.src_size = 0;
+ 
+ while (_compressionStream.dst_size > 0) {
+ _compressionStream.dst_ptr = compressionBuffer;
+ _compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
+ 
+ compression_status status = compression_stream_process(&_compressionStream, COMPRESSION_STREAM_FINALIZE);
+ if (status == COMPRESSION_STATUS_ERROR) {
+ self.error = NSError errorWithDomain:SPARKLE_COMPRESSION_ERROR_DOMAIN code:COMPRESSION_STATUS_ERROR userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write final bits of Compression based file" };
+ return;
+ }
+ 
+ size_t compressedBytesToWrite = (size_t)(_compressionStream.dst_ptr - (uint8_t *)compressionBuffer);
+ if (compressedBytesToWrite > 0) {
+ if (fwrite(compressionBuffer, compressedBytesToWrite, 1, file) < 1) {
+ self.error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: @"Failed to write and close Compression based file due to io error" };
+ return;
+ }
+ }
+ 
+ if (status == COMPRESSION_STATUS_END) {
+ // We're done
+ break;
+ }
+ }
+ }
+}
+
+@end
+
+#pragma clang diagnostic pop

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUXarDeltaArchive.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SPUXarDeltaArchive.m Added

@@ -0,0 +1,416 @@
+//
+// SPUXarDeltaArchive.m
+// Autoupdate
+//
+// Created by Mayur Pawashe on 12/28/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUXarDeltaArchive.h"
+#include <xar/xar.h>
+#include "SUBinaryDeltaCommon.h"
+#import <Availability.h>
+#import <CommonCrypto/CommonDigest.h>
+
+
+#include "AppKitPrevention.h"
+
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
+ #define HAS_XAR_GET_SAFE_PATH 1
+#else
+ #define HAS_XAR_GET_SAFE_PATH 0
+#endif
+
+#if HAS_XAR_GET_SAFE_PATH
+// This is preferred over xar_get_path (which is deprecated) when it's available
+// Don't use OS availability for this API
+extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
+#endif
+
+// Xar attribute keys
+#define BINARY_DELTA_ATTRIBUTES_KEY "binary-delta-attributes"
+#define MAJOR_DIFF_VERSION_KEY "major-version"
+#define MINOR_DIFF_VERSION_KEY "minor-version"
+#define BEFORE_TREE_SHA1_KEY "before-tree-sha1"
+#define AFTER_TREE_SHA1_KEY "after-tree-sha1"
+#define DELETE_KEY "delete"
+#define EXTRACT_KEY "extract"
+#define BINARY_DELTA_KEY "binary-delta"
+#define MODIFY_PERMISSIONS_KEY "mod-permissions"
+
+// Errors
+#define SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN @"Sparkle XAR Archive"
+#define SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_OPEN_FAILURE 1
+#define SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_ADD_FAILURE 2
+#define SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_EXTRACT_FAILURE 3
+#define SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_UNSUPPORTED_COMPRESSION_FAILURE 4
+
+@interface SPUXarDeltaArchive ()
+
+@property (nonatomic) xar_t x;
+@property (nonatomic, readonly) int32_t xarMode;
+@property (nonatomic, readonly) NSMutableDictionary<NSString *, NSValue *> *fileTable;
+@property (nonatomic, readonly) NSString *patchFile;
+@property (nonatomic) NSError *error;
+
+@end
+
+@implementation SPUXarDeltaArchive
+
+@synthesize x = _x;
+@synthesize xarMode = _xarMode;
+@synthesize patchFile = _patchFile;
+@synthesize fileTable = _fileTable;
+@synthesize error = _error;
+
+- (instancetype)initWithPatchFileForWriting:(NSString *)patchFile
+{
+ self = super init;
+ if (self != nil) {
+ _patchFile = patchFile copy;
+ _xarMode = WRITE;
+ _fileTable = NSMutableDictionary dictionary;
+ }
+ return self;
+}
+
+- (instancetype)initWithPatchFileForReading:(NSString *)patchFile
+{
+ self = super init;
+ if (self != nil) {
+ _patchFile = patchFile copy;
+ _xarMode = READ;
+ }
+ return self;
+}
+
+- (void)dealloc
+{
+ self close;
+}
+
+- (void)close
+{
+ if (self.x != NULL) {
+ xar_close(self.x);
+ self.x = NULL;
+ }
+}
+
+// This indicates if safe extraction is available at compile time (SDK), but not if it's available at runtime.
++ (BOOL)maySupportSafeExtraction
+{
+ return HAS_XAR_GET_SAFE_PATH;
+}
+
+- (nullable SPUDeltaArchiveHeader *)readHeader
+{
+ NSString *patchFile = self.patchFile;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // Sparkle's XAR delta archives have been superceded by Sparkle's own format
+ xar_t x = xar_open(patchFile.fileSystemRepresentation, READ);
+#pragma clang diagnostic pop
+ if (x == NULL) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_OPEN_FAILURE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to xar_open() file for reading: %@", patchFile };
+ return nil;
+ }
+ 
+ self.x = x;
+ 
+ uint16_t majorDiffVersion = SUBinaryDeltaMajorVersionFirst;
+ uint16_t minorDiffVersion = 0;
+ NSString *expectedBeforeHash = nil;
+ NSString *expectedAfterHash = nil;
+
+ xar_subdoc_t subdoc;
+ for (subdoc = xar_subdoc_first(self.x); subdoc; subdoc = xar_subdoc_next(subdoc)) {
+ if (strcmp(xar_subdoc_name(subdoc), BINARY_DELTA_ATTRIBUTES_KEY) == 0) {
+ {
+ // available in version 2.0 or later
+ const char *value = NULL;
+ xar_subdoc_prop_get(subdoc, MAJOR_DIFF_VERSION_KEY, &value);
+ if (value != NULL) {
+ majorDiffVersion = (uint16_t)@(value) intValue;
+ }
+ }
+
+ {
+ // available in version 2.0 or later
+ const char *value = NULL;
+ xar_subdoc_prop_get(subdoc, MINOR_DIFF_VERSION_KEY, &value);
+ if (value != NULL) {
+ minorDiffVersion = (uint16_t)@(value) intValue;
+ }
+ }
+ 
+ // available in version 2.0 or later
+ {
+ const char *value = NULL;
+ xar_subdoc_prop_get(subdoc, BEFORE_TREE_SHA1_KEY, &value);
+ if (value != NULL) {
+ expectedBeforeHash = @(value);
+ }
+ }
+
+ // available in version 2.0 or later
+ {
+ const char *value = NULL;
+ xar_subdoc_prop_get(subdoc, AFTER_TREE_SHA1_KEY, &value);
+ if (value != NULL) {
+ expectedAfterHash = @(value);
+ }
+ }
+ }
+ }
+ 
+ unsigned char rawExpectedBeforeHashCC_SHA1_DIGEST_LENGTH = {0};
+ getRawHashFromDisplayHash(rawExpectedBeforeHash, expectedBeforeHash);
+ 
+ unsigned char rawExpectedAfterHashCC_SHA1_DIGEST_LENGTH = {0};
+ getRawHashFromDisplayHash(rawExpectedAfterHash, expectedAfterHash);
+ 
+ // I wasn't able to figure out how to retrieve the compression options from xar,
+ // so we will use default flags to indicate the info isn't available
+ return SPUDeltaArchiveHeader alloc initWithCompression:SPUDeltaCompressionModeDefault compressionLevel:0 fileSystemCompression:false majorVersion:majorDiffVersion minorVersion:minorDiffVersion beforeTreeHash:rawExpectedBeforeHash afterTreeHash:rawExpectedAfterHash;
+}
+
+- (void)writeHeader:(SPUDeltaArchiveHeader *)header
+{
+ NSString *patchFile = self.patchFile;
+ 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // Sparkle's XAR delta archives have been superceded by Sparkle's own format
+ xar_t x = xar_open(patchFile.fileSystemRepresentation, WRITE);
+#pragma clang diagnostic pop
+ if (x == NULL) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_OPEN_FAILURE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to xar_open() file for writing: %@", patchFile };
+ return;
+ }
+ 
+ self.x = x;
+ 
+ SPUDeltaCompressionMode compression = (header.compression == SPUDeltaCompressionModeDefault ? SPUDeltaCompressionModeBzip2 : header.compression);
+ 
+ uint8_t compressionLevel;
+ // Only 1 - 9 are valid, 0 is special case to use default level 9
+ if (header.compressionLevel <= 0 || header.compressionLevel > 9) {
+ compressionLevel = 9;
+ } else {
+ compressionLevel = header.compressionLevel;
+ }
+ 
+ switch (compression) {
+ case SPUDeltaCompressionModeNone:
+ xar_opt_set(x, XAR_OPT_COMPRESSION, XAR_OPT_VAL_NONE);
+ break;
+ case SPUDeltaCompressionModeBzip2: {
+ xar_opt_set(x, XAR_OPT_COMPRESSION, "bzip2");
+ 
+ char buffer256 = {0};
+ snprintf(buffer, sizeof(buffer) - 1, "%d", compressionLevel);
+ xar_opt_set(x, XAR_OPT_COMPRESSIONARG, buffer);
+ 
+ break;
+ }
+ case SPUDeltaCompressionModeLZMA:
+ case SPUDeltaCompressionModeLZFSE:
+ case SPUDeltaCompressionModeLZ4:
+ case SPUDeltaCompressionModeZLIB: {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_UNSUPPORTED_COMPRESSION_FAILURE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Version 2 patches only support bzip2 compression." };
+ 
+ return;
+ }
+ }
+ 
+ xar_subdoc_t attributes = xar_subdoc_new(x, BINARY_DELTA_ATTRIBUTES_KEY);
+ 
+ xar_subdoc_prop_set(attributes, MAJOR_DIFF_VERSION_KEY, NSString stringWithFormat:@"%u", header.majorVersion UTF8String);
+ xar_subdoc_prop_set(attributes, MINOR_DIFF_VERSION_KEY, NSString stringWithFormat:@"%u", header.minorVersion UTF8String);
+ 
+ xar_subdoc_prop_set(attributes, BEFORE_TREE_SHA1_KEY, displayHashFromRawHash(header.beforeTreeHash) UTF8String);
+ xar_subdoc_prop_set(attributes, AFTER_TREE_SHA1_KEY, displayHashFromRawHash(header.afterTreeHash) UTF8String);
+}
+
+static xar_file_t _xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTable, xar_t x, NSString *relativePath, NSString *filePath)
+{
+ NSArray<NSString *> *rootRelativePathComponents = relativePath.pathComponents;
+ // Relative path must at least have starting "/" component and one more path component
+ if (rootRelativePathComponents.count < 2) {
+ return NULL;
+ }
+ 
+ NSArray<NSString *> *relativePathComponents = rootRelativePathComponents subarrayWithRange:NSMakeRange(1, rootRelativePathComponents.count - 1);
+ 
+ NSUInteger relativePathComponentsCount = relativePathComponents.count;
+ 
+ // Build parent files as needed until we get to our final file we want to add
+ // So if we get "Contents/Resources/foo.txt", we will first add "Contents" parent,
+ // then "Resources" parent, then "foo.txt" as the final entry we want to add
+ // We store every file we add into a fileTable for easy referencing
+ // Note if a diff has Contents/Resources/foo/ and Contents/Resources/foo/bar.txt,
+ // due to sorting order we will add the foo directory first and won't end up with
+ // mis-ordering bugs
+ xar_file_t lastParent = NULL;
+ for (NSUInteger componentIndex = 0; componentIndex < relativePathComponentsCount; componentIndex++) {
+ NSArray<NSString *> *subpathComponents = relativePathComponents subarrayWithRange:NSMakeRange(0, componentIndex + 1);
+ NSString *subpathKey = subpathComponents componentsJoinedByString:@"/";
+ 
+ xar_file_t cachedFile = fileTablesubpathKey pointerValue;
+ if (cachedFile != NULL) {
+ lastParent = cachedFile;
+ } else {
+ xar_file_t newParent;
+ 
+ BOOL atLastIndex = (componentIndex == relativePathComponentsCount - 1);
+ 
+ NSString *lastPathComponent = subpathComponents.lastObject;
+ if (atLastIndex && filePath != nil) {
+ newParent = xar_add_frompath(x, lastParent, lastPathComponent.fileSystemRepresentation, filePath.fileSystemRepresentation);
+ } else {
+ newParent = xar_add_frombuffer(x, lastParent, lastPathComponent.fileSystemRepresentation, "", 1);
+ }
+ 
+ lastParent = newParent;
+ fileTablesubpathKey = NSValue valueWithPointer:newParent;
+ }
+ }
+ return lastParent;
+}
+
+- (void)addItem:(SPUDeltaArchiveItem *)item
+{
+ if (self.error != nil) {
+ return;
+ }
+ 
+ NSString *relativeFilePath = item.relativeFilePath;
+ NSString *filePath = item.itemFilePath;
+ SPUDeltaItemCommands commands = item.commands;
+ uint16_t mode = item.mode;
+ 
+ xar_file_t newFile = _xarAddFile(self.fileTable, self.x, relativeFilePath, filePath);
+ if (newFile == NULL) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_ADD_FAILURE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to add xar file entry: %@", relativeFilePath };
+ return;
+ }
+ 
+ if ((commands & SPUDeltaItemCommandDelete) != 0) {
+ xar_prop_set(newFile, DELETE_KEY, "true");
+ }
+ 
+ if ((commands & SPUDeltaItemCommandExtract) != 0) {
+ xar_prop_set(newFile, EXTRACT_KEY, "true");
+ }
+ 
+ if ((commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ xar_prop_set(newFile, BINARY_DELTA_KEY, "true");
+ }
+ 
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ xar_prop_set(newFile, MODIFY_PERMISSIONS_KEY, NSString stringWithFormat:@"%u", mode.UTF8String);
+ }
+}
+
+- (void)finishEncodingItems
+{
+ // Items are already encoded when they are extracted prior
+}
+
+- (void)enumerateItems:(void (^)(SPUDeltaArchiveItem *, BOOL *))itemHandler
+{
+ if (self.error != nil) {
+ return;
+ }
+ 
+ BOOL exitedEarly = NO;
+ xar_iter_t iter = xar_iter_new();
+ for (xar_file_t file = xar_file_first(self.x, iter); file; file = xar_file_next(iter)) {
+ char *pathCString;
+#if HAS_XAR_GET_SAFE_PATH
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+ if (xar_get_safe_path != NULL) {
+ pathCString = xar_get_safe_path(file);
+ }
+#pragma clang diagnostic pop
+ else
+#endif
+ {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ pathCString = xar_get_path(file);
+#pragma clang diagnostic pop
+ }
+ 
+ if (pathCString == NULL) {
+ continue;
+ }
+ 
+ NSString *relativePath = NSString alloc initWithBytesNoCopy:pathCString length:strlen(pathCString) encoding:NSUTF8StringEncoding freeWhenDone:YES;
+ if (relativePath == nil) {
+ free(pathCString);
+ continue;
+ }
+ 
+ SPUDeltaItemCommands commands = 0;
+ {
+ const char *value = NULL;
+ if (xar_prop_get(file, DELETE_KEY, &value) == 0) {
+ commands |= SPUDeltaItemCommandDelete;
+ }
+ }
+ {
+ const char *value = NULL;
+ if (xar_prop_get(file, BINARY_DELTA_KEY, &value) == 0) {
+ commands |= SPUDeltaItemCommandBinaryDiff;
+ }
+ }
+ {
+ const char *value = NULL;
+ if (xar_prop_get(file, EXTRACT_KEY, &value) == 0) {
+ commands |= SPUDeltaItemCommandExtract;
+ }
+ }
+ 
+ uint16_t mode = 0;
+ {
+ const char *value = NULL;
+ if (xar_prop_get(file, MODIFY_PERMISSIONS_KEY, &value) == 0) {
+ commands |= SPUDeltaItemCommandModifyPermissions;
+ mode = (uint16_t)@(value) intValue;
+ }
+ }
+ 
+ SPUDeltaArchiveItem *item = SPUDeltaArchiveItem alloc initWithRelativeFilePath:relativePath commands:commands mode:mode;
+ item.xarContext = file;
+ 
+ itemHandler(item, &exitedEarly);
+ if (exitedEarly) {
+ break;
+ }
+ }
+ 
+ xar_iter_free(iter);
+}
+
+- (BOOL)extractItem:(SPUDeltaArchiveItem *)item
+{
+ if (self.error != nil) {
+ return NO;
+ }
+ 
+ assert(item.itemFilePath != nil);
+ assert(item.xarContext != NULL);
+ 
+ xar_file_t file = item.xarContext;
+ if (xar_extract_tofile(self.x, file, item.itemFilePath.fileSystemRepresentation) != 0) {
+ self.error = NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_EXTRACT_FAILURE userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to extract xar file entry to %@", item.itemFilePath };
+ return NO;
+ }
+ 
+ return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaApply.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaApply.m Added

@@ -0,0 +1,481 @@
+//
+// SUBinaryDeltaApply.m
+// Sparkle
+//
+// Created by Mark Rowe on 2009-06-01.
+// Copyright 2009 Mark Rowe. All rights reserved.
+//
+
+#import "SUBinaryDeltaApply.h"
+#import "SUBinaryDeltaCommon.h"
+#import "SPUDeltaArchiveProtocol.h"
+#import "SPUDeltaArchive.h"
+#import <CommonCrypto/CommonDigest.h>
+#import <Foundation/Foundation.h>
+#include "bspatch.h"
+#include <stdio.h>
+#include <stdlib.h>
+#import <sys/stat.h>
+
+
+#include "AppKitPrevention.h"
+
+static BOOL applyBinaryDeltaToFile(NSString *patchFile, NSString *sourceFilePath, NSString *destinationFilePath)
+{
+ const char *argv = {"/usr/bin/bspatch", sourceFilePath fileSystemRepresentation, destinationFilePath fileSystemRepresentation, patchFile fileSystemRepresentation};
+ BOOL success = (bspatch(4, argv) == 0);
+ unlink(patchFile fileSystemRepresentation);
+ return success;
+}
+
+BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *patchFile, BOOL verbose, void (^progressCallback)(double progress), NSError *__autoreleasing *error)
+{
+ SPUDeltaArchiveHeader *header = nil;
+ id<SPUDeltaArchiveProtocol> archive = SPUDeltaArchiveReadPatchAndHeader(patchFile, &header);
+ if (archive.error != nil) {
+ if (error != NULL) {
+ *error = archive.error;
+ }
+ return NO;
+ }
+
+ progressCallback(0/7.0);
+
+ SUBinaryDeltaMajorVersion majorDiffVersion = header.majorVersion;
+ uint16_t minorDiffVersion = header.minorVersion;
+
+ unsigned char *expectedBeforeHash = header.beforeTreeHash;
+ unsigned char *expectedAfterHash = header.afterTreeHash;
+ 
+ if (majorDiffVersion < SUBinaryDeltaMajorVersionFirst) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to identify diff-version %u in delta. Giving up.", majorDiffVersion };
+ }
+ return NO;
+ }
+ 
+ if (majorDiffVersion < SUBinaryDeltaMajorVersionFirstSupported) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Applying version %u patches is no longer supported.", majorDiffVersion };
+ }
+ return NO;
+ }
+
+ if (majorDiffVersion > SUBinaryDeltaMajorVersionLatest) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"A later version is needed to apply this patch (on major version %u, but patch requests version %u).", SUBinaryDeltaMajorVersionLatest, majorDiffVersion };
+ }
+ return NO;
+ }
+ 
+ // Reject patches that did not generate valid hierarchical xar container paths
+ // These will not succeed to patch using recent versions of BinaryDelta
+ if (archive class maySupportSafeExtraction && majorDiffVersion == SUBinaryDeltaMajorVersion2 && minorDiffVersion < 3) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"This patch version (%u.%u) is too old and potentially unsafe to apply. Please re-generate the patch using the latest version of BinaryDelta or generate_appcast. New version %u.%u patches will still be compatible with older versions of Sparkle.", majorDiffVersion, minorDiffVersion, majorDiffVersion, latestMinorVersionForMajorVersion(majorDiffVersion) };
+ }
+ 
+ return NO;
+ }
+
+ if (expectedBeforeHash == nil || expectedAfterHash == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: @"Unable to find before-sha1 or after-sha1 metadata in delta. Giving up." };
+ }
+ return NO;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "Applying version %u.%u patch...\n", majorDiffVersion, minorDiffVersion);
+ fprintf(stderr, "Verifying source...");
+ }
+
+ progressCallback(1/7.0);
+ 
+ unsigned char beforeHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!getRawHashOfTreeWithVersion(beforeHash, source, majorDiffVersion)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to calculate hash of tree %@", source };
+ }
+ return NO;
+ }
+
+ if (memcmp(beforeHash, expectedBeforeHash, CC_SHA1_DIGEST_LENGTH) != 0) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Source doesn't have expected hash (%@ != %@). Giving up.", displayHashFromRawHash(expectedBeforeHash), displayHashFromRawHash(beforeHash) };
+ }
+ return NO;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "\nCopying files...");
+ }
+
+ progressCallback(2/7.0);
+ 
+ // Make a temporary destination path if necessary
+ // If we want to apply file system compression after we're done applying, we'll need to use a different
+ // temporary path
+ NSString *destination;
+ if (header.fileSystemCompression) {
+ destination = finalDestination.stringByDeletingLastPathComponent stringByAppendingPathComponent:NSString stringWithFormat:@".tmp.%@", finalDestination.lastPathComponent;
+ } else {
+ destination = finalDestination;
+ }
+
+ if (!removeTree(destination)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to remove %@", destination };
+ }
+ return NO;
+ }
+
+ progressCallback(3/7.0);
+
+ if (!copyTree(source, destination)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to copy %@ to %@", source, destination };
+ }
+ return NO;
+ }
+
+ progressCallback(4/7.0);
+
+ if (verbose) {
+ fprintf(stderr, "\nPatching...");
+ }
+ NSFileManager *fileManager = NSFileManager alloc init;
+ 
+ // Ensure error is cleared out in advance
+ if (error != NULL) {
+ *error = nil;
+ }
+ 
+ archive enumerateItems:^(SPUDeltaArchiveItem *item, BOOL *stop) {
+ NSString *relativePath = item.relativeFilePath;
+ 
+ if (relativePath.pathComponents containsObject:@"..") {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path '%@' contains '..' path component", relativePath };
+ }
+ *stop = YES;
+ return;
+ }
+ 
+ NSString *sourceFilePath = source stringByAppendingPathComponent:relativePath;
+ NSString *destinationFilePath = destination stringByAppendingPathComponent:relativePath;
+ {
+ NSString *destinationParentDirectory = destinationFilePath.stringByDeletingLastPathComponent;
+ NSDictionary<NSFileAttributeKey, id> *destinationParentDirectoryAttributes = fileManager attributesOfItemAtPath:destinationParentDirectory error:NULL;
+ 
+ // It is OK for the directory parent to not exist if it has already been removed
+ if (destinationParentDirectoryAttributes != nil) {
+ // But if it does exist, make sure the entry in the parent directory we're looking at is good
+ // If it's inside a symlink, this is not good in any circumstance
+ NSString *fileType = destinationParentDirectoryAttributesNSFileType;
+ if (fileType isEqualToString:NSFileTypeSymbolicLink) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to create patch because '%@' cannot be a symbolic link.", destinationParentDirectory };
+ }
+ *stop = YES;
+ return;
+ }
+ }
+ }
+
+ // Don't use -NSFileManager fileExistsAtPath: because it will follow symbolic links
+ BOOL fileExisted = verbose && fileManager attributesOfItemAtPath:destinationFilePath error:nil;
+ BOOL removedFile = NO;
+ 
+ // Files that have no property set that we check for will get ignored
+ // This is important because they aren't part of the delta, just part of the directory structure
+ SPUDeltaItemCommands commands = item.commands;
+ if ((commands & SPUDeltaItemCommandDelete) != 0) {
+ if (!removeTree(destinationFilePath)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"delete: failed to remove %@", destination };
+ }
+ *stop = YES;
+ return;
+ }
+
+ removedFile = YES;
+ }
+
+ if ((commands & SPUDeltaItemCommandClone) != 0 && (commands & SPUDeltaItemCommandBinaryDiff) == 0) {
+ NSString *clonedRelativePath = item.clonedRelativePath;
+ if (clonedRelativePath.pathComponents containsObject:@"..") {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path for clone '%@' contains '..' path component", clonedRelativePath };
+ }
+ *stop = YES;
+ return;
+ }
+ 
+ NSString *clonedOriginalPath = source stringByAppendingPathComponent:clonedRelativePath;
+ 
+ // Ensure there isn't an item already at our destination
+ fileManager removeItemAtPath:destinationFilePath error:NULL;
+ 
+ NSError *copyError = nil;
+ if (!fileManager copyItemAtPath:clonedOriginalPath toPath:destinationFilePath error:&copyError) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = copyError;
+ }
+ 
+ *stop = YES;
+ return;
+ }
+ 
+ if (verbose) {
+ fprintf(stderr, "\n✂️ %s %s -> %s", VERBOSE_CLONED, clonedRelativePath fileSystemRepresentation, relativePath fileSystemRepresentation);
+ }
+ } else if ((commands & SPUDeltaItemCommandBinaryDiff) != 0) {
+ NSString *tempDiffFile = temporaryFilename(@"apply-binary-delta");
+ item.itemFilePath = tempDiffFile;
+ 
+ if (!archive extractItem:item) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to extract diffed file to %@", tempDiffFile, NSUnderlyingErrorKey: (NSError * _Nonnull)archive.error };
+ }
+ 
+ *stop = YES;
+ return;
+ }
+ 
+ NSString *sourceDiffFilePath;
+ NSString *clonedRelativePath;
+ if ((commands & SPUDeltaItemCommandClone) != 0) {
+ clonedRelativePath = item.clonedRelativePath;
+ if (clonedRelativePath.pathComponents containsObject:@"..") {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Relative path for clone '%@' contains '..' path component", clonedRelativePath };
+ }
+ *stop = YES;
+ return;
+ }
+ 
+ sourceDiffFilePath = source stringByAppendingPathComponent:clonedRelativePath;
+ } else {
+ sourceDiffFilePath = sourceFilePath;
+ clonedRelativePath = nil;
+ }
+ 
+ // Decide if we need to preserve original file permissions from the original file
+ // applyBinaryDeltaToFile() normally preserves file permissions on the file it's replacing.
+ // However this is not possible if the destination file we're patching is not writable.
+ // We also need to preserve permissions for clones except when we'll be changing permissions later anyway.
+ BOOL needsToCopyFilePermissions;
+ if (!fileManager isWritableFileAtPath:destinationFilePath) {
+ // Remove the file non-writable we're patching that may cause issues
+ fileManager removeItemAtPath:destinationFilePath error:NULL;
+ 
+ // We will need to preserve permissons if there is no need to make permission changes later on
+ needsToCopyFilePermissions = (commands & SPUDeltaItemCommandModifyPermissions) == 0;
+ } else {
+ needsToCopyFilePermissions = ((commands & SPUDeltaItemCommandClone) != 0) && ((commands & SPUDeltaItemCommandModifyPermissions) == 0);
+ }
+ 
+ if (!applyBinaryDeltaToFile(tempDiffFile, sourceDiffFilePath, destinationFilePath)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to patch %@ to destination %@", sourceFilePath, destinationFilePath };
+ }
+ *stop = YES;
+ return;
+ }
+ 
+ if (needsToCopyFilePermissions) {
+ struct stat sourceFileInfo = {0};
+ if (lstat(sourceDiffFilePath.fileSystemRepresentation, &sourceFileInfo) != 0) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to retrieve stat info from %@", sourceFilePath };
+ }
+ *stop = YES;
+ return;
+ }
+ 
+ if (chmod(destinationFilePath.fileSystemRepresentation, sourceFileInfo.st_mode) != 0) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteNoPermissionError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to modify permissions (%u) on file %@", sourceFileInfo.st_mode, destinationFilePath };
+ }
+ *stop = YES;
+ return;
+ }
+ }
+
+ if (verbose) {
+ if ((commands & SPUDeltaItemCommandClone) != 0) {
+ fprintf(stderr, "\n🔨 %s %s -> %s", VERBOSE_PATCHED, clonedRelativePath fileSystemRepresentation, relativePath fileSystemRepresentation);
+ } else {
+ fprintf(stderr, "\n🔨 %s %s", VERBOSE_PATCHED, relativePath fileSystemRepresentation);
+ }
+ }
+ } else if ((commands & SPUDeltaItemCommandExtract) != 0) { // extract and permission modifications don't coexist
+ item.itemFilePath = destinationFilePath;
+ if (!archive extractItem:item) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to extract file to %@", destinationFilePath, NSUnderlyingErrorKey: (NSError * _Nonnull)archive.error };
+ }
+ *stop = YES;
+ return;
+ }
+
+ if (verbose) {
+ if (fileExisted) {
+ fprintf(stderr, "\n✏️ %s %s", VERBOSE_UPDATED, relativePath fileSystemRepresentation);
+ } else {
+ fprintf(stderr, "\n✅ %s %s", VERBOSE_ADDED, relativePath fileSystemRepresentation);
+ }
+ }
+ } else if (verbose && removedFile) {
+ fprintf(stderr, "\n❌ %s %s", VERBOSE_DELETED, relativePath fileSystemRepresentation);
+ }
+
+ if ((commands & SPUDeltaItemCommandModifyPermissions) != 0) {
+ mode_t mode = (mode_t)item.mode;
+ if (!modifyPermissions(destinationFilePath, mode)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteNoPermissionError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to modify permissions (%u) on file %@", mode, destinationFilePath };
+ }
+ *stop = YES;
+ return;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "\n👮 %s %s (0%o)", VERBOSE_MODIFIED, relativePath fileSystemRepresentation, mode & PERMISSION_FLAGS);
+ }
+ }
+ };
+ 
+ archive close;
+ 
+ // Set error from enumerating items if we have encountered an error and haven't set it yet
+ NSError *archiveError = archive.error;
+ if (archiveError != nil) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL && *error == nil) {
+ *error = archiveError;
+ }
+ removeTree(destination);
+ return NO;
+ }
+
+ progressCallback(5/7.0);
+ 
+ // Re-apply file system compression is requested
+ if (header.fileSystemCompression) {
+ if (verbose) {
+ fprintf(stderr, "\nApplying file system compression...");
+ }
+ 
+ NSTask *dittoTask = NSTask alloc init;
+ 
+ dittoTask.executableURL = NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO;
+ dittoTask.arguments = @@"--hfsCompression", destination, finalDestination;
+ 
+ // If we fail to apply file system compression, we will try falling back to not doing this
+ BOOL failedToApplyFileSystemCompression = NO;
+ 
+ NSError *launchError = nil;
+ if (!dittoTask launchAndReturnError:&launchError) {
+ failedToApplyFileSystemCompression = YES;
+ 
+ fprintf(stderr, "\nWarning: failed to launch ditto task for file compression: %s", launchError.localizedDescription.UTF8String);
+ }
+ 
+ if (!failedToApplyFileSystemCompression) {
+ dittoTask waitUntilExit;
+ 
+ if (dittoTask.terminationStatus != 0) {
+ failedToApplyFileSystemCompression = YES;
+ 
+ fprintf(stderr, "\nWarning: ditto task for file compression returned exit status %d", dittoTask.terminationStatus);
+ }
+ }
+ 
+ if (failedToApplyFileSystemCompression) {
+ // Try to replace bundle normally
+ if (!fileManager replaceItemAtURL:NSURL fileURLWithPath:finalDestination withItemAtURL:NSURL fileURLWithPath:destination isDirectory:YES backupItemName:nil options:0 resultingItemURL:NULL error:error) {
+ removeTree(destination);
+ return NO;
+ }
+ } else {
+ // Remove original copy
+ fileManager removeItemAtURL:NSURL fileURLWithPath:destination isDirectory:YES error:NULL;
+ }
+ }
+ 
+ progressCallback(6/7.0);
+ 
+ if (verbose) {
+ fprintf(stderr, "\nVerifying destination...");
+ }
+ 
+ unsigned char afterHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!getRawHashOfTreeWithVersion(afterHash, finalDestination, majorDiffVersion)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Unable to calculate hash of tree %@", finalDestination };
+ }
+ removeTree(finalDestination);
+ return NO;
+ }
+
+ if (memcmp(afterHash, expectedAfterHash, CC_SHA1_DIGEST_LENGTH) != 0) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Destination doesn't have expected hash (%@ != %@). Giving up.", displayHashFromRawHash(expectedAfterHash), displayHashFromRawHash(afterHash) };
+ }
+ removeTree(finalDestination);
+ return NO;
+ }
+
+ progressCallback(7/7.0);
+
+ if (verbose) {
+ fprintf(stderr, "\nDone!\n");
+ }
+ return YES;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaCommon.h Added

@@ -0,0 +1,77 @@
+//
+// SUBinaryDeltaCommon.h
+// Sparkle
+//
+// Created by Mark Rowe on 2009-06-01.
+// Copyright 2009 Mark Rowe. All rights reserved.
+//
+
+#ifndef SUBINARYDELTACOMMON_H
+#define SUBINARYDELTACOMMON_H
+
+#import <Foundation/Foundation.h>
+#import "SPUDeltaCompressionMode.h"
+#include <fts.h>
+
+#define PERMISSION_FLAGS (S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISVTX)
+#define VALID_SYMBOLIC_LINK_PERMISSIONS 0755
+// Enforcing Sparkle's executable permissions to be valid allows us to perform a preflight test before
+// downloading delta items
+#define VALID_SPARKLE_EXECUTABLE_PERMISSIONS 0755
+
+#define APPLE_CODE_SIGN_XATTR_CODE_DIRECTORY_KEY "com.apple.cs.CodeDirectory"
+#define APPLE_CODE_SIGN_XATTR_CODE_REQUIREMENTS_KEY "com.apple.cs.CodeRequirements"
+#define APPLE_CODE_SIGN_XATTR_CODE_SIGNATURE_KEY "com.apple.cs.CodeSignature"
+
+#define VERBOSE_DELETED "Deleted" // file is deleted from the file system when applying a patch
+#define VERBOSE_REMOVED "Removed" // file is set to be removed when creating a patch
+#define VERBOSE_ADDED "Added" // file is added to the patch or file system
+#define VERBOSE_DIFFED "Diffed" // file is diffed when creating a patch
+#define VERBOSE_PATCHED "Patched" // file is patched when applying a patch
+#define VERBOSE_UPDATED "Updated" // file's contents are updated
+#define VERBOSE_MODIFIED "Modified" // file's metadata is modified
+#define VERBOSE_CLONED "Cloned" // file is cloned in content from a differently named file
+
+#define MAJOR_VERSION_IS_AT_LEAST(actualMajor, expectedMajor) (actualMajor >= expectedMajor)
+
+// Relative path of custom icon data that may be set on a bundle via a resource fork
+#define CUSTOM_ICON_PATH @"/Icon\r"
+
+// Changes that break backwards compatibility will have different major versions
+// Changes that affect creating but not applying patches will have different minor versions
+typedef NS_ENUM(uint16_t, SUBinaryDeltaMajorVersion)
+{
+ // Note: support for creating or applying version 1 deltas have been removed
+ SUBinaryDeltaMajorVersion1 = 1,
+ SUBinaryDeltaMajorVersion2 = 2,
+ SUBinaryDeltaMajorVersion3 = 3
+};
+
+extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionDefault;
+extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionLatest;
+extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirst;
+extern SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirstSupported;
+
+#define COMPRESSION_METHOD_ARGUMENT_DESCRIPTION @"The compression method to use for generating delta updates. Supported methods for version 3 delta files are 'lzma', 'bzip2', 'zlib', 'lzfse', 'lz4', 'none', and 'default'. Note that version 2 delta files only support 'bzip2', 'none', and 'default' so other methods will be ignored if version 2 files are being generated. The 'default' compression for version 3 delta files is currently lzma."
+
+#define COMPRESSION_LEVEL_ARGUMENT_DESCRIPTION @"The compression level to use for generating delta updates. This only applies if the compression method used is bzip2 which accepts values from 1 - 9. A special value of 0 will use the default compression level."
+
+SPUDeltaCompressionMode deltaCompressionModeFromDescription(NSString *description, BOOL *requestValid);
+NSString *deltaCompressionStringFromMode(SPUDeltaCompressionMode mode);
+
+extern int compareFiles(const FTSENT **a, const FTSENT **b);
+BOOL getRawHashOfTreeWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion);
+BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary);
+NSString *displayHashFromRawHash(const unsigned char *hash);
+void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash);
+extern NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion);
+extern NSString *hashOfTree(NSString *path);
+extern BOOL removeTree(NSString *path);
+extern BOOL copyTree(NSString *source, NSString *dest);
+extern BOOL modifyPermissions(NSString *path, mode_t desiredPermissions);
+extern NSString *pathRelativeToDirectory(NSString *directory, NSString *path);
+NSString *temporaryFilename(NSString *base);
+NSString *temporaryDirectory(NSString *base);
+NSString *stringWithFileSystemRepresentation(const char*);
+uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersion);
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaCommon.m Added

@@ -0,0 +1,384 @@
+//
+// SUBinaryDeltaCommon.m
+// Sparkle
+//
+// Created by Mark Rowe on 2009-06-01.
+// Copyright 2009 Mark Rowe. All rights reserved.
+//
+
+#include "SUBinaryDeltaCommon.h"
+#import "SUFileManager.h"
+#include <CommonCrypto/CommonDigest.h>
+#include <Foundation/Foundation.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <xlocale.h>
+
+#include "AppKitPrevention.h"
+
+// Note: the framework bundle version must be bumped, and generate_appcast must be updated to compare it,
+// when we add/change new major versions and defaults. Unit tests need to be updated to use new versions too.
+SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionDefault = SUBinaryDeltaMajorVersion3;
+SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionLatest = SUBinaryDeltaMajorVersion3;
+SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirst = SUBinaryDeltaMajorVersion1;
+SUBinaryDeltaMajorVersion SUBinaryDeltaMajorVersionFirstSupported = SUBinaryDeltaMajorVersion2;
+
+SPUDeltaCompressionMode deltaCompressionModeFromDescription(NSString *requestedDescription, BOOL *requestValid)
+{
+ // Set to NO later if request was not valid
+ if (requestValid != NULL) {
+ *requestValid = YES;
+ }
+ 
+ SPUDeltaCompressionMode compression;
+ NSString *description = requestedDescription.lowercaseString;
+ 
+ if (description isEqualToString:@"default") {
+ compression = SPUDeltaCompressionModeDefault;
+ } else if (description isEqualToString:@"none") {
+ compression = SPUDeltaCompressionModeNone;
+ } else if (description isEqualToString:@"bzip2") {
+ compression = SPUDeltaCompressionModeBzip2;
+ } else if (description isEqualToString:@"lzma") {
+ compression = SPUDeltaCompressionModeLZMA;
+ } else if (description isEqualToString:@"lzfse") {
+ compression = SPUDeltaCompressionModeLZFSE;
+ } else if (description isEqualToString:@"lz4") {
+ compression = SPUDeltaCompressionModeLZ4;
+ } else if (description isEqualToString:@"zlib") {
+ compression = SPUDeltaCompressionModeZLIB;
+ } else {
+ compression = SPUDeltaCompressionModeDefault;
+ 
+ if (requestValid != NULL) {
+ *requestValid = NO;
+ }
+ }
+ 
+ return compression;
+}
+
+NSString *deltaCompressionStringFromMode(SPUDeltaCompressionMode mode)
+{
+ switch (mode) {
+ case SPUDeltaCompressionModeBzip2:
+ return @"bzip2";
+ case SPUDeltaCompressionModeLZMA:
+ return @"LZMA";
+ case SPUDeltaCompressionModeNone:
+ return @"no";
+ case SPUDeltaCompressionModeLZ4:
+ return @"LZ4";
+ case SPUDeltaCompressionModeLZFSE:
+ return @"LZFSE";
+ case SPUDeltaCompressionModeZLIB:
+ return @"ZLIB";
+ default:
+ break;
+ }
+ 
+ if (mode == SPUDeltaCompressionModeDefault) {
+ return @"default";
+ }
+ 
+ return @"unknown";
+}
+
+int compareFiles(const FTSENT **a, const FTSENT **b)
+{
+ return strcoll_l((*a)->fts_name, (*b)->fts_name, _c_locale);
+}
+
+NSString *pathRelativeToDirectory(NSString *directory, NSString *path)
+{
+ NSUInteger directoryLength = directory length;
+ if (path hasPrefix:directory)
+ return path substringFromIndex:directoryLength;
+
+ return path;
+}
+
+NSString *stringWithFileSystemRepresentation(const char *input)
+{
+ return NSFileManager defaultManager stringWithFileSystemRepresentation:input length:strlen(input);
+}
+
+uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersion)
+{
+ switch (majorVersion) {
+ case SUBinaryDeltaMajorVersion1:
+ return 2;
+ case SUBinaryDeltaMajorVersion2:
+ return 4;
+ case SUBinaryDeltaMajorVersion3:
+ return 1;
+ }
+ return 0;
+}
+
+NSString *temporaryFilename(NSString *base)
+{
+ NSString *template = NSTemporaryDirectory() stringByAppendingPathComponent:NSString stringWithFormat:@"%@.XXXXXXXXXX", base;
+ NSMutableData *data = NSMutableData data;
+ data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1;
+
+ char *buffer = data.mutableBytes;
+ int fd = mkstemp(buffer);
+ if (fd == -1) {
+ perror("mkstemp");
+ return nil;
+ }
+
+ if (close(fd) != 0) {
+ perror("close");
+ return nil;
+ }
+
+ return stringWithFileSystemRepresentation(buffer);
+}
+
+NSString *temporaryDirectory(NSString *base)
+{
+ NSString *template = NSTemporaryDirectory() stringByAppendingPathComponent:NSString stringWithFormat:@"%@.XXXXXXXXXX", base;
+ NSMutableData *data = NSMutableData data;
+ data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1;
+
+ char *buffer = data.mutableBytes;
+ char *templateResult = mkdtemp(buffer);
+ if (templateResult == NULL) {
+ perror("mkdtemp");
+ return nil;
+ }
+
+ return stringWithFileSystemRepresentation(templateResult);
+}
+
+static void _hashOfBuffer(unsigned char *hash, const char *buffer, ssize_t bufferLength)
+{
+ assert(bufferLength >= 0 && bufferLength <= UINT32_MAX);
+ CC_SHA1_CTX hashContext;
+ CC_SHA1_Init(&hashContext);
+ CC_SHA1_Update(&hashContext, buffer, (CC_LONG)bufferLength);
+ CC_SHA1_Final(hash, &hashContext);
+}
+
+static BOOL _hashOfFileContents(unsigned char *hash, FTSENT *ent, void *tempBuffer, size_t tempBufferSize)
+{
+ if (ent->fts_info == FTS_SL) {
+ char linkDestinationMAXPATHLEN + 1;
+ ssize_t linkDestinationLength = readlink(ent->fts_path, linkDestination, MAXPATHLEN);
+ if (linkDestinationLength < 0) {
+ perror("readlink");
+ return NO;
+ }
+
+ _hashOfBuffer(hash, linkDestination, linkDestinationLength);
+ } else if (ent->fts_info == FTS_F) {
+ ssize_t fileSize = ent->fts_statp->st_size;
+ if (fileSize <= 0) {
+ _hashOfBuffer(hash, NULL, 0);
+ } else {
+ FILE *file = fopen(ent->fts_path, "rb");
+ if (file == NULL) {
+ perror("fopen");
+ return NO;
+ }
+ 
+ CC_SHA1_CTX hashContext;
+ CC_SHA1_Init(&hashContext);
+ 
+ size_t bytesLeft = (size_t)fileSize;
+ while (bytesLeft > 0) {
+ size_t bytesToConsume = (bytesLeft >= tempBufferSize) ? tempBufferSize : bytesLeft;
+ 
+ if (fread(tempBuffer, bytesToConsume, 1, file) < 1) {
+ perror("fread");
+ fclose(file);
+ return NO;
+ }
+ 
+ CC_SHA1_Update(&hashContext, tempBuffer, (CC_LONG)bytesToConsume);
+ bytesLeft -= bytesToConsume;
+ }
+ 
+ CC_SHA1_Final(hash, &hashContext);
+ 
+ fclose(file);
+ }
+ } else if (ent->fts_info == FTS_D) {
+ memset(hash, 0xdd, CC_SHA1_DIGEST_LENGTH);
+ } else {
+ return NO;
+ }
+ return YES;
+}
+
+BOOL getRawHashOfTreeWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t majorVersion)
+{
+ return getRawHashOfTreeAndFileTablesWithVersion(hashBuffer, path, majorVersion, nil, nil);
+}
+
+BOOL getRawHashOfTreeAndFileTablesWithVersion(unsigned char *hashBuffer, NSString *path, uint16_t __unused majorVersion, NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *hashToFileKeyDictionary, NSMutableDictionary<NSString *, NSData *> *fileKeyToHashDictionary)
+{
+ char pathBufferPATH_MAX = { 0 };
+ if (!path getFileSystemRepresentation:pathBuffer maxLength:sizeof(pathBuffer)) {
+ return NO;
+ }
+
+ const size_t tempBufferSize = 16384;
+ void *tempBuffer = calloc(1, tempBufferSize);
+ if (tempBuffer == NULL) {
+ perror("calloc");
+ return NO;
+ }
+ 
+ char *const sourcePaths = { pathBuffer, 0 };
+ FTS *fts = fts_open(sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles);
+ if (!fts) {
+ perror("fts_open");
+ free(tempBuffer);
+ return NO;
+ }
+
+ CC_SHA1_CTX hashContext;
+ CC_SHA1_Init(&hashContext);
+
+ // Ensure the path uses filesystem-specific Unicode normalization #1017
+ NSString *normalizedPath = stringWithFileSystemRepresentation(pathBuffer);
+
+ FTSENT *ent = 0;
+ while ((ent = fts_read(fts))) {
+ if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D)
+ continue;
+
+ NSString *relativePath = pathRelativeToDirectory(normalizedPath, stringWithFileSystemRepresentation(ent->fts_path));
+ 
+ // Ignore icon resource fork data
+ if (relativePath.length == 0 || relativePath isEqualToString:CUSTOM_ICON_PATH) {
+ continue;
+ }
+
+ unsigned char fileHashCC_SHA1_DIGEST_LENGTH;
+ if (!_hashOfFileContents(fileHash, ent, tempBuffer, tempBufferSize)) {
+ fts_close(fts);
+ free(tempBuffer);
+ return NO;
+ }
+ CC_SHA1_Update(&hashContext, fileHash, sizeof(fileHash));
+ 
+ // For file hash tables we only track regular files
+ if (ent->fts_info == FTS_F) {
+ NSData *hashKey = NSData dataWithBytes:fileHash length:sizeof(fileHash);
+ 
+ if (hashToFileKeyDictionary != nil) {
+ if (hashToFileKeyDictionaryhashKey == nil) {
+ hashToFileKeyDictionaryhashKey = NSMutableArray array;
+ }
+ hashToFileKeyDictionaryhashKey addObject:relativePath;
+ }
+ 
+ if (fileKeyToHashDictionary != nil) {
+ fileKeyToHashDictionaryrelativePath = hashKey;
+ }
+ }
+
+ const char *relativePathBytes = relativePath fileSystemRepresentation;
+ CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes));
+
+ uint16_t mode = ent->fts_statp->st_mode;
+ uint16_t type = ent->fts_info;
+ uint16_t permissions = mode & PERMISSION_FLAGS;
+ 
+ // permission of symlinks are 0777 on some linux file systems and can't be changed,
+ // differing from the 0755 macOS default.
+ // hardcoding a value helps avoid differences between filesystems.
+ uint16_t hashedPermissions = (ent->fts_info == FTS_SL) ? VALID_SYMBOLIC_LINK_PERMISSIONS : permissions;
+
+ CC_SHA1_Update(&hashContext, &type, sizeof(type));
+ CC_SHA1_Update(&hashContext, &hashedPermissions, sizeof(hashedPermissions));
+ }
+ 
+ free(tempBuffer);
+ 
+ fts_close(fts);
+
+ CC_SHA1_Final(hashBuffer, &hashContext);
+ 
+ return YES;
+}
+
+void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash)
+{
+ const char *hexString = hexHash.UTF8String;
+ if (hexString == NULL) {
+ return;
+ }
+ 
+ for (size_t blockIndex = 0; blockIndex < CC_SHA1_DIGEST_LENGTH; blockIndex++) {
+ const char *currentBlock = hexString + blockIndex * 2;
+ char convertedBlock3 = {currentBlock0, currentBlock1, '\0'};
+ hashblockIndex = (unsigned char)strtol(convertedBlock, NULL, 16);
+ }
+}
+
+NSString *displayHashFromRawHash(const unsigned char *hash)
+{
+ char hexHashCC_SHA1_DIGEST_LENGTH * 2 + 1 = {0};
+ for (size_t i = 0; i < CC_SHA1_DIGEST_LENGTH; i++) {
+ snprintf(hexHash + i * 2, 3, "%02x", hashi);
+ }
+ return @(hexHash);
+}
+
+NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion)
+{
+ unsigned char hashCC_SHA1_DIGEST_LENGTH;
+ if (!getRawHashOfTreeWithVersion(hash, path, majorVersion)) {
+ return nil;
+ }
+ return displayHashFromRawHash(hash);
+}
+
+extern NSString *hashOfTree(NSString *path)
+{
+ return hashOfTreeWithVersion(path, SUBinaryDeltaMajorVersionLatest);
+}
+
+BOOL removeTree(NSString *path)
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ // Don't use fileExistsForPath: because it will try to follow symbolic links
+ if (!fileManager attributesOfItemAtPath:path error:nil) {
+ return YES;
+ }
+ return fileManager removeItemAtPath:path error:nil;
+}
+
+BOOL copyTree(NSString *source, NSString *dest)
+{
+ // SUFileManager will be more reliable for copying items especially across network mounts
+ return SUFileManager alloc init copyItemAtURL:NSURL fileURLWithPath:source toURL:NSURL fileURLWithPath:dest error:NULL;
+}
+
+BOOL modifyPermissions(NSString *path, mode_t desiredPermissions)
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ NSDictionary *attributes = fileManager attributesOfItemAtPath:path error:nil;
+ if (!attributes) {
+ return NO;
+ }
+ NSNumber *permissions = attributes objectForKey:NSFilePosixPermissions;
+ if (!permissions) {
+ return NO;
+ }
+ mode_t newMode = (permissions unsignedShortValue & ~PERMISSION_FLAGS) | desiredPermissions;
+ int (*changeModeFunc)(const char *, mode_t) = (NSString *)attributes objectForKey:NSFileType isEqualToString:NSFileTypeSymbolicLink ? lchmod : chmod;
+ if (changeModeFunc(path fileSystemRepresentation, newMode) != 0) {
+ return NO;
+ }
+ return YES;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaCreate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaCreate.m Added

@@ -0,0 +1,1012 @@
+//
+// SUBinaryDeltaCreate.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/9/15.
+// Copyright (c) 2015 Sparkle Project. All rights reserved.
+//
+
+#import "SUBinaryDeltaCreate.h"
+#import <Foundation/Foundation.h>
+#include "SUBinaryDeltaCommon.h"
+#import "SPUDeltaArchiveProtocol.h"
+#import "SPUSparkleDeltaArchive.h"
+#import "SPUXarDeltaArchive.h"
+#import <CommonCrypto/CommonDigest.h>
+#include <fcntl.h>
+#include <fts.h>
+#include <libgen.h>
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <sys/xattr.h>
+
+
+#include "AppKitPrevention.h"
+
+extern int bsdiff(int argc, const char **argv);
+
+@interface CreateBinaryDeltaOperation : NSOperation
+@property (copy) NSString *relativePath;
+@property (copy) NSString *clonedRelativePath;
+@property (strong) NSString *resultPath;
+@property (strong) NSNumber *oldPermissions;
+@property (strong) NSNumber *permissions;
+@property (nonatomic) BOOL changingPermissions;
+@property (strong) NSString *_fromPath;
+@property (strong) NSString *_toPath;
+- (id)initWithRelativePath:(NSString *)relativePath clonedRelativePath:(NSString *)clonedRelativePath oldTree:(NSString *)oldTree newTree:(NSString *)newTree oldPermissions:(NSNumber *)oldPermissions newPermissions:(NSNumber *)permissions changingPermissions:(BOOL)changingPermissions;
+@end
+
+@implementation CreateBinaryDeltaOperation
+@synthesize relativePath = _relativePath;
+@synthesize clonedRelativePath = _clonedRelativePath;
+@synthesize resultPath = _resultPath;
+@synthesize oldPermissions = _oldPermissions;
+@synthesize permissions = _permissions;
+@synthesize changingPermissions = _changingPermissions;
+@synthesize _fromPath = _fromPath;
+@synthesize _toPath = _toPath;
+
+- (id)initWithRelativePath:(NSString *)relativePath clonedRelativePath:(NSString *)clonedRelativePath oldTree:(NSString *)oldTree newTree:(NSString *)newTree oldPermissions:(NSNumber *)oldPermissions newPermissions:(NSNumber *)permissions changingPermissions:(BOOL)changingPermissions
+{
+ if ((self = super init)) {
+ self.relativePath = relativePath;
+ self.clonedRelativePath = clonedRelativePath;
+ self.oldPermissions = oldPermissions;
+ self.permissions = permissions;
+ self.changingPermissions = changingPermissions;
+ 
+ if (clonedRelativePath == nil) {
+ self._fromPath = oldTree stringByAppendingPathComponent:relativePath;
+ } else {
+ self._fromPath = oldTree stringByAppendingPathComponent:clonedRelativePath;
+ }
+ self._toPath = newTree stringByAppendingPathComponent:relativePath;
+ }
+ return self;
+}
+
+- (void)main
+{
+ NSString *temporaryFile = temporaryFilename(@"BinaryDelta");
+ const char *argv = { "/usr/bin/bsdiff", self._fromPath fileSystemRepresentation, self._toPath fileSystemRepresentation, temporaryFile fileSystemRepresentation };
+ int result = bsdiff(4, argv);
+ if (!result)
+ self.resultPath = temporaryFile;
+}
+
+@end
+
+#define INFO_PATH_KEY @"path"
+#define INFO_TYPE_KEY @"type"
+#define INFO_PERMISSIONS_KEY @"permissions"
+#define INFO_SIZE_KEY @"size"
+
+static NSDictionary *infoForFile(FTSENT *ent)
+{
+ off_t size = (ent->fts_info != FTS_D) ? ent->fts_statp->st_size : 0;
+
+ assert(ent->fts_statp != NULL);
+
+ mode_t permissions = ent->fts_statp->st_mode & PERMISSION_FLAGS;
+
+ NSString *path = @(ent->fts_path);
+ assert(path != nil);
+ 
+ return @{ INFO_PATH_KEY: path != nil ? path : @"",
+ INFO_TYPE_KEY: @(ent->fts_info),
+ INFO_PERMISSIONS_KEY: @(permissions),
+ INFO_SIZE_KEY: @(size) };
+}
+
+static bool aclExists(const FTSENT *ent)
+{
+ // macOS does not currently support ACLs for symlinks
+ if (ent->fts_info == FTS_SL) {
+ return NO;
+ }
+
+ acl_t acl = acl_get_link_np(ent->fts_path, ACL_TYPE_EXTENDED);
+ if (acl != NULL) {
+ acl_entry_t entry;
+ int result = acl_get_entry(acl, ACL_FIRST_ENTRY, &entry);
+ assert(acl_free((void *)acl) == 0);
+ return (result == 0);
+ }
+ return false;
+}
+
+static bool codeSignatureExtendedAttributeExists(const FTSENT *ent)
+{
+ const int options = XATTR_NOFOLLOW;
+ ssize_t listSize = listxattr(ent->fts_path, NULL, 0, options);
+ if (listSize == -1) {
+ return false;
+ }
+
+ char *buffer = malloc((size_t)listSize);
+ assert(buffer != NULL);
+
+ ssize_t sizeBack = listxattr(ent->fts_path, buffer, (size_t)listSize, options);
+ assert(sizeBack == listSize);
+
+ size_t startCharacterIndex = 0;
+ for (size_t characterIndex = 0; characterIndex < (size_t)listSize; characterIndex++) {
+ if (buffercharacterIndex == '\0') {
+ char *attribute = &bufferstartCharacterIndex;
+ size_t length = characterIndex - startCharacterIndex;
+ if (strncmp(APPLE_CODE_SIGN_XATTR_CODE_DIRECTORY_KEY, attribute, length) == 0 || strncmp(APPLE_CODE_SIGN_XATTR_CODE_REQUIREMENTS_KEY, attribute, length) == 0 || strncmp(APPLE_CODE_SIGN_XATTR_CODE_SIGNATURE_KEY, attribute, length) == 0) {
+ free(buffer);
+ return true;
+ }
+ startCharacterIndex = characterIndex + 1;
+ }
+ }
+
+ free(buffer);
+ return false;
+}
+
+static NSString *absolutePath(NSString *path)
+{
+ NSURL *url = NSURL alloc initFileURLWithPath:path;
+ return url absoluteURL path;
+}
+
+static NSString *temporaryPatchFile(NSString *patchFile)
+{
+ NSString *path = absolutePath(patchFile);
+ NSString *directory = path stringByDeletingLastPathComponent;
+ NSString *file = path lastPathComponent;
+ return NSString stringWithFormat:@"%@/.%@.tmp", directory, file;
+}
+
+#define MIN_FILE_SIZE_FOR_CREATING_DELTA 4096
+
+static BOOL shouldSkipDeltaCompression(NSDictionary *originalInfo, NSDictionary *newInfo)
+{
+ unsigned long long fileSize = (NSNumber *)newInfoINFO_SIZE_KEY unsignedLongLongValue;
+ if (fileSize < MIN_FILE_SIZE_FOR_CREATING_DELTA) {
+ return YES;
+ }
+
+ if (!originalInfo) {
+ return YES;
+ }
+
+ unsigned short originalInfoType = (NSNumber *)originalInfoINFO_TYPE_KEY unsignedShortValue;
+ unsigned short newInfoType = (NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue;
+ if (originalInfoType != newInfoType || originalInfoType != FTS_F) {
+ // File types are different or they're not regular files
+ return YES;
+ }
+
+ NSString *originalPath = originalInfoINFO_PATH_KEY;
+ NSString *newPath = newInfoINFO_PATH_KEY;
+
+ // Skip delta if the files are equal in content
+ if (NSFileManager defaultManager contentsEqualAtPath:originalPath andPath:newPath) {
+ return YES;
+ }
+
+ return NO;
+}
+
+static BOOL shouldDeleteThenExtract(NSDictionary *originalInfo, NSDictionary *newInfo)
+{
+ if (!originalInfo) {
+ return NO;
+ }
+
+ if ((NSNumber *)originalInfoINFO_TYPE_KEY unsignedShortValue != (NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue) {
+ return YES;
+ }
+
+ return NO;
+}
+
+static BOOL shouldSkipExtracting(NSDictionary *originalInfo, NSDictionary *newInfo)
+{
+ if (!originalInfo) {
+ return NO;
+ }
+
+ unsigned short originalInfoType = (NSNumber *)originalInfoINFO_TYPE_KEY unsignedShortValue;
+ unsigned short newInfoType = (NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue;
+ 
+ if (originalInfoType != newInfoType) {
+ // File types are different
+ return NO;
+ }
+
+ 
+ NSString *originalPath = originalInfoINFO_PATH_KEY;
+ NSString *newPath = newInfoINFO_PATH_KEY;
+ 
+ // Don't skip extract if files/symlinks entries are not equal in content
+ // (note if the entries are directories, they are equal)
+ if (originalInfoType != FTS_D && !NSFileManager defaultManager contentsEqualAtPath:originalPath andPath:newPath) {
+ return NO;
+ }
+
+ return YES;
+}
+
+static BOOL shouldChangePermissions(NSDictionary *originalInfo, NSDictionary *newInfo)
+{
+ if (!originalInfo) {
+ return NO;
+ }
+ 
+ unsigned short originalInfoType = (NSNumber *)originalInfoINFO_TYPE_KEY unsignedShortValue;
+ unsigned short newInfoType = (NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue;
+
+ if (originalInfoType != newInfoType) {
+ return NO;
+ }
+ 
+ unsigned short oldPermissions = (NSNumber *)originalInfoINFO_PERMISSIONS_KEY unsignedShortValue;
+ unsigned short newPermissions = (NSNumber *)newInfoINFO_PERMISSIONS_KEY unsignedShortValue;
+
+ if (oldPermissions == newPermissions) {
+ return NO;
+ }
+ 
+ // We don't track new permissions on symbolic links that aren't the 0755 macOS default
+ // Some linux / remotely mounted filesystems may not track permissions on symlinks and use 0777
+ // We don't want to pick up bad permissions
+ if (newInfoType == FTS_SL && newPermissions != VALID_SYMBOLIC_LINK_PERMISSIONS) {
+ return NO;
+ }
+
+ return YES;
+}
+
+#define MIN_SIZE_FOR_CLONE 4096
+#define MIN_SIZE_FOR_CLONE_DIFF (4096 * 4)
+static NSString *cloneableRelativePath(NSDictionary<NSString *, NSData *> *afterFileKeyToHashDictionary, NSDictionary<NSData *, NSArray<NSString *> *> *beforeHashToFileKeyDictionary, NSDictionary<NSString *, NSString *> *frameworkVersionsSubstitutes, NSDictionary<NSString *, NSString *> *fileSubstitutes, NSDictionary *originalTreeState, NSDictionary *newInfo, NSString *key, NSNumber * __autoreleasing *outNewPermissions, BOOL *clonePermissionsChanged, BOOL *clonedBinaryDiff)
+{
+ // Avoid clones for small files. Small files can compress very well, sometimes better than tracking clones.
+ if ((NSNumber *)newInfoINFO_SIZE_KEY unsignedLongLongValue <= MIN_SIZE_FOR_CLONE) {
+ return nil;
+ }
+ 
+ if ((NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue != FTS_F) {
+ return nil;
+ }
+ 
+ {
+ NSData *keyHash = afterFileKeyToHashDictionarykey;
+ if (keyHash != nil) {
+ // Check for identical clones first
+ for (NSString *oldRelativePath in beforeHashToFileKeyDictionarykeyHash) {
+ NSDictionary *oldCloneInfo = originalTreeStateoldRelativePath;
+ if (oldCloneInfo == nil) {
+ continue;
+ }
+ 
+ if ((NSNumber *)oldCloneInfoINFO_TYPE_KEY unsignedShortValue != FTS_F) {
+ continue;
+ }
+ 
+ NSString *clonePath = oldCloneInfoINFO_PATH_KEY;
+ NSString *newPath = newInfoINFO_PATH_KEY;
+ 
+ if (!NSFileManager defaultManager contentsEqualAtPath:clonePath andPath:newPath) {
+ continue;
+ }
+ 
+ NSNumber *newPermissions = newInfoINFO_PERMISSIONS_KEY;
+ if (outNewPermissions != NULL) {
+ *outNewPermissions = newPermissions;
+ }
+ 
+ if (clonePermissionsChanged != NULL) {
+ *clonePermissionsChanged = ((NSNumber *)oldCloneInfoINFO_PERMISSIONS_KEY unsignedShortValue != newPermissions unsignedShortValue);
+ }
+ 
+ if (clonedBinaryDiff != NULL) {
+ *clonedBinaryDiff = NO;
+ }
+ 
+ return oldRelativePath;
+ }
+ }
+ }
+ 
+ // For non-identical files where we do a binary diff, make sure file size matches a more strict file size test
+ if ((NSNumber *)newInfoINFO_SIZE_KEY unsignedLongLongValue <= MIN_SIZE_FOR_CLONE_DIFF) {
+ return nil;
+ }
+ 
+ // Look out for any .framework/Versions/{A -> B} changes
+ for (NSString *frameworkVersionPrefix in frameworkVersionsSubstitutes) {
+ if (!key hasPrefix:frameworkVersionPrefix) {
+ continue;
+ }
+ 
+ NSString *cloneFrameworkSubstitutePrefix = frameworkVersionsSubstitutesframeworkVersionPrefix;
+ if (cloneFrameworkSubstitutePrefix == nil) {
+ continue;
+ }
+ 
+ NSString *cloneRelativeKey = key stringByReplacingCharactersInRange:NSMakeRange(0, frameworkVersionPrefix.length) withString:cloneFrameworkSubstitutePrefix;
+ 
+ NSDictionary *oldCloneInfo = originalTreeStatecloneRelativeKey;
+ if (oldCloneInfo == nil) {
+ continue;
+ }
+ 
+ NSNumber *newPermissions = newInfoINFO_PERMISSIONS_KEY;
+ if (outNewPermissions != NULL) {
+ *outNewPermissions = newPermissions;
+ }
+ 
+ if (clonePermissionsChanged != NULL) {
+ *clonePermissionsChanged = ((NSNumber *)oldCloneInfoINFO_PERMISSIONS_KEY unsignedShortValue != newPermissions unsignedShortValue);
+ }
+ 
+ if (clonedBinaryDiff != NULL) {
+ *clonedBinaryDiff = YES;
+ }
+ 
+ return cloneRelativeKey;
+ }
+ 
+ // Look out for any changes that involve the same named file moving to another directory
+ do {
+ NSString *cloneRelativeKey = fileSubstituteskey.lastPathComponent;
+ if (cloneRelativeKey == nil) {
+ break;
+ }
+ 
+ NSDictionary *oldCloneInfo = originalTreeStatecloneRelativeKey;
+ if (oldCloneInfo == nil) {
+ break;
+ }
+ 
+ uint64_t cloneSize = (NSNumber *)oldCloneInfoINFO_SIZE_KEY unsignedLongValue;
+ uint64_t newSize = (NSNumber *)newInfoINFO_SIZE_KEY unsignedLongValue;
+ uint64_t minSize = MIN(cloneSize, newSize);
+ uint64_t maxSize = MAX(cloneSize, newSize);
+ 
+ // Ensure file is at least 60% the same size
+ if (minSize == 0 || maxSize == 0 || (double)minSize / (double)maxSize < 0.60) {
+ break;
+ }
+ 
+ NSNumber *newPermissions = newInfoINFO_PERMISSIONS_KEY;
+ if (outNewPermissions != NULL) {
+ *outNewPermissions = newPermissions;
+ }
+ 
+ if (clonePermissionsChanged != NULL) {
+ *clonePermissionsChanged = ((NSNumber *)oldCloneInfoINFO_PERMISSIONS_KEY unsignedShortValue != newPermissions unsignedShortValue);
+ }
+ 
+ if (clonedBinaryDiff != NULL) {
+ *clonedBinaryDiff = YES;
+ }
+ 
+ return cloneRelativeKey;
+ } while (NO);
+ 
+ return nil;
+}
+
+BOOL createBinaryDelta(NSString *source, NSString *destination, NSString *patchFile, SUBinaryDeltaMajorVersion majorVersion, SPUDeltaCompressionMode compression, uint8_t compressionLevel, BOOL verbose, NSError *__autoreleasing *error)
+{
+ assert(source);
+ assert(destination);
+ assert(patchFile);
+ assert(majorVersion >= SUBinaryDeltaMajorVersionFirst && majorVersion <= SUBinaryDeltaMajorVersionLatest);
+
+ uint16_t minorVersion = latestMinorVersionForMajorVersion(majorVersion);
+
+ NSMutableDictionary *originalTreeState = NSMutableDictionary dictionary;
+
+ char pathBufferPATH_MAX = { 0 };
+ if (!source getFileSystemRepresentation:pathBuffer maxLength:sizeof(pathBuffer)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to retrieve file system path representation from source %@", source };
+ }
+ return NO;
+ }
+
+ char *sourcePaths = { pathBuffer, 0 };
+ FTS *fts = fts_open(sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles);
+ if (!fts) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"fts_open failed on source: %@", @(strerror(errno)) };
+ }
+ return NO;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "Creating version %u.%u patch using %s compression...\n", majorVersion, minorVersion, deltaCompressionStringFromMode(compression).UTF8String);
+ fprintf(stderr, "Processing source, %s...", source fileSystemRepresentation);
+ }
+
+ FTSENT *ent = 0;
+ while ((ent = fts_read(fts))) {
+ if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D) {
+ continue;
+ }
+
+ NSString *key = pathRelativeToDirectory(source, stringWithFileSystemRepresentation(ent->fts_path));
+ if (!key length) {
+ continue;
+ }
+ 
+ if (key isEqualToString:CUSTOM_ICON_PATH) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing bundles with a custom icon set via a resource fork is not supported. Detected presence of %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+
+ NSDictionary *info = infoForFile(ent);
+ if (!info) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to retrieve info for file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+ originalTreeStatekey = info;
+
+ // Ensure Sparkle executable permissions are valid
+ if (ent->fts_info == FTS_F && key.lastPathComponent isEqualToString:@"Sparkle" && key.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.lastPathComponent isEqualToString:@"Sparkle.framework") {
+ mode_t permissions = (mode_t)(NSNumber *)infoINFO_PERMISSIONS_KEY shortValue;
+ if (permissions != VALID_SPARKLE_EXECUTABLE_PERMISSIONS) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path) };
+ }
+ return NO;
+ }
+ }
+ 
+ if (aclExists(ent)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing ACLs are not supported. Detected ACL in before-tree on file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+
+ if (codeSignatureExtendedAttributeExists(ent)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing code signed extended attributes are not supported. Detected extended attribute in before-tree on file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+ }
+ fts_close(fts);
+
+ // This dictionary will help us keep track of clones
+ NSMutableDictionary<NSData *, NSMutableArray<NSString *> *> *beforeHashToFileKeyDictionary = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? NSMutableDictionary dictionary : nil;
+ 
+ unsigned char beforeHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!getRawHashOfTreeAndFileTablesWithVersion(beforeHash, source, majorVersion, beforeHashToFileKeyDictionary, nil)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to generate hash for tree %@", source };
+ }
+ return NO;
+ }
+
+ NSMutableDictionary *newTreeState = NSMutableDictionary dictionary;
+ for (NSString *key in originalTreeState) {
+ newTreeStatekey = NSNull null;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "\nProcessing destination, %s...", destination fileSystemRepresentation);
+ }
+
+ pathBuffer0 = 0;
+ if (!destination getFileSystemRepresentation:pathBuffer maxLength:sizeof(pathBuffer)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to retrieve file system path representation from destination %@", destination };
+ }
+ return NO;
+ }
+
+ sourcePaths0 = pathBuffer;
+ fts = fts_open(sourcePaths, FTS_PHYSICAL | FTS_NOCHDIR, compareFiles);
+ if (!fts) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"fts_open failed on destination: %@", @(strerror(errno)) };
+ }
+ return NO;
+ }
+ 
+ bool foundFilesystemCompression = false;
+
+ uint32_t warningsCount = 0;
+ const uint32_t maxWarningsToPrint = 16;
+ while ((ent = fts_read(fts))) {
+ if (ent->fts_info != FTS_F && ent->fts_info != FTS_SL && ent->fts_info != FTS_D) {
+ continue;
+ }
+
+ NSString *key = pathRelativeToDirectory(destination, stringWithFileSystemRepresentation(ent->fts_path));
+ if (!key length) {
+ continue;
+ }
+ 
+ if (key isEqualToString:CUSTOM_ICON_PATH) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing bundles with a custom icon set via a resource fork is not supported. Detected presence of %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+
+ NSDictionary *info = infoForFile(ent);
+ if (!info) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to retrieve info from file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+
+ // Ensure Sparkle executable permissions are valid
+ if (ent->fts_info == FTS_F && key.lastPathComponent isEqualToString:@"Sparkle" && key.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.lastPathComponent isEqualToString:@"Sparkle.framework") {
+ mode_t permissions = (mode_t)(NSNumber *)infoINFO_PERMISSIONS_KEY shortValue;
+ if (permissions != VALID_SPARKLE_EXECUTABLE_PERMISSIONS) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Permissions for Sparkle executable must be 0%o (found 0%o) on file %@", VALID_SPARKLE_EXECUTABLE_PERMISSIONS, permissions, @(ent->fts_path) };
+ }
+ return NO;
+ }
+ }
+ 
+ // We should validate ACLs even if we don't store the info in the diff in the case of ACLs
+ // We should also not allow files with code signed extended attributes since Apple doesn't recommend inserting these
+ // inside an application, and since we don't preserve extended attribitutes anyway
+
+ if (aclExists(ent)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing ACLs are not supported. Detected ACL in after-tree on file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+
+ if (codeSignatureExtendedAttributeExists(ent)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Diffing code signed extended attributes are not supported. Detected extended attribute in after-tree on file %@", @(ent->fts_path) };
+ }
+ return NO;
+ }
+ 
+ if (warningsCount < maxWarningsToPrint) {
+ uint16_t permissions = (ent->fts_statp->st_mode & PERMISSION_FLAGS);
+ if (ent->fts_info == FTS_SL) {
+ if (permissions != VALID_SYMBOLIC_LINK_PERMISSIONS) {
+ fprintf(stderr, "\nWarning: file permissions 0%o of symbolic link '%s' won't be preserved in the delta update (only permissions with mode 0755 are supported for symbolic links).", permissions, ent->fts_path);
+ 
+ warningsCount++;
+ }
+ } else if (permissions != 0755 && permissions != 0644) {
+ // This could indicate something is wrong inside of the bundle so it's worth warning the user about
+ fprintf(stderr, "\nWarning: detected irregular file permissions 0%o for '%s'", permissions, ent->fts_path);
+ 
+ warningsCount++;
+ }
+ 
+ if (warningsCount == maxWarningsToPrint) {
+ fprintf(stderr, "\nWarning: encountered too many warnings.. Ignoring the rest..");
+ }
+ }
+ 
+ // If we find any executable files that are using file system compression, that is sufficient
+ // for recording that the applier should re-apply file system compression.
+ // We check for executable files because they are likely candidates to be compressed.
+ if (!foundFilesystemCompression && MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) && ent->fts_info == FTS_F && (ent->fts_statp->st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0 && (ent->fts_statp->st_flags & UF_COMPRESSED) != 0) {
+ foundFilesystemCompression = true;
+ 
+ if (verbose) {
+ fprintf(stderr, " File system compression detected.");
+ }
+ }
+
+ NSDictionary *oldInfo = originalTreeStatekey;
+
+ BOOL hasEqualInfo;
+ if (!info isEqual:oldInfo) {
+ hasEqualInfo = NO;
+ } else {
+ NSString *originalPath = oldInfoINFO_PATH_KEY;
+ NSString *newPath = infoINFO_PATH_KEY;
+ hasEqualInfo = NSFileManager defaultManager contentsEqualAtPath:originalPath andPath:newPath;
+ }
+ 
+ if (hasEqualInfo) {
+ newTreeState removeObjectForKey:key;
+ } else {
+ newTreeStatekey = info;
+
+ if (oldInfo && (NSNumber *)oldInfoINFO_TYPE_KEY unsignedShortValue == FTS_D && (NSNumber *)infoINFO_TYPE_KEY unsignedShortValue != FTS_D) {
+ NSArray *parentPathComponents = key.pathComponents;
+
+ for (NSString *childPath in originalTreeState) {
+ NSArray *childPathComponents = childPath.pathComponents;
+ if (childPathComponents.count > parentPathComponents.count &&
+ parentPathComponents isEqualToArray:childPathComponents subarrayWithRange:NSMakeRange(0, parentPathComponents.count)) {
+ newTreeState removeObjectForKey:childPath;
+ }
+ }
+ }
+ }
+ }
+ fts_close(fts);
+
+ // This dictionary will help us keep track of clones
+ NSMutableDictionary<NSString *, NSData *> *afterFileKeyToHashDictionary = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? NSMutableDictionary dictionary : nil;
+ 
+ unsigned char afterHashCC_SHA1_DIGEST_LENGTH = {0};
+ if (!getRawHashOfTreeAndFileTablesWithVersion(afterHash, destination, majorVersion, nil, afterFileKeyToHashDictionary)) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to generate hash for tree %@", destination };
+ }
+ return NO;
+ }
+
+ if (verbose) {
+ fprintf(stderr, "\nGenerating delta...");
+ }
+
+ NSString *temporaryFile = temporaryPatchFile(patchFile);
+ if (verbose) {
+ fprintf(stderr, "\nWriting to temporary file %s...", temporaryFile fileSystemRepresentation);
+ }
+ 
+ id<SPUDeltaArchiveProtocol> archive;
+ if (majorVersion >= SUBinaryDeltaMajorVersion3) {
+ archive = SPUSparkleDeltaArchive alloc initWithPatchFileForWriting:temporaryFile;
+ } else {
+ archive = SPUXarDeltaArchive alloc initWithPatchFileForWriting:temporaryFile;
+ }
+ 
+ SPUDeltaArchiveHeader *header = SPUDeltaArchiveHeader alloc initWithCompression:compression compressionLevel:compressionLevel fileSystemCompression:foundFilesystemCompression majorVersion:majorVersion minorVersion:minorVersion beforeTreeHash:beforeHash afterTreeHash:afterHash;
+ 
+ archive writeHeader:header;
+ if (archive.error != nil) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = archive.error;
+ }
+ return NO;
+ }
+
+ NSOperationQueue *deltaQueue = NSOperationQueue alloc init;
+ NSMutableArray *deltaOperations = NSMutableArray array;
+
+ // Sort the keys by preferring the ones from the original tree to appear first
+ // We want to enforce deleting before extracting in the case paths differ only by case
+ NSArray *keys = newTreeState allKeys sortedArrayUsingComparator:^NSComparisonResult(NSString *key1, NSString *key2) {
+ NSComparisonResult insensitiveCompareResult = key1 caseInsensitiveCompare:key2;
+ if (insensitiveCompareResult != NSOrderedSame) {
+ return insensitiveCompareResult;
+ }
+
+ return originalTreeStatekey1 ? NSOrderedAscending : NSOrderedDescending;
+ };
+ 
+ // Using a couple of heursitics we track if files have been moved to other locations within the app bundle
+ NSMutableDictionary<NSString *, NSString *> *frameworkVersionsSubstitutes = NSMutableDictionary dictionary;
+ NSMutableDictionary<NSString *, NSString *> *fileSubstitutes = NSMutableDictionary dictionary;
+ if (MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3)) {
+ // Heuristic #1: track if an old framework version was removed and a new framework version was added
+ // Keep track of these prefixes in a dictionary
+ // Eg: /Contents/Frameworks/Foo.framework/Versions/B/ (new) -> /Contents/Frameworks/Foo.framework/Versions/A/ (old)
+ 
+ NSMutableDictionary<NSString *, NSString *> *oldFrameworkVersions = NSMutableDictionary dictionary;
+ for (NSString *key in keys) {
+ id value = newTreeState valueForKey:key;
+ if (!(NSObject *)value isEqual:NSNull null) {
+ continue;
+ }
+ 
+ NSDictionary *originalInfo = originalTreeStatekey;
+ if ((NSNumber *)originalInfoINFO_TYPE_KEY unsignedShortValue != FTS_D) {
+ continue;
+ }
+ 
+ NSString *keyWithoutLastPathComponent = key.stringByDeletingLastPathComponent;
+ 
+ if (!keyWithoutLastPathComponent.lastPathComponent isEqualToString:@"Versions") {
+ continue;
+ }
+ 
+ NSString *keyWithoutLastLastPathComponent = keyWithoutLastPathComponent.stringByDeletingLastPathComponent;
+ 
+ if (!keyWithoutLastLastPathComponent.pathExtension isEqualToString:@"framework") {
+ continue;
+ }
+ 
+ oldFrameworkVersionskeyWithoutLastLastPathComponent = key;
+ }
+ 
+ for (NSString *key in keys) {
+ id value = newTreeState valueForKey:key;
+ if ((NSObject *)value isEqual:NSNull null || originalTreeStatekey != nil) {
+ continue;
+ }
+ 
+ NSDictionary *newInfo = value;
+ if ((NSNumber *)newInfoINFO_TYPE_KEY unsignedShortValue != FTS_D) {
+ continue;
+ }
+ 
+ NSString *keyWithoutLastPathComponent = key.stringByDeletingLastPathComponent;
+ 
+ if (!keyWithoutLastPathComponent.lastPathComponent isEqualToString:@"Versions") {
+ continue;
+ }
+ 
+ NSString *keyWithoutLastLastPathComponent = keyWithoutLastPathComponent.stringByDeletingLastPathComponent;
+ 
+ if (!keyWithoutLastLastPathComponent.pathExtension isEqualToString:@"framework") {
+ continue;
+ }
+ 
+ NSString *oldFrameworkVersionKey = oldFrameworkVersionskeyWithoutLastLastPathComponent;
+ if (oldFrameworkVersionKey == nil) {
+ continue;
+ }
+ 
+ frameworkVersionsSubstituteskey stringByAppendingString:@"/" = oldFrameworkVersionKey stringByAppendingString:@"/";
+ }
+ 
+ // Heuristic #2: Keep a table of removed filenames, collapsing them by the largest file per unique name
+ // This sees if a file has just been moved to another location
+ for (NSString *key in keys) {
+ id value = newTreeState valueForKey:key;
+ if (!(NSObject *)value isEqual:NSNull null) {
+ continue;
+ }
+ 
+ NSDictionary *keyInfo = originalTreeStatekey;
+ if ((NSNumber *)keyInfoINFO_TYPE_KEY unsignedShortValue != FTS_F) {
+ continue;
+ }
+ 
+ NSString *lastPathComponent = key.lastPathComponent;
+ 
+ NSString *existingKey = fileSubstituteslastPathComponent;
+ if (existingKey == nil) {
+ fileSubstituteslastPathComponent = key;
+ } else {
+ NSDictionary *existingKeyInfo = originalTreeStateexistingKey;
+ if ((NSNumber *)keyInfoINFO_SIZE_KEY unsignedLongValue > (NSNumber *)existingKeyInfoINFO_SIZE_KEY unsignedLongValue) {
+ fileSubstituteslastPathComponent = key;
+ }
+ }
+ }
+ }
+
+ for (NSString *key in keys) {
+ id value = newTreeState valueForKey:key;
+
+ if ((NSObject *)value isEqual:NSNull null) {
+ archive addItem:SPUDeltaArchiveItem alloc initWithRelativeFilePath:key commands:SPUDeltaItemCommandDelete mode:0;
+
+ if (verbose) {
+ fprintf(stderr, "\n❌ %s %s", VERBOSE_REMOVED, key fileSystemRepresentation);
+ }
+ continue;
+ }
+
+ NSDictionary *originalInfo = originalTreeStatekey;
+ NSDictionary *newInfo = newTreeStatekey;
+ if (shouldSkipDeltaCompression(originalInfo, newInfo)) {
+ if (shouldSkipExtracting(originalInfo, newInfo)) {
+ if (shouldChangePermissions(originalInfo, newInfo)) {
+ archive addItem:SPUDeltaArchiveItem alloc initWithRelativeFilePath:key commands:SPUDeltaItemCommandModifyPermissions mode:(NSNumber *)newInfoINFO_PERMISSIONS_KEY unsignedShortValue;
+
+ if (verbose) {
+ fprintf(stderr, "\n👮 %s %s (0%o -> 0%o)", VERBOSE_MODIFIED, key fileSystemRepresentation, (NSNumber *)originalInfoINFO_PERMISSIONS_KEY unsignedShortValue, (NSNumber *)newInfoINFO_PERMISSIONS_KEY unsignedShortValue);
+ }
+ }
+ } else {
+ // Check if the new file can be cloned from an old existing one located at a different path
+ NSNumber *newPermissions = nil;
+ BOOL clonePermissionsChanged = NO;
+ BOOL clonedBinaryDiff = NO;
+ NSString *clonedRelativePath = MAJOR_VERSION_IS_AT_LEAST(majorVersion, SUBinaryDeltaMajorVersion3) ? cloneableRelativePath(afterFileKeyToHashDictionary, beforeHashToFileKeyDictionary, frameworkVersionsSubstitutes, fileSubstitutes, originalTreeState, newInfo, key, &newPermissions, &clonePermissionsChanged, &clonedBinaryDiff) : nil;
+ if (clonedRelativePath != nil) {
+ if (clonedBinaryDiff) {
+ NSDictionary *cloneInfo = originalTreeStateclonedRelativePath;
+ 
+ CreateBinaryDeltaOperation *operation = CreateBinaryDeltaOperation alloc initWithRelativePath:key clonedRelativePath:clonedRelativePath oldTree:source newTree:destination oldPermissions:cloneInfoINFO_PERMISSIONS_KEY newPermissions:newPermissions changingPermissions:clonePermissionsChanged;
+ deltaQueue addOperation:operation;
+ deltaOperations addObject:operation;
+ } else {
+ SPUDeltaItemCommands commands = SPUDeltaItemCommandClone;
+ if (clonePermissionsChanged) {
+ commands |= SPUDeltaItemCommandModifyPermissions;
+ }
+ 
+ SPUDeltaArchiveItem *item = SPUDeltaArchiveItem alloc initWithRelativeFilePath:key commands:commands mode:(clonePermissionsChanged ? newPermissions.unsignedShortValue : 0);
+ // Physical path for clones points to the old file
+ item.itemFilePath = source stringByAppendingPathComponent:clonedRelativePath;
+ item.sourcePath = item.itemFilePath;
+ item.clonedRelativePath = clonedRelativePath;
+ 
+ archive addItem:item;
+ 
+ if (verbose) {
+ fprintf(stderr, "\n✂️ %s %s -> %s", VERBOSE_CLONED, clonedRelativePath fileSystemRepresentation, key fileSystemRepresentation);
+ }
+ }
+ } else {
+ // Otherwise add a new file
+ NSString *path = destination stringByAppendingPathComponent:key;
+ 
+ SPUDeltaItemCommands commands = SPUDeltaItemCommandExtract;
+ if (shouldDeleteThenExtract(originalInfo, newInfo)) {
+ commands |= SPUDeltaItemCommandDelete;
+ }
+ 
+ SPUDeltaArchiveItem *item = SPUDeltaArchiveItem alloc initWithRelativeFilePath:key commands:commands mode:0;
+ item.itemFilePath = path;
+ item.sourcePath = path;
+ 
+ archive addItem:item;
+
+ if (verbose) {
+ if (originalInfo) {
+ fprintf(stderr, "\n✏️ %s %s", VERBOSE_UPDATED, key fileSystemRepresentation);
+ } else {
+ fprintf(stderr, "\n✅ %s %s", VERBOSE_ADDED, key fileSystemRepresentation);
+ }
+ }
+ }
+ }
+ } else {
+ NSNumber *permissions = newInfoINFO_PERMISSIONS_KEY;
+ 
+ CreateBinaryDeltaOperation *operation = CreateBinaryDeltaOperation alloc initWithRelativePath:key clonedRelativePath:nil oldTree:source newTree:destination oldPermissions:originalInfoINFO_PERMISSIONS_KEY newPermissions:permissions changingPermissions:shouldChangePermissions(originalInfo, newInfo);
+ deltaQueue addOperation:operation;
+ deltaOperations addObject:operation;
+ }
+ }
+
+ deltaQueue waitUntilAllOperationsAreFinished;
+
+ BOOL deltaOperationsFailed = NO;
+ for (CreateBinaryDeltaOperation *operation in deltaOperations) {
+ NSString *resultPath = operation resultPath;
+ if (resultPath == nil) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteUnknownError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to create patch from source %@ and destination %@", operation.relativePath, resultPath };
+ }
+ deltaOperationsFailed = YES;
+ break;
+ }
+
+ NSString *clonedRelativePath = operation clonedRelativePath;
+ if (verbose) {
+ if (clonedRelativePath == nil) {
+ fprintf(stderr, "\n🔨 %s %s", VERBOSE_DIFFED, operation relativePath fileSystemRepresentation);
+ } else {
+ fprintf(stderr, "\n🔨 %s %s -> %s", VERBOSE_DIFFED, clonedRelativePath fileSystemRepresentation, operation relativePath fileSystemRepresentation);
+ }
+ }
+ 
+ NSNumber *mode = operation.permissions;
+ NSString *relativePath = operation.relativePath;
+ 
+ SPUDeltaItemCommands commands = SPUDeltaItemCommandBinaryDiff;
+ if (operation.changingPermissions) {
+ commands |= SPUDeltaItemCommandModifyPermissions;
+ }
+ if (clonedRelativePath != nil) {
+ commands |= SPUDeltaItemCommandClone;
+ }
+ 
+ SPUDeltaArchiveItem *item = SPUDeltaArchiveItem alloc initWithRelativeFilePath:relativePath commands:commands mode:mode.unsignedShortValue;
+ item.itemFilePath = resultPath;
+ item.sourcePath = operation._fromPath;
+ item.clonedRelativePath = clonedRelativePath;
+ 
+ archive addItem:item;
+
+ if (operation.changingPermissions) {
+ if (verbose) {
+ fprintf(stderr, "\n👮 %s %s (0%o -> 0%o)", VERBOSE_MODIFIED, relativePath.fileSystemRepresentation, operation.oldPermissions.unsignedShortValue, operation.permissions.unsignedShortValue);
+ }
+ }
+ }
+ 
+ if (!deltaOperationsFailed) {
+ archive finishEncodingItems;
+ }
+ 
+ archive close;
+ 
+ // Clean up operations after the archive has finished encoding
+ for (CreateBinaryDeltaOperation *operation in deltaOperations) {
+ NSString *resultPath = operation resultPath;
+ if (resultPath != nil) {
+ unlink(resultPath.fileSystemRepresentation);
+ }
+ }
+ 
+ if (deltaOperationsFailed) {
+ // We already set an error so let's bail
+ return NO;
+ }
+ 
+ NSError *archiveError = archive.error;
+ if (archiveError != nil) {
+ if (verbose) {
+ fprintf(stderr, "\n");
+ }
+ if (error != NULL) {
+ *error = archiveError;
+ }
+ return NO;
+ }
+
+ NSFileManager *filemgr;
+ filemgr = NSFileManager defaultManager;
+ 
+ filemgr removeItemAtPath: patchFile error: NULL;
+ if (filemgr moveItemAtPath: temporaryFile toPath: patchFile error: NULL != YES)
+ {
+ if (verbose) {
+ fprintf(stderr, "Failed to move temporary file, %s, to %s!\n", temporaryFile fileSystemRepresentation, patchFile fileSystemRepresentation);
+ }
+ return NO;
+ }
+ if (verbose) {
+ fprintf(stderr, "\nDone!\n");
+ }
+ return YES;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaUnarchiver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUBinaryDeltaUnarchiver.m Added

@@ -0,0 +1,118 @@
+//
+// SUBinaryDeltaUnarchiver.m
+// Sparkle
+//
+// Created by Mark Rowe on 2009-06-03.
+// Copyright 2009 Mark Rowe. All rights reserved.
+//
+
+#import "SUBinaryDeltaUnarchiver.h"
+#import "SUUnarchiverNotifier.h"
+#import "SUBinaryDeltaCommon.h"
+#import "SUBinaryDeltaApply.h"
+#import "SULog.h"
+#import "SUFileManager.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUBinaryDeltaUnarchiver ()
+
+@property (nonatomic, copy, readonly) NSString *archivePath;
+@property (nonatomic, copy, readonly) NSString *updateHostBundlePath;
+
+@end
+
+@implementation SUBinaryDeltaUnarchiver
+
+@synthesize archivePath = _archivePath;
+@synthesize updateHostBundlePath = _updateHostBundlePath;
+
++ (BOOL)canUnarchivePath:(NSString *)path
+{
+ return path pathExtension isEqualToString:@"delta";
+}
+
++ (BOOL)mustValidateBeforeExtraction
+{
+ return YES;
+}
+
+// According to https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/MDImporters/Concepts/Troubleshooting.html
+// We should make sure mdimporter bundles have an up to date time in the event they were delta updated.
+// We used to invoke mdimport on the bundle but this is not a very good approach.
+// There's no need to do that for non-delta updates and for updates that contain no mdimporters.
+// Moreover, updating the timestamp on the mdimporter bundles is what developers have to do anyway when shipping their new update outside of Sparkle
++ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath
+{
+ NSURL *targetURL = NSURL fileURLWithPath:targetPath;
+ // Only recurse if it's actually a directory. Don't recurse into a
+ // root-level symbolic link.
+ NSDictionary *rootAttributes = NSFileManager defaultManager attributesOfItemAtPath:targetPath error:nil;
+ NSString *rootType = rootAttributes objectForKey:NSFileType;
+ 
+ if (rootType isEqualToString:NSFileTypeDirectory) {
+ // The NSDirectoryEnumerator will avoid recursing into any contained
+ // symbolic links, so no further type checks are needed.
+ NSDirectoryEnumerator *directoryEnumerator = NSFileManager defaultManager enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil;
+ 
+ NSMutableArray *filesToUpdate = NSMutableArray alloc init;
+ for (NSURL *file in directoryEnumerator) {
+ if (file.pathExtension isEqualToString:@"mdimporter") {
+ filesToUpdate addObject:file;
+ }
+ }
+ 
+ SUFileManager *fileManager = SUFileManager alloc init;
+ for (NSURL *file in filesToUpdate) {
+ NSError *error = nil;
+ if (!fileManager updateModificationAndAccessTimeOfItemAtURL:file error:&error) {
+ SULog(SULogLevelError, @"Error: During delta unarchiving, failed to touch %@", error);
+ }
+ }
+ }
+}
+
+- (instancetype)initWithArchivePath:(NSString *)archivePath updateHostBundlePath:(NSString *)updateHostBundlePath
+{
+ self = super init;
+ if (self != nil) {
+ _archivePath = archivePath copy;
+ _updateHostBundlePath = updateHostBundlePath copy;
+ }
+ return self;
+}
+
+- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
+{
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ @autoreleasepool {
+ SUUnarchiverNotifier *notifier = SUUnarchiverNotifier alloc initWithCompletionBlock:completionBlock progressBlock:progressBlock;
+ self extractDeltaWithNotifier:notifier;
+ }
+ });
+}
+
+- (void)extractDeltaWithNotifier:(SUUnarchiverNotifier *)notifier
+{
+ NSString *sourcePath = self.updateHostBundlePath;
+ NSString *targetPath = self.archivePath stringByDeletingLastPathComponent stringByAppendingPathComponent:sourcePath lastPathComponent;
+ 
+ NSError *applyDiffError = nil;
+ BOOL success = applyBinaryDelta(sourcePath, targetPath, self.archivePath, NO, ^(double progress){
+ notifier notifyProgress:progress;
+
+ }, &applyDiffError);
+ 
+ if (success) {
+ self class updateSpotlightImportersAtBundlePath:targetPath;
+ notifier notifySuccess;
+ }
+ else {
+ notifier notifyFailureWithError:applyDiffError;
+ }
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.archivePath; }
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUCodeSigningVerifier.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUCodeSigningVerifier.m Added

@@ -0,0 +1,274 @@
+//
+// SUCodeSigningVerifier.m
+// Sparkle
+//
+// Created by Andy Matuschak on 7/5/12.
+//
+//
+
+#include <Security/CodeSigning.h>
+#include <Security/SecCode.h>
+#import "SUCodeSigningVerifier.h"
+#import "SULog.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUCodeSigningVerifier
+
++ (BOOL)codeSignatureAtBundleURL:(NSURL *)oldBundleURL matchesSignatureAtBundleURL:(NSURL *)newBundleURL error:(NSError * __autoreleasing *)error
+{
+ OSStatus result;
+ SecRequirementRef requirement = NULL;
+ SecStaticCodeRef staticCode = NULL;
+ SecStaticCodeRef oldCode = NULL;
+ CFErrorRef cfError = NULL;
+
+ result = SecStaticCodeCreateWithPath((__bridge CFURLRef)oldBundleURL, kSecCSDefaultFlags, &oldCode);
+ if (result == errSecCSUnsigned) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Bundle is not code signed: %@", newBundleURL };
+ }
+ 
+ return NO;
+ }
+
+ result = SecCodeCopyDesignatedRequirement(oldCode, kSecCSDefaultFlags, &requirement);
+ if (result != noErr) {
+ NSString *message = NSString stringWithFormat:@"Failed to copy designated requirement. Code Signing OSStatus code: %d", result;
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ goto finally;
+ }
+
+ result = SecStaticCodeCreateWithPath((__bridge CFURLRef)newBundleURL, kSecCSDefaultFlags, &staticCode);
+ if (result != noErr) {
+ NSString *message = NSString stringWithFormat:@"Failed to get static code %d", result;
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ goto finally;
+ }
+ 
+ // Note that kSecCSCheckNestedCode may not work with pre-Mavericks code signing.
+ // See https://github.com/sparkle-project/Sparkle/issues/376#issuecomment-48824267 and https://developer.apple.com/library/mac/technotes/tn2206
+ // Aditionally, there are several reasons to stay away from deep verification and to prefer EdDSA signing the download archive instead.
+ // See https://github.com/sparkle-project/Sparkle/pull/523#commitcomment-17549302 and https://github.com/sparkle-project/Sparkle/issues/543
+ SecCSFlags flags = (SecCSFlags) (kSecCSDefaultFlags | kSecCSCheckAllArchitectures);
+ result = SecStaticCodeCheckValidityWithErrors(staticCode, flags, requirement, &cfError);
+ 
+ if (result != errSecSuccess) {
+ NSError *underlyingError;
+ if (cfError != NULL) {
+ NSError *tmpError = CFBridgingRelease(cfError);
+ underlyingError = tmpError;
+ } else {
+ underlyingError = nil;
+ }
+ 
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+ if (underlyingError != nil) {
+ userInfoNSUnderlyingErrorKey = underlyingError;
+ }
+ 
+ if (result == errSecCSUnsigned) {
+ NSString *message = @"The host app is signed, but the new version of the app is not signed using Apple Code Signing. Please ensure that the new app is signed and that archiving did not corrupt the signature.";
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ userInfoNSLocalizedDescriptionKey = message;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ } else if (result == errSecCSReqFailed) {
+ CFStringRef requirementString = nil;
+ NSString *initialMessage;
+ if (SecRequirementCopyString(requirement, kSecCSDefaultFlags, &requirementString) == noErr) {
+ initialMessage = NSString stringWithFormat:@"Code signature of the new version doesn't match the old version: %@. Please ensure that old and new app is signed using exactly the same certificate.", requirementString;
+ 
+ SULog(SULogLevelError, @"%@", initialMessage);
+ CFRelease(requirementString);
+ } else {
+ initialMessage = @"Code signature of new version doesn't match the old version. Please ensure that old and new app is signed using exactly the same certificate.";
+ }
+ 
+ NSDictionary *oldInfo = self logSigningInfoForCode:oldCode label:@"old info";
+ NSDictionary *newInfo = self logSigningInfoForCode:staticCode label:@"new info";
+ 
+ if (error != NULL) {
+ userInfoNSLocalizedDescriptionKey = NSString stringWithFormat:@"%@ old info: %@. new info: %@", initialMessage, oldInfo, newInfo;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ } else {
+ if (error != NULL) {
+ userInfoNSLocalizedDescriptionKey = @"Error: Old app bundle code signing signature failed to match new bundle code signature";
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ }
+ }
+ 
+finally:
+ if (oldCode) CFRelease(oldCode);
+ if (staticCode) CFRelease(staticCode);
+ if (requirement) CFRelease(requirement);
+ return (result == noErr);
+}
+
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundleURL error:(NSError *__autoreleasing *)error
+{
+ return self codeSignatureIsValidAtBundleURL:bundleURL checkNestedCode:NO error:error;
+}
+
++ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)bundleURL checkNestedCode:(BOOL)checkNestedCode error:(NSError *__autoreleasing *)error
+{
+ OSStatus result;
+ SecStaticCodeRef staticCode = NULL;
+ CFErrorRef cfError = NULL;
+ 
+ result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
+ if (result != noErr) {
+ SULog(SULogLevelError, @"Failed to get static code %d", result);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to get static code for verifying code signature: %d", result };
+ }
+ 
+ goto finally;
+ }
+
+ // See in -codeSignatureAtBundleURL:matchesSignatureAtBundleURL:error: for why kSecCSCheckNestedCode is not always passed
+ SecCSFlags flags = (SecCSFlags) (kSecCSDefaultFlags | kSecCSCheckAllArchitectures);
+ if (checkNestedCode) {
+ flags |= kSecCSCheckNestedCode;
+ }
+ 
+ result = SecStaticCodeCheckValidityWithErrors(staticCode, flags, NULL, &cfError);
+ 
+ if (result != errSecSuccess) {
+ NSError *underlyingError;
+ if (cfError != NULL) {
+ NSError *tmpError = CFBridgingRelease(cfError);
+ underlyingError = tmpError;
+ } else {
+ underlyingError = nil;
+ }
+ 
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+ if (underlyingError != nil) {
+ userInfoNSUnderlyingErrorKey = underlyingError;
+ }
+ 
+ if (result == errSecCSUnsigned) {
+ NSString *message = NSString stringWithFormat:@"Error: The app is not signed using Apple Code Signing. %@", bundleURL;
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ userInfoNSLocalizedDescriptionKey = message;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ } else if (result == errSecCSReqFailed) {
+ if (error != NULL) {
+ NSDictionary *newInfo = self logSigningInfoForCode:staticCode label:@"new info";
+ 
+ NSString *message = NSString stringWithFormat:@"Error: The app failed Apple Code Signing checks: %@ - new info: %@", bundleURL, newInfo;
+ 
+ userInfoNSLocalizedDescriptionKey = message;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ } else {
+ if (error != NULL) {
+ NSString *message = NSString stringWithFormat:@"Error: The app failed Apple Code Signing checks: %@", bundleURL;
+ 
+ userInfoNSLocalizedDescriptionKey = message;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:userInfo copy;
+ }
+ }
+ }
+ 
+finally:
+ if (staticCode) CFRelease(staticCode);
+ return (result == noErr);
+}
+
+static id valueOrNSNull(id value) {
+ return value ? value : NSNull null;
+}
+
++ (NSDictionary *)codeSignatureInfoAtBundleURL:(NSURL *)bundlePath {
+ NSDictionary *info = nil;
+ SecStaticCodeRef code = NULL;
+ OSStatus result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundlePath, kSecCSDefaultFlags, &code);
+ if (result != noErr) {
+ SULog(SULogLevelError, @"Failed to get static code %d", result);
+ goto finally;
+ }
+ info = self codeSignatureInfoForCode:code;
+ 
+finally:
+ if (code) CFRelease(code);
+ return info;
+}
+
++ (NSDictionary *)codeSignatureInfoForCode:(SecStaticCodeRef)code {
+ CFDictionaryRef signingInfo = nil;
+ const SecCSFlags flags = (SecCSFlags) (kSecCSSigningInformation | kSecCSRequirementInformation | kSecCSDynamicInformation | kSecCSContentInformation);
+ if (SecCodeCopySigningInformation(code, flags, &signingInfo) == noErr) {
+ NSDictionary *signingDict = CFBridgingRelease(signingInfo);
+ NSMutableDictionary *relevantInfo = NSMutableDictionary dictionary;
+ for (NSString *key in @@"format", @"identifier", @"requirements", @"teamid", @"signing-time") {
+ relevantInfo setObject:valueOrNSNull(signingDict objectForKey:key) forKey:key;
+ }
+ NSDictionary *infoPlist = signingDict objectForKey:@"info-plist";
+ relevantInfo setObject:valueOrNSNull(infoPlist objectForKey:@"CFBundleShortVersionString") forKey:@"version";
+ relevantInfo setObject:valueOrNSNull(infoPlist objectForKey:(__bridge NSString *)kCFBundleVersionKey) forKey:@"build";
+ return relevantInfo copy;
+ }
+ return nil;
+}
+
++ (NSDictionary *)logSigningInfoForCode:(SecStaticCodeRef)code label:(NSString*)label {
+ NSDictionary *relevantInfo = self codeSignatureInfoForCode:code;
+ SULog(SULogLevelDefault, @"%@: %@", label, relevantInfo);
+ return relevantInfo;
+}
+
++ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundleURL
+{
+ OSStatus result;
+ SecStaticCodeRef staticCode = NULL;
+
+ result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
+ if (result == errSecCSUnsigned) {
+ return NO;
+ }
+
+ SecRequirementRef requirement = NULL;
+ result = SecCodeCopyDesignatedRequirement(staticCode, kSecCSDefaultFlags, &requirement);
+ if (staticCode) {
+ CFRelease(staticCode);
+ }
+ if (requirement) {
+ CFRelease(requirement);
+ }
+ if (result == errSecCSUnsigned) {
+ return NO;
+ }
+ return (result == 0);
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUDiskImageUnarchiver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUDiskImageUnarchiver.m Added

@@ -0,0 +1,229 @@
+//
+// SUDiskImageUnarchiver.m
+// Sparkle
+//
+// Created by Andy Matuschak on 6/16/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUDiskImageUnarchiver.h"
+#import "SUUnarchiverNotifier.h"
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUDiskImageUnarchiver ()
+
+@property (nonatomic, copy, readonly) NSString *archivePath;
+@property (nullable, nonatomic, copy, readonly) NSString *decryptionPassword;
+
+@end
+
+@implementation SUDiskImageUnarchiver
+
+@synthesize archivePath = _archivePath;
+@synthesize decryptionPassword = _decryptionPassword;
+
++ (BOOL)canUnarchivePath:(NSString *)path
+{
+ return path pathExtension isEqualToString:@"dmg";
+}
+
++ (BOOL)mustValidateBeforeExtraction
+{
+ return NO;
+}
+
+- (instancetype)initWithArchivePath:(NSString *)archivePath decryptionPassword:(nullable NSString *)decryptionPassword
+{
+ self = super init;
+ if (self != nil) {
+ _archivePath = archivePath copy;
+ _decryptionPassword = decryptionPassword copy;
+ }
+ return self;
+}
+
+- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
+{
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ SUUnarchiverNotifier *notifier = SUUnarchiverNotifier alloc initWithCompletionBlock:completionBlock progressBlock:progressBlock;
+ self extractDMGWithNotifier:notifier;
+ });
+}
+
+// Called on a non-main thread.
+- (void)extractDMGWithNotifier:(SUUnarchiverNotifier *)notifier
+{
+	@autoreleasepool {
+ BOOL mountedSuccessfully = NO;
+ 
+ // get a unique mount point path
+ NSString *mountPoint = nil;
+ NSFileManager *manager;
+ NSError *error = nil;
+ NSArray *contents = nil;
+ do
+		{
+ // Using NSUUID would make creating UUIDs be done in Cocoa,
+ // and thus managed under ARC. Sadly, the class is in 10.8 and later.
+ CFUUIDRef uuid = CFUUIDCreate(NULL);
+ if (uuid)
+ {
+ NSString *uuidString = CFBridgingRelease(CFUUIDCreateString(NULL, uuid));
+ if (uuidString)
+ {
+ mountPoint = @"/Volumes" stringByAppendingPathComponent:uuidString;
+ }
+ CFRelease(uuid);
+ }
+		}
+ // Note: this check does not follow symbolic links, which is what we want
+		while (NSURL fileURLWithPath:mountPoint checkResourceIsReachableAndReturnError:NULL);
+ 
+ NSData *promptData = NSData dataWithBytes:"yes\n" length:4;
+ 
+ NSMutableArray *arguments = @@"attach", self.archivePath, @"-mountpoint", mountPoint, /*@"-noverify",*/ @"-nobrowse", @"-noautoopen" mutableCopy;
+ 
+ if (self.decryptionPassword) {
+ NSMutableData *passwordData = self.decryptionPassword dataUsingEncoding:NSUTF8StringEncoding mutableCopy;
+ // From the hdiutil docs:
+ // read a null-terminated passphrase from standard input
+ //
+ // Add the null terminator, then the newline
+ passwordData appendData:NSData dataWithBytes:"\0" length:1;
+ passwordData appendData:promptData;
+ promptData = passwordData;
+ 
+ arguments addObject:@"-stdinpass";
+ }
+ 
+ NSData *output = nil;
+ NSInteger taskResult = -1;
+ 
+ {
+ NSTask *task = NSTask alloc init;
+ task.launchPath = @"/usr/bin/hdiutil";
+ task.currentDirectoryPath = @"/";
+ task.arguments = arguments;
+ 
+ NSPipe *inputPipe = NSPipe pipe;
+ NSPipe *outputPipe = NSPipe pipe;
+ 
+ task.standardInput = inputPipe;
+ task.standardOutput = outputPipe;
+ 
+ NSFileHandle *fileStdHandle = outputPipe.fileHandleForReading;
+ NSMutableData *currentOutput = NSMutableData data;
+ 
+ fileStdHandle.readabilityHandler = ^(NSFileHandle *file) {
+ currentOutput appendData:file.availableData;
+ };
+ 
+ dispatch_semaphore_t terminationSemaphore = dispatch_semaphore_create(0);
+ task.terminationHandler = ^(NSTask *__unused terminatingTask) {
+ fileStdHandle.readabilityHandler = nil;
+ 
+ dispatch_semaphore_signal(terminationSemaphore);
+ };
+ 
+ if (!task launchAndReturnError:&error) {
+ goto reportError;
+ }
+ 
+ notifier notifyProgress:0.125;
+
+ inputPipe.fileHandleForWriting writeData:promptData;
+ 
+ if (@available(macOS 10.15, *)) {
+ if (!inputPipe.fileHandleForWriting writeData:promptData error:&error) {
+ goto reportError;
+ }
+ } else {
+ @try {
+ inputPipe.fileHandleForWriting writeData:promptData;
+ } @catch (NSException *) {
+ goto reportError;
+ }
+ }
+ 
+ inputPipe.fileHandleForWriting closeFile;
+ 
+ dispatch_semaphore_wait(terminationSemaphore, DISPATCH_TIME_FOREVER);
+ output = currentOutput copy;
+ 
+ taskResult = task.terminationStatus;
+ }
+ 
+ notifier notifyProgress:0.5;
+
+		if (taskResult != 0)
+		{
+ NSString *resultStr = output ? NSString alloc initWithData:output encoding:NSUTF8StringEncoding : nil;
+ SULog(SULogLevelError, @"hdiutil failed with code: %ld data: <<%@>>", (long)taskResult, resultStr);
+ goto reportError;
+ }
+ mountedSuccessfully = YES;
+ 
+ // Now that we've mounted it, we need to copy out its contents.
+ manager = NSFileManager alloc init;
+ contents = manager contentsOfDirectoryAtPath:mountPoint error:&error;
+ if (contents == nil)
+ {
+ SULog(SULogLevelError, @"Couldn't enumerate contents of archive mounted at %@: %@", mountPoint, error);
+ goto reportError;
+ }
+
+ double itemsCopied = 0;
+ double totalItems = (double)contents count;
+
+		for (NSString *item in contents)
+		{
+ NSString *fromPath = mountPoint stringByAppendingPathComponent:item;
+ NSString *toPath = self.archivePath stringByDeletingLastPathComponent stringByAppendingPathComponent:item;
+ 
+ itemsCopied += 1.0;
+ notifier notifyProgress:0.5 + itemsCopied/(totalItems*2.0);
+ 
+ // We skip any files in the DMG which are not readable but include the item in the progress
+ if (!manager isReadableFileAtPath:fromPath) {
+ continue;
+ }
+
+ SULog(SULogLevelDefault, @"copyItemAtPath:%@ toPath:%@", fromPath, toPath);
+
+			if (!manager copyItemAtPath:fromPath toPath:toPath error:&error)
+			{
+ goto reportError;
+ }
+ }
+ 
+ notifier notifySuccess;
+ goto finally;
+ 
+ reportError:
+ notifier notifyFailureWithError:error;
+
+ finally:
+ if (mountedSuccessfully) {
+ NSTask *task = NSTask alloc init;
+ task.launchPath = @"/usr/bin/hdiutil";
+ task.arguments = @@"detach", mountPoint, @"-force";
+ task.standardOutput = NSPipe pipe;
+ task.standardError = NSPipe pipe;
+ 
+ NSError *launchCleanupError = nil;
+ if (!task launchAndReturnError:&launchCleanupError) {
+ SULog(SULogLevelError, @"Failed to unmount %@", mountPoint);
+ SULog(SULogLevelError, @"Error: %@", launchCleanupError);
+ }
+ } else {
+ SULog(SULogLevelError, @"Can't mount DMG %@", self.archivePath);
+ }
+ }
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.archivePath; }
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUFlatPackageUnarchiver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUFlatPackageUnarchiver.m Added

@@ -0,0 +1,67 @@
+//
+// SUFlatPackageUnarchiver.m
+// Autoupdate
+//
+// Created by Mayur Pawashe on 1/30/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SUFlatPackageUnarchiver.h"
+#import "SUUnarchiverNotifier.h"
+#import "SPUInstallationType.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUFlatPackageUnarchiver ()
+
+@property (nonatomic, readonly) NSString *flatPackagePath;
+@property (nonatomic, readonly) NSString *expectedInstallationType;
+
+@end
+
+@implementation SUFlatPackageUnarchiver
+
+@synthesize flatPackagePath = _flatPackagePath;
+@synthesize expectedInstallationType = _expectedInstallationType;
+
++ (BOOL)canUnarchivePath:(NSString *)path
+{
+ return path.pathExtension isEqualToString:@"pkg" || path.pathExtension isEqualToString:@"mpkg";
+}
+
++ (BOOL)mustValidateBeforeExtraction
+{
+ return YES;
+}
+
+- (instancetype)initWithFlatPackagePath:(NSString *)flatPackagePath expectingInstallationType:(NSString *)installationType
+{
+ self = super init;
+ if (self != nil) {
+ _flatPackagePath = flatPackagePath copy;
+ _expectedInstallationType = installationType copy;
+ }
+ return self;
+}
+
+- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
+{
+ SUUnarchiverNotifier *notifier = SUUnarchiverNotifier alloc initWithCompletionBlock:completionBlock progressBlock:progressBlock;
+ 
+ // Flat packages must use guided package installs, not interactive
+ BOOL isDirectory = NO;
+ if (!self.expectedInstallationType isEqualToString:SPUInstallationTypeGuidedPackage) {
+ notifier notifyFailureWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:NSString stringWithFormat:@"Flat package does not have guided installation type but %@ instead", self.expectedInstallationType};
+ } else if (!NSFileManager defaultManager fileExistsAtPath:self.flatPackagePath isDirectory:&isDirectory || isDirectory) {
+ notifier notifyFailureWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:NSString stringWithFormat:@"Flat package does not exist at %@", self.flatPackagePath};
+ } else {
+ notifier notifyProgress:1.0;
+ notifier notifySuccess;
+ }
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.flatPackagePath; }
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUGuidedPackageInstaller.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUGuidedPackageInstaller.m Added

@@ -0,0 +1,95 @@
+//
+// SUGuidedPackageInstaller.m
+// Sparkle
+//
+// Created by Graham Miln on 14/05/2010.
+// Copyright 2010 Dragon Systems Software Limited. All rights reserved.
+//
+
+#import <sys/stat.h>
+#import "SUGuidedPackageInstaller.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUGuidedPackageInstaller ()
+
+@property (nonatomic, readonly, copy) NSString *packagePath;
+@property (nonatomic, readonly, copy) NSString *homeDirectory;
+@property (nonatomic, readonly, copy) NSString *userName;
+
+@end
+
+@implementation SUGuidedPackageInstaller
+
+@synthesize packagePath = _packagePath;
+@synthesize homeDirectory = _homeDirectory;
+@synthesize userName = _userName;
+
+- (instancetype)initWithPackagePath:(NSString *)packagePath homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName
+{
+ self = super init;
+ if (self != nil) {
+ _packagePath = packagePath copy;
+ _homeDirectory = homeDirectory copy;
+ _userName = userName copy;
+ }
+ return self;
+}
+
+- (BOOL)performInitialInstallation:(NSError * __autoreleasing *)__unused error
+{
+ return YES;
+}
+
+- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))__unused cb error:(NSError * __autoreleasing *)error
+{
+ // This command *must* be run as root
+ NSString *installerPath = @"/usr/sbin/installer";
+ 
+ NSTask *task = NSTask alloc init;
+ task.launchPath = installerPath;
+ task.arguments = @@"-pkg", self.packagePath, @"-target", @"/";
+ // Set the $HOME and $USER variables so pre/post install scripts reference the correct user environment
+ task.environment = @{@"HOME": self.homeDirectory, @"USER": self.userName};
+ task.standardError = nil;
+ task.standardOutput = nil;
+ 
+ NSError *launchError = nil;
+ if (!task launchAndReturnError:&launchError) {
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: @"Guided package installer failed to launch" };
+ 
+ if (launchError != nil) {
+ userInfoNSUnderlyingErrorKey = launchError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ }
+ return NO;
+ }
+ 
+ task waitUntilExit;
+ 
+ if (task.terminationStatus != EXIT_SUCCESS) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Guided package installer returned non-zero exit status (%d)", task.terminationStatus };
+ }
+ 
+ return NO;
+ }
+ 
+ return YES;
+}
+
+- (void)performCleanup
+{
+}
+
+- (BOOL)canInstallSilently
+{
+ return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUInstaller.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUInstaller.m Added

@@ -0,0 +1,176 @@
+//
+// SUInstaller.m
+// Sparkle
+//
+// Created by Andy Matuschak on 4/10/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUInstaller.h"
+#import "SUPlainInstaller.h"
+#import "SUPackageInstaller.h"
+#import "SUGuidedPackageInstaller.h"
+#import "SUHost.h"
+#import "SUConstants.h"
+#import "SULog.h"
+#import "SUErrors.h"
+#import "SPUInstallationType.h"
+#import "SUNormalization.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUInstaller
+
++ (BOOL)isAliasFolderAtPath:(NSString *)path
+{
+ NSNumber *aliasFlag = nil;
+ NSURL fileURLWithPath:path getResourceValue:&aliasFlag forKey:NSURLIsAliasFileKey error:nil;
+ NSNumber *directoryFlag = nil;
+ NSURL fileURLWithPath:path getResourceValue:&directoryFlag forKey:NSURLIsDirectoryKey error:nil;
+ return aliasFlag.boolValue && directoryFlag.boolValue;
+}
+
++ (nullable NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host isPackage:(BOOL *)isPackagePtr isGuided:(BOOL *)isGuidedPtr
+{
+ NSParameterAssert(inUpdateFolder);
+ NSParameterAssert(host);
+
+ // Search subdirectories for the application
+ NSString *currentFile,
+ *newAppDownloadPath = nil,
+ *bundleFileName = host bundlePath lastPathComponent,
+ *alternateBundleFileName = host name stringByAppendingPathExtension:host bundlePath pathExtension;
+ BOOL isPackage = NO;
+ BOOL isGuided = YES;
+ NSString *fallbackPackagePath = nil;
+ NSDirectoryEnumerator *dirEnum = NSFileManager defaultManager enumeratorAtPath:inUpdateFolder;
+ NSString *bundleFileNameNoExtension = bundleFileName stringByDeletingPathExtension;
+
+ while ((currentFile = dirEnum nextObject)) {
+ NSString *currentPath = inUpdateFolder stringByAppendingPathComponent:currentFile;
+ NSString *currentFilename = currentFile lastPathComponent;
+ NSString *currentExtension = currentFile pathExtension;
+ NSString *currentFilenameNoExtension = currentFilename stringByDeletingPathExtension;
+ if (currentFilename isEqualToString:bundleFileName ||
+ currentFilename isEqualToString:alternateBundleFileName) // We found one!
+ {
+ isPackage = NO;
+ newAppDownloadPath = currentPath;
+ break;
+ } else if (currentExtension isEqualToString:@"pkg" ||
+ currentExtension isEqualToString:@"mpkg") {
+ if (currentFilenameNoExtension isEqualToString:bundleFileNameNoExtension) {
+ isPackage = YES;
+ newAppDownloadPath = currentPath;
+ break;
+ } else {
+ // Remember any other non-matching packages we have seen should we need to use one of them as a fallback.
+ fallbackPackagePath = currentPath;
+ }
+ } else {
+ // Try matching on bundle identifiers in case the user has changed the name of the host app
+ NSBundle *incomingBundle = NSBundle bundleWithPath:currentPath;
+ NSString *hostBundleIdentifier = host.bundle.bundleIdentifier;
+ if (incomingBundle && incomingBundle.bundleIdentifier isEqualToString:hostBundleIdentifier) {
+ isPackage = NO;
+ newAppDownloadPath = currentPath;
+ break;
+ }
+ }
+
+ // Some DMGs have symlinks into /Applications! That's no good!
+ if (self isAliasFolderAtPath:currentPath)
+ dirEnum skipDescendents;
+ }
+
+ // We don't have a valid path. Try to use the fallback package.
+
+ if (newAppDownloadPath == nil && fallbackPackagePath != nil) {
+ isPackage = YES;
+ newAppDownloadPath = fallbackPackagePath;
+ }
+
+ if (isPackage) {
+ // Guided (or now "normal") installs used to be opt-in (i.e, Sparkle would detect foo.sparkle_guided.pkg or foo.sparkle_guided.mpkg),
+ // but to get an interactive (or "unguided") install, the developer now must opt-out of guided installations.
+ 
+ // foo.app -> foo.sparkle_interactive.pkg or foo.sparkle_interactive.mpkg
+ if (newAppDownloadPath stringByDeletingPathExtension pathExtension isEqualToString:@"sparkle_interactive") {
+ isGuided = NO;
+ }
+ }
+
+ if (isPackagePtr)
+ *isPackagePtr = isPackage;
+ if (isGuidedPtr)
+ *isGuidedPtr = isGuided;
+
+ if (!newAppDownloadPath) {
+ SULog(SULogLevelError, @"Searched %@ for %@.(app|pkg)", inUpdateFolder, bundleFileNameNoExtension);
+ }
+ return newAppDownloadPath;
+}
+
++ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError * __autoreleasing *)error
+{
+ BOOL isPackage = NO;
+ BOOL isGuided = NO;
+ NSString *newDownloadPath = self installSourcePathInUpdateFolder:updateDirectory forHost:host isPackage:&isPackage isGuided:&isGuided;
+ 
+ if (newDownloadPath == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find an appropriate update in the downloaded package." };
+ }
+ return nil;
+ }
+ 
+ // Make sure we find the type of installer that we were expecting to find
+ // We shouldn't implicitly trust the installation type fed into here from the appcast because the installation type helps us determine
+ // ahead of time whether or not this installer tool should be ran as root or not
+ id <SUInstallerProtocol> installer = nil;
+ if (isPackage && isGuided) {
+ if (!expectedInstallationType isEqualToString:SPUInstallationTypeGuidedPackage) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Found guided package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeGuidedPackage };
+ }
+ } else {
+ installer = SUGuidedPackageInstaller alloc initWithPackagePath:newDownloadPath homeDirectory:homeDirectory userName:userName;
+ }
+ } else if (isPackage) {
+ if (!expectedInstallationType isEqualToString:SPUInstallationTypeInteractivePackage) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Found package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeInteractivePackage };
+ }
+ } else {
+ installer = SUPackageInstaller alloc initWithPackagePath:newDownloadPath;
+ }
+ } else {
+ if (!expectedInstallationType isEqualToString:SPUInstallationTypeApplication) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Found regular application update but expected '%@=%@' from the appcast item enclosure instead", SUAppcastAttributeInstallationType, expectedInstallationType };
+ }
+ } else {
+ NSString *normalizedInstallationPath = nil;
+ if (SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME) {
+ normalizedInstallationPath = SUNormalizedInstallationPath(host);
+ }
+ 
+ // If we have a normalized path, we'll install to "#{CFBundleName}.app", but only if that path doesn't already exist. If we're "Foo 4.2.app," and there's a "Foo.app" in this directory, we don't want to overwrite it! But if there's no "Foo.app," we'll take that name.
+ // Otherwise if there's no normalized path (the more likely case), we'll just use the host bundle's path
+ // Check progress agent app which computes normalized path too according to these rules
+ NSString *installationPath;
+ if (normalizedInstallationPath != nil && !NSFileManager defaultManager fileExistsAtPath:normalizedInstallationPath) {
+ installationPath = normalizedInstallationPath;
+ } else {
+ installationPath = host.bundlePath;
+ }
+ 
+ installer = SUPlainInstaller alloc initWithHost:host bundlePath:newDownloadPath installationPath:installationPath;
+ }
+ }
+ 
+ return installer;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUInstallerProtocol.h Added

@@ -0,0 +1,38 @@
+//
+// SUInstallerProtocol.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/12/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUInstallerProtocol <NSObject>
+
+// Any installation work can be done prior to user application being terminated and relaunched
+// No UI should occur during this stage (i.e, do not show package installer apps, etc..)
+// Should be able to be called from non-main thread
+- (BOOL)performInitialInstallation:(NSError **)error;
+
+// Any installation work after the user application has has been terminated. This is where the final installation work can be done.
+// After this stage is done, the user application may be relaunched.
+// Should be able to be called from non-main thread
+- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))cb error:(NSError **)error;
+
+// Any clean up work can be done here
+// This is work that may be performed after the user application may have been updated / relaunched,
+// or after an error occurred in the previous stages.
+// Should be able to be called from any thread
+- (void)performCleanup;
+
+// Indicates whether or not this installer can install the update silently in the background, without hindering the user
+// If this returns NO, then the installation can fail if the user did not directly request for the install to occur.
+// Should be thread safe
+- (BOOL)canInstallSilently;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPackageInstaller.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPackageInstaller.m Added

@@ -0,0 +1,82 @@
+//
+//  SUPackageInstaller.m
+//  Sparkle
+//
+//  Created by Andy Matuschak on 4/10/08.
+//  Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUPackageInstaller.h"
+#import "SUConstants.h"
+#import "SUErrors.h"
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUPackageInstaller ()
+
+@property (nonatomic, readonly, copy) NSString *packagePath;
+
+@end
+
+@implementation SUPackageInstaller
+
+static NSString *SUOpenUtilityPath = @"/usr/bin/open";
+
+@synthesize packagePath = _packagePath;
+
+- (instancetype)initWithPackagePath:(NSString *)packagePath
+{
+    self = super init;
+    if (self != nil) {
+        _packagePath = packagePath copy;
+    }
+    return self;
+}
+
+- (BOOL)performInitialInstallation:(NSError * __autoreleasing *)error
+{
+    if (!NSFileManager defaultManager fileExistsAtPath:SUOpenUtilityPath) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingInstallerToolError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find Apple's installer tool!" };
+        }
+        return NO;
+    }
+    return YES;
+}
+
+- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))__unused cb error:(NSError *__autoreleasing*)error
+{
+    // Run installer using the "open" command to ensure it is launched in front of current application.
+    // -W = wait until the app has quit.
+    // -n = Open another instance if already open.
+    // -b = app bundle identifier
+    NSArray *args = @@"-W", @"-n", @"-b", @"com.apple.installer", self.packagePath;
+    
+    // Known bug: if the installation fails or is canceled, Sparkle goes ahead and restarts, thinking everything is fine.
+    @try {
+        NSTask *installer = NSTask launchedTaskWithLaunchPath:SUOpenUtilityPath arguments:args;
+        installer waitUntilExit;
+    }
+    @catch (NSException *exception) {
+        SULog(SULogLevelError, @"Error: Failed to launch package installer: %@", exception);
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Package installer failed to launch." };
+        }
+        return NO;
+    }
+    
+    return YES;
+}
+
+- (void)performCleanup
+{
+}
+
+- (BOOL)canInstallSilently
+{
+    return NO;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPipedUnarchiver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPipedUnarchiver.m Added

@@ -0,0 +1,226 @@
+//
+// SUPipedUnarchiver.m
+// Sparkle
+//
+// Created by Andy Matuschak on 6/16/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUPipedUnarchiver.h"
+#import "SUUnarchiverNotifier.h"
+#import "SULog.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUPipedUnarchiver ()
+
+@property (nonatomic, copy, readonly) NSString *archivePath;
+
+@end
+
+@implementation SUPipedUnarchiver
+
+@synthesize archivePath = _archivePath;
+
++ (nullable NSArray <NSString *> *)commandAndArgumentsConformingToTypeOfPath:(NSString *)path
+{
+ NSArray <NSString *> *extractTGZ = @@"/usr/bin/tar", @"-zxC";
+ NSArray <NSString *> *extractTBZ = @@"/usr/bin/tar", @"-jxC";
+ NSArray <NSString *> *extractTXZ = extractTGZ;
+ 
+ NSDictionary <NSString *, NSArray<NSString *> *> *extractCommandDictionary =
+ @{
+ @".zip" : @@"/usr/bin/ditto", @"-x",@"-k",@"-",
+ @".tar" : @@"/usr/bin/tar", @"-xC",
+ @".tar.gz" : extractTGZ,
+ @".tgz" : extractTGZ,
+ @".tar.bz2" : extractTBZ,
+ @".tbz" : extractTBZ,
+ @".tar.xz" : extractTXZ,
+ @".txz" : extractTXZ,
+ @".tar.lzma" : extractTXZ
+ };
+ 
+ NSString *lastPathComponent = path lastPathComponent;
+ for (NSString *currentType in extractCommandDictionary)
+ {
+ if (lastPathComponent hasSuffix:currentType) {
+ return extractCommandDictionary objectForKey:currentType;
+ }
+ }
+ return nil;
+}
+
++ (BOOL)canUnarchivePath:(NSString *)path
+{
+ return (self commandAndArgumentsConformingToTypeOfPath:path != nil);
+}
+
++ (BOOL)mustValidateBeforeExtraction
+{
+ return NO;
+}
+
+- (instancetype)initWithArchivePath:(NSString *)archivePath
+{
+ self = super init;
+ if (self != nil) {
+ _archivePath = archivePath copy;
+ }
+ return self;
+}
+
+- (void)unarchiveWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
+{
+ NSArray <NSString *> *commandAndArguments = self class commandAndArgumentsConformingToTypeOfPath:self.archivePath;
+ assert(commandAndArguments != nil);
+ 
+ NSString *command = commandAndArguments.firstObject;
+ assert(command != nil);
+ 
+ NSArray <NSString *> *arguments = commandAndArguments subarrayWithRange:NSMakeRange(1, commandAndArguments.count - 1);
+ 
+ dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+ SUUnarchiverNotifier *notifier = SUUnarchiverNotifier alloc initWithCompletionBlock:completionBlock progressBlock:progressBlock;
+ self extractArchivePipingDataToCommand:command arguments:arguments notifier:notifier;
+ });
+}
+
+// This method abstracts the types that use a command line tool piping data from stdin.
+- (void)extractArchivePipingDataToCommand:(NSString *)command arguments:(NSArray*)args notifier:(SUUnarchiverNotifier *)notifier
+{
+ // *** GETS CALLED ON NON-MAIN THREAD!!!
+	@autoreleasepool {
+ NSString *destination = self.archivePath stringByDeletingLastPathComponent;
+ 
+ SULog(SULogLevelDefault, @"Extracting using '%@' '%@' < '%@' '%@'", command, args componentsJoinedByString:@"' '", self.archivePath, destination);
+ 
+ // Get the file size.
+ NSDictionary *attributes = NSFileManager defaultManager attributesOfItemAtPath:self.archivePath error:nil;
+ NSUInteger expectedLength = (NSNumber *)attributes objectForKey:NSFileSize unsignedIntegerValue;
+ 
+ if (expectedLength == 0) {
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:NSString stringWithFormat:@"Extraction failed, archive '%@' is empty", self.archivePath};
+ 
+ notifier notifyFailureWithError:error;
+ return;
+ }
+ 
+ NSFileHandle *archiveInput = NSFileHandle fileHandleForReadingAtPath:self.archivePath;
+ 
+ NSPipe *pipe = NSPipe pipe;
+ NSTask *task = NSTask alloc init;
+ task setStandardInput:pipe;
+ task setStandardError:NSFileHandle fileHandleWithStandardError;
+ task setStandardOutput:NSFileHandle fileHandleWithStandardOutput;
+ task setLaunchPath:command;
+ task setArguments:args arrayByAddingObject:destination;
+ 
+ NSError *launchError = nil;
+ if (!task launchAndReturnError:&launchError) {
+ notifier notifyFailureWithError:launchError;
+ return;
+ }
+ 
+ NSFileHandle *archiveOutput = pipe fileHandleForWriting;
+ NSUInteger bytesWritten = 0;
+ 
+ BOOL hasIOErrorMethods;
+ if (@available(macOS 10.15, *)) {
+ hasIOErrorMethods = YES;
+ } else {
+ hasIOErrorMethods = NO;
+ }
+ 
+ do {
+ NSData *data;
+ if (hasIOErrorMethods) {
+ NSError *readError = nil;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
+ data = archiveInput readDataUpToLength:256*1024 error:&readError;
+#pragma clang diagnostic pop
+ if (data == nil) {
+ SULog(SULogLevelError, @"Failed to read data from archive with error %@", readError);
+ }
+ } else {
+ @try {
+ data = archiveInput readDataOfLength:256*1024;
+ } @catch (NSException *exception) {
+ SULog(SULogLevelError, @"Failed to read data from archive with exception reason %@", exception.reason);
+ data = nil;
+ }
+ }
+ 
+ NSUInteger len = data length;
+ if (len == 0) {
+ break;
+ }
+ 
+ NSError *writeError = nil;
+ if (hasIOErrorMethods) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wpartial-availability"
+ if (!archiveOutput writeData:data error:&writeError) {
+#pragma clang diagnostic pop
+ SULog(SULogLevelError, @"Failed to write data to pipe with error %@", writeError);
+ break;
+ }
+ } else {
+ @try {
+ archiveOutput writeData:data;
+ } @catch (NSException *exception) {
+ SULog(SULogLevelError, @"Failed to write data to pipe with exception reason %@", exception.reason);
+ break;
+ }
+ }
+ 
+ bytesWritten += len;
+ 
+ notifier notifyProgress:(double)bytesWritten / (double)expectedLength;
+ }
+ while(bytesWritten < expectedLength);
+ 
+ if (@available(macOS 10.15, *)) {
+ NSError *archiveOutputCloseError = nil;
+ if (!archiveOutput closeAndReturnError:&archiveOutputCloseError) {
+ SULog(SULogLevelError, @"Failed to close pipe with error %@", archiveOutputCloseError);
+ }
+ } else {
+ archiveOutput closeFile;
+ }
+ 
+ if (@available(macOS 10.15, *)) {
+ NSError *archiveInputCloseError = nil;
+ if (!archiveInput closeAndReturnError:&archiveInputCloseError) {
+ SULog(SULogLevelError, @"Failed to close archive input with error %@", archiveInputCloseError);
+ }
+ } else {
+ archiveInput closeFile;
+ }
+ 
+ task waitUntilExit;
+ 
+ if (task terminationStatus != 0) {
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:NSString stringWithFormat:@"Extraction failed, command '%@' returned %d", command, task terminationStatus};
+ 
+ notifier notifyFailureWithError:error;
+ return;
+ }
+ 
+ if (bytesWritten != expectedLength) {
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:NSString stringWithFormat:@"Extraction failed, command '%@' got only %ld of %ld bytes", command, (long)bytesWritten, (long)expectedLength};
+ 
+ notifier notifyFailureWithError:error;
+ return;
+ }
+ 
+ notifier notifySuccess;
+ }
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.archivePath; }
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPlainInstaller.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUPlainInstaller.m Added

@@ -0,0 +1,338 @@
+//
+// SUPlainInstaller.m
+// Sparkle
+//
+// Created by Andy Matuschak on 4/10/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUPlainInstaller.h"
+#import "SUFileManager.h"
+#import "SUConstants.h"
+#import "SUHost.h"
+#import "SULog.h"
+#import "SUErrors.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUStandardVersionComparator.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUPlainInstaller ()
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, copy, readonly) NSString *bundlePath;
+@property (nonatomic, copy, readonly) NSString *installationPath;
+
+@property (nonatomic) NSURL *temporaryOldDirectory;
+// We get an obj-c warning if we use 'newTemporaryDirectory' name about new + ownership stuff, so use 'temporaryNewDirectory' instead
+@property (nonatomic) NSURL *temporaryNewDirectory;
+
+@end
+
+@implementation SUPlainInstaller
+
+@synthesize host = _host;
+@synthesize bundlePath = _bundlePath;
+@synthesize installationPath = _installationPath;
+@synthesize temporaryOldDirectory = _temporaryOldDirectory;
+@synthesize temporaryNewDirectory = _temporaryNewDirectory;
+
+- (instancetype)initWithHost:(SUHost *)host bundlePath:(NSString *)bundlePath installationPath:(NSString *)installationPath
+{
+ self = super init;
+ if (self != nil) {
+ _host = host;
+ _bundlePath = bundlePath copy;
+ _installationPath = installationPath copy;
+ }
+ return self;
+}
+
+// Returns the bundle version from the specified host that is appropriate to use as a filename, or nil if we're unable to retrieve one
+- (NSString *)bundleVersionAppropriateForFilenameFromHost:(SUHost *)host
+{
+ NSString *bundleVersion = host objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey;
+ NSString *trimmedVersion = @"";
+ 
+ if (bundleVersion != nil) {
+ NSMutableCharacterSet *validCharacters = NSMutableCharacterSet alphanumericCharacterSet;
+ validCharacters formUnionWithCharacterSet:NSCharacterSet characterSetWithCharactersInString:@".-()";
+ 
+ trimmedVersion = bundleVersion stringByTrimmingCharactersInSet:validCharacters invertedSet;
+ }
+ 
+ return trimmedVersion.length > 0 ? trimmedVersion : nil;
+}
+
+- (BOOL)startInstallationToURL:(NSURL *)installationURL fromUpdateAtURL:(NSURL *)newURL withHost:(SUHost *)host progressBlock:(nullable void(^)(double))progress error:(NSError * __autoreleasing *)error
+{
+ if (installationURL == nil || newURL == nil) {
+ // this really shouldn't happen but just in case
+ SULog(SULogLevelError, @"Failed to perform installation because either installation URL (%@) or new URL (%@) is nil", installationURL, newURL);
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to perform installation because the paths to install at and from are not valid" };
+ }
+ return NO;
+ }
+
+ if (progress) {
+ progress(1/10.0);
+ }
+
+ SUFileManager *fileManager = SUFileManager alloc init;
+
+ // Update the access time of our entire application before moving it into a temporary directory
+ // The system periodically cleans up files by looking at the mod & access times, so we have to make sure they're up to date
+ // They could be potentially be preserved when archiving an application, but also an update could just be sitting on the system for a long time
+ // before being installed
+ NSError *accessTimeError = nil;
+ if (!fileManager updateAccessTimeOfItemAtRootURL:newURL error:&accessTimeError) {
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: @"Failed to recursively update new application's modification time before moving into temporary directory" };
+ 
+ if (accessTimeError != nil) {
+ userInfoNSUnderlyingErrorKey = accessTimeError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ }
+ 
+ return NO;
+ }
+ 
+ NSURL *oldURL = NSURL fileURLWithPath:host.bundlePath;
+ if (oldURL == nil) {
+ // this really shouldn't happen but just in case
+ SULog(SULogLevelError, @"Failed to construct URL from bundle path: %@", host.bundlePath);
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to perform installation because a path could not be constructed for the old installation" };
+ }
+ return NO;
+ }
+ 
+ if (progress) {
+ progress(2/10.0);
+ }
+ 
+ // Create a temporary directory for our new app that resides on our destination's volume
+ // We use oldURL here instead of installationURL because in the case of normalization, installationURL may not exist
+ // And we don't want to use either of the URL's parent directories because the parent directory could be on a different volume
+ NSURL *tempNewDirectoryURL = fileManager makeTemporaryDirectoryAppropriateForDirectoryURL:oldURL error:error;
+ if (tempNewDirectoryURL == nil) {
+ return NO;
+ }
+ 
+ self.temporaryNewDirectory = tempNewDirectoryURL;
+
+ if (progress) {
+ progress(3/10.0);
+ }
+
+ // Move the new app to our temporary directory
+ NSString *newURLLastPathComponent = newURL.lastPathComponent;
+ NSURL *newTempURL = tempNewDirectoryURL URLByAppendingPathComponent:newURLLastPathComponent;
+ NSError *newTempMoveError = nil;
+ if (!fileManager moveItemAtURL:newURL toURL:newTempURL error:&newTempMoveError) {
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to move the new app from %@ to its temp directory at %@", newURL.path, newTempURL.path };
+ 
+ if (newTempMoveError != nil) {
+ userInfoNSUnderlyingErrorKey = newTempMoveError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ }
+ return NO;
+ }
+
+ if (progress) {
+ progress(4/10.0);
+ }
+
+ // Release our new app from quarantine
+ NSError *quarantineError = nil;
+ if (!fileManager releaseItemFromQuarantineAtRootURL:newTempURL error:&quarantineError) {
+ // Not big enough of a deal to fail the entire installation
+ SULog(SULogLevelError, @"Failed to release quarantine at %@ with error %@", newTempURL.path, quarantineError);
+ }
+
+ if (progress) {
+ progress(5/10.0);
+ }
+ 
+ // Try to preserve Finder Tags
+ NSArray *resourceTags = nil;
+ BOOL retrievedResourceTags = oldURL getResourceValue:&resourceTags forKey:NSURLTagNamesKey error:NULL;
+ if (retrievedResourceTags && resourceTags.count > 0) {
+ newTempURL setResourceValue:resourceTags forKey:NSURLTagNamesKey error:NULL;
+ }
+ 
+ if (progress) {
+ progress(6/10.0);
+ }
+ 
+ // We must leave moving the app to its destination as the final step in installing it, so that
+ // it's not possible our new app can be left in an incomplete state at the final destination
+ 
+ NSError *changeOwnerAndGroupError = nil;
+ if (!fileManager changeOwnerAndGroupOfItemAtRootURL:newTempURL toMatchURL:oldURL error:&changeOwnerAndGroupError) {
+ // Not a fatal error
+ SULog(SULogLevelError, @"Failed to change owner and group of new app at %@ to match old app at %@", newTempURL.path, oldURL.path);
+ SULog(SULogLevelError, @"Error: %@", changeOwnerAndGroupError);
+ }
+
+ if (progress) {
+ progress(7/10.0);
+ }
+
+ NSError *touchError = nil;
+ if (!fileManager updateModificationAndAccessTimeOfItemAtURL:newTempURL error:&touchError) {
+ // Not a fatal error, but a pretty unfortunate one
+ SULog(SULogLevelError, @"Failed to update modification and access time of new app at %@", newTempURL.path);
+ SULog(SULogLevelError, @"Error: %@", touchError);
+ }
+
+ if (progress) {
+ progress(8/10.0);
+ }
+ 
+ // First try swapping the application atomically
+ NSError *swapError = nil;
+ BOOL swappedApp;
+ // If the app is normalized and the installation path differs, go through the old swap path
+ if (SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME && !oldURL.path isEqual:installationURL.path) {
+ swappedApp = NO;
+ } else {
+ // We will be cleaning up the temporary directory later in -performCleanup:
+ // We don't want to clean it up now because it can take some time
+ swappedApp = fileManager swapItemAtURL:installationURL withItemAtURL:newTempURL error:&swapError;
+ }
+ 
+ if (!swappedApp) {
+ // Otherwise swap out the old and new applications using the legacy path
+ 
+ if (swapError != nil) {
+ SULog(SULogLevelDefault, @"Invoking fallback from failing to replace original item with error: %@", swapError);
+ }
+
+ // Create a temporary directory for our old app that resides on its volume
+ NSURL *tempOldDirectoryURL = fileManager makeTemporaryDirectoryAppropriateForDirectoryURL:oldURL error:error;
+ if (tempOldDirectoryURL == nil) {
+ return NO;
+ }
+ 
+ self.temporaryOldDirectory = tempOldDirectoryURL;
+
+ if (progress) {
+ progress(9/10.0);
+ }
+ 
+ NSString *oldURLFilename = oldURL.lastPathComponent;
+ if (oldURLFilename == nil) {
+ // this really shouldn't happen..
+ SULog(SULogLevelError, @"Failed to retrieve last path component from old URL: %@", oldURL.path);
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to perform installation because the last path component of the old installation URL could not be constructed." };
+ }
+ return NO;
+ }
+ 
+ // Move the old app to the temporary directory
+ NSURL *oldTempURL = tempOldDirectoryURL URLByAppendingPathComponent:oldURLFilename;
+ NSError *oldMoveError = nil;
+ if (!fileManager moveItemAtURL:oldURL toURL:oldTempURL error:&oldMoveError) {
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to move the old app at %@ to a temporary location at %@", oldURL.path, oldTempURL.path };
+ 
+ if (oldMoveError != nil) {
+ userInfoNSUnderlyingErrorKey = oldMoveError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ }
+ return NO;
+ }
+
+ if (progress) {
+ progress(9.5/10.0);
+ }
+
+ // Move the new app to its final destination
+ NSError *installMoveError = nil;
+ if (!fileManager moveItemAtURL:newTempURL toURL:installationURL error:&installMoveError) {
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to move new app at %@ to final destination %@", newTempURL.path, installationURL.path };
+ 
+ if (installMoveError != nil) {
+ userInfoNSUnderlyingErrorKey = installMoveError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ }
+ 
+ // Attempt to restore our old app back the way it was on failure
+ fileManager moveItemAtURL:oldTempURL toURL:oldURL error:NULL;
+ 
+ return NO;
+ }
+ }
+
+ if (progress) {
+ progress(10/10.0);
+ }
+
+ return YES;
+}
+
+- (BOOL)performInitialInstallation:(NSError * __autoreleasing *)error
+{
+ // Prevent malicious downgrades
+ // Note that we may not be able to do this for package installations, hence this code being done here
+ NSString *hostVersion = self.host version;
+ 
+ NSBundle *bundle = NSBundle bundleWithPath:self.bundlePath;
+ SUHost *updateHost = SUHost alloc initWithBundle:bundle;
+ NSString *updateVersion = updateHost objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey;
+ 
+ id<SUVersionComparison> comparator = SUStandardVersionComparator alloc init;
+ if (!updateVersion || comparator compareVersion:hostVersion toVersion:updateVersion == NSOrderedDescending) {
+ 
+ if (error != NULL) {
+ NSString *errorMessage = NSString stringWithFormat:@"For security reasons, updates that downgrade version of the application are not allowed. Refusing to downgrade app from version %@ to %@. Aborting update.", hostVersion, updateVersion;
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUDowngradeError userInfo:@{ NSLocalizedDescriptionKey: errorMessage };
+ }
+ 
+ return NO;
+ }
+ 
+ return YES;
+}
+
+- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))cb error:(NSError *__autoreleasing*)error
+{
+ // Note: we must do most installation work in the third stage due to relying on our application sitting in temporary directories.
+ // It must not be possible for our update to sit in temporary directories for a very long time.
+ return self startInstallationToURL:NSURL fileURLWithPath:self.installationPath fromUpdateAtURL:NSURL fileURLWithPath:self.bundlePath withHost:self.host progressBlock:cb error:error;
+}
+
+- (void)performCleanup
+{
+ SUFileManager *fileManager = SUFileManager alloc init;
+ 
+ if (self.temporaryNewDirectory != nil) {
+ fileManager removeItemAtURL:self.temporaryNewDirectory error:NULL;
+ }
+ 
+ if (self.temporaryOldDirectory != nil) {
+ fileManager removeItemAtURL:self.temporaryOldDirectory error:NULL;
+ }
+}
+
+- (BOOL)canInstallSilently
+{
+ return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUSignatureVerifier.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUSignatureVerifier.m Added

@@ -0,0 +1,372 @@
+//
+// SUDSAVerifier.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/16/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+// Includes code by Zach Waldowski on 10/18/13.
+// Copyright 2014 Big Nerd Ranch. Licensed under MIT.
+//
+// Includes code from Plop by Mark Hamlin.
+// Copyright 2011 Mark Hamlin. Licensed under BSD.
+//
+
+#import "SUSignatureVerifier.h"
+#import "SULog.h"
+#import "SUSignatures.h"
+#import "SUErrors.h"
+#include <CommonCrypto/CommonDigest.h>
+#import "ed25519.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUSignatureVerifier ()
+@property (readonly) SUPublicKeys *pubKeys;
+@end
+
+@implementation SUSignatureVerifier {
+}
+
+@synthesize pubKeys = _pubKeys;
+
++ (BOOL)validatePath:(NSString *)path withSignatures:(SUSignatures *)signatures withPublicKeys:(SUPublicKeys *)pkeys error:(NSError * __autoreleasing *)error
+{
+ SUSignatureVerifier *verifier = (SUSignatureVerifier *)self alloc initWithPublicKeys:pkeys;
+
+ if (verifier == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to create SUSignatureVerifier instance" };
+ }
+ return NO;
+ }
+
+ return verifier verifyFileAtPath:path signatures:signatures error:error;
+}
+
+- (instancetype)initWithPublicKeys:(SUPublicKeys *)pubkeys
+{
+ self = super init;
+ if (self != nil) {
+ _pubKeys = pubkeys;
+ }
+ return self;
+}
+
+- (SecKeyRef)dsaSecKeyRef {
+
+ NSData *data = self.pubKeys.dsaPubKey dataUsingEncoding:NSASCIIStringEncoding;
+ if (!self || !data.length) {
+ SULog(SULogLevelError, @"Could not read public DSA key");
+ return nil;
+ }
+
+ SecExternalFormat format = kSecFormatOpenSSL;
+ SecExternalItemType itemType = kSecItemTypePublicKey;
+ CFArrayRef items = NULL;
+
+ OSStatus status = SecItemImport((__bridge CFDataRef)data, NULL, &format, &itemType, (SecItemImportExportFlags)0, NULL, NULL, &items);
+ if (status != errSecSuccess || !items) {
+ if (items) {
+ CFRelease(items);
+ }
+ SULog(SULogLevelError, @"Public DSA key could not be imported: %d", status);
+ return nil;
+ }
+
+ SecKeyRef dsaPubKeySecKey = nil;
+ if (format == kSecFormatOpenSSL && itemType == kSecItemTypePublicKey && CFArrayGetCount(items) == 1) {
+ // Seems silly, but we can't quiet the warning about dropping CFTypeRef's const qualifier through
+ // any manner of casting I've tried, including interim explicit cast to void*. The -Wcast-qual
+ // warning is on by default with -Weverything and apparently became more noisy as of Xcode 7.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
+ dsaPubKeySecKey = (SecKeyRef)CFRetain(CFArrayGetValueAtIndex(items, 0));
+#pragma clang diagnostic pop
+ }
+
+ CFRelease(items);
+ return dsaPubKeySecKey;
+}
+
+- (BOOL)verifyFileAtPath:(NSString *)path signatures:(SUSignatures *)signatures error:(NSError * __autoreleasing *)error
+{
+ if (!path || !path.length) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Path passed to verify has zero length and is not valid" };
+ }
+ return NO;
+ }
+
+ if (!signatures) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"No signatures given to verifyFileAtPath" };
+ }
+ return NO;
+ }
+
+ switch (self.pubKeys.ed25519PubKeyStatus) {
+ case SUSigningInputStatusAbsent:
+ if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
+ SULog(SULogLevelDefault, @"The update has an EdDSA signature, but it won't be used, because the old app doesn't have an EdDSA public key");
+ }
+ break;
+ case SUSigningInputStatusInvalid:
+ if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
+ NSString *message = @"The update has an EdDSA signature, but the app has an invalid EdDSA public key, so the update will automatically be rejected.";
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ return NO;
+ }
+ SULog(SULogLevelDefault, @"The app has an invalid EdDSA public key, but there is no EdDSA signature in the update. Falling back to DSA.");
+ break;
+ case SUSigningInputStatusPresent:
+ switch (signatures.ed25519SignatureStatus) {
+ case SUSigningInputStatusAbsent: {
+ NSString *message = @"The app has an EdDSA public key, but there is no EdDSA signature in the update, so the update will be rejected.";
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ return NO;
+ }
+ case SUSigningInputStatusInvalid: {
+ NSString *message = @"The update has an EdDSA signature, but it's invalid, so the update will automatically be rejected.";
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ return NO;
+ }
+ case SUSigningInputStatusPresent: {
+ NSError *dataError = nil;
+ NSData *data = NSData dataWithContentsOfFile:path options:NSDataReadingMappedAlways error:&dataError;
+ if (!data || !data.length) {
+ SULog(SULogLevelError, @"Failed to load file %@: %@", path, dataError);
+ 
+ if (error != NULL) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+ userInfoNSLocalizedDescriptionKey = NSString stringWithFormat:@"Failed to load file: %@", path;
+ if (dataError != nil) {
+ userInfoNSUnderlyingErrorKey = dataError;
+ }
+ 
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo copy;
+ }
+ 
+ return NO;
+ }
+ if (ed25519_verify(signatures.ed25519Signature, data.bytes, data.length, self.pubKeys.ed25519PubKey)) {
+ SULog(SULogLevelDefault, @"OK: EdDSA signature is correct");
+ // No need to check DSA when EdDSA verification succeeded, unless a DSA signature is provided and it's
+ // erroneously invalid
+ if (signatures.dsaSignatureStatus != SUSigningInputStatusInvalid) {
+ return YES;
+ }
+ } else {
+ NSString *message = @"EdDSA signature does not match. Data of the update file being checked is different than data that has been signed, or the public key and the private key are not from the same set.";
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
+ SULog(SULogLevelDefault, @"DSA signature won't be checked, because EdDSA verification has already failed");
+ }
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ return NO;
+ }
+ }
+ }
+ break;
+ }
+
+ switch (self.pubKeys.dsaPubKeyStatus) {
+ case SUSigningInputStatusAbsent:
+ if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
+ SULog(SULogLevelDefault, @"The update has a DSA signature, but it can't be used, because the old app doesn't have a DSA public key");
+ }
+ break;
+ case SUSigningInputStatusInvalid:
+ if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
+ // We will have already logged an error for this failure when the public key was read in, so just do an informational log here.
+ NSString *message = @"The update has a DSA signature, but the app has an invalid DSA public key, so the update will automatically be rejected.";
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ return NO;
+ }
+ SULog(SULogLevelDefault, @"The app has an invalid DSA public key, but there is no DSA signature in the update.");
+ break;
+ case SUSigningInputStatusPresent:
+ switch (signatures.dsaSignatureStatus) {
+ case SUSigningInputStatusAbsent:
+ SULog(SULogLevelError, @"There is no DSA signature in the update");
+ break;
+ case SUSigningInputStatusInvalid: {
+ NSString *message = @"The update has a DSA signature, but it's invalid, so the update will automatically be rejected.";
+ 
+ SULog(SULogLevelError, @"%@", message);
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: message };
+ }
+ 
+ return NO;
+ }
+ case SUSigningInputStatusPresent: {
+ NSInputStream *dataInputStream = NSInputStream inputStreamWithFileAtPath:path;
+ return self verifyDSASignatureOfStream:dataInputStream dsaSignature:signatures.dsaSignature error:error;
+ }
+ }
+ }
+
+ if (error != NULL) {
+ // Use generic failure
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"EdDSA and DSA verification for the update has failed" };
+ }
+ 
+ return NO;
+}
+
+- (BOOL)verifyDSASignatureOfStream:(NSInputStream *)stream dsaSignature:(NSData *)dsaSignature error:(NSError * __autoreleasing *)outError
+{
+ if (!stream || !dsaSignature) {
+ SULog(SULogLevelError, @"Invalid arguments to verifyStream");
+ 
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Invalid arguments to verifyStream" };
+ }
+ 
+ return NO;
+ }
+
+ SecKeyRef dsaPubKeySecKey = self dsaSecKeyRef;
+ if (!dsaPubKeySecKey) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to create DSA Sec Key Ref" };
+ }
+ 
+ return NO;
+ }
+
+ // Sparkle's DSA support is deprecated
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ __block SecGroupTransformRef group = SecTransformCreateGroupTransform();
+ __block SecTransformRef dataReadTransform = NULL;
+ __block SecTransformRef dataDigestTransform = NULL;
+ __block SecTransformRef dataVerifyTransform = NULL;
+ __block CFErrorRef error = NULL;
+
+ BOOL (^cleanup)(void) = ^{
+		if (group) CFRelease(group);
+		if (dataReadTransform) CFRelease(dataReadTransform);
+		if (dataDigestTransform) CFRelease(dataDigestTransform);
+		if (dataVerifyTransform) CFRelease(dataVerifyTransform);
+		if (error) CFRelease(error);
+ if (dsaPubKeySecKey) CFRelease(dsaPubKeySecKey);
+		return NO;
+ };
+
+ dataReadTransform = SecTransformCreateReadTransformWithReadStream((__bridge CFReadStreamRef)stream);
+ if (!dataReadTransform) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"File containing update archive could not be read (failed to create SecTransform for input stream)" };
+ }
+ return cleanup();
+ }
+
+ dataDigestTransform = SecDigestTransformCreate(kSecDigestSHA1, CC_SHA1_DIGEST_LENGTH, NULL);
+ if (!dataDigestTransform) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"File containing update archive could not be read (failed to create SecDigest for input stream)" };
+ }
+ 
+ return cleanup();
+ }
+ 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ dataVerifyTransform = SecVerifyTransformCreate(dsaPubKeySecKey, (__bridge CFDataRef)dsaSignature, &error);
+#pragma clang diagnostic pop
+ if (!dataVerifyTransform) {
+ SULog(SULogLevelError, @"Could not understand format of the signature: %@; Signature data: %@", error, dsaSignature);
+ if (outError != NULL) {
+ NSError *underlyingError = (__bridge NSError *)error;
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+ userInfoNSLocalizedDescriptionKey = NSString stringWithFormat:@"Could not understand format of the signature data %@", dsaSignature;
+ if (underlyingError != NULL) {
+ userInfoNSUnderlyingErrorKey = underlyingError;
+ }
+ 
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo copy;
+ }
+ 
+ return cleanup();
+ }
+#pragma clang diagnostic pop
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ SecTransformConnectTransforms(dataReadTransform, kSecTransformOutputAttributeName, dataDigestTransform, kSecTransformInputAttributeName, group, &error);
+#pragma clang diagnostic pop
+ if (error) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{NSLocalizedDescriptionKey : @"Failed to connect data read transform", NSUnderlyingErrorKey: (__bridge NSError *)error};
+ }
+ 
+ return cleanup();
+ }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ SecTransformConnectTransforms(dataDigestTransform, kSecTransformOutputAttributeName, dataVerifyTransform, kSecTransformInputAttributeName, group, &error);
+#pragma clang diagnostic pop
+ if (error) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{NSLocalizedDescriptionKey : @"Failed to connect data digest transform", NSUnderlyingErrorKey: (__bridge NSError *)error};
+ }
+ 
+ return cleanup();
+ }
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ NSNumber *result = CFBridgingRelease(SecTransformExecute(group, &error));
+#pragma clang diagnostic pop
+ if (error) {
+ SULog(SULogLevelError, @"DSA signature verification failed: %@", error);
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"DSA signature verification failed", NSUnderlyingErrorKey: (__bridge NSError *)error};
+ }
+ 
+ return cleanup();
+ }
+
+ if (!result.boolValue) {
+ if (outError != NULL) {
+ *outError = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"DSA signature does not match. Data of the update file being checked is different than data that has been signed, or the public key and the private key are not from the same set"};
+ }
+ }
+
+ cleanup();
+ return result.boolValue;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUStatusInfoProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUUnarchiver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUUnarchiver.m Added

@@ -0,0 +1,40 @@
+//
+// SUUnarchiver.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/16/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import "SUUnarchiver.h"
+#import "SUUnarchiverProtocol.h"
+#import "SUPipedUnarchiver.h"
+#import "SUDiskImageUnarchiver.h"
+#import "SUBinaryDeltaUnarchiver.h"
+#import "SUFlatPackageUnarchiver.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUUnarchiver
+
++ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType
+{
+ if (SUPipedUnarchiver canUnarchivePath:path) {
+ return SUPipedUnarchiver alloc initWithArchivePath:path;
+ 
+ } else if (SUDiskImageUnarchiver canUnarchivePath:path) {
+ return SUDiskImageUnarchiver alloc initWithArchivePath:path decryptionPassword:decryptionPassword;
+ 
+ } else if (SUBinaryDeltaUnarchiver canUnarchivePath:path) {
+ assert(hostPath != nil);
+ NSString *nonNullHostPath = hostPath;
+ return SUBinaryDeltaUnarchiver alloc initWithArchivePath:path updateHostBundlePath:nonNullHostPath;
+ } else if (SUFlatPackageUnarchiver canUnarchivePath:path) {
+ // Flat packages are only supported for guided packaage installs
+ return SUFlatPackageUnarchiver alloc initWithFlatPackagePath:path expectingInstallationType:installationType;
+ }
+ return nil;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUUnarchiverNotifier.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUUnarchiverNotifier.m Added

@@ -0,0 +1,70 @@
+//
+//  SUUnarchiverNotifier.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 12/21/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUUnarchiverNotifier.h"
+#import "SULocalizations.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUUnarchiverNotifier ()
+
+@property (nonatomic, readonly, copy) void (^completionBlock)(NSError * _Nullable);
+@property (nonatomic, readonly, copy) void (^ _Nullable progressBlock)(double);
+
+@end
+
+@implementation SUUnarchiverNotifier
+
+@synthesize completionBlock = _completionBlock;
+@synthesize progressBlock = _progressBlock;
+
+- (instancetype)initWithCompletionBlock:(void (^)(NSError * _Nullable))completionBlock progressBlock:(void (^ _Nullable)(double))progressBlock
+{
+    self = super init;
+    if (self != nil) {
+        _completionBlock = completionBlock copy;
+        _progressBlock = progressBlock copy;
+    } else {
+        assert(false);
+    }
+    return self;
+}
+
+- (void)notifySuccess
+{
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.completionBlock(nil);
+    });
+}
+
+- (void)notifyFailureWithError:(NSError * _Nullable)reason
+{
+    NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithObject:SULocalizedString(@"An error occurred while extracting the archive. Please try again later.", nil) forKey:NSLocalizedDescriptionKey;
+    if (reason) {
+        userInfo setObject:(NSError * _Nonnull)reason forKey:NSUnderlyingErrorKey;
+    }
+    
+    NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:userInfo;
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.completionBlock(error);
+    });
+}
+
+- (void)notifyProgress:(double)progress
+{
+    if (self.progressBlock != nil) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.progressBlock(progress);
+        });
+    }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/SUUnarchiverProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/StatusInfo.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/StatusInfo.m Added

@@ -0,0 +1,104 @@
+//
+// StatusInfo.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "StatusInfo.h"
+#import "SPUMessageTypes.h"
+
+
+#include "AppKitPrevention.h"
+
+#define REPLY_STATUS_INFO_TIMEOUT 2
+
+@interface StatusInfo () <NSXPCListenerDelegate>
+@end
+
+@implementation StatusInfo
+{
+ NSXPCListener *_xpcListener;
+ NSMutableDictionary *_pendingReplies;
+ NSUInteger _pendingReplyCounter;
+}
+
+@synthesize installationInfoData = _installationInfoData;
+
+- (instancetype)initWithHostBundleIdentifier:(NSString *)bundleIdentifier
+{
+ self = super init;
+ if (self != nil) {
+ _xpcListener = NSXPCListener alloc initWithMachServiceName:SPUStatusInfoServiceNameForBundleIdentifier(bundleIdentifier);
+ _xpcListener.delegate = self;
+ _pendingReplies = NSMutableDictionary dictionary;
+ }
+ return self;
+}
+
+- (void)startListener
+{
+ _xpcListener resume;
+}
+
+- (void)invalidate
+{
+ _xpcListener invalidate;
+ _xpcListener = nil;
+}
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
+{
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUStatusInfoProtocol);
+ newConnection.exportedObject = self;
+ 
+ newConnection resume;
+ 
+ return YES;
+}
+
+- (void)setInstallationInfoData:(NSData *)installationInfoData
+{
+ _installationInfoData = installationInfoData;
+ 
+ // Respond to all of our pending replies
+ for (NSNumber *replyKey in _pendingReplies) {
+ void (^replyBlock)(NSData * _Nullable) = self->_pendingRepliesreplyKey;
+ replyBlock(_installationInfoData);
+ }
+ 
+ _pendingReplies removeAllObjects;
+}
+
+- (void)probeStatusInfoWithReply:(void (^)(NSData * _Nullable))reply
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self->_installationInfoData != nil) {
+ reply(self->_installationInfoData);
+ } else {
+ // If we don't have the installation info data currently, we may receive it in a very short window afterwards
+ // In this case wait a bit for the reply. If we receive the data it will be in -setInstallationInfoData:
+ NSUInteger currentReplyCounter = self->_pendingReplyCounter;
+ self->_pendingReplyCounter++;
+
+ NSNumber *currentReplyCounterKey = @(currentReplyCounter);
+ self->_pendingRepliescurrentReplyCounterKey = reply copy;
+ 
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(REPLY_STATUS_INFO_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ void (^replyBlock)(NSData * _Nullable) = self->_pendingRepliescurrentReplyCounterKey;
+ if (replyBlock != nil) {
+ replyBlock(self->_installationInfoData);
+ self->_pendingReplies removeObjectForKey:currentReplyCounterKey;
+ }
+ });
+ }
+ });
+}
+
+- (void)probeStatusConnectivityWithReply:(void (^)(void))reply
+{
+ reply();
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/TerminationListener.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/TerminationListener.m Added

@@ -0,0 +1,131 @@
+//
+// TerminationListener.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/7/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "TerminationListener.h"
+#import "SULog.h"
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+
+
+#include "AppKitPrevention.h"
+
+@interface TerminationListener ()
+
+@property (nonatomic, readonly, nullable) NSNumber *processIdentifier;
+@property (nonatomic) BOOL watchedTermination;
+@property (nonatomic, copy) void (^completionBlock)(BOOL);
+
+@end
+
+@implementation TerminationListener
+
+@synthesize completionBlock = _completionBlock;
+@synthesize processIdentifier = _processIdentifier;
+@synthesize watchedTermination = _watchedTermination;
+
+- (instancetype)initWithProcessIdentifier:(NSNumber * _Nullable)processIdentifier
+{
+ self = super init;
+ if (self != nil) {
+ _processIdentifier = processIdentifier;
+ }
+ 
+ return self;
+}
+
+- (BOOL)terminated
+{
+ return (self.watchedTermination || self.processIdentifier == nil) ? YES : (kill(self.processIdentifier.intValue, 0) != 0);
+}
+
+- (void)invokeCompletionWithSuccess:(BOOL)success
+{
+ if (self.completionBlock != nil) {
+ self.completionBlock(success);
+ self.completionBlock = nil;
+ }
+}
+
+- (void)startListeningWithCompletion:(void (^)(BOOL))completionBlock
+{
+ self.completionBlock = completionBlock;
+ 
+ if (self.processIdentifier == nil) {
+ self invokeCompletionWithSuccess:YES;
+ return;
+ }
+ 
+ // Use kqueues to determine when the process will terminate
+ // As described in https://developer.apple.com/library/mac/technotes/tn2050/_index.html#//apple_ref/doc/uid/DTS10003081-CH1-SUBSECTION10
+ // By using kqueues, we can stay away from using AppKit in case we ever decide to abandon it
+ 
+ pid_t processIdentifier = self.processIdentifier.intValue;
+ int queue = kqueue();
+ if (queue == -1) {
+ SULog(SULogLevelError, @"Failed to create kqueue() due to error %d: %@", errno, @(strerror(errno)));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ struct kevent changes;
+ EV_SET(&changes, processIdentifier, EVFILT_PROC, EV_ADD | EV_RECEIPT, NOTE_EXIT, 0, NULL);
+ 
+ if (kevent(queue, &changes, 1, &changes, 1, NULL) == -1) {
+ SULog(SULogLevelError, @"Failed to invoke kevent() due to error %d: %@", errno, @(strerror(errno)));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ // We will assume this terminationListener will never be deallocated
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
+ CFFileDescriptorContext context = { 0, (void *)CFBridgingRetain(self), NULL, NULL, NULL };
+#pragma clang diagnostic pop
+ CFFileDescriptorRef noteExitKQueueRef = CFFileDescriptorCreate(NULL, queue, true, noteExitKQueueCallback, &context);
+ if (noteExitKQueueRef == NULL) {
+ SULog(SULogLevelError, @"Failed to create file descriptor via CFFileDescriptorCreate()");
+ CFRelease((__bridge CFTypeRef)(self));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ CFRunLoopSourceRef runLoopSource = CFFileDescriptorCreateRunLoopSource(NULL, noteExitKQueueRef, 0);
+ if (runLoopSource == NULL) {
+ SULog(SULogLevelError, @"Failed to create runLoopSource via CFFileDescriptorCreateRunLoopSource()");
+ CFRelease((__bridge CFTypeRef)(self));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopDefaultMode);
+ CFRelease(runLoopSource);
+ 
+ CFFileDescriptorEnableCallBacks(noteExitKQueueRef, kCFFileDescriptorReadCallBack);
+ 
+ // Make sure we didn't set the listener callback to a dead PID
+ // If we did, we could hang forever. To avoid this, we check if the process has terminated *after* we set up the callback
+ // If we tried to do this check before setting the callback, we could run into an issue where the process can terminate after our check
+ // but before setting the callback
+ if (self terminated) {
+ self invokeCompletionWithSuccess:YES;
+ }
+}
+
+static void noteExitKQueueCallback(CFFileDescriptorRef file, CFOptionFlags __unused callBackTypes, void *info)
+{
+ struct kevent event;
+ kevent(CFFileDescriptorGetNativeDescriptor(file), NULL, 0, &event, 1, NULL);
+ 
+ TerminationListener *self = CFBridgingRelease(info);
+ self.watchedTermination = YES;
+ self invokeCompletionWithSuccess:YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Autoupdate/main.m Added

@@ -0,0 +1,39 @@
+#import <Foundation/Foundation.h>
+#import "AppInstaller.h"
+
+
+#include "AppKitPrevention.h"
+
+int main(int __unused argc, const char __unused *argv)
+{
+ @autoreleasepool
+ {
+ NSArray<NSString *> *args = NSProcessInfo processInfo arguments;
+ if (args.count != 4) {
+ return EXIT_FAILURE;
+ }
+ 
+ NSString *hostBundleIdentifier = args1;
+ NSString *homeDirectory = args2;
+ NSString *userName = args3;
+ 
+ AppInstaller *appInstaller = AppInstaller alloc initWithHostBundleIdentifier:hostBundleIdentifier homeDirectory:homeDirectory userName:userName;
+ appInstaller start;
+ 
+ // Ignore SIGTERM because we are going to catch it ourselves
+ signal(SIGTERM, SIG_IGN);
+ // Ignore SIGPIPE because we won't want read or write failures due to broken pipe to unexpectably
+ // terminate the process (e.g, when extracting archives or performing package installs).
+ signal(SIGPIPE, SIG_IGN);
+ 
+ dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
+ dispatch_source_set_event_handler(sigtermSource, ^{
+ appInstaller cleanupAndExitWithStatus:SIGTERM error:nil;
+ });
+ dispatch_resume(sigtermSource);
+ 
+ NSRunLoop currentRunLoop run;
+ }
+
+ return EXIT_SUCCESS;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/BinaryDelta Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/BinaryDelta/Bridging-Header.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/BinaryDelta/main.swift Added

@@ -0,0 +1,228 @@
+//
+// main.swift
+// BinaryDelta
+//
+// Created by Mayur Pawashe on 1/3/22.
+// Copyright © 2022 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import ArgumentParser
+
+// Create a patch from an old and new bundle
+struct Create: ParsableCommand {
+ @Option(name: .long, help: ArgumentHelp("The major version of the patch to generate. Defaults to the latest stable version. Older versions will need to be specified for updating from applications using older versions of Sparkle.", valueName: "version"))
+ var version: Int = Int(SUBinaryDeltaMajorVersionDefault.rawValue)
+ 
+ @Flag(name: .customLong("verbose"), help: ArgumentHelp("Enable logging of the changes being archived into the generated patch."))
+ var verbose: Bool = false
+ 
+ @Option(name: .long, help: ArgumentHelp(COMPRESSION_METHOD_ARGUMENT_DESCRIPTION, valueName: "compression"))
+ var compression: String = "default"
+ 
+ @Option(name: .long, help: ArgumentHelp(COMPRESSION_LEVEL_ARGUMENT_DESCRIPTION, valueName: "compression-level"))
+ var compressionLevel: UInt8 = 0
+ 
+ @Argument(help: ArgumentHelp("Path to original bundle to create a patch from."))
+ var beforeTree: String
+ 
+ @Argument(help: ArgumentHelp("Path to new bundle to create a patch from."))
+ var afterTree: String
+ 
+ @Argument(help: ArgumentHelp("Path to new patch file to create."))
+ var patchFile: String
+ 
+ func validate() throws {
+ var validCompression: ObjCBool = false
+ let compressionMode = deltaCompressionModeFromDescription(compression, &validCompression)
+ guard validCompression.boolValue else {
+ fputs("Error: unrecognized compression \(compression)\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ switch compressionMode {
+ case SPUDeltaCompressionModeDefault:
+ fallthrough
+ case .none:
+ guard compressionLevel == 0 else {
+ fputs("Error: compression level must be 0 for compression \(compression)\n", stderr)
+ throw ExitCode(1)
+ }
+ break
+ case .bzip2:
+ guard compressionLevel >= 0 && compressionLevel <= 9 else {
+ fputs("Error: compression level \(compressionLevel) is not valid.\n", stderr)
+ throw ExitCode(1)
+ }
+ break
+ case .LZMA:
+ fallthrough
+ case .LZFSE:
+ fallthrough
+ case .LZ4:
+ fallthrough
+ case .ZLIB:
+ guard version >= 3 else {
+ fputs("Error: version \(version) patch files do not support compression \(compression)\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ guard compressionLevel == 0 else {
+ fputs("Error: compression level provided must be 0 for compression \(compression)\n", stderr)
+ throw ExitCode(1)
+ }
+ break
+ @unknown default:
+ fputs("Error: unrecognized compression \(compression)\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ guard version >= SUBinaryDeltaMajorVersionFirst.rawValue else {
+ fputs("Error: version provided \(version) is not valid.\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ guard version >= SUBinaryDeltaMajorVersionFirstSupported.rawValue else {
+ fputs("Error: creating version \(version) patches is no longer supported.\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ guard version <= SUBinaryDeltaMajorVersionLatest.rawValue else {
+ fputs("Error: this program is too old to create a version \(version) patch, or the version number provided is invalid.\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ let fileManager = FileManager.default
+ 
+ var isDirectory: ObjCBool = false
+ if !fileManager.fileExists(atPath: beforeTree, isDirectory: &isDirectory) || !isDirectory.boolValue {
+ fputs("Error: before-tree must be a directory\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ if !fileManager.fileExists(atPath: afterTree, isDirectory: &isDirectory) || !isDirectory.boolValue {
+ fputs("Error: after-tree must be a directory\n", stderr)
+ throw ExitCode(1)
+ }
+ }
+ 
+ func run() throws {
+ let compressionMode = deltaCompressionModeFromDescription(compression, nil)
+ 
+ guard let majorDeltaVersion = SUBinaryDeltaMajorVersion(rawValue: UInt16(version)) else {
+ // We shouldn't reach here
+ fputs("Error: failed to retrieve major version from provided version: \(version)\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ var createDiffError: NSError? = nil
+ if !createBinaryDelta(beforeTree, afterTree, patchFile, majorDeltaVersion, compressionMode, compressionLevel, verbose, &createDiffError) {
+ if let error = createDiffError {
+ fputs("\(error.localizedDescription)\n", stderr)
+ } else {
+ fputs("Error: Failed to create patch due to unknown reason.\n", stderr)
+ }
+ throw ExitCode(1)
+ }
+ }
+}
+
+// Apply a patch from an old bundle to generate a new bundle
+struct Apply: ParsableCommand {
+ static let configuration = CommandConfiguration(abstract: "Apply a patch against an original bundle to generate a new bundle.")
+ 
+ @Flag(name: .customLong("verbose"), help: ArgumentHelp("Enable logging of changes being applied from the patch."))
+ var verbose: Bool = false
+ 
+ @Argument(help: ArgumentHelp("Path to original bundle to patch."))
+ var beforeTree: String
+ 
+ @Argument(help: ArgumentHelp("Path to new bundle to create."))
+ var afterTree: String
+ 
+ @Argument(help: ArgumentHelp("Path to patch file to apply."))
+ var patchFile: String
+ 
+ func validate() throws {
+ let fileManager = FileManager.default
+ 
+ var isDirectory: ObjCBool = false
+ if !fileManager.fileExists(atPath: beforeTree, isDirectory: &isDirectory) || !isDirectory.boolValue {
+ fputs("Error: before-tree must be a directory\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ if !fileManager.fileExists(atPath: patchFile, isDirectory: &isDirectory) || isDirectory.boolValue {
+ fputs("Error: patch-file must be a file\n", stderr)
+ throw ExitCode(1)
+ }
+ }
+ 
+ func run() throws {
+ var applyDiffError: NSError?
+ if (!applyBinaryDelta(beforeTree, afterTree, patchFile, verbose, { _ in }, &applyDiffError)) {
+ if let error = applyDiffError {
+ fputs("\(error.localizedDescription)\n", stderr)
+ } else {
+ fputs("Error: patch failed to apply for unknown reason\n", stderr)
+ }
+ throw ExitCode(1)
+ }
+ }
+}
+
+// Output information for BinaryDelta or from a patch file
+struct Info: ParsableCommand {
+ @Argument(help: ArgumentHelp("Path to patch file to extract information from."))
+ var patchFile : String?
+ 
+ func run() throws {
+ if let patchFile = patchFile {
+ // Print version of patch file
+ var header: SPUDeltaArchiveHeader? = nil
+ let archive = SPUDeltaArchiveReadPatchAndHeader(patchFile, &header)
+ if let error = archive.error {
+ fputs("Error: Unable to open patch \(patchFile): \(error.localizedDescription)\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ if let header = header {
+ if header.majorVersion < SUBinaryDeltaMajorVersionFirst.rawValue {
+ fputs("Error: major version \(header.majorVersion) is invalid.\n", stderr)
+ throw ExitCode(1)
+ }
+ 
+ fputs("Patch version \(header.majorVersion).\(header.minorVersion)", stdout)
+ 
+ // Print out compression info only if it's available
+ // We can't get compression info from version 2 files
+ if header.compression != SPUDeltaCompressionModeDefault, let compressionDescription = deltaCompressionStringFromMode(header.compression) {
+ fputs(" using \(compressionDescription) compression", stdout)
+ 
+ // Compression level isn't available or applicable for all formats
+ if header.compressionLevel != 0 {
+ fputs(" with level \(header.compressionLevel)", stdout)
+ }
+ }
+ 
+ fputs("\n", stdout)
+ } else {
+ fputs("Error: Failed to retrieve header due to unknown reason.\n", stderr)
+ throw ExitCode(1)
+ }
+ } else {
+ // Print version of program
+ fputs("BinaryDelta version \(SUBinaryDeltaMajorVersionLatest.rawValue).\(latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersionLatest))\n", stdout)
+ }
+ }
+}
+
+struct BinaryDelta: ParsableCommand {
+ static let configuration = CommandConfiguration(commandName: "BinaryDelta", abstract: "Create and apply small and efficient delta patches between an old and new version of a bundle.", subcommands: Create.self, Apply.self, Info.self)
+}
+
+DispatchQueue.global().async(execute: {
+ BinaryDelta.main()
+ CFRunLoopStop(CFRunLoopGetMain())
+})
+CFRunLoopRun()

HandBrake-1.5.1.tar.xz/macosx/Sparkle/CHANGELOG Added

@@ -0,0 +1,862 @@
+# 2.3.0
+
+* Bump minimum deployment target to macOS 10.13 (#2196) (Zorg)
+* Remove and preserve necessary updates in generate_appcast (#2218) (Zorg)
+* Move old update files no longer needed to old_updates/ in archive directory in generate_appcast (#2228) (Zorg)
+* Expose maximum-versions option (per branch) in generate_appcast to preserve in the feed (#2259) (Zorg)
+* Add -p option to sign_update to only print the signed signature (#2268) (Zorg)
+* Hide automatic install check box when allowsAutomaticUpdates is disabled (#2202) (Jie)
+* Allow developer to always force allowing automatic updates (#2266) (Zorg)
+* Fix update window going haywire during resize when release notes are hidden by disabling resizing (#2200) (Zorg)
+* Allow user to re-try installing/relaunching application when quit is delayed/cancelled (#2234) (Zorg)
+* Add delta update attributes for validating an app hasn't been stripped from removed localizations or architectures (#2219) (Zorg)
+* Fix delta patches not applying edge case if files from source that need to be diffed are not writeable (#2211) (Zorg)
+* Add delegate callback when user makes choice to install, dismiss, or skip an update (#2250) (Zorg)
+* Reject serving updates with DSA only and no EdDSA (#2167) (Zorg)
+* Find potential matching running apps that are translocated in the updater agent (#2233) (Zorg)
+* Expose -SPUStandardUserDriver activeUpdateAlert as private API (#2255) (Zorg)
+* Add zh_CN l10n for "Version History" (#2247) (kakaiikaka)
+* Update zh_TW localization (#2271) (Chiahong)
+* Remove ed25519 git submodule in favor of including the dependency directly (#2244) (Zorg)
+* Clean up left-over code (#2243) (Eitot)
+* Update Package.resolved (#2245) (Zorg)
+* Remove model translation table for system profiling (#2188) (Zorg)
+* Improve documentation usage for SPUUpdater properties (#2256) (Zorg)
+
+This release improves generate_appcast by automatically removing updates that are no longer needed in the generated appcast, and moving old update files to old_updates/ in the archives directory. New delta update attributes are also added to let Sparkle know when to skip downloading delta updates if the application has been stripped.
+
+macOS 10.13 or later is now required (due to Xcode 14 dropping support for deploying to older OS versions).
+
+If you're not generating appcasts automatically, remember to add `<sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>` element to `<item>`s in your appcast.
+
+# 2.2.2
+
+* Critical update alerts may not show up as promptly as they should when they are being automatically installed (#2230) (Zorg)
+* Remove module imports from framework headers (#2217) (Zorg)
+* Update Portuguese localization (#2224) (Kent Sutherland)
+* Update zh_TW localization (#2246) (Chiahong)
+
+# 2.2.1
+
+* Make scroll bar dark in dark theme for Release Notes by default (#2187) (Pavel Moiseenko)
+* Fix memory leaks when using generate_appcast (#2193) (Zorg)
+* Update Italian localization (#2192) (VinBoiSoft)
+
+# 2.2.0
+
+* Update Focus Improvements (#924)
+ * Present new scheduled updates in utmost focus only at opportune times (Zorg)
+ * For regular apps opportune times are: app launch, app re-activation, and system being idle (without a power assertion being held to prevent display sleep).
+ * For background (dockless) apps opportune time is just app launch. Otherwise, the update is now shown behind other applications and windows, instead of previously stealing focus from other active apps.
+ * Add APIs and documentation for adding gentle update reminders to compliment Sparkle's standard user interface (Zorg) (#2122)
+ * Allow status window to be minimizable for regular app installs (Zorg) (#2100)
+ * Center status window and inherit key focus from the previously shown update alert window (Zorg)
+ * Activate app when checking for updates if the app is not currently active (e.g, from a menu bar extra menu item) (Zorg)
+ * Fix issue where bringing status window to front made other active windows exit in macOS Ventura's Stage Manager (#2153) (Zorg)
+ * Fix showing update in focus not bringing the "checking for updates" window in focus (Zorg) (#2150)
+* Rename XPC Service filenames for Sandboxing to show more friendly human-readable name in authorization dialog (Zorg) (#2096)
+* Add support for running the framework and sparkle-cli as root (Zorg) (#2119)
+* Fix issue where update cycle may not complete in unusual configuration if automatic checks are disabled + automatic downloading is enabled + install requires user interaction (Zorg) (#2133)
+* Synchronize usage of XPC connections to main queue to fix potential race conditions (Zorg) (#2178)
+* Update last update check time when choosing to install an update & relaunch (Zorg) (#2136)
+* Improve error reporting in the framework and sparkle-cli when installation fails with no write permission (Zorg) (#2157)
+* Use displayVersionString instead of versionString for OS version mismatch error message (samschott) (#2138)
+* Make displayVersionString non-null and update fallback documentation (Zorg) (#2139)
+* Ignore custom icons set via resource forks when applying delta updates (Zorg) (#2114)
+* Fall back to regular update if delta update fails to download (Zorg) (#2118)
+* Skip downloading delta updates when application has been moved to a file system (like FAT) that doesn't support regular permission modes (Zorg) (#2148)
+* Bump initial installer message timeouts and declare daemon/agents processes as Interactive (Zorg) (#2162)
+* Add and improve translation strings and update pt-BR (BR Lingo) (#2094)
+* Update localisations (Eitot) (#2113)
+* Update Greek localizations (seitsme) (#2184, #2185)
+* Update Japanese localization (1024jp) (#2182)
+* Replace deprecated code with newer APIs (Eitot) (#2112)
+* Remove obsolete fallbacks for older OS versions (Eitot) (#2110)
+* Remove SPUURLRequest (Zorg) (#2124)
+* Silence ivar deprecation warnings (Zorg) (#2099)
+* Fix Xcode 14 project warnings (Zorg) (#2147, #2179)
+* Deprecate -s flag and add --ed-key-file option to generate_appcast (Zorg) (#2170)
+* Update text for external licenses (Zorg) (#2164)
+
+This update renames the bundled XPC Services, brings improvements to notifying users of new updates without disrupting their focus, and adds gentle update reminder APIs(https://sparkle-project.org/documentation/gentle-reminders/) to further customize how Sparkle's standard user interface delivers new update alerts.
+
+The `-s` flag for passing a raw private EdDSA key to sign_update and generate_appcast is now deprecated. If you were using this option previously, please see the help pages of these tools for more information.
+
+# 2.1.0
+
+* New Binary Delta format (version 3)
+ * Features a custom and more efficient container format, migrating away from the deprecated xar format (Zorg) (#2051)
+ * Adds delta compression options for lzma, bzip2, zlib, lzfse, lz4, and no compression (Zorg) (#2051)
+ * Changes default delta format compression from bzip2 (in version 2) to lzma (in version 3) resulting in smaller deltas (Zorg) (#2051)
+ * Preserve file system (HFS+/apfs) level compression when applying delta updates (Zorg) (#2084)
+ * Tracks renames and binary diffs for files that have moved around to new locations using intelligent heuristics (Zorg) (#2051, #2053)
+ * Added more unit tests, UI tests, and generate_appcast/BinaryDelta tools support for the new format (Zorg) (#2052, #2054)
+* Major upgrade improvements (#2070)
+ * Fix skipping a major version to not skip subsequent major versions (Zorg) (#2079)
+ * Add sparkle:belowVersion element for informational updates (Zorg) (#2080)
+ * Add option to allow developers to ignore/reset user skipped upgrades (Zorg) (#2081)
+* Fix progress bar and button alignment for checking updates (Zorg) (#2066)
+ * This deprecates `-SPUUserDriver showInstallingUpdate` and `-SPUUserDriver showSendingTerminationSignal` in favor for `-SPUUserDriver showInstallingUpdateWithApplicationTerminated:`
+* Fix unsteady progress when installing updates (Zorg) (#2072)
+* Check http statusCode in didFinishDownloadingToURL (Eric Shapiro, Zorg) (#2049, #2073)
+* Use strcoll_l() for locale-independent comparisons for delta updates (Dan Rigdon-Bel) (#2087)
+* Fix version compare not treating '2.1.0' and '2.1' as being equal (Zorg) (#2065)
+* Add verify and account options for signing updates (Zorg) (#2074)
+* Add delta patch and Apple code signing verification in generate_appcast (Zorg) (#2076, #2077)
+* Use more modern NSSecureCoding APIs when available (Zorg) (#2058)
+* Use more modern FileManager APIs for copying files (Zorg) (#2059)
+* Fix make release failing when customizing XPC_SERVICE_BUNDLE_ID_PREFIX (Zorg) (#2060)
+* Preserve the Entitlements directory in podspec (digitalMoksha) (#2062)
+* Add hidden option to generate_appcast to set max CDATA threshold (Zorg) (#2075)
+
+This update introduces a new major format for delta updates(https://sparkle-project.org/documentation/delta-updates/), which migrates away from deprecated APIs (xar) and creates smaller patches. If you don't use `generate_appcast`, please check the compatibility notes for creating delta updates(https://sparkle-project.org/documentation/delta-updates/#compatibility).
+
+# 2.0.0
+
+* Support for Sandboxed Applications (Zorg)
+* Support for writing custom user interfaces (Zorg)
+* Support for updating external Sparkle-based bundles (Zorg)
+ * Added command line utility to update Sparkle-based bundles (Zorg)
+* Modern architecture
+ * Moves extraction, validation, and installation into a submitted launchd agent/daemon with XPC communication (Zorg)
+ * Features faster installs with shorter update/relaunch times (#1802) (Zorg)
+ * Provides more robust installs when user authorization is needed (Zorg)
+ * Adoption of improved atomic-safe updates leveraging APFS (#1801) (Zorg)
+* API Changes
+ * Introduced new SPUStandardUpdaterController, SPUUpdater, SPUUserDriver classes/protocols (Zorg)
+ * Decoupled AppKit and UI logic in the framework from core functionality (Zorg)
+ * Ensure (most) API compatibility with Sparkle 1; you can likely test Sparkle 2 in an existing app with little to no changes (Zorg)
+ * Deprecated SUUpdater, albeit it is still functional for testing and transitional purposes (Zorg)
+ * `-bestValidUpdateInAppcast:forUpdater:` delegate method behavior has been refined and discouraged for some cases. Please review its updated header documentation in `SPUUpdaterDelegate.h` if you use this method. (#1838, #1862, #1879, #1880) (Zorg)
+ * Delegation methods may have been removed or added to the newer updater API. Please review `SPUUpdaterDelegate` if using `SPUUpdater`. (Zorg)
+* Updater Changes
+ * Automatic silent and manual update alert prompts are now merged together (Zorg)
+ * Updates will attempt to install even if the user quits the application without relaunching the application update explicitly (Zorg)
+ * Updates can be downloaded in the background automatically but later prompt the user to install them, particularly if Sparkle doesn't have sufficient permission to install them without the user's permission (Zorg)
+ * Authorization now occurs before launching the installer and before terminating the application, which can be canceled by the user cleanly (Zorg)
+ * Sparkle uses the icon of the bundle to update for its authorization dialog. A 32x32 image representation of the icon is needed. (Zorg)
+ * Sudden termination for silent automatic updates isn't disabled anymore (Zorg)
+* Policy Changes
+ * Non-bare package based updates that are zipped or archived must add sparkle:installationType="package" to the appcast item enclosure (this doesn't apply to bare packages which aren't archived) (Zorg)
+ * We now recommend using sparkle:version and sparkle:shortVersionString top level elements instead of enclosure attributes (#1878) (Zorg)
+ * The link element in an appcast item is now used for directing users to the product's website if they don't meet minimum system requirements (#1877) (Zorg)
+* Expose why a new update is unavailable and direct user to prior release notes or website info (#1877, #1886) (Zorg)
+ * Add <sparkle:fullReleaseNotesLink> element allowing Sparkle to show a better stylized and full changelog to the user (#2001) (aONe)
+ * Add delegate API allowing applications to show full in-app or offline version history to the user (#1989) (Billy Gray)
+* Major/Paid Upgrades Enhancements
+ * Latest minor updates are preferred over major updates (specified by sparkle:minimumAutoupdateVersion) (#1850) (Zorg)
+ * Major updates can be skipped with a user confirmation (#1853) (Zorg)
+* Informational only and critical updates can be specified selectively by app version (#1862)
+* Add support for posting updates only on specific channels (eg for supporting beta updates) (#1879) (Zorg)
+* System profiler privacy and transparency (#1690) (Martin Pilkington)
+* Support getting app icon from asset catalog (#1694) (Charles Srstka)
+* Don't bring up authorization just because group ID doesn't match (#1830) (Zorg)
+* Raise minimum system version to macOS 10.11 (Zorg)
+* Special thanks to developers using early builds of this release in production and contributors for keeping this running (Kornel, Jonas Zaugg, Gwynne Raskind, Jordan Rose, Tony Arnold, Bryan Jones, Christian Tietze, Jakob Egger, and many more)
+
+Please visit Sparkle's website(http://sparkle-project.org) for more information on documentation and migration.
+
+If you are migrating from earlier beta versions of Sparkle 2 and use sandboxing, please re-familiarize yourself with the Sandboxing guide(https://sparkle-project.org/documentation/sandboxing/). Some of the XPC Services are now optional and integration with XPC Services and code signing have been simplified. The SPUUserDriver protocol for custom user interfaces has been greatly simplified too.
+
+# 1.27.1
+
+ * Use px instead of pt when specifying font size to fix default font size in WebView from #1962 (regressed in 1.25.0 with WKWebView adoption) (Daniel Jalkut)
+ * Fix to prevent Sparkle manipulating the host app's high level WebView defaults from #1961 (affecting only macOS versions before 10.11 in 1.x branch) (Daniel Jalkut)
+ * Add safer handling of applying binary delta files from #1990 (Zorg)
+ * Don't use current date unless necessary when scheduling next update from #1991 (Zorg)
+ * Whitelist about:srcdoc as a safe web URL from #1938, #2007 (Louis Pontoise, Zorg)
+ * Backport not hiding update window on deactivation from #2008 (Zorg)
+
+# 1.27.0
+
+ * Deprecate not using EdDSA and skip DSA verification when possible in #1892 (Zorg)
+ * Pass http headers and user agent when downloading release notes from #1873 (Zorg)
+ * Fix project warnings from #1893 (Zorg)
+ * Update sample appcast from #1895 (Zorg)
+ * Fix appcast pubDate tag generation in different locales from #1898 (Sungbin Jo)
+ * Create valid xar archives for generating binary delta files from #1906 (Zorg)
+ * Fix a few issues with German localization from #1931 (J-rg)
+ * Fix issues with Russian localizations from #1947 (Konstantin Zamyakin)
+ * Fix issues with Czech localizations from #1943 (Vojtěch Koňařík)
+ * Add an automated workflow that builds and publishes official Sparkle releases (Tony Arnold, Zorg)
+
+# 1.26.0
+
+ * Flat package support from #1745 (Zorg)
+ * Correct generate_appcast -s command line argument usage help (Lance Lovette)
+ * Fix -f command line argument handling (Lance Lovette)
+ * Fix progress for guided pkg install (Zorg)
+ * Fix XQuartz update failing because NSLog caused issues (Zorg)
+ * Update localization (Vojtěch Koňařík)
+ * Various fixes to SPM logic (Jonas Zaugg)
+
+# 1.25.0
+
+ * Raise minimum system version to 10.9 (Kornel)
+ * Allow an appcast to prevent the new version from being installed automatically (#1688) (pierswalter)
+ * UI fixes
+ * Show check for updates button only when automatic updates are enabled (Lorena Rangel)
+ * Don't initialize the webview if we don't show release notes (Tobias Fonfara)
+ * Keep skip button available if there is a minimum autoupdate version (Zorg)
+ * Fix automatic updates checkbox state when not showing release notes (Zorg)
+ * Fix edge cases with hiding alert buttons and using "Install Later" (Zorg)
+ * Re-add setting WebUIDelegate fix for legacy web view (Zorg)
+ * Adopt WKWebView for 1.x (Zorg)
+ * Add auto layout constraints to SUAutomaticUpdateAlert window (Zorg)
+ * Made buttons wide enough to display the full text. Made window wide enough to display the widened buttons (el, fi, ru, uk) (Piers Uso Walter)
+ * Remove max size from update alert. (George Nachman)
+ * Integrate generate_keys export/import options changes from #1730 (Zorg)
+ * Add `—release-notes-url-prefix` support to localized release notes (Adam Tharani)
+ * Translations
+ * Enable base internalization for alert xibs (Zorg)
+ * Capitalizes french translation of "Vous utilisez actuellement..." ("You are currently running...") (Micah Moore)
+ * Fix and cleanup Hebrew, Catalan, Finnish localizations (Zorg)
+ * Remove non-english localizations from TestApplication (Zorg)
+ * Fix catch-22 Swift Package Manager binary target (Jonas Zaugg)
+ * Add explicit dependencies to fix Xcode linking errors (Kornel)
+ * Add phased rollouts feature to automatic update driver too (Zorg)
+ * Remove hiding skip button and retitling later button (Zorg)
+ * Deprecate installUpdatesIfAvailable (Zorg)
+ * Apply custom headers to app download (Geraint White)
+
+ # 1.24.0
+
+ * Prioritize UserDefaults when fetching value for EnableAutomaticChecks (Nicolas Bosi)
+ * Improve best appcast item selection handling (Ian Bytchek)
+ * Create lockfile for improved compatibility with 3rd party updaters (CoreCode)
+ * Enable SPM support via binary target (Jonas Zaugg)
+ * `generate_appcast` improvements:
+ * follow symbolic links (Denis Dzyubenko)
+ * update the release notes element’s URL when required (Brad Andalman)
+ * Added output filename option to generate_appcast (Brad Andalman)
+ * Added —release-notes-url-prefix to generate_appcast (Brad Andalman)
+ * Command line option to provide a download url prefix is now parsed and set on each archive item (Dominik H)
+ * Added help command line option (Dominik H)
+ * Locale updates:
+ * Update zh_CN localization (柳东原 · Dongyuan Liu)
+ * Update Sparkle.strings (Vojtěch Koňařík)
+ * Update Croatian (#1603) (milotype)
+ * Update SUUpdateAlert.xib (DanielFirlej)
+ * fix: read SUAutomaticallyUpdate from Info.plist (Trevor DeVore)
+ * Fix casting Boolean to BOOL on Apple Silicon (Kevin Wojniak)
+ * Use build matrix to test on multiple Xcode versions (Rajiv Shah)
+ * Set UpdateAlert and AutomaticUpdateAlert window's fullscreen collectionBehavior to NSWindowCollectionBehaviorFullScreenAuxiliary to allow them to present on top of the Main App's window if it's fullscreen. (Micah Moore)
+ * Fixed error about "about:blank" release notes (Louis Pontoise)
+ * Support App Store URL scheme in release note webview (Bi11)
+ * Use the SHA-256 hash of the archive as the cache path (Nate Weaver)
+ * Don't return an optional from the FileHandle method (Nate Weaver)
+ * Added URL+Hashing (Nate Weaver)
+
+# 1.23.0
+
+ * Support generating appcast with localizations (#1499) (Alik Vovkotrub)
+ * Support versions with git commit SHA (#1504) (Alec Larson)
+ * Hide "Skip..." and "Remind..." buttons when they're not relevant (#1480) (Kenneth Johnsen)
+ * Preserve Finder tags while updating apps (#1512) (CoreCode)
+ * Read-only update alert dialog formatting improvements (#1515) (Quinn Taylor)
+ * Check if `SUBundleName` is set before normalizing (Jake Fenton)
+ * `NSInteger` cast warning on Xcode 11 (Marga Keuvelaar)
+ * Correct appcast file extension (Tom Vos)
+ * Update Sparkle.strings (Emir Sarı)
+ * Fix spelling (#1508) (Frank Chiarulli Jr)
+
+# 1.22.0
+
+ * Enabled "Hardened Runtime" build option for Apple's notarization requirement
+ * Add delegate methods to suppress update alerts (George Nachman)
+ * Improved error when running from translocated location (Michael Buckley)
+ * Add phased rollout feature (#1381) (Fabian Jäger)
+ * Ignore non-standard permissions in delta updates instead of failing the build (Kornel Lesiński)
+ * Notify user when installed version is newer than the latest in the appcast (CoreCode)
+ * Reset timers after computer sleep (CoreCode)
+ * Block-based alternatives to `NSInvocation`-based delegate methods (Fabian Jäger)
+ * Add delegate `userDidSkipThisVersion` (BobZombie, Leo Natan, bono yusuke)
+ * Pass item to updaterShouldShowUpdateAlertForScheduledUpdate delegate method (George Nachman)
+ * Support providing private key as argument in `generate_appcast` (Yakuhzi, marchyang)
+ * Separate the ed25519 sources into a new static library (Tony Arnold)
+ * Disambiguate signing error messages (Nate Weaver)
+ * Use `XMLNode.Options.nodePrettyPrint` in `generate_appcast` instead of trying to add whitespace manually (fumoboy007)
+ * Annotate SUHost for nullability (Michael Buckley)
+ * Use SUAVAILABLE macro (Christiaan Hofman)
+ * Fix warnings when using modules (nivekkagicom)
+ * Correction of Czech localization inconsistency (#1403) (vojtakonarik)
+ * BR locale fix (BR Lingo)
+ * Update Japanese localization (fujisoft)
+ * French Sparkle.strings (Jean-Baptiste)
+
+# 1.21.3
+
+ * Losslessly reduced the size of PNG (Barijaona Ramaholimihaso)
+ * Catch exceptions from subcommands (Julian Mayer)
+ * `generate_appcast` can sign any bundles instead of just apps (Nate Weaver)
+ * Check that effectiveAppearance is being observed before calling removeObserver (Pierluigi)
+
+# 1.21.2
+
+ * Allow EdDSA for delta updates, too (Kornel)
+ * Warning fixes (Brian Bergstrand)
+ * Improvements to release notes view context menu and dark mode (Bi11)
+
+# 1.21.0
+
+ * Added support EdDSA (ed25519) signatures (Kornel)
+ * DSA signatures are considered outdated, and Apple's `Security.framework` only supports weaker SHA-1-based DSA.
+ * Both old DSA and new EdDSA are still supported (and one app can use both), but new applications should use EdDSA only, and we recommend migrating away from DSA signatures.
+ * `generate_keys` is now a Swift tool that stores EdDSA private keys in the Keychain
+ * Existing apps can continue using their old DSA keys, but we've dropped support for generation of old DSA keys
+ * `sign_update` is now a Swift tool that signs using EdDSA from private keys in the Keychain
+ * The old DSA-based signing script has been moved to `bin/old_dsa_scripts`
+ * The old DSA-based signing script has been fixed to work on pre-10.13 systems (Thomas Tempelmann)
+ * `generate_appcast` has been updated to support EdDSA signatures
+ * It can sign both DSA (if `dsa_priv.pem` file is specified) and EdDSA (from Keychain)
+ * The tool now uses Caches directory and doesn't generate unnecessary delta files
+ * Fixed verification of delta updates on filesystems that change permissions of symlinks
+ * Fixed `NSURLSession` leak (Michael Ehrmann)
+
+# 1.20.0
+
+ * `generate_appcast` option to read private key directly from the keychain (Tamás Lustyik)
+ * Add delegate callbacks for fininshed download and extraction related events (Csaba Horony)
+ * Don't check for updates if Do Not Disturb is on (Kornel)
+ * Expose `CodesigningVerifier`, add codesign info API (sunuslee)
+ * Threading fixes:
+ * Fix potential hang with `dispatch_sync` to main thread (Brian Bergstrand)
+ * Fix closeCheckingWindow called from background thread (Alexey Martemyanov)
+ * Improve 'read-only' error message (#1192) (Adrian Thomas)
+ * New Spanish localisation (Ken Arroyo Ohori)
+ * Updated Finnish language resources (Jason Pollack)
+ * Hungarian localization (Csaba Horony)
+ * Log more information about authentication requests (Kornel)
+ * Explicitly specify types to silence "Messaging unqualified id" warning that's new in Xcode 10. Removed __has_feature(objc_generics) check and use generisc to help silence the warnings. (Kent Sutherland)
+ * Fix binary delta creation on network drives (sagecook)
+ * Fix compilation issues on Xcode 10 with new build system (Leo Natan)
+
+# 1.19.0
+
+ * Refactoring of downloader code to avoid deprecated methods (Deadpikle)
+ * Changes to which methods run on the main thread.
+ Note: some delegate methods may be called on non-main thread now. (Kornel)
+ * Update Japanese localization (1024jp)
+ * Update Sparkle.strings (Stefan Paychère)
+ * Fix Sparkle clients polling too frequently (Jonathan Bullard)
+ * Handle SecTransformExecute errors (Kornel)
+ * Silence Touch Bar availability warnings on Xcode 9 by using API_AVAILABLE. Disable gnu-zero-variadic-macro-arguments to prevent warnings from use of API_AVAILABLE. (Kent Sutherland)
+ * 10.11 SDK compatibility (David Fuhrmann)
+
+# 1.18.1
+
+ * Add optional updaterDidRelaunchApplication: method on SUUpdaterDelegate (#1115) (App Tyrant)
+ * Implemented sparkle:os attribute as documented (Memphiz)
+ * Additional termination detection in case kpoll fails. (fujisoft)
+ * Included bin files in CocoaPods installation (Keith Smiley)
+ * Updated Dutch localization (Eitot)
+ * Updated German localization (Eitot)
+ * Updated Japanese translation (1024jp)
+ * Updated Portuguese translation (Victor)
+ * Updated to Xcode 9/Swift 4
+
+ # 1.18.0
+
+ * Name of the host app is used in authorization prompt (the `SPARKLE_RELAUNCH_TOOL_NAME` setting is now obsolete)
+ * More detailed progress bar for package installers (Kornel Lesiński)
+ * Disabled the keyboard shortcut for the install button for scheduled updates to avoid accidental installs. (George Nachman)
+ * generate_appcast tool adds release notes if there's an .html file with the same base name as the archive (Brett Walker)
+ * Added `sparkle:shortVersionString` to the enclosure, #1032 (Brett Walker)
+ * Fixed Japanese localization (1024jp)
+ * Fixed escaping of system profile URLs
+ * Added more logging in various failure cases (Kornel Lesiński)
+ * Better error message for quarantined apps that can't be updated
+
+# 1.17.0
+
+ * Added Touch Bar support (Bi11)
+ * Upgraded SULog to use logging APIs that Apple provides built-in (Zorg)
+ * Skip buttons are disabled if the update is marked as critical (Kornel Lesiński)
+ * Background updates ask OS for lower-priority networking (Kornel Lesiński)
+ * Refactorings to sync with upcoming 2.0
+ * Added kqueue based termination listener (Zorg)
+ * Added AppKit prevention guards to modules that shouldn't import it (Zorg)
+ * Added Obj-C generics where applicable (Zorg)
+ * Made SUBundleIcon & SUApplicationInfo take SUHost, not NSBundle (Zorg)
+ * Improved -SUHost objectForInfoDictionaryKey: (Zorg)
+ * Detect and fail if any two-way dependencies exist in the project (Zorg)
+ * generate_appcast:
+ * fixed handling of multiple directories in an archive
+ * percent encode the filename used in the delta url (Brett Walker)
+ * Update Sparkle.strings (BR Lingo)
+ * Improved handling of non-ASCII names in delta archives (Kornel Lesiński)
+ * Don't touch Info.plist unless git version changes (Václav Slavík)
+
+# 1.16.0
+
+ * Guided package installs are now the default for updating packages (Zorg)
+ - `pkg` installers won't show any UI. If you require the old behavior of showing a full installer window, rename the `*.pkg` file to `*.sparkle_interactive.pkg`
+ * Previous version of the app is now deleted instead of staying in the trash (Zorg)
+ * Added `generate_appcast` helper tool (Kornel Lesiński)
+ * Made manual check resume pending automatic updates instead of starting a new update (Kornel Lesiński)
+ * Started using `length` value from RSS if HTTP doesn't give one (Zorg)
+ * Hidden automatic updates checkbox for information only updates (Bi11)
+ * Added progressbar for DMG and binary delta extraction (Kornel Lesiński)
+ * Fixed showing of download status if we attempt a 2nd download (Zorg)
+ * Refactorings to sync with upcoming 2.0
+ * Decoupled and simplified installation code using protocols (Zorg)
+ * Added nullability annotations (Zorg)
+ * Allowed delegate methods that return an object to return nil (Zorg)
+ * Decreased responsibility of SUHost and moved code into other components (Zorg)
+ * Removed Sparkle.pch and many file #includes (Zorg)
+
+# 1.15.0
+
+* A new icon! Thanks to 1024jp
+* Show alert when an update is sent over insecure HTTP with no DSA key (Zorg)
+ - If you can't use HTTPS, you must at least sign updates with a DSA key.
+* Improved binary delta implementation (Zorg)
+* Added improved -validateMenuItem: as a method in SUUpdater.h for public use (Zorg)
+* Removed reachability preflight check (Zorg)
+* Clear update caches directory before downloading new update (Zorg)
+* Check the bundle's parent directory for writability too (Zorg)
+* Don't follow symbolic links for file operations (Zorg)
+* Don't bring up an authorized dialog during cleanup (Zorg)
+* Made Sparkle look for the highest compatible version regardless of timestamps (Zorg)
+* Fixed compatibility with 10.7
+ * Fixed crash on 10.7 - subscript operator not available (kleuter)
+ * Fixed warnings caused by -Wpartial-availability (Zorg)
+* Fixed german l10n. (Sebastian Volland)
+* Error code for download errors (Kornel Lesiński)
+* Update last update check date when the update driver finishes (Zorg)
+* Scale app icon up if needed in Software Update window (Nicholas Riley)
+* Don't register for termination notifications more than once (Zorg)
+* Don't terminate the app if we're already terminating (Zorg)
+* Removed SUEnableAutomaticChecksKeyOld and SUCheckAtStartup constants (Eitot)
+* Updated Sparkle framework headers to use modules if modules are available (B. Kevin Hardman)
+* Fixed warnings, fixed uses of SULocalizedString (Jerry Krinock)
+* Improved signing verifier to take any host and s/application/bundle/ (Zorg)
+* Improved Spotlight updates after delta extraction (Zorg)
+
+# 1.14.0 (Mar 11, 2016)
+
+* Disable javascript by default and make it opt-in (Zorg)
+* URL-encoding of appcast URLs is preserved (Kornel Lesiński)
+* Delegate is asked for fallback updates if delta update fails (Kornel Lesiński)
+* Fixed crash on 10.7 - subscript operator not available (kleuter)
+* Fixed check of feed URL before delegate had a chance to set it (Kornel Lesiński)
+* Re-added support for password-protected dmg images (Andrew K. Boyd)
+* Added warning about ATS blocking (Kornel Lesiński)
+* Translation fixes for pt-BR. (vitu)
+* Add some Japanese lozalized strings (1024jp)
+* Made test app available in all languages #695 (LIU Dongyuan / 柳东原)
+* Czech localizations update (Frantisek Erben)
+* Removed a test resource from the framework bundle (Karl Moskowski)
+* Test if the updated app is the frontmost one (Zorg)
+* UI Tests for the Test Application (Zorg)
+
+# 1.13.1 (Jan 31, 2016)
+
+Important security fixes:
+
+* Prevent inclusion of local files via file:// XML entities
+* Disable redirects to non-HTTP URLs in release notes webview
+
+# 1.13.0 (Dec 18, 2015)
+
+* Changed framework's bundle ID from `org.andymatuschak.Sparkle` to `org.sparkle-project.Sparkle`.
+
+# 1.12.0 (Dec 13, 2015)
+
+* Rewritten file operations for updating an app (Zorg)
+ - Ensuring atomic move operations, robust error handling.
+ - Faster.
+ - Using modern APIs where possible (no FSPathMakeRef, FSGetCatalogInfo, FSFindFolder, etc.)
+ - Strong documentation, easier to read code.
+* Automatic updates won't be installed if the system is about to shut off (Zorg)
+* Deprecated serving over HTTP without DSA (Zorg)
+ - Note that Apple has deprecated insecure HTTP in macOS 10.11
+* Improved Autoupdate application (Zorg)
+ * Do all the installation work after the runloop is set up
+ * TerminationListener only does termination listening now
+ * Handle cases where host path is not installation path and host path is not desired executable path
+ * Don't show Autoupdate dock icon if we shouldn't show UI
+ * Update modification & access time for new update
+* Added installUpdatesIfAvailable (Ian Langworth)
+* Removed extensions from shell scripts (Jake Petroules)
+* Rewritten test app so it works again, and from a local web server (Zorg)
+* Replaced use of Python with built-in web server (Kevin Wojniak)
+* Set LD_RUNPATH_SEARCH_PATHS in Podspec (Jake Petroules)
+* Don't install automatic updates if the system might shut off (Zorg)
+* Don't show Autoupdate dock icon if we shouldn't show UI (Zorg)
+* Updated layout constraints when removing release notes (Zorg)
+* Improved BinaryDelta error handling & logging (Zorg)
+* Refactored quarantine removal (Zorg)
+* Fixed German localization (1024jp)
+* Updated zh_CN translation (LIU Dongyuan / 柳东原)
+* Updated Mac models list until July 2015 (Gabriel Ulici)
+* Updated Polish translation (Kornel Lesiński)
+* Updated Xcode project languages for which we have translations (Jake Petroules)
+* Updated XIB files (Kornel Lesiński)
+* Use NSByteCountFormatter if available (Jake Petroules)
+* Declared protocols on SUUpdateAlert for the 10.11 SDK (Daniel Jalkut)
+* Silenced warning about casting away const-ness and -Wassign-enum (Daniel Jalkut)
+* Added script to generate a report comparing the Sparkle.strings files (Kevin Wojniak)
+* Check for empty strings (as well as nil) in SUHost's -name method (Karl Moskowski)
+* Don't follow symlinks for checking file existence (Zorg)
+* Unit tests in Swift (Zorg, Jake Petroules)
+* Fixed framework imports (Felix Schulze)
+* Fixed issues with copying files from different mounted drives (Zorg)
+* Disallowed automatic updates when user can't write to the bundle (Zorg)
+* Set the task working directories instead of changing the process working directory (Kevin Wojniak)
+
+# 1.11.1 (Nov 9, 2015)
+
+* Don't install automatic updates when system is about to shut down
+
+# 1.11.0 (Aug 24, 2015)
+
+* Big improvements to code signing and DSA verification
+ - Sparkle now checks not only whether an update is correctly signed, but also whether the updated version will be able to verify future updates. Updates now must either use DSA keys correctly, or not try to use them at all. Same goes for Apple Code Signing.
+ - Rely on code signing and the DSA key in the new app instead of appcast. If the new app has a public DSA key, then the appcast item must have a DSA signature for the app, even if the app is code signed. (Zorg)
+* More verbose error message when DSA keys don't match (Kornel Lesiński)
+* Added delegate methods for pre-download and immediately post-failed-download (Isaac Greenspan)
+* Fix Lucida Grande is always used for release notes (LIU Dongyuan / 柳东原)
+* Only remove quarantine with setResourceValue: when it's present. Fixes "Unable to quarantine: 93" messages from showing up in the console. (Zorg)
+* Fixed const and nullability warnings (Jake Petroules, Kornel Lesiński)
+* Replaced deprecated NSRunAlertPanel/alertWithMessageText (Kevin Wojniak)
+* Imported the Foundation umbrella header in all the public headers (C.W. Betts)
+* pt-BR localization update (Victor Figueiredo)
+* Reject unsupported code-signing xattrs in binary delta (Zorg)
+* Fixed crash while applying delta update (antonc27)
+* Added logging of appcast/download URL on error (Kornel Lesiński)
+* More robust reading of Autoupdate.app path from Sparkle bundle
+
+# 1.10.0 (Apr 26, 2015)
+
+* Massive improvements to the BinaryDelta tool (Zorg)
+ - Ability to track file permissions (Zorg)
+ - Nicely formatted log output (Zorg)
+ - Numerous bug fixes in handling of symlinks, empty directories, case-insensitive names, etc. (Zorg)
+ - Refactored and modernized code (Zorg)
+ - libxar is no longer weak-linked (C.W. Betts)
+* Double-check the code signature of the the app after installation (Isaac Wankerl)
+* Added headless guided package installation (Graham Miln)
+* Added ability to inject custom HTTP headers in appcast request (Mattias Gunneras)
+* Changes to make unarching more reliable (Zorg, Kornel Lesiński)
+* Have Sparkle build a framework module (C.W. Betts)
+* Stdout used for non error outputs (JDuquennoy)
+* French locale update (Kent Sutherland)
+
+# 1.9.0 (Jan 26, 2015)
+
+* Added SUUpdater delegate method for failures. (Benjamin Gordon)
+* Make the error definitions public (C.W. Betts)
+* Add support for lzma compressed tarballs (Kyle Fuller)
+* Back to SKIP_INSTALL=YES by default (Tony Arnold)
+* Properly set install names and rpaths for targets (Jake Petroules)
+* Use Library/Caches rather than app support directory (Kornel Lesiński)
+* Check for a modal window being onscreen before trying to put up the Sparkle prompt (Alf Watt)
+* Fixed crashes on 10.7 (Chris Campbell, Ger Teunis)
+* Fixed Sparkle tags parsing (Tamás Lustyik)
+* SULog code cleanups (Kevin Wojniak)
+* Make sure CFBundleVersion is a semantic version number. (Jake Petroules)
+* Replace typedef enums with typedef NS_ENUM to make Swift happier (C.W. Betts)
+* Fix warnings under Xcode 6.1 relating the SUUpdateAlert XIB (Tony Arnold)
+* Prefer string constants to strings (Jake Petroules)
+* Use Info.plist keys instead of macros (Jake Petroules)
+* Only export public symbols. (Jake Petroules)
+* BinaryDelta: avoid crash with bad paths (Jake Petroules)
+* Fixing Swedish translations (Erik Vikström)
+* Turkish localization fixes (Emir)
+* Proofing of Ukrainian localization (Vera Tkachenko)
+
+# 1.8.0 (Jul 26, 2014)
+
+* New SUDSAVerifier based on up-to-date macOS APIs (Zachary Waldowski)
+* Detailed error log for failed signature checks (Kornel Lesiński)
+* Converted Sparkle to ARC (C.W. Betts)
+* Converted ivars to properties. (Jake Petroules)
+* Cocoapod support (Xhacker Liu)
+* Quarantine removal on macOS 10.10 (C.W. Betts)
+* Updated Japanese localization (1024jp)
+* Added Greek localization
+
+# 1.7.1 (Jul 2, 2014)
+
+* Removed option to install unverified updates (Kornel Lesiński)
+* Added detailed log when code signing verification fails (Sam Deane)
+* Restored original Sparkle icon. (Jake Petroules)
+* Switched SUUpdateAlert.xib to AutoLayout (Kornel Lesiński)
+* Replace references to andymatuschak.org with sparkle-project.org. (Jake Petroules)
+* Several code cleanups, modernizations, fixed warnings and improved code formatting (Jake Petroules)
+* Make the repository significantly more organized. (Jake Petroules)
+* Xcode project: set organization name and class prefix. (Jake Petroules)
+* Link to Foundation and AppKit instead of Cocoa. (Jake Petroules)
+* Use new operatingSystemVersion API when available. (Jake Petroules)
+* Add .clang-format configuration file for source code formatting. (Jake Petroules)
+* Add a target to build Sparkle API documentation using Doxygen. (Jake Petroules)
+
+# 1.7.0
+
+* Dropped support for macOS 10.6. Sparkle now supports 10.7 and newer (including 10.10 Yosemite) on 64-bit Intel Macs (the last 32-bit Mac was released in 2006).
+* Removed use of deprecated functions (Zachary Waldowski)
+* Switched to modern Obj-C runtime and new literals syntax
+* Removed pre-10.7 code. (C.W. Betts)
+* Use more Blocks/libdispatch code. (C.W. Betts)
+* Cleaned up and improved security of `generate_keys`/`sign_update` scripts
+
+# 1.6.1
+
+* Removed archive password prompt (Kornel Lesiński)
+* (Re)fixes bug where URLs are naively double escaped (Andrew Madsen)
+* Fixed typo that caused crashes in BinaryDelta (Tamas Lustyik)
+* SUStandardVersionComparator.h is public (Vincent CARLIER)
+* Remove pre-10.6-specific code. (C.W. Betts)
+* Objective C 2 getters and setters. (C.W. Betts)
+* Define correct dependencies on locale scripts (Antonin Hildebrand)
+
+# 1.6.0
+
+* Cleaned up and deleted redundant strings files (Kornel Lesiński)
+* Modern Objective C syntax, properties where possible. (C.W. Betts)
+* Make SUAppcastDelegate a formal protocol. (C.W. Betts)
+* Fixed default font in release notes WebView (Kornel Lesiński)
+* Configurable name for finish_installation.app (Kornel Lesiński)
+* Removed code for 10.4 (Kornel Lesiński)
+* Convert all strings files to UTF-8 (UTF-16 must die) (Kornel Lesiński)
+* Removing GC target (Matt Thomas)
+* finish_installation.app and pkg files will not removed when we use *.pkg installer and restart system in the installer (Takayama Fumihiko)
+* Select Korean and Slovak for Sparkle.strings localization (Shon Frazier)
+* Updated the Romanian translation (Gabe)
+* pt-BR localization polishing (BR Lingo)
+* update zh_CN (61)
+* Shut up some warnings & make build with newer Xcode (Uli Kusterer)
+* Less unsafety with format strings (Uli Kusterer)
+* New icon (Rick Fillion)
+* fixed a 'content rectangle not entirely onscreen' warning (Simone Manganelli)
+* updated sends system profile to use info.plist if user defaults key isn't present (Jamie Pinkham)
+* Support for notifications on some updater events (Doug Russell)
+* Allow the delegate to trigger a silent install and relaunch (Matt Stevens)
+* Support silent relaunches (Matt Stevens)
+* Increment the sudden termination counter if installing on quit (Matt Stevens)
+* Prompts the user to update after a week (rather than a day) if he doesn't quit the app (Andy Matuschak)
+* Adding <sparkle:tags> appcast item element, <sparkle:criticalUpdate /> tag (Andy Matuschak)
+* We have this check box that says "Automatically download and install updates in the future." But we only download them automatically. We still ask permission again before installing them. (Andy Matuschak)
+
+# 1.5.0-beta6
+
+* Important Changes
+ * Sparkle now requires DSA signatures on your updates. Check the documentation for more information on how to set that up if you don't already sign your updates. You can bypass this requirement if you deliver both your appcast and your updates over SSL.
+* Sparkle will no longer display release notes located at file:// URLs, since Javascript on such a page would be able to read files on your file system.
+* For security reasons, Sparkle will refuse to install updates which appear to "downgrade" the app.
+* SUUpdater now implements new keys: "automaticallyDownloadsUpdates", "lastUpdateCheckDate", and "sendsSystemProfile."
+* Fixed a bug that could prevent SUProbingUpdateDriver from working.
+* Fixed a bug that prevented the updaterWillRelaunchApplication: delegate method from getting called.
+* Fixed displaying release notes transmitted "loose" in the <description> key.
+* Fixed Sparkle compilation on 10.4 systems.
+* Fixed a bug that could cause window confusion if an app changed its LSUIElement at runtime.
+* Added support for Sparkle 1.1's behavior of disabling updates when the check interval is 0.
+* Sparkle can now handle appending parameters to URLs which already have parameters.
+* If an update's sparkle:shortVersionString is the same as the host's CFBundleShortVersionString, the sparkle:version and CFBundleVersion will be presented in parentheticals.
+
+# 1.5.0-beta5
+
+* Important Changes!
+ * Made every Sparkle class private except for SUUpdater, SUAppcast, SUAppcastItem, and the SUVersionComparisonProtocol.
+ * There is now a single SUUpdater singleton for every host bundle; instead of -SUUpdater setHostBundle, you can use +SUUpdater updaterForBundle.
+ * Redefined the (entire) delegate protocol accordingly.
+ * Renamed -SUUpdater updatePreferencesChanged to -SUUpdater resetUpdateCycle. This provides better semantics for non-apps, which need to start the update cycle manually.
+ * -SUUpdater checkForUpdatesWithDriver is private. If you were using SUProbingUpdateDriver, you can now use -SUUpdater checkForUpdateInformation for a similar effect.
+ * All the user defaults keys are now private; instead, SUUpdater is KVC-compliant for automaticallyChecksForUpdates, updateCheckInterval, and feedURL.
+* Reduced the size of the English-only framework by 25%.
+* System profiling information is now only submitted to the server once per week; this will help normalize your statistics across users with different interval preferences.
+* The feedParamatersForUpdater: delegate method now requires "displayKey" and "displayVersion" keys so that it can inform the user what's being sent.
+* Added a delegate method called pathToRelaunchForUpdater: which can be used for plugins to provide the path which should be used when relaunching the client after installing an update.
+* Added support for xml:lang to pick localized nodes in appcasts (for release notes, etc).
+* Fixed a bug which would cause the "checking for updates" window to not disappear in certain extraordinary error conditions.
+* Fixed a DSA signature checking bug for .tar.gz archives.
+* Sparkle now refuses to update on any read-only volume, not just dmgs.
+* Sparkle will clean up the host app's name and version before sending it as the user agent string; some non-ASCII characters were causing problems.
+* Added an Italian localization courtesy Michele Longhi.
+* Added a Swedish localization courtesy Daniel Bergman.
+* Fixes to the French localization courtesy Ronald Leroux and Yann Ricqueberg.
+* Fixes to the German localization courtesy Sven-S. Porst.
+* Fixes to the Russian localization courtesy Alexander Bykov and Anton Sotkov.
+* Fixed a number of issues related to archive format detection: I reverted back to extensions from UTIs.
+* Focus behavior fixes for LSUIElement apps.
+* The status window progress bar now animates even when indeterminate.
+* Major refactorings to improve functionality for non-app bundles.
+
+# 1.5.0-beta4
+
+* Fixed a critical bug which prevented non-.dmgs from unarchiving properly.
+* Added reporting of 64-bit capability to the profiling system.
+
+# 1.5.0-beta3
+
+* Added a new delegate method to SUUpdater.h to allow delegates to specify custom version comparators.
+* Added a German localization, courtesy the Camino localizer team: Dominik Tobschall, Tobias Stohr, and Friedemann Bochow.
+* Bug fixes:
+ * Fixed a serious bug which could cause a server to be DDoS'd (or the host app to crash!) if an appcast fails to be parsed.
+ * Fixed .tbz extraction if the archive was made with Stuffit.
+ * Fixed support for .tar.bz2 and .tar.gz; Sparkle has to assume the archive is a tar when it sees "bz2" and "gz"; don't use those without tarring.
+ * Fixed a typo which caused the shouldPromptForPermissionToCheckForUpdatesToHostBundle: method to not work in 1.5b2.
+ * Fixed .zip extraction on Tiger (Apple changed the UTI between releases)
+ * Fixed a crasher on Tiger.
+ * Fixed display of the default app icon when the host app doesn't have an icon.
+ * Sparkle now displays a sensible progress string and uses an indeterminate progress bar when the server doesn't report a file size.
+ * Fixed some memory leaks.
+
+ # 1.5.0-beta2
+
+ * Compatibility Issues:
+ * Most of the delegate method selectors have changed to scale better. See SUUpdater.h for changes; you'll likely have to make changes if you implement any delegate methods.
+ * If you're using .tar.gz or .tar.bz2 archives, name them ".tbz" or ".tgz" instead; Sparkle now uses UTIs for archive detection, and it's not smart about double extensions.
+ * I'm no longer supporting 10.3. This may or may not work on Panther—probably not.
+ * Sparkle's no longer built for ppc64 by default. If you want to ship that, feel free to build your own, but this saves a few hundred k.
+* Enhancements:
+ * Sparkle now detects if the preferences for automatic update checks or the time interval change mid-cycle.
+ * If your product is a non-.app, you need to clue Sparkle in on the change by calling SUUpdater sharedUpdater updatePreferencesChanged.
+ * Added a cancel to the "checking for updates..." dialog.
+ * Sparkle now cleans up all its litter in /tmp.
+ * Made SUUpdater's delegate an IBOutlet so you can hook it up in IB.
+* Bug fixes:
+ * Sparkle no longer crashes on non-GC hosts when the user cancels an update's downloads.
+ * Sparkle no longer gets stuck in an inconsistent state or crashes when it can't parse the appcast on scheduled updates.
+ * Added the sharedUpdater method to SUUpdater, as it should have been.
+ * Fixed a bug where the "checking for updates..." window wouldn't go away if an error occurs while checking for updates.
+ * Made the dual-mode build configuration actually use the .xcconfig which builds it with GC support. (oops!)
+ * Fixed relaunching for prefpanes.
+ * Sparkle no longer fails to install updates on Snow Leopard (though there's still an issue with trashing the old version of the app, but it seems to be a 10.6 bug)
+ * Sparkle now handles redirects correctly under Tiger.
+ * Fixed the installation path for non-.app bundles.
+ * Fixed a bug which could crash Sparkle under non-English locales.
+ * Fixed a weird race condition which could cause the relaunch tool to never notice that its target relaunched.
+ * Fixed a bug where if the host app is inactive when an update occurs, the update alert sometimes doesn't become key.
+ * Minor textual fixes.
+* Localizations:
+ * Dutch: Maarten Van Coile
+ * French: Yann Ricquebourg
+ * Spanish: Ernesto Gomez Cereijo
+
+ # 1.5.0-beta1
+
+ * The most important things to know:
+ * The 10.3 support is untested at best; sketchy at worst. Test with it thoroughly before you use it.
+ * Sparkle now asks for permission to update on second launch; don't be surprised at that. You can change that behavior with a delegate method; read SUUpdater.h for more info.
+ * We no longer distinguish between "check on startup" and "scheduled updates"; everything is scheduled, with the default being every day.
+ * The test application is using the new profiling features, but that's only for demonstration: these are off by default. More on this later.
+ * There are no localizations yet.
+* New features:
+ * Sparkle now supports .pkgs. Just name the .pkg the name of the app and put in the update archive.
+ * Sparkle now sends optional demographic profiling information; set SUEnableSystemProfiling to YES in your Info.plist and check out the GET data sent to your webserver when fetching the appcast. More on this in the documentation. The test application has this on so you can see the behavior.
+ * Sparkle now supports updating non-.apps. Just call -setHostBundle: on the global SUUpdater to let it know what you're trying to update.
+ * Sparkle now supports garbage collection in the host app. Use "Sparkle-with-GC.framework" for that, but be aware it's 10.5-only.
+ * Sparkle is now 64-bit compatible, compiling both ppc64 and x86_64.
+ * Sparkle now supports a sparkle:minimumSystemVersion key you can set on appcast items. It does what you think it does.
+ * Sparkle now checks to see if the host app is running from a disk image and refuses to update if it is. (10.4+ only)
+ * Added support for entities in enclosure paths.
+ * The file size output is now formatted prettily.
+ * Sparkle now gives visual indication that it's checking for updates when the update's user initiated. ie: it pops up a status controller saying "checking for updates..."
+ * Added support for an SUPublicDSAKeyFile, so people don't have to copy/paste their entire key into their Info.plist. Set this key in your Info.plist to the filename of the key in your Resources directory.
+ * Added an actually maintainable codebase.
+* Changes:
+ * Sparkle version comparison is now dramatically less stupid and verified by a bunch of unit tests. If something doesn't work the way you think it should, add a test to SUVersionComparisonTest.m
+ * Added a minimum to the check interval so that developers don't accidentally release their apps into the wild with 60-second test check intervals and have DOS-attack-like results. It's an hour now for release mode; feel free to change it.
+ * The relaunching process now uses a separate helper app, which is a much more robust method.
+ * Changed CFBundleShortVersionString behavior: Sparkle no longer uses Apple's about box style of displaying ShortVersionString (CFBundleVersion) when the latter is available.
+ * No more MD5 checking. Use DSA: it's actually secure.
+ * The abomination that was SUStatusChecker is dead. Use SUProbingUpdateDriver instead.
+* Bugfixes:
+ * Fixed a huge bug with fully-automatic updating: before, if the user chose to relaunch later, the app would be running from the trash for a while. Now the buttons are "install and relaunch" or "install later."
+ * Sparkle forces Spotlight to reindex the updated app so that it won't keep pointing to the one in the trash.
+ * Sparkle trims whitespace from around DSA signatures; this could cause crashes before.
+ * Fixed a bug where the user choosing to skip a version would inhibit future automatic updates until the next launch.
+ * Fixed a bug that could occur when the app has a localized CFBundleName.
+ * .dmgs now work on Leopard.
+ * The status controller's button now sizes appropriately to the localization.
+ * Sparkle now works correctly with LSUIElement apps: it focuses them before displaying the update alert.
+ * Sparkle now deletes failed partial downloads.
+ * The update alert no longer floats above everything in the app.
+ * Fixed varied and sundry memory leaks.
+* A ton of other things that I've forgotten or were too small to mention!
+
+# 1.1
+
+* Optimized framework size: now only 1.4mb with all localizations and 384kb with only English (an English-only version is in the Extras folder).
+* Added a new SUStatusChecker class for programmatically determining if a new version is available (see the docs); thanks, Evan Schoenberg!
+* Added support for apps using SIGCHLD; thanks, Augie Fackler!
+* Added a zh_CN update from JT Lee
+* Added a Polish update from Piotr Chylinski
+* Fixed DMG support for images with /Applications symlinks.
+* Fixed a really stupid interval-checking bug that could cause repeated hits to the appcast.
+* Fixed a bug where the check interval would be inconsistent if a value of 0 was stored in the user defaults.
+
+# 1.0
+
+* Additions:
+ * Added real version comparison courtesy Kevin Ballard: Sparkle now knows that 0.89 < 1.0a3 < 1.0.
+ * Added many localizations courtesy David Kocher's localization team.
+ * Added a much better installation mechanism courtesy Allan Odgaard.
+ * Added a user agent string to the RSS fetch request.
+ * Added support for CFBundleShortVersionString in addition to CFBundleVersion, and support for a sparkle:shortVersionString attribute on the enclosure.
+ * Added support for CFBundleDisplayName if available.
+* Changes:
+ * Automatic updating is now allowed by default, but only if DSA signing is on.
+ * Pressing Escape or closing the update alert now reminds the user later.
+ * Now when there's a stored check interval, Sparkle doesn't check immediately on startup the first time the app is launched because the user hasn't consented to it yet.
+ * The update alert now remembers its size and floats.
+* Bug Fixes:
+ * Fixed installation of DMGs with multiple files enclosed.
+ * Fixed a nasty memory leak.
+ * Fixed a bug wherein having no value for allowing automatic updates would display a checkbox for the updates but would not honor it.
+ * Fixed a bug in zip extraction that occurred in Panther.
+ * Fixed release notes caching.
+ * Fixed a bug wherein Sparkle refused to authenticate the installation if the user had cancelled authentication previously in that session.
+ * Fixed a weird bug that would cause a second help menu to appear on first launch.
+ * Fixed a bug that could occur when changing the scheduled check interval.
+ * Fixed a bug wherein the host app could crash if the user clicked Remind Me Later before the release notes finished loading.
+ * Fixed a bug wherein the behavior was undefined if the user manually initiated a check when an automatic one was already taking place.
+ * Fixed wrapping on the description field in the update alert.
+
+# 1.0-beta3
+
+* Fixed a nasty crasher that occurred often when the user was not connected to the internet.
+
+# 1.0-beta2
+
+* Major Improvements:
+ * Fully automatic updating! (see the Documentation: this is beta and off by default)
+ * Added support for DSA signatures (see the Documentation).
+ * Added support for MD5 sum verification.
+ * Added Security.framework-based authentication for installing to privileged directories.
+ * Huge refactoring of the codebase: there's now a Sparkle Xcode project, Sparkle is now a framework, and everything is modular / abstracted. And no more code-generated interface.
+* Minor Improvements:
+ * A SUUpdaterWillRestartNotification is sent out before restarting now.
+ * Added key equivalents to alert panel buttons.
+ * Error handling is much prettier now: technical messages are not presented to the user anymore.
+ * There's now a test app for developers to see what Sparkle's like before using it.
+ * Wrote new, pretty, extremely thorough documentation.
+* Bug Fixes:
+ * Relaunch behavior is much improved and shouldn't fail in huge apps anymore.
+ * Fixed a bug wherein a failing tar command could crash the host app.
+ * Sparkle now looks at InfoPlist.strings in addition to Info.plist.
+ * Fixed some stupid typos.
+
+# 1.0-beta1
+
+* Major New Features:
+ * Sparkle now supports scheduled periodic updates—read the Readme for information on how to use it.
+ * Sparkle now supports WebKit-based release notes (for CSS and full HTML), which it displays in the main update alert, not a separate panel. The Readme has much more information. Sparkle will, of course, fall back on NSTextView if the host app does not include WebKit.
+* Minor New Features:
+ * Added support for .zip update archives.
+ * Added support for .dmg update archives.
+ * Implemented Remind Me Later to replace simple update cancellation.
+ * Implemented Skip This Version functionality.
+ * Added support for multiple feeds via the user defaults SUFeedURL key taking precedent over the one in Info.plist.
+ * Added support for Sparkle's custom XML namespace, which is optional but may prove useful. See the Readme for more information.
+* Bug Fixes:
+ * Sparkle will no longer enter an inconsistent state if the user tries to update again while one is already in progress.
+ * Sparkle now uses CFBundleName to determine the application's name instead of the app's filename.
+ * Sparkle no longer crashes if the user cancels during extraction.
+ * Lots of code refactoring.
+
+# 0.1
+
+* Initial Release

HandBrake-1.5.1.tar.xz/macosx/Sparkle/CODE_OF_CONDUCT.md Added

@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at kornel+sparkle@geekhood.net. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenanthomepage, version 1.4,
+available at http://contributor-covenant.org/version/1/4version
+
+homepage: http://contributor-covenant.org
+version: http://contributor-covenant.org/version/1/4/

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Carthage-dev.json Added

@@ -0,0 +1,1 @@
+{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz"}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/CommandLineTool-Debug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/CommandLineTool-Release.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/CommandLineTool-Shared.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigCommon.xcconfig Added

@@ -0,0 +1,121 @@
+// Common
+
+SPARKLE_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle
+SPARKLE_RELAUNCH_TOOL_NAME = Autoupdate
+SPARKLE_INSTALLER_PROGRESS_TOOL_NAME = Updater
+
+// Set to 1 or 0 to bundle or not bundle provided XPC Services in Sparkle framework
+SPARKLE_EMBED_INSTALLER_LAUNCHER_XPC_SERVICE = 1
+SPARKLE_EMBED_DOWNLOADER_XPC_SERVICE = 1
+SPARKLE_EMBED_INSTALLER_STATUS_XPC_SERVICE = 0
+SPARKLE_EMBED_INSTALLER_CONNECTION_XPC_SERVICE = 0
+
+// Set these if you want to use custom name for the XPC Services
+// For the Installer one in particular, this name may show up in an authorization prompt
+// when installing an update that requires authorization.
+INSTALLER_CONNECTION_NAME = InstallerConnection
+INSTALLER_STATUS_NAME = InstallerStatus
+INSTALLER_LAUNCHER_NAME = Installer
+DOWNLOADER_NAME = Downloader
+
+// Set this to your own prefix if you want to use XPC Service bundle IDs with different prefix
+XPC_SERVICE_BUNDLE_ID_PREFIX = org.sparkle-project
+
+INSTALLER_CONNECTION_BUNDLE_ID = ${XPC_SERVICE_BUNDLE_ID_PREFIX}.InstallerConnection
+INSTALLER_STATUS_BUNDLE_ID = ${XPC_SERVICE_BUNDLE_ID_PREFIX}.InstallerStatus
+INSTALLER_LAUNCHER_BUNDLE_ID = ${XPC_SERVICE_BUNDLE_ID_PREFIX}.InstallerLauncher
+DOWNLOADER_BUNDLE_ID = ${XPC_SERVICE_BUNDLE_ID_PREFIX}.Downloader
+
+// Set to 0 to only build all non-UI bits
+SPARKLE_BUILD_UI_BITS = 1
+
+// If your app file on disk is named "MyApp 1.1b4", Sparkle usually updates it
+// in place, giving you an app named 1.1b4 that is actually 1.2. Turn the
+// following on to always reset the name back to "MyApp"
+// If you are using this option to change the name of your app, you should
+// disable the option again when you no longer need it
+// Note this option is only supported for regular application updates and not plug-ins
+SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME = 0
+
+SPARKLE_ICON_NAME = AppIcon
+
+// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
+// These variables must have a space after the '=' too
+SPARKLE_VERSION_MAJOR = 2
+SPARKLE_VERSION_MINOR = 4
+SPARKLE_VERSION_PATCH = 0
+
+// This should be in SemVer format or empty, ie. "-beta.1"
+// These variables must have a space after the '=' too
+SPARKLE_VERSION_SUFFIX =
+CURRENT_PROJECT_VERSION = 2022
+
+MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
+ALWAYS_SEARCH_USER_PATHS = NO
+ENABLE_STRICT_OBJC_MSGSEND = YES
+GCC_SYMBOLS_PRIVATE_EXTERN = YES
+GCC_INLINES_ARE_PRIVATE_EXTERN = YES
+ARCHS = $(ARCHS_STANDARD)
+MACOSX_DEPLOYMENT_TARGET = 10.13
+PRODUCT_NAME = ${TARGET_NAME}
+PRODUCT_BUNDLE_IDENTIFIER = org.sparkle-project.Sparkle.${PRODUCT_NAME:rfc1034identifier}
+
+GCC_PREPROCESSOR_DEFINITIONS_COMMON = SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME=$(SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME) SPARKLE_BUILD_UI_BITS=$(SPARKLE_BUILD_UI_BITS) SPARKLE_BUNDLE_IDENTIFIER=\"$(SPARKLE_BUNDLE_IDENTIFIER)\" CURRENT_PROJECT_VERSION=\"$(CURRENT_PROJECT_VERSION)\" MARKETING_VERSION=\"$(MARKETING_VERSION)\"  SPARKLE_RELAUNCH_TOOL_NAME=\"$(SPARKLE_RELAUNCH_TOOL_NAME)\" SPARKLE_INSTALLER_PROGRESS_TOOL_NAME=\"$(SPARKLE_INSTALLER_PROGRESS_TOOL_NAME)\" SPARKLE_ICON_NAME=\"$(SPARKLE_ICON_NAME)\" INSTALLER_LAUNCHER_NAME=\"${INSTALLER_LAUNCHER_NAME}\" INSTALLER_LAUNCHER_BUNDLE_ID=\"${INSTALLER_LAUNCHER_BUNDLE_ID}\" INSTALLER_CONNECTION_NAME=\"${INSTALLER_CONNECTION_NAME}\" INSTALLER_CONNECTION_BUNDLE_ID=\"${INSTALLER_CONNECTION_BUNDLE_ID}\" INSTALLER_STATUS_NAME=\"${INSTALLER_STATUS_NAME}\" INSTALLER_STATUS_BUNDLE_ID=\"${INSTALLER_STATUS_BUNDLE_ID}\" DOWNLOADER_NAME=\"${DOWNLOADER_NAME}\" DOWNLOADER_BUNDLE_ID=\"${DOWNLOADER_BUNDLE_ID}\"
+
+CODE_SIGN_IDENTITY = -
+SDKROOT = macosx
+ENABLE_HARDENED_RUNTIME = YES
+CLANG_ENABLE_OBJC_ARC = YES
+GCC_ENABLE_PASCAL_STRINGS = NO
+GCC_NO_COMMON_BLOCKS = YES
+COMBINE_HIDPI_IMAGES = NO
+
+// Enable warnings
+CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
+CLANG_ANALYZER_SECURITY_FLOATLOOPCOUNTER = YES
+CLANG_ANALYZER_SECURITY_INSECUREAPI_RAND = YES
+CLANG_ANALYZER_SECURITY_INSECUREAPI_STRCPY = YES
+CLANG_ENABLE_MODULES = YES
+CLANG_WARN__DUPLICATE_METHOD_MATCH = YES
+CLANG_WARN_ASSIGN_ENUM = YES
+CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES
+CLANG_WARN_DOCUMENTATION_COMMENTS = YES
+CLANG_WARN_EMPTY_BODY = YES
+CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES
+CLANG_WARN_OBJC_EXPLICIT_OWNERSHIP_TYPE = YES
+CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES
+CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES
+CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = YES
+CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES
+CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES
+CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES
+CLANG_WARN_UNREACHABLE_CODE = YES
+GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES
+GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES
+GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES
+GCC_WARN_ABOUT_MISSING_NEWLINE = YES
+GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES
+GCC_WARN_ABOUT_RETURN_TYPE = YES
+GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES
+GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES
+GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES
+GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES
+GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES
+GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES
+GCC_WARN_PEDANTIC = YES
+GCC_WARN_SHADOW = YES
+GCC_WARN_SIGN_COMPARE = YES
+GCC_WARN_STRICT_SELECTOR_MATCH = YES
+GCC_WARN_UNDECLARED_SELECTOR = YES
+GCC_WARN_UNKNOWN_PRAGMAS = YES
+GCC_WARN_UNUSED_FUNCTION = YES
+GCC_WARN_UNUSED_LABEL = YES
+GCC_WARN_UNUSED_PARAMETER = YES
+GCC_WARN_UNUSED_VARIABLE = YES
+
+// These should be removed once the conversion to ARC is complete
+WARNING_CFLAGS_EXTRA = -Wno-custom-atomic-properties -Wno-implicit-atomic-properties
+
+// Turn on all warnings, then disable a few which are almost impossible to avoid
+WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-arc-repeated-use-of-weak -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-direct-ivar-access $(WARNING_CFLAGS_EXTRA)

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigCommonCoverage.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigCommonDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigCommonRelease.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigDownloader.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigDownloaderDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigFramework.xcconfig Added

@@ -0,0 +1,25 @@
+// Framework only
+
+DYLIB_INSTALL_NAME_BASE = @rpath
+DYLIB_COMPATIBILITY_VERSION = 1.6
+DYLIB_CURRENT_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)
+WRAPPER_EXTENSION = framework
+
+// Sparkle 2 used to support developers embedding XPC Services in their own app bundle
+// However the Sparkle framework now bundles these XPC Services. Unfortunately this causes
+// a cache conflict in the system from upgrading from previous to newer versions of Sparkle, and
+// XPC Services inside Sparkle may not launch (a system reboot would fix this though).
+// The system cache seems to depend on the Sparkle file path,
+// so as a better workaround we have changed the FRAMEWORK_VERSION from A to B
+FRAMEWORK_VERSION = B
+
+INFOPLIST_FILE = Sparkle/Sparkle-Info.plist
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BUILDING_SPARKLE=1
+SKIP_INSTALL = YES
+DEFINES_MODULE = YES
+PRODUCT_BUNDLE_IDENTIFIER = ${SPARKLE_BUNDLE_IDENTIFIER}
+
+// As long as we don't ourselves depend upon any Frameworks that are incompatible
+// with Application Extensions, then we should allow frameworks that require
+// compatibility to be able to link with us.
+APPLICATION_EXTENSION_API_ONLY = YES

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigFrameworkDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerConnection.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerConnectionDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerLauncher.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerLauncherDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerProgress.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerStatus.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigInstallerStatusDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigRelaunch.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigSparkleTool.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigSwift.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigSwiftDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigSwiftRelease.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigTestApp.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigTestAppDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigTestAppHelper.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigTestAppHelperDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUITest.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUITestCoverage.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUITestDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUITestRelease.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUnitTest.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUnitTestCoverage.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUnitTestDebug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ConfigUnitTestRelease.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/bsdiff-Debug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/bsdiff-Release.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/bsdiff-Shared.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ed25519-Debug.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ed25519-Release.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/ed25519-Shared.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/generate_latest_changes.py Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/link-tools.sh Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/make-release-package.sh Added

@@ -0,0 +1,177 @@
+#!/bin/bash
+set -e
+
+# Tests the code signing validity of the extracted products within the provided path.
+# This guards against our archives being corrupt / created incorrectly.
+function verify_code_signatures() {
+    verification_directory="$1"
+
+    if   -z "$verification_directory" ; then
+        echo "Provided verification directory does not exist" >&2
+        exit 1
+    fi
+
+    # Search the current directory for all instances of the framework to verify them (XCFrameworks can have multiple copies of a framework for different platforms).
+    find "${verification_directory}" -name "Sparkle.framework" -type d -exec codesign --verify -vvv --deep {} \;
+    codesign --verify -vvv --deep "${verification_directory}/sparkle.app"
+    codesign --verify -vvv --deep "${verification_directory}/Sparkle Test App.app"
+    codesign --verify -vvv --deep "${verification_directory}/bin/BinaryDelta"
+    codesign --verify -vvv --deep "${verification_directory}/bin/generate_appcast"
+    codesign --verify -vvv --deep "${verification_directory}/bin/sign_update"
+    codesign --verify -vvv --deep "${verification_directory}/bin/generate_keys"
+}
+
+if  "$ACTION" = ""  ; then
+    rm -rf "$CONFIGURATION_BUILD_DIR/staging"
+    rm -rf "$CONFIGURATION_BUILD_DIR/staging-spm"
+    rm -f "Sparkle-$MARKETING_VERSION.tar.xz"
+    rm -f "Sparkle-$MARKETING_VERSION.tar.bz2"
+    rm -f "Sparkle-for-Swift-Package-Manager.zip"
+
+    mkdir -p "$CONFIGURATION_BUILD_DIR/staging"
+    mkdir -p "$CONFIGURATION_BUILD_DIR/staging-spm"
+    cp "$SRCROOT/CHANGELOG" "$SRCROOT/LICENSE" "$SRCROOT/INSTALL" "$SRCROOT/Resources/SampleAppcast.xml" "$CONFIGURATION_BUILD_DIR/staging"
+    cp "$SRCROOT/CHANGELOG" "$SRCROOT/LICENSE" "$SRCROOT/INSTALL" "$SRCROOT/Resources/SampleAppcast.xml" "$CONFIGURATION_BUILD_DIR/staging-spm"
+    cp -R "$SRCROOT/bin" "$CONFIGURATION_BUILD_DIR/staging"
+    cp "$CONFIGURATION_BUILD_DIR/BinaryDelta" "$CONFIGURATION_BUILD_DIR/staging/bin"
+    cp "$CONFIGURATION_BUILD_DIR/generate_appcast" "$CONFIGURATION_BUILD_DIR/staging/bin"
+    cp "$CONFIGURATION_BUILD_DIR/generate_keys" "$CONFIGURATION_BUILD_DIR/staging/bin"
+    cp "$CONFIGURATION_BUILD_DIR/sign_update" "$CONFIGURATION_BUILD_DIR/staging/bin"
+    cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app" "$CONFIGURATION_BUILD_DIR/staging"
+    cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app" "$CONFIGURATION_BUILD_DIR/staging-spm"
+    cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app" "$CONFIGURATION_BUILD_DIR/staging"
+    cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app" "$CONFIGURATION_BUILD_DIR/staging-spm"
+    cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework" "$CONFIGURATION_BUILD_DIR/staging"
+    cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.xcframework" "$CONFIGURATION_BUILD_DIR/staging-spm"
+    
+    if  "$SPARKLE_EMBED_DOWNLOADER_XPC_SERVICE" -eq 1 ; then
+        mkdir -p "$CONFIGURATION_BUILD_DIR/staging/Entitlements"
+        mkdir -p "$CONFIGURATION_BUILD_DIR/staging-spm/Entitlements"
+        
+        cp -R "$SRCROOT/Downloader/org.sparkle-project.Downloader.entitlements" "$CONFIGURATION_BUILD_DIR/staging/Entitlements/$DOWNLOADER_NAME.entitlements"
+        cp -R "$SRCROOT/Downloader/org.sparkle-project.Downloader.entitlements" "$CONFIGURATION_BUILD_DIR/staging-spm/Entitlements/$DOWNLOADER_NAME.entitlements"
+    fi
+
+    mkdir -p "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+
+    # Only copy dSYMs for Release builds, but don't check for the presence of the actual files
+    # because missing dSYMs in a release build SHOULD trigger a build failure
+    if  "$CONFIGURATION" = "Release"  ; then
+        cp -R "$CONFIGURATION_BUILD_DIR/BinaryDelta.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/generate_appcast.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/generate_keys.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/sign_update.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/Autoupdate.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/Updater.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/${INSTALLER_LAUNCHER_NAME}.xpc.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+        cp -R "$CONFIGURATION_BUILD_DIR/${DOWNLOADER_NAME}.xpc.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
+    fi
+    cp -R "$CONFIGURATION_BUILD_DIR/staging/bin" "$CONFIGURATION_BUILD_DIR/staging-spm"
+    cp -R "$CONFIGURATION_BUILD_DIR/staging/Symbols" "$CONFIGURATION_BUILD_DIR/staging-spm"
+
+    cd "$CONFIGURATION_BUILD_DIR/staging"
+
+    if  -x "$(command -v xz)" ; then
+        XZ_EXISTS=1
+    else
+        XZ_EXISTS=0
+    fi
+
+    rm -rf "/tmp/sparkle-extract"
+    mkdir -p "/tmp/sparkle-extract"
+
+    # Sorted file list groups similar files together, which improves tar compression
+    if  "$XZ_EXISTS" -eq 1  ; then
+        find . \! -type d | rev | sort | rev | tar cv --files-from=- | xz -9 > "../Sparkle-$MARKETING_VERSION.tar.xz"
+
+        # Copy archived distribution for CI
+        cp -f "../Sparkle-$MARKETING_VERSION.tar.xz" "../sparkle-dist.tar.xz"
+
+        # Extract archive for testing binary validity
+        tar -xf "../Sparkle-$MARKETING_VERSION.tar.xz" -C "/tmp/sparkle-extract"
+    else
+        # Fallback to bz2 compression if xz utility is not available
+        find . \! -type d | rev | sort | rev | tar cjvf "../Sparkle-$MARKETING_VERSION.tar.bz2" --files-from=-
+
+        # Extract archive for testing binary validity
+        tar -xf "../Sparkle-$MARKETING_VERSION.tar.bz2" -C "/tmp/sparkle-extract"
+    fi
+
+    # Test code signing validity of the extracted products
+    # This guards against our archives being corrupt / created incorrectly
+    verify_code_signatures "/tmp/sparkle-extract"
+
+    rm -rf "/tmp/sparkle-extract"
+    rm -rf "$CONFIGURATION_BUILD_DIR/staging"
+
+    # Get latest git tag
+    cd "$SRCROOT"
+    latest_git_tag=$( git describe --tags --abbrev=0 || true )
+
+    if  -n "$latest_git_tag"  ; then
+        # Generate zip containing the xcframework for SPM
+        rm -rf "/tmp/sparkle-spm-extract"
+        mkdir -p "/tmp/sparkle-spm-extract"
+        cd "$CONFIGURATION_BUILD_DIR/staging-spm"
+        # rm -rf "$CONFIGURATION_BUILD_DIR/Sparkle.xcarchive"
+        ditto -c -k --zlibCompressionLevel 9 --rsrc . "../Sparkle-for-Swift-Package-Manager.zip"
+
+        # Test code signing validity of the extracted Swift package
+        # This guards against our archives being corrupt / created incorrectly
+        ditto -x -k "../Sparkle-for-Swift-Package-Manager.zip" "/tmp/sparkle-spm-extract"
+        verify_code_signatures "/tmp/sparkle-spm-extract"
+
+        rm -rf "/tmp/sparkle-spm-extract"
+        rm -rf "$CONFIGURATION_BUILD_DIR/staging-spm"
+        
+        cd "$SRCROOT"
+    
+        # Check semantic versioning
+        if  $latest_git_tag =~ ^(0|1-90-9*)\.(0|1-90-9*)\.(0|1-90-9*)(-((0|1-90-9*|0-9*a-zA-Z-0-9a-zA-Z-*)(\.(0|1-90-9*|0-9*a-zA-Z-0-9a-zA-Z-*))*))?(\\+(0-9a-zA-Z-+(\.0-9a-zA-Z-+)*))?$ ; then
+            echo "Tag $latest_git_tag follows semantic versioning"
+        else
+            echo "ERROR: Tag $latest_git_tag does not follow semantic versioning! SPM will not be able to resolve the repository" >&2
+            exit 1
+        fi
+        
+            # Generate new Package manifest, podspec, and carthage files
+        cd "$CONFIGURATION_BUILD_DIR"
+        cp "$SRCROOT/Package.swift" "$CONFIGURATION_BUILD_DIR"
+        cp "$SRCROOT/Sparkle.podspec" "$CONFIGURATION_BUILD_DIR"
+        cp "$SRCROOT/Carthage-dev.json" "$CONFIGURATION_BUILD_DIR"
+    fi
+    
+    if  -z "$latest_git_tag"  ; then
+        echo "warning: No git repository found so skipping updating package management files"
+    elif  "$XCODE_VERSION_MAJOR" -ge "1200" ; then
+        # is equivalent to shasum -a 256 FILE
+        spm_checksum=$(swift package compute-checksum "Sparkle-for-Swift-Package-Manager.zip")
+        rm -rf ".build"
+        sed -E -i '' -e "/let tag/ s/\".+\"/\"$latest_git_tag\"/" -e "/let version/ s/\".+\"/\"$MARKETING_VERSION\"/" -e "/let checksum/ s/:xdigit:{64}/$spm_checksum/" "Package.swift"
+        cp "Package.swift" "$SRCROOT"
+        echo "Package.swift updated with the following values:"
+        echo "Version: $MARKETING_VERSION"
+        echo "Tag: $latest_git_tag"
+        echo "Checksum: $spm_checksum"
+
+        sed -E -i '' -e "/s\.version.+=/ s/\".+\"/\"$MARKETING_VERSION\"/" "Sparkle.podspec"
+        
+        "$SRCROOT/Configurations/update-carthage.py" "Carthage-dev.json" "$MARKETING_VERSION"
+        cp "Sparkle.podspec" "$SRCROOT"
+        # Note the Carthage-dev.json file will finally be copied to the website repo in Carthage/Sparkle.json in the end
+        cp "Carthage-dev.json" "$SRCROOT"
+        echo "Sparkle.podspec and Carthage-dev.json updated with following values:"
+        echo "Version: $MARKETING_VERSION"
+    else
+        echo "warning: Xcode version $XCODE_VERSION_ACTUAL does not support computing checksums for Swift Packages. Please update the Package manifest manually."
+    fi
+
+    if  "$XZ_EXISTS" -ne 1  ; then
+        echo "WARNING: xz compression is used for official releases but bz2 is being used instead because xz tool is not installed on your system."
+    fi
+
+    rm -rf "$CONFIGURATION_BUILD_DIR/staging-spm"
+fi

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/release-move-tag.sh Added

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -e
+
+# Convenience script to automatically commit Package.swift after updating the checksum and move the latest tag
+latest_git_tag=$( git describe --tags --abbrev=0 || true ) # gets the latest tag name
+if  -z "$latest_git_tag"  ; then
+    exit 0
+fi
+
+commits_since_tag=$(git rev-list ${latest_git_tag}.. --count)
+
+function move_tag() {
+    long_message=$(git tag -n99 -l $latest_git_tag) # gets corresponding message
+    long_message=${long_message/$latest_git_tag} # trims tag name
+    long_message="$(echo -e "${long_message}" | sed -e 's/^:space:*//')" # trim leading whitespace
+    git add Package.swift Sparkle.podspec Carthage-dev.json
+    git commit -m "Update Package management files for version ${latest_git_tag}"
+    git tag -fa $latest_git_tag -m "${long_message}"
+    echo "Package.swift and Sparkle.podspec committed and tag '$latest_git_tag' moved."
+}
+
+if  "$commits_since_tag" -gt 0 ; then
+    # If there have been commits since the latest tag, it's highly likely that we did not intend to do a full release
+    echo "WARNING: $commits_since_tag commit(s) since tag '$latest_git_tag'. Did you tag a new version?"
+    echo "Package management files have not been committed and tag has not been moved."
+elif  "$CI" == true ; then
+    move_tag
+else
+# TODO: add sanity check to see if version is actually being updated or not?
+    read -p "Do you want to commit changes to Package.swift, Sparkle.podspec, Carthage-dev.json and force move tag '$latest_git_tag'? (required for official release) Y/n" -n 1 -r
+        echo    # (optional) move to a new line
+    if  $REPLY =~ ^Yy$ ; then
+        move_tag
+    else
+        echo "Package.swift, Sparkle.podspec, and Carthage-dev.json have not been committed and tag has not been moved."
+    fi
+fi

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/set-git-version-info.sh Added

@@ -0,0 +1,40 @@
+#!/bin/sh
+set -e
+
+if ! which -s git ; then
+    exit 0
+fi
+
+if  -z "$SRCROOT"  || \
+    -z "$BUILT_PRODUCTS_DIR"  || \
+    -z "$INFOPLIST_PATH"  || \
+    -z "$MARKETING_VERSION" ; then
+	echo "$0: Must be run from Xcode!" 1>&2
+    exit 1
+fi
+
+version="$MARKETING_VERSION"
+
+# Get version in format 1.x.x-commits-hash
+gitversion=$( cd "$SRCROOT"; git describe --tags --match '12.*' || true )
+if  -z "$gitversion"  ; then
+    echo "$0: Can't find a Git hash!" 1>&2
+    exit 0
+fi
+
+# remove everything before the second last "-" to keep the hash part only
+versionsuffix=$( echo "${gitversion}" | sed -E 's/.+((-^.+){2})$/\1/' )
+if  "$versionsuffix" != "$gitversion" ; then
+    version="$version$versionsuffix"
+fi
+
+# and use it to set the CFBundleShortVersionString value
+export PATH="$PATH:/usr/libexec"
+
+if  -f "$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"  ; then
+    oldversion=$(PlistBuddy -c "Print :CFBundleShortVersionString" "$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH")
+fi
+if  "$version" != "$oldversion"  ; then
+    PlistBuddy -c "Set :CFBundleShortVersionString '$version'" \
+        "$BUILT_PRODUCTS_DIR/$INFOPLIST_PATH"
+fi

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/strip-xpc-services.sh Added

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+FRAMEWORK_PATH="${TARGET_BUILD_DIR}"/"${FULL_PRODUCT_NAME}"
+
+removedservices=0
+
+if  "$SPARKLE_EMBED_INSTALLER_LAUNCHER_XPC_SERVICE" -eq 0 ; then
+    rm -rf "${FRAMEWORK_PATH}"/"Versions/"${FRAMEWORK_VERSION}"/XPCServices"/"${INSTALLER_LAUNCHER_NAME}.xpc"
+    removedservices=$((removedservices+1))
+fi
+
+if  "$SPARKLE_EMBED_DOWNLOADER_XPC_SERVICE" -eq 0 ; then
+    rm -rf "${FRAMEWORK_PATH}"/"Versions/"${FRAMEWORK_VERSION}"/XPCServices"/"${DOWNLOADER_NAME}.xpc"
+    removedservices=$((removedservices+1))
+fi
+
+if  "$SPARKLE_EMBED_INSTALLER_STATUS_XPC_SERVICE" -eq 0 ; then
+    rm -rf "${FRAMEWORK_PATH}"/"Versions/"${FRAMEWORK_VERSION}"/XPCServices"/"${INSTALLER_STATUS_NAME}.xpc"
+    removedservices=$((removedservices+1))
+fi
+
+if  "$SPARKLE_EMBED_INSTALLER_CONNECTION_XPC_SERVICE" -eq 0 ; then
+    rm -rf "${FRAMEWORK_PATH}"/"Versions/"${FRAMEWORK_VERSION}"/XPCServices"/"${INSTALLER_CONNECTION_NAME}.xpc"
+    removedservices=$((removedservices+1))
+fi
+
+if  "$removedservices" -eq 4 ; then
+    rm -rf "${FRAMEWORK_PATH}"/"Versions/"${FRAMEWORK_VERSION}"/XPCServices"
+        rm -rf "${FRAMEWORK_PATH}"/"XPCServices"
+fi

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Configurations/update-carthage.py Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/.gitignore Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/API_README.markdown Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/Design Practices.md Added

@@ -0,0 +1,41 @@
+# Design Practices
+
+## XPC Services
+
+XPC services in Sparkle are all optional, so the code involved in the services needs to be usable directly from the framework as well. For this to work well, if the class used in the XPC service takes a delegate, it must not be weakly referenced, so the retain cycle will have to be broken explicitly (via an explicit added invalidate method). dealloc also must not be implemented (do cleanup in custom invalidate method). As one may tell, two of the services are simply proxies (InstallerConnection, InstallerStatus) -- we now recommend most developers to set up a temporary exception with their bundle ID rather than use these two services.
+
+The protocols used in XPC services must also not adopt other protocols (i.e, one protocol inheriting from another protocol). This is because the XPC protocol decoder on older supported systems doesn't properly handle this case, and won't be able to find that methods exist on a class.
+
+## Singletons
+
+Singletons and other global mutable variables have been either removed entirely or completely avoided with an exception to backwards compatibility. They have no place in a well architectured framework.
+
+`SPUUpdater` doesn't maintain singleton instances and can now be properly deconstructed. Note because a caller is not expected to explicitly invalidate an updater, this means that the updater needs to avoid geting into a retain cycle. Intermediate clasess were created for the update cycle and schedule timer to avoid just this.
+
+One may argue that we shouldn't allow multiple live updaters running at the same bundle simutaneously, but I disagree and I think that is missing the point. It also does not account for updaters running external to the process. For example, it may be perfectly reasonable to start an update from `sparkle-cli` that defers the installation until quit, and have the application that is being updated be able to resume that installation and relaunch immediately.
+
+The original `SUUpdater` may have also been created to assist plug-ins and other non-app bundles. My advice there is in order to be truely safe, you must not inject a framework like Sparkle into the host application anyway. An external tool that is bundled like `sparkle-cli` may be more appropriate to use here.
+
+## Extensibility
+
+Sparkle 2.0 does not support subclassing classes internal (not exported) to Sparkle anymore. Doing so would be almost impossible to maintain into the future. Subclassing in general has been banned. Composition is prefered everywhere, even amongst the internal update drivers which were rewritten to follow a protocol oriented approach. The reason why composition is preferred is because it's easier to follow the flow of logic.
+
+I hope the user driver API gives enough extensibility without someone wanting to create another fork.
+
+## Delegation
+
+Newer classes, other than assisting backwards compatibility, that support delegation don't pass the delegator around anymore. Doing so has some bad consequences(https://zgcoder.net/ramblings/avoid-passing-the-delegator) and makes code hard to maintain. 
+
+Optional delegate methods that have return types need to be optional or have known default values for primitive types.
+
+You may notice that the delegate and user driver are not accessible as properties from `SPUUpdater`. This is intentional. The methods that belong to these types aren't meaningful to any caller except from internal classes.
+
+## Decoupling
+
+Two software components should not directly know about each other. Preferrably they wouldn't know about each other at all, but if they must, they can use the delegation pattern with a declared protocol.
+
+See `Documentation/graph-of-sparkle.png` for a graph of how the code looks like currently. This was generated via objc_dep(https://github.com/nst/objc_dep) (great tool). Note that there are no red edges which would mean that two nodes know of each other.
+
+## Attributes
+
+`nonatomic` should really be used wherever possible with regards to obj-c properties (`atomic` is a bad default). `readonly` should be used wherever possible as well, which also implies that only ivar access should be used in initializers. `NS_ASSUME_NONNULL_BEGIN` and `NS_ASSUME_NONNULL_END` should be used around new headers whenever possible. AppKit prevention guards should be used for any non-UI class whenever possible.
\ No newline at end of file

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/Installation.md Added

@@ -0,0 +1,137 @@
+# Details on Installer IPC & Security
+
+## Important components:
+
+* The bundle to update & replace
+* The application to listen for termination & to relaunch. This can be the same bundle as the one being updated, but this doesn't have to be the case (eg: the bundle being updated could be a plug-in that is hosted by another application).
+* The updater that lives in Sparkle.framework - this schedules & downloads updates and starts the installer. This updater's life can be tied to the application's lifetime, but this doesn't have to be the case.
+* The installer (Autoupdate) which does all the extraction, validation, and installation work. This program is submitted by the updater and is run as a launchd agent or daemon, depending on the type of installation and if elevated permissions are needed to perform the update.
+* The progress or agent application which hosts the installation status service and is also responsible for showing UI if the installation takes a sufficiently long period of time, as well as responsible for launching the new update.
+
+## After downloading the update:
+
+### Launching the Installer
+SPUCoreBasedUpdateDriver invokes SPUInstallerDriver's extraction method which invokes SUInstallerLauncher's launch installer method. An XPC Service may be used to launch the installer if necessary for Sandboxed applications.
+
+First, if the updater driver that invoked the launcher doesn't allow for interaction (in particular, the automatic/silent update driver does not allow interaction), then the launcher fails with a hint to try again with interaction enabled (in particular, with a UI based update driver). If this happens, the updater keeps a reference to the downloaded update and appcast item that is used for resuming with a UI based update driver later. The launcher in this case is telling that authorization can only be done if interaction is allowed from the driver, so the user can enter their password to start up the installer as root to install over a location that requires such privileges.
+
+The launcher then looks for the installer and agent application. If we are inside the XPC Service, a relative path back to the framework auxiliary directory is computed otherwise the bundle's auxiliary directory path is retrieved. Once those paths are found, the launcher copies the progress agent application to a temporary cache location. The installer is not copied because it is a plain single executable that does not rely on external relative dependencies, whereas the agent application relies on bundle resources. This is important to consider because the old application may be moved around and removed when the installation process occurs. Leaving the installer inside its bundle also could leave it in a place the user doesn't necessarily have write privileges to.
+
+The installer is first submitted. If it requires root privileges, it will ask for an admin user name and password. How it determines if root privileges are necessary is based on:
+
+* If the installation type from the appcast is an interactive package based installer, then no root privileges are necessary because the package installer will ask for them. Note this type of installation is deprecated however.
+* If the installation type from the appcast is a guided or regular package based installer, then root privileges are necessary because the system installer utility has to run as root.
+* Otherwise the installation type is a normal application update, and root privileges are only needed if write permission or changing the owner is currently insufficient.
+
+The installer makes sure, after extraction, that the expected installation type from the appcast matches the type of installation found within the archive. So this hint from the appcast is not just trusted implicitly.
+
+If the user cancels submitting the installer on authorization (if it's required), the launcher aborts the installation process silently. If everything goes alright, the progress agent application is submitted next. If either of the submissions fail, the installation fails and aborts, otherwise the launcher succeeds and its job is done. Note before the submissions are done, the jobs are removed from launchd, and the jobs are submitted in a way that act as "one-time" jobs. If they fail or succeed, the jobs aren't restarted, and the jobs aren't installed in a system location for launchd to attempt launching again.
+
+The most important argument passed to the installer is the host bundle identifier of the bundle to update. This bundle identifier is used so that the installer and updater know what Mach service to connect to for IPC. Mostly everything else to the installer is sent via a XPC connection. The host bundle path is passed to the progress agent, which is just used for obtaining the bundle identifier, and for UI purposes (eg: displaying app icon and name when the app needs to show progress). The type of domain the installer is running in (user vs system) is also passed to the progress agent application so it can know which domain to use to connect to the installer.
+
+### Timeouts
+
+Upon starting the progress agent, it tries to establish a connection to the installer and send a "hello" message expecting a reply back. If a reply isn't received back within a certain threshold, the agent application aborts (unless it's already planning to terminate in the near future after relaunching the new update).
+
+If the installer doesn't receive the "hello" message from the agent in a certain threshold, the installer aborts. If the installer doesn't receive the installation input data from the data in a certain threshold also, it aborts there too. If the installer aborts and the agent is connected to the installer, the agent will abort as well.
+
+When the updater attempts to set up a connection to the installer, after a certain threshold, if the installation hasn't progressed from not beginning (i.e, extraction hasn't begun), then the updater aborts the installation.
+
+### Installation Data
+After the installer launches, the updater creates a connection to the installer and sends installation data to the installer using the `SPUInstallationData` message. This data includes the bundle application path to relaunch, the path to the bundle to update and replace, Ed(DSA) signature from the appcast item, decryption password for dmg if available, the path to the downloaded directory and name of the downloaded item, and the type of expected installation.
+
+The installer takes note of all this information, but it moves the downloaded item into a update directory it chooses for itself. This is for two reasons:
+
+1. If the installer is running at a higher level than the process that submitted it (eg: sandboxed -> user, or user -> root), it make sense from a security perspective to move the file into its own support directory. This could prevent an attacker from manipulating the download while the installer is using it.
+2. The updater, or another updater running, or someone else probably won't accidently remove the downloaded item if the installer decides to 'own' it.
+
+After the installer moves the downloaded item, it makes sure the item is not a symbolic link. If it is a non-regular file, the installer aborts, causing the updater to abort as well. Note this check is done after the move rather than before due to potential race conditions an attacker could create.
+
+### Update Extraction
+After the installer receives the input installation data, it starts extracting the update. The installer first sends a `SPUExtractionStarted` message.
+
+If the unarchiver requires EdDSA validation before extraction (binary delta archives do) or if the expected installation type is a package type, then before starting the unarchiver, validation is checked to make sure the signature for the archive is valid. If the signature is not valid, then a `SPUArchiveExtractionFailed` message is sent to the updater (see below on what happens after that). We can't require validation before extracting for normal application updates because they allow changes to EdDSA keys. Delta updates are fine however because if those fail, then a full update can be tried.
+
+After extraction starts, one or more `SPUExtractedArchiveWithProgress` messages indicating the unarchival progress are sent back to the updater. On failure, the installer will send `SPUArchiveExtractionFailed`. In the updater, if the update is a delta update and extraction fails, then the full archive is downloaded and we go back to the "Sending Installation Data" section to re-send the data and begin extraction again. If the update is not a delta update and extraction fails on the other hand, then the updater aborts causing the installer to abort as well.
+
+### Post Validation
+If the unarchiving succeeds, a `SPUValidationStarted` message is sent back to the updater, and the installer begins post validating the update.
+
+If validation was already done before extraction, just the code signature is checked on the extracted bundle to make sure it's valid (if there's a code signature on the bundle). This is just a consistency check to make sure the developer didn't make a careless erorr.
+
+If validation fails, the installer aborts, causing the updater to abort the update as well. Otherwise, the installer sends a message `SPUInstallationStartedStage1` to the updater and begins the installation.
+
+### Retrieving Process Identifier
+
+If the installer hasn't made a connection to the agent yet within the time threshold, the installer waits until a connection is made. Otherwise, the installer asks the agent for the process identifier of the application bundle that it wants to wait for termination. If the installer doesn't get a response within a certain threshold, the installer aborts.
+
+When the installer gets the process identifier, it begins the installation. At this point on, the installer will try to perform the installation even if the connection to the updater or the connection to the agent invalidates.
+
+### Starting the Installation
+
+The installer figures out what kind of installer to use (regular, guided pkg, interactive pkg) based on the type of file inside the archive. If the type of file doesn't match the expected installation type from the input installation data, then the installer aborts causing the updater to abort as well.
+
+Once the type of installer is found, the first stage of installation is performed:
+
+* Regular application installer 1st stage: Makes sure this update is not a downgrade.
+* Guided Package installer 1st stage: Does nothing.
+* Interactive Package installer (deprecated) 1st stage: Makes sure /usr/bin/open utility is available.
+
+If the first stage fails, the installer aborts causing the updater to abort the update.
+
+Otherwise a `SPUInstallationFinishedStage1` message is sent back to the updater along with some data. This data includes whether the application bundle to relaunch is currently terminated, and whether the installation at later stages can be performed silently (that is, with no user interaction allowed). If we reach here, only the interactive package installer can't be performed silently.
+
+The installer then listens and waits for the target application to relaunch terminates. If it is already terminated, then it resumes to stage 2 and 3 of the installation immediately on the assumption that the installer does not have permission to show UI interaction to the user. Thus if the installer has to show user interaction here and hasn't received an OK from the updater (it won't if the target application is already terminated), the install will fail. If the target is already terminated, the installer will also assume that the target should not be relaunched after installation.
+
+### Installation Waiting Period
+The updater receives `SPUInstallationFinishedStage1` message. The updater sends a message `SPUSentUpdateAppcastItemData` with the appcast data in case the updater may request for it later (due to installer resumability, discussed later). It also reads if the target has already been terminated (implying that the installer will continue installing the update immediately), and if the installation will be done silently.
+
+For UI based update drivers, the updater tells the user driver to show that the application is ready to be relaunched - the user can continue to install & relaunch the app. The user driver is only alerted however if the installation isn't happening immediately (that is, if the target application to relaunch is still alive). The user driver can decide whether to a) install b) install & relaunch or c) delay installation. If installation is delayed, it can be resumed later, or if the target application terminates, the installer will try to continue installation if it is capable to without user interaction.
+
+For automatic based drivers, if the update is not going to be installed immediately and if it can be installed silently, the updater's delegate has a choice to handle the immediate installation of the update. If the delegate handles the installation, it can invoke a block that will trigger the automatic update driver to tell the installer to resume to stage 2 as detailed in step the "Continue to Installation" section - except without displaying any user interface and by relaunching the application afterwards. If the delegate handles the immediate installation, the automatic update driver will not abort, it will just leave the driver running until the installer requests for the app to be terminated later. This means the update can't be resumed later and the user driver won't be involved.
+
+Otherwise if the updater delegate doesn't handle immediate installation for automatic based drivers (assuming still the update is not going to be installed immediately), the update driver is aborted; the installer will still wait for the target to terminate however. If the update cannot be silently installed or if the update is marked as critical from the appcast, the update procedure is actually 'resumed' as a scheduled UI based update driver immediately. The update driver can also be 'resumed' later when the user initiates for an update manually or when a long duration (I think a week) has passed by without the user terminating the application. Note automatic based drivers are unable to do a resume, so only UI based ones can.
+
+If an update driver is resumed (which cannot happen if the target applicaton is already terminated by the way), then the updater first requests the installer for the appcast item data that the installer received before. The updater does this by creating a temporary distinct connection for the purpose of querying for the installation status. The connection will give up if a short timeout passes. If the updater fails to retrieve resume data, it assumes that there's no update to resume and will start back from the beginning. The updater can use this data for showing release notes, etc. Note the updater and target application don't have to live in the same process, and the updater could choose to terminate and resume later as a new process - so having the installer keep the appcast item data is nice.
+
+Afterwards the resumed update driver then allows the user driver to decide whether to a) install the update now, b) install & relaunch the update, or to c) delay the update installation and abort the update driver. Note we are now back to the same options discussed earlier.
+
+### Continue to Installation
+If the user driver decides to install the update, it sends a `SPUResumeInstallationToStage2` message to the installer and supplies whether the update should be relaunched, and whether user interface can be displayed. The user driver specifies that the user interface can be displayed as long as the updater delegate allows interaction. If the updater's delegate handles immediate installation in the automatic based update driver, UI cannot be displayed there too.
+
+The installer receives `SPUResumeInstallationToStage2` and reads whether it should relaunch the target application and whether it can show UI (thus be allowed to show user interaction). The installer then resumes to stage 2 of the installation if it has not been performed already (that is if the target app already terminated). Note if the installer doesn't receive this message before the target application terminates, then the installer will not relaunch or show UI and resume stage 2 & 3 by itself. Again not displaying UI is only an issue for interactive based package installers which are deprecated.
+
+If the 2nd stage succeeds, the installer sends a `SPUInstallationFinishedStage2` message back to the updater, including if the target application has already terminated at this time. If the target application has not already been terminated, the installer sends a request to the progress agent to *terminate* the application. By *terminate*, we mean sending an Apple quit event, allowing the application or user to possibly cancel or delay termination.
+
+The updater receives a `SPUInstallationFinishedStage2` message, and reads if the target application had already been terminated. If the target application has not already terminated, the updater tells the user driver to show that the application is being sent a termination request.
+
+In the case termination of the application is delayed or canceled, the user driver may re-try sending a `SPUResumeInstallationToStage2` message to the installer. This time the installer will recognize it already completed stage 2. If it hasn't proceeded onto stage 3 it will send another quit event to the application. This re-try can be done multiple times.
+
+### Showing Progress
+
+When the target application is terminated, if the updater allowed the installer to show UI progress and the installation type doesn't show progress on its own (only interactive package installer shows progress on its own), then the installer sends a `SPUUpdaterAlivePing` message to the updater. If the updater is still alive by now and receives the message, the updater will then send back a `SPUUpdaterAlivePong` message. This lets the installer know that the updater is still active after the target application is terminated, and whether the installer should later be responsible for displaying updater progress or not if a short time passes by, and the installation is still not finished. If the updater is still not alive, then the installer should be responsible for showing progress if otherwise allowed.
+
+If the installer decides to show progress, it sends a message to the progress agent to show progress UI. Under most circumstances, the installation will finish faster than this point is reached however (exceptions may be potentially large updates with many scattered files, guided package installers, and updates over a remote network mount). If the connection to the updater is still connected after this short time passes (eg: like with sparkle-cli), then it's the updater's job to show progress instead.
+
+### Finishing the Installation
+The installer starts stage 3 of the installation after the target application is terminated as well. The third stage does the final installation for updating and replacing the new updated bundle.
+
+If the third stage fails, then the installer aborts, causing the updater driver to abort if it's still running. The target application is not ever relaunched on failure.
+
+Otherwise if the third stage succeeds, the installer sends a message to the agent to stop showing progress. The agent uses this hint to acknowledge that it should stop broadcasting the status info service for the updater. If the connection to the updater is still alive, a `SPUInstallationFinishedStage3` message is sent back to the updater and the updater driver silently aborts the update.
+
+The installer then sends a message to the agent to relaunch the new application if the installer was requested to relaunch it. This also signals to the agent that it will terminate shortly. If the installer decides not to relaunch the update, the agent will terminate when its connection to the installer invalidates. The installer lastly does cleanup work by removing its update directory it was using and exits.
+
+When the progress agent exits, it cleans up by removing itself from disk. The installer doesn't do that because the installer isn't copied to another location in the first place.
+
+## Notes:
+
+* Performing an update as the root user is not currently supported. The command line driver (minorly) and the agent application link to AppKit, and running the agent as a different user (i.e, dropping from root -> logged in user) is not particularly the most elegant idea.
+
+* We use IPC in such a way that the installer process does not trust the updater process, which is why the installer does extraction, validation, and installation -- all in a single process. The launcher portion of code (which could be running as a XPC service) also does not trust the updater for determining the paths to the installer and agent tool. This portion of code does not check the code signing signature of the installer or agent though for reasons explained in the code.
+
+* We have timeouts and ping/pong messages in various cases because we don't want to trust the other end very much for communicating back quickly. On older systems in my testing (eg: 10.8), connection invalidation events don't even get sent to the other end when interacting with launchd, possibly due a bug that is outputted in Console.app.
+
+* When we terminate the application before doing final installation work, we send an Apple quit event to all running application instances we find under the agent's GUI login session. This does not include running instances from other logged in sessions -- that may require authenticating all the time, so trade off is not worthwhile. Also currently the installer only handles a single process identifier to watch for until termination, and certainly doesn't handle the case if more instances are launched afterwards. Note all of this only applies to instances being launched from the same bundle path, and the consequence may rarely be updating a bundle when a running instance is still left alive.
+
+* SMJobBless() would be interesting to explore and perhaps more suitable for sparkle-cli than ordinary application updaters because using this API is less approriate for one-off installations. Furthermore, the installer would have to change to persist rather than be a one-time install, and may have to handle mutliple connections for installing multiple bundles simutaneously.

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/Security.md Added

@@ -0,0 +1,35 @@
+# Security
+
+First, some references I've found to be quite useful:
+
+* WWDC 2010 video on "Creating Secure Applications" - asciiwwdc(http://asciiwwdc.com/2010/sessions/204?q=security).
+* EvenBetterAuthorizationExample(https://developer.apple.com/library/mac/samplecode/EvenBetterAuthorizationSample/Introduction/Intro.html) sample code by Apple for showing off privileged authorization as well as in sandboxed applications.
+* Apple's Daemons and Agents Technote(https://developer.apple.com/library/mac/technotes/tn2083/_index.html). Outdated and before XPC existed, but insightful.
+
+Sparkle 2.0 puts a huge emphasis on splitting Sparkle into several components to achieve privilege separation.
+
+* User Driver (Application; AppKit permitted)
+* Updater Scheduler (Framework)
+* XPC Services (Instead of some portions of Framework)
+* Progress Agent (Application; AppKit permitted)
+* Installer (Agent and Daemon safe)
+
+These achieve privilege separation, because at least theoretically, they can all be placed into different processes from one another, although in practice the user driver and updater framework will likely be in the same process.
+
+For XPC Services, it's significant to understand they can be used independent of sandboxing (although I wouldn't recommend this personally). Besides privilege separation, they also have an impact on fault tolerance and termination.
+
+We have code that detects whether or not XPC services are available and enabled by the main application bundle. This is simpler and more efficient than attempting to create a connection and wait for a timeout. We don't have *any* checks for seeing if the "current process" is sandboxed; doing so is a rather broken behavior. The XPC Services are important, not the sandboxing.
+
+I said above that XPC services are looked up in the main bundle. One may think this assumption doesn't hold for helpers or plug-ins inside applications. My response to that is they probably don't need the services, and they probably shoudn't be injecting Sparkle inside the host application anyway due to unintended conflicts and other consequences. A more appropriate approach may be to bundle a separate tool such as the sparkle command line utility.
+
+The `InstallerLauncher` XPC service needs a `JoinExistingSession` key set to `YES` otherwise authorization will not work properly, and even less so on older systems. It took me forever to debug this, so it's worth mentioning.
+
+When developing Sparkle 2.0, I still had a huge hole in the privilege separation even after supporting XPC Services and sandboxing. I fixed that by removing references to `AuthorizationExecuteWithPrivileges` and submitting a launchd agent/daemon for the installer. This is overlooked, but absolutely essential for our model to be secure.
+
+When communicating to a launchd job, we've several options to use for IPC such as BSD Sockets, Mach ports, XPC (note: XPC is an IPC API and is != "XPC Services"), and file IO. The technote I linked above describes why Mach ports have user namespace issues and why BSD sockets may be preferred over them. However, now, XPC which allows you to choose which domain to look up is the simplest, best, and most modern choice. It's crucial in any event we don't have a daemon (running in system domain) try to *connect* to something in the user domain. Our launchd tasks should also be connected to rather than the other way around. As for communication via file IO, I just wouldn't go anywhere close to trusting such a model mixing in system and user running processes.
+
+For sending Obj-C objects across the wire, we use `SPUSecureCoding` because Cocoa doesn't support sending objects securely out of the box unless working with XPC Services. It's very important the objects implement `NSSecureCoding` and whitelist types that are expected to be decoded, as well as whitelist types inside collections before decoding them.
+
+The installer handles extraction, validation, and installation of the update. This was the main reason why other sandboxed-capable forks were rejected from being secure. The point to be stressed anyway is that these all need to be done in the same process; they can't be handed off by some other process. This is also why removing references to `AuthorizationExecuteWithPrivileges` is crucial as well.
+
+Note that the installer does *not* handle downloading. That is handled by the updater framework. This is ideal because downloading can be done without disrupting the user, allowing it to be done silently without presenting an authorization dialog. The downloading portion of code can also be stuck into a XPC service with just an entitlement for allowing incoming connections. This also means for secure installations the installer cannot know (or trust) what protocol the update was downloaded from (i.e: http vs https). A good installer will not care, which is why applying updates without a EdDSA signature/key is now deprecated (reminder that Apple's code signature checks are not intended for complete integrity).

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Documentation/graph-of-sparkle.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/Info.plist Added

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<false/>
+	</dict>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
+	<key>XPCService</key>
+	<dict>
+		<key>ServiceType</key>
+		<string>Application</string>
+		<key>RunLoopType</key>
+		<string>NSRunLoop</string>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/SPUDownloader.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/SPUDownloader.m Added

@@ -0,0 +1,287 @@
+//
+// SPUDownloader.m
+// Downloader
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPULocalCacheDirectory.h"
+#import "SPUDownloadData.h"
+#import "SPUDownloadDataPrivate.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+typedef NS_ENUM(NSUInteger, SPUDownloadMode)
+{
+ SPUDownloadModePersistent,
+ SPUDownloadModeTemporary
+};
+
+static NSString *SUDownloadingReason = @"Downloading update related file";
+
+@interface SPUDownloader () <NSURLSessionDownloadDelegate>
+
+// Delegate is intentionally strongly referenced; see header
+@property (nonatomic) id <SPUDownloaderDelegate> delegate;
+@property (nonatomic) NSURLSessionDownloadTask *download;
+@property (nonatomic) NSURLSession *downloadSession;
+@property (nonatomic, copy) NSString *bundleIdentifier;
+@property (nonatomic, copy) NSString *desiredFilename;
+@property (nonatomic, copy) NSString *downloadFilename;
+@property (nonatomic) BOOL disabledAutomaticTermination;
+@property (nonatomic) SPUDownloadMode mode;
+@property (nonatomic) BOOL receivedExpectedBytes;
+
+@end
+
+@implementation SPUDownloader
+
+@synthesize delegate = _delegate;
+@synthesize download = _download;
+@synthesize downloadSession = _downloadSession;
+@synthesize bundleIdentifier = _bundleIdentifier;
+@synthesize desiredFilename = _desiredFilename;
+@synthesize downloadFilename = _downloadFilename;
+@synthesize disabledAutomaticTermination = _disabledAutomaticTermination;
+@synthesize mode = _mode;
+@synthesize receivedExpectedBytes = _receivedExpectedBytes;
+
+- (instancetype)initWithDelegate:(id <SPUDownloaderDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _delegate = delegate;
+ }
+ return self;
+}
+
+- (void)startDownloadWithRequest:(NSURLRequest *)request
+{
+ self.downloadSession = NSURLSession
+ sessionWithConfiguration:NSURLSessionConfiguration defaultSessionConfiguration
+ delegate:self
+ delegateQueue:NSOperationQueue mainQueue;
+ self.download = self.downloadSession downloadTaskWithRequest:request;
+ self.download resume;
+}
+
+// Don't implement dealloc - make the client call cleanup, which is the only way to remove the reference cycle from the delegate anyway
+
+- (void)startPersistentDownloadWithRequest:(NSURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.download == nil && self.delegate != nil) {
+ // Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
+ NSProcessInfo processInfo disableAutomaticTermination:SUDownloadingReason;
+ self.disabledAutomaticTermination = YES;
+ 
+ self.mode = SPUDownloadModePersistent;
+ self.desiredFilename = desiredFilename;
+ self.bundleIdentifier = bundleIdentifier;
+ 
+ self startDownloadWithRequest:request;
+ }
+ });
+}
+
+- (void)startTemporaryDownloadWithRequest:(NSURLRequest *)request
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.download == nil && self.delegate != nil) {
+ // Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
+ NSProcessInfo processInfo disableAutomaticTermination:SUDownloadingReason;
+ self.disabledAutomaticTermination = YES;
+ 
+ self.mode = SPUDownloadModeTemporary;
+ self startDownloadWithRequest:request;
+ }
+ });
+}
+
+- (void)enableAutomaticTermination
+{
+ if (self.disabledAutomaticTermination) {
+ NSProcessInfo processInfo enableAutomaticTermination:SUDownloadingReason;
+ self.disabledAutomaticTermination = NO;
+ }
+}
+
+- (NSString *)rootPersistentDownloadCachePathForBundleIdentifier:(NSString *)bundleIdentifier
+{
+ return SPULocalCacheDirectory cachePathForBundleIdentifier:bundleIdentifier stringByAppendingPathComponent:@"PersistentDownloads";
+}
+
+- (void)removeDownloadDirectory:(NSString *)directoryName bundleIdentifier:(NSString *)bundleIdentifier
+{
+ // Only take the directory name and compute most of the base path ourselves
+ // This way we do not have to send/trust an absolute path
+ // The downloader instance that creates this temp directory isn't necessarily the same as the one
+ // that clears it (eg upon skipping an already downloaded update), so we can't just preserve it here too
+ dispatch_async(dispatch_get_main_queue(), ^{
+ NSString *rootPersistentDownloadCachePath = self rootPersistentDownloadCachePathForBundleIdentifier:bundleIdentifier;
+ if (rootPersistentDownloadCachePath != nil) {
+ NSString *sanitizedDirectoryName = directoryName.lastPathComponent;
+ NSString *tempDir = rootPersistentDownloadCachePath stringByAppendingPathComponent:sanitizedDirectoryName;
+ 
+ NSFileManager defaultManager removeItemAtPath:tempDir error:NULL;
+ }
+ });
+}
+
+- (void)_cleanup
+{
+ self enableAutomaticTermination;
+ self.download cancel;
+ self.downloadSession finishTasksAndInvalidate;
+ self.download = nil;
+ self.downloadSession = nil;
+ self.delegate = nil;
+ 
+ if (self.mode == SPUDownloadModeTemporary && self.downloadFilename != nil)
+ {
+ NSFileManager defaultManager removeItemAtPath:self.downloadFilename error:NULL;
+ self.downloadFilename = nil;
+ }
+}
+
+- (void)cleanup:(void (^)(void))completionHandler
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self _cleanup;
+ 
+ completionHandler();
+ });
+}
+
+- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *) downloadTask didFinishDownloadingToURL:(NSURL *)location
+{
+ NSInteger statusCode = downloadTask.response isKindOfClass:NSHTTPURLResponse class ? ((NSHTTPURLResponse *)downloadTask.response).statusCode : 200;
+ if ((statusCode < 200) || (statusCode >= 400))
+ {
+ NSString *message = NSString stringWithFormat:@"A network error occurred while downloading the update. %@ (%ld)", NSHTTPURLResponse localizedStringForStatusCode:statusCode, (long)statusCode;
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message };
+ self.delegate downloaderDidFailWithError:error;
+ }
+ else if (self.mode == SPUDownloadModeTemporary)
+ {
+ self.downloadFilename = location.path;
+ self downloadDidFinish; // file is already in a system temp dir
+ }
+ else
+ {
+ // Remove our old caches path so we don't start accumulating files in there
+ NSString *rootPersistentDownloadCachePath = self rootPersistentDownloadCachePathForBundleIdentifier:self.bundleIdentifier;
+
+ SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath;
+ 
+ NSString *tempDir = SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootPersistentDownloadCachePath;
+ if (tempDir == nil)
+ {
+ // Okay, something's really broken with this user's file structure.
+ self.download cancel;
+ self.download = nil;
+ 
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", tempDir };
+ 
+ self.delegate downloaderDidFailWithError:error;
+ } else {
+ NSString *downloadFileName = self.desiredFilename;
+ NSString *downloadFileNameDirectory = tempDir stringByAppendingPathComponent:downloadFileName;
+ 
+ NSError *createError = nil;
+ if (!NSFileManager defaultManager createDirectoryAtPath:downloadFileNameDirectory withIntermediateDirectories:NO attributes:nil error:&createError) {
+ NSError *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Can't make a download file name %@ directory inside temporary directory for the update download at %@.", downloadFileName, downloadFileNameDirectory };
+ 
+ self.delegate downloaderDidFailWithError:error;
+ } else {
+ NSString *name = self.download.response.suggestedFilename;
+ if (!name) {
+ name = location.lastPathComponent; // This likely contains nothing useful to identify the file (e.g. CFNetworkDownload_87LVIz.tmp)
+ }
+ NSString *toPath = downloadFileNameDirectory stringByAppendingPathComponent:name;
+ NSString *fromPath = location.path; // suppress moveItemAtPath: non-null warning
+ NSError *error = nil;
+ if (NSFileManager defaultManager moveItemAtPath:fromPath toPath:toPath error:&error) {
+ self.downloadFilename = toPath;
+ self.delegate downloaderDidSetDestinationName:name temporaryDirectory:downloadFileNameDirectory;
+ self downloadDidFinish;
+ } else {
+ self.delegate downloaderDidFailWithError:error;
+ }
+ }
+ }
+ }
+}
+
+- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)__unused downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)__unused totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
+{
+ 
+ if (self.mode == SPUDownloadModePersistent && totalBytesExpectedToWrite > 0 && !self.receivedExpectedBytes) {
+ self.receivedExpectedBytes = YES;
+ self.delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite;
+ }
+ 
+ if (self.mode == SPUDownloadModePersistent && bytesWritten >= 0) {
+ self.delegate downloaderDidReceiveDataOfLength:(uint64_t)bytesWritten;
+ }
+}
+
+- (void)downloadDidFinish
+{
+ assert(self.downloadFilename != nil);
+ 
+ SPUDownloadData *downloadData = nil;
+ if (self.mode == SPUDownloadModeTemporary) {
+ NSData *data = NSData dataWithContentsOfFile:self.downloadFilename;
+ if (data != nil) {
+ NSURLResponse *response = self.download.response;
+ assert(response != nil);
+
+ NSURL *responseURL = response.URL;
+ if (responseURL == nil) {
+ responseURL = self.download.currentRequest.URL;
+ }
+ if (responseURL == nil) {
+ responseURL = self.download.originalRequest.URL;
+ }
+ assert(responseURL != nil);
+
+ downloadData = SPUDownloadData alloc initWithData:data URL:responseURL textEncodingName:response.textEncodingName MIMEType:response.MIMEType;
+ }
+ }
+ 
+ self.download = nil;
+ 
+ switch (self.mode) {
+ case SPUDownloadModeTemporary:
+ if (downloadData != nil) {
+ self.delegate downloaderDidFinishWithTemporaryDownloadData:downloadData;
+ } else {
+ self.delegate downloaderDidFailWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to read temporary downloaded data from %@", self.downloadFilename};
+ }
+ 
+ self _cleanup;
+ break;
+ case SPUDownloadModePersistent:
+ self.delegate downloaderDidFinishWithTemporaryDownloadData:nil;
+ break;
+ }
+}
+
+- (void)URLSession:(NSURLSession *)__unused session task:(NSURLSessionTask *)__unused task didCompleteWithError:(NSError *)error
+{
+ self.download = nil;
+ if (error != nil) {
+ self.delegate downloaderDidFailWithError:error;
+ }
+}
+
+// NSURLDownload has a downlaod:shouldDecodeSourceDataOfMIMEType: to determine if the data should be decoded.
+// This does not exist for NSURLSessionDownloadTask and appears unnecessary. Data tasks will decode data, but not download tasks.
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/SPUDownloaderDelegate.h Added

@@ -0,0 +1,34 @@
+//
+// SPUDownloaderDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUDownloadData;
+
+@protocol SPUDownloaderDelegate <NSObject>
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory;
+
+// Under rare cases, this may be called more than once, in which case the current progress should be reset back to 0
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength;
+
+// This is only invoked for persistent downloads
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length;
+
+// downloadData is nil if this is a persisent download, otherwise it's non-nil if it's a temporary download
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData;
+
+- (void)downloaderDidFailWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/SPUDownloaderProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/main.m Added

@@ -0,0 +1,53 @@
+//
+// main.m
+// PersistentDownloader
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SPUDownloader.h"
+#import "SPUDownloaderDelegate.h"
+
+@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
+@end
+
+@implementation ServiceDelegate
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+ // This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
+ 
+ // Configure the connection.
+ // First, set the interface that the exported object implements.
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderProtocol);
+ 
+ // Then set remote object interface
+ newConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderDelegate);
+ 
+ // Next, set the object that the connection exports. All messages sent on the connection to this service will be sent to the exported object to handle. The connection retains the exported object.
+ SPUDownloader *exportedObject = SPUDownloader alloc initWithDelegate:newConnection.remoteObjectProxy;
+ newConnection.exportedObject = exportedObject;
+ 
+ // Resuming the connection allows the system to deliver more incoming messages.
+ newConnection resume;
+ 
+ // Returning YES from this method tells the system that you have accepted this connection. If you want to reject the connection for some reason, call -invalidate on the connection and return NO.
+ return YES;
+}
+
+@end
+
+int main(int __unused argc, const char * __unused argv)
+{
+ // Create the delegate for the service.
+ ServiceDelegate *delegate = ServiceDelegate new;
+ 
+ // Set up the one NSXPCListener for this service. It will handle all incoming connections.
+ NSXPCListener *listener = NSXPCListener serviceListener;
+ listener.delegate = delegate;
+ 
+ // Resuming the serviceListener starts this service. This method does not return.
+ listener resume;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Downloader/org.sparkle-project.Downloader.entitlements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/INSTALL Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/Info.plist Added

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
+	<key>XPCService</key>
+	<dict>
+		<key>ServiceType</key>
+		<string>Application</string>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUInstallerCommunicationProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUInstallerConnection.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUInstallerConnection.m Added

@@ -0,0 +1,158 @@
+//
+// SUInstallerConnection.m
+// InstallerConnection
+//
+// Created by Mayur Pawashe on 7/9/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUInstallerConnection.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SUInstallerConnectionKeepAliveReason = @"Installer Connection Keep Alive";
+
+@interface SUInstallerConnection () <SUInstallerCommunicationProtocol>
+
+// Intentionally not weak for XPC reasons
+@property (nonatomic) id<SUInstallerCommunicationProtocol> delegate;
+
+@property (nonatomic) BOOL disabledAutomaticTermination;
+@property (nonatomic, copy) void (^invalidationBlock)(void);
+@property (nonatomic) NSXPCConnection *connection;
+
+@end
+
+@implementation SUInstallerConnection
+{
+ BOOL _remote;
+}
+
+@synthesize delegate = _delegate;
+@synthesize disabledAutomaticTermination = _disabledAutomaticTermination;
+@synthesize invalidationBlock = _invalidationBlock;
+@synthesize connection = _connection;
+
+- (instancetype)initWithDelegate:(id<SUInstallerCommunicationProtocol>)delegate remote:(BOOL)remote
+{
+ self = super init;
+ if (self != nil) {
+ _delegate = delegate;
+ _remote = remote;
+ 
+ if (remote) {
+ // If we are a XPC service, protect it from being terminated until the invalidation handler is set
+ _disabledAutomaticTermination = YES;
+ NSProcessInfo processInfo disableAutomaticTermination:SUInstallerConnectionKeepAliveReason;
+ }
+ }
+ return self;
+}
+
+- (void)enableAutomaticTermination
+{
+ if (self.disabledAutomaticTermination) {
+ NSProcessInfo processInfo enableAutomaticTermination:SUInstallerConnectionKeepAliveReason;
+ self.disabledAutomaticTermination = NO;
+ }
+}
+
+- (void)_setInvalidationHandler:(void (^)(void))invalidationHandler
+{
+ self.invalidationBlock = invalidationHandler;
+ 
+ // No longer needed because of invalidation callback
+ self enableAutomaticTermination;
+}
+
+- (void)setInvalidationHandler:(void (^)(void))invalidationHandler
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self _setInvalidationHandler:invalidationHandler;
+ });
+ } else {
+ self _setInvalidationHandler:invalidationHandler;
+ }
+}
+
+- (void)_setServiceName:(NSString *)serviceName systemDomain:(BOOL)systemDomain
+{
+ NSXPCConnectionOptions options = systemDomain ? NSXPCConnectionPrivileged : 0;
+ NSXPCConnection *connection = NSXPCConnection alloc initWithMachServiceName:serviceName options:options;
+ 
+ connection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ connection.exportedObject = self.delegate;
+ 
+ connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ 
+ self.connection = connection;
+ 
+ __weak SUInstallerConnection *weakSelf = self;
+ self.connection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.connection invalidate;
+ });
+ };
+ 
+ self.connection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SUInstallerConnection *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf.connection = nil;
+ strongSelf _invalidate;
+ }
+ });
+ };
+ 
+ self.connection resume;
+}
+
+- (void)setServiceName:(NSString *)serviceName systemDomain:(BOOL)systemDomain
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self _setServiceName:serviceName systemDomain:systemDomain;
+ });
+ } else {
+ self _setServiceName:serviceName systemDomain:systemDomain;
+ }
+}
+
+- (void)handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ (id<SUInstallerCommunicationProtocol>)self.connection.remoteObjectProxy handleMessageWithIdentifier:identifier data:data;
+ });
+ } else {
+ (id<SUInstallerCommunicationProtocol>)self.connection.remoteObjectProxy handleMessageWithIdentifier:identifier data:data;
+ }
+}
+
+- (void)_invalidate
+{
+ if (self.invalidationBlock != nil) {
+ self.invalidationBlock();
+ self.invalidationBlock = nil;
+ }
+ 
+ // Break the retain cycle
+ self.delegate = nil;
+ 
+ self enableAutomaticTermination;
+}
+
+// This method can be called from us or a remote
+- (void)invalidate
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.connection invalidate;
+ self.connection = nil;
+ 
+ self _invalidate;
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUInstallerConnectionProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUXPCInstallerConnection.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/SUXPCInstallerConnection.m Added

@@ -0,0 +1,92 @@
+//
+// SUXPCInstallerConnection.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUXPCInstallerConnection.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUXPCInstallerConnection ()
+
+@property (nonatomic) NSXPCConnection *connection;
+@property (nonatomic) id<SUInstallerCommunicationProtocol> delegate; // intentionally not weak for XPC reasons
+@property (nonatomic, copy) void (^invalidationBlock)(void);
+
+@end
+
+@implementation SUXPCInstallerConnection
+
+@synthesize connection = _connection;
+@synthesize delegate = _delegate;
+@synthesize invalidationBlock = _invalidationBlock;
+
+- (instancetype)initWithDelegate:(id<SUInstallerCommunicationProtocol>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _connection = NSXPCConnection alloc initWithServiceName:@INSTALLER_CONNECTION_BUNDLE_ID;
+ _connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerConnectionProtocol);
+ 
+ __weak SUXPCInstallerConnection *weakSelf = self;
+ _connection.invalidationHandler = ^{
+ weakSelf invokeInvalidation;
+ };
+ 
+ _connection.interruptionHandler = ^{
+ weakSelf invokeInvalidation;
+ weakSelf.connection invalidate;
+ };
+ 
+ _delegate = delegate;
+ 
+ _connection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ _connection.exportedObject = _delegate;
+ 
+ _connection resume;
+ }
+ return self;
+}
+
+- (void)setInvalidationHandler:(void (^)(void))invalidationHandler
+{
+ self.invalidationBlock = invalidationHandler;
+ 
+ __weak SUXPCInstallerConnection *weakSelf = self;
+ (id<SUInstallerConnectionProtocol>)self.connection.remoteObjectProxy setInvalidationHandler:^{
+ weakSelf invokeInvalidation;
+ };
+}
+
+- (void)setServiceName:(NSString *)serviceName systemDomain:(BOOL)systemDomain
+{
+ (id<SUInstallerConnectionProtocol>)self.connection.remoteObjectProxy setServiceName:serviceName systemDomain:systemDomain;
+}
+
+- (void)handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data
+{
+ (id<SUInstallerConnectionProtocol>)self.connection.remoteObjectProxy handleMessageWithIdentifier:identifier data:data;
+}
+
+- (void)invalidate
+{
+ (id<SUInstallerConnectionProtocol>)self.connection.remoteObjectProxy invalidate;
+ self.connection invalidate;
+ self.connection = nil;
+}
+
+- (void)invokeInvalidation
+{
+ if (self.invalidationBlock != nil) {
+ self.invalidationBlock();
+ self.invalidationBlock = nil;
+ }
+ // Break our retain cycle
+ self.delegate = nil;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/main.m Added

@@ -0,0 +1,53 @@
+//
+// main.m
+// InstallerConnection
+//
+// Created by Mayur Pawashe on 7/9/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SUInstallerConnection.h"
+#import "SUInstallerCommunicationProtocol.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
+@end
+
+@implementation ServiceDelegate
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+ // This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
+ 
+ // Configure the connection.
+ // First, set the interface that the exported object implements.
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerConnectionProtocol);
+ newConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol);
+ 
+ SUInstallerConnection *exportedObject = SUInstallerConnection alloc initWithDelegate:newConnection.remoteObjectProxy remote:YES;
+ 
+ newConnection.exportedObject = exportedObject;
+ 
+ // Resuming the connection allows the system to deliver more incoming messages.
+ newConnection resume;
+ 
+ return YES;
+}
+
+@end
+
+int main(int __unused argc, const char * __unused argv)
+{
+ // Create the delegate for the service.
+ ServiceDelegate *delegate = ServiceDelegate new;
+ 
+ // Set up the one NSXPCListener for this service. It will handle all incoming connections.
+ NSXPCListener *listener = NSXPCListener serviceListener;
+ listener.delegate = delegate;
+ 
+ // Resuming the serviceListener starts this service. This method does not return.
+ listener resume;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerConnection/org.sparkle-project.InstallerConnection.entitlements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/Info.plist Added

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
+	<key>XPCService</key>
+	<dict>
+		<key>ServiceType</key>
+		<string>Application</string>
+		<key>JoinExistingSession</key>
+		<true/>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/SUInstallerLauncher+Private.h Added

@@ -0,0 +1,29 @@
+//
+// SUInstallerLauncher+Private.h
+// SUInstallerLauncher+Private
+//
+// Created by Mayur Pawashe on 8/21/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUInstallerLauncher_Private_h
+#define SUInstallerLauncher_Private_h
+
+#import <Sparkle/SUExport.h>
+
+// Chances are clients will need this too
+#import <Sparkle/SPUInstallationType.h>
+
+@class NSString;
+
+/**
+ Private API for determining if the system needs authorization access to update a bundle path
+ 
+ This API is not supported when used directly from a Sandboxed applications and will always return @c YES in that case.
+ 
+ @param bundlePath The bundle path to test if authorization is needed when performing an update that replaces this bundle.
+ @return @c YES if Sparkle thinks authorization is needed to update the @c bundlePath, otherwise @c NO.
+ */
+SU_EXPORT BOOL SPUSystemNeedsAuthorizationAccessForBundlePath(NSString *bundlePath);
+
+#endif /* SUInstallerLauncher_Private_h */

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/SUInstallerLauncher.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/SUInstallerLauncher.m Added

@@ -0,0 +1,532 @@
+//
+// SUInstallerLauncher.m
+// InstallerLauncher
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUInstallerLauncher.h"
+#import "SUInstallerLauncher+Private.h"
+#import "SUFileManager.h"
+#import "SULog.h"
+#import "SPUMessageTypes.h"
+#import "SUBundleIcon.h"
+#import "SPULocalCacheDirectory.h"
+#import "SPUInstallationType.h"
+#import "SUHost.h"
+#import <ImageIO/ImageIO.h>
+#import <ServiceManagement/ServiceManagement.h>
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
+#import <SystemConfiguration/SystemConfiguration.h>
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUInstallerLauncher
+
+- (BOOL)submitProgressToolAtPath:(NSString *)progressToolPath withHostBundle:(NSBundle *)hostBundle inSystemDomainForInstaller:(BOOL)inSystemDomainForInstaller
+{
+ SUFileManager *fileManager = SUFileManager alloc init;
+ 
+ NSURL *progressToolURL = NSURL fileURLWithPath:progressToolPath;
+ 
+ NSError *quarantineError = nil;
+ if (!fileManager releaseItemFromQuarantineAtRootURL:progressToolURL error:&quarantineError) {
+ // This may or may not be a fatal error depending on if the process is sandboxed or not
+ SULog(SULogLevelError, @"Failed to release quarantine on installer at %@ with error %@", progressToolPath, quarantineError);
+ }
+ 
+ NSString *executablePath = NSBundle bundleWithURL:progressToolURL executablePath;
+ assert(executablePath != nil);
+ 
+ NSString *hostBundlePath = hostBundle.bundlePath;
+ assert(hostBundlePath != nil);
+ 
+ NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ 
+ NSArray<NSString *> *arguments = @executablePath, hostBundlePath, @(inSystemDomainForInstaller).stringValue;
+ 
+ // The progress tool can only be ran as the logged in user, not as root
+ CFStringRef domain = kSMDomainUserLaunchd;
+ NSString *label = NSString stringWithFormat:@"%@-sparkle-progress", hostBundleIdentifier;
+ 
+ AuthorizationRef auth = NULL;
+ Boolean submittedJob = false;
+ OSStatus createStatus = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth);
+ if (createStatus == errAuthorizationSuccess) {
+ // Try to remove the job from launchd if it is already running
+ // We could invoke SMJobCopyDictionary() first to see if the job exists, but I'd rather avoid
+ // using it because the headers indicate it may be removed one day without any replacement
+ CFErrorRef removeError = NULL;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if (!SMJobRemove(domain, (__bridge CFStringRef)(label), auth, true, &removeError)) {
+#pragma clang diagnostic pop
+ if (removeError != NULL) {
+ // It's normal for a job to not be found, so this is not an interesting error
+ if (CFErrorGetCode(removeError) != kSMErrorJobNotFound) {
+ SULog(SULogLevelError, @"Remove error: %@", removeError);
+ }
+ CFRelease(removeError);
+ }
+ }
+ 
+ // If we are running as the root user, there is no need to explicitly set the UserName / GroupName keys
+ // because we are submitting under the user domain, which should automatically use the the console user.
+ NSMutableDictionary *jobDictionary = NSMutableDictionary alloc init;
+ jobDictionary@"Label" = label;
+ jobDictionary@"ProgramArguments" = arguments;
+ jobDictionary@"EnableTransactions" = @NO;
+ jobDictionary@"KeepAlive" = @{@"SuccessfulExit" : @NO};
+ jobDictionary@"RunAtLoad" = @NO;
+ jobDictionary@"Nice" = @0;
+ jobDictionary@"ProcessType" = @"Interactive";
+ jobDictionary@"LaunchOnlyOnce" = @YES;
+ jobDictionary@"MachServices" = @{SPUStatusInfoServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES};
+ 
+ CFErrorRef submitError = NULL;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // SMJobSubmit is deprecated but is the only way to submit a non-permanent
+ // helper and allows us to submit to user domain without requiring authorization
+ submittedJob = SMJobSubmit(domain, (__bridge CFDictionaryRef)(jobDictionary), auth, &submitError);
+#pragma clang diagnostic pop
+ if (!submittedJob) {
+ if (submitError != NULL) {
+ SULog(SULogLevelError, @"Submit progress error: %@", submitError);
+ CFRelease(submitError);
+ }
+ }
+ 
+ AuthorizationFree(auth, kAuthorizationFlagDefaults);
+ }
+ 
+ return (submittedJob == true);
+}
+
+- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory authorizationPrompt:(NSString *)authorizationPrompt inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser
+{
+ SUFileManager *fileManager = SUFileManager alloc init;
+ 
+ // No need to release the quarantine for this utility
+ // In fact, we shouldn't because the tool may be located at a path we should not be writing too.
+ 
+ NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ 
+ // The first argument has to be the path to the program, and the second is a host identifier so that the installer knows what mach services to host
+ // The third and forth arguments are for home directory and user name which only pkg installer scripts may need
+ // We intentionally do not pass any more arguments. Anything else should be done via IPC.
+ // This is compatible to SMJobBless() which does not allow arguments
+ // Even though we aren't using that function for now, it'd be wise to not decrease compatibility to it
+ 
+ NSArray<NSString *> *arguments = @installerPath, hostBundleIdentifier, homeDirectory, userName;
+ 
+ AuthorizationRef auth = NULL;
+ OSStatus createStatus = AuthorizationCreate(NULL, kAuthorizationEmptyEnvironment, kAuthorizationFlagDefaults, &auth);
+ if (createStatus != errAuthorizationSuccess) {
+ auth = NULL;
+ SULog(SULogLevelError, @"Failed to create authorization reference: %d", createStatus);
+ }
+ 
+ BOOL canceledAuthorization = NO;
+ BOOL failedToUseSystemDomain = NO;
+ if (auth != NULL && systemDomain && !rootUser) {
+ // See Apple's 'EvenBetterAuthorizationSample' sample code and
+ // https://developer.apple.com/library/mac/technotes/tn2095/_index.html#//apple_ref/doc/uid/DTS10003110-CH1-SECTION7
+ // We can set a custom right name for authenticating as an administrator
+ // Using this right rather than using something like kSMRightModifySystemDaemons allows us to present a better worded prompt
+ // Note the right name is cached, so if we want to change the authorization
+ // prompt, we may need to change the right name. I have found no good way around this :|
+ NSString *sparkleAuthTag = @"sparkle2-auth"; // this needs to change if auth wording changes
+ NSString *rightNameString;
+ if (hostBundleIdentifier isEqualToString:updaterIdentifier) {
+ // Application bundle is likely updating itself
+ rightNameString = NSString stringWithFormat:@"%@.%@", hostBundleIdentifier, sparkleAuthTag;
+ } else {
+ // Updater is likely updating a bundle that is not itself
+ rightNameString = NSString stringWithFormat:@"%@.%@.%@", updaterIdentifier, hostBundleIdentifier, sparkleAuthTag;
+ }
+ 
+ const char *rightName = rightNameString.UTF8String;
+ assert(rightName != NULL);
+ 
+ OSStatus getRightResult = AuthorizationRightGet(rightName, NULL);
+ if (getRightResult == errAuthorizationDenied) {
+ if (AuthorizationRightSet(auth, rightName, (__bridge CFTypeRef _Nonnull)(@(kAuthorizationRuleAuthenticateAsAdmin)), (__bridge CFStringRef _Nullable)(authorizationPrompt), NULL, NULL) != errAuthorizationSuccess) {
+ SULog(SULogLevelError, @"Failed to make auth right set");
+ }
+ }
+ 
+ AuthorizationItem right = { .name = rightName, .valueLength = 0, .value = NULL, .flags = 0 };
+ AuthorizationRights rights = { .count = 1, .items = &right };
+ 
+ AuthorizationFlags flags = (AuthorizationFlags)(kAuthorizationFlagExtendRights | kAuthorizationFlagInteractionAllowed);
+ 
+ AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
+ AuthorizationEnvironment authorizationEnvironment = {.count = 0, .items = NULL};
+ 
+ // Find a 32x32 image representation of the icon, and write out a PNG version of it to a temporary location
+ // Then use the icon (if one is available) for the authorization prompt
+ // NSImage is not used because it relies on AppKit
+ NSURL *tempIconDestinationURL = nil;
+ NSURL *iconURL = SUBundleIcon iconURLForHost:SUHost alloc initWithBundle:hostBundle;
+ if (iconURL != nil) {
+ CGImageSourceRef imageSource = CGImageSourceCreateWithURL((CFURLRef)iconURL, (CFDictionaryRef)@{});
+ if (imageSource != NULL) {
+ size_t imageCount = CGImageSourceGetCount(imageSource);
+ for (size_t imageIndex = 0; imageIndex < imageCount; imageIndex++) {
+ CFDictionaryRef cfProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, imageIndex, (CFDictionaryRef)@{});
+ NSDictionary *properties = CFBridgingRelease(cfProperties);
+ 
+ NSNumber *pixelWidth = properties(const NSString *)kCGImagePropertyPixelWidth;
+ NSNumber *pixelHeight = properties(const NSString *)kCGImagePropertyPixelHeight;
+ 
+ // If we don't find a 32x32 image representation, then we don't provide an icon
+ // Don't try to make up with it by eg: converting an image representation to this size
+ // The app developer should be providing the icon representation.
+ // The authorization API may not take other size dimensions.
+ NSNumber *targetDimension = @32;
+ if (pixelWidth isKindOfClass:NSNumber class && pixelHeight isKindOfClass:NSNumber class && pixelWidth isEqualToNumber:targetDimension && pixelHeight isEqualToNumber:targetDimension) {
+ 
+ // Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
+ // a) no spaces in the path (SU/NSFileManager fails here)
+ // b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here)
+ // These limitations only apply to older systems (eg: macOS 10.8)
+ // The file also needs to be placed in a system readable place such as /tmp
+ // See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
+ char pathBuffer = "/tmp/XXXXXX.png";
+ int tempIconFile = mkstemps(pathBuffer, strlen(".png"));
+ if (tempIconFile == -1) {
+ SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
+ } else {
+ close(tempIconFile);
+ 
+ NSString *path = NSString alloc initWithUTF8String:pathBuffer;
+ tempIconDestinationURL = NSURL fileURLWithPath:path;
+ 
+ CGImageDestinationRef imageDestination = NULL;
+ if (@available(macOS 11, *)) {
+ CFStringRef uti = (__bridge CFStringRef)UTTypePNG identifier;
+ imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, uti, 1, NULL);
+ } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, kUTTypePNG, 1, NULL);
+#pragma clang diagnostic pop
+ }
+ if (imageDestination != NULL) {
+ CGImageDestinationAddImageFromSource(imageDestination, imageSource, imageIndex, (CFDictionaryRef)@{});
+ if (CGImageDestinationFinalize(imageDestination)) {
+ iconAuthorizationItem.valueLength = strlen(pathBuffer);
+ iconAuthorizationItem.value = pathBuffer;
+ 
+ authorizationEnvironment.count = 1;
+ authorizationEnvironment.items = &iconAuthorizationItem;
+ }
+ 
+ CFRelease(imageDestination);
+ }
+ }
+ 
+ break;
+ }
+ }
+ 
+ CFRelease(imageSource);
+ }
+ }
+ 
+ // This should prompt up the authorization dialog if necessary
+ OSStatus copyStatus = AuthorizationCopyRights(auth, &rights, &authorizationEnvironment, flags, NULL);
+ if (copyStatus != errAuthorizationSuccess) {
+ failedToUseSystemDomain = YES;
+ 
+ if (copyStatus == errAuthorizationCanceled) {
+ canceledAuthorization = YES;
+ } else {
+ SULog(SULogLevelError, @"Failed copying system domain rights: %d", copyStatus);
+ }
+ }
+ 
+ if (tempIconDestinationURL != nil) {
+ fileManager removeItemAtURL:tempIconDestinationURL error:NULL;
+ }
+ }
+ 
+ Boolean submittedJob = false;
+ if (!canceledAuthorization && !failedToUseSystemDomain && auth != NULL) {
+ CFStringRef domain = (systemDomain ? kSMDomainSystemLaunchd : kSMDomainUserLaunchd);
+ NSString *label = NSString stringWithFormat:@"%@-sparkle-updater", hostBundleIdentifier;
+ 
+ // Try to remove the job from launchd if it is already running
+ // We could invoke SMJobCopyDictionary() first to see if the job exists, but I'd rather avoid
+ // using it because the headers indicate it may be removed one day without any replacement
+ CFErrorRef removeError = NULL;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if (!SMJobRemove(domain, (__bridge CFStringRef)(label), auth, true, &removeError)) {
+#pragma clang diagnostic pop
+ if (removeError != NULL) {
+ // It's normal for a job to not be found, so this is not an interesting error
+ if (CFErrorGetCode(removeError) != kSMErrorJobNotFound) {
+ SULog(SULogLevelError, @"Remove job error: %@", removeError);
+ }
+ CFRelease(removeError);
+ }
+ }
+ 
+ NSDictionary *jobDictionary = @{@"Label" : label, @"ProgramArguments" : arguments, @"EnableTransactions" : @NO, @"KeepAlive" : @{@"SuccessfulExit" : @NO}, @"RunAtLoad" : @NO, @"Nice" : @0, @"ProcessType": @"Interactive", @"LaunchOnlyOnce": @YES, @"MachServices" : @{SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES, SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES}};
+ 
+ CFErrorRef submitError = NULL;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ // SMJobSubmit is deprecated but is the only way to submit a non-permanent
+ // helper and allows us to submit to user domain without requiring authorization
+ submittedJob = SMJobSubmit(domain, (__bridge CFDictionaryRef)(jobDictionary), auth, &submitError);
+#pragma clang diagnostic pop
+ if (!submittedJob) {
+ if (submitError != NULL) {
+ SULog(SULogLevelError, @"Submit error: %@", submitError);
+ CFRelease(submitError);
+ }
+ }
+ }
+ 
+ if (auth != NULL) {
+ AuthorizationFree(auth, kAuthorizationFlagDefaults);
+ }
+ 
+ SUInstallerLauncherStatus status;
+ if (submittedJob == true) {
+ status = SUInstallerLauncherSuccess;
+ } else if (canceledAuthorization) {
+ status = SUInstallerLauncherCanceled;
+ } else {
+ status = SUInstallerLauncherFailure;
+ }
+ return status;
+}
+
+- (NSString *)pathForBundledTool:(NSString *)toolName extension:(NSString *)extension fromBundle:(NSBundle *)bundle
+{
+ // If the path extension is empty, we don't want to add a "." at the end
+ NSString *nameWithExtension = (extension.length > 0) ? toolName stringByAppendingPathExtension:extension : toolName;
+ assert(nameWithExtension != nil);
+ 
+ NSURL *auxiliaryToolURL;
+ if (bundle.bundleURL.pathExtension isEqualToString:@"xpc") {
+ // Paranoid check to get full bundle URL
+ NSURL *fullURL = bundle.bundleURL.URLByResolvingSymlinksInPath;
+ 
+ auxiliaryToolURL = fullURL.URLByDeletingLastPathComponent.URLByDeletingLastPathComponent URLByAppendingPathComponent:nameWithExtension;
+ } else {
+ auxiliaryToolURL = bundle URLForAuxiliaryExecutable:nameWithExtension;
+ }
+ assert(auxiliaryToolURL != nil);
+ 
+ NSURL *resolvedAuxiliaryToolURL = auxiliaryToolURL URLByResolvingSymlinksInPath;
+ assert(resolvedAuxiliaryToolURL != nil);
+ 
+ return resolvedAuxiliaryToolURL.path;
+}
+
+BOOL SPUSystemNeedsAuthorizationAccessForBundlePath(NSString *bundlePath)
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ BOOL hasWritability = fileManager isWritableFileAtPath:bundlePath && fileManager isWritableFileAtPath:bundlePath stringByDeletingLastPathComponent;
+ 
+ BOOL needsAuthorization;
+ if (!hasWritability) {
+ needsAuthorization = YES;
+ } else {
+ // Just because we have writability access does not mean we can set the correct owner/group
+ // Test if we can set the owner/group on a temporarily created file
+ // If we can, then we can probably perform an update without authorization
+ 
+ NSString *tempFilename = @"permission_test" ;
+ 
+ SUFileManager *suFileManager = SUFileManager alloc init;
+ NSURL *tempDirectoryURL = suFileManager makeTemporaryDirectoryAppropriateForDirectoryURL:NSURL fileURLWithPath:NSTemporaryDirectory() error:NULL;
+ 
+ if (tempDirectoryURL == nil) {
+ // I don't imagine this ever happening but in case it does, requesting authorization may be the better option
+ needsAuthorization = YES;
+ } else {
+ NSURL *tempFileURL = tempDirectoryURL URLByAppendingPathComponent:tempFilename;
+ if (!NSData data writeToURL:tempFileURL atomically:NO) {
+ // Obvious indicator we may need authorization
+ needsAuthorization = YES;
+ } else {
+ needsAuthorization = !suFileManager changeOwnerAndGroupOfItemAtRootURL:tempFileURL toMatchURL:NSURL fileURLWithPath:bundlePath error:NULL;
+ }
+ 
+ suFileManager removeItemAtURL:tempDirectoryURL error:NULL;
+ }
+ }
+ 
+ return needsAuthorization;
+}
+
+static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, NSString *installationType, BOOL rootUser)
+{
+ if (!rootUser) {
+ if (installationType isEqualToString:SPUInstallationTypeGuidedPackage) {
+ return YES;
+ } else if (installationType isEqualToString:SPUInstallationTypeInteractivePackage) {
+ return NO;
+ } else {
+ return SPUSystemNeedsAuthorizationAccessForBundlePath(path);
+ }
+ } else {
+ // If we are the root user we use the system domain even if we don't need escalated authorization.
+ // Note interactive package installations are not supported as root.
+ return YES;
+ }
+}
+
+// Note: do not pass untrusted information such as paths to the installer and progress agent tools, when we can find them ourselves here
+- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // We could do a sort of preflight Authorization test instead of testing if we are running as root,
+ // but I think this is not necessarily a better approach. We have to chown() the launcher cache directory later on,
+ // and that is not necessarily related to a preflight test. It's more related to being ran under a root / different user from the active GUI session
+ BOOL rootUser = (geteuid() == 0);
+ 
+ BOOL inSystemDomain = SPUUsesSystemDomainForBundlePath(hostBundlePath, installationType, rootUser);
+ 
+ NSBundle *hostBundle = NSBundle bundleWithPath:hostBundlePath;
+ if (hostBundle == nil) {
+ SULog(SULogLevelError, @"InstallerLauncher failed to create bundle at %@", hostBundlePath);
+ SULog(SULogLevelError, @"Please make sure InstallerLauncher is not sandboxed and do not sign your app by passing --deep. Check: codesign -d --entitlements :- \"%@\"", NSBundle.mainBundle.bundlePath);
+ SULog(SULogLevelError, @"More information regarding sandboxing: https://sparkle-project.org/documentation/sandboxing/");
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ // if we need to use the system authorization from non-root and we aren't allowed interaction, then try sometime later when interaction is allowed
+ if (inSystemDomain && !rootUser && !allowingDriverInteraction) {
+ completionHandler(SUInstallerLauncherAuthorizeLater, inSystemDomain);
+ return;
+ }
+ 
+ NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ 
+ // We could be inside the InstallerLauncher XPC bundle or in the Sparkle.framework bundle if no XPC service is used
+ NSBundle *ourBundle = NSBundle bundleForClass:self class;
+ 
+ // Note we do not have to copy this tool out of the bundle it's in because it's a utility with no dependencies.
+ // Furthermore, we can keep the tool at a place that may not necessarily be writable.
+ NSString *installerPath = self pathForBundledTool:@""SPARKLE_RELAUNCH_TOOL_NAME extension:@"" fromBundle:ourBundle;
+ if (installerPath == nil) {
+ SULog(SULogLevelError, @"Error: Cannot submit installer because the installer could not be located");
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ // We do however have to copy the progress tool app somewhere safe due to its external depedencies
+ NSString *progressToolResourcePath = self pathForBundledTool:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME extension:@"app" fromBundle:ourBundle;
+ 
+ if (progressToolResourcePath == nil) {
+ SULog(SULogLevelError, @"Error: Cannot submit progress tool because the progress tool could not be located");
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ // It may be tempting here to validate/match the signature of the installer and progress tool, however this is not very reliable
+ // We can't compare the signature of this framework/XPC service (depending how it's run) to the host bundle because
+ // they could be different (eg: take a look at sparkle-cli). We also can't easily tell if the signature of the service/framework is the same as the bundle it's inside.
+ // The service/framework also need not even be signed in the first place. We'll just assume for now the original bundle hasn't been tampered with
+ 
+ NSString *rootLauncherCachePath = SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier stringByAppendingPathComponent:@"Launcher";
+ 
+ SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath;
+ 
+ NSString *launcherCachePath = SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath;
+ if (launcherCachePath == nil) {
+ SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ SUFileManager *fileManager = SUFileManager alloc init;
+ 
+ NSString *userName;
+ NSString *homeDirectory;
+ if (!rootUser) {
+ // Normal path
+ homeDirectory = NSHomeDirectory();
+ assert(homeDirectory != nil);
+ 
+ userName = NSUserName();
+ assert(userName != nil);
+ } else {
+ // As the root user we need to obtain the user name and home directory reflecting
+ // the user's console session.
+ 
+ uid_t uid = 0;
+ gid_t gid = 0;
+ CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, &uid, &gid);
+ if (userNameRef == NULL) {
+ SULog(SULogLevelError, @"Failed to retrieve user name from the console user");
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ userName = (NSString *)CFBridgingRelease(userNameRef);
+ homeDirectory = NSHomeDirectoryForUser(userName);
+ if (homeDirectory == nil) {
+ SULog(SULogLevelError, @"Failed to retrieve home directory for user: %@", userName);
+ 
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ // Ensure the console user has ownership of the launcher cache directory
+ // Otherwise the updater may not launch and not be able to clean up itself
+ NSError *changeOwnerAndGroupError = nil;
+ if (!fileManager changeOwnerAndGroupOfItemAtURL:NSURL fileURLWithPath:launcherCachePath ownerID:uid groupID:gid error:&changeOwnerAndGroupError) {
+ SULog(SULogLevelError, @"Failed to change owner and group for launcher cache directory: %@", changeOwnerAndGroupError);
+ 
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ }
+ 
+ NSString *progressToolPath = launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app";
+ 
+ NSError *copyError = nil;
+ // SUFileManager is more reliable for copying files around
+ if (!fileManager copyItemAtURL:NSURL fileURLWithPath:progressToolResourcePath toURL:NSURL fileURLWithPath:progressToolPath error:&copyError) {
+ SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
+ completionHandler(SUInstallerLauncherFailure, inSystemDomain);
+ return;
+ }
+ 
+ SUInstallerLauncherStatus installerStatus = self submitInstallerAtPath:installerPath withHostBundle:hostBundle updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory authorizationPrompt:authorizationPrompt inSystemDomain:inSystemDomain rootUser:rootUser;
+ 
+ BOOL submittedProgressTool = NO;
+ if (installerStatus == SUInstallerLauncherSuccess) {
+ submittedProgressTool = self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain;
+ 
+ if (!submittedProgressTool) {
+ SULog(SULogLevelError, @"Failed to submit progress tool job");
+ }
+ } else if (installerStatus == SUInstallerLauncherFailure) {
+ SULog(SULogLevelError, @"Failed to submit installer job");
+ SULog(SULogLevelError, @"If your application is sandboxed please follow steps at: https://sparkle-project.org/documentation/sandboxing/");
+ }
+ 
+ if (installerStatus == SUInstallerLauncherCanceled) {
+ completionHandler(installerStatus, inSystemDomain);
+ } else {
+ completionHandler(submittedProgressTool ? SUInstallerLauncherSuccess : SUInstallerLauncherFailure, inSystemDomain);
+ }
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/SUInstallerLauncherProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/SUInstallerLauncherStatus.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerLauncher/main.m Added

@@ -0,0 +1,49 @@
+//
+// main.m
+// InstallerLauncher
+//
+// Created by Mayur Pawashe on 4/1/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SUInstallerLauncher.h"
+
+@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
+@end
+
+@implementation ServiceDelegate
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+ // This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
+ 
+ // Configure the connection.
+ // First, set the interface that the exported object implements.
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerLauncherProtocol);
+ 
+ // Next, set the object that the connection exports. All messages sent on the connection to this service will be sent to the exported object to handle. The connection retains the exported object.
+ SUInstallerLauncher *exportedObject = SUInstallerLauncher new;
+ newConnection.exportedObject = exportedObject;
+ 
+ // Resuming the connection allows the system to deliver more incoming messages.
+ newConnection resume;
+ 
+ // Returning YES from this method tells the system that you have accepted this connection. If you want to reject the connection for some reason, call -invalidate on the connection and return NO.
+ return YES;
+}
+
+@end
+
+int main(int __unused argc, const char * __unused argv)
+{
+ // Create the delegate for the service.
+ ServiceDelegate *delegate = ServiceDelegate new;
+ 
+ // Set up the one NSXPCListener for this service. It will handle all incoming connections.
+ NSXPCListener *listener = NSXPCListener serviceListener;
+ listener.delegate = delegate;
+ 
+ // Resuming the serviceListener starts this service. This method does not return.
+ listener resume;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/SUInstallerStatus.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/SUInstallerStatus.m Added

@@ -0,0 +1,129 @@
+//
+// SUInstallerStatus.m
+// InstallerStatus
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUInstallerStatus.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUInstallerStatus ()
+
+@property (nonatomic, copy) void (^invalidationBlock)(void);
+@property (nonatomic) NSXPCConnection *connection;
+
+@end
+
+@implementation SUInstallerStatus
+{
+ BOOL _remote;
+}
+
+@synthesize invalidationBlock = _invalidationBlock;
+@synthesize connection = _connection;
+
+- (instancetype)initWithRemote:(BOOL)remote
+{
+ self = super init;
+ if (self != nil) {
+ _remote = remote;
+ }
+ return self;
+}
+
+- (void)setInvalidationHandler:(void (^)(void))invalidationHandler
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.invalidationBlock = invalidationHandler;
+ });
+ } else {
+ self.invalidationBlock = invalidationHandler;
+ }
+}
+
+- (void)_setServiceName:(NSString *)serviceName
+{
+ NSXPCConnection *connection = NSXPCConnection alloc initWithMachServiceName:serviceName options:(NSXPCConnectionOptions)0;
+ 
+ connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUStatusInfoProtocol);
+ 
+ self.connection = connection;
+ 
+ __weak SUInstallerStatus *weakSelf = self;
+ self.connection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.connection invalidate;
+ });
+ };
+ 
+ self.connection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SUInstallerStatus *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf.connection = nil;
+ strongSelf _invokeInvalidationBlock;
+ }
+ });
+ };
+ 
+ self.connection resume;
+}
+
+- (void)setServiceName:(NSString *)serviceName
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self _setServiceName:serviceName;
+ });
+ } else {
+ self _setServiceName:serviceName;
+ }
+}
+
+- (void)probeStatusInfoWithReply:(void (^)(NSData * _Nullable installationInfoData))reply
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ (id<SUStatusInfoProtocol>)self.connection.remoteObjectProxy probeStatusInfoWithReply:reply;
+ });
+ } else {
+ (id<SUStatusInfoProtocol>)self.connection.remoteObjectProxy probeStatusInfoWithReply:reply;
+ }
+}
+
+- (void)probeStatusConnectivityWithReply:(void (^)(void))reply
+{
+ if (_remote) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ (id<SUStatusInfoProtocol>)self.connection.remoteObjectProxy probeStatusConnectivityWithReply:reply;
+ });
+ } else {
+ (id<SUStatusInfoProtocol>)self.connection.remoteObjectProxy probeStatusConnectivityWithReply:reply;
+ }
+}
+
+- (void)_invokeInvalidationBlock
+{
+ if (self.invalidationBlock != nil) {
+ self.invalidationBlock();
+ self.invalidationBlock = nil;
+ }
+}
+
+// This method can be called from us or a remote
+- (void)invalidate
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.connection invalidate;
+ self.connection = nil;
+ 
+ self _invokeInvalidationBlock;
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/SUInstallerStatusProtocol.h Added

@@ -0,0 +1,33 @@
+//
+// SUInstallerStatusProtocol.h
+// InstallerStatus
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SUStatusInfoProtocol.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+// The protocol that this service will vend as its API. This header file will also need to be visible to the process hosting the service.
+@protocol SUInstallerStatusProtocol
+
+// Even though this is declared in SUStatusInfoProtocol, we should declare it here because macOS 10.8 doesn't traverse adopted protocols,
+// which is why this protocol doesn't adopt SUStatusInfoProtocol
+- (void)probeStatusInfoWithReply:(void (^)(NSData * _Nullable installationInfoData))reply;
+
+// Even though this is declared in SUStatusInfoProtocol, we should declare it here because macOS 10.8 doesn't traverse adopted protocols,
+// which is why this protocol doesn't adopt SUStatusInfoProtocol
+- (void)probeStatusConnectivityWithReply:(void (^)(void))reply;
+
+- (void)setInvalidationHandler:(void (^)(void))invalidationHandler;
+
+- (void)setServiceName:(NSString *)serviceName;
+
+- (void)invalidate;
+ 
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/SUXPCInstallerStatus.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/SUXPCInstallerStatus.m Added

@@ -0,0 +1,88 @@
+//
+// SUXPCInstallerStatus.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUXPCInstallerStatus.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUXPCInstallerStatus ()
+
+@property (nonatomic) NSXPCConnection *connection;
+@property (nonatomic, copy) void (^invalidationBlock)(void);
+
+@end
+
+@implementation SUXPCInstallerStatus
+
+@synthesize connection = _connection;
+@synthesize invalidationBlock = _invalidationBlock;
+
+- (instancetype)init
+{
+ self = super init;
+ if (self != nil) {
+ _connection = NSXPCConnection alloc initWithServiceName:@INSTALLER_STATUS_BUNDLE_ID;
+ _connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerStatusProtocol);
+ 
+ __weak SUXPCInstallerStatus *weakSelf = self;
+ _connection.invalidationHandler = ^{
+ weakSelf invokeInvalidation;
+ };
+ 
+ _connection.interruptionHandler = ^{
+ weakSelf invokeInvalidation;
+ weakSelf.connection invalidate;
+ };
+ 
+ _connection resume;
+ }
+ return self;
+}
+
+- (void)setInvalidationHandler:(void (^)(void))invalidationHandler
+{
+ self.invalidationBlock = invalidationHandler;
+ 
+ __weak SUXPCInstallerStatus *weakSelf = self;
+ (id<SUInstallerStatusProtocol>)self.connection.remoteObjectProxy setInvalidationHandler:^{
+ weakSelf invokeInvalidation;
+ };
+}
+
+- (void)setServiceName:(NSString *)serviceName
+{
+ (id<SUInstallerStatusProtocol>)self.connection.remoteObjectProxy setServiceName:serviceName;
+}
+
+- (void)probeStatusInfoWithReply:(void (^)(NSData * _Nullable installationInfoData))reply
+{
+ (id<SUInstallerStatusProtocol>)self.connection.remoteObjectProxy probeStatusInfoWithReply:reply;
+}
+
+- (void)probeStatusConnectivityWithReply:(void (^)(void))reply
+{
+ (id<SUInstallerStatusProtocol>)self.connection.remoteObjectProxy probeStatusConnectivityWithReply:reply;
+}
+
+- (void)invalidate
+{
+ (id<SUInstallerStatusProtocol>)self.connection.remoteObjectProxy invalidate;
+ self.connection invalidate;
+ self.connection = nil;
+}
+
+- (void)invokeInvalidation
+{
+ if (self.invalidationBlock != nil) {
+ self.invalidationBlock();
+ self.invalidationBlock = nil;
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/main.m Added

@@ -0,0 +1,52 @@
+//
+// main.m
+// InstallerStatus
+//
+// Created by Mayur Pawashe on 7/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SUInstallerStatus.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
+@end
+
+@implementation ServiceDelegate
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+ // This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
+ 
+ // Configure the connection.
+ // First, set the interface that the exported object implements.
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerStatusProtocol);
+ 
+ // Next, set the object that the connection exports. All messages sent on the connection to this service will be sent to the exported object to handle. The connection retains the exported object.
+ SUInstallerStatus *exportedObject = SUInstallerStatus alloc initWithRemote:YES;
+ newConnection.exportedObject = exportedObject;
+ 
+ // Resuming the connection allows the system to deliver more incoming messages.
+ newConnection resume;
+ 
+ // Returning YES from this method tells the system that you have accepted this connection. If you want to reject the connection for some reason, call -invalidate on the connection and return NO.
+ return YES;
+}
+
+@end
+
+int main(int __unused argc, const char * __unused argv)
+{
+ // Create the delegate for the service.
+ ServiceDelegate *delegate = ServiceDelegate new;
+ 
+ // Set up the one NSXPCListener for this service. It will handle all incoming connections.
+ NSXPCListener *listener = NSXPCListener serviceListener;
+ listener.delegate = delegate;
+ 
+ // Resuming the serviceListener starts this service. This method does not return.
+ listener resume;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/InstallerStatus/org.sparkle-project.InstallerStatus.entitlements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/LICENSE Added

@@ -0,0 +1,134 @@
+Copyright (c) 2006-2013 Andy Matuschak.
+Copyright (c) 2009-2013 Elgato Systems GmbH.
+Copyright (c) 2011-2014 Kornel Lesiński.
+Copyright (c) 2015-2017 Mayur Pawashe.
+Copyright (c) 2014 C.W. Betts.
+Copyright (c) 2014 Petroules Corporation.
+Copyright (c) 2014 Big Nerd Ranch.
+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, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+=================
+EXTERNAL LICENSES
+=================
+
+bspatch.c and bsdiff.c, from bsdiff 4.3 <http://www.daemonology.net/bsdiff/>:
+
+Copyright 2003-2005 Colin Percival
+All rights reserved
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted providing that the following conditions 
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+--
+
+sais.c and sais.c, from sais-lite (2010/08/07) <https://sites.google.com/site/yuta256/sais>:
+
+The sais-lite copyright is as follows:
+
+Copyright (c) 2008-2010 Yuta Mori 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, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
+--
+
+Portable C implementation of Ed25519, from https://github.com/orlp/ed25519
+
+Copyright (c) 2015 Orson Peters <orsonpeters@gmail.com>
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the
+authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial
+applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the
+ original software. If you use this software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as
+ being the original software.
+
+3. This notice may not be removed or altered from any source distribution.
+
+--
+
+SUSignatureVerifier.m:
+
+Copyright (c) 2011 Mark Hamlin.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted providing that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Makefile Added

@@ -0,0 +1,35 @@
+.PHONY: all localizable-strings release build test ci
+
+all: build
+
+ifndef BUILDDIR
+ BUILDDIR := $(shell mktemp -d "$(TMPDIR)/Sparkle.XXXXXX")
+endif
+
+localizable-strings:
+	rm -f Sparkle/Base.lproj/Sparkle.strings
+	genstrings -o Sparkle/Base.lproj -s SULocalizedString Sparkle/*.m
+	iconv -f UTF-16 -t UTF-8 < Sparkle/Base.lproj/Localizable.strings > Sparkle/Base.lproj/Sparkle.strings
+	rm Sparkle/Base.lproj/Localizable.strings
+
+release:
+	xcodebuild -scheme Distribution -configuration Release -derivedDataPath "$(BUILDDIR)" build
+	./Configurations/release-move-tag.sh
+	open "$(BUILDDIR)/Build/Products/Release/"
+	cat Sparkle.podspec
+	@echo "Don't forget to update CocoaPods! pod trunk push"
+	@echo "Don't forget to upload Sparkle-for-Swift-Package-Manager.zip!"
+
+build:
+	xcodebuild clean build
+	
+# Need to first gem install jazzy to run this rule
+docs:
+	jazzy --author "Sparkle Project" --objc --umbrella-header Sparkle/Sparkle.h --framework-root . --readme Documentation/API_README.markdown --theme jony --output Documentation/html
+
+uitest:
+	xcodebuild -scheme UITests -configuration Debug test
+
+check-localizations:
+	./Sparkle/CheckLocalizations.swift -root . -htmlPath "$(TMPDIR)/LocalizationsReport.htm"
+	open "$(TMPDIR)/LocalizationsReport.htm"

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Package.swift Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/README.markdown Added

@@ -0,0 +1,63 @@
+# Sparkle 2 !Build Status(https://github.com/sparkle-project/Sparkle/workflows/Build%20%26%20Tests/badge.svg?branch=2.x) !SwiftPM(https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) !Carthage compatible(https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)(https://github.com/Carthage/Carthage) !CocoaPods(https://img.shields.io/cocoapods/v/Sparkle.svg?cacheSeconds=86400)(https://cocoapods.org/pods/Sparkle)
+
+Secure and reliable software update framework for macOS.
+
+<img src="Resources/Screenshot.png" width="732" alt="Sparkle shows familiar update window with release notes">
+
+Sparkle 2 adds support for application sandboxing, custom user interfaces, updating external bundles, and a more modern architecture which includes faster and more reliable installs.
+
+Pre-releases when available can be found on the Sparkle's Releases(https://github.com/sparkle-project/Sparkle/releases) or on your favorite package manager. More nightly builds can be downloaded by selecting a recent workflow run(https://github.com/sparkle-project/Sparkle/actions?query=event%3Apush+is%3Asuccess+branch%3A2.x) and downloading the corresponding Sparkle-distribution artifact.
+
+The current status for future versions of Sparkle is tracked by its roadmap(https://github.com/sparkle-project/Sparkle/milestones).
+
+Please visit Sparkle's website(http://sparkle-project.org) for up to date documentation on using and migrating over to Sparkle 2. Refer to Changelog(CHANGELOG) for a more detailed list of changes. More internal design documents to the project can be found in the repository under Documentation(Documentation/).
+
+## Features
+
+* Seamless. There's no mention of Sparkle; your icons and app name are used.
+* Secure. Updates are verified using EdDSA signatures and Apple Code Signing. Supports Sandboxed applications in Sparkle 2.
+* Fast. Supports delta updates which only patch files that have changed and atomic-safe installs.
+* Easy to install. Sparkle requires no code in your app, and only needs static files on a web server.
+* Customizable. Sparkle 2 supports plugging in a custom UI for updates.
+* Flexible. Supports applications, package installers, preference panes, and other plug-ins. Sparkle 2 supports updating external bundles.
+* Handles permissions, quarantine, and automatically asks for authentication if needed.
+* Uses RSS-based appcasts for release information. Appcasts are a de-facto standard supported by 3rd party update-tracking programs and websites.
+* Stays hidden until second launch for better first impressions.
+* Truly self-updating — the user can choose to automatically download and install all updates in the background.
+* Ability to use channels for beta updates (in Sparkle 2), add phased rollouts to users, and mark updates as critical or major.
+* Progress and status notifications for the host app.
+
+## Requirements
+
+* Runtime: macOS 10.13 or greater for 2.3, macOS 10.11 or greater for 2.2.x
+* Build: Latest major Xcode (stable or beta, whichever is latest) and one major version less.
+* HTTPS server for serving updates (see App Transport Security(http://sparkle-project.org/documentation/app-transport-security/))
+
+## Usage
+
+See getting started guide(https://sparkle-project.org/documentation/). No code is necessary, but a bit of configuration is required.
+
+### Troubleshooting
+
+ * Please check **Console.app** for logs under your application. Sparkle prints detailed information there about all problems it encounters. It often also suggests solutions to the problems, so please read Sparkle's log messages carefully.
+
+ * Use the `generate_appcast` tool which creates appcast files, correct signatures, and delta updates automatically.
+
+ * Make sure the URL specified in `SUFeedURL`(https://sparkle-project.org/documentation/customization/) is valid (typos/404s are a common error!), and that it uses modern TLS (test it(https://www.ssllabs.com/ssltest/)).
+
+### API symbols
+
+Sparkle is built with `-fvisibility=hidden -fvisibility-inlines-hidden` which means no symbols are exported by default.
+If you are adding a symbol to the public API you must decorate the declaration with the `SU_EXPORT` macro (grep the source code for examples).
+
+### Building the distribution package
+
+You do not usually need to build a Sparkle distribution unless you're making changes to Sparkle itself.
+
+To build a Sparkle distribution, `cd` to the root of the Sparkle source tree and run `make release`. Sparkle-*VERSION*.tar.xz (or .bz2) will be created in a temporary directory and revealed in Finder after the build has completed.
+
+Alternatively, build the Distribution scheme in the Xcode UI.
+
+### Code of Conduct
+
+We pledge to have an open and welcoming environment. See our Code of Conduct(CODE_OF_CONDUCT.md).

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/Contents.json Added

@@ -0,0 +1,68 @@
+{
+  "images" : 
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "16x16",
+      "idiom" : "mac",
+      "filename" : "icon_16x16@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "32x32",
+      "idiom" : "mac",
+      "filename" : "icon_32x32@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "128x128",
+      "idiom" : "mac",
+      "filename" : "icon_128x128@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "256x256",
+      "idiom" : "mac",
+      "filename" : "icon_256x256@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "512x512",
+      "idiom" : "mac",
+      "filename" : "icon_512x512@2x.png",
+      "scale" : "2x"
+    }
+  ,
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_256x256.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_512x512.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/ReleaseNotesColorStyle.css Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/SampleAppcast.xml Added

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <channel>
+ <title>Your Great App's Changelog</title>
+ <description>Most recent changes with links to updates.</description>
+ <language>en</language>
+ <item>
+ <title>Version 2.0 (2 bugs fixed; 3 new features)</title>
+ <link>https://sparkle-project.org</link>
+ <sparkle:version>2.0</sparkle:version>
+ <sparkle:releaseNotesLink>
+ https://you.com/app/2.0.html
+ </sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>
+ https://you.com/app/changelog.php
+ </sparkle:fullReleaseNotesLink>
+ <pubDate>Wed, 09 Jan 2006 19:20:11 +0000</pubDate>
+ <enclosure url="https://you.com/app/Your%20Great%20App%202.0.zip" length="1623481" type="application/octet-stream" sparkle:edSignature="WVyVJpOx+a5+vNWJVY79TRjFKveNk+VhGJf2iti4CZtJsJewIUGvh/1AKKEAFbH1qUwx+vro1ECuzOsMmumoBA==" />
+ <sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
+ </item>
+
+ <item>
+ <title>Version 1.5 (8 bugs fixed; 2 new features)</title>
+ <link>https://sparkle-project.org</link>
+ <sparkle:version>1.5</sparkle:version>
+ <sparkle:releaseNotesLink>
+ https://you.com/app/1.5.html
+ </sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>
+ https://you.com/app/changelog.php?up-to=1.5
+ </sparkle:fullReleaseNotesLink>
+ <pubDate>Wed, 01 Jan 2006 12:20:11 +0000</pubDate>
+ <enclosure url="https://you.com/app/Your%20Great%20App%201.5.zip" length="1472893" type="application/octet-stream" sparkle:edSignature="pNFd7KbcQSu+Mq7UYrbQXTPq82luht2ACXm/r2utp1u/Uv/5hWqctdT2jwQgMejW7DRoeV/hVr6J4VdZYdwWDw==" />
+ <sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
+ </item>
+
+ 
+ <item>
+ <title>Version 1.4 (5 bugs fixed; 2 new features)</title>
+ <link>https://sparkle-project.org</link>
+ <sparkle:releaseNotesLink>
+ https://you.com/app/1.4.html
+ </sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>
+ https://you.com/app/changelog.php?up-to=1.4
+ </sparkle:fullReleaseNotesLink>
+ <sparkle:version>241</sparkle:version>
+ <sparkle:shortVersionString>1.4</sparkle:shortVersionString>
+ <pubDate>Wed, 25 Dec 2005 12:20:11 +0000</pubDate>
+ <enclosure url="https://you.com/app/Your%20Great%20App%201.4.zip" sparkle:edSignature="Ody3D/ybSMH4T+P/oNj3LN4F0SA8RJGLEr1TI4UemrBAiJ9aEcDnYV3u58P75AbcFjI13jPYmHDUHXMSTFQbDw==" length="1472349" type="application/octet-stream" />
+ <sparkle:minimumSystemVersion>10.13</sparkle:minimumSystemVersion>
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Screenshot.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Screenshot2.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Screenshot3.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Resources/Sparkle-Icon.sketch Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.podspec Added

@@ -0,0 +1,33 @@
+Pod::Spec.new do |s|
+  s.name        = "Sparkle"
+  s.version     = "2.3.0"
+  s.summary     = "A software update framework for macOS"
+  s.description = "Sparkle is an easy-to-use software update framework for macOS."
+  s.homepage    = "https://sparkle-project.org"
+  s.documentation_url = "https://sparkle-project.org/documentation/"
+  s.screenshot  = "https://sparkle-project.org/images/screenshot-noshadow@2x.png"
+  s.license     = {
+    :type => 'MIT',
+    :file => 'LICENSE'
+  }
+  s.authors     = {
+    'Zorg' => 'zorgiepoo@gmail.com',
+    'Kornel Lesiński' => 'pornel@pornel.net',
+    'Jake Petroules' => 'jake.petroules@petroules.com',
+    'C.W. Betts' => 'computers57@hotmail.com',
+    'Andy Matuschak' => 'andy@andymatuschak.org',
+  }
+
+  s.platform = :osx, '10.13'
+  s.source   = { :http => "https://github.com/sparkle-project/Sparkle/releases/download/#{s.version}/Sparkle-#{s.version}.tar.xz" }
+  s.source_files = 'Sparkle.framework/Versions/B/Headers/*.h'
+
+  s.preserve_paths = 'bin/*', 'Entitlements', 'Symbols'
+  s.public_header_files = 'Sparkle.framework/Versions/B/Headers/*.h'
+  s.vendored_frameworks  = 'Sparkle.framework'
+  s.xcconfig            = {
+    'FRAMEWORK_SEARCH_PATHS' => '"${PODS_ROOT}/Sparkle"',
+    'LD_RUNPATH_SEARCH_PATHS' => '@loader_path/../Frameworks'
+  }
+  s.requires_arc        = true
+end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.pbxproj Added

@@ -0,0 +1,4756 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 54;
+	objects = {
+
+/* Begin PBXAggregateTarget section */
+		1495005F195FB89400BC5B5B /* All */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 14950060195FB89500BC5B5B /* Build configuration list for PBXAggregateTarget "All" */;
+			buildPhases = (
+			);
+			dependencies = (
+				14950064195FB8A600BC5B5B /* PBXTargetDependency */,
+				14950066195FB8A600BC5B5B /* PBXTargetDependency */,
+				14950068195FB8A600BC5B5B /* PBXTargetDependency */,
+				1495006A195FB8A600BC5B5B /* PBXTargetDependency */,
+				7205C4691E1306FB00E370AE /* PBXTargetDependency */,
+			);
+			name = All;
+			productName = All;
+		};
+		895C5DC024D78E210058A82D /* XCFrameworks */ = {
+			isa = PBXAggregateTarget;
+			buildConfigurationList = 895C5DC424D78E210058A82D /* Build configuration list for PBXAggregateTarget "XCFrameworks" */;
+			buildPhases = (
+				895C5DC524D78E460058A82D /* ShellScript */,
+			);
+			dependencies = (
+				72EF30B926747E39008CE987 /* PBXTargetDependency */,
+			);
+			name = XCFrameworks;
+			productName = Sparkle.xcframework;
+		};
+/* End PBXAggregateTarget section */
+
+/* Begin PBXBuildFile section */
+		1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; };
+		142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */; };
+		14652F8019A9740F00959E44 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
+		14652F8219A9746000959E44 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		14652F8419A978C200959E44 /* SUExport.h in Headers */ = {isa = PBXBuildFile; fileRef = 14652F8319A9759F00959E44 /* SUExport.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		14732BD019610A0D00593899 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+		14732BD119610A1200593899 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+		14732BD319610A1800593899 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14732BD219610A1800593899 /* XCTest.framework */; };
+		1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+		14950072195FCE4B00BC5B5B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+		14950073195FCE4E00BC5B5B /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
+		14958C6E19AEBC950061B14F /* signed-test-file.txt in Resources */ = {isa = PBXBuildFile; fileRef = 14958C6B19AEBC530061B14F /* signed-test-file.txt */; };
+		14958C6F19AEBC980061B14F /* test-pubkey.pem in Resources */ = {isa = PBXBuildFile; fileRef = 14958C6C19AEBC610061B14F /* test-pubkey.pem */; };
+		1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */ = {isa = PBXBuildFile; fileRef = 1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */; };
+		3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		55C14BEF136EF21700649790 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
+		55C14F06136EF6DB00649790 /* SULog.h in Headers */ = {isa = PBXBuildFile; fileRef = 55C14F04136EF6DB00649790 /* SULog.h */; };
+		55C14F07136EF6DB00649790 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */ = {isa = PBXBuildFile; fileRef = 55E6F33219EC9F6C00005E76 /* SUErrors.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		5A06357023FE332300478A72 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		5A06357323FE333600478A72 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		5A06357423FE33A400478A72 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		5A4094481C74EA5200983BE0 /* SUAppcastTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AA4DCD01C73E5510078F128 /* SUAppcastTest.swift */; };
+		5A5DD401249585E70045EB3E /* SUUpdateValidatorTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */; };
+		5A5DD402249586840045EB3E /* SUUpdateValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */; };
+		5A5DD40424958B000045EB3E /* SUUpdateValidatorTest in Resources */ = {isa = PBXBuildFile; fileRef = 5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */; };
+		5A5DD41D249F116E0045EB3E /* test-relative-urls.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */; };
+		5A6DD17123FE1FFC000AEF33 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
+		5AA89BA523FE27660094DAB8 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
+		5AA89BA623FE276A0094DAB8 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
+		5AD0FA7F1C73F2E2004BCEFF /* testappcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */; };
+		5AE459001C34118500E3BB47 /* SUUpdaterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 14950074195FDF5900BC5B5B /* SUUpdaterTest.m */; };
+		5AE459021C34118500E3BB47 /* SUVersionComparisonTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */; };
+		5AF6C74F1AEA46D10014A3AB /* test.pkg in Resources */ = {isa = PBXBuildFile; fileRef = 5AF6C74E1AEA46D10014A3AB /* test.pkg */; };
+		5AF6C7541AEA49840014A3AB /* SUInstallerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */; };
+		5AF9DC3C1981DBEE001EA135 /* SUSignatureVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */; };
+		5D06E8FF0FD68D6D005AE3F6 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */; };
+		5D06E9050FD68D7D005AE3F6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+		5D1AF58B0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */; };
+		5D1AF5900FD767AD0065DB48 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */; };
+		5D1AF59A0FD767E50065DB48 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5990FD767E50065DB48 /* libz.dylib */; };
+		5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */ = {isa = PBXBuildFile; fileRef = 5F1510A11C96E591006E1629 /* testnamespaces.xml */; };
+		61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 61299A5B09CA6D4500B7442F /* SUConstants.h */; };
+		61299A6009CA6EB100B7442F /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		61299B3609CB04E000B7442F /* Sparkle.h in Headers */ = {isa = PBXBuildFile; fileRef = 61299B3509CB04E000B7442F /* Sparkle.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		612DCBB00D488BC60015DBEA /* SUUpdatePermissionPrompt.m in Sources */ = {isa = PBXBuildFile; fileRef = 612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */; };
+		6196CFF909C72148000DC222 /* SUStatusController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6196CFE309C71ADE000DC222 /* SUStatusController.h */; settings = {ATTRIBUTES = (); }; };
+		6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6196CFE409C71ADE000DC222 /* SUStatusController.m */; };
+		61A2259E0D1C495D00430CCD /* SUVersionComparisonProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
+		61A2279C0D1CEE7600430CCD /* SUSystemProfiler.h in Headers */ = {isa = PBXBuildFile; fileRef = 61A2279A0D1CEE7600430CCD /* SUSystemProfiler.h */; settings = {ATTRIBUTES = (); }; };
+		61A2279D0D1CEE7600430CCD /* SUSystemProfiler.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */; };
+		61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61AAE8220A321A7F00D8810D /* Sparkle.strings */; };
+		61B5F8ED09C4CE3C00B25A18 /* SPUUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B5F8E309C4CE3C00B25A18 /* SPUUpdater.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		61B5F8EE09C4CE3C00B25A18 /* SPUUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5F8E409C4CE3C00B25A18 /* SPUUpdater.m */; };
+		61B5F90F09C4CF3A00B25A18 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; };
+		61B5F93009C4CFDC00B25A18 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5F92409C4CFC900B25A18 /* main.m */; };
+		61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FB9509C4F04600B25A18 /* SUAppcast.m */; };
+		61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B5FB9409C4F04600B25A18 /* SUAppcast.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		61B5FC6F09C51F4900B25A18 /* SUAppcastItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FC5409C5182000B25A18 /* SUAppcastItem.m */; };
+		61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B5FC5309C5182000B25A18 /* SUAppcastItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		61B5FCDE09C52A9F00B25A18 /* SUUpdateAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FCA109C5228F00B25A18 /* SUUpdateAlert.m */; };
+		61B5FCDF09C52A9F00B25A18 /* SUUpdateAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = 61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */; settings = {ATTRIBUTES = (); }; };
+		61EF67560E25B58D00F754E0 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
+		61EF67590E25C5B400F754E0 /* SUHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 61EF67580E25C5B400F754E0 /* SUHost.h */; };
+		7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */; };
+		72045CE026FEE535004F96E5 /* Downloader.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 726E07EF1CAF37BD001A286B /* Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		72045CE126FEE535004F96E5 /* InstallerConnection.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		72045CE226FEE535004F96E5 /* Installer.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 726E07AD1CAF08D6001A286B /* Installer.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		72045CE326FEE535004F96E5 /* InstallerStatus.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 724BB3931D333832005D534A /* InstallerStatus.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		720595EF1D700568000572E8 /* SUApplicationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 725602D41C83551C00DAA70E /* SUApplicationInfo.m */; };
+		7205C4411E13049400E370AE /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4401E13049400E370AE /* main.swift */; };
+		7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4471E1304CE00E370AE /* Appcast.swift */; };
+		7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4481E1304CE00E370AE /* ArchiveItem.swift */; };
+		7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4491E1304CE00E370AE /* Signatures.swift */; };
+		7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44A1E1304CE00E370AE /* FeedXML.swift */; };
+		7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44B1E1304CE00E370AE /* Unarchive.swift */; };
+		7205C4561E13060D00E370AE /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
+		7205C4571E13061F00E370AE /* SUUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */; };
+		7205C4581E13061F00E370AE /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
+		7205C4591E13062500E370AE /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
+		7205C45A1E13063E00E370AE /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */; };
+		7205C45B1E13064C00E370AE /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */; };
+		7205C45C1E13065800E370AE /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		7205C45D1E13065F00E370AE /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		7205C45E1E13066800E370AE /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7205C45F1E13066F00E370AE /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
+		7205C4611E13069000E370AE /* SUBinaryDeltaCreate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */; };
+		7205C4621E1306A600E370AE /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
+		7205C4631E1306B500E370AE /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E07681CA616A4001A286B /* libxar.tbd */; };
+		7205C4641E1306BE00E370AE /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E076A1CA616B3001A286B /* libbz2.tbd */; };
+		720AC2A42618E85700E25A3E /* SPUInstallationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */; };
+		720AC2C92618E89500E25A3E /* SUAppcastItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FC5409C5182000B25A18 /* SUAppcastItem.m */; };
+		720AC2DC2618E8A500E25A3E /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
+		720B16451C66433D006985FB /* SUTestApplicationTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 720B16431C66433D006985FB /* SUTestApplicationTest.swift */; };
+		720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */ = {isa = PBXBuildFile; fileRef = 720DC50327A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml */; };
+		720DC50627A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml in Resources */ = {isa = PBXBuildFile; fileRef = 720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */; };
+		720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */; };
+		720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */; };
+		7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */; };
+		7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B87F1D456A8500CB5CED /* SUBundleIcon.h */; };
+		7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
+		7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
+		7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
+		72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 72162B071C82C9600013C1C5 /* SULocalizations.h */; };
+		721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */; };
+		721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
+		721BC2101D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
+		721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; };
+		721C245C1CB7576E005440CB /* SUStatusController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6196CFE409C71ADE000DC222 /* SUStatusController.m */; };
+		721C245E1CB757DE005440CB /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		721C24611CB75C5D005440CB /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
+		721C24621CB75C68005440CB /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		721CF1AA1AD7647000D9AC09 /* libxar.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */; };
+		721CF1AB1AD764EB00D9AC09 /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */; };
+		721D588D25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 721D588B25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.h */; };
+		721D588F25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 721D588C25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m */; };
+		721D5A8525C65D3F00D23BEA /* SUFlatPackageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 721D5A8425C65D3F00D23BEA /* SUFlatPackageUnarchiver.m */; };
+		721D5ABC25C680A300D23BEA /* SUFlatPackageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 721D5A8425C65D3F00D23BEA /* SUFlatPackageUnarchiver.m */; };
+		721D5B1B25C692BB00D23BEA /* SUFlatPackageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 721D5A8425C65D3F00D23BEA /* SUFlatPackageUnarchiver.m */; };
+		721D8A611D48413B0032E472 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
+		721D8A7B1D4963190032E472 /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
+		721D8A861D4ADFEB0032E472 /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
+		721D8A871D4C5BF10032E472 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */ = {isa = PBXBuildFile; fileRef = 722545B526805FF80036465C /* testappcast_info_updates.xml */; };
+		7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */; };
+		7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */; };
+		7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */; };
+		7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */; };
+		7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */; };
+		722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		722FB7E5260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
+		722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
+		72316BD31E0DA8430039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
+		72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
+		723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */; };
+		723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */; };
+		723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */; };
+		723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABE00259A9E9E00BDB4FA /* MainMenu.xib */; };
+		723ABF1B259D055E00BDB4FA /* SUWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 723ABF1A259D055E00BDB4FA /* SUWebView.h */; };
+		723ABF30259D062F00BDB4FA /* SULegacyWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 723ABF2E259D062F00BDB4FA /* SULegacyWebView.h */; };
+		723ABF31259D062F00BDB4FA /* SULegacyWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 723ABF2F259D062F00BDB4FA /* SULegacyWebView.m */; };
+		723ABFC4259D4CB300BDB4FA /* SUWKWebView.h in Headers */ = {isa = PBXBuildFile; fileRef = 723ABFC2259D4CB300BDB4FA /* SUWKWebView.h */; };
+		723ABFC5259D4CB300BDB4FA /* SUWKWebView.m in Sources */ = {isa = PBXBuildFile; fileRef = 723ABFC3259D4CB300BDB4FA /* SUWKWebView.m */; };
+		723AC010259DBDAA00BDB4FA /* SUWebViewCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 723AC00E259DBDAA00BDB4FA /* SUWebViewCommon.h */; };
+		723AC011259DBDAA00BDB4FA /* SUWebViewCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 723AC00F259DBDAA00BDB4FA /* SUWebViewCommon.m */; };
+		723B5DA71CF7AB0100365F95 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 723B5DA01CF7AB0100365F95 /* main.m */; };
+		723B5DA91CF7AB0100365F95 /* SPUDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 723B5DA31CF7AB0100365F95 /* SPUDownloader.m */; };
+		723B5DAA1CF7AB6A00365F95 /* SPUDownloader.m in Sources */ = {isa = PBXBuildFile; fileRef = 723B5DA31CF7AB0100365F95 /* SPUDownloader.m */; };
+		723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 723C8A521E2D60DB00C14942 /* SUTouchBarButtonGroup.h */; };
+		723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
+		723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
+		723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */; };
+		72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		72464F711E1F326A00FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		72464F721E1F327C00FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
+		7246E0A31C83B685003B4E75 /* SPUStandardUpdaterController.h in Headers */ = {isa = PBXBuildFile; fileRef = 7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		7246E0A41C83B685003B4E75 /* SPUStandardUpdaterController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7246E0A21C83B685003B4E75 /* SPUStandardUpdaterController.m */; };
+		724BB3711D31D0B7005D534A /* SUInstallerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3701D31D0B7005D534A /* SUInstallerConnection.m */; };
+		724BB3731D31D0B7005D534A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3721D31D0B7005D534A /* main.m */; };
+		724BB3871D32A167005D534A /* SUXPCInstallerConnection.h in Headers */ = {isa = PBXBuildFile; fileRef = 724BB3851D32A167005D534A /* SUXPCInstallerConnection.h */; };
+		724BB3881D32A167005D534A /* SUXPCInstallerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3861D32A167005D534A /* SUXPCInstallerConnection.m */; };
+		724BB3891D32B915005D534A /* SUInstallerConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3701D31D0B7005D534A /* SUInstallerConnection.m */; };
+		724BB3981D333832005D534A /* SUInstallerStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3971D333832005D534A /* SUInstallerStatus.m */; };
+		724BB39A1D333832005D534A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3991D333832005D534A /* main.m */; };
+		724BB3A81D33461B005D534A /* SUXPCInstallerStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 724BB3A61D33461B005D534A /* SUXPCInstallerStatus.h */; };
+		724BB3A91D33461B005D534A /* SUXPCInstallerStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3A71D33461B005D534A /* SUXPCInstallerStatus.m */; };
+		724BB3AA1D3347C2005D534A /* SUInstallerStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3971D333832005D534A /* SUInstallerStatus.m */; };
+		724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
+		724F76F91D6EAD0D00ECD062 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; };
+		725264A91D5FBD9100CD6400 /* Sparkle.strings in Resources */ = {isa = PBXBuildFile; fileRef = 61AAE8220A321A7F00D8810D /* Sparkle.strings */; };
+		725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 725602D31C83551C00DAA70E /* SUApplicationInfo.h */; };
+		725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 725602D41C83551C00DAA70E /* SUApplicationInfo.m */; };
+		725B3A82263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml in Resources */ = {isa = PBXBuildFile; fileRef = 725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */; };
+		725B81FA2781AEAF0041746F /* libcompression.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 725B81F92781AEA40041746F /* libcompression.tbd */; };
+		725B81FB2781CD930041746F /* libcompression.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 725B81F92781AEA40041746F /* libcompression.tbd */; };
+		725B81FC2781CDC20041746F /* libcompression.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 725B81F92781AEA40041746F /* libcompression.tbd */; };
+		725C2EAA2782EC61007CB7B5 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 725C2EA92782EC61007CB7B5 /* main.swift */; };
+		725C2EAC2782EF3C007CB7B5 /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 725C2EAB2782EF3C007CB7B5 /* ArgumentParser */; };
+		725CB9571C7120410064365A /* SPUUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9561C7120410064365A /* SPUUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9581C7121830064365A /* SPUStandardUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725CB9591C7121830064365A /* SPUStandardUserDriver.m */; };
+		725EE480277BF13B00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
+		725EE482277BF44A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
+		725EE483277C767A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
+		725EE486277D375F00D820CE /* SPUDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE485277D375F00D820CE /* SPUDeltaArchive.m */; };
+		725EE487277D376000D820CE /* SPUDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE485277D375F00D820CE /* SPUDeltaArchive.m */; };
+		725EE488277D398100D820CE /* SPUDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE485277D375F00D820CE /* SPUDeltaArchive.m */; };
+		725EE489277D39B400D820CE /* SPUDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE485277D375F00D820CE /* SPUDeltaArchive.m */; };
+		725EE48A277D39B400D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
+		725F97771C8A62F500265BE4 /* SUAdHocCodeSigning.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97751C8A62F500265BE4 /* SUAdHocCodeSigning.m */; };
+		725F97781C8A65AC00265BE4 /* SUAdHocCodeSigning.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97751C8A62F500265BE4 /* SUAdHocCodeSigning.m */; };
+		725F97841C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97831C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m */; };
+		725F97A51C8B304D00265BE4 /* SUInstallUpdateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */; };
+		725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */; };
+		7267E5751D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
+		7267E5761D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
+		7267E5771D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
+		7267E5781D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
+		7267E5791D3D895B00D1BF90 /* SUBinaryDeltaCreate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */; };
+		7267E57A1D3D895B00D1BF90 /* SUBinaryDeltaCreate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */; };
+		7267E57F1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */; };
+		7267E5861D3D89B300D1BF90 /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */; };
+		7267E5871D3D89B300D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
+		7267E5881D3D89B300D1BF90 /* SUUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */; };
+		7267E59C1D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
+		7267E59D1D3D8A5A00D1BF90 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
+		7267E59F1D3D8A6F00D1BF90 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59E1D3D8A6F00D1BF90 /* main.m */; };
+		7267E5A21D3D8A7E00D1BF90 /* AppInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5A11D3D8A7E00D1BF90 /* AppInstaller.m */; };
+		7267E5A81D3D8A9900D1BF90 /* AgentConnection.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5A71D3D8A9900D1BF90 /* AgentConnection.m */; };
+		7267E5AB1D3D8AA800D1BF90 /* TerminationListener.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5AA1D3D8AA800D1BF90 /* TerminationListener.m */; };
+		7267E5AE1D3D8AB700D1BF90 /* SPUInstallationInputData.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5AD1D3D8AB700D1BF90 /* SPUInstallationInputData.m */; };
+		7267E5B11D3D8AD500D1BF90 /* SPUMessageTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5AF1D3D8AD500D1BF90 /* SPUMessageTypes.h */; };
+		7267E5B21D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */; };
+		7267E5B31D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */; };
+		7267E5B61D3D8AEE00D1BF90 /* SPUInstallationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5B41D3D8AEE00D1BF90 /* SPUInstallationInfo.h */; };
+		7267E5B71D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */; };
+		7267E5B81D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */; };
+		7267E5C21D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
+		7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */; };
+		7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
+		7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
+		7267E5C91D3D8C4300D1BF90 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
+		7267E5CA1D3D8C4800D1BF90 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
+		7267E5CB1D3D8C6400D1BF90 /* SUAppcastItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 61B5FC5409C5182000B25A18 /* SUAppcastItem.m */; };
+		7267E5CC1D3D8C6B00D1BF90 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		7267E5CD1D3D8C7200D1BF90 /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
+		7267E5CE1D3D8C7500D1BF90 /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		7267E5D51D3D8D2800D1BF90 /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E07681CA616A4001A286B /* libxar.tbd */; };
+		7267E5D61D3D8D3500D1BF90 /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E076A1CA616B3001A286B /* libbz2.tbd */; };
+		7267E5D71D3D8D3F00D1BF90 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
+		7267E5D81D3D8D4400D1BF90 /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
+		7267E5DC1D3D8F1E00D1BF90 /* SPUMessageTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */; };
+		7267E5DF1D3D8FFA00D1BF90 /* SPUInstallationInputData.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5AD1D3D8AB700D1BF90 /* SPUInstallationInputData.m */; };
+		7267E5E11D3D901600D1BF90 /* SPUMessageTypes.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */; };
+		7267E5E51D3D90AA00D1BF90 /* SUFileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5E31D3D90AA00D1BF90 /* SUFileManager.h */; };
+		7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7267E5E71D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7267E5EA1D3D90AA00D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		7267E5EC1D3D912900D1BF90 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */; };
+		7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */; };
+		7267E5EE1D3D915900D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
+		7267E5EF1D3D915900D1BF90 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
+		7267E5F01D3D915900D1BF90 /* SUBinaryDeltaCreate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */; };
+		7267E5F11D3D917A00D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */; };
+		7267E5F21D3D918000D1BF90 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
+		7267E5F41D3D918B00D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
+		7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
+		7267E5F61D3D919000D1BF90 /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */; };
+		7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
+		7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
+		7267E5F91D3D92DA00D1BF90 /* Autoupdate in Copy Tools */ = {isa = PBXBuildFile; fileRef = 72B398D21D3D879300EE297F /* Autoupdate */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5A41D3D8A8A00D1BF90 /* StatusInfo.m */; };
+		7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */; };
+		7269E494264798200088C213 /* SPUSkippedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7269E492264798200088C213 /* SPUSkippedUpdate.h */; };
+		7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
+		7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
+		7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E4992648F7C00088C213 /* SPUUserUpdateState.m */; };
+		726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */ = {isa = PBXBuildFile; fileRef = 726DF88D1C84277500188804 /* SPUUserUpdateState.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */; };
+		726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
+		726E078D1CA891E9001A286B /* SPUUpdaterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E078B1CA891E9001A286B /* SPUUpdaterSettings.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		726E078E1CA891E9001A286B /* SPUUpdaterSettings.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E078C1CA891E9001A286B /* SPUUpdaterSettings.m */; };
+		726E07B21CAF08D6001A286B /* SUInstallerLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E07B11CAF08D6001A286B /* SUInstallerLauncher.m */; };
+		726E07B41CAF08D6001A286B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E07B31CAF08D6001A286B /* main.m */; };
+		726E07BF1CAF0C6C001A286B /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		726E07C01CAF15B7001A286B /* SULog.m in Sources */ = {isa = PBXBuildFile; fileRef = 55C14F05136EF6DB00649790 /* SULog.m */; };
+		726E4A1B1C86C88F00C57C6A /* TestAppHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E4A1A1C86C88F00C57C6A /* TestAppHelper.m */; };
+		726E4A1D1C86C88F00C57C6A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E4A1C1C86C88F00C57C6A /* main.m */; };
+		726E4A211C86C88F00C57C6A /* TestAppHelper.xpc in Embed XPC Services */ = {isa = PBXBuildFile; fileRef = 726E4A161C86C88F00C57C6A /* TestAppHelper.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		726E4A2B1C87D56200C57C6A /* SUTestWebServer.m in Sources */ = {isa = PBXBuildFile; fileRef = A5BF4F1C1BC7668B007A052A /* SUTestWebServer.m */; };
+		726E4A301C87DC1700C57C6A /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; };
+		726E4A371C89116000C57C6A /* SPUStandardUserDriverDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E4A361C89116000C57C6A /* SPUStandardUserDriverDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		726F168626747CEB005BEA89 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; };
+		726F168726747CEB005BEA89 /* Sparkle.framework in Copy Sparkle */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		726F2CE51BC9C33D001971A4 /* SUOperatingSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 726F2CE31BC9C33D001971A4 /* SUOperatingSystem.h */; };
+		726F2CE61BC9C33D001971A4 /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		726F2CE81BC9C48F001971A4 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		726F2CE91BC9C499001971A4 /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		726F2CEB1BC9C733001971A4 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		727DBAE526B5BBFD00111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE426B5BBFD00111F0C /* ArgumentParser */; };
+		727DBAE726B5C47800111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE626B5C47800111F0C /* ArgumentParser */; };
+		727DBAE926B5C48A00111F0C /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 727DBAE826B5C48A00111F0C /* ArgumentParser */; };
+		727F340B2605321D00020E85 /* SULog+NSError.m in Sources */ = {isa = PBXBuildFile; fileRef = 727F340A2605321D00020E85 /* SULog+NSError.m */; };
+		727F340D2605321D00020E85 /* SULog+NSError.m in Sources */ = {isa = PBXBuildFile; fileRef = 727F340A2605321D00020E85 /* SULog+NSError.m */; };
+		727F340E2605321D00020E85 /* SULog+NSError.m in Sources */ = {isa = PBXBuildFile; fileRef = 727F340A2605321D00020E85 /* SULog+NSError.m */; };
+		728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */; };
+		728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */; };
+		728638ED1CAF50CE00783084 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
+		728ED34A277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
+		728ED34B277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
+		728ED34C277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
+		728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
+		729051E41DC82AC0003DEA7F /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
+		729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
+		729924941DF4A45000DBCDF5 /* SUUpdateValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */; };
+		729F7EAC27366353004592DC /* test-links.xml in Resources */ = {isa = PBXBuildFile; fileRef = 729F7EAB27366353004592DC /* test-links.xml */; };
+		729F7EAF273F1840004592DC /* SPUUserAgent+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */; };
+		729F7ECE27409077004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip in Resources */ = {isa = PBXBuildFile; fileRef = 729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */; };
+		72A1C2631CD6849C004CD282 /* SUUpdatePermissionPrompt.h in Headers */ = {isa = PBXBuildFile; fileRef = 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */; };
+		72A450531C69A68900D67EEA /* SUUpdatePermissionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72A450541C69A68900D67EEA /* SUUpdatePermissionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */; };
+		72A4A2401BB6567D00E7820D /* SUFileManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */; };
+		72A6F98A1C94E2D6005F404C /* SUUpdaterDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A6F9891C94E2D6005F404C /* SUUpdaterDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72AC6B261B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz in Resources */ = {isa = PBXBuildFile; fileRef = 72AC6B251B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz */; };
+		72AC6B281B9AAD6700F62325 /* SparkleTestCodeSignApp.tar in Resources */ = {isa = PBXBuildFile; fileRef = 72AC6B271B9AAD6700F62325 /* SparkleTestCodeSignApp.tar */; };
+		72AC6B2A1B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 in Resources */ = {isa = PBXBuildFile; fileRef = 72AC6B291B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 */; };
+		72AC6B2C1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz in Resources */ = {isa = PBXBuildFile; fileRef = 72AC6B2B1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz */; };
+		72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72AC6B2D1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg */; };
+		72B3DEC91E23472200457642 /* SPUDownloadedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */; };
+		72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */; };
+		72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */; };
+		72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */; };
+		72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767C81C9B707000A07552 /* SUAppcastDriver.h */; };
+		72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767C91C9B707000A07552 /* SUAppcastDriver.m */; };
+		72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */; };
+		72B767CF1C9B924900A07552 /* SPUInstallerDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */; };
+		72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */; };
+		72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */; };
+		72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */; };
+		72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */; };
+		72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */; };
+		72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */; };
+		72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */; };
+		72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */; };
+		72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */; };
+		72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */; };
+		72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */; };
+		72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
+		72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
+		72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */; };
+		72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */; };
+		72D60CD928C2BAE900189AB8 /* SPUStandardUserDriver+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72D60CD828C2BA2100189AB8 /* SPUStandardUserDriver+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		72D954811CBACC35006F28BD /* InstallerProgressAppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D954801CBACC35006F28BD /* InstallerProgressAppController.m */; };
+		72D954831CBAD34F006F28BD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D954821CBAD34F006F28BD /* main.m */; };
+		72D954A21CBB415C006F28BD /* SPUCommandLineDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D954A11CBB415C006F28BD /* SPUCommandLineDriver.m */; };
+		72D954A51CBB415C006F28BD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D954A41CBB415C006F28BD /* main.m */; };
+		72D954B81CBB467F006F28BD /* SPUCommandLineUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D954B71CBB467F006F28BD /* SPUCommandLineUserDriver.m */; };
+		72DBA37D1D60CC34002594A8 /* SPUUpdatePermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 72DBA37B1D60CC34002594A8 /* SPUUpdatePermissionRequest.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72DBA37E1D60CC34002594A8 /* SPUUpdatePermissionRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 72DBA37C1D60CC34002594A8 /* SPUUpdatePermissionRequest.m */; };
+		72DBA37F1D62C23E002594A8 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
+		72E45CF31B640CDD005C701A /* SUTestApplicationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72E45CF21B640CDD005C701A /* SUTestApplicationDelegate.m */; };
+		72E45CF71B640DAE005C701A /* SUUpdateSettingsWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */; };
+		72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */; };
+		72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = 72E45CFB1B641961005C701A /* sparkletestcast.xml */; };
+		72E539121D68C3FA0092CE5E /* SPUDownloadData.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */; };
+		72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
+		72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */ = {isa = PBXBuildFile; fileRef = 721C24451CB753E6005440CB /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */ = {isa = PBXBuildFile; fileRef = 55C14BD8136EF00C00649790 /* SUStatus.xib */; };
+		72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72EF30BE2675CF38008CE987 /* SPUAppcastItemStateResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EF30BA2675CF38008CE987 /* SPUAppcastItemStateResolver.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		72EF30BF2675CF38008CE987 /* SPUAppcastItemState.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BB2675CF38008CE987 /* SPUAppcastItemState.m */; };
+		72EF30C02675CF38008CE987 /* SPUAppcastItemStateResolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BC2675CF38008CE987 /* SPUAppcastItemStateResolver.m */; };
+		72EF30C12675CF38008CE987 /* SPUAppcastItemState.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EF30BD2675CF38008CE987 /* SPUAppcastItemState.h */; };
+		72EF30C22675CF67008CE987 /* SPUAppcastItemState.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BB2675CF38008CE987 /* SPUAppcastItemState.m */; };
+		72EF30C32675CF67008CE987 /* SPUAppcastItemStateResolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BC2675CF38008CE987 /* SPUAppcastItemStateResolver.m */; };
+		72EF30C42675CFA1008CE987 /* SPUAppcastItemState.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BB2675CF38008CE987 /* SPUAppcastItemState.m */; };
+		72EF30C52675CFA1008CE987 /* SPUAppcastItemStateResolver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EF30BC2675CF38008CE987 /* SPUAppcastItemStateResolver.m */; };
+		72EF30C7267C716A008CE987 /* SUAppcastItem+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EF30C6267C716A008CE987 /* SUAppcastItem+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
+		72F0EC45278A55CA002A876A /* screenshot.png in Resources */ = {isa = PBXBuildFile; fileRef = 72F0EC44278A55CA002A876A /* screenshot.png */; };
+		72F0EC46278A5B87002A876A /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
+		72F0EC47278A5B87002A876A /* SUBinaryDeltaCreate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */; };
+		72F0EC48278A5B95002A876A /* SPUDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE485277D375F00D820CE /* SPUDeltaArchive.m */; };
+		72F0EC49278A5B95002A876A /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
+		72F0EC4A278A5B95002A876A /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
+		72F0EC4B278A5BB2002A876A /* libxar.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E07681CA616A4001A286B /* libxar.tbd */; };
+		72F0EC4C278A5BB9002A876A /* libbz2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 726E076A1CA616B3001A286B /* libbz2.tbd */; };
+		72F0EC4D278A5BCA002A876A /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
+		72F0EC4E278A73C6002A876A /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		72F94F581CC44DE1002DEE68 /* SPUXPCServiceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F94F561CC44DE1002DEE68 /* SPUXPCServiceInfo.h */; };
+		72F94F591CC44DE1002DEE68 /* SPUXPCServiceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F94F571CC44DE1002DEE68 /* SPUXPCServiceInfo.m */; };
+		72F94F5A1CC450DE002DEE68 /* SUInstallerLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E07B11CAF08D6001A286B /* SUInstallerLauncher.m */; };
+		72F9EBE21D517E2F004AC8B6 /* SUUpdater.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EBE01D517E2F004AC8B6 /* SUUpdater.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72F9EBE31D517E2F004AC8B6 /* SUUpdater.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EBE11D517E2F004AC8B6 /* SUUpdater.m */; };
+		72F9EC341D5BF542004AC8B6 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		72F9EC351D5BF54E004AC8B6 /* SUFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */; };
+		72F9EC3F1D5E823F004AC8B6 /* SPUUpdaterTimer.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC3D1D5E823F004AC8B6 /* SPUUpdaterTimer.h */; };
+		72F9EC401D5E823F004AC8B6 /* SPUUpdaterTimer.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC3E1D5E823F004AC8B6 /* SPUUpdaterTimer.m */; };
+		72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */; };
+		72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */ = {isa = PBXBuildFile; fileRef = C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */; };
+		EA1E281722B645AE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
+		EA1E281822B645CE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
+		EA1E281922B645D9004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
+		EA1E281A22B645F4004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
+		EA1E282122B64677004AA304 /* bscommon.c in Sources */ = {isa = PBXBuildFile; fileRef = 72B09CE91CEA18900052EF9E /* bscommon.c */; };
+		EA1E282222B64677004AA304 /* bsdiff.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */; };
+		EA1E282322B64677004AA304 /* bspatch.c in Sources */ = {isa = PBXBuildFile; fileRef = 5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */; };
+		EA1E282422B64677004AA304 /* sais.c in Sources */ = {isa = PBXBuildFile; fileRef = 7223E7611AD1AEFF008E3161 /* sais.c */; };
+		EA1E282622B64693004AA304 /* bscommon.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 72B09CEA1CEA18900052EF9E /* bscommon.h */; };
+		EA1E282722B64694004AA304 /* bspatch.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 611142E810FB1BE5009810AA /* bspatch.h */; };
+		EA1E282822B64694004AA304 /* sais.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 7223E7621AD1AEFF008E3161 /* sais.h */; };
+		EA1E284522B660ED004AA304 /* seed.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283522B660ED004AA304 /* seed.c */; };
+		EA1E284622B660ED004AA304 /* fe.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283622B660ED004AA304 /* fe.c */; };
+		EA1E284722B660ED004AA304 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283722B660ED004AA304 /* verify.c */; };
+		EA1E284822B660ED004AA304 /* ge.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283822B660ED004AA304 /* ge.c */; };
+		EA1E284922B660ED004AA304 /* sc.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283922B660ED004AA304 /* sc.c */; };
+		EA1E284A22B660ED004AA304 /* sign.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283A22B660ED004AA304 /* sign.c */; };
+		EA1E284B22B660ED004AA304 /* key_exchange.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283C22B660ED004AA304 /* key_exchange.c */; };
+		EA1E284C22B660ED004AA304 /* add_scalar.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E283D22B660ED004AA304 /* add_scalar.c */; };
+		EA1E284D22B660ED004AA304 /* keypair.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E284022B660ED004AA304 /* keypair.c */; };
+		EA1E284E22B660ED004AA304 /* sha512.c in Sources */ = {isa = PBXBuildFile; fileRef = EA1E284222B660ED004AA304 /* sha512.c */; };
+		EA1E284F22B66115004AA304 /* precomp_data.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283422B660ED004AA304 /* precomp_data.h */; };
+		EA1E285022B66115004AA304 /* sha512.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283B22B660ED004AA304 /* sha512.h */; };
+		EA1E285122B66115004AA304 /* ed25519.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283E22B660ED004AA304 /* ed25519.h */; };
+		EA1E285222B66115004AA304 /* fe.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E283F22B660ED004AA304 /* fe.h */; };
+		EA1E285322B66115004AA304 /* fixedint.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284122B660ED004AA304 /* fixedint.h */; };
+		EA1E285422B66115004AA304 /* sc.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284322B660ED004AA304 /* sc.h */; };
+		EA1E285522B66115004AA304 /* ge.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = EA1E284422B660ED004AA304 /* ge.h */; };
+		EA1E285622B6619B004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		EA1E286122B66487004AA304 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286022B66487004AA304 /* main.swift */; };
+		EA1E286A22B6653D004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		EA1E286E22B665F0004AA304 /* SUSignatures.h in Headers */ = {isa = PBXBuildFile; fileRef = EA1E286C22B665E8004AA304 /* SUSignatures.h */; };
+		EA1E287022B66621004AA304 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
+		EA1E287922B666EB004AA304 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E287822B666EB004AA304 /* main.swift */; };
+		EA1E287E22B66705004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
+		F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
+		F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */; };
+		F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */; };
+		FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */; };
+		FA30773F24CBC3E9007BA37D /* URL+Hashing.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		1454BA1519637EDB00344E57 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 61B5F90109C4CEE200B25A18;
+			remoteInfo = "Sparkle Test App";
+		};
+		14732BCA1960F73500593899 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		14732BCE1960F73500593899 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5D06E8CF0FD68C7C005AE3F6;
+			remoteInfo = BinaryDelta;
+		};
+		14950063195FB8A600BC5B5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		14950065195FB8A600BC5B5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 61B5F90109C4CEE200B25A18;
+			remoteInfo = "Sparkle Test App";
+		};
+		14950067195FB8A600BC5B5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 612279D80DB5470200AB99EA;
+			remoteInfo = "Sparkle Unit Tests";
+		};
+		14950069195FB8A600BC5B5B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 5D06E8CF0FD68C7C005AE3F6;
+			remoteInfo = BinaryDelta;
+		};
+		376769AE23442F320077B8F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E280E22B64522004AA304;
+			remoteInfo = bsdiff;
+		};
+		376769B023442F490077B8F7 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E280E22B64522004AA304;
+			remoteInfo = bsdiff;
+		};
+		37DC0CE52340667000501A67 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E280E22B64522004AA304;
+			remoteInfo = bsdiff;
+		};
+		5A06357123FE332300478A72 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E282C22B660BE004AA304;
+			remoteInfo = ed25519;
+		};
+		61B5F91B09C4CF7200B25A18 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		61FA528C0E2D9EB200EF58AD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		72045CD726FEE471004F96E5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07EE1CAF37BD001A286B;
+			remoteInfo = SparkleDownloader;
+		};
+		72045CD926FEE471004F96E5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB36B1D31D0B7005D534A;
+			remoteInfo = SparkleInstallerConnection;
+		};
+		72045CDB26FEE471004F96E5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07AC1CAF08D6001A286B;
+			remoteInfo = SparkleInstallerLauncher;
+		};
+		72045CDD26FEE471004F96E5 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB3921D333832005D534A;
+			remoteInfo = SparkleInstallerStatus;
+		};
+		7205C4681E1306FB00E370AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7205C43D1E13049400E370AE;
+			remoteInfo = generate_appcast;
+		};
+		7205C46A1E13070300E370AE /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 7205C43D1E13049400E370AE;
+			remoteInfo = generate_appcast;
+		};
+		7218EC322623ED94008FECF3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB36B1D31D0B7005D534A;
+			remoteInfo = SparkleInstallerConnection;
+		};
+		7218EC342623ED97008FECF3 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 724BB3921D333832005D534A;
+			remoteInfo = SparkleInstallerStatus;
+		};
+		725148E8266D918900247C9C /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07EE1CAF37BD001A286B;
+			remoteInfo = SparkleDownloader;
+		};
+		726B2B621C645FC900388755 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 61B5F90109C4CEE200B25A18;
+			remoteInfo = "Sparkle Test App";
+		};
+		726E4A1F1C86C88F00C57C6A /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E4A151C86C88F00C57C6A;
+			remoteInfo = TestAppHelper;
+		};
+		726F168826747CEB005BEA89 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		72A5D5AB1D6929260009E5AC /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 72B398D11D3D879300EE297F;
+			remoteInfo = Autoupdate;
+		};
+		72CCCC14287B3D1900E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		72CCCC16287B3D3400E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E280E22B64522004AA304;
+			remoteInfo = bsdiff;
+		};
+		72CCCC18287B3D3D00E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E282C22B660BE004AA304;
+			remoteInfo = ed25519;
+		};
+		72CCCC1A287B3D9000E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E282C22B660BE004AA304;
+			remoteInfo = ed25519;
+		};
+		72CCCC1C287B3D9600E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E282C22B660BE004AA304;
+			remoteInfo = ed25519;
+		};
+		72CCCC1E287B3DA100E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E282C22B660BE004AA304;
+			remoteInfo = ed25519;
+		};
+		72CCCC20287B3DA400E7156B /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E280E22B64522004AA304;
+			remoteInfo = bsdiff;
+		};
+		72D954B91CBB6E27006F28BD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 721C24441CB753E6005440CB;
+			remoteInfo = "Installer Progress";
+		};
+		72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 72D9549D1CBB415B006F28BD;
+			remoteInfo = "sparkle-cli";
+		};
+		72EF30B826747E39008CE987 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 8DC2EF4F0486A6940098B216;
+			remoteInfo = Sparkle;
+		};
+		72F94F6A1CC4A0C8002DEE68 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 726E07AC1CAF08D6001A286B;
+			remoteInfo = SparkleInstallerLauncher;
+		};
+		895C5DC624D78F700058A82D /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 895C5DC024D78E210058A82D;
+			remoteInfo = XCFrameworks;
+		};
+		FA344BA424C8699E00B2A401 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E287522B666EB004AA304;
+			remoteInfo = sign_update;
+		};
+		FA344BA624C869A300B2A401 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = EA1E285D22B66487004AA304;
+			remoteInfo = generate_keys;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		142E0E0119A6A13300E4312B /* Copy Files */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */,
+			);
+			name = "Copy Files";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		142E0E0319A6A24100E4312B /* Copy Tools */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 6;
+			files = (
+				7267E5F91D3D92DA00D1BF90 /* Autoupdate in Copy Tools */,
+				72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */,
+			);
+			name = "Copy Tools";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		61B5FB4D09C4E9FA00B25A18 /* Copy Frameworks */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */,
+			);
+			name = "Copy Frameworks";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72045CDF26FEE51D004F96E5 /* Copy XPC Services */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
+			dstSubfolderSpec = 16;
+			files = (
+				72045CE026FEE535004F96E5 /* Downloader.xpc in Copy XPC Services */,
+				72045CE126FEE535004F96E5 /* InstallerConnection.xpc in Copy XPC Services */,
+				72045CE226FEE535004F96E5 /* Installer.xpc in Copy XPC Services */,
+				72045CE326FEE535004F96E5 /* InstallerStatus.xpc in Copy XPC Services */,
+			);
+			name = "Copy XPC Services";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7205C43C1E13049400E370AE /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		726E4A261C86C88F00C57C6A /* Embed XPC Services */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "$(CONTENTS_FOLDER_PATH)/XPCServices";
+			dstSubfolderSpec = 16;
+			files = (
+				726E4A211C86C88F00C57C6A /* TestAppHelper.xpc in Embed XPC Services */,
+			);
+			name = "Embed XPC Services";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72B398D01D3D879300EE297F /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		72D954B41CBB4469006F28BD /* Copy Sparkle */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				726F168726747CEB005BEA89 /* Sparkle.framework in Copy Sparkle */,
+			);
+			name = "Copy Sparkle";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E282522B6467A004AA304 /* Copy Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+				EA1E282622B64693004AA304 /* bscommon.h in Copy Headers */,
+				EA1E282722B64694004AA304 /* bspatch.h in Copy Headers */,
+				EA1E282822B64694004AA304 /* sais.h in Copy Headers */,
+			);
+			name = "Copy Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E283222B660C6004AA304 /* Copy Headers */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 16;
+			files = (
+				EA1E284F22B66115004AA304 /* precomp_data.h in Copy Headers */,
+				EA1E285022B66115004AA304 /* sha512.h in Copy Headers */,
+				EA1E285122B66115004AA304 /* ed25519.h in Copy Headers */,
+				EA1E285222B66115004AA304 /* fe.h in Copy Headers */,
+				EA1E285322B66115004AA304 /* fixedint.h in Copy Headers */,
+				EA1E285422B66115004AA304 /* sc.h in Copy Headers */,
+				EA1E285522B66115004AA304 /* ge.h in Copy Headers */,
+			);
+			name = "Copy Headers";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E285C22B66487004AA304 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		EA1E287422B666EB004AA304 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		004A8652192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		0263187214FEBB31005EBF43 /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		1420DF4F196247F900203BB0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = "<group>"; };
+		14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = "<group>"; };
+		14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = "<group>"; };
+		146EC84E19A68CF8004A50C5 /* Sparkle.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = Sparkle.podspec; sourceTree = SOURCE_ROOT; };
+		14732BB1195FF6B700593899 /* .clang-format */ = {isa = PBXFileReference; lastKnownFileType = text; path = ".clang-format"; sourceTree = SOURCE_ROOT; };
+		14732BB91960EEEE00593899 /* SampleAppcast.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = SampleAppcast.xml; sourceTree = "<group>"; };
+		14732BBA1960EF7100593899 /* CHANGELOG */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CHANGELOG; sourceTree = SOURCE_ROOT; };
+		14732BBC1960EFB500593899 /* README.markdown */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.markdown; sourceTree = SOURCE_ROOT; };
+		14732BC11960F3B200593899 /* Makefile */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = SOURCE_ROOT; usesTabs = 1; };
+		14732BC31960F3FF00593899 /* generate_keys */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = generate_keys; sourceTree = "<group>"; };
+		14732BC41960F3FF00593899 /* sign_update */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = sign_update; sourceTree = "<group>"; };
+		14732BC91960F70A00593899 /* make-release-package.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "make-release-package.sh"; sourceTree = "<group>"; };
+		14732BD219610A1800593899 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		147D6D9E1B66DC3C006607AB /* CheckLocalizations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CheckLocalizations.swift; path = Sparkle/CheckLocalizations.swift; sourceTree = SOURCE_ROOT; };
+		147D6DA71B66EC1C006607AB /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		147D6DA91B66EC22006607AB /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		147D6DAA1B66EC25006607AB /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		14950074195FDF5900BC5B5B /* SUUpdaterTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdaterTest.m; sourceTree = "<group>"; usesTabs = 0; };
+		14958C6B19AEBC530061B14F /* signed-test-file.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "signed-test-file.txt"; sourceTree = "<group>"; };
+		14958C6C19AEBC610061B14F /* test-pubkey.pem */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "test-pubkey.pem"; sourceTree = "<group>"; };
+		149B78631B7D3A0C00D7D62C /* ConfigCommonCoverage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigCommonCoverage.xcconfig; sourceTree = "<group>"; };
+		149B78641B7D3A4800D7D62C /* ConfigUnitTestCoverage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUnitTestCoverage.xcconfig; sourceTree = "<group>"; };
+		1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = ReleaseNotesColorStyle.css; sourceTree = "<group>"; };
+		3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionDisplayProtocol.h; sourceTree = "<group>"; };
+		37A5F28528E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		37A5F28628E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		37A5F28728E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		37A5F28828E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
+		555CF29A196C52330000B31E /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		55C14BD8136EF00C00649790 /* SUStatus.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUStatus.xib; sourceTree = "<group>"; };
+		55C14F04136EF6DB00649790 /* SULog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULog.h; sourceTree = "<group>"; };
+		55C14F05136EF6DB00649790 /* SULog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SULog.m; sourceTree = "<group>"; };
+		55C14F31136EFC2400649790 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		55E6F33219EC9F6C00005E76 /* SUErrors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUErrors.h; sourceTree = "<group>"; };
+		5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SUUpdateValidatorTest.swift; sourceTree = "<group>"; };
+		5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SUUpdateValidatorTest; sourceTree = "<group>"; };
+		5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "test-relative-urls.xml"; sourceTree = "<group>"; };
+		5AA4DCD01C73E5510078F128 /* SUAppcastTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUAppcastTest.swift; sourceTree = "<group>"; };
+		5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast.xml; sourceTree = "<group>"; };
+		5AEF45D9189D1CC90030D7DC /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUInstallerTest.m; sourceTree = "<group>"; };
+		5AF6C74E1AEA46D10014A3AB /* test.pkg */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.pkg; sourceTree = "<group>"; };
+		5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUSignatureVerifierTest.m; sourceTree = "<group>"; };
+		5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = BinaryDelta; sourceTree = BUILT_PRODUCTS_DIR; };
+		5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */ = {isa = PBXFileReference; comments = "-Wno-shorten-64-to-32"; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bsdiff.c; sourceTree = "<group>"; };
+		5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bspatch.c; sourceTree = "<group>"; };
+		5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
+		5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxar.1.dylib; path = usr/lib/libxar.1.dylib; sourceTree = SDKROOT; };
+		5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
+		5D1AF5990FD767E50065DB48 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		5F1510A11C96E591006E1629 /* testnamespaces.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testnamespaces.xml; sourceTree = "<group>"; };
+		611142E810FB1BE5009810AA /* bspatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bspatch.h; sourceTree = "<group>"; };
+		61131A050F846CE600E97AF6 /* da */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61131A090F846D0A00E97AF6 /* zh_CN */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61131A0A0F846D1100E97AF6 /* zh_TW */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		6117796E0D1112E000749C97 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; };
+		611A904210240DD300CC659E /* pl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		611A904610240DF700CC659E /* ja */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Sparkle Unit Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		612279DA0DB5470200AB99EA /* SparkleTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SparkleTests-Info.plist"; sourceTree = "<group>"; };
+		61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUVersionComparisonTest.m; sourceTree = "<group>"; };
+		61299A5B09CA6D4500B7442F /* SUConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUConstants.h; sourceTree = "<group>"; };
+		61299A5F09CA6EB100B7442F /* SUConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUConstants.m; sourceTree = "<group>"; };
+		61299B3509CB04E000B7442F /* Sparkle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sparkle.h; sourceTree = "<group>"; };
+		612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdatePermissionPrompt.h; sourceTree = "<group>"; };
+		612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdatePermissionPrompt.m; sourceTree = "<group>"; };
+		613151B20FB4946A000DCD59 /* is */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		615409C4103BBC4000125AF1 /* cs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		6186554310D7484E00B1E074 /* pt-PT */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/Sparkle.strings"; sourceTree = "<group>"; };
+		618915730E35937600B5E981 /* sv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		6195D4920E404AD700D41A50 /* ru */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		6196CFE309C71ADE000DC222 /* SUStatusController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUStatusController.h; sourceTree = "<group>"; };
+		6196CFE409C71ADE000DC222 /* SUStatusController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUStatusController.m; sourceTree = "<group>"; };
+		619B17200E1E9D0800E72754 /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionComparisonProtocol.h; sourceTree = "<group>"; };
+		61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUStandardVersionComparator.h; sourceTree = "<group>"; };
+		61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUStandardVersionComparator.m; sourceTree = "<group>"; };
+		61A2279A0D1CEE7600430CCD /* SUSystemProfiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUSystemProfiler.h; sourceTree = "<group>"; };
+		61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUSystemProfiler.m; sourceTree = "<group>"; };
+		61AAE84F0A321AF700D8810D /* es */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61AAE8590A321B0400D8810D /* fr */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61AAE8710A321F7700D8810D /* nl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61B5F8E309C4CE3C00B25A18 /* SPUUpdater.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPUUpdater.h; sourceTree = "<group>"; };
+		61B5F8E409C4CE3C00B25A18 /* SPUUpdater.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = SPUUpdater.m; sourceTree = "<group>"; };
+		61B5F8F609C4CEB300B25A18 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
+		61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Sparkle Test App.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TestApplication-Info.plist"; sourceTree = "<group>"; };
+		61B5F92409C4CFC900B25A18 /* main.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		61B5FB9409C4F04600B25A18 /* SUAppcast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcast.h; sourceTree = "<group>"; };
+		61B5FB9509C4F04600B25A18 /* SUAppcast.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcast.m; sourceTree = "<group>"; };
+		61B5FC3F09C4FD4000B25A18 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
+		61B5FC5309C5182000B25A18 /* SUAppcastItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcastItem.h; sourceTree = "<group>"; };
+		61B5FC5409C5182000B25A18 /* SUAppcastItem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcastItem.m; sourceTree = "<group>"; };
+		61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateAlert.h; sourceTree = "<group>"; };
+		61B5FCA109C5228F00B25A18 /* SUUpdateAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateAlert.m; sourceTree = "<group>"; };
+		61BA66CC14BDFA0400D02D86 /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61C268090E2DB5D000175E6C /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
+		61E31A80103299500051D188 /* pt-BR */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Sparkle.strings"; sourceTree = "<group>"; };
+		61EF67550E25B58D00F754E0 /* SUHost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUHost.m; sourceTree = "<group>"; };
+		61EF67580E25C5B400F754E0 /* SUHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUHost.h; sourceTree = "<group>"; };
+		61F3AC1215C22D4A00260CA2 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		61F614540E24A12D009F47E7 /* it */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_phasedRollout.xml; sourceTree = "<group>"; };
+		72045CE426FEE708004F96E5 /* strip-xpc-services.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "strip-xpc-services.sh"; sourceTree = "<group>"; };
+		7205C43E1E13049400E370AE /* generate_appcast */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generate_appcast; sourceTree = BUILT_PRODUCTS_DIR; };
+		7205C4401E13049400E370AE /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		7205C4461E1304C300E370AE /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
+		7205C4471E1304CE00E370AE /* Appcast.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Appcast.swift; sourceTree = "<group>"; };
+		7205C4481E1304CE00E370AE /* ArchiveItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArchiveItem.swift; sourceTree = "<group>"; };
+		7205C4491E1304CE00E370AE /* Signatures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signatures.swift; sourceTree = "<group>"; };
+		7205C44A1E1304CE00E370AE /* FeedXML.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedXML.swift; sourceTree = "<group>"; };
+		7205C44B1E1304CE00E370AE /* Unarchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Unarchive.swift; sourceTree = "<group>"; };
+		7205C4511E13053500E370AE /* ConfigSwiftDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwiftDebug.xcconfig; sourceTree = "<group>"; };
+		7205C4521E13053500E370AE /* ConfigSwiftRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwiftRelease.xcconfig; sourceTree = "<group>"; };
+		7205C46C1E13244800E370AE /* ConfigUnitTestDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUnitTestDebug.xcconfig; sourceTree = "<group>"; };
+		7205C46D1E13245600E370AE /* ConfigUnitTestRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUnitTestRelease.xcconfig; sourceTree = "<group>"; };
+		7205C46E1E13254500E370AE /* ConfigUITestDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITestDebug.xcconfig; sourceTree = "<group>"; };
+		7205C46F1E13255900E370AE /* ConfigUITestRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITestRelease.xcconfig; sourceTree = "<group>"; };
+		720767D11E2EB86200F9A850 /* AppKitPrevention.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitPrevention.h; sourceTree = "<group>"; };
+		720B16421C66433D006985FB /* UITests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "UITests-Info.plist"; path = "UITests/UITests-Info.plist"; sourceTree = SOURCE_ROOT; };
+		720B16431C66433D006985FB /* SUTestApplicationTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SUTestApplicationTest.swift; path = UITests/SUTestApplicationTest.swift; sourceTree = SOURCE_ROOT; };
+		720B4C2325EBFAFD005A0592 /* link-tools.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "link-tools.sh"; sourceTree = "<group>"; };
+		720C192827127A3800740C8E /* release-move-tag.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "release-move-tag.sh"; sourceTree = "<group>"; };
+		720DC50327A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_minimumAutoupdateVersionSkipping.xml; sourceTree = "<group>"; };
+		720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_minimumAutoupdateVersionSkipping2.xml; sourceTree = "<group>"; };
+		720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterCycle.h; sourceTree = "<group>"; };
+		720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterCycle.m; sourceTree = "<group>"; };
+		7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; sourceTree = "<group>"; };
+		7214B87F1D456A8500CB5CED /* SUBundleIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBundleIcon.h; sourceTree = "<group>"; };
+		7214B8801D456A8500CB5CED /* SUBundleIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBundleIcon.m; sourceTree = "<group>"; };
+		7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallationType.h; sourceTree = "<group>"; };
+		72162B071C82C9600013C1C5 /* SULocalizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULocalizations.h; sourceTree = "<group>"; };
+		721652671D3C8FED00FD13D8 /* SUInstallerLauncherStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerLauncherStatus.h; path = InstallerLauncher/SUInstallerLauncherStatus.h; sourceTree = SOURCE_ROOT; };
+		7218EC362623F31C008FECF3 /* org.sparkle-project.InstallerConnection.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "org.sparkle-project.InstallerConnection.entitlements"; sourceTree = "<group>"; };
+		7218EC372623F32E008FECF3 /* org.sparkle-project.InstallerStatus.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "org.sparkle-project.InstallerStatus.entitlements"; sourceTree = "<group>"; };
+		721AB11626C777D900D34A86 /* SPUDownloadDataPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUDownloadDataPrivate.h; sourceTree = "<group>"; };
+		721BC2061D17A532002BC71E /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		721BC2081D17A553002BC71E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
+		721BC20A1D17A5AD002BC71E /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = System/Library/Frameworks/CoreServices.framework; sourceTree = SDKROOT; };
+		721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPULocalCacheDirectory.h; sourceTree = "<group>"; };
+		721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPULocalCacheDirectory.m; sourceTree = "<group>"; };
+		721C24451CB753E6005440CB /* Updater.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Updater.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		721C24571CB754E8005440CB /* ConfigInstallerProgress.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerProgress.xcconfig; sourceTree = "<group>"; };
+		721C24581CB7567D005440CB /* InstallerProgress-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "InstallerProgress-Info.plist"; path = "Sparkle/InstallerProgress/InstallerProgress-Info.plist"; sourceTree = SOURCE_ROOT; };
+		721D588B25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPhasedUpdateGroupInfo.h; sourceTree = "<group>"; };
+		721D588C25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPhasedUpdateGroupInfo.m; sourceTree = "<group>"; };
+		721D5A8325C65D3F00D23BEA /* SUFlatPackageUnarchiver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUFlatPackageUnarchiver.h; path = Autoupdate/SUFlatPackageUnarchiver.h; sourceTree = SOURCE_ROOT; };
+		721D5A8425C65D3F00D23BEA /* SUFlatPackageUnarchiver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SUFlatPackageUnarchiver.m; path = Autoupdate/SUFlatPackageUnarchiver.m; sourceTree = SOURCE_ROOT; };
+		721D8A881D4D272E0032E472 /* Installation.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Installation.md; sourceTree = "<group>"; };
+		722194511D3BF987004C34FF /* SPUInstallerAgentProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUInstallerAgentProtocol.h; path = Sparkle/InstallerProgress/SPUInstallerAgentProtocol.h; sourceTree = SOURCE_ROOT; };
+		722194521D3BFEB7004C34FF /* SUInstallerAgentInitiationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerAgentInitiationProtocol.h; path = Sparkle/InstallerProgress/SUInstallerAgentInitiationProtocol.h; sourceTree = SOURCE_ROOT; };
+		7223E7611AD1AEFF008E3161 /* sais.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sais.c; sourceTree = "<group>"; };
+		7223E7621AD1AEFF008E3161 /* sais.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sais.h; sourceTree = "<group>"; };
+		722545B526805FF80036465C /* testappcast_info_updates.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_info_updates.xml; sourceTree = "<group>"; };
+		722545B72680699D0036465C /* SPUAppcastItemStateResolver+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUAppcastItemStateResolver+Private.h"; sourceTree = "<group>"; };
+		722589B51E0A24B9005EA0B9 /* Security.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Security.md; sourceTree = "<group>"; };
+		722589B61E0A24C6005EA0B9 /* Design Practices.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Design Practices.md"; sourceTree = "<group>"; };
+		7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdateDriver.h; sourceTree = "<group>"; };
+		7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUScheduledUpdateDriver.h; sourceTree = "<group>"; };
+		7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUScheduledUpdateDriver.m; sourceTree = "<group>"; };
+		7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadDriver.h; sourceTree = "<group>"; };
+		7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadDriver.m; sourceTree = "<group>"; };
+		722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUGentleUserDriverReminders.h; sourceTree = "<group>"; };
+		722FB7CA1DD69897001D40CE /* ConfigSwift.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwift.xcconfig; sourceTree = "<group>"; };
+		722FB7E3260EE53F00EB571C /* SUNormalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUNormalization.h; sourceTree = "<group>"; };
+		722FB7E4260EE53F00EB571C /* SUNormalization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUNormalization.m; sourceTree = "<group>"; };
+		72316BD11E0DA8430039EFD9 /* SUUnarchiverNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUnarchiverNotifier.h; path = Autoupdate/SUUnarchiverNotifier.h; sourceTree = SOURCE_ROOT; };
+		72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUnarchiverNotifier.m; path = Autoupdate/SUUnarchiverNotifier.m; sourceTree = SOURCE_ROOT; };
+		723ABCD7259A9A9D00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		723ABD37259A9BA500BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdateAlert.xib; sourceTree = "<group>"; };
+		723ABD4C259A9BB900BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD4D259A9BE100BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD4E259A9BEF00BDB4FA /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD4F259A9BFD00BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD50259A9C0200BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD51259A9C0600BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD52259A9C0900BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD53259A9C1000BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD54259A9C1300BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD55259A9C1500BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD56259A9C1E00BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD57259A9C2100BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD58259A9C2400BDB4FA /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD59259A9C2C00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5A259A9C3600BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5B259A9C3900BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5C259A9C3B00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5D259A9C3D00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5E259A9C4000BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD5F259A9C4900BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
+		723ABD60259A9C4B00BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
+		723ABD61259A9C5400BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD62259A9C5700BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD63259A9C5900BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD64259A9C5B00BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD65259A9C5D00BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD66259A9C5F00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD67259A9C6100BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD68259A9C6300BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD69259A9C6600BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		723ABD6B259A9CBB00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
+		723ABD80259A9CD600BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD81259A9CDA00BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD82259A9CEC00BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD83259A9CF000BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD84259A9CF400BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD85259A9CF800BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD86259A9CFC00BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD87259A9CFF00BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD88259A9D0200BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD89259A9D1800BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD8A259A9D1C00BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD8D259A9D2700BDB4FA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD8E259A9D2A00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD91259A9D3400BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD92259A9D3700BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD93259A9D3C00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD94259A9D3E00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD95259A9D4100BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD96259A9D4600BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
+		723ABD97259A9D4900BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
+		723ABD98259A9D4C00BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD99259A9D4F00BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9A259A9D5200BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9B259A9D5500BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9C259A9D5700BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9D259A9D5A00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9E259A9D5D00BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABD9F259A9D6000BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABDA0259A9D6300BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		723ABDDA259A9E8600BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		723ABE01259A9E9E00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
+		723ABE15259A9EB000BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE16259A9EBE00BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE17259A9ECA00BDB4FA /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE18259A9ECF00BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE19259A9ED200BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE1A259A9ED600BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE1B259A9ED800BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE1C259A9EDB00BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE1D259A9EDE00BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE1E259A9EE100BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE21259A9EEB00BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE22259A9EEE00BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE23259A9EF200BDB4FA /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE24259A9EF600BDB4FA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE25259A9EF800BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE28259A9F0100BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE29259A9F0300BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE2A259A9F0600BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE2B259A9F0800BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE2C259A9F0B00BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE2D259A9F0F00BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/MainMenu.strings"; sourceTree = "<group>"; };
+		723ABE2E259A9F1100BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/MainMenu.strings"; sourceTree = "<group>"; };
+		723ABE2F259A9F1400BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE30259A9F1700BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE31259A9F1A00BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE34259A9F2100BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE35259A9F2400BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE36259A9F2600BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE37259A9F2900BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE38259A9F2B00BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABE39259A9F2E00BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		723ABF1A259D055E00BDB4FA /* SUWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUWebView.h; sourceTree = "<group>"; };
+		723ABF2E259D062F00BDB4FA /* SULegacyWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SULegacyWebView.h; sourceTree = "<group>"; };
+		723ABF2F259D062F00BDB4FA /* SULegacyWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SULegacyWebView.m; sourceTree = "<group>"; };
+		723ABFC2259D4CB300BDB4FA /* SUWKWebView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUWKWebView.h; sourceTree = "<group>"; };
+		723ABFC3259D4CB300BDB4FA /* SUWKWebView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUWKWebView.m; sourceTree = "<group>"; };
+		723AC00E259DBDAA00BDB4FA /* SUWebViewCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUWebViewCommon.h; sourceTree = "<group>"; };
+		723AC00F259DBDAA00BDB4FA /* SUWebViewCommon.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUWebViewCommon.m; sourceTree = "<group>"; };
+		723B5D9F1CF7AB0100365F95 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Downloader/Info.plist; sourceTree = SOURCE_ROOT; };
+		723B5DA01CF7AB0100365F95 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Downloader/main.m; sourceTree = SOURCE_ROOT; };
+		723B5DA21CF7AB0100365F95 /* SPUDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUDownloader.h; path = Downloader/SPUDownloader.h; sourceTree = SOURCE_ROOT; };
+		723B5DA31CF7AB0100365F95 /* SPUDownloader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPUDownloader.m; path = Downloader/SPUDownloader.m; sourceTree = SOURCE_ROOT; };
+		723B5DA41CF7AB0100365F95 /* SPUDownloaderDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUDownloaderDelegate.h; path = Downloader/SPUDownloaderDelegate.h; sourceTree = SOURCE_ROOT; };
+		723B5DA51CF7AB0100365F95 /* SPUDownloaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUDownloaderProtocol.h; path = Downloader/SPUDownloaderProtocol.h; sourceTree = SOURCE_ROOT; };
+		723C8A521E2D60DB00C14942 /* SUTouchBarButtonGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTouchBarButtonGroup.h; sourceTree = "<group>"; };
+		723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTouchBarButtonGroup.m; sourceTree = "<group>"; };
+		723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_channels.xml; sourceTree = "<group>"; };
+		7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUpdaterController.h; sourceTree = "<group>"; };
+		7246E0A21C83B685003B4E75 /* SPUStandardUpdaterController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUpdaterController.m; sourceTree = "<group>"; };
+		724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = InstallerConnection.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		724BB36E1D31D0B7005D534A /* SUInstallerConnectionProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerConnectionProtocol.h; sourceTree = "<group>"; };
+		724BB36F1D31D0B7005D534A /* SUInstallerConnection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerConnection.h; sourceTree = "<group>"; };
+		724BB3701D31D0B7005D534A /* SUInstallerConnection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUInstallerConnection.m; sourceTree = "<group>"; };
+		724BB3721D31D0B7005D534A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		724BB3741D31D0B7005D534A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		724BB37E1D31D1EA005D534A /* ConfigInstallerConnection.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerConnection.xcconfig; sourceTree = "<group>"; };
+		724BB37F1D31D1EA005D534A /* ConfigInstallerConnectionDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerConnectionDebug.xcconfig; sourceTree = "<group>"; };
+		724BB3801D31F186005D534A /* SUInstallerCommunicationProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerCommunicationProtocol.h; sourceTree = "<group>"; };
+		724BB3851D32A167005D534A /* SUXPCInstallerConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUXPCInstallerConnection.h; sourceTree = "<group>"; };
+		724BB3861D32A167005D534A /* SUXPCInstallerConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUXPCInstallerConnection.m; sourceTree = "<group>"; };
+		724BB3931D333832005D534A /* InstallerStatus.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = InstallerStatus.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		724BB3951D333832005D534A /* SUInstallerStatusProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerStatusProtocol.h; sourceTree = "<group>"; };
+		724BB3961D333832005D534A /* SUInstallerStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerStatus.h; sourceTree = "<group>"; };
+		724BB3971D333832005D534A /* SUInstallerStatus.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUInstallerStatus.m; sourceTree = "<group>"; };
+		724BB3991D333832005D534A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		724BB39B1D333832005D534A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		724BB3A41D3338C8005D534A /* ConfigInstallerStatus.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerStatus.xcconfig; sourceTree = "<group>"; };
+		724BB3A51D3338C8005D534A /* ConfigInstallerStatusDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerStatusDebug.xcconfig; sourceTree = "<group>"; };
+		724BB3A61D33461B005D534A /* SUXPCInstallerStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUXPCInstallerStatus.h; sourceTree = "<group>"; };
+		724BB3A71D33461B005D534A /* SUXPCInstallerStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUXPCInstallerStatus.m; sourceTree = "<group>"; };
+		724BB3B51D35AAC3005D534A /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
+		725602D31C83551C00DAA70E /* SUApplicationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUApplicationInfo.h; sourceTree = "<group>"; };
+		725602D41C83551C00DAA70E /* SUApplicationInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUApplicationInfo.m; sourceTree = "<group>"; };
+		72563CA9272E1C5400AF39F0 /* .github */ = {isa = PBXFileReference; lastKnownFileType = folder; path = .github; sourceTree = "<group>"; };
+		725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_minimumAutoupdateVersion.xml; sourceTree = "<group>"; };
+		725B81F92781AEA40041746F /* libcompression.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libcompression.tbd; path = usr/lib/libcompression.tbd; sourceTree = SDKROOT; };
+		725C2EA82782EC44007CB7B5 /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Bridging-Header.h"; path = "BinaryDelta/Bridging-Header.h"; sourceTree = SOURCE_ROOT; };
+		725C2EA92782EC61007CB7B5 /* main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = main.swift; path = BinaryDelta/main.swift; sourceTree = SOURCE_ROOT; };
+		725C2EAD278386A8007CB7B5 /* SPUDeltaCompressionMode.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaCompressionMode.h; path = Autoupdate/SPUDeltaCompressionMode.h; sourceTree = SOURCE_ROOT; };
+		725CB9561C7120410064365A /* SPUUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserDriver.h; sourceTree = "<group>"; };
+		725CB9581C7121830064365A /* SPUStandardUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriver.h; sourceTree = "<group>"; };
+		725CB9591C7121830064365A /* SPUStandardUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUserDriver.m; sourceTree = "<group>"; };
+		725DED72263D10C400E7FA8F /* SUAppcast+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUAppcast+Private.h"; sourceTree = "<group>"; };
+		725EE47E277BF13A00D820CE /* SPUXarDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUXarDeltaArchive.h; path = Autoupdate/SPUXarDeltaArchive.h; sourceTree = SOURCE_ROOT; };
+		725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUXarDeltaArchive.m; path = Autoupdate/SPUXarDeltaArchive.m; sourceTree = SOURCE_ROOT; };
+		725EE481277BF17A00D820CE /* SPUDeltaArchiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaArchiveProtocol.h; path = Autoupdate/SPUDeltaArchiveProtocol.h; sourceTree = SOURCE_ROOT; };
+		725EE484277D375F00D820CE /* SPUDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaArchive.h; path = Autoupdate/SPUDeltaArchive.h; sourceTree = SOURCE_ROOT; };
+		725EE485277D375F00D820CE /* SPUDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUDeltaArchive.m; path = Autoupdate/SPUDeltaArchive.m; sourceTree = SOURCE_ROOT; };
+		725F97741C8A62F500265BE4 /* SUAdHocCodeSigning.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAdHocCodeSigning.h; sourceTree = "<group>"; };
+		725F97751C8A62F500265BE4 /* SUAdHocCodeSigning.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAdHocCodeSigning.m; sourceTree = "<group>"; };
+		725F97821C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUPopUpTitlebarUserDriver.h; sourceTree = "<group>"; };
+		725F97831C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUPopUpTitlebarUserDriver.m; sourceTree = "<group>"; };
+		725F97A21C8B304D00265BE4 /* SUInstallUpdateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUInstallUpdateViewController.h; sourceTree = "<group>"; };
+		725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUInstallUpdateViewController.m; sourceTree = "<group>"; };
+		725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUInstallUpdateViewController.xib; sourceTree = "<group>"; };
+		7267E56E1D3D895B00D1BF90 /* SUBinaryDeltaApply.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaApply.h; path = Autoupdate/SUBinaryDeltaApply.h; sourceTree = SOURCE_ROOT; };
+		7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaApply.m; path = Autoupdate/SUBinaryDeltaApply.m; sourceTree = SOURCE_ROOT; };
+		7267E5701D3D895B00D1BF90 /* SUBinaryDeltaCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaCommon.h; path = Autoupdate/SUBinaryDeltaCommon.h; sourceTree = SOURCE_ROOT; };
+		7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaCommon.m; path = Autoupdate/SUBinaryDeltaCommon.m; sourceTree = SOURCE_ROOT; };
+		7267E5721D3D895B00D1BF90 /* SUBinaryDeltaCreate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaCreate.h; path = Autoupdate/SUBinaryDeltaCreate.h; sourceTree = SOURCE_ROOT; };
+		7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaCreate.m; path = Autoupdate/SUBinaryDeltaCreate.m; sourceTree = SOURCE_ROOT; };
+		7267E57D1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaUnarchiver.h; path = Autoupdate/SUBinaryDeltaUnarchiver.h; sourceTree = SOURCE_ROOT; };
+		7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaUnarchiver.m; path = Autoupdate/SUBinaryDeltaUnarchiver.m; sourceTree = SOURCE_ROOT; };
+		7267E5801D3D89B300D1BF90 /* SUDiskImageUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUDiskImageUnarchiver.h; path = Autoupdate/SUDiskImageUnarchiver.h; sourceTree = SOURCE_ROOT; };
+		7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUDiskImageUnarchiver.m; path = Autoupdate/SUDiskImageUnarchiver.m; sourceTree = SOURCE_ROOT; };
+		7267E5821D3D89B300D1BF90 /* SUPipedUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPipedUnarchiver.h; path = Autoupdate/SUPipedUnarchiver.h; sourceTree = SOURCE_ROOT; };
+		7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPipedUnarchiver.m; path = Autoupdate/SUPipedUnarchiver.m; sourceTree = SOURCE_ROOT; };
+		7267E5841D3D89B300D1BF90 /* SUUnarchiver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUnarchiver.h; path = Autoupdate/SUUnarchiver.h; sourceTree = SOURCE_ROOT; };
+		7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUnarchiver.m; path = Autoupdate/SUUnarchiver.m; sourceTree = SOURCE_ROOT; };
+		7267E5891D3D89CA00D1BF90 /* SUUnarchiverProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUUnarchiverProtocol.h; path = Autoupdate/SUUnarchiverProtocol.h; sourceTree = SOURCE_ROOT; };
+		7267E5981D3D8A5A00D1BF90 /* SUCodeSigningVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUCodeSigningVerifier.h; path = Autoupdate/SUCodeSigningVerifier.h; sourceTree = SOURCE_ROOT; };
+		7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUCodeSigningVerifier.m; path = Autoupdate/SUCodeSigningVerifier.m; sourceTree = SOURCE_ROOT; };
+		7267E59A1D3D8A5A00D1BF90 /* SUSignatureVerifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUSignatureVerifier.h; path = Autoupdate/SUSignatureVerifier.h; sourceTree = SOURCE_ROOT; };
+		7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUSignatureVerifier.m; path = Autoupdate/SUSignatureVerifier.m; sourceTree = SOURCE_ROOT; };
+		7267E59E1D3D8A6F00D1BF90 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Autoupdate/main.m; sourceTree = SOURCE_ROOT; };
+		7267E5A01D3D8A7E00D1BF90 /* AppInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppInstaller.h; path = Autoupdate/AppInstaller.h; sourceTree = SOURCE_ROOT; };
+		7267E5A11D3D8A7E00D1BF90 /* AppInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppInstaller.m; path = Autoupdate/AppInstaller.m; sourceTree = SOURCE_ROOT; };
+		7267E5A31D3D8A8A00D1BF90 /* StatusInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatusInfo.h; path = Autoupdate/StatusInfo.h; sourceTree = SOURCE_ROOT; };
+		7267E5A41D3D8A8A00D1BF90 /* StatusInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StatusInfo.m; path = Autoupdate/StatusInfo.m; sourceTree = SOURCE_ROOT; };
+		7267E5A61D3D8A9900D1BF90 /* AgentConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AgentConnection.h; path = Autoupdate/AgentConnection.h; sourceTree = SOURCE_ROOT; };
+		7267E5A71D3D8A9900D1BF90 /* AgentConnection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AgentConnection.m; path = Autoupdate/AgentConnection.m; sourceTree = SOURCE_ROOT; };
+		7267E5A91D3D8AA800D1BF90 /* TerminationListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TerminationListener.h; path = Autoupdate/TerminationListener.h; sourceTree = SOURCE_ROOT; };
+		7267E5AA1D3D8AA800D1BF90 /* TerminationListener.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TerminationListener.m; path = Autoupdate/TerminationListener.m; sourceTree = SOURCE_ROOT; };
+		7267E5AC1D3D8AB700D1BF90 /* SPUInstallationInputData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUInstallationInputData.h; path = Autoupdate/SPUInstallationInputData.h; sourceTree = SOURCE_ROOT; };
+		7267E5AD1D3D8AB700D1BF90 /* SPUInstallationInputData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPUInstallationInputData.m; path = Autoupdate/SPUInstallationInputData.m; sourceTree = SOURCE_ROOT; };
+		7267E5AF1D3D8AD500D1BF90 /* SPUMessageTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUMessageTypes.h; path = Autoupdate/SPUMessageTypes.h; sourceTree = SOURCE_ROOT; };
+		7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPUMessageTypes.m; path = Autoupdate/SPUMessageTypes.m; sourceTree = SOURCE_ROOT; };
+		7267E5B41D3D8AEE00D1BF90 /* SPUInstallationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUInstallationInfo.h; path = Autoupdate/SPUInstallationInfo.h; sourceTree = SOURCE_ROOT; };
+		7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPUInstallationInfo.m; path = Autoupdate/SPUInstallationInfo.m; sourceTree = SOURCE_ROOT; };
+		7267E5B91D3D8B0B00D1BF90 /* SUInstallerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerProtocol.h; path = Autoupdate/SUInstallerProtocol.h; sourceTree = SOURCE_ROOT; };
+		7267E5BA1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUGuidedPackageInstaller.h; path = Autoupdate/SUGuidedPackageInstaller.h; sourceTree = SOURCE_ROOT; };
+		7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUGuidedPackageInstaller.m; path = Autoupdate/SUGuidedPackageInstaller.m; sourceTree = SOURCE_ROOT; };
+		7267E5BC1D3D8B2700D1BF90 /* SUInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUInstaller.h; path = Autoupdate/SUInstaller.h; sourceTree = SOURCE_ROOT; };
+		7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUInstaller.m; path = Autoupdate/SUInstaller.m; sourceTree = SOURCE_ROOT; };
+		7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPackageInstaller.h; path = Autoupdate/SUPackageInstaller.h; sourceTree = SOURCE_ROOT; };
+		7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPackageInstaller.m; path = Autoupdate/SUPackageInstaller.m; sourceTree = SOURCE_ROOT; };
+		7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPlainInstaller.h; path = Autoupdate/SUPlainInstaller.h; sourceTree = SOURCE_ROOT; };
+		7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPlainInstaller.m; path = Autoupdate/SUPlainInstaller.m; sourceTree = SOURCE_ROOT; };
+		7267E5CF1D3D8C8500D1BF90 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = System/Library/Frameworks/SecurityFoundation.framework; sourceTree = SDKROOT; };
+		7267E5DD1D3D8F5A00D1BF90 /* SUStatusInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUStatusInfoProtocol.h; path = Autoupdate/SUStatusInfoProtocol.h; sourceTree = SOURCE_ROOT; };
+		7267E5E31D3D90AA00D1BF90 /* SUFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUFileManager.h; sourceTree = "<group>"; };
+		7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUFileManager.m; sourceTree = "<group>"; };
+		7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUResumableUpdate.h; sourceTree = "<group>"; };
+		7269E492264798200088C213 /* SPUSkippedUpdate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUSkippedUpdate.h; sourceTree = "<group>"; };
+		7269E493264798200088C213 /* SPUSkippedUpdate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUSkippedUpdate.m; sourceTree = "<group>"; };
+		7269E4992648F7C00088C213 /* SPUUserUpdateState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUserUpdateState.m; sourceTree = "<group>"; };
+		7269E49C2648FC6C0088C213 /* SPUUserUpdateState+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUserUpdateState+Private.h"; sourceTree = "<group>"; };
+		726B2B5D1C645FC900388755 /* UI Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "UI Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
+		726DF88D1C84277500188804 /* SPUUserUpdateState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserUpdateState.h; sourceTree = "<group>"; };
+		726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SPUSecureCoding.h; path = Sparkle/SPUSecureCoding.h; sourceTree = SOURCE_ROOT; };
+		726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SPUSecureCoding.m; path = Sparkle/SPUSecureCoding.m; sourceTree = SOURCE_ROOT; };
+		726E07681CA616A4001A286B /* libxar.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libxar.tbd; path = usr/lib/libxar.tbd; sourceTree = SDKROOT; };
+		726E076A1CA616B3001A286B /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
+		726E078B1CA891E9001A286B /* SPUUpdaterSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterSettings.h; sourceTree = "<group>"; };
+		726E078C1CA891E9001A286B /* SPUUpdaterSettings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterSettings.m; sourceTree = "<group>"; };
+		726E07AD1CAF08D6001A286B /* Installer.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = Installer.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		726E07AF1CAF08D6001A286B /* SUInstallerLauncherProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerLauncherProtocol.h; sourceTree = "<group>"; };
+		726E07B01CAF08D6001A286B /* SUInstallerLauncher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUInstallerLauncher.h; sourceTree = "<group>"; };
+		726E07B11CAF08D6001A286B /* SUInstallerLauncher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUInstallerLauncher.m; sourceTree = "<group>"; };
+		726E07B31CAF08D6001A286B /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		726E07B51CAF08D6001A286B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		726E07C11CAF1E79001A286B /* ConfigInstallerLauncher.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigInstallerLauncher.xcconfig; sourceTree = "<group>"; };
+		726E07EF1CAF37BD001A286B /* Downloader.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = Downloader.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		726E4A111C86C44A00C57C6A /* Sparkle-Test-App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Sparkle-Test-App.entitlements"; sourceTree = "<group>"; };
+		726E4A161C86C88F00C57C6A /* TestAppHelper.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = TestAppHelper.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
+		726E4A181C86C88F00C57C6A /* TestAppHelperProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAppHelperProtocol.h; sourceTree = "<group>"; };
+		726E4A191C86C88F00C57C6A /* TestAppHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestAppHelper.h; sourceTree = "<group>"; };
+		726E4A1A1C86C88F00C57C6A /* TestAppHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TestAppHelper.m; sourceTree = "<group>"; };
+		726E4A1C1C86C88F00C57C6A /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		726E4A1E1C86C88F00C57C6A /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		726E4A281C86CAB500C57C6A /* ConfigTestAppHelper.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigTestAppHelper.xcconfig; sourceTree = "<group>"; };
+		726E4A361C89116000C57C6A /* SPUStandardUserDriverDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriverDelegate.h; sourceTree = "<group>"; };
+		726F2CE31BC9C33D001971A4 /* SUOperatingSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUOperatingSystem.h; sourceTree = "<group>"; };
+		726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUOperatingSystem.m; sourceTree = "<group>"; };
+		726FD2CB25F4BE5F00123BC6 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		726FD2CC25F4BE5F00123BC6 /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		727F340A2605321D00020E85 /* SULog+NSError.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SULog+NSError.m"; sourceTree = "<group>"; };
+		727F34212605323500020E85 /* SULog+NSError.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SULog+NSError.h"; sourceTree = "<group>"; };
+		728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbeInstallStatus.h; sourceTree = "<group>"; };
+		728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbeInstallStatus.m; sourceTree = "<group>"; };
+		728638EE1CAF589C00783084 /* ConfigDownloader.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigDownloader.xcconfig; sourceTree = "<group>"; };
+		728ED348277DA23400D9238F /* SPUSparkleDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUSparkleDeltaArchive.h; path = Autoupdate/SPUSparkleDeltaArchive.h; sourceTree = SOURCE_ROOT; };
+		728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUSparkleDeltaArchive.m; path = Autoupdate/SPUSparkleDeltaArchive.m; sourceTree = SOURCE_ROOT; };
+		729924921DF4A45000DBCDF5 /* SUUpdateValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUpdateValidator.h; path = Sparkle/SUUpdateValidator.h; sourceTree = SOURCE_ROOT; };
+		729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUpdateValidator.m; path = Sparkle/SUUpdateValidator.m; sourceTree = SOURCE_ROOT; };
+		729BB3D11D503826007C4276 /* org.sparkle-project.Downloader.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = "org.sparkle-project.Downloader.entitlements"; path = "Downloader/org.sparkle-project.Downloader.entitlements"; sourceTree = SOURCE_ROOT; };
+		729F10FD1C65A9B500DFCCC5 /* ConfigUITest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITest.xcconfig; sourceTree = "<group>"; };
+		729F10FE1C65A9B500DFCCC5 /* ConfigUITestCoverage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITestCoverage.xcconfig; sourceTree = "<group>"; };
+		729F7EAB27366353004592DC /* test-links.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "test-links.xml"; sourceTree = "<group>"; };
+		729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUserAgent+Private.h"; sourceTree = "<group>"; };
+		729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SPUUserAgent+Private.m"; sourceTree = "<group>"; };
+		729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_extraneous.zip; sourceTree = "<group>"; };
+		72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdatePermissionResponse.h; sourceTree = "<group>"; };
+		72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdatePermissionResponse.m; sourceTree = "<group>"; };
+		72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUFileManagerTest.swift; sourceTree = "<group>"; };
+		72A6F9891C94E2D6005F404C /* SUUpdaterDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdaterDelegate.h; sourceTree = "<group>"; };
+		72AC6B251B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz */ = {isa = PBXFileReference; lastKnownFileType = archive.gzip; path = SparkleTestCodeSignApp.tar.gz; sourceTree = "<group>"; };
+		72AC6B271B9AAD6700F62325 /* SparkleTestCodeSignApp.tar */ = {isa = PBXFileReference; lastKnownFileType = archive.tar; path = SparkleTestCodeSignApp.tar; sourceTree = "<group>"; };
+		72AC6B291B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.tar.bz2; sourceTree = "<group>"; };
+		72AC6B2B1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.tar.xz; sourceTree = "<group>"; };
+		72AC6B2D1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.dmg; sourceTree = "<group>"; };
+		72AFC6121B9A944200F6B565 /* Sparkle Unit Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Sparkle Unit Tests-Bridging-Header.h"; sourceTree = "<group>"; };
+		72B09CE91CEA18900052EF9E /* bscommon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bscommon.c; sourceTree = "<group>"; };
+		72B09CEA1CEA18900052EF9E /* bscommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bscommon.h; sourceTree = "<group>"; };
+		72B398D21D3D879300EE297F /* Autoupdate */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Autoupdate; sourceTree = BUILT_PRODUCTS_DIR; };
+		72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadedUpdate.h; sourceTree = "<group>"; };
+		72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadedUpdate.m; sourceTree = "<group>"; };
+		72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInformationalUpdate.h; sourceTree = "<group>"; };
+		72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInformationalUpdate.m; sourceTree = "<group>"; };
+		72B767C81C9B707000A07552 /* SUAppcastDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcastDriver.h; sourceTree = "<group>"; };
+		72B767C91C9B707000A07552 /* SUAppcastDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcastDriver.m; sourceTree = "<group>"; };
+		72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInstallerDriver.h; sourceTree = "<group>"; };
+		72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInstallerDriver.m; sourceTree = "<group>"; };
+		72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbingUpdateDriver.h; sourceTree = "<group>"; };
+		72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbingUpdateDriver.m; sourceTree = "<group>"; };
+		72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUBasicUpdateDriver.h; sourceTree = "<group>"; };
+		72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUBasicUpdateDriver.m; sourceTree = "<group>"; };
+		72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUIBasedUpdateDriver.h; sourceTree = "<group>"; };
+		72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUIBasedUpdateDriver.m; sourceTree = "<group>"; };
+		72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserInitiatedUpdateDriver.h; sourceTree = "<group>"; };
+		72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUserInitiatedUpdateDriver.m; sourceTree = "<group>"; };
+		72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUCoreBasedUpdateDriver.h; sourceTree = "<group>"; };
+		72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCoreBasedUpdateDriver.m; sourceTree = "<group>"; };
+		72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAutomaticUpdateDriver.h; sourceTree = "<group>"; };
+		72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAutomaticUpdateDriver.m; sourceTree = "<group>"; };
+		72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs.dmg; sourceTree = "<group>"; };
+		72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUSpotlightImporterTest.swift; sourceTree = "<group>"; };
+		72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_header.zip; sourceTree = "<group>"; };
+		72D60CD828C2BA2100189AB8 /* SPUStandardUserDriver+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUStandardUserDriver+Private.h"; sourceTree = "<group>"; };
+		72D9547F1CBACC35006F28BD /* InstallerProgressAppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InstallerProgressAppController.h; path = Sparkle/InstallerProgress/InstallerProgressAppController.h; sourceTree = SOURCE_ROOT; };
+		72D954801CBACC35006F28BD /* InstallerProgressAppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InstallerProgressAppController.m; path = Sparkle/InstallerProgress/InstallerProgressAppController.m; sourceTree = SOURCE_ROOT; };
+		72D954821CBAD34F006F28BD /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Sparkle/InstallerProgress/main.m; sourceTree = SOURCE_ROOT; };
+		72D954841CBAD418006F28BD /* ShowInstallerProgress.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ShowInstallerProgress.h; path = Sparkle/InstallerProgress/ShowInstallerProgress.h; sourceTree = SOURCE_ROOT; };
+		72D954851CBAD4AE006F28BD /* InstallerProgressDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = InstallerProgressDelegate.h; path = Sparkle/InstallerProgress/InstallerProgressDelegate.h; sourceTree = SOURCE_ROOT; };
+		72D9549E1CBB415B006F28BD /* sparkle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sparkle.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		72D954A01CBB415C006F28BD /* SPUCommandLineDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUCommandLineDriver.h; sourceTree = "<group>"; };
+		72D954A11CBB415C006F28BD /* SPUCommandLineDriver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUCommandLineDriver.m; sourceTree = "<group>"; };
+		72D954A41CBB415C006F28BD /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		72D954AB1CBB415C006F28BD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		72D954B01CBB41E2006F28BD /* ConfigSparkleTool.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSparkleTool.xcconfig; sourceTree = "<group>"; };
+		72D954B61CBB467F006F28BD /* SPUCommandLineUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUCommandLineUserDriver.h; sourceTree = "<group>"; };
+		72D954B71CBB467F006F28BD /* SPUCommandLineUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCommandLineUserDriver.m; sourceTree = "<group>"; };
+		72DBA37B1D60CC34002594A8 /* SPUUpdatePermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdatePermissionRequest.h; sourceTree = "<group>"; };
+		72DBA37C1D60CC34002594A8 /* SPUUpdatePermissionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdatePermissionRequest.m; sourceTree = "<group>"; };
+		72E1DAB525B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
+		72E1DAB625B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		72E1DAB725B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/MainMenu.strings; sourceTree = "<group>"; };
+		72E1DACB25B3E8DF0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		72E45CF11B640CDD005C701A /* SUTestApplicationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestApplicationDelegate.h; sourceTree = "<group>"; };
+		72E45CF21B640CDD005C701A /* SUTestApplicationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTestApplicationDelegate.m; sourceTree = "<group>"; };
+		72E45CF41B640DAE005C701A /* SUUpdateSettingsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdateSettingsWindowController.h; sourceTree = "<group>"; };
+		72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdateSettingsWindowController.m; sourceTree = "<group>"; };
+		72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUUpdateSettingsWindowController.xib; sourceTree = "<group>"; };
+		72E45CFB1B641961005C701A /* sparkletestcast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = sparkletestcast.xml; sourceTree = "<group>"; };
+		72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShowInstallerProgress.m; path = Sparkle/InstallerProgress/ShowInstallerProgress.m; sourceTree = SOURCE_ROOT; };
+		72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUInstallerLauncher+Private.h"; sourceTree = "<group>"; };
+		72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdateCheck.h; sourceTree = "<group>"; };
+		72EF30BA2675CF38008CE987 /* SPUAppcastItemStateResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAppcastItemStateResolver.h; sourceTree = "<group>"; };
+		72EF30BB2675CF38008CE987 /* SPUAppcastItemState.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAppcastItemState.m; sourceTree = "<group>"; };
+		72EF30BC2675CF38008CE987 /* SPUAppcastItemStateResolver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAppcastItemStateResolver.m; sourceTree = "<group>"; };
+		72EF30BD2675CF38008CE987 /* SPUAppcastItemState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAppcastItemState.h; sourceTree = "<group>"; };
+		72EF30C6267C716A008CE987 /* SUAppcastItem+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "SUAppcastItem+Private.h"; sourceTree = "<group>"; };
+		72F0EC44278A55CA002A876A /* screenshot.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = screenshot.png; sourceTree = "<group>"; };
+		72F94ED51CC3441A002DEE68 /* ConfigInstallerLauncherDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigInstallerLauncherDebug.xcconfig; sourceTree = "<group>"; };
+		72F94ED61CC344A7002DEE68 /* ConfigDownloaderDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigDownloaderDebug.xcconfig; sourceTree = "<group>"; };
+		72F94EDA1CC36C37002DEE68 /* ConfigTestAppDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigTestAppDebug.xcconfig; sourceTree = "<group>"; };
+		72F94EDB1CC36C6F002DEE68 /* ConfigTestAppHelperDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigTestAppHelperDebug.xcconfig; sourceTree = "<group>"; };
+		72F94F561CC44DE1002DEE68 /* SPUXPCServiceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUXPCServiceInfo.h; sourceTree = "<group>"; };
+		72F94F571CC44DE1002DEE68 /* SPUXPCServiceInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUXPCServiceInfo.m; sourceTree = "<group>"; };
+		72F9EBE01D517E2F004AC8B6 /* SUUpdater.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdater.h; sourceTree = "<group>"; };
+		72F9EBE11D517E2F004AC8B6 /* SUUpdater.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdater.m; sourceTree = "<group>"; };
+		72F9EC3D1D5E823F004AC8B6 /* SPUUpdaterTimer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterTimer.h; sourceTree = "<group>"; };
+		72F9EC3E1D5E823F004AC8B6 /* SPUUpdaterTimer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterTimer.m; sourceTree = "<group>"; };
+		72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadData.h; sourceTree = "<group>"; };
+		72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadData.m; sourceTree = "<group>"; };
+		72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterDelegate.h; sourceTree = "<group>"; };
+		8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Sparkle-Info.plist"; sourceTree = "<group>"; };
+		8DC2EF5B0486A6940098B216 /* Sparkle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A5BF4F1B1BC7668B007A052A /* SUTestWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestWebServer.h; sourceTree = "<group>"; };
+		A5BF4F1C1BC7668B007A052A /* SUTestWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTestWebServer.m; sourceTree = "<group>"; };
+		C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.enc.dmg; sourceTree = "<group>"; };
+		EA1E280F22B64522004AA304 /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Debug.xcconfig"; sourceTree = "<group>"; };
+		EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Release.xcconfig"; sourceTree = "<group>"; };
+		EA1E281622B64549004AA304 /* bsdiff-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Shared.xcconfig"; sourceTree = "<group>"; };
+		EA1E282D22B660BE004AA304 /* libed25519.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libed25519.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		EA1E283422B660ED004AA304 /* precomp_data.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = precomp_data.h; sourceTree = "<group>"; };
+		EA1E283522B660ED004AA304 /* seed.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = seed.c; sourceTree = "<group>"; };
+		EA1E283622B660ED004AA304 /* fe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe.c; sourceTree = "<group>"; };
+		EA1E283722B660ED004AA304 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = "<group>"; };
+		EA1E283822B660ED004AA304 /* ge.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge.c; sourceTree = "<group>"; };
+		EA1E283922B660ED004AA304 /* sc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sc.c; sourceTree = "<group>"; };
+		EA1E283A22B660ED004AA304 /* sign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sign.c; sourceTree = "<group>"; };
+		EA1E283B22B660ED004AA304 /* sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha512.h; sourceTree = "<group>"; };
+		EA1E283C22B660ED004AA304 /* key_exchange.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = key_exchange.c; sourceTree = "<group>"; };
+		EA1E283D22B660ED004AA304 /* add_scalar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = add_scalar.c; sourceTree = "<group>"; };
+		EA1E283E22B660ED004AA304 /* ed25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ed25519.h; sourceTree = "<group>"; };
+		EA1E283F22B660ED004AA304 /* fe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fe.h; sourceTree = "<group>"; };
+		EA1E284022B660ED004AA304 /* keypair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keypair.c; sourceTree = "<group>"; };
+		EA1E284122B660ED004AA304 /* fixedint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fixedint.h; sourceTree = "<group>"; };
+		EA1E284222B660ED004AA304 /* sha512.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha512.c; sourceTree = "<group>"; };
+		EA1E284322B660ED004AA304 /* sc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sc.h; sourceTree = "<group>"; };
+		EA1E284422B660ED004AA304 /* ge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge.h; sourceTree = "<group>"; };
+		EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Release.xcconfig"; sourceTree = "<group>"; };
+		EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Debug.xcconfig"; sourceTree = "<group>"; };
+		EA1E285922B6622E004AA304 /* ed25519-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "ed25519-Shared.xcconfig"; sourceTree = "<group>"; };
+		EA1E285E22B66487004AA304 /* generate_keys */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = generate_keys; sourceTree = BUILT_PRODUCTS_DIR; };
+		EA1E286022B66487004AA304 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		EA1E286622B664A5004AA304 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
+		EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "CommandLineTool-Release.xcconfig"; sourceTree = "<group>"; };
+		EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "CommandLineTool-Debug.xcconfig"; sourceTree = "<group>"; };
+		EA1E286922B664FD004AA304 /* CommandLineTool-Shared.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "CommandLineTool-Shared.xcconfig"; sourceTree = "<group>"; };
+		EA1E286C22B665E8004AA304 /* SUSignatures.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUSignatures.h; sourceTree = "<group>"; };
+		EA1E286D22B665E8004AA304 /* SUSignatures.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUSignatures.m; sourceTree = "<group>"; };
+		EA1E287622B666EB004AA304 /* sign_update */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = sign_update; sourceTree = BUILT_PRODUCTS_DIR; };
+		EA1E287822B666EB004AA304 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
+		EA1E287F22B667D8004AA304 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
+		F67C9B7B281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		F67C9B7C281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
+		F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
+		F6E11510281410D10003736C /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUCodeSigningVerifierTest.m; sourceTree = "<group>"; };
+		F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp.zip; sourceTree = "<group>"; };
+		FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFrameworkDebug.xcconfig; sourceTree = "<group>"; };
+		FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigCommonRelease.xcconfig; sourceTree = "<group>"; };
+		FA1941CD0D94A70100DD942E /* ConfigTestApp.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigTestApp.xcconfig; sourceTree = "<group>"; };
+		FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigRelaunch.xcconfig; sourceTree = "<group>"; };
+		FA1941CF0D94A70100DD942E /* ConfigCommonDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigCommonDebug.xcconfig; sourceTree = "<group>"; };
+		FA1941D00D94A70100DD942E /* ConfigCommon.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigCommon.xcconfig; sourceTree = "<group>"; };
+		FA1941D10D94A70100DD942E /* ConfigFramework.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigFramework.xcconfig; sourceTree = "<group>"; };
+		FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testlocalizedreleasenotesappcast.xml; sourceTree = "<group>"; };
+		FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Hashing.swift"; sourceTree = "<group>"; };
+		FA3AAF3B1050B273004B3130 /* ConfigUnitTest.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ConfigUnitTest.xcconfig; sourceTree = "<group>"; };
+		FE5536F517A2C6A7007CB333 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Sparkle.strings; sourceTree = "<group>"; };
+		FE5536F617A2C6AB007CB333 /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Sparkle.strings; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		5D06E8CE0FD68C7C005AE3F6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E281922B645D9004AA304 /* libbsdiff.a in Frameworks */,
+				5D06E9050FD68D7D005AE3F6 /* Foundation.framework in Frameworks */,
+				725C2EAC2782EF3C007CB7B5 /* ArgumentParser in Frameworks */,
+				5D06E8FF0FD68D6D005AE3F6 /* libbz2.dylib in Frameworks */,
+				5D1AF58B0FD7678C0065DB48 /* libxar.1.dylib in Frameworks */,
+				5D1AF5900FD767AD0065DB48 /* libxml2.dylib in Frameworks */,
+				5D1AF59A0FD767E50065DB48 /* libz.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		612279D60DB5470200AB99EA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725B81FB2781CD930041746F /* libcompression.tbd in Frameworks */,
+				5A06357323FE333600478A72 /* libed25519.a in Frameworks */,
+				EA1E281822B645CE004AA304 /* libbsdiff.a in Frameworks */,
+				14732BD119610A1200593899 /* AppKit.framework in Frameworks */,
+				14732BD019610A0D00593899 /* Foundation.framework in Frameworks */,
+				721CF1AB1AD764EB00D9AC09 /* libbz2.dylib in Frameworks */,
+				721CF1AA1AD7647000D9AC09 /* libxar.1.dylib in Frameworks */,
+				14652F8019A9740F00959E44 /* Security.framework in Frameworks */,
+				14732BD319610A1800593899 /* XCTest.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		61B5F90009C4CEE200B25A18 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72F0EC4D278A5BCA002A876A /* libbsdiff.a in Frameworks */,
+				72F0EC4C278A5BB9002A876A /* libbz2.tbd in Frameworks */,
+				72F0EC4B278A5BB2002A876A /* libxar.tbd in Frameworks */,
+				5A06357423FE33A400478A72 /* libed25519.a in Frameworks */,
+				14950073195FCE4E00BC5B5B /* AppKit.framework in Frameworks */,
+				14950072195FCE4B00BC5B5B /* Foundation.framework in Frameworks */,
+				61B5F90F09C4CF3A00B25A18 /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7205C43B1E13049400E370AE /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E285622B6619B004AA304 /* libed25519.a in Frameworks */,
+				EA1E281A22B645F4004AA304 /* libbsdiff.a in Frameworks */,
+				7205C4641E1306BE00E370AE /* libbz2.tbd in Frameworks */,
+				727DBAE526B5BBFD00111F0C /* ArgumentParser in Frameworks */,
+				7205C4631E1306B500E370AE /* libxar.tbd in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		721C24421CB753E6005440CB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */,
+				724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */,
+				F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB3691D31D0B7005D534A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB3901D333832005D534A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726B2B5A1C645FC900388755 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E07AA1CAF08D6001A286B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E07EC1CAF37BD001A286B /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E4A131C86C88F00C57C6A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				726E4A301C87DC1700C57C6A /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72B398CF1D3D879300EE297F /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E281722B645AE004AA304 /* libbsdiff.a in Frameworks */,
+				7267E5C91D3D8C4300D1BF90 /* CoreServices.framework in Frameworks */,
+				7267E5CA1D3D8C4800D1BF90 /* Foundation.framework in Frameworks */,
+				725B81FA2781AEAF0041746F /* libcompression.tbd in Frameworks */,
+				5A06357023FE332300478A72 /* libed25519.a in Frameworks */,
+				7267E5D61D3D8D3500D1BF90 /* libbz2.tbd in Frameworks */,
+				7267E5D51D3D8D2800D1BF90 /* libxar.tbd in Frameworks */,
+				721D8A611D48413B0032E472 /* Security.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72D9549B1CBB415B006F28BD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				724F76F91D6EAD0D00ECD062 /* Cocoa.framework in Frameworks */,
+				726F168626747CEB005BEA89 /* Sparkle.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8DC2EF560486A6940098B216 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725B81FC2781CDC20041746F /* libcompression.tbd in Frameworks */,
+				1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E282B22B660BE004AA304 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E285B22B66487004AA304 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				727DBAE726B5C47800111F0C /* ArgumentParser in Frameworks */,
+				EA1E286A22B6653D004AA304 /* libed25519.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E287322B666EB004AA304 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				727DBAE926B5C48A00111F0C /* ArgumentParser in Frameworks */,
+				EA1E287E22B66705004AA304 /* libed25519.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		034768DFFF38A50411DB9C8B /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				72B398D21D3D879300EE297F /* Autoupdate */,
+				5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */,
+				7205C43E1E13049400E370AE /* generate_appcast */,
+				726E07EF1CAF37BD001A286B /* Downloader.xpc */,
+				724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */,
+				726E07AD1CAF08D6001A286B /* Installer.xpc */,
+				724BB3931D333832005D534A /* InstallerStatus.xpc */,
+				61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */,
+				612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */,
+				72D9549E1CBB415B006F28BD /* sparkle.app */,
+				8DC2EF5B0486A6940098B216 /* Sparkle.framework */,
+				726E4A161C86C88F00C57C6A /* TestAppHelper.xpc */,
+				726B2B5D1C645FC900388755 /* UI Tests.xctest */,
+				721C24451CB753E6005440CB /* Updater.app */,
+				EA1E280F22B64522004AA304 /* libbsdiff.a */,
+				EA1E282D22B660BE004AA304 /* libed25519.a */,
+				EA1E285E22B66487004AA304 /* generate_keys */,
+				EA1E287622B666EB004AA304 /* sign_update */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		0867D691FE84028FC02AAC07 /* Sparkle */ = {
+			isa = PBXGroup;
+			children = (
+				1495006D195FBBBD00BC5B5B /* Sparkle */,
+				EA1E288122B6688A004AA304 /* Command Line Tools */,
+				14732BB81960EEB600593899 /* Resources */,
+				61227A100DB5484000AB99EA /* Tests */,
+				61B5F91D09C4CF7F00B25A18 /* Test Application */,
+				14732BB51960ECBA00593899 /* Vendor */,
+				1420DE391962322200203BB0 /* Documentation */,
+				FA1941C40D94A6EA00DD942E /* Configurations */,
+				72563CA9272E1C5400AF39F0 /* .github */,
+				726B2B5E1C645FC900388755 /* UI Tests */,
+				0867D69AFE84028FC02AAC07 /* Frameworks */,
+				034768DFFF38A50411DB9C8B /* Products */,
+			);
+			indentWidth = 4;
+			name = Sparkle;
+			sourceTree = "<group>";
+			tabWidth = 4;
+			usesTabs = 0;
+		};
+		0867D69AFE84028FC02AAC07 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				725B81F92781AEA40041746F /* libcompression.tbd */,
+				0867D6A5FE840307C02AAC07 /* AppKit.framework */,
+				721BC2081D17A553002BC71E /* Carbon.framework */,
+				525A278F133D6AE900FD8D70 /* Cocoa.framework */,
+				721BC2061D17A532002BC71E /* CoreFoundation.framework */,
+				721BC20A1D17A5AD002BC71E /* CoreServices.framework */,
+				0867D69BFE84028FC02AAC07 /* Foundation.framework */,
+				6117796E0D1112E000749C97 /* IOKit.framework */,
+				5D06E8FB0FD68D61005AE3F6 /* libbz2.dylib */,
+				726E076A1CA616B3001A286B /* libbz2.tbd */,
+				5D1AF5890FD7678C0065DB48 /* libxar.1.dylib */,
+				726E07681CA616A4001A286B /* libxar.tbd */,
+				5D1AF58F0FD767AD0065DB48 /* libxml2.dylib */,
+				5D1AF5990FD767E50065DB48 /* libz.dylib */,
+				61B5F8F609C4CEB300B25A18 /* Security.framework */,
+				7267E5CF1D3D8C8500D1BF90 /* SecurityFoundation.framework */,
+				724BB3B51D35AAC3005D534A /* ServiceManagement.framework */,
+				55C14F31136EFC2400649790 /* SystemConfiguration.framework */,
+				F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */,
+				61B5FC3F09C4FD4000B25A18 /* WebKit.framework */,
+				14732BD219610A1800593899 /* XCTest.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		089C1665FE841158C02AAC07 /* Framework Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */,
+				61AAE8220A321A7F00D8810D /* Sparkle.strings */,
+				55C14BD8136EF00C00649790 /* SUStatus.xib */,
+				723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */,
+				723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */,
+			);
+			name = "Framework Resources";
+			sourceTree = "<group>";
+		};
+		1420DE391962322200203BB0 /* Documentation */ = {
+			isa = PBXGroup;
+			children = (
+				721D8A891D4D273E0032E472 /* Internal */,
+			);
+			path = Documentation;
+			sourceTree = "<group>";
+		};
+		14732BB51960ECBA00593899 /* Vendor */ = {
+			isa = PBXGroup;
+			children = (
+				14732BB61960ECE800593899 /* bsdiff */,
+				EA1E283322B660ED004AA304 /* ed25519 */,
+			);
+			path = Vendor;
+			sourceTree = "<group>";
+		};
+		14732BB61960ECE800593899 /* bsdiff */ = {
+			isa = PBXGroup;
+			children = (
+				72B09CE91CEA18900052EF9E /* bscommon.c */,
+				72B09CEA1CEA18900052EF9E /* bscommon.h */,
+				5D06E8DB0FD68CB9005AE3F6 /* bsdiff.c */,
+				5D06E8DC0FD68CB9005AE3F6 /* bspatch.c */,
+				611142E810FB1BE5009810AA /* bspatch.h */,
+				7223E7611AD1AEFF008E3161 /* sais.c */,
+				7223E7621AD1AEFF008E3161 /* sais.h */,
+			);
+			path = bsdiff;
+			sourceTree = "<group>";
+		};
+		14732BB81960EEB600593899 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				14732BC21960F3FF00593899 /* bin */,
+				14732BBA1960EF7100593899 /* CHANGELOG */,
+				61C268090E2DB5D000175E6C /* LICENSE */,
+				14732BC11960F3B200593899 /* Makefile */,
+				147D6D9E1B66DC3C006607AB /* CheckLocalizations.swift */,
+				1420DF4F196247F900203BB0 /* Images.xcassets */,
+				14732BBC1960EFB500593899 /* README.markdown */,
+				14732BB91960EEEE00593899 /* SampleAppcast.xml */,
+				1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		14732BC21960F3FF00593899 /* bin */ = {
+			isa = PBXGroup;
+			children = (
+				14732BC31960F3FF00593899 /* generate_keys */,
+				14732BC41960F3FF00593899 /* sign_update */,
+			);
+			path = bin;
+			sourceTree = SOURCE_ROOT;
+		};
+		1495006D195FBBBD00BC5B5B /* Sparkle */ = {
+			isa = PBXGroup;
+			children = (
+				720767D11E2EB86200F9A850 /* AppKitPrevention.h */,
+				61299B3909CB055000B7442F /* Appcast Support */,
+				55C14BD5136EEFD000649790 /* Autoupdate */,
+				72F9EBE41D519425004AC8B6 /* Deprecated */,
+				089C1665FE841158C02AAC07 /* Framework Resources */,
+				721C24461CB753E6005440CB /* Installer Progress */,
+				729746481C91483B00FC134E /* IPC */,
+				61B5F8F309C4CE5900B25A18 /* Other Sources */,
+				EA1E286B22B665DB004AA304 /* Signatures */,
+				61F83F6E0DBFE07A006FDD30 /* Update Control */,
+				61299B3A09CB056100B7442F /* User Interface */,
+				72F94F551CC43D99002DEE68 /* XPC Services */,
+			);
+			path = Sparkle;
+			sourceTree = "<group>";
+		};
+		14958C7019AEBE350061B14F /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				14958C6B19AEBC530061B14F /* signed-test-file.txt */,
+				72AC6B2D1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg */,
+				C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */,
+				72AC6B271B9AAD6700F62325 /* SparkleTestCodeSignApp.tar */,
+				72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */,
+				72AC6B291B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 */,
+				72AC6B251B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz */,
+				72AC6B2B1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz */,
+				729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */,
+				72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */,
+				F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */,
+				14958C6C19AEBC610061B14F /* test-pubkey.pem */,
+				5AF6C74E1AEA46D10014A3AB /* test.pkg */,
+				5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */,
+				723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */,
+				725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */,
+				720DC50327A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml */,
+				720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */,
+				7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */,
+				722545B526805FF80036465C /* testappcast_info_updates.xml */,
+				5F1510A11C96E591006E1629 /* testnamespaces.xml */,
+				FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */,
+				5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
+				729F7EAB27366353004592DC /* test-links.xml */,
+				5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		55C14BD5136EEFD000649790 /* Autoupdate */ = {
+			isa = PBXGroup;
+			children = (
+				618FA6DB0DB485440026945C /* Installation */,
+				6101354A0DD25B7F0049ACDF /* Unarchiving */,
+				61CFB2C10E384958007A1735 /* Verifiers */,
+				7267E5A61D3D8A9900D1BF90 /* AgentConnection.h */,
+				7267E5A71D3D8A9900D1BF90 /* AgentConnection.m */,
+				7267E5A01D3D8A7E00D1BF90 /* AppInstaller.h */,
+				7267E5A11D3D8A7E00D1BF90 /* AppInstaller.m */,
+				7267E59E1D3D8A6F00D1BF90 /* main.m */,
+				7267E5AC1D3D8AB700D1BF90 /* SPUInstallationInputData.h */,
+				7267E5AD1D3D8AB700D1BF90 /* SPUInstallationInputData.m */,
+				729924921DF4A45000DBCDF5 /* SUUpdateValidator.h */,
+				729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */,
+				7267E5A91D3D8AA800D1BF90 /* TerminationListener.h */,
+				7267E5AA1D3D8AA800D1BF90 /* TerminationListener.m */,
+			);
+			path = Autoupdate;
+			sourceTree = "<group>";
+		};
+		5D06E8D90FD68C95005AE3F6 /* Binary Delta */ = {
+			isa = PBXGroup;
+			children = (
+				7267E56E1D3D895B00D1BF90 /* SUBinaryDeltaApply.h */,
+				7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */,
+				7267E5701D3D895B00D1BF90 /* SUBinaryDeltaCommon.h */,
+				7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */,
+				7267E5721D3D895B00D1BF90 /* SUBinaryDeltaCreate.h */,
+				7267E5731D3D895B00D1BF90 /* SUBinaryDeltaCreate.m */,
+				725EE481277BF17A00D820CE /* SPUDeltaArchiveProtocol.h */,
+				725C2EAD278386A8007CB7B5 /* SPUDeltaCompressionMode.h */,
+				725EE484277D375F00D820CE /* SPUDeltaArchive.h */,
+				725EE485277D375F00D820CE /* SPUDeltaArchive.m */,
+				728ED348277DA23400D9238F /* SPUSparkleDeltaArchive.h */,
+				728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */,
+				725EE47E277BF13A00D820CE /* SPUXarDeltaArchive.h */,
+				725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */,
+				7267E57D1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.h */,
+				7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */,
+				725C2EA92782EC61007CB7B5 /* main.swift */,
+				725C2EA82782EC44007CB7B5 /* Bridging-Header.h */,
+			);
+			name = "Binary Delta";
+			sourceTree = "<group>";
+		};
+		6101354A0DD25B7F0049ACDF /* Unarchiving */ = {
+			isa = PBXGroup;
+			children = (
+				5D06E8D90FD68C95005AE3F6 /* Binary Delta */,
+				7267E5801D3D89B300D1BF90 /* SUDiskImageUnarchiver.h */,
+				7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */,
+				7267E5821D3D89B300D1BF90 /* SUPipedUnarchiver.h */,
+				7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */,
+				721D5A8325C65D3F00D23BEA /* SUFlatPackageUnarchiver.h */,
+				721D5A8425C65D3F00D23BEA /* SUFlatPackageUnarchiver.m */,
+				7267E5841D3D89B300D1BF90 /* SUUnarchiver.h */,
+				7267E5851D3D89B300D1BF90 /* SUUnarchiver.m */,
+				72316BD11E0DA8430039EFD9 /* SUUnarchiverNotifier.h */,
+				72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */,
+				7267E5891D3D89CA00D1BF90 /* SUUnarchiverProtocol.h */,
+			);
+			name = Unarchiving;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		61227A100DB5484000AB99EA /* Tests */ = {
+			isa = PBXGroup;
+			children = (
+				14958C7019AEBE350061B14F /* Resources */,
+				72AFC6121B9A944200F6B565 /* Sparkle Unit Tests-Bridging-Header.h */,
+				612279DA0DB5470200AB99EA /* SparkleTests-Info.plist */,
+				5AA4DCD01C73E5510078F128 /* SUAppcastTest.swift */,
+				142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */,
+				F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */,
+				5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */,
+				72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
+				5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
+				72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
+				7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */,
+				5A5DD400249585E70045EB3E /* SUUpdateValidatorTest.swift */,
+				14950074195FDF5900BC5B5B /* SUUpdaterTest.m */,
+				61227A150DB548B800AB99EA /* SUVersionComparisonTest.m */,
+			);
+			path = Tests;
+			sourceTree = "<group>";
+		};
+		61299B3909CB055000B7442F /* Appcast Support */ = {
+			isa = PBXGroup;
+			children = (
+				72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */,
+				721AB11626C777D900D34A86 /* SPUDownloadDataPrivate.h */,
+				72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */,
+				7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */,
+				61B5FB9409C4F04600B25A18 /* SUAppcast.h */,
+				725DED72263D10C400E7FA8F /* SUAppcast+Private.h */,
+				61B5FB9509C4F04600B25A18 /* SUAppcast.m */,
+				61B5FC5309C5182000B25A18 /* SUAppcastItem.h */,
+				72EF30C6267C716A008CE987 /* SUAppcastItem+Private.h */,
+				61B5FC5409C5182000B25A18 /* SUAppcastItem.m */,
+				72EF30BD2675CF38008CE987 /* SPUAppcastItemState.h */,
+				72EF30BB2675CF38008CE987 /* SPUAppcastItemState.m */,
+				72EF30BA2675CF38008CE987 /* SPUAppcastItemStateResolver.h */,
+				722545B72680699D0036465C /* SPUAppcastItemStateResolver+Private.h */,
+				72EF30BC2675CF38008CE987 /* SPUAppcastItemStateResolver.m */,
+				721D588B25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.h */,
+				721D588C25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m */,
+				61A225A20D1C4AC000430CCD /* SUStandardVersionComparator.h */,
+				61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */,
+				61A2279A0D1CEE7600430CCD /* SUSystemProfiler.h */,
+				61A2279B0D1CEE7600430CCD /* SUSystemProfiler.m */,
+				61A2259C0D1C495D00430CCD /* SUVersionComparisonProtocol.h */,
+			);
+			name = "Appcast Support";
+			sourceTree = "<group>";
+		};
+		61299B3A09CB056100B7442F /* User Interface */ = {
+			isa = PBXGroup;
+			children = (
+				725F97811C8A997300265BE4 /* User Driver */,
+				725602D31C83551C00DAA70E /* SUApplicationInfo.h */,
+				725602D41C83551C00DAA70E /* SUApplicationInfo.m */,
+				6196CFE309C71ADE000DC222 /* SUStatusController.h */,
+				6196CFE409C71ADE000DC222 /* SUStatusController.m */,
+				61B5FCA009C5228F00B25A18 /* SUUpdateAlert.h */,
+				61B5FCA109C5228F00B25A18 /* SUUpdateAlert.m */,
+				723AC036259DBF1B00BDB4FA /* Web View */,
+				612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */,
+				612DCBAE0D488BC60015DBEA /* SUUpdatePermissionPrompt.m */,
+				723C8A521E2D60DB00C14942 /* SUTouchBarButtonGroup.h */,
+				723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */,
+				3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */,
+			);
+			name = "User Interface";
+			sourceTree = "<group>";
+		};
+		618FA6DB0DB485440026945C /* Installation */ = {
+			isa = PBXGroup;
+			children = (
+				7267E5BA1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.h */,
+				7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */,
+				7267E5BC1D3D8B2700D1BF90 /* SUInstaller.h */,
+				7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */,
+				722FB7E3260EE53F00EB571C /* SUNormalization.h */,
+				722FB7E4260EE53F00EB571C /* SUNormalization.m */,
+				7267E5B91D3D8B0B00D1BF90 /* SUInstallerProtocol.h */,
+				7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */,
+				7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */,
+				7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */,
+				7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */,
+			);
+			name = Installation;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		61B5F8F309C4CE5900B25A18 /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				61299B3509CB04E000B7442F /* Sparkle.h */,
+				721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */,
+				721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */,
+				729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */,
+				729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */,
+				7214B87F1D456A8500CB5CED /* SUBundleIcon.h */,
+				7214B8801D456A8500CB5CED /* SUBundleIcon.m */,
+				61299A5B09CA6D4500B7442F /* SUConstants.h */,
+				61299A5F09CA6EB100B7442F /* SUConstants.m */,
+				55E6F33219EC9F6C00005E76 /* SUErrors.h */,
+				14652F8319A9759F00959E44 /* SUExport.h */,
+				7267E5E31D3D90AA00D1BF90 /* SUFileManager.h */,
+				7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */,
+				61EF67580E25C5B400F754E0 /* SUHost.h */,
+				61EF67550E25B58D00F754E0 /* SUHost.m */,
+				7269E492264798200088C213 /* SPUSkippedUpdate.h */,
+				7269E493264798200088C213 /* SPUSkippedUpdate.m */,
+				72162B071C82C9600013C1C5 /* SULocalizations.h */,
+				55C14F04136EF6DB00649790 /* SULog.h */,
+				55C14F05136EF6DB00649790 /* SULog.m */,
+				727F34212605323500020E85 /* SULog+NSError.h */,
+				727F340A2605321D00020E85 /* SULog+NSError.m */,
+				726F2CE31BC9C33D001971A4 /* SUOperatingSystem.h */,
+				726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */,
+			);
+			includeInIndex = 1;
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		61B5F91D09C4CF7F00B25A18 /* Test Application */ = {
+			isa = PBXGroup;
+			children = (
+				726E4A171C86C88F00C57C6A /* TestAppHelper */,
+				61B5F92409C4CFC900B25A18 /* main.m */,
+				723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */,
+				723ABE00259A9E9E00BDB4FA /* MainMenu.xib */,
+				726E4A111C86C44A00C57C6A /* Sparkle-Test-App.entitlements */,
+				72E45CFB1B641961005C701A /* sparkletestcast.xml */,
+				725F97741C8A62F500265BE4 /* SUAdHocCodeSigning.h */,
+				725F97751C8A62F500265BE4 /* SUAdHocCodeSigning.m */,
+				725F97A21C8B304D00265BE4 /* SUInstallUpdateViewController.h */,
+				725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */,
+				725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */,
+				725F97821C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.h */,
+				725F97831C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m */,
+				72E45CF11B640CDD005C701A /* SUTestApplicationDelegate.h */,
+				72E45CF21B640CDD005C701A /* SUTestApplicationDelegate.m */,
+				A5BF4F1B1BC7668B007A052A /* SUTestWebServer.h */,
+				A5BF4F1C1BC7668B007A052A /* SUTestWebServer.m */,
+				72E45CF41B640DAE005C701A /* SUUpdateSettingsWindowController.h */,
+				72E45CF51B640DAE005C701A /* SUUpdateSettingsWindowController.m */,
+				72E45CF61B640DAE005C701A /* SUUpdateSettingsWindowController.xib */,
+				61B5F90409C4CEE200B25A18 /* TestApplication-Info.plist */,
+				72F0EC44278A55CA002A876A /* screenshot.png */,
+			);
+			name = "Test Application";
+			path = TestApplication;
+			sourceTree = "<group>";
+		};
+		61CFB2C10E384958007A1735 /* Verifiers */ = {
+			isa = PBXGroup;
+			children = (
+				7267E5981D3D8A5A00D1BF90 /* SUCodeSigningVerifier.h */,
+				7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */,
+				7267E59A1D3D8A5A00D1BF90 /* SUSignatureVerifier.h */,
+				7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */,
+			);
+			name = Verifiers;
+			path = ..;
+			sourceTree = "<group>";
+		};
+		61CFB2C20E38496B007A1735 /* Drivers */ = {
+			isa = PBXGroup;
+			children = (
+				72B767E81C9D114F00A07552 /* Update Drivers */,
+				72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */,
+				72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */,
+				72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */,
+				72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */,
+				7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */,
+				7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */,
+				7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */,
+				72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */,
+				72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */,
+				72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */,
+				72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */,
+				72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */,
+				72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */,
+				728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */,
+				728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */,
+				72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */,
+				72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */,
+				72B767C81C9B707000A07552 /* SUAppcastDriver.h */,
+				72B767C91C9B707000A07552 /* SUAppcastDriver.m */,
+			);
+			name = Drivers;
+			sourceTree = "<group>";
+		};
+		61F83F6E0DBFE07A006FDD30 /* Update Control */ = {
+			isa = PBXGroup;
+			children = (
+				61CFB2C20E38496B007A1735 /* Drivers */,
+				72DBA37B1D60CC34002594A8 /* SPUUpdatePermissionRequest.h */,
+				72DBA37C1D60CC34002594A8 /* SPUUpdatePermissionRequest.m */,
+				61B5F8E309C4CE3C00B25A18 /* SPUUpdater.h */,
+				61B5F8E409C4CE3C00B25A18 /* SPUUpdater.m */,
+				720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */,
+				720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */,
+				72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */,
+				72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */,
+				726E078B1CA891E9001A286B /* SPUUpdaterSettings.h */,
+				726E078C1CA891E9001A286B /* SPUUpdaterSettings.m */,
+				72F9EC3D1D5E823F004AC8B6 /* SPUUpdaterTimer.h */,
+				72F9EC3E1D5E823F004AC8B6 /* SPUUpdaterTimer.m */,
+				72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */,
+				72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */,
+			);
+			name = "Update Control";
+			sourceTree = "<group>";
+		};
+		7205C43F1E13049400E370AE /* generate_appcast */ = {
+			isa = PBXGroup;
+			children = (
+				7205C4461E1304C300E370AE /* Bridging-Header.h */,
+				7205C4471E1304CE00E370AE /* Appcast.swift */,
+				7205C4481E1304CE00E370AE /* ArchiveItem.swift */,
+				7205C44A1E1304CE00E370AE /* FeedXML.swift */,
+				7205C4401E13049400E370AE /* main.swift */,
+				7205C4491E1304CE00E370AE /* Signatures.swift */,
+				7205C44B1E1304CE00E370AE /* Unarchive.swift */,
+				FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */,
+			);
+			path = generate_appcast;
+			sourceTree = "<group>";
+		};
+		721C24461CB753E6005440CB /* Installer Progress */ = {
+			isa = PBXGroup;
+			children = (
+				721C24581CB7567D005440CB /* InstallerProgress-Info.plist */,
+				72D9547F1CBACC35006F28BD /* InstallerProgressAppController.h */,
+				72D954801CBACC35006F28BD /* InstallerProgressAppController.m */,
+				72D954851CBAD4AE006F28BD /* InstallerProgressDelegate.h */,
+				72D954821CBAD34F006F28BD /* main.m */,
+				72D954841CBAD418006F28BD /* ShowInstallerProgress.h */,
+				72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */,
+				722194511D3BF987004C34FF /* SPUInstallerAgentProtocol.h */,
+				7267E5A31D3D8A8A00D1BF90 /* StatusInfo.h */,
+				7267E5A41D3D8A8A00D1BF90 /* StatusInfo.m */,
+				722194521D3BFEB7004C34FF /* SUInstallerAgentInitiationProtocol.h */,
+			);
+			name = "Installer Progress";
+			path = InstallerProgress;
+			sourceTree = "<group>";
+		};
+		721D8A891D4D273E0032E472 /* Internal */ = {
+			isa = PBXGroup;
+			children = (
+				722589B61E0A24C6005EA0B9 /* Design Practices.md */,
+				721D8A881D4D272E0032E472 /* Installation.md */,
+				722589B51E0A24B9005EA0B9 /* Security.md */,
+			);
+			name = Internal;
+			sourceTree = "<group>";
+		};
+		723AC036259DBF1B00BDB4FA /* Web View */ = {
+			isa = PBXGroup;
+			children = (
+				723ABF1A259D055E00BDB4FA /* SUWebView.h */,
+				723AC00E259DBDAA00BDB4FA /* SUWebViewCommon.h */,
+				723AC00F259DBDAA00BDB4FA /* SUWebViewCommon.m */,
+				723ABFC2259D4CB300BDB4FA /* SUWKWebView.h */,
+				723ABFC3259D4CB300BDB4FA /* SUWKWebView.m */,
+				723ABF2E259D062F00BDB4FA /* SULegacyWebView.h */,
+				723ABF2F259D062F00BDB4FA /* SULegacyWebView.m */,
+			);
+			name = "Web View";
+			sourceTree = "<group>";
+		};
+		724BB36D1D31D0B7005D534A /* InstallerConnection */ = {
+			isa = PBXGroup;
+			children = (
+				724BB3741D31D0B7005D534A /* Info.plist */,
+				724BB3721D31D0B7005D534A /* main.m */,
+				724BB3801D31F186005D534A /* SUInstallerCommunicationProtocol.h */,
+				724BB36F1D31D0B7005D534A /* SUInstallerConnection.h */,
+				724BB3701D31D0B7005D534A /* SUInstallerConnection.m */,
+				724BB36E1D31D0B7005D534A /* SUInstallerConnectionProtocol.h */,
+				724BB3851D32A167005D534A /* SUXPCInstallerConnection.h */,
+				724BB3861D32A167005D534A /* SUXPCInstallerConnection.m */,
+				7218EC362623F31C008FECF3 /* org.sparkle-project.InstallerConnection.entitlements */,
+			);
+			name = InstallerConnection;
+			path = ../InstallerConnection;
+			sourceTree = "<group>";
+		};
+		724BB3941D333832005D534A /* InstallerStatus */ = {
+			isa = PBXGroup;
+			children = (
+				724BB39B1D333832005D534A /* Info.plist */,
+				724BB3991D333832005D534A /* main.m */,
+				724BB3961D333832005D534A /* SUInstallerStatus.h */,
+				724BB3971D333832005D534A /* SUInstallerStatus.m */,
+				724BB3951D333832005D534A /* SUInstallerStatusProtocol.h */,
+				7267E5DD1D3D8F5A00D1BF90 /* SUStatusInfoProtocol.h */,
+				724BB3A61D33461B005D534A /* SUXPCInstallerStatus.h */,
+				724BB3A71D33461B005D534A /* SUXPCInstallerStatus.m */,
+				7218EC372623F32E008FECF3 /* org.sparkle-project.InstallerStatus.entitlements */,
+			);
+			name = InstallerStatus;
+			path = ../InstallerStatus;
+			sourceTree = "<group>";
+		};
+		725F97811C8A997300265BE4 /* User Driver */ = {
+			isa = PBXGroup;
+			children = (
+				7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */,
+				7246E0A21C83B685003B4E75 /* SPUStandardUpdaterController.m */,
+				725CB9581C7121830064365A /* SPUStandardUserDriver.h */,
+				72D60CD828C2BA2100189AB8 /* SPUStandardUserDriver+Private.h */,
+				725CB9591C7121830064365A /* SPUStandardUserDriver.m */,
+				726E4A361C89116000C57C6A /* SPUStandardUserDriverDelegate.h */,
+				722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */,
+				726DF88D1C84277500188804 /* SPUUserUpdateState.h */,
+				7269E49C2648FC6C0088C213 /* SPUUserUpdateState+Private.h */,
+				7269E4992648F7C00088C213 /* SPUUserUpdateState.m */,
+				725CB9561C7120410064365A /* SPUUserDriver.h */,
+			);
+			name = "User Driver";
+			sourceTree = "<group>";
+		};
+		726B2B5E1C645FC900388755 /* UI Tests */ = {
+			isa = PBXGroup;
+			children = (
+				720B16431C66433D006985FB /* SUTestApplicationTest.swift */,
+				720B16421C66433D006985FB /* UITests-Info.plist */,
+			);
+			name = "UI Tests";
+			path = UITests;
+			sourceTree = "<group>";
+		};
+		726E07AE1CAF08D6001A286B /* InstallerLauncher */ = {
+			isa = PBXGroup;
+			children = (
+				726E07B51CAF08D6001A286B /* Info.plist */,
+				726E07B31CAF08D6001A286B /* main.m */,
+				726E07B01CAF08D6001A286B /* SUInstallerLauncher.h */,
+				72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */,
+				726E07B11CAF08D6001A286B /* SUInstallerLauncher.m */,
+				726E07AF1CAF08D6001A286B /* SUInstallerLauncherProtocol.h */,
+				721652671D3C8FED00FD13D8 /* SUInstallerLauncherStatus.h */,
+			);
+			name = InstallerLauncher;
+			path = ../InstallerLauncher;
+			sourceTree = "<group>";
+		};
+		726E07F01CAF37BD001A286B /* Downloader */ = {
+			isa = PBXGroup;
+			children = (
+				723B5D9F1CF7AB0100365F95 /* Info.plist */,
+				723B5DA01CF7AB0100365F95 /* main.m */,
+				729BB3D11D503826007C4276 /* org.sparkle-project.Downloader.entitlements */,
+				723B5DA21CF7AB0100365F95 /* SPUDownloader.h */,
+				723B5DA31CF7AB0100365F95 /* SPUDownloader.m */,
+				723B5DA41CF7AB0100365F95 /* SPUDownloaderDelegate.h */,
+				723B5DA51CF7AB0100365F95 /* SPUDownloaderProtocol.h */,
+			);
+			name = Downloader;
+			path = ../Downloader;
+			sourceTree = "<group>";
+		};
+		726E4A171C86C88F00C57C6A /* TestAppHelper */ = {
+			isa = PBXGroup;
+			children = (
+				726E4A1E1C86C88F00C57C6A /* Info.plist */,
+				726E4A1C1C86C88F00C57C6A /* main.m */,
+				726E4A191C86C88F00C57C6A /* TestAppHelper.h */,
+				726E4A1A1C86C88F00C57C6A /* TestAppHelper.m */,
+				726E4A181C86C88F00C57C6A /* TestAppHelperProtocol.h */,
+			);
+			name = TestAppHelper;
+			path = ../TestAppHelper;
+			sourceTree = "<group>";
+		};
+		729746481C91483B00FC134E /* IPC */ = {
+			isa = PBXGroup;
+			children = (
+				7267E5B41D3D8AEE00D1BF90 /* SPUInstallationInfo.h */,
+				7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */,
+				7267E5AF1D3D8AD500D1BF90 /* SPUMessageTypes.h */,
+				7267E5B01D3D8AD500D1BF90 /* SPUMessageTypes.m */,
+				726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */,
+				726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */,
+			);
+			name = IPC;
+			path = Autoupdate;
+			sourceTree = "<group>";
+		};
+		72B767E81C9D114F00A07552 /* Update Drivers */ = {
+			isa = PBXGroup;
+			children = (
+				7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */,
+				72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */,
+				72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */,
+				72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */,
+				72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */,
+				7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */,
+				7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */,
+				72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */,
+				72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */,
+			);
+			name = "Update Drivers";
+			sourceTree = "<group>";
+		};
+		72D9549F1CBB415C006F28BD /* sparkle-cli */ = {
+			isa = PBXGroup;
+			children = (
+				72D954AB1CBB415C006F28BD /* Info.plist */,
+				72D954A41CBB415C006F28BD /* main.m */,
+				72D954A01CBB415C006F28BD /* SPUCommandLineDriver.h */,
+				72D954A11CBB415C006F28BD /* SPUCommandLineDriver.m */,
+				72D954B61CBB467F006F28BD /* SPUCommandLineUserDriver.h */,
+				72D954B71CBB467F006F28BD /* SPUCommandLineUserDriver.m */,
+			);
+			path = "sparkle-cli";
+			sourceTree = "<group>";
+		};
+		72F94F551CC43D99002DEE68 /* XPC Services */ = {
+			isa = PBXGroup;
+			children = (
+				726E07F01CAF37BD001A286B /* Downloader */,
+				724BB36D1D31D0B7005D534A /* InstallerConnection */,
+				726E07AE1CAF08D6001A286B /* InstallerLauncher */,
+				724BB3941D333832005D534A /* InstallerStatus */,
+				72F94F561CC44DE1002DEE68 /* SPUXPCServiceInfo.h */,
+				72F94F571CC44DE1002DEE68 /* SPUXPCServiceInfo.m */,
+			);
+			name = "XPC Services";
+			sourceTree = "<group>";
+		};
+		72F9EBE41D519425004AC8B6 /* Deprecated */ = {
+			isa = PBXGroup;
+			children = (
+				72F9EBE01D517E2F004AC8B6 /* SUUpdater.h */,
+				72F9EBE11D517E2F004AC8B6 /* SUUpdater.m */,
+				72A6F9891C94E2D6005F404C /* SUUpdaterDelegate.h */,
+			);
+			name = Deprecated;
+			sourceTree = "<group>";
+		};
+		EA1E283322B660ED004AA304 /* ed25519 */ = {
+			isa = PBXGroup;
+			children = (
+				EA1E283422B660ED004AA304 /* precomp_data.h */,
+				EA1E283522B660ED004AA304 /* seed.c */,
+				EA1E283622B660ED004AA304 /* fe.c */,
+				EA1E283722B660ED004AA304 /* verify.c */,
+				EA1E283822B660ED004AA304 /* ge.c */,
+				EA1E283922B660ED004AA304 /* sc.c */,
+				EA1E283A22B660ED004AA304 /* sign.c */,
+				EA1E283B22B660ED004AA304 /* sha512.h */,
+				EA1E283C22B660ED004AA304 /* key_exchange.c */,
+				EA1E283D22B660ED004AA304 /* add_scalar.c */,
+				EA1E283E22B660ED004AA304 /* ed25519.h */,
+				EA1E283F22B660ED004AA304 /* fe.h */,
+				EA1E284022B660ED004AA304 /* keypair.c */,
+				EA1E284122B660ED004AA304 /* fixedint.h */,
+				EA1E284222B660ED004AA304 /* sha512.c */,
+				EA1E284322B660ED004AA304 /* sc.h */,
+				EA1E284422B660ED004AA304 /* ge.h */,
+			);
+			name = ed25519;
+			path = "ed25519-sparkle/src";
+			sourceTree = "<group>";
+		};
+		EA1E285F22B66487004AA304 /* generate_keys */ = {
+			isa = PBXGroup;
+			children = (
+				EA1E286622B664A5004AA304 /* Bridging-Header.h */,
+				EA1E286022B66487004AA304 /* main.swift */,
+			);
+			path = generate_keys;
+			sourceTree = "<group>";
+		};
+		EA1E286B22B665DB004AA304 /* Signatures */ = {
+			isa = PBXGroup;
+			children = (
+				EA1E286C22B665E8004AA304 /* SUSignatures.h */,
+				EA1E286D22B665E8004AA304 /* SUSignatures.m */,
+			);
+			name = Signatures;
+			sourceTree = "<group>";
+		};
+		EA1E287722B666EB004AA304 /* sign_update */ = {
+			isa = PBXGroup;
+			children = (
+				EA1E287F22B667D8004AA304 /* Bridging-Header.h */,
+				EA1E287822B666EB004AA304 /* main.swift */,
+			);
+			path = sign_update;
+			sourceTree = "<group>";
+		};
+		EA1E288122B6688A004AA304 /* Command Line Tools */ = {
+			isa = PBXGroup;
+			children = (
+				7205C43F1E13049400E370AE /* generate_appcast */,
+				EA1E285F22B66487004AA304 /* generate_keys */,
+				EA1E287722B666EB004AA304 /* sign_update */,
+				72D9549F1CBB415C006F28BD /* sparkle-cli */,
+			);
+			name = "Command Line Tools";
+			sourceTree = "<group>";
+		};
+		FA1941C40D94A6EA00DD942E /* Configurations */ = {
+			isa = PBXGroup;
+			children = (
+				14732BB1195FF6B700593899 /* .clang-format */,
+				EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */,
+				EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */,
+				EA1E281622B64549004AA304 /* bsdiff-Shared.xcconfig */,
+				EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */,
+				EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */,
+				EA1E286922B664FD004AA304 /* CommandLineTool-Shared.xcconfig */,
+				FA1941D00D94A70100DD942E /* ConfigCommon.xcconfig */,
+				149B78631B7D3A0C00D7D62C /* ConfigCommonCoverage.xcconfig */,
+				FA1941CF0D94A70100DD942E /* ConfigCommonDebug.xcconfig */,
+				FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */,
+				728638EE1CAF589C00783084 /* ConfigDownloader.xcconfig */,
+				72F94ED61CC344A7002DEE68 /* ConfigDownloaderDebug.xcconfig */,
+				FA1941D10D94A70100DD942E /* ConfigFramework.xcconfig */,
+				FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */,
+				724BB37E1D31D1EA005D534A /* ConfigInstallerConnection.xcconfig */,
+				724BB37F1D31D1EA005D534A /* ConfigInstallerConnectionDebug.xcconfig */,
+				726E07C11CAF1E79001A286B /* ConfigInstallerLauncher.xcconfig */,
+				72F94ED51CC3441A002DEE68 /* ConfigInstallerLauncherDebug.xcconfig */,
+				721C24571CB754E8005440CB /* ConfigInstallerProgress.xcconfig */,
+				724BB3A41D3338C8005D534A /* ConfigInstallerStatus.xcconfig */,
+				724BB3A51D3338C8005D534A /* ConfigInstallerStatusDebug.xcconfig */,
+				FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */,
+				72D954B01CBB41E2006F28BD /* ConfigSparkleTool.xcconfig */,
+				722FB7CA1DD69897001D40CE /* ConfigSwift.xcconfig */,
+				7205C4511E13053500E370AE /* ConfigSwiftDebug.xcconfig */,
+				7205C4521E13053500E370AE /* ConfigSwiftRelease.xcconfig */,
+				FA1941CD0D94A70100DD942E /* ConfigTestApp.xcconfig */,
+				72F94EDA1CC36C37002DEE68 /* ConfigTestAppDebug.xcconfig */,
+				726E4A281C86CAB500C57C6A /* ConfigTestAppHelper.xcconfig */,
+				72F94EDB1CC36C6F002DEE68 /* ConfigTestAppHelperDebug.xcconfig */,
+				729F10FD1C65A9B500DFCCC5 /* ConfigUITest.xcconfig */,
+				729F10FE1C65A9B500DFCCC5 /* ConfigUITestCoverage.xcconfig */,
+				7205C46E1E13254500E370AE /* ConfigUITestDebug.xcconfig */,
+				7205C46F1E13255900E370AE /* ConfigUITestRelease.xcconfig */,
+				FA3AAF3B1050B273004B3130 /* ConfigUnitTest.xcconfig */,
+				149B78641B7D3A4800D7D62C /* ConfigUnitTestCoverage.xcconfig */,
+				7205C46C1E13244800E370AE /* ConfigUnitTestDebug.xcconfig */,
+				7205C46D1E13245600E370AE /* ConfigUnitTestRelease.xcconfig */,
+				EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */,
+				EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */,
+				EA1E285922B6622E004AA304 /* ed25519-Shared.xcconfig */,
+				14732BC91960F70A00593899 /* make-release-package.sh */,
+				14652F7919A93E5F00959E44 /* set-git-version-info.sh */,
+				72045CE426FEE708004F96E5 /* strip-xpc-services.sh */,
+				720C192827127A3800740C8E /* release-move-tag.sh */,
+				720B4C2325EBFAFD005A0592 /* link-tools.sh */,
+				146EC84E19A68CF8004A50C5 /* Sparkle.podspec */,
+			);
+			path = Configurations;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXHeadersBuildPhase section */
+		8DC2EF500486A6940098B216 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				61299B3609CB04E000B7442F /* Sparkle.h in Headers */,
+				72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */,
+				72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */,
+				72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */,
+				72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */,
+				72EF30C12675CF38008CE987 /* SPUAppcastItemState.h in Headers */,
+				7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */,
+				7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */,
+				7267E5B61D3D8AEE00D1BF90 /* SPUInstallationInfo.h in Headers */,
+				72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */,
+				72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */,
+				723ABF30259D062F00BDB4FA /* SULegacyWebView.h in Headers */,
+				721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */,
+				7267E5B11D3D8AD500D1BF90 /* SPUMessageTypes.h in Headers */,
+				728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */,
+				723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */,
+				72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */,
+				7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */,
+				726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */,
+				7246E0A31C83B685003B4E75 /* SPUStandardUpdaterController.h in Headers */,
+				725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */,
+				726E4A371C89116000C57C6A /* SPUStandardUserDriverDelegate.h in Headers */,
+				72D60CD928C2BAE900189AB8 /* SPUStandardUserDriver+Private.h in Headers */,
+				722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */,
+				729F7EAF273F1840004592DC /* SPUUserAgent+Private.h in Headers */,
+				72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */,
+				72EF30BE2675CF38008CE987 /* SPUAppcastItemStateResolver.h in Headers */,
+				72EF30C7267C716A008CE987 /* SUAppcastItem+Private.h in Headers */,
+				72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */,
+				61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */,
+				726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */,
+				72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */,
+				7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */,
+				72DBA37D1D60CC34002594A8 /* SPUUpdatePermissionRequest.h in Headers */,
+				61B5F8ED09C4CE3C00B25A18 /* SPUUpdater.h in Headers */,
+				720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */,
+				72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */,
+				726E078D1CA891E9001A286B /* SPUUpdaterSettings.h in Headers */,
+				72F9EC3F1D5E823F004AC8B6 /* SPUUpdaterTimer.h in Headers */,
+				7269E494264798200088C213 /* SPUSkippedUpdate.h in Headers */,
+				723ABFC4259D4CB300BDB4FA /* SUWKWebView.h in Headers */,
+				725CB9571C7120410064365A /* SPUUserDriver.h in Headers */,
+				72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */,
+				72F94F581CC44DE1002DEE68 /* SPUXPCServiceInfo.h in Headers */,
+				61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */,
+				72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
+				61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */,
+				725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */,
+				7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */,
+				55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */,
+				14652F8419A978C200959E44 /* SUExport.h in Headers */,
+				7267E5E51D3D90AA00D1BF90 /* SUFileManager.h in Headers */,
+				72B3DEC91E23472200457642 /* SPUDownloadedUpdate.h in Headers */,
+				61EF67590E25C5B400F754E0 /* SUHost.h in Headers */,
+				723AC010259DBDAA00BDB4FA /* SUWebViewCommon.h in Headers */,
+				72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */,
+				55C14F06136EF6DB00649790 /* SULog.h in Headers */,
+				EA1E286E22B665F0004AA304 /* SUSignatures.h in Headers */,
+				723ABF1B259D055E00BDB4FA /* SUWebView.h in Headers */,
+				72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */,
+				726F2CE51BC9C33D001971A4 /* SUOperatingSystem.h in Headers */,
+				61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */,
+				6196CFF909C72148000DC222 /* SUStatusController.h in Headers */,
+				61A2279C0D1CEE7600430CCD /* SUSystemProfiler.h in Headers */,
+				61B5FCDF09C52A9F00B25A18 /* SUUpdateAlert.h in Headers */,
+				72A1C2631CD6849C004CD282 /* SUUpdatePermissionPrompt.h in Headers */,
+				72A450531C69A68900D67EEA /* SUUpdatePermissionResponse.h in Headers */,
+				72F9EBE21D517E2F004AC8B6 /* SUUpdater.h in Headers */,
+				721D588D25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.h in Headers */,
+				72A6F98A1C94E2D6005F404C /* SUUpdaterDelegate.h in Headers */,
+				61A2259E0D1C495D00430CCD /* SUVersionComparisonProtocol.h in Headers */,
+				3772FEA913DE0B6B00F79537 /* SUVersionDisplayProtocol.h in Headers */,
+				724BB3871D32A167005D534A /* SUXPCInstallerConnection.h in Headers */,
+				724BB3A81D33461B005D534A /* SUXPCInstallerStatus.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXLegacyTarget section */
+		14732BC51960F69300593899 /* Distribution */ = {
+			isa = PBXLegacyTarget;
+			buildArgumentsString = "$(SRCROOT)/Configurations/make-release-package.sh $(ACTION)";
+			buildConfigurationList = 14732BC61960F69300593899 /* Build configuration list for PBXLegacyTarget "Distribution" */;
+			buildPhases = (
+			);
+			buildToolPath = bash;
+			buildWorkingDirectory = "";
+			dependencies = (
+				14732BCB1960F73500593899 /* PBXTargetDependency */,
+				72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */,
+				72F94F6B1CC4A0C8002DEE68 /* PBXTargetDependency */,
+				725148E9266D918900247C9C /* PBXTargetDependency */,
+				7218EC352623ED97008FECF3 /* PBXTargetDependency */,
+				7218EC332623ED94008FECF3 /* PBXTargetDependency */,
+				1454BA1619637EDB00344E57 /* PBXTargetDependency */,
+				14732BCF1960F73500593899 /* PBXTargetDependency */,
+				7205C46B1E13070300E370AE /* PBXTargetDependency */,
+				FA344BA724C869A300B2A401 /* PBXTargetDependency */,
+				FA344BA524C8699E00B2A401 /* PBXTargetDependency */,
+				895C5DC724D78F700058A82D /* PBXTargetDependency */,
+			);
+			name = Distribution;
+			passBuildSettingsInEnvironment = 1;
+			productName = Distribution;
+		};
+/* End PBXLegacyTarget section */
+
+/* Begin PBXNativeTarget section */
+		5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5D06E8DA0FD68C95005AE3F6 /* Build configuration list for PBXNativeTarget "BinaryDelta" */;
+			buildPhases = (
+				5D06E8CD0FD68C7C005AE3F6 /* Sources */,
+				5D06E8CE0FD68C7C005AE3F6 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				376769AF23442F320077B8F7 /* PBXTargetDependency */,
+			);
+			name = BinaryDelta;
+			packageProductDependencies = (
+				725C2EAB2782EF3C007CB7B5 /* ArgumentParser */,
+			);
+			productName = BinaryDelta;
+			productReference = 5D06E8D00FD68C7C005AE3F6 /* BinaryDelta */;
+			productType = "com.apple.product-type.tool";
+		};
+		612279D80DB5470200AB99EA /* Sparkle Unit Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 612279DD0DB5470300AB99EA /* Build configuration list for PBXNativeTarget "Sparkle Unit Tests" */;
+			buildPhases = (
+				612279D50DB5470200AB99EA /* Sources */,
+				612279D60DB5470200AB99EA /* Frameworks */,
+				14958C6D19AEBC890061B14F /* Resources */,
+				142E0E0119A6A13300E4312B /* Copy Files */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				61FA528D0E2D9EB200EF58AD /* PBXTargetDependency */,
+				376769B123442F490077B8F7 /* PBXTargetDependency */,
+			);
+			name = "Sparkle Unit Tests";
+			productName = "Sparkle Unit Tests";
+			productReference = 612279D90DB5470200AB99EA /* Sparkle Unit Tests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+		61B5F90109C4CEE200B25A18 /* Sparkle Test App */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 61B5F90509C4CEE300B25A18 /* Build configuration list for PBXNativeTarget "Sparkle Test App" */;
+			buildPhases = (
+				61B5F8FE09C4CEE200B25A18 /* Resources */,
+				61B5F8FF09C4CEE200B25A18 /* Sources */,
+				61B5F90009C4CEE200B25A18 /* Frameworks */,
+				61B5FB4D09C4E9FA00B25A18 /* Copy Frameworks */,
+				726E4A261C86C88F00C57C6A /* Embed XPC Services */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72CCCC19287B3D3D00E7156B /* PBXTargetDependency */,
+				72CCCC17287B3D3400E7156B /* PBXTargetDependency */,
+				61B5F91C09C4CF7200B25A18 /* PBXTargetDependency */,
+				726E4A201C86C88F00C57C6A /* PBXTargetDependency */,
+			);
+			name = "Sparkle Test App";
+			productName = "Test Application";
+			productReference = 61B5F90209C4CEE200B25A18 /* Sparkle Test App.app */;
+			productType = "com.apple.product-type.application";
+		};
+		7205C43D1E13049400E370AE /* generate_appcast */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7205C4451E13049400E370AE /* Build configuration list for PBXNativeTarget "generate_appcast" */;
+			buildPhases = (
+				7205C43A1E13049400E370AE /* Sources */,
+				7205C43B1E13049400E370AE /* Frameworks */,
+				7205C43C1E13049400E370AE /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72CCCC21287B3DA400E7156B /* PBXTargetDependency */,
+				72CCCC1F287B3DA100E7156B /* PBXTargetDependency */,
+			);
+			name = generate_appcast;
+			packageProductDependencies = (
+				727DBAE426B5BBFD00111F0C /* ArgumentParser */,
+			);
+			productName = generate_appcast;
+			productReference = 7205C43E1E13049400E370AE /* generate_appcast */;
+			productType = "com.apple.product-type.tool";
+		};
+		721C24441CB753E6005440CB /* Installer Progress */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 721C24561CB753E7005440CB /* Build configuration list for PBXNativeTarget "Installer Progress" */;
+			buildPhases = (
+				721C24411CB753E6005440CB /* Sources */,
+				721C24421CB753E6005440CB /* Frameworks */,
+				721C24431CB753E6005440CB /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "Installer Progress";
+			productName = "Installer Progress";
+			productReference = 721C24451CB753E6005440CB /* Updater.app */;
+			productType = "com.apple.product-type.application";
+		};
+		724BB36B1D31D0B7005D534A /* SparkleInstallerConnection */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 724BB3781D31D0B7005D534A /* Build configuration list for PBXNativeTarget "SparkleInstallerConnection" */;
+			buildPhases = (
+				724BB3681D31D0B7005D534A /* Sources */,
+				724BB3691D31D0B7005D534A /* Frameworks */,
+				724BB36A1D31D0B7005D534A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SparkleInstallerConnection;
+			productName = InstallerConnection;
+			productReference = 724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		724BB3921D333832005D534A /* SparkleInstallerStatus */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 724BB39F1D333832005D534A /* Build configuration list for PBXNativeTarget "SparkleInstallerStatus" */;
+			buildPhases = (
+				724BB38F1D333832005D534A /* Sources */,
+				724BB3901D333832005D534A /* Frameworks */,
+				724BB3911D333832005D534A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SparkleInstallerStatus;
+			productName = InstallerStatus;
+			productReference = 724BB3931D333832005D534A /* InstallerStatus.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		726B2B5C1C645FC900388755 /* UI Tests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 726B2B671C645FC900388755 /* Build configuration list for PBXNativeTarget "UI Tests" */;
+			buildPhases = (
+				726B2B591C645FC900388755 /* Sources */,
+				726B2B5A1C645FC900388755 /* Frameworks */,
+				726B2B5B1C645FC900388755 /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				726B2B631C645FC900388755 /* PBXTargetDependency */,
+			);
+			name = "UI Tests";
+			productName = "UI Tests";
+			productReference = 726B2B5D1C645FC900388755 /* UI Tests.xctest */;
+			productType = "com.apple.product-type.bundle.ui-testing";
+		};
+		726E07AC1CAF08D6001A286B /* SparkleInstallerLauncher */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 726E07B91CAF08D6001A286B /* Build configuration list for PBXNativeTarget "SparkleInstallerLauncher" */;
+			buildPhases = (
+				726E07A91CAF08D6001A286B /* Sources */,
+				726E07AA1CAF08D6001A286B /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SparkleInstallerLauncher;
+			productName = InstallerLauncher;
+			productReference = 726E07AD1CAF08D6001A286B /* Installer.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		726E07EE1CAF37BD001A286B /* SparkleDownloader */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 726E07FB1CAF37BD001A286B /* Build configuration list for PBXNativeTarget "SparkleDownloader" */;
+			buildPhases = (
+				726E07EB1CAF37BD001A286B /* Sources */,
+				726E07EC1CAF37BD001A286B /* Frameworks */,
+				726E07ED1CAF37BD001A286B /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = SparkleDownloader;
+			productName = UpdateDownloader;
+			productReference = 726E07EF1CAF37BD001A286B /* Downloader.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		726E4A151C86C88F00C57C6A /* TestAppHelper */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 726E4A221C86C88F00C57C6A /* Build configuration list for PBXNativeTarget "TestAppHelper" */;
+			buildPhases = (
+				726E4A121C86C88F00C57C6A /* Sources */,
+				726E4A131C86C88F00C57C6A /* Frameworks */,
+				726E4A141C86C88F00C57C6A /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72CCCC15287B3D1900E7156B /* PBXTargetDependency */,
+			);
+			name = TestAppHelper;
+			productName = TestAppHelper;
+			productReference = 726E4A161C86C88F00C57C6A /* TestAppHelper.xpc */;
+			productType = "com.apple.product-type.xpc-service";
+		};
+		72B398D11D3D879300EE297F /* Autoupdate */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 72B398D61D3D879400EE297F /* Build configuration list for PBXNativeTarget "Autoupdate" */;
+			buildPhases = (
+				72B398CE1D3D879300EE297F /* Sources */,
+				72B398CF1D3D879300EE297F /* Frameworks */,
+				72B398D01D3D879300EE297F /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				37DC0CE62340667000501A67 /* PBXTargetDependency */,
+				5A06357223FE332300478A72 /* PBXTargetDependency */,
+			);
+			name = Autoupdate;
+			productName = Autoupdate;
+			productReference = 72B398D21D3D879300EE297F /* Autoupdate */;
+			productType = "com.apple.product-type.tool";
+		};
+		72D9549D1CBB415B006F28BD /* sparkle-cli */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 72D954AF1CBB415C006F28BD /* Build configuration list for PBXNativeTarget "sparkle-cli" */;
+			buildPhases = (
+				72D9549A1CBB415B006F28BD /* Sources */,
+				72D9549B1CBB415B006F28BD /* Frameworks */,
+				72D9549C1CBB415B006F28BD /* Resources */,
+				72D954B41CBB4469006F28BD /* Copy Sparkle */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				726F168926747CEB005BEA89 /* PBXTargetDependency */,
+			);
+			name = "sparkle-cli";
+			productName = "sparkle-cli";
+			productReference = 72D9549E1CBB415B006F28BD /* sparkle.app */;
+			productType = "com.apple.product-type.application";
+		};
+		8DC2EF4F0486A6940098B216 /* Sparkle */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Sparkle" */;
+			buildPhases = (
+				8DC2EF500486A6940098B216 /* Headers */,
+				8DC2EF520486A6940098B216 /* Resources */,
+				142E0E0319A6A24100E4312B /* Copy Tools */,
+				72045CDF26FEE51D004F96E5 /* Copy XPC Services */,
+				72045CE626FEE8CC004F96E5 /* Strip XPC Services */,
+				8DC2EF540486A6940098B216 /* Sources */,
+				8DC2EF560486A6940098B216 /* Frameworks */,
+				6131B1910DDCDE32005215F0 /* Run Script: Set Git Version Info */,
+				720B4C2125EBFAA5005A0592 /* Run Script: Link Tools */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72045CD826FEE471004F96E5 /* PBXTargetDependency */,
+				72045CDA26FEE471004F96E5 /* PBXTargetDependency */,
+				72045CDC26FEE471004F96E5 /* PBXTargetDependency */,
+				72045CDE26FEE471004F96E5 /* PBXTargetDependency */,
+				72A5D5AC1D6929260009E5AC /* PBXTargetDependency */,
+				72D954BA1CBB6E27006F28BD /* PBXTargetDependency */,
+			);
+			name = Sparkle;
+			productInstallPath = "$(HOME)/Library/Frameworks";
+			productName = Sparkle;
+			productReference = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+		EA1E280E22B64522004AA304 /* bsdiff */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EA1E281322B64522004AA304 /* Build configuration list for PBXNativeTarget "bsdiff" */;
+			buildPhases = (
+				EA1E280C22B64522004AA304 /* Sources */,
+				EA1E282522B6467A004AA304 /* Copy Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = bsdiff;
+			productName = bsdiff;
+			productReference = EA1E280F22B64522004AA304 /* libbsdiff.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		EA1E282C22B660BE004AA304 /* ed25519 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EA1E282E22B660BE004AA304 /* Build configuration list for PBXNativeTarget "ed25519" */;
+			buildPhases = (
+				EA1E282A22B660BE004AA304 /* Sources */,
+				EA1E282B22B660BE004AA304 /* Frameworks */,
+				EA1E283222B660C6004AA304 /* Copy Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ed25519;
+			productName = ed25519;
+			productReference = EA1E282D22B660BE004AA304 /* libed25519.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+		EA1E285D22B66487004AA304 /* generate_keys */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EA1E286222B66487004AA304 /* Build configuration list for PBXNativeTarget "generate_keys" */;
+			buildPhases = (
+				EA1E285A22B66487004AA304 /* Sources */,
+				EA1E285B22B66487004AA304 /* Frameworks */,
+				EA1E285C22B66487004AA304 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72CCCC1B287B3D9000E7156B /* PBXTargetDependency */,
+			);
+			name = generate_keys;
+			packageProductDependencies = (
+				727DBAE626B5C47800111F0C /* ArgumentParser */,
+			);
+			productName = generate_keys;
+			productReference = EA1E285E22B66487004AA304 /* generate_keys */;
+			productType = "com.apple.product-type.tool";
+		};
+		EA1E287522B666EB004AA304 /* sign_update */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = EA1E287D22B666EB004AA304 /* Build configuration list for PBXNativeTarget "sign_update" */;
+			buildPhases = (
+				EA1E287222B666EB004AA304 /* Sources */,
+				EA1E287322B666EB004AA304 /* Frameworks */,
+				EA1E287422B666EB004AA304 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				72CCCC1D287B3D9600E7156B /* PBXTargetDependency */,
+			);
+			name = sign_update;
+			packageProductDependencies = (
+				727DBAE826B5C48A00111F0C /* ArgumentParser */,
+			);
+			productName = sign_update;
+			productReference = EA1E287622B666EB004AA304 /* sign_update */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		0867D690FE84028FC02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				CLASSPREFIX = SU;
+				LastSwiftUpdateCheck = 1020;
+				LastUpgradeCheck = 1400;
+				ORGANIZATIONNAME = "Sparkle Project";
+				TargetAttributes = {
+					5D06E8CF0FD68C7C005AE3F6 = {
+						LastSwiftMigration = 1320;
+					};
+					612279D80DB5470200AB99EA = {
+						LastSwiftMigration = 0800;
+						TestTargetID = 8DC2EF4F0486A6940098B216;
+					};
+					61B5F90109C4CEE200B25A18 = {
+						SystemCapabilities = {
+							com.apple.Sandbox = {
+								enabled = 1;
+							};
+						};
+					};
+					7205C43D1E13049400E370AE = {
+						CreatedOnToolsVersion = 8.2.1;
+						LastSwiftMigration = 1200;
+						ProvisioningStyle = Automatic;
+					};
+					721C24441CB753E6005440CB = {
+						CreatedOnToolsVersion = 7.3;
+					};
+					724BB36B1D31D0B7005D534A = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+					724BB3921D333832005D534A = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+					726B2B5C1C645FC900388755 = {
+						CreatedOnToolsVersion = 7.2.1;
+						LastSwiftMigration = 0800;
+						TestTargetID = 61B5F90109C4CEE200B25A18;
+					};
+					726E07AC1CAF08D6001A286B = {
+						CreatedOnToolsVersion = 7.3;
+					};
+					726E07EE1CAF37BD001A286B = {
+						CreatedOnToolsVersion = 7.3;
+						SystemCapabilities = {
+							com.apple.Sandbox = {
+								enabled = 1;
+							};
+						};
+					};
+					726E4A151C86C88F00C57C6A = {
+						CreatedOnToolsVersion = 7.2.1;
+						SystemCapabilities = {
+							com.apple.Sandbox = {
+								enabled = 0;
+							};
+						};
+					};
+					72B398D11D3D879300EE297F = {
+						CreatedOnToolsVersion = 7.3.1;
+					};
+					72D9549D1CBB415B006F28BD = {
+						CreatedOnToolsVersion = 7.3;
+					};
+					895C5DC024D78E210058A82D = {
+						CreatedOnToolsVersion = 12.0;
+					};
+					EA1E280E22B64522004AA304 = {
+						CreatedOnToolsVersion = 10.2.1;
+					};
+					EA1E282C22B660BE004AA304 = {
+						CreatedOnToolsVersion = 10.2.1;
+					};
+					EA1E285D22B66487004AA304 = {
+						CreatedOnToolsVersion = 10.2.1;
+					};
+					EA1E287522B666EB004AA304 = {
+						CreatedOnToolsVersion = 10.2.1;
+					};
+				};
+			};
+			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */;
+			compatibilityVersion = "Xcode 6.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				zh_TW,
+				en,
+				ca,
+				cs,
+				cy,
+				da,
+				de,
+				es,
+				fi,
+				fr,
+				he,
+				hu,
+				id,
+				is,
+				it,
+				ja,
+				ko,
+				nl,
+				pl,
+				ru,
+				sk,
+				sv,
+				th,
+				tr,
+				zh_CN,
+				pt,
+				ro,
+				sl,
+				uk,
+				ar,
+				nb,
+				el,
+				"zh-Hans",
+				"zh-Hant",
+				"fr-CA",
+				"pt-PT",
+				"pt-BR",
+				Base,
+				hr,
+				fa,
+				zh_HK,
+			);
+			mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */;
+			packageReferences = (
+				727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */,
+			);
+			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8DC2EF4F0486A6940098B216 /* Sparkle */,
+				72B398D11D3D879300EE297F /* Autoupdate */,
+				726E07AC1CAF08D6001A286B /* SparkleInstallerLauncher */,
+				724BB36B1D31D0B7005D534A /* SparkleInstallerConnection */,
+				724BB3921D333832005D534A /* SparkleInstallerStatus */,
+				726E07EE1CAF37BD001A286B /* SparkleDownloader */,
+				61B5F90109C4CEE200B25A18 /* Sparkle Test App */,
+				726E4A151C86C88F00C57C6A /* TestAppHelper */,
+				612279D80DB5470200AB99EA /* Sparkle Unit Tests */,
+				5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */,
+				72D9549D1CBB415B006F28BD /* sparkle-cli */,
+				721C24441CB753E6005440CB /* Installer Progress */,
+				14732BC51960F69300593899 /* Distribution */,
+				1495005F195FB89400BC5B5B /* All */,
+				895C5DC024D78E210058A82D /* XCFrameworks */,
+				726B2B5C1C645FC900388755 /* UI Tests */,
+				7205C43D1E13049400E370AE /* generate_appcast */,
+				EA1E285D22B66487004AA304 /* generate_keys */,
+				EA1E287522B666EB004AA304 /* sign_update */,
+				EA1E280E22B64522004AA304 /* bsdiff */,
+				EA1E282C22B660BE004AA304 /* ed25519 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		14958C6D19AEBC890061B14F /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725B3A82263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml in Resources */,
+				14958C6E19AEBC950061B14F /* signed-test-file.txt in Resources */,
+				723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
+				720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
+				72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
+				C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
+				72AC6B281B9AAD6700F62325 /* SparkleTestCodeSignApp.tar in Resources */,
+				72AC6B2A1B9AAF3A00F62325 /* SparkleTestCodeSignApp.tar.bz2 in Resources */,
+				72AC6B261B9AAC8800F62325 /* SparkleTestCodeSignApp.tar.gz in Resources */,
+				72AC6B2C1B9AB0EE00F62325 /* SparkleTestCodeSignApp.tar.xz in Resources */,
+				729F7ECE27409077004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip in Resources */,
+				5A5DD41D249F116E0045EB3E /* test-relative-urls.xml in Resources */,
+				F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */,
+				5A5DD40424958B000045EB3E /* SUUpdateValidatorTest in Resources */,
+				14958C6F19AEBC980061B14F /* test-pubkey.pem in Resources */,
+				5AF6C74F1AEA46D10014A3AB /* test.pkg in Resources */,
+				72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */,
+				720DC50627A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml in Resources */,
+				5AD0FA7F1C73F2E2004BCEFF /* testappcast.xml in Resources */,
+				FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */,
+				72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
+				722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
+				7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
+				5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
+				729F7EAC27366353004592DC /* test-links.xml in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		61B5F8FE09C4CEE200B25A18 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1420DF50196247F900203BB0 /* Images.xcassets in Resources */,
+				723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */,
+				72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
+				725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
+				723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
+				72F0EC45278A55CA002A876A /* screenshot.png in Resources */,
+				72E45CF81B640DAE005C701A /* SUUpdateSettingsWindowController.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		721C24431CB753E6005440CB /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725264A91D5FBD9100CD6400 /* Sparkle.strings in Resources */,
+				72EB87EC1CB8887E00C37F42 /* SUStatus.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB36A1D31D0B7005D534A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB3911D333832005D534A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726B2B5B1C645FC900388755 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E07ED1CAF37BD001A286B /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E4A141C86C88F00C57C6A /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72D9549C1CBB415B006F28BD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8DC2EF520486A6940098B216 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,
+				1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */,
+				723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */,
+				55C14BEF136EF21700649790 /* SUStatus.xib in Resources */,
+				723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		6131B1910DDCDE32005215F0 /* Run Script: Set Git Version Info */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 12;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script: Set Git Version Info";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$SRCROOT/Configurations/set-git-version-info.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		72045CE626FEE8CC004F96E5 /* Strip XPC Services */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Strip XPC Services";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$SRCROOT/Configurations/strip-xpc-services.sh\"\n";
+		};
+		720B4C2125EBFAA5005A0592 /* Run Script: Link Tools */ = {
+			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			name = "Run Script: Link Tools";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"$SRCROOT/Configurations/link-tools.sh\"\n";
+		};
+		895C5DC524D78E460058A82D /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+			);
+			outputFileListPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "# Deleting old products\nrm -rd \"$BUILT_PRODUCTS_DIR/Sparkle.xcarchive\"\nrm -rd \"$BUILT_PRODUCTS_DIR/Sparkle.xcframework\"\n\nxcodebuild archive -scheme Sparkle -archivePath \"$BUILT_PRODUCTS_DIR/Sparkle.xcarchive\" BUILD_LIBRARY_FOR_DISTRIBUTION=YES SKIP_INSTALL=NO\n\nif $XCODE_VERSION_MAJOR -ge \"1200\" ; then\nxcodebuild -create-xcframework -framework \"$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/Products/Library/Frameworks/Sparkle.framework\" -debug-symbols \"$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Sparkle.framework.dSYM\" -output \"$BUILT_PRODUCTS_DIR/Sparkle.xcframework\"\nelse\necho \"warning: Your Xcode version does not support bundling dSYMs in XCFrameworks directly. You should copy them manually into the XCFramework.\"\necho \"note: cp '$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/dSYMs/Sparkle.framework.dSYM' '$BUILT_PRODUCTS_DIR/Sparkle.xcframework/your_architecture/dSYMs'\"\nxcodebuild -create-xcframework -framework \"$BUILT_PRODUCTS_DIR/Sparkle.xcarchive/Products/Library/Frameworks/Sparkle.framework\" -output \"$BUILT_PRODUCTS_DIR/Sparkle.xcframework\"\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		5D06E8CD0FD68C7C005AE3F6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725EE482277BF44A00D820CE /* SPUXarDeltaArchive.m in Sources */,
+				728ED34C277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
+				725C2EAA2782EC61007CB7B5 /* main.swift in Sources */,
+				7267E5761D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */,
+				725EE487277D376000D820CE /* SPUDeltaArchive.m in Sources */,
+				7267E5781D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */,
+				7267E57A1D3D895B00D1BF90 /* SUBinaryDeltaCreate.m in Sources */,
+				726F2CE81BC9C48F001971A4 /* SUConstants.m in Sources */,
+				7267E5EA1D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
+				726F2CE91BC9C499001971A4 /* SUOperatingSystem.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		612279D50DB5470200AB99EA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725EE488277D398100D820CE /* SPUDeltaArchive.m in Sources */,
+				725EE483277C767A00D820CE /* SPUXarDeltaArchive.m in Sources */,
+				7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */,
+				721D5ABC25C680A300D23BEA /* SUFlatPackageUnarchiver.m in Sources */,
+				725F97771C8A62F500265BE4 /* SUAdHocCodeSigning.m in Sources */,
+				5A4094481C74EA5200983BE0 /* SUAppcastTest.swift in Sources */,
+				7267E5EE1D3D915900D1BF90 /* SUBinaryDeltaApply.m in Sources */,
+				7267E5EF1D3D915900D1BF90 /* SUBinaryDeltaCommon.m in Sources */,
+				7267E5F01D3D915900D1BF90 /* SUBinaryDeltaCreate.m in Sources */,
+				728ED34B277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
+				142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */,
+				7267E5F11D3D917A00D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */,
+				F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */,
+				5A5DD402249586840045EB3E /* SUUpdateValidator.m in Sources */,
+				7267E5F61D3D919000D1BF90 /* SUDiskImageUnarchiver.m in Sources */,
+				7267E5F21D3D918000D1BF90 /* SUSignatureVerifier.m in Sources */,
+				5AF9DC3C1981DBEE001EA135 /* SUSignatureVerifierTest.m in Sources */,
+				72A4A2401BB6567D00E7820D /* SUFileManagerTest.swift in Sources */,
+				7267E5F41D3D918B00D1BF90 /* SUGuidedPackageInstaller.m in Sources */,
+				5A5DD401249585E70045EB3E /* SUUpdateValidatorTest.swift in Sources */,
+				7267E5EC1D3D912900D1BF90 /* SUInstaller.m in Sources */,
+				5AF6C7541AEA49840014A3AB /* SUInstallerTest.m in Sources */,
+				14652F8219A9746000959E44 /* SULog.m in Sources */,
+				7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */,
+				7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */,
+				7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */,
+				72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */,
+				7267E5ED1D3D912E00D1BF90 /* SUUnarchiver.m in Sources */,
+				72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */,
+				7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */,
+				5AE459001C34118500E3BB47 /* SUUpdaterTest.m in Sources */,
+				5AE459021C34118500E3BB47 /* SUVersionComparisonTest.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		61B5F8FF09C4CEE200B25A18 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72F0EC4E278A73C6002A876A /* SUFileManager.m in Sources */,
+				72F0EC48278A5B95002A876A /* SPUDeltaArchive.m in Sources */,
+				72F0EC49278A5B95002A876A /* SPUSparkleDeltaArchive.m in Sources */,
+				72F0EC4A278A5B95002A876A /* SPUXarDeltaArchive.m in Sources */,
+				72F0EC46278A5B87002A876A /* SUBinaryDeltaCommon.m in Sources */,
+				72F0EC47278A5B87002A876A /* SUBinaryDeltaCreate.m in Sources */,
+				61B5F93009C4CFDC00B25A18 /* main.m in Sources */,
+				726F2CEB1BC9C733001971A4 /* SUConstants.m in Sources */,
+				725F97A51C8B304D00265BE4 /* SUInstallUpdateViewController.m in Sources */,
+				725F97841C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m in Sources */,
+				72E45CF31B640CDD005C701A /* SUTestApplicationDelegate.m in Sources */,
+				726E4A2B1C87D56200C57C6A /* SUTestWebServer.m in Sources */,
+				72E45CF71B640DAE005C701A /* SUUpdateSettingsWindowController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		7205C43A1E13049400E370AE /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */,
+				725EE489277D39B400D820CE /* SPUDeltaArchive.m in Sources */,
+				725EE48A277D39B400D820CE /* SPUXarDeltaArchive.m in Sources */,
+				721D5B1B25C692BB00D23BEA /* SUFlatPackageUnarchiver.m in Sources */,
+				72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */,
+				7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */,
+				7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */,
+				7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */,
+				7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */,
+				7205C4411E13049400E370AE /* main.swift in Sources */,
+				728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
+				7205C45F1E13066F00E370AE /* SUBinaryDeltaApply.m in Sources */,
+				7205C4621E1306A600E370AE /* SUBinaryDeltaCommon.m in Sources */,
+				FA30773F24CBC3E9007BA37D /* URL+Hashing.swift in Sources */,
+				7205C4611E13069000E370AE /* SUBinaryDeltaCreate.m in Sources */,
+				7205C45B1E13064C00E370AE /* SUBinaryDeltaUnarchiver.m in Sources */,
+				7205C45D1E13065F00E370AE /* SUConstants.m in Sources */,
+				7205C45A1E13063E00E370AE /* SUDiskImageUnarchiver.m in Sources */,
+				7205C45E1E13066800E370AE /* SUFileManager.m in Sources */,
+				7205C45C1E13065800E370AE /* SULog.m in Sources */,
+				7205C4591E13062500E370AE /* SUPipedUnarchiver.m in Sources */,
+				7205C4561E13060D00E370AE /* SUStandardVersionComparator.m in Sources */,
+				7205C4571E13061F00E370AE /* SUUnarchiver.m in Sources */,
+				7205C4581E13061F00E370AE /* SUUnarchiverNotifier.m in Sources */,
+				7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		721C24411CB753E6005440CB /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72EF30C22675CF67008CE987 /* SPUAppcastItemState.m in Sources */,
+				72EF30C32675CF67008CE987 /* SPUAppcastItemStateResolver.m in Sources */,
+				720AC2DC2618E8A500E25A3E /* SPUSecureCoding.m in Sources */,
+				720AC2C92618E89500E25A3E /* SUAppcastItem.m in Sources */,
+				720AC2A42618E85700E25A3E /* SPUInstallationInfo.m in Sources */,
+				72D954811CBACC35006F28BD /* InstallerProgressAppController.m in Sources */,
+				72D954831CBAD34F006F28BD /* main.m in Sources */,
+				72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */,
+				727F340E2605321D00020E85 /* SULog+NSError.m in Sources */,
+				7267E5DC1D3D8F1E00D1BF90 /* SPUMessageTypes.m in Sources */,
+				723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */,
+				5AA89BA623FE276A0094DAB8 /* SUSignatures.m in Sources */,
+				7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */,
+				720595EF1D700568000572E8 /* SUApplicationInfo.m in Sources */,
+				7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */,
+				722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */,
+				721C245E1CB757DE005440CB /* SUConstants.m in Sources */,
+				7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */,
+				721C24611CB75C5D005440CB /* SUHost.m in Sources */,
+				721C24621CB75C68005440CB /* SULog.m in Sources */,
+				729051E41DC82AC0003DEA7F /* SUOperatingSystem.m in Sources */,
+				721C245C1CB7576E005440CB /* SUStatusController.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB3681D31D0B7005D534A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				724BB3731D31D0B7005D534A /* main.m in Sources */,
+				72F9EC341D5BF542004AC8B6 /* SUFileManager.m in Sources */,
+				724BB3711D31D0B7005D534A /* SUInstallerConnection.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		724BB38F1D333832005D534A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				724BB39A1D333832005D534A /* main.m in Sources */,
+				72F9EC351D5BF54E004AC8B6 /* SUFileManager.m in Sources */,
+				724BB3981D333832005D534A /* SUInstallerStatus.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726B2B591C645FC900388755 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				720B16451C66433D006985FB /* SUTestApplicationTest.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E07A91CAF08D6001A286B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */,
+				72464F711E1F326A00FB341C /* SUOperatingSystem.m in Sources */,
+				726E07B41CAF08D6001A286B /* main.m in Sources */,
+				721D8A7B1D4963190032E472 /* SPULocalCacheDirectory.m in Sources */,
+				7267E5E11D3D901600D1BF90 /* SPUMessageTypes.m in Sources */,
+				5AA89BA523FE27660094DAB8 /* SUSignatures.m in Sources */,
+				7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */,
+				726E07BF1CAF0C6C001A286B /* SUConstants.m in Sources */,
+				7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
+				726E07B21CAF08D6001A286B /* SUInstallerLauncher.m in Sources */,
+				726E07C01CAF15B7001A286B /* SULog.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E07EB1CAF37BD001A286B /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72464F721E1F327C00FB341C /* SUOperatingSystem.m in Sources */,
+				723B5DA71CF7AB0100365F95 /* main.m in Sources */,
+				72E539121D68C3FA0092CE5E /* SPUDownloadData.m in Sources */,
+				723B5DA91CF7AB0100365F95 /* SPUDownloader.m in Sources */,
+				721BC2101D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */,
+				728638ED1CAF50CE00783084 /* SUConstants.m in Sources */,
+				721D8A871D4C5BF10032E472 /* SULog.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		726E4A121C86C88F00C57C6A /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				726E4A1D1C86C88F00C57C6A /* main.m in Sources */,
+				725F97781C8A65AC00265BE4 /* SUAdHocCodeSigning.m in Sources */,
+				726E4A1B1C86C88F00C57C6A /* TestAppHelper.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72B398CE1D3D879300EE297F /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				725EE480277BF13B00D820CE /* SPUXarDeltaArchive.m in Sources */,
+				728ED34A277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
+				72EF30C42675CFA1008CE987 /* SPUAppcastItemState.m in Sources */,
+				72EF30C52675CFA1008CE987 /* SPUAppcastItemStateResolver.m in Sources */,
+				72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */,
+				7267E5A81D3D8A9900D1BF90 /* AgentConnection.m in Sources */,
+				7267E5A21D3D8A7E00D1BF90 /* AppInstaller.m in Sources */,
+				7267E59F1D3D8A6F00D1BF90 /* main.m in Sources */,
+				7267E5B81D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */,
+				7267E5AE1D3D8AB700D1BF90 /* SPUInstallationInputData.m in Sources */,
+				721D8A861D4ADFEB0032E472 /* SPULocalCacheDirectory.m in Sources */,
+				7267E5B31D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */,
+				7267E5CD1D3D8C7200D1BF90 /* SPUSecureCoding.m in Sources */,
+				7267E5CB1D3D8C6400D1BF90 /* SUAppcastItem.m in Sources */,
+				7267E5751D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */,
+				725EE486277D375F00D820CE /* SPUDeltaArchive.m in Sources */,
+				7267E5771D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */,
+				7267E5791D3D895B00D1BF90 /* SUBinaryDeltaCreate.m in Sources */,
+				7267E57F1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */,
+				7267E59C1D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m in Sources */,
+				7267E5CC1D3D8C6B00D1BF90 /* SUConstants.m in Sources */,
+				7267E5861D3D89B300D1BF90 /* SUDiskImageUnarchiver.m in Sources */,
+				7267E59D1D3D8A5A00D1BF90 /* SUSignatureVerifier.m in Sources */,
+				7267E5E71D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
+				7267E5C21D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m in Sources */,
+				727F340D2605321D00020E85 /* SULog+NSError.m in Sources */,
+				7267E5D71D3D8D3F00D1BF90 /* SUHost.m in Sources */,
+				7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */,
+				5A6DD17123FE1FFC000AEF33 /* SUSignatures.m in Sources */,
+				721D5A8525C65D3F00D23BEA /* SUFlatPackageUnarchiver.m in Sources */,
+				7267E5CE1D3D8C7500D1BF90 /* SULog.m in Sources */,
+				7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */,
+				7267E5871D3D89B300D1BF90 /* SUPipedUnarchiver.m in Sources */,
+				7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */,
+				7267E5D81D3D8D4400D1BF90 /* SUStandardVersionComparator.m in Sources */,
+				7267E5881D3D89B300D1BF90 /* SUUnarchiver.m in Sources */,
+				72316BD31E0DA8430039EFD9 /* SUUnarchiverNotifier.m in Sources */,
+				729924941DF4A45000DBCDF5 /* SUUpdateValidator.m in Sources */,
+				7267E5AB1D3D8AA800D1BF90 /* TerminationListener.m in Sources */,
+				722FB7E5260EE53F00EB571C /* SUNormalization.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		72D9549A1CBB415B006F28BD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				72D954A51CBB415C006F28BD /* main.m in Sources */,
+				72D954A21CBB415C006F28BD /* SPUCommandLineDriver.m in Sources */,
+				72D954B81CBB467F006F28BD /* SPUCommandLineUserDriver.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		8DC2EF540486A6940098B216 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				723ABF31259D062F00BDB4FA /* SULegacyWebView.m in Sources */,
+				72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */,
+				72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */,
+				72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */,
+				72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */,
+				723ABFC5259D4CB300BDB4FA /* SUWKWebView.m in Sources */,
+				7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */,
+				723B5DAA1CF7AB6A00365F95 /* SPUDownloader.m in Sources */,
+				7267E5B71D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */,
+				7267E5DF1D3D8FFA00D1BF90 /* SPUInstallationInputData.m in Sources */,
+				72B767CF1C9B924900A07552 /* SPUInstallerDriver.m in Sources */,
+				72EF30BF2675CF38008CE987 /* SPUAppcastItemState.m in Sources */,
+				721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */,
+				7267E5B21D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */,
+				72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */,
+				728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */,
+				72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */,
+				7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */,
+				726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */,
+				7246E0A41C83B685003B4E75 /* SPUStandardUpdaterController.m in Sources */,
+				725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */,
+				723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */,
+				72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */,
+				72DBA37E1D60CC34002594A8 /* SPUUpdatePermissionRequest.m in Sources */,
+				72EF30C02675CF38008CE987 /* SPUAppcastItemStateResolver.m in Sources */,
+				61B5F8EE09C4CE3C00B25A18 /* SPUUpdater.m in Sources */,
+				720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */,
+				726E078E1CA891E9001A286B /* SPUUpdaterSettings.m in Sources */,
+				721D588F25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m in Sources */,
+				72F9EC401D5E823F004AC8B6 /* SPUUpdaterTimer.m in Sources */,
+				72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */,
+				72F94F591CC44DE1002DEE68 /* SPUXPCServiceInfo.m in Sources */,
+				61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */,
+				72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */,
+				61B5FC6F09C51F4900B25A18 /* SUAppcastItem.m in Sources */,
+				7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */,
+				7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */,
+				725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */,
+				7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */,
+				72DBA37F1D62C23E002594A8 /* SUCodeSigningVerifier.m in Sources */,
+				61299A6009CA6EB100B7442F /* SUConstants.m in Sources */,
+				7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
+				61EF67560E25B58D00F754E0 /* SUHost.m in Sources */,
+				724BB3891D32B915005D534A /* SUInstallerConnection.m in Sources */,
+				72F94F5A1CC450DE002DEE68 /* SUInstallerLauncher.m in Sources */,
+				724BB3AA1D3347C2005D534A /* SUInstallerStatus.m in Sources */,
+				55C14F07136EF6DB00649790 /* SULog.m in Sources */,
+				726F2CE61BC9C33D001971A4 /* SUOperatingSystem.m in Sources */,
+				61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */,
+				727F340B2605321D00020E85 /* SULog+NSError.m in Sources */,
+				EA1E287022B66621004AA304 /* SUSignatures.m in Sources */,
+				6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */,
+				72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */,
+				61A2279D0D1CEE7600430CCD /* SUSystemProfiler.m in Sources */,
+				61B5FCDE09C52A9F00B25A18 /* SUUpdateAlert.m in Sources */,
+				612DCBB00D488BC60015DBEA /* SUUpdatePermissionPrompt.m in Sources */,
+				72A450541C69A68900D67EEA /* SUUpdatePermissionResponse.m in Sources */,
+				729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */,
+				72F9EBE31D517E2F004AC8B6 /* SUUpdater.m in Sources */,
+				724BB3881D32A167005D534A /* SUXPCInstallerConnection.m in Sources */,
+				724BB3A91D33461B005D534A /* SUXPCInstallerStatus.m in Sources */,
+				723AC011259DBDAA00BDB4FA /* SUWebViewCommon.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E280C22B64522004AA304 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E282122B64677004AA304 /* bscommon.c in Sources */,
+				EA1E282222B64677004AA304 /* bsdiff.c in Sources */,
+				EA1E282322B64677004AA304 /* bspatch.c in Sources */,
+				EA1E282422B64677004AA304 /* sais.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E282A22B660BE004AA304 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E284622B660ED004AA304 /* fe.c in Sources */,
+				EA1E284822B660ED004AA304 /* ge.c in Sources */,
+				EA1E284722B660ED004AA304 /* verify.c in Sources */,
+				EA1E284C22B660ED004AA304 /* add_scalar.c in Sources */,
+				EA1E284D22B660ED004AA304 /* keypair.c in Sources */,
+				EA1E284522B660ED004AA304 /* seed.c in Sources */,
+				EA1E284B22B660ED004AA304 /* key_exchange.c in Sources */,
+				EA1E284A22B660ED004AA304 /* sign.c in Sources */,
+				EA1E284922B660ED004AA304 /* sc.c in Sources */,
+				EA1E284E22B660ED004AA304 /* sha512.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E285A22B66487004AA304 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E286122B66487004AA304 /* main.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		EA1E287222B666EB004AA304 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				EA1E287922B666EB004AA304 /* main.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		1454BA1619637EDB00344E57 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */;
+			targetProxy = 1454BA1519637EDB00344E57 /* PBXContainerItemProxy */;
+		};
+		14732BCB1960F73500593899 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 14732BCA1960F73500593899 /* PBXContainerItemProxy */;
+		};
+		14732BCF1960F73500593899 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */;
+			targetProxy = 14732BCE1960F73500593899 /* PBXContainerItemProxy */;
+		};
+		14950064195FB8A600BC5B5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 14950063195FB8A600BC5B5B /* PBXContainerItemProxy */;
+		};
+		14950066195FB8A600BC5B5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */;
+			targetProxy = 14950065195FB8A600BC5B5B /* PBXContainerItemProxy */;
+		};
+		14950068195FB8A600BC5B5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 612279D80DB5470200AB99EA /* Sparkle Unit Tests */;
+			targetProxy = 14950067195FB8A600BC5B5B /* PBXContainerItemProxy */;
+		};
+		1495006A195FB8A600BC5B5B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 5D06E8CF0FD68C7C005AE3F6 /* BinaryDelta */;
+			targetProxy = 14950069195FB8A600BC5B5B /* PBXContainerItemProxy */;
+		};
+		376769AF23442F320077B8F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E280E22B64522004AA304 /* bsdiff */;
+			targetProxy = 376769AE23442F320077B8F7 /* PBXContainerItemProxy */;
+		};
+		376769B123442F490077B8F7 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E280E22B64522004AA304 /* bsdiff */;
+			targetProxy = 376769B023442F490077B8F7 /* PBXContainerItemProxy */;
+		};
+		37DC0CE62340667000501A67 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E280E22B64522004AA304 /* bsdiff */;
+			targetProxy = 37DC0CE52340667000501A67 /* PBXContainerItemProxy */;
+		};
+		5A06357223FE332300478A72 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E282C22B660BE004AA304 /* ed25519 */;
+			targetProxy = 5A06357123FE332300478A72 /* PBXContainerItemProxy */;
+		};
+		61B5F91C09C4CF7200B25A18 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 61B5F91B09C4CF7200B25A18 /* PBXContainerItemProxy */;
+		};
+		61FA528D0E2D9EB200EF58AD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 61FA528C0E2D9EB200EF58AD /* PBXContainerItemProxy */;
+		};
+		72045CD826FEE471004F96E5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726E07EE1CAF37BD001A286B /* SparkleDownloader */;
+			targetProxy = 72045CD726FEE471004F96E5 /* PBXContainerItemProxy */;
+		};
+		72045CDA26FEE471004F96E5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 724BB36B1D31D0B7005D534A /* SparkleInstallerConnection */;
+			targetProxy = 72045CD926FEE471004F96E5 /* PBXContainerItemProxy */;
+		};
+		72045CDC26FEE471004F96E5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726E07AC1CAF08D6001A286B /* SparkleInstallerLauncher */;
+			targetProxy = 72045CDB26FEE471004F96E5 /* PBXContainerItemProxy */;
+		};
+		72045CDE26FEE471004F96E5 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 724BB3921D333832005D534A /* SparkleInstallerStatus */;
+			targetProxy = 72045CDD26FEE471004F96E5 /* PBXContainerItemProxy */;
+		};
+		7205C4691E1306FB00E370AE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7205C43D1E13049400E370AE /* generate_appcast */;
+			targetProxy = 7205C4681E1306FB00E370AE /* PBXContainerItemProxy */;
+		};
+		7205C46B1E13070300E370AE /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 7205C43D1E13049400E370AE /* generate_appcast */;
+			targetProxy = 7205C46A1E13070300E370AE /* PBXContainerItemProxy */;
+		};
+		7218EC332623ED94008FECF3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 724BB36B1D31D0B7005D534A /* SparkleInstallerConnection */;
+			targetProxy = 7218EC322623ED94008FECF3 /* PBXContainerItemProxy */;
+		};
+		7218EC352623ED97008FECF3 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 724BB3921D333832005D534A /* SparkleInstallerStatus */;
+			targetProxy = 7218EC342623ED97008FECF3 /* PBXContainerItemProxy */;
+		};
+		725148E9266D918900247C9C /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726E07EE1CAF37BD001A286B /* SparkleDownloader */;
+			targetProxy = 725148E8266D918900247C9C /* PBXContainerItemProxy */;
+		};
+		726B2B631C645FC900388755 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 61B5F90109C4CEE200B25A18 /* Sparkle Test App */;
+			targetProxy = 726B2B621C645FC900388755 /* PBXContainerItemProxy */;
+		};
+		726E4A201C86C88F00C57C6A /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726E4A151C86C88F00C57C6A /* TestAppHelper */;
+			targetProxy = 726E4A1F1C86C88F00C57C6A /* PBXContainerItemProxy */;
+		};
+		726F168926747CEB005BEA89 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 726F168826747CEB005BEA89 /* PBXContainerItemProxy */;
+		};
+		72A5D5AC1D6929260009E5AC /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 72B398D11D3D879300EE297F /* Autoupdate */;
+			targetProxy = 72A5D5AB1D6929260009E5AC /* PBXContainerItemProxy */;
+		};
+		72CCCC15287B3D1900E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 72CCCC14287B3D1900E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC17287B3D3400E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E280E22B64522004AA304 /* bsdiff */;
+			targetProxy = 72CCCC16287B3D3400E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC19287B3D3D00E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E282C22B660BE004AA304 /* ed25519 */;
+			targetProxy = 72CCCC18287B3D3D00E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC1B287B3D9000E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E282C22B660BE004AA304 /* ed25519 */;
+			targetProxy = 72CCCC1A287B3D9000E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC1D287B3D9600E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E282C22B660BE004AA304 /* ed25519 */;
+			targetProxy = 72CCCC1C287B3D9600E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC1F287B3DA100E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E282C22B660BE004AA304 /* ed25519 */;
+			targetProxy = 72CCCC1E287B3DA100E7156B /* PBXContainerItemProxy */;
+		};
+		72CCCC21287B3DA400E7156B /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E280E22B64522004AA304 /* bsdiff */;
+			targetProxy = 72CCCC20287B3DA400E7156B /* PBXContainerItemProxy */;
+		};
+		72D954BA1CBB6E27006F28BD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 721C24441CB753E6005440CB /* Installer Progress */;
+			targetProxy = 72D954B91CBB6E27006F28BD /* PBXContainerItemProxy */;
+		};
+		72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 72D9549D1CBB415B006F28BD /* sparkle-cli */;
+			targetProxy = 72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */;
+		};
+		72EF30B926747E39008CE987 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
+			targetProxy = 72EF30B826747E39008CE987 /* PBXContainerItemProxy */;
+		};
+		72F94F6B1CC4A0C8002DEE68 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 726E07AC1CAF08D6001A286B /* SparkleInstallerLauncher */;
+			targetProxy = 72F94F6A1CC4A0C8002DEE68 /* PBXContainerItemProxy */;
+		};
+		895C5DC724D78F700058A82D /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 895C5DC024D78E210058A82D /* XCFrameworks */;
+			targetProxy = 895C5DC624D78F700058A82D /* PBXContainerItemProxy */;
+		};
+		FA344BA524C8699E00B2A401 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E287522B666EB004AA304 /* sign_update */;
+			targetProxy = FA344BA424C8699E00B2A401 /* PBXContainerItemProxy */;
+		};
+		FA344BA724C869A300B2A401 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = EA1E285D22B66487004AA304 /* generate_keys */;
+			targetProxy = FA344BA624C869A300B2A401 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		61AAE8220A321A7F00D8810D /* Sparkle.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				147D6DA71B66EC1C006607AB /* ca */,
+				615409C4103BBC4000125AF1 /* cs */,
+				61131A050F846CE600E97AF6 /* da */,
+				619B17200E1E9D0800E72754 /* de */,
+				555CF29A196C52330000B31E /* el */,
+				61AAE84F0A321AF700D8810D /* es */,
+				147D6DA91B66EC22006607AB /* fi */,
+				61AAE8590A321B0400D8810D /* fr */,
+				147D6DAA1B66EC25006607AB /* he */,
+				613151B20FB4946A000DCD59 /* is */,
+				61F614540E24A12D009F47E7 /* it */,
+				611A904610240DF700CC659E /* ja */,
+				FE5536F517A2C6A7007CB333 /* ko */,
+				4607BEA21948443800EF8DA4 /* nb */,
+				61AAE8710A321F7700D8810D /* nl */,
+				611A904210240DD300CC659E /* pl */,
+				61E31A80103299500051D188 /* pt-BR */,
+				6186554310D7484E00B1E074 /* pt-PT */,
+				004A8652192A492B00C9730D /* ro */,
+				6195D4920E404AD700D41A50 /* ru */,
+				FE5536F617A2C6AB007CB333 /* sk */,
+				61BA66CC14BDFA0400D02D86 /* sl */,
+				618915730E35937600B5E981 /* sv */,
+				61F3AC1215C22D4A00260CA2 /* th */,
+				5AEF45D9189D1CC90030D7DC /* tr */,
+				0263187214FEBB31005EBF43 /* uk */,
+				61131A090F846D0A00E97AF6 /* zh_CN */,
+				61131A0A0F846D1100E97AF6 /* zh_TW */,
+				723ABCD7259A9A9D00BDB4FA /* Base */,
+				72E1DACB25B3E8DF0001BA6D /* hr */,
+				726FD2CC25F4BE5F00123BC6 /* fa */,
+				F67C9B7B281410B600740813 /* hu */,
+				F6E11510281410D10003736C /* ar */,
+				37A5F28528E9219000891504 /* zh_HK */,
+			);
+			name = Sparkle.strings;
+			sourceTree = "<group>";
+		};
+		723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				723ABD37259A9BA500BDB4FA /* Base */,
+				723ABD4C259A9BB900BDB4FA /* ar */,
+				723ABD4D259A9BE100BDB4FA /* en */,
+				723ABD4E259A9BEF00BDB4FA /* ca */,
+				723ABD4F259A9BFD00BDB4FA /* zh_CN */,
+				723ABD50259A9C0200BDB4FA /* zh_TW */,
+				723ABD51259A9C0600BDB4FA /* cs */,
+				723ABD52259A9C0900BDB4FA /* da */,
+				723ABD53259A9C1000BDB4FA /* nl */,
+				723ABD54259A9C1300BDB4FA /* fi */,
+				723ABD55259A9C1500BDB4FA /* fr */,
+				723ABD56259A9C1E00BDB4FA /* de */,
+				723ABD57259A9C2100BDB4FA /* el */,
+				723ABD58259A9C2400BDB4FA /* he */,
+				723ABD59259A9C2C00BDB4FA /* is */,
+				723ABD5A259A9C3600BDB4FA /* it */,
+				723ABD5B259A9C3900BDB4FA /* ja */,
+				723ABD5C259A9C3B00BDB4FA /* ko */,
+				723ABD5D259A9C3D00BDB4FA /* nb */,
+				723ABD5E259A9C4000BDB4FA /* pl */,
+				723ABD5F259A9C4900BDB4FA /* pt-BR */,
+				723ABD60259A9C4B00BDB4FA /* pt-PT */,
+				723ABD61259A9C5400BDB4FA /* ro */,
+				723ABD62259A9C5700BDB4FA /* ru */,
+				723ABD63259A9C5900BDB4FA /* sk */,
+				723ABD64259A9C5B00BDB4FA /* sl */,
+				723ABD65259A9C5D00BDB4FA /* es */,
+				723ABD66259A9C5F00BDB4FA /* sv */,
+				723ABD67259A9C6100BDB4FA /* th */,
+				723ABD68259A9C6300BDB4FA /* tr */,
+				723ABD69259A9C6600BDB4FA /* uk */,
+				72E1DAB625B3E8AE0001BA6D /* hr */,
+				F67C9B7C281410B600740813 /* hu */,
+				37A5F28728E9219000891504 /* zh_HK */,
+			);
+			name = SUUpdateAlert.xib;
+			sourceTree = "<group>";
+		};
+		723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				723ABD6B259A9CBB00BDB4FA /* Base */,
+				723ABD80259A9CD600BDB4FA /* en */,
+				723ABD81259A9CDA00BDB4FA /* ar */,
+				723ABD82259A9CEC00BDB4FA /* cs */,
+				723ABD83259A9CF000BDB4FA /* zh_CN */,
+				723ABD84259A9CF400BDB4FA /* zh_TW */,
+				723ABD85259A9CF800BDB4FA /* da */,
+				723ABD86259A9CFC00BDB4FA /* nl */,
+				723ABD87259A9CFF00BDB4FA /* fi */,
+				723ABD88259A9D0200BDB4FA /* fr */,
+				723ABD89259A9D1800BDB4FA /* de */,
+				723ABD8A259A9D1C00BDB4FA /* el */,
+				723ABD8D259A9D2700BDB4FA /* hu */,
+				723ABD8E259A9D2A00BDB4FA /* is */,
+				723ABD91259A9D3400BDB4FA /* it */,
+				723ABD92259A9D3700BDB4FA /* ja */,
+				723ABD93259A9D3C00BDB4FA /* ko */,
+				723ABD94259A9D3E00BDB4FA /* nb */,
+				723ABD95259A9D4100BDB4FA /* pl */,
+				723ABD96259A9D4600BDB4FA /* pt-BR */,
+				723ABD97259A9D4900BDB4FA /* pt-PT */,
+				723ABD98259A9D4C00BDB4FA /* ro */,
+				723ABD99259A9D4F00BDB4FA /* ru */,
+				723ABD9A259A9D5200BDB4FA /* sk */,
+				723ABD9B259A9D5500BDB4FA /* sl */,
+				723ABD9C259A9D5700BDB4FA /* es */,
+				723ABD9D259A9D5A00BDB4FA /* sv */,
+				723ABD9E259A9D5D00BDB4FA /* th */,
+				723ABD9F259A9D6000BDB4FA /* tr */,
+				723ABDA0259A9D6300BDB4FA /* uk */,
+				72E1DAB525B3E8AE0001BA6D /* hr */,
+				37A5F28628E9219000891504 /* zh_HK */,
+			);
+			name = SUUpdatePermissionPrompt.xib;
+			sourceTree = "<group>";
+		};
+		723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				723ABDDA259A9E8600BDB4FA /* Base */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		723ABE00259A9E9E00BDB4FA /* MainMenu.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				723ABE01259A9E9E00BDB4FA /* Base */,
+				723ABE15259A9EB000BDB4FA /* en */,
+				723ABE16259A9EBE00BDB4FA /* ar */,
+				723ABE17259A9ECA00BDB4FA /* ca */,
+				723ABE18259A9ECF00BDB4FA /* zh_CN */,
+				723ABE19259A9ED200BDB4FA /* zh_TW */,
+				723ABE1A259A9ED600BDB4FA /* cs */,
+				723ABE1B259A9ED800BDB4FA /* da */,
+				723ABE1C259A9EDB00BDB4FA /* nl */,
+				723ABE1D259A9EDE00BDB4FA /* fi */,
+				723ABE1E259A9EE100BDB4FA /* fr */,
+				723ABE21259A9EEB00BDB4FA /* de */,
+				723ABE22259A9EEE00BDB4FA /* el */,
+				723ABE23259A9EF200BDB4FA /* he */,
+				723ABE24259A9EF600BDB4FA /* hu */,
+				723ABE25259A9EF800BDB4FA /* is */,
+				723ABE28259A9F0100BDB4FA /* it */,
+				723ABE29259A9F0300BDB4FA /* ja */,
+				723ABE2A259A9F0600BDB4FA /* ko */,
+				723ABE2B259A9F0800BDB4FA /* nb */,
+				723ABE2C259A9F0B00BDB4FA /* pl */,
+				723ABE2D259A9F0F00BDB4FA /* pt-BR */,
+				723ABE2E259A9F1100BDB4FA /* pt-PT */,
+				723ABE2F259A9F1400BDB4FA /* ro */,
+				723ABE30259A9F1700BDB4FA /* ru */,
+				723ABE31259A9F1A00BDB4FA /* sk */,
+				723ABE34259A9F2100BDB4FA /* sl */,
+				723ABE35259A9F2400BDB4FA /* es */,
+				723ABE36259A9F2600BDB4FA /* sv */,
+				723ABE37259A9F2900BDB4FA /* th */,
+				723ABE38259A9F2B00BDB4FA /* tr */,
+				723ABE39259A9F2E00BDB4FA /* uk */,
+				72E1DAB725B3E8AE0001BA6D /* hr */,
+				726FD2CB25F4BE5F00123BC6 /* fa */,
+				37A5F28828E9219000891504 /* zh_HK */,
+			);
+			name = MainMenu.xib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		14732BC71960F69300593899 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		14732BC81960F69300593899 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		14950061195FB89500BC5B5B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		14950062195FB89500BC5B5B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		149B785A1B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 149B78631B7D3A0C00D7D62C /* ConfigCommonCoverage.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B785B1B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B785C1B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94EDA1CC36C37002DEE68 /* ConfigTestAppDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B785D1B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 149B78641B7D3A4800D7D62C /* ConfigUnitTestCoverage.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B785E1B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B78601B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		149B78621B7D398100D7D62C /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		1DEB91AE08733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CA0D94A70100DD942E /* ConfigFrameworkDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		1DEB91AF08733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941D10D94A70100DD942E /* ConfigFramework.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		1DEB91B208733DA50010E9CD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CF0D94A70100DD942E /* ConfigCommonDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		1DEB91B308733DA50010E9CD /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CC0D94A70100DD942E /* ConfigCommonRelease.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		5D06E8D20FD68C7D005AE3F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		5D06E8D30FD68C7D005AE3F6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		612279DB0DB5470300AB99EA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7205C46C1E13244800E370AE /* ConfigUnitTestDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		612279DC0DB5470300AB99EA /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7205C46D1E13245600E370AE /* ConfigUnitTestRelease.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		61B5F90609C4CEE300B25A18 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94EDA1CC36C37002DEE68 /* ConfigTestAppDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		61B5F90709C4CEE300B25A18 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CD0D94A70100DD942E /* ConfigTestApp.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		7205C4421E13049400E370AE /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		7205C4431E13049400E370AE /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		7205C4441E13049400E370AE /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		721C24531CB753E7005440CB /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 721C24571CB754E8005440CB /* ConfigInstallerProgress.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		721C24541CB753E7005440CB /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 721C24571CB754E8005440CB /* ConfigInstallerProgress.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		721C24551CB753E7005440CB /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 721C24571CB754E8005440CB /* ConfigInstallerProgress.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		724BB3791D31D0B7005D534A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB37F1D31D1EA005D534A /* ConfigInstallerConnectionDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		724BB37A1D31D0B7005D534A /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB37E1D31D1EA005D534A /* ConfigInstallerConnection.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		724BB37B1D31D0B7005D534A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB37E1D31D1EA005D534A /* ConfigInstallerConnection.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		724BB3A01D333832005D534A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB3A51D3338C8005D534A /* ConfigInstallerStatusDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		724BB3A11D333832005D534A /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB3A41D3338C8005D534A /* ConfigInstallerStatus.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		724BB3A21D333832005D534A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 724BB3A41D3338C8005D534A /* ConfigInstallerStatus.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		726B2B641C645FC900388755 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7205C46E1E13254500E370AE /* ConfigUITestDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		726B2B651C645FC900388755 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 729F10FE1C65A9B500DFCCC5 /* ConfigUITestCoverage.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		726B2B661C645FC900388755 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 7205C46F1E13255900E370AE /* ConfigUITestRelease.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		726E07BA1CAF08D6001A286B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94ED51CC3441A002DEE68 /* ConfigInstallerLauncherDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		726E07BB1CAF08D6001A286B /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94ED51CC3441A002DEE68 /* ConfigInstallerLauncherDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		726E07BC1CAF08D6001A286B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 726E07C11CAF1E79001A286B /* ConfigInstallerLauncher.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		726E07FC1CAF37BD001A286B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94ED61CC344A7002DEE68 /* ConfigDownloaderDebug.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Debug;
+		};
+		726E07FD1CAF37BD001A286B /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94ED61CC344A7002DEE68 /* ConfigDownloaderDebug.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Coverage;
+		};
+		726E07FE1CAF37BD001A286B /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 728638EE1CAF589C00783084 /* ConfigDownloader.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Release;
+		};
+		726E4A231C86C88F00C57C6A /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94EDB1CC36C6F002DEE68 /* ConfigTestAppHelperDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		726E4A241C86C88F00C57C6A /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72F94EDB1CC36C6F002DEE68 /* ConfigTestAppHelperDebug.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		726E4A251C86C88F00C57C6A /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 726E4A281C86CAB500C57C6A /* ConfigTestAppHelper.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		72B398D71D3D879400EE297F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		72B398D81D3D879400EE297F /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		72B398D91D3D879400EE297F /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = FA1941CE0D94A70100DD942E /* ConfigRelaunch.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		72D954AC1CBB415C006F28BD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72D954B01CBB41E2006F28BD /* ConfigSparkleTool.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Debug;
+		};
+		72D954AD1CBB415C006F28BD /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72D954B01CBB41E2006F28BD /* ConfigSparkleTool.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Coverage;
+		};
+		72D954AE1CBB415C006F28BD /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 72D954B01CBB41E2006F28BD /* ConfigSparkleTool.xcconfig */;
+			buildSettings = {
+				CLANG_ANALYZER_NONNULL = YES;
+			};
+			name = Release;
+		};
+		895C5DC124D78E210058A82D /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		895C5DC224D78E210058A82D /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		895C5DC324D78E210058A82D /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		EA1E281022B64522004AA304 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		EA1E281122B64522004AA304 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		EA1E281222B64522004AA304 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		EA1E282F22B660BE004AA304 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E285822B6622E004AA304 /* ed25519-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		EA1E283022B660BE004AA304 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		EA1E283122B660BE004AA304 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E285722B6622E004AA304 /* ed25519-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		EA1E286322B66487004AA304 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		EA1E286422B66487004AA304 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		EA1E286522B66487004AA304 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+		EA1E287A22B666EB004AA304 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286822B664FD004AA304 /* CommandLineTool-Debug.xcconfig */;
+			buildSettings = {
+			};
+			name = Debug;
+		};
+		EA1E287B22B666EB004AA304 /* Coverage */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Coverage;
+		};
+		EA1E287C22B666EB004AA304 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = EA1E286722B664FD004AA304 /* CommandLineTool-Release.xcconfig */;
+			buildSettings = {
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		14732BC61960F69300593899 /* Build configuration list for PBXLegacyTarget "Distribution" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				14732BC71960F69300593899 /* Debug */,
+				149B78601B7D398100D7D62C /* Coverage */,
+				14732BC81960F69300593899 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		14950060195FB89500BC5B5B /* Build configuration list for PBXAggregateTarget "All" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				14950061195FB89500BC5B5B /* Debug */,
+				149B78621B7D398100D7D62C /* Coverage */,
+				14950062195FB89500BC5B5B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91AD08733DA50010E9CD /* Build configuration list for PBXNativeTarget "Sparkle" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91AE08733DA50010E9CD /* Debug */,
+				149B785B1B7D398100D7D62C /* Coverage */,
+				1DEB91AF08733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "Sparkle" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1DEB91B208733DA50010E9CD /* Debug */,
+				149B785A1B7D398100D7D62C /* Coverage */,
+				1DEB91B308733DA50010E9CD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5D06E8DA0FD68C95005AE3F6 /* Build configuration list for PBXNativeTarget "BinaryDelta" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5D06E8D20FD68C7D005AE3F6 /* Debug */,
+				149B785E1B7D398100D7D62C /* Coverage */,
+				5D06E8D30FD68C7D005AE3F6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		612279DD0DB5470300AB99EA /* Build configuration list for PBXNativeTarget "Sparkle Unit Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				612279DB0DB5470300AB99EA /* Debug */,
+				149B785D1B7D398100D7D62C /* Coverage */,
+				612279DC0DB5470300AB99EA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		61B5F90509C4CEE300B25A18 /* Build configuration list for PBXNativeTarget "Sparkle Test App" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				61B5F90609C4CEE300B25A18 /* Debug */,
+				149B785C1B7D398100D7D62C /* Coverage */,
+				61B5F90709C4CEE300B25A18 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7205C4451E13049400E370AE /* Build configuration list for PBXNativeTarget "generate_appcast" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7205C4421E13049400E370AE /* Debug */,
+				7205C4431E13049400E370AE /* Coverage */,
+				7205C4441E13049400E370AE /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		721C24561CB753E7005440CB /* Build configuration list for PBXNativeTarget "Installer Progress" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				721C24531CB753E7005440CB /* Debug */,
+				721C24541CB753E7005440CB /* Coverage */,
+				721C24551CB753E7005440CB /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		724BB3781D31D0B7005D534A /* Build configuration list for PBXNativeTarget "SparkleInstallerConnection" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				724BB3791D31D0B7005D534A /* Debug */,
+				724BB37A1D31D0B7005D534A /* Coverage */,
+				724BB37B1D31D0B7005D534A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		724BB39F1D333832005D534A /* Build configuration list for PBXNativeTarget "SparkleInstallerStatus" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				724BB3A01D333832005D534A /* Debug */,
+				724BB3A11D333832005D534A /* Coverage */,
+				724BB3A21D333832005D534A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		726B2B671C645FC900388755 /* Build configuration list for PBXNativeTarget "UI Tests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				726B2B641C645FC900388755 /* Debug */,
+				726B2B651C645FC900388755 /* Coverage */,
+				726B2B661C645FC900388755 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		726E07B91CAF08D6001A286B /* Build configuration list for PBXNativeTarget "SparkleInstallerLauncher" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				726E07BA1CAF08D6001A286B /* Debug */,
+				726E07BB1CAF08D6001A286B /* Coverage */,
+				726E07BC1CAF08D6001A286B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		726E07FB1CAF37BD001A286B /* Build configuration list for PBXNativeTarget "SparkleDownloader" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				726E07FC1CAF37BD001A286B /* Debug */,
+				726E07FD1CAF37BD001A286B /* Coverage */,
+				726E07FE1CAF37BD001A286B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		726E4A221C86C88F00C57C6A /* Build configuration list for PBXNativeTarget "TestAppHelper" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				726E4A231C86C88F00C57C6A /* Debug */,
+				726E4A241C86C88F00C57C6A /* Coverage */,
+				726E4A251C86C88F00C57C6A /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		72B398D61D3D879400EE297F /* Build configuration list for PBXNativeTarget "Autoupdate" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				72B398D71D3D879400EE297F /* Debug */,
+				72B398D81D3D879400EE297F /* Coverage */,
+				72B398D91D3D879400EE297F /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		72D954AF1CBB415C006F28BD /* Build configuration list for PBXNativeTarget "sparkle-cli" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				72D954AC1CBB415C006F28BD /* Debug */,
+				72D954AD1CBB415C006F28BD /* Coverage */,
+				72D954AE1CBB415C006F28BD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		895C5DC424D78E210058A82D /* Build configuration list for PBXAggregateTarget "XCFrameworks" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				895C5DC124D78E210058A82D /* Debug */,
+				895C5DC224D78E210058A82D /* Coverage */,
+				895C5DC324D78E210058A82D /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EA1E281322B64522004AA304 /* Build configuration list for PBXNativeTarget "bsdiff" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EA1E281022B64522004AA304 /* Debug */,
+				EA1E281122B64522004AA304 /* Coverage */,
+				EA1E281222B64522004AA304 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EA1E282E22B660BE004AA304 /* Build configuration list for PBXNativeTarget "ed25519" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EA1E282F22B660BE004AA304 /* Debug */,
+				EA1E283022B660BE004AA304 /* Coverage */,
+				EA1E283122B660BE004AA304 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EA1E286222B66487004AA304 /* Build configuration list for PBXNativeTarget "generate_keys" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EA1E286322B66487004AA304 /* Debug */,
+				EA1E286422B66487004AA304 /* Coverage */,
+				EA1E286522B66487004AA304 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		EA1E287D22B666EB004AA304 /* Build configuration list for PBXNativeTarget "sign_update" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				EA1E287A22B666EB004AA304 /* Debug */,
+				EA1E287B22B666EB004AA304 /* Coverage */,
+				EA1E287C22B666EB004AA304 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+
+/* Begin XCRemoteSwiftPackageReference section */
+		727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/apple/swift-argument-parser.git";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.4.3;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
+/* Begin XCSwiftPackageProductDependency section */
+		725C2EAB2782EF3C007CB7B5 /* ArgumentParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */;
+			productName = ArgumentParser;
+		};
+		727DBAE426B5BBFD00111F0C /* ArgumentParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */;
+			productName = ArgumentParser;
+		};
+		727DBAE626B5C47800111F0C /* ArgumentParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */;
+			productName = ArgumentParser;
+		};
+		727DBAE826B5C48A00111F0C /* ArgumentParser */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 727DBAE326B5BBFD00111F0C /* XCRemoteSwiftPackageReference "swift-argument-parser" */;
+			productName = ArgumentParser;
+		};
+/* End XCSwiftPackageProductDependency section */
+	};
+	rootObject = 0867D690FE84028FC02AAC07 /* Project object */;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace/contents.xcworkspacedata Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace/xcshareddata Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace/xcshareddata/swiftpm Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/BinaryDelta.xcscheme Added

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "NO">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5D06E8CF0FD68C7C005AE3F6"
+ BuildableName = "BinaryDelta"
+ BlueprintName = "BinaryDelta"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5D06E8CF0FD68C7C005AE3F6"
+ BuildableName = "BinaryDelta"
+ BlueprintName = "BinaryDelta"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5D06E8CF0FD68C7C005AE3F6"
+ BuildableName = "BinaryDelta"
+ BlueprintName = "BinaryDelta"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Distribution.xcscheme Added

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "14732BC51960F69300593899"
+ BuildableName = "Distribution"
+ BlueprintName = "Distribution"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "612279D80DB5470200AB99EA"
+ BuildableName = "Sparkle Unit Tests.xctest"
+ BlueprintName = "Sparkle Unit Tests"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Release"
+ selectedDebuggerIdentifier = ""
+ selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "14732BC51960F69300593899"
+ BuildableName = "Distribution"
+ BlueprintName = "Distribution"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "14732BC51960F69300593899"
+ BuildableName = "Distribution"
+ BlueprintName = "Distribution"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle Test App.xcscheme Added

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "NO">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "61B5F90109C4CEE200B25A18"
+ BuildableName = "Sparkle Test App.app"
+ BlueprintName = "Sparkle Test App"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "NO"
+ debugServiceExtension = "internal"
+ enableGPUFrameCaptureMode = "3"
+ enableGPUValidationMode = "1"
+ allowLocationSimulation = "NO">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "61B5F90109C4CEE200B25A18"
+ BuildableName = "Sparkle Test App.app"
+ BlueprintName = "Sparkle Test App"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ <EnvironmentVariables>
+ <EnvironmentVariable
+ key = "TEST_MODE"
+ value = "DELTA"
+ isEnabled = "NO">
+ </EnvironmentVariable>
+ </EnvironmentVariables>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "61B5F90109C4CEE200B25A18"
+ BuildableName = "Sparkle Test App.app"
+ BlueprintName = "Sparkle Test App"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/Sparkle.xcscheme Added

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "2.0">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "NO">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
+ BuildableName = "Sparkle.framework"
+ BlueprintName = "Sparkle"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "612279D80DB5470200AB99EA"
+ BuildableName = "Sparkle Unit Tests.xctest"
+ BlueprintName = "Sparkle Unit Tests"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = ""
+ selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugXPCServices = "NO"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
+ BuildableName = "Sparkle.framework"
+ BlueprintName = "Sparkle"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "8DC2EF4F0486A6940098B216"
+ BuildableName = "Sparkle.framework"
+ BlueprintName = "Sparkle"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/UITests.xcscheme Added

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ <TestableReference
+ skipped = "NO">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "726B2B5C1C645FC900388755"
+ BuildableName = "UI Tests.xctest"
+ BlueprintName = "UI Tests"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </TestableReference>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/generate_appcast.xcscheme Added

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "7205C43D1E13049400E370AE"
+ BuildableName = "generate_appcast"
+ BlueprintName = "generate_appcast"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "7205C43D1E13049400E370AE"
+ BuildableName = "generate_appcast"
+ BlueprintName = "generate_appcast"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "7205C43D1E13049400E370AE"
+ BuildableName = "generate_appcast"
+ BlueprintName = "generate_appcast"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/generate_keys.xcscheme Added

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E285D22B66487004AA304"
+ BuildableName = "generate_keys"
+ BlueprintName = "generate_keys"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E285D22B66487004AA304"
+ BuildableName = "generate_keys"
+ BlueprintName = "generate_keys"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E285D22B66487004AA304"
+ BuildableName = "generate_keys"
+ BlueprintName = "generate_keys"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/sign_update.xcscheme Added

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "YES">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E287522B666EB004AA304"
+ BuildableName = "sign_update"
+ BlueprintName = "sign_update"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "YES"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E287522B666EB004AA304"
+ BuildableName = "sign_update"
+ BlueprintName = "sign_update"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "EA1E287522B666EB004AA304"
+ BuildableName = "sign_update"
+ BlueprintName = "sign_update"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle.xcodeproj/xcshareddata/xcschemes/sparkle-cli.xcscheme Added

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+ LastUpgradeVersion = "1400"
+ version = "1.3">
+ <BuildAction
+ parallelizeBuildables = "YES"
+ buildImplicitDependencies = "NO">
+ <BuildActionEntries>
+ <BuildActionEntry
+ buildForTesting = "YES"
+ buildForRunning = "YES"
+ buildForProfiling = "YES"
+ buildForArchiving = "YES"
+ buildForAnalyzing = "YES">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "72D9549D1CBB415B006F28BD"
+ BuildableName = "sparkle.app"
+ BlueprintName = "sparkle-cli"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildActionEntry>
+ </BuildActionEntries>
+ </BuildAction>
+ <TestAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES">
+ <Testables>
+ </Testables>
+ </TestAction>
+ <LaunchAction
+ buildConfiguration = "Debug"
+ selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+ selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ launchStyle = "0"
+ useCustomWorkingDirectory = "NO"
+ ignoresPersistentStateOnLaunch = "NO"
+ debugDocumentVersioning = "NO"
+ debugServiceExtension = "internal"
+ allowLocationSimulation = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "72D9549D1CBB415B006F28BD"
+ BuildableName = "sparkle.app"
+ BlueprintName = "sparkle-cli"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </LaunchAction>
+ <ProfileAction
+ buildConfiguration = "Release"
+ shouldUseLaunchSchemeArgsEnv = "YES"
+ savedToolIdentifier = ""
+ useCustomWorkingDirectory = "NO"
+ debugDocumentVersioning = "YES">
+ <BuildableProductRunnable
+ runnableDebuggingMode = "0">
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "72D9549D1CBB415B006F28BD"
+ BuildableName = "sparkle.app"
+ BlueprintName = "sparkle-cli"
+ ReferencedContainer = "container:Sparkle.xcodeproj">
+ </BuildableReference>
+ </BuildableProductRunnable>
+ </ProfileAction>
+ <AnalyzeAction
+ buildConfiguration = "Debug">
+ </AnalyzeAction>
+ <ArchiveAction
+ buildConfiguration = "Release"
+ revealArchiveInOrganizer = "YES">
+ </ArchiveAction>
+</Scheme>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/AppKitPrevention.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Autoupdate Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Autoupdate/TerminationListener.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Autoupdate/TerminationListener.m Added

@@ -0,0 +1,136 @@
+//
+// TerminationListener.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/7/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "TerminationListener.h"
+#import "SULog.h"
+
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.h>
+
+
+#include "AppKitPrevention.h"
+
+@interface TerminationListener ()
+
+@property (nonatomic, readonly, nullable) NSNumber *processIdentifier;
+@property (nonatomic) BOOL watchedTermination;
+@property (nonatomic, copy) void (^completionBlock)(BOOL);
+
+@end
+
+@implementation TerminationListener
+
+@synthesize completionBlock = _completionBlock;
+@synthesize processIdentifier = _processIdentifier;
+@synthesize watchedTermination = _watchedTermination;
+
+- (instancetype)initWithProcessIdentifier:(NSNumber * _Nullable)processIdentifier
+{
+ self = super init;
+ if (self != nil) {
+ _processIdentifier = processIdentifier;
+ }
+ 
+ return self;
+}
+
+- (BOOL)terminated
+{
+ return (self.watchedTermination || self.processIdentifier == nil) ? YES : (kill(self.processIdentifier.intValue, 0) != 0);
+}
+
+- (void)invokeCompletionWithSuccess:(BOOL)success
+{
+ if (self.completionBlock != nil) {
+ self.completionBlock(success);
+ self.completionBlock = nil;
+ }
+}
+
+- (void)startListeningWithCompletion:(void (^)(BOOL))completionBlock
+{
+ self.completionBlock = completionBlock;
+ 
+ if (self.processIdentifier == nil) {
+ self invokeCompletionWithSuccess:YES;
+ return;
+ }
+ 
+ // Use kqueues to determine when the process will terminate
+ // As described in https://developer.apple.com/library/mac/technotes/tn2050/_index.html#//apple_ref/doc/uid/DTS10003081-CH1-SUBSECTION10
+ // By using kqueues, we can stay away from using AppKit in case we ever decide to abandon it
+ 
+ pid_t processIdentifier = self.processIdentifier.intValue;
+ int queue = kqueue();
+ if (queue == -1) {
+ SULog(SULogLevelError, @"Failed to create kqueue() due to error %d: %@", errno, @(strerror(errno)));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ struct kevent changes;
+ EV_SET(&changes, processIdentifier, EVFILT_PROC, EV_ADD | EV_RECEIPT, NOTE_EXIT, 0, NULL);
+ 
+ if (kevent(queue, &changes, 1, &changes, 1, NULL) == -1) {
+ SULog(SULogLevelError, @"Failed to invoke kevent() due to error %d: %@", errno, @(strerror(errno)));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ // We will assume this terminationListener will never be deallocated
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-qual"
+ CFFileDescriptorContext context = { 0, (void *)CFBridgingRetain(self), NULL, NULL, NULL };
+#pragma clang diagnostic pop
+ CFFileDescriptorRef noteExitKQueueRef = CFFileDescriptorCreate(NULL, queue, true, noteExitKQueueCallback, &context);
+ if (noteExitKQueueRef == NULL) {
+ SULog(SULogLevelError, @"Failed to create file descriptor via CFFileDescriptorCreate()");
+ CFRelease((__bridge CFTypeRef)(self));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ CFRunLoopSourceRef runLoopSource = CFFileDescriptorCreateRunLoopSource(NULL, noteExitKQueueRef, 0);
+ if (runLoopSource == NULL) {
+ SULog(SULogLevelError, @"Failed to create runLoopSource via CFFileDescriptorCreateRunLoopSource()");
+ CFRelease((__bridge CFTypeRef)(self));
+ self invokeCompletionWithSuccess:NO;
+ return;
+ }
+ 
+ CFRunLoopAddSource(CFRunLoopGetCurrent(), runLoopSource, kCFRunLoopDefaultMode);
+ CFRelease(runLoopSource);
+ 
+ CFFileDescriptorEnableCallBacks(noteExitKQueueRef, kCFFileDescriptorReadCallBack);
+ 
+ // Make sure we didn't set the listener callback to a dead PID
+ // If we did, we could hang forever. To avoid this, we check if the process has terminated *after* we set up the callback
+ // If we tried to do this check before setting the callback, we could run into an issue where the process can terminate after our check
+ // but before setting the callback
+ if (self terminated) {
+ self invokeCompletionWithSuccess:YES;
+ }
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (self terminated) {
+ self invokeCompletionWithSuccess:YES;
+ }
+ });
+}
+
+static void noteExitKQueueCallback(CFFileDescriptorRef file, CFOptionFlags __unused callBackTypes, void *info)
+{
+ struct kevent event;
+ kevent(CFFileDescriptorGetNativeDescriptor(file), NULL, 0, &event, 1, NULL);
+ 
+ TerminationListener *self = CFBridgingRelease(info);
+ self.watchedTermination = YES;
+ self invokeCompletionWithSuccess:YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Base.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Base.lproj/SUUpdateAlert.xib Added

@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21208.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21208.1"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="SUUpdateAlert">
+ <connections>
+ <outlet property="automaticallyInstallUpdatesButton" destination="117" id="o2H-xw-Qv8"/>
+ <outlet property="descriptionField" destination="101" id="9oA-2S-eXN"/>
+ <outlet property="installButton" destination="76" id="176"/>
+ <outlet property="laterButton" destination="22" id="177"/>
+ <outlet property="releaseNotesBoxView" destination="89" id="FhX-K4-uzH"/>
+ <outlet property="releaseNotesContainerView" destination="fKC-QA-GZa" id="BYw-MA-Z5h"/>
+ <outlet property="skipButton" destination="23" id="178"/>
+ <outlet property="window" destination="5" id="69"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window identifier="SUUpdateAlert" title="Software Update" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+ <windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
+ <windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="746" y="229" width="620" height="370"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+ <value key="minSize" type="size" width="550" height="150"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="620" height="370"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <imageView translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="Program icon">
+ <rect key="frame" x="22" y="286" width="64" height="64"/>
+ <constraints>
+ <constraint firstAttribute="width" secondItem="7" secondAttribute="height" multiplier="1:1" id="7pS-Kw-VGo"/>
+ <constraint firstAttribute="width" priority="800" constant="64" id="QhW-E9-8Br"/>
+ <constraint firstAttribute="height" priority="800" constant="64" id="aXh-vN-k5u"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="168"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
+ </connections>
+ </imageView>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Version text field">
+ <rect key="frame" x="106" y="338" width="494" height="17"/>
+ <constraints>
+ <constraint firstAttribute="height" priority="777" constant="17" id="n8w-DR-XEM"/>
+ </constraints>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="169">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="titleText" id="11"/>
+ </connections>
+ </textField>
+ <textField horizontalHuggingPriority="350" verticalHuggingPriority="999" horizontalCompressionResistancePriority="100" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="101" userLabel="Question text field">
+ <rect key="frame" x="106" y="316" width="494" height="14"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="lessThanOrEqual" priority="300" constant="28" id="H6E-te-Fog"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="KUO-Dw-g6s"/>
+ </constraints>
+ <textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="174">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="descriptionText" id="103"/>
+ </connections>
+ </textField>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="fKC-QA-GZa" userLabel="Container to hide release notes">
+ <rect key="frame" x="108" y="73" width="492" height="235"/>
+ <subviews>
+ <box boxType="oldStyle" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="89">
+ <rect key="frame" x="0.0" y="0.0" width="492" height="215"/>
+ <view key="contentView" id="hbB-V1-Bf6">
+ <rect key="frame" x="1" y="1" width="490" height="213"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ </view>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="pvn-8k-9Ev"/>
+ </constraints>
+ 
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="164">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </box>
+ <textField verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="17">
+ <rect key="frame" x="-2" y="221" width="88" height="14"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="100" constant="100" id="gkn-FW-9aC"/>
+ </constraints>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Release Notes:" usesSingleLineMode="YES" id="170">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="72">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstItem="89" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="6" id="1H8-33-yNF"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="17" secondAttribute="trailing" constant="408" id="5ym-81-wbN"/>
+ <constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" id="Bv8-Jz-SXd"/>
+ <constraint firstAttribute="bottom" secondItem="89" secondAttribute="bottom" id="E4h-VA-0Xt"/>
+ <constraint firstItem="17" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="top" id="P9G-6a-y7j"/>
+ <constraint firstItem="89" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="e5T-q1-kq1"/>
+ <constraint firstItem="17" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="tFH-k0-O7I"/>
+ </constraints>
+ </customView>
+ <button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="22">
+ <rect key="frame" x="338" y="12" width="137" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="90" id="2Zy-5G-GBj"/>
+ </constraints>
+ <buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="remindMeLater:" target="-2" id="34"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="23">
+ <rect key="frame" x="102" y="12" width="139" height="32"/>
+ <buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="172">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="skipThisVersion:" target="-2" id="33"/>
+ </connections>
+ </button>
+ <button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="76">
+ <rect key="frame" x="473" y="12" width="134" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="222" constant="120" id="N94-uf-6oP"/>
+ </constraints>
+ <buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="173">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="installUpdate:" target="-2" id="77"/>
+ </connections>
+ </button>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="117">
+ <rect key="frame" x="108" y="50" width="491" height="16"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
+ </constraints>
+ <buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="93" name="value" keyPath="values.SUAutomaticallyUpdate" id="135"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="10" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="22" id="2ef-4I-Il3"/>
+ <constraint firstAttribute="trailing" secondItem="fKC-QA-GZa" secondAttribute="trailing" constant="20" id="406-Cn-C5d"/>
+ <constraint firstItem="101" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="7XS-9C-U6N"/>
+ <constraint firstItem="23" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="12" id="CBk-cX-pk2"/>
+ <constraint firstItem="22" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="23" secondAttribute="trailing" constant="12" id="EeC-NR-NYg"/>
+ <constraint firstAttribute="trailing" secondItem="76" secondAttribute="trailing" constant="20" id="GdV-QF-Cdi"/>
+ <constraint firstItem="76" firstAttribute="width" secondItem="22" secondAttribute="width" multiplier="0.8" priority="110" id="I8t-73-gX0"/>
+ <constraint firstItem="117" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="bottom" priority="900" constant="8" id="M7E-UY-nWx"/>
+ <constraint firstItem="fKC-QA-GZa" firstAttribute="top" secondItem="101" secondAttribute="bottom" constant="8" id="Mbz-C0-6Cx"/>
+ <constraint firstItem="117" firstAttribute="leading" secondItem="23" secondAttribute="leading" id="Nm4-V1-7X0"/>
+ <constraint firstItem="23" firstAttribute="leading" secondItem="117" secondAttribute="leading" id="OXY-8u-ljs"/>
+ <constraint firstItem="23" firstAttribute="leading" secondItem="10" secondAttribute="leading" constant="1" id="RRB-n5-xid"/>
+ <constraint firstItem="76" firstAttribute="leading" secondItem="22" secondAttribute="trailing" constant="12" id="VQk-Ut-ggj"/>
+ <constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" id="alH-AL-5RD"/>
+ <constraint firstItem="22" firstAttribute="baseline" secondItem="23" secondAttribute="baseline" id="ayY-6b-JGg"/>
+ <constraint firstItem="76" firstAttribute="baseline" secondItem="22" secondAttribute="baseline" id="dIR-3Q-wQx"/>
+ <constraint firstAttribute="bottom" secondItem="76" secondAttribute="bottom" constant="19" id="gcR-Kl-Wlq"/>
+ <constraint firstAttribute="trailing" secondItem="101" secondAttribute="trailing" constant="22" id="k7p-HC-x7i"/>
+ <constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="23" secondAttribute="leading" constant="-1" id="nVW-Qt-8JE"/>
+ <constraint firstAttribute="trailing" secondItem="10" secondAttribute="trailing" constant="22" id="oQx-Oc-awc"/>
+ <constraint firstItem="76" firstAttribute="width" secondItem="23" secondAttribute="width" priority="109" id="pLI-z3-P0b"/>
+ <constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="qQ9-OJ-06z"/>
+ <constraint firstItem="101" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" id="r7Q-z5-jkx"/>
+ <constraint firstItem="10" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="rXd-o0-WQQ"/>
+ <constraint firstAttribute="trailing" secondItem="117" secondAttribute="trailing" constant="21" id="sHI-Hm-eSA"/>
+ <constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="22" id="zSE-lw-Ggj"/>
+ </constraints>
+ </view>
+ <connections>
+ <outlet property="delegate" destination="-2" id="50"/>
+ </connections>
+ <point key="canvasLocation" x="466" y="290"/>
+ </window>
+ <userDefaultsController representsSharedInstance="YES" id="93" userLabel="Shared Defaults"/>
+ </objects>
+ <resources>
+ <image name="NSApplicationIcon" width="32" height="32"/>
+ </resources>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Base.lproj/SUUpdatePermissionPrompt.xib Added

@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="SUUpdatePermissionPrompt">
+ <connections>
+ <outlet property="anonymousInfoDisclosureButton" destination="JW6-0z-Ud3" id="8Ac-kJ-T5e"/>
+ <outlet property="cancelButton" destination="cFC-wV-H3j" id="L2P-Ux-4Vn"/>
+ <outlet property="checkButton" destination="sMh-ha-r7R" id="2O6-G4-etk"/>
+ <outlet property="infoChoiceView" destination="ov1-yV-Uol" id="A1X-Y9-Hnh"/>
+ <outlet property="moreInfoView" destination="39" id="127"/>
+ <outlet property="placeholderHeightLayoutConstraint" destination="yis-HR-OIe" id="odJ-KG-SRB"/>
+ <outlet property="placeholderView" destination="AGr-V0-0al" id="piB-Wg-PJx"/>
+ <outlet property="promptView" destination="Yrl-Dt-Qvb" id="2a4-nD-uDx"/>
+ <outlet property="responseView" destination="0CP-x7-YFK" id="fE5-5k-8Uf"/>
+ <outlet property="stackView" destination="qNw-uD-4Bg" id="DxM-SL-1Xl"/>
+ <outlet property="window" destination="5" id="126"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Profile Info">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="83" y="492" width="488" height="379"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qNw-uD-4Bg">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="437" id="gcK-Q4-n9c"/>
+ </constraints>
+ </stackView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="qNw-uD-4Bg" firstAttribute="top" secondItem="6" secondAttribute="top" id="BBZ-1D-MsD"/>
+ <constraint firstAttribute="trailing" secondItem="qNw-uD-4Bg" secondAttribute="trailing" id="HvQ-3i-G7k"/>
+ <constraint firstItem="qNw-uD-4Bg" firstAttribute="leading" secondItem="6" secondAttribute="leading" id="SsP-SG-frl"/>
+ <constraint firstAttribute="bottom" secondItem="qNw-uD-4Bg" secondAttribute="bottom" id="i6M-Nl-VAm"/>
+ </constraints>
+ </view>
+ <point key="canvasLocation" x="264" y="181"/>
+ </window>
+ <arrayController editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" id="24" userLabel="Array Controller">
+ <declaredKeys>
+ <string>visibleKey</string>
+ <string>visibleValue</string>
+ <string>displayValue</string>
+ <string>displayKey</string>
+ </declaredKeys>
+ <connections>
+ <binding destination="-2" name="contentArray" keyPath="systemProfileInformationArray" id="25"/>
+ </connections>
+ </arrayController>
+ <userDefaultsController id="49" userLabel="User Defaults Controller">
+ <declaredKeys>
+ <string>SUIncludeProfile</string>
+ <string>SUSendProfileInfo</string>
+ </declaredKeys>
+ </userDefaultsController>
+ <view id="Yrl-Dt-Qvb" userLabel="Prompt View">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="87"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8">
+ <rect key="frame" x="104" y="33" width="315" height="34"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="J49-m7-iIa"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Check for updates automatically?" id="gmh-T4-BO0">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia">
+ <rect key="frame" x="104" y="0.0" width="315" height="42"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="42" id="HfG-Lg-91D"/>
+ <constraint firstAttribute="width" constant="311" id="lNZ-C1-ceR"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="DO NOT LOCALIZE" id="cfa-j0-Ya4">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="promptDescription" id="dvR-Lp-2jl"/>
+ </connections>
+ </textField>
+ <imageView translatesAutoresizingMaskIntoConstraints="NO" id="NBn-FN-XAx">
+ <rect key="frame" x="23" y="3" width="64" height="64"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="64" id="KbC-i0-ZyN"/>
+ <constraint firstAttribute="height" constant="64" id="Osy-kb-JTR"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="NSApplicationIcon" id="clc-hq-1NY"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="icon" id="JD9-MU-vwB"/>
+ </connections>
+ </imageView>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="tgW-Jp-Aia" secondAttribute="trailing" constant="20" symbolic="YES" id="Fwc-c2-DDZ"/>
+ <constraint firstAttribute="trailing" secondItem="IgD-Pj-pc8" secondAttribute="trailing" constant="20" symbolic="YES" id="HXU-lh-GWa"/>
+ <constraint firstItem="IgD-Pj-pc8" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="Wl8-N0-skJ"/>
+ <constraint firstItem="NBn-FN-XAx" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="23" id="Xku-5M-xMC"/>
+ <constraint firstItem="tgW-Jp-Aia" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="fPB-MW-Oc2"/>
+ <constraint firstItem="NBn-FN-XAx" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="fad-TA-xIj"/>
+ <constraint firstItem="tgW-Jp-Aia" firstAttribute="top" secondItem="IgD-Pj-pc8" secondAttribute="bottom" constant="-9" id="nN4-jN-Fdn"/>
+ <constraint firstItem="IgD-Pj-pc8" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="s7w-Aw-JQY"/>
+ <constraint firstAttribute="bottom" secondItem="tgW-Jp-Aia" secondAttribute="bottom" id="uS1-FX-kSX"/>
+ </constraints>
+ <point key="canvasLocation" x="-241" y="-37"/>
+ </view>
+ <customView hidden="YES" id="39" userLabel="MoreInfoView">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="205"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="SystemProfileInfo">
+ <rect key="frame" x="107" y="123" width="312" height="70"/>
+ <constraints>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="70" id="Csk-S6-dh4"/>
+ <constraint firstAttribute="width" constant="308" id="iAG-SY-yVp"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="183">
+ 
+ <string key="title">Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.
+
+This is the information that would be sent:</string>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
+ <rect key="frame" x="109" y="0.0" width="308" height="115"/>
+ <clipView key="contentView" id="sbp-rk-wxX">
+ <rect key="frame" x="1" y="1" width="306" height="113"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" id="41">
+ <rect key="frame" x="0.0" y="0.0" width="306" height="113"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <size key="intercellSpacing" width="3" height="2"/>
+ <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
+ <tableColumns>
+ <tableColumn editable="NO" width="128" minWidth="40" maxWidth="1000" id="42">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" selectable="YES" alignment="left" title="Text Cell" id="43">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="24" name="value" keyPath="arrangedObjects.displayKey" id="174"/>
+ </connections>
+ </tableColumn>
+ <tableColumn editable="NO" width="137" minWidth="40" maxWidth="1000" id="44">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
+ <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
+ </tableHeaderCell>
+ <textFieldCell key="dataCell" controlSize="small" selectable="YES" alignment="left" title="Text Cell" id="45">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
+ <connections>
+ <binding destination="24" name="value" keyPath="arrangedObjects.displayValue" id="173"/>
+ </connections>
+ </tableColumn>
+ </tableColumns>
+ <connections>
+ <outlet property="delegate" destination="-2" id="oca-Wx-0pN"/>
+ </connections>
+ </tableView>
+ </subviews>
+ </clipView>
+ <constraints>
+ <constraint firstAttribute="height" constant="115" id="g4H-Z1-0xq"/>
+ </constraints>
+ <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="185">
+ <rect key="frame" x="-100" y="-100" width="345" height="11"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="NO" id="184">
+ <rect key="frame" x="-22" y="1" width="11" height="125"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" constant="12" id="0rj-EA-SIj"/>
+ <constraint firstItem="40" firstAttribute="trailing" secondItem="46" secondAttribute="trailing" id="5Ze-wu-AsK"/>
+ <constraint firstItem="40" firstAttribute="width" secondItem="46" secondAttribute="width" id="AfJ-OK-Apa"/>
+ <constraint firstItem="40" firstAttribute="leading" secondItem="46" secondAttribute="leading" id="Qg9-kp-Lzl"/>
+ <constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="109" id="TMg-61-Tbj"/>
+ <constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" id="fYg-If-EVL"/>
+ <constraint firstAttribute="bottom" secondItem="40" secondAttribute="bottom" id="o4Y-3j-NmQ"/>
+ <constraint firstItem="40" firstAttribute="top" secondItem="46" secondAttribute="bottom" constant="8" symbolic="YES" id="seb-Gl-jtw"/>
+ </constraints>
+ <point key="canvasLocation" x="-621" y="194"/>
+ </customView>
+ <customView id="0CP-x7-YFK" userLabel="Response View">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="ilj-QP-33p" userLabel="View">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
+ <subviews>
+ <button verticalHuggingPriority="750" tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
+ <rect key="frame" x="260" y="13" width="164" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="gon-Nu-M8r"/>
+ </constraints>
+ <buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
+ <rect key="frame" x="145" y="13" width="115" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="Fta-eR-U3P"/>
+ </constraints>
+ <buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="bottom" secondItem="cFC-wV-H3j" secondAttribute="bottom" constant="20" id="B76-mf-2m9"/>
+ <constraint firstItem="cFC-wV-H3j" firstAttribute="top" secondItem="ilj-QP-33p" secondAttribute="top" constant="15" id="Fyr-gv-3TM"/>
+ <constraint firstItem="sMh-ha-r7R" firstAttribute="leading" secondItem="cFC-wV-H3j" secondAttribute="trailing" constant="14" id="Gse-h5-ctH"/>
+ <constraint firstAttribute="width" constant="437" id="KXc-Kv-G8j"/>
+ <constraint firstAttribute="trailing" secondItem="sMh-ha-r7R" secondAttribute="trailing" constant="20" symbolic="YES" id="PWc-tb-dWV"/>
+ <constraint firstItem="sMh-ha-r7R" firstAttribute="centerY" secondItem="cFC-wV-H3j" secondAttribute="centerY" id="dmL-eu-rzf"/>
+ <constraint firstItem="cFC-wV-H3j" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ilj-QP-33p" secondAttribute="leading" constant="20" symbolic="YES" id="l3J-Va-WaM"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="ilj-QP-33p" firstAttribute="top" secondItem="0CP-x7-YFK" secondAttribute="top" id="5In-8H-mUY"/>
+ <constraint firstAttribute="bottom" secondItem="ilj-QP-33p" secondAttribute="bottom" id="XNF-yO-yBl"/>
+ <constraint firstItem="ilj-QP-33p" firstAttribute="leading" secondItem="0CP-x7-YFK" secondAttribute="leading" id="d3g-7o-f52"/>
+ <constraint firstAttribute="trailing" secondItem="ilj-QP-33p" secondAttribute="trailing" id="jzr-jk-sQQ"/>
+ </constraints>
+ <point key="canvasLocation" x="-291" y="554"/>
+ </customView>
+ <customView id="ov1-yV-Uol" userLabel="Anonymous Info View">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="27"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="a0k-dW-Jhx" userLabel="View">
+ <rect key="frame" x="0.0" y="-26" width="437" height="66"/>
+ <subviews>
+ <button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="IncludeInfoButton">
+ <rect key="frame" x="104" y="25" width="313" height="16"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="14" id="MvK-K5-kxt"/>
+ <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="STF-87-eYy"/>
+ </constraints>
+ <buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
+ <dictionary key="options">
+ <integer key="NSNullPlaceholder" value="1"/>
+ <bool key="NSValidatesImmediately" value="YES"/>
+ </dictionary>
+ </binding>
+ </connections>
+ </button>
+ <button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3">
+ <rect key="frame" x="85" y="25" width="16" height="16"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
+ <constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
+ </constraints>
+ <buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
+ <behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
+ <binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </button>
+ </subviews>
+ <constraints>
+ <constraint firstItem="a90-Iq-FgS" firstAttribute="centerY" secondItem="JW6-0z-Ud3" secondAttribute="centerY" id="BNJ-xV-faQ"/>
+ <constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="105" id="ILg-Qu-R6M"/>
+ <constraint firstItem="a90-Iq-FgS" firstAttribute="top" secondItem="a0k-dW-Jhx" secondAttribute="top" constant="26" id="Mh6-5L-xqM"/>
+ <constraint firstAttribute="trailing" secondItem="a90-Iq-FgS" secondAttribute="trailing" constant="20" id="U4G-Eh-HPu"/>
+ <constraint firstItem="JW6-0z-Ud3" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="20" symbolic="YES" id="V3P-iz-aJ9"/>
+ <constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="JW6-0z-Ud3" secondAttribute="trailing" constant="4" id="axA-s0-uGg"/>
+ <constraint firstAttribute="width" constant="437" id="iUc-Zs-h9S"/>
+ <constraint firstAttribute="bottom" secondItem="a90-Iq-FgS" secondAttribute="bottom" constant="26" id="qij-uH-6Yl"/>
+ </constraints>
+ </customView>
+ </subviews>
+ <constraints>
+ <constraint firstItem="a0k-dW-Jhx" firstAttribute="leading" secondItem="ov1-yV-Uol" secondAttribute="leading" id="dE2-R0-ENa"/>
+ <constraint firstItem="a0k-dW-Jhx" firstAttribute="top" secondItem="ov1-yV-Uol" secondAttribute="top" constant="-13" id="ibf-cg-DNR"/>
+ <constraint firstAttribute="trailing" secondItem="a0k-dW-Jhx" secondAttribute="trailing" id="rAn-bJ-Mp6"/>
+ <constraint firstAttribute="bottom" secondItem="a0k-dW-Jhx" secondAttribute="bottom" constant="-26" id="xw5-bj-VOd"/>
+ </constraints>
+ <point key="canvasLocation" x="-113" y="145.5"/>
+ </customView>
+ <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGr-V0-0al" userLabel="Placeholder View">
+ <rect key="frame" x="0.0" y="0.0" width="437" height="205"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="437" id="4p7-cJ-U8Z"/>
+ <constraint firstAttribute="height" constant="205" id="yis-HR-OIe"/>
+ </constraints>
+ <point key="canvasLocation" x="-643" y="495"/>
+ </customView>
+ </objects>
+ <resources>
+ <image name="NSApplicationIcon" width="32" height="32"/>
+ </resources>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Base.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ can’t be updated if it’s running from the location it was downloaded to.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ can’t be updated, because it was opened from a read-only or a temporary location.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ is currently the newest version available.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ is currently the newest version available.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ is now available—you have %3$@. This is an important update; would you like to download it now?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ is now available—you have %3$@. Would you like to download it now?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is now available—you have %3$@. Would you like to learn more about this update on the web?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ downloaded";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%1$@ is now updated to version %2$@!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ is now updated!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ of %2$@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "A new version of %@ is available!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "A new version of %@ is ready to install!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "An error occurred in retrieving update information. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "An error occurred while connecting to the installer. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "An error occurred while downloading the update. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "An error occurred while launching the installer. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "An error occurred while parsing the update feed.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "An error occurred while running the updater. Please try again later.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "An error occurred while starting the installer. Please try again later.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "An important update to %@ is ready to install";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancel";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Cancel Update";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Checking for updates…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Downloading update…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extracting update…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Failed to resume installing update.";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Install and Relaunch";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Install on Quit";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installing update…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Learn More…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Quit %1$@, move it into your Applications folder, relaunch it from there and try again.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Ready to Install";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "The update is improperly signed and could not be validated. Please try again later or contact the app developer.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Unable to Check For Updates";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Update Error!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Update Installed";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Updating %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.";
+
+/* No comment provided by engineer. */
+"Version History" = "Version History";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "Your macOS version is too new";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "Your macOS version is too old";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "You’re up-to-date!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/CheckLocalizations.swift Added

@@ -0,0 +1,115 @@
+#!/usr/bin/xcrun swift
+
+import Foundation
+
+func die(_ msg: String) {
+ print("ERROR: \(msg)")
+ exit(1)
+}
+
+extension XMLElement {
+ convenience init(name: String, attributes: String: String, stringValue string: String? = nil) {
+ self.init(name: name, stringValue: string)
+ setAttributesWith(attributes)
+ }
+}
+
+let ud = UserDefaults.standard
+let sparkleRoot = ud.object(forKey: "root") as? String
+let htmlPath = ud.object(forKey: "htmlPath") as? String
+if sparkleRoot == nil || htmlPath == nil {
+ die("Missing arguments")
+}
+
+let enStringsPath = sparkleRoot! + "/Sparkle/Base.lproj/Sparkle.strings"
+let enStringsDict = NSDictionary(contentsOfFile: enStringsPath)
+if enStringsDict == nil {
+ die("Invalid English strings")
+}
+let enStringsDictKeys = enStringsDict!.allKeys
+
+let dirPath = NSString(string: sparkleRoot! + "/Sparkle")
+let dirContents = try! FileManager.default.contentsOfDirectory(atPath: dirPath as String)
+let css =
+ "body { font-family: sans-serif; font-size: 10pt; }" +
+ "h1 { font-size: 12pt; }" +
+ ".missing { background-color: #FFBABA; color: #D6010E; white-space: pre; }" +
+ ".unused { background-color: #BDE5F8; color: #00529B; white-space: pre; }" +
+ ".unlocalized { background-color: #FEEFB3; color: #9F6000; white-space: pre; }"
+var html = XMLDocument(rootElement: XMLElement(name: "html"))
+html.dtd = XMLDTD()
+html.dtd!.name = html.rootElement()!.name
+html.characterEncoding = "UTF-8"
+html.documentContentKind = XMLDocument.ContentKind.xhtml
+var body = XMLElement(name: "body")
+var head = XMLElement(name: "head")
+html.rootElement()!.addChild(head)
+html.rootElement()!.addChild(body)
+head.addChild(XMLElement(name: "meta", attributes: "charset": html.characterEncoding!))
+head.addChild(XMLElement(name: "title", stringValue: "Sparkle Localizations Report"))
+head.addChild(XMLElement(name: "style", stringValue: css))
+
+let locale = Locale.current
+for dirEntry in dirContents {
+ if NSString(string: dirEntry).pathExtension != "lproj" || dirEntry == "Base.lproj" || dirEntry == "en.lproj" {
+ continue
+ }
+
+ let lang = (locale as NSLocale).displayName(forKey: NSLocale.Key.languageCode, value: NSString(string: dirEntry).deletingPathExtension)
+ body.addChild(XMLElement(name: "h1", stringValue: "\(dirEntry) (\(lang!))"))
+
+ let stringsPath = NSString(string: dirPath.appendingPathComponent(dirEntry)).appendingPathComponent("Sparkle.strings")
+ let stringsDict = NSDictionary(contentsOfFile: stringsPath)
+ if stringsDict == nil {
+ die("Invalid strings file \(dirEntry)")
+ continue
+ }
+
+ var missing: String = 
+ var unlocalized: String = 
+ var unused: String = 
+
+ for key in enStringsDictKeys {
+ let str = stringsDict?.object(forKey: key) as? String
+ if str == nil {
+ missing.append(key as! String)
+ } else if let enStr = enStringsDict?.object(forKey: key) as? String {
+ if enStr == str {
+ unlocalized.append(key as! String)
+ }
+ }
+ }
+
+ let stringsDictKeys = stringsDict!.allKeys
+ for key in stringsDictKeys {
+ if enStringsDict?.object(forKey: key) == nil {
+ unused.append(key as! String)
+ }
+ }
+
+ let sorter = { (s1: String, s2: String) -> Bool in
+ return s1 < s2
+ }
+ missing.sort(by: sorter)
+ unlocalized.sort(by: sorter)
+ unused.sort(by: sorter)
+
+ let addRow = { (prefix: String, cssClass: String, key: String) -> Void in
+ body.addChild(XMLElement(name: "span", attributes: "class": cssClass, stringValue: prefix, key.joined(separator: " ") + "\n"))
+ }
+
+ for key in missing {
+ addRow("Missing", "missing", key)
+ }
+ for key in unlocalized {
+ addRow("Unlocalized", "unlocalized", key)
+ }
+ for key in unused {
+ addRow("Unused", "unused", key)
+ }
+}
+
+var err: NSError?
+if !((try? html.xmlData.write(to: URL(fileURLWithPath: htmlPath!), options: .atomic)) != nil) {
+ die("Can't write report: \(err!)")
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/InstallerProgress-Info.plist Added

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.utilities</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/InstallerProgressAppController.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/InstallerProgressAppController.m Added

@@ -0,0 +1,400 @@
+//
+// InstallerProgressAppController.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "InstallerProgressAppController.h"
+#import "InstallerProgressDelegate.h"
+#import "SPUMessageTypes.h"
+#import "SULog.h"
+#import "SULog+NSError.h"
+#import "SUApplicationInfo.h"
+#import "SPUInstallerAgentProtocol.h"
+#import "SUInstallerAgentInitiationProtocol.h"
+#import "StatusInfo.h"
+#import "SUHost.h"
+#import "SUErrors.h"
+#import "SUNormalization.h"
+#import "SUConstants.h"
+#import "SPUSecureCoding.h"
+#import "SPUInstallationInfo.h"
+
+/**
+ * Terminate the application after a delay from launching the new update to avoid OS activation issues
+ * This delay should be be high enough to increase the likelihood that our updated app will be launched up front,
+ * but should be low enough so that the user doesn't ponder why the updater hasn't finished terminating yet
+ */
+static const NSTimeInterval SUTerminationTimeDelay = 0.3;
+
+@interface InstallerProgressAppController () <NSApplicationDelegate, SPUInstallerAgentProtocol>
+
+@property (nonatomic, readonly) NSApplication *application;
+@property (nonatomic, weak) id<InstallerProgressDelegate> delegate;
+@property (nonatomic, readonly) NSXPCConnection *connection;
+@property (nonatomic) BOOL connected;
+@property (nonatomic) BOOL repliedToRegistration;
+@property (nonatomic, readonly) SUHost *oldHost;
+@property (nonatomic, readonly) BOOL shouldRelaunchHostBundle;
+@property (nonatomic, readonly) NSString *oldHostBundlePath;
+@property (nonatomic, readonly) BOOL systemDomain;
+@property (nonatomic) StatusInfo *statusInfo;
+@property (nonatomic) BOOL submittedLauncherJob;
+@property (nonatomic) BOOL willTerminate;
+@property (nonatomic) BOOL applicationInitiallyAlive;
+@property (nonatomic) NSBundle *applicationBundle;
+@property (nonatomic) NSString *normalizedPath;
+
+@end
+
+#define CONNECTION_ACKNOWLEDGEMENT_TIMEOUT 7ull
+
+@implementation InstallerProgressAppController
+
+@synthesize application = _application;
+@synthesize delegate = _delegate;
+@synthesize connection = _connection;
+@synthesize connected = _connected;
+@synthesize repliedToRegistration = _repliedToRegistration;
+@synthesize oldHost = _oldHost;
+@synthesize shouldRelaunchHostBundle = _shouldRelaunchHostBundle;
+@synthesize oldHostBundlePath = _oldHostBundlePath;
+@synthesize systemDomain = _systemDomain;
+@synthesize statusInfo = _statusInfo;
+@synthesize submittedLauncherJob = _submittedLauncherJob;
+@synthesize willTerminate = _willTerminate;
+@synthesize applicationInitiallyAlive = _applicationInitiallyAlive;
+@synthesize applicationBundle = _applicationBundle;
+@synthesize normalizedPath = _normalizedPath;
+
+- (instancetype)initWithApplication:(NSApplication *)application arguments:(NSArray<NSString *> *)arguments delegate:(id<InstallerProgressDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ if (arguments.count != 3) {
+ SULog(SULogLevelError, @"Error: Invalid number of arguments supplied: %@", arguments);
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:nil;
+ }
+ 
+ NSString *hostBundlePath = arguments1;
+ if (hostBundlePath.length == 0) {
+ SULog(SULogLevelError, @"Error: Host bundle path length is 0");
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:nil;
+ }
+ 
+ NSBundle *hostBundle = NSBundle bundleWithPath:hostBundlePath;
+ if (hostBundle == nil) {
+ SULog(SULogLevelError, @"Error: Host bundle for target is nil");
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:nil;
+ }
+ 
+ NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
+ if (hostBundleIdentifier == nil) {
+ SULog(SULogLevelError, @"Error: Host bundle identifier for target is nil");
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:nil;
+ return nil; // just to silence analyzer warnings later about hostBundleIdentifier being nil
+ }
+ 
+ SUHost *host = SUHost alloc initWithBundle:hostBundle;
+ _shouldRelaunchHostBundle = host boolForInfoDictionaryKey:SURelaunchHostBundleKey;
+ _oldHostBundlePath = host.bundlePath;
+ 
+ _oldHost = host;
+ 
+ // Note that we are connecting to the installer rather than the installer connecting to us
+ // This difference is significant. We shouldn't have a model where the 'server' tries to connect to a 'client',
+ // nor have a model where a process that runs at the highest level (the installer can run as root) tries to connect to a user level agent or process
+ BOOL systemDomain = arguments2.boolValue;
+ NSXPCConnectionOptions connectionOptions = systemDomain ? NSXPCConnectionPrivileged : 0;
+ 
+ _systemDomain = systemDomain;
+ _connection = NSXPCConnection alloc initWithMachServiceName:SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) options:connectionOptions;
+ 
+ _statusInfo = StatusInfo alloc initWithHostBundleIdentifier:hostBundleIdentifier;
+ 
+ application.delegate = self;
+ 
+ _application = application;
+ _delegate = delegate;
+ 
+ _connection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol);
+ _connection.exportedObject = self;
+ 
+ _connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerAgentInitiationProtocol);
+ 
+ __weak InstallerProgressAppController *weakSelf = self;
+ _connection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.connection invalidate;
+ });
+ };
+ 
+ _connection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ InstallerProgressAppController *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ int exitStatus = (strongSelf.repliedToRegistration ? EXIT_SUCCESS : EXIT_FAILURE);
+ NSError *registrationError;
+ if (!strongSelf.repliedToRegistration) {
+ registrationError = NSError errorWithDomain:SUSparkleErrorDomain code:SUAgentInvalidationError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Agent Invalidating without having the chance to reply to installer" };
+ } else {
+ registrationError = nil;
+ }
+ if (!strongSelf.willTerminate) {
+ strongSelf cleanupAndExitWithStatus:exitStatus error:registrationError;
+ }
+ }
+ });
+ };
+ }
+ return self;
+}
+
+- (void)run
+{
+ self.application run;
+}
+
+- (void)startConnection
+{
+ self.statusInfo startListener;
+ 
+ self.connection resume;
+ (id<SUInstallerAgentInitiationProtocol>)self.connection.remoteObjectProxy connectionDidInitiateWithReply:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.connected = YES;
+ });
+ };
+ 
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(CONNECTION_ACKNOWLEDGEMENT_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (!self.connected) {
+ SULog(SULogLevelError, @"Timeout error: failed to receive acknowledgement from installer");
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:nil;
+ }
+ });
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)__unused notification
+{
+ self startConnection;
+}
+
+- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn))
+{
+ if (error != nil) {
+ SULog(SULogLevelError, @"Agent failed..");
+ SULogError(error);
+ 
+ (id<SUInstallerAgentInitiationProtocol>)self.connection.remoteObjectProxy connectionWillInvalidateWithError:error;
+ }
+ 
+ self.statusInfo invalidate;
+ self.connection invalidate;
+ 
+ // Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
+ NSError *theError = nil;
+ NSString *bundlePath = NSBundle mainBundle bundlePath;
+ 
+ if (!NSFileManager defaultManager removeItemAtPath:bundlePath error:&theError) {
+ SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
+ } else {
+ // There should be nothing else in the parent temporary directory given to us,
+ // so let us try to remove it. Note rmdir() will fail if there are unexpectably other
+ // items present
+ NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
+ const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
+ if (fileSystemRepresentation != NULL) {
+ if (rmdir(fileSystemRepresentation) != 0) {
+ SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
+ }
+ }
+ }
+ 
+ exit(status);
+}
+
+- (NSArray<NSRunningApplication *> *)runningApplicationsWithBundle:(NSBundle *)bundle
+{
+ // Resolve symlinks otherwise when we compare file paths, we may not realize two paths that are represented differently are the same
+ NSArray<NSString *> *bundlePathComponents = bundle.bundlePath.stringByResolvingSymlinksInPath.pathComponents;
+ NSString *bundleIdentifier = bundle.bundleIdentifier;
+ 
+ NSMutableArray<NSRunningApplication *> *matchedRunningApplications = NSMutableArray alloc init;
+ 
+ if (bundleIdentifier != nil && bundlePathComponents != nil) {
+ NSArray *runningApplications = NSRunningApplication runningApplicationsWithBundleIdentifier:bundleIdentifier;
+ 
+ // If we find any running application that is translocated and looks like the bundle, we should record those too
+ // We will want to terminate those apps and observe their pids, but we will only do this if we don't find any regular matches
+ NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = NSMutableArray alloc init;
+ 
+ for (NSRunningApplication *runningApplication in runningApplications) {
+ // Comparing the URLs hasn't worked well for me in practice, so I'm comparing the file paths instead
+ NSString *candidatePath = runningApplication.bundleURL.URLByResolvingSymlinksInPath.path;
+ if (candidatePath != nil) {
+ NSArray<NSString *> *candidatePathComponents = candidatePath.pathComponents;
+ if (candidatePathComponents isEqualToArray:bundlePathComponents) {
+ matchedRunningApplications addObject:runningApplication;
+ } else if (matchedRunningApplications.count == 0 && candidatePathComponents.count > 0 && bundlePathComponents.count > 0) {
+ NSString *lastBundlePathComponent = bundlePathComponents.lastObject;
+ NSString *lastCandidatePathComponent = candidatePathComponents.lastObject;
+ if (lastBundlePathComponent != nil && lastCandidatePathComponent != nil && lastBundlePathComponent isEqualToString:lastCandidatePathComponent && candidatePathComponents containsObject:@"AppTranslocation") {
+ potentialMatchingTranslocatedRunningApplications addObject:runningApplication;
+ }
+ }
+ }
+ }
+ 
+ // Non-translocated apps take priority first
+ // And we only use translocated version of apps if there are no regular apps matched
+ if (matchedRunningApplications.count == 0) {
+ matchedRunningApplications addObjectsFromArray:potentialMatchingTranslocatedRunningApplications;
+ }
+ }
+ 
+ return matchedRunningApplications copy;
+}
+
+- (void)registerApplicationBundlePath:(NSString *)applicationBundlePath reply:(void (^)(NSNumber *))reply
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (applicationBundlePath != nil && !self.willTerminate) {
+ NSBundle *applicationBundle = NSBundle bundleWithPath:applicationBundlePath;
+ if (applicationBundle == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SUAgentInvalidationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Encountered invalid path for waiting termination: %@", applicationBundlePath };
+ }
+ 
+ // Compute normalized path that we may use later for relaunching the application
+ // We compute normalized path from progress agent instead of trusting or having the installer
+ // pass it to us
+ if (SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME && applicationBundle.bundlePath isEqualToString:self.oldHostBundlePath) {
+ NSString *normalizedPath = SUNormalizedInstallationPath(self.oldHost);
+ // We only use normalized path if it doesn't already exist
+ // Check the installer which has the same logic
+ if (!NSFileManager defaultManager fileExistsAtPath:normalizedPath) {
+ self.normalizedPath = SUNormalizedInstallationPath(self.oldHost);
+ }
+ }
+ 
+ NSArray<NSRunningApplication *> *runningApplications = self runningApplicationsWithBundle:applicationBundle;
+ 
+ // We're just picking the first running application to send..
+ // Ideally we'd send them all and have the installer monitor all of them but I don't want to deal with that complexity at the moment
+ // Although that would still have the issue if another instance of the application launched during that duration
+ // At the same time we don't want the installer to be over-reliant on us (the agent tool) in a way that could leave the installer as a zombie by accident
+ // In other words, the installer should be monitoring for dead processes, not us
+ // Lastly we don't handle monitoring or terminating processes from logged in users
+ NSRunningApplication *firstRunningApplication = runningApplications.firstObject;
+ NSNumber *processIdentifier = (firstRunningApplication == nil || firstRunningApplication.terminated) ? nil : @(firstRunningApplication.processIdentifier);
+ 
+ reply(processIdentifier);
+ 
+ self.repliedToRegistration = YES;
+ self.applicationBundle = applicationBundle;
+ self.applicationInitiallyAlive = (processIdentifier != nil);
+ } else {
+ assert(false);
+ }
+ });
+}
+
+- (void)registerInstallationInfoData:(NSData *)installationInfoData
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.statusInfo.installationInfoData == nil && installationInfoData != nil) {
+ SPUInstallationInfo *installationInfo = (SPUInstallationInfo *)SPUUnarchiveRootObjectSecurely(installationInfoData, SPUInstallationInfo class);
+ 
+ if (installationInfo != nil) {
+ installationInfo.systemDomain = self.systemDomain;
+ self.statusInfo.installationInfoData = SPUArchiveRootObjectSecurely(installationInfo);
+ } else {
+ SULog(SULogLevelError, @"Error: Failed to decode initial installation info from installer: %@", installationInfoData);
+ }
+ }
+ });
+}
+
+- (void)sendTerminationSignal
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!self.willTerminate && self.applicationBundle != nil) {
+ // Note we are sending an Apple quit event, which gives the application or user a chance to delay or cancel the request, which is what we desire
+ for (NSRunningApplication *runningApplication in self runningApplicationsWithBundle:self.applicationBundle) {
+ runningApplication terminate;
+ }
+ }
+ });
+}
+
+- (void)relaunchApplication
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!self.willTerminate && self.applicationBundle != nil && self.applicationInitiallyAlive) {
+ NSString *pathToRelaunch;
+ if (self.normalizedPath != nil) {
+ pathToRelaunch = self.normalizedPath;
+ } else if (self.shouldRelaunchHostBundle) {
+ // Use self.oldHostBundlePath because it was computed before self.oldHost could have been removed
+ pathToRelaunch = self.oldHostBundlePath;
+ } else {
+ pathToRelaunch = self.applicationBundle.bundlePath;
+ }
+ 
+ // We should at least make sure we're opening a bundle
+ NSBundle *relaunchBundle = NSBundle bundleWithPath:pathToRelaunch;
+ if (relaunchBundle == nil) {
+ self cleanupAndExitWithStatus:EXIT_FAILURE error:NSError errorWithDomain:SUSparkleErrorDomain code:SUAgentInvalidationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Error: Encountered invalid path to relaunch: %@", pathToRelaunch };
+ }
+ 
+ // Note: we can launch application bundles or open plug-in bundles
+ if (!NSWorkspace sharedWorkspace openURL:NSURL fileURLWithPath:pathToRelaunch isDirectory:YES) {
+ SULog(SULogLevelError, @"Error: Failed to relaunch bundle at %@", pathToRelaunch);
+ }
+ 
+ // Delay termination for a little bit to better increase the chance the updated application when relaunched will be the frontmost application
+ // This is related to macOS activation issues when terminating a frontmost application happens right before launching another app
+ 
+ self.willTerminate = YES;
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUTerminationTimeDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ self cleanupAndExitWithStatus:EXIT_SUCCESS error:nil;
+ });
+ }
+ });
+}
+
+- (void)showProgress
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!self.willTerminate) {
+ // Show app icon in the dock
+ ProcessSerialNumber psn = { 0, kCurrentProcess };
+ TransformProcessType(&psn, kProcessTransformToForegroundApplication);
+ 
+ // Note: the application icon needs to be set after showing the icon in the dock
+ self.application.applicationIconImage = SUApplicationInfo bestIconForHost:self.oldHost;
+ 
+ // Activate ourselves otherwise we will probably be in the background
+ self.application activateIgnoringOtherApps:YES;
+ 
+ self.delegate installerProgressShouldDisplayWithHost:self.oldHost;
+ }
+ });
+}
+
+- (void)stopProgress
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Dismiss any UI immediately
+ self.delegate installerProgressShouldStop;
+ self.delegate = nil;
+ 
+ // No need to broadcast status service anymore
+ // In fact we shouldn't when we decide to relaunch the update
+ self.statusInfo invalidate;
+ self.statusInfo = nil;
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/InstallerProgressDelegate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/SPUInstallerAgentProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/SUInstallerAgentInitiationProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/ShowInstallerProgress.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/ShowInstallerProgress.m Added

@@ -0,0 +1,40 @@
+//
+// ShowInstallerProgress.m
+// Installer Progress
+//
+// Created by Mayur Pawashe on 4/7/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <AppKit/AppKit.h>
+#import "ShowInstallerProgress.h"
+#import "SUStatusController.h"
+#import "SUHost.h"
+#import "SULocalizations.h"
+
+@interface ShowInstallerProgress ()
+
+@property (nonatomic) SUStatusController *statusController;
+
+@end
+
+@implementation ShowInstallerProgress
+
+@synthesize statusController = _statusController;
+
+- (void)installerProgressShouldDisplayWithHost:(SUHost *)host
+{
+ self.statusController = SUStatusController alloc initWithHost:host centerPointValue:nil minimizable:NO closable:NO;
+ 
+ self.statusController setButtonTitle:SULocalizedString(@"Cancel Update", @"") target:nil action:nil isDefault:NO;
+ self.statusController beginActionWithTitle:SULocalizedString(@"Installing update…", @"") maxProgressValue:0 statusText:@"";
+ self.statusController showWindow:self;
+}
+
+- (void)installerProgressShouldStop
+{
+ self.statusController close;
+ self.statusController = nil;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/InstallerProgress/main.m Added

@@ -0,0 +1,38 @@
+//
+// main.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "InstallerProgressAppController.h"
+#import "ShowInstallerProgress.h"
+
+int main(int __unused argc, const char __unused *argv)
+{
+ @autoreleasepool
+ {
+ id<InstallerProgressDelegate> showInstallerProgress = ShowInstallerProgress alloc init;
+ 
+ InstallerProgressAppController *appController =
+ InstallerProgressAppController alloc
+ initWithApplication:NSApplication sharedApplication
+ arguments:NSProcessInfo processInfo arguments
+ delegate:showInstallerProgress;
+ 
+ // Ignore SIGTERM because we are going to catch it ourselves
+ signal(SIGTERM, SIG_IGN);
+ 
+ dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
+ dispatch_source_set_event_handler(sigtermSource, ^{
+ appController cleanupAndExitWithStatus:SIGTERM error:nil;
+ });
+ dispatch_resume(sigtermSource);
+ 
+ appController run;
+ }
+ 
+ return EXIT_SUCCESS;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAppcastItemState.h Added

@@ -0,0 +1,28 @@
+//
+// SPUAppcastItemState.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/31/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Appcast Item state that contains properties that depends on a host
+@interface SPUAppcastItemState : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
+- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK;
+
+@property (nonatomic, readonly) BOOL majorUpgrade;
+@property (nonatomic, readonly) BOOL criticalUpdate;
+@property (nonatomic, readonly) BOOL informationalUpdate;
+@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK;
+@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAppcastItemState.m Added

@@ -0,0 +1,69 @@
+//
+// SPUAppcastItemState.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/31/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUAppcastItemState.h"
+
+
+#include "AppKitPrevention.h"
+
+#define SPUAppcastItemStateMajorUpgradeKey @"SPUAppcastItemStateMajorUpgrade"
+#define SPUAppcastItemStateCriticalUpdateKey @"SPUAppcastItemStateCriticalUpdate"
+#define SPUAppcastItemStateInformationalUpdateKey @"SPUAppcastItemStateInformationalUpdate"
+#define SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMinimumOperatingSystemVersionIsOK"
+#define SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMaximumOperatingSystemVersionIsOK"
+
+@interface SPUAppcastItemState () <NSSecureCoding>
+@end
+
+@implementation SPUAppcastItemState
+
+@synthesize majorUpgrade = _majorUpgrade;
+@synthesize criticalUpdate = _criticalUpdate;
+@synthesize informationalUpdate = _informationalUpdate;
+@synthesize minimumOperatingSystemVersionIsOK = _minimumOperatingSystemVersionIsOK;
+@synthesize maximumOperatingSystemVersionIsOK = _maximumOperatingSystemVersionIsOK;
+
+- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK
+{
+ self = super init;
+ if (self != nil) {
+ _majorUpgrade = majorUpgrade;
+ _criticalUpdate = criticalUpdate;
+ _informationalUpdate = informationalUpdate;
+ _minimumOperatingSystemVersionIsOK = minimumOperatingSystemVersionIsOK;
+ _maximumOperatingSystemVersionIsOK = maximumOperatingSystemVersionIsOK;
+ }
+ return self;
+}
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+ encoder encodeBool:self.majorUpgrade forKey:SPUAppcastItemStateMajorUpgradeKey;
+ encoder encodeBool:self.criticalUpdate forKey:SPUAppcastItemStateCriticalUpdateKey;
+ encoder encodeBool:self.informationalUpdate forKey:SPUAppcastItemStateInformationalUpdateKey;
+ encoder encodeBool:self.minimumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey;
+ encoder encodeBool:self.maximumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+ BOOL majorUpgrade = decoder decodeBoolForKey:SPUAppcastItemStateMajorUpgradeKey;
+ BOOL criticalUpdate = decoder decodeBoolForKey:SPUAppcastItemStateCriticalUpdateKey;
+ BOOL informationalUpdate = decoder decodeBoolForKey:SPUAppcastItemStateInformationalUpdateKey;
+ BOOL minimumOperatingSystemVersionIsOK = decoder decodeBoolForKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey;
+ BOOL maximumOperatingSystemVersionIsOK = decoder decodeBoolForKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey;
+ 
+ return self initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAppcastItemStateResolver+Private.h Added

@@ -0,0 +1,24 @@
+//
+// SPUAppcastItemStateResolver+Private.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 6/20/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#ifndef SPUAppcastItemStateResolver_Private_h
+#define SPUAppcastItemStateResolver_Private_h
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SPUAppcastItemStateResolver ()
+
+- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary;
+
++ (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif /* SPUAppcastItemStateResolver_Private_h */

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAppcastItemStateResolver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAppcastItemStateResolver.m Added

@@ -0,0 +1,134 @@
+//
+// SPUAppcastItemStateResolver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/31/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUAppcastItemStateResolver.h"
+#import "SPUAppcastItemStateResolver+Private.h"
+#import "SPUAppcastItemState.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUStandardVersionComparator.h"
+#import "SUConstants.h"
+#import "SUOperatingSystem.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUAppcastItemStateResolver ()
+
+@property (nonatomic, readonly) NSString *hostVersion;
+@property (nonatomic, readonly) id<SUVersionComparison> applicationVersionComparator;
+@property (nonatomic, readonly) SUStandardVersionComparator *standardVersionComparator;
+
+@end
+
+@implementation SPUAppcastItemStateResolver
+
+@synthesize hostVersion = _hostVersion;
+@synthesize applicationVersionComparator = _applicationVersionComparator;
+@synthesize standardVersionComparator = _standardVersionComparator;
+
+- (instancetype)initWithHostVersion:(NSString *)hostVersion applicationVersionComparator:(id<SUVersionComparison>)applicationVersionComparator standardVersionComparator:(SUStandardVersionComparator *)standardVersionComparator
+{
+ self = super init;
+ if (self != nil) {
+ _hostVersion = hostVersion copy;
+ _applicationVersionComparator = applicationVersionComparator;
+ _standardVersionComparator = standardVersionComparator;
+ }
+ return self;
+}
+
+- (BOOL)isMinimumOperatingSystemVersionOK:(NSString * _Nullable)minimumSystemVersion
+{
+ BOOL minimumVersionOK = YES;
+ if (minimumSystemVersion != nil && !minimumSystemVersion isEqualToString:@"") {
+ minimumVersionOK = self.standardVersionComparator compareVersion:(NSString * _Nonnull)minimumSystemVersion toVersion:SUOperatingSystem systemVersionString != NSOrderedDescending;
+ }
+ return minimumVersionOK;
+}
+
+- (BOOL)isMaximumOperatingSystemVersionOK:(NSString * _Nullable)maximumSystemVersion
+{
+ BOOL maximumVersionOK = YES;
+ if (maximumSystemVersion != nil && !maximumSystemVersion isEqualToString:@"") {
+ maximumVersionOK = self.standardVersionComparator compareVersion:(NSString * _Nonnull)maximumSystemVersion toVersion:SUOperatingSystem systemVersionString != NSOrderedAscending;
+ }
+ return maximumVersionOK;
+}
+
++ (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator
+ {
+ return (minimumAutoupdateVersion.length == 0 || (versionComparator compareVersion:hostVersion toVersion:(NSString * _Nonnull)minimumAutoupdateVersion != NSOrderedAscending));
+ }
+
+- (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion
+ {
+ return self class isMinimumAutoupdateVersionOK:minimumAutoupdateVersion hostVersion:self.hostVersion versionComparator:self.applicationVersionComparator;
+ }
+
+- (BOOL)isCriticalUpdateWithCriticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
+{
+ // Check if any critical update info is provided
+ if (criticalUpdateDictionary == nil) {
+ return NO;
+ }
+ 
+ // If no critical version is supplied, then it is critical
+ NSString *criticalVersion = criticalUpdateDictionarySUAppcastAttributeVersion;
+ if (criticalVersion == nil || !criticalVersion isKindOfClass:NSString class) {
+ return YES;
+ }
+ 
+ // Update is only critical when coming from previous versions
+ return (self.applicationVersionComparator compareVersion:self.hostVersion toVersion:criticalVersion == NSOrderedAscending);
+}
+
+- (BOOL)isInformationalUpdateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions
+{
+ if (informationalUpdateVersions == nil) {
+ return NO;
+ }
+ 
+ // Informational only update regardless of version the app is updating from
+ if (informationalUpdateVersions.count == 0) {
+ return YES;
+ }
+ 
+ NSString *hostVersion = self.hostVersion;
+ 
+ // Informational update only for a set of host versions we're updating from
+ if (informationalUpdateVersions containsObject:hostVersion) {
+ return YES;
+ }
+ 
+ // If an informational update version has a '<' prefix, this is an informational update if
+ // hostVersion < this info update version
+ for (NSString *informationalUpdateVersion in informationalUpdateVersions) {
+ if (informationalUpdateVersion hasPrefix:@"<" && self.applicationVersionComparator compareVersion:hostVersion toVersion:informationalUpdateVersion substringFromIndex:1 == NSOrderedAscending) {
+ return YES;
+ }
+ }
+ 
+ return NO;
+}
+
+- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
+{
+ BOOL informationalUpdate = self isInformationalUpdateWithInformationalUpdateVersions:informationalUpdateVersions;
+ 
+ BOOL minimumOperatingSystemVersionIsOK = self isMinimumOperatingSystemVersionOK:minimumOperatingSystemVersion;
+ 
+ BOOL maximumOperatingSystemVersionIsOK = self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion;;
+ 
+ BOOL majorUpgrade = !self isMinimumAutoupdateVersionOK:minimumAutoupdateVersion;
+ 
+ BOOL criticalUpdate = self isCriticalUpdateWithCriticalUpdateDictionary:criticalUpdateDictionary;
+ 
+ return SPUAppcastItemState alloc initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAutomaticUpdateDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUAutomaticUpdateDriver.m Added

@@ -0,0 +1,149 @@
+//
+// SPUAutomaticUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUAutomaticUpdateDriver.h"
+#import "SPUUpdateDriver.h"
+#import "SUHost.h"
+#import "SPUUpdaterDelegate.h"
+#import "SPUCoreBasedUpdateDriver.h"
+#import "SULog.h"
+#import "SUAppcastItem.h"
+#import "SPUUserDriver.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUAutomaticUpdateDriver () <SPUCoreBasedUpdateDriverDelegate>
+
+@property (nonatomic, readonly, weak) id updater;
+@property (nonatomic, readonly, weak) id<SPUUserDriver> userDriver;
+@property (nonatomic, readonly, weak, nullable) id updaterDelegate;
+@property (nonatomic, readonly) SPUCoreBasedUpdateDriver *coreDriver;
+@property (nonatomic) SUAppcastItem* updateItem;
+@property (nonatomic) BOOL willInstallSilently;
+
+@end
+
+@implementation SPUAutomaticUpdateDriver
+
+@synthesize updater = _updater;
+@synthesize userDriver = _userDriver;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize coreDriver = _coreDriver;
+@synthesize updateItem = _updateItem;
+@synthesize willInstallSilently = _willInstallSilently;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
+{
+ self = super init;
+ if (self != nil) {
+ _updater = updater;
+ // The user driver is only used for a termination callback
+ _userDriver = userDriver;
+ _updaterDelegate = updaterDelegate;
+ _coreDriver = SPUCoreBasedUpdateDriver alloc initWithHost:host applicationBundle:applicationBundle updateCheck:SPUUpdateCheckUpdatesInBackground updater:updater updaterDelegate:updaterDelegate delegate:self;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.coreDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
+{
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ self.coreDriver setUpdateWillInstallHandler:updateWillInstallHandler;
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
+{
+ self.coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES requiresSilentInstall:YES;
+}
+
+- (void)resumeInstallingUpdate
+{
+ // Nothing really to do here.. this shouldn't be called.
+ SULog(SULogLevelError, @"Error: resumeInstallingUpdate: called on SPUAutomaticUpdateDriver");
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)__unused resumableUpdate
+{
+ // Nothing really to do here.. this shouldn't be called.
+ SULog(SULogLevelError, @"Error: resumeDownloadedUpdate: called on SPUAutomaticUpdateDriver");
+}
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
+{
+ self.updateItem = updateItem;
+ 
+ if (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade) {
+ self.coreDriver deferInformationalUpdate:updateItem secondaryUpdate:secondaryUpdateItem;
+ self abortUpdate;
+ } else {
+ self.coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:YES;
+ }
+}
+
+- (BOOL)showingUpdate
+{
+ return NO;
+}
+
+- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
+{
+ self.willInstallSilently = willInstallSilently;
+ 
+ if (!willInstallImmediately) {
+ BOOL installationHandledByDelegate = NO;
+ id<SPUUpdaterDelegate> updaterDelegate = self.updaterDelegate;
+ if (self.willInstallSilently && updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)) {
+ __weak SPUAutomaticUpdateDriver *weakSelf = self;
+ installationHandledByDelegate = updaterDelegate updater:self.updater willInstallUpdateOnQuit:self.updateItem immediateInstallationBlock:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:NO;
+ });
+ };
+ }
+ 
+ if (!installationHandledByDelegate) {
+ // We are done and can safely abort now
+ // The installer tool will keep the installation alive
+ self abortUpdate;
+ }
+ }
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)abortUpdate
+{
+ self abortUpdateWithError:nil;
+}
+
+- (void)abortUpdateWithError:(NSError *)error
+{
+ BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!self.willInstallSilently || self.updateItem.criticalUpdate || self.updateItem.isInformationOnlyUpdate);
+ 
+ self.coreDriver abortUpdateAndShowNextUpdateImmediately:showNextUpdateImmediately error:error;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUBasicUpdateDriver.h Added

@@ -0,0 +1,46 @@
+//
+// SPUBasicUpdateDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SPUUpdateDriver.h"
+#import "SPUUpdateCheck.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUHost, SUAppcastItem;
+@protocol SPUUpdaterDelegate;
+
+@protocol SPUBasicUpdateDriverDelegate <NSObject>
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem systemDomain:(NSNumber * _Nullable)systemDomain;
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+
+@optional
+
+- (void)basicDriverDidFinishLoadingAppcast;
+
+@end
+
+@interface SPUBasicUpdateDriver : NSObject
+
+- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate;
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
+
+- (void)resumeInstallingUpdate;
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
+
+- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldSignalShowingUpdate resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUBasicUpdateDriver.m Added

@@ -0,0 +1,282 @@
+//
+// SPUBasicUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUBasicUpdateDriver.h"
+#import "SUAppcastDriver.h"
+#import "SPUUpdaterDelegate.h"
+#import "SUErrors.h"
+#import "SULocalizations.h"
+#import "SUHost.h"
+#import "SUAppcastItem.h"
+#import "SPUProbeInstallStatus.h"
+#import "SPUInstallationInfo.h"
+#import "SPUResumableUpdate.h"
+#import "SPUAppcastItemState.h"
+#import "SUAppcastItem+Private.h"
+#import "SPUInstallationType.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUBasicUpdateDriver () <SUAppcastDriverDelegate>
+
+@property (nonatomic, weak, readonly) id<SPUBasicUpdateDriverDelegate> delegate;
+@property (nonatomic, readonly) SUAppcastDriver *appcastDriver;
+@property (nonatomic, copy) SPUUpdateDriverCompletion completionBlock;
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, readonly) SPUUpdateCheck updateCheck;
+@property (nonatomic, readonly, weak) id updater; // if we didn't have legacy support, I'd remove this..
+@property (nullable, nonatomic, readonly, weak) id <SPUUpdaterDelegate>updaterDelegate;
+
+@property (nonatomic) BOOL aborted;
+
+@end
+
+@implementation SPUBasicUpdateDriver
+
+@synthesize host = _host;
+@synthesize updateCheck = _updateCheck;
+@synthesize updater = _updater;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize delegate = _delegate;
+@synthesize appcastDriver = _appcastDriver;
+@synthesize completionBlock = _completionBlock;
+@synthesize aborted = _aborted;
+
+- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _host = host;
+ _updateCheck = updateCheck;
+ _updater = updater;
+ _updaterDelegate = updaterDelegate;
+ _delegate = delegate;
+ 
+ _appcastDriver = SUAppcastDriver alloc initWithHost:host updater:updater updaterDelegate:updaterDelegate delegate:self;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.completionBlock = completionBlock;
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
+{
+ if (self.host isRunningOnReadOnlyVolume) {
+ NSString *hostName = self.host.name;
+ if (self.host isRunningTranslocated) {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SURunningTranslocated userInfo:@{ NSLocalizedRecoverySuggestionErrorKey: NSString stringWithFormat:SULocalizedString(@"Quit %1$@, move it into your Applications folder, relaunch it from there and try again.", nil), hostName, NSLocalizedDescriptionKey: NSString stringWithFormat:SULocalizedString(@"%1$@ can’t be updated if it’s running from the location it was downloaded to.", nil), hostName, };
+ } else {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:SULocalizedString(@"%1$@ can’t be updated, because it was opened from a read-only or a temporary location.", nil), hostName, NSLocalizedRecoverySuggestionErrorKey: NSString stringWithFormat:SULocalizedString(@"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.", nil), hostName };
+ }
+ } else {
+ self.appcastDriver loadAppcastFromURL:appcastURL userAgent:userAgent httpHeaders:httpHeaders inBackground:background;
+ }
+}
+
+- (void)notifyResumableUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain
+{
+ if (updateItem == nil) {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUResumeAppcastError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedString(@"Failed to resume installing update.", nil) };
+ } else {
+ // Kind of lying, but triggering the notification so drivers can know when to stop showing initial fetching progress
+ self notifyFinishLoadingAppcast;
+ 
+ SUAppcastItem *nonNullUpdateItem = updateItem;
+ self notifyFoundValidUpdateWithAppcastItem:nonNullUpdateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain resuming:YES;
+ }
+}
+
+- (void)resumeInstallingUpdate
+{
+ NSString *hostBundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self notifyResumableUpdateItem:installationInfo.appcastItem secondaryUpdateItem:nil systemDomain:@(installationInfo.systemDomain);
+ });
+ };
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self notifyResumableUpdateItem:resumableUpdate.updateItem secondaryUpdateItem:resumableUpdate.secondaryUpdateItem systemDomain:nil;
+}
+
+- (void)didFailToFetchAppcastWithError:(NSError *)error
+{
+ if (!self.aborted) {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:error;
+ }
+}
+
+- (void)notifyFinishLoadingAppcast
+{
+ if (self.delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)) {
+ self.delegate basicDriverDidFinishLoadingAppcast;
+ }
+}
+
+- (void)didFinishLoadingAppcast:(SUAppcast *)appcast
+{
+ if (!self.aborted) {
+ if (self.updaterDelegate respondsToSelector:@selector((updater:didFinishLoadingAppcast:))) {
+ self.updaterDelegate updater:self.updater didFinishLoadingAppcast:appcast;
+ }
+ 
+ self notifyFinishLoadingAppcast;
+ }
+}
+
+- (void)notifyFoundValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain resuming:(BOOL)resuming
+{
+ if (!self.aborted) {
+ if (!resuming) {
+ // interactive pkg based updates are not supported under root user
+ if (updateItem.installationType isEqualToString:SPUInstallationTypeInteractivePackage && geteuid() == 0) {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationRootInteractiveError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedString(@"Interactive based packages cannot be installed as the root user.", nil) };
+ return;
+ } else {
+ // Give the delegate a chance to bail
+ 
+ NSError *shouldNotProceedError = nil;
+ if (self.updaterDelegate respondsToSelector:@selector(updater:shouldProceedWithUpdate:updateCheck:error:) && !self.updaterDelegate updater:self.updater shouldProceedWithUpdate:updateItem updateCheck:self.updateCheck error:&shouldNotProceedError) {
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:shouldNotProceedError;
+ return;
+ }
+ }
+ }
+ 
+ NSNotificationCenter defaultCenter postNotificationName:SUUpdaterDidFindValidUpdateNotification
+ object:self.updater
+ userInfo:@{ SUUpdaterAppcastItemNotificationKey: updateItem };
+ 
+ if (self.updaterDelegate respondsToSelector:@selector((updater:didFindValidUpdate:))) {
+ self.updaterDelegate updater:self.updater didFindValidUpdate:updateItem;
+ }
+ 
+ self.delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain;
+ }
+}
+
+- (void)didFindValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem
+{
+ self notifyFoundValidUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryAppcastItem systemDomain:nil resuming:NO;
+}
+
+- (void)didNotFindUpdateWithLatestAppcastItem:(nullable SUAppcastItem *)latestAppcastItem hostToLatestAppcastItemComparisonResult:(NSComparisonResult)hostToLatestAppcastItemComparisonResult background:(BOOL)background
+{
+ if (!self.aborted) {
+ NSString *localizedDescription;
+ NSString *recoverySuggestion;
+ 
+ SPUNoUpdateFoundReason reason;
+ if (latestAppcastItem != nil) {
+ switch (hostToLatestAppcastItemComparisonResult) {
+ case NSOrderedDescending:
+ // This means the user is a 'newer than latest' version. give a slight hint to the user instead of wrongly claiming this version is identical to the latest feed version.
+ localizedDescription = SULocalizedString(@"You’re up-to-date!", "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
+ 
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%@ %@ is currently the newest version available.\n(You are currently running version %@.)", nil), self.host name, latestAppcastItem.displayVersionString, self.host displayVersion;
+ 
+ reason = SPUNoUpdateFoundReasonOnNewerThanLatestVersion;
+ break;
+ case NSOrderedSame:
+ // No new update is available and we're on the latest
+ localizedDescription = SULocalizedString(@"You’re up-to-date!", "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
+ 
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%@ %@ is currently the newest version available.", nil), self.host name, self.host displayVersion;
+ 
+ reason = SPUNoUpdateFoundReasonOnLatestVersion;
+ break;
+ case NSOrderedAscending:
+ // A new update is available but cannot be installed
+ 
+ if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
+ localizedDescription = SULocalizedString(@"Your macOS version is too old", nil);
+ 
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required.", nil), self.host name, latestAppcastItem.displayVersionString, latestAppcastItem.minimumSystemVersion;
+ 
+ reason = SPUNoUpdateFoundReasonSystemIsTooOld;
+ } else if (!latestAppcastItem.maximumOperatingSystemVersionIsOK) {
+ localizedDescription = SULocalizedString(@"Your macOS version is too new", nil);
+ 
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@.", nil), self.host name, latestAppcastItem.displayVersionString, latestAppcastItem.maximumSystemVersion;
+ 
+ reason = SPUNoUpdateFoundReasonSystemIsTooNew;
+ } else {
+ // We shouldn't realistically get here
+ localizedDescription = SULocalizedString(@"You’re up-to-date!", "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
+ 
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%@ %@ is currently the newest version available.", nil), self.host name, self.host displayVersion;
+ 
+ reason = SPUNoUpdateFoundReasonUnknown;
+ }
+ break;
+ }
+ } else {
+ // When no updates are found in the appcast
+ // We will need to assume the user is up to date if the feed doen't have any applicable update items
+ // There could be update items on channels the updater is not subscribed to for example. But we can't tell the user about them.
+ // There could also only be update items available for other platforms or none at all.
+ localizedDescription = SULocalizedString(@"You’re up-to-date!", "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
+ recoverySuggestion = NSString stringWithFormat:SULocalizedString(@"%@ %@ is currently the newest version available.", nil), self.host name, self.host displayVersion;
+ 
+ reason = SPUNoUpdateFoundReasonOnLatestVersion;
+ }
+ 
+ NSString *recoveryOption = SULocalizedString(@"OK", nil);
+ 
+ NSMutableDictionary *userInfo =
+ NSMutableDictionary dictionaryWithDictionary:@{
+ NSLocalizedDescriptionKey: localizedDescription,
+ NSLocalizedRecoverySuggestionErrorKey: recoverySuggestion,
+ NSLocalizedRecoveryOptionsErrorKey: @recoveryOption,
+ SPUNoUpdateFoundReasonKey: @(reason),
+ SPUNoUpdateFoundUserInitiatedKey: @(!background),
+ };
+ 
+ if (latestAppcastItem != nil) {
+ userInfoSPULatestAppcastItemFoundKey = latestAppcastItem;
+ }
+ 
+ NSError *notFoundError =
+ NSError
+ errorWithDomain:SUSparkleErrorDomain
+ code:SUNoUpdateError
+ userInfo:userInfo copy;
+ 
+ if (self.updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:error:))) {
+ self.updaterDelegate updaterDidNotFindUpdate:self.updater error:notFoundError;
+ } else if (self.updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:))) {
+ self.updaterDelegate updaterDidNotFindUpdate:self.updater;
+ }
+ 
+ NSNotificationCenter defaultCenter postNotificationName:SUUpdaterDidNotFindUpdateNotification object:self.updater userInfo:userInfo;
+ 
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:notFoundError;
+ }
+}
+
+- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error
+{
+ self.aborted = YES;
+ 
+ self.appcastDriver cleanup:^{
+ if (self.completionBlock != nil) {
+ self.completionBlock(shouldShowUpdateImmediately, resumableUpdate, error);
+ self.completionBlock = nil;
+ }
+ };
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUCoreBasedUpdateDriver.h Added

@@ -0,0 +1,77 @@
+//
+// SPUCoreBasedUpdateDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SPUUpdateDriver.h"
+#import "SPUUserUpdateState.h"
+#import "SPUUpdateCheck.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUHost, SUAppcastItem;
+@protocol SPUUpdaterDelegate;
+
+@protocol SPUCoreBasedUpdateDriverDelegate <NSObject>
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
+
+- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
+
+- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+
+@optional
+
+- (void)basicDriverDidFinishLoadingAppcast;
+
+- (void)downloadDriverWillBeginDownload;
+
+- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
+
+- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length;
+
+- (void)coreDriverDidStartExtractingUpdate;
+
+- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
+
+- (void)installerDidExtractUpdateWithProgress:(double)progress;
+
+- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement;
+
+@end
+
+@interface SPUCoreBasedUpdateDriver : NSObject
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate;
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall;
+
+- (void)resumeInstallingUpdate;
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
+
+- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background;
+
+- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem;
+
+- (void)extractDownloadedUpdate;
+
+- (void)clearDownloadedUpdate;
+
+- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)installUpdateStatus displayingUserInterface:(BOOL)displayingUserInterface;
+
+- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUCoreBasedUpdateDriver.m Added

@@ -0,0 +1,391 @@
+//
+// SPUCoreBasedUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUCoreBasedUpdateDriver.h"
+#import "SUHost.h"
+#import "SPUUpdaterDelegate.h"
+#import "SPUBasicUpdateDriver.h"
+#import "SPUInstallerDriver.h"
+#import "SPUDownloadDriver.h"
+#import "SULog.h"
+#import "SULog+NSError.h"
+#import "SUErrors.h"
+#import "SPUResumableUpdate.h"
+#import "SPUDownloadedUpdate.h"
+#import "SPUInformationalUpdate.h"
+#import "SUAppcastItem.h"
+#import "SULocalizations.h"
+#import "SPUInstallationType.h"
+#import "SUPhasedUpdateGroupInfo.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUCoreBasedUpdateDriver () <SPUBasicUpdateDriverDelegate, SPUDownloadDriverDelegate, SPUInstallerDriverDelegate>
+
+@property (nonatomic, readonly) SPUBasicUpdateDriver *basicDriver;
+@property (nonatomic) SPUDownloadDriver *downloadDriver;
+@property (nonatomic, readonly) SPUInstallerDriver *installerDriver;
+@property (nonatomic, weak, readonly) id<SPUCoreBasedUpdateDriverDelegate> delegate;
+@property (nonatomic) SUAppcastItem *updateItem;
+@property (nonatomic, nullable) SUAppcastItem *secondaryUpdateItem;
+@property (nonatomic) id<SPUResumableUpdate> resumableUpdate;
+@property (nonatomic) SPUDownloadedUpdate *downloadedUpdateForRemoval;
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic) BOOL resumingInstallingUpdate;
+@property (nonatomic) BOOL silentInstall;
+@property (nonatomic, readonly, weak) id updater; // if we didn't have legacy support, I'd remove this..
+@property (nullable, nonatomic, readonly, weak) id <SPUUpdaterDelegate>updaterDelegate;
+@property (nonatomic) NSString *userAgent;
+@property (nonatomic, nullable) NSDictionary *httpHeaders;
+
+@end
+
+@implementation SPUCoreBasedUpdateDriver
+
+@synthesize basicDriver = _basicDriver;
+@synthesize downloadDriver = _downloadDriver;
+@synthesize installerDriver = _installerDriver;
+@synthesize delegate = _delegate;
+@synthesize updateItem = _updateItem;
+@synthesize secondaryUpdateItem = _secondaryUpdateItem;
+@synthesize host = _host;
+@synthesize resumingInstallingUpdate = _resumingInstallingUpdate;
+@synthesize silentInstall = _silentInstall;
+@synthesize updater = _updater;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize userAgent = _userAgent;
+@synthesize httpHeaders = _httpHeaders;
+@synthesize resumableUpdate = _resumableUpdate;
+@synthesize downloadedUpdateForRemoval = _downloadedUpdateForRemoval;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _delegate = delegate;
+ 
+ NSString *bundleIdentifier = host.bundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ 
+ _basicDriver = SPUBasicUpdateDriver alloc initWithHost:host updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self;
+ _installerDriver = SPUInstallerDriver alloc initWithHost:host applicationBundle:applicationBundle updater:updater updaterDelegate:updaterDelegate delegate:self;
+ 
+ _host = host;
+ _updater = updater;
+ _updaterDelegate = updaterDelegate;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.basicDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ self.installerDriver setUpdateWillInstallHandler:updateWillInstallHandler;
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall
+{
+ self.userAgent = userAgent;
+ self.httpHeaders = httpHeaders;
+ self.silentInstall = silentInstall;
+ 
+ self.basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background;
+}
+
+- (void)resumeInstallingUpdate
+{
+ self.resumingInstallingUpdate = YES;
+ self.silentInstall = NO;
+ 
+ self.basicDriver resumeInstallingUpdate;
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self.resumableUpdate = resumableUpdate;
+ self.silentInstall = NO;
+ 
+ self.basicDriver resumeUpdate:resumableUpdate;
+}
+
+- (void)basicDriverDidFinishLoadingAppcast
+{
+ if (self.delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)) {
+ self.delegate basicDriverDidFinishLoadingAppcast;
+ }
+}
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain
+{
+ self.updateItem = updateItem;
+ self.secondaryUpdateItem = secondaryUpdateItem;
+ 
+ if (self.resumingInstallingUpdate) {
+ assert(systemDomain != nil);
+ self.installerDriver resumeInstallingUpdateWithUpdateItem:updateItem systemDomain:systemDomain.boolValue;
+ }
+ 
+ self.delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem;
+}
+
+- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background
+{
+ self.downloadDriver = SPUDownloadDriver alloc initWithUpdateItem:updateItem secondaryUpdateItem:secondaryUpdateItem host:self.host userAgent:self.userAgent httpHeaders:self.httpHeaders inBackground:background delegate:self;
+ 
+ if (self.updaterDelegate respondsToSelector:@selector((updater:willDownloadUpdate:withRequest:))) {
+ self.updaterDelegate updater:self.updater
+ willDownloadUpdate:updateItem
+ withRequest:self.downloadDriver.request;
+ }
+ 
+ self.downloadDriver downloadFile;
+}
+
+- (void)downloadDriverWillBeginDownload
+{
+ if (self.delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)) {
+ self.delegate downloadDriverWillBeginDownload;
+ }
+}
+
+- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
+{
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidReceiveExpectedContentLength:)) {
+ self.delegate downloadDriverDidReceiveExpectedContentLength:expectedContentLength;
+ }
+}
+
+- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
+{
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidReceiveDataOfLength:)) {
+ self.delegate downloadDriverDidReceiveDataOfLength:length;
+ }
+}
+
+- (void)downloadDriverDidDownloadUpdate:(SPUDownloadedUpdate *)downloadedUpdate
+{
+ // Use a new update group for our next downloaded update
+ // We could restrict this to when the appcast was downloaded in the background,
+ // but it shouldn't matter.
+ if (downloadedUpdate.updateItem.phasedRolloutInterval != nil) {
+ SUPhasedUpdateGroupInfo setNewUpdateGroupIdentifierForHost:self.host;
+ }
+ 
+ if (self.updaterDelegate respondsToSelector:@selector(updater:didDownloadUpdate:)) {
+ self.updaterDelegate updater:self.updater didDownloadUpdate:self.updateItem;
+ }
+ 
+ self.resumableUpdate = downloadedUpdate;
+ self extractUpdate:downloadedUpdate;
+}
+
+- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem
+{
+ self.resumableUpdate = SPUInformationalUpdate alloc initWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem;
+}
+
+- (void)extractDownloadedUpdate
+{
+ assert(self.resumableUpdate != nil);
+ self extractUpdate:self.resumableUpdate;
+}
+
+- (void)clearDownloadedUpdate
+{
+ id<NSObject> downloadedUpdateObject = (self.resumableUpdate != nil) ? self.resumableUpdate : self.downloadedUpdateForRemoval;
+ assert(downloadedUpdateObject != nil);
+ 
+ if (downloadedUpdateObject != nil && downloadedUpdateObject isKindOfClass:SPUDownloadedUpdate class) {
+ if (self.downloadDriver == nil) {
+ self.downloadDriver = SPUDownloadDriver alloc initWithHost:self.host;
+ }
+ 
+ SPUDownloadedUpdate *downloadedUpdate = (SPUDownloadedUpdate *)downloadedUpdateObject;
+ self.downloadDriver removeDownloadedUpdate:downloadedUpdate;
+ }
+ 
+ // Clear any type of resumable update
+ self.resumableUpdate = nil;
+}
+
+- (void)extractUpdate:(SPUDownloadedUpdate *)downloadedUpdate
+{
+ if (self.updaterDelegate respondsToSelector:@selector(updater:willExtractUpdate:)) {
+ self.updaterDelegate updater:self.updater willExtractUpdate:self.updateItem;
+ }
+ 
+ // Now we have to extract the downloaded archive.
+ if (self.delegate respondsToSelector:@selector(coreDriverDidStartExtractingUpdate)) {
+ self.delegate coreDriverDidStartExtractingUpdate;
+ }
+ 
+ self.installerDriver extractDownloadedUpdate:downloadedUpdate silently:self.silentInstall completion:^(NSError * _Nullable error) {
+ if (error != nil) {
+ if (error.code != SUInstallationAuthorizeLaterError) {
+ self clearDownloadedUpdate;
+ }
+ 
+ self.delegate coreDriverIsRequestingAbortUpdateWithError:error;
+ } else {
+ // If the installer started properly, we can't use the downloaded update archive anymore
+ // Especially if the installer fails later and we try resuming the update with a missing archive file
+ // We must clear the download after the installer begins using it however (in -installerDidStartInstalling)
+ self.downloadedUpdateForRemoval = downloadedUpdate;
+ self.resumableUpdate = nil;
+ 
+ if (self.updaterDelegate respondsToSelector:@selector(updater:didExtractUpdate:)) {
+ self.updaterDelegate updater:self.updater didExtractUpdate:self.updateItem;
+ }
+ }
+ };
+}
+
+- (void)downloadDriverDidFailToDownloadFileWithError:(NSError *)error
+{
+ if (self.updateItem isDeltaUpdate) {
+ SULog(SULogLevelError, @"Failed to download delta update. Falling back to regular update...");
+ SULogError(error);
+ 
+ self fallBackAndDownloadRegularUpdate;
+ } else {
+ if (self.updaterDelegate respondsToSelector:@selector((updater:failedToDownloadUpdate:error:))) {
+ NSError *errorToReport = error.userInfo objectForKey:NSUnderlyingErrorKey;
+ if (errorToReport == nil) {
+ errorToReport = error;
+ }
+ 
+ self.updaterDelegate updater:self.updater
+ failedToDownloadUpdate:self.updateItem
+ error:errorToReport;
+ }
+ 
+ self.delegate coreDriverIsRequestingAbortUpdateWithError:error;
+ }
+}
+
+- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
+{
+ if (self.delegate respondsToSelector:@selector(installerDidStartInstallingWithApplicationTerminated:)) {
+ self.delegate installerDidStartInstallingWithApplicationTerminated:applicationTerminated;
+ }
+}
+
+- (void)installerDidStartExtracting
+{
+ // The installer has moved the archive and no longer needs the download directory
+ self clearDownloadedUpdate;
+}
+
+- (void)installerDidExtractUpdateWithProgress:(double)progress
+{
+ if (self.delegate respondsToSelector:@selector(installerDidExtractUpdateWithProgress:)) {
+ self.delegate installerDidExtractUpdateWithProgress:progress;
+ }
+}
+
+- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
+{
+ self.delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately silently:willInstallSilently;
+}
+
+- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)response displayingUserInterface:(BOOL)displayingUserInterface
+{
+ switch (response) {
+ case SPUUserUpdateChoiceDismiss:
+ self.delegate coreDriverIsRequestingAbortUpdateWithError:nil;
+ break;
+ case SPUUserUpdateChoiceSkip:
+ self.installerDriver cancelUpdate;
+ break;
+ case SPUUserUpdateChoiceInstall:
+ self.installerDriver installWithToolAndRelaunch:YES displayingUserInterface:displayingUserInterface;
+ break;
+ }
+}
+
+- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch
+{
+ if (self.updaterDelegate respondsToSelector:@selector((updater:willInstallUpdate:))) {
+ self.updaterDelegate updater:self.updater willInstallUpdate:self.updateItem;
+ }
+ 
+ if (relaunch) {
+ NSNotificationCenter defaultCenter postNotificationName:SUUpdaterWillRestartNotification object:self;
+ if (self.updaterDelegate respondsToSelector:@selector((updaterWillRelaunchApplication:))) {
+ self.updaterDelegate updaterWillRelaunchApplication:self.updater;
+ }
+ }
+}
+
+- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
+{
+ if (self.delegate respondsToSelector:@selector(installerDidFinishInstallationAndRelaunched:acknowledgement:)) {
+ self.delegate installerDidFinishInstallationAndRelaunched:relaunched acknowledgement:acknowledgement;
+ } else {
+ acknowledgement();
+ }
+}
+
+- (void)installerIsRequestingAbortInstallWithError:(nullable NSError *)error
+{
+ self.delegate coreDriverIsRequestingAbortUpdateWithError:error;
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ // A delegate may want to handle this type of error specially
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:error;
+}
+
+- (void)fallBackAndDownloadRegularUpdate
+{
+ SUAppcastItem *secondaryUpdateItem = self.secondaryUpdateItem;
+ assert(secondaryUpdateItem != nil);
+ 
+ BOOL backgroundDownload = self.downloadDriver.inBackground;
+ 
+ // Fall back to the non-delta update. Note that we don't want to trigger another update was found event.
+ self.updateItem = secondaryUpdateItem;
+ self.secondaryUpdateItem = nil;
+ 
+ self downloadUpdateFromAppcastItem:secondaryUpdateItem secondaryAppcastItem:nil inBackground:backgroundDownload;
+}
+
+- (void)installerDidFailToApplyDeltaUpdate
+{
+ self clearDownloadedUpdate;
+ 
+ self fallBackAndDownloadRegularUpdate;
+}
+
+- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error
+{
+ self.installerDriver abortInstall;
+ 
+ void (^basicDriverAbort)(void) = ^{
+ id<SPUResumableUpdate> resumableUpdate = (error == nil || error.code == SUInstallationAuthorizeLaterError) ? self.resumableUpdate : nil;
+ 
+ self.basicDriver abortUpdateAndShowNextUpdateImmediately:shouldShowUpdateImmediately resumableUpdate:resumableUpdate error:error;
+ };
+ 
+ if (self.downloadDriver != nil) {
+ self.downloadDriver cleanup:^{
+ basicDriverAbort();
+ };
+ } else {
+ basicDriverAbort();
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadData.h Added

@@ -0,0 +1,52 @@
+//
+// SPUDownloadData.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 8/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#ifdef BUILDING_SPARKLE_DOWNLOADER_SERVICE
+// Ignore incorrect warning
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "SUExport.h"
+#pragma clang diagnostic pop
+#else
+#import <Sparkle/SUExport.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * A class for containing downloaded data along with some information about it.
+ */
+SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
+
+/**
+ * The raw data that was downloaded.
+ */
+@property (nonatomic, readonly) NSData *data;
+
+/**
+ * The URL that was fetched from.
+ *
+ * This may be different from the URL in the request if there were redirects involved.
+ */
+@property (nonatomic, readonly, copy) NSURL *URL;
+
+/**
+ * The IANA charset encoding name if available. Eg: "utf-8"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *textEncodingName;
+
+/**
+ * The MIME type if available. Eg: "text/plain"
+ */
+@property (nonatomic, readonly, nullable, copy) NSString *MIMEType;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadData.m Added

@@ -0,0 +1,76 @@
+//
+//  SPUDownloadData.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/10/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloadData.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SPUDownloadDataKey = @"SPUDownloadData";
+static NSString *SPUDownloadURLKey = @"SPUDownloadURL";
+static NSString *SPUDownloadTextEncodingKey = @"SPUDownloadTextEncoding";
+static NSString *SPUDownloadMIMETypeKey = @"SPUDownloadMIMEType";
+
+@implementation SPUDownloadData
+
+@synthesize data = _data;
+@synthesize URL = _URL;
+@synthesize textEncodingName = _textEncodingName;
+@synthesize MIMEType = _MIMEType;
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+- (instancetype)initWithData:(NSData *)data URL:(NSURL *)URL textEncodingName:(NSString * _Nullable)textEncodingName MIMEType:(NSString *)MIMEType
+{
+    self = super init;
+    if (self != nil) {
+        _data = data;
+        _URL = URL;
+        _textEncodingName = textEncodingName;
+        _MIMEType = MIMEType;
+    }
+    return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+    coder encodeObject:self.data forKey:SPUDownloadDataKey;
+    coder encodeObject:self.URL forKey:SPUDownloadURLKey;
+
+    if (self.textEncodingName != nil) {
+        coder encodeObject:self.textEncodingName forKey:SPUDownloadTextEncodingKey;
+    }
+    
+    if (self.MIMEType != nil) {
+        coder encodeObject:self.MIMEType forKey:SPUDownloadMIMETypeKey;
+    }
+}
+
+- (nullable instancetype)initWithCoder:(NSCoder *)decoder
+{
+    NSData *data = decoder decodeObjectOfClass:NSData class forKey:SPUDownloadDataKey;
+    if (data == nil) {
+        return nil;
+    }
+
+    NSURL *URL = decoder decodeObjectOfClass:NSURL class forKey:SPUDownloadURLKey;
+    if (URL == nil) {
+        return nil;
+    }
+
+    NSString *textEncodingName = decoder decodeObjectOfClass:NSString class forKey:SPUDownloadTextEncodingKey;
+    
+    NSString *MIMEType = decoder decodeObjectOfClass:NSString class forKey:SPUDownloadMIMETypeKey;
+    
+    return self initWithData:data URL:URL textEncodingName:textEncodingName MIMEType:MIMEType;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadDataPrivate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadDriver.h Added

@@ -0,0 +1,56 @@
+//
+// SPUDownloadDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/15/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUAppcastItem, SUHost, SPUDownloadedUpdate, SPUDownloadData;
+
+@protocol SPUDownloadDriverDelegate <NSObject>
+
+- (void)downloadDriverDidFailToDownloadFileWithError:(NSError *)error;
+
+@optional
+
+- (void)downloadDriverWillBeginDownload;
+
+// For persitent update downloads
+- (void)downloadDriverDidDownloadUpdate:(SPUDownloadedUpdate *)downloadedUpdate;
+
+// For temporary downloads
+- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData;
+
+// Only for persistent downloads
+- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
+
+// Only for persistent downloads
+- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length;
+
+@end
+
+@interface SPUDownloadDriver : NSObject
+
+- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
+
+- (instancetype)initWithUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
+
+- (instancetype)initWithHost:(SUHost *)host;
+
+- (void)downloadFile;
+
+- (void)removeDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate;
+
+@property (nonatomic, readonly) NSMutableURLRequest *request;
+@property (nonatomic, readonly) BOOL inBackground;
+
+- (void)cleanup:(void (^)(void))completionHandler;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadDriver.m Added

@@ -0,0 +1,288 @@
+//
+// SPUDownloadDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/15/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloadDriver.h"
+#import "SPUDownloaderDelegate.h"
+#import "SPUDownloader.h"
+#import "SPUXPCServiceInfo.h"
+#import "SUAppcastItem.h"
+#import "SUFileManager.h"
+#import "SULocalizations.h"
+#import "SUHost.h"
+#import "SULog.h"
+#import "SUErrors.h"
+#import "SPUDownloadedUpdate.h"
+#import "SPUDownloadData.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUDownloadDriver () <SPUDownloaderDelegate>
+
+@property (nonatomic) id<SPUDownloaderProtocol> downloader;
+@property (nonatomic) NSXPCConnection *connection;
+@property (nonatomic, readonly) SUAppcastItem *updateItem;
+@property (nonatomic, readonly, nullable) SUAppcastItem *secondaryUpdateItem;
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, copy) NSString *temporaryDirectory;
+@property (nonatomic, copy) NSString *downloadName;
+@property (nonatomic, weak) id<SPUDownloadDriverDelegate> delegate;
+@property (nonatomic) BOOL retrievedDownloadResult;
+@property (nonatomic) uint64_t expectedContentLength;
+@property (nonatomic) BOOL cleaningUp;
+
+@end
+
+@implementation SPUDownloadDriver
+
+@synthesize downloader = _downloader;
+@synthesize connection = _connection;
+@synthesize updateItem = _updateItem;
+@synthesize secondaryUpdateItem = _secondaryUpdateItem;
+@synthesize request = _request;
+@synthesize inBackground = _inBackground;
+@synthesize host = _host;
+@synthesize temporaryDirectory = _temporaryDirectory;
+@synthesize downloadName = _downloadName;
+@synthesize delegate = _delegate;
+@synthesize retrievedDownloadResult = _retrievedDownloadResult;
+@synthesize expectedContentLength = _expectedContentLength;
+@synthesize cleaningUp = _cleaningUp;
+
+- (instancetype)initWithHost:(SUHost *)host
+{
+ self = super init;
+ if (self != nil) {
+ _host = host;
+ 
+ if (!SPUXPCServiceIsEnabled(SUEnableDownloaderServiceKey)) {
+ _downloader = SPUDownloader alloc initWithDelegate:self;
+ } else {
+ _connection = NSXPCConnection alloc initWithServiceName:@DOWNLOADER_BUNDLE_ID;
+ _connection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderProtocol);
+ _connection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderDelegate);
+ _connection.exportedObject = self;
+ 
+ _downloader = _connection.remoteObjectProxy;
+ 
+ __weak SPUDownloadDriver *weakSelf = self;
+ 
+ _connection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUDownloadDriver *strongSelf = weakSelf;
+ if (strongSelf != nil && !strongSelf.retrievedDownloadResult) {
+ strongSelf.connection invalidate;
+ }
+ });
+ };
+ 
+ _connection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUDownloadDriver *strongSelf = weakSelf;
+ if (strongSelf != nil && !strongSelf.retrievedDownloadResult && !strongSelf.cleaningUp) {
+ strongSelf.downloader = nil;
+ 
+ SULog(SULogLevelError, @"Connection to update downloader was invalidated");
+ 
+ NSDictionary *userInfo =
+ @{
+ NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while downloading the update. Please try again later.", nil),
+ };
+ 
+ NSError *downloadError = NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo;
+ 
+ strongSelf.delegate downloadDriverDidFailToDownloadFileWithError:downloadError;
+ }
+ });
+ };
+ 
+ _connection resume;
+ }
+ }
+ return self;
+}
+
+- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate
+{
+ self = self initWithHost:host;
+ if (self != nil) {
+ _delegate = delegate;
+ _inBackground = background;
+ 
+ NSMutableURLRequest *request = NSMutableURLRequest requestWithURL:requestURL cachePolicy:NSURLRequestReloadIgnoringCacheData timeoutInterval:30.0;
+ 
+ if (userAgent != nil) {
+ request setValue:(NSString * _Nonnull)userAgent forHTTPHeaderField:@"User-Agent";
+ }
+ 
+ request.networkServiceType = background ? NSURLNetworkServiceTypeBackground : NSURLNetworkServiceTypeDefault;
+
+ if (httpHeaders != nil) {
+ for (NSString *key in httpHeaders) {
+ NSString *value = httpHeaders objectForKey:key;
+ request setValue:value forHTTPHeaderField:key;
+ }
+ }
+ 
+ _request = request;
+ }
+ return self;
+}
+
+- (instancetype)initWithUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate
+{
+ NSURL *updateFileURL = updateItem.fileURL;
+ assert(updateFileURL != nil);
+ 
+ self = self initWithRequestURL:updateFileURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:background delegate:delegate;
+ if (self != nil) {
+ _updateItem = updateItem;
+ _secondaryUpdateItem = secondaryUpdateItem;
+ }
+ return self;
+}
+
+- (void)downloadFile
+{
+ if (self.delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)) {
+ self.delegate downloadDriverWillBeginDownload;
+ }
+ 
+ if (self.updateItem != nil) {
+ NSString *desiredFilename = NSString stringWithFormat:@"%@ %@", self.host name, self.updateItem versionString;
+ 
+ NSString *bundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ 
+ self.downloader startPersistentDownloadWithRequest:self.request bundleIdentifier:bundleIdentifier desiredFilename:desiredFilename;
+ } else {
+ self.downloader startTemporaryDownloadWithRequest:self.request;
+ }
+}
+
+- (void)removeDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate
+{
+ NSString *bundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ 
+ if (bundleIdentifier != nil) {
+ // Grab eg "0bCSun8tj" from org.sparkle-project.Sparkle/PersistentDownloads/0bCSun8tj/Sparkle Test App 2.0/
+ NSString *tempDirectoryName = downloadedUpdate.temporaryDirectory.stringByDeletingLastPathComponent.lastPathComponent;
+ 
+ self.downloader removeDownloadDirectory:tempDirectoryName bundleIdentifier:bundleIdentifier;
+ }
+}
+
+- (void)cleanup:(void (^)(void))completionHandler
+{
+ void (^cleanupBlock)(void) = ^{
+ self.cleaningUp = YES;
+ 
+ if (self.connection != nil) {
+ self.connection invalidate;
+ self.connection = nil;
+ }
+ self.downloadName = nil;
+ self.downloader = nil;
+ 
+ completionHandler();
+ };
+ 
+ if (self.downloader == nil) {
+ cleanupBlock();
+ } else {
+ self.downloader cleanup:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ cleanupBlock();
+ });
+ };
+ }
+}
+
+- (void)downloaderDidFinishWithTemporaryDownloadData:(SPUDownloadData * _Nullable)downloadData
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.retrievedDownloadResult = YES;
+ 
+ if (self.updateItem != nil) {
+ if (self.expectedContentLength > 0 && self.updateItem.contentLength > 0 && self.expectedContentLength != self.updateItem.contentLength) {
+ SULog(SULogLevelError, @"Warning: Downloader's expected content length (%llu) != Appcast item's length (%llu)", self.expectedContentLength, self.updateItem.contentLength);
+ }
+ 
+ SPUDownloadedUpdate *downloadedUpdate = SPUDownloadedUpdate alloc initWithAppcastItem:self.updateItem secondaryAppcastItem:self.secondaryUpdateItem downloadName:self.downloadName temporaryDirectory:self.temporaryDirectory;
+ 
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidDownloadUpdate:)) {
+ self.delegate downloadDriverDidDownloadUpdate:downloadedUpdate;
+ }
+ } else {
+ assert(downloadData != nil);
+ SPUDownloadData *nonNullDownloadData = downloadData;
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidDownloadData:)) {
+ self.delegate downloadDriverDidDownloadData:nonNullDownloadData;
+ }
+ }
+ });
+}
+
+- (void)downloaderDidFailWithError:(NSError *)error
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.retrievedDownloadResult = YES;
+ 
+ NSURL *failingUrl = error.userInfoNSURLErrorFailingURLErrorKey;
+ if (!failingUrl) {
+ failingUrl = self.updateItem fileURL;
+ }
+ 
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{
+ NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while downloading the update. Please try again later.", nil),
+ NSUnderlyingErrorKey: error,
+ };
+ if (failingUrl) {
+ userInfoNSURLErrorFailingURLErrorKey = failingUrl;
+ }
+ 
+ NSError *downloadError = NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo;
+ self.delegate downloadDriverDidFailToDownloadFileWithError:downloadError;
+ });
+}
+
+- (void)downloaderDidSetDestinationName:(NSString *)destinationName temporaryDirectory:(NSString *)temporaryDirectory
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.downloadName = destinationName;
+ self.temporaryDirectory = temporaryDirectory;
+ });
+}
+
+- (void)downloaderDidReceiveExpectedContentLength:(int64_t)expectedContentLength
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Fallback to appcast item's content length if we don't get the length from HTTP header
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidReceiveExpectedContentLength:)) {
+ self.delegate downloadDriverDidReceiveExpectedContentLength:expectedContentLength > 0 ? (uint64_t)expectedContentLength : self.updateItem.contentLength;
+ }
+ 
+ // Reset expected content length from downloader
+ // Later we verify if the total length matches with the content length from the appcast
+ if (expectedContentLength > 0) {
+ self.expectedContentLength = (uint64_t)expectedContentLength;
+ }
+ });
+}
+
+- (void)downloaderDidReceiveDataOfLength:(uint64_t)length
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.delegate respondsToSelector:@selector(downloadDriverDidReceiveDataOfLength:)) {
+ self.delegate downloadDriverDidReceiveDataOfLength:length;
+ }
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadedUpdate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUDownloadedUpdate.m Added

@@ -0,0 +1,36 @@
+//
+//  SPUDownloadedUpdate.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 1/8/17.
+//  Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#import "SPUDownloadedUpdate.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SPUDownloadedUpdate
+
+// If we ever enable auto-synthesize in the future, we'll still need this synthesize
+// because the property is declared in a protocol
+@synthesize updateItem = _updateItem;
+@synthesize secondaryUpdateItem = _secondaryUpdateItem;
+
+@synthesize downloadName = _downloadName;
+@synthesize temporaryDirectory = _temporaryDirectory;
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem downloadName:(NSString *)downloadName temporaryDirectory:(NSString *)temporaryDirectory
+{
+    self = super init;
+    if (self != nil) {
+        _updateItem = updateItem;
+        _secondaryUpdateItem = secondaryUpdateItem;
+        _downloadName = downloadName copy;
+        _temporaryDirectory = temporaryDirectory copy;
+    }
+    return self;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUGentleUserDriverReminders.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUInformationalUpdate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUInformationalUpdate.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUInstallationType.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUInstallerDriver.h Added

@@ -0,0 +1,48 @@
+//
+// SPUInstallerDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/17/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SPUUpdaterDelegate;
+@class SUHost, SUAppcastItem, SPUDownloadedUpdate;
+
+@protocol SPUInstallerDriverDelegate <NSObject>
+
+- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
+- (void)installerDidStartExtracting;
+- (void)installerDidExtractUpdateWithProgress:(double)progress;
+- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
+- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch;
+- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunch acknowledgement:(void(^)(void))acknowledgement;
+
+- (void)installerIsRequestingAbortInstallWithError:(nullable NSError *)error;
+- (void)installerDidFailToApplyDeltaUpdate;
+
+@end
+
+@interface SPUInstallerDriver : NSObject
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater updaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id<SPUInstallerDriverDelegate>)delegate;
+
+- (void)resumeInstallingUpdateWithUpdateItem:(SUAppcastItem *)updateItem systemDomain:(BOOL)systemDomain;
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
+
+- (void)extractDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate silently:(BOOL)silently completion:(void (^)(NSError * _Nullable))completionHandler;
+
+- (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI;
+
+- (void)cancelUpdate;
+
+- (void)abortInstall;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUInstallerDriver.m Added

@@ -0,0 +1,548 @@
+//
+// SPUInstallerDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/17/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUInstallerDriver.h"
+#import "SULog.h"
+#import "SPUMessageTypes.h"
+#import "SPUXPCServiceInfo.h"
+#import "SPUUpdaterDelegate.h"
+#import "SUAppcastItem.h"
+#import "SUAppcastItem+Private.h"
+#import "SULocalizations.h"
+#import "SUErrors.h"
+#import "SUHost.h"
+#import "SUFileManager.h"
+#import "SPUSecureCoding.h"
+#import "SPUInstallationInputData.h"
+#import "SUInstallerLauncher.h"
+#import "SUInstallerConnection.h"
+#import "SUInstallerConnectionProtocol.h"
+#import "SUXPCInstallerConnection.h"
+#import "SPUDownloadedUpdate.h"
+#import "SPUInstallationType.h"
+
+
+#include "AppKitPrevention.h"
+
+#define FIRST_INSTALLER_MESSAGE_TIMEOUT 7ull
+
+@interface NSObject (PrivateDelegateMethods)
+
+- (nullable NSString *)_pathToRelaunchForUpdater:(SPUUpdater *)updater;
+
+@end
+
+@interface SPUInstallerDriver () <SUInstallerCommunicationProtocol>
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, readonly) NSBundle *applicationBundle;
+@property (nonatomic, weak, readonly) id<SPUInstallerDriverDelegate> delegate;
+@property (nonatomic) SPUInstallerMessageType currentStage;
+
+@property (nonatomic) id<SUInstallerConnectionProtocol> installerConnection;
+
+@property (nonatomic) NSUInteger extractionAttempts;
+@property (nonatomic) BOOL postponedOnce;
+@property (nonatomic, weak, readonly) id updater;
+@property (nonatomic, weak, readonly) id<SPUUpdaterDelegate> updaterDelegate;
+@property (nonatomic) BOOL relaunch;
+
+@property (nonatomic) BOOL systemDomain;
+
+@property (nonatomic) SUAppcastItem *updateItem;
+@property (nonatomic, copy) NSString *downloadName;
+@property (nonatomic, copy) NSString *temporaryDirectory;
+
+@property (nonatomic) BOOL aborted;
+@property (nonatomic, nullable) NSError *installerError;
+
+@end
+
+@implementation SPUInstallerDriver
+{
+ void (^_updateWillInstallHandler)(void);
+}
+
+@synthesize host = _host;
+@synthesize applicationBundle = _applicationBundle;
+@synthesize delegate = _delegate;
+@synthesize currentStage = _currentStage;
+@synthesize installerConnection = _installerConnection;
+@synthesize extractionAttempts = _extractionAttempts;
+@synthesize postponedOnce = _postponedOnce;
+@synthesize updater = _updater;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize relaunch = _relaunch;
+@synthesize systemDomain = _systemDomain;
+@synthesize updateItem = _updateItem;
+@synthesize downloadName = _downloadName;
+@synthesize temporaryDirectory = _temporaryDirectory;
+@synthesize aborted = _aborted;
+@synthesize installerError = _installerError;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater updaterDelegate:(id<SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id<SPUInstallerDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _host = host;
+ _applicationBundle = applicationBundle;
+ _updater = updater;
+ _updaterDelegate = updaterDelegate;
+ _delegate = delegate;
+ }
+ return self;
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ _updateWillInstallHandler = updateWillInstallHandler copy;
+}
+
+- (void)_reportInstallerError:(nullable NSError *)currentInstallerError genericErrorCode:(NSInteger)genericErrorCode genericUserInfo:(NSDictionary *)genericUserInfo
+{
+ // First see if there is a good custom error we can show
+ // We only check for signing validation errors and installation errors due to not having write permission currently
+ NSError *customError = nil;
+ if (currentInstallerError != nil) {
+ NSError *underlyingError = currentInstallerError.userInfoNSUnderlyingErrorKey;
+ if (underlyingError != nil) {
+ if (underlyingError.code == SUValidationError) {
+ NSDictionary *userInfo = @{
+ NSLocalizedDescriptionKey: SULocalizedString(@"The update is improperly signed and could not be validated. Please try again later or contact the app developer.", nil),
+ NSUnderlyingErrorKey: (NSError * _Nonnull)currentInstallerError
+ };
+ 
+ customError = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:userInfo;
+ } else if (underlyingError.code == SUInstallationError) {
+ NSError *secondUnderlyingError = underlyingError.userInfoNSUnderlyingErrorKey;
+ if (secondUnderlyingError != nil && secondUnderlyingError.domain isEqualToString:NSCocoaErrorDomain && secondUnderlyingError.code == NSFileWriteNoPermissionError) {
+ // Note: these error strings will only surface for external app updaters like sparkle-cli (i.e, updaters that update other app bundles)
+ 
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{
+ NSLocalizedDescriptionKey: SULocalizedString(@"The installation failed due to not having permission to write the new update.", nil),
+ NSUnderlyingErrorKey: (NSError * _Nonnull)currentInstallerError
+ };
+ 
+ // macOS 13 and later introduce a policy where Gatekeeper can block app modifications if the apps have different Team IDs
+ if (@available(macOS 13, *)) {
+ NSBundle *mainBundle = NSBundle mainBundle;
+ if (!mainBundle isEqual:self.host.bundle) {
+ SUHost *mainBundleHost = SUHost alloc initWithBundle:mainBundle;
+ 
+ userInfoNSLocalizedRecoverySuggestionErrorKey = NSString stringWithFormat:SULocalizedString(@"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates.", nil), mainBundleHost.name;
+ }
+ }
+ 
+ customError = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationWriteNoPermissionError userInfo:userInfo;
+ }
+ }
+ }
+ }
+ 
+ // Otherwise if there's no custom error, then use a generic installer error to show
+ // and keep the underlying error around for logging
+ NSError *installerError;
+ if (customError != nil) {
+ installerError = customError;
+ } else {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:genericUserInfo;
+ if (currentInstallerError != nil) {
+ userInfoNSUnderlyingErrorKey = currentInstallerError;
+ }
+ installerError = NSError errorWithDomain:SUSparkleErrorDomain code:genericErrorCode userInfo:userInfo;
+ }
+ 
+ self.delegate installerIsRequestingAbortInstallWithError:installerError;
+}
+
+- (void)setUpConnection
+{
+ if (self.installerConnection != nil) {
+ return;
+ }
+ 
+ NSString *hostBundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ 
+ if (!SPUXPCServiceIsEnabled(SUEnableInstallerConnectionServiceKey)) {
+ self.installerConnection = SUInstallerConnection alloc initWithDelegate:self remote:NO;
+ } else {
+ self.installerConnection = SUXPCInstallerConnection alloc initWithDelegate:self;
+ }
+ 
+ __weak SPUInstallerDriver *weakSelf = self;
+ self.installerConnection setInvalidationHandler:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUInstallerDriver *strongSelf = weakSelf;
+ if (strongSelf.installerConnection != nil && !strongSelf.aborted) {
+ NSDictionary *genericUserInfo = @{
+ NSLocalizedDescriptionKey: SULocalizedString(@"An error occurred while running the updater. Please try again later.", nil),
+ NSLocalizedFailureReasonErrorKey:@"The remote port connection was invalidated from the updater. For additional details, please check Console logs for "@SPARKLE_RELAUNCH_TOOL_NAME". If your application is sandboxed, please also ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/"
+ };
+ 
+ strongSelf _reportInstallerError:strongSelf.installerError genericErrorCode:SUInstallationError genericUserInfo:genericUserInfo;
+ }
+ });
+ };
+ 
+ NSString *serviceName = SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
+ NSString *installationType = self.updateItem.installationType;
+ assert(installationType != nil);
+ 
+ self.installerConnection setServiceName:serviceName systemDomain:self.systemDomain;
+}
+
+// This can be called multiple times (eg: if a delta update fails, this may be called again with a regular update item)
+- (void)extractDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate silently:(BOOL)silently completion:(void (^)(NSError * _Nullable))completionHandler
+{
+ self.updateItem = downloadedUpdate.updateItem;
+ self.temporaryDirectory = downloadedUpdate.temporaryDirectory;
+ self.downloadName = downloadedUpdate.downloadName;
+ 
+ self.currentStage = SPUInstallerNotStarted;
+ 
+ if (self.installerConnection == nil) {
+ self launchAutoUpdateSilently:silently completion:completionHandler;
+ } else {
+ // The Install tool is already alive; just send out installation input data again
+ self sendInstallationData;
+ completionHandler(nil);
+ }
+}
+
+- (void)resumeInstallingUpdateWithUpdateItem:(SUAppcastItem *)updateItem systemDomain:(BOOL)systemDomain
+{
+ self.updateItem = updateItem;
+ self.systemDomain = systemDomain;
+}
+
+- (void)sendInstallationData
+{
+ NSString *pathToRelaunch = self.applicationBundle.bundlePath;
+ // Give the delegate one more chance for determining the path to relaunch via a private API used by SUUpdater
+ if (self.updaterDelegate respondsToSelector:@selector(_pathToRelaunchForUpdater:)) {
+ NSString *relaunchPath = (NSObject *)self.updaterDelegate _pathToRelaunchForUpdater:self.updater;
+ if (relaunchPath != nil) {
+ pathToRelaunch = relaunchPath;
+ }
+ }
+
+ NSString *decryptionPassword = nil;
+ if (self.updaterDelegate respondsToSelector:@selector(decryptionPasswordForUpdater:)) {
+ decryptionPassword = self.updaterDelegate decryptionPasswordForUpdater:self.updater;
+ }
+ 
+ SPUInstallationInputData *installationData = SPUInstallationInputData alloc initWithRelaunchPath:pathToRelaunch hostBundlePath:self.host.bundlePath updateDirectoryPath:self.temporaryDirectory downloadName:self.downloadName installationType:self.updateItem.installationType signatures:self.updateItem.signatures decryptionPassword:decryptionPassword;
+ 
+ NSData *archivedData = SPUArchiveRootObjectSecurely(installationData);
+ if (archivedData == nil) {
+ self.delegate installerIsRequestingAbortInstallWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:@"An error occurred while encoding the installer parameters. Please try again later." };
+ return;
+ }
+ 
+ self.installerConnection handleMessageWithIdentifier:SPUInstallationData data:archivedData;
+ 
+ self.currentStage = SPUInstallerNotStarted;
+ 
+ // If the number of extractions attempts stays the same, then we've waited too long and should abort the installation
+ // The extraction attempts is incremented when we receive an extraction should start message from the installer
+ // This also handles the case when a delta extraction fails and tries to re-try another extraction attempt later
+ // We will also want to make sure current stage is still SUInstallerNotStarted because it may not be due to resumability
+ NSUInteger currentExtractionAttempts = self.extractionAttempts;
+ __weak SPUInstallerDriver *weakSelf = self;
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(FIRST_INSTALLER_MESSAGE_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ SPUInstallerDriver *strongSelf = weakSelf;
+ if (strongSelf != nil && strongSelf.currentStage == SPUInstallerNotStarted && currentExtractionAttempts == self.extractionAttempts) {
+ SULog(SULogLevelError, @"Timeout: Installer never started archive extraction");
+ strongSelf.delegate installerIsRequestingAbortInstallWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedString(@"An error occurred while starting the installer. Please try again later.", nil) };
+ }
+ });
+}
+
+- (void)handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data
+{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self _handleMessageWithIdentifier:identifier data:data;
+ });
+}
+
+- (void)_handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data
+{
+ if (!SPUInstallerMessageTypeIsLegal(self.currentStage, identifier)) {
+ SULog(SULogLevelError, @"Error: received out of order message with current stage: %d, requested stage: %d", self.currentStage, identifier);
+ return;
+ }
+ 
+ if (identifier == SPUExtractionStarted) {
+ self.extractionAttempts++;
+ self.currentStage = identifier;
+ self.delegate installerDidStartExtracting;
+ } else if (identifier == SPUExtractedArchiveWithProgress) {
+ if (data.length == sizeof(double) && sizeof(double) == sizeof(uint64_t)) {
+ uint64_t progressValue = CFSwapInt64LittleToHost(*(const uint64_t *)data.bytes);
+ double progress = *(double *)&progressValue;
+ self.delegate installerDidExtractUpdateWithProgress:progress;
+ self.currentStage = identifier;
+ }
+ } else if (identifier == SPUArchiveExtractionFailed) {
+ // If this is a delta update, there must be a regular update we can fall back to
+ if (self.updateItem isDeltaUpdate) {
+ self.delegate installerDidFailToApplyDeltaUpdate;
+ } else {
+ // Don't have to store current stage because we're going to abort
+ NSDictionary *genericUserInfo = @{ NSLocalizedDescriptionKey:SULocalizedString(@"An error occurred while extracting the archive. Please try again later.", nil) };
+ 
+ NSError *unarchivedError = (NSError *)SPUUnarchiveRootObjectSecurely(data, NSError class);
+ self _reportInstallerError:unarchivedError genericErrorCode:SUUnarchivingError genericUserInfo:genericUserInfo;
+ }
+ } else if (identifier == SPUValidationStarted) {
+ self.currentStage = identifier;
+ } else if (identifier == SPUInstallationStartedStage1) {
+ self.currentStage = identifier;
+ } else if (identifier == SPUInstallationFinishedStage1) {
+ self.currentStage = identifier;
+ 
+ // Let the installer keep a copy of the appcast item data
+ // We may want to ask for it later (note the updater can relaunch without the app necessarily having relaunched)
+ NSData *updateItemData = SPUArchiveRootObjectSecurely(self.updateItem);
+ 
+ if (updateItemData != nil) {
+ self.installerConnection handleMessageWithIdentifier:SPUSentUpdateAppcastItemData data:updateItemData;
+ } else {
+ SULog(SULogLevelError, @"Error: Archived data to send for appcast item is nil");
+ }
+ 
+ BOOL canInstallSilently = NO;
+ if (data.length >= sizeof(uint8_t)) {
+ canInstallSilently = (BOOL)*(const uint8_t *)data.bytes;
+ }
+ 
+ BOOL hasTargetTerminated = NO;
+ if (data.length >= sizeof(uint8_t) * 2) {
+ hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes + 1);
+ }
+ 
+ self.delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated silently:canInstallSilently;
+ } else if (identifier == SPUInstallationFinishedStage2) {
+ self.currentStage = identifier;
+ 
+ BOOL hasTargetTerminated = NO;
+ if (data.length >= sizeof(uint8_t)) {
+ hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes);
+ }
+ 
+ self.delegate installerWillFinishInstallationAndRelaunch:self.relaunch;
+ 
+ self.delegate installerDidStartInstallingWithApplicationTerminated:hasTargetTerminated;
+ } else if (identifier == SPUInstallationFinishedStage3) {
+ self.currentStage = identifier;
+ 
+ self.installerConnection invalidate;
+ self.installerConnection = nil;
+ 
+ self.delegate installerDidFinishInstallationAndRelaunched:self.relaunch acknowledgement:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.delegate installerIsRequestingAbortInstallWithError:nil;
+ });
+ };
+ } else if (identifier == SPUUpdaterAlivePing) {
+ // Don't update the current stage; a ping request has no effect on that.
+ self.installerConnection handleMessageWithIdentifier:SPUUpdaterAlivePong data:NSData data;
+ } else if (identifier == SPUInstallerError) {
+ // Don't update the current stage; an installation error has no effect on that.
+ self.installerError = (NSError *)SPUUnarchiveRootObjectSecurely(data, NSError class);
+ }
+}
+
+- (void)launchAutoUpdateSilently:(BOOL)silently completion:(void (^)(NSError *_Nullable))completionHandler
+{
+ id<SUInstallerLauncherProtocol> installerLauncher = nil;
+ __block BOOL retrievedLaunchStatus = NO;
+ NSXPCConnection *launcherConnection = nil;
+ 
+ if (!SPUXPCServiceIsEnabled(SUEnableInstallerLauncherServiceKey)) {
+ installerLauncher = SUInstallerLauncher alloc init;
+ } else {
+ launcherConnection = NSXPCConnection alloc initWithServiceName:@INSTALLER_LAUNCHER_BUNDLE_ID;
+ launcherConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerLauncherProtocol);
+ 
+ launcherConnection.interruptionHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!retrievedLaunchStatus) {
+ // We'll break the retain cycle in the invalidation handler
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-retain-cycles"
+ launcherConnection invalidate;
+#pragma clang diagnostic pop
+ }
+ });
+ };
+ 
+ launcherConnection.invalidationHandler = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ if (!retrievedLaunchStatus) {
+#pragma clang diagnostic pop
+ NSError *error =
+ NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedString(@"An error occurred while connecting to the installer. Please try again later.", nil) };
+ 
+ completionHandler(error);
+ 
+ // Break the retain cycle
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warc-retain-cycles"
+ launcherConnection.interruptionHandler = nil;
+ launcherConnection.invalidationHandler = nil;
+#pragma clang diagnostic pop
+ }
+ });
+ };
+ 
+ launcherConnection resume;
+ 
+ installerLauncher = launcherConnection.remoteObjectProxy;
+ }
+ 
+ // Our driver (automatic or UI based) has a say if interaction is allowed as well
+ // An automatic driver may disallow interaction but the updater could try again later for a UI based driver that does allow interaction
+ BOOL driverAllowsInteraction = !silently;
+ 
+ NSString *hostBundlePath = self.host.bundle.bundlePath;
+ assert(hostBundlePath != nil);
+ 
+ NSString *installationType = self.updateItem.installationType;
+ assert(installationType != nil);
+ 
+ // The installer launcher could be in a XPC service, so we don't want to do localization in there
+ // Make sure the authorization prompt reflects whether or not the updater is updating itself, or
+ // if the updater is updating another application. We use SUHost.name property, so an application
+ // or Sparkle helper application can override its name with SUBundleName key
+ 
+ SUHost *mainBundleHost = SUHost alloc initWithBundle:NSBundle mainBundle;
+ NSString *mainBundleName = mainBundleHost.name;
+ NSString *hostName = self.host.name;
+ 
+ // Changing this authorization prompt is a little complicated because the
+ // Auth database retains and caches the right we use, and there isn't a good way
+ // of updating the prompt. See code in SUInstallerLauncher.m
+ // For this reason, we don't provide localized strings for this prompt yet
+ // (and I believe, the authorization framework has a different way of specifying localizations..)
+ NSString *authorizationPrompt;
+ if (mainBundleName isEqualToString:hostName) {
+ authorizationPrompt = NSString stringWithFormat:@"%1$@ wants permission to update.", hostName;
+ } else {
+ authorizationPrompt = NSString stringWithFormat:@"%1$@ wants permission to update %2$@.", mainBundleName, hostName;
+ }
+ 
+ NSString *mainBundleIdentifier;
+ {
+ NSString *bundleIdentifier = mainBundleHost.bundle.bundleIdentifier;
+ mainBundleIdentifier = (bundleIdentifier == nil) ? mainBundleName : bundleIdentifier;
+ }
+ 
+ installerLauncher launchInstallerWithHostBundlePath:hostBundlePath updaterIdentifier:mainBundleIdentifier authorizationPrompt:authorizationPrompt installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ retrievedLaunchStatus = YES;
+ launcherConnection invalidate;
+ 
+ switch (result) {
+ case SUInstallerLauncherFailure:
+ SULog(SULogLevelError, @"Error: Failed to gain authorization required to update target");
+ completionHandler(NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedString(@"An error occurred while launching the installer. Please try again later.", nil) });
+ break;
+ case SUInstallerLauncherCanceled:
+ completionHandler(NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationCanceledError userInfo:nil);
+ break;
+ case SUInstallerLauncherAuthorizeLater:
+ completionHandler(NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationAuthorizeLaterError userInfo:nil);
+ break;
+ case SUInstallerLauncherSuccess:
+ self.systemDomain = systemDomain;
+ self setUpConnection;
+ self sendInstallationData;
+ completionHandler(nil);
+ break;
+ }
+ });
+ };
+}
+
+- (BOOL)mayUpdateAndRestart
+{
+ return (!self.updaterDelegate || !self.updaterDelegate respondsToSelector:@selector((updaterShouldRelaunchApplication:)) || self.updaterDelegate updaterShouldRelaunchApplication:self.updater);
+}
+
+- (void)installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI
+{
+ assert(self.updateItem);
+ 
+ if (!self mayUpdateAndRestart)
+ {
+ self.delegate installerIsRequestingAbortInstallWithError:nil;
+ return;
+ }
+ 
+ // Give the host app an opportunity to postpone the install and relaunch.
+ if (!self.postponedOnce)
+ {
+ if (self.updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvokingBlock:)) {
+ self.postponedOnce = YES;
+ __weak SPUInstallerDriver *weakSelf = self;
+ if (self.updaterDelegate updater:self.updater shouldPostponeRelaunchForUpdate:self.updateItem untilInvokingBlock:^{
+ weakSelf installWithToolAndRelaunch:relaunch displayingUserInterface:showUI;
+ }) {
+ return;
+ }
+ }
+ }
+ 
+ if (_updateWillInstallHandler != NULL) {
+ _updateWillInstallHandler();
+ }
+ 
+ // Set up connection to the installer if one is not set up already
+ self setUpConnection;
+ 
+ // For resumability, we'll assume we are far enough for the installation to continue
+ self.currentStage = SPUInstallationFinishedStage1;
+ 
+ self.relaunch = relaunch;
+ 
+ uint8_t response2 = {(uint8_t)relaunch, (uint8_t)showUI};
+ NSData *responseData = NSData dataWithBytes:response length:sizeof(response);
+ 
+ self.installerConnection handleMessageWithIdentifier:SPUResumeInstallationToStage2 data:responseData;
+ 
+ // the installer will send us SPUInstallationFinishedStage2 when stage 2 is done
+}
+
+- (void)cancelUpdate
+{
+ // Set up connection to the installer if one is not set up already
+ self setUpConnection;
+ 
+ self.aborted = YES;
+ 
+ self.installerConnection handleMessageWithIdentifier:SPUCancelInstallation data:NSData data;
+ 
+ self.delegate installerIsRequestingAbortInstallWithError:nil;
+}
+
+- (void)abortInstall
+{
+ self.aborted = YES;
+ if (self.installerConnection != nil) {
+ self.installerConnection invalidate;
+ self.installerConnection = nil;
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPULocalCacheDirectory.h Added

@@ -0,0 +1,35 @@
+//
+// SULocalCacheDirectory.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 6/23/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SPULocalCacheDirectory : NSObject
+
+// Returns a path to a suitable cache directory to create specifically for Sparkle
+// Intermediate directories to this path may not exist yet
+// This path may depend on the type of running process,
+// such that sandboxed vs non-sandboxed processes could yield different paths
+// The caller should create a subdirectory from the path that is returned here so they don't have files that
+// conflict with other callers. Once that subdirectory name is decided, the caller can remove old items inside it (using +removeOldItemsInDirectory:)
+// and then create a unique temporary directory inside it (using +createUniqueDirectoryInDirectory:)
++ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier;
+
+// Remove old files inside a directory
+// A caller may want to invoke this on a directory they own rather than remove and re-create an entire directory
+// This does nothing if the supplied directory does not exist yet
++ (void)removeOldItemsInDirectory:(NSString *)directory;
+
+// Create a unique directory inside a parent directory
+// The parent directory doesn't have to exist yet. If it doesn't exist, intermediate directories will be created.
++ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPULocalCacheDirectory.m Added

@@ -0,0 +1,80 @@
+//
+// SULocalCacheDirectory.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 6/23/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPULocalCacheDirectory.h"
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
+
+@implementation SPULocalCacheDirectory
+
+// It is important to note this may return a different path whether invoked from a sanboxed vs non-sandboxed process, or from a different user
+// For this reason, this method should not be a part of SUHost because its behavior depends on what kind of process it's being invoked from
++ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier
+{
+ NSURL *cacheURL = NSFileManager defaultManager URLForDirectory:NSCachesDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:NO error:NULL;
+ assert(cacheURL != nil);
+ 
+ NSString *resultPath = cacheURL URLByAppendingPathComponent:bundleIdentifier URLByAppendingPathComponent:@SPARKLE_BUNDLE_IDENTIFIER path;
+ assert(resultPath != nil);
+ 
+ return resultPath;
+}
+
++ (void)removeOldItemsInDirectory:(NSString *)directory
+{
+ NSMutableArray<NSString *> *filePathsToRemove = NSMutableArray array;
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ if (fileManager fileExistsAtPath:directory) {
+ NSDirectoryEnumerator *directoryEnumerator = fileManager enumeratorAtPath:directory;
+ NSDate *currentDate = NSDate date;
+ for (NSString *filename in directoryEnumerator)
+ {
+ NSDictionary<NSString *, id> *fileAttributes = fileManager attributesOfItemAtPath:directory stringByAppendingPathComponent:filename error:NULL;
+ if (fileAttributes != nil)
+ {
+ NSDate *lastModificationDate = fileAttributes objectForKey:NSFileModificationDate;
+ if (currentDate timeIntervalSinceDate:lastModificationDate >= OLD_ITEM_DELETION_INTERVAL)
+ {
+ filePathsToRemove addObject:directory stringByAppendingPathComponent:filename;
+ }
+ }
+ 
+ directoryEnumerator skipDescendants;
+ }
+ 
+ for (NSString *filename in filePathsToRemove)
+ {
+ fileManager removeItemAtPath:filename error:NULL;
+ }
+ }
+}
+
++ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
+{
+ NSFileManager *fileManager = NSFileManager defaultManager;
+ NSError *createError = nil;
+ if (!fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:&createError) {
+ SULog(SULogLevelError, @"Failed to create directory with intermediate components at %@ with error %@", directory, createError);
+ return nil;
+ }
+ 
+ NSString *templateString = directory stringByAppendingPathComponent:@"XXXXXXXXX";
+ char bufferPATH_MAX = {0};
+ if (templateString getFileSystemRepresentation:buffer maxLength:sizeof(buffer)) {
+ if (mkdtemp(buffer) != NULL) {
+ return NSString alloc initWithUTF8String:buffer;
+ }
+ }
+ return nil;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUProbeInstallStatus.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUProbeInstallStatus.m Added

@@ -0,0 +1,160 @@
+//
+// SPUProbeInstallStatus.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/20/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUProbeInstallStatus.h"
+#import "SPUXPCServiceInfo.h"
+#import "SPUMessageTypes.h"
+#import "SPUInstallationInfo.h"
+#import "SPUSecureCoding.h"
+#import "SUInstallerStatus.h"
+#import "SUXPCInstallerStatus.h"
+#import "SUConstants.h"
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+// This timeout is if probing the installer takes too long
+// It should be at least more than 1 second since a probe can take around that much time
+#define PROBE_TIMEOUT 7
+
+@implementation SPUProbeInstallStatus
+
++ (void)probeInstallerInProgressForHostBundleIdentifier:(NSString *)hostBundleIdentifier completion:(void (^)(BOOL))completionHandler
+{
+ id<SUInstallerStatusProtocol> installerStatus = nil;
+ BOOL usesXPC = SPUXPCServiceIsEnabled(SUEnableInstallerStatusServiceKey);
+ if (!usesXPC) {
+ installerStatus = SUInstallerStatus alloc initWithRemote:NO;
+ } else {
+ installerStatus = SUXPCInstallerStatus alloc init;
+ }
+ 
+ __block BOOL handledCompletion = NO;
+ 
+ installerStatus setInvalidationHandler:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ completionHandler(NO);
+ handledCompletion = YES;
+ }
+ });
+ };
+ 
+ NSString *serviceName = SPUStatusInfoServiceNameForBundleIdentifier(hostBundleIdentifier);
+ installerStatus setServiceName:serviceName;
+ 
+ installerStatus probeStatusConnectivityWithReply:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ completionHandler(YES);
+ handledCompletion = YES;
+ }
+ });
+ installerStatus invalidate;
+ };
+ 
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(PROBE_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ if (usesXPC) {
+ SULog(SULogLevelError, @"Timed out while probing installer progress. Please see https://sparkle-project.org/documentation/sandboxing/#testing for potential cause.");
+ } else {
+ SULog(SULogLevelError, @"Timed out while probing installer progress");
+ }
+ completionHandler(NO);
+ handledCompletion = YES;
+ }
+ installerStatus invalidate;
+ });
+}
+
++ (void)probeInstallerUpdateItemForHostBundleIdentifier:(NSString *)hostBundleIdentifier completion:(void (^)(SPUInstallationInfo * _Nullable))completionHandler
+{
+ id<SUInstallerStatusProtocol> installerStatus = nil;
+ BOOL usesXPC = SPUXPCServiceIsEnabled(SUEnableInstallerStatusServiceKey);
+ if (!usesXPC) {
+ installerStatus = SUInstallerStatus alloc initWithRemote:NO;
+ } else {
+ installerStatus = SUXPCInstallerStatus alloc init;
+ }
+ 
+ __block BOOL handledCompletion = NO;
+ 
+ installerStatus setInvalidationHandler:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ completionHandler(nil);
+ handledCompletion = YES;
+ }
+ });
+ };
+ 
+ NSString *serviceName = SPUStatusInfoServiceNameForBundleIdentifier(hostBundleIdentifier);
+ installerStatus setServiceName:serviceName;
+ 
+ installerStatus probeStatusInfoWithReply:^(NSData * _Nullable installationInfoData) {
+ SPUInstallationInfo *installationInfo = nil;
+ if (installationInfoData != nil) {
+ installationInfo = (SPUInstallationInfo *)SPUUnarchiveRootObjectSecurely((NSData * _Nonnull)installationInfoData, SPUInstallationInfo class);
+ }
+ 
+ dispatch_async(dispatch_get_main_queue(), ^{
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ completionHandler(installationInfo);
+ handledCompletion = YES;
+ }
+ });
+ 
+ installerStatus invalidate;
+ };
+ 
+#pragma clang diagnostic push
+#if __has_warning("-Wcompletion-handler")
+#pragma clang diagnostic ignored "-Wcompletion-handler"
+#endif
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(PROBE_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ if (!handledCompletion) {
+#pragma clang diagnostic pop
+ if (usesXPC) {
+ SULog(SULogLevelDefault, @"Timed out while probing installer info data. Please see https://sparkle-project.org/documentation/sandboxing/#testing for potential cause.");
+ } else {
+ SULog(SULogLevelDefault, @"Timed out while probing installer info data");
+ }
+ completionHandler(nil);
+ handledCompletion = YES;
+ }
+ installerStatus invalidate;
+ });
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUProbingUpdateDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUProbingUpdateDriver.m Added

@@ -0,0 +1,92 @@
+//
+// SPUProbingUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUProbingUpdateDriver.h"
+#import "SPUBasicUpdateDriver.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUProbingUpdateDriver () <SPUBasicUpdateDriverDelegate>
+
+@property (nonatomic, readonly) SPUBasicUpdateDriver *basicDriver;
+@property (nonatomic) id<SPUResumableUpdate> resumableUpdate;
+
+@end
+
+@implementation SPUProbingUpdateDriver
+
+@synthesize basicDriver = _basicDriver;
+@synthesize resumableUpdate = _resumableUpdate;
+
+- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate
+{
+ self = super init;
+ if (self != nil) {
+ _basicDriver = SPUBasicUpdateDriver alloc initWithHost:host updateCheck:SPUUpdateCheckUpdateInformation updater:updater updaterDelegate:updaterDelegate delegate:self;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.basicDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
+{
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
+{
+ self.basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES;
+}
+
+- (void)resumeInstallingUpdate
+{
+ self.basicDriver resumeInstallingUpdate;
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self.resumableUpdate = resumableUpdate;
+ 
+ self.basicDriver resumeUpdate:resumableUpdate;
+}
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)__unused appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)__unused secondaryAppcastItem systemDomain:(NSNumber * _Nullable)__unused systemDomain
+{
+ // Stop as soon as we have an answer
+ self abortUpdate;
+}
+
+- (BOOL)showingUpdate
+{
+ return NO;
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)abortUpdate
+{
+ self abortUpdateWithError:nil;
+}
+
+- (void)abortUpdateWithError:(nullable NSError *)error
+{
+ self.basicDriver abortUpdateAndShowNextUpdateImmediately:NO resumableUpdate:self.resumableUpdate error:error;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUResumableUpdate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUScheduledUpdateDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUScheduledUpdateDriver.m Added

@@ -0,0 +1,110 @@
+//
+// SPUScheduledUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/15/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUScheduledUpdateDriver.h"
+#import "SUHost.h"
+#import "SUErrors.h"
+#import "SPUUpdaterDelegate.h"
+#import "SPUUserDriver.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUScheduledUpdateDriver() <SPUUIBasedUpdateDriverDelegate>
+
+@property (nonatomic, readonly) SPUUIBasedUpdateDriver *uiDriver;
+@property (nonatomic) BOOL showedUpdate;
+@property (nonatomic) void (^updateDidShowHandler)(void);
+
+@end
+
+@implementation SPUScheduledUpdateDriver
+
+@synthesize uiDriver = _uiDriver;
+@synthesize showedUpdate = _showedUpdate;
+@synthesize updateDidShowHandler = _updateDidShowHandler;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
+{
+ self = super init;
+ if (self != nil) {
+ _uiDriver = SPUUIBasedUpdateDriver alloc initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:NO updaterDelegate:updaterDelegate delegate:self;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.uiDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateShownHandler:(void (^)(void))handler
+{
+ self.updateDidShowHandler = handler;
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ self.uiDriver setUpdateWillInstallHandler:updateWillInstallHandler;
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
+{
+ self.uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES;
+}
+
+- (void)resumeInstallingUpdate
+{
+ self.uiDriver resumeInstallingUpdate;
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self.uiDriver resumeUpdate:resumableUpdate;
+}
+
+- (void)uiDriverDidShowUpdate
+{
+ self.showedUpdate = YES;
+ 
+ if (self.updateDidShowHandler != nil) {
+ self.updateDidShowHandler();
+ }
+}
+
+- (BOOL)showingUpdate
+{
+ return self.showedUpdate;
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)abortUpdate
+{
+ self abortUpdateWithError:nil;
+}
+
+- (void)abortUpdateWithError:(nullable NSError *)error
+{
+ self.uiDriver abortUpdateWithError:error showErrorToUser:self.showedUpdate;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUSecureCoding.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUSecureCoding.m Added

@@ -0,0 +1,35 @@
+//
+// SPUSecureCoding.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/24/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUSecureCoding.h"
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SURootObjectArchiveKey = @"SURootObjectArchive";
+
+NSData * _Nullable SPUArchiveRootObjectSecurely(id<NSSecureCoding> rootObject)
+{
+ NSError *error = nil;
+ NSData *data = NSKeyedArchiver archivedDataWithRootObject:rootObject requiringSecureCoding:YES error:&error;
+ if (data == nil) {
+ SULog(SULogLevelError, @"Error while securely archiving object: %@", error);
+ }
+ return data;
+}
+
+id<NSSecureCoding> _Nullable SPUUnarchiveRootObjectSecurely(NSData *data, Class klass)
+{
+ NSError *error = nil;
+ id<NSSecureCoding> rootObject = NSKeyedUnarchiver unarchivedObjectOfClass:klass fromData:data error:&error;
+ if (rootObject == nil) {
+ SULog(SULogLevelError, @"Error while securely unarchiving object: %@", error);
+ }
+ return rootObject;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUSkippedUpdate.h Added

@@ -0,0 +1,40 @@
+//
+// SPUSkippedUpdate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/8/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUHost, SUAppcastItem;
+
+/*
+ A skipped update tracks an optional minor version and an optional major version the user may skip.
+ The minor and major versions are independent versions, so the user can choose to skip at most two separate versions.
+ The intent is when the user is faced with a major upgrade, they can skip a major version.
+ Otherwise they can choose to skip a minor version.
+ */
+@interface SPUSkippedUpdate : NSObject
+
++ (nullable SPUSkippedUpdate *)skippedUpdateForHost:(SUHost *)host;
+
++ (void)clearSkippedUpdateForHost:(SUHost *)host;
+
++ (void)skipUpdate:(SUAppcastItem *)updateItem host:(SUHost *)host;
+
+// At least one of minorVersion or majorVersion should be non-nil
+- (instancetype)initWithMinorVersion:(nullable NSString *)minorVersion majorVersion:(nullable NSString *)majorVersion majorSubreleaseVersion:(nullable NSString *)majorSubreleaseVersion;
+
+// At least one of these two version properties will be non-nil
+@property (nonatomic, readonly, nullable) NSString *minorVersion;
+@property (nonatomic, readonly, nullable) NSString *majorVersion;
+
+@property (nonatomic, readonly, nullable) NSString *majorSubreleaseVersion;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUSkippedUpdate.m Added

@@ -0,0 +1,71 @@
+//
+//  SPUSkippedUpdate.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 5/8/21.
+//  Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUSkippedUpdate.h"
+#import "SUHost.h"
+#import "SUConstants.h"
+#import "SUAppcastItem.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SPUSkippedUpdate
+
+@synthesize minorVersion = _minorVersion;
+@synthesize majorVersion = _majorVersion;
+@synthesize majorSubreleaseVersion = _majorSubreleaseVersion;
+
+- (instancetype)initWithMinorVersion:(nullable NSString *)minorVersion majorVersion:(nullable NSString *)majorVersion majorSubreleaseVersion:(nullable NSString *)majorSubreleaseVersion
+{
+    self = super init;
+    if (self != nil) {
+        _minorVersion = minorVersion copy;
+        _majorVersion = majorVersion copy;
+        _majorSubreleaseVersion = majorSubreleaseVersion copy;
+        
+        assert(_minorVersion != nil || _majorVersion != nil);
+    }
+    return self;
+}
+
++ (nullable SPUSkippedUpdate *)skippedUpdateForHost:(SUHost *)host
+{
+    NSString *minorVersion = host objectForUserDefaultsKey:SUSkippedMinorVersionKey;
+    NSString *majorVersion = host objectForUserDefaultsKey:SUSkippedMajorVersionKey;
+    NSString *majorSubreleaseVersion = host objectForUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey;
+    
+    if (minorVersion != nil || majorVersion != nil) {
+        return SPUSkippedUpdate alloc initWithMinorVersion:minorVersion majorVersion:majorVersion majorSubreleaseVersion:majorSubreleaseVersion;
+    } else {
+        return nil;
+    }
+}
+
++ (void)clearSkippedUpdateForHost:(SUHost *)host
+{
+    host setObject:nil forUserDefaultsKey:SUSkippedMinorVersionKey;
+    host setObject:nil forUserDefaultsKey:SUSkippedMajorVersionKey;
+    host setObject:nil forUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey;
+}
+
++ (void)skipUpdate:(SUAppcastItem *)updateItem host:(SUHost *)host
+{
+    NSString *version = updateItem.versionString;
+    
+    if (updateItem.majorUpgrade) {
+        NSString *majorVersion = updateItem.minimumAutoupdateVersion;
+        assert(majorVersion != nil);
+        
+        host setObject:majorVersion forUserDefaultsKey:SUSkippedMajorVersionKey;
+        host setObject:version forUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey;
+    } else {
+        host setObject:version forUserDefaultsKey:SUSkippedMinorVersionKey;
+    }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUpdaterController.h Added

@@ -0,0 +1,112 @@
+//
+// SPUStandardUpdaterController.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/28/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUUpdater;
+@class SPUStandardUserDriver;
+@class NSMenuItem;
+@protocol SPUUserDriver, SPUUpdaterDelegate, SPUStandardUserDriverDelegate;
+
+/**
+ A controller class that instantiates a `SPUUpdater` and allows binding UI to its updater settings.
+ 
+ This class can be instantiated in a nib or created programatically using `-initWithUpdaterDelegate:userDriverDelegate:` or `-initWithStartingUpdater:updaterDelegate:userDriverDelegate:`.
+ 
+ The controller's updater targets the application's main bundle and uses Sparkle's standard user interface.
+ Typically, this class is used by sticking it as a custom NSObject subclass in an Interface Builder nib (probably in MainMenu) but it works well programatically too.
+ 
+ The controller creates an `SPUUpdater` instance using a `SPUStandardUserDriver` and allows hooking up the check for updates action and handling menu item validation.
+ It also allows hooking up the updater's and user driver's delegates.
+ 
+ If you need more control over what bundle you want to update, or you want to provide a custom user interface (via `SPUUserDriver`), please use `SPUUpdater` directly instead.
+ */
+SU_EXPORT @interface SPUStandardUpdaterController : NSObject
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-interface-ivars"
+ /**
+ * Interface builder outlet for the updater's delegate.
+ */
+ IBOutlet __weak id<SPUUpdaterDelegate> updaterDelegate;
+ 
+ /**
+ * Interface builder outlet for the user driver's delegate.
+ */
+ IBOutlet __weak id<SPUStandardUserDriverDelegate> userDriverDelegate;
+#pragma clang diagnostic pop
+}
+
+/**
+ Accessible property for the updater. Some properties on the updater can be binded via KVO
+ 
+ When instantiated from a nib, don't perform update checks before the application has finished launching in a MainMenu nib (i.e applicationDidFinishLaunching:) or before the corresponding window/view controller has been loaded (i.e, windowDidLoad or viewDidLoad). The updater is not guaranteed to be started yet before these points.
+ */
+@property (nonatomic, readonly) SPUUpdater *updater;
+
+/**
+ Accessible property for the updater's user driver.
+ */
+@property (nonatomic, readonly) SPUStandardUserDriver *userDriver;
+
+/**
+ Create a new `SPUStandardUpdaterController` from a nib.
+ 
+ You cannot call this initializer directly. You must instantiate a `SPUStandardUpdaterController` inside of a nib (typically the MainMenu nib) to use it.
+ 
+ To create a `SPUStandardUpdaterController` programatically, use `-initWithUpdaterDelegate:userDriverDelegate:` or `-initWithStartingUpdater:updaterDelegate:userDriverDelegate:` instead.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ Create a new `SPUStandardUpdaterController` programmatically.
+ 
+ The updater is started automatically. See `-startUpdater` for more information.
+ */
+- (instancetype)initWithUpdaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
+
+/**
+ Create a new `SPUStandardUpdaterController` programmatically allowing you to specify whether or not to start the updater immediately.
+ 
+ You can specify whether or not you want to start the updater immediately.
+ If you do not start the updater, you must invoke `-startUpdater` at a later time to start it.
+ */
+- (instancetype)initWithStartingUpdater:(BOOL)startUpdater updaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
+
+/**
+ Starts the updater if it has not already been started.
+ 
+ You should only call this method yourself if you opted out of starting the updater on initialization.
+ Hence, do not call this yourself if you are instantiating this controller from a nib.
+ 
+ This invokes `-SPUUpdater startUpdater:`. If the application is misconfigured with Sparkle, an error is logged and an alert is shown to the user (after a few seconds) to contact the developer.
+ If you want more control over this behavior, you can create your own `SPUUpdater` instead of using `SPUStandardUpdaterController`.
+ */
+- (void)startUpdater;
+
+/**
+ Explicitly checks for updates and displays a progress dialog while doing so.
+ 
+ This method is meant for a main menu item.
+ Connect any NSMenuItem to this action in Interface Builder or programmatically,
+ and Sparkle will check for updates and report back its findings verbosely when it is invoked.
+ 
+ When the target/action of the menu item is set to this controller and this method,
+ this controller also handles enabling/disabling the menu item by checking
+ `-SPUUpdater canCheckForUpdates`
+ 
+ This action checks updates by invoking `-SPUUpdater checkForUpdates`
+ */
+- (IBAction)checkForUpdates:(nullable id)sender;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUpdaterController.m Added

@@ -0,0 +1,110 @@
+//
+// SPUStandardUpdaterController.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/28/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SPUStandardUpdaterController.h"
+#import "SPUUpdater.h"
+#import "SUHost.h"
+#import "SPUStandardUserDriver.h"
+#import "SUConstants.h"
+#import "SULog.h"
+#import "SULocalizations.h"
+#import <AppKit/AppKit.h>
+
+// We use public instance variables instead of properties for the updater / user driver delegates
+// because we want them to be connectable outlets from Interface Builder, but we do not want their setters to be invoked
+// programmatically.
+
+@interface SPUStandardUpdaterController () <NSMenuItemValidation>
+
+@property (nonatomic) SPUUpdater *updater;
+@property (nonatomic) id<SPUUserDriver> userDriver;
+
+@end
+
+@implementation SPUStandardUpdaterController
+
+@synthesize updater = _updater;
+@synthesize userDriver = _userDriver;
+
+- (void)awakeFromNib
+{
+ // Note: awakeFromNib might be called more than once
+ // We have to use awakeFromNib otherwise the delegate outlets may not be connected yet,
+ // and we aren't a proper window or view controller, so we don't have a proper "did load" point
+ if (self.updater == nil) {
+ self _initUpdater;
+ self startUpdater;
+ }
+}
+
+- (void)_initUpdater
+{
+ NSBundle *hostBundle = NSBundle mainBundle;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ SPUStandardUserDriver *userDriver = SPUStandardUserDriver alloc initWithHostBundle:hostBundle delegate:self->userDriverDelegate;
+ 
+ self.updater = SPUUpdater alloc initWithHostBundle:hostBundle applicationBundle:hostBundle userDriver:userDriver delegate:self->updaterDelegate;
+ self.userDriver = userDriver;
+#pragma clang diagnostic pop
+}
+
+- (instancetype)initWithUpdaterDelegate:(nullable id<SPUUpdaterDelegate>)theUpdaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)theUserDriverDelegate
+{
+ return self initWithStartingUpdater:YES updaterDelegate:theUpdaterDelegate userDriverDelegate:theUserDriverDelegate;
+}
+
+- (instancetype)initWithStartingUpdater:(BOOL)startUpdater updaterDelegate:(nullable id<SPUUpdaterDelegate>)theUpdaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)theUserDriverDelegate
+{
+ if ((self = super init)) {
+ self->updaterDelegate = theUpdaterDelegate;
+ self->userDriverDelegate = theUserDriverDelegate;
+
+ self _initUpdater;
+ 
+ if (startUpdater) {
+ self startUpdater;
+ }
+ }
+ return self;
+}
+
+- (void)startUpdater
+{
+ NSError *updaterError = nil;
+ if (!self.updater startUpdater:&updaterError) {
+ SULog(SULogLevelError, @"Fatal updater error (%ld): %@", updaterError.code, updaterError.localizedDescription);
+ 
+ // Delay the alert four seconds so it doesn't show RIGHT as the app launches, but also doesn't interrupt the user once they really get to work.
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ NSAlert *alert = NSAlert alloc init;
+ alert.messageText = SULocalizedString(@"Unable to Check For Updates", nil);
+ alert.informativeText = SULocalizedString(@"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version.", nil);
+ alert runModal;
+ });
+ }
+}
+
+- (IBAction)checkForUpdates:(nullable id)__unused sender
+{
+ self.updater checkForUpdates;
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+ if (item action == @selector(checkForUpdates:)) {
+ return self.updater.canCheckForUpdates;
+ }
+ return YES;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUserDriver+Private.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUserDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUserDriver.m Added

@@ -0,0 +1,864 @@
+//
+// SPUStandardUserDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/14/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SPUStandardUserDriver.h"
+#import "SPUStandardUserDriverDelegate.h"
+#import "SPUGentleUserDriverReminders.h"
+#import "SUAppcastItem.h"
+#import "SUVersionDisplayProtocol.h"
+#import "SUHost.h"
+#import "SUUpdatePermissionPrompt.h"
+#import "SUStatusController.h"
+#import "SUUpdateAlert.h"
+#import "SULocalizations.h"
+#import "SUApplicationInfo.h"
+#import "SUOperatingSystem.h"
+#import "SPUUserUpdateState.h"
+#import "SUErrors.h"
+#import "SPUInstallationType.h"
+#import "SULog.h"
+#include <time.h>
+#include <mach/mach_time.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
+
+
+#import <AppKit/AppKit.h>
+
+// The amount of time the app is allowed to be idle for us to consider showing an update prompt right away when the app is active
+static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 30.0 : 5 * 60.0;
+
+@interface SPUStandardUserDriver () <SPUGentleUserDriverReminders>
+
+@property (nonatomic, readonly) SUHost *host;
+// We must store the oldHostName before the host is potentially replaced
+// because we may use this property after update has been installed
+@property (nonatomic, readonly) NSString *oldHostName;
+@property (nonatomic, readonly) NSURL *oldHostBundleURL;
+
+@property (nonatomic, weak, nullable, readonly) id <SPUStandardUserDriverDelegate> delegate;
+
+@property (nonatomic, copy) void (^installUpdateHandler)(SPUUserUpdateChoice);
+@property (nonatomic, copy) void (^cancellation)(void);
+
+@property (nonatomic) SUStatusController *checkingController;
+// Note: we expose a private interface for activeUpdateAlert in SPUStandardUserDriver+Private.h as NSWindowController
+@property (nonatomic) SUUpdateAlert *activeUpdateAlert;
+@property (nonatomic) SUStatusController *statusController;
+@property (nonatomic) SUUpdatePermissionPrompt *permissionPrompt;
+
+@property (nonatomic) uint64_t expectedContentLength;
+@property (nonatomic) uint64_t bytesDownloaded;
+
+@end
+
+@implementation SPUStandardUserDriver
+{
+ void (^_retryTerminatingApplication)(void);
+ mach_timebase_info_data_t _timebaseInfo;
+ double _timeSinceOpportuneUpdateNotice;
+ id<NSObject> _applicationBecameActiveAfterUpdateAlertBecameKeyObserver;
+ NSValue *_updateAlertWindowFrameValue;
+ BOOL _updateAlertWindowWasInactive;
+ BOOL _loggedGentleUpdateReminderWarning;
+ BOOL _regularApplicationUpdate;
+ BOOL _updateReceivedUserAttention;
+}
+
+@synthesize host = _host;
+@synthesize oldHostName = _oldHostName;
+@synthesize oldHostBundleURL = _oldHostBundleURL;
+@synthesize installUpdateHandler = _installUpdateHandler;
+@synthesize cancellation = _cancellation;
+@synthesize delegate = _delegate;
+@synthesize checkingController = _checkingController;
+@synthesize activeUpdateAlert = _activeUpdateAlert;
+@synthesize statusController = _statusController;
+@synthesize permissionPrompt = _permissionPrompt;
+@synthesize expectedContentLength = _expectedContentLength;
+@synthesize bytesDownloaded = _bytesDownloaded;
+
+#pragma mark Birth
+
+- (instancetype)initWithHostBundle:(NSBundle *)hostBundle delegate:(nullable id<SPUStandardUserDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _host = SUHost alloc initWithBundle:hostBundle;
+ _oldHostName = _host.name;
+ _oldHostBundleURL = hostBundle.bundleURL;
+ _delegate = delegate;
+ 
+ kern_return_t timebaseInfoResult = mach_timebase_info(&_timebaseInfo);
+ if (timebaseInfoResult != KERN_SUCCESS) {
+ SULog(SULogLevelError, @"Error: failed to fill mach_timebase_info() with error %d", timebaseInfoResult);
+ 
+ _timebaseInfo.numer = 0;
+ _timebaseInfo.denom = 0;
+ }
+ }
+ return self;
+}
+
+- (double)currentTime
+{
+ if (_timebaseInfo.denom > 0) {
+ return (1.0 * mach_absolute_time() * _timebaseInfo.numer / _timebaseInfo.denom);
+ } else {
+ return 0.0;
+ }
+}
+
+// This private method is used by SPUUpdater for resetting the opportune time to show an update notice in utmost focus
+- (void)resetTimeSinceOpportuneUpdateNotice
+{
+ _timeSinceOpportuneUpdateNotice = self currentTime;
+}
+
+#pragma mark Update Permission
+
+- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply
+{
+ assert(NSThread.isMainThread);
+ 
+ if (SUApplicationInfo isBackgroundApplication:NSApplication sharedApplication) {
+ NSApplication sharedApplication activateIgnoringOtherApps:YES;
+ }
+ 
+ __weak __typeof__(self) weakSelf = self;
+ self.permissionPrompt = SUUpdatePermissionPrompt alloc initPromptWithHost:self.host request:request reply:^(SUUpdatePermissionResponse *response) {
+ reply(response);
+ weakSelf.permissionPrompt = nil;
+ };
+ 
+ self.permissionPrompt showWindow:nil;
+}
+
+#pragma mark Update Alert Focus
+
+// This private method is used by SPUUpdater when scheduling for update checks
+- (void)logGentleScheduledUpdateReminderWarningIfNeeded
+{
+ id<SPUStandardUserDriverDelegate> delegate = self.delegate;
+ if (!_loggedGentleUpdateReminderWarning && (!delegate respondsToSelector:@selector(supportsGentleScheduledUpdateReminders) || !delegate.supportsGentleScheduledUpdateReminders)) {
+ BOOL isBackgroundApp = SUApplicationInfo isBackgroundApplication:NSApplication sharedApplication;
+ if (isBackgroundApp) {
+ SULog(SULogLevelError, @"Warning: Background app automatically schedules for update checks but does not implement gentle reminders. As a result, users may not take notice to update alerts that show up in the background. Please visit https://sparkle-project.org/documentation/gentle-reminders for more information. This warning will only be logged once.");
+ 
+ _loggedGentleUpdateReminderWarning = YES;
+ }
+ }
+}
+
+// updateItem should be non-nil when showing an update for first time for scheduled updates
+// If appcastItem is != nil, then state must be != nil
+- (void)setUpActiveUpdateAlertForScheduledUpdate:(SUAppcastItem * _Nullable)updateItem state:(SPUUserUpdateState * _Nullable)state
+{
+ // Make sure the window is loaded in any case
+ self.activeUpdateAlert window;
+ 
+ self _removeApplicationBecomeActiveObserver;
+ 
+ if (updateItem == nil) {
+ // This is a user initiated check or a check to bring the already shown update back in focus
+ if (!NSApp isActive) {
+ // If the user initiated an update check, we should make the app active,
+ // regardless if it's a background running app or not
+ NSApp activateIgnoringOtherApps:YES;
+ }
+ 
+ self.activeUpdateAlert showWindow:nil;
+ self.activeUpdateAlert setInstallButtonFocus:YES;
+ } else {
+ // Handle scheduled update check
+ uint64_t timeElapsedSinceOpportuneUpdateNotice = (uint64_t)(self currentTime - _timeSinceOpportuneUpdateNotice);
+ 
+ // Give scheduled update alerts priority if 3 or less seconds have passed since our last opportune time
+ BOOL appNearUpdaterInitialization = (timeElapsedSinceOpportuneUpdateNotice <= 3000000000ULL);
+ 
+ // We will always show an update alert at the right time
+ self.activeUpdateAlert setInstallButtonFocus:YES;
+ 
+ // If the delegate doesn't override our behavior:
+ // For regular applications, only show the update alert if the app is active and if it's an an opportune time, otherwise, we'll wait until the app becomes active again.
+ // For background applications, if the app is active, we will show the update window ordered back.
+ // If the app is inactive, we'll show the update alert in the background behind other running apps
+ // But we are near app launch, we will activate the app and show the alert as key
+ BOOL backgroundApp = SUApplicationInfo isBackgroundApplication:NSApp;
+ BOOL driverShowingUpdateNow;
+ BOOL immediateFocus;
+ BOOL showingUpdateInBack;
+ BOOL activatingApp;
+ if (NSApp isActive) {
+ BOOL systemHasBeenIdle;
+ {
+ // If the system has been inactive for several minutes, allow the update alert to show up immediately. We assume it's likely the user isn't at their computer in this case.
+ // Note this is not done for background running applications.
+ CFTimeInterval timeSinceLastEvent;
+ if (!appNearUpdaterInitialization && !backgroundApp) {
+ timeSinceLastEvent = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateHIDSystemState, kCGAnyInputEventType);
+ 
+ if (timeSinceLastEvent >= SUScheduledUpdateIdleEventLeewayInterval) {
+ // Make sure there's no active power management assertions preventing
+ // the display from sleeping by the current application.
+ // If there is, then the app may still actively be in use
+ CFDictionaryRef cfAssertions = NULL;
+ if (IOPMCopyAssertionsByProcess(&cfAssertions) == kIOReturnSuccess) {
+ NSDictionary<NSNumber *, NSArray<NSDictionary<NSString *, id> *> *> *assertions = CFBridgingRelease(cfAssertions);
+ 
+ pid_t currentProcessIdentifier = NSRunningApplication.currentApplication.processIdentifier;
+ 
+ NSNumber *processIdentifierKey = @(currentProcessIdentifier);
+ NSArray<NSDictionary<NSString *, id> *> *currentProcessAssertions = assertionsprocessIdentifierKey;
+ 
+ BOOL foundNoDisplaySleepAssertion = NO;
+ for (NSDictionary<NSString *, id> *assertion in currentProcessAssertions) {
+ NSString *assertionType = assertion(NSString *)kIOPMAssertionTypeKey;
+ NSNumber *assertionLevel = assertion(NSString *)kIOPMAssertionLevelKey;
+ if (assertionType isEqualToString:(NSString *)kIOPMAssertionTypeNoDisplaySleep && assertionLevel isEqual:@(kIOPMAssertionLevelOn)) {
+ 
+ foundNoDisplaySleepAssertion = YES;
+ break;
+ }
+ }
+ 
+ systemHasBeenIdle = !foundNoDisplaySleepAssertion;
+ } else {
+ systemHasBeenIdle = NO;
+ }
+ } else {
+ systemHasBeenIdle = NO;
+ }
+ } else {
+ systemHasBeenIdle = NO;
+ }
+ }
+ 
+ if (appNearUpdaterInitialization || systemHasBeenIdle) {
+ driverShowingUpdateNow = YES;
+ immediateFocus = YES;
+ showingUpdateInBack = NO;
+ activatingApp = backgroundApp;
+ } else {
+ driverShowingUpdateNow = backgroundApp;
+ immediateFocus = NO;
+ // If there is a key window active in the app, show the update alert behind other windows
+ showingUpdateInBack = backgroundApp && (NSApp keyWindow != nil);
+ activatingApp = NO;
+ }
+ } else {
+ // For regular applications, we will show the update alert when the user comes back to the app
+ // For background applications, we will show the update alert right away but in the background,
+ // unless focus is requested
+ if (!backgroundApp) {
+ driverShowingUpdateNow = NO;
+ immediateFocus = NO;
+ showingUpdateInBack = NO;
+ activatingApp = NO;
+ } else {
+ driverShowingUpdateNow = YES;
+ immediateFocus = appNearUpdaterInitialization;
+ showingUpdateInBack = NO;
+ activatingApp = appNearUpdaterInitialization;
+ }
+ }
+ 
+ BOOL handleShowingUpdates;
+ if (self.delegate respondsToSelector:@selector(standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:)) {
+ handleShowingUpdates = self.delegate standardUserDriverShouldHandleShowingScheduledUpdate:(SUAppcastItem * _Nonnull)updateItem andInImmediateFocus:immediateFocus;
+ } else {
+ handleShowingUpdates = YES;
+ }
+ 
+ if (!handleShowingUpdates) {
+ // Delay a runloop cycle to make sure the update can properly be checked
+ SPUStandardUserDriver *__weak weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ id<SPUStandardUserDriverDelegate> delegate = weakSelf.delegate;
+ if (delegate respondsToSelector:@selector(standardUserDriverWillHandleShowingUpdate:forUpdate:state:)) {
+ delegate standardUserDriverWillHandleShowingUpdate:handleShowingUpdates forUpdate:(SUAppcastItem * _Nonnull)updateItem state:(SPUUserUpdateState * _Nonnull)state;
+ } else {
+ SULog(SULogLevelError, @"Error: Delegate <%@> is handling showing scheduled update but does not implement %@", delegate, NSStringFromSelector(@selector(standardUserDriverWillHandleShowingUpdate:forUpdate:state:)));
+ }
+ });
+ } else {
+ // The update will be shown, but not necessarily immediately if !driverShowingUpdateNow
+ // It is useful to post this early in case the delegate wants to post a notification
+ if (self.delegate respondsToSelector:@selector(standardUserDriverWillHandleShowingUpdate:forUpdate:state:)) {
+ self.delegate standardUserDriverWillHandleShowingUpdate:handleShowingUpdates forUpdate:(SUAppcastItem * _Nonnull)updateItem state:(SPUUserUpdateState * _Nonnull)state;
+ }
+ 
+ if (!driverShowingUpdateNow) {
+ NSNotificationCenter defaultCenter addObserver:self selector:@selector(applicationDidBecomeActive:) name:NSApplicationDidBecomeActiveNotification object:NSApp;
+ } else {
+ if (activatingApp) {
+ NSApp activateIgnoringOtherApps:YES;
+ }
+ 
+ if (showingUpdateInBack) {
+ self.activeUpdateAlert.window orderBack:nil;
+ } else {
+ self.activeUpdateAlert showWindow:nil;
+ }
+ }
+ }
+ }
+}
+
+- (void)_removeApplicationBecomeActiveObserver
+{
+ NSNotificationCenter defaultCenter removeObserver:self name:NSApplicationDidBecomeActiveNotification object:NSApp;
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)__unused aNotification
+{
+ self.activeUpdateAlert showWindow:nil;
+ self.activeUpdateAlert setInstallButtonFocus:YES;
+ 
+ self _removeApplicationBecomeActiveObserver;
+}
+
+#pragma mark Update Found
+
+- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem state:(SPUUserUpdateState *)state reply:(void (^)(SPUUserUpdateChoice))reply
+{
+ assert(NSThread.isMainThread);
+ 
+ self closeCheckingWindow;
+ 
+ id <SUVersionDisplay> versionDisplayer = nil;
+ if (self.delegate respondsToSelector:@selector(standardUserDriverRequestsVersionDisplayer)) {
+ versionDisplayer = self.delegate standardUserDriverRequestsVersionDisplayer;
+ }
+ 
+ BOOL needsToObserveUserAttention = self.delegate respondsToSelector:@selector(standardUserDriverDidReceiveUserAttentionForUpdate:);
+ 
+ __weak SPUStandardUserDriver *weakSelf = self;
+ __weak id<SPUStandardUserDriverDelegate> weakDelegate = self.delegate;
+ self.activeUpdateAlert = SUUpdateAlert alloc initWithAppcastItem:appcastItem state:state host:self.host versionDisplayer:versionDisplayer completionBlock:^(SPUUserUpdateChoice choice, NSRect windowFrame, BOOL wasKeyWindow) {
+ reply(choice);
+ 
+ SPUStandardUserDriver *strongSelf = weakSelf;
+ 
+ if (strongSelf != nil) {
+ if (needsToObserveUserAttention && !strongSelf->_updateReceivedUserAttention) {
+ strongSelf->_updateReceivedUserAttention = YES;
+ 
+ id<SPUStandardUserDriverDelegate> strongDelegate = weakDelegate;
+ // needsToObserveUserAttention already checks delegate responds to this selector
+ strongDelegate standardUserDriverDidReceiveUserAttentionForUpdate:appcastItem;
+ }
+ 
+ // Record the window frame of the update alert right before we deallocate it
+ // So we can center future status window to where the update alert last was.
+ // Also record if the window was inactive at the time a response was made
+ // (the window may not be key if the window e.g. holds command while clicking on a response button)
+ strongSelf->_updateAlertWindowFrameValue = NSValue valueWithRect:windowFrame;
+ strongSelf->_updateAlertWindowWasInactive = !wasKeyWindow;
+ 
+ strongSelf.activeUpdateAlert = nil;
+ }
+ } didBecomeKeyBlock:^{
+ if (!needsToObserveUserAttention) {
+ return;
+ }
+ 
+ if (NSApp isActive) {
+ SPUStandardUserDriver *strongSelf = weakSelf;
+ if (strongSelf != nil && !strongSelf->_updateReceivedUserAttention) {
+ strongSelf->_updateReceivedUserAttention = YES;
+ 
+ id<SPUStandardUserDriverDelegate> strongDelegate = weakDelegate;
+ // needsToObserveUserAttention already checks delegate responds to this selector
+ strongDelegate standardUserDriverDidReceiveUserAttentionForUpdate:appcastItem;
+ }
+ } else {
+ // We need to listen for when the app becomes active again, and then test if the window alert
+ // is still key. if it is, let the delegate know. Remove the observation after that.
+ 
+ SPUStandardUserDriver *strongSelfOuter = weakSelf;
+ if (strongSelfOuter != nil && strongSelfOuter->_applicationBecameActiveAfterUpdateAlertBecameKeyObserver == nil) {
+ strongSelfOuter->_applicationBecameActiveAfterUpdateAlertBecameKeyObserver = NSNotificationCenter defaultCenter addObserverForName:NSApplicationDidBecomeActiveNotification object:NSApp queue:NSOperationQueue.mainQueue usingBlock:^(NSNotification * _Nonnull __unused note) {
+ SPUStandardUserDriver *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ if (!strongSelf->_updateReceivedUserAttention && strongSelf.activeUpdateAlert.window isKeyWindow) {
+ strongSelf->_updateReceivedUserAttention = YES;
+ 
+ id<SPUStandardUserDriverDelegate> strongDelegate = weakDelegate;
+ // needsToObserveUserAttention already checks delegate responds to this selector
+ strongDelegate standardUserDriverDidReceiveUserAttentionForUpdate:appcastItem;
+ }
+ 
+ if (strongSelf->_applicationBecameActiveAfterUpdateAlertBecameKeyObserver != nil) {
+ NSNotificationCenter defaultCenter removeObserver:strongSelf->_applicationBecameActiveAfterUpdateAlertBecameKeyObserver;
+ 
+ strongSelf->_applicationBecameActiveAfterUpdateAlertBecameKeyObserver = nil;
+ }
+ }
+ };
+ }
+ }
+ };
+ 
+ _regularApplicationUpdate = appcastItem.installationType isEqualToString:SPUInstallationTypeApplication;
+ 
+ // For user initiated checks, let the delegate know we'll be showing an update
+ // For scheduled checks, -setUpActiveUpdateAlertForUpdate:state: below will handle this
+ if (state.userInitiated && self.delegate respondsToSelector:@selector(standardUserDriverWillHandleShowingUpdate:forUpdate:state:)) {
+ self.delegate standardUserDriverWillHandleShowingUpdate:YES forUpdate:appcastItem state:state;
+ }
+ 
+ self setUpActiveUpdateAlertForScheduledUpdate:(state.userInitiated ? nil : appcastItem) state:state;
+}
+
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
+{
+ assert(NSThread.isMainThread);
+ 
+ self.activeUpdateAlert showUpdateReleaseNotesWithDownloadData:downloadData;
+}
+
+- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error
+{
+ assert(NSThread.isMainThread);
+ 
+ // I don't want to expose SULog here because it's more of a user driver facing error
+ // For our purposes we just ignore it and continue on..
+ NSLog(@"Failed to download release notes with error: %@", error);
+ self.activeUpdateAlert showReleaseNotesFailedToDownload;
+}
+
+- (void)showUpdateInFocus
+{
+ BOOL mayNeedToActivateApp;
+ if (self.activeUpdateAlert != nil) {
+ self setUpActiveUpdateAlertForScheduledUpdate:nil state:nil;
+ mayNeedToActivateApp = NO;
+ } else if (self.permissionPrompt != nil) {
+ self.permissionPrompt showWindow:nil;
+ mayNeedToActivateApp = YES;
+ } else if (self.statusController != nil) {
+ self.statusController showWindow:nil;
+ mayNeedToActivateApp = YES;
+ } else if (self.checkingController != nil) {
+ self.checkingController showWindow:nil;
+ mayNeedToActivateApp = YES;
+ } else if (_retryTerminatingApplication != nil) {
+ self _showAndConfigureStatusControllerForReadyToInstallWithAction:@selector(retryTermination:) closable:YES;
+ mayNeedToActivateApp = YES;
+ } else {
+ mayNeedToActivateApp = NO;
+ }
+ 
+ if (mayNeedToActivateApp && !NSApp isActive) {
+ // Make the app active if it's not already active, e.g, from a menu bar extra
+ NSApp activateIgnoringOtherApps:YES;
+ }
+}
+
+#pragma mark Install & Relaunch Update
+
+- (void)_showAndConfigureStatusControllerForReadyToInstallWithAction:(SEL)selector closable:(BOOL)closable
+{
+ self createAndShowStatusControllerWithClosable:closable;
+ 
+ self.statusController beginActionWithTitle:SULocalizedString(@"Ready to Install", nil) maxProgressValue:1.0 statusText:nil;
+ self.statusController setProgressValue:1.0; // Fill the bar.
+ self.statusController setButtonEnabled:YES;
+ self.statusController setButtonTitle:SULocalizedString(@"Install and Relaunch", nil) target:self action:selector isDefault:YES;
+}
+
+- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
+{
+ assert(NSThread.isMainThread);
+ 
+ self _showAndConfigureStatusControllerForReadyToInstallWithAction:@selector(installAndRestart:) closable:NO;
+ 
+ NSApp requestUserAttention:NSInformationalRequest;
+ 
+ self.installUpdateHandler = installUpdateHandler;
+}
+
+- (void)installAndRestart:(id)__unused sender
+{
+ if (self.installUpdateHandler != nil) {
+ self.installUpdateHandler(SPUUserUpdateChoiceInstall);
+ self.installUpdateHandler = nil;
+ }
+}
+
+- (void)retryTermination:(id)__unused sender
+{
+ if (_retryTerminatingApplication != nil) {
+ _retryTerminatingApplication();
+ }
+}
+
+#pragma mark Check for Updates
+
+- (void)showUserInitiatedUpdateCheckWithCancellation:(void (^)(void))cancellation
+{
+ assert(NSThread.isMainThread);
+ 
+ self.cancellation = cancellation;
+ 
+ self.checkingController = SUStatusController alloc initWithHost:self.host centerPointValue:nil minimizable:NO closable:NO;
+ self.checkingController window center; // Force the checking controller to load its window.
+ self.checkingController beginActionWithTitle:SULocalizedString(@"Checking for updates…", nil) maxProgressValue:0.0 statusText:nil;
+ self.checkingController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO;
+ self.checkingController showWindow:self;
+ 
+ // For background applications, obtain focus.
+ // Useful if the update check is requested from another app like System Preferences.
+ if (SUApplicationInfo isBackgroundApplication:NSApplication sharedApplication)
+ {
+ NSApp activateIgnoringOtherApps:YES;
+ }
+}
+
+- (void)closeCheckingWindow
+{
+ if (self.checkingController != nil)
+ {
+ self.checkingController close;
+ self.checkingController = nil;
+ self.cancellation = nil;
+ }
+}
+
+- (void)cancelCheckForUpdates:(id)__unused sender
+{
+ if (self.cancellation != nil) {
+ self.cancellation();
+ self.cancellation = nil;
+ }
+ self closeCheckingWindow;
+}
+
+#pragma mark Update Errors
+
+- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement
+{
+ assert(NSThread.isMainThread);
+ 
+ self closeCheckingWindow;
+ 
+ self.statusController close;
+ self.statusController = nil;
+ 
+ NSAlert *alert = NSAlert alloc init;
+ alert.messageText = SULocalizedString(@"Update Error!", nil);
+ alert.informativeText = NSString stringWithFormat:@"%@", error localizedDescription;
+ alert addButtonWithTitle:SULocalizedString(@"Cancel Update", nil);
+ self showAlert:alert secondaryAction:nil;
+ 
+ acknowledgement();
+}
+
+- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement
+{
+ assert(NSThread.isMainThread);
+ 
+ self closeCheckingWindow;
+ 
+ NSAlert *alert = NSAlert alertWithError:error;
+ alert.alertStyle = NSAlertStyleInformational;
+ 
+ // Can we give more information to the user?
+ SPUNoUpdateFoundReason reason = (SPUNoUpdateFoundReason)(NSNumber *)error.userInfoSPUNoUpdateFoundReasonKey integerValue;
+ 
+ void (^secondaryAction)(void) = nil;
+ SUAppcastItem *latestAppcastItem = error.userInfoSPULatestAppcastItemFoundKey;
+ if (latestAppcastItem != nil) {
+ switch (reason) {
+ case SPUNoUpdateFoundReasonOnLatestVersion:
+ case SPUNoUpdateFoundReasonOnNewerThanLatestVersion: {
+ // Show the user the past version history if available
+ NSString *localizedButtonTitle = SULocalizedString(@"Version History", nil);
+
+ // Check if the delegate implements a Version History action
+ id <SPUStandardUserDriverDelegate> delegate = self.delegate;
+ 
+ if (delegate respondsToSelector:@selector(standardUserDriverShowVersionHistoryForAppcastItem:)) {
+ alert addButtonWithTitle:localizedButtonTitle;
+ 
+ secondaryAction = ^{
+ delegate standardUserDriverShowVersionHistoryForAppcastItem:latestAppcastItem;
+ };
+ } else if (latestAppcastItem.fullReleaseNotesURL != nil) {
+ // Open the full release notes URL if informed
+ alert addButtonWithTitle:localizedButtonTitle;
+ 
+ secondaryAction = ^{
+ NSWorkspace sharedWorkspace openURL:(NSURL * _Nonnull)latestAppcastItem.fullReleaseNotesURL;
+ };
+ } else if (latestAppcastItem.releaseNotesURL != nil) {
+ // Fall back to opening the release notes URL
+ alert addButtonWithTitle:localizedButtonTitle;
+ 
+ secondaryAction = ^{
+ NSWorkspace sharedWorkspace openURL:(NSURL * _Nonnull)latestAppcastItem.releaseNotesURL;
+ };
+ }
+ 
+ break;
+ }
+ case SPUNoUpdateFoundReasonSystemIsTooOld:
+ case SPUNoUpdateFoundReasonSystemIsTooNew:
+ if (latestAppcastItem.infoURL != nil) {
+ // Show the user the product's link if available
+ alert addButtonWithTitle:SULocalizedString(@"Learn More…", nil);
+ 
+ secondaryAction = ^{
+ NSWorkspace sharedWorkspace openURL:(NSURL * _Nonnull)latestAppcastItem.infoURL;
+ };
+ }
+ break;
+ case SPUNoUpdateFoundReasonUnknown:
+ break;
+ }
+ }
+ 
+ self showAlert:alert secondaryAction:secondaryAction;
+ 
+ acknowledgement();
+}
+
+- (void)showAlert:(NSAlert *)alert secondaryAction:(void (^ _Nullable)(void))secondaryAction
+{
+ id <SPUStandardUserDriverDelegate> delegate = self.delegate;
+ 
+ if (delegate respondsToSelector:@selector(standardUserDriverWillShowModalAlert)) {
+ delegate standardUserDriverWillShowModalAlert;
+ }
+ 
+ alert setIcon:SUApplicationInfo bestIconForHost:self.host;
+ 
+ NSModalResponse response = alert runModal;
+ if (response == NSAlertSecondButtonReturn && secondaryAction != nil) {
+ secondaryAction();
+ }
+ 
+ if (delegate respondsToSelector:@selector(standardUserDriverDidShowModalAlert)) {
+ delegate standardUserDriverDidShowModalAlert;
+ }
+}
+
+#pragma mark Download & Install Updates
+
+- (void)createAndShowStatusControllerWithClosable:(BOOL)closable
+{
+ if (self.statusController == nil) {
+ // We will make the status window minimizable for regular app updates which are often
+ // quick and atomic to install on quit. But we won't do this for package based updates.
+ BOOL minimizable;
+ if (!_regularApplicationUpdate) {
+ minimizable = NO;
+ } else if (self.delegate respondsToSelector:@selector(standardUserDriverAllowsMinimizableStatusWindow)) {
+ minimizable = self.delegate standardUserDriverAllowsMinimizableStatusWindow;
+ } else {
+ minimizable = YES;
+ }
+ 
+ NSValue *centerPointValue;
+ if (_updateAlertWindowFrameValue != nil) {
+ NSRect updateAlertFrame = _updateAlertWindowFrameValue.rectValue;
+ NSPoint centerPoint = NSMakePoint(updateAlertFrame.origin.x + updateAlertFrame.size.width / 2.0, updateAlertFrame.origin.y + updateAlertFrame.size.height / 2.0);
+ 
+ centerPointValue = NSValue valueWithPoint:centerPoint;
+ } else {
+ centerPointValue = nil;
+ }
+ 
+ self.statusController = SUStatusController alloc initWithHost:self.host centerPointValue:centerPointValue minimizable:minimizable closable:closable;
+ 
+ if (_updateAlertWindowWasInactive) {
+ self.statusController.window orderFront:nil;
+ } else {
+ self.statusController showWindow:self;
+ }
+ }
+}
+
+- (void)showDownloadInitiatedWithCancellation:(void (^)(void))cancellation
+{
+ assert(NSThread.isMainThread);
+ 
+ self.cancellation = cancellation;
+ 
+ self createAndShowStatusControllerWithClosable:NO;
+ 
+ self.statusController beginActionWithTitle:SULocalizedString(@"Downloading update…", @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil;
+ self.statusController setProgressValue:0.0;
+ self.statusController setButtonTitle:SULocalizedString(@"Cancel", nil) target:self action:@selector(cancelDownload:) isDefault:NO;
+ 
+ self.bytesDownloaded = 0;
+}
+
+- (void)cancelDownload:(id)__unused sender
+{
+ if (self.cancellation != nil) {
+ self.cancellation();
+ self.cancellation = nil;
+ }
+}
+
+- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
+{
+ assert(NSThread.isMainThread);
+ 
+ self.expectedContentLength = expectedContentLength;
+ if (expectedContentLength == 0) {
+ self.statusController setMaxProgressValue:0.0;
+ }
+}
+
+- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length
+{
+ assert(NSThread.isMainThread);
+
+ self.bytesDownloaded += length;
+
+ NSByteCountFormatter *formatter = NSByteCountFormatter alloc init;
+ formatter setZeroPadsFractionDigits:YES;
+
+ if (self.expectedContentLength > 0.0) {
+ double newProgressValue = (double)self.bytesDownloaded / (double)self.expectedContentLength;
+ 
+ self.statusController setProgressValue:MIN(newProgressValue, 1.0);
+ 
+ self.statusController setStatusText:NSString stringWithFormat:SULocalizedString(@"%@ of %@", @"The download progress in units of bytes, e.g. 100 KB of 1,0 MB"), formatter stringFromByteCount:(long long)self.bytesDownloaded, formatter stringFromByteCount:(long long)MAX(self.bytesDownloaded, self.expectedContentLength);
+ } else {
+ self.statusController setStatusText:NSString stringWithFormat:SULocalizedString(@"%@ downloaded", @"The download progress in a unit of bytes, e.g. 100 KB"), formatter stringFromByteCount:(long long)self.bytesDownloaded;
+ }
+}
+
+- (void)showDownloadDidStartExtractingUpdate
+{
+ assert(NSThread.isMainThread);
+ 
+ self.cancellation = nil;
+ 
+ self createAndShowStatusControllerWithClosable:NO;
+ self.statusController beginActionWithTitle:SULocalizedString(@"Extracting update…", @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil;
+ self.statusController setProgressValue:0.0;
+ self.statusController setButtonTitle:SULocalizedString(@"Cancel", nil) target:nil action:nil isDefault:NO;
+ self.statusController setButtonEnabled:NO;
+}
+
+- (void)showExtractionReceivedProgress:(double)progress
+{
+ assert(NSThread.isMainThread);
+ 
+ self.statusController setProgressValue:progress;
+}
+
+- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated retryTerminatingApplication:(void (^)(void))retryTerminatingApplication
+{
+ assert(NSThread.isMainThread);
+ 
+ if (applicationTerminated) {
+ // Note this will only show up if -showReadyToInstallAndRelaunch: was called beforehand
+ self.statusController beginActionWithTitle:SULocalizedString(@"Installing update…", @"Take care not to overflow the status window.") maxProgressValue:0.0 statusText:nil;
+ self.statusController setButtonEnabled:NO;
+ } else {
+ // The "quit" event can always be canceled or delayed by the application we're updating
+ // So we can't easily predict how long the installation will take or if it won't happen right away
+ // We close our status window because we don't want it persisting for too long and have it obscure other windows
+ self.statusController close;
+ self.statusController = nil;
+ 
+ // Keep retry handler in case user tries to show update in focus again
+ _retryTerminatingApplication = retryTerminatingApplication copy;
+ }
+}
+
+- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement
+{
+ assert(NSThread.isMainThread);
+ 
+ // Close window showing update is installing
+ self.statusController close;
+ self.statusController = nil;
+ 
+ // Only show installed prompt when the app is not relaunched
+ // When the app is relaunched, there is enough of a UI from relaunching the app.
+ if (!relaunched) {
+ NSAlert *alert = NSAlert alloc init;
+ alert.messageText = SULocalizedString(@"Update Installed", nil);
+ 
+ // Extract information from newly updated bundle if available
+ NSString *hostName;
+ NSString *hostVersion;
+ NSBundle *newBundle = NSBundle bundleWithURL:self.oldHostBundleURL;
+ if (newBundle != nil) {
+ SUHost *newHost = SUHost alloc initWithBundle:newBundle;
+ hostName = newHost.name;
+ hostVersion = newHost.displayVersion;
+ } else {
+ // This may happen if Sparkle's normalization is enabled
+ hostName = self.oldHostName;
+ hostVersion = nil;
+ }
+ 
+ if (hostVersion != nil) {
+ alert.informativeText = NSString stringWithFormat:SULocalizedString(@"%@ is now updated to version %@!", nil), hostName, hostVersion;
+ } else {
+ alert.informativeText = NSString stringWithFormat:SULocalizedString(@"%@ is now updated!", nil), hostName;
+ }
+ self showAlert:alert secondaryAction:nil;
+ }
+ 
+ acknowledgement();
+}
+
+#pragma mark Aborting Everything
+
+- (void)dismissUpdateInstallation
+{
+ assert(NSThread.isMainThread);
+ 
+ id<SPUStandardUserDriverDelegate> delegate = self.delegate;
+ if (delegate respondsToSelector:@selector(standardUserDriverWillFinishUpdateSession)) {
+ delegate standardUserDriverWillFinishUpdateSession;
+ }
+ 
+ if (_applicationBecameActiveAfterUpdateAlertBecameKeyObserver != nil) {
+ NSNotificationCenter defaultCenter removeObserver:_applicationBecameActiveAfterUpdateAlertBecameKeyObserver;
+ _applicationBecameActiveAfterUpdateAlertBecameKeyObserver = nil;
+ }
+ 
+ _updateReceivedUserAttention = NO;
+ self.installUpdateHandler = nil;
+ self.cancellation = nil;
+ _retryTerminatingApplication = nil;
+ 
+ self closeCheckingWindow;
+ 
+ if (self.permissionPrompt) {
+ self.permissionPrompt close;
+ self.permissionPrompt = nil;
+ }
+ 
+ if (self.statusController) {
+ self.statusController close;
+ self.statusController = nil;
+ }
+ 
+ if (self.activeUpdateAlert) {
+ self.activeUpdateAlert close;
+ self.activeUpdateAlert = nil;
+ }
+ 
+ self _removeApplicationBecomeActiveObserver;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUStandardUserDriverDelegate.h Added

@@ -0,0 +1,172 @@
+//
+// SPUStandardUserDriverDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/3/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUVersionDisplay;
+@class SUAppcastItem;
+@class SPUUserUpdateState;
+
+/**
+ A protocol for Sparkle's standard user driver's delegate
+ 
+ This includes methods related to UI interactions
+ */
+SU_EXPORT @protocol SPUStandardUserDriverDelegate <NSObject>
+
+@optional
+
+/**
+ Called before showing a modal alert window,
+ to give the opportunity to hide attached windows that may get in the way.
+ */
+- (void)standardUserDriverWillShowModalAlert;
+
+/**
+ Called after showing a modal alert window,
+ to give the opportunity to hide attached windows that may get in the way.
+ */
+- (void)standardUserDriverDidShowModalAlert;
+
+/**
+ Returns an object that formats version numbers for display to the user.
+ If you don't implement this method or return @c nil, the standard version formatter will be used.
+ */
+- (_Nullable id <SUVersionDisplay>)standardUserDriverRequestsVersionDisplayer;
+
+/**
+ Handles showing the full release notes to the user.
+ 
+ When a user checks for new updates and no new update is found, Sparkle will offer to show the application's version history to the user
+ by providing a "Version History" button in the no new update available alert.
+ 
+ If this delegate method is not implemented, Sparkle will instead offer to open the
+ `fullReleaseNotesLink` (or `releaseNotesLink` if the former is unavailable) from the appcast's latest `item` in the user's web browser.
+ 
+ If this delegate method is implemented, Sparkle will instead ask the delegate to show the full release notes to the user.
+ A delegate may want to implement this method if they want to show in-app or offline release notes.
+ 
+ @param item The appcast item corresponding to the latest version available.
+ */
+- (void)standardUserDriverShowVersionHistoryForAppcastItem:(SUAppcastItem *)item;
+
+/**
+ Specifies whether or not the download, extraction, and installing status windows allows to be minimized.
+ 
+ By default, the status window showing the current status of the update (download, extraction, ready to install) is allowed to be minimized
+ for regular application bundle updates.
+ 
+ @return @c YES if the status window is allowed to be minimized (default behavior), otherwise @c NO.
+ */
+- (BOOL)standardUserDriverAllowsMinimizableStatusWindow;
+
+/**
+ Declares whether or not gentle scheduled update reminders are supported.
+ 
+ The delegate may implement scheduled update reminders that are presented in a gentle manner by implementing one or both of:
+ `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` and `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:`
+ 
+ Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples.
+ 
+ @return @c YES if gentle scheduled update reminders are implemented by standard user driver delegate, otherwise @c NO (default).
+ */
+@property (nonatomic, readonly) BOOL supportsGentleScheduledUpdateReminders;
+
+/**
+ Specifies if the standard user driver should handle showing a new scheduled update, or if its delegate should handle showing the update instead.
+ 
+ If you implement this method and return @c NO the delegate is then responsible for showing the update,
+ which must be implemented and done in `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:`
+ The motivation for the delegate being responsible for showing updates is to override Sparkle's default behavior
+ and add gentle reminders for new updates.
+ 
+ Returning @c YES is the default behavior and allows the standard user driver to handle showing the update.
+ 
+ If the standard user driver handles showing the update, `immediateFocus` reflects whether or not it will show the update in immediate and utmost focus.
+ The standard user driver may choose to show the update in immediate and utmost focus when the app was launched recently
+ or the system has been idle for some time.
+ 
+ If `immediateFocus` is @c NO the standard user driver may want to defer showing the update until the user comes back to the app.
+ For background running applications, when `immediateFocus` is @c NO the standard user driver will always want to show
+ the update alert immediately, but behind other running applications or behind the app's own windows if it's currently active.
+ 
+ There should be no side effects made when implementing this method so you should just return @c YES or @c NO
+ You will also want to implement `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:` for adding additional update reminders.
+ 
+ This method is not called for user-initiated update checks. The standard user driver always handles those.
+ 
+ Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples.
+ 
+ @param update The update the standard user driver should show.
+ @param immediateFocus If @c immediateFocus is @c YES, then the standard user driver proposes to show the update in immediate and utmost focus. See discussion for more details.
+ 
+ @return @c YES if the standard user should handle showing the scheduled update (default behavior), otherwise @c NO if the delegate handles showing it.
+ */
+- (BOOL)standardUserDriverShouldHandleShowingScheduledUpdate:(SUAppcastItem *)update andInImmediateFocus:(BOOL)immediateFocus;
+
+/**
+ Called before an update will be shown to the user.
+ 
+ If the standard user driver handles showing the update, `handleShowingUpdate` will be `YES`.
+ Please see `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:` for how the standard user driver
+ may handle showing scheduled updates when `handleShowingUpdate` is `YES` and `state.userInitiated` is `NO`.
+ 
+ If the delegate declared it handles showing the update by returning @c NO in `-standardUserDriverShouldHandleShowingScheduledUpdate:andInImmediateFocus:`
+ then the delegate should handle showing update reminders in this method, or at some later point.
+ In this case, `handleShowingUpdate` will be @c NO.
+ To bring the update alert in focus, you may call `-SPUStandardUpdaterController checkForUpdates:` or `-SPUUpdater checkForUpdates`.
+ You may want to show additional UI indicators in your application that will show this update in focus
+ and want to dismiss additional UI indicators in `-standardUserDriverWillFinishUpdateSession` or `-standardUserDriverDidReceiveUserAttentionForUpdate:`
+ 
+ If `state.userInitiated` is @c YES then the standard user driver always handles showing the new update and `handleShowingUpdate` will be @c YES.
+ In this case, it may still be useful for the delegate to intercept this method right before a new update will be shown.
+ 
+ This method is not called when bringing an update that has already been presented back in focus.
+ 
+ Visit https://sparkle-project.org/documentation/gentle-reminders for more information and examples.
+ 
+ @param handleShowingUpdate @c YES if the standard user driver handles showing the update, otherwise @c NO if the delegate handles showing the update.
+ @param update The update that will be shown.
+ @param state The user state of the update which includes if the update check was initiated by the user.
+ */
+- (void)standardUserDriverWillHandleShowingUpdate:(BOOL)handleShowingUpdate forUpdate:(SUAppcastItem *)update state:(SPUUserUpdateState *)state;
+
+/**
+ Called when a new update first receives attention from the user.
+ 
+ This occurs either when the user first brings the update alert in utmost focus or when the user makes a choice to install an update or dismiss/skip it.
+ 
+ This may be useful to intercept for dismissing custom attention-based UI indicators (e.g, user notifications) introduced when implementing
+ `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:`
+ 
+ For custom UI indicators that need to still be on screen after the user has started to install an update, please see `-standardUserDriverWillFinishUpdateSession`.
+ 
+ @param update The new update that the user gave attention to.
+ */
+- (void)standardUserDriverDidReceiveUserAttentionForUpdate:(SUAppcastItem *)update;
+
+/**
+ Called before the standard user driver session will finish its current update session.
+ 
+ This may occur after the user has dismissed / skipped a new update or after an update error has occurred.
+ For updaters updating external/other bundles, this may also be called after an update has been successfully installed.
+ 
+ This may be useful to intercept for dismissing custom UI indicators introduced when implementing
+ `-standardUserDriverWillHandleShowingUpdate:forUpdate:state:`
+ 
+ For UI indicators that need to be dismissed when the user has given attention to a new update alert,
+ please see `-standardUserDriverDidReceiveUserAttentionForUpdate:`
+ */
+- (void)standardUserDriverWillFinishUpdateSession;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUIBasedUpdateDriver.h Added

@@ -0,0 +1,48 @@
+//
+// SPUUIBasedUpdateDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SPUUpdateDriver.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SPUUIBasedUpdateDriverDelegate <NSObject>
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
+
+@optional
+
+- (void)uiDriverDidShowUpdate;
+- (void)basicDriverDidFinishLoadingAppcast;
+
+@end
+
+@class SUHost;
+@protocol SPUUserDriver, SPUUpdaterDelegate;
+
+@interface SPUUIBasedUpdateDriver : NSObject
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate;
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
+
+- (void)resumeInstallingUpdate;
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
+
+- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showedUserProgress;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUIBasedUpdateDriver.m Added

@@ -0,0 +1,450 @@
+//
+// SPUUIBasedUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUIBasedUpdateDriver.h"
+#import "SPUCoreBasedUpdateDriver.h"
+#import "SPUUserDriver.h"
+#import "SUHost.h"
+#import "SUConstants.h"
+#import "SPUUpdaterDelegate.h"
+#import "SUAppcastItem.h"
+#import "SUErrors.h"
+#import "SPUDownloadData.h"
+#import "SPUResumableUpdate.h"
+#import "SPUDownloadDriver.h"
+#import "SPUSkippedUpdate.h"
+#import "SPUUserUpdateState+Private.h"
+
+
+#include "AppKitPrevention.h"
+
+// Private class for downloading release notes
+@interface SPUReleaseNotesDriver: NSObject <SPUDownloadDriverDelegate>
+
+@property (nonatomic, readonly) SPUDownloadDriver *downloadDriver;
+@property (nonatomic) void (^completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable );
+
+@end
+
+@implementation SPUReleaseNotesDriver
+
+@synthesize downloadDriver = _downloadDriver;
+@synthesize completionHandler = _completionHandler;
+
+- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler
+{
+ self = super init;
+ if (self != nil) {
+ _downloadDriver = SPUDownloadDriver alloc initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO delegate:self;
+ _completionHandler = completionHandler copy;
+ } else {
+ assert(false);
+ }
+ return self;
+}
+
+- (void)startDownload
+{
+ self.downloadDriver downloadFile;
+}
+
+- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
+{
+ if (self.completionHandler != nil) {
+ self.completionHandler(downloadData, nil);
+ self.completionHandler = nil;
+ }
+}
+
+- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
+{
+ if (self.completionHandler != nil) {
+ self.completionHandler(nil, error);
+ self.completionHandler = nil;
+ }
+}
+
+- (void)cleanup:(void (^)(void))cleanupHandler
+{
+ self.completionHandler = nil;
+ self.downloadDriver cleanup:cleanupHandler;
+}
+
+@end
+
+@interface SPUUIBasedUpdateDriver() <SPUCoreBasedUpdateDriverDelegate>
+
+@property (nonatomic, readonly) SPUCoreBasedUpdateDriver *coreDriver;
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, weak, readonly) id updater;
+@property (nonatomic, readonly) BOOL userInitiated;
+@property (weak, nonatomic, readonly) id<SPUUpdaterDelegate> updaterDelegate;
+@property (nonatomic, weak, readonly) id<SPUUIBasedUpdateDriverDelegate> delegate;
+@property (nonatomic, readonly) id<SPUUserDriver> userDriver;
+@property (nonatomic) SPUReleaseNotesDriver *releaseNotesDriver;
+@property (nonatomic) BOOL resumingInstallingUpdate;
+@property (nonatomic) BOOL resumingDownloadedInfoOrUpdate;
+@property (nonatomic, nullable) NSDictionary *httpHeaders;
+@property (nonatomic, nullable) NSString *userAgent;
+
+@end
+
+@implementation SPUUIBasedUpdateDriver
+
+@synthesize coreDriver = _coreDriver;
+@synthesize host = _host;
+@synthesize updater = _updater;
+@synthesize userInitiated = _userInitiated;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize userDriver = _userDriver;
+@synthesize releaseNotesDriver = _releaseNotesDriver;
+@synthesize delegate = _delegate;
+@synthesize resumingInstallingUpdate = _resumingInstallingUpdate;
+@synthesize resumingDownloadedInfoOrUpdate = _resumingDownloadedInfoOrUpdate;
+@synthesize httpHeaders = _httpHeaders;
+@synthesize userAgent = _userAgent;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _userDriver = userDriver;
+ _delegate = delegate;
+ _updater = updater;
+ _userInitiated = userInitiated;
+ _updaterDelegate = updaterDelegate;
+ _host = host;
+ 
+ SPUUpdateCheck updateCheck = userInitiated ? SPUUpdateCheckUpdates : SPUUpdateCheckUpdatesInBackground;
+ 
+ _coreDriver = SPUCoreBasedUpdateDriver alloc initWithHost:host applicationBundle:applicationBundle updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.coreDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ self.coreDriver setUpdateWillInstallHandler:updateWillInstallHandler;
+}
+
+- (void)_clearSkippedUpdatesIfUserInitiated
+{
+ if (self.userInitiated) {
+ SPUSkippedUpdate clearSkippedUpdateForHost:self.host;
+ }
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
+{
+ self.httpHeaders = httpHeaders;
+ self.userAgent = userAgent;
+ 
+ self _clearSkippedUpdatesIfUserInitiated;
+ 
+ self.coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background requiresSilentInstall:NO;
+}
+
+- (void)resumeInstallingUpdate
+{
+ self _clearSkippedUpdatesIfUserInitiated;
+ 
+ self.resumingInstallingUpdate = YES;
+ self.coreDriver resumeInstallingUpdate;
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self _clearSkippedUpdatesIfUserInitiated;
+ 
+ self.resumingDownloadedInfoOrUpdate = YES;
+ self.coreDriver resumeUpdate:resumableUpdate;
+}
+
+- (void)basicDriverDidFinishLoadingAppcast
+{
+ if (self.delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)) {
+ self.delegate basicDriverDidFinishLoadingAppcast;
+ }
+}
+
+- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
+{
+ id <SPUUpdaterDelegate> updaterDelegate = self.updaterDelegate;
+ 
+ SPUUserUpdateStage stage;
+ // Major upgrades and information only updates are not downloaded automatically
+ if (self.resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate) {
+ stage = SPUUserUpdateStageDownloaded;
+ } else if (self.resumingInstallingUpdate) {
+ stage = SPUUserUpdateStageInstalling;
+ } else {
+ stage = SPUUserUpdateStageNotDownloaded;
+ }
+ 
+ SPUUserUpdateState *state = SPUUserUpdateState alloc initWithStage:stage userInitiated:self.userInitiated;
+ 
+ self.userDriver showUpdateFoundWithAppcastItem:updateItem state:state reply:^(SPUUserUpdateChoice userChoice) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ 
+ // Rule out invalid choices
+ SPUUserUpdateChoice validatedChoice;
+ if (updateItem.isInformationOnlyUpdate && userChoice == SPUUserUpdateChoiceInstall) {
+ validatedChoice = SPUUserUpdateChoiceDismiss;
+ } else {
+ validatedChoice = userChoice;
+ }
+ 
+ if (self.updaterDelegate respondsToSelector:@selector(updater:userDidMakeChoice:forUpdate:state:)) {
+ self.updaterDelegate updater:self.updater userDidMakeChoice:validatedChoice forUpdate:updateItem state:state;
+ } else if (validatedChoice == SPUUserUpdateChoiceSkip && self.updaterDelegate respondsToSelector:@selector(updater:userDidSkipThisVersion:)) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ self.updaterDelegate updater:self.updater userDidSkipThisVersion:updateItem;
+#pragma clang diagnostic pop
+ }
+ 
+ switch (validatedChoice) {
+ case SPUUserUpdateChoiceInstall: {
+ switch (stage) {
+ case SPUUserUpdateStageDownloaded:
+ self.coreDriver extractDownloadedUpdate;
+ break;
+ case SPUUserUpdateStageInstalling:
+ self.coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES;
+ break;
+ case SPUUserUpdateStageNotDownloaded:
+ self.coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:NO;
+ break;
+ }
+ break;
+ }
+ case SPUUserUpdateChoiceSkip: {
+ SPUSkippedUpdate skipUpdate:updateItem host:self.host;
+ 
+ switch (stage) {
+ case SPUUserUpdateStageDownloaded:
+ case SPUUserUpdateStageNotDownloaded:
+ // Informational and major updates can be resumed too, so make sure we check
+ // self.resumingDownloadedInfoOrUpdate instead of the stage we pass to user driver
+ if (self.resumingDownloadedInfoOrUpdate) {
+ self.coreDriver clearDownloadedUpdate;
+ }
+ 
+ self.delegate uiDriverIsRequestingAbortUpdateWithError:nil;
+ 
+ break;
+ case SPUUserUpdateStageInstalling:
+ self.coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES;
+ break;
+ }
+ 
+ break;
+ }
+ case SPUUserUpdateChoiceDismiss: {
+ switch (stage) {
+ case SPUUserUpdateStageDownloaded:
+ case SPUUserUpdateStageNotDownloaded: {
+ self.delegate uiDriverIsRequestingAbortUpdateWithError:nil;
+ break;
+ }
+ case SPUUserUpdateStageInstalling: {
+ self.coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES;
+ break;
+ }
+ }
+ 
+ break;
+ }
+ }
+ });
+ };
+ 
+ if (self.delegate respondsToSelector:@selector(uiDriverDidShowUpdate)) {
+ self.delegate uiDriverDidShowUpdate;
+ }
+ 
+ if (updateItem.releaseNotesURL != nil && (!updaterDelegate respondsToSelector:@selector(updater:shouldDownloadReleaseNotesForUpdate:) || updaterDelegate updater:self.updater shouldDownloadReleaseNotesForUpdate:updateItem)) {
+ 
+ __weak __typeof__(self) weakSelf = self;
+ self.releaseNotesDriver = SPUReleaseNotesDriver alloc initWithReleaseNotesURL:updateItem.releaseNotesURL httpHeaders:self.httpHeaders userAgent:self.userAgent host:self.host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
+ __typeof__(self) strongSelf = weakSelf;
+ id <SPUUserDriver> userDriver = strongSelf.userDriver;
+ if (downloadData != nil) {
+ userDriver showUpdateReleaseNotesWithDownloadData:(SPUDownloadData * _Nonnull)downloadData;
+ } else {
+ userDriver showUpdateReleaseNotesFailedToDownloadWithError:(NSError * _Nonnull)error;
+ }
+ };
+ 
+ self.releaseNotesDriver startDownload;
+ }
+}
+
+- (void)downloadDriverWillBeginDownload
+{
+ void (^cancelDownload)(void) = ^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.updaterDelegate respondsToSelector:@selector((userDidCancelDownload:))) {
+ self.updaterDelegate userDidCancelDownload:self.updater;
+ }
+ 
+ self.delegate uiDriverIsRequestingAbortUpdateWithError:nil;
+ });
+ };
+ 
+ self.userDriver showDownloadInitiatedWithCancellation:cancelDownload;
+}
+
+- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
+{
+ self.userDriver showDownloadDidReceiveExpectedContentLength:expectedContentLength;
+}
+
+- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
+{
+ self.userDriver showDownloadDidReceiveDataOfLength:length;
+}
+
+- (void)coreDriverDidStartExtractingUpdate
+{
+ self.userDriver showDownloadDidStartExtractingUpdate;
+}
+
+- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
+{
+ if (self.userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication:)) {
+ __weak __typeof__(self) weakSelf = self;
+ self.userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated retryTerminatingApplication:^{
+ if (!applicationTerminated) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ weakSelf.coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:YES;
+ });
+ }
+ };
+ } else if (self.userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:)) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ self.userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated;
+#pragma clang diagnostic pop
+ } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if (self.userDriver respondsToSelector:@selector(showInstallingUpdate)) {
+ self.userDriver showInstallingUpdate;
+ }
+ 
+ if (!applicationTerminated) {
+ if (self.userDriver respondsToSelector:@selector(showSendingTerminationSignal)) {
+ self.userDriver showSendingTerminationSignal;
+ }
+ }
+#pragma clang diagnostic pop
+ }
+}
+
+- (void)installerDidExtractUpdateWithProgress:(double)progress
+{
+ self.userDriver showExtractionReceivedProgress:progress;
+}
+
+- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)__unused willInstallSilently
+{
+ if (!willInstallImmediately) {
+ self.userDriver showReadyToInstallAndRelaunch:^(SPUUserUpdateChoice choice) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ self.coreDriver finishInstallationWithResponse:choice displayingUserInterface:YES;
+ });
+ };
+ }
+}
+
+- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
+{
+ if (self.userDriver respondsToSelector:@selector(showUpdateInstalledAndRelaunched:acknowledgement:)) {
+ self.userDriver showUpdateInstalledAndRelaunched:relaunched acknowledgement:acknowledgement;
+ } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ self.userDriver showUpdateInstallationDidFinishWithAcknowledgement:acknowledgement;
+#pragma clang diagnostic pop
+ }
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ // A delegate may want to handle this type of error specially
+ self.delegate basicDriverIsRequestingAbortUpdateWithError:error;
+}
+
+- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
+{
+ // A delegate may want to handle this type of error specially
+ self.delegate coreDriverIsRequestingAbortUpdateWithError:error;
+}
+
+- (void)_abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser
+{
+ void (^abortUpdate)(void) = ^{
+ if (showErrorToUser) {
+ self.userDriver dismissUpdateInstallation;
+ }
+ self.coreDriver abortUpdateAndShowNextUpdateImmediately:NO error:error;
+ };
+ 
+ if (error != nil && showErrorToUser) {
+ NSError *nonNullError = error;
+ 
+ if (error.code == SUNoUpdateError) {
+ if (self.userDriver respondsToSelector:@selector(showUpdateNotFoundWithError:acknowledgement:)) {
+ self.userDriver showUpdateNotFoundWithError:(NSError * _Nonnull)error acknowledgement:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ abortUpdate();
+ });
+ };
+ } else if (self.userDriver respondsToSelector:@selector(showUpdateNotFoundWithAcknowledgement:)) {
+ // Eventually we should remove this fallback once clients adopt -showUpdateNotFoundWithError:acknowledgement:
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ self.userDriver showUpdateNotFoundWithAcknowledgement:^{
+#pragma clang diagnostic pop
+ dispatch_async(dispatch_get_main_queue(), ^{
+ abortUpdate();
+ });
+ };
+ }
+ } else if (error.code == SUInstallationCanceledError || error.code == SUInstallationAuthorizeLaterError) {
+ abortUpdate();
+ } else {
+ self.userDriver showUpdaterError:nonNullError acknowledgement:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ abortUpdate();
+ });
+ };
+ }
+ } else {
+ abortUpdate();
+ }
+}
+
+- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser
+{
+ if (self.releaseNotesDriver != nil) {
+ self.releaseNotesDriver cleanup:^{
+ self _abortUpdateWithError:error showErrorToUser:showErrorToUser;
+ };
+ } else {
+ self _abortUpdateWithError:error showErrorToUser:showErrorToUser;
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdateCheck.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdateDriver.h Added

@@ -0,0 +1,44 @@
+//
+// SPUUpdateDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/15/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SPUResumableUpdate;
+
+typedef void (^SPUUpdateDriverCompletion)(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error);
+
+// This protocol describes an update driver that drives updates
+// An update driver may have multiple levels of other controller components (eg: basic update driver, core based update driver, ui based update driver, appcast driver, etc)
+// The update driver and the components the driver has communicates via parameter passing and delegation..
+// The old Sparkle architecture communicated via subclassing and method overriding, but this lead to bugs due to high coupling, and complexity of not being aware of methods being executed.
+// The newer architecture is still complex but should be more reliable to maintain and extend.
+@protocol SPUUpdateDriver <NSObject>
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
+
+- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler;
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders;
+
+- (void)resumeInstallingUpdate;
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
+
+@property (nonatomic, readonly) BOOL showingUpdate;
+
+// A likely implementation of -abortUpdate is invoking -abortUpdateWithError: by passing nil
+- (void)abortUpdate;
+
+// This should be invoked on the update driver to finish the update driver's work
+- (void)abortUpdateWithError:(NSError * _Nullable)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdatePermissionRequest.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdatePermissionRequest.m Added

@@ -0,0 +1,49 @@
+//
+// SPUUpdatePermissionRequest.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 8/14/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUpdatePermissionRequest.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SPUUpdatePermissionRequestSystemProfileKey = @"SPUUpdatePermissionRequestSystemProfile";
+
+@implementation SPUUpdatePermissionRequest
+
+@synthesize systemProfile = _systemProfile;
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+ NSArray<NSDictionary<NSString *, NSString *> *> *systemProfile = decoder decodeObjectOfClasses:NSSet setWithArray:@NSArray class, NSDictionary class, NSString class forKey:SPUUpdatePermissionRequestSystemProfileKey;
+ if (systemProfile == nil) {
+ return nil;
+ }
+ 
+ return self initWithSystemProfile:systemProfile;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+ encoder encodeObject:self.systemProfile forKey:SPUUpdatePermissionRequestSystemProfileKey;
+}
+
+- (instancetype)initWithSystemProfile:(NSArray<NSDictionary<NSString *, NSString *> *> *)systemProfile
+{
+ self = super init;
+ if (self != nil) {
+ _systemProfile = systemProfile;
+ }
+ return self;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdater.h Added

@@ -0,0 +1,312 @@
+//
+// SPUUpdater.h
+// Sparkle
+//
+// Created by Andy Matuschak on 1/4/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+#import <Sparkle/SPUUserDriver.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUAppcastItem, SUAppcast;
+
+@protocol SPUUpdaterDelegate;
+
+/**
+ The main API in Sparkle for controlling the update mechanism.
+
+ This class is used to configure the update parameters as well as manually and automatically schedule and control checks for updates.
+ 
+ For convenience, you can create a standard or nib instantiable updater by using `SPUStandardUpdaterController`.
+ 
+ Prefer to set initial properties in your bundle's Info.plist as described in Customizing Sparkle(https://sparkle-project.org/documentation/customization/).
+ 
+ Otherwise only if you need dynamic behavior for user settings should you set properties on the updater such as:
+ - `automaticallyChecksForUpdates`
+ - `updateCheckInterval`
+ - `automaticallyDownloadsUpdates`
+ - `feedURL`
+ 
+ Please view the documentation on each of these properties for more detail if you are to configure them dynamically.
+ */
+SU_EXPORT @interface SPUUpdater : NSObject
+
+/**
+ Initializes a new `SPUUpdater` instance
+ 
+ This creates an updater, but to start it and schedule update checks `-startUpdater:` needs to be invoked first.
+ 
+ Related: See `SPUStandardUpdaterController` which wraps a `SPUUpdater` instance and is suitable for instantiating inside of nib files.
+ 
+ @param hostBundle The bundle that should be targetted for updating.
+ @param applicationBundle The application bundle that should be waited for termination and relaunched (unless overridden). Usually this can be the same as hostBundle. This may differ when updating a plug-in or other non-application bundle.
+ @param userDriver The user driver that Sparkle uses for user update interaction.
+ @param delegate The delegate for `SPUUpdater`.
+ */
+- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id <SPUUserDriver>)userDriver delegate:(nullable id<SPUUpdaterDelegate>)delegate;
+
+/**
+ Use `-initWithHostBundle:applicationBundle:userDriver:delegate:` or `SPUStandardUpdaterController` standard adapter instead.
+ 
+ If you want to drop an updater into a nib, use `SPUStandardUpdaterController`.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ Starts the updater.
+
+ This method first checks if Sparkle is configured properly. A valid feed URL should be set before this method is invoked.
+
+ If the configuration is valid, an update cycle is started in the next main runloop cycle.
+ During this cycle, a permission prompt may be brought up (if needed) for checking if the user wants automatic update checking.
+ Otherwise if automatic update checks are enabled, a scheduled update alert may be brought up if enough time has elapsed since the last check.
+ See `automaticallyChecksForUpdates` for more information.
+
+ After starting the updater and before the next runloop cycle, one of `-checkForUpdates`, `-checkForUpdatesInBackground`, or `-checkForUpdateInformation` can be invoked.
+ This may be useful if you want to check for updates immediately or without showing a potential permission prompt.
+ 
+ If the updater cannot be started (i.e, due to a configuration issue in the application), you may want to fall back appropriately.
+ For example, the standard updater controller (`SPUStandardUpdaterController`) alerts the user that the app is misconfigured and to contact the developer.
+
+ This must be called on the main thread.
+
+ @param error The error that is populated if this method fails. Pass NULL if not interested in the error information.
+ @return YES if the updater started otherwise NO with a populated error
+ */
+- (BOOL)startUpdater:(NSError * __autoreleasing *)error;
+
+/**
+ Checks for updates, and displays progress while doing so if needed.
+ 
+ This is meant for users initiating a new update check or checking the current update progress.
+ 
+ If an update hasn't started, the user may be shown that a new check for updates is occurring.
+ If an update has already been downloaded or begun installing from a previous session, the user may be presented to install that update.
+ If the user is already being presented with an update, that update will be shown to the user in active focus.
+ 
+ This will find updates that the user has previously opted into skipping.
+ 
+ See `canCheckForUpdates` property which can determine when this method may be invoked.
+ */
+- (void)checkForUpdates;
+
+/**
+ Checks for updates, but does not show any UI unless an update is found.
+ 
+ You usually do not need to call this method directly. If `automaticallyChecksForUpdates` is @c YES,
+ Sparkle calls this method automatically according to its update schedule using the `updateCheckInterval`
+ and the `lastUpdateCheckDate`. Therefore, you should typically only consider calling this method directly if you
+ opt out of automatic update checks.
+ 
+ This is meant for programmatically initating a check for updates in the background without the user initiating it.
+ This check will not show UI if no new updates are found.
+ 
+ If a new update is found, the updater's user driver may handle showing it at an appropriate (but not necessarily immediate) time.
+ If you want control over when and how a new update is shown, please see https://sparkle-project.org/documentation/gentle-reminders/
+ 
+ Note if automated updating is turned on, either a new update may be downloaded in the background to be installed silently,
+ or an already downloaded update may be shown.
+ 
+ This will not find updates that the user has opted into skipping.
+ 
+ This method does not do anything if there is a `sessionInProgress`.
+ */
+- (void)checkForUpdatesInBackground;
+
+/**
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
+ 
+ However, the delegate methods
+ `-SPUUpdaterDelegate updater:didFindValidUpdate:` and
+ `-SPUUpdaterDelegate updaterDidNotFindUpdate:` will be called,
+ so you can use that information in your UI.
+ 
+ `-SPUUpdaterDelegate updater:didFinishUpdateCycleForUpdateCheck:error:` will be called when
+ this probing check is completed.
+ 
+ Updates that have been skipped by the user will not be found.
+ 
+ This method does not do anything if there is a `sessionInProgress`.
+ */
+- (void)checkForUpdateInformation;
+
+/**
+ A property indicating whether or not updates can be checked by the user.
+ 
+ An update check can be made by the user when an update session isn't in progress, or when an update or its progress is being shown to the user.
+ A user cannot check for updates when data (such as the feed or an update) is still being downloaded automatically in the background.
+ 
+ This property is suitable to use for menu item validation for seeing if `-checkForUpdates` can be invoked.
+ 
+ This property is also KVO-compliant.
+ 
+ Note this property does not reflect whether or not an update session is in progress. Please see `sessionInProgress` property instead.
+ */
+@property (nonatomic, readonly) BOOL canCheckForUpdates;
+
+/**
+ A property indicating whether or not an update session is in progress.
+ 
+ An update session is in progress when the appcast is being downloaded, an update is being downloaded,
+ an update is being shown, update permission is being requested, or the installer is being started.
+ 
+ An active session is when Sparkle's fired scheduler is running.
+ 
+ Note an update session may not be running even though Sparkle's installer (ran as a separate process) may be running,
+ or even though the update has been downloaded but the installation has been deferred. In both of these cases, a new update session
+ may be activated with the update resumed at a later point (automatically or manually).
+ 
+ See also:
+ - `canCheckForUpdates` property which is more suited for menu item validation and deciding if the user can initiate update checks.
+ - `-SPUUpdaterDelegate updater:didFinishUpdateCycleForUpdateCheck:error:` which lets the updater delegate know when an update cycle and session finishes.
+ */
+@property (nonatomic, readonly) BOOL sessionInProgress;
+
+/**
+ A property indicating whether or not to check for updates automatically.
+ 
+ By default, Sparkle asks users on second launch for permission if they want automatic update checks enabled
+ and sets this property based on their response. If `SUEnableAutomaticChecks` is set in the Info.plist,
+ this permission request is not performed however.
+ 
+ Setting this property will persist in the host bundle's user defaults.
+ Hence developers shouldn't maintain an additional user default for this property.
+ Only set this property if the user wants to change the default via a user settings option.
+ Do not always set it on launch unless you want to ignore the user's preference.
+ For testing environments, you can disable update checks by passing `-SUEnableAutomaticChecks NO`
+ to your app's command line arguments instead of setting this property.
+ 
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property (nonatomic) BOOL automaticallyChecksForUpdates;
+
+/**
+ A property indicating the current automatic update check interval in seconds.
+ 
+ Prefer to set SUScheduledCheckInterval directly in your Info.plist for setting the initial value.
+ 
+ Setting this property will persist in the host bundle's user defaults.
+ Hence developers shouldn't maintain an additional user default for this property.
+ Only set this property if the user wants to change the default via a user settings option.
+ Do not always set it on launch unless you want to ignore the user's preference.
+ 
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property (nonatomic) NSTimeInterval updateCheckInterval;
+
+/**
+ A property indicating whether or not updates can be automatically downloaded in the background.
+ 
+ By default, updates are not automatically downloaded.
+ 
+ Note that the developer can disallow automatic downloading of updates from being enabled (via `SUAllowsAutomaticUpdates` Info.plist key).
+ In this case, this property will return NO regardless of how this property is set.
+ 
+ Prefer to set SUAutomaticallyUpdate directly in your Info.plist for setting the initial value.
+ 
+ Setting this property will persist in the host bundle's user defaults.
+ Hence developers shouldn't maintain an additional user default for this property.
+ Only set this property if the user wants to change the default via a user settings option.
+ Do not always set it on launch unless you want to ignore the user's preference.
+ */
+@property (nonatomic) BOOL automaticallyDownloadsUpdates;
+
+/**
+ The URL of the appcast used to download update information.
+ 
+ If the updater's delegate implements `-SPUUpdaterDelegate feedURLStringForUpdater:`, this will return that feed URL.
+ Otherwise if the feed URL has been set before, the feed URL returned will be retrieved from the host bundle's user defaults.
+ Otherwise the feed URL in the host bundle's Info.plist will be returned.
+ If no feed URL can be retrieved, returns nil.
+ 
+ For setting a primary feed URL, please set the `SUFeedURL` property in your Info.plist.
+ For setting an alternative feed URL, please prefer `-SPUUpdaterDelegate feedURLStringForUpdater:` over `-setFeedURL:`
+ 
+ This property must be called on the main thread; calls from background threads will return nil.
+ */
+@property (nonatomic, readonly, nullable) NSURL *feedURL;
+
+/**
+ Set the URL of the appcast used to download update information. Using this method is discouraged.
+ 
+ Setting this property will persist in the host bundle's user defaults.
+ To avoid this, you should consider implementing
+ `-SPUUpdaterDelegate feedURLStringForUpdater:` instead of using this method.
+ 
+ Passing nil will remove any feed URL that has been set in the host bundle's user defaults.
+ If you do not need to alternate between multiple feeds, set the SUFeedURL in your Info.plist instead of invoking this method.
+ 
+ For beta updates, you may consider migrating to `-SPUUpdaterDelegate allowedChannelsForUpdater:` in the future.
+ 
+ This method must be called on the main thread; calls from background threads will have no effect.
+ */
+- (void)setFeedURL:(nullable NSURL *)feedURL;
+
+/**
+ The host bundle that is being updated.
+ */
+@property (nonatomic, readonly) NSBundle *hostBundle;
+
+/**
+ The user agent used when checking for updates.
+ 
+ By default the user agent string returned is in the format:
+ $(BundleDisplayName)/$(BundleDisplayVersion) Sparkle/$(SparkleDisplayVersion)
+ 
+ BundleDisplayVersion is derived from the main application's Info.plist's CFBundleShortVersionString.
+ 
+ Note if Sparkle is being used to update another application, the bundle information retrieved is from the main application performing the updating.
+ 
+ This default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
+
+/**
+ The HTTP headers used when checking for updates, downloading release notes, and downloading updates.
+ 
+ The keys of this dictionary are HTTP header fields and values are corresponding values.
+ */
+@property (nonatomic, copy, nullable) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+/**
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property (nonatomic) BOOL sendsSystemProfile;
+
+/**
+ The date of the last update check or nil if no check has been performed yet.
+ 
+ For testing purposes, the last update check is stored in the `SULastCheckTime` key in the host bundle's user defaults.
+ For example, `defaults delete my-bundle-id SULastCheckTime` can be invoked to clear the last update check time and test
+ if update checks are automatically scheduled.
+ */
+@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate;
+
+/**
+ Appropriately schedules or cancels the update checking timer according to the settings for the time interval and automatic checks.
+
+ If you change the `updateCheckInterval` or `automaticallyChecksForUpdates` properties, the update cycle will be reset automatically after a short delay.
+ The update cycle is also started automatically after the updater is started. In all these cases, this method should not be called directly.
+ 
+ This call does not change the date of the next check, but only the internal timer.
+ */
+- (void)resetUpdateCycle;
+
+
+/**
+ The system profile information that is sent when checking for updates.
+ */
+@property (nonatomic, readonly, copy) NSArray<NSDictionary<NSString *, NSString *> *> *systemProfileArray;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdater.m Added

@@ -0,0 +1,1050 @@
+//
+// SPUUpdater.m
+// Sparkle
+//
+// Created by Andy Matuschak on 1/4/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import "SPUUpdater.h"
+#import "SPUUpdaterDelegate.h"
+#import "SPUUpdaterSettings.h"
+#import "SUHost.h"
+#import "SPUUpdatePermissionRequest.h"
+#import "SUUpdatePermissionResponse.h"
+#import "SPUUpdateDriver.h"
+#import "SUConstants.h"
+#import "SULog.h"
+#import "SULog+NSError.h"
+#import "SUCodeSigningVerifier.h"
+#import "SUSystemProfiler.h"
+#import "SPUScheduledUpdateDriver.h"
+#import "SPUProbingUpdateDriver.h"
+#import "SPUUserInitiatedUpdateDriver.h"
+#import "SPUAutomaticUpdateDriver.h"
+#import "SPUProbeInstallStatus.h"
+#import "SUAppcastItem.h"
+#import "SPUInstallationInfo.h"
+#import "SUErrors.h"
+#import "SPUXPCServiceInfo.h"
+#import "SPUUpdaterCycle.h"
+#import "SPUUpdaterTimer.h"
+#import "SPUResumableUpdate.h"
+#import "SUSignatures.h"
+#import "SPUUserAgent+Private.h"
+#import "SPUGentleUserDriverReminders.h"
+
+
+#include "AppKitPrevention.h"
+
+NSString *const SUUpdaterDidFinishLoadingAppCastNotification = @"SUUpdaterDidFinishLoadingAppCastNotification";
+NSString *const SUUpdaterDidFindValidUpdateNotification = @"SUUpdaterDidFindValidUpdateNotification";
+NSString *const SUUpdaterDidNotFindUpdateNotification = @"SUUpdaterDidNotFindUpdateNotification";
+NSString *const SUUpdaterWillRestartNotification = @"SUUpdaterWillRestartNotificationName";
+NSString *const SUUpdaterAppcastItemNotificationKey = @"SUUpdaterAppcastItemNotificationKey";
+NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotificationKey";
+
+@interface SPUUpdater () <SPUUpdaterCycleDelegate, SPUUpdaterTimerDelegate>
+
+@property (readonly, copy) NSURL *parameterizedFeedURL;
+
+@property (nonatomic, readonly) id<SPUUserDriver> userDriver;
+@property (weak, readonly, nullable) id<SPUUpdaterDelegate> delegate;
+@property (nonatomic) id <SPUUpdateDriver> driver;
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, readonly) SUHost *mainBundleHost;
+@property (nonatomic, readonly) NSBundle *applicationBundle;
+@property (nonatomic, readonly) NSBundle *sparkleBundle;
+@property (nonatomic, readonly) SPUUpdaterSettings *updaterSettings;
+@property (nonatomic, readonly) SPUUpdaterCycle *updaterCycle;
+@property (nonatomic, readonly) SPUUpdaterTimer *updaterTimer;
+@property (nonatomic) BOOL startedUpdater;
+@property (nonatomic, nullable) id<SPUResumableUpdate> resumableUpdate;
+@property (nonatomic) BOOL sessionInProgress;
+@property (nonatomic) BOOL canCheckForUpdates;
+@property (nonatomic) BOOL showingPermissionRequest;
+
+@property (nonatomic, copy) NSDate *updateLastCheckedDate;
+
+@property (nonatomic) BOOL loggedATSWarning;
+@property (nonatomic) BOOL loggedNoSecureKeyWarning;
+
+@end
+
+@implementation SPUUpdater
+
+@synthesize delegate = _delegate;
+@synthesize userDriver = _userDriver;
+@synthesize userAgentString = _userAgentString;
+@synthesize httpHeaders;
+@synthesize driver;
+@synthesize host = _host;
+@synthesize mainBundleHost = _mainBundleHost;
+@synthesize applicationBundle = _applicationBundle;
+@synthesize updaterSettings = _updaterSettings;
+@synthesize updaterCycle = _updaterCycle;
+@synthesize updaterTimer = _updaterTimer;
+@synthesize sparkleBundle = _sparkleBundle;
+@synthesize startedUpdater = _startedUpdater;
+@synthesize resumableUpdate = _resumableUpdate;
+@synthesize sessionInProgress = _sessionInProgress;
+@synthesize canCheckForUpdates = _canCheckForUpdates;
+@synthesize showingPermissionRequest = _showingPermissionRequest;
+@synthesize updateLastCheckedDate = _updateLastCheckedDate;
+@synthesize loggedATSWarning = _loggedATSWarning;
+@synthesize loggedNoSecureKeyWarning = _loggedNoSecureKeyWarning;
+
+#if DEBUG
++ (void)initialize
+{
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ // We're using NSLog instead of SULog here because we don't want to start Sparkle's logger here,
+ // and because this is not really an error, just a warning notice
+ NSLog(@"WARNING: This is running a Debug build of Sparkle 2; don't use this in production!");
+ });
+}
+#endif
+
+- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id <SPUUserDriver>)userDriver delegate:(id<SPUUpdaterDelegate> _Nullable)delegate
+{
+ self = super init;
+ 
+ if (self != nil) {
+ // Use explicit class to use the correct bundle even when subclassed
+ _sparkleBundle = NSBundle bundleForClass:SPUUpdater class;
+ 
+ _host = SUHost alloc initWithBundle:hostBundle;
+ _applicationBundle = applicationBundle;
+ 
+ _updaterSettings = SPUUpdaterSettings alloc initWithHostBundle:hostBundle;
+ _updaterCycle = SPUUpdaterCycle alloc initWithDelegate:self;
+ _updaterTimer = SPUUpdaterTimer alloc initWithDelegate:self;
+ 
+ _userDriver = userDriver;
+ 
+ _delegate = delegate;
+ 
+ // Set up default user agent
+ // Use the main bundle rather than the bundle to update for retrieving user agent information from
+ // We want the user agent to reflect the updater that is doing the updating
+ SUHost *mainBundleHost = SUHost alloc initWithBundle:NSBundle mainBundle;
+ _userAgentString = SPUMakeUserAgentWithHost(mainBundleHost, nil);
+ _mainBundleHost = mainBundleHost;
+ }
+ 
+ return self;
+}
+
+// To prevent subclasses from doing something bad based on older Sparkle code
+- (instancetype)initForBundle:(NSBundle *)__unused bundle
+{
+ NSString *reason = NSString stringWithFormat:@"-%@ initForBundle: is not implemented anymore in Sparkle 2.", NSStringFromClass(self class);
+ SULog(SULogLevelError, @"%@", reason);
+ 
+ NSException *exception = NSException exceptionWithName:@"SUIncorrectAPIUsageException" reason:reason userInfo:nil;
+ @throw exception;
+ 
+ return nil;
+}
+
+// To prevent trying to stick an SUUpdater in a nib or initializing it in an incorrect way
+- (instancetype)init
+{
+ NSString *reason = NSString stringWithFormat:@"-%@ init is not implemented. If you want to drop an updater into a nib, see SPUStandardUpdaterController.", NSStringFromClass(self class);
+ SULog(SULogLevelError, @"%@", reason);
+ 
+ NSException *exception = NSException exceptionWithName:@"SUIncorrectAPIUsageException" reason:reason userInfo:nil;
+ @throw exception;
+ 
+ return nil;
+}
+
+- (BOOL)startUpdater:(NSError * __autoreleasing *)error
+{
+ if (self.startedUpdater) {
+ return YES;
+ }
+ 
+ if (!self checkIfConfiguredProperlyAndRequireFeedURL:NO validateXPCServices:YES error:error) {
+ return NO;
+ }
+ 
+ if (self.userDriver respondsToSelector:@selector(resetTimeSinceOpportuneUpdateNotice)) {
+ (id<SPUGentleUserDriverReminders>)self.userDriver resetTimeSinceOpportuneUpdateNotice;
+ }
+ 
+ self.startedUpdater = YES;
+ self.canCheckForUpdates = YES;
+ 
+ // Start updater on next update cycle so we make sure the application invoking the updater is ready
+ // This also gives the developer a cycle to check for updates before Sparkle's update cycle scheduler kicks in
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (!self.sessionInProgress) {
+ self startUpdateCycle;
+ }
+ });
+ 
+ return YES;
+}
+
+- (BOOL)checkATSIssueForBundle:(NSBundle * _Nullable)bundle getBundleExists:(BOOL *)bundleExists
+{
+ if (bundleExists != NULL) {
+ *bundleExists = (bundle != nil);
+ }
+ 
+ if (bundle == nil) {
+ return NO;
+ }
+ 
+ return (bundle objectForInfoDictionaryKey:@"NSAppTransportSecurity" == nil);
+}
+
+- (BOOL)checkIfConfiguredProperlyAndRequireFeedURL:(BOOL)requireFeedURL validateXPCServices:(BOOL)validateXPCServices error:(NSError * __autoreleasing *)error
+{
+ NSString *hostName = self.host.name;
+ 
+ if (self.sparkleBundle == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"%@ can't find Sparkle.framework it belongs to in %@.", NSStringFromClass(self class), hostName };
+ }
+ return NO;
+ }
+ 
+ if (self hostBundle bundleIdentifier == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidHostBundleIdentifierError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Sparkle cannot target a bundle that does not have a valid bundle identifier for %@.", hostName };
+ }
+ return NO;
+ }
+ 
+ if (!self.host.validVersion) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidHostVersionError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Sparkle cannot target a bundle that does not have a valid version for %@.", hostName };
+ }
+ return NO;
+ }
+ 
+ SUHost *mainBundleHost = self.mainBundleHost;
+ if (validateXPCServices) {
+ // Check that all enabled XPC Services are embedded
+ NSArray<NSString *> *xpcServiceIDs = @@INSTALLER_LAUNCHER_NAME, @DOWNLOADER_NAME, @INSTALLER_CONNECTION_NAME, @INSTALLER_STATUS_NAME;
+ NSArray<NSString *> *xpcServiceEnabledKeys = @SUEnableInstallerLauncherServiceKey, SUEnableDownloaderServiceKey, SUEnableInstallerConnectionServiceKey, SUEnableInstallerStatusServiceKey;
+ NSUInteger xpcServiceCount = xpcServiceIDs.count;
+ 
+ for (NSUInteger xpcServiceIndex = 0; xpcServiceIndex < xpcServiceCount; xpcServiceIndex++) {
+ NSString *xpcServiceEnabledKey = xpcServiceEnabledKeysxpcServiceIndex;
+ NSString *xpcServiceBundleName = xpcServiceIDsxpcServiceIndex stringByAppendingPathExtension:@"xpc";
+ 
+ if (mainBundleHost boolForInfoDictionaryKey:xpcServiceEnabledKey) {
+ NSURL *xpcServiceBundleURL = self.sparkleBundle.bundleURL URLByAppendingPathComponent:@"XPCServices" URLByAppendingPathComponent:xpcServiceBundleName;
+ 
+ if (!xpcServiceBundleURL checkResourceIsReachableAndReturnError:NULL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"XPC Service is enabled (%@) but does not exist: %@", xpcServiceEnabledKey, xpcServiceBundleURL.path };
+ }
+ 
+ return NO;
+ }
+ }
+ 
+ // Make sure the app isn't bundling XPC Services directly
+ NSURL *mainBundleXPCServiceURL = mainBundleHost.bundle.bundleURL URLByAppendingPathComponent:@"Contents" URLByAppendingPathComponent:@"XPCServices" URLByAppendingPathComponent:xpcServiceBundleName;
+ 
+ if (mainBundleXPCServiceURL checkResourceIsReachableAndReturnError:NULL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"XPC Service (%@) must be in the Sparkle framework, not in the application bundle (%@). Please visit https://sparkle-project.org/documentation/sandboxing/ for up to date Sandboxing instructions.", xpcServiceBundleName, mainBundleXPCServiceURL.path };
+ }
+ 
+ return NO;
+ }
+ }
+ }
+ 
+ BOOL servingOverHttps = NO;
+ NSError *feedError = nil;
+ NSURL *feedURL = self retrieveFeedURL:&feedError;
+ if (feedURL == nil) {
+ if (requireFeedURL) {
+ if (error != NULL) {
+ *error = feedError;
+ }
+ return NO;
+ }
+ }
+ 
+ BOOL updatingMainBundle = self.host.bundle isEqualTo:mainBundleHost.bundle;
+ 
+ if (feedURL != nil) {
+ servingOverHttps = feedURL scheme lowercaseString isEqualToString:@"https";
+ if (!servingOverHttps && !self.loggedATSWarning) {
+ BOOL foundXPCDownloaderService = NO;
+ 
+ NSBundle *downloaderBundle;
+ if (mainBundleHost boolForInfoDictionaryKey:SUEnableDownloaderServiceKey) {
+ NSURL *downloaderServiceBundleURL = self.sparkleBundle.bundleURL URLByAppendingPathComponent:@"XPCServices" URLByAppendingPathComponent:@DOWNLOADER_NAME URLByAppendingPathExtension:@"xpc";
+ downloaderBundle = NSBundle bundleWithURL:downloaderServiceBundleURL;
+ } else {
+ downloaderBundle = nil;
+ }
+ 
+ BOOL foundATSPersistentIssue = self checkATSIssueForBundle:downloaderBundle getBundleExists:&foundXPCDownloaderService;
+ 
+ BOOL foundATSMainBundleIssue = NO;
+ if (!foundATSPersistentIssue && !foundXPCDownloaderService) {
+ BOOL foundATSIssue = (mainBundleHost objectForInfoDictionaryKey:@"NSAppTransportSecurity" == nil);
+ 
+ if (updatingMainBundle) {
+ // The only way we'll know for sure if there is an issue is if the main bundle is the same as the one we're updating
+ // We don't want to generate false positives..
+ foundATSMainBundleIssue = foundATSIssue;
+ }
+ }
+ 
+ if (foundATSPersistentIssue || foundATSMainBundleIssue) {
+ // Just log a warning. Don't outright fail in case we are wrong (eg: app is linked on an old SDK where ATS doesn't take effect)
+ SULog(SULogLevelDefault, @"The feed URL (%@) may need to change to use HTTPS.\nFor more information: https://sparkle-project.org/documentation/app-transport-security", feedURL absoluteString);
+ 
+ self.loggedATSWarning = YES;
+ }
+ }
+ }
+ 
+ SUPublicKeys *publicKeys = self.host.publicKeys;
+ BOOL hasAnyPublicKey = publicKeys.hasAnyKeys;
+ if (!hasAnyPublicKey) {
+ // If we failed to retrieve a DSA key but the bundle specifies a path to one, we should consider this a configuration failure
+ NSString *publicDSAKeyFileKey = self.host publicDSAKeyFileKey;
+ if (publicDSAKeyFileKey != nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"The DSA public key '%@' could not be found for %@.", publicDSAKeyFileKey, hostName };
+ }
+ return NO;
+ }
+ }
+ 
+ // Don't allow invalid EdDSA public keys
+ if (publicKeys.ed25519PubKeyStatus == SUSigningInputStatusInvalid) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"The EdDSA public key is not valid for %@.", hostName };
+ }
+ return NO;
+ }
+
+ if (!hasAnyPublicKey) {
+ if ((feedURL != nil && !servingOverHttps) || !SUCodeSigningVerifier bundleAtURLIsCodeSigned:self hostBundle bundleURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"For security reasons, updates need to be signed with an EdDSA key for %@. See Sparkle's documentation for more information.", hostName };
+ }
+ return NO;
+ } else {
+ if (updatingMainBundle && !self.loggedNoSecureKeyWarning) {
+ SULog(SULogLevelError, @"Error: Serving updates without an EdDSA key and only using Apple Code Signing is deprecated and may be unsupported in a future release. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/#3-segue-for-security-concerns");
+ 
+ self.loggedNoSecureKeyWarning = YES;
+ }
+ }
+ } else if (publicKeys.ed25519PubKey == nil) {
+ // No EdDSA key is available, so app must be using DSA
+ if (updatingMainBundle) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUNoPublicDSAFoundError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"For security reasons, updates need to be signed with an EdDSA key for %@. Please migrate to using EdDSA (ed25519). Visit Sparkle's documentation for migration information: https://sparkle-project.org/documentation/#3-segue-for-security-concerns.", hostName };
+ }
+ return NO;
+ }
+ }
+ 
+ return YES;
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.host bundlePath; }
+
+- (void)startUpdateCycle
+{
+ BOOL shouldPrompt = NO;
+ BOOL hasLaunchedBefore = self.host boolForUserDefaultsKey:SUHasLaunchedBeforeKey;
+
+ // If the user has been asked about automatic checks, don't bother prompting
+ // When the user answers to the permission prompt, this will be set to either @YES or @NO instead of nil
+ if (self.host objectForUserDefaultsKey:SUEnableAutomaticChecksKey != nil) {
+ shouldPrompt = NO;
+ }
+ // Does the delegate want to take care of the logic for when we should ask permission to update?
+ else if (self.delegate respondsToSelector:@selector((updaterShouldPromptForPermissionToCheckForUpdates:))) {
+ shouldPrompt = self.delegate updaterShouldPromptForPermissionToCheckForUpdates:self;
+ }
+ // Has the user been asked already? And don't ask if the host has a default value set in its Info.plist.
+ else if (self.host objectForKey:SUEnableAutomaticChecksKey == nil) {
+ // We wait until the second launch of the updater for this host bundle, unless explicitly overridden via SUPromptUserOnFirstLaunchKey.
+ shouldPrompt = self.host objectForKey:SUPromptUserOnFirstLaunchKey || hasLaunchedBefore;
+ }
+ 
+ if (!hasLaunchedBefore) {
+ self.host setBool:YES forUserDefaultsKey:SUHasLaunchedBeforeKey;
+ }
+
+ if (shouldPrompt) {
+ NSArray<NSDictionary<NSString *, NSString *> *> *profileInfo = self.systemProfileArray;
+ // Always say we're sending the system profile here so that the delegate displays the parameters it would send.
+ if (self.delegate respondsToSelector:@selector((feedParametersForUpdater:sendingSystemProfile:))) {
+ NSArray *feedParameters = self.delegate feedParametersForUpdater:self sendingSystemProfile:YES;
+ if (feedParameters != nil) {
+ profileInfo = profileInfo arrayByAddingObjectsFromArray:feedParameters;
+ }
+ }
+ 
+ SPUUpdatePermissionRequest *updatePermissionRequest = SPUUpdatePermissionRequest alloc initWithSystemProfile:profileInfo;
+ 
+ self.showingPermissionRequest = YES;
+ self.sessionInProgress = YES;
+ self.canCheckForUpdates = YES;
+ 
+ __weak SPUUpdater *weakSelf = self;
+ self.userDriver showUpdatePermissionRequest:updatePermissionRequest reply:^(SUUpdatePermissionResponse *response) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf.sessionInProgress = NO;
+ strongSelf.showingPermissionRequest = NO;
+ 
+ strongSelf updatePermissionRequestFinishedWithResponse:response;
+ // Schedule checks, but make sure we ignore the delayed call from KVO
+ strongSelf resetUpdateCycle;
+ }
+ });
+ };
+ 
+ // We start the update checks and register as observer for changes after the prompt finishes
+ } else {
+ // We check if the user's said they want updates, or they haven't said anything, and the default is set to checking.
+ self scheduleNextUpdateCheckFiringImmediately:NO usingCurrentDate:YES;
+ }
+}
+
+- (void)updatePermissionRequestFinishedWithResponse:(SUUpdatePermissionResponse *)response
+{
+ self setSendsSystemProfile:response.sendSystemProfile;
+ self setAutomaticallyChecksForUpdates:response.automaticUpdateChecks;
+}
+
+- (NSDate *)lastUpdateCheckDate
+{
+ if (self updateLastCheckedDate == nil)
+ {
+ self setUpdateLastCheckedDate:self.host objectForUserDefaultsKey:SULastCheckTimeKey;
+ }
+ 
+ return self updateLastCheckedDate;
+}
+
+- (void)updateLastUpdateCheckDate
+{
+ self willChangeValueForKey:NSStringFromSelector(@selector((lastUpdateCheckDate)));
+ // We use an intermediate property for last update check date due to https://github.com/sparkle-project/Sparkle/pull/1135
+ self setUpdateLastCheckedDate:NSDate date;
+ self.host setObject:self updateLastCheckedDate forUserDefaultsKey:SULastCheckTimeKey;
+ self didChangeValueForKey:NSStringFromSelector(@selector((lastUpdateCheckDate)));
+}
+
+// Note this method is never called when sessionInProgress is YES
+- (void)scheduleNextUpdateCheckFiringImmediately:(BOOL)firingImmediately usingCurrentDate:(BOOL)usingCurrentDate
+{
+ self.updaterTimer invalidate;
+ 
+ if (!firingImmediately && !self automaticallyChecksForUpdates) {
+ if (self.delegate respondsToSelector:@selector(updaterWillNotScheduleUpdateCheck:)) {
+ self.delegate updaterWillNotScheduleUpdateCheck:self;
+ }
+ return;
+ }
+ 
+ if (firingImmediately) {
+ self checkForUpdatesInBackground;
+ } else {
+ // This may not return the same update check interval as the developer has configured
+ // Notably it may differ when we have an update that has been already downloaded and needs to resume,
+ // as well as if that update is marked critical or not
+ void (^retrieveNextUpdateCheckInterval)(void (^)(NSTimeInterval)) = ^(void (^completionHandler)(NSTimeInterval)) {
+ NSString *hostBundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ NSTimeInterval regularCheckInterval = self updateCheckInterval;
+ if (installationInfo == nil) {
+ // Proceed as normal if there's no resumable updates
+ completionHandler(regularCheckInterval);
+ } else {
+ if (!installationInfo.canSilentlyInstall || installationInfo.appcastItem isCriticalUpdate || installationInfo.appcastItem isInformationOnlyUpdate) {
+ completionHandler(MIN(regularCheckInterval, SUImpatientUpdateCheckInterval));
+ } else {
+ completionHandler(MAX(regularCheckInterval, SUImpatientUpdateCheckInterval));
+ }
+ }
+ });
+ };
+ };
+ 
+ self.canCheckForUpdates = NO;
+ self.sessionInProgress = YES;
+ 
+ retrieveNextUpdateCheckInterval(^(NSTimeInterval updateCheckInterval) {
+ self.canCheckForUpdates = YES;
+ self.sessionInProgress = NO;
+ 
+ // This callback is asynchronous, so the timer may be set. Invalidate to make sure it isn't.
+ self.updaterTimer invalidate;
+ 
+ NSTimeInterval intervalSinceCheck;
+ if (usingCurrentDate) {
+ // How long has it been since last we checked for an update?
+ NSDate *lastCheckDate = self lastUpdateCheckDate;
+ if (!lastCheckDate) { lastCheckDate = NSDate distantPast; }
+ intervalSinceCheck = NSDate date timeIntervalSinceDate:lastCheckDate;
+ if (intervalSinceCheck < 0) {
+ // Last update check date is in the future and bogus, so reset it to current date
+ self updateLastUpdateCheckDate;
+ 
+ intervalSinceCheck = 0;
+ }
+ } else {
+ intervalSinceCheck = 0;
+ }
+ 
+ // Now we want to figure out how long until we check again.
+ if (updateCheckInterval < SUMinimumUpdateCheckInterval)
+ updateCheckInterval = SUMinimumUpdateCheckInterval;
+ if (intervalSinceCheck < updateCheckInterval) {
+ NSTimeInterval delayUntilCheck = (updateCheckInterval - intervalSinceCheck); // It hasn't been long enough.
+ if (self.delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)) {
+ self.delegate updater:self willScheduleUpdateCheckAfterDelay:delayUntilCheck;
+ }
+ 
+ if (self.userDriver respondsToSelector:@selector(logGentleScheduledUpdateReminderWarningIfNeeded)) {
+ (id<SPUGentleUserDriverReminders>)self.userDriver logGentleScheduledUpdateReminderWarningIfNeeded;
+ }
+ 
+ self.updaterTimer startAndFireAfterDelay:delayUntilCheck;
+ } else {
+ // We're overdue! Run one now.
+ self checkForUpdatesInBackground;
+ }
+ });
+ }
+}
+
+- (void)updaterTimerDidFire
+{
+ self checkForUpdatesInBackground;
+}
+
+- (void)checkForUpdatesInBackground
+{
+ if (!self.startedUpdater) {
+ SULog(SULogLevelError, @"Error: checkForUpdatesInBackground - updater hasn't been started yet. Please call -startUpdater: first");
+ return;
+ }
+ 
+ if (self.sessionInProgress) {
+ SULog(SULogLevelError, @"Error: -checkForUpdatesInBackground called but .sessionInProgress == YES");
+ return;
+ }
+ 
+ self.sessionInProgress = YES;
+ self.canCheckForUpdates = NO;
+ 
+ // We don't want the probe check to act on the driver if the updater is going near death
+ __weak SPUUpdater *weakSelf = self;
+ 
+ NSString *hostBundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(hostBundleIdentifier != nil);
+ SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL installerIsRunning) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf == nil) {
+ return;
+ }
+ 
+ id <SPUUpdateDriver> updateDriver;
+ if (!installerIsRunning && strongSelf automaticallyDownloadsUpdates && strongSelf.resumableUpdate == nil) {
+ updateDriver =
+ SPUAutomaticUpdateDriver alloc
+ initWithHost:strongSelf.host
+ applicationBundle:strongSelf.applicationBundle
+ updater:strongSelf
+ userDriver:strongSelf.userDriver
+ updaterDelegate:strongSelf.delegate;
+ } else {
+ updateDriver =
+ SPUScheduledUpdateDriver alloc
+ initWithHost:strongSelf.host
+ applicationBundle:strongSelf.applicationBundle
+ updater:strongSelf
+ userDriver:strongSelf.userDriver
+ updaterDelegate:strongSelf.delegate;
+ }
+ 
+ strongSelf checkForUpdatesWithDriver:updateDriver updateCheck:SPUUpdateCheckUpdatesInBackground installerInProgress:installerIsRunning;
+ });
+ };
+}
+
+- (void)checkForUpdates
+{
+ if (self.showingPermissionRequest || self.driver.showingUpdate) {
+ if (self.userDriver respondsToSelector:@selector(showUpdateInFocus)) {
+ self.userDriver showUpdateInFocus;
+ }
+ return;
+ }
+ 
+ if (!self.startedUpdater) {
+ SULog(SULogLevelError, @"Error: checkForUpdates - updater hasn't been started yet. Please call -startUpdater: first");
+ return;
+ }
+ 
+ if (self.sessionInProgress) {
+ SULog(SULogLevelError, @"Error: -checkForUpdates called but .sessionInProgress == YES");
+ return;
+ }
+ 
+ if (self.driver != nil) {
+ return;
+ }
+ 
+ self.sessionInProgress = YES;
+ self.canCheckForUpdates = NO;
+ 
+ id <SPUUpdateDriver> theUpdateDriver = SPUUserInitiatedUpdateDriver alloc initWithHost:self.host applicationBundle:self.applicationBundle updater:self userDriver:self.userDriver updaterDelegate:self.delegate;
+ 
+ NSString *bundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ 
+ __weak SPUUpdater *weakSelf = self;
+ SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf checkForUpdatesWithDriver:theUpdateDriver updateCheck:SPUUpdateCheckUpdates installerInProgress:installerInProgress;
+ }
+ });
+ };
+}
+
+- (void)checkForUpdateInformation
+{
+ __weak SPUUpdater *weakSelf = self;
+ if (!self.startedUpdater) {
+ SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
+ return;
+ }
+ 
+ if (self.sessionInProgress) {
+ SULog(SULogLevelError, @"Error: -checkForUpdateInformation called but .sessionInProgress == YES");
+ return;
+ }
+ 
+ self.sessionInProgress = YES;
+ self.canCheckForUpdates = NO;
+ 
+ NSString *bundleIdentifier = self.host.bundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
+ dispatch_async(dispatch_get_main_queue(), ^{
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf checkForUpdatesWithDriver:SPUProbingUpdateDriver alloc initWithHost:strongSelf.host updater:strongSelf updaterDelegate:strongSelf.delegate updateCheck:SPUUpdateCheckUpdateInformation installerInProgress:installerInProgress;
+ }
+ });
+ };
+}
+
+- (void)checkForUpdatesWithDriver:(id <SPUUpdateDriver> )d updateCheck:(SPUUpdateCheck)updateCheck installerInProgress:(BOOL)installerInProgress
+{
+ assert(self.driver == nil);
+ if (self.driver != nil) {
+ return;
+ }
+ 
+ self.updaterTimer invalidate;
+
+ self updateLastUpdateCheckDate;
+
+ self.driver = d;
+ assert(self.driver != nil);
+ 
+ void (^notifyDelegateOfDriverCompletion)(NSError * _Nullable, BOOL) = ^(NSError * _Nullable error, BOOL shouldShowUpdateImmediately) {
+ if (error != nil) {
+ if (error.code != SUNoUpdateError && error.code != SUInstallationCanceledError && error.code != SUInstallationAuthorizeLaterError) { // Let's not bother logging this.
+ SULogError(error);
+ }
+ 
+ // Notify host app that update driver has aborted if a non-recoverable error occurs
+ if (error.code != SUInstallationAuthorizeLaterError && self.delegate respondsToSelector:@selector((updater:didAbortWithError:))) {
+ self.delegate updater:self didAbortWithError:(NSError * _Nonnull)error;
+ }
+ }
+ 
+ // Notify host app that update driver has finished
+ // As long as we're not going to immmediately kick off a new check
+ if (!shouldShowUpdateImmediately && self.delegate respondsToSelector:@selector((updater:didFinishUpdateCycleForUpdateCheck:error:))) {
+ self.delegate updater:self didFinishUpdateCycleForUpdateCheck:updateCheck error:error;
+ }
+ };
+ 
+ void (^abortUpdateDriver)(NSError * _Nullable , BOOL) = ^(NSError * _Nullable abortError, BOOL shouldScheduleNextUpdateCheck) {
+ __weak SPUUpdater *weakSelf = self;
+ self.driver setCompletionHandler:^(BOOL __unused shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable __unused resumableUpdate, NSError * _Nullable error) {
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf.driver = nil;
+ 
+ strongSelf updateLastUpdateCheckDate;
+ 
+ strongSelf.sessionInProgress = NO;
+ strongSelf.canCheckForUpdates = YES;
+ 
+ notifyDelegateOfDriverCompletion(error, NO);
+ 
+ // Ensure the delegate doesn't start a new session when being notified of the previous one ending
+ if (!strongSelf.sessionInProgress) {
+ if (shouldScheduleNextUpdateCheck) {
+ strongSelf scheduleNextUpdateCheckFiringImmediately:NO usingCurrentDate:NO;
+ } else {
+ SULog(SULogLevelDefault, @"Disabling scheduled updates..");
+ }
+ }
+ }
+ };
+ 
+ self.driver abortUpdateWithError:abortError;
+ };
+ 
+ // Check if the delegate wants to defer checking for updates
+ NSError *mayCheckForUpdatesError = nil;
+ if (
+ (self.delegate respondsToSelector:@selector(updater:mayPerformUpdateCheck:error:) && !self.delegate updater:self mayPerformUpdateCheck:updateCheck error:&mayCheckForUpdatesError) ||
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ (self.delegate respondsToSelector:@selector((updaterMayCheckForUpdates:)) && !self.delegate updaterMayCheckForUpdates:self))
+#pragma clang diagnostic pop
+ {
+ abortUpdateDriver(mayCheckForUpdatesError, YES);
+ return;
+ }
+
+ // Because an application can change the configuration (eg: the feed url) at any point, we should always check if it's valid
+ // We will not schedule a next update check if the bundle is misconfigured
+ NSError *configurationError = nil;
+ if (!self checkIfConfiguredProperlyAndRequireFeedURL:YES validateXPCServices:NO error:&configurationError) {
+ SULog(SULogLevelError, @"Sparkle configuration error (%ld): %@", (long)configurationError.code, configurationError.localizedDescription);
+ 
+ abortUpdateDriver(configurationError, NO);
+ return;
+ }
+ 
+ // Run our update driver and schedule next update check on its completion
+ __weak SPUUpdater *weakSelf = self;
+ self.driver setCompletionHandler:^(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error) {
+ SPUUpdater *strongSelf = weakSelf;
+ if (strongSelf != nil) {
+ strongSelf.resumableUpdate = resumableUpdate;
+ strongSelf.driver = nil;
+ 
+ strongSelf updateLastUpdateCheckDate;
+ 
+ strongSelf.sessionInProgress = NO;
+ strongSelf.canCheckForUpdates = YES;
+ 
+ notifyDelegateOfDriverCompletion(error, shouldShowUpdateImmediately);
+ 
+ // Ensure the delegate doesn't start a new session when being notified of the previous one ending
+ if (!strongSelf.sessionInProgress) {
+ strongSelf scheduleNextUpdateCheckFiringImmediately:shouldShowUpdateImmediately usingCurrentDate:NO;
+ }
+ }
+ };
+ 
+ self.driver setUpdateShownHandler:^{
+ weakSelf.canCheckForUpdates = YES;
+ };
+ 
+ self.driver setUpdateWillInstallHandler:^{
+ weakSelf updateLastUpdateCheckDate;
+ };
+ 
+ if (installerInProgress) {
+ // Resume an update that has already begun installing in the background
+ self.driver resumeInstallingUpdate;
+ } else if (self.resumableUpdate != nil) {
+ // Resume an update or info that has already been downloaded
+ self.driver resumeUpdate:(id<SPUResumableUpdate> _Nonnull)self.resumableUpdate;
+ } else {
+ // Check that the parameterized feed URL is valid
+ NSURL *theFeedURL = self parameterizedFeedURL;
+ if (theFeedURL == nil) {
+ // I think this is really unlikely to occur but better be safe
+ // We will not schedule a next update check if the feed URL cannot be formed
+ SULog(SULogLevelError, @"Error: failed to retrieve feed URL for bundle");
+ 
+ abortUpdateDriver(NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: @"Sparkle cannot form a valid feed URL." }, NO);
+ } else {
+ // Check for new updates
+ self.driver checkForUpdatesAtAppcastURL:theFeedURL withUserAgent:self.userAgentString httpHeaders:self httpHeaders;
+ }
+ }
+}
+
+- (void)cancelNextUpdateCycle
+{
+ self.updaterCycle cancelNextUpdateCycle;
+}
+
+- (void)resetUpdateCycle
+{
+ if (!self.startedUpdater) {
+ SULog(SULogLevelError, @"Error: resetUpdateCycle - updater hasn't been started yet. Please call -startUpdater: first");
+ return; // not even ready yet
+ }
+ 
+ // Note this resets the opportune time when user grants Sparkle permission to check for updates
+ // and when the user changes preferences on automatically checking for updates or the update time check interval
+ if (self.userDriver respondsToSelector:@selector(resetTimeSinceOpportuneUpdateNotice)) {
+ (id<SPUGentleUserDriverReminders>)self.userDriver resetTimeSinceOpportuneUpdateNotice;
+ }
+ 
+ if (!self.sessionInProgress) {
+ self cancelNextUpdateCycle;
+ self scheduleNextUpdateCheckFiringImmediately:NO usingCurrentDate:YES;
+ }
+}
+
+- (void)resetUpdateCycleAfterShortDelay
+{
+ self cancelNextUpdateCycle;
+ self.updaterCycle resetUpdateCycleAfterDelay;
+}
+
+- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
+{
+ self.host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey;
+ // Hack to support backwards compatibility with older Sparkle versions, which supported
+ // disabling updates by setting the check interval to 0.
+ if (automaticallyCheckForUpdates && (NSInteger)self updateCheckInterval == 0) {
+ self setUpdateCheckInterval:SUDefaultUpdateCheckInterval;
+ }
+ 
+ if (self.startedUpdater) {
+ // Provide a small delay in case multiple preferences are being updated simultaneously.
+ self resetUpdateCycleAfterShortDelay;
+ }
+}
+
+- (BOOL)automaticallyChecksForUpdates
+{
+ return self.updaterSettings automaticallyChecksForUpdates;
+}
+
+- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyUpdates
+{
+ self.host setBool:automaticallyUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey;
+}
+
+- (BOOL)automaticallyDownloadsUpdates
+{
+ return self.updaterSettings allowsAutomaticUpdates && self.updaterSettings automaticallyDownloadsUpdates;
+}
+
+- (void)setFeedURL:(NSURL * _Nullable)feedURL
+{
+ if (!NSThread isMainThread) {
+ SULog(SULogLevelError, @"Error: SPUUpdater -setFeedURL: must be called on the main thread. The call from a background thread was ignored.");
+ return;
+ }
+
+ // When feedURL is nil, -absoluteString will return nil and will remove the user default key
+ self.host setObject:feedURL absoluteString forUserDefaultsKey:SUFeedURLKey;
+}
+
+- (NSURL * _Nullable)retrieveFeedURL:(NSError * __autoreleasing *)error
+{
+ NSString *hostName = self.host.name;
+ 
+ if (!NSThread isMainThread) {
+ SULog(SULogLevelError, @"Error: SPUUpdater -retrieveFeedURL:error: must be called on the main thread.");
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUIncorrectAPIUsageError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"SUUpdater -retriveFeedURL:error: must be called on the main thread for %@", hostName};
+ }
+ return nil;
+ }
+ 
+ // A value in the user defaults overrides one in the Info.plist (so preferences panels can be created wherein users choose between beta / release feeds).
+ NSString *appcastString = self.host objectForKey:SUFeedURLKey;
+ if (self.delegate respondsToSelector:@selector((feedURLStringForUpdater:))) {
+ NSString *delegateAppcastString = self.delegate feedURLStringForUpdater:self;
+ if (delegateAppcastString != nil) {
+ appcastString = delegateAppcastString;
+ }
+ }
+ 
+ if (!appcastString) { // Can't find an appcast string!
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"You must specify the URL of the appcast as the %@ key in either the Info.plist, or with -feedURLStringForUpdater: delegate method, or by the user defaults of %@!", SUFeedURLKey, hostName };
+ }
+ return nil;
+ }
+ 
+ NSCharacterSet *quoteSet = NSCharacterSet characterSetWithCharactersInString:@"\"\'"; // Some feed publishers add quotes; strip 'em.
+ NSString *castUrlStr = appcastString stringByTrimmingCharactersInSet:quoteSet;
+ if (castUrlStr == nil || castUrlStr length == 0) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Appcast feed (%@) after trimming it of quotes is empty for %@!", appcastString, hostName };
+ }
+ return nil;
+ }
+ 
+ NSURL *feedURL = NSURL URLWithString:castUrlStr;
+ if (feedURL == nil) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Appcast feed (%@) after converting it to a URL is invalid for %@!", appcastString, hostName };
+ }
+ return nil;
+ }
+ 
+ return feedURL;
+}
+
+// A client may call this method but do not invoke this method ourselves because it's unsafe
+- (NSURL * _Nullable)feedURL
+{
+ NSError *feedError = nil;
+ NSURL *feedURL = self retrieveFeedURL:&feedError;
+ if (feedURL == nil) {
+ SULog(SULogLevelError, @"Feed Error (%ld): %@", feedError.code, feedError.localizedDescription);
+ return nil;
+ }
+ return feedURL;
+}
+
+- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
+{
+ self.host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey;
+}
+
+- (BOOL)sendsSystemProfile
+{
+ return self.updaterSettings sendsSystemProfile;
+}
+
+static NSString *escapeURLComponent(NSString *str) {
+ NSString *escapedString = str stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet;
+ 
+ return escapedString stringByReplacingOccurrencesOfString:@"=" withString:@"%3d" stringByReplacingOccurrencesOfString:@"&" withString:@"%26" stringByReplacingOccurrencesOfString:@"+" withString:@"%2b";
+}
+
+// Precondition: The feed URL should be valid
+- (NSURL * _Nullable)parameterizedFeedURL
+{
+ NSURL *baseFeedURL = self retrieveFeedURL:NULL;
+ if (baseFeedURL == nil) {
+ SULog(SULogLevelError, @"Unexpected error: base feed URL is invalid during -parameterizedFeedURL");
+ return nil;
+ }
+ 
+ // Determine all the parameters we're attaching to the base feed URL.
+ BOOL sendingSystemProfile = self sendsSystemProfile;
+
+ // Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such.
+ NSDate *lastSubmitDate = self.host objectForUserDefaultsKey:SULastProfileSubmitDateKey;
+ if (!lastSubmitDate) {
+ lastSubmitDate = NSDate distantPast;
+ }
+ const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
+ sendingSystemProfile &= (-lastSubmitDate timeIntervalSinceNow >= oneWeek);
+
+ NSArray<NSDictionary<NSString *, NSString *> *> *parameters = @;
+ if (self.delegate respondsToSelector:@selector((feedParametersForUpdater:sendingSystemProfile:))) {
+ NSArray *feedParameters = self.delegate feedParametersForUpdater:self sendingSystemProfile:sendingSystemProfile;
+ if (feedParameters != nil) {
+ parameters = parameters arrayByAddingObjectsFromArray:feedParameters;
+ }
+ }
+	if (sendingSystemProfile)
+	{
+ parameters = parameters arrayByAddingObjectsFromArray:self.systemProfileArray;
+ self.host setObject:NSDate date forUserDefaultsKey:SULastProfileSubmitDateKey;
+ }
+	if (parameters count == 0) { return baseFeedURL; }
+
+ // Build up the parameterized URL.
+ NSMutableArray *parameterStrings = NSMutableArray array;
+ for (NSDictionary<NSString *, NSString *> *currentProfileInfo in parameters) {
+ parameterStrings addObject:NSString stringWithFormat:@"%@=%@", escapeURLComponent(currentProfileInfo objectForKey:@"key"), escapeURLComponent(currentProfileInfo objectForKey:@"value");
+ }
+
+ NSString *separatorCharacter = @"?";
+ if (baseFeedURL query) {
+ separatorCharacter = @"&"; // In case the URL is already http://foo.org/baz.xml?bat=4
+ }
+ NSString *appcastStringWithProfile = NSString stringWithFormat:@"%@%@%@", baseFeedURL absoluteString, separatorCharacter, parameterStrings componentsJoinedByString:@"&";
+
+ // Clean it up so it's a valid URL
+ NSURL *parameterizedFeedURL = NSURL URLWithString:appcastStringWithProfile;
+ if (parameterizedFeedURL == nil) {
+ SULog(SULogLevelError, @"Unexpected error: parameterized feed URL formed from %@ is invalid", appcastStringWithProfile);
+ }
+ return parameterizedFeedURL;
+}
+
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)systemProfileArray {
+ NSArray *systemProfile = SUSystemProfiler systemProfileArrayForHost:self.host;
+ if (self.delegate respondsToSelector:@selector(allowedSystemProfileKeysForUpdater:)) {
+ NSArray * allowedKeys = self.delegate allowedSystemProfileKeysForUpdater:self;
+ if (allowedKeys != nil) {
+ NSMutableArray *filteredProfile = NSMutableArray array;
+ for (NSDictionary *profileElement in systemProfile) {
+ NSString *key = profileElement objectForKey:@"key";
+ if (key && allowedKeys containsObject:key) {
+ filteredProfile addObject:profileElement;
+ }
+ }
+ systemProfile = filteredProfile copy;
+ }
+ }
+ return systemProfile;
+}
+
+- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
+{
+ self.host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey;
+ if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
+ self setAutomaticallyChecksForUpdates:NO;
+ }
+ 
+ if (self.startedUpdater) {
+ // Provide a small delay in case multiple preferences are being updated simultaneously.
+ self resetUpdateCycleAfterShortDelay;
+ }
+}
+
+- (NSTimeInterval)updateCheckInterval
+{
+ return self.updaterSettings updateCheckInterval;
+}
+
+- (void)dealloc
+{
+ // Stop checking for updates
+ self cancelNextUpdateCycle;
+ self.updaterTimer invalidate;
+ 
+ // Abort any on-going updates
+ // A driver could be retained by another object (eg: a timer),
+ // so not aborting could mean it stays alive longer than we'd want
+ self.driver abortUpdate;
+ self.driver = nil;
+}
+
+- (NSBundle *)hostBundle { return self.host bundle; }
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterCycle.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterCycle.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterDelegate.h Added

@@ -0,0 +1,465 @@
+//
+// SPUUpdaterDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 8/12/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+#import <Sparkle/SPUUpdateCheck.h>
+#import <Sparkle/SPUUserUpdateState.h>
+
+@protocol SUVersionComparison;
+@class SPUUpdater, SUAppcast, SUAppcastItem, SPUUserUpdateState;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+// System Profile Keys
+// -----------------------------------------------------------------------------
+
+SU_EXPORT extern NSString *const SUSystemProfilerApplicationNameKey;
+SU_EXPORT extern NSString *const SUSystemProfilerApplicationVersionKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPU64bitKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUCountKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUFrequencyKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUTypeKey;
+SU_EXPORT extern NSString *const SUSystemProfilerCPUSubtypeKey;
+SU_EXPORT extern NSString *const SUSystemProfilerHardwareModelKey;
+SU_EXPORT extern NSString *const SUSystemProfilerMemoryKey;
+SU_EXPORT extern NSString *const SUSystemProfilerOperatingSystemVersionKey;
+SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
+
+// -----------------------------------------------------------------------------
+//	SPUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/**
+ Provides delegation methods to control the behavior of an `SPUUpdater` object.
+ */
+@protocol SPUUpdaterDelegate <NSObject>
+@optional
+
+/**
+ Returns whether to allow Sparkle to check for updates.
+ 
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+ Alternatively, you may want to consider starting the updater after eg: the setup assistant finishes.
+ 
+ Note in Swift, this method returns Void and is marked with the throws keyword. If this method
+ doesn't throw an error, the updater may perform an update check. Otherwise if an error is thrown (we recommend using an NSError),
+ then the updater may not perform an update check.
+ 
+ @param updater The updater instance.
+ @param updateCheck The type of update check that will be performed if the updater is allowed to check for updates.
+ @param error The populated error object if the updater may not perform a new update check. The @c NSLocalizedDescriptionKey user info key should be populated indicating a description of the error.
+ @return @c YES if the updater is allowed to check for updates, otherwise @c NO
+*/
+- (BOOL)updater:(SPUUpdater *)updater mayPerformUpdateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error;
+
+/**
+ Returns the set of Sparkle channels the updater is allowed to find new updates from.
+ 
+ An appcast item can specify a channel the update is posted to. Without specifying a channel, the appcast item is posted to the default channel.
+ For instance:
+ ```
+ <item>
+ <sparkle:version>2.0 Beta 1</sparkle:version>
+ <sparkle:channel>beta</sparkle:channel>
+ </item>
+ ```
+ 
+ This example posts an update to the @c beta channel, so only updaters that are allowed to use the @c beta channel can find this update.
+ 
+ If the @c <sparkle:channel> element is not present, the update item is posted to the default channel and can be found by any updater.
+ 
+ You can pick any name you'd like for the channel. The valid characters for channel names are letters, numbers, dashes, underscores, and periods.
+ 
+ Note to use this feature, all app versions that your users may update from in your feed must use a version of Sparkle that supports this feature.
+ This feature was added in Sparkle 2.
+ 
+ @return The set of channel names the updater is allowed to find new updates in. An empty set is the default behavior,
+ which means the updater will only look for updates in the default channel.
+ */
+- (NSSet<NSString *> *)allowedChannelsForUpdater:(SPUUpdater *)updater;
+
+/**
+ Returns a custom appcast URL used for checking for new updates.
+ 
+ Override this to dynamically specify the feed URL.
+ 
+ @param updater The updater instance.
+ @return An appcast feed URL to check for new updates in, or @c nil for the default behavior and if you don't want to be delegated this task.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SPUUpdater *)updater;
+
+/**
+ Returns additional parameters to append to the appcast URL's query string.
+ 
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+ 
+ @param updater The updater instance.
+ @param sendingProfile Whether the system profile will also be sent.
+ 
+ @return An array of dictionaries with keys: `key`, `value`, `displayKey`, `displayValue`, the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SPUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/**
+ Returns whether Sparkle should prompt the user about checking for new updates automatically.
+ 
+ Use this to override the default behavior.
+ 
+ @param updater The updater instance.
+ @return @c YES if the updater should prompt for permission to check for new updates automatically, otherwise @c NO
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)updater;
+
+/**
+ Returns an allowed list of system profile keys to be appended to the appcast URL's query string.
+
+ By default all keys will be included. This method allows overriding which keys should only be allowed.
+
+ @param updater The updater instance.
+
+ @return An array of system profile keys to include in the appcast URL's query string. Elements must be one of the `SUSystemProfiler*Key` constants. Return @c nil for the default behavior and if you don't want to be delegated this task.
+ */
+- (nullable NSArray<NSString *> *)allowedSystemProfileKeysForUpdater:(SPUUpdater *)updater;
+
+/**
+ Called after Sparkle has downloaded the appcast from the remote server.
+ 
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+ 
+ @param updater The updater instance.
+ @param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SPUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/**
+ Called when a new valid update is found by the update driver.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SPUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/**
+ Called when a valid new update is not found.
+ 
+ There are various reasons a new update is unavailable and can't be installed.
+ 
+ The userInfo dictionary on the error is populated with three keys:
+ - `SPULatestAppcastItemFoundKey`: if available, this may provide the latest `SUAppcastItem` that was found. This will be @c nil if it's unavailable.
+ - `SPUNoUpdateFoundReasonKey`: This will provide the `SPUNoUpdateFoundReason`.
+ For example the reason could be because the latest version in the feed requires a newer OS version or could be because the user is already on the latest version.
+ - `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user intitiated an update check manually.
+ 
+ @param updater The updater instance.
+ @param error An error containing information on why a new valid update was not found
+ */
+- (void)updaterDidNotFindUpdate:(SPUUpdater *)updater error:(NSError *)error;
+
+/**
+ Called when a valid new update is not found.
+ 
+ If more information is needed on why an update was not found, use `-SPUUpdaterDelegate updaterDidNotFindUpdate:error:` instead.
+ 
+ @param updater The updater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SPUUpdater *)updater;
+
+/**
+ Returns the item in the appcast corresponding to the update that should be installed.
+ 
+ Please consider using or migrating to other supported features before adopting this method.
+ Specifically:
+ - If you want to filter out certain tagged updates (like beta updates), consider `-SPUUpdaterDelegate allowedChannelsForUpdater:` instead.
+ - If you want to treat certain updates as informational-only, consider supplying @c <sparkle:informationalUpdate> with a set of affected versions users are updating from.
+ 
+ If you're using special logic or extensions in your appcast, implement this to use your own logic for finding a valid update, if any, in the given appcast.
+ 
+ Do not base your logic by filtering out items with a minimum or maximum OS version or minimum autoupdate version
+ because Sparkle already has logic for determining whether or not those items should be filtered out.
+ 
+ Also do not return a non-top level item from the appcast such as a delta item. Delta items will be ignored.
+ Sparkle picks the delta item from your selection if the appropriate one is available.
+ 
+ This method will not be invoked with an appcast that has zero items. Pick the best item from the appcast.
+ If an item is available that has the same version as the application or bundle to update, do not pick an item that is worse than that version.
+ 
+ This method may be called multiple times for different selections and filters. This method should be efficient.
+ 
+ Return `+SUAppcastItem emptyAppcastItem` if no appcast item is valid.
+ 
+ Return @c nil if you don't want to be delegated this task and want to let Sparkle handle picking the best valid update.
+ 
+ @param appcast The appcast that was downloaded from the remote server.
+ @param updater The updater instance.
+ @return The best valid appcast item.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SPUUpdater *)updater;
+
+/**
+ Returns whether or not the updater should proceed with the new chosen update from the appcast.
+ 
+ By default, the updater will always proceed with the best selected update found in an appcast. Override this to override this behavior.
+ 
+ If you return @c NO and populate the @c error, the user is not shown this @c updateItem nor is the update downloaded or installed.
+ 
+ Note in Swift, this method returns Void and is marked with the throws keyword. If this method doesn't throw an error, the updater will proceed with the update.
+ Otherwise if an error is thrown (we recommend using an NSError), then the will not proceed with the update.
+ 
+ @param updater The updater instance.
+ @param updateItem The selected update item to proceed with.
+ @param updateCheck The type of update check that would be performed if proceeded.
+ @param error An error object that must be populated by the delegate if the updater should not proceed with the update. The @c NSLocalizedDescriptionKey user info key should be populated indicating a description of the error.
+ @return @c YES if the updater should proceed with @c updateItem, otherwise @c NO if the updater should not proceed with the update with an @c error populated.
+ */
+- (BOOL)updater:(SPUUpdater *)updater shouldProceedWithUpdate:(SUAppcastItem *)updateItem updateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error;
+
+/**
+ Called when a user makes a choice to install, dismiss, or skip an update.
+ 
+ If the @c choice is `SPUUserUpdateChoiceDismiss` and @c state.stage is `SPUUserUpdateStageDownloaded` the downloaded update is kept
+ around until the next time Sparkle reminds the user of the update.
+ 
+ If the @c choice is `SPUUserUpdateChoiceDismiss` and @c state.stage is `SPUUserUpdateStageInstalling` the update is still set to install on application termination.
+ 
+ If the @c choice is `SPUUserUpdateChoiceSkip` the user will not be reminded in the future for this update unless they initiate an update check themselves.
+ 
+ If @c updateItem.isInformationOnlyUpdate is @c YES the @c choice cannot be `SPUUserUpdateChoiceInstall`.
+ 
+ @param updater The updater instance.
+ @param choice The choice (install, dismiss, or skip) the user made for this @c updateItem
+ @param updateItem The appcast item corresponding to the update that the user made a choice on.
+ @param state The current state for the update which includes if the update has already been downloaded or already installing.
+ */
+- (void)updater:(SPUUpdater *)updater userDidMakeChoice:(SPUUserUpdateChoice)choice forUpdate:(SUAppcastItem *)updateItem state:(SPUUserUpdateState *)state;
+
+/**
+ Returns whether the release notes (if available) should be downloaded after an update is found and shown.
+ 
+ This is specifically for the @c <releaseNotesLink> element in the appcast item.
+ 
+ @param updater The updater instance.
+ @param updateItem The update item to download and show release notes from.
+ 
+ @return @c YES to download and show the release notes if available, otherwise @c NO. The default behavior is @c YES.
+ */
+- (BOOL)updater:(SPUUpdater *)updater shouldDownloadReleaseNotesForUpdate:(SUAppcastItem *)updateItem;
+
+/**
+ Called immediately before downloading the specified update.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that is proposed to be downloaded.
+ @param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SPUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/**
+ Called immediately after succesfull download of the specified update.
+ 
+ @param updater The SUUpdater instance.
+ @param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SPUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/**
+ Called after the specified update failed to download.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that failed to download.
+ @param error The error generated by the failed download.
+ */
+- (void)updater:(SPUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/**
+ Called when the user cancels an update while it is being downloaded.
+ 
+ @param updater The updater instance.
+ */
+- (void)userDidCancelDownload:(SPUUpdater *)updater;
+
+/**
+ Called immediately before extracting the specified downloaded update.
+ 
+ @param updater The SUUpdater instance.
+ @param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SPUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/**
+ Called immediately after extracting the specified downloaded update.
+ 
+ @param updater The SUUpdater instance.
+ @param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SPUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/**
+ Called immediately before installing the specified update.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SPUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/**
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ This may also not be called if the application is not going to relaunch after it terminates.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that is proposed to be installed.
+ @param installHandler The install handler that must be completed before continuing with the relaunch.
+ 
+ @return @c YES to delay the relaunch until @c installHandler is invoked.
+ */
+- (BOOL)updater:(SPUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvokingBlock:(void (^)(void))installHandler;
+
+/**
+ Returns whether the application should be relaunched at all.
+ 
+ Some apps **cannot** be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+ 
+ @param updater The updater instance.
+ @return @c YES if the updater should be relaunched, otherwise @c NO if it shouldn't.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SPUUpdater *)updater;
+
+/**
+ Called immediately before relaunching.
+ 
+ @param updater The updater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SPUUpdater *)updater;
+
+/**
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+ 
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return @c nil,
+ the standard version comparator will be used.
+ 
+ Note that the standard version comparator may be used during installation for preventing a downgrade,
+ even if you provide a custom comparator here.
+ 
+ @param updater The updater instance.
+ @return The custom version comparator or @c nil if you don't want to be delegated this task.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)updater;
+
+/**
+ Called when a background update will be scheduled after a delay.
+ 
+ Automatic update checks need to be enabled for this to trigger.
+ 
+ @param delay The delay in seconds until the next scheduled update will occur. This is an approximation and may vary due to system state.
+ 
+ @param updater The updater instance.
+ */
+- (void)updater:(SPUUpdater *)updater willScheduleUpdateCheckAfterDelay:(NSTimeInterval)delay;
+
+/**
+ Called when no update checks will be scheduled in the future.
+ 
+ This may later change if automatic update checks become enabled.
+ 
+ @param updater The updater instance.
+ */
+- (void)updaterWillNotScheduleUpdateCheck:(SPUUpdater *)updater;
+
+/**
+ Returns the decryption password (if any) which is used to extract the update archive DMG.
+ 
+ Return @c nil if no password should be used.
+ 
+ @param updater The updater instance.
+ @return The password used for decrypting the archive, or @c nil if no password should be used.
+ */
+- (nullable NSString *)decryptionPasswordForUpdater:(SPUUpdater *)updater;
+
+/**
+ Called when an update is scheduled to be silently installed on quit after downloading the update automatically.
+ 
+ If the updater is given responsibility, it can later remind the user an update is available if they have not terminated the application for a long time.
+ 
+ Also if the updater is given responsibility and the update item is marked critical, the new update will be presented to the user immediately after.
+ 
+ Even if the @c immediateInstallHandler is not invoked, the installer will attempt to install the update on termination.
+ 
+ @param updater The updater instance.
+ @param item The appcast item corresponding to the update that is proposed to be installed.
+ @param immediateInstallHandler The install handler for the delegate to immediately install the update. No UI interaction will be shown and the application will be relaunched after installation. This handler can only be used if @c YES is returned and the delegate handles installing the update. For Sparkle 2.3 onwards, this handler can be invoked multiple times in case the application cancels the termination request.
+ @return @c YES if the delegate will handle installing the update or @c NO if the updater should be given responsibility.
+ */
+- (BOOL)updater:(SPUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))immediateInstallHandler;
+
+/**
+ Called after the update driver aborts due to an error.
+ 
+ The update driver runs when checking for updates. This delegate method is called an error occurs during this process.
+ 
+ Some special possible values of `error.code` are:
+ 
+ - `SUNoUpdateError`: No new update was found.
+ - `SUInstallationCanceledError`: The user canceled installing the update when requested for authorization.
+ 
+ @param updater The updater instance.
+ @param error The error that caused the update driver to abort.
+ */
+- (void)updater:(SPUUpdater *)updater didAbortWithError:(NSError *)error;
+
+/**
+ Called after the update driver finishes.
+ 
+ The update driver runs when checking for updates. This delegate method is called when that check is finished.
+ 
+ An update may be scheduled to be installed during the update cycle, or no updates may be found, or an available update may be dismissed or skipped (which is the same as no error).
+ 
+ If the @c error is @c nil, no error has occurred.
+ 
+ Some special possible values of `error.code` are:
+ 
+ - `SUNoUpdateError`: No new update was found.
+ - `SUInstallationCanceledError`: The user canceled installing the update when requested for authorization.
+ 
+ @param updater The updater instance.
+ @param updateCheck The type of update check was performed.
+ @param error The error that caused the update driver to abort. This is @c nil if the update driver finished normally and there is no error.
+ */
+- (void)updater:(SPUUpdater *)updater didFinishUpdateCycleForUpdateCheck:(SPUUpdateCheck)updateCheck error:(nullable NSError *)error;
+
+/* Deprecated methods */
+
+- (BOOL)updaterMayCheckForUpdates:(SPUUpdater *)updater __deprecated_msg("Please use -SPUUpdaterDelegate updater:mayPerformUpdateCheck:error: instead.");
+
+- (void)updater:(SPUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item __deprecated_msg("Please use -SPUUpdaterDelegate updater:userDidMakeChoice:forUpdate:state: instead.");
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterSettings.h Added

@@ -0,0 +1,60 @@
+//
+// SPUUpdaterSettings.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/27/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ This class can be used for reading certain updater settings.
+ 
+ It retrieves the settings by first looking into the host's user defaults.
+ If the setting is not found in there, then the host's Info.plist file is looked at.
+ */
+SU_EXPORT @interface SPUUpdaterSettings : NSObject
+
+- (instancetype)initWithHostBundle:(NSBundle *)hostBundle;
+
+/**
+ * Indicates whether or not automatic update checks are enabled.
+ */
+@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates;
+
+/**
+ * The regular update check interval.
+ */
+@property (readonly, nonatomic) NSTimeInterval updateCheckInterval;
+
+/**
+ * Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
+ * If this value is nil, the developer has not explicitly specified this option.
+ */
+@property (readonly, nonatomic, nullable) NSNumber *allowsAutomaticUpdatesOption;
+
+/**
+ * Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
+ */
+@property (readonly, nonatomic) BOOL allowsAutomaticUpdates;
+
+/**
+ * Indicates whether or not automatically downloading updates is enabled by the user or developer.
+ *
+ * Note this does not indicate whether or not automatic downloading of updates is allowable.
+ * See `-allowsAutomaticUpdates` property for that.
+ */
+@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates;
+
+/**
+ * Indicates whether or not anonymous system profile information is sent when checking for updates.
+ */
+@property (readonly, nonatomic) BOOL sendsSystemProfile;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterSettings.m Added

@@ -0,0 +1,77 @@
+//
+//  SPUUpdaterSettings.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 3/27/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUpdaterSettings.h"
+#import "SUHost.h"
+#import "SUConstants.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUUpdaterSettings ()
+
+@property (nonatomic, readonly) SUHost *host;
+
+@end
+
+@implementation SPUUpdaterSettings
+
+@synthesize host = _host;
+
+- (instancetype)initWithHostBundle:(NSBundle *)hostBundle
+{
+    self = super init;
+    if (self != nil) {
+        _host = SUHost alloc initWithBundle:hostBundle;
+    }
+    return self;
+}
+
+- (BOOL)automaticallyChecksForUpdates
+{
+    // Don't automatically update when the check interval is 0, to be compatible with 1.1 settings.
+    if ((NSInteger)self updateCheckInterval == 0) {
+        return NO;
+    }
+    return self.host boolForKey:SUEnableAutomaticChecksKey;
+}
+
+- (NSTimeInterval)updateCheckInterval
+{
+    // Find the stored check interval. User defaults override Info.plist.
+    NSNumber *intervalValue = self.host objectForKey:SUScheduledCheckIntervalKey;
+    if (intervalValue)
+        return intervalValue doubleValue;
+    else
+        return SUDefaultUpdateCheckInterval;
+}
+
+// For allowing automatic downloaded updates to be turned on or off
+- (NSNumber * _Nullable)allowsAutomaticUpdatesOption
+{
+    NSNumber *developerAllowsAutomaticUpdates = self.host objectForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey;
+    return developerAllowsAutomaticUpdates isKindOfClass:NSNumber class ? developerAllowsAutomaticUpdates : nil;
+}
+
+- (BOOL)allowsAutomaticUpdates
+{
+    NSNumber *developerAllowsAutomaticUpdates = self allowsAutomaticUpdatesOption;
+    return (developerAllowsAutomaticUpdates == nil || developerAllowsAutomaticUpdates.boolValue);
+}
+
+- (BOOL)automaticallyDownloadsUpdates
+{
+    return self.host boolForKey:SUAutomaticallyUpdateKey;
+}
+
+- (BOOL)sendsSystemProfile
+{
+    return self.host boolForKey:SUSendProfileInfoKey;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterTimer.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUpdaterTimer.m Added

@@ -0,0 +1,61 @@
+//
+// SPUUpdaterTimer.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 8/12/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUpdaterTimer.h"
+#import "SUConstants.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUUpdaterTimer ()
+
+@property (nonatomic, readonly, weak) id<SPUUpdaterTimerDelegate> delegate;
+@property (nonatomic) dispatch_source_t source;
+
+@end
+
+@implementation SPUUpdaterTimer
+
+@synthesize delegate = _delegate;
+@synthesize source = _source;
+
+- (instancetype)initWithDelegate:(id<SPUUpdaterTimerDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _delegate = delegate;
+ }
+ return self;
+}
+
+- (void)startAndFireAfterDelay:(NSTimeInterval)delay
+{
+ self.source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
+ 
+ // We use the wall time instead of cpu time for our dispatch timer
+ // So eg if the computer sleeps we want to include that time spent in our timer
+ dispatch_time_t timeToFire = dispatch_walltime(NULL, (int64_t)(delay * NSEC_PER_SEC));
+ dispatch_source_set_timer(self.source, timeToFire, DISPATCH_TIME_FOREVER, SULeewayUpdateCheckInterval * NSEC_PER_SEC);
+ 
+ __weak __typeof__(self) weakSelf = self;
+ dispatch_source_set_event_handler(self.source, ^{
+ weakSelf.delegate updaterTimerDidFire;
+ });
+ 
+ dispatch_resume(self.source);
+}
+
+- (void)invalidate
+{
+ if (self.source != nil) {
+ dispatch_source_cancel(self.source);
+ self.source = nil;
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserAgent+Private.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserAgent+Private.m Added

@@ -0,0 +1,38 @@
+//
+//  SPUUserAgent+Private.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 11/12/21.
+//  Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUserAgent+Private.h"
+#import "SUHost.h"
+
+NSString *SPUMakeUserAgentWithBundle(NSBundle *responsibleBundle, NSString * _Nullable displayNameSuffix)
+{
+    SUHost *responsibleHost = SUHost alloc initWithBundle:responsibleBundle;
+    return SPUMakeUserAgentWithHost(responsibleHost, displayNameSuffix);
+}
+
+NSString *SPUMakeUserAgentWithHost(SUHost *responsibleHost, NSString * _Nullable displayNameSuffix)
+{
+    NSString *displayVersion = responsibleHost.displayVersion;
+    
+    NSString *userAgent = NSString stringWithFormat:@"%@%@/%@ Sparkle/%@", responsibleHost.name, (displayNameSuffix != nil ? displayNameSuffix : @""), (displayVersion.length > 0 ? displayVersion : @"?"), @""MARKETING_VERSION;
+    NSData *cleanedAgent = userAgent dataUsingEncoding:NSASCIIStringEncoding allowLossyConversion:YES;
+    
+    NSString *result;
+    if (cleanedAgent != nil) {
+        NSString *cleanedAgentString = NSString alloc initWithData:(NSData * _Nonnull)cleanedAgent encoding:NSASCIIStringEncoding;
+        if (cleanedAgentString != nil) {
+            result = cleanedAgentString;
+        } else {
+            result = @"";
+        }
+    } else {
+        result = @"";
+    }
+    
+    return result;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserDriver.h Added

@@ -0,0 +1,287 @@
+//
+// SPUUserDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/14/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+#import <Sparkle/SPUUserUpdateState.h>
+#import <Sparkle/SUExport.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SPUUpdatePermissionRequest, SUUpdatePermissionResponse, SUAppcastItem, SPUDownloadData;
+
+/**
+ The API in Sparkle for controlling the user interaction.
+ 
+ This protocol is used for implementing a user interface for the Sparkle updater. Sparkle's internal drivers tell
+ an object that implements this protocol what actions to take and show to the user.
+ 
+ Every method in this protocol can be assumed to be called from the main thread.
+ */
+SU_EXPORT @protocol SPUUserDriver <NSObject>
+
+/**
+ * Show an updater permission request to the user
+ *
+ * Ask the user for their permission regarding update checks.
+ * This is typically only called once per app installation.
+ *
+ * @param request The update permission request.
+ * @param reply A reply with a update permission response.
+ */
+- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply;
+
+/**
+ * Show the user initating an update check
+ *
+ * Respond to the user initiating an update check. Sparkle uses this to show the user a window with an indeterminate progress bar.
+ *
+ * @param cancellation Invoke this cancellation block to cancel the update check before the update check is completed.
+ */
+- (void)showUserInitiatedUpdateCheckWithCancellation:(void (^)(void))cancellation;
+
+/**
+ * Show the user a new update is found.
+ *
+ * Let the user know a new update is found and ask them what they want to do.
+ * Before this point, `-showUserInitiatedUpdateCheckWithCancellation:` may be called.
+ *
+ * The potential `stage`s on the updater @c state are:
+ *
+ * `SPUUpdateStateNotDownloaded` - Update has not been downloaded yet.
+ *
+ * `SPUUpdateStateDownloaded` - Update has already been downloaded but not started installing yet.
+ *
+ * `SPUUpdateStateInstalling` - Update has been downloaded and already started installing.
+ *
+ * The `userIntiated` property on the @c state indicates if the update was initiated by the user or if it was automatically scheduled in the background.
+ *
+ * Additionally, these properties on the @c appcastItem are of importance:
+ *
+ * @c appcastItem.informationOnlyUpdate indicates if the update is only informational and should not be downloaded. You can direct the user to the infoURL property of the appcastItem in their web browser. Sometimes information only updates are used as a fallback in case a bad update is shipped, so you'll want to support this case.
+ *
+ * @c appcastItem.majorUpgrade indicates if the update is a major or paid upgrade.
+ *
+ * @c appcastItem.criticalUpdate indicates if the update is a critical update.
+ *
+ * A reply of `SPUUserUpdateChoiceInstall` begins or resumes downloading or installing the update.
+ * If the state.stage is `SPUUserUpdateStateInstalling`, this may send a quit event to the application and relaunch it immediately (in this state, this behaves as a fast "install and Relaunch").
+ * Do not use this reply if @c appcastItem.informationOnlyUpdate is YES.
+ *
+ * A reply of `SPUUserUpdateChoiceDismiss` dismisses the update for the time being. The user may be reminded of the update at a later point.
+ * If the state.stage is `SPUUserUpdateStateDownloaded`, the downloaded update is kept after dismissing until the next time an update is shown to the user.
+ * If the state.stage is `SPUUserUpdateStateInstalling`, the installing update is also preserved after dismissing. In this state however, the update will also still be installed after the application is terminated.
+ *
+ * A reply of `SPUUserUpdateChoiceSkip` skips this particular version and won't notify the user again, unless they initiate an update check themselves.
+ * If @c appcastItem.majorUpgrade is YES, the major update and any future minor updates to that major release are skipped, unless a future minor update specifies a `<sparkle:ignoreSkippedUpgradesBelowVersion>` requirement.
+ * If the state.stage is `SPUUpdateStateInstalling`, the installation is also canceled when the update is skipped.
+ *
+ * @param appcastItem The Appcast Item containing information that reflects the new update.
+ * @param state The current state of the user update. See above discussion for notable properties.
+ * @param reply The reply which indicates if the update should be installed, dismissed, or skipped. See above discussion for more details.
+ */
+- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem state:(SPUUserUpdateState *)state reply:(void (^)(SPUUserUpdateChoice))reply;
+
+/**
+ * Show the user the release notes for the new update
+ *
+ * Display the release notes to the user. This will be called after showing the new update.
+ * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file.
+ * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil.
+ *
+ * @param downloadData The data for the release notes that was downloaded from the new update's appcast.
+ */
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData;
+
+/**
+ * Show the user that the new update's release notes could not be downloaded
+ *
+ * This will be called after showing the new update.
+ * This is only applicable if the release notes are linked from the appcast, and are not directly embedded inside of the appcast file.
+ * That is, this may be invoked if the releaseNotesURL from the appcast item is non-nil.
+ *
+ * @param error The error associated with why the new update's release notes could not be downloaded.
+ */
+- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error;
+
+/**
+ * Show the user a new update was not found
+ *
+ * Let the user know a new update was not found after they tried initiating an update check.
+ * Before this point, `-showUserInitiatedUpdateCheckWithCancellation:` may be called.
+ *
+ * There are various reasons a new update is unavailable and can't be installed.
+ * The @c error object is populated with recovery and suggestion strings suitable to be shown in an alert.
+ *
+ * The @c userInfo dictionary on the @c error is also populated with two keys:
+ *
+ * `SPULatestAppcastItemFoundKey`: if available, this may provide the latest SUAppcastItem that was found.
+ *
+ * `SPUNoUpdateFoundReasonKey`: if available, this will provide the `SUNoUpdateFoundReason`. For example the reason could be because
+ * the latest version in the feed requires a newer OS version or could be because the user is already on the latest version.
+ *
+ * @param error The error associated with why a new update was not found. See above discussion for more details.
+ * @param acknowledgement Acknowledge to the updater that no update found error was shown.
+ */
+- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement;
+
+/**
+ * Show the user an update error occurred
+ *
+ * Let the user know that the updater failed with an error. This will not be invoked without the user having been
+ * aware that an update was in progress.
+ *
+ * Before this point, any of the non-error user driver methods may have been invoked.
+ *
+ * @param error The error associated with what update error occurred.
+ * @param acknowledgement Acknowledge to the updater that the error was shown.
+ */
+- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement;
+
+/**
+ * Show the user that downloading the new update initiated
+ *
+ * Let the user know that downloading the new update started.
+ *
+ * @param cancellation Invoke this cancellation block to cancel the download at any point before `-showDownloadDidStartExtractingUpdate` is invoked.
+ */
+- (void)showDownloadInitiatedWithCancellation:(void (^)(void))cancellation;
+
+/**
+ * Show the user the content length of the new update that will be downloaded
+ *
+ * @param expectedContentLength The expected content length of the new update being downloaded.
+ * An implementor should be able to handle if this value is invalid (more or less than actual content length downloaded).
+ * Additionally, this method may be called more than once for the same download in rare scenarios.
+ */
+- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
+
+/**
+ * Show the user that the update download received more data
+ *
+ * This may be an appropriate time to advance a visible progress indicator of the download
+ * @param length The length of the data that was just downloaded
+ */
+- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length;
+
+/**
+ * Show the user that the update finished downloading and started extracting
+ *
+ * Sparkle uses this to show an indeterminate progress bar.
+ *
+ * Note that an update can resume at this point after having been downloaded before,
+ * so this may be called without any of the download callbacks being invoked prior.
+ */
+- (void)showDownloadDidStartExtractingUpdate;
+
+/**
+ * Show the user that the update is extracting with progress
+ *
+ * Let the user know how far along the update extraction is.
+ *
+ * Before this point, `-showDownloadDidStartExtractingUpdate` is called.
+ *
+ * @param progress The progress of the extraction from a 0.0 to 1.0 scale
+ */
+- (void)showExtractionReceivedProgress:(double)progress;
+
+/**
+ * Show the user that the update is ready to install & relaunch
+ *
+ * Let the user know that the update is ready to install and relaunch, and ask them whether they want to proceed.
+ * Note if the target application has already terminated, this method may not be invoked.
+ *
+ * A reply of `SPUUserUpdateChoiceInstall` installs the update the new update immediately. The application is relaunched only if it is still running by the time this reply is invoked. If the application terminates on its own, Sparkle will attempt to automatically install the update.
+ *
+ * A reply of `SPUUserUpdateChoiceDismiss` dismisses the update installation for the time being. Note the update may still be installed automatically after the application terminates.
+ *
+ * A reply of `SPUUserUpdateChoiceSkip` cancels the current update that has begun installing and dismisses the update. In this circumstance, the update is canceled but this update version is not skipped in the future.
+ *
+ * Before this point, `-showExtractionReceivedProgress:` or `-showUpdateFoundWithAppcastItem:state:reply:` may be called.
+ *
+ * @param reply The reply which indicates if the update should be installed, dismissed, or skipped. See above discussion for more details.
+ */
+- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))reply;
+
+/**
+ * Show the user that the update is installing
+ *
+ * Let the user know that the update is currently installing.
+ *
+ * Before this point, `-showReadyToInstallAndRelaunch:` or `-showUpdateFoundWithAppcastItem:state:reply:` will be called.
+ *
+ * @param applicationTerminated Indicates if the application has been terminated already.
+ * If the application hasn't been terminated, a quit event is sent to the running application before installing the update.
+ * If the application or user delays or cancels termination, there may be an indefinite period of time before the application fully quits.
+ * It is up to the implementor whether or not to decide to continue showing installation progress in this case.
+ *
+ * @param retryTerminatingApplication This handler gives a chance for the application to re-try sending a quit event to the running application before installing the update.
+ * The application may cancel or delay termination. This handler gives the user driver another chance to allow the user to try terminating the application again.
+ * If the application does not delay or cancel application termination, there is no need to invoke this handler. This handler may be invoked multiple times.
+ * Note this handler should not be invoked if @c applicationTerminated is already @c YES
+ */
+- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated retryTerminatingApplication:(void (^)(void))retryTerminatingApplication;
+
+/**
+ * Show the user that the update installation finished
+ *
+ * Let the user know that the update finished installing.
+ *
+ * This will only be invoked if the updater process is still alive, which is typically not the case if
+ * the updater's lifetime is tied to the application it is updating. This implementation must not try to reference
+ * the old bundle prior to the installation, which will no longer be around.
+ *
+ * Before this point, `-showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication:` will be called.
+ *
+ * @param relaunched Indicates if the update was relaunched.
+ * @param acknowledgement Acknowledge to the updater that the finished installation was shown.
+ */
+- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement;
+
+/**
+ * Show the user the current presented update or its progress in utmost focus
+ *
+ * The user wishes to check for updates while the user is being shown update progress.
+ * Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
+ */
+- (void)showUpdateInFocus;
+
+/**
+ * Dismiss the current update installation
+ *
+ * Stop and tear down everything.
+ * Dismiss all update windows, alerts, progress, etc from the user.
+ * Basically, stop everything that could have been started. Sparkle may invoke this when aborting or finishing an update.
+ */
+- (void)dismissUpdateInstallation;
+
+/*
+ * Below are deprecated methods that have been replaced by better alternatives.
+ * The deprecated methods will be used if the alternatives have not been implemented yet.
+ * In the future support for using these deprecated methods may be removed however.
+ */
+@optional
+
+// Clients should move to non-deprecated methods
+// Deprecated methods are only (temporarily) kept around for compatibility reasons
+
+- (void)showUpdateNotFoundWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateNotFoundWithError:acknowledgement: instead");
+
+- (void)showUpdateInstallationDidFinishWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateInstalledAndRelaunched:acknowledgement: instead");
+
+- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs.");
+
+- (void)showInstallingUpdate __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");
+
+- (void)showSendingTerminationSignal __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");
+
+- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserInitiatedUpdateDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserInitiatedUpdateDriver.m Added

@@ -0,0 +1,151 @@
+//
+// SPUUserInitiatedUpdateDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUserInitiatedUpdateDriver.h"
+#import "SPUUIBasedUpdateDriver.h"
+#import "SPUUserDriver.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SPUUserInitiatedUpdateDriver () <SPUUIBasedUpdateDriverDelegate>
+
+@property (nonatomic, readonly) SPUUIBasedUpdateDriver *uiDriver;
+@property (nonatomic, readonly) id<SPUUserDriver> userDriver;
+@property (nonatomic) BOOL showingUserInitiatedProgress;
+@property (nonatomic) BOOL showingUpdate;
+@property (nonatomic) BOOL aborted;
+@property (nonatomic) void (^updateDidShowHandler)(void);
+
+@end
+
+@implementation SPUUserInitiatedUpdateDriver
+
+@synthesize uiDriver = _uiDriver;
+@synthesize userDriver = _userDriver;
+@synthesize showingUserInitiatedProgress = _showingUserInitiatedProgress;
+@synthesize showingUpdate = _showingUpdate;
+@synthesize aborted = _aborted;
+@synthesize updateDidShowHandler = _updateDidShowHandler;
+
+- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
+{
+ self = super init;
+ if (self != nil) {
+ _uiDriver = SPUUIBasedUpdateDriver alloc initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:YES updaterDelegate:updaterDelegate delegate:self;
+ _userDriver = userDriver;
+ }
+ return self;
+}
+
+- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
+{
+ self.uiDriver setCompletionHandler:completionBlock;
+}
+
+- (void)setUpdateShownHandler:(void (^)(void))handler
+{
+ self.updateDidShowHandler = handler;
+}
+
+- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
+{
+ self.uiDriver setUpdateWillInstallHandler:updateWillInstallHandler;
+}
+
+- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
+{
+ self.showingUserInitiatedProgress = YES;
+ 
+ if (self.updateDidShowHandler != nil) {
+ self.updateDidShowHandler();
+ self.updateDidShowHandler = nil;
+ }
+ 
+ self.userDriver showUserInitiatedUpdateCheckWithCancellation:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (self.showingUserInitiatedProgress) {
+ self abortUpdate;
+ }
+ });
+ };
+ 
+ self.uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:NO;
+}
+
+- (void)resumeInstallingUpdate
+{
+ self.uiDriver resumeInstallingUpdate;
+}
+
+- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
+{
+ self.uiDriver resumeUpdate:resumableUpdate;
+}
+
+- (void)uiDriverDidShowUpdate
+{
+ // When a new update check has not been initiated and an update has been resumed,
+ // update the driver to indicate we are showing an update to the user
+ self.showingUpdate = YES;
+ 
+ if (self.updateDidShowHandler != nil) {
+ self.updateDidShowHandler();
+ self.updateDidShowHandler = nil;
+ }
+}
+
+- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
+{
+ self abortUpdateWithError:error;
+}
+
+- (void)basicDriverDidFinishLoadingAppcast
+{
+ if (self.showingUserInitiatedProgress) {
+ self.showingUserInitiatedProgress = NO;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if (self.userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)) {
+ self.userDriver dismissUserInitiatedUpdateCheck;
+ }
+#pragma clang diagnostic pop
+ }
+}
+
+- (void)abortUpdate
+{
+ self abortUpdateWithError:nil;
+}
+
+- (void)abortUpdateWithError:(nullable NSError *)error
+{
+ if (self.showingUserInitiatedProgress) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ if (self.userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)) {
+ self.userDriver dismissUserInitiatedUpdateCheck;
+ }
+#pragma clang diagnostic pop
+ self.showingUserInitiatedProgress = NO;
+ }
+ self.aborted = YES;
+ self.uiDriver abortUpdateWithError:error showErrorToUser:YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserUpdateState+Private.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserUpdateState.h Added

@@ -0,0 +1,77 @@
+//
+// SPUUserUpdateState.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/29/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#ifndef SPUUserUpdateState_h
+#define SPUUserUpdateState_h
+
+#import <Foundation/Foundation.h>
+
+#import <Sparkle/SUExport.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ A choice made by the user when prompted with a new update.
+ */
+typedef NS_ENUM(NSInteger, SPUUserUpdateChoice) {
+ /**
+ Dismisses the update and skips being notified of it in the future.
+ */
+ SPUUserUpdateChoiceSkip,
+ /**
+ Downloads (if needed) and installs the update.
+ */
+ SPUUserUpdateChoiceInstall,
+ /**
+ Dismisses the update until Sparkle reminds the user of it at a later time.
+ */
+ SPUUserUpdateChoiceDismiss,
+};
+
+/**
+ Describes the current stage an update is undergoing.
+ */
+typedef NS_ENUM(NSInteger, SPUUserUpdateStage) {
+ /**
+ The update has not been downloaded.
+ */
+ SPUUserUpdateStageNotDownloaded,
+ /**
+ The update has already been downloaded but not begun installing.
+ */
+ SPUUserUpdateStageDownloaded,
+ /**
+ The update has already been downloaded and began installing in the background.
+ */
+ SPUUserUpdateStageInstalling
+};
+
+/**
+ This represents the user's current update state.
+ */
+SU_EXPORT @interface SPUUserUpdateState : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ The current update stage.
+ 
+ This stage indicates if data has been already downloaded or not, or if an update is currently being installed.
+ */
+@property (nonatomic, readonly) SPUUserUpdateStage stage;
+
+/**
+ Indicates whether or not the update check was initiated by the user.
+ */
+@property (nonatomic, readonly) BOOL userInitiated;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif /* SPUUserUpdateState_h */

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUUserUpdateState.m Added

@@ -0,0 +1,57 @@
+//
+// SPUUserUpdateState.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/9/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SPUUserUpdateState.h"
+#import "SPUUserUpdateState+Private.h"
+
+
+#include "AppKitPrevention.h"
+
+#define SPUUserUpdateStateStageKey @"SPUUserUpdateStateStage"
+#define SPUUserUpdateStateUserInitiatedKey @"SPUUserUpdateStateUserInitiated"
+#define SPUUserUpdateStateMajorUpgradeKey @"SPUUserUpdateStateMajorUpgrade"
+#define SPUUserUpdateStateCriticalUpdateKey @"SPUUserUpdateStateCriticalUpdate"
+
+@interface SPUUserUpdateState () <NSSecureCoding>
+@end
+
+@implementation SPUUserUpdateState
+
+@synthesize stage = _stage;
+@synthesize userInitiated = _userInitiated;
+
+- (instancetype)initWithStage:(SPUUserUpdateStage)stage userInitiated:(BOOL)userInitiated
+{
+ self = super init;
+ if (self != nil) {
+ _stage = stage;
+ _userInitiated = userInitiated;
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+ encoder encodeInteger:self.stage forKey:SPUUserUpdateStateStageKey;
+ encoder encodeBool:self.userInitiated forKey:SPUUserUpdateStateUserInitiatedKey;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+ SPUUserUpdateStage stage = decoder decodeIntegerForKey:SPUUserUpdateStateStageKey;
+ BOOL userInitiated = decoder decodeBoolForKey:SPUUserUpdateStateUserInitiatedKey;
+ 
+ return self initWithStage:stage userInitiated:userInitiated;
+}
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUXPCServiceInfo.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SPUXPCServiceInfo.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcast+Private.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcast.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcast.m Added

@@ -0,0 +1,242 @@
+//
+// SUAppcast.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/12/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import "SUExport.h"
+#import "SUAppcast.h"
+#import "SUAppcast+Private.h"
+#import "SPUAppcastItemState.h"
+#import "SUAppcastItem.h"
+#import "SUAppcastItem+Private.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUConstants.h"
+#import "SULog.h"
+#import "SUErrors.h"
+#import "SULocalizations.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUAppcast ()
+
+@property (nonatomic, copy) NSArray<SUAppcastItem *> *items;
+
+@end
+
+@implementation SUAppcast
+
+@synthesize items = _items;
+
+- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver error:(NSError * __autoreleasing *)error
+{
+ self = super init;
+ if (self != nil) {
+ _items = self parseAppcastItemsFromXMLData:xmlData relativeToURL:relativeURL stateResolver:stateResolver error:error;
+ if (_items == nil) {
+ return nil;
+ }
+ }
+ return self;
+}
+
+- (NSDictionary *)attributesOfNode:(NSXMLElement *)node
+{
+ NSEnumerator *attributeEnum = node attributes objectEnumerator;
+ NSMutableDictionary *dictionary = NSMutableDictionary dictionary;
+
+ for (NSXMLNode *attribute in attributeEnum) {
+ NSString *attrName = self sparkleNamespacedNameOfNode:attribute;
+ if (!attrName) {
+ continue;
+ }
+ NSString *attributeStringValue = attribute stringValue;
+ if (attributeStringValue != nil) {
+ dictionary setObject:attributeStringValue forKey:attrName;
+ }
+ }
+ return dictionary;
+}
+
+-(NSString *)sparkleNamespacedNameOfNode:(NSXMLNode *)node {
+ // XML namespace prefix is semantically meaningless, so compare namespace URI
+ // NS URI isn't used to fetch anything, and must match exactly, so we look for http:// not https://
+ if (node URI isEqualToString:@"http://www.andymatuschak.org/xml-namespaces/sparkle") {
+ NSString *localName = node localName;
+ assert(localName);
+ return @"sparkle:" stringByAppendingString:localName;
+ } else {
+ return node name; // Backwards compatibility
+ }
+}
+
+-(NSArray *)parseAppcastItemsFromXMLData:(NSData *)appcastData relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver error:(NSError *__autoreleasing*)errorp {
+ if (errorp) {
+ *errorp = nil;
+ }
+
+ if (!appcastData) {
+ return nil;
+ }
+
+ NSUInteger options = NSXMLNodeLoadExternalEntitiesNever; // Prevent inclusion from file://
+ NSXMLDocument *document = NSXMLDocument alloc initWithData:appcastData options:options error:errorp;
+	if (nil == document) {
+ return nil;
+ }
+
+ NSArray *xmlItems = document nodesForXPath:@"/rss/channel/item" error:errorp;
+ if (nil == xmlItems) {
+ return nil;
+ }
+
+ NSMutableArray *appcastItems = NSMutableArray array;
+ NSEnumerator *nodeEnum = xmlItems objectEnumerator;
+ NSXMLNode *node;
+
+	while((node = nodeEnum nextObject)) {
+ NSMutableDictionary *nodesDict = NSMutableDictionary dictionary;
+ NSMutableDictionary *dict = NSMutableDictionary dictionary;
+
+ // First, we'll "index" all the first-level children of this appcast item so we can pick them out by language later.
+ if (node children count) {
+ node = node childAtIndex:0;
+ while (nil != node) {
+ NSString *name = self sparkleNamespacedNameOfNode:node;
+ if (name) {
+ NSMutableArray *nodes = nodesDict objectForKey:name;
+ if (nodes == nil) {
+ nodes = NSMutableArray array;
+ nodesDict setObject:nodes forKey:name;
+ }
+ nodes addObject:node;
+ }
+ node = node nextSibling;
+ }
+ }
+
+ for (NSString *name in nodesDict) {
+ node = self bestNodeInNodes:nodesDict objectForKey:name;
+ if (name isEqualToString:SURSSElementEnclosure || name isEqualToString:SUAppcastElementCriticalUpdate) {
+ // These are flattened as a separate dictionary for some reason
+ NSDictionary *innerDict = self attributesOfNode:(NSXMLElement *)node;
+ dict setObject:innerDict forKey:name;
+			}
+ else if (name isEqualToString:SURSSElementPubDate) {
+ // We don't want to parse and create a NSDate instance -
+ // that's a risk we can avoid. We don't use the date anywhere other
+ // than it being accessible from SUAppcastItem
+ NSString *dateString = node.stringValue;
+ if (dateString) {
+ dict setObject:dateString forKey:name;
+ }
+			}
+			else if (name isEqualToString:SUAppcastElementDeltas) {
+ NSMutableArray *deltas = NSMutableArray array;
+ NSEnumerator *childEnum = node children objectEnumerator;
+ for (NSXMLNode *child in childEnum) {
+ if (child name isEqualToString:SURSSElementEnclosure) {
+ deltas addObject:self attributesOfNode:(NSXMLElement *)child;
+ }
+ }
+ dict setObject:deltas forKey:name;
+			}
+ else if (name isEqualToString:SUAppcastElementTags) {
+ NSMutableArray *names = NSMutableArray array;
+ NSEnumerator *childEnum = node children objectEnumerator;
+ for (NSXMLNode *child in childEnum) {
+ NSString *childName = child.name;
+ if (childName) {
+ names addObject:childName;
+ }
+ }
+ dict setObject:names forKey:name;
+ }
+ else if (name isEqualToString:SUAppcastElementInformationalUpdate) {
+ NSMutableSet *informationalUpdateVersions = NSMutableSet set;
+ NSEnumerator *childEnum = node children objectEnumerator;
+ for (NSXMLNode *child in childEnum) {
+ if (child.name isEqualToString:SUAppcastElementVersion) {
+ NSString *version = child.stringValue;
+ if (version != nil) {
+ informationalUpdateVersions addObject:version;
+ }
+ } else if (child.name isEqualToString:SUAppcastElementBelowVersion) {
+ NSString *version = child.stringValue;
+ if (version != nil) {
+ // Denote version is used as an upper bound by using '<'
+ informationalUpdateVersions addObject:NSString stringWithFormat:@"<%@", version;
+ }
+ }
+ }
+ dict setObject:informationalUpdateVersions copy forKey:name;
+ }
+			else if (name != nil) {
+ // add all other values as strings
+ NSString *theValue = node stringValue stringByTrimmingCharactersInSet:NSCharacterSet whitespaceAndNewlineCharacterSet;
+ if (theValue != nil) {
+ dict setObject:theValue forKey:name;
+ }
+ }
+ }
+
+ NSString *errString;
+ SUAppcastItem *anItem = SUAppcastItem alloc initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver failureReason:&errString;
+ 
+ if (anItem) {
+ appcastItems addObject:anItem;
+		}
+ else {
+ SULog(SULogLevelError, @"Sparkle Updater: Failed to parse appcast item: %@.\nAppcast dictionary was: %@", errString, dict);
+ if (errorp) *errorp = NSError errorWithDomain:SUSparkleErrorDomain
+ code:SUAppcastParseError
+ userInfo:@{NSLocalizedDescriptionKey: errString};
+ return nil;
+ }
+ }
+
+ return appcastItems;
+}
+
+- (NSXMLNode *)bestNodeInNodes:(NSArray *)nodes
+{
+ // We use this method to pick out the localized version of a node when one's available.
+ if (nodes count == 1)
+ return nodes objectAtIndex:0;
+ else if (nodes count == 0)
+ return nil;
+
+ NSMutableArray *languages = NSMutableArray array;
+ NSString *lang;
+ NSUInteger i;
+ for (NSXMLElement *node in nodes) {
+ lang = node attributeForName:@"xml:lang" stringValue;
+ languages addObject:(lang ? lang : @"");
+ }
+ lang = NSBundle preferredLocalizationsFromArray:languages objectAtIndex:0;
+ i = languages indexOfObject:(languages containsObject:lang ? lang : @"");
+ if (i == NSNotFound) {
+ i = 0;
+ }
+ return nodes objectAtIndex:i;
+}
+
+- (SUAppcast *)copyByFilteringItems:(BOOL (^)(SUAppcastItem *))filterBlock
+{
+ SUAppcast *other = SUAppcast new;
+ NSMutableArray *newItems = NSMutableArray new;
+ 
+ for (SUAppcastItem *item in self.items) {
+ if (filterBlock(item)) {
+ newItems addObject:item;
+ }
+ }
+ 
+ other.items = newItems;
+ return other;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcastDriver.h Added

@@ -0,0 +1,35 @@
+//
+// SUAppcastDriver.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/17/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUAppcastItem, SUHost, SUAppcast;
+@protocol SPUUpdaterDelegate;
+
+@protocol SUAppcastDriverDelegate <NSObject>
+
+- (void)didFailToFetchAppcastWithError:(NSError *)error;
+- (void)didFinishLoadingAppcast:(SUAppcast *)appcast;
+- (void)didFindValidUpdateWithAppcastItem:(SUAppcastItem *)appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
+- (void)didNotFindUpdateWithLatestAppcastItem:(nullable SUAppcastItem *)latestAppcastItem hostToLatestAppcastItemComparisonResult:(NSComparisonResult)hostToLatestAppcastItemComparisonResult background:(BOOL)background;
+
+@end
+
+@interface SUAppcastDriver : NSObject
+
+- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id <SUAppcastDriverDelegate>)delegate;
+
+- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
+
+- (void)cleanup:(void (^)(void))completionHandler;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcastDriver.m Added

@@ -0,0 +1,500 @@
+//
+// SUAppcastDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/17/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUAppcastDriver.h"
+#import "SUAppcast.h"
+#import "SUAppcast+Private.h"
+#import "SUAppcastItem.h"
+#import "SUAppcastItem+Private.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUStandardVersionComparator.h"
+#import "SUOperatingSystem.h"
+#import "SPUUpdaterDelegate.h"
+#import "SUHost.h"
+#import "SPUSkippedUpdate.h"
+#import "SUConstants.h"
+#import "SUPhasedUpdateGroupInfo.h"
+#import "SULog.h"
+#import "SPUDownloadDriver.h"
+#import "SPUDownloadData.h"
+#import "SULocalizations.h"
+#import "SUErrors.h"
+#import "SPUAppcastItemStateResolver.h"
+#import "SPUAppcastItemStateResolver+Private.h"
+#import "SPUAppcastItemState.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUAppcastDriver () <SPUDownloadDriverDelegate>
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic, readonly, weak) id updater;
+@property (nullable, nonatomic, readonly, weak) id <SPUUpdaterDelegate> updaterDelegate;
+@property (nullable, nonatomic, readonly, weak) id <SUAppcastDriverDelegate> delegate;
+@property (nonatomic) SPUDownloadDriver *downloadDriver;
+
+@end
+
+@implementation SUAppcastDriver
+
+@synthesize host = _host;
+@synthesize updater = _updater;
+@synthesize updaterDelegate = _updaterDelegate;
+@synthesize delegate = _delegate;
+@synthesize downloadDriver = _downloadDriver;
+
+- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SUAppcastDriverDelegate>)delegate
+{
+ self = super init;
+ if (self != nil) {
+ _host = host;
+ _updater = updater;
+ _updaterDelegate = updaterDelegate;
+ _delegate = delegate;
+ }
+ return self;
+}
+
+- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
+{
+ NSMutableDictionary *requestHTTPHeaders = NSMutableDictionary dictionary;
+ if (httpHeaders != nil) {
+ requestHTTPHeaders addEntriesFromDictionary:(NSDictionary * _Nonnull)httpHeaders;
+ }
+ requestHTTPHeaders@"Accept" = @"application/rss+xml,*/*;q=0.1";
+ 
+ self.downloadDriver = SPUDownloadDriver alloc initWithRequestURL:appcastURL host:self.host userAgent:userAgent httpHeaders:requestHTTPHeaders inBackground:background delegate:self;
+ 
+ self.downloadDriver downloadFile;
+}
+
+- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
+{
+ SPUAppcastItemStateResolver *stateResolver = SPUAppcastItemStateResolver alloc initWithHostVersion:self.host.version applicationVersionComparator:self versionComparator standardVersionComparator:SUStandardVersionComparator defaultComparator;
+ 
+ NSError *appcastError = nil;
+ SUAppcast *appcast = SUAppcast alloc initWithXMLData:downloadData.data relativeToURL:downloadData.URL stateResolver:stateResolver error:&appcastError;
+ 
+ if (appcast == nil) {
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithObject:SULocalizedString(@"An error occurred while parsing the update feed.", nil) forKey:NSLocalizedDescriptionKey;
+ 
+ if (appcastError != nil) {
+ userInfo setObject:appcastError forKey:NSUnderlyingErrorKey;
+ }
+ 
+ self.delegate didFailToFetchAppcastWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:userInfo;
+ } else {
+ self appcastDidFinishLoading:appcast inBackground:self.downloadDriver.inBackground;
+ }
+}
+
+- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
+{
+ SULog(SULogLevelError, @"Encountered download feed error: %@", error);
+
+ NSMutableDictionary *userInfo = NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedString(@"An error occurred in retrieving update information. Please try again later.", nil)};
+ 
+ if (error != nil) {
+ userInfo setObject:error forKey:NSUnderlyingErrorKey;
+ }
+ 
+ self.delegate didFailToFetchAppcastWithError:NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo;
+}
+
+- (SUAppcastItem * _Nullable)preferredUpdateForRegularAppcastItem:(SUAppcastItem * _Nullable)regularItem secondaryUpdate:(SUAppcastItem * __autoreleasing _Nullable *)secondaryUpdate
+{
+ SUAppcastItem *deltaItem = (regularItem != nil) ? self class deltaUpdateFromAppcastItem:regularItem hostVersion:self.host.version : nil;
+ 
+ BOOL supportsDeltaItem;
+ if (deltaItem == nil) {
+ supportsDeltaItem = NO;
+ } else {
+ // Delta updates are not supported when bundles are transferred over to some file systems like fat32 and exfat systems
+ // This is because they do not preserve permissions completely, which we require for diff'ing.
+ // We shouldn't download delta updates in cases where we can detect they aren't supported
+ // More accurately we will detect if the host bundle's permission bits have been 'tainted'
+ // which is more reliable than checking the underlying file system.
+ // To do this, we will check the Sparkle executable's permission bits, which is produced from us
+ // We will also check if the executable file or the localization files have been stripped from Sparkle.framework
+ 
+ NSFileManager *fileManager = NSFileManager.defaultManager;
+ 
+ NSBundle *hostBundle = self.host.bundle;
+ NSString *sparkleExecutablePath;
+ NSString *sparkleResourcesPath;
+ if (hostBundle isEqual:NSBundle.mainBundle) {
+ NSBundle *sparkleBundle = NSBundle bundleForClass:self class;
+ sparkleExecutablePath = sparkleBundle.executableURL.URLByResolvingSymlinksInPath.path;
+ sparkleResourcesPath = sparkleBundle.resourcePath;
+ } else {
+ // If we are not updating ourselves, make a good guess to the Sparkle executable location
+ NSURL *frameworksURL = hostBundle.privateFrameworksURL;
+ NSURL *sparkleSymlinkURL = frameworksURL URLByAppendingPathComponent:@"Sparkle.framework/Sparkle";
+ NSString *candidateExecutablePath = sparkleSymlinkURL.URLByResolvingSymlinksInPath.path;
+ 
+ if (fileManager fileExistsAtPath:candidateExecutablePath) {
+ sparkleExecutablePath = candidateExecutablePath;
+ sparkleResourcesPath = candidateExecutablePath.stringByDeletingLastPathComponent stringByAppendingPathComponent:@"Resources";
+ } else {
+ sparkleExecutablePath = nil;
+ sparkleResourcesPath = nil;
+ }
+ }
+ 
+ if (sparkleExecutablePath != nil) {
+ NSError *attributesError = nil;
+ NSDictionary<NSFileAttributeKey, id> *attributes = fileManager attributesOfItemAtPath:sparkleExecutablePath error:&attributesError;
+ 
+ BOOL sparkleExecutableIsOK;
+ if (attributes != nil) {
+ // Skip delta updates if permissions are not 0755
+ NSNumber *posixPermissions = attributesNSFilePosixPermissions;
+ if (posixPermissions != nil && posixPermissions.shortValue != 0755) {
+ sparkleExecutableIsOK = NO;
+ 
+ // Irregular permissions on the Sparkle executable could mean the app was transferred on a file system we don't support
+ // (which doesn't track all permissions)
+ SULog(SULogLevelDefault, @"Encountered irregular POSIX permissions 0%o for Sparkle executable, which is not 0755. Skipping delta updates..", posixPermissions.shortValue);
+ } else {
+ // Test if Sparkle's executable file on disk has expected file size for applying this delta update
+ // If the file size has been reduced, the user could have stripped an architecture out
+ if (deltaItem.deltaFromSparkleExecutableSize != nil) {
+ NSNumber *fileSize = attributesNSFileSize;
+ if (fileSize != nil && !deltaItem.deltaFromSparkleExecutableSize isEqualToNumber:fileSize) {
+ sparkleExecutableIsOK = NO;
+ 
+ SULog(SULogLevelDefault, @"Expected file size (%lld) of Sparkle's executable does not match actual file size (%lld). Skipping delta update.", deltaItem.deltaFromSparkleExecutableSize.unsignedLongLongValue, fileSize.unsignedLongLongValue);
+ } else {
+ sparkleExecutableIsOK = YES;
+ }
+ } else {
+ sparkleExecutableIsOK = YES;
+ }
+ }
+ } else {
+ sparkleExecutableIsOK = YES;
+ 
+ SULog(SULogLevelError, @"Error: Failed to retrieve attributes from Sparkle executable: %@", attributesError.localizedDescription);
+ }
+ 
+ // Test if Sparkle's expected localization files on disk are still present for applying this delta update
+ // If there are missing localization files, the user could have stripped them out
+ // No need to test this though if !sparkleExecutableIsOK
+ BOOL sparkleResourcesAreOK;
+ if (sparkleExecutableIsOK && sparkleResourcesPath != nil && deltaItem.deltaFromSparkleLocales != nil) {
+ BOOL foundAllExpectedLocales = YES;
+ for (NSString *locale in deltaItem.deltaFromSparkleLocales) {
+ NSString *localeProjectPath = sparkleResourcesPath stringByAppendingPathComponent:locale stringByAppendingPathExtension:@"lproj";
+ if (!fileManager fileExistsAtPath:localeProjectPath) {
+ foundAllExpectedLocales = NO;
+ 
+ SULog(SULogLevelDefault, @"Expected project locale (%@) is missing in Sparkle.framework. Skipping delta update.", locale);
+ break;
+ }
+ }
+ 
+ sparkleResourcesAreOK = foundAllExpectedLocales;
+ } else {
+ sparkleResourcesAreOK = YES;
+ }
+ 
+ supportsDeltaItem = sparkleExecutableIsOK && sparkleResourcesAreOK;
+ } else {
+ supportsDeltaItem = YES;
+ 
+ SULog(SULogLevelError, @"Error: Failed to unexpectably retrieve Sparkle executable URL from %@", hostBundle.bundlePath);
+ }
+ }
+ 
+ if (supportsDeltaItem) {
+ if (secondaryUpdate != NULL) {
+ *secondaryUpdate = regularItem;
+ }
+ return deltaItem;
+ } else {
+ if (secondaryUpdate != NULL) {
+ *secondaryUpdate = nil;
+ }
+ return regularItem;
+ }
+}
+
+- (SUAppcastItem *)retrieveBestAppcastItemFromAppcast:(SUAppcast *)appcast versionComparator:(id<SUVersionComparison>)versionComparator secondaryUpdate:(SUAppcastItem * __autoreleasing _Nullable *)secondaryAppcastItem
+{
+ // Find the best valid update in the appcast by asking the delegate
+ // Don't ask the delegate if the appcast has no items though
+ SUAppcastItem *regularItemFromDelegate;
+ BOOL delegateOptedOutOfSelection;
+ if (appcast.items.count > 0 && self.updaterDelegate respondsToSelector:@selector((bestValidUpdateInAppcast:forUpdater:))) {
+ SUAppcastItem *candidateItem = self.updaterDelegate bestValidUpdateInAppcast:appcast forUpdater:(id _Nonnull)self.updater;
+ 
+ if (candidateItem == SUAppcastItem.emptyAppcastItem) {
+ regularItemFromDelegate = nil;
+ delegateOptedOutOfSelection = YES;
+ } else if (candidateItem == nil) {
+ regularItemFromDelegate = nil;
+ delegateOptedOutOfSelection = NO;
+ } else {
+ if (candidateItem.deltaUpdate) {
+ // Client would have to go out of their way to examine the .deltaUpdates to return one
+ // We need them to give us a regular update item back instead..
+ SULog(SULogLevelError, @"Error: -bestValidUpdateInAppcast:forUpdater: cannot return a delta update item");
+ regularItemFromDelegate = nil;
+ } else {
+ regularItemFromDelegate = candidateItem;
+ }
+ 
+ delegateOptedOutOfSelection = NO;
+ }
+ } else {
+ regularItemFromDelegate = nil;
+ delegateOptedOutOfSelection = NO;
+ }
+ 
+ // Take care of finding best appcast item ourselves if delegate does not
+ SUAppcastItem *regularItem;
+ if (regularItemFromDelegate == nil && !delegateOptedOutOfSelection) {
+ regularItem = self class bestItemFromAppcastItems:appcast.items comparator:versionComparator;
+ } else {
+ regularItem = regularItemFromDelegate;
+ }
+ 
+ // Retrieve the preferred primary and secondary update items
+ // In the case of a delta update, the preferred primary item will be the delta update,
+ // and the secondary item will be the regular update.
+ return self preferredUpdateForRegularAppcastItem:regularItem secondaryUpdate:secondaryAppcastItem;
+}
+
+- (void)appcastDidFinishLoading:(SUAppcast *)loadedAppcast inBackground:(BOOL)background
+{
+ self.delegate didFinishLoadingAppcast:loadedAppcast;
+ 
+ NSDictionary *userInfo = @{ SUUpdaterAppcastNotificationKey: loadedAppcast };
+ NSNotificationCenter defaultCenter postNotificationName:SUUpdaterDidFinishLoadingAppCastNotification object:self.updater userInfo:userInfo;
+ 
+ NSSet<NSString *> *allowedChannels;
+ if (self.updaterDelegate respondsToSelector:@selector(allowedChannelsForUpdater:)) {
+ allowedChannels = self.updaterDelegate allowedChannelsForUpdater:self.updater;
+ if (allowedChannels == nil) {
+ SULog(SULogLevelError, @"Error: -allowedChannelsForUpdater: cannot return nil. Treating this as an empty set.");
+ allowedChannels = NSSet set;
+ }
+ } else {
+ allowedChannels = NSSet set;
+ }
+ 
+ SUAppcast *macOSAppcast = self class filterAppcast:loadedAppcast forMacOSAndAllowedChannels:allowedChannels;
+ 
+ id<SUVersionComparison> applicationVersionComparator = self versionComparator;
+ 
+ NSNumber *phasedUpdateGroup = background ? @(SUPhasedUpdateGroupInfo updateGroupForHost:self.host) : nil;
+ 
+ SPUSkippedUpdate *skippedUpdate = background ? SPUSkippedUpdate skippedUpdateForHost:self.host : nil;
+ 
+ NSDate *currentDate = NSDate date;
+ 
+ // First filter out min/max OS version and see if there's an update that passes
+ // the minimum autoupdate version. We filter out updates that fail the minimum
+ // autoupdate version test because we have a preference over minor updates that can be
+ // downloaded and installed with less disturbance
+ SUAppcast *passesMinimumAutoupdateAppcast = self class filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:self.host.version versionComparator:applicationVersionComparator testOSVersion:YES testMinimumAutoupdateVersion:YES;
+ 
+ SUAppcastItem *secondaryItemPassesMinimumAutoupdate = nil;
+ SUAppcastItem *primaryItemPassesMinimumAutoupdate = self retrieveBestAppcastItemFromAppcast:passesMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&secondaryItemPassesMinimumAutoupdate;
+ 
+ // If we weren't able to find a valid update, try to find an update that
+ // doesn't pass the minimum autoupdate version
+ SUAppcastItem *finalPrimaryItem;
+ SUAppcastItem *finalSecondaryItem = nil;
+ if (!self isItemNewer:primaryItemPassesMinimumAutoupdate) {
+ SUAppcast *failsMinimumAutoupdateAppcast = self class filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:self.host.version versionComparator:applicationVersionComparator testOSVersion:YES testMinimumAutoupdateVersion:NO;
+ 
+ finalPrimaryItem = self retrieveBestAppcastItemFromAppcast:failsMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&finalSecondaryItem;
+ } else {
+ finalPrimaryItem = primaryItemPassesMinimumAutoupdate;
+ finalSecondaryItem = secondaryItemPassesMinimumAutoupdate;
+ }
+ 
+ if (self isItemNewer:finalPrimaryItem) {
+ // We found a suitable update
+ self.delegate didFindValidUpdateWithAppcastItem:finalPrimaryItem secondaryAppcastItem:finalSecondaryItem;
+ } else {
+ // Find the latest appcast item that we can report to the user and updater delegates
+ // This may include updates that fail due to OS version requirements.
+ // This excludes newer backgrounded updates that fail because they are skipped or not in current phased rollout group
+ SUAppcast *notFoundAppcast = self class filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:self.host.version versionComparator:applicationVersionComparator testOSVersion:NO testMinimumAutoupdateVersion:NO;
+ 
+ SUAppcastItem *notFoundPrimaryItem = self retrieveBestAppcastItemFromAppcast:notFoundAppcast versionComparator:applicationVersionComparator secondaryUpdate:nil;
+ 
+ NSComparisonResult hostToLatestAppcastItemComparisonResult;
+ if (notFoundPrimaryItem != nil) {
+ hostToLatestAppcastItemComparisonResult = applicationVersionComparator compareVersion:self.host.version toVersion:notFoundPrimaryItem.versionString;
+ } else {
+ hostToLatestAppcastItemComparisonResult = 0;
+ }
+ 
+ self.delegate didNotFindUpdateWithLatestAppcastItem:notFoundPrimaryItem hostToLatestAppcastItemComparisonResult:hostToLatestAppcastItemComparisonResult background:background;
+ }
+}
+
+// This method is used by unit tests
++ (SUAppcast *)filterAppcast:(SUAppcast *)appcast forMacOSAndAllowedChannels:(NSSet<NSString *> *)allowedChannels
+{
+ return appcast copyByFilteringItems:^(SUAppcastItem *item) {
+ // We will never care about other OS's
+ BOOL macOSUpdate = item isMacOsUpdate;
+ if (!macOSUpdate) {
+ return NO;
+ }
+ 
+ // Delta updates cannot be top-level entries
+ BOOL isDeltaUpdate = item isDeltaUpdate;
+ if (isDeltaUpdate) {
+ return NO;
+ }
+ 
+ NSString *channel = item.channel;
+ if (channel == nil) {
+ // Item is on the default channel
+ return YES;
+ }
+ 
+ return allowedChannels containsObject:channel;
+ };
+}
+
+// This method is used by unit tests
++ (SUAppcast *)filterSupportedAppcast:(SUAppcast *)appcast phasedUpdateGroup:(NSNumber * _Nullable)phasedUpdateGroup skippedUpdate:(SPUSkippedUpdate * _Nullable)skippedUpdate currentDate:(NSDate *)currentDate hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator testOSVersion:(BOOL)testOSVersion testMinimumAutoupdateVersion:(BOOL)testMinimumAutoupdateVersion
+{
+ BOOL hostPassesSkippedMajorVersion = SPUAppcastItemStateResolver isMinimumAutoupdateVersionOK:skippedUpdate.majorVersion hostVersion:hostVersion versionComparator:versionComparator;
+ 
+ return appcast copyByFilteringItems:^(SUAppcastItem *item) {
+ BOOL passesOSVersion = (!testOSVersion || (item.minimumOperatingSystemVersionIsOK && item.maximumOperatingSystemVersionIsOK));
+ 
+ BOOL passesPhasedRollout = self itemIsReadyForPhasedRollout:item phasedUpdateGroup:phasedUpdateGroup currentDate:currentDate hostVersion:hostVersion versionComparator:versionComparator;
+ 
+ BOOL passesMinimumAutoupdateVersion = (!testMinimumAutoupdateVersion || !item.majorUpgrade);
+ 
+ BOOL passesSkippedUpdates = (versionComparator == nil || hostVersion == nil || !self item:item containsSkippedUpdate:skippedUpdate hostPassesSkippedMajorVersion:hostPassesSkippedMajorVersion versionComparator:versionComparator);
+ 
+ return (BOOL)(passesOSVersion && passesPhasedRollout && passesMinimumAutoupdateVersion && passesSkippedUpdates);
+ };
+}
+
++ (SUAppcastItem * _Nullable)deltaUpdateFromAppcastItem:(SUAppcastItem *)appcastItem hostVersion:(NSString *)hostVersion
+{
+ return appcastItem.deltaUpdateshostVersion;
+}
+
++ (SUAppcastItem * _Nullable)bestItemFromAppcastItems:(NSArray *)appcastItems comparator:(id<SUVersionComparison>)comparator
+{
+ SUAppcastItem *item = nil;
+ for(SUAppcastItem *candidate in appcastItems) {
+ // Note if two items are equal, we must select the first matching one
+ if (!item || comparator compareVersion:item.versionString toVersion:candidate.versionString == NSOrderedAscending) {
+ item = candidate;
+ }
+ }
+ return item;
+}
+
+// This method is used by unit tests
+// This method should not do *any* filtering, only version comparing
++ (SUAppcastItem *)bestItemFromAppcastItems:(NSArray *)appcastItems getDeltaItem:(SUAppcastItem * __autoreleasing *)deltaItem withHostVersion:(NSString *)hostVersion comparator:(id<SUVersionComparison>)comparator
+{
+ SUAppcastItem *item = self bestItemFromAppcastItems:appcastItems comparator:comparator;
+ if (item != nil && deltaItem != NULL) {
+ *deltaItem = self deltaUpdateFromAppcastItem:item hostVersion:hostVersion;
+ }
+ return item;
+}
+
+- (id<SUVersionComparison>)versionComparator
+{
+ id<SUVersionComparison> comparator = nil;
+ 
+ // Give the delegate a chance to provide a custom version comparator
+ if (self.updaterDelegate respondsToSelector:@selector((versionComparatorForUpdater:))) {
+ comparator = self.updaterDelegate versionComparatorForUpdater:self.updater;
+ }
+ 
+ // If we don't get a comparator from the delegate, use the default comparator
+ if (comparator == nil) {
+ comparator = SUStandardVersionComparator defaultComparator;
+ }
+ 
+ return comparator;
+}
+
+- (BOOL)isItemNewer:(SUAppcastItem *)ui
+{
+ return ui != nil && self versionComparator compareVersion:self.host.version toVersion:ui.versionString == NSOrderedAscending;
+}
+
++ (BOOL)item:(SUAppcastItem *)ui containsSkippedUpdate:(SPUSkippedUpdate * _Nullable)skippedUpdate hostPassesSkippedMajorVersion:(BOOL)hostPassesSkippedMajorVersion versionComparator:(id<SUVersionComparison>)versionComparator
+{
+ NSString *skippedMajorVersion = skippedUpdate.majorVersion;
+ NSString *skippedMajorSubreleaseVersion = skippedUpdate.majorSubreleaseVersion;
+ 
+ if (!hostPassesSkippedMajorVersion && skippedMajorVersion != nil && ui.minimumAutoupdateVersion != nil && versionComparator compareVersion:skippedMajorVersion toVersion:(NSString * _Nonnull)ui.minimumAutoupdateVersion != NSOrderedAscending && (ui.ignoreSkippedUpgradesBelowVersion == nil || (skippedMajorSubreleaseVersion != nil && versionComparator compareVersion:skippedMajorSubreleaseVersion toVersion:(NSString * _Nonnull)ui.ignoreSkippedUpgradesBelowVersion != NSOrderedAscending))) {
+ // If skipped major version is >= than the item's minimumAutoupdateVersion, we can skip the item.
+ // But if there is an ignoreSkippedUpgradesBelowVersion, we can only skip the item if the last skipped subrelease
+ // version is >= than that version provided by the item
+ return YES;
+ }
+ 
+ NSString *skippedMinorVersion = skippedUpdate.minorVersion;
+ 
+ if (skippedMinorVersion != nil && versionComparator compareVersion:skippedMinorVersion toVersion:ui.versionString != NSOrderedAscending) {
+ // Item is on a less or equal version than a minor version we've skipped
+ // So we skip this item
+ return YES;
+ }
+ 
+ return NO;
+}
+
++ (BOOL)itemIsReadyForPhasedRollout:(SUAppcastItem *)ui phasedUpdateGroup:(NSNumber * _Nullable)phasedUpdateGroup currentDate:(NSDate *)currentDate hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator
+{
+ if (phasedUpdateGroup == nil || ui.criticalUpdate) {
+ return YES;
+ }
+ 
+ NSNumber *phasedRolloutIntervalObject = ui phasedRolloutInterval;
+ if (phasedRolloutIntervalObject == nil) {
+ return YES;
+ }
+ 
+ NSDate* itemReleaseDate = ui.date;
+ if (itemReleaseDate == nil) {
+ return YES;
+ }
+ 
+ NSTimeInterval timeSinceRelease = currentDate timeIntervalSinceDate:itemReleaseDate;
+ 
+ NSTimeInterval phasedRolloutInterval = phasedRolloutIntervalObject doubleValue;
+ NSTimeInterval timeToWaitForGroup = phasedRolloutInterval * phasedUpdateGroup.unsignedIntegerValue;
+ 
+ if (timeSinceRelease >= timeToWaitForGroup) {
+ return YES;
+ }
+ 
+ return NO;
+}
+
+- (void)cleanup:(void (^)(void))completionHandler
+{
+ if (self.downloadDriver == nil) {
+ completionHandler();
+ } else {
+ self.downloadDriver cleanup:completionHandler;
+ }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcastItem+Private.h Added

@@ -0,0 +1,39 @@
+//
+// SUAppcastItem+Private.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/30/21.
+// Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUAppcastItem_Private_h
+#define SUAppcastItem_Private_h
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Available in SPUAppcastItemStateResolver.h (a private exposed header)
+@class SPUAppcastItemStateResolver;
+@class SUSignatures;
+
+@interface SUAppcastItem (Private) <NSSecureCoding>
+
+/**
+ Initializes with data from a dictionary provided by the RSS class and state resolver
+
+ This initializer method is intended to be marked "private" and discouraged from public usage.
+ This method is available however. Talk to us to describe your use case and if you need to construct appcast items yourself.
+ */
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error;
+
+/**
+ The DSA and EdDSA signatures along with their statuses.
+ */
+@property (readonly, nullable) SUSignatures *signatures;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif /* SUAppcastItem_Private_h */

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcastItem.h Added

@@ -0,0 +1,391 @@
+//
+// SUAppcastItem.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/12/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUAPPCASTITEM_H
+#define SUAPPCASTITEM_H
+
+#import <Foundation/Foundation.h>
+
+#ifdef BUILDING_SPARKLE_TESTS
+// Ignore incorrect warning
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "SUExport.h"
+#pragma clang diagnostic pop
+#else
+#import <Sparkle/SUExport.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ The appcast item describing an update in the application's appcast feed.
+
+ An appcast item represents a single update item in the `SUAppcast` contained within the @c <item> element.
+ 
+ Every appcast item must have a `versionString`, and either a `fileURL` or an `infoURL`.
+ All the remaining properties describing an update to the application are optional.
+ 
+ Extended documentation and examples on using appcast item features are available at:
+ https://sparkle-project.org/documentation/publishing/
+ */
+SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
+
+/**
+ The version of the update item.
+ 
+ Sparkle uses this property to compare update items and determine the best available update item in the `SUAppcast`.
+ 
+ This corresponds to the application update's @c CFBundleVersion
+ 
+ This is extracted from the @c <sparkle:version> element, or the @c sparkle:version attribute from the @c <enclosure> element.
+ */
+@property (copy, readonly) NSString *versionString;
+
+/**
+ The human-readable display version of the update item if provided.
+ 
+ This is the version string shown to the user when they are notified of a new update.
+ 
+ This corresponds to the application update's @c CFBundleShortVersionString
+ 
+ This is extracted from the @c <sparkle:shortVersionString> element, or the @c sparkle:shortVersionString attribute from the @c <enclosure> element.
+ 
+ If no short version string is available, this falls back to the update's `versionString`.
+ */
+@property (copy, readonly) NSString *displayVersionString;
+
+/**
+ The file URL to the update item if provided.
+ 
+ This download contains the actual update Sparkle will attempt to install.
+ In cases where a download cannot be provided, an `infoURL` must be provided instead.
+ 
+ A file URL should have an accompanying `contentLength` provided.
+ 
+ This is extracted from the @c url attribute in the @c <enclosure> element.
+ */
+@property (readonly, nullable) NSURL *fileURL;
+
+/**
+ The content length of the download in bytes.
+ 
+ This property is used as a fallback when the server doesn't report the content length of the download.
+ In that case, it is used to report progress of the downloading update to the user.
+ 
+ A warning is outputted if this property is not equal the server's expected content length (if provided).
+ 
+ This is extracted from the @c length attribute in the @c <enclosure> element.
+ It should be specified if a `fileURL` is provided.
+ */
+@property (nonatomic, readonly) uint64_t contentLength;
+
+/**
+ The info URL to the update item if provided.
+ 
+ This informational link is used to direct the user to learn more about an update they cannot download/install directly from within the application.
+ The link should point to the product's web page.
+ 
+ The informational link will be used if `informationOnlyUpdate` is @c YES
+ 
+ This is extracted from the @c <link> element.
+ */
+@property (readonly, nullable) NSURL *infoURL;
+
+/**
+ Indicates whether or not the update item is only informational and has no download.
+ 
+ If `infoURL` is not present, this is @c NO
+ 
+ If `fileURL` is not present, this is @c YES
+ 
+ Otherwise this is determined based on the contents extracted from the @c <sparkle:informationalUpdate> element.
+ */
+@property (getter=isInformationOnlyUpdate, readonly) BOOL informationOnlyUpdate;
+
+/**
+ The title of the appcast item if provided.
+ 
+ This is extracted from the @c <title> element.
+ */
+@property (copy, readonly, nullable) NSString *title;
+
+/**
+ The date string of the appcast item if provided.
+ 
+ The `date` property is constructed from this property and expects this string to comply with the following date format:
+ `E, dd MMM yyyy HH:mm:ss Z`
+ 
+ This is extracted from the @c <pubDate> element.
+ */
+@property (copy, readonly, nullable) NSString *dateString;
+
+/**
+ The date constructed from the `dateString` property if provided.
+ 
+ Sparkle by itself only uses this property for phased group rollouts specified via `phasedRolloutInterval`, but clients may query this property too.
+ 
+ This date is constructed using the @c en_US locale.
+ */
+@property (copy, readonly, nullable) NSDate *date;
+
+/**
+ The release notes URL of the appcast item if provided.
+ 
+ This external link points to an HTML file that Sparkle downloads and renders to show the user a new or old update item's changelog.
+ 
+ An alternative to using an external release notes link is providing an embedded `itemDescription`.
+ 
+ This is extracted from the @c <sparkle:releaseNotesLink> element.
+ */
+@property (readonly, nullable) NSURL *releaseNotesURL;
+
+/**
+ The description of the appcast item if provided.
+ 
+ A description may be provided for inline/embedded release notes for new updates using @c <!CDATA...>
+ This is an alternative to providing a `releaseNotesURL`.
+ 
+ This is extracted from the @c <description> element.
+ */
+@property (copy, readonly, nullable) NSString *itemDescription;
+
+/**
+ The full release notes URL of the appcast item if provided.
+ 
+ The link should point to the product's full changelog.
+ 
+ Sparkle's standard user interface offers to show these full release notes when a user checks for a new update and no new update is available.
+ 
+ This is extracted from the @c <sparkle:fullReleaseNotesLink> element.
+ */
+@property (readonly, nullable) NSURL *fullReleaseNotesURL;
+
+/**
+ The required minimum system operating version string for this update if provided.
+ 
+ This version string should contain three period-separated components.
+ 
+ Example: @c 10.13.0
+ 
+ Use `minimumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement.
+ 
+ This is extracted from the @c <sparkle:minimumSystemVersion> element.
+ */
+@property (copy, readonly, nullable) NSString *minimumSystemVersion;
+
+/**
+ Indicates whether or not the current running system passes the `minimumSystemVersion` requirement.
+ */
+@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK;
+
+/**
+ The required maximum system operating version string for this update if provided.
+ 
+ A maximum system operating version requirement should only be made in unusual scenarios.
+ 
+ This version string should contain three period-separated components.
+ 
+ Example: @c 10.14.0
+ 
+ Use `maximumOperatingSystemVersionIsOK` property to test if the current running system passes this requirement.
+ 
+ This is extracted from the @c <sparkle:maximumSystemVersion> element.
+ */
+@property (copy, readonly, nullable) NSString *maximumSystemVersion;
+
+/**
+ Indicates whether or not the current running system passes the `maximumSystemVersion` requirement.
+ */
+@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK;
+
+/**
+ The channel the update item is on if provided.
+ 
+ An update item may specify a custom channel name (such as @c beta) that can only be found by updaters that filter for that channel.
+ If no channel is provided, the update item is assumed to be on the default channel.
+ 
+ This is extracted from the @c <sparkle:channel> element.
+ Old applications must be using Sparkle 2 or later to interpret the channel element and to ignore unmatched channels.
+ */
+@property (nonatomic, readonly, nullable) NSString *channel;
+
+/**
+ The installation type of the update at `fileURL`
+ 
+ This may be:
+ - @c application - indicates this is a regular application update.
+ - @c package - indicates this is a guided package installer update.
+ - @c interactive-package - indicates this is an interactive package installer update (deprecated; use "package" instead)
+ 
+ This is extracted from the @c sparkle:installationType attribute in the @c <enclosure> element.
+ 
+ If no installation type is provided in the enclosure, the installation type is inferred from the `fileURL` file extension instead.
+ 
+ If the file extension is @c pkg or @c mpkg, the installation type is @c package otherwise it is @c application
+ 
+ Hence, the installation type in the enclosure element only needs to be specified for package based updates distributed inside of a @c zip or other archive format.
+ 
+ Old applications must be using Sparkle 1.26 or later to support downloading bare package updates (`pkg` or `mpkg`) that are not additionally archived inside of a @c zip or other archive format.
+ */
+@property (nonatomic, copy, readonly) NSString *installationType;
+
+/**
+ The phased rollout interval of the update item in seconds if provided.
+ 
+ This is the interval between when different groups of users are notified of a new update.
+ 
+ For this property to be used by Sparkle, the published `date` on the update item must be present as well.
+ 
+ After each interval after the update item's `date`, a new group of users become eligible for being notified of the new update.
+ 
+ This is extracted from the @c <sparkle:phasedRolloutInterval> element.
+ 
+ Old applications must be using Sparkle 1.25 or later to support phased rollout intervals, otherwise they may assume updates are immediately available.
+ */
+@property (copy, readonly, nullable) NSNumber* phasedRolloutInterval;
+
+/**
+ The minimum bundle version string this update requires for automatically downloading and installing updates if provided.
+ 
+ If an application's bundle version meets this version requirement, it can install the new update item in the background automatically.
+ 
+ Otherwise if the requirement is not met, the user is always prompted to install the update. In this case, the update is assumed to be a `majorUpgrade`.
+ 
+ If the update is a `majorUpgrade` and the update is skipped by the user, other future update alerts with the same `minimumAutoupdateVersion` will also be skipped automatically unless an update specifies `ignoreSkippedUpgradesBelowVersion`.
+ 
+ This version string corresponds to the application's @c CFBundleVersion
+ 
+ This is extracted from the @c <sparkle:minimumAutoupdateVersion> element.
+ */
+@property (copy, readonly, nullable) NSString *minimumAutoupdateVersion;
+
+/**
+ Indicates whether or not the update item is a major upgrade.
+ 
+ An update is a major upgrade if the application's bundle version doesn't meet the `minimumAutoupdateVersion` requirement.
+ */
+@property (getter=isMajorUpgrade, readonly) BOOL majorUpgrade;
+
+/**
+ Previously skipped upgrades by the user will be ignored if they skipped an update whose version precedes this version.
+ 
+ This can only be applied if the update is a `majorUpgrade`.
+ 
+ This version string corresponds to the application's @c CFBundleVersion
+ 
+ This is extracted from the @c <sparkle:ignoreSkippedUpgradesBelowVersion> element.
+ 
+ Old applications must be using Sparkle 2.1 or later, otherwise this property will be ignored.
+ */
+@property (nonatomic, readonly, nullable) NSString *ignoreSkippedUpgradesBelowVersion;
+
+/**
+ Indicates whether or not the update item is critical.
+ 
+ Critical updates are shown to the user more promptly. Sparkle's standard user interface also does not allow them to be skipped.
+ 
+ This is determined and extracted from a top-level @c <sparkle:criticalUpdate> element or a @c sparkle:criticalUpdate element inside of a @c sparkle:tags element.
+ 
+ Old applications must be using Sparkle 2 or later to support the top-level @c <sparkle:criticalUpdate> element.
+ */
+@property (getter=isCriticalUpdate, readonly) BOOL criticalUpdate;
+
+/**
+ Specifies the operating system the download update is available for if provided.
+ 
+ If this property is not provided, then the supported operating system is assumed to be macOS.
+ 
+ Known potential values for this string are @c macos and @c windows
+ 
+ Sparkle on Mac ignores update items that are for other operating systems.
+ This is only useful for sharing appcasts between Sparkle on Mac and Sparkle on other operating systems.
+ 
+ Use `macOsUpdate` property to test if this update item is for macOS.
+ 
+ This is extracted from the @c sparkle:os attribute in the @c <enclosure> element.
+ */
+@property (copy, readonly, nullable) NSString *osString;
+
+/**
+ Indicates whether or not this update item is for macOS.
+ 
+ This is determined from the `osString` property.
+ */
+@property (getter=isMacOsUpdate, readonly) BOOL macOsUpdate;
+
+/**
+ The delta updates for this update item.
+ 
+ Sparkle uses these to download and apply a smaller update based on the version the user is updating from.
+ 
+ The key is based on the @c sparkle:version of the update.
+ The value is an update item that will have `deltaUpdate` be @c YES
+ 
+ Clients typically should not need to examine the contents of the delta updates.
+ 
+ This is extracted from the @c <sparkle:deltas> element.
+ */
+@property (copy, readonly, nullable) NSDictionary<NSString *, SUAppcastItem *> *deltaUpdates;
+
+/**
+ The expected size of the Sparkle executable file before applying this delta update.
+ 
+ This attribute is used to test if the delta item can still be applied. If Sparkle's executable file has changed (e.g. from having an architecture stripped),
+ then the delta item cannot be applied.
+ 
+ This is extracted from the @c sparkle:deltaFromSparkleExecutableSize attribute from the @c <enclosure> element of a @c sparkle:deltas item.
+ This attribute is optional for delta update items.
+ */
+@property (nonatomic, readonly, nullable) NSNumber *deltaFromSparkleExecutableSize;
+
+/**
+ An expected set of Sparkle's locales present on disk before applying this delta update.
+ 
+ This attribute is used to test if the delta item can still be applied. If Sparkle's list of locales present on disk (.lproj directories) do not contain any items from this set,
+ (e.g. from having localization files stripped) then the delta item cannot be applied. This set does not need to be a complete list of locales. Sparkle may even decide
+ to not process all them. 1-10 should be a decent amount.
+ 
+ This is extracted from the @c sparkle:deltaFromSparkleLocales attribute from the @c <enclosure> element of a @c sparkle:deltas item.
+ The locales extracted from this attribute are delimited by a comma (e.g. "en,ca,fr,hr,hu"). This attribute is optional for delta update items.
+ */
+@property (nonatomic, readonly, nullable) NSSet<NSString *> *deltaFromSparkleLocales;
+
+/**
+ Indicates whether or not the update item is a delta update.
+ 
+ An update item is a delta update if it is in the `deltaUpdates` of another update item.
+ */
+@property (getter=isDeltaUpdate, readonly) BOOL deltaUpdate;
+
+/**
+ The dictionary representing the entire appcast item.
+ 
+ This is useful for querying custom extensions or elements from the appcast item.
+ */
+@property (readonly, copy) NSDictionary *propertiesDictionary;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ An empty appcast item.
+ 
+ This may be used as a potential return value in `-SPUUpdaterDelegate bestValidUpdateInAppcast:forUpdater:`
+ */
++ (instancetype)emptyAppcastItem;
+
+// Deprecated initializers
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case.");
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case.");
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error __deprecated_msg("Properties that depend on the system or application version are not supported when used with this initializer. The designated initializer is available in SUAppcastItem+Private.h. Please first explore other APIs or contact us to describe your use case.");
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUAppcastItem.m Added

@@ -0,0 +1,668 @@
+//
+// SUAppcastItem.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/12/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import "SUAppcastItem.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SULog.h"
+#import "SUConstants.h"
+#import "SUSignatures.h"
+#import "SPUInstallationType.h"
+#import "SPUAppcastItemState.h"
+#import "SPUAppcastItemStateResolver.h"
+#import "SPUAppcastItemStateResolver+Private.h"
+
+
+#include "AppKitPrevention.h"
+
+#define DELTA_EXPECTED_LOCALES_LIMIT 15
+
+static NSString *SUAppcastItemDeltaUpdatesKey = @"deltaUpdates";
+static NSString *SUAppcastItemDisplayVersionStringKey = @"displayVersionString";
+static NSString *SUAppcastItemSignaturesKey = @"signatures";
+static NSString *SUAppcastItemFileURLKey = @"fileURL";
+static NSString *SUAppcastItemInfoURLKey = @"infoURL";
+static NSString *SUAppcastItemContentLengthKey = @"contentLength";
+static NSString *SUAppcastItemDescriptionKey = @"itemDescription";
+static NSString *SUAppcastItemMaximumSystemVersionKey = @"maximumSystemVersion";
+static NSString *SUAppcastItemMinimumSystemVersionKey = @"minimumSystemVersion";
+static NSString *SUAppcastItemReleaseNotesURLKey = @"releaseNotesURL";
+static NSString *SUAppcastItemFullReleaseNotesURLKey = @"fullReleaseNotesURL";
+static NSString *SUAppcastItemTitleKey = @"title";
+static NSString *SUAppcastItemVersionStringKey = @"versionString";
+static NSString *SUAppcastItemPropertiesKey = @"propertiesDictionary";
+static NSString *SUAppcastItemInstallationTypeKey = @"SUAppcastItemInstallationType";
+static NSString *SUAppcastItemStateKey = @"SUAppcastItemState";
+static NSString *SUAppcastItemDeltaFromSparkleExecutableSizeKey = @"SUAppcastItemDeltaFromSparkleExecutableSize";
+static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaFromSparkleLocales";
+
+@interface SUAppcastItem ()
+
+@property (readonly, nullable) SUSignatures *signatures;
+
+// Auxillary appcast item state that needs to be evaluated based on the host state
+// This may be nil if the client creates an SUAppcastItem with a deprecated initializer
+// In that case we will need to fallback to safe behavior
+@property (nonatomic, readonly, nullable) SPUAppcastItemState *state;
+
+// Indicates if we have any critical information. Used as a fallback if state is nil
+@property (nonatomic, readonly) BOOL hasCriticalInformation;
+
+// Indicates the versions we update from that are informational-only
+@property (nonatomic, readonly, nullable) NSSet<NSString *> *informationalUpdateVersions;
+
+@end
+
+@implementation SUAppcastItem
+
+@synthesize dateString = _dateString;
+@synthesize deltaUpdates = _deltaUpdates;
+@synthesize displayVersionString = _displayVersionString;
+@synthesize signatures = _signatures;
+@synthesize fileURL = _fileURL;
+@synthesize contentLength = _contentLength;
+@synthesize infoURL = _infoURL;
+@synthesize itemDescription = _itemDescription;
+@synthesize maximumSystemVersion = _maximumSystemVersion;
+@synthesize minimumSystemVersion = _minimumSystemVersion;
+@synthesize releaseNotesURL = _releaseNotesURL;
+@synthesize fullReleaseNotesURL = _fullReleaseNotesURL;
+@synthesize title = _title;
+@synthesize versionString = _versionString;
+@synthesize osString = _osString;
+@synthesize propertiesDictionary = _propertiesDictionary;
+@synthesize installationType = _installationType;
+@synthesize minimumAutoupdateVersion = _minimumAutoupdateVersion;
+@synthesize ignoreSkippedUpgradesBelowVersion = _ignoreSkippedUpgradesBelowVersion;
+@synthesize phasedRolloutInterval = _phasedRolloutInterval;
+@synthesize state = _state;
+@synthesize hasCriticalInformation = _hasCriticalInformation;
+@synthesize informationalUpdateVersions = _informationalUpdateVersions;
+@synthesize channel = _channel;
+@synthesize deltaFromSparkleExecutableSize = _deltaFromSparkleExecutableSize;
+@synthesize deltaFromSparkleLocales = _deltaFromSparkleLocales;
+
++ (BOOL)supportsSecureCoding
+{
+ return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+ self = super init;
+ 
+ if (self != nil) {
+ _deltaUpdates = decoder decodeObjectOfClasses:NSSet setWithArray:@NSDictionary class, SUAppcastItem class forKey:SUAppcastItemDeltaUpdatesKey;
+ _deltaFromSparkleExecutableSize = decoder decodeObjectOfClass:NSNumber class forKey:SUAppcastItemDeltaFromSparkleExecutableSizeKey;
+ _deltaFromSparkleLocales = decoder decodeObjectOfClasses:NSSet setWithArray:@NSSet class, NSString class forKey:SUAppcastItemDeltaFromSparkleLocalesKey;
+ 
+ _displayVersionString = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemDisplayVersionStringKey copy;
+ _signatures = (SUSignatures *)decoder decodeObjectOfClass:SUSignatures class forKey:SUAppcastItemSignaturesKey;
+ _fileURL = decoder decodeObjectOfClass:NSURL class forKey:SUAppcastItemFileURLKey;
+ _infoURL = decoder decodeObjectOfClass:NSURL class forKey:SUAppcastItemInfoURLKey;
+ 
+ if (_fileURL == nil && _infoURL == nil) {
+ return nil;
+ }
+ 
+ _contentLength = (uint64_t)decoder decodeInt64ForKey:SUAppcastItemContentLengthKey;
+ 
+ NSString *installationType = decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemInstallationTypeKey;
+ if (!SPUValidInstallationType(installationType)) {
+ return nil;
+ }
+ 
+ SPUAppcastItemState *state = decoder decodeObjectOfClass:SPUAppcastItemState class forKey:SUAppcastItemStateKey;
+ _state = state;
+ 
+ _installationType = installationType copy;
+ 
+ _itemDescription = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemDescriptionKey copy;
+ _maximumSystemVersion = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemMaximumSystemVersionKey copy;
+ _minimumSystemVersion = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemMinimumSystemVersionKey copy;
+ _minimumAutoupdateVersion = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastElementMinimumAutoupdateVersion copy;
+ _ignoreSkippedUpgradesBelowVersion = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion copy;
+ _releaseNotesURL = decoder decodeObjectOfClass:NSURL class forKey:SUAppcastItemReleaseNotesURLKey;
+ _fullReleaseNotesURL = decoder decodeObjectOfClass:NSURL class forKey:SUAppcastItemFullReleaseNotesURLKey;
+ _title = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemTitleKey copy;
+ 
+ NSString *versionString = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastItemVersionStringKey copy;
+ if (versionString == nil) {
+ return nil;
+ }
+ 
+ _versionString = versionString;
+ 
+ _osString = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastAttributeOsType copy;
+ 
+ NSDictionary *propertiesDictionary = decoder decodeObjectOfClasses:NSSet setWithArray:@NSDictionary class, NSString class, NSDate class, NSArray class forKey:SUAppcastItemPropertiesKey;
+ if (propertiesDictionary == nil) {
+ return nil;
+ }
+ 
+ _propertiesDictionary = propertiesDictionary;
+ 
+ _phasedRolloutInterval = decoder decodeObjectOfClass:NSNumber class forKey:SUAppcastElementPhasedRolloutInterval;
+ 
+ _channel = (NSString *)decoder decodeObjectOfClass:NSString class forKey:SUAppcastElementChannel copy;
+ }
+ 
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+ if (self.deltaUpdates != nil) {
+ encoder encodeObject:self.deltaUpdates forKey:SUAppcastItemDeltaUpdatesKey;
+ }
+ 
+ if (self.deltaFromSparkleExecutableSize != nil) {
+ encoder encodeObject:self.deltaFromSparkleExecutableSize forKey:SUAppcastItemDeltaFromSparkleExecutableSizeKey;
+ }
+ 
+ if (self.deltaFromSparkleLocales != nil) {
+ encoder encodeObject:self.deltaFromSparkleLocales forKey:SUAppcastItemDeltaFromSparkleLocalesKey;
+ }
+ 
+ if (self.displayVersionString != nil) {
+ encoder encodeObject:self.displayVersionString forKey:SUAppcastItemDisplayVersionStringKey;
+ }
+ 
+ if (self.signatures != nil) {
+ encoder encodeObject:self.signatures forKey:SUAppcastItemSignaturesKey;
+ }
+ 
+ if (self.fileURL != nil) {
+ encoder encodeObject:self.fileURL forKey:SUAppcastItemFileURLKey;
+ }
+ 
+ if (self.infoURL != nil) {
+ encoder encodeObject:self.infoURL forKey:SUAppcastItemInfoURLKey;
+ }
+ 
+ encoder encodeInt64:(int64_t)self.contentLength forKey:SUAppcastItemContentLengthKey;
+ 
+ if (self.itemDescription != nil) {
+ encoder encodeObject:self.itemDescription forKey:SUAppcastItemDescriptionKey;
+ }
+ 
+ if (self.maximumSystemVersion != nil) {
+ encoder encodeObject:self.maximumSystemVersion forKey:SUAppcastItemMaximumSystemVersionKey;
+ }
+ 
+ if (self.minimumSystemVersion != nil) {
+ encoder encodeObject:self.minimumSystemVersion forKey:SUAppcastItemMinimumSystemVersionKey;
+ }
+ 
+ if (self.minimumAutoupdateVersion != nil) {
+ encoder encodeObject:self.minimumAutoupdateVersion forKey:SUAppcastElementMinimumAutoupdateVersion;
+ }
+ 
+ if (self.ignoreSkippedUpgradesBelowVersion != nil) {
+ encoder encodeObject:self.ignoreSkippedUpgradesBelowVersion forKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion;
+ }
+ 
+ if (self.state != nil) {
+ encoder encodeObject:self.state forKey:SUAppcastItemStateKey;
+ }
+ 
+ if (self.releaseNotesURL != nil) {
+ encoder encodeObject:self.releaseNotesURL forKey:SUAppcastItemReleaseNotesURLKey;
+ }
+ 
+ if (self.fullReleaseNotesURL != nil) {
+ encoder encodeObject:self.fullReleaseNotesURL forKey:SUAppcastItemFullReleaseNotesURLKey;
+ }
+ 
+ if (self.title != nil) {
+ encoder encodeObject:self.title forKey:SUAppcastItemTitleKey;
+ }
+ 
+ if (self.versionString != nil) {
+ encoder encodeObject:self.versionString forKey:SUAppcastItemVersionStringKey;
+ }
+ 
+ if (self.osString != nil) {
+ encoder encodeObject:self.osString forKey:SUAppcastAttributeOsType;
+ }
+ 
+ if (self.propertiesDictionary != nil) {
+ encoder encodeObject:self.propertiesDictionary forKey:SUAppcastItemPropertiesKey;
+ }
+ 
+ if (self.installationType != nil) {
+ encoder encodeObject:self.installationType forKey:SUAppcastItemInstallationTypeKey;
+ }
+ 
+ if (self.phasedRolloutInterval != nil) {
+ encoder encodeObject:self.phasedRolloutInterval forKey:SUAppcastElementPhasedRolloutInterval;
+ }
+ 
+ if (self.channel != nil) {
+ encoder encodeObject:self.channel forKey:SUAppcastElementChannel;
+ }
+}
+
+- (BOOL)isDeltaUpdate
+{
+ NSDictionary *rssElementEnclosure = self.propertiesDictionary objectForKey:SURSSElementEnclosure;
+ return rssElementEnclosure objectForKey:SUAppcastAttributeDeltaFrom != nil;
+}
+
+- (BOOL)isCriticalUpdate
+{
+ if (self.state != nil) {
+ return self.state.criticalUpdate;
+ } else {
+ return self.hasCriticalInformation;
+ }
+}
+
+- (BOOL)isMajorUpgrade
+{
+ if (self.state != nil) {
+ return self.state.majorUpgrade;
+ } else {
+ return NO;
+ }
+}
+
+- (BOOL)minimumOperatingSystemVersionIsOK
+{
+ if (self.state != nil) {
+ return self.state.minimumOperatingSystemVersionIsOK;
+ } else {
+ return YES;
+ }
+}
+
+- (BOOL)maximumOperatingSystemVersionIsOK
+{
+ if (self.state != nil) {
+ return self.state.maximumOperatingSystemVersionIsOK;
+ } else {
+ return YES;
+ }
+}
+
+- (BOOL)isMacOsUpdate
+{
+ return self.osString == nil || self.osString isEqualToString:SUAppcastAttributeValueMacOS;
+}
+
+- (NSDate *)date
+{
+ NSString *dateString = self.dateString;
+ if (dateString == nil) {
+ return nil;
+ }
+ 
+ NSDateFormatter* dateFormatter = NSDateFormatter alloc init;
+ dateFormatter.locale = NSLocale alloc initWithLocaleIdentifier:@"en_US";
+ dateFormatter.dateFormat = @"E, dd MMM yyyy HH:mm:ss Z";
+ 
+ return dateFormatter dateFromString:dateString;
+}
+
+- (BOOL)isInformationOnlyUpdate
+{
+ if (self.state != nil) {
+ return self.state.informationalUpdate;
+ } else {
+ return (self.informationalUpdateVersions != nil && self.informationalUpdateVersions.count == 0);
+ }
+}
+
++ (instancetype)emptyAppcastItem
+{
+ static SUAppcastItem *emptyAppcastItem;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ emptyAppcastItem = SUAppcastItem alloc init;
+ });
+ return emptyAppcastItem;
+}
+
+// Initializer used for making delta items
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL state:(SPUAppcastItemState * _Nullable)state
+{
+ return self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:state failureReason:nil;
+}
+
+// Exported public initializer
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver failureReason:(NSString *__autoreleasing *)error
+{
+ return self initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver resolvedState:nil failureReason:error;
+}
+
+// Deprecated
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict
+{
+ return self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil failureReason:nil;
+}
+
+// Deprecated
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString *__autoreleasing *)error
+{
+ return self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil failureReason:error;
+}
+
+// Deprecated
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL failureReason:(NSString *__autoreleasing *)error
+{
+ return self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:nil failureReason:error;
+}
+
+- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver * _Nullable)stateResolver resolvedState:(SPUAppcastItemState * _Nullable)resolvedState failureReason:(NSString *__autoreleasing *)error
+{
+ self = super init;
+ if (self) {
+ _title = (NSString *)dict objectForKey:SURSSElementTitle copy;
+ 
+ NSDictionary *enclosure = dict objectForKey:SURSSElementEnclosure;
+
+ // Try to find a version string.
+ // Finding the new version number from the RSS feed is a little bit hacky. There are a few ways:
+ // 1. A "sparkle:version" attribute on the enclosure tag, an extension from the RSS spec.
+ // 2. If there isn't a version attribute, see if there is a version element (this is now the recommended path).
+ // 3. If there isn't a version element, Sparkle will parse the path in the enclosure, expecting
+ // that it will look like this: http://something.com/YourApp_0.5.zip. It'll read whatever's between the last
+ // underscore and the last period as the version number. So name your packages like this: APPNAME_VERSION.extension.
+ // The big caveat with this is that you can't have underscores in your version strings, as that'll confuse Sparkle.
+ // Feel free to change the separator string to a hyphen or something more suited to your needs if you like.
+ NSString *newVersion = enclosure objectForKey:SUAppcastAttributeVersion;
+ if (newVersion == nil) {
+ // Get version from the item
+ newVersion = dict objectForKey:SUAppcastElementVersion;
+ }
+ if (newVersion == nil)
+ {
+ // No sparkle:version element/attribute anywhere?
+ SULog(SULogLevelError, @"warning: Item '%@' is missing '<%@>' element. Version comparison may be unreliable. Please always specify %@", _title, SUAppcastElementVersion, SUAppcastElementVersion);
+
+ // Separate the url by underscores and take the last component, as that'll be closest to the end,
+ // then we remove the extension. Hopefully, this will be the version.
+ NSArray<NSString *> *fileComponents = (NSString *)enclosure objectForKey:SURSSAttributeURL componentsSeparatedByString:@"_";
+ if (fileComponents count > 1) {
+ newVersion = fileComponents lastObject stringByDeletingPathExtension;
+ }
+ }
+
+ if (!newVersion) {
+ if (error) {
+ *error = NSString stringWithFormat:@"Feed item lacks %@ element, and version couldn't be deduced from file name (would have used last component of a file name like AppName_1.3.4.zip)", SUAppcastElementVersion;
+ }
+ return nil;
+ }
+
+ _propertiesDictionary = NSDictionary alloc initWithDictionary:dict;
+ _dateString = (NSString *)dict objectForKey:SURSSElementPubDate copy;
+ _itemDescription = (NSString *)dict objectForKey:SURSSElementDescription copy;
+
+ NSString *theInfoURL = dict objectForKey:SURSSElementLink;
+ if (theInfoURL) {
+ if (!theInfoURL isKindOfClass:NSString class) {
+ SULog(SULogLevelError, @"%@ -%@ Info URL is not of valid type.", NSStringFromClass(self class), NSStringFromSelector(_cmd));
+ } else {
+ NSURL *infoURL;
+ if (appcastURL != nil) {
+ infoURL = NSURL URLWithString:theInfoURL relativeToURL:appcastURL;
+ } else {
+ infoURL = NSURL URLWithString:theInfoURL;
+ }
+ 
+ if (infoURL.scheme caseInsensitiveCompare:@"http" == NSOrderedSame || infoURL.scheme caseInsensitiveCompare:@"https" == NSOrderedSame) {
+ _infoURL = infoURL;
+ } else {
+ SULog(SULogLevelError, @"%@ -%@ Info URL must have a http or https URL scheme.", NSStringFromClass(self class), NSStringFromSelector(_cmd));
+ }
+ }
+ }
+
+ // Need an info URL or an enclosure URL. Former to show "More Info"
+ //	page, latter to download & install:
+ if (!enclosure && !_infoURL) {
+ if (error) {
+ *error = @"No enclosure in feed item";
+ }
+ return nil;
+ }
+ 
+ if (_infoURL != nil) {
+ // If enclosure doesn't exist, the update must be an informational update
+ // Otherwise check presence of informational update element
+ _informationalUpdateVersions = (enclosure != nil) ? dict objectForKey:SUAppcastElementInformationalUpdate : NSSet set;
+ } else {
+ // Not an informational update
+ _informationalUpdateVersions = nil;
+ }
+
+ NSString *enclosureURLString = enclosure objectForKey:SURSSAttributeURL;
+ if (!enclosureURLString && !_infoURL) {
+ if (error) {
+ *error = @"Feed item's enclosure lacks URL";
+ }
+ return nil;
+ }
+ 
+ if (enclosureURLString) {
+ NSString *enclosureLengthString = enclosure objectForKey:SURSSAttributeLength;
+ long long contentLength = 0;
+ if (enclosureLengthString != nil) {
+ contentLength = enclosureLengthString longLongValue;
+ }
+ _contentLength = (contentLength > 0) ? (uint64_t)contentLength : 0;
+ }
+
+ if (enclosureURLString) {
+ // Sparkle used to always URL-encode, so for backwards compatibility spaces in URLs must be forgiven.
+ NSString *fileURLString = enclosureURLString stringByReplacingOccurrencesOfString:@" " withString:@"%20";
+ 
+ NSURL *fileURL;
+ if (appcastURL != nil) {
+ fileURL = NSURL URLWithString:fileURLString relativeToURL:appcastURL;
+ } else {
+ fileURL = NSURL URLWithString:fileURLString;
+ }
+ 
+ if (fileURL.scheme caseInsensitiveCompare:@"http" == NSOrderedSame || fileURL.scheme caseInsensitiveCompare:@"https" == NSOrderedSame) {
+ _fileURL = fileURL;
+ } else {
+ SULog(SULogLevelError, @"File URLs must have a http or https URL scheme.");
+ _fileURL = nil;
+ }
+ }
+ if (enclosure) {
+ _signatures = SUSignatures alloc initWithDsa:enclosure objectForKey:SUAppcastAttributeDSASignature ed:enclosure objectForKey:SUAppcastAttributeEDSignature;
+ _osString = enclosure objectForKey:SUAppcastAttributeOsType;
+ }
+
+ _versionString = (NSString *)newVersion copy;
+ _minimumSystemVersion = (NSString *)dict objectForKey:SUAppcastElementMinimumSystemVersion copy;
+ _maximumSystemVersion = (NSString *)dict objectForKey:SUAppcastElementMaximumSystemVersion copy;
+ _minimumAutoupdateVersion = (NSString *)dict objectForKey:SUAppcastElementMinimumAutoupdateVersion copy;
+ 
+ _ignoreSkippedUpgradesBelowVersion = (NSString *)dict objectForKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion copy;
+ 
+ NSString *channel = dict objectForKey:SUAppcastElementChannel;
+ if (channel != nil) {
+ if (channel.length == 0) {
+ SULog(SULogLevelError, @"warning: Item with version '%@' has zero-length channel; this will be ignored.", newVersion);
+ _channel = nil;
+ } else {
+ // Reject characters in the channel name that may cause parsing problems in tools later
+ NSMutableCharacterSet *allowedCharacterSet = NSMutableCharacterSet alphanumericCharacterSet;
+ allowedCharacterSet addCharactersInString:@"_.-";
+ if (channel rangeOfCharacterFromSet:allowedCharacterSet.invertedSet.location != NSNotFound) {
+ SULog(SULogLevelError, @"warning: Item with version '%@' has channel with invalid name. This channel will be ignored. Only a-zA-Z0-9._- is allowed.", newVersion);
+ _channel = nil;
+ } else {
+ _channel = channel copy;
+ }
+ }
+ }
+ 
+ // Grab critical update information
+ NSDictionary * _Nullable criticalUpdateDictionaryFromAppcast = (NSDictionary *)dict objectForKey:SUAppcastElementCriticalUpdate;
+ NSArray *tags = dict objectForKey:SUAppcastElementTags;
+ 
+ NSDictionary * _Nullable criticalUpdateDictionary;
+ if (criticalUpdateDictionaryFromAppcast != nil) {
+ criticalUpdateDictionary = criticalUpdateDictionaryFromAppcast;
+ } else if (tags isKindOfClass:NSArray class && tags containsObject:SUAppcastElementCriticalUpdate) {
+ // Legacy path where critical update used to be a tag without a specified version
+ criticalUpdateDictionary = @{};
+ } else {
+ // No critical info present
+ criticalUpdateDictionary = nil;
+ }
+ 
+ _hasCriticalInformation = (criticalUpdateDictionary != nil);
+ 
+ if (stateResolver != nil) {
+ _state = (SPUAppcastItemStateResolver * _Nonnull)stateResolver resolveStateWithInformationalUpdateVersions:_informationalUpdateVersions minimumOperatingSystemVersion:_minimumSystemVersion maximumOperatingSystemVersion:_maximumSystemVersion minimumAutoupdateVersion:_minimumAutoupdateVersion criticalUpdateDictionary:criticalUpdateDictionary;
+ } else {
+ // Note state still may be nil if a deprecated initializer is used
+ _state = resolvedState;
+ }
+ 
+ NSString* rolloutIntervalString = (NSString *)dict objectForKey:SUAppcastElementPhasedRolloutInterval copy;
+ if (rolloutIntervalString != nil) {
+ _phasedRolloutInterval = @(rolloutIntervalString.integerValue);
+ }
+
+ NSString *shortVersionString = enclosure objectForKey:SUAppcastAttributeShortVersionString;
+ if (nil == shortVersionString) {
+ shortVersionString = dict objectForKey:SUAppcastAttributeShortVersionString; // fall back on the <item>
+ }
+
+ if (shortVersionString) {
+ _displayVersionString = shortVersionString copy;
+ } else {
+ _displayVersionString = _versionString copy;
+ }
+ 
+ NSString *attributeInstallationType = enclosure objectForKey:SUAppcastAttributeInstallationType;
+ NSString *chosenInstallationType;
+ if (attributeInstallationType == nil) {
+ // If we have a flat package, assume installation type is guided
+ // (flat / non-archived interactive packages are not supported)
+ // Otherwise assume we have a normal application inside an archive
+ if (_fileURL.pathExtension isEqualToString:@"pkg" || _fileURL.pathExtension isEqualToString:@"mpkg") {
+ chosenInstallationType = SPUInstallationTypeGuidedPackage;
+ } else {
+ chosenInstallationType = SPUInstallationTypeApplication;
+ }
+ } else if (!SPUValidInstallationType(attributeInstallationType)) {
+ if (error != NULL) {
+ *error = NSString stringWithFormat:@"Feed item's enclosure lacks valid %@ (found %@)", SUAppcastAttributeInstallationType, attributeInstallationType;
+ }
+ return nil;
+ } else if (attributeInstallationType isEqualToString:SPUInstallationTypeInteractivePackage) {
+ SULog(SULogLevelDefault, @"warning: '%@' for %@ is deprecated. Use '%@' instead.", SPUInstallationTypeInteractivePackage, SUAppcastAttributeInstallationType, SPUInstallationTypeGuidedPackage);
+ 
+ chosenInstallationType = attributeInstallationType;
+ } else {
+ chosenInstallationType = attributeInstallationType;
+ }
+ 
+ _installationType = chosenInstallationType copy;
+ 
+ NSString *enclosureDeltaSparkleExecutableSize = enclosure objectForKey:SUAppcastAttributeDeltaFromSparkleExecutableSize;
+ if (enclosureDeltaSparkleExecutableSize != nil) {
+ long long sparkleExecutableSize = enclosureDeltaSparkleExecutableSize longLongValue;
+ if (sparkleExecutableSize > 0) {
+ _deltaFromSparkleExecutableSize = @(sparkleExecutableSize);
+ }
+ }
+ 
+ NSString *enclosureDeltaSparkleLocales = enclosure objectForKey:SUAppcastAttributeDeltaFromSparkleLocales;
+ if (enclosureDeltaSparkleLocales != nil) {
+ NSMutableSet<NSString *> *expectedLocales = NSMutableSet set;
+ 
+ NSArray<NSString *> *locales = enclosureDeltaSparkleLocales componentsSeparatedByString:@",";
+ NSUInteger localeIndex = 0;
+ for (NSString *locale in locales) {
+ if (locale.length != 0 && !locale containsString:@"." && !locale containsString:@"/") {
+ expectedLocales addObject:locale;
+ localeIndex++;
+ 
+ // Place an upper limit on the number of locales we process
+ if (localeIndex >= DELTA_EXPECTED_LOCALES_LIMIT) {
+ break;
+ }
+ } else {
+ SULog(SULogLevelError, @"Ignoring expected delta locale '%@' because it contains a period or slash or is empty", locale);
+ }
+ }
+ 
+ _deltaFromSparkleLocales = expectedLocales copy;
+ }
+
+ // Find the appropriate release notes URL.
+ NSString *releaseNotesString = dict objectForKey:SUAppcastElementReleaseNotesLink;
+ if (releaseNotesString) {
+ NSURL *url;
+ if (appcastURL != nil) {
+ url = NSURL URLWithString:releaseNotesString relativeToURL:appcastURL;
+ } else {
+ url = NSURL URLWithString:releaseNotesString;
+ }
+ if (url.scheme caseInsensitiveCompare:@"http" == NSOrderedSame || url.scheme caseInsensitiveCompare:@"https" == NSOrderedSame) {
+ _releaseNotesURL = url;
+ } else {
+ SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
+ _releaseNotesURL = nil;
+ }
+ } else if (self.itemDescription hasPrefix:@"http://" || self.itemDescription hasPrefix:@"https://") { // if the description starts with http:// or https:// use that.
+ _releaseNotesURL = NSURL URLWithString:(NSString * _Nonnull)self.itemDescription;
+ } else {
+ _releaseNotesURL = nil;
+ }
+ 
+ // Get full release notes URL if informed.
+ NSString *fullReleaseNotesString = dict objectForKey:SUAppcastElementFullReleaseNotesLink;
+ if (fullReleaseNotesString) {
+ NSURL *url;
+ if (appcastURL != nil) {
+ url = NSURL URLWithString:fullReleaseNotesString relativeToURL:appcastURL;
+ } else {
+ url = NSURL URLWithString:fullReleaseNotesString;
+ }
+ if (url.scheme caseInsensitiveCompare:@"http" == NSOrderedSame || url.scheme caseInsensitiveCompare:@"https" == NSOrderedSame) {
+ _fullReleaseNotesURL = url;
+ } else {
+ SULog(SULogLevelError, @"Full release notes must have a http or https URL scheme.");
+ _fullReleaseNotesURL = nil;
+ }
+ } else {
+ _fullReleaseNotesURL = nil;
+ }
+
+ NSArray *deltaDictionaries = dict objectForKey:SUAppcastElementDeltas;
+ if (deltaDictionaries) {
+ NSMutableDictionary *deltas = NSMutableDictionary dictionary;
+ for (NSDictionary *deltaDictionary in deltaDictionaries) {
+ NSString *deltaFrom = deltaDictionary objectForKey:SUAppcastAttributeDeltaFrom;
+ if (!deltaFrom) continue;
+
+ NSMutableDictionary *fakeAppCastDict = dict mutableCopy;
+ fakeAppCastDict removeObjectForKey:SUAppcastElementDeltas;
+ fakeAppCastDict setObject:deltaDictionary forKey:SURSSElementEnclosure;
+ SUAppcastItem *deltaItem = SUAppcastItem alloc initWithDictionary:fakeAppCastDict relativeToURL:appcastURL state:_state;
+
+ if (deltaItem != nil) {
+ deltas setObject:deltaItem forKey:deltaFrom;
+ }
+ }
+ _deltaUpdates = deltas;
+ }
+ }
+ return self;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUApplicationInfo.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUApplicationInfo.m Added

@@ -0,0 +1,57 @@
+//
+// SUApplicationInfo.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/28/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
+
+#import "SUApplicationInfo.h"
+#import "SUBundleIcon.h"
+#import "SUHost.h"
+#import <AppKit/AppKit.h>
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
+
+@implementation SUApplicationInfo
+
++ (BOOL)isBackgroundApplication:(NSApplication *)application
+{
+ return (application.activationPolicy == NSApplicationActivationPolicyAccessory);
+}
+
++ (NSImage *)bestIconForHost:(SUHost *)host
+{
+ NSURL *iconURL = SUBundleIcon iconURLForHost:host;
+ 
+ NSImage *icon = (iconURL == nil) ? nil : NSImage alloc initWithContentsOfURL:iconURL;
+ 
+ // Get icon from asset catalog if no explicit filename is provided.
+ if (!icon) {
+ icon = host.bundle imageForResource:@SPARKLE_ICON_NAME;
+ }
+ 
+ // Use a default icon if none is defined.
+ if (!icon) {
+ // this asumption may not be correct (eg. even though we're not the main bundle, it could be still be a regular app)
+ // but still better than nothing if no icon was included
+ BOOL isMainBundle = host.bundle isEqualTo:NSBundle mainBundle;
+
+ if (@available(macOS 11, *)) {
+ UTType *contentType = isMainBundle ? UTTypeApplication : UTTypeBundle;
+ icon = NSWorkspace sharedWorkspace iconForContentType:contentType;
+ } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ NSString *fileType = isMainBundle ? (__bridge NSString *)kUTTypeApplication : (__bridge NSString *)kUTTypeBundle;
+ icon = NSWorkspace sharedWorkspace iconForFileType:fileType;
+#pragma clang diagnostic pop
+ }
+ }
+ return icon;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUBundleIcon.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUBundleIcon.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUConstants.h Added

@@ -0,0 +1,114 @@
+//
+// SUConstants.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/16/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+
+#ifndef SUCONSTANTS_H
+#define SUCONSTANTS_H
+
+#import <Foundation/Foundation.h>
+
+// -----------------------------------------------------------------------------
+//	Misc:
+// -----------------------------------------------------------------------------
+
+extern const NSTimeInterval SUDefaultUpdatePermissionPromptInterval;
+extern const NSTimeInterval SUMinimumUpdateCheckInterval;
+extern const NSTimeInterval SUDefaultUpdateCheckInterval;
+extern const uint64_t SULeewayUpdateCheckInterval;
+extern const NSTimeInterval SUImpatientUpdateCheckInterval;
+
+extern NSString *const SUBundleIdentifier;
+
+extern NSString *const SUAppcastAttributeValueMacOS;
+
+// -----------------------------------------------------------------------------
+//	Notifications:
+// -----------------------------------------------------------------------------
+
+extern NSString *const SUTechnicalErrorInformationKey;
+
+// -----------------------------------------------------------------------------
+//	PList keys::
+// -----------------------------------------------------------------------------
+
+extern NSString *const SUFeedURLKey;
+extern NSString *const SUHasLaunchedBeforeKey;
+extern NSString *const SURelaunchHostBundleKey;
+extern NSString *const SUShowReleaseNotesKey;
+extern NSString *const SUSkippedMinorVersionKey;
+extern NSString *const SUSkippedMajorVersionKey;
+extern NSString *const SUSkippedMajorSubreleaseVersionKey;
+extern NSString *const SUScheduledCheckIntervalKey;
+extern NSString *const SULastCheckTimeKey;
+extern NSString *const SUExpectsDSASignatureKey;
+extern NSString *const SUExpectsEDSignatureKey;
+extern NSString *const SUPublicDSAKeyKey;
+extern NSString *const SUPublicDSAKeyFileKey;
+extern NSString *const SUPublicEDKeyKey;
+extern NSString *const SUAutomaticallyUpdateKey;
+extern NSString *const SUAllowsAutomaticUpdatesKey;
+extern NSString *const SUEnableAutomaticChecksKey;
+extern NSString *const SUEnableInstallerLauncherServiceKey;
+extern NSString *const SUEnableDownloaderServiceKey;
+extern NSString *const SUEnableInstallerConnectionServiceKey;
+extern NSString *const SUEnableInstallerStatusServiceKey;
+extern NSString *const SUEnableSystemProfilingKey;
+extern NSString *const SUSendProfileInfoKey;
+extern NSString *const SUUpdateGroupIdentifierKey;
+extern NSString *const SULastProfileSubmitDateKey;
+extern NSString *const SUPromptUserOnFirstLaunchKey;
+extern NSString *const SUDefaultsDomainKey;
+extern NSString *const SUEnableJavaScriptKey;
+extern NSString *const SUFixedHTMLDisplaySizeKey __attribute__((deprecated("This key is obsolete and has no effect.")));
+extern NSString *const SUAppendVersionNumberKey __attribute__((deprecated("This key is obsolete. See SPARKLE_APPEND_VERSION_NUMBER.")));
+extern NSString *const SUEnableAutomatedDowngradesKey __attribute__((deprecated("This key is obsolete. See SPARKLE_AUTOMATED_DOWNGRADES.")));
+extern NSString *const SUNormalizeInstalledApplicationNameKey __attribute__((deprecated("This key is obsolete. SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME.")));
+extern NSString *const SURelaunchToolNameKey __attribute__((deprecated("This key is obsolete. SPARKLE_RELAUNCH_TOOL_NAME.")));
+
+// -----------------------------------------------------------------------------
+//	Appcast keys::
+// -----------------------------------------------------------------------------
+
+extern NSString *const SUAppcastAttributeDeltaFrom;
+extern NSString *const SUAppcastAttributeDeltaFromSparkleExecutableSize;
+extern NSString *const SUAppcastAttributeDeltaFromSparkleLocales;
+extern NSString *const SUAppcastAttributeDSASignature;
+extern NSString *const SUAppcastAttributeEDSignature;
+extern NSString *const SUAppcastAttributeShortVersionString;
+extern NSString *const SUAppcastAttributeVersion;
+extern NSString *const SUAppcastAttributeOsType;
+extern NSString *const SUAppcastAttributeInstallationType;
+
+extern NSString *const SUAppcastElementVersion;
+extern NSString *const SUAppcastElementShortVersionString;
+extern NSString *const SUAppcastElementCriticalUpdate;
+extern NSString *const SUAppcastElementDeltas;
+extern NSString *const SUAppcastElementMinimumAutoupdateVersion;
+extern NSString *const SUAppcastElementMinimumSystemVersion;
+extern NSString *const SUAppcastElementMaximumSystemVersion;
+extern NSString *const SUAppcastElementReleaseNotesLink;
+extern NSString *const SUAppcastElementFullReleaseNotesLink;
+extern NSString *const SUAppcastElementTags;
+extern NSString *const SUAppcastElementPhasedRolloutInterval;
+extern NSString *const SUAppcastElementInformationalUpdate;
+extern NSString *const SUAppcastElementChannel;
+extern NSString *const SUAppcastElementBelowVersion;
+extern NSString *const SUAppcastElementIgnoreSkippedUpgradesBelowVersion;
+
+extern NSString *const SURSSAttributeURL;
+extern NSString *const SURSSAttributeLength;
+
+extern NSString *const SURSSElementDescription;
+extern NSString *const SURSSElementEnclosure;
+extern NSString *const SURSSElementLink;
+extern NSString *const SURSSElementPubDate;
+extern NSString *const SURSSElementTitle;
+
+extern NSString *const SUXMLLanguage;
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUConstants.m Added

@@ -0,0 +1,109 @@
+//
+//  SUConstants.m
+//  Sparkle
+//
+//  Created by Andy Matuschak on 3/16/06.
+//  Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#import "SUConstants.h"
+#import "SUErrors.h"
+
+#ifndef DEBUG
+#define DEBUG 0
+#endif
+
+#include "AppKitPrevention.h"
+
+// Define some minimum intervals to avoid DoS-like checking attacks
+const NSTimeInterval SUMinimumUpdateCheckInterval = DEBUG ? 60 : (60 * 60);
+const NSTimeInterval SUDefaultUpdateCheckInterval = DEBUG ? 60 : (60 * 60 * 24);
+// The amount of time the system can defer our update check (for improved performance)
+const uint64_t SULeewayUpdateCheckInterval = DEBUG ? 1 : 15;
+
+// If the update has already been automatically downloaded, we normally don't want to bug the user about the update
+// However if the user has gone a very long time without quitting an application, we will bug them
+// This is the time interval for a "week"; it doesn't matter that this measure is imprecise.
+const NSTimeInterval SUImpatientUpdateCheckInterval = DEBUG ? (60 * 2) : (60 * 60 * 24 * 7);
+
+NSString *const SUBundleIdentifier = @SPARKLE_BUNDLE_IDENTIFIER;
+
+NSString *const SUAppcastAttributeValueMacOS = @"macos";
+
+NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
+
+NSString *const SUFeedURLKey = @"SUFeedURL";
+NSString *const SUHasLaunchedBeforeKey = @"SUHasLaunchedBefore";
+NSString *const SURelaunchHostBundleKey = @"SURelaunchHostBundle";
+NSString *const SUShowReleaseNotesKey = @"SUShowReleaseNotes";
+NSString *const SUSkippedMinorVersionKey = @"SUSkippedVersion";
+NSString *const SUSkippedMajorVersionKey = @"SUSkippedMajorVersion";
+NSString *const SUSkippedMajorSubreleaseVersionKey = @"SUSkippedMajorSubreleaseVersion";
+NSString *const SUScheduledCheckIntervalKey = @"SUScheduledCheckInterval";
+NSString *const SULastCheckTimeKey = @"SULastCheckTime";
+NSString *const SUExpectsDSASignatureKey = @"SUExpectsDSASignature";
+NSString *const SUExpectsEDSignatureKey = @"SUExpectsEDSignatureKey";
+NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey";
+NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile";
+NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
+NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
+NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
+NSString *const SUEnableSystemProfilingKey = @"SUEnableSystemProfiling";
+NSString *const SUEnableAutomaticChecksKey = @"SUEnableAutomaticChecks";
+NSString *const SUEnableInstallerLauncherServiceKey = @"SUEnableInstallerLauncherService";
+NSString *const SUEnableDownloaderServiceKey = @"SUEnableDownloaderService";
+NSString *const SUEnableInstallerConnectionServiceKey = @"SUEnableInstallerConnectionService";
+NSString *const SUEnableInstallerStatusServiceKey = @"SUEnableInstallerStatusService";
+NSString *const SUSendProfileInfoKey = @"SUSendProfileInfo";
+NSString *const SUUpdateGroupIdentifierKey = @"SUUpdateGroupIdentifier";
+NSString *const SULastProfileSubmitDateKey = @"SULastProfileSubmissionDate";
+NSString *const SUPromptUserOnFirstLaunchKey = @"SUPromptUserOnFirstLaunch";
+NSString *const SUEnableJavaScriptKey = @"SUEnableJavaScript";
+NSString *const SUFixedHTMLDisplaySizeKey = @"SUFixedHTMLDisplaySize";
+NSString *const SUDefaultsDomainKey = @"SUDefaultsDomain";
+NSString *const SUSparkleErrorDomain = @"SUSparkleErrorDomain";
+NSString *const SPUNoUpdateFoundReasonKey = @"SUNoUpdateFoundReason";
+NSString *const SPUNoUpdateFoundUserInitiatedKey = @"SPUNoUpdateUserInitiated";
+NSString *const SPULatestAppcastItemFoundKey = @"SULatestAppcastItemFound";
+
+NSString *const SUAppendVersionNumberKey = @"SUAppendVersionNumber";
+NSString *const SUEnableAutomatedDowngradesKey = @"SUEnableAutomatedDowngrades";
+NSString *const SUNormalizeInstalledApplicationNameKey = @"SUNormalizeInstalledApplicationName";
+NSString *const SURelaunchToolNameKey = @"SURelaunchToolName";
+
+NSString *const SUAppcastAttributeDeltaFrom = @"sparkle:deltaFrom";
+NSString *const SUAppcastAttributeDeltaFromSparkleExecutableSize = @"sparkle:deltaFromSparkleExecutableSize";
+NSString *const SUAppcastAttributeDeltaFromSparkleLocales = @"sparkle:deltaFromSparkleLocales";
+NSString *const SUAppcastAttributeDSASignature = @"sparkle:dsaSignature";
+NSString *const SUAppcastAttributeEDSignature = @"sparkle:edSignature";
+NSString *const SUAppcastAttributeShortVersionString = @"sparkle:shortVersionString";
+NSString *const SUAppcastAttributeVersion = @"sparkle:version";
+NSString *const SUAppcastAttributeOsType = @"sparkle:os";
+NSString *const SUAppcastAttributeInstallationType = @"sparkle:installationType";
+
+NSString *const SUAppcastElementVersion = SUAppcastAttributeVersion;
+NSString *const SUAppcastElementShortVersionString = SUAppcastAttributeShortVersionString;
+NSString *const SUAppcastElementCriticalUpdate = @"sparkle:criticalUpdate";
+NSString *const SUAppcastElementDeltas = @"sparkle:deltas";
+NSString *const SUAppcastElementMinimumAutoupdateVersion = @"sparkle:minimumAutoupdateVersion";
+NSString *const SUAppcastElementMinimumSystemVersion = @"sparkle:minimumSystemVersion";
+NSString *const SUAppcastElementMaximumSystemVersion = @"sparkle:maximumSystemVersion";
+NSString *const SUAppcastElementReleaseNotesLink = @"sparkle:releaseNotesLink";
+NSString *const SUAppcastElementFullReleaseNotesLink = @"sparkle:fullReleaseNotesLink";
+NSString *const SUAppcastElementTags = @"sparkle:tags";
+NSString *const SUAppcastElementPhasedRolloutInterval = @"sparkle:phasedRolloutInterval";
+NSString *const SUAppcastElementInformationalUpdate = @"sparkle:informationalUpdate";
+NSString *const SUAppcastElementChannel = @"sparkle:channel";
+NSString *const SUAppcastElementBelowVersion = @"sparkle:belowVersion";
+NSString *const SUAppcastElementIgnoreSkippedUpgradesBelowVersion = @"sparkle:ignoreSkippedUpgradesBelowVersion";
+
+NSString *const SURSSAttributeURL = @"url";
+NSString *const SURSSAttributeLength = @"length";
+
+NSString *const SURSSElementDescription = @"description";
+NSString *const SURSSElementEnclosure = @"enclosure";
+NSString *const SURSSElementLink = @"link";
+NSString *const SURSSElementPubDate = @"pubDate";
+NSString *const SURSSElementTitle = @"title";
+
+NSString *const SUXMLLanguage = @"xml:lang";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUErrors.h Added

@@ -0,0 +1,106 @@
+//
+// SUErrors.h
+// Sparkle
+//
+// Created by C.W. Betts on 10/13/14.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#ifndef SUERRORS_H
+#define SUERRORS_H
+
+#import <Foundation/Foundation.h>
+
+#if defined(BUILDING_SPARKLE_TOOL) || defined(BUILDING_SPARKLE_TESTS)
+// Ignore incorrect warning
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "SUExport.h"
+#pragma clang diagnostic pop
+#else
+#import <Sparkle/SUExport.h>
+#endif
+
+/**
+ * Error domain used by Sparkle
+ */
+SU_EXPORT extern NSString *const SUSparkleErrorDomain;
+
+typedef NS_ENUM(OSStatus, SUError) {
+ // Configuration phase errors
+ SUNoPublicDSAFoundError = 0001,
+ SUInsufficientSigningError = 0002,
+ SUInsecureFeedURLError = 0003,
+ SUInvalidFeedURLError = 0004,
+ SUInvalidUpdaterError = 0005,
+ SUInvalidHostBundleIdentifierError = 0006,
+ SUInvalidHostVersionError = 0007,
+ 
+ // Appcast phase errors.
+ SUAppcastParseError = 1000,
+ SUNoUpdateError = 1001,
+ SUAppcastError = 1002,
+ SURunningFromDiskImageError = 1003,
+ SUResumeAppcastError = 1004,
+ SURunningTranslocated = 1005,
+ SUWebKitTerminationError = 1006,
+
+ // Download phase errors.
+ SUTemporaryDirectoryError = 2000,
+ SUDownloadError = 2001,
+
+ // Extraction phase errors.
+ SUUnarchivingError = 3000,
+ SUSignatureError = 3001,
+ SUValidationError = 3002,
+ 
+ // Installation phase errors.
+ SUFileCopyFailure = 4000,
+ SUAuthenticationFailure = 4001,
+ SUMissingUpdateError = 4002,
+ SUMissingInstallerToolError = 4003,
+ SURelaunchError = 4004,
+ SUInstallationError = 4005,
+ SUDowngradeError = 4006,
+ SUInstallationCanceledError = 4007,
+ SUInstallationAuthorizeLaterError = 4008,
+ SUNotValidUpdateError = 4009,
+ SUAgentInvalidationError = 4010,
+ SUInstallationRootInteractiveError = 4011,
+ SUInstallationWriteNoPermissionError = 4012,
+ 
+ // API misuse errors.
+ SUIncorrectAPIUsageError = 5000
+};
+
+/**
+ The reason why a new update is not available.
+ */
+typedef NS_ENUM(OSStatus, SPUNoUpdateFoundReason) {
+ /**
+ A new update is unavailable for an unknown reason.
+ */
+ SPUNoUpdateFoundReasonUnknown,
+ /**
+ A new update is unavailable because the user is on the latest known version in the appcast feed.
+ */
+ SPUNoUpdateFoundReasonOnLatestVersion,
+ /**
+ A new update is unavailable because the user is on a version newer than the latest known version in the appcast feed.
+ */
+ SPUNoUpdateFoundReasonOnNewerThanLatestVersion,
+ /**
+ A new update is unavailable because the user's operating system version is too old for the update.
+ */
+ SPUNoUpdateFoundReasonSystemIsTooOld,
+ /**
+ A new update is unavailable because the user's operating system version is too new for the update.
+ */
+ SPUNoUpdateFoundReasonSystemIsTooNew
+};
+
+SU_EXPORT extern NSString *const SPUNoUpdateFoundReasonKey;
+SU_EXPORT extern NSString *const SPULatestAppcastItemFoundKey;
+SU_EXPORT extern NSString *const SPUNoUpdateFoundUserInitiatedKey;
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUExport.h Changed

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUFileManager.h Added

@@ -0,0 +1,170 @@
+//
+// SUFileManager.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/18/15.
+// Copyright (c) 2015 zgcoder. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "SUExport.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * A class used for performing file operations more suitable than NSFileManager for performing installation work.
+ * All operations on this class may be used on thread other than the main thread.
+ * This class provides just basic file operations and stays away from including much application-level logic.
+ */
+@interface SUFileManager : NSObject
+
+/**
+ * Initializes a new file manager
+ *
+ * @return A new file manager instance
+ */
+- (instancetype)init;
+
+/**
+ * Creates a temporary directory on the same volume as a provided URL
+ * @param appropriateURL A URL to a directory that resides on the volume that the temporary directory will be created on. In the uncommon case, the temporary directory may be created inside this directory.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return A URL pointing to the newly created temporary directory, or nil with a populated error object if an error occurs.
+ *
+ * When moving an item from a source to a destination, it is desirable to create a temporary intermediate destination on the same volume as the destination to ensure
+ * that the item will be moved, and not copied, from the intermediate point to the final destination. This ensures file atomicity.
+ */
+- (NSURL * _Nullable)makeTemporaryDirectoryAppropriateForDirectoryURL:(NSURL *)appropriateURL error:(NSError * __autoreleasing *)error;
+
+/**
+ * Creates a directory at the target URL
+ * @param targetURL A URL pointing to the directory to create. The item at this URL must not exist, and the parent directory of this URL must already exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the item was created successfully, otherwise NO along with a populated error object
+ *
+ * This is an atomic operation.
+ */
+- (BOOL)makeDirectoryAtURL:(NSURL *)targetURL error:(NSError **)error;
+
+/**
+ * Moves an item from a source to a destination
+ * @param sourceURL A URL pointing to the item to move. The item at this URL must exist.
+ * @param destinationURL A URL pointing to the destination the item will be moved at. An item must not already exist at this URL.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the item was moved successfully, otherwise NO along with a populated error object
+ *
+ * If sourceURL and destinationURL reside on the same volume, this operation will be an atomic move operation.
+ * Otherwise this will be equivalent to a copy & remove which will be a nonatomic operation.
+ */
+- (BOOL)moveItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError **)error;
+
+/**
+ * Swaps an original item with a new item atomically.
+ * @param originalItemURL A URL pointing to the original item to replace. The item at this URL must exist.
+ * @param newItemURL A URL pointing to the new item that will replace the original item.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the original item was replaced with the new item successfully, otherwise NO along with a populated error object
+ *
+ * originalItemURL and newItemURL must reside on the same volume. If the operation succeeds, this will be be an atomic operation.
+ * Otherwise on failure you may need to re-try using move operations. This operation will fail on non-apfs volumes or volumes that don't support rename swapping.
+ * Both originalItemURL and newItemURL must exist.
+ */
+- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError **)error;
+
+/**
+ * Copies an item from a source to a destination
+ * @param sourceURL A URL pointing to the item to move. The item at this URL must exist.
+ * @param destinationURL A URL pointing to the destination the item will be moved at. An item must not already exist at this URL.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the item was copied successfully, otherwise NO along with a populated error object
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)copyItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError **)error;
+
+/**
+ * Removes an item at a URL
+ * @param url A URL pointing to the item to remove. The item at this URL must exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the item was removed successfully, otherwise NO along with a populated error object
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)removeItemAtURL:(NSURL *)url error:(NSError **)error;
+
+/**
+ * Changes the owner and group IDs of an item at a specified target URL to match another URL
+ * @param targetURL A URL pointing to the target item whose owner and group IDs to alter. This will be applied recursively if the item is a directory. The item at this URL must exist.
+ * @param matchURL A URL pointing to the item whose owner and group IDs will be used for changing on the targetURL. The item at this URL must exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the target item's owner and group IDs have changed to match the origin's ones, otherwise NO along with a populated error object
+ *
+ * If the owner and group IDs match on the root items of targetURL and matchURL, this method stops and assumes that nothing needs to be done.
+ * Otherwise this method recursively changes the IDs if the target is a directory. If an item in the directory is encountered that is unable to be changed,
+ * then this method stops and returns NO.
+ * While this method will try to change the group ID, being unable to change the group ID does not result in a failure if the owner ID can be changed or matched.
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)changeOwnerAndGroupOfItemAtRootURL:(NSURL *)targetURL toMatchURL:(NSURL *)matchURL error:(NSError **)error;
+
+/**
+ Changes the owner and group ID of an item at a specified target URL
+ @param targetURL A URL pointing to the target item whose owner and group IDs to alter. The item at this URL must exist.
+ @param ownerID The new owner ID to set on the item.
+ @param groupID The new group ID to set on the item.
+ @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ @return YES if the target item's owner and group IDs have changed, otherwise NO along with a populated error object.
+ 
+ Unlike -changeOwnerAndGroupOfItemAtRootURL:toMatchURL:error: this method does not recursively try to change the owner and group IDs if the target item is a directory.
+ */
+- (BOOL)changeOwnerAndGroupOfItemAtURL:(NSURL *)targetURL ownerID:(uid_t)ownerID groupID:(gid_t)groupID error:(NSError * __autoreleasing *)error;
+
+/**
+ * Updates the modification and access time of an item at a specified target URL to the current time
+ * @param targetURL A URL pointing to the target item whose modification and access time to update. The item at this URL must exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the target item's modification and access times have been updated, otherwise NO along with a populated error object
+ *
+ * This method updates the modification and access time of an item to the current time, ideal for letting the system know we installed a new file or
+ * application.
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)updateModificationAndAccessTimeOfItemAtURL:(NSURL *)targetURL error:(NSError **)error;
+
+/**
+ * Updates the access time of an item at a specified root URL to the current time
+ * @param targetURL A URL pointing to the target item whose access time to update to the current time.
+ * This will be applied recursively if the item is a directory. The item at this URL must exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if the target item's access times have been updated, otherwise NO along with a populated error object
+ *
+ * This method updates the access time of an item to the current time, ideal for letting the system know not to remove a file or directory when placing it
+ * at a temporary directory.
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)updateAccessTimeOfItemAtRootURL:(NSURL *)targetURL error:(NSError * __autoreleasing *)error;
+
+/**
+ * Releases Apple's quarantine extended attribute from the item at the specified root URL
+ * @param rootURL A URL pointing to the item to release from Apple's quarantine. This will be applied recursively if the item is a directory. The item at this URL must exist.
+ * @param error If an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
+ * @return YES if all the items at the target could be released from quarantine, otherwise NO if any items couldn't along with a populated error object
+ *
+ * This method removes quarantine attributes from an item, ideally an application, so that when the user launches a new application themselves, they
+ * don't have to witness the system dialog alerting them that they downloaded an application from the internet and asking if they want to continue.
+ * Note that this may not exactly mimic the system behavior when a user opens an application for the first time (i.e, the xattr isn't deleted),
+ * but this should be sufficient enough for our purposes.
+ *
+ * This method may return NO even if some items do get released from quarantine if the target URL is pointing to a directory.
+ * Thus if an item cannot be released from quarantine, this method still continues on to the next enumerated item.
+ *
+ * This is not an atomic operation.
+ */
+- (BOOL)releaseItemFromQuarantineAtRootURL:(NSURL *)rootURL error:(NSError **)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUFileManager.m Added

@@ -0,0 +1,574 @@
+//
+// SUFileManager.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/18/15.
+// Copyright (c) 2015 zgcoder. All rights reserved.
+//
+
+#import "SUFileManager.h"
+#import "SUErrors.h"
+
+#include <sys/xattr.h>
+#include <sys/errno.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+
+
+#include "AppKitPrevention.h"
+
+extern int renamex_np(const char *, const char *, unsigned int) __attribute__((weak_import));
+
+static char SUAppleQuarantineIdentifier = "com.apple.quarantine";
+
+#pragma clang diagnostic push
+// Use direct access because it's easier, clearer, and faster
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+
+@implementation SUFileManager
+{
+ NSFileManager *_fileManager;
+}
+
+- (instancetype)init
+{
+ self = super init;
+ if (self != nil) {
+ _fileManager = NSFileManager alloc init;
+ }
+ return self;
+}
+
+// -NSFileManager attributesOfItemAtPath:error: won't follow symbolic links
+
+- (BOOL)_itemExistsAtURL:(NSURL *)fileURL
+{
+ NSString *path = fileURL.path;
+ if (path == nil) {
+ return NO;
+ }
+ return _fileManager attributesOfItemAtPath:path error:NULL != nil;
+}
+
+- (BOOL)_itemExistsAtURL:(NSURL *)fileURL isDirectory:(BOOL *)isDirectory
+{
+ NSString *path = fileURL.path;
+ if (path == nil) {
+ return NO;
+ }
+
+ NSDictionary *attributes = _fileManager attributesOfItemAtPath:path error:NULL;
+ if (attributes == nil) {
+ return NO;
+ }
+
+ if (isDirectory != NULL) {
+ *isDirectory = (NSString *)attributes objectForKey:NSFileType isEqualToString:NSFileTypeDirectory;
+ }
+
+ return YES;
+}
+
+// Wrapper around getxattr()
+- (ssize_t)_getXAttr:(const char *)name fromFile:(NSString *)file options:(int)options
+{
+ char pathPATH_MAX = {0};
+ if (!file getFileSystemRepresentation:path maxLength:sizeof(path)) {
+ errno = 0;
+ return -1;
+ }
+
+ return getxattr(path, name, NULL, 0, 0, options);
+}
+
+// Wrapper around removexattr()
+- (int)_removeXAttr:(const char *)attr fromFile:(NSString *)file options:(int)options
+{
+ char pathPATH_MAX = {0};
+ if (!file getFileSystemRepresentation:path maxLength:sizeof(path)) {
+ errno = 0;
+ return -1;
+ }
+
+ return removexattr(path, attr, options);
+}
+
+// Removes the directory tree rooted at |root| from the file quarantine.
+// The quarantine was introduced on macOS 10.5 and is described at:
+//
+// http://developer.apple.com/releasenotes/Carbon/RN-LaunchServices/index.html#apple_ref/doc/uid/TP40001369-DontLinkElementID_2
+//
+// If |root| is not a directory, then it alone is removed from the quarantine.
+// Symbolic links, including |root| if it is a symbolic link, will not be
+// traversed.
+
+// Ordinarily, the quarantine is managed by calling LSSetItemAttribute
+// to set the kLSItemQuarantineProperties attribute to a dictionary specifying
+// the quarantine properties to be applied. However, it does not appear to be
+// possible to remove an item from the quarantine directly through any public
+// Launch Services calls. Instead, this method takes advantage of the fact
+// that the quarantine is implemented in part by setting an extended attribute,
+// "com.apple.quarantine", on affected files. Removing this attribute is
+// sufficient to remove files from the quarantine.
+
+// This works by removing the quarantine extended attribute for every file we come across.
+// We used to have code similar to the method below that used -NSURL getResourceValue:forKey:error: and -NSURL setResourceValue:forKey:error:
+// However, those methods *really suck* - you can't rely on the return value from getting the resource value and if you set the resource value
+// when the key isn't present, errors are spewed out to the console
+- (BOOL)releaseItemFromQuarantineAtRootURL:(NSURL *)rootURL error:(NSError *__autoreleasing *)error
+{
+ static const int removeXAttrOptions = XATTR_NOFOLLOW;
+ BOOL success = YES;
+
+ // First remove quarantine on the root item
+ NSString *rootURLPath = rootURL.path;
+ if (self _getXAttr:SUAppleQuarantineIdentifier fromFile:rootURLPath options:removeXAttrOptions >= 0) {
+ BOOL removedRootQuarantine = (self _removeXAttr:SUAppleQuarantineIdentifier fromFile:rootURLPath options:removeXAttrOptions == 0);
+ if (!removedRootQuarantine) {
+ success = NO;
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to remove file quarantine on %@.", rootURL.lastPathComponent };
+ }
+ }
+ }
+ 
+ // Only recurse if it's actually a directory. Don't recurse into a root-level symbolic link.
+ // Even if we fail removing the quarantine from the root item or any single item in the directory, we will continue trying to remove the quarantine.
+ // This is because often it may not be a fatal error from the caller to not remove the quarantine of an item
+ NSDictionary *rootAttributes = _fileManager attributesOfItemAtPath:rootURLPath error:nil;
+ NSString *rootType = rootAttributesNSFileType;
+ 
+ if (rootType isEqualToString:NSFileTypeDirectory) {
+ // The NSDirectoryEnumerator will avoid recursing into any contained
+ // symbolic links, so no further type checks are needed.
+ NSDirectoryEnumerator *directoryEnumerator = _fileManager enumeratorAtURL:rootURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil;
+ 
+ for (NSURL *fileURL in directoryEnumerator) {
+ if (self _getXAttr:SUAppleQuarantineIdentifier fromFile:fileURL.path options:removeXAttrOptions >= 0) {
+ BOOL removedQuarantine = (self _removeXAttr:SUAppleQuarantineIdentifier fromFile:fileURL.path options:removeXAttrOptions == 0);
+ 
+ if (!removedQuarantine && success) {
+ success = NO;
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to remove file quarantine on %@.", fileURL.lastPathComponent };
+ }
+ }
+ }
+ }
+ }
+ return success;
+}
+
+- (BOOL)copyItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError * __autoreleasing *)error
+{
+ return _fileManager copyItemAtURL:sourceURL toURL:destinationURL error:error;
+}
+
+- (BOOL)_getVolumeID:(out id _Nullable __autoreleasing * _Nonnull)outVolumeIdentifier ofItemAtURL:(NSURL *)url
+{
+ NSError *error = nil;
+ return url getResourceValue:outVolumeIdentifier forKey:NSURLVolumeIdentifierKey error:&error;
+}
+
+- (BOOL)moveItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error
+{
+ if (!self _itemExistsAtURL:sourceURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Source file to move (%@) does not exist.", sourceURL.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSURL *destinationURLParent = destinationURL.URLByDeletingLastPathComponent;
+ if (!self _itemExistsAtURL:destinationURLParent) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Destination parent directory to move into (%@) does not exist.", destinationURLParent.lastPathComponent };
+ }
+ return NO;
+ }
+
+ if (self _itemExistsAtURL:destinationURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteFileExistsError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Destination file to move (%@) already exists.", destinationURL.lastPathComponent };
+ }
+ return NO;
+ }
+
+ // If the source and destination are on different volumes, we should not do a move;
+ // from my experience a move may fail when moving particular files from
+ // one network mount to another one. This is possibly related to the fact that
+ // moving a file will try to preserve ownership but copying won't
+
+ id sourceVolumeIdentifier = nil;
+ BOOL foundSourceVolume = self _getVolumeID:&sourceVolumeIdentifier ofItemAtURL:sourceURL;
+
+ id destinationVolumeIdentifier = nil;
+ BOOL foundDestinationVolume = self _getVolumeID:&destinationVolumeIdentifier ofItemAtURL:destinationURLParent;
+
+ if (foundSourceVolume && foundDestinationVolume && !(NSObject *)sourceVolumeIdentifier isEqual:destinationVolumeIdentifier) {
+ return (self copyItemAtURL:sourceURL toURL:destinationURL error:error && self removeItemAtURL:sourceURL error:error);
+ }
+
+ return _fileManager moveItemAtURL:sourceURL toURL:destinationURL error:error;
+}
+
+- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError * __autoreleasing *)error
+{
+ char originalPathPATH_MAX = {0};
+ if (!originalItemURL.path getFileSystemRepresentation:originalPath maxLength:sizeof(originalPath)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Original item %@ to replace cannot be represented as a valid file name", originalItemURL.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ char newPathPATH_MAX = {0};
+ if (!newItemURL.path getFileSystemRepresentation:newPath maxLength:sizeof(newPath)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"New item %@ to replace cannot be represented as a valid file name", newItemURL.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ int status = renamex_np(newPath, originalPath, RENAME_SWAP);
+ if (status != 0) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to replace %@ with %@.", originalItemURL.lastPathComponent, newItemURL.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ return YES;
+}
+
+- (BOOL)changeOwnerAndGroupOfItemAtURL:(NSURL *)targetURL ownerID:(uid_t)ownerID groupID:(gid_t)groupID error:(NSError * __autoreleasing *)error
+{
+ char pathPATH_MAX = {0};
+ if (!targetURL.path getFileSystemRepresentation:path maxLength:sizeof(path)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"File to change owner & group (%@) cannot be represented as a valid file name.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ int fileDescriptor = open(path, O_RDONLY | O_SYMLINK);
+ if (fileDescriptor == -1) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open file descriptor to %@", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ // We use fchown instead of chown because the latter can follow symbolic links
+ BOOL success = (fchown(fileDescriptor, ownerID, groupID) == 0);
+ close(fileDescriptor);
+ 
+ if (!success) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to change owner & group for %@ with owner ID %u and group ID %u.", targetURL.path.lastPathComponent, ownerID, groupID };
+ }
+ }
+
+ return success;
+}
+
+- (BOOL)changeOwnerAndGroupOfItemAtRootURL:(NSURL *)targetURL toMatchURL:(NSURL *)matchURL error:(NSError * __autoreleasing *)error
+{
+ BOOL isTargetADirectory = NO;
+ if (!self _itemExistsAtURL:targetURL isDirectory:&isTargetADirectory) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to change owner & group IDs because %@ does not exist.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ if (!self _itemExistsAtURL:matchURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to match owner & group IDs because %@ does not exist.", matchURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSError *matchFileAttributesError = nil;
+ NSString *matchURLPath = matchURL.path;
+ NSDictionary *matchFileAttributes = _fileManager attributesOfItemAtPath:matchURLPath error:&matchFileAttributesError;
+ if (matchFileAttributes == nil) {
+ if (error != NULL) {
+ *error = matchFileAttributesError;
+ }
+ return NO;
+ }
+
+ NSError *targetFileAttributesError = nil;
+ NSString *targetURLPath = targetURL.path;
+ NSDictionary *targetFileAttributes = _fileManager attributesOfItemAtPath:targetURLPath error:&targetFileAttributesError;
+ if (targetFileAttributes == nil) {
+ if (error != NULL) {
+ *error = targetFileAttributesError;
+ }
+ return NO;
+ }
+
+ NSNumber *ownerID = matchFileAttributes objectForKey:NSFileOwnerAccountID;
+ if (ownerID == nil) {
+ // shouldn't be possible to error here, but just in case
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadNoPermissionError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Owner ID could not be read from %@.", matchURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSNumber *groupID = matchFileAttributes objectForKey:NSFileGroupOwnerAccountID;
+ if (groupID == nil) {
+ // shouldn't be possible to error here, but just in case
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadNoPermissionError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Group ID could not be read from %@.", matchURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSNumber *targetOwnerID = targetFileAttributes objectForKey:NSFileOwnerAccountID;
+ NSNumber *targetGroupID = targetFileAttributes objectForKey:NSFileGroupOwnerAccountID;
+
+ if ((targetOwnerID != nil && ownerID isEqualToNumber:targetOwnerID) && (targetGroupID != nil && groupID isEqualToNumber:targetGroupID)) {
+ // Assume they're the same even if we don't check every file recursively
+ // Speeds up the common case
+ return YES;
+ }
+ 
+ // If we can't change both the new owner & group, try to only change the owner
+ // If this works, this is sufficient enough for performing the update
+ NSNumber *groupIDToUse;
+ if (!self changeOwnerAndGroupOfItemAtURL:targetURL ownerID:ownerID.unsignedIntValue groupID:groupID.unsignedIntValue error:NULL) {
+ if ((targetOwnerID != nil && ownerID isEqualToNumber:targetOwnerID)) {
+ // Assume they're the same even if we don't check every file recursively
+ // Speeds up the common case like above
+ return YES;
+ }
+ 
+ if (!self changeOwnerAndGroupOfItemAtURL:targetURL ownerID:ownerID.unsignedIntValue groupID:targetGroupID.unsignedIntValue error:error) {
+ return NO;
+ }
+ 
+ groupIDToUse = targetGroupID;
+ } else {
+ groupIDToUse = groupID;
+ }
+
+ if (isTargetADirectory) {
+ NSDirectoryEnumerator *directoryEnumerator = _fileManager enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil;
+ for (NSURL *url in directoryEnumerator) {
+ if (!self changeOwnerAndGroupOfItemAtURL:url ownerID:ownerID.unsignedIntValue groupID:groupIDToUse.unsignedIntValue error:error) {
+ return NO;
+ }
+ }
+ }
+ 
+ return YES;
+}
+
+- (BOOL)_updateItemAtURL:(NSURL *)targetURL withAccessTime:(struct timeval)accessTime error:(NSError * __autoreleasing *)error
+{
+ char pathPATH_MAX = {0};
+
+ // NOTE: At least on Mojave 10.14.1, running on an APFS filesystem, the act of asking
+ // for a path's file system representation causes the access time of the containing folder
+ // to be updated. Callers should take care when attempting to set a recursive directory's
+ // access time to ensure that the inner-most items get set first, so that the implicitly
+ // updated access times are replaced after this side-effect occurs.
+ if (!targetURL.path getFileSystemRepresentation:path maxLength:sizeof(path)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"File to update modification & access time (%@) cannot be represented as a valid file name.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ int fileDescriptor = open(path, O_RDONLY | O_SYMLINK);
+ if (fileDescriptor == -1) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open file descriptor to %@", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ struct stat statInfo;
+ if (fstat(fileDescriptor, &statInfo) != 0) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to stat file descriptor to %@", targetURL.path.lastPathComponent };
+ }
+ close(fileDescriptor);
+ return NO;
+ }
+
+ // Preserve the modification time
+ struct timeval modTime;
+ TIMESPEC_TO_TIMEVAL(&modTime, &statInfo.st_mtimespec);
+ 
+ const struct timeval timeInputs = {accessTime, modTime};
+ 
+ // Using futimes() because utimes() follows symbolic links
+ BOOL updatedTime = (futimes(fileDescriptor, timeInputs) == 0);
+ 
+ close(fileDescriptor);
+ 
+ if (!updatedTime) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to update modification & access time for %@", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ return YES;
+}
+
+- (BOOL)updateAccessTimeOfItemAtRootURL:(NSURL *)targetURL error:(NSError * __autoreleasing *)error
+{
+ if (!self _itemExistsAtURL:targetURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to update modification & access time recursively because %@ does not exist.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ // We want to update all files with the same exact time
+ struct timeval currentTime = {0, 0};
+ if (gettimeofday(&currentTime, NULL) != 0) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to update modification & access time recursively because gettimeofday failed." };
+ }
+ return NO;
+ }
+
+ NSString *rootURLPath = targetURL.path;
+ NSDictionary *rootAttributes = _fileManager attributesOfItemAtPath:rootURLPath error:nil;
+ NSString *rootType = rootAttributes objectForKey:NSFileType;
+
+ // Only recurse if it's actually a directory. Don't recurse into a
+ // root-level symbolic link.
+ if (rootType isEqualToString:NSFileTypeDirectory) {
+ // The NSDirectoryEnumerator will avoid recursing into any contained
+ // symbolic links, so no further type checks are needed.
+ NSDirectoryEnumerator *directoryEnumerator = _fileManager enumeratorAtURL:targetURL includingPropertiesForKeys:nil options:(NSDirectoryEnumerationOptions)0 errorHandler:nil;
+ 
+ for (NSURL *file in directoryEnumerator) {
+ if (!self _updateItemAtURL:file withAccessTime:currentTime error:error) {
+ return NO;
+ }
+ }
+ }
+
+ // Set the access time on the container last because the process of setting the access
+ // time on children actually causes the access time of the container directory to be
+ // updated.
+ if (!self _updateItemAtURL:targetURL withAccessTime:currentTime error:error) {
+ return NO;
+ }
+
+ return YES;
+}
+
+// /usr/bin/touch can be used to update an application, as described in:
+// https://developer.apple.com/library/mac/documentation/Carbon/Conceptual/LaunchServicesConcepts/LSCConcepts/LSCConcepts.html
+// The document says LSRegisterURL() can be used as well but this hasn't worked out well for me in practice
+// Anyway, updating the modification time of the application is important because the system will be aware a new version of your app is available,
+// Finder will report the correct file size and other metadata for it, URL schemes your app may register will be updated, etc.
+// Behind the scenes, touch calls to utimes() which is what we use here
+- (BOOL)updateModificationAndAccessTimeOfItemAtURL:(NSURL *)targetURL error:(NSError * __autoreleasing *)error
+{
+ if (!self _itemExistsAtURL:targetURL) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to update modification & access time because %@ does not exist.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ char pathPATH_MAX = {0};
+ if (!targetURL.path getFileSystemRepresentation:path maxLength:sizeof(path)) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"File to update modification & access time (%@) cannot be represented as a valid file name.", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ int fileDescriptor = open(path, O_RDONLY | O_SYMLINK);
+ if (fileDescriptor == -1) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to open file descriptor to %@", targetURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+ 
+ // Using futimes() because utimes() follows symbolic links
+ BOOL updatedTime = (futimes(fileDescriptor, NULL) == 0);
+ close(fileDescriptor);
+ 
+ if (!updatedTime) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to update modification & access time for %@", targetURL.path.lastPathComponent };
+ }
+ }
+ 
+ return updatedTime;
+}
+
+// Creates a directory at the item pointed by url
+// An item cannot already exist at the url, but the parent must be a directory that exists
+- (BOOL)makeDirectoryAtURL:(NSURL *)url error:(NSError * __autoreleasing *)error
+{
+ if (self _itemExistsAtURL:url) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileWriteFileExistsError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to create directory because file %@ already exists.", url.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSURL *parentURL = url URLByDeletingLastPathComponent;
+ BOOL isParentADirectory = NO;
+ if (!self _itemExistsAtURL:parentURL isDirectory:&isParentADirectory || !isParentADirectory) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to create directory because parent directory %@ does not exist.", parentURL.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSError *createDirectoryError = nil;
+ if (!_fileManager createDirectoryAtURL:url withIntermediateDirectories:NO attributes:nil error:&createDirectoryError) {
+ if (error != NULL) {
+ *error = createDirectoryError;
+ }
+ return NO;
+ }
+
+ return YES;
+}
+
+- (NSURL *)makeTemporaryDirectoryAppropriateForDirectoryURL:(NSURL *)directoryURL error:(NSError * __autoreleasing *)error
+{
+ return _fileManager URLForDirectory:NSItemReplacementDirectory inDomain:NSUserDomainMask appropriateForURL:directoryURL create:YES error:error;
+}
+
+- (BOOL)removeItemAtURL:(NSURL *)url error:(NSError * __autoreleasing *)error
+{
+ if (!self _itemExistsAtURL:url) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:NSCocoaErrorDomain code:NSFileNoSuchFileError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"Failed to remove file %@ because it does not exist.", url.path.lastPathComponent };
+ }
+ return NO;
+ }
+
+ NSError *removeError = nil;
+ if (!_fileManager removeItemAtURL:url error:&removeError) {
+ if (error != NULL) {
+ *error = removeError;
+ }
+ return NO;
+ }
+
+ return YES;
+}
+
+@end
+
+#pragma clang diagnostic pop

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUHost.h Added

@@ -0,0 +1,43 @@
+//
+// SUHost.h
+// Sparkle
+//
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@class SUPublicKeys;
+
+@interface SUHost : NSObject
+
+@property (strong, readonly) NSBundle *bundle;
+
+- (instancetype)initWithBundle:(NSBundle *)aBundle;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@property (readonly, copy) NSString *bundlePath;
+@property (readonly, copy) NSString *name;
+@property (readonly, copy) NSString *version;
+@property (readonly, nonatomic) BOOL validVersion;
+@property (readonly, copy) NSString *displayVersion;
+@property (readonly) SUPublicKeys *publicKeys;
+
+@property (getter=isRunningOnReadOnlyVolume, readonly) BOOL runningOnReadOnlyVolume;
+@property (getter=isRunningTranslocated, readonly) BOOL runningTranslocated;
+@property (readonly, nonatomic, copy, nullable) NSString *publicDSAKeyFileKey;
+
+- (nullable id)objectForInfoDictionaryKey:(NSString *)key;
+- (BOOL)boolForInfoDictionaryKey:(NSString *)key;
+- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName;
+- (void)setObject:(nullable id)value forUserDefaultsKey:(NSString *)defaultName;
+- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName;
+- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName;
+- (nullable id)objectForKey:(NSString *)key;
+- (BOOL)boolForKey:(NSString *)key;
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUHost.m Added

@@ -0,0 +1,278 @@
+//
+// SUHost.m
+// Sparkle
+//
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import "SUHost.h"
+
+#import "SUConstants.h"
+#include <sys/mount.h> // For statfs for isRunningOnReadOnlyVolume
+#import "SULog.h"
+#import "SUSignatures.h"
+
+
+#include "AppKitPrevention.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+// This class should not rely on AppKit and should also be process independent
+// For example, it should not have code that tests writabilty to somewhere on disk,
+// as that may depend on the privileges of the process owner. Or code that depends on
+// if the process is sandboxed or not; eg: finding the user's caches directory. Or code that depends
+// on compilation flags and if other files exist relative to the host bundle.
+
+@interface SUHost ()
+
+@property (strong, readwrite) NSBundle *bundle;
+@property (nonatomic, readonly) BOOL isMainBundle;
+@property (copy, nullable) NSString *defaultsDomain;
+@property (assign) BOOL usesStandardUserDefaults;
+@property (readonly, copy, nullable) NSString *publicDSAKey;
+
+@end
+
+@implementation SUHost
+
+@synthesize bundle;
+@synthesize isMainBundle = _isMainBundle;
+@synthesize defaultsDomain;
+@synthesize usesStandardUserDefaults;
+
+- (instancetype)initWithBundle:(NSBundle *)aBundle
+{
+	if ((self = super init))
+	{
+ NSParameterAssert(aBundle);
+ self.bundle = aBundle;
+ if (!self.bundle bundleIdentifier) {
+ SULog(SULogLevelError, @"Error: the bundle being updated at %@ has no %@! This will cause preference read/write to not work properly.", self.bundle, kCFBundleIdentifierKey);
+ }
+ 
+ _isMainBundle = aBundle isEqualTo:NSBundle mainBundle;
+
+ self.defaultsDomain = self objectForInfoDictionaryKey:SUDefaultsDomainKey;
+ if (!self.defaultsDomain) {
+ self.defaultsDomain = self.bundle bundleIdentifier;
+ }
+
+ // If we're using the main bundle's defaults we'll use the standard user defaults mechanism, otherwise we have to get CF-y.
+ NSString *mainBundleIdentifier = NSBundle.mainBundle.bundleIdentifier;
+ usesStandardUserDefaults = !self.defaultsDomain || self.defaultsDomain isEqualToString:mainBundleIdentifier;
+ }
+ return self;
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self bundlePath; }
+
+- (NSString *)bundlePath
+{
+ return self.bundle bundlePath;
+}
+
+- (NSString * _Nonnull)name
+{
+ NSString *name;
+
+ // Allow host bundle to provide a custom name
+ name = self objectForInfoDictionaryKey:@"SUBundleName";
+ if (name && name.length > 0) return name;
+
+ name = self objectForInfoDictionaryKey:@"CFBundleDisplayName";
+	if (name && name.length > 0) return name;
+
+ name = self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey;
+	if (name && name.length > 0) return name;
+
+ return NSFileManager defaultManager displayNameAtPath:self bundlePath stringByDeletingPathExtension;
+}
+
+- (BOOL)validVersion
+{
+ return self isValidVersion:self _version;
+}
+
+- (BOOL)isValidVersion:(NSString * _Nullable)version
+{
+ return (version != nil && version.length != 0);
+}
+
+- (NSString * _Nullable)_version
+{
+ NSString *version = self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey;
+ return (self isValidVersion:version ? version : nil);
+}
+
+- (NSString * _Nonnull)version
+{
+ NSString *version = self _version;
+ if (version == nil) {
+ SULog(SULogLevelError, @"This host (%@) has no %@! This attribute is required.", self bundlePath, (__bridge NSString *)kCFBundleVersionKey);
+ // Instead of abort()-ing, return an empty string to satisfy the _Nonnull contract.
+ return @"";
+ }
+ return version;
+}
+
+- (NSString * _Nonnull)displayVersion
+{
+ NSString *shortVersionString = self objectForInfoDictionaryKey:@"CFBundleShortVersionString";
+ if (shortVersionString)
+ return shortVersionString;
+ else
+ return self version; // Fall back on the normal version string.
+}
+
+- (BOOL)isRunningOnReadOnlyVolume
+{
+ struct statfs statfs_info;
+ statfs(self.bundle bundlePath fileSystemRepresentation, &statfs_info);
+ return (statfs_info.f_flags & MNT_RDONLY) != 0;
+}
+
+- (BOOL)isRunningTranslocated
+{
+ NSString *path = self.bundle bundlePath;
+ return path rangeOfString:@"/AppTranslocation/".location != NSNotFound;
+}
+
+- (NSString *_Nullable)publicEDKey
+{
+ return self objectForInfoDictionaryKey:SUPublicEDKeyKey;
+}
+
+- (NSString *_Nullable)publicDSAKey
+{
+ // Maybe the key is just a string in the Info.plist.
+ NSString *key = self objectForInfoDictionaryKey:SUPublicDSAKeyKey;
+	if (key) {
+ return key;
+ }
+
+ // More likely, we've got a reference to a Resources file by filename:
+ NSString *keyFilename = self publicDSAKeyFileKey;
+	if (!keyFilename) {
+ return nil;
+ }
+
+ NSString *keyPath = self.bundle pathForResource:keyFilename ofType:nil;
+ if (!keyPath) {
+ return nil;
+ }
+ NSError *error = nil;
+ key = NSString stringWithContentsOfFile:keyPath encoding:NSASCIIStringEncoding error:&error;
+ if (error) {
+ SULog(SULogLevelError, @"Error loading %@: %@", keyPath, error);
+ }
+ return key;
+}
+
+- (SUPublicKeys *)publicKeys
+{
+ return SUPublicKeys alloc initWithDsa:self publicDSAKey ed:self publicEDKey;
+}
+
+- (NSString * _Nullable)publicDSAKeyFileKey
+{
+ return self objectForInfoDictionaryKey:SUPublicDSAKeyFileKey;
+}
+
+- (nullable id)objectForInfoDictionaryKey:(NSString *)key
+{
+ if (self.isMainBundle) {
+ // Common fast path - if we're updating the main bundle, that means our updater and host bundle's lifetime is the same
+ // If the bundle happens to be updated or change, that means our updater process needs to be terminated first to do it safely
+ // Thus we can rely on the cached Info dictionary
+ return self.bundle objectForInfoDictionaryKey:key;
+ } else {
+ // Slow path - if we're updating another bundle, we should read in the most up to date Info dictionary because
+ // the bundle can be replaced externally or even by us.
+ // This is the easiest way to read the Info dictionary values *correctly* despite some performance loss.
+ // A mutable method to reload the Info dictionary at certain points and have it cached at other points is challenging to do correctly.
+ CFDictionaryRef cfInfoDictionary = CFBundleCopyInfoDictionaryInDirectory((CFURLRef)self.bundle.bundleURL);
+ NSDictionary *infoDictionary = CFBridgingRelease(cfInfoDictionary);
+ 
+ return infoDictionary objectForKey:key;
+ }
+}
+
+- (BOOL)boolForInfoDictionaryKey:(NSString *)key
+{
+ return (NSNumber *)self objectForInfoDictionaryKey:key boolValue;
+}
+
+- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName
+{
+ if (!defaultName || !self.defaultsDomain) {
+ return nil;
+ }
+
+ // Under Tiger, CFPreferencesCopyAppValue doesn't get values from NSRegistrationDomain, so anything
+ // passed into -NSUserDefaults registerDefaults: is ignored. The following line falls
+ // back to using NSUserDefaults, but only if the host bundle is the main bundle.
+ if (self.usesStandardUserDefaults) {
+ return NSUserDefaults standardUserDefaults objectForKey:defaultName;
+ }
+
+ CFPropertyListRef obj = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)self.defaultsDomain);
+ return CFBridgingRelease(obj);
+}
+
+// Note this handles nil being passed for defaultName, in which case the user default will be removed
+- (void)setObject:(nullable id)value forUserDefaultsKey:(NSString *)defaultName
+{
+	if (self.usesStandardUserDefaults)
+	{
+ NSUserDefaults standardUserDefaults setObject:value forKey:defaultName;
+	}
+	else
+	{
+ CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFPropertyListRef)(value), (__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+ CFPreferencesSynchronize((__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+ }
+}
+
+- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName
+{
+ if (self.usesStandardUserDefaults) {
+ return NSUserDefaults standardUserDefaults boolForKey:defaultName;
+ }
+
+ BOOL value;
+ CFPropertyListRef plr = CFPreferencesCopyAppValue((__bridge CFStringRef)defaultName, (__bridge CFStringRef)self.defaultsDomain);
+ if (plr == NULL) {
+ value = NO;
+	}
+	else
+	{
+ value = CFBooleanGetValue((CFBooleanRef)plr) ? YES : NO;
+ CFRelease(plr);
+ }
+ return value;
+}
+
+- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
+{
+	if (self.usesStandardUserDefaults)
+	{
+ NSUserDefaults standardUserDefaults setBool:value forKey:defaultName;
+	}
+	else
+	{
+ CFPreferencesSetValue((__bridge CFStringRef)defaultName, (__bridge CFBooleanRef) @(value), (__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+ CFPreferencesSynchronize((__bridge CFStringRef)self.defaultsDomain, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+ }
+}
+
+- (nullable id)objectForKey:(NSString *)key {
+ return self objectForUserDefaultsKey:key ? self objectForUserDefaultsKey:key : self objectForInfoDictionaryKey:key;
+}
+
+- (BOOL)boolForKey:(NSString *)key {
+ return self objectForUserDefaultsKey:key ? self boolForUserDefaultsKey:key : self boolForInfoDictionaryKey:key;
+}
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUInstallerProtocol.h Added

@@ -0,0 +1,36 @@
+//
+// SUInstallerProtocol.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/26/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol SUInstallerProtocol <NSObject>
+
+// Any installation work can be done prior to user application being terminated and relaunched
+// Currently this is invoked after the user application is terminated, but this may change in the future.
+// No UI should occur during this stage (i.e, do not show package installer apps, etc..)
+// Should be able to be called from non-main thread
+- (BOOL)performInitialInstallation:(NSError **)error;
+
+// Any installation work after the user application has been terminated. This is where the final installation work can be done.
+// After this stage is done, the user application may be relaunched.
+// Should be able to be called from non-main thread
+- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))cb error:(NSError **)error;
+
+// Indicates whether or not this installer can install the update silently in the background, without hindering the user
+// Should be thread safe
+- (BOOL)canInstallSilently;
+
+// The destination and installation path of the bundle being updated
+// Should be thread safe
+- (NSString *)installationPath;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULegacyWebView.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULegacyWebView.m Added

@@ -0,0 +1,171 @@
+//
+// SULegacyWebView.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/30/20.
+// Copyright © 2020 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SULegacyWebView.h"
+#import "SUWebViewCommon.h"
+#import "SULog.h"
+#import <WebKit/WebKit.h>
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
+@interface SULegacyWebView () <WebPolicyDelegate, WebFrameLoadDelegate, WebUIDelegate>
+
+@property (nonatomic, readonly) WebView *webView;
+@property (nonatomic) void (^completionHandler)(NSError * _Nullable);
+
+@end
+
+@implementation SULegacyWebView
+
+@synthesize webView = _webView;
+@synthesize completionHandler = _completionHandler;
+
+- (instancetype)initWithColorStyleSheetLocation:(NSURL *)colorStyleSheetLocation fontFamily:(NSString *)fontFamily fontPointSize:(int)fontPointSize javaScriptEnabled:(BOOL)javaScriptEnabled
+{
+ self = super init;
+ if (self != nil) {
+ _webView = WebView alloc initWithFrame:NSZeroRect;
+
+ WebPreferences *preferences = WebPreferences alloc initWithIdentifier:@"sparkle-project.org.legacy-web-view";
+ preferences.autosaves = NO;
+ preferences.javaScriptEnabled = javaScriptEnabled;
+ preferences.javaEnabled = NO;
+ preferences.plugInsEnabled = NO;
+ 
+ // Mimicking settings when WebView used to be in SUUpdateAlert nib
+ preferences.loadsImagesAutomatically = YES;
+ preferences.allowsAnimatedImages = YES;
+ preferences.allowsAnimatedImageLooping = YES;
+ 
+ // Settings for default style
+ preferences.userStyleSheetEnabled = YES;
+ preferences.userStyleSheetLocation = colorStyleSheetLocation;
+ preferences.standardFontFamily = fontFamily;
+ preferences.defaultFontSize = fontPointSize;
+ 
+ _webView.preferences = preferences;
+ _webView.policyDelegate = self;
+ _webView.frameLoadDelegate = self;
+ _webView.UIDelegate = self;
+ }
+ return self;
+}
+
+- (NSView *)view
+{
+ return self.webView;
+}
+
+- (void)loadHTMLString:(NSString *)htmlString baseURL:(NSURL * _Nullable)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
+{
+ self.completionHandler = completionHandler copy;
+ self.webView mainFrame loadHTMLString:htmlString baseURL:baseURL;
+}
+
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName baseURL:(NSURL *)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
+{
+ self.completionHandler = completionHandler copy;
+ self.webView mainFrame loadData:data MIMEType:MIMEType textEncodingName:textEncodingName baseURL:baseURL;
+}
+
+- (void)stopLoading
+{
+ self.completionHandler = nil;
+ self.webView stopLoading:self;
+}
+
+- (void)setDrawsBackground:(BOOL)drawsBackground
+{
+ self.webView.drawsBackground = drawsBackground;
+}
+
+- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
+{
+ if (frame parentFrame == nil) {
+ if (self.completionHandler != nil) {
+ self.completionHandler(nil);
+ self.completionHandler = nil;
+ }
+ sender display; // necessary to prevent weird scroll bar artifacting
+ }
+}
+
+- (void)webView:(WebView *)sender didFailLoadWithError:(NSError *)error forFrame:(WebFrame *)frame
+{
+ if (frame parentFrame == nil) {
+ if (self.completionHandler != nil) {
+ self.completionHandler(error);
+ self.completionHandler = nil;
+ }
+ }
+}
+
+- (void)webView:(WebView *)__unused sender decidePolicyForNavigationAction:(NSDictionary *)__unused actionInformation request:(NSURLRequest *)request frame:(WebFrame *)__unused frame decisionListener:(id<WebPolicyDecisionListener>)listener
+{
+ NSURL *requestURL = request.URL;
+ BOOL isAboutBlank = NO;
+ BOOL safeURL = SUWebViewIsSafeURL(requestURL, &isAboutBlank);
+
+ // Do not allow redirects to dangerous protocols such as file://
+ if (!safeURL) {
+ SULog(SULogLevelDefault, @"Blocked display of %@ URL which may be dangerous", requestURL.scheme);
+ listener ignore;
+ return;
+ }
+
+ // Ensure we are finished loading
+ if (self.completionHandler == nil) {
+ if (requestURL && !isAboutBlank) {
+ NSWorkspace sharedWorkspace openURL:requestURL;
+ }
+
+ listener ignore;
+ }
+ else {
+ listener use;
+ }
+}
+
+// Clean up the contextual menu.
+- (NSArray *)webView:(WebView *)__unused sender contextMenuItemsForElement:(NSDictionary *)__unused element defaultMenuItems:(NSArray *)defaultMenuItems
+{
+ NSMutableArray *webViewMenuItems = defaultMenuItems mutableCopy;
+
+ if (webViewMenuItems)
+ {
+ for (NSMenuItem *menuItem in defaultMenuItems)
+ {
+ NSInteger tag = menuItem tag;
+
+ switch (tag)
+ {
+ case WebMenuItemTagOpenLinkInNewWindow:
+ case WebMenuItemTagDownloadLinkToDisk:
+ case WebMenuItemTagOpenImageInNewWindow:
+ case WebMenuItemTagDownloadImageToDisk:
+ case WebMenuItemTagOpenFrameInNewWindow:
+ case WebMenuItemTagGoBack:
+ case WebMenuItemTagGoForward:
+ case WebMenuItemTagStop:
+ case WebMenuItemTagReload:
+ webViewMenuItems removeObjectIdenticalTo:menuItem;
+ }
+ }
+ }
+
+ return webViewMenuItems;
+}
+
+@end
+
+#pragma clang diagnostic pop
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULocalizations.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULog+NSError.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULog+NSError.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULog.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SULog.m Added

@@ -0,0 +1,45 @@
+//
+// SULog.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 5/18/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#include "SULog.h"
+#include <os/log.h>
+
+
+#include "AppKitPrevention.h"
+
+void SULog(SULogLevel level, NSString *format, ...)
+{
+ static dispatch_once_t onceToken;
+ static os_log_t logger;
+
+ dispatch_once(&onceToken, ^{
+ const char *subsystem = SPARKLE_BUNDLE_IDENTIFIER;
+ // This creates a thread-safe object
+ logger = os_log_create(subsystem, "Sparkle");
+ });
+
+ va_list ap;
+ va_start(ap, format);
+ NSString *logMessage = NSString alloc initWithFormat:format arguments:ap;
+ va_end(ap);
+ 
+ // We'll make all of our messages formatted as public; just don't log sensitive information.
+ // Note we don't take advantage of info like the source line number because we wrap this macro inside our own function
+ // And we don't really leverage of os_log's deferred formatting processing because we format the string before passing it in
+ switch (level) {
+ case SULogLevelDefault:
+ // See docs for OS_LOG_TYPE_DEFAULT
+ // By default, OS_LOG_TYPE_DEFAULT seems to be more noticable than OS_LOG_TYPE_INFO
+ os_log(logger, "%{public}@", logMessage);
+ break;
+ case SULogLevelError:
+ // See docs for OS_LOG_TYPE_ERROR
+ os_log_error(logger, "%{public}@", logMessage);
+ break;
+ }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUNormalization.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUNormalization.m Added

@@ -0,0 +1,35 @@
+//
+//  SUNormalization.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 3/26/21.
+//  Copyright © 2021 Sparkle Project. All rights reserved.
+//
+
+#import "SUNormalization.h"
+
+
+#include "AppKitPrevention.h"
+
+NSString *SUNormalizedInstallationPath(SUHost *host)
+{
+    NSBundle *bundle = host.bundle;
+    assert(bundle != nil);
+   
+    NSString * baseBundleName = host objectForInfoDictionaryKey:@"SUBundleName";
+   
+    if (baseBundleName == nil) {
+        baseBundleName = host objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey;
+    }
+    
+    NSString *normalizedAppPath = bundle bundlePath stringByDeletingLastPathComponent stringByAppendingPathComponent:NSString stringWithFormat:@"%@.%@", baseBundleName, bundle bundlePath pathExtension;
+
+    // Roundtrip string through fileSystemRepresentation to ensure it uses filesystem's Unicode normalization
+    // rather than arbitrary Unicode form from Info.plist - #1017
+    NSString *unicodeNormalizedPath = NSString stringWithUTF8String:normalizedAppPath fileSystemRepresentation;
+    if (unicodeNormalizedPath != nil) {
+        return unicodeNormalizedPath;
+    } else {
+        return normalizedAppPath;
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUOperatingSystem.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUOperatingSystem.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUPhasedUpdateGroupInfo.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUPhasedUpdateGroupInfo.m Added

@@ -0,0 +1,42 @@
+//
+//  SUPhasedUpdateGroupInfo.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 01/24/21.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUPhasedUpdateGroupInfo.h"
+#import "SUHost.h"
+#import "SUConstants.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUPhasedUpdateGroupInfo
+
+#define NUM_UPDATE_GROUPS 7
++ (NSUInteger)updateGroupForHost:(SUHost*)host {
+    NSNumber* updateGroupIdentifier = self updateGroupIdentifierForHost:host;
+    return (updateGroupIdentifier unsignedIntValue % NUM_UPDATE_GROUPS);
+}
+
++ (NSNumber*)updateGroupIdentifierForHost:(SUHost*)host {
+    NSNumber* updateGroupIdentifier = host objectForUserDefaultsKey:SUUpdateGroupIdentifierKey;
+    if(updateGroupIdentifier == nil) {
+        updateGroupIdentifier = self setNewUpdateGroupIdentifierForHost:host;
+    }
+
+    return updateGroupIdentifier;
+}
+
++ (NSNumber*)setNewUpdateGroupIdentifierForHost:(SUHost*)host {
+    unsigned int r = arc4random_uniform(UINT_MAX);
+    NSNumber* updateGroupIdentifier = @(r);
+
+    host setObject:updateGroupIdentifier forUserDefaultsKey:SUUpdateGroupIdentifierKey;
+
+    return updateGroupIdentifier;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUSignatures.h Added

@@ -0,0 +1,54 @@
+//
+// SUSignatures.h
+// Sparkle
+//
+// Created by Kornel on 15/09/2018.
+// Copyright © 2018 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+typedef NS_ENUM(uint8_t, SUSigningInputStatus) {
+ /// An input was not provided at all.
+ SUSigningInputStatusAbsent = 0,
+
+ /// An input was provided, but did not have the correct format.
+ SUSigningInputStatusInvalid,
+
+ /// An input was provided and can be used for verifying signing information.
+ SUSigningInputStatusPresent,
+ SUSigningInputStatusLastValidCase = SUSigningInputStatusPresent
+};
+
+@interface SUSignatures : NSObject <NSSecureCoding> {
+ unsigned char ed25519_signature64;
+}
+@property (strong, readonly, nullable) NSData *dsaSignature;
+@property (readonly) SUSigningInputStatus dsaSignatureStatus;
+
+@property (readonly, nullable, nonatomic) const unsigned char *ed25519Signature;
+@property (readonly) SUSigningInputStatus ed25519SignatureStatus;
+
+- (instancetype)initWithDsa:(NSString * _Nullable)dsa ed:(NSString * _Nullable)ed;
+@end
+
+
+@interface SUPublicKeys : NSObject {
+ unsigned char ed25519_public_key32;
+}
+@property (strong, readonly, nullable) NSString *dsaPubKey;
+@property (readonly) SUSigningInputStatus dsaPubKeyStatus;
+
+@property (readonly, nullable, nonatomic) const unsigned char *ed25519PubKey;
+@property (readonly) SUSigningInputStatus ed25519PubKeyStatus;
+
+/// Returns YES if either key is present (though they may be invalid).
+@property (readonly) BOOL hasAnyKeys;
+
+- (instancetype)initWithDsa:(NSString * _Nullable)dsa ed:(NSString * _Nullable)ed;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUSignatures.m Added

@@ -0,0 +1,190 @@
+//
+// SUSignatures.m
+// Sparkle
+//
+// Created by Kornel on 15/09/2018.
+// Copyright © 2018 Sparkle Project. All rights reserved.
+//
+
+#import "SUSignatures.h"
+#import <assert.h>
+#import "SULog.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SUDSASignatureKey = @"SUDSASignature";
+static NSString *SUDSASignatureStatusKey = @"SUDSASignatureStatus";
+static NSString *SUEDSignatureKey = @"SUEDSignature";
+static NSString *SUEDSignatureStatusKey = @"SUEDSignatureStatus";
+
+@implementation SUSignatures
+@synthesize dsaSignature = _dsaSignature;
+@synthesize dsaSignatureStatus = _dsaSignatureStatus;
+@synthesize ed25519SignatureStatus = _ed25519SignatureStatus;
+
+static SUSigningInputStatus decode(NSString *str, NSData * __strong *outData) {
+ if (str == nil) {
+ return SUSigningInputStatusAbsent;
+ }
+
+ NSString *stripped = str stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet;
+ NSData *result = NSData alloc initWithBase64EncodedString:stripped options:0;
+ if (!result) {
+ return SUSigningInputStatusInvalid;
+ }
+ *outData = result;
+ return SUSigningInputStatusPresent;
+}
+
+- (instancetype)initWithDsa:(NSString * _Nullable)maybeDsa ed:(NSString * _Nullable)maybeEd25519
+{
+ self = super init;
+ if (self) {
+ _dsaSignatureStatus = decode(maybeDsa, &_dsaSignature);
+ if (_dsaSignatureStatus == SUSigningInputStatusInvalid) {
+ SULog(SULogLevelError, @"The provided DSA signature could not be decoded.");
+ }
+
+ if (maybeEd25519 != nil) {
+ NSData *data = nil;
+ _ed25519SignatureStatus = decode(maybeEd25519, &data);
+ if (data) {
+ assert(64 == sizeof(self->ed25519_signature));
+ if (data length == sizeof(self->ed25519_signature)) {
+ data getBytes:self->ed25519_signature length:sizeof(self->ed25519_signature);
+ } else {
+ _ed25519SignatureStatus = SUSigningInputStatusInvalid;
+ }
+ }
+
+ if (_ed25519SignatureStatus == SUSigningInputStatusInvalid) {
+ SULog(SULogLevelError, @"The provided EdDSA signature could not be decoded.");
+ }
+ }
+ }
+ return self;
+}
+
+- (const unsigned char *)ed25519Signature {
+// Xcode may enable this in pedantic mode
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ if (self.ed25519SignatureStatus == SUSigningInputStatusPresent) {
+ return self->ed25519_signature;
+ }
+ return NULL;
+#pragma clang diagnostic pop
+}
+
+static BOOL decodeStatus(NSCoder *decoder, NSString *key, SUSigningInputStatus *outStatus) {
+ NSInteger rawValue = decoder decodeIntegerForKey:key;
+ if (rawValue > SUSigningInputStatusLastValidCase) {
+ return NO;
+ }
+ *outStatus = (SUSigningInputStatus)rawValue;
+ return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+ self = super init;
+ if (self) {
+ if (!decodeStatus(decoder, SUDSASignatureStatusKey, &_dsaSignatureStatus)) {
+ return nil;
+ }
+
+ NSData *dsaSignature = decoder decodeObjectOfClass:NSData class forKey:SUDSASignatureKey;
+ if (dsaSignature) {
+ _dsaSignature = dsaSignature;
+ }
+
+ if (!decodeStatus(decoder, SUEDSignatureStatusKey, &_ed25519SignatureStatus)) {
+ return nil;
+ }
+
+ NSData *edSignature = decoder decodeObjectOfClass:NSData class forKey:SUEDSignatureKey;
+ if (edSignature) {
+ if (edSignature.length != sizeof(self->ed25519_signature)) {
+ return nil;
+ }
+ edSignature getBytes:self->ed25519_signature length:sizeof(self->ed25519_signature);
+ }
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder
+{
+ coder encodeInteger:self.dsaSignatureStatus forKey:SUDSASignatureStatusKey;
+ if (self.dsaSignature) {
+ coder encodeObject:self.dsaSignature forKey:SUDSASignatureKey;
+ }
+ coder encodeInteger:self.ed25519SignatureStatus forKey:SUEDSignatureStatusKey;
+ if (self.ed25519Signature) {
+// Xcode may enable this in pedantic mode
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ NSData *edSignature = NSData dataWithBytesNoCopy:&self->ed25519_signature length:sizeof(self->ed25519_signature) freeWhenDone:false;
+#pragma clang diagnostic pop
+ coder encodeObject:edSignature forKey:SUEDSignatureKey;
+ }
+}
+
++ (BOOL)supportsSecureCoding {
+ return YES;
+}
+
+@end
+
+@implementation SUPublicKeys
+@synthesize dsaPubKey = _dsaPubKey;
+@synthesize ed25519PubKeyStatus = _ed25519PubKeyStatus;
+
+- (instancetype)initWithDsa:(NSString * _Nullable)maybeDsa ed:(NSString * _Nullable)maybeEd25519
+{
+ self = super init;
+ if (self) {
+ _dsaPubKey = maybeDsa;
+ if (maybeEd25519 != nil) {
+ NSData *ed = nil;
+ _ed25519PubKeyStatus = decode(maybeEd25519, &ed);
+ if (ed) {
+ assert(32 == sizeof(self->ed25519_public_key));
+ if (ed length == sizeof(self->ed25519_public_key)) {
+ ed getBytes:self->ed25519_public_key length:sizeof(self->ed25519_public_key);
+ } else {
+ _ed25519PubKeyStatus = SUSigningInputStatusInvalid;
+ }
+ }
+
+ if (_ed25519PubKeyStatus == SUSigningInputStatusInvalid) {
+ SULog(SULogLevelError, @"The provided EdDSA key could not be decoded.");
+ }
+ }
+ }
+ return self;
+}
+
+- (SUSigningInputStatus)dsaPubKeyStatus {
+ // We don't currently do any prevalidation of DSA public keys,
+ // so this is always going to be "present" or "absent".
+ return self.dsaPubKey ? SUSigningInputStatusPresent : SUSigningInputStatusAbsent;
+}
+
+- (const unsigned char *)ed25519PubKey {
+// Xcode may enable this in pedantic mode
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ if (self.ed25519PubKeyStatus == SUSigningInputStatusPresent) {
+ return self->ed25519_public_key;
+ }
+ return NULL;
+#pragma clang diagnostic pop
+}
+
+- (BOOL)hasAnyKeys {
+ return self.dsaPubKeyStatus != SUSigningInputStatusAbsent || self.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUStandardVersionComparator.h Added

@@ -0,0 +1,63 @@
+//
+// SUStandardVersionComparator.h
+// Sparkle
+//
+// Created by Andy Matuschak on 12/21/07.
+// Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUSTANDARDVERSIONCOMPARATOR_H
+#define SUSTANDARDVERSIONCOMPARATOR_H
+
+#import <Foundation/Foundation.h>
+
+#ifdef BUILDING_SPARKLE_TOOL
+// Ignore incorrect warning
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "SUExport.h"
+#import "SUVersionComparisonProtocol.h"
+#pragma clang diagnostic pop
+#else
+#import <Sparkle/SUExport.h>
+#import <Sparkle/SUVersionComparisonProtocol.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Sparkle's default version comparator.
+
+ This comparator is adapted from MacPAD, by Kevin Ballard.
+ It's "dumb" in that it does essentially string comparison,
+ in components split by character type.
+*/
+SU_EXPORT @interface SUStandardVersionComparator : NSObject <SUVersionComparison>
+
+/**
+ Initializes a new instance of the standard version comparator.
+*/
+- (instancetype)init;
+
+/**
+ A singleton instance of the comparator.
+ */
+@property (nonatomic, class, readonly) SUStandardVersionComparator *defaultComparator;
+
+/**
+ Compares two version strings through textual analysis.
+ 
+ These version strings should be in the format of x, x.y, or x.y.z where each component is a number.
+ For example, valid version strings include "1.5.3", "500", or "4000.1"
+ These versions that are compared correspond to the @c CFBundleVersion values of the updates.
+ 
+ @param versionA The first version string to compare.
+ @param versionB The second version string to compare.
+ @return A comparison result between @c versionA and @c versionB
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB;
+
+@end
+
+NS_ASSUME_NONNULL_END
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUStandardVersionComparator.m Added

@@ -0,0 +1,276 @@
+//
+// SUStandardVersionComparator.m
+// Sparkle
+//
+// Created by Andy Matuschak on 12/21/07.
+// Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#import "SUVersionComparisonProtocol.h"
+#import "SUStandardVersionComparator.h"
+
+
+#include "AppKitPrevention.h"
+
+@implementation SUStandardVersionComparator
+
+- (instancetype)init
+{
+ return super init;
+}
+
++ (SUStandardVersionComparator *)defaultComparator
+{
+ static SUStandardVersionComparator *defaultComparator = nil;
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ defaultComparator = SUStandardVersionComparator alloc init;
+ });
+ return defaultComparator;
+}
+
+typedef NS_ENUM(NSInteger, SUCharacterType) {
+ kNumberType,
+ kStringType,
+ kPeriodSeparatorType,
+ kPunctuationSeparatorType,
+ kWhitespaceSeparatorType,
+ kDashType,
+};
+
+- (SUCharacterType)typeOfCharacter:(NSString *)character
+{
+ if (character isEqualToString:@".") {
+ return kPeriodSeparatorType;
+ } else if (character isEqualToString:@"-") {
+ return kDashType;
+ } else if (NSCharacterSet decimalDigitCharacterSet characterIsMember:character characterAtIndex:0) {
+ return kNumberType;
+ } else if (NSCharacterSet whitespaceAndNewlineCharacterSet characterIsMember:character characterAtIndex:0) {
+ return kWhitespaceSeparatorType;
+ } else if (NSCharacterSet punctuationCharacterSet characterIsMember:character characterAtIndex:0) {
+ return kPunctuationSeparatorType;
+ } else {
+ return kStringType;
+ }
+}
+
+- (BOOL)isSeparatorType:(SUCharacterType)characterType
+{
+ switch (characterType) {
+ case kNumberType:
+ case kStringType:
+ case kDashType:
+ return NO;
+ case kPeriodSeparatorType:
+ case kPunctuationSeparatorType:
+ case kWhitespaceSeparatorType:
+ return YES;
+ }
+}
+
+// If type A and type B are some sort of separator, consider them to be equal
+- (BOOL)isEqualCharacterTypeClassForTypeA:(SUCharacterType)typeA typeB:(SUCharacterType)typeB
+{
+ switch (typeA) {
+ case kNumberType:
+ case kStringType:
+ case kDashType:
+ return (typeA == typeB);
+ case kPeriodSeparatorType:
+ case kPunctuationSeparatorType:
+ case kWhitespaceSeparatorType: {
+ switch (typeB) {
+ case kPeriodSeparatorType:
+ case kPunctuationSeparatorType:
+ case kWhitespaceSeparatorType:
+ return YES;
+ case kNumberType:
+ case kStringType:
+ case kDashType:
+ return NO;
+ }
+ }
+ }
+}
+
+- (NSMutableArray<NSString *> *)splitVersionString:(NSString *)version
+{
+ NSString *character;
+ NSMutableString *s;
+ NSUInteger i, n;
+ SUCharacterType oldType, newType;
+ NSMutableArray<NSString *> *parts = NSMutableArray array;
+ if (version length == 0) {
+ // Nothing to do here
+ return parts;
+ }
+ s = version substringToIndex:1 mutableCopy;
+ oldType = self typeOfCharacter:s;
+ n = version length - 1;
+ for (i = 1; i <= n; ++i) {
+ character = version substringWithRange:NSMakeRange(i, 1);
+ newType = self typeOfCharacter:character;
+ if (newType == kDashType) {
+ break;
+ }
+ if (oldType != newType || self isSeparatorType:oldType) {
+ // We've reached a new segment
+ NSString *aPart = NSString alloc initWithString:s;
+ parts addObject:aPart;
+ s setString:character;
+ } else {
+ // Add character to string and continue
+ s appendString:character;
+ }
+ oldType = newType;
+ }
+
+ // Add the last part onto the array
+ parts addObject:NSString stringWithString:s;
+ return parts;
+}
+
+// This returns the count of number and period parts at the beginning of the version
+// See -balanceVersionPartsA:partsB below
+- (NSUInteger)countOfNumberAndPeriodStartingParts:(NSArray<NSString *> *)parts
+{
+ NSUInteger count = 0;
+ for (NSString *part in parts) {
+ SUCharacterType characterType = self typeOfCharacter:part;
+ 
+ if (characterType == kNumberType || characterType == kPeriodSeparatorType) {
+ count++;
+ } else {
+ break;
+ }
+ }
+ return count;
+}
+
+// See -balanceVersionPartsA:partsB below
+- (void)addNumberAndPeriodPartsToParts:(NSMutableArray<NSString *> *)toParts toNumberAndPeriodPartsCount:(NSUInteger)toNumberAndPeriodPartsCount fromParts:(NSArray<NSString *> *)fromParts fromNumberAndPeriodPartsCount:(NSUInteger)fromNumberAndPeriodPartsCount
+{
+ NSUInteger partsCountDifference = (fromNumberAndPeriodPartsCount - toNumberAndPeriodPartsCount);
+ 
+ for (NSUInteger insertionIndex = toNumberAndPeriodPartsCount; insertionIndex < toNumberAndPeriodPartsCount + partsCountDifference; insertionIndex++) {
+ SUCharacterType typeA = self typeOfCharacter:fromPartsinsertionIndex;
+ if (typeA == kPeriodSeparatorType) {
+ toParts insertObject:@"." atIndex:insertionIndex;
+ } else if (typeA == kNumberType) {
+ toParts insertObject:@"0" atIndex:insertionIndex;
+ } else {
+ // It should not be possible to get here
+ assert(false);
+ }
+ }
+}
+
+// If one version starts with "1.0.0" and the other starts with "1.1" we make sure they're balanced
+// such that the latter version now becomes "1.1.0". This helps ensure that versions like "1.0" and "1.0.0" are equal.
+- (void)balanceVersionPartsA:(NSMutableArray<NSString *> *)partsA partsB:(NSMutableArray<NSString *> *)partsB
+{
+ NSUInteger partANumberAndPeriodPartsCount = self countOfNumberAndPeriodStartingParts:partsA;
+ NSUInteger partBNumberAndPeriodPartsCount = self countOfNumberAndPeriodStartingParts:partsB;;
+ 
+ if (partANumberAndPeriodPartsCount > partBNumberAndPeriodPartsCount) {
+ self addNumberAndPeriodPartsToParts:partsB toNumberAndPeriodPartsCount:partBNumberAndPeriodPartsCount fromParts:partsA fromNumberAndPeriodPartsCount:partANumberAndPeriodPartsCount;
+ } else if (partBNumberAndPeriodPartsCount > partANumberAndPeriodPartsCount) {
+ self addNumberAndPeriodPartsToParts:partsA toNumberAndPeriodPartsCount:partANumberAndPeriodPartsCount fromParts:partsB fromNumberAndPeriodPartsCount:partBNumberAndPeriodPartsCount;
+ }
+}
+
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB
+{
+ NSMutableArray<NSString *> *splitPartsA = self splitVersionString:versionA;
+ NSMutableArray<NSString *> *splitPartsB = self splitVersionString:versionB;
+ 
+ self balanceVersionPartsA:splitPartsA partsB:splitPartsB;
+ 
+ NSArray<NSString *> *partsA = splitPartsA;
+ NSArray<NSString *> *partsB = splitPartsB;
+
+ NSString *partA, *partB;
+ NSUInteger i, n;
+ long long valueA, valueB;
+ SUCharacterType typeA, typeB;
+
+ n = MIN(partsA count, partsB count);
+ for (i = 0; i < n; ++i) {
+ partA = partsA objectAtIndex:i;
+ partB = partsB objectAtIndex:i;
+
+ typeA = self typeOfCharacter:partA;
+ typeB = self typeOfCharacter:partB;
+
+ // Compare types
+ if (self isEqualCharacterTypeClassForTypeA:typeA typeB:typeB) {
+ // Same type; we can compare
+ if (typeA == kNumberType) {
+ valueA = partA longLongValue;
+ valueB = partB longLongValue;
+ if (valueA > valueB) {
+ return NSOrderedDescending;
+ } else if (valueA < valueB) {
+ return NSOrderedAscending;
+ }
+ } else if (typeA == kStringType) {
+ NSComparisonResult result = partA compare:partB;
+ if (result != NSOrderedSame) {
+ return result;
+ }
+ }
+ } else {
+ // Not the same type? Now we have to do some validity checking
+ if (typeA != kStringType && typeB == kStringType) {
+ // typeA wins
+ return NSOrderedDescending;
+ } else if (typeA == kStringType && typeB != kStringType) {
+ // typeB wins
+ return NSOrderedAscending;
+ } else {
+ // One is a number and the other is a period. The period is invalid
+ if (typeA == kNumberType) {
+ return NSOrderedDescending;
+ } else {
+ return NSOrderedAscending;
+ }
+ }
+ }
+ }
+ // The versions are equal up to the point where they both still have parts
+ // Lets check to see if one is larger than the other
+ if (partsA count != partsB count) {
+ // Yep. Lets get the next part of the larger
+ // n holds the index of the part we want.
+ NSString *missingPart;
+ SUCharacterType missingType;
+ NSComparisonResult shorterResult, largerResult;
+
+ if (partsA count > partsB count) {
+ missingPart = partsA objectAtIndex:n;
+ shorterResult = NSOrderedAscending;
+ largerResult = NSOrderedDescending;
+ } else {
+ missingPart = partsB objectAtIndex:n;
+ shorterResult = NSOrderedDescending;
+ largerResult = NSOrderedAscending;
+ }
+
+ missingType = self typeOfCharacter:missingPart;
+ // Check the type
+ if (missingType == kStringType) {
+ // It's a string. Shorter version wins
+ return shorterResult;
+ } else {
+ // It's a number/period. Larger version wins
+ return largerResult;
+ }
+ }
+
+ // The 2 strings are identical
+ return NSOrderedSame;
+}
+
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUStatus.xib Added

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
+ <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="SUStatusController">
+ <connections>
+ <outlet property="actionButton" destination="12" id="34"/>
+ <outlet property="progressBar" destination="11" id="49"/>
+ <outlet property="statusTextField" destination="16" id="MiZ-Tn-yVg"/>
+ <outlet property="window" destination="5" id="25"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <window identifier="SUStatus" title="Set in Code" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Window">
+ <windowStyleMask key="styleMask" titled="YES"/>
+ <windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+ <rect key="contentRect" x="200" y="222" width="400" height="107"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
+ <value key="minSize" type="size" width="213" height="107"/>
+ <view key="contentView" id="6">
+ <rect key="frame" x="0.0" y="0.0" width="400" height="106"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <imageView translatesAutoresizingMaskIntoConstraints="NO" id="7">
+ <rect key="frame" x="24" y="27" width="64" height="64"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="64" id="BT1-iv-l2H"/>
+ <constraint firstAttribute="width" constant="64" id="eYK-yn-PVe"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="axesIndependently" image="NSApplicationIcon" id="53"/>
+ <connections>
+ <binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
+ </connections>
+ </imageView>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8">
+ <rect key="frame" x="106" y="75" width="277" height="16"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Status Text (set by loc. string in code)" id="54">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="title" id="26"/>
+ </connections>
+ </textField>
+ <progressIndicator verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="11">
+ <rect key="frame" x="107" y="47" width="273" height="20"/>
+ <connections>
+ <binding destination="-2" name="maxValue" keyPath="maxProgressValue" id="13"/>
+ <binding destination="-2" name="value" keyPath="progressValue" previousBinding="13" id="27"/>
+ </connections>
+ </progressIndicator>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12">
+ <rect key="frame" x="273" y="12" width="114" height="32"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="100" id="3tI-Ef-LLb"/>
+ </constraints>
+ <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="55">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="title" keyPath="buttonTitle" id="21"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="16">
+ <rect key="frame" x="106" y="23" width="146" height="16"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Small System Font Text" id="56">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="statusText" id="17"/>
+ <binding destination="-2" name="hidden" keyPath="statusText" id="33">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSIsNil</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstAttribute="trailing" secondItem="11" secondAttribute="trailing" constant="20" id="1eu-lX-1HN"/>
+ <constraint firstItem="12" firstAttribute="top" secondItem="11" secondAttribute="bottom" constant="9" id="3RZ-xs-4zc"/>
+ <constraint firstItem="8" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="5bq-w6-BOU"/>
+ <constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="9Mg-Ac-X6m"/>
+ <constraint firstItem="11" firstAttribute="top" secondItem="8" secondAttribute="bottom" constant="9" id="B9k-9V-CdX"/>
+ <constraint firstItem="11" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="19" id="EQn-l8-5gk"/>
+ <constraint firstItem="16" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="20" id="LTo-e9-myp"/>
+ <constraint firstItem="16" firstAttribute="top" secondItem="11" secondAttribute="bottom" constant="9" id="ViF-iJ-I4A"/>
+ <constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="24" id="ZLG-dr-gmv"/>
+ <constraint firstAttribute="bottom" secondItem="12" secondAttribute="bottom" constant="19" id="iY3-LJ-ivz"/>
+ <constraint firstItem="12" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="16" secondAttribute="trailing" constant="25" id="k07-gJ-v9t"/>
+ <constraint firstAttribute="trailing" secondItem="12" secondAttribute="trailing" constant="20" id="onJ-J5-mra"/>
+ <constraint firstAttribute="trailing" secondItem="8" secondAttribute="trailing" constant="19" id="pHi-Hm-GAw"/>
+ <constraint firstItem="8" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="tAo-wJ-XR0"/>
+ </constraints>
+ </view>
+ <connections>
+ <binding destination="-2" name="title" keyPath="windowTitle" id="24"/>
+ </connections>
+ <point key="canvasLocation" x="-158" y="132"/>
+ </window>
+ </objects>
+ <resources>
+ <image name="NSApplicationIcon" width="32" height="32"/>
+ </resources>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUStatusController.h Added

@@ -0,0 +1,40 @@
+//
+// SUStatusController.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/14/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
+
+#ifndef SUSTATUSCONTROLLER_H
+#define SUSTATUSCONTROLLER_H
+
+#import <Cocoa/Cocoa.h>
+
+@class SUHost;
+@interface SUStatusController : NSWindowController
+@property (weak) IBOutlet NSButton *actionButton;
+@property (weak) IBOutlet NSProgressIndicator *progressBar;
+@property (weak) IBOutlet NSTextField *statusTextField;
+
+@property (copy) NSString *statusText;
+@property double progressValue;
+@property (nonatomic) double maxProgressValue;
+@property (getter=isButtonEnabled) BOOL buttonEnabled;
+
+- (instancetype)initWithHost:(SUHost *)aHost centerPointValue:(NSValue *)centerPointValue minimizable:(BOOL)minimizable closable:(BOOL)closable;
+
+// Pass 0 for the max progress value to get an indeterminate progress bar.
+// Pass nil for the status text to not show it.
+- (void)beginActionWithTitle:(NSString *)title maxProgressValue:(double)maxProgressValue statusText:(NSString *)statusText;
+
+// If isDefault is YES, the button's key equivalent will be \r.
+- (void)setButtonTitle:(NSString *)buttonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault;
+
+@end
+
+#endif
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUStatusController.m Added

@@ -0,0 +1,176 @@
+//
+// SUStatusController.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/14/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
+
+#import "SUStatusController.h"
+#import "SUHost.h"
+#import "SUApplicationInfo.h"
+#import "SULocalizations.h"
+#import "SUOperatingSystem.h"
+#import "SUTouchBarButtonGroup.h"
+
+static NSString *const SUStatusControllerTouchBarIndentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUStatusController";
+
+@interface SUStatusController () <NSTouchBarDelegate>
+@property (copy) NSString *title, *buttonTitle;
+@property (strong) SUHost *host;
+@property NSButton *touchBarButton;
+@property (nonatomic, readonly) BOOL minimizable;
+@end
+
+@implementation SUStatusController
+{
+ NSValue *_centerPointValue;
+ BOOL _closable;
+}
+
+@synthesize progressValue;
+@synthesize maxProgressValue;
+@synthesize statusText;
+@synthesize title;
+@synthesize buttonTitle;
+@synthesize host;
+@synthesize actionButton;
+@synthesize progressBar;
+@synthesize statusTextField;
+@synthesize touchBarButton;
+@synthesize minimizable = _minimizable;
+
+- (instancetype)initWithHost:(SUHost *)aHost centerPointValue:(NSValue *)centerPointValue minimizable:(BOOL)minimizable closable:(BOOL)closable
+{
+ self = super initWithWindowNibName:@"SUStatus" owner:self;
+	if (self)
+	{
+ self.host = aHost;
+ _centerPointValue = centerPointValue;
+ _minimizable = minimizable;
+ _closable = closable;
+ self setShouldCascadeWindows:NO;
+ }
+ return self;
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.host bundlePath; }
+
+- (void)windowDidLoad
+{
+ NSRect windowFrame = self.window.frame;
+ 
+ if (_centerPointValue != nil) {
+ NSPoint centerPoint = _centerPointValue.pointValue;
+ self.window setFrameOrigin:NSMakePoint(centerPoint.x - windowFrame.size.width / 2.0, centerPoint.y - windowFrame.size.height / 2.0);
+ } else {
+ self.window center;
+ }
+ 
+ if (self.minimizable) {
+ self.window.styleMask |= NSWindowStyleMaskMiniaturizable;
+ }
+ if (_closable) {
+ self.window.styleMask |= NSWindowStyleMaskClosable;
+ }
+ self.progressBar setUsesThreadedAnimation:YES;
+ self.statusTextField setFont:NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular;
+}
+
+- (NSString *)windowTitle
+{
+ return NSString stringWithFormat:SULocalizedString(@"Updating %@", nil), self.host name;
+}
+
+- (NSImage *)applicationIcon
+{
+ return SUApplicationInfo bestIconForHost:self.host;
+}
+
+- (void)beginActionWithTitle:(NSString *)aTitle maxProgressValue:(double)aMaxProgressValue statusText:(NSString *)aStatusText
+{
+ self.title = aTitle;
+
+ self.maxProgressValue = aMaxProgressValue;
+ self.statusText = aStatusText;
+}
+
+- (void)setButtonTitle:(NSString *)aButtonTitle target:(id)target action:(SEL)action isDefault:(BOOL)isDefault
+{
+ self.buttonTitle = aButtonTitle;
+
+ self window;
+ self.actionButton sizeToFit;
+ // Except we're going to add 15 px for padding.
+ self.actionButton setFrameSize:NSMakeSize(self.actionButton frame.size.width + 15, self.actionButton frame.size.height);
+ // Now we have to move it over so that it's always 15px from the side of the window.
+ self.actionButton setFrameOrigin:NSMakePoint(self window frame.size.width - 15 - self.actionButton frame.size.width, self.actionButton frame.origin.y);
+ // Redisplay superview to clean up artifacts
+ self.actionButton superview display;
+
+ self.actionButton setTarget:target;
+ self.actionButton setAction:action;
+ self.actionButton setKeyEquivalent:isDefault ? @"\r" : @"";
+ 
+ self.touchBarButton.target = self.actionButton.target;
+ self.touchBarButton.action = self.actionButton.action;
+ self.touchBarButton.keyEquivalent = self.actionButton.keyEquivalent;
+
+ // 06/05/2008 Alex: Avoid a crash when cancelling during the extraction
+ self setButtonEnabled:(target != nil);
+}
+
+- (BOOL)progressBarShouldAnimate
+{
+ return YES;
+}
+
+- (void)setButtonEnabled:(BOOL)enabled
+{
+ self.actionButton setEnabled:enabled;
+}
+
+- (BOOL)isButtonEnabled
+{
+ return self.actionButton isEnabled;
+}
+
+- (void)setMaxProgressValue:(double)value
+{
+	if (value < 0.0) value = 0.0;
+ maxProgressValue = value;
+ self setProgressValue:0.0;
+ self.progressBar setIndeterminate:(value == 0.0);
+ self.progressBar startAnimation:self;
+ self.progressBar setUsesThreadedAnimation:YES;
+}
+
+
+- (NSTouchBar *)makeTouchBar
+{
+ NSTouchBar *touchBar = NSTouchBar alloc init;
+ touchBar.defaultItemIdentifiers = @ SUStatusControllerTouchBarIndentifier,;
+ touchBar.principalItemIdentifier = SUStatusControllerTouchBarIndentifier;
+ touchBar.delegate = self;
+ return touchBar;
+}
+
+- (NSTouchBarItem *)touchBar:(NSTouchBar * __unused)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
+{
+ if (identifier isEqualToString:SUStatusControllerTouchBarIndentifier) {
+ NSCustomTouchBarItem *item = NSCustomTouchBarItem alloc initWithIdentifier:identifier;
+ SUTouchBarButtonGroup *group = SUTouchBarButtonGroup alloc initByReferencingButtons:@self.actionButton,;
+ item.viewController = group;
+ self.touchBarButton = group.buttons.firstObject;
+ self.touchBarButton bind:@"title" toObject:self.actionButton withKeyPath:@"title" options:nil;
+ self.touchBarButton bind:@"enabled" toObject:self.actionButton withKeyPath:@"enabled" options:nil;
+ return item;
+ }
+ return nil;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUSystemProfiler.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUSystemProfiler.m Added

@@ -0,0 +1,163 @@
+//
+// SUSystemProfiler.m
+// Sparkle
+//
+// Created by Andy Matuschak on 12/22/07.
+// Copyright 2007 Andy Matuschak. All rights reserved.
+// Adapted from Sparkle+, by Tom Harrington.
+//
+
+#import "SUSystemProfiler.h"
+#import "SUHost.h"
+#import "SUOperatingSystem.h"
+#include <sys/sysctl.h>
+#import "SPUUpdaterDelegate.h"
+
+
+#include "AppKitPrevention.h"
+
+NSString *const SUSystemProfilerApplicationNameKey = @"appName";
+NSString *const SUSystemProfilerApplicationVersionKey = @"appVersion";
+NSString *const SUSystemProfilerCPU64bitKey = @"cpu64bit";
+NSString *const SUSystemProfilerCPUCountKey = @"ncpu";
+NSString *const SUSystemProfilerCPUFrequencyKey = @"cpuFreqMHz";
+NSString *const SUSystemProfilerCPUTypeKey = @"cputype";
+NSString *const SUSystemProfilerCPUSubtypeKey = @"cpusubtype";
+NSString *const SUSystemProfilerHardwareModelKey = @"model";
+NSString *const SUSystemProfilerMemoryKey = @"ramMB";
+NSString *const SUSystemProfilerOperatingSystemVersionKey = @"osVersion";
+NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
+
+@implementation SUSystemProfiler
+
++ (NSArray<NSDictionary<NSString *, NSString *> *> *)systemProfileArrayForHost:(SUHost *)host
+{
+ // Gather profile information and append it to the URL.
+ NSMutableArray<NSDictionary<NSString *, NSString *> *> *profileArray = NSMutableArray array;
+ NSArray *profileDictKeys = @@"key", @"displayKey", @"value", @"displayValue";
+ int error = 0;
+ int value = 0;
+ size_t length = sizeof(value);
+
+ // OS version
+ NSString *currentSystemVersion = SUOperatingSystem systemVersionString;
+ if (currentSystemVersion != nil) {
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerOperatingSystemVersionKey, @"OS Version", currentSystemVersion, currentSystemVersion forKeys:profileDictKeys;
+ }
+
+ // CPU type (decoder info for values found here is in mach/machine.h)
+ error = sysctlbyname("hw.cputype", &value, &length, NULL, 0);
+ int cpuType = -1;
+ if (error == 0) {
+ // Only the lower 24 bits of sysctl hw.cputype values contain the CPU type. On Macs with ARM processor, one of the top eight bits may be set.
+ cpuType = value & (int)~CPU_ARCH_MASK;
+ NSString *visibleCPUType;
+ switch (cpuType) {
+ case CPU_TYPE_ARM: visibleCPUType = @"ARM"; break;
+ case CPU_TYPE_X86: visibleCPUType = @"Intel"; break;
+ case CPU_TYPE_POWERPC: visibleCPUType = @"PowerPC"; break;
+ default: visibleCPUType = @"Other"; break;
+ }
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerCPUTypeKey, @"CPU Type", NSString stringWithFormat:@"%d", value, visibleCPUType forKeys:profileDictKeys;
+ }
+ error = sysctlbyname("hw.cpu64bit_capable", &value, &length, NULL, 0);
+ if (error != 0) {
+ error = sysctlbyname("hw.optional.x86_64", &value, &length, NULL, 0); //x86 specific
+ }
+ if (error != 0) {
+ error = sysctlbyname("hw.optional.64bitops", &value, &length, NULL, 0); //PPC specific
+ }
+
+ BOOL is64bit = NO;
+
+ if (error == 0) {
+ is64bit = value == 1;
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerCPU64bitKey, @"CPU is 64-Bit?", NSString stringWithFormat:@"%d", is64bit, is64bit ? @"Yes" : @"No" forKeys:profileDictKeys;
+ }
+ error = sysctlbyname("hw.cpusubtype", &value, &length, NULL, 0);
+ if (error == 0) {
+ NSString *visibleCPUSubType;
+ if (cpuType == CPU_TYPE_X86) {
+ // Intel
+ // TODO: other Intel processors, like Core i7, i5, i3, Xeon?
+ visibleCPUSubType = is64bit ? @"Intel Core 2" : @"Intel Core"; // If anyone knows how to tell a Core Duo from a Core Solo, please email tph@atomicbird.com
+ } else if (cpuType == CPU_TYPE_POWERPC) {
+ // PowerPC
+ switch (value) {
+ case CPU_SUBTYPE_POWERPC_750: visibleCPUSubType=@"G3"; break;
+ case CPU_SUBTYPE_POWERPC_7400: case CPU_SUBTYPE_POWERPC_7450: visibleCPUSubType=@"G4"; break;
+ case CPU_SUBTYPE_POWERPC_970: visibleCPUSubType=@"G5"; break;
+ default: visibleCPUSubType=@"Other"; break;
+ }
+ } else if (cpuType == CPU_TYPE_ARM) {
+ switch (value) {
+ case CPU_SUBTYPE_ARM64E: visibleCPUSubType=@"ARM64E"; break;
+ default: visibleCPUSubType = @"Other"; break;
+ }
+ } else {
+ visibleCPUSubType = @"Other";
+ }
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerCPUSubtypeKey, @"CPU Subtype", NSString stringWithFormat:@"%d", value, visibleCPUSubType forKeys:profileDictKeys;
+ }
+ error = sysctlbyname("hw.model", NULL, &length, NULL, 0);
+ if (error == 0) {
+ char *cpuModel = (char *)malloc(sizeof(char) * length);
+ if (cpuModel != NULL) {
+ error = sysctlbyname("hw.model", cpuModel, &length, NULL, 0);
+ if (error == 0) {
+ NSString *rawModelName = @(cpuModel);
+ NSString *visibleModelName = rawModelName;
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerHardwareModelKey, @"Mac Model", rawModelName, visibleModelName forKeys:profileDictKeys;
+ }
+ free(cpuModel);
+ }
+ }
+
+ // Number of CPUs
+ error = sysctlbyname("hw.ncpu", &value, &length, NULL, 0);
+ if (error == 0) {
+ NSString *stringValue = NSString stringWithFormat:@"%d", value;
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerCPUCountKey, @"Number of CPUs", stringValue, stringValue forKeys:profileDictKeys;
+ }
+
+ // User preferred language
+ NSUserDefaults *defs = NSUserDefaults standardUserDefaults;
+ NSArray *languages = defs objectForKey:@"AppleLanguages";
+ if (languages count > 0) {
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerPreferredLanguageKey, @"Preferred Language", languages objectAtIndex:0, languages objectAtIndex:0 forKeys:profileDictKeys;
+ }
+
+ // Application sending the request
+ NSString *appName = host name;
+ if (appName) {
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerApplicationNameKey, @"Application Name", appName, appName forKeys:profileDictKeys;
+ }
+ NSString *appVersion = host version;
+ if (appVersion) {
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerApplicationVersionKey, @"Application Version", appVersion, appVersion forKeys:profileDictKeys;
+ }
+
+ // Number of displays?
+
+ // CPU speed
+ unsigned long hz;
+ size_t hz_size = sizeof(unsigned long);
+ if (sysctlbyname("hw.cpufrequency", &hz, &hz_size, NULL, 0) == 0) {
+ unsigned long mhz = hz / 1000000;
+ NSString *stringValue = NSString stringWithFormat:@"%lu", mhz;
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerCPUFrequencyKey, @"CPU Speed (MHz)", stringValue, stringValue forKeys:profileDictKeys;
+ }
+
+ // amount of RAM
+ unsigned long bytes;
+ size_t bytes_size = sizeof(unsigned long);
+ if (sysctlbyname("hw.memsize", &bytes, &bytes_size, NULL, 0) == 0) {
+ double megabytes = bytes / (1024. * 1024.);
+ NSString *stringValue = NSString stringWithFormat:@"%lu", (unsigned long)megabytes;
+ profileArray addObject:NSDictionary dictionaryWithObjects:@SUSystemProfilerMemoryKey, @"Memory (MB)", stringValue, stringValue forKeys:profileDictKeys;
+ }
+
+ return profileArray copy;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUTouchBarButtonGroup.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUTouchBarButtonGroup.m Added

@@ -0,0 +1,67 @@
+//
+// SUTouchBarButtonGroup.m
+// Sparkle
+//
+// Created by Yuxin Wang on 05/01/2017.
+// Copyright © 2017 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
+
+#import "SUTouchBarButtonGroup.h"
+
+@implementation SUTouchBarButtonGroup
+
+@synthesize buttons = _buttons;
+
+- (instancetype)initByReferencingButtons:(NSArray<NSButton *> *)buttons
+{
+ if (!(self = super init))
+ return self;
+
+ NSView *buttonGroup = NSView alloc initWithFrame:NSZeroRect;
+ self.view = buttonGroup;
+ NSMutableArray<NSLayoutConstraint *> *constraints = NSMutableArray array;
+ NSMutableArray<NSButton *> *buttonCopies = NSMutableArray arrayWithCapacity:buttons.count;
+
+ for (NSUInteger i = 0; i < buttons.count; i++) {
+ NSButton *button = buttons objectAtIndex:i;
+ NSButton *buttonCopy = NSButton buttonWithTitle:button.title target:button.target action:button.action;
+ buttonCopy.tag = button.tag;
+ buttonCopy.enabled = button.enabled;
+
+ // Must be set explicitly, because NSWindow clears it
+ // https://github.com/sparkle-project/Sparkle/pull/987#issuecomment-271539319
+ if (i == 0) {
+ buttonCopy.keyEquivalent = @"\r";
+ }
+
+ buttonCopy.translatesAutoresizingMaskIntoConstraints = NO;
+
+ buttonCopies addObject:buttonCopy;
+ buttonGroup addSubview:buttonCopy;
+
+ // Custom layout is used for equal width buttons, to look more keyboard-like and mimic standard alerts
+ // https://github.com/sparkle-project/Sparkle/pull/987#issuecomment-272324726
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:buttonGroup attribute:NSLayoutAttributeTop multiplier:1.0 constant:0.0;
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:buttonGroup attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0.0;
+ if (i == 0) {
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:buttonGroup attribute:NSLayoutAttributeTrailing multiplier:1.0 constant:0.0;
+ } else {
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:buttonCopies objectAtIndex:i - 1 attribute:NSLayoutAttributeLeading multiplier:1.0 constant:(i == 1) ? -8 : -32;
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:buttonCopies objectAtIndex:i - 1 attribute:NSLayoutAttributeWidth multiplier:1.0 constant:0.0;
+ constraints.lastObject.priority = 250;
+ }
+ if (i == buttons.count - 1) {
+ constraints addObject:NSLayoutConstraint constraintWithItem:buttonCopy attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:buttonGroup attribute:NSLayoutAttributeLeading multiplier:1.0 constant:0.0;
+ }
+ }
+ NSLayoutConstraint activateConstraints:constraints;
+
+ _buttons = buttonCopies;
+ return self;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdateAlert.h Added

@@ -0,0 +1,40 @@
+//
+// SUUpdateAlert.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/12/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#ifndef SUUPDATEALERT_H
+#define SUUPDATEALERT_H
+
+#import <Cocoa/Cocoa.h>
+#import "SUVersionDisplayProtocol.h"
+#import "SPUUserUpdateState.h"
+
+@protocol SUUpdateAlertDelegate;
+
+@class SUAppcastItem, SPUDownloadData, SUHost;
+@interface SUUpdateAlert : NSWindowController
+
+@property (nonatomic, weak, readonly) id <SUVersionDisplay> versionDisplayer;
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id <SUVersionDisplay>)aVersionDisplayer completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock;
+
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData;
+- (void)showReleaseNotesFailedToDownload;
+
+- (IBAction)installUpdate:sender;
+- (IBAction)skipThisVersion:sender;
+- (IBAction)remindMeLater:sender;
+
+- (void)setInstallButtonFocus:(BOOL)focus;
+
+@end
+
+#endif
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdateAlert.m Added

@@ -0,0 +1,487 @@
+//
+// SUUpdateAlert.m
+// Sparkle
+//
+// Created by Andy Matuschak on 3/12/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+// -----------------------------------------------------------------------------
+//	Headers:
+// -----------------------------------------------------------------------------
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SUUpdateAlert.h"
+
+#import "SUHost.h"
+#import "SUWebView.h"
+#import "SUWKWebView.h"
+#import "SULegacyWebView.h"
+
+#import "SUConstants.h"
+#import "SULog.h"
+#import "SULocalizations.h"
+#import "SUAppcastItem.h"
+#import "SPUDownloadData.h"
+#import "SUApplicationInfo.h"
+#import "SPUUpdaterSettings.h"
+#import "SUTouchBarButtonGroup.h"
+#import "SPUXPCServiceInfo.h"
+#import "SPUUserUpdateState.h"
+
+static NSString *const SUUpdateAlertTouchBarIndentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdateAlert";
+
+@interface SUUpdateAlert () <NSTouchBarDelegate>
+
+@property (strong) SUAppcastItem *updateItem;
+@property (strong) SUHost *host;
+@property (nonatomic) BOOL allowsAutomaticUpdates;
+@property (nonatomic, copy, nullable) void(^completionBlock)(SPUUserUpdateChoice, NSRect, BOOL);
+@property (nonatomic) SPUUserUpdateState *state;
+
+@property (strong) NSProgressIndicator *releaseNotesSpinner;
+
+@property (weak) IBOutlet NSView *releaseNotesContainerView;
+@property (weak) IBOutlet NSBox *releaseNotesBoxView;
+@property (weak) IBOutlet NSTextField *descriptionField;
+@property (weak) IBOutlet NSButton *automaticallyInstallUpdatesButton;
+@property (weak) IBOutlet NSButton *installButton;
+@property (weak) IBOutlet NSButton *skipButton;
+@property (weak) IBOutlet NSButton *laterButton;
+
+@property (strong) NSBox *darkBackgroundView;
+@property (assign) BOOL observingAppearance;
+
+@property (nonatomic) id<SUWebView> webView;
+
+@end
+
+@implementation SUUpdateAlert
+{
+ void (^_didBecomeKeyBlock)(void);
+}
+
+@synthesize completionBlock = _completionBlock;
+@synthesize state = _state;
+@synthesize versionDisplayer;
+
+@synthesize updateItem;
+@synthesize host;
+@synthesize allowsAutomaticUpdates = _allowsAutomaticUpdates;
+
+@synthesize releaseNotesSpinner;
+
+@synthesize releaseNotesContainerView;
+@synthesize releaseNotesBoxView = _releaseNotesBoxView;
+@synthesize descriptionField;
+@synthesize automaticallyInstallUpdatesButton;
+@synthesize installButton;
+@synthesize skipButton;
+@synthesize laterButton;
+
+@synthesize darkBackgroundView = _darkBackgroundView;
+@synthesize observingAppearance;
+
+@synthesize webView = _webView;
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id <SUVersionDisplay>)aVersionDisplayer completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock
+{
+ self = super initWithWindowNibName:@"SUUpdateAlert";
+ if (self != nil) {
+ host = aHost;
+ updateItem = item;
+ versionDisplayer = aVersionDisplayer;
+ 
+ _state = state;
+ _completionBlock = completionBlock copy;
+ _didBecomeKeyBlock = didBecomeKeyBlock copy;
+ 
+ SPUUpdaterSettings *updaterSettings = SPUUpdaterSettings alloc initWithHostBundle:host.bundle;
+ 
+ BOOL allowsAutomaticUpdates;
+ NSNumber *allowsAutomaticUpdatesOption = updaterSettings.allowsAutomaticUpdatesOption;
+ if (item.informationOnlyUpdate) {
+ allowsAutomaticUpdates = NO;
+ } else if (allowsAutomaticUpdatesOption == nil) {
+ allowsAutomaticUpdates = updaterSettings.automaticallyChecksForUpdates;
+ } else {
+ allowsAutomaticUpdates = allowsAutomaticUpdatesOption.boolValue;
+ }
+ _allowsAutomaticUpdates = allowsAutomaticUpdates;
+ 
+ self setShouldCascadeWindows:NO;
+ } else {
+ assert(false);
+ }
+ return self;
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.host bundlePath; }
+
+- (void)setInstallButtonFocus:(BOOL)focus
+{
+ if (focus) {
+ self.installButton.keyEquivalent = @"\r";
+ } else {
+ self.installButton.keyEquivalent = @"";
+ }
+}
+
+- (void)endWithSelection:(SPUUserUpdateChoice)choice
+{
+ self.webView stopLoading;
+ self.webView.view removeFromSuperview; // Otherwise it gets sent Esc presses (why?!) and gets very confused.
+ 
+ BOOL wasKeyWindow = self.window.keyWindow;
+ NSRect windowFrame = self.window.frame;
+ 
+ self close;
+ 
+ if (self.completionBlock != nil) {
+ self.completionBlock(choice, windowFrame, wasKeyWindow);
+ self.completionBlock = nil;
+ }
+}
+
+- (IBAction)installUpdate:(id)__unused sender
+{
+ self endWithSelection:SPUUserUpdateChoiceInstall;
+}
+
+- (IBAction)openInfoURL:(id)__unused sender
+{
+ NSURL *infoURL = self.updateItem.infoURL;
+ assert(infoURL);
+ 
+ NSWorkspace sharedWorkspace openURL:infoURL;
+ 
+ self endWithSelection:SPUUserUpdateChoiceDismiss;
+}
+
+- (IBAction)skipThisVersion:(id)__unused sender
+{
+ self endWithSelection:SPUUserUpdateChoiceSkip;
+}
+
+- (IBAction)remindMeLater:(id)__unused sender
+{
+ self endWithSelection:SPUUserUpdateChoiceDismiss;
+}
+
+- (void)displayReleaseNotes
+{
+ self adaptReleaseNotesAppearance;
+
+ if (@available(macOS 10.14, *)) {
+ if (!self.observingAppearance) {
+ self.webView.view addObserver:self forKeyPath:@"effectiveAppearance" options:0 context:nil;
+ self.observingAppearance = YES;
+ }
+ }
+ 
+ // Stick a nice big spinner in the middle of the web view until the page is loaded.
+ NSRect frame = self.webView.view superview frame;
+ self.releaseNotesSpinner = NSProgressIndicator alloc initWithFrame:NSMakeRect(NSMidX(frame) - 16, NSMidY(frame) - 16, 32, 32);
+ self.releaseNotesSpinner setStyle:NSProgressIndicatorStyleSpinning;
+ self.releaseNotesSpinner startAnimation:self;
+ self.webView.view superview addSubview:self.releaseNotesSpinner;
+ 
+ // If there's no release notes URL, just stick the contents of the description into the web view
+ // Otherwise we'll wait until the client wants us to show release notes
+	if (self.updateItem.releaseNotesURL == nil)
+	{
+ NSString *itemDescription = self.updateItem.itemDescription;
+ if (itemDescription != nil) {
+ __weak __typeof__(self) weakSelf = self;
+ self.webView loadHTMLString:itemDescription baseURL:nil completionHandler:^(NSError * _Nullable error) {
+ if (error != nil) {
+ SULog(SULogLevelError, @"Failed to load HTML string from web view: %@", error);
+ }
+ weakSelf stopReleaseNotesSpinner;
+ };
+ }
+ }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(__attribute__((unused)) NSDictionary<NSKeyValueChangeKey,id> *)change context:(__attribute__((unused)) void *)context {
+ if (@available(macOS 10.14, *)) {
+ if (object == self.webView.view && keyPath isEqualToString:@"effectiveAppearance") {
+ self adaptReleaseNotesAppearance;
+ }
+ }
+}
+
+- (void)dealloc {
+ if (@available(macOS 10.14, *)) {
+ if (self.observingAppearance) {
+ self.webView.view removeObserver:self forKeyPath:@"effectiveAppearance";
+ self.observingAppearance = NO;
+ }
+ }
+}
+
+- (void)adaptReleaseNotesAppearance
+{
+ if (@available(macOS 10.14, *))
+ {
+ NSAppearanceName bestAppearance = self.webView.view.effectiveAppearance bestMatchFromAppearancesWithNames:@NSAppearanceNameAqua, NSAppearanceNameDarkAqua;
+ if (bestAppearance isEqualToString:NSAppearanceNameDarkAqua)
+ {
+ // Remove web view background...
+ self.webView setDrawsBackground:NO;
+ // ... and use NSBox to get the dynamically colored background
+ if (self.darkBackgroundView == nil)
+ {
+ self.darkBackgroundView = NSBox alloc initWithFrame:self.webView.view.frame;
+ self.darkBackgroundView.boxType = NSBoxCustom;
+ self.darkBackgroundView.fillColor = NSColor textBackgroundColor;
+ self.darkBackgroundView.borderColor = NSColor clearColor;
+ // Using auto-resizing mask instead of contraints works well enough
+ self.darkBackgroundView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+ self.webView.view.superview addSubview:self.darkBackgroundView positioned:NSWindowBelow relativeTo:self.webView.view;
+ 
+ // The release note user stylesheet will not adjust to the user changing the theme until adaptReleaseNoteAppearance is called again.
+ // So lock the appearance of the background to keep the text readable if the system theme changes.
+ self.darkBackgroundView.appearance = self.darkBackgroundView.effectiveAppearance;
+ }
+ }
+ else
+ {
+ // Restore standard dark on light appearance
+ self.darkBackgroundView removeFromSuperview;
+ self.darkBackgroundView = nil;
+ self.webView setDrawsBackground:YES;
+ }
+ }
+}
+
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
+{
+ NSURL *baseURL = self.updateItem.releaseNotesURL.URLByDeletingLastPathComponent;
+ // If a MIME type isn't provided, we will pick html as the default, as opposed to plain text. Questionable decision..
+ NSString *chosenMIMEType = (downloadData.MIMEType != nil) ? downloadData.MIMEType : @"text/html";
+ // We'll pick utf-8 as the default text encoding name if one isn't provided which I think is reasonable
+ NSString *chosenTextEncodingName = (downloadData.textEncodingName != nil) ? downloadData.textEncodingName : @"utf-8";
+ 
+ __weak __typeof__(self) weakSelf = self;
+ self.webView loadData:downloadData.data MIMEType:chosenMIMEType textEncodingName:chosenTextEncodingName baseURL:baseURL completionHandler:^(NSError * _Nullable error) {
+ if (error != nil) {
+ SULog(SULogLevelError, @"Failed to load data from web view: %@", error);
+ }
+ weakSelf stopReleaseNotesSpinner;
+ };
+}
+
+- (void)showReleaseNotesFailedToDownload
+{
+ self stopReleaseNotesSpinner;
+}
+
+- (void)stopReleaseNotesSpinner
+{
+ self.releaseNotesSpinner stopAnimation:self;
+ self.releaseNotesSpinner setHidden:YES;
+}
+
+- (BOOL)showsReleaseNotes
+{
+ NSNumber *shouldShowReleaseNotes = self.host objectForInfoDictionaryKey:SUShowReleaseNotesKey;
+	if (shouldShowReleaseNotes == nil)
+	{
+ // Don't show release notes if RSS item contains no description and no release notes URL:
+ return ((self.updateItem itemDescription != nil
+ && self.updateItem itemDescription stringByTrimmingCharactersInSet:NSCharacterSet whitespaceAndNewlineCharacterSet length > 0)
+ || self.updateItem releaseNotesURL != nil);
+	}
+	else
+ return shouldShowReleaseNotes boolValue;
+}
+
+- (void)windowDidLoad
+{
+ BOOL showReleaseNotes = self showsReleaseNotes;
+ 
+ if (showReleaseNotes) {
+ self.window.frameAutosaveName = @"SUUpdateAlert";
+ 
+ NSURL *colorStyleURL = NSBundle bundleForClass:self class URLForResource:@"ReleaseNotesColorStyle" withExtension:@"css";
+ 
+ // "-apple-system-font" is a reference to the system UI font. "-apple-system" is the new recommended token, but for backward compatibility we can't use it.
+ NSString *defaultFontFamily = @"-apple-system-font";
+ int defaultFontSize = (int)NSFont systemFontSize;
+ 
+ BOOL javaScriptEnabled = self.host boolForInfoDictionaryKey:SUEnableJavaScriptKey;
+ 
+ // WKWebView has a bug where it won't work in loading local HTML content in sandboxed apps that do not have an outgoing network entitlement
+ // FB6993802: https://twitter.com/sindresorhus/status/1160577243929878528 | https://github.com/feedback-assistant/reports/issues/1
+ // If the developer is using the downloader XPC service, they are very most likely are a) sandboxed b) do not use outgoing network entitlement.
+ // In this case, fall back to legacy WebKit view.
+ // (In theory it is possible for a non-sandboxed app or sandboxed app with outgoing network entitlement to use the XPC service, it's just pretty unlikely. And falling back to a legacy web view would not be too harmful in those cases).
+ BOOL useWKWebView = !SPUXPCServiceIsEnabled(SUEnableDownloaderServiceKey);
+ 
+ if (useWKWebView) {
+ self.webView = SUWKWebView alloc initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled;
+ } else {
+ self.webView = SULegacyWebView alloc initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled;
+ }
+ 
+ NSView *boxContentView = self.releaseNotesBoxView.contentView;
+ boxContentView addSubview:self.webView.view;
+ 
+ self.webView.view.frame = boxContentView.bounds;
+ self.webView.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+ } else {
+ // Update alert should not be resizable when no release notes are available
+ self.window.styleMask &= ~NSWindowStyleMaskResizable;
+ }
+
+ if (self.updateItem.informationOnlyUpdate) {
+ self.installButton setTitle:SULocalizedString(@"Learn More…", @"Alternate title for 'Install Update' button when there's no download in RSS feed.");
+ self.installButton setAction:@selector(openInfoURL:);
+ }
+
+ BOOL allowsAutomaticUpdates = self.allowsAutomaticUpdates;
+ 
+ if (showReleaseNotes) {
+ self displayReleaseNotes;
+ } else {
+ // When automatic updates aren't allowed we won't show the automatic install updates button
+ // This button is removed later below
+ if (allowsAutomaticUpdates) {
+ NSLayoutConstraint *automaticallyInstallUpdatesButtonToDescriptionFieldConstraint = NSLayoutConstraint constraintWithItem:self.automaticallyInstallUpdatesButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:8.0;
+ 
+ self.window.contentView addConstraint:automaticallyInstallUpdatesButtonToDescriptionFieldConstraint;
+ }
+ 
+ self.releaseNotesContainerView removeFromSuperview;
+ }
+ 
+ // NOTE: The code below for deciding what buttons to hide is complex! Due to array of feature configurations :)
+ 
+ // When we show release notes, it looks ugly if the install buttons are not closer to the release notes view
+ // However when we don't show release notes, it looks ugly if the install buttons are too close to the description field. Shrugs.
+ if (!allowsAutomaticUpdates) {
+ if (showReleaseNotes) {
+ // Fix constraints so that buttons aren't far away from web view when we hide the automatic updates check box
+ NSLayoutConstraint *skipButtonToReleaseNotesContainerConstraint = NSLayoutConstraint constraintWithItem:self.skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.releaseNotesContainerView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:12.0;
+ 
+ self.window.contentView addConstraint:skipButtonToReleaseNotesContainerConstraint;
+ } else {
+ NSLayoutConstraint *skipButtonToDescriptionConstraint = NSLayoutConstraint constraintWithItem:self.skipButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.descriptionField attribute:NSLayoutAttributeBottom multiplier:1.0 constant:20.0;
+
+ self.window.contentView addConstraint:skipButtonToDescriptionConstraint;
+ }
+ self.automaticallyInstallUpdatesButton removeFromSuperview;
+ }
+ 
+ if (self.state.stage == SPUUserUpdateStageInstalling) {
+ // We're going to be relaunching pretty instantaneously
+ self.installButton.title = SULocalizedString(@"Install and Relaunch", nil);
+ 
+ // We should be explicit that the update will be installed on quit
+ self.laterButton.title = SULocalizedString(@"Install on Quit", @"Alternate title for 'Remind Me Later' button when downloaded updates can be resumed");
+ }
+
+ if (self.updateItem.criticalUpdate && !self.updateItem.majorUpgrade) {
+ self.skipButton.hidden = YES;
+ self.laterButton.hidden = YES;
+ }
+ 
+ // Reminding user later doesn't make sense when automatic update checks are off
+ if (!self.host boolForKey:SUEnableAutomaticChecksKey) {
+ self.laterButton.hidden = YES;
+ }
+
+ self.window center;
+}
+
+- (void)windowDidBecomeKey:(NSNotification *)__unused note
+{
+ if (_didBecomeKeyBlock != NULL) {
+ _didBecomeKeyBlock();
+ }
+}
+
+- (BOOL)windowShouldClose:(NSNotification *) __unused note
+{
+	self endWithSelection:SPUUserUpdateChoiceDismiss;
+	return YES;
+}
+
+- (NSImage *)applicationIcon
+{
+ return SUApplicationInfo bestIconForHost:self.host;
+}
+
+- (NSString *)titleText
+{
+ if (self.updateItem.criticalUpdate)
+ {
+ return NSString stringWithFormat:SULocalizedString(@"An important update to %@ is ready to install", nil), self.host name;
+ }
+ else if (self.state.stage == SPUUserUpdateStageDownloaded || self.state.stage == SPUUserUpdateStageInstalling)
+ {
+ return NSString stringWithFormat:SULocalizedString(@"A new version of %@ is ready to install!", nil), self.host name;
+ }
+ else
+ {
+ return NSString stringWithFormat:SULocalizedString(@"A new version of %@ is available!", nil), self.host name;
+ }
+}
+
+- (NSString *)descriptionText
+{
+ NSString *updateItemVersion = self.updateItem displayVersionString;
+ NSString *hostVersion = self.host displayVersion;
+ // Display more info if the version strings are the same; useful for betas.
+ if (!self.versionDisplayer && updateItemVersion isEqualToString:hostVersion ) {
+ updateItemVersion = updateItemVersion stringByAppendingFormat:@" (%@)", self.updateItem versionString;
+ hostVersion = hostVersion stringByAppendingFormat:@" (%@)", self.host.version;
+ } else {
+ self.versionDisplayer formatVersion:&updateItemVersion andVersion:&hostVersion;
+ }
+
+ // We display a different summary depending on if it's an "info-only" item, or a "critical update" item, or if we've already downloaded the update and just need to relaunch
+ NSString *finalString = nil;
+
+ if (self.updateItem.informationOnlyUpdate) {
+ finalString = NSString stringWithFormat:SULocalizedString(@"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?", @"Description text for SUUpdateAlert when the update informational with no download."), self.host.name, updateItemVersion, hostVersion;
+ } else if (self.updateItem.criticalUpdate) {
+ if (self.state.stage == SPUUserUpdateStageNotDownloaded) {
+ finalString = NSString stringWithFormat:SULocalizedString(@"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?", @"Description text for SUUpdateAlert when the critical update is downloadable."), self.host.name, updateItemVersion, hostVersion;
+ } else {
+ finalString = NSString stringWithFormat:SULocalizedString(@"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?", @"Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install."), self.host.name, updateItemVersion;
+ }
+ } else {
+ if (self.state.stage == SPUUserUpdateStageNotDownloaded) {
+ finalString = NSString stringWithFormat:SULocalizedString(@"%@ %@ is now available—you have %@. Would you like to download it now?", @"Description text for SUUpdateAlert when the update is downloadable."), self.host.name, updateItemVersion, hostVersion;
+ } else {
+ finalString = NSString stringWithFormat:SULocalizedString(@"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?", @"Description text for SUUpdateAlert when the update has already been downloaded and ready to install."), self.host.name, updateItemVersion;
+ }
+ }
+ return finalString;
+}
+
+- (NSTouchBar *)makeTouchBar
+{
+ NSTouchBar *touchBar = NSTouchBar alloc init;
+ touchBar.defaultItemIdentifiers = @SUUpdateAlertTouchBarIndentifier,;
+ touchBar.principalItemIdentifier = SUUpdateAlertTouchBarIndentifier;
+ touchBar.delegate = self;
+ return touchBar;
+}
+
+- (NSTouchBarItem *)touchBar:(NSTouchBar * __unused)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
+{
+ if (identifier isEqualToString:SUUpdateAlertTouchBarIndentifier) {
+ NSCustomTouchBarItem* item = NSCustomTouchBarItem alloc initWithIdentifier:identifier;
+ item.viewController = SUTouchBarButtonGroup alloc initByReferencingButtons:@self.installButton, self.laterButton, self.skipButton;
+ return item;
+ }
+ return nil;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdatePermissionPrompt.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdatePermissionPrompt.m Added

@@ -0,0 +1,178 @@
+//
+// SUUpdatePermissionPrompt.m
+// Sparkle
+//
+// Created by Andy Matuschak on 1/24/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SUUpdatePermissionPrompt.h"
+#import "SPUUpdatePermissionRequest.h"
+#import "SUUpdatePermissionResponse.h"
+#import "SULocalizations.h"
+
+#import "SUHost.h"
+#import "SUConstants.h"
+#import "SUApplicationInfo.h"
+#import "SUTouchBarButtonGroup.h"
+
+static NSString *const SUUpdatePermissionPromptTouchBarIndentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdatePermissionPrompt";
+
+@interface SUUpdatePermissionPrompt () <NSTouchBarDelegate>
+
+@property (nonatomic) BOOL shouldSendProfile;
+
+@property (nonatomic) SUHost *host;
+@property (nonatomic) NSArray *systemProfileInformationArray;
+
+@property (nonatomic) IBOutlet NSStackView *stackView;
+@property (nonatomic) IBOutlet NSView *promptView;
+@property (nonatomic) IBOutlet NSView *moreInfoView;
+@property (nonatomic) IBOutlet NSView *placeholderView;
+@property (nonatomic) IBOutlet NSView *responseView;
+@property (nonatomic) IBOutlet NSView *infoChoiceView;
+
+@property (nonatomic) IBOutlet NSButton *cancelButton;
+@property (nonatomic) IBOutlet NSButton *checkButton;
+@property (nonatomic) IBOutlet NSButton *anonymousInfoDisclosureButton;
+
+@property (nonatomic) IBOutlet NSLayoutConstraint *placeholderHeightLayoutConstraint;
+
+@property (nonatomic, readonly) void (^reply)(SUUpdatePermissionResponse *);
+
+@end
+
+@implementation SUUpdatePermissionPrompt
+
+@synthesize reply = _reply;
+@synthesize shouldSendProfile = _shouldSendProfile;
+@synthesize host = _host;
+@synthesize systemProfileInformationArray = _systemProfileInformationArray;
+@synthesize stackView = _stackView;
+@synthesize promptView = _promtView;
+@synthesize moreInfoView = _moreInfoView;
+@synthesize placeholderView = _placeholderView;
+@synthesize responseView = _responseView;
+@synthesize infoChoiceView = _infoChoiceView;
+@synthesize cancelButton = _cancelButton;
+@synthesize checkButton = _checkButton;
+@synthesize anonymousInfoDisclosureButton = _anonymousInfoDisclosureButton;
+@synthesize placeholderHeightLayoutConstraint = _placeholderHeightLayoutConstraint;
+
+- (instancetype)initPromptWithHost:(SUHost *)theHost request:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply
+{
+ self = super initWithWindowNibName:@"SUUpdatePermissionPrompt";
+ if (self)
+ {
+ _reply = reply;
+ _host = theHost;
+ _shouldSendProfile = self shouldAskAboutProfile;
+ _systemProfileInformationArray = request.systemProfile;
+ self setShouldCascadeWindows:NO;
+ } else {
+ assert(false);
+ }
+ return self;
+}
+
+- (BOOL)shouldAskAboutProfile
+{
+ return (NSNumber *)self.host objectForInfoDictionaryKey:SUEnableSystemProfilingKey boolValue;
+}
+
+- (NSString *)description { return NSString stringWithFormat:@"%@ <%@>", self class, self.host bundlePath; }
+
+- (void)windowDidLoad
+{
+ self.window center;
+ 
+ self.infoChoiceView.hidden = !self shouldAskAboutProfile;
+ 
+ self.stackView addArrangedSubview:self.promptView;
+ self.stackView addArrangedSubview:self.infoChoiceView;
+ self.stackView addArrangedSubview:self.placeholderView;
+ self.stackView addArrangedSubview:self.moreInfoView;
+ self.stackView addArrangedSubview:self.responseView;
+}
+
+- (BOOL)tableView:(NSTableView *) __unused tableView shouldSelectRow:(NSInteger) __unused row { return NO; }
+
+
+- (NSImage *)icon
+{
+ return SUApplicationInfo bestIconForHost:self.host;
+}
+
+- (NSString *)promptDescription
+{
+ return NSString stringWithFormat:SULocalizedString(@"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu.", nil), self.host name;
+}
+
+- (IBAction)toggleMoreInfo:(id)__unused sender
+{
+ // Use a placeholder view to unhide/hide before putting the more info view in place
+ // This allows us to animate resizing the more info view in place more easily
+ 
+ static const CGFloat TOGGLE_INFO_ANIMATION_DURATION = 0.2;
+ 
+ BOOL disclosingInfo = (self.anonymousInfoDisclosureButton.state == NSControlStateValueOn);
+ 
+ if (disclosingInfo) {
+ self.placeholderHeightLayoutConstraint.constant = 0.0;
+ self.placeholderView.hidden = NO;
+ 
+ NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
+ context.duration = TOGGLE_INFO_ANIMATION_DURATION;
+ 
+ self.placeholderHeightLayoutConstraint.animator.constant = self.moreInfoView.frame.size.height;
+ } completionHandler:^{
+ self.placeholderView.hidden = YES;
+ self.moreInfoView.hidden = NO;
+ };
+ } else {
+ self.placeholderHeightLayoutConstraint.constant = self.moreInfoView.frame.size.height;
+ self.moreInfoView.hidden = YES;
+ self.placeholderView.hidden = NO;
+ 
+ NSAnimationContext runAnimationGroup:^(NSAnimationContext * _Nonnull context) {
+ context.duration = TOGGLE_INFO_ANIMATION_DURATION;
+ 
+ self.placeholderHeightLayoutConstraint.animator.constant = 0.0;
+ } completionHandler:^{
+ self.placeholderView.hidden = YES;
+ };
+ }
+}
+
+- (IBAction)finishPrompt:(NSButton *)sender
+{
+ SUUpdatePermissionResponse *response = SUUpdatePermissionResponse alloc initWithAutomaticUpdateChecks:(sender tag == 1) sendSystemProfile:self.shouldSendProfile;
+ self.reply(response);
+ 
+ self close;
+}
+
+- (NSTouchBar *)makeTouchBar
+{
+ NSTouchBar *touchBar = NSTouchBar alloc init;
+ touchBar.defaultItemIdentifiers = @SUUpdatePermissionPromptTouchBarIndentifier,;
+ touchBar.principalItemIdentifier = SUUpdatePermissionPromptTouchBarIndentifier;
+ touchBar.delegate = self;
+ return touchBar;
+}
+
+- (NSTouchBarItem *)touchBar:(NSTouchBar * __unused)touchBar makeItemForIdentifier:(NSTouchBarItemIdentifier)identifier
+{
+ if (identifier isEqualToString:SUUpdatePermissionPromptTouchBarIndentifier) {
+ NSCustomTouchBarItem* item = NSCustomTouchBarItem alloc initWithIdentifier:identifier;
+ item.viewController = SUTouchBarButtonGroup alloc initByReferencingButtons:@self.checkButton, self.cancelButton;
+ return item;
+ }
+ return nil;
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdatePermissionResponse.h Added

@@ -0,0 +1,40 @@
+//
+// SUUpdatePermissionResponse.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 2/8/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+
+/**
+ This class represents a response for permission to check updates.
+*/
+SU_EXPORT @interface SUUpdatePermissionResponse : NSObject<NSSecureCoding>
+
+/**
+ Initializes a new update permission response instance.
+ 
+ @param automaticUpdateChecks Flag for whether to allow automatic update checks.
+ @param sendSystemProfile Flag for if system profile information should be sent to the server hosting the appcast.
+ */
+- (instancetype)initWithAutomaticUpdateChecks:(BOOL)automaticUpdateChecks sendSystemProfile:(BOOL)sendSystemProfile;
+
+/*
+ Use -initWithAutomaticUpdateChecks:sendSystemProfile: instead.
+ */
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ A read-only property indicating whether automatic update checks are allowed or not.
+ */
+@property (nonatomic, readonly) BOOL automaticUpdateChecks;
+
+/**
+ A read-only property indicating if system profile should be sent or not.
+ */
+@property (nonatomic, readonly) BOOL sendSystemProfile;
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdatePermissionResponse.m Added

@@ -0,0 +1,50 @@
+//
+//  SUUpdatePermissionResponse.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 2/8/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUUpdatePermissionResponse.h"
+
+
+#include "AppKitPrevention.h"
+
+static NSString *SUUpdatePermissionAutomaticUpdateChecksKey = @"SUUpdatePermissionAutomaticUpdateChecks";
+static NSString *SUUpdatePermissionSendSystemProfileKey = @"SUUpdatePermissionSendSystemProfile";
+
+@implementation SUUpdatePermissionResponse
+
+@synthesize automaticUpdateChecks = _automaticUpdateChecks;
+@synthesize sendSystemProfile = _sendSystemProfile;
+
++ (BOOL)supportsSecureCoding
+{
+    return YES;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)decoder
+{
+    BOOL automaticUpdateChecks = decoder decodeBoolForKey:SUUpdatePermissionAutomaticUpdateChecksKey;
+    BOOL sendSystemProfile = decoder decodeBoolForKey:SUUpdatePermissionSendSystemProfileKey;
+    return self initWithAutomaticUpdateChecks:automaticUpdateChecks sendSystemProfile:sendSystemProfile;
+}
+
+- (void)encodeWithCoder:(NSCoder *)encoder
+{
+    encoder encodeBool:self.automaticUpdateChecks forKey:SUUpdatePermissionAutomaticUpdateChecksKey;
+    encoder encodeBool:self.sendSystemProfile forKey:SUUpdatePermissionSendSystemProfileKey;
+}
+
+- (instancetype)initWithAutomaticUpdateChecks:(BOOL)automaticUpdateChecks sendSystemProfile:(BOOL)sendSystemProfile
+{
+    self = super init;
+    if (self != nil) {
+        _automaticUpdateChecks = automaticUpdateChecks;
+        _sendSystemProfile = sendSystemProfile;
+    }
+    return self;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdateValidator.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdateValidator.m Added

@@ -0,0 +1,251 @@
+//
+//  SUUpdateValidator.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 12/3/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUUpdateValidator.h"
+#import "SUSignatureVerifier.h"
+#import "SUCodeSigningVerifier.h"
+#import "SUInstaller.h"
+#import "SUHost.h"
+#import "SULog.h"
+#import "SUSignatures.h"
+#import "SUErrors.h"
+
+
+#include "AppKitPrevention.h"
+
+@interface SUUpdateValidator ()
+
+@property (nonatomic, readonly) SUHost *host;
+@property (nonatomic) BOOL prevalidatedSignature;
+@property (strong, nonatomic, readonly) SUSignatures *signatures;
+@property (nonatomic, readonly) NSString *downloadPath;
+
+@end
+
+@implementation SUUpdateValidator
+
+@synthesize host = _host;
+@synthesize prevalidatedSignature = _prevalidatedSignature;
+@synthesize signatures = _signatures;
+@synthesize downloadPath = _downloadPath;
+
+- (instancetype)initWithDownloadPath:(NSString *)downloadPath signatures:(SUSignatures *)signatures host:(SUHost *)host
+{
+    self = super init;
+    if (self != nil) {
+        _downloadPath = downloadPath copy;
+        _signatures = signatures;
+        _host = host;
+    }
+    return self;
+}
+
+- (BOOL)validateDownloadPathWithError:(NSError * __autoreleasing *)error
+{
+    SUPublicKeys *publicKeys = self.host.publicKeys;
+    SUSignatures *signatures = self.signatures;
+
+    if (!publicKeys.hasAnyKeys) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to validate update before unarchiving because no (Ed)DSA public key was found in the old app" };
+        }
+    } else {
+        NSError *innerError = nil;
+        if (SUSignatureVerifier validatePath:self.downloadPath withSignatures:signatures withPublicKeys:publicKeys error:&innerError) {
+            self.prevalidatedSignature = YES;
+            return YES;
+        }
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"(Ed)DSA signature validation before unarchiving failed for update %@", self.downloadPath, NSUnderlyingErrorKey: innerError };
+        }
+    }
+    return NO;
+}
+
+- (BOOL)validateWithUpdateDirectory:(NSString *)updateDirectory error:(NSError * __autoreleasing *)error
+{
+    SUSignatures *signatures = self.signatures;
+    SUPublicKeys *publicKeys = self.host.publicKeys;
+    NSString *downloadPath = self.downloadPath;
+    SUHost *host = self.host;
+
+    BOOL isPackage = NO;
+
+    // install source could point to a new bundle or a package
+    NSString *installSource = SUInstaller installSourcePathInUpdateFolder:updateDirectory forHost:host isPackage:&isPackage isGuided:NULL;
+    if (installSource == nil) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"No suitable install is found in the update. The update will be rejected." };
+        }
+        return NO;
+    }
+
+    NSURL *installSourceURL = NSURL fileURLWithPath:installSource;
+
+    if (!self.prevalidatedSignature) {
+        // Check to see if we have a package or bundle to validate
+        if (isPackage) {
+            // If we get here, then the appcast installation type was lying to us.. This error will be caught later when starting the installer.
+            // For package type updates, all we do is check if the EdDSA signature is valid
+            NSError *innerError = nil;
+            BOOL validationCheckSuccess = SUSignatureVerifier validatePath:downloadPath withSignatures:signatures withPublicKeys:publicKeys error:&innerError;
+            if (!validationCheckSuccess) {
+                if (error != NULL) {
+                    *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"EdDSA signature validation of the package failed. The update contains an installer package, and valid EdDSA signatures are mandatory for all installer packages. The update will be rejected. Sign the installer with a valid EdDSA key or use an .app bundle update instead.", NSUnderlyingErrorKey: innerError };
+                }
+            }
+            return validationCheckSuccess;
+        } else {
+            // For application bundle updates, we check both the EdDSA and Apple code signing signatures
+            return self validateUpdateForHost:host downloadedToPath:downloadPath newBundleURL:installSourceURL signatures:signatures error:error;
+        }
+    } else if (isPackage) {
+        // We already prevalidated the package and nothing else needs to be done
+        return YES;
+    } else {
+        // Because we already validated the EdDSA signature, this is just a consistency check to see
+        // if the developer signed their application properly with their Apple ID
+        // Currently, this case only gets hit for binary delta updates
+        NSError *innerError = nil;
+        if (SUCodeSigningVerifier bundleAtURLIsCodeSigned:installSourceURL && !SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:installSourceURL error:&innerError) {
+            if (error != NULL) {
+                *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to validate apple code sign signature on bundle after archive validation", NSUnderlyingErrorKey: innerError };
+            }
+            
+            return NO;
+        } else {
+            return YES;
+        }
+    }
+}
+
+/**
+ * If the update is a bundle, then it must meet any one of:
+ *
+ *  * old and new Ed(DSA) public keys are the same and valid (it allows change of Code Signing identity), or
+ *
+ *  * old and new Code Signing identity are the same and valid
+ *
+ */
+- (BOOL)validateUpdateForHost:(SUHost *)host downloadedToPath:(NSString *)downloadedPath newBundleURL:(NSURL *)newBundleURL signatures:(SUSignatures *)signatures error:(NSError * __autoreleasing *)error
+{
+    NSBundle *newBundle = NSBundle bundleWithURL:newBundleURL;
+    if (newBundle == nil) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"No suitable bundle is found in the update. The update will be rejected." };
+        }
+        return NO;
+    }
+
+    SUPublicKeys *publicKeys = host.publicKeys;
+
+    SUHost *newHost = SUHost alloc initWithBundle:newBundle;
+    SUPublicKeys *newPublicKeys = newHost.publicKeys;
+    BOOL oldHasLegacyDSAKey = publicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
+    BOOL oldHasEdDSAKey = publicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
+    BOOL oldHasAnyDSAKey = oldHasLegacyDSAKey || oldHasEdDSAKey;
+    BOOL newHasLegacyDSAKey = newPublicKeys.dsaPubKeyStatus != SUSigningInputStatusAbsent;
+    BOOL newHasEdDSAKey = newPublicKeys.ed25519PubKeyStatus != SUSigningInputStatusAbsent;
+    BOOL newHasAnyDSAKey = newHasLegacyDSAKey || newHasEdDSAKey;
+    BOOL migratesDSAKeys = oldHasLegacyDSAKey && !oldHasEdDSAKey && newHasEdDSAKey && !newHasLegacyDSAKey;
+    BOOL updateIsCodeSigned = SUCodeSigningVerifier bundleAtURLIsCodeSigned:newHost.bundle.bundleURL;
+    BOOL hostIsCodeSigned = SUCodeSigningVerifier bundleAtURLIsCodeSigned:host.bundle.bundleURL;
+
+    // This is not essential for security, only a policy
+    if (oldHasAnyDSAKey && !newHasAnyDSAKey) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"A public (Ed)DSA key was found in the old bundle but no public (Ed)DSA key was found in the new update. Sparkle only supports rotation, but not removal of (Ed)DSA keys. Please add an EdDSA key to the new app." };
+        }
+        return NO;
+    }
+
+    // Security-critical part starts here
+    BOOL passedDSACheck = NO;
+    BOOL passedCodeSigning = NO;
+
+    NSError *dsaError = nil;
+    if (oldHasAnyDSAKey) {
+        // it's critical to check against the old public key, rather than the new key
+        passedDSACheck = SUSignatureVerifier validatePath:downloadedPath withSignatures:signatures withPublicKeys:publicKeys error:&dsaError;
+    }
+
+    NSError *codeSignedError = nil;
+    if (hostIsCodeSigned) {
+        passedCodeSigning = SUCodeSigningVerifier codeSignatureAtBundleURL:host.bundle.bundleURL matchesSignatureAtBundleURL:newHost.bundle.bundleURL error:&codeSignedError;
+    }
+    // End of security-critical part
+
+    // If the new DSA key differs from the old, then this check is not a security measure, because the new key is not trusted.
+    // In that case, the check ensures that the app author has correctly used DSA keys, so that the app will be updateable in the next version.
+    if (!passedDSACheck && newHasAnyDSAKey) {
+        NSError *innerError = nil;
+        if (!SUSignatureVerifier validatePath:downloadedPath withSignatures:signatures withPublicKeys:newPublicKeys error:&innerError) {
+            if (error != NULL) {
+                *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"The update has a public (Ed)DSA key, but the public key shipped with the update doesn't match the signature. To prevent future problems, the update will be rejected.", NSUnderlyingErrorKey: innerError };
+            }
+            return NO;
+        }
+    }
+
+    NSError *innerError = nil;
+    if (passedDSACheck && updateIsCodeSigned && !SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:newHost.bundle.bundleURL error:&innerError) {
+        if (error != NULL) {
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"The update archive has a valid (Ed)DSA signature, but the app is also signed with Code Signing, which is corrupted. The update will be rejected.", NSUnderlyingErrorKey: innerError };
+        }
+        return NO;
+    }
+
+    // Either DSA must be valid, or Apple Code Signing must be valid.
+    // We allow failure of one of them, because this allows key rotation without breaking chain of trust.
+    if (passedDSACheck || passedCodeSigning) {
+        return YES;
+    }
+
+    // Now this just explains the failure
+
+    NSString *dsaStatus;
+    if (migratesDSAKeys) {
+        dsaStatus = @"migrates to new EdDSA keys without keeping the old DSA key for transition";
+    } else if (newHasAnyDSAKey) {
+        dsaStatus = @"has a new (Ed)DSA key that doesn't match the previous one";
+    } else if (oldHasAnyDSAKey) {
+        dsaStatus = @"removes the (Ed)DSA key";
+    } else {
+        dsaStatus = @"isn't signed with an EdDSA key";
+    }
+
+    if (!hostIsCodeSigned || !updateIsCodeSigned) {
+        NSString *acsStatus = !hostIsCodeSigned ? @"old app hasn't been signed with app Code Signing" : @"new app isn't signed with app Code Signing";
+        
+        if (error != NULL) {
+            NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+            userInfoNSLocalizedDescriptionKey = NSString stringWithFormat:@"The update archive %@, and the %@. At least one method of signature verification must be valid. The update will be rejected.", dsaStatus, acsStatus;
+            
+            if (dsaError != nil) {
+                userInfoNSUnderlyingErrorKey = dsaError;
+            }
+            
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo copy;
+        }
+    } else {
+        if (error != NULL) {
+            NSMutableDictionary *userInfo = NSMutableDictionary dictionary;
+            userInfoNSLocalizedDescriptionKey = NSString stringWithFormat:@"The update archive %@, and the app is signed with a new Code Signing identity that doesn't match code signing of the original app. At least one method of signature verification must be valid. The update will be rejected.", dsaStatus;
+            
+            if (codeSignedError != nil) {
+                userInfoNSUnderlyingErrorKey = codeSignedError;
+            }
+            
+            *error = NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:userInfo copy;
+        }
+    }
+
+    return NO;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdater.h Added

@@ -0,0 +1,200 @@
+//
+// SUUpdater.h
+// Sparkle
+//
+// Created by Andy Matuschak on 1/4/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUUPDATER_H
+#define SUUPDATER_H
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+#import <Sparkle/SUVersionComparisonProtocol.h>
+#import <Sparkle/SUVersionDisplayProtocol.h>
+#import <Sparkle/SUUpdaterDelegate.h>
+
+@class SUAppcastItem, SUAppcast, NSMenuItem;
+
+@protocol SUUpdaterDelegate;
+
+/**
+ The legacy API in Sparkle for controlling the update mechanism.
+
+ This class is now deprecated and acts as a thin wrapper around `SPUUpdater` and `SPUStandardUserDriver`.
+ 
+ If you are migrating to Sparkle 2, use `SPUStandardUpdaterController` instead, or `SPUUpdater` if you need more control.
+ */
+__deprecated_msg("Deprecated in Sparkle 2. Use SPUStandardUpdaterController instead, or SPUUpdater if you need more control.")
+SU_EXPORT @interface SUUpdater : NSObject
+
+@property (unsafe_unretained, nonatomic) IBOutlet id<SUUpdaterDelegate> delegate;
+
+/*!
+ The shared updater for the main bundle.
+ 
+ This is equivalent to passing NSBundle mainBundle to SUUpdater::updaterForBundle:
+ */
++ (SUUpdater *)sharedUpdater;
+
+/*!
+ The shared updater for a specified bundle.
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle;
+
+/*!
+ Designated initializer for SUUpdater.
+ 
+ If an updater has already been initialized for the provided bundle, that shared instance will be returned.
+ */
+- (instancetype)initForBundle:(NSBundle *)bundle;
+
+/*!
+ Explicitly checks for updates and displays a progress dialog while doing so.
+
+ This method is meant for a main menu item.
+ Connect any menu item to this action in Interface Builder,
+ and Sparkle will check for updates and report back its findings verbosely
+ when it is invoked.
+
+ This will find updates that the user has opted into skipping.
+ */
+- (IBAction)checkForUpdates:(id)sender;
+
+/*!
+ The menu item validation used for the -checkForUpdates: action
+ */
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem;
+
+/*!
+ Checks for updates, but does not display any UI unless an update is found.
+
+ This is meant for programmatically initating a check for updates. That is,
+ it will display no UI unless it actually finds an update, in which case it
+ proceeds as usual.
+
+ If automatic downloading of updates it turned on and allowed, however,
+ this will invoke that behavior, and if an update is found, it will be downloaded
+ in the background silently and will be prepped for installation.
+
+ This will not find updates that the user has opted into skipping.
+ */
+- (void)checkForUpdatesInBackground;
+
+/*!
+ A property indicating whether or not to check for updates automatically.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property (nonatomic) BOOL automaticallyChecksForUpdates;
+
+/*!
+ A property indicating whether or not updates can be automatically downloaded in the background.
+
+ Note that automatic downloading of updates can be disallowed by the developer.
+ In this case, -automaticallyDownloadsUpdates will return NO regardless of how this property is set.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property (nonatomic) BOOL automaticallyDownloadsUpdates;
+
+/*!
+ A property indicating the current automatic update check interval.
+
+ Setting this property will persist in the host bundle's user defaults.
+ The update schedule cycle will be reset in a short delay after the property's new value is set.
+ This is to allow reverting this property without kicking off a schedule change immediately
+ */
+@property (nonatomic) NSTimeInterval updateCheckInterval;
+
+/*!
+ Begins a "probing" check for updates which will not actually offer to
+ update to that version.
+
+ However, the delegate methods
+ SUUpdaterDelegate::updater:didFindValidUpdate: and
+ SUUpdaterDelegate::updaterDidNotFindUpdate: will be called,
+ so you can use that information in your UI.
+
+ Updates that have been skipped by the user will not be found.
+ */
+- (void)checkForUpdateInformation;
+
+/*!
+ The URL of the appcast used to download update information.
+
+ Setting this property will persist in the host bundle's user defaults.
+ If you don't want persistence, you may want to consider instead implementing
+ SUUpdaterDelegate::feedURLStringForUpdater: or SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+
+ This property must be called on the main thread.
+ */
+@property (nonatomic, copy) NSURL *feedURL;
+
+/*!
+ The host bundle that is being updated.
+ */
+@property (readonly, nonatomic) NSBundle *hostBundle;
+
+/*!
+ The bundle this class (SUUpdater) is loaded into.
+ */
+@property (nonatomic, readonly) NSBundle *sparkleBundle;
+
+/*!
+ The user agent used when checking for and downloading updates.
+
+ The default implementation can be overrided.
+ */
+@property (nonatomic, copy) NSString *userAgentString;
+
+/*!
+ The HTTP headers used when checking for and downloading updates.
+
+ The keys of this dictionary are HTTP header fields (NSString) and values are corresponding values (NSString)
+ */
+@property (copy) NSDictionary<NSString *, NSString *> *httpHeaders;
+
+/*!
+ A property indicating whether or not the user's system profile information is sent when checking for updates.
+
+ Setting this property will persist in the host bundle's user defaults.
+ */
+@property (nonatomic) BOOL sendsSystemProfile;
+
+/*!
+ A property indicating the decryption password used for extracting updates shipped as Apple Disk Images (dmg)
+ */
+@property (nonatomic, copy) NSString *decryptionPassword;
+
+/*!
+ Returns the date of last update check.
+
+ \returns \c nil if no check has been performed.
+ */
+@property (nonatomic, readonly, copy) NSDate *lastUpdateCheckDate;
+
+/*!
+ Appropriately schedules or cancels the update checking timer according to
+ the preferences for time interval and automatic checks.
+
+ This call does not change the date of the next check,
+ but only the internal NSTimer.
+ */
+- (void)resetUpdateCycle;
+
+/*!
+ A property indicating whether or not an update is in progress.
+
+ Note this property is not indicative of whether or not user initiated updates can be performed.
+ Use SUUpdater::validateMenuItem: for that instead.
+ */
+@property (nonatomic, readonly) BOOL updateInProgress;
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdater.m Added

@@ -0,0 +1,539 @@
+//
+// SUUpdater.m
+// Sparkle
+//
+// Created by Andy Matuschak on 1/4/06.
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SUUpdater.h"
+#import "SPUUpdater.h"
+#import "SPUStandardUserDriver.h"
+#import "SPUStandardUserDriverDelegate.h"
+#import "SPUUpdaterDelegate.h"
+#import "SULog.h"
+#import <AppKit/AppKit.h>
+
+@interface SUUpdater () <SPUUpdaterDelegate, SPUStandardUserDriverDelegate>
+
+@property (nonatomic, readonly) SPUUpdater *updater;
+@property (nonatomic, readonly) SPUStandardUserDriver *userDriver;
+
+@property (nonatomic, copy) void(^postponedInstallHandler)(void);
+@property (nonatomic, copy) void(^silentInstallHandler)(void);
+
+@property (nonatomic) BOOL loggedInstallUpdatesIfAvailableWarning;
+
+@end
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-implementations"
+@implementation SUUpdater
+#pragma clang diagnostic pop
+{
+ BOOL _delayShowingUserUpdate;
+}
+
+@synthesize updater = _updater;
+@synthesize delegate = _delegate;
+@synthesize userDriver = _userDriver;
+@synthesize postponedInstallHandler = _postponedInstallHandler;
+@synthesize silentInstallHandler = _silentInstallHandler;
+@synthesize decryptionPassword = _decryptionPassword;
+@synthesize loggedInstallUpdatesIfAvailableWarning = _loggedInstallUpdatesIfAvailableWarning;
+
+static NSMutableDictionary *sharedUpdaters = nil;
+
++ (SUUpdater *)sharedUpdater
+{
+ return self updaterForBundle:NSBundle mainBundle;
+}
+
+// SUUpdater has a singleton for each bundle. We use the fact that NSBundle instances are also singletons, so we can use them as keys. If you don't trust that you can also use the identifier as key
++ (SUUpdater *)updaterForBundle:(NSBundle *)bundle
+{
+ if (bundle == nil) bundle = NSBundle mainBundle;
+ id updater = sharedUpdaters objectForKey:NSValue valueWithNonretainedObject:bundle;
+ if (updater == nil) {
+ updater = (SUUpdater *)self class alloc initForBundle:bundle;
+ }
+ return updater;
+}
+
+// This is the designated initializer for SUUpdater, important for subclasses
+- (instancetype)initForBundle:(NSBundle *)bundle
+{
+ self = super init;
+ if (bundle == nil) bundle = NSBundle mainBundle;
+
+ id updater = sharedUpdaters objectForKey:NSValue valueWithNonretainedObject:bundle;
+ if (updater)
+	{
+ self = updater;
+	}
+	else if (self)
+	{
+ if (sharedUpdaters == nil) {
+ sharedUpdaters = NSMutableDictionary alloc init;
+ }
+ sharedUpdaters setObject:self forKey:NSValue valueWithNonretainedObject:bundle;
+ 
+ // This bundle may not necessarily be the correct application bundle
+ // Unfortunately we won't know the correct application bundle until after the delegate is set
+ // See -SUUpdater _standardUserDriverRequestsPathToRelaunch and -SUUpdater _pathToRelaunchForUpdater: implemented below which resolves this
+ _userDriver = SPUStandardUserDriver alloc initWithHostBundle:bundle delegate:self;
+ _updater = SPUUpdater alloc initWithHostBundle:bundle applicationBundle:bundle userDriver:_userDriver delegate:self;
+ 
+ NSError *updaterError = nil;
+ if (!self.updater startUpdater:&updaterError) {
+ SULog(SULogLevelError, @"Error: Failed to start updater with error: %@", updaterError);
+ }
+ }
+ return self;
+}
+
+// This will be used when the updater is instantiated in a nib such as MainMenu
+- (instancetype)init
+{
+ return self initForBundle:NSBundle mainBundle;
+}
+
+- (void)resetUpdateCycle
+{
+ self.updater resetUpdateCycle;
+}
+
+- (NSBundle *)hostBundle
+{
+ return self.updater.hostBundle;
+}
+
+- (NSBundle *)sparkleBundle
+{
+ // Use explicit class to use the correct bundle even when subclassed
+ return NSBundle bundleForClass:SUUpdater class;
+}
+
+- (BOOL)automaticallyChecksForUpdates
+{
+ return self.updater.automaticallyChecksForUpdates;
+}
+
+- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyChecksForUpdates
+{
+ self.updater setAutomaticallyChecksForUpdates:automaticallyChecksForUpdates;
+}
+
+- (NSTimeInterval)updateCheckInterval
+{
+ return self.updater.updateCheckInterval;
+}
+
+- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
+{
+ self.updater setUpdateCheckInterval:updateCheckInterval;
+}
+
+- (NSURL *)feedURL
+{
+ return self.updater.feedURL;
+}
+
+- (void)setFeedURL:(NSURL *)feedURL
+{
+ self.updater setFeedURL:feedURL;
+}
+
+- (NSString *)userAgentString
+{
+ return self.updater.userAgentString;
+}
+
+- (void)setUserAgentString:(NSString *)userAgentString
+{
+ self.updater setUserAgentString:userAgentString;
+}
+
+- (NSDictionary *)httpHeaders
+{
+ return self.updater.httpHeaders;
+}
+
+- (void)setHttpHeaders:(NSDictionary *)httpHeaders
+{
+ self.updater setHttpHeaders:httpHeaders;
+}
+
+- (BOOL)sendsSystemProfile
+{
+ return self.updater.sendsSystemProfile;
+}
+
+- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
+{
+ self.updater setSendsSystemProfile:sendsSystemProfile;
+}
+
+- (BOOL)automaticallyDownloadsUpdates
+{
+ return self.updater.automaticallyDownloadsUpdates;
+}
+
+- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates
+{
+ self.updater setAutomaticallyDownloadsUpdates:automaticallyDownloadsUpdates;
+}
+
+- (IBAction)checkForUpdates:(id)__unused sender
+{
+ self.updater checkForUpdates;
+}
+ 
+- (BOOL)validateMenuItem:(NSMenuItem *)item
+{
+ if (item action == @selector(checkForUpdates:)) {
+ return self.updater.canCheckForUpdates;
+ }
+ return YES;
+}
+
+- (void)checkForUpdatesInBackground
+{
+ if (_delayShowingUserUpdate) {
+ // We don't know if SUUpdater delegate will call checkForUpdates: or checkForUpdatesInBackground
+ // to bring a deffered update alert back in 1.x.
+ // So if checkForUpdatesInBackground is called we will bring the update back in focus
+ self checkForUpdates:nil;
+ } else {
+ self.updater checkForUpdatesInBackground;
+ }
+}
+
+- (NSDate *)lastUpdateCheckDate
+{
+ return self.updater.lastUpdateCheckDate;
+}
+
+- (void)checkForUpdateInformation
+{
+ self.updater checkForUpdateInformation;
+}
+
+- (BOOL)updateInProgress
+{
+ // This is not quite true -- we may be able to check / resume an update if one is in progress
+ // But this is a close enough approximation for 1.x updater API
+ return self.updater.sessionInProgress;
+}
+
+// Not implemented properly at the moment - leaning towards it not be in the future
+// because it may be hard to implement properly (without passing a boolean flag everywhere), or
+// it would require us to maintain support for an additional class used by a very few people thus far
+// For now, just invoke the regular background update process if this is invoked. Could change our minds on this later.
+- (void)installUpdatesIfAvailable
+{
+ if (!self.loggedInstallUpdatesIfAvailableWarning) {
+ SULog(SULogLevelError, @"-%@ installUpdatesIfAvailable does not function anymore.. Instead a background scheduled update check will be done.", NSStringFromClass(self class));
+ 
+ self.loggedInstallUpdatesIfAvailableWarning = YES;
+ }
+
+ self checkForUpdatesInBackground;
+}
+
+- (void)standardUserDriverWillShowModalAlert
+{
+ if (self.delegate respondsToSelector:@selector(updaterWillShowModalAlert:)) {
+ self.delegate updaterWillShowModalAlert:self;
+ }
+}
+
+- (void)standardUserDriverDidShowModalAlert
+{
+ if (self.delegate respondsToSelector:@selector(updaterDidShowModalAlert:)) {
+ self.delegate updaterDidShowModalAlert:self;
+ }
+}
+
+- (_Nullable id <SUVersionDisplay>)standardUserDriverRequestsVersionDisplayer
+{
+ id <SUVersionDisplay> versionDisplayer = nil;
+ if (self.delegate respondsToSelector:@selector(versionDisplayerForUpdater:)) {
+ versionDisplayer = self.delegate versionDisplayerForUpdater:self;
+ }
+ return versionDisplayer;
+}
+
+- (BOOL)updater:(SPUUpdater *)__unused updater mayPerformUpdateCheck:(SPUUpdateCheck)__unused updateCheck error:(NSError *__autoreleasing _Nullable *)error
+{
+ BOOL updaterMayCheck = YES;
+ if (self.delegate respondsToSelector:@selector(updaterMayCheckForUpdates:)) {
+ updaterMayCheck = self.delegate updaterMayCheckForUpdates:self;
+ }
+ return updaterMayCheck;
+}
+
+- (NSArray *)feedParametersForUpdater:(SPUUpdater *)__unused updater sendingSystemProfile:(BOOL)sendingProfile
+{
+ NSArray *feedParameters;
+ if (self.delegate respondsToSelector:@selector(feedParametersForUpdater:sendingSystemProfile:)) {
+ feedParameters = self.delegate feedParametersForUpdater:self sendingSystemProfile:sendingProfile;
+ } else {
+ feedParameters = NSArray array;
+ }
+ return feedParameters;
+}
+
+- (NSString *)feedURLStringForUpdater:(SPUUpdater *)__unused updater
+{
+ // Be really careful not to call self feedURL here. That might lead us into infinite recursion.
+ NSString *feedURL = nil;
+ if (self.delegate respondsToSelector:@selector(feedURLStringForUpdater:)) {
+ feedURL = self.delegate feedURLStringForUpdater:self;
+ }
+ return feedURL;
+}
+
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)__unused updater
+{
+ BOOL shouldPrompt = YES;
+ if (self.delegate respondsToSelector:@selector(updater:didFinishLoadingAppcast:)) {
+ shouldPrompt = self.delegate updaterShouldPromptForPermissionToCheckForUpdates:self;
+ }
+ return shouldPrompt;
+}
+
+- (void)updater:(SPUUpdater *)__unused updater didFinishLoadingAppcast:(SUAppcast *)appcast
+{
+ if (self.delegate respondsToSelector:@selector(updater:didFinishLoadingAppcast:)) {
+ self.delegate updater:self didFinishLoadingAppcast:appcast;
+ }
+}
+
+- (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SPUUpdater *)__unused updater
+{
+ SUAppcastItem *bestValidUpdate = nil;
+ if (self.delegate respondsToSelector:@selector(bestValidUpdateInAppcast:forUpdater:)) {
+ bestValidUpdate = self.delegate bestValidUpdateInAppcast:appcast forUpdater:self;
+ }
+ return bestValidUpdate;
+}
+
+- (void)updater:(SPUUpdater *)__unused updater didFindValidUpdate:(SUAppcastItem *)item
+{
+ if (self.delegate respondsToSelector:@selector(updater:didFindValidUpdate:)) {
+ self.delegate updater:self didFindValidUpdate:item;
+ }
+}
+
+- (void)updaterDidNotFindUpdate:(SPUUpdater *)__unused updater
+{
+ if (self.delegate respondsToSelector:@selector(updaterDidNotFindUpdate:)) {
+ self.delegate updaterDidNotFindUpdate:self;
+ }
+}
+
+- (void)updater:(SPUUpdater *)__unused updater userDidMakeChoice:(SPUUserUpdateChoice)choice forUpdate:(SUAppcastItem *)updateItem state:(SPUUserUpdateState *)__unused state
+{
+ // This delegate callback matches 1.x behavior (even though -standardUserDriverWillFinishUpdateSession might be a better place for it)
+ if (self.delegate respondsToSelector:@selector(updater:didDismissUpdateAlertPermanently:forItem:)) {
+ self.delegate updater:self didDismissUpdateAlertPermanently:(choice == SPUUserUpdateChoiceSkip) forItem:updateItem;
+ }
+ 
+ if (choice == SPUUserUpdateChoiceSkip && self.delegate respondsToSelector:@selector(updater:userDidSkipThisVersion:)) {
+ self.delegate updater:self userDidSkipThisVersion:updateItem;
+ }
+}
+
+- (BOOL)standardUserDriverShouldHandleShowingScheduledUpdate:(SUAppcastItem *)update andInImmediateFocus:(BOOL)immediateFocus
+{
+ if (self.delegate respondsToSelector:@selector(updaterShouldShowUpdateAlertForScheduledUpdate:forItem:)) {
+ // If the delegate returns NO and tries to show the update before
+ // -standardUserDriverWillHandleShowingUpdate:forUpdate:state: is called, this is technically
+ // a violation. However it is also unlikely to happen.
+ return self.delegate updaterShouldShowUpdateAlertForScheduledUpdate:self forItem:update;
+ } else {
+ return YES;
+ }
+}
+
+- (void)standardUserDriverWillHandleShowingUpdate:(BOOL)handleShowingUpdate forUpdate:(SUAppcastItem *)update state:(SPUUserUpdateState *)state
+{
+ if (!handleShowingUpdate) {
+ _delayShowingUserUpdate = YES;
+ }
+}
+
+- (void)standardUserDriverWillFinishUpdateSession
+{
+ _delayShowingUserUpdate = NO;
+}
+
+- (void)updater:(SPUUpdater *)__unused updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request
+{
+ if (self.delegate respondsToSelector:@selector(updater:willDownloadUpdate:withRequest:)) {
+ self.delegate updater:self willDownloadUpdate:item withRequest:request;
+ }
+}
+
+- (void)updater:(SPUUpdater *)__unused updater didDownloadUpdate:(SUAppcastItem *)item
+{
+ if (self.delegate respondsToSelector:@selector(updater:didDownloadUpdate:)) {
+ self.delegate updater:self didDownloadUpdate:item;
+ }
+}
+
+- (void)updater:(SPUUpdater *)__unused updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error
+{
+ if (self.delegate respondsToSelector:@selector(updater:failedToDownloadUpdate:error:)) {
+ self.delegate updater:self failedToDownloadUpdate:item error:error;
+ }
+}
+
+- (void)userDidCancelDownload:(SPUUpdater *)__unused updater
+{
+ if (self.delegate respondsToSelector:@selector(userDidCancelDownload:)) {
+ self.delegate userDidCancelDownload:self;
+ }
+}
+
+- (void)updater:(SPUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item
+{
+ if (self.delegate respondsToSelector:@selector(updater:willExtractUpdate:)) {
+ self.delegate updater:self willExtractUpdate:item;
+ }
+}
+
+- (void)updater:(SPUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item
+{
+ if (self.delegate respondsToSelector:@selector(updater:didExtractUpdate:)) {
+ self.delegate updater:self didExtractUpdate:item;
+ }
+}
+
+- (void)updater:(SPUUpdater *)__unused updater willInstallUpdate:(SUAppcastItem *)item
+{
+ if (self.delegate respondsToSelector:@selector(updater:willInstallUpdate:)) {
+ self.delegate updater:self willInstallUpdate:item;
+ }
+}
+
+- (void)installPostponedUpdate
+{
+ if (self.postponedInstallHandler != nil) {
+ self.postponedInstallHandler();
+ self.postponedInstallHandler = nil;
+ }
+}
+
+- (BOOL)updater:(SPUUpdater *)__unused updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvokingBlock:(void (^)(void))installHandler
+{
+ BOOL shouldPostponeRelaunch = NO;
+ 
+ if (self.delegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvoking:)) {
+ NSInvocation *invocation = NSInvocation invocationWithMethodSignature:self class instanceMethodSignatureForSelector:@selector(installPostponedUpdate);
+ 
+ invocation setSelector:@selector(installPostponedUpdate);
+ 
+ // This invocation will retain self, but this instance is kept alive forever by our singleton pattern anyway
+ invocation setTarget:self;
+
+ self.postponedInstallHandler = installHandler;
+
+ shouldPostponeRelaunch = self.delegate updater:self shouldPostponeRelaunchForUpdate:item untilInvoking:invocation;
+ } else if (self.delegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:)) {
+ // This API should really take a block, but not fixing a 1.x mishap now
+ shouldPostponeRelaunch = self.delegate updater:self shouldPostponeRelaunchForUpdate:item;
+ }
+ 
+ return shouldPostponeRelaunch;
+}
+
+- (BOOL)updaterShouldRelaunchApplication:(SPUUpdater *)__unused updater
+{
+ BOOL shouldRestart = YES;
+ if (self.delegate respondsToSelector:@selector(updaterShouldRelaunchApplication:)) {
+ shouldRestart = self.delegate updaterShouldRelaunchApplication:self;
+ }
+ return shouldRestart;
+}
+
+- (void)updaterWillRelaunchApplication:(SPUUpdater *)__unused updater
+{
+ if (self.delegate respondsToSelector:@selector(updaterWillRelaunchApplication:)) {
+ self.delegate updaterWillRelaunchApplication:self;
+ }
+}
+
+- (id<SUVersionComparison>)versionComparatorForUpdater:(SPUUpdater *)__unused updater
+{
+ id<SUVersionComparison> versionComparator;
+ if (self.delegate respondsToSelector:@selector(versionComparatorForUpdater:)) {
+ versionComparator = self.delegate versionComparatorForUpdater:self;
+ }
+ return versionComparator;
+}
+
+// Private SPUUpdater API that allows us to defer providing an application path to relaunch
+- (NSString * _Nullable)_pathToRelaunchForUpdater:(SPUUpdater *)__unused updater
+{
+ NSString *relaunchPath = nil;
+ if (self.delegate respondsToSelector:@selector(pathToRelaunchForUpdater:)) {
+ relaunchPath = self.delegate pathToRelaunchForUpdater:self;
+ }
+ return relaunchPath;
+}
+
+- (NSString *)decryptionPasswordForUpdater:(SPUUpdater *)__unused updater
+{
+ return self.decryptionPassword;
+}
+
+- (void)finishSilentInstallation
+{
+ if (self.silentInstallHandler != nil) {
+ self.silentInstallHandler();
+ self.silentInstallHandler = nil;
+ }
+}
+
+- (BOOL)updater:(SPUUpdater *)__unused updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))immediateInstallHandler
+{
+ BOOL installationHandledByDelegate = NO;
+ 
+ if (self.delegate respondsToSelector:@selector((updater:willInstallUpdateOnQuit:immediateInstallationBlock:))) {
+ self.delegate updater:self willInstallUpdateOnQuit:item immediateInstallationBlock:immediateInstallHandler;
+ 
+ // We have to assume they will handle the installation since they implement this method
+ // Not ideal, but this is why this delegate callback is deprecated
+ installationHandledByDelegate = YES;
+ } else if (self.delegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationInvocation:)) {
+ NSInvocation *invocation = NSInvocation invocationWithMethodSignature:self class instanceMethodSignatureForSelector:@selector(finishSilentInstallation);
+ 
+ // This invocation will retain self, but this instance is kept alive forever by our singleton pattern anyway
+ invocation setTarget:self;
+ 
+ self.silentInstallHandler = immediateInstallHandler;
+ 
+ self.delegate updater:self willInstallUpdateOnQuit:item immediateInstallationInvocation:invocation;
+ 
+ // We have to assume they will handle the installation since they implement this method
+ // Not ideal, but this is why this delegate callback is deprecated
+ installationHandledByDelegate = YES;
+ }
+ 
+ return installationHandledByDelegate;
+}
+
+- (void)updater:(SPUUpdater *)__unused updater didAbortWithError:(NSError *)error
+{
+ if (self.delegate respondsToSelector:@selector(updater:didAbortWithError:)) {
+ self.delegate updater:self didAbortWithError:error;
+ }
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUUpdaterDelegate.h Added

@@ -0,0 +1,354 @@
+//
+// SUUpdaterDelegate.h
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/12/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/SUExport.h>
+
+@protocol SUVersionComparison, SUVersionDisplay;
+@class SUUpdater, SUAppcast, SUAppcastItem;
+
+NS_ASSUME_NONNULL_BEGIN
+
+// -----------------------------------------------------------------------------
+// SUUpdater Notifications for events that might be interesting to more than just the delegate
+// The updater will be the notification object
+// -----------------------------------------------------------------------------
+SU_EXPORT extern NSString *const SUUpdaterDidFinishLoadingAppCastNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidFindValidUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterDidNotFindUpdateNotification;
+SU_EXPORT extern NSString *const SUUpdaterWillRestartNotification;
+#define SUUpdaterWillRelaunchApplicationNotification SUUpdaterWillRestartNotification;
+#define SUUpdaterWillInstallUpdateNotification SUUpdaterWillRestartNotification;
+
+// Key for the SUAppcastItem object in the SUUpdaterDidFindValidUpdateNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastItemNotificationKey;
+// Key for the SUAppcast object in the SUUpdaterDidFinishLoadingAppCastNotification userInfo
+SU_EXPORT extern NSString *const SUUpdaterAppcastNotificationKey;
+
+// -----------------------------------------------------------------------------
+//	SUUpdater Delegate:
+// -----------------------------------------------------------------------------
+
+/*!
+ Provides methods to control the behavior of an SUUpdater object.
+ */
+__deprecated_msg("Deprecated in Sparkle 2. See SPUUpdaterDelegate instead")
+@protocol SUUpdaterDelegate <NSObject>
+@optional
+
+/*!
+ Returns whether to allow Sparkle to pop up.
+ 
+ For example, this may be used to prevent Sparkle from interrupting a setup assistant.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterMayCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Returns additional parameters to append to the appcast URL's query string.
+ 
+ This is potentially based on whether or not Sparkle will also be sending along the system profile.
+ 
+ \param updater The SUUpdater instance.
+ \param sendingProfile Whether the system profile will also be sent.
+ 
+ \return An array of dictionaries with keys: "key", "value", "displayKey", "displayValue", the latter two being specifically for display to the user.
+ */
+- (NSArray<NSDictionary<NSString *, NSString *> *> *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile;
+
+/*!
+ Returns a custom appcast URL.
+ 
+ Override this to dynamically specify the entire URL.
+ 
+ An alternative may be to use SUUpdaterDelegate::feedParametersForUpdater:sendingSystemProfile:
+ and let the server handle what kind of feed to provide.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)feedURLStringForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns whether Sparkle should prompt the user about automatic update checks.
+ 
+ Use this to override the default behavior.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater;
+
+/*!
+ Called after Sparkle has downloaded the appcast from the remote server.
+ 
+ Implement this if you want to do some special handling with the appcast once it finishes loading.
+ 
+ \param updater The SUUpdater instance.
+ \param appcast The appcast that was downloaded from the remote server.
+ */
+- (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcast;
+
+/*!
+ Returns the item in the appcast corresponding to the update that should be installed.
+ 
+ If you're using special logic or extensions in your appcast,
+ implement this to use your own logic for finding a valid update, if any,
+ in the given appcast.
+ 
+ \param appcast The appcast that was downloaded from the remote server.
+ \param updater The SUUpdater instance.
+ */
+- (nullable SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)updater;
+
+/*!
+ Called when a valid update is found by the update driver.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when a valid update is not found.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;
+
+/*!
+ Called just before the scheduled update driver prompts the user to install an update.
+
+ \param updater The SUUpdater instance.
+
+ \return YES to allow the update prompt to be shown (the default behavior), or NO to suppress it.
+ */
+ - (BOOL)updaterShouldShowUpdateAlertForScheduledUpdate:(SUUpdater *)updater forItem:(SUAppcastItem *)item;
+
+ /*!
+ Called after the user dismisses the update alert.
+
+ \param updater The SUUpdater instance.
+ \param permanently YES if the alert will not appear again for this update; NO if it may reappear.
+ */
+ - (void)updater:(SUUpdater *)updater didDismissUpdateAlertPermanently:(BOOL)permanently forItem:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before downloading the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be downloaded.
+ \param request The mutable URL request that will be used to download the update.
+ */
+- (void)updater:(SUUpdater *)updater willDownloadUpdate:(SUAppcastItem *)item withRequest:(NSMutableURLRequest *)request;
+
+/*!
+ Called immediately after succesfull download of the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been downloaded.
+ */
+- (void)updater:(SUUpdater *)updater didDownloadUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called after the specified update failed to download.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that failed to download.
+ \param error The error generated by the failed download.
+ */
+- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error;
+
+/*!
+ Called when the user clicks the cancel button while and update is being downloaded.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)userDidCancelDownload:(SUUpdater *)updater;
+
+/*!
+ Called immediately before extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be extracted.
+ */
+- (void)updater:(SUUpdater *)updater willExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately after extracting the specified downloaded update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that has been extracted.
+ */
+- (void)updater:(SUUpdater *)updater didExtractUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called immediately before installing the specified update.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)item;
+
+/*!
+ Called when an update is skipped by the user.
+ 
+ \param updater The updater instance.
+ \param item The appcast item corresponding to the update that the user skipped.
+ */
+- (void)updater:(SUUpdater *)updater userDidSkipThisVersion:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ This may also not be called if the application is not going to relaunch after it terminates.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation The invocation that must be completed with `invocation invoke` before continuing with the relaunch.
+ 
+ \return \c YES to delay the relaunch until \p invocation is invoked.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item untilInvoking:(NSInvocation *)invocation;
+
+/*!
+ Returns whether the relaunch should be delayed in order to perform other tasks.
+ 
+ This is not called if the user didn't relaunch on the previous update,
+ in that case it will immediately restart.
+ 
+ This method acts as a simpler alternative to SUUpdaterDelegate::updater:shouldPostponeRelaunchForUpdate:untilInvoking: avoiding usage of NSInvocation, which is not available in Swift environments.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ 
+ \return \c YES to delay the relaunch.
+ */
+- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)item;
+
+/*!
+ Returns whether the application should be relaunched at all.
+ 
+ Some apps \b cannot be relaunched under certain circumstances.
+ This method can be used to explicitly prevent a relaunch.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (BOOL)updaterShouldRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately before relaunching.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Called immediately after relaunching. SUUpdater delegate must be set before applicationDidFinishLaunching: to catch this event.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidRelaunchApplication:(SUUpdater *)updater;
+
+/*!
+ Returns an object that compares version numbers to determine their arithmetic relation to each other.
+ 
+ This method allows you to provide a custom version comparator.
+ If you don't implement this method or return \c nil,
+ the standard version comparator will be used. Note that the
+ standard version comparator may be used during installation for preventing
+ a downgrade, even if you provide a custom comparator here.
+ 
+ \sa SUStandardVersionComparator
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable id<SUVersionComparison>)versionComparatorForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns an object that formats version numbers for display to the user.
+ If you don't implement this method or return \c nil, the standard version formatter will be used.
+ 
+ \sa SUUpdateAlert
+ \param updater The SUUpdater instance.
+ */
+- (nullable id <SUVersionDisplay>)versionDisplayerForUpdater:(SUUpdater *)updater;
+
+/*!
+ Returns the path to the application which is used to relaunch after the update is installed.
+ 
+ The installer also waits for the termination of the application at this path.
+ 
+ The default is the path of the host bundle.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (nullable NSString *)pathToRelaunchForUpdater:(SUUpdater *)updater;
+
+/*!
+ Called before an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterWillShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called after an updater shows a modal alert window,
+ to give the host the opportunity to hide attached windows that may get in the way.
+ 
+ \param updater The SUUpdater instance.
+ */
+- (void)updaterDidShowModalAlert:(SUUpdater *)updater;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ 
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param invocation Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationInvocation:(NSInvocation *)invocation;
+
+/*!
+ Called when an update is scheduled to be silently installed on quit.
+ This is after an update has been automatically downloaded in the background.
+ (i.e. SUUpdater::automaticallyDownloadsUpdates is YES)
+ This method acts as a more modern alternative to SUUpdaterDelegate::updater:willInstallUpdateOnQuit:immediateInstallationInvocation: using a block instead of NSInvocation, which is not available in Swift environments.
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that is proposed to be installed.
+ \param installationBlock Can be used to trigger an immediate silent install and relaunch.
+ */
+- (void)updater:(SUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))installationBlock;
+
+/*!
+ Calls after an update that was scheduled to be silently installed on quit has been canceled.
+ 
+ \param updater The SUUpdater instance.
+ \param item The appcast item corresponding to the update that was proposed to be installed.
+ 
+ \deprecated This method is no longer invoked. The installer will try to its best ability to install the update.
+ */
+- (void)updater:(SUUpdater *)updater didCancelInstallUpdateOnQuit:(SUAppcastItem *)item __deprecated;
+
+/*!
+ Called after an update is aborted due to an error.
+ 
+ \param updater The SUUpdater instance.
+ \param error The error that caused the abort
+ */
+- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUVersionComparisonProtocol.h Added

@@ -0,0 +1,42 @@
+//
+// SUVersionComparisonProtocol.h
+// Sparkle
+//
+// Created by Andy Matuschak on 12/21/07.
+// Copyright 2007 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SUVERSIONCOMPARISONPROTOCOL_H
+#define SUVERSIONCOMPARISONPROTOCOL_H
+
+#import <Foundation/Foundation.h>
+
+#ifdef BUILDING_SPARKLE_TOOL
+// Ignore incorrect warning
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
+#import "SUExport.h"
+#pragma clang diagnostic pop
+#else
+#import <Sparkle/SUExport.h>
+#endif
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Provides version comparison facilities for Sparkle.
+*/
+@protocol SUVersionComparison
+
+/**
+ An abstract method to compare two version strings.
+
+ Should return NSOrderedAscending if b > a, NSOrderedDescending if b < a,
+ and NSOrderedSame if they are equivalent.
+*/
+- (NSComparisonResult)compareVersion:(NSString *)versionA toVersion:(NSString *)versionB; // *** MAY BE CALLED ON NON-MAIN THREAD!
+
+@end
+
+NS_ASSUME_NONNULL_END
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUVersionDisplayProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUWKWebView.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUWKWebView.m Added

@@ -0,0 +1,207 @@
+//
+// SUWKWebView.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 12/30/20.
+// Copyright © 2020 Sparkle Project. All rights reserved.
+//
+
+#if SPARKLE_BUILD_UI_BITS
+
+#import "SUWKWebView.h"
+#import "SUWebViewCommon.h"
+#import "SULog.h"
+#import "SUErrors.h"
+#import <WebKit/WebKit.h>
+
+@interface WKWebView (Private)
+
+- (void)_setDrawsBackground:(BOOL)drawsBackground;
+- (void)_setDrawsTransparentBackground:(BOOL)drawsTransparentBackground;
+
+@end
+
+@interface SUWKWebView () <WKNavigationDelegate>
+
+@property (nonatomic, readonly) WKWebView *webView;
+@property (nonatomic) WKNavigation *currentNavigation;
+@property (nonatomic) void (^completionHandler)(NSError * _Nullable);
+@property (nonatomic) BOOL drawsWebViewBackground;
+
+@end
+
+@implementation SUWKWebView
+
+@synthesize webView = _webView;
+@synthesize currentNavigation = _currentNavigation;
+@synthesize completionHandler = _completionHandler;
+@synthesize drawsWebViewBackground = _drawsWebViewBackground;
+
+static WKUserScript *_userScriptWithInjectedStyleSource(NSString *styleSource)
+{
+ // We must remove newlines when inserting the style source in this interpolated string below
+ NSString *strippedStyleSource = styleSource stringByReplacingOccurrencesOfString:@"\n" withString:@"";
+ 
+ NSString *scriptSource = NSString stringWithFormat:
+ @"var style = document.createElement('style');\n"
+ @"style.innerHTML = '%@'\n"
+ @"var head = document.head;\n"
+ @"if (head.firstChild) {"
+ @"\tdocument.head.insertBefore(style, document.head.firstChild);\n"
+ @"} else {\n"
+ @"\tdocument.head.appendChild(style)\n"
+ @"}", strippedStyleSource;
+ 
+ return WKUserScript alloc initWithSource:scriptSource injectionTime:WKUserScriptInjectionTimeAtDocumentEnd forMainFrameOnly:YES;
+}
+
+- (instancetype)initWithColorStyleSheetLocation:(NSURL *)colorStyleSheetLocation fontFamily:(NSString *)fontFamily fontPointSize:(int)fontPointSize javaScriptEnabled:(BOOL)javaScriptEnabled
+{
+ self = super init;
+ if (self != nil) {
+ // Synchronize with web view defaulting to drawing background to avoid unnecessary invocations in -setDrawsBackground:
+ _drawsWebViewBackground = YES;
+ 
+ WKWebViewConfiguration *configuration = WKWebViewConfiguration alloc init;
+ 
+ // Note: this javaScriptEnabled property is deprecated in favor of another webpage preference property,
+ // that involves implementing a delegate method that is only available on macOS 11.. to get it properly working.
+ // To simplify things, just rely on deprecated property for now.
+ // Future reader: if you change how JS is disabled, please be sure to test that JS code is properly disabled in HTML release notes.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+ configuration.preferences.javaScriptEnabled = javaScriptEnabled;
+#pragma clang diagnostic pop
+ configuration.preferences.javaScriptCanOpenWindowsAutomatically = NO;
+ 
+ NSError *colorStyleContentsError = nil;
+ NSString *colorStyleContents = NSString stringWithContentsOfURL:colorStyleSheetLocation encoding:NSUTF8StringEncoding error:&colorStyleContentsError;
+ 
+ WKUserContentController *userContentController = WKUserContentController alloc init;
+ 
+ NSString *fontStyleContents = NSString stringWithFormat:@"body { font-family: %@; font-size: %dpx; }", fontFamily, fontPointSize;
+ 
+ NSString *finalStyleContents;
+ if (colorStyleContents == nil) {
+ SULog(SULogLevelError, @"Failed to load style contents from %@ with %@", colorStyleSheetLocation, colorStyleContentsError);
+ 
+ finalStyleContents = fontStyleContents;
+ } else {
+ finalStyleContents = NSString stringWithFormat:@"%@ %@", fontStyleContents, colorStyleContents;
+ }
+ 
+ // Note: we can still execute javascript via WKUserScript even if javascript is otherwise disabled from the web content
+ // In fact, we must execute javascript to properly inject our default CSS style into the DOM
+ // Legacy WebView has exposed methods for custom stylesheets and default fonts,
+ // but WKWebView seems to forgo that type of API surface in favor of user scripts like this
+ userContentController addUserScript:_userScriptWithInjectedStyleSource(finalStyleContents);
+ configuration.userContentController = userContentController;
+ 
+ _webView = WKWebView alloc initWithFrame:NSZeroRect configuration:configuration;
+ _webView.navigationDelegate = self;
+ }
+ return self;
+}
+
+- (NSView *)view
+{
+ return self.webView;
+}
+
+- (void)loadHTMLString:(NSString *)htmlString baseURL:(NSURL * _Nullable)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
+{
+ self.completionHandler = completionHandler copy;
+ 
+ self.currentNavigation = self.webView loadHTMLString:htmlString baseURL:baseURL;
+}
+
+- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName baseURL:(NSURL *)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
+{
+ self.completionHandler = completionHandler copy;
+
+ self.currentNavigation = self.webView loadData:data MIMEType:MIMEType characterEncodingName:textEncodingName baseURL:baseURL;
+}
+
+- (void)setDrawsBackground:(BOOL)drawsBackground
+{
+ if (self.drawsWebViewBackground != drawsBackground) {
+ // Unfortunately we have to rely on a private API
+ // FB7539179: https://github.com/feedback-assistant/reports/issues/81 | https://bugs.webkit.org/show_bug.cgi?id=155550
+ // But it seems like others are already relying on it, passed App Review, and apps couldn't be broken due to compatibility
+ // Note: before we were using _setDrawsTransparentBackground < macOS 10.12
+ if (self.webView respondsToSelector:@selector(_setDrawsBackground:)) {
+ self.webView _setDrawsBackground:drawsBackground;
+ }
+ 
+ self.drawsWebViewBackground = drawsBackground;
+ }
+}
+
+- (void)stopLoading
+{
+ self.completionHandler = nil;
+ self.webView stopLoading;
+}
+
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
+{
+ if (navigation == self.currentNavigation) {
+ if (self.completionHandler != nil) {
+ self.completionHandler(nil);
+ self.completionHandler = nil;
+ }
+ self.currentNavigation = nil;
+ }
+}
+
+- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error
+{
+ if (navigation == self.currentNavigation) {
+ if (self.completionHandler != nil) {
+ self.completionHandler(error);
+ self.completionHandler = nil;
+ }
+ self.currentNavigation = nil;
+ }
+}
+
+- (void)webViewWebContentProcessDidTerminate:(WKWebView *)webView
+{
+ if (self.currentNavigation != nil) {
+ if (self.completionHandler != nil) {
+ self.completionHandler(NSError errorWithDomain:SUSparkleErrorDomain code:SUWebKitTerminationError userInfo:nil);
+ self.completionHandler = nil;
+ }
+ 
+ self.currentNavigation = nil;
+ }
+}
+
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationActionPolicy))decisionHandler
+{
+ NSURLRequest *request = navigationAction.request;
+ NSURL *requestURL = request.URL;
+ BOOL isAboutBlank = NO;
+ BOOL safeURL = SUWebViewIsSafeURL(requestURL, &isAboutBlank);
+ 
+ // Do not allow redirects to dangerous protocols such as file://
+ if (!safeURL) {
+ SULog(SULogLevelDefault, @"Blocked display of %@ URL which may be dangerous", requestURL.scheme);
+ decisionHandler(WKNavigationActionPolicyCancel);
+ } else {
+ // Ensure we're finished loading
+ if (self.completionHandler == nil) {
+ if (!isAboutBlank) {
+ NSWorkspace sharedWorkspace openURL:requestURL;
+ }
+ 
+ decisionHandler(WKNavigationActionPolicyCancel);
+ } else {
+ decisionHandler(WKNavigationActionPolicyAllow);
+ }
+ }
+}
+
+@end
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUWebView.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUWebViewCommon.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/SUWebViewCommon.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Sparkle-Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/Sparkle.h Added

@@ -0,0 +1,39 @@
+//
+// Sparkle.h
+// Sparkle
+//
+// Created by Andy Matuschak on 3/16/06. (Modified by CDHW on 23/12/07)
+// Copyright 2006 Andy Matuschak. All rights reserved.
+//
+
+#ifndef SPARKLE_H
+#define SPARKLE_H
+
+// This list should include the shared headers. It doesn't matter if some of them aren't shared (unless
+// there are name-space collisions) so we can list all of them to start with:
+
+#import <Sparkle/SUExport.h>
+#import <Sparkle/SUAppcast.h>
+#import <Sparkle/SUAppcastItem.h>
+#import <Sparkle/SUStandardVersionComparator.h>
+#import <Sparkle/SPUUpdater.h>
+#import <Sparkle/SPUUpdaterDelegate.h>
+#import <Sparkle/SPUUpdaterSettings.h>
+#import <Sparkle/SUVersionComparisonProtocol.h>
+#import <Sparkle/SUVersionDisplayProtocol.h>
+#import <Sparkle/SUErrors.h>
+#import <Sparkle/SPUUpdatePermissionRequest.h>
+#import <Sparkle/SUUpdatePermissionResponse.h>
+#import <Sparkle/SPUUserDriver.h>
+#import <Sparkle/SPUDownloadData.h>
+
+// UI bits
+#import <Sparkle/SPUStandardUpdaterController.h>
+#import <Sparkle/SPUStandardUserDriver.h>
+#import <Sparkle/SPUStandardUserDriverDelegate.h>
+
+// Deprecated bits
+#import <Sparkle/SUUpdater.h>
+#import <Sparkle/SUUpdaterDelegate.h>
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ar.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ar.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ar.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "عدم التحقق";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "هل تريد أن يتم التحقق من وجود تحديثات تلقائيًا؟";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "تضمين تقرير عن النظام دون ذكر معلومات عن المستخدم";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "التحقق تلقائيًا";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ar.lproj/Sparkle.strings Added

@@ -0,0 +1,56 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "الإصدار %2$@ هو أحدث إصدار متوفر حاليًا لتطبيق %1$@";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "تم تنزيل %@";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ من %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "تم تنزيل %1$@ %2$@ وهو جاهز للاستخدام، هل ترغب بتثبيت التحديث وإعادة تشغيل %1$@ الآن؟";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "يتوفر إصدار جديد من تطبيق %@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "الإصدار الجديد من تطبيق %@ جاهز للتثبيت";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "حال خطأ دون الحصول على معلومات حول التحديث، الرجاء المحاولة لاحقًا.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "حدث خطأ أثناء تنزيل التحديث، الرجاء المحاولة لاحقًا.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "حدث خطأ أثناء استخراج الأرشيف، الرجاء المحاولة لاحقًا.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "حدث خطأ أثناء تحليل المعلومات المزوّدَة حول التحديث.";
+
+/* No comment provided by engineer. */
+"Cancel" = "إلغاء";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "إلغاء التحديث";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "تثبيت وإعادة تشغيل التطبيق";
+
+/* No comment provided by engineer. */
+"OK" = "موافق";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "جاهز للتثبيت";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "هل ترغب في أن يتحقق %1$@ من وجود تحديثات تلقائيًا؟ يمكنك التحقق من وجود تحديثات يدويًا في أي وقت من قائمة %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "حدث خطأ أثناء التحديث";
+
+/* No comment provided by engineer. */
+"Updating %@" = "تحديث %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "انقل %1$@ إلى مجلد التطبيقات وأعد تشغيله من هناك ثم حاول مجددًا.";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ca.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ca.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ca.lproj/Sparkle.strings Added

@@ -0,0 +1,62 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%@ %@ és la versió disponible més actual.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%@ %@ és la versió disponible més actual.\n(You are currently running version %@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%@ %@ està disponible (ara teniu %@). Voleu actualitzar?";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ de %2$@";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ no es pot actualitzar quan funciona des d'un disc d'imatge.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Hi ha una nova versió de %@ disponible!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Hi ha hagut un error obtenint la informació d'actualització. Torneu a provar-ho més tard.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Hi ha hagut un error al extreure l'arxiu? Torneu a provar-ho més tard.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancel·la";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Descarregant l'actualització…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extraient l'actualització…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instal·la i reinicia";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Reinicia el programa més tard";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instal·lant l'actualització…";
+
+/* No comment provided by engineer. */
+"OK" = "D'acord";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "A punt per instal·lar";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Voleu que %1$@ comprovi si hi ha noves actualitzacions al iniciar? Si no, podeu inciar la comprovació manualment des del menú %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Error d'actualització!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Actualitzant %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Moveu %1$@ al vostre directori Aplicacions, reinicieu-lo, i torneu a provar-ho.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Ja esteu al dia!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/cs.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/cs.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/cs.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Informace z anonymního systémového profilu pomáhají vývojářům lépe plánovat budoucí vývoj aplikace.\nBudete-li mít nějaký dotaz, obraťte se na nás.\n\nToto jsou informace, které budou odeslány:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nevyhledávat";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Vyhledávat aktualizace automaticky?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Odeslat anonymní systémový profil";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Automaticky vyhledávat";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/cs.lproj/Sparkle.strings Added

@@ -0,0 +1,153 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ je nejnovější dostupná verze";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ je nejnovější dostupná verze.\n(Aktuálně používáte verzi %3$@.)";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "Verze %1$@ %2$@ je nyní k dispozici – nainstalována je %3$@. Tato aktualizace je důležitá; přejete si ji nyní stáhnout?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "Je k dispozici %1$@ %2$@ - nainstalována je %3$@. Přejete si nyní stáhnout aktualizaci?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ je nyní k dispozici – nainstalována je %3$@. Přejete si zobrazit o této aktualizaci další informace?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "staženo %@";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "Aplikace %1$@ je nyní aktualizována na verzi %2$@! ";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ je nyní aktuální!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ z %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "Aplikace %1$@ %2$@ byla stažena a je připravena k použití po příštím spuštění! Toto je důležitá aktualizace; přejete si aplikaci %1$@ nyní nainstalovat a znovu spustit?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Aplikace %1$@ %2$@ byla stažena a je připravena k použití po příštím spuštění! Přejete si aplikaci %1$@ nyní nainstalovat a znovu spustit?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ je k dispozici, ale vaše verze macOS je pro tuto aktualizaci příliš nová. Aktualizace podporuje nejvýše macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ je k dispozici, ale vaše verze macOS je pro tuto aktualizaci příliš stará. Je potřeba alespoň macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "Aplikace %1$@ nemůže být aktualizována pokud je spuštěna z umístění, ve kterém je stažena.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Aplikace %1$@ nemůže být aktualizována, protože je spuštěna z dočasného umístění nebo z umístění, na které nelze zapisovat.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Je dostupná nová verze aplikace %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Nová verze %@ je připravena k instalaci!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Při získávání údajů o aktualizaci se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "Při připojování k instalátoru se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Při stahování souboru se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Při rozbalování archivu se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "Při spouštění instalátoru se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Při zpracování údajů o aktualizaci se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "Při provádění aktualizace se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "Při spouštění instalátoru se vyskytla chyba. Zkuste to prosím později.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Důležitá aktualizace %@ je připravena k instalaci";
+
+/* No comment provided by engineer. */
+"Cancel" = "Zrušit";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Zrušit aktualizaci";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Stahuje se aktualizace…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Rozbaluje se aktualizace…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Nepodařilo se pokračovat v aktualizaci.";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Hledání aktualizací…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instalovat a znovu spustit";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Instalovat a ukončit";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instaluje se aktualizace…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Další informace…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Ukončete %1$@, spusťte %1$@ ze složky Aplikace a spusťte aktualizaci znovu.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Připraveno k instalaci";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Přejete si, aby aplikace %1$@ automaticky vyhledávala aktualizace? Tuto volbu můžete kdykoliv změnit v nabídce %1$@.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "Nepodařilo se správně spustit update checker. Kontaktujte prosím vývojáře, nahlašte tento problém a ujistěte se, že používáte nejnovější verzi.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "Tato aktualizace není správně podepsaná a nelze ji ověřit. Zkuste to prosím později nebo kontaktujte vývojáře aplikace.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Hledání aktualizací se nezdařilo";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Chyba při aktualizaci!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Aktualizace dokončena";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Aktualizuje se %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Přesuňte %1$@ do složky Aplikace a spusťte ji z tohoto umístění znovu.";
+
+/* No comment provided by engineer. */
+"Version History" = "Historie verzí";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Vaše verze je aktuální!";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "Vaše verze macOS je příliš nová";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "Vaše verze macOS je příliš stará";
+

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/da.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/da.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/da.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Søg ikke";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Søg efter opdateringer automatisk?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Vedhæft anonym systemprofil";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Søg automatisk";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/da.lproj/Sparkle.strings Added

@@ -0,0 +1,86 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ er den aktuelle version.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ er den aktuelle version.\n(Du kører lige nu version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ er tilgængelig! Du har %3$@. Skal den hentes nu?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ er tilgængelig--du har %3$@. Vil du lære mere om denne opdatering på web?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ hentet";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ af %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er hentet og klar til brug! Vil du installere og genstarte %1$@ nu?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kan ikke opdateres når det køres fra en kun læsbar enhed.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "En ny version af %@ er tilgængelig!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "En ny version af %@ er klar til installering!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Kunne ikke modtage informationer om opdateringer. Kontroller at du har forbindelse til internettet eller prøv igen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Opdateringen kunne ikke hentes. Prøv igen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Arkivet kunne ikke udpakkes. Prøv igen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "En fejl opstod under læsning af opdaterings-feed.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annuller";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Annuller opdatering";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Søger efter opdateringer…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Henter opdatering…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Udpakker arkiver…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installer og genstart";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installerer opdatering…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Læs mere…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Klar til installering";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Skal %1$@ søge efter opdateringer automatisk? Du kan altid søge efter opdateringer manuelt fra programmets menu.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Der opstod en fejl!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Opdaterer %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Flyt %1$@ til mappen Programmer, genstart derfra og prøv igen.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Der er ingen opdateringer";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/de.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/de.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/de.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Das anonymisierte Systemprofil unterstützt uns bei der zukünftigen Entwicklung. Bitte kontaktiere uns, wenn du Fragen hierzu hast.\n\nDiese Informationen würden an uns gesendet werden:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nicht suchen";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Automatisch nach Updates suchen?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Anonymisiertes Systemprofil übertragen";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Automatisch suchen";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/de.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ ist zurzeit die neueste verfügbare Version.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ ist zurzeit die neueste verfügbare Version.\n(Die derzeit installierte Version ist %3$@.)";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Dies ist ein wichtiges Update. Möchtest du die neue Version jetzt laden?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du die neue Version jetzt laden?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ist verfügbar – du verwendest Version %3$@. Möchtest du mehr über dieses Update erfahren?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ geladen";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%@ ist aktualisiert auf Version %@!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ ist aktualisiert!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ von %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Dies ist ein wichtiges Update. Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ wurde geladen und steht zur Installation bereit! Möchtest du %1$@ jetzt durch die neue Version ersetzen und neu starten?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ ist verfügbar, aber deine Version von macOS ist zu neu für dieses Update. Das Update unterstützt nur bis macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ ist verfügbar, aber deine Version von macOS ist zu alt, um das Update zu installieren. Es wird mindestens macOS %3$@ benötigt.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "„%1$@“ kann nicht aktualisiert werden, wenn das Programm von dem Ort ausgeführt wird, an den es heruntergeladen wurde.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kann nicht aktualisiert werden, da es aus dem Downloads-Order, oder von einer DMG-Datei oder einem Laufwerk ohne Schreibzugriff gestartet wurde.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Eine neue Version von %@ ist verfügbar!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Eine neue Version von %@ steht zur Installation bereit!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Beim Laden der Updateinformationen ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "Beim Verbinden mit dem Installationsprogramm ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Beim Laden des Updates ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Beim Entpacken des Archivs ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "Beim Starten des Installationsprogramms ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Beim Lesen der Updateinformationen ist ein Fehler aufgetreten.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "Beim Ausführen des Aktualisierungsprogramms ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "Beim Starten des Installationsprogramms ist ein Fehler aufgetreten. Bitte versuche es später erneut.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Ein wichtiges Update von %@ steht zur Installation bereit";
+
+/* No comment provided by engineer. */
+"Cancel" = "Abbrechen";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Aktualisierung abbrechen";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Nach Updates suchen …";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Update laden …";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Update entpacken …";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Das Fortsetzen der Installation ist fehlgeschlagen.";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installieren und neu starten";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Installieren beim Beenden";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Update installieren …";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Mehr über …";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Beende „%1$@“, bewege es in den Ordner „Programme“, starte das Programm von dort erneut und versuche es noch einmal.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Bereit zum Installieren";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Soll %1$@ automatisch nach Updates suchen? Du kannst im %1$@-Menü auch manuell nach Updates suchen.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "Das Aktualisierungsprogramm wurde nicht richtig gestartet. Du solltest den App-Entwickler kontaktieren, um diesen Fehler zu melden und zu prüfen, ob du die neueste Version hast.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "Das Update ist nicht ordnungsgemäß signiert und konnte nicht überprüft werden. Bitte versuche es später erneut oder kontaktiere den App-Entwickler.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Suche nach Updates ist fehlgeschlagen";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Fehler beim Aktualisieren!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Update installiert";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Aktualisierung von %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Kopiere %1$@ in den Programmeordner, starte es von dort aus und versuche es erneut zu aktualisieren.";
+
+/* No comment provided by engineer. */
+"Version History" = "Versionsverlauf";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Du bist auf dem neuesten Stand!";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "Deine Version von macOS ist zu neu";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "Deine Version von macOS ist zu alt";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/el.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/el.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/el.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Οι ανώνυμες πληροφορίες του προφίλ του συστήματός σας, μας βοηθούν στο σχεδιασμό της μελλοντικής ανάπτυξης του προγράμματος. Παρακαλώ επικοινωνήστε μαζί μας άν έχετε ερωτήσεις.\n\nΑυτές είναι οι πληροφορίες που θα σταλούν σε εμάς:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Κανένας έλεγχος";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Αυτόματος έλεγχος για ενημερώσεις;";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Συμπερίληψη του ανώνυμου προφίλ του συστήματός σας";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Αυτόματος Ελεγχος";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/el.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "Το %1$@ %2$@ είναι η τελευταία διαθέσιμη έκδοση.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "Το %1$@ %2$@ είναι η τελευταία διαθέσιμη έκδοση.\n(Η παρούσα εκδοσή σας είναι η %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "Το %1$@ %2$@ είναι η νέα έκδοση--έχετε την %3$@. Θέλετε να την κατεβάσετε τώρα;";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ λήφθησαν";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ από %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Το %1$@ %2$@ κατέβηκε. Είναι έτοιμο προς εγκατάσταση! Θέλετε να εγκαταστήσετε και να επανεκκινήσετε το %1$@ τώρα;";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Το %1$@ δεν μπορεί να ενημερωθεί όσο τρέχει από έναν δίσκο ανάγνωσης-μόνο ή έναν οπτικό δίσκο.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Μία νέα έκδοση του %@ είναι διαθέσιμη!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Μία νέα έκδοση του %@ είναι έτοιμη για εγκατάσταση!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Υπήρξε ένα σφάλμα κατά την ανάκτηση των πληροφοριών ενημέρωσης. Παρακαλώ δοκιμάστε αργότερα.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Υπήρξε ένα σφάλμα κατά την λήψη της ενημέρωσης. Παρακαλώ δοκιμάστε αργότερα.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Υπήρξε ένα σφάλμα κατά την εξαγωγή του αρχείου. Παρακαλώ δοκιμάστε αργότερα.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Υπήρξε ένα σφάλμα κατά την ανάλυση του feed ενημερώσεων.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Ακύρωση";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Ακύρωση Ενημέρωσης";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Έλεγχος για ενημερώσεις…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Λήψη ενημέρωσης…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Εξαγωγή ενημέρωσης…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Εγκατάσταση και Επανεκκίνηση";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Εγκατάσταση ενημέρωσης…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Έτοιμο προς Εγκατάσταση";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Θέλετε το %1$@ να ελέγχει αυτόματα για ενημερώσεις; Μπορείτε να ελέγχετε πάντα για επιθυμητές ενημερώσεις από το μενού %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Σφάλμα Ενημέρωσης!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Ενημέρωση %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Αντιγράψτε το %1$@ στον φάκελο εφαρμογών συστήματος, επανεκκινήστε το από εκεί και ξαναδοκιμάστε.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Είστε ενημερωμένοι!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/en.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/en.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/en.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,24 @@
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "176"; */
+"OhZ-1K-DmA.title" = "Check Automatically";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "177"; */
+"cCJ-V0-aTi.title" = "Don’t Check";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "178"; */
+"gmh-T4-BO0.title" = "Check for updates automatically?";
+
+/* Class = "NSTextFieldCell"; title = "DO NOT LOCALIZE"; ObjectID = "179"; */
+"179.title" = "DO NOT LOCALIZE";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "180"; */
+"gz7-LM-gNf.title" = "Include anonymous system profile";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/es.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/es.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/es.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "La información de perfil de sistema anónimo se usa para ayudarnos a planear el trabajo de desarrollo futuro. Por favor, póngase en contacto con nosotros si tiene preguntas sobre esto.\n\nEsta es la información que nos enviaría:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "No comprobar";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "¿Comprobar si hay actualizaciones automáticamente?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Incluir perfil de sistema anónimo";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Comprobar automáticamente";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/es.lproj/Sparkle.strings Added

@@ -0,0 +1,92 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ es la versión más nueva disponible.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ es la versión más nueva disponible.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ ya está disponible (tienes la %3$@). ¿Quisieras descargarla ahora?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ ya está disponible--tú tienes la %3$@. ¿Quisieras aprender más acerca de esta actualización en la red?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ descargado";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ de %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "¡%1$@ %2$@ se ha descargado y está lista para usarse! Ésta es una actualización importante. ¿Te gustaría instalarla y volver a abrir %1$@ ahora?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "¡%1$@ %2$@ se ha descargado y está lista para usarse! ¿Te gustaría instalarla y volver a abrir %1$@ ahora?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ no se puede actualizar porque fue abierta desde una ubicación temporal o de solo lectura.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "¡Una nueva versión de %@ está disponible!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "¡Una nueva versión de %@ está lista para instalarse!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Ocurrió un error al recopilar información sobre la actualización. Por favor inténtalo de nuevo más tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Ocurrió un error al descargar la actualización. Por favor inténtalo de nuevo más tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Ocurrió un error al extraer el archivo. Por favor inténtalo de nuevo más tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Ocurrió un error al analizar la información de la actualización.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Una actualización importante para %@ está lista para instalarse";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancelar";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Cancelar actualización";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Buscando actualizaciones…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Descargando actualización…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extrayendo actualización…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instalar y volver a abrir";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instalando actualización…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Más información…";
+
+/* No comment provided by engineer. */
+"OK" = "Aceptar";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Listo para instalarse";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "¿Debería %1$@ buscar actualizaciones automáticamente? Siempre puedes buscar actualizaciones manualmente desde el menú %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "¡Error de actualización!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Actualizando %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Usa Finder para copiar %1$@ a la carpeta Aplicaciones, vuélvela a abrir desde ahí e inténtalo de nuevo.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "¡Está actualizado!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fa.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fa.lproj/Sparkle.strings Added

@@ -0,0 +1,98 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ در حال حاضر جدیدترین نسخهٔ موجود است";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ در حال حاضر جدیدترین نسخه است.\n(شما در حال اجرای نسخهٔ %3$@ هستید.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ اکنون در دسترس است-- نسخهٔ شما: %3$@. اکنون می‌خواهید آن را دریافت کنید؟";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ اکنون در دسترس است-- نسخهٔ شما: %3$@. می‌خواهید در مورد آن بیشتر یاد بگیرید؟";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "دانلود شده است %@";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ از %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ بارگیری شده و آمادهٔ استفاده است! این به‌روزرسانی مهمی است، آیا اکنون مایل به نصب و بازکردن دوبارهٔ %1$@ هستید؟";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ بارگیری شده و آمادهٔ استفاده است! آیا اکنون مایل به نصب و بازکردن دوبارهٔ %1$@ هستید؟";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ نمی‌تواند به‌روزرسانی شود، اگر از محلی که در آن بارگیری شده باز شود";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ نمی‌تواند به‌روزرسانی شود، زیرا از محلی با سطح دسترسی فقط-خواندن یا موقت باز شده است";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "نسخه‌ای جدید از %@ در دسترس است";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "نسخه‌ای جدید از %@ برای نصب آماده است!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "خطایی هنگام دستیابی به اطلاعات به‌روزرسانی رخ داد. لطفاً دوباره امتحان کنید.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "خطایی در هنگام بارگیری به‌روزرسانی رخ داد. لطفاً دوباره امتحان کنید.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "خطایی در بازکردن آرشیو رخ داد. لطفاً دوباره امتحان کنید. ";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "خطایی در بررسی به‌روزرسانی رخ داد";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "یک به‌روزرسانی مهم آمادهٔ نصب است";
+
+/* No comment provided by engineer. */
+"Cancel" = "لغو";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "لغو به‌روزرسانی";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "بررسی وجود به‌روزرسانی";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "در حال بارگیری به‌روزرسانی";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "در حال بازکردن بستهٔ به‌روزرسانی";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "نصب و بازکردن دوباره";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "در حال نصب به‌روزرسانی";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "یادگیری بیشتر…";
+
+/* No comment provided by engineer. */
+"OK" = "پذیرفتن";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "از %1$@  خارج شوید آن را به پوشهٔ برنامه انتقال دهید سپس آن را دوباره باز کرده و دوباره امتحان کنید.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "آماده برای نصب";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "آیا می‌خواهید بررسی به‌روزرسانی‌ها %1$@  به صورت خودکار انجام شود؟ همیشه می‌توانید به‌روزرسانی‌های %1$@ را به صورت دستی بررسی کنید.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "خطای به‌روزرسانی!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ در حال به‌روزرسانی";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "از Finder برای کپی کردن %1$@ به پوشهٔ برنامه استفاده کنید، سپس %1$@ را دوباره باز کرده و مجدداً امتحان کنید.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "برنامهٔ شما به‌روز است";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fi.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fi.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fi.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Älä tarkista";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Tarkista päivityksiä käynnistyksen yhteydessä?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Sisällytä nimetön järjestelmäprofiili";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Tarkista automaattisesti";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fi.lproj/Sparkle.strings Added

@@ -0,0 +1,56 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ on uusin saatavilla oleva versio.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ on uusin saatavilla oleva versio.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ on nyt saatavilla (sinulla on %3$@). Haluatko ladata sen nyt?";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Uusi versio ohjelmasta  %@ on saatavilla!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Päivitystietojen haussa tapahtui virhe. Yritä myöhemmin uudelleen.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Pakkauksen purkamisen yhteydessä tapahtui virhe. Yritä myöhemmin uudelleen.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Kumoa";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Peruuta päivitykset";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Tarkistetaan päivityksiä…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Haen päivitystä…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Puran päivitystä…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Asenna ja käynnistä ohjelma uudelleen";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Asennan päivityksen…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Valmiina asentamaan";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Virhe päivityksessä!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Päivitän %@";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Sinulla on viimeisin versio!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fr.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fr.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Les informations anonymes de profil système nous aident à planifier les futurs développements. Contactez-nous pour toute question à ce sujet.\n\nCi-dessous figurent les informations qui seront transmises :";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Ne pas vérifier";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Rechercher automatiquement les mises à jour ?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Avec transmission anonyme de mon profil système";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Vérifier automatiquement";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/fr.lproj/Sparkle.strings Added

@@ -0,0 +1,101 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ est la version la plus récente disponible.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ est la version la plus récente disponible.\n(Vous utilisez actuellement la version %3$@)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ est disponible ; vous utilisez la version %3$@. Voulez-vous le télécharger maintenant ?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ est disponible ; vous utilisez la version %3$@. Voulez-vous en savoir plus sur cette mise à jour sur Internet ?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ téléchargé";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ sur %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a été téléchargé. C’est une mise à jour importante ; voulez-vous l’installer et relancer %1$@ maintenant ?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a été téléchargé. Voulez-vous l’installer et relancer %1$@ maintenant ?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ ne peut pas être mis à jour s’il est exécuté depuis le dossier dans lequel il a été téléchargé.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ ne peut pas être mis à jour quand il fonctionne à partir d’un volume en lecture seule, comme une image disque ou un lecteur optique.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Une nouvelle version de %@ est disponible !";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Une nouvelle version de %@ est prête à être installée !";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Une erreur est survenue en récupérant les informations de mise à jour. Veuillez réessayer plus tard.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Une erreur est survenue pendant le téléchargement de la mise à jour. Veuillez réessayer plus tard.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Une erreur est survenue pendant l’extraction des données de l’archive. Veuillez réessayer plus tard.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Une erreur est survenue pendant l’analyse de la mise à jour.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Une mise à jour importante de %@ est prête à être installée";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annuler";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Annuler la mise à jour";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Recherche de mises à jour…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Téléchargement de la mise à jour…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extraction de la mise à jour…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installer et relancer";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installation de la mise à jour…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "En savoir plus…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Quittez %1$@ et déplacez-le dans le dossier Applications, relancez-le à partir de ce dossier et essayez à nouveau.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Prêt pour l’installation";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ doit-il rechercher automatiquement les mises à jour ? La mise à jour est toujours possible manuellement depuis le menu %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Erreur pendant la mise à jour !";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Mise à jour de %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Déplacez %1$@ dans votre dossier Applications, relancez-le à partir de là et réessayez.";
+
+/* No comment provided by engineer. */
+"Version History" = "Historique des versions";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Votre logiciel est à jour !";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/he.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/he.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/he.lproj/Sparkle.strings Added

@@ -0,0 +1,53 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ היא הגרסה האחונה הזמינה.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ היא הגרסה האחונה הזמינה.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ זמין כעת (לך יש %3$@). ברצונך להוריד כעת?";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "גרסה חדשה של %@ זמינה!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "שגיאה בקבלת מידע על עדכונים. אנא נסה שנית במועד מאוחר יותר.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "שגיאה בפתיחת הקובת המקווץ. אנא נסה שנית במועד מאוחר יותר.";
+
+/* No comment provided by engineer. */
+"Cancel" = "ביטול";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "בטל עדכון";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "מוריד עדכון…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "פותח עדכון…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "התקן ואתחל";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "אתחל מאוחר יותר";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "מתקין עידכון…";
+
+/* No comment provided by engineer. */
+"OK" = "אישור";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "מוכן להתקנה!";
+
+/* No comment provided by engineer. */
+"Update Error!" = "שגיאה בעדכון!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "מעדכן %@";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "התכנה עדכנית!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hr.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hr.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonimizirani podaci profila susatava pomažu nam planirati budući razvoj. Kontaktiraj nas, ako imaš pitanja o tome.\n\nŠalju se sljedeći podaci:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nemoj provjeravati";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Automatski provjeriti nadogradnje?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Uključi anonimizirane podatke o profilu sustava";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Provjeri automatski";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hr.lproj/Sparkle.strings Added

@@ -0,0 +1,92 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ je trenutačno najnovija dostupna verzija.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ je trenutačno najnovija dostupna verzija.\n(Trenutačno pokrećeš verziju %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ je sada dostupna. Ti koristiš verziju %3$@. Želiš li je sada preuzeti?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ je sada dostupna. Ti koristiš verziju %3$@. Želiš li saznati više o ovoj nadogradnji na našim web-stranicama?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ preuzeto";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ od %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ je preuzeta i spremna za upotrebu! Ovo je važna nadogradnja. Želiš li je sada instalirati, te ponovo pokrenuti %1$@?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ je preuzeta i spremna za upotrebu! Želiš li je sada instalirati, te ponovo pokrenuti %1$@?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ nije moguće aktualizirati, jer je pokrenuta s lokacije bez korisničkih prava pisanja, npr. dmg.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Dostupna je nova verzija za %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Nova verzija za %@ je spremna za instaliranje!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Dogodila se greška u dohvaćanju informacija o nadogradnji. Pokušaj kasnije ponovo.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Dogodila se greška prilikom preuzimanja nadogradnje. Pokušaj kasnije ponovo.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Dogodila se greška prilikom raspakiranja arhive. Pokušaj kasnije ponovo.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Dogodila se greška prilikom obrađivanja nadogradnje.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Važna nadogradnja za %@ je spremna za instaliranje";
+
+/* No comment provided by engineer. */
+"Cancel" = "Odustani";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Prekini aktualiziranje";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Provjera nadogradnji …";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Preuzimanje nadogradnje …";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Raspakiravanje nadogradnje …";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instaliraj i ponovo pokreni";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instaliranje nadogradnje …";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Saznaj više …";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Spremno za instaliranje";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Želiš li da %1$@ automatski provjerava nadogradnje? Nadogradnje možeš i ručno provjeriti u %1$@ izborniku.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Greška prilikom aktualiziranja!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ se aktualizira";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Kopiraj %1$@ u mapu Aplikacije, pokreni je odande i pokušaj ponovo.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Koristiš najnoviju verziju!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hu.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hu.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hu.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Manuális keresés";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Keresse automatikusan a frissítéseket?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Anonim rendszerinformáció küldése";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Automatikus keresés";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/hu.lproj/Sparkle.strings Added

@@ -0,0 +1,62 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "A %1$@ %2$@ a jelenleg elérhető legfrissebb verzió.";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ letöltve";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "A %1$@ %2$@ verziója letöltődött és készen áll a telepítésre! Ez egy fontos frissítés; szeretné most telepíteni, majd újraindítani a %1$@ alkalmazást?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "A %1$@ %2$@ verziója letöltődött és készen áll a telepítésre! Szeretné most telepíteni, majd újraindítani a %1$@ alkalmazást?";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "A %@ egy újabb verziója elérhető!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "A %@ egy újabb verziója készen áll a telepítésre!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Hiba történt a frissítések lekérdezésekor. Kérjük, próbálja újra később.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Hiba történt a frissítés letöltése közben. Kérjük, próbálja újra később.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Hiba történt a frissítés kicsomagolása közben. Kérjük, próbálja újra később.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Hiba történt az elérhető frissítések beolvasásakor.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "A %@ egy fontos frissítése készen áll a telepítésre";
+
+/* No comment provided by engineer. */
+"Cancel" = "Mégsem";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Frissítés megszakítása";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Telepítés és újraindítás";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "A telepítő készen áll";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Szeretné, hogy a %1$@ ellenőrizze az elérhető frissítéseket induláskor? Ha nem, a frissítések keresését kézzel is elindíthatja a %1$@ menüből.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Frissítési hiba!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ frissítése";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Mozgassa a %1$@ alkalmazást az Alkalmazások mappába, indítsa újra onnan, majd próbálja újra a frissítést.";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/is.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/is.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/is.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Upplýsingar úr nafnlausum kerfisskýrslum eru notaðar til að hjálpa okkur við framtíðarþróun hugbúnaðarins. Ekki hika við að hafa samband ef spurningar vakna um þetta.\n\nÞetta eru upplýsingarnar sem yrðu sendar:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Ekki kanna";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Athuga sjálfkrafa með uppfærslur?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Innifela nafnlausa kerfisskýrslu";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Kanna sjálfkrafa";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/is.lproj/Sparkle.strings Added

@@ -0,0 +1,53 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%@ %@ er nýjasta útgáfan sem er fáanleg þessa stundina.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%@ %@ er nýjasta útgáfan sem er fáanleg þessa stundina.\n(You are currently running version %@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "Útgafa %2$@ af %1$@ er nú fáanlegt en þú ert með %3$@. Viltu sækja hana núna?";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%@ af %@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Ný útgáfa af %@ er fáanleg!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Villa kom upp við að sækja uppfærsluupplýsingar. Vinsamlegast reynið síðar.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Villa kom upp við afþjöppun skráarsafns. Vinsamlegast reynið síðar.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Hætta við";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Sækja nýja útgáfu…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Afþjappa uppfærslu…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Setja upp og ræsa aftur";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Set inn uppfærslu…";
+
+/* No comment provided by engineer. */
+"OK" = "Í lagi";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Innsetning reiðubúin";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Viltu að forritið %1$@ athugi með uppfærslur þegar það er ræst? Ef ekki getur þú athugað handvirkt af %1$@-valblaðinu.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Villa við uppfærslu!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Uppfæri %@";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Það er allt uppfært hjá þér!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/it.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/it.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/it.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Le informazioni del profilo di sistema anomino sono utilizzate per aiutarci in futuri lavori di sviluppo. Contattaci se hai dei quesiti sull’argomento.\n\nQueste sono le informazioni che verrebbero inviate:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Non controllare";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Controllo automaticamente gli aggiornamenti?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Include profilo di sistema anonimo";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Controlla Automaticamente";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/it.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ è stato scaricato ed è pronto per essere utilizzato! Questo è un aggiornamento importante; desideri installare e riavviare %1$@ ora?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ è stato scaricato ed è pronto per essere utilizzato! Desideri installare e riavviare %1$@ ora?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ è disponibile ma la tua versione di macOS è troppo recente per questo aggiornamento. Questo aggiornamento supporta solo fino a macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ è disponibile ma la tua versione di macOS è troppo vecchia per installarla. È richiesto almeno macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ non può essere aggiornata se è in esecuzione dalla posizione in cui è stato scaricata.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ non può essere aggiornata perché è stata aperta da una posizione di sola lettura o temporanea.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ è la versione più recente attualmente disponibile.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ è la versione più recente attualmente disponibile.\n(Attualmente stai utilizzando la versione %3$@)";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ è disponibile; disponi della versione %3$@. Questo è un aggiornamento importante; desideri eseguire l’aggiornamento ora?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ è disponibile; disponi della versione %3$@. Desideri eseguire l’aggiornamento ora?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ è disponibile; disponi della versione %3$@. Desideri ulteriori informazioni su questo aggiornamento sul web?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ scaricato";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%1$@ ora è aggiornata alla versione %2$@!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ ora è aggiornata!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ di %2$@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "È disponibile una nuova versione di %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Una nuova versione di %@ è pronta per essere installata!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Si è verificato un errore durante il recupero delle informazioni sull’aggiornamento. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "Si è verificato un errore durante la connessione al programma di installazione. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Si è verificato un errore durante lo scaricamento dell’aggiornamento. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Si è verificato un errore durante l’estrazione dell’archivio. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "Si è verificato un errore durante l’avvio del programma di installazione. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Si è verificato un errore durante la lettura del feed di aggiornamento.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "Si è verificato un errore durante l’esecuzione del programma di aggiornamento. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "Si è verificato un errore durante l’avvio del programma di installazione. Riprova in seguito.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Un importante aggiornamento di %@ è pronto per l’installazione";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annulla";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Annulla Aggiornamento";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Controllo aggiornamenti in corso…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Scaricamento dell’aggiornamento…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Estrazione dell’aggiornamento…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Impossibile riprendere l’installazione dell’aggiornamento.";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installa e Riavvia";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Installa all’uscita";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installazione aggiornamento in corso…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Ulteriori informazioni…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Esci da %1$@, spostala nella Cartella Applicazioni, riavviala da lì e riprova.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pronto per l’installazione";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Desideri che %1$@ verifichi gli aggiornamenti automaticamente? Puoi effettuare la verifica manualmente dal menu di %1$@.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "Il controllo degli aggiornamenti non è stato avviato correttamente. È necessario contattare lo sviluppatore dell’app per segnalare questo problema e verificare di disporre della versione più recente.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "L’aggiornamento è firmato in modo errato e non può essere convalidato. Riprova in seguito o contatta lo sviluppatore dell’app.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Impossibile controllare gli aggiornamenti";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Errore di Aggiornamento!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Aggiornamento installato";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Aggiornamento di %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Spostare %1$@ nella Cartella Applicazioni, riavviarla e riprovare.";
+
+/* No comment provided by engineer. */
+"Version History" = "Cronologia versioni";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "La tua versione di macOS è troppo recente";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "La tua versione di macOS è troppo vecchia";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "La tua applicazione è aggiornata!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ja.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ja.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ja.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "匿名のシステムプロファイル情報は、今後の開発の参考にさせていただきます。この件に関してご質問があればご連絡下さい。\n\n以下の情報が送信されます:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "確認しない";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "アップデートを自動で確認しますか?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "匿名のシステム情報を含める";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "自動で確認";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ja.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@は現在入手できる最新バージョンです。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@は現在入手できる最新バージョンです。\n（現在使用中のバージョンは%3$@です。）";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@が入手できます（使用中のバージョンは%3$@です）。これは重要なアップデートです。今すぐダウンロードしますか?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@が入手できます（使用中のバージョンは%3$@です）。今すぐダウンロードしますか?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@が入手できます（使用中のバージョンは%3$@です）。このアップデートの詳しい情報をWebで確認しますか?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ダウンロード済み";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%@はバージョン%@にアップデートされました!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@はアップデートされました!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@/%2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@がダウンロードされました! これは重要なアップデートです。今すぐ%1$@をインストールして再起動しますか?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@がダウンロードされました! 今すぐ %1$@ をインストールして再起動しますか?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@が入手可能ですが、インストールするにはmacOSのバージョンが新しすぎます。このアップデートはmacOS %3$@までしか対応していません。";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@が入手可能ですが、インストールするにはmacOSのバージョンが古すぎます。macOS %3$@以降が必要です。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "この場所ではダウンロードされたアップデータを%1$@に適用できません。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@は読み出し専用またはテンポラリな場所で開かれているためアップデートできません。";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "新しいバージョンの%@が入手できます!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "新しいバージョンの%@が今すぐインストールできます!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "アップデート情報の取得中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "インストーラに接続中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "アップデートをダウンロード中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "アーカイブの展開中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "インストーラを起動中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "アップデートフィードを解析中にエラーが発生しました。";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "アップデータを実行中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "インストーラを始動中にエラーが発生しました。あとでやり直してください。";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "%@の重要なアップデートがインストールできます。";
+
+/* No comment provided by engineer. */
+"Cancel" = "キャンセル";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "アップデートを中止";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "アップデートを確認しています…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "アップデートをダウンロードしています…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "アップデートを展開しています…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "アップデートのインストール再開に失敗しました。";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "インストールして再起動";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "終了時にインストール";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "アップデートをインストールしています…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "詳しい情報…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "%1$@を終了させ、アプリケーションフォルダに移動の上再度お試しください。";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "インストールできます";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = " %1$@のアップデートを自動で確認しますか? アップデートは%1$@メニューから手動でいつでも確認することができます。";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "アップデートチェッカーが正しくスタートできませんでした。アプリケーション開発者に連絡をしてこの不具合を報告し、最新バージョンであることを確認してください。";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "アップデートの署名が不適切で認証できませんでした。あとでやり直すかアプリケーション開発者に連絡してください。";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "アップデートを確認できませんでした";
+
+/* No comment provided by engineer. */
+"Update Error!" = "アップデートエラー!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "アップデートがインストールされました";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@をアップデート中";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@をアプリケーションフォルダに移動し、そこから再起動したあとやり直してください。";
+
+/* No comment provided by engineer. */
+"Version History" = "バージョン履歴";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "このmacOSのバージョンは新しすぎます";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "このmacOSのバージョンは古すぎます";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "最新版を使用しています!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ko.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ko.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ko.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "익명으로 보내지는 시스템 정보로 차후 프로그램 개발에 도움이 될 수 있습니다. 질문이 있으시면 연락 주십시오.\n\n아래 정보가 전송될 것입니다.";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "취소";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "자동으로 업데이트 확인할까요?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "익명 시스템 정보 포함";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "자동으로 확인";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ko.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@이(가) 현재 최신 버전입니다.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@이(가) 현재 최신 버전입니다.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@이(가) 업데이트 되었습니다. (현재 버전 : %3$@) 다운로드 하시겠습니까?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ 다운로드 완료";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@이(가) 다운로드 되었습니다. 프로그램을 업데이트하고 재실행 하시겠습니까?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@이(가) 디스크 이미지나 CD 드라이브 같은 읽기 전용 볼륨에서 실행되고 있으므로 업데이트 할 수 없습니다.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "%@ 새 버전이 있습니다.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "%@ 새 버전을 설치할 준비가 되었습니다.";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "업데이트 정보를 수집하는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "업데이트를 다운로드 하는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "압축 파일을 푸는 중 오류가 발생하였습니다. 나중에 다시 시도해 주십시오.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "업데이트 피드를 분석하는 중 오류가 발생하였습니다.";
+
+/* No comment provided by engineer. */
+"Cancel" = "취소";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "업데이트 취소";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "업데이트 확인 중…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "다운로드 중…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "압축 푸는 중…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "설치 & 재실행";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "설치 중…";
+
+/* No comment provided by engineer. */
+"OK" = "확인";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "설치 준비 완료";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 업데이트 확인을 자동으로 할까요? %1$@ 메뉴에서 수동 설정을 할 수 있습니다.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "업데이트 오류!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ 업데이트 중";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@을(를) 응용프로그램 폴더로 이동하여 다시 실행해 주십시오.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "최신 버전입니다.";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nb.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nb.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nb.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,21 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Den anonyme systemprofilen hjelper oss med å planlegge fremtidig utviklingsarbeid. Ta gjerne kontakt med oss hvis du har spørsmål om dette. \nFølgende innhold vil bli sendt:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Ikke søk";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Søk etter oppdateringer automatisk?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Inkluder anonym systemprofil";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Søk automatisk";
+

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nb.lproj/Sparkle.strings Added

@@ -0,0 +1,90 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ er nyeste versjon.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ er nyeste versjon.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ er nå tilgjengelig—du har %3$@. Ønsker du å laste ned og installere nå?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ lastet ned";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ av %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@  er lastet ned og er klar til bruk!  Dette er en viktig oppdatering; ønsker du å installere og restarte %1$@ nå?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ er lastet ned og er klar til bruk! Ønsker du å installere og restarte %1$@ nå?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kan ikke oppdateres fra en 'bare lesbar' enhet som f.eks. en cd";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "En ny versjon av %@ er tilgjengelig!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "En ny versjon av %@ er klar for installering!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "En feil oppstod ved henting av oppdateringsinformasjon. Vennligst prøv igjen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "En feil oppstod under nedlasting av oppdateringen. Vennligst prøv igjen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "En feil oppstod under utpakking av oppdateringen. Vennligst prøv igjen senere.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "En feil oppstod under lesing av oppdateringsstrømmen.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "En viktig oppdatering for %@ er klar til å installeres";
+
+/* No comment provided by engineer. */
+"Cancel" = "Avbryt";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Avbryt oppdateringen";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Søker etter oppdateringer…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Laster ned oppdateringen…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Pakker ut oppdateringen…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installer og start på ny";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installerer oppdateringen…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Mer info…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Klar til å installere";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Skal %1$@ søke automatisk etter oppdateringer? Du kan når som helst søke manuelt fra %1$@-menyen.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Feil ved oppdateringen!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Oppdaterer %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Flytt %1$@ til Programmer-katalogen, start på ny og prøv igjen.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Ingen nye oppdateringer";
+

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nl.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nl.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,14 @@
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Aan de hand van anonieme informatie over het systeemprofiel kunnen wij toekomstige ontwikkelingswerkzaamheden beter plannen. Neem contact met ons op als je hierover vragen hebt.\n\nDit is de informatie die wordt verzonden:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Zoek niet";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Automatisch zoeken naar updates?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Voeg anoniem systeemprofiel bij";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Zoek automatisch";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/nl.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ is momenteel de nieuwste versie.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ is momenteel de nieuwste versie.\n(Je gebruikt op dit moment versie %3$@.)";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ is nu beschikbaar – je hebt %3$@. Dit is een belangrijke update. Wil je deze nu downloaden?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ is nu beschikbaar – je hebt %3$@. Wil je de update nu downloaden?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ is nu beschikbaar – je hebt %3$@. Wil je een webpagina openen met meer informatie?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ gedownload";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%@ is nu bijgewerkt naar versie %@!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ is nu bijgewerkt!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ van %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ is gedownload en klaar om te installeren! Dit is een belangrijke update. Wil je deze nu installeren en %1$@ herstarten?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ is gedownload en klaar om te installeren! Wil je deze nu installeren en %1$@ herstarten?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ is beschikbaar, maar je versie van macOS is te nieuw voor deze update. De update kan alleen worden gebruikt tot macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ is beschikbaar, maar je versie van macOS is te oud om deze te installeren. Ten minste macOS %3$@ is vereist.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ kan niet worden bijgewerkt als het is geopend vanuit de downloadlocatie.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ kan niet worden bijgewerkt, omdat het vanuit een alleen-lezen- of tijdelijke locatie is geopend.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Een nieuwe versie van %@ is beschikbaar!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Een nieuwe versie van %@ is klaar om te installeren!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Er heeft zich een fout voorgedaan bij het ophalen van update-informatie. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "Er heeft zich een fout voorgedaan bij het verbinden met het installatieprogramma. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Er heeft zich een fout voorgedaan bij het downloaden van de update. Probeer het later opnieuw";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Er heeft zich een fout voorgedaan bij het uitpakken van het archief. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "Er heeft zich een fout voorgedaan bij het starten van het installatieprogramma. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Er heeft zich een fout voorgedaan bij het verwerken van de update-informatie.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "Er heeft zich een fout voorgedaan bij het uitvoeren van het bijwerkprogramma. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "Er heeft zich een fout voorgedaan bij het starten van het installatieprogramma. Probeer het later opnieuw.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Een belangrijke update voor %@ is klaar om te installeren";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annuleer";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Annuleer update";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Naar updates zoeken…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Update downloaden…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Update uitpakken…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Het hervatten van de update-installatie is mislukt.";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installeer en herstart";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Installeer bij het stoppen";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Update installeren…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Meer informatie…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Stop %1$@, verplaats het naar de map 'Apps', herstart het van daaruit en probeer opnieuw.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Klaar om te installeren";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Wil je dat %1$@ automatisch naar updates zoekt? Je kunt altijd nog handmatig zoeken naar updates via het %1$@-menu.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "De updatezoeker is niet goed gestart. Je kunt wellicht met de app-ontwikkelaar contact opnemen om de fout te melden en te controleren dat je de nieuwste versie hebt.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "De update is onjuist gesigneerd en kan niet worden gecontroleerd. Probeer het later opnieuw of neem contact op met de app-ontwikkelaar.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Zoeken naar updates mislukt";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Fout bij het bijwerken!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Update geïnstalleerd";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ bijwerken…";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Gebruik Finder om %1$@ naar de map 'Apps' te kopiëren, herstart het van daaruit en probeer opnieuw.";
+
+/* No comment provided by engineer. */
+"Version History" = "Versiegeschiedenis";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Je hebt de nieuwste versie!";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "Je versie van macOS is te nieuw";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "Je versie van macOS is te oud";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pl.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pl.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nie sprawdzaj";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Sprawdzać automatycznie uaktualnienia?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Załącz anonimowe informacje o systemie";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Sprawdzaj automatycznie";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pl.lproj/Sparkle.strings Added

@@ -0,0 +1,83 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ jest najnowszą dostępną wersją.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ jest najnowszą dostępną wersją.\n(aktualnie posiadasz %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ jest już dostępny (aktualnie posiadasz %3$@). Czy chcesz go teraz pobrać?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ jest już dostępny (aktualnie posiadasz %3$@). Czy chcesz otworzyć stronę z informacjami o tym uaktualnieniu?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "Pobrano %@";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ z %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ został pobrany i jest gotowy do użycia! Czy chcesz teraz zainstalować i ponownie uruchomić %1$@?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ nie może zostać uaktualniony, ponieważ został uruchomiony z folderu tymczasowego lub tylko do odczytu.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Dostępna jest nowa wersja %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Nowa wersja %@ gotowa do zainstalowania!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Błąd podczas pobierania informacji o uaktualnieniach. Spróbuj ponownie później.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Błąd podczas pobierania uaktualnienia. Spróbuj ponownie później.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Błąd podczas rozpakowywania archiwum. Spróbuj ponownie później";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Błąd podczas wczytywania danych o uaktualnieniu.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Anuluj";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Anuluj uaktualnianie";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Sprawdzam uaktualnienia…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Pobieram uaktualnienie…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Rozpakowuję uaktualnienie…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Zainstaluj i uruchom ponownie";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instalowanie uaktualnienia…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Gotowy do instalacji";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Czy %1$@ ma automatycznie sprawdzać uaktualnienia? Zawsze możesz ręcznie sprawdzać z menu %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Błąd uaktualniania!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Uaktualniam %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Użyj Findera, aby skopiować %1$@ do folderu Programy, uruchom z nowej lokacji i spróbuj ponownie.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Jesteś na bieżąco!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-BR.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-BR.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-BR.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,23 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "As informações anônimas do sistema são usadas para nos ajudar a planejar o desenvolvimento futuro do aplicativo. Contate-nos caso tenha dúvidas sobre este procedimento.\n\nAs seguintes informações seriam enviadas:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Não Buscar";
+
+/* Class = "NSTextFieldCell"; title = "DO NOT LOCALIZE"; ObjectID = "cfa-j0-Ya4"; */
+"cfa-j0-Ya4.title" = "";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Buscar atualizações automaticamente?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Incluir perfil anônimo do sistema";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Buscar Automaticamente";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-BR.lproj/Sparkle.strings Added

@@ -0,0 +1,149 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ é a versão mais recente disponível.";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "O app %1$@ %2$@ está disponível — sua versão é %3$@. Esta é uma atualização importante. Deseja baixá-la agora?";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "O app %1$@ %2$@ está disponível — sua versão é %3$@. Deseja baixá-lo agora?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "O app %1$@ %2$@ está disponível — sua versão é %3$@. Deseja saber mais sobre esta atualização na web?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ baixados";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "O app %@ foi atualizado para a versão %@!";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "O app %@ foi atualizado!";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ de %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "O app %1$@ %2$@ foi baixado e está pronto para uso! Esta é uma atualização importante; deseja instalar e reabrir o app %1$@ agora?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "O app %1$@ %2$@ foi baixado e está pronto para uso! Deseja instalar e reabrir o app %1$@ agora?";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "O app %1$@ %2$@ está disponível, mas a versão do macOS é nova demais para esta atualização, que oferece compatibilidade até o macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "O app %1$@ %2$@ está disponível, mas a versão do macOS é antiga demais para instalá-lo. Você deve ter, no mínimo, o macOS %3$@.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "O app %1$@ não pode ser atualizado se ele estiver aberto do local onde foi baixado.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "O app %1$@ não pode ser atualizado porque foi aberto de um volume somente leitura ou local temporário.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Uma nova versão do app %@ está disponível!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Uma nova versão do app %@ está pronta para ser instalada!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Ocorreu um erro ao obter informações de atualização. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "Ocorreu um erro ao conectar-se ao instalador. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Ocorreu um erro ao baixar a atualização. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Ocorreu um erro ao extrair o arquivo comprimido. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "Ocorreu um erro ao abrir o instalador. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Ocorreu um erro ao analisar o feed de atualização.";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "Ocorreu um erro ao abrir o atualizador. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "Ocorreu um erro ao iniciar o instalador. Tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "Uma atualização importante do app %@ está pronta para ser instalada";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancelar";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Cancelar Atualização";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Buscando atualizações…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Baixando atualização…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extraindo atualização…";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "Falha ao retomar a instalação da atualização.";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instalar e Reabrir";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "Instalar ao Encerrar";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instalando atualização…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Saber Mais…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Encerre o app %1$@, mova-o para a pasta Aplicativos, reabra-o e tente novamente.";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pronto para Instalar";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Deseja que o app %1$@ busque atualizações automaticamente? Você também pode buscar atualizações manualmente no menu %1$@.";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "Houve uma falha ao iniciar a busca de atualizações. Contate o desenvolvedor do app para comunicar esse problema e verifique se você tem a versão mais recente.";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "A atualização foi assinada incorretamente e não pôde ser validada. Tente novamente mais tarde ou contate o desenvolvedor do app.";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "Não Foi Possível Buscar Atualizações";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Erro de atualização!";
+
+/* No comment provided by engineer. */
+"Update Installed" = "Atualização Instalada";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Atualizando o app %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Use o Finder para copiar o app %1$@ para a pasta Aplicativos, reabra-o e tente novamente.";
+
+/* No comment provided by engineer. */
+"Version History" = "Histórico de Versões";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "O app está atualizado!";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "A versão do macOS é nova demais";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "A versão do macOS é antiga demais";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-PT.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-PT.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-PT.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "A informação anónima do perfil de sistema é usada para no futuro nos ajudar a planear o trabalho de desenvolvimento. Por favor contacte-nos se tiver alguma questão acerca deste assunto.\n\nEsta é a informação que seria enviada:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Não procurar";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Procurar actualizações automaticamente?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Incluir perfil de sistema anónimo";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Procurar automaticamente";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/pt-PT.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "O %1$@ %2$@ é neste momento a versão mais recente disponível.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "O %1$@ %2$@ é neste momento a versão mais recente disponível.\n(Neste momento está na versão %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "O %1$@ %2$@ está agora disponível e tem a versão %3$@. Gostaria de o transferir agora?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ transferido";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ de %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "O %1$@ %2$@ foi transferido e está pronto a instalar! Gostaria de o fazer agora e reiniciar o %1$@ posteriormente?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "O %1$@ não pode ser actualizado quando estiver a ser executado a partir de um volume apenas de leitura como uma imagem de disco ou disco óptico.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Uma nova versão do %@ está dísponível!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Uma nova versão do %@ está pronta a instalar!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Ocorreu um erro ao recolher informação sobre as actualizações disponíveis. Por favor tente novamente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Ocorreu um erro ao transferir a actualização. Por favor novamente tente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Ocorreu um erro ao extrair o arquivo. Por favor novamente tente mais tarde.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Ocorrer um erro ao processar o feed de actualização.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancelar";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Cancelar actualização";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "A procurar actualizações…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "A transferir actualização…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "A extrair actualização…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instalar e reiniciar";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "A instalar actualização…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pronto para instalar";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Deverá o %1$@ procurar por actualizações automaticamente? Pode sempre procurar actualizações manualmente a partir do menu do %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Erro na actualização!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "A actualizar o %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Use o Finder para copiar o %1$@ para a sua pasta Aplicações, reinicie-o aí e tente novamente.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Está actualizado!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ro.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ro.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ro.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nu verifica";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Verifică pentru actualizări în mod automat?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Include profil anomin de sistem";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Verifică în mod automat";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ro.lproj/Sparkle.strings Added

@@ -0,0 +1,89 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ este cea ultima versiune disponibilă.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ este cea ultima versiune disponibilă.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ este disponibilă—tu ai %3$@. Dorești să o descărcarci acum?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ descărcat";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ din %2$@";
+
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a fost descărcată și este gata de utilizare! Aceasta este o actualizare importantă; dorești să o instalezi și să relansați %1$@ acum?";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ a fost descărcată și este gata de utilizare! Dorești să o instalezi și să relansați %1$@ acum?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ nu poate fi actualizată atunci când a fost pornită de pe un volum read-only ca o imagine disc sau o unitate optică.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "O nouă versiune pentru %@ este disponibilă!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "O nouă versiune pentru %@ este gata de instalare!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "A apărut o eroare în timpul preluari informaţiilor pentru actualizare. Te rog încercă din nou mai târziu.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "A apărut o eroare în timp ce se descărca actualizărea. Te rog încercă din nou mai târziu.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "A apărut o eroare în timpul dezarhivării. Te rog încercă din nou mai târziu.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "A apărut o eroare în timpul citiri feed-ului de actualizare.";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "O actualizare importantă pentru %@ este gata pentru a fi instalată";
+
+/* No comment provided by engineer. */
+"Cancel" = "Anulează";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Anulează actualizarea";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Verifică de actualizări…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Descarcă actualizarea…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Dezarhivează actualizarea…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Instalează și Redeschide";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Instalează actualizarea…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Află mai multe…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pregatit pentru a instala";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ ar trebui ca să caute în mod automat pentru actualizări? Puteți verifica mereu pentru actualizări din meniul %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Eroare Actualizare!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Actualizează %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Mută %1$@ în directorul Aplicații, repornește-o de acolo și încearcă din nou.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Ai ultima versiune!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ru.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ru.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ru.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Использование анонимного профиля системы помогает нам в планировании будущей работы по разработке. Если у вас есть какие-либо вопросы по этой теме, обращайтесь к нам.\n\nЭто информация, предназначенная для отправления:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Не проверять";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Выполнять автоматическую проверку наличия обновлений?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Включить анонимный профиль системы";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Проверять автоматически";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/ru.lproj/Sparkle.strings Added

@@ -0,0 +1,83 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "В настоящий момент %1$@ %2$@ является новейшей версией.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "В настоящий момент %1$@ %2$@ является новейшей версией.\n(У вас установлена %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ теперь доступен – у вас установлен %3$@. Хотите загрузить его сейчас?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ загружено";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ из %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ загружен и готов к использованию! Хотите установить и перезапустить %1$@?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Не удаётся обновить %1$@ с тома, предназначенного только для чтения.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Имеется новая версия %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Новая версия %@ готова к установке!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Произошла ошибка при извлечении информации обновления. Повторите попытку позже.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Произошла ошибка при загрузке обновления. Повторите попытку позже.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Произошла ошибка при извлечении архива. Повторите попытку позже.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Произошла ошибка при извлечении канала обновления.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Отменить";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Отменить обновление";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Проверяю наличие обновлений…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Загружаю обновление…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Извлекаю обновление…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Установить и перезапустить";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Устанавливаю обновление…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Узнать больше…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Готов к установке";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Должен ли %1$@ выполнять автоматическую проверку обновлений? Вы всегда можете выполнять проверку обновлений вручную в меню %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Ошибка при обновлении!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Обновляю %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Переместите %1$@ в Папку приложений, перезапустите его оттуда и повторите попытку.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "У вас все обновлено!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sk.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sk.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sk.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonymný profil systému nám umožní zlepšiť plánovanie budúceho vývoja aplikácie. Ak máte ohľadom tohto akékoľvek otázky, neváhajte a kontaktujte nás.\n\nOdosielané budú nasledujúce informácie:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Nekontrolovať";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Kontrolovať aktualizácie automaticky?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Zahrnúť anonymný profil systému";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Kontrolovať automaticky";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sk.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@\nje najnovšia dostupná verzia.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@\nje najnovšia dostupná verzia.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "Je dostupná aplikácia %1$@ %2$@ — máte %3$@. Chcete ju prevziať teraz?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ prevzaté";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ z %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Aplikácia %1$@ %2$@ bola prevzatá a je pripravená na použitie! Chcete teraz nainštalovať a následne znovu spustiť %1$@?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Aplikáciu %1$@ nemožno aktualizovať, ak je spustená zo zväzku s právami len na čítanie (napríklad z obrazu disku alebo optického disku).";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Je dostupná nová verzia aplikácie %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Nová verzia aplikácie %@ je pripravená na inštaláciu!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Pri získavaní informácie o aktualizácii sa vyskytla chyba. Skúste neskôr.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Pri preberaní aktualizácie sa vyskytla chyba. Skúste neskôr.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Pri rozbaľovaní archívu sa vyskytla chyba. Skúste neskôr.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Pri analyzovaní aktualizácie sa vyskytla chyba.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Zrušiť";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Zrušiť aktualizáciu";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Kontrolujú sa aktualizácie…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Preberá sa aktualizácia…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Rozbaľuje sa aktualizácia…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Inštalovať a znovu spustiť";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Inštaluje sa aktualizácia…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pripravené na inštaláciu";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Môže %1$@ automaticky kontrolovať aktualizácie? Kedykoľvek ich môžete z ponuky %1$@ skontrolovať aj manuálne.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Chyba aktualizácie!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Aktualizuje sa %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Presuňte aplikáciu %1$@ do priečinka Applications, spustite ju odtiaľ a potom znova skúste aktualizáciu.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Máte aktuálnu verziu!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sl.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sl.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonimni profil sistema se uporablja za načrtovanje nadaljnega razvoja programa. V primeru vprašanj nas lahko kontaktirate.\n\nPošljejo se sledeče informacije:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Ne preverjaj";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Naj občasno preverjam, če so na voljo posodobitve?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Vključi anonimni profil sistema";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Samodejno preverjaj";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sl.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ je najnovejša verzija programa.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ je najnovejša verzija programa.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "Na voljo je %1$@ %2$@ — vi imate %3$@. Ga želite prenesti s spleta sedaj?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "prenešenih je %@";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ od %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ je bil uspešno prenešen s spleta in je pripravljen na namestitev. Ga želite namestiti in ponovno zagnati takoj?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Programa %1$@ ni mogoče posodobiti, ker ga poganjate iz lokacije, kamor pisanje ni dovoljeno (pogosto je to slika diska dmg ali optična enota).";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Na voljo je nova verzija programa %@.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Najnovejša verzija programa %@ je že nameščena.";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Med iskanjem posodobitev je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Med prenašanje posodobitve s spleta je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Med odpiranjem arhiva je prišlo do napake. Prosimo poskusite ponovno čez nekaj časa.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Napaka pri interpretaciji RSS vira s posodobitvami.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Prekliči";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Prekliči posodabljanje";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Iskanje posodobitev …";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Prenašanje posodobitve …";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Razpakiranje posodobitve …";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Namesti in ponovno zaženi";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Nameščanje posodobitve …";
+
+/* No comment provided by engineer. */
+"OK" = "V redu";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Pripravljen na namestitev";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Naj %1$@ samodejno preverja, če so na voljo posodobitve? To lahko kadarkoli preverite tudi sami iz menija za %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Napaka pri posodabljanju";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Posodabljam %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Poskusite %1$@ premakniti v direktorij z aplikacijami (Applications), ga ponovno zagnati in šele nato posodobiti.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Uporabljate zadnjo verzijo.";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sv.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sv.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sv.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Textcell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Textcell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Anonym systemprofilinformation används för att hjälpa oss att planera framtida utvecklingsarbete. Vänligen kontakta oss ifall du har några frågot om detta.\n\nDetta är informationen som skulle sändas:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Kontrollera inte";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Leta efter uppdateringar automatiskt?\n";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Inkludera anonym systemprofil";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Kontrollera automatiskt";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/sv.lproj/Sparkle.strings Added

@@ -0,0 +1,80 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ är för närvarande den senaste tillgängliga versionen.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ är för närvarande den senaste tillgängliga versionen.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ finns nu tillgänglig—du har %3$@. Vill hämta uppdateringen nu?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ hämtat";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ av %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ har hämtats och är klar att använda! Vill du installera det och starta om %1$@ nu?";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "En ny version av %@ finns tillgänglig!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "En ny version av %@ är redo att installeras!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Ett fel uppstod vid hämtning av information om uppdateringar. Försök igen senare.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Ett fel uppstod vid hämtning av uppdateringen. Försök igen senare.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Ett fel uppstod vid extrahering av arkivet. Försök igen senare.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Ett fel uppstod vid tolkning av uppdateringslänken.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Avbryt";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Avbryt uppdatering";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Letar efter uppdateringar…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Hämtar uppdatering…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Extraherar uppdatering…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Installera och starta om";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Installerar uppdatering…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Mer info…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Redo att installera";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Ska %1$@ leta efter uppdateringar automatiskt? Du kan alltid leta efter uppdateringar manuellt från %1$@-menyn.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Uppdateringsfel!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Uppdaterar %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Flytta %1$@ till mappen Program, starta om det därifrån, och försök igen.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Du är uppdaterad!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/th.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/th.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/th.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "ข้อมูลระบบแบบนิรนามช่วยในการวางแผนพัฒนาแอปพลิเคชันของเราในอนาคต กรุณาติดต่อเราถ้าคุณมีข้อสงสัยในเรื่องนี้\n\nนี่คือข้อมูลที่จะถูกส่งไป:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "ไม่ต้องตรวจสอบ";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "ตรวจสอบอัพเดทอัตโนมัติ?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "ส่งข้อมูลระบบแบบนิรนาม";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "ตรวจสอบโดยอัตโนมัติ";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/th.lproj/Sparkle.strings Added

@@ -0,0 +1,83 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ เป็นเวอร์ชั่นใหม่ล่าสุดแล้ว";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ เป็นเวอร์ชั่นใหม่ล่าสุดแล้ว\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ พร้อมให้ดาวน์โหลดแล้ว (คุณมีเวอร์ชั่น %3$@) ต้องการดาวน์โหลดเลยหรือไม่";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "ดาวน์โหลด %@ เสร็จสิ้น";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ จาก %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ ได้ถูกดาวน์โหลดและพร้อมใช้งานแล้ว คุณต้องการติดตั้งและเริ่ม %1$@ ใหม่เดี๋ยวนี้หรือไม่";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ ไม่สามารถรับการอัพเดทได้เมื่อถูกเรียกจากดิสก์แบบอ่านอย่างเดียวหรือซีดีรอม ย้าย";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "%@ มีเวอร์ชั่นใหม่!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "เวอร์ชั่นใหม่ของ %@ พร้อมสำหรับการติดตั้งแล้ว";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "เกิดข้อผิดพลาดระหว่างการรับข้อมูลอัพเดท กรุณาลองใหม่ในภายหลัง";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "เกิดข้อผิดพลาดระหว่างพยายามดาวน์โหลดอัพเดท กรุณาลองใหม่ในภายหลัง";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "เกิดข้อผิดพลาดระหว่างการแตกไฟล์ที่ถูกบีบอัด กรุณาลองใหม่ในภายหลัง";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "เกิดข้อผิดพลาดระหว่างการประมวลผลฟีดอัพเดท กรุณาลองใหม่ในภายหลัง";
+
+/* No comment provided by engineer. */
+"Cancel" = "ยกเลิก";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "ยกเลิกอัพเดท";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "ตรวจสอบอัพเดท…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "กำลังดาวน์โหลดอัพเดท…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "กำลังแตกไฟล์อัพเดท…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "ติดตั้งและเริ่มแอปพลิเคชันใหม่";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "กำลังติดตั้งอัพเดท…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "เรียนรู้เพิ่มเติม…";
+
+/* No comment provided by engineer. */
+"OK" = "ตกลง";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "พร้อมติดตั้ง";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "คุณต้องการให้ %1$@ ตรวจสอบอัพเดทโดยอัตโนมัติหรือไม่ คุณสามารถเริ่มการตรวจสอบอัพเดทด้วยตนเองได้ทุกเมื่อจากเมนูของ %1$@";
+
+/* No comment provided by engineer. */
+"Update Error!" = "อัพเดทผิดพลาด!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "กำลังอัพเดท %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "%1$@ ไปยังโฟลเดอร์แอปพลิเคชัน และเรียกใช้งาน จากนั้นลองใหม่อีกครั้ง";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "คุณมีเวอร์ชั่นล่าสุดแล้ว!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/tr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/tr.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/tr.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Gönderdiğiniz anonim sistem bilgileri bu yazılımın geliştirilmesi için kullanılacaktır. Konu ile ilgili ayrıntılı bilgi için lütfen bizimle bağlantıya geçiniz. Göndereceğiniz Bilgiler:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Arama";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Güncellemeler otomatik olarak aransın mı?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Sistem bilgilerini kimlik gizlenmiş olarak gönder";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Otomatik Olarak Ara";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/tr.lproj/Sparkle.strings Added

@@ -0,0 +1,83 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ mevcut en yeni sürümdür.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ mevcut en yeni sürümdür.\n(Şu anda %3$@ sürümünü kullanıyorsunuz.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ çıktı (Kullandığınız Sürüm: %3$@). Şimdi yeni sürümü indirmek ister misiniz?";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ çıktı (kullandığınız sürüm: %3$@). Bu güncelleme ile ilgili olarak web sayfasından daha fazla bilgi almak ister misiniz?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ indirildi";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ indirildi ve kullanıma hazır! Şimdi yüklemek ister misiniz? Uygulama yeniden başlatılacaktır.";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "%1$@ uygulaması geçici veya salt okunur bir konumdan açıldığı için güncellenemedi.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "%@ uygulaması için yeni bir sürüm var!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "%@ uygulamasının yeni bir sürümü yüklenmeye hazır!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Güncelleme bilgilerini alırken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Güncelleme indirilirken bir hata oluştu. Lütfen sonra tekrar deneyiniz.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "İndirilen arşivi açarken bir hata oluştu. Lütfen daha sonra tekrar deneyiniz.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Güncelleme kaynağını incelerken bir hata oluştu.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Vazgeç";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Güncellemeyi iptal et";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Güncellemelere bakılıyor…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Güncelleme indiriliyor…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Güncelleme ayıklanıyor…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Kur ve yeniden başlat";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Güncelleme kuruluyor…";
+
+/* No comment provided by engineer. */
+"OK" = "Tamam";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Kuruluma hazır";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ uygulaması için güncellemeler otomatik olarak aransın mı? Güncelleme işlemini el ile uygulama menüsünden de başlatabilirsiniz.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Güncelleme hatası.";
+
+/* No comment provided by engineer. */
+"Updating %@" = "%@ güncelleniyor";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Lütfen %1$@ uygulamasını Uygulamalar dizinine kopyalayıp yeniden başlatınız.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "Uygulama güncel!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/uk.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/uk.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/uk.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "Використання анонімного профілю системи допомагає нам у планування майбутньої розробки. Якщо у вас виникли питання щодо цього, звертайтесь до нас.\n\nІнформація, що буде надіслано:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "Не перервіряти";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "Виконувати автоматичну перевірку оновлень?";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "Автоматично надсилати профіль системи";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "Перевіряти автоматично";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/uk.lproj/Sparkle.strings Added

@@ -0,0 +1,83 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "У данний момент %1$@ %2$@ є останньою версією.";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%У данний момент %1$@ %2$@ є останньою версією.\n(You are currently running version %3$@.)";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ доступна – ви маєте %3$@. Бажаєте завантажити її зараз?";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ завантажено";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ із %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ завантажений і готовий до використання! Бажаєте встановити і перезавантажити %1$@?";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "Під час роботи з %1$@ з тому, що призначений лише для читання, наприклад, образу диска чи оптичного диску, його неможливо оновити.";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "Доступна нова версія %@!";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "Нова версія %@ готова до встановлення!";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "Виникла помилка при отриманні інформації про оновлення. Спробуйте ще раз пізніше.";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "Виникла помилка при завантаження оновлення. Спробуйте ще раз пізніше.";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "Виникла помилка при розпаковуванні архіву. Спробуйте ще раз пізніше.";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "Виникла помилка розбору каналу оновлень.";
+
+/* No comment provided by engineer. */
+"Cancel" = "Відмінити";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "Відмінити оновлення";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "Перевіряю наявність оновлень…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "Завантажую оновлення…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "Розпаковую оновлення…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "Встановити та перезавантажити";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "Встановлюю оновлення…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "Дізнатись більше…";
+
+/* No comment provided by engineer. */
+"OK" = "OK";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "Готовий до встановлення";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Чи повинен %1$@ автоматично виконувати перевірку на оновлення? Ви завжди можете самостійно перевірити оновлення у меню %1$@.";
+
+/* No comment provided by engineer. */
+"Update Error!" = "Помилка оновлення!";
+
+/* No comment provided by engineer. */
+"Updating %@" = "Оновлюю %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Перемістіть %1$@ у папку з програмами, перезавантажте його звідти і спробуйте ще раз.";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "У вас остання версія!";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_CN.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_CN.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_CN.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "无记名系统概况信息被用于帮助我们安排将来的开发工作。如果对此存在疑问请联系我们。\n\n这是将要被发送的信息：:";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "不核查";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "自动核查更新？";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "包括无记名系统概况";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "自动核查";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_CN.lproj/Sparkle.strings Added

@@ -0,0 +1,95 @@
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ 是当前的最新版本。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 是当前的最新版本（您正在运行 %3$@）。";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 可供下载，您现在的版本是 %3$@。要现在下载吗？";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 已经推出，您正在运行 %3$@。您要在网站上查看关于更新的更多信息吗？";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ 已下载";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下载完毕并可以使用。您想要现在安装 %1$@ 吗？";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如果在下载位置运行此程序，则无法对 %1$@ 进行更新。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "无法更新 %1$@，因为它运行于一个只读或临时位置。";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "新版本的 %@ 已经发布";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "新版本的 %@ 可以安装了";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "获取升级信息时出现错误，请稍后再试。";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "下载过程中出现错误，请稍后再试。";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "解压过程中出现错误，请稍后再试。";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "解析更新信息时出现错误，请稍后再试。";
+
+/* No comment provided by engineer. */
+"Cancel" = "取消";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "取消更新";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "正在检查更新…";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "正在下载更新…";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "正在解压更新…";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "安装并重启应用";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "正在安装更新…";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "查看更多…";
+
+/* No comment provided by engineer. */
+"OK" = "好";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "退出 %1$@，将其移至“应用程序”，并在那里重新启动，然后再试。";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "可以开始安装了";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "您想让 %1$@ 在启动时自动检查更新么？您也可以在程序菜单 %1$@ 中手动检查。";
+
+/* No comment provided by engineer. */
+"Update Error!" = "更新错误！";
+
+/* No comment provided by engineer. */
+"Updating %@" = "正在更新 %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "移动 %1$@ 到应用程序文件夹并再试一次。";
+
+/* No comment provided by engineer. */
+"Version History" = "版本历史记录";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "您使用的就是最新版！";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_HK.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_HK.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_HK.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "匿名系統概況資訊可用來協助我等計畫未來開發工作。若對此有任何疑問，請聯繫我等。\n\n以下係會傳送嘅資訊：";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "毋檢查";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "自動檢查更新？";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "包含匿名系統概況";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "自動檢查";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_HK.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用！此爲重要更新，是否立即安裝並重新啓動 %1$@？";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載並可供使用！是否立即安裝並重新啓動 %1$@？";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 現已可供下載，但你嘅 macOS 版本過新以致無法安裝。此更新僅支援至 macOS %3$@。";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 現已可供下載，但你嘅 macOS 版本過舊以致無法安裝。最低版本需求爲 macOS %3$@。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "如果從下載位置運行 %1$@，則無法進行更新。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "無法更新 %1$@，因爲佢運行於一個只讀或臨時位置。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已係目前最新版本。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已係目前最新版本。\n（你正在運行版本係 %3$@。）";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現已可供下載，你目前版本係 %3$@。此爲重要更新，是否立即下載？";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現已可供下載，你目前版本係 %3$@。是否立即下載？";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現已可供下載，你目前版本係 %3$@。要毋要去網站度瞭解更多關於此更新嘅資訊？";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ 已下載";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%1$@ 已更新至版本 %2$@！";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ 已完成更新！";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "新版本 %@ 已可供下載！";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "新版本 %@ 已可供安裝！";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "擷取更新資訊時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "連線到安裝程式時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "下載更新時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "解壓縮時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "剖析更新摘要時發生錯誤。";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "執行更新程式時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "啓動安裝程式時發生錯誤。請稍後再試。";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = " %@ 重要更新已可供安裝";
+
+/* No comment provided by engineer. */
+"Cancel" = "取消";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "取消更新";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "檢查緊更新⋯";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "下載緊更新⋯";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "解壓緊更新⋯";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "嘗試繼續安裝更新失敗。";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "安裝並重新啓動";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "結束時安裝";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "安裝緊更新⋯";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "瞭解更多⋯";
+
+/* No comment provided by engineer. */
+"OK" = "好";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "請結束 %1$@ 並將其移至「應用程式」檔案夾，從該處重新啓動後再試。";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "已可供安裝";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應自動檢查更新？你可隨時從 %1$@ 選單手動檢查更新。";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "更新檢查程式未能正確啓動。你應聯絡軟體開發者以回報此問題並驗證你是否已有最新版本。";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "此更新並未正確簽署且無法驗證。請稍後再試或聯絡軟體開發者。";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "無法檢查更新";
+
+/* No comment provided by engineer. */
+"Update Error!" = "更新發生錯誤！";
+
+/* No comment provided by engineer. */
+"Update Installed" = "已安裝更新";
+
+/* No comment provided by engineer. */
+"Updating %@" = "更新緊 %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "請將 %1$@ 複製至「應用程式」檔案夾，從該處重新啓動後再試。";
+
+/* No comment provided by engineer. */
+"Version History" = "版本歷史";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "你 macOS 版本過新";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "你 macOS 版本過舊";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "你用緊最新版本！";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_TW.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_TW.lproj/SUUpdateAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_TW.lproj/SUUpdatePermissionPrompt.strings Added

@@ -0,0 +1,20 @@
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "43"; */
+"43.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "45"; */
+"45.title" = "Text Cell";
+
+/* Class = "NSTextFieldCell"; title = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:"; ObjectID = "183"; */
+"183.title" = "匿名系統描述資訊可用來協助我們計畫未來的開發工作。若您有任何相關問題，請與我們聯繫。\n\n以下是會傳送的資訊：";
+
+/* Class = "NSButtonCell"; title = "Don’t Check"; ObjectID = "cCJ-V0-aTi"; */
+"cCJ-V0-aTi.title" = "不要檢查";
+
+/* Class = "NSTextFieldCell"; title = "Check for updates automatically?"; ObjectID = "gmh-T4-BO0"; */
+"gmh-T4-BO0.title" = "自動檢查更新項目？";
+
+/* Class = "NSButtonCell"; title = "Include anonymous system profile"; ObjectID = "gz7-LM-gNf"; */
+"gz7-LM-gNf.title" = "包含匿名的系統描述資料";
+
+/* Class = "NSButtonCell"; title = "Check Automatically"; ObjectID = "OhZ-1K-DmA"; */
+"OhZ-1K-DmA.title" = "自動檢查";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Sparkle/zh_TW.lproj/Sparkle.strings Added

@@ -0,0 +1,152 @@
+/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載且可供使用！此為重要更新，您是否要立即安裝並重新啟動 %1$@？";
+
+/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
+"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "%1$@ %2$@ 已下載且可供使用！您是否要立即安裝並重新啟動 %1$@？";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "%1$@ %2$@ 現在已可供下載，但您的 macOS 版本過新以致無法安裝。此更新僅支援至 macOS %3$@。";
+
+/* No comment provided by engineer. */
+"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "%1$@ %2$@ 現在已可供下載，但您的 macOS 版本過舊以致無法安裝。最低版本需求為 macOS %3$@。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "當從下載位置執行 %1$@ 時，無法進行更新。";
+
+/* No comment provided by engineer. */
+"%1$@ can’t be updated, because it was opened from a read-only or a temporary location." = "當 %1$@ 正從唯讀卷宗（如磁碟映像檔或光碟機）執行時，無法進行更新。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available." = "%1$@ %2$@ 已是目前最新的版本。";
+
+/* No comment provided by engineer. */
+"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "%1$@ %2$@ 已是目前最新的版本。\n（您正在執行的版本是 %3$@。）";
+
+/* Description text for SUUpdateAlert when the critical update is downloadable. */
+"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "%1$@ %2$@ 現在已可供下載，您的版本則是 %3$@。此為重要更新，您想要立即下載嗎？";
+
+/* Description text for SUUpdateAlert when the update is downloadable. */
+"%@ %@ is now available—you have %@. Would you like to download it now?" = "%1$@ %2$@ 現在已可供下載，您的版本則是 %3$@。您想要立即下載嗎？";
+
+/* Description text for SUUpdateAlert when the update informational with no download. */
+"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "%1$@ %2$@ 現在已可供下載，您的版本則是 %3$@。您想要瞭解更多關於此更新的資訊嗎？";
+
+/* The download progress in a unit of bytes, e.g. 100 KB */
+"%@ downloaded" = "%@ 已下載";
+
+/* No comment provided by engineer. */
+"%@ is now updated to version %@!" = "%1$@ 已更新至版本 %2$@！";
+
+/* No comment provided by engineer. */
+"%@ is now updated!" = "%@ 已完成更新！";
+
+/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
+"%@ of %@" = "%1$@ / %2$@";
+
+/* No comment provided by engineer. */
+"A new version of %@ is available!" = "已有新版本的 %@ 可供下載！";
+
+/* No comment provided by engineer. */
+"A new version of %@ is ready to install!" = "已準備安裝新版本的 %@！";
+
+/* No comment provided by engineer. */
+"An error occurred in retrieving update information. Please try again later." = "擷取更新資訊時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while connecting to the installer. Please try again later." = "連線到安裝程式時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while downloading the update. Please try again later." = "下載更新項目時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while extracting the archive. Please try again later." = "解壓縮封存檔時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while launching the installer. Please try again later." = "啟動安裝程式時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while parsing the update feed." = "剖析更新摘要時發生錯誤。";
+
+/* No comment provided by engineer. */
+"An error occurred while running the updater. Please try again later." = "執行更新程式時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An error occurred while starting the installer. Please try again later." = "啟動安裝程式時發生錯誤。請稍後再試一次。";
+
+/* No comment provided by engineer. */
+"An important update to %@ is ready to install" = "已準備安裝 %@ 的重要更新";
+
+/* No comment provided by engineer. */
+"Cancel" = "取消";
+
+/* No comment provided by engineer. */
+"Cancel Update" = "取消更新";
+
+/* No comment provided by engineer. */
+"Checking for updates…" = "正在檢查更新項目⋯";
+
+/* Take care not to overflow the status window. */
+"Downloading update…" = "正在下載更新項目⋯";
+
+/* Take care not to overflow the status window. */
+"Extracting update…" = "正在解壓縮更新項目⋯";
+
+/* No comment provided by engineer. */
+"Failed to resume installing update." = "嘗試繼續安裝更新失敗。";
+
+/* No comment provided by engineer. */
+"Install and Relaunch" = "安裝並重新啟動";
+
+/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
+"Install on Quit" = "結束時安裝";
+
+/* Take care not to overflow the status window. */
+"Installing update…" = "正在安裝更新項目⋯";
+
+/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
+"Learn More…" = "瞭解更多⋯";
+
+/* No comment provided by engineer. */
+"OK" = "好";
+
+/* No comment provided by engineer. */
+"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "請結束 %1$@ 並移至您的「應用程式」檔案夾，從該處重新啟動後再試一次。";
+
+/* No comment provided by engineer. */
+"Ready to Install" = "準備安裝";
+
+/* No comment provided by engineer. */
+"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "%1$@ 是否應自動檢查更新項目？您可隨時從 %1$@ 選單手動檢查更新項目。";
+
+/* No comment provided by engineer. */
+"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "更新檢查程式未能正確啟動。您應聯絡軟體開發者以回報此問題並驗證您是否已有最新版本。";
+
+/* No comment provided by engineer. */
+"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "此更新並未正確簽署且無法驗證。請稍後再試一次或聯絡軟體開發者。";
+
+/* No comment provided by engineer. */
+"Unable to Check For Updates" = "無法檢查更新項目";
+
+/* No comment provided by engineer. */
+"Update Error!" = "更新發生錯誤！";
+
+/* No comment provided by engineer. */
+"Update Installed" = "已安裝更新";
+
+/* No comment provided by engineer. */
+"Updating %@" = "正在更新 %@";
+
+/* No comment provided by engineer. */
+"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "請將 %1$@ 移至您的「應用程式」檔案夾，從該處重新啟動後再試一次。";
+
+/* No comment provided by engineer. */
+"Version History" = "版本歷程記錄";
+
+/* No comment provided by engineer. */
+"Your macOS version is too new" = "您的 macOS 版本過新";
+
+/* No comment provided by engineer. */
+"Your macOS version is too old" = "您的 macOS 版本過舊";
+
+/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
+"You’re up-to-date!" = "您已有最新版本！";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper/Info.plist Added

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>TestAppHelper</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>XPC!</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
+	<key>XPCService</key>
+	<dict>
+		<key>ServiceType</key>
+		<string>Application</string>
+		<key>JoinExistingSession</key>
+		<true/>
+	</dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper/TestAppHelper.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper/TestAppHelper.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper/TestAppHelperProtocol.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestAppHelper/main.m Added

@@ -0,0 +1,49 @@
+//
+// main.m
+// TestAppHelper
+//
+// Created by Mayur Pawashe on 3/2/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "TestAppHelper.h"
+#import <Sparkle/SPUUserDriver.h>
+
+@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
+@end
+
+@implementation ServiceDelegate
+
+- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
+ // This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
+ 
+ // Configure the connection.
+ // First, set the interface that the exported object implements.
+ newConnection.exportedInterface = NSXPCInterface interfaceWithProtocol:@protocol(TestAppHelperProtocol);
+ 
+ // Next, set the object that the connection exports. All messages sent on the connection to this service will be sent to the exported object to handle. The connection retains the exported object.
+ newConnection.exportedObject = TestAppHelper alloc init;
+ 
+ // Resuming the connection allows the system to deliver more incoming messages.
+ newConnection resume;
+ 
+ // Returning YES from this method tells the system that you have accepted this connection. If you want to reject the connection for some reason, call -invalidate on the connection and return NO.
+ return YES;
+}
+
+@end
+
+int main(__unused int argc, __unused const char *argv)
+{
+ // Create the delegate for the service.
+ ServiceDelegate *delegate = ServiceDelegate new;
+ 
+ // Set up the one NSXPCListener for this service. It will handle all incoming connections.
+ NSXPCListener *listener = NSXPCListener serviceListener;
+ listener.delegate = delegate;
+ 
+ // Resuming the serviceListener starts this service. This method does not return.
+ listener resume;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/Base.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/Base.lproj/InfoPlist.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/Base.lproj/MainMenu.xib Added

@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1212" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+ <connections>
+ <outlet property="delegate" destination="iTs-bN-9SB" id="w0I-XO-wWG"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <menu title="MainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+ <items>
+ <menuItem title="Sparkle Test App" id="56">
+ <menu key="submenu" title="Sparkle Test App" systemMenu="apple" id="57">
+ <items>
+ <menuItem title="About Sparkle Test App" id="58">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check for Updates…" keyEquivalent="u" id="207">
+ <connections>
+ <action selector="checkForUpdates:" target="-1" id="yqv-bK-pBA"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="196">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Services" id="131">
+ <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="144">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Hide Sparkle Test App" keyEquivalent="h" id="134">
+ <connections>
+ <action selector="hide:" target="-2" id="152"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Hide Others" keyEquivalent="h" id="145">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="hideOtherApplications:" target="-2" id="146"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Show All" id="150">
+ <connections>
+ <action selector="unhideAllApplications:" target="-2" id="153"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="149">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Quit Sparkle Test App" keyEquivalent="q" id="136">
+ <connections>
+ <action selector="terminate:" target="-2" id="139"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="File" id="83">
+ <menu key="submenu" title="File" id="81">
+ <items>
+ <menuItem title="New" keyEquivalent="n" id="82"/>
+ <menuItem title="Open..." keyEquivalent="o" id="72"/>
+ <menuItem title="Open Recent" id="124">
+ <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+ <items>
+ <menuItem title="Clear Menu" id="126">
+ <connections>
+ <action selector="clearRecentDocuments:" target="-1" id="127"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="79">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Close" keyEquivalent="w" id="73">
+ <connections>
+ <action selector="performClose:" target="-1" id="193"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Save" keyEquivalent="s" id="75"/>
+ <menuItem title="Save As…" keyEquivalent="S" id="80"/>
+ <menuItem title="Revert" id="112">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="74">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Page Setup…" keyEquivalent="p" id="77">
+ <modifierMask key="keyEquivalentModifierMask" control="YES" option="YES" command="YES"/>
+ <connections>
+ <action selector="runPageLayout:" target="-1" id="87"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Print…" keyEquivalent="p" id="78">
+ <modifierMask key="keyEquivalentModifierMask" shift="YES" control="YES" option="YES" command="YES"/>
+ <connections>
+ <action selector="print:" target="-1" id="86"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Edit" id="163">
+ <menu key="submenu" title="Edit" id="169">
+ <items>
+ <menuItem title="Undo" keyEquivalent="z" id="158">
+ <connections>
+ <action selector="undo:" target="-1" id="180"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Redo" keyEquivalent="Z" id="173">
+ <connections>
+ <action selector="redo:" target="-1" id="178"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="156">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Cut" keyEquivalent="x" id="160">
+ <connections>
+ <action selector="cut:" target="-1" id="175"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Copy" keyEquivalent="c" id="157">
+ <connections>
+ <action selector="copy:" target="-1" id="181"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Paste" keyEquivalent="v" id="171">
+ <connections>
+ <action selector="paste:" target="-1" id="176"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Paste and Match Style" keyEquivalent="V" id="204">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="pasteAsPlainText:" target="-1" id="205"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Delete" id="164">
+ <connections>
+ <action selector="delete:" target="-1" id="195"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Select All" keyEquivalent="a" id="172">
+ <connections>
+ <action selector="selectAll:" target="-1" id="179"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="174">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Find" id="168">
+ <menu key="submenu" title="Find" id="159">
+ <items>
+ <menuItem title="Find…" tag="1" keyEquivalent="f" id="154">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="199"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Find Next" tag="2" keyEquivalent="g" id="167">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="200"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="162">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="201"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="161">
+ <connections>
+ <action selector="performFindPanelAction:" target="-1" id="202"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Jump to Selection" keyEquivalent="j" id="155">
+ <connections>
+ <action selector="centerSelectionInVisibleArea:" target="-1" id="203"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Spelling" id="184">
+ <menu key="submenu" title="Spelling" id="185">
+ <items>
+ <menuItem title="Spelling…" keyEquivalent=":" id="187">
+ <connections>
+ <action selector="showGuessPanel:" target="-1" id="188"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check Spelling" keyEquivalent=";" id="189">
+ <connections>
+ <action selector="checkSpelling:" target="-1" id="190"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Check Spelling as You Type" id="191">
+ <connections>
+ <action selector="toggleContinuousSpellChecking:" target="-1" id="192"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Window" id="19">
+ <menu key="submenu" title="Window" systemMenu="window" id="24">
+ <items>
+ <menuItem title="Minimize" keyEquivalent="m" id="23">
+ <connections>
+ <action selector="performMiniaturize:" target="-1" id="37"/>
+ </connections>
+ </menuItem>
+ <menuItem title="Zoom" id="197">
+ <connections>
+ <action selector="performZoom:" target="-1" id="198"/>
+ </connections>
+ </menuItem>
+ <menuItem isSeparatorItem="YES" id="92">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Bring All to Front" keyEquivalent="p" id="5">
+ <connections>
+ <action selector="arrangeInFront:" target="-1" id="39"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ <menuItem title="Help" id="103">
+ <menu key="submenu" title="Help" id="106">
+ <items>
+ <menuItem title="Sparkle Test App Help" keyEquivalent="?" id="111">
+ <connections>
+ <action selector="showHelp:" target="-1" id="122"/>
+ </connections>
+ </menuItem>
+ </items>
+ </menu>
+ </menuItem>
+ </items>
+ </menu>
+ <customObject id="iTs-bN-9SB" customClass="SUTestApplicationDelegate"/>
+ </objects>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUAdHocCodeSigning.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUAdHocCodeSigning.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUInstallUpdateViewController.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUInstallUpdateViewController.m Added

@@ -0,0 +1,130 @@
+//
+//  SUInstallUpdateViewController.m
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 3/5/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUInstallUpdateViewController.h"
+
+@interface SUInstallUpdateViewController ()
+
+@property (nonatomic) IBOutlet NSButton *skipUpdatesButton;
+@property (nonatomic) IBOutlet NSTextView *textView;
+@property (nonatomic, readonly) SUAppcastItem *appcastItem;
+@property (nonatomic, nullable) NSAttributedString *preloadedReleaseNotes;
+@property (nonatomic, copy) void (^reply)(SPUUserUpdateChoice);
+
+@end
+
+@implementation SUInstallUpdateViewController
+
+@synthesize skipUpdatesButton = _skipUpdatesButton;
+@synthesize textView = _textView;
+@synthesize preloadedReleaseNotes = _preloadedReleaseNotes;
+@synthesize appcastItem = _appcastItem;
+@synthesize reply = _reply;
+
+- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem reply:(void (^)(SPUUserUpdateChoice))reply
+{
+    self = super initWithNibName:@"SUInstallUpdateViewController" bundle:nil;
+    if (self != nil) {
+        _appcastItem = appcastItem;
+        self.reply = reply;
+    } else {
+        assert(false);
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    super viewDidLoad;
+    
+    self.textView enclosingScrollView setDrawsBackground:NO;
+    self.textView setDrawsBackground:NO;
+    
+    if (self.preloadedReleaseNotes != nil) {
+        self displayReleaseNotes:self.preloadedReleaseNotes;
+        self.preloadedReleaseNotes = nil;
+    } else if (self.appcastItem.releaseNotesURL == nil) {
+        NSString *descriptionHTML = self.appcastItem.itemDescription;
+        if (descriptionHTML != nil) {
+            NSData *htmlData = descriptionHTML dataUsingEncoding:NSUTF8StringEncoding;
+            NSAttributedString *attributedString = NSAttributedString alloc initWithHTML:htmlData documentAttributes:NULL;
+            self displayReleaseNotes:attributedString;
+        }
+    }
+}
+
+- (void)displayReleaseNotes:(NSAttributedString *)releaseNotes
+{
+    if (self.textView == nil) {
+        self.preloadedReleaseNotes = releaseNotes;
+    } else {
+        self.textView.textStorage setAttributedString:releaseNotes;
+    }
+}
+
+- (void)displayHTMLReleaseNotes:(NSData *)releaseNotes
+{
+    NSAttributedString *attributedString = NSAttributedString alloc initWithHTML:releaseNotes documentAttributes:NULL;
+    self displayReleaseNotes:attributedString;
+}
+
+- (void)displayPlainTextReleaseNotes:(NSData *)releaseNotes encoding:(NSStringEncoding)encoding
+{
+    NSString *string = NSString alloc initWithData:releaseNotes encoding:encoding;
+    NSAttributedString *attributedString = NSAttributedString alloc initWithString:string attributes:nil;
+    self displayReleaseNotes:attributedString;
+}
+
+- (void)showReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
+{
+    // Partially copied from SPUCommandLineUserDriver
+    // Not all user drivers need this kind of implementation (eg: see SPUStandardUserDriver)
+    // Also I'm not extremely confident about the correctness of this code so I don't want to export it publicly
+    if (downloadData.MIMEType != nil && downloadData.MIMEType isEqualToString:@"text/plain") {
+        NSStringEncoding encoding;
+        if (downloadData.textEncodingName == nil) {
+            encoding = NSUTF8StringEncoding;
+        } else {
+            CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)downloadData.textEncodingName);
+            if (cfEncoding != kCFStringEncodingInvalidId) {
+                encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
+            } else {
+                encoding = NSUTF8StringEncoding;
+            }
+        }
+        self displayPlainTextReleaseNotes:downloadData.data encoding:encoding;
+    } else {
+        self displayHTMLReleaseNotes:downloadData.data;
+    }
+}
+
+- (IBAction)installUpdate:(id)__unused sender
+{
+    if (self.reply != nil) {
+        self.reply(SPUUserUpdateChoiceInstall);
+        self.reply = nil;
+    }
+}
+
+- (IBAction)installUpdateLater:(id)__unused sender
+{
+    if (self.reply != nil) {
+        self.reply(SPUUserUpdateChoiceDismiss);
+        self.reply = nil;
+    }
+}
+
+- (IBAction)skipUpdate:(id)__unused sender
+{
+    if (self.reply != nil) {
+        self.reply(SPUUserUpdateChoiceSkip);
+        self.reply = nil;
+    }
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUInstallUpdateViewController.xib Added

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="SUInstallUpdateViewController">
+ <connections>
+ <outlet property="skipUpdatesButton" destination="GnO-99-FrA" id="3lg-83-oGn"/>
+ <outlet property="textView" destination="hvq-rZ-gUG" id="U5Y-SK-7E5"/>
+ <outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <customView id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="370" height="182"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JaG-xU-cSv">
+ <rect key="frame" x="128" y="6" width="114" height="32"/>
+ <buttonCell key="cell" type="push" title="Install Later" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vGh-C9-cmI">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+Gw
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="installUpdateLater:" target="-2" id="49e-4G-Ofu"/>
+ </connections>
+ </button>
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GnO-99-FrA">
+ <rect key="frame" x="14" y="6" width="114" height="32"/>
+ <buttonCell key="cell" type="push" title="Skip Update" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Q9S-re-mYe">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <action selector="skipUpdate:" target="-2" id="VsN-ie-9xR"/>
+ </connections>
+ </button>
+ <scrollView fixedFrame="YES" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Cj-JW-f43">
+ <rect key="frame" x="0.0" y="46" width="370" height="136"/>
+ <clipView key="contentView" ambiguous="YES" id="CIT-u4-hRg">
+ <rect key="frame" x="1" y="1" width="368" height="134"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textView ambiguous="YES" editable="NO" importsGraphics="NO" findStyle="panel" verticallyResizable="YES" allowsNonContiguousLayout="YES" id="hvq-rZ-gUG">
+ <rect key="frame" x="0.0" y="0.0" width="368" height="134"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <size key="minSize" width="368" height="134"/>
+ <size key="maxSize" width="463" height="10000000"/>
+ <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <size key="minSize" width="368" height="134"/>
+ <size key="maxSize" width="463" height="10000000"/>
+ </textView>
+ </subviews>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ </clipView>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="t2X-nw-Cy5">
+ <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="dth-jh-Csr">
+ <rect key="frame" x="353" y="1" width="16" height="134"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cYY-dW-0o8">
+ <rect key="frame" x="242" y="6" width="114" height="32"/>
+ <buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="AoI-0t-LLU">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ 
+ <string key="keyEquivalent" base64-UTF8="YES">
+DQ
+</string>
+ </buttonCell>
+ <connections>
+ <action selector="installUpdate:" target="-2" id="G8I-20-OHo"/>
+ </connections>
+ </button>
+ </subviews>
+ <point key="canvasLocation" x="174" y="251"/>
+ </customView>
+ </objects>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUPopUpTitlebarUserDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUPopUpTitlebarUserDriver.m Added

@@ -0,0 +1,278 @@
+//
+// SUPopUpTitlebarUserDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 3/5/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SUPopUpTitlebarUserDriver.h"
+#import "SUInstallUpdateViewController.h"
+#import <AppKit/AppKit.h>
+
+@interface SUPopUpTitlebarUserDriver()
+
+@property (nonatomic, readonly) NSWindow *window;
+@property (nonatomic, nullable) SUInstallUpdateViewController *installUpdateViewController;
+@property (nonatomic) NSTitlebarAccessoryViewController *accessoryViewController;
+@property (nonatomic) BOOL addedAccessory;
+@property (nonatomic) NSButton *updateButton;
+@property (nonatomic, copy) void (^updateButtonAction)(NSButton *);
+@property (nonatomic) uint64_t expectedContentLength;
+@property (nonatomic) uint64_t contentLengthDownloaded;
+
+@end
+
+@implementation SUPopUpTitlebarUserDriver
+
+@synthesize window = _window;
+@synthesize installUpdateViewController = _installUpdateViewController;
+@synthesize accessoryViewController = _accessoryViewController;
+@synthesize addedAccessory = _addedAccessory;
+@synthesize updateButton = _updateButton;
+@synthesize updateButtonAction = _updateButtonAction;
+@synthesize expectedContentLength = _expectedContentLength;
+@synthesize contentLengthDownloaded = _contentLengthDownloaded;
+
+- (instancetype)initWithWindow:(NSWindow *)window
+{
+ self = super init;
+ if (self != nil) {
+ _window = window;
+ }
+ return self;
+}
+
+- (void)addUpdateButtonWithTitle:(NSString *)title
+{
+ self addUpdateButtonWithTitle:title action:nil;
+}
+
+- (void)addUpdateButtonWithTitle:(NSString *)title action:(void (^)(NSButton *button))action
+{
+ if (self.updateButton == nil) {
+ NSButton *updateButton = NSButton alloc initWithFrame:NSMakeRect(0, 0, 160, 100);
+ updateButton.title = title;
+ updateButton.bezelStyle = NSBezelStyleRecessed;
+ 
+ self.updateButton = updateButton;
+ } else {
+ self.updateButton.title = title;
+ }
+ 
+ if (action != nil) {
+ self.updateButton.target = self;
+ self.updateButton.action = @selector(updateButtonAction:);
+ self.updateButtonAction = action;
+ self.updateButton.enabled = YES;
+ } else {
+ self.updateButton.enabled = NO;
+ self.updateButton.target = nil;
+ self.updateButtonAction = nil;
+ }
+ 
+ if (self.accessoryViewController == nil) {
+ self.accessoryViewController = NSTitlebarAccessoryViewController alloc init;
+ self.accessoryViewController.layoutAttribute = NSLayoutAttributeRight;
+ self.accessoryViewController.view = self.updateButton;
+ }
+ 
+ if (!self.addedAccessory) {
+ self.window addTitlebarAccessoryViewController:self.accessoryViewController;
+ self.addedAccessory = YES;
+ }
+}
+
+- (void)updateButtonAction:(NSButton *)sender
+{
+ if (self.updateButtonAction != nil) {
+ self.updateButtonAction(sender);
+ }
+}
+
+- (void)removeUpdateButton
+{
+ self.accessoryViewController removeFromParentViewController;
+ self.addedAccessory = NO;
+ self.updateButtonAction = nil;
+}
+
+#pragma mark Update Permission
+
+- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)__unused request reply:(void (^)(SUUpdatePermissionResponse *))reply
+{
+ // Just make a decision..
+ SUUpdatePermissionResponse *response = SUUpdatePermissionResponse alloc initWithAutomaticUpdateChecks:YES sendSystemProfile:NO;
+ reply(response);
+}
+
+#pragma mark Update Found
+
+- (void)showUpdateWithAppcastItem:(SUAppcastItem *)appcastItem reply:(void (^)(SPUUserUpdateChoice))reply
+{
+ NSPopover *popover = NSPopover alloc init;
+ popover.behavior = NSPopoverBehaviorTransient;
+ 
+ __weak SUPopUpTitlebarUserDriver *weakSelf = self;
+ __block NSButton *actionButton = nil;
+ 
+ SUInstallUpdateViewController *viewController = SUInstallUpdateViewController alloc initWithAppcastItem:appcastItem reply:^(SPUUserUpdateChoice choice) {
+ reply(choice);
+ 
+ popover close;
+ actionButton.enabled = NO;
+ 
+ weakSelf.installUpdateViewController = nil;
+ };
+ 
+ self.installUpdateViewController = viewController;
+ 
+ self addUpdateButtonWithTitle:@"Update Available" action:^(NSButton *button) {
+ actionButton = button;
+ popover.contentViewController = viewController;
+ popover showRelativeToRect:button.bounds ofView:button preferredEdge:NSMaxYEdge;
+ };
+}
+
+- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem state:(SPUUserUpdateState *)state reply:(void (^)(SPUUserUpdateChoice))reply
+{
+ if (appcastItem.informationOnlyUpdate) {
+ // Todo: show user interface for this
+ NSLog(@"Found info URL: %@", appcastItem.infoURL);
+ 
+ // Remove UI from user initiated check
+ self removeUpdateButton;
+ 
+ reply(SPUUserUpdateChoiceDismiss);
+ } else {
+ self showUpdateWithAppcastItem:appcastItem reply:reply;
+ }
+}
+
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
+{
+ self.installUpdateViewController showReleaseNotesWithDownloadData:downloadData;
+}
+
+- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)__unused error
+{
+}
+
+- (void)showUpdateInFocus
+{
+ self.window makeKeyAndOrderFront:nil;
+ 
+ if (self.updateButton.enabled) {
+ // Not the proper way to do things but ignoring warnings in Test App.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-messaging-id"
+#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
+ self.updateButton.target performSelector:self.updateButton.action withObject:self.updateButton;
+#pragma clang diagnostic pop
+ }
+}
+
+#pragma mark Install & Relaunch Update
+
+- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
+{
+ self addUpdateButtonWithTitle:@"Install & Relaunch" action:^(NSButton *__unused button) {
+ installUpdateHandler(SPUUserUpdateChoiceInstall);
+ };
+}
+
+#pragma mark Check for Updates
+
+- (void)showUserInitiatedUpdateCheckWithCancellation:(void (^)(void))__unused cancellation
+{
+ self addUpdateButtonWithTitle:@"Checking for Updates…";
+}
+
+#pragma mark Update Errors
+
+- (void)acceptAcknowledgementAfterDelay:(void (^)(void))acknowledgement
+{
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+ // Installation will be dismissed shortly after this
+ acknowledgement();
+ });
+}
+
+- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement
+{
+ NSLog(@"Error: %@", error);
+ self addUpdateButtonWithTitle:@"Update Errored!" action:nil;
+ 
+ self acceptAcknowledgementAfterDelay:acknowledgement;
+}
+
+- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement
+{
+ self addUpdateButtonWithTitle:@"No Update Available" action:nil;
+ 
+ self acceptAcknowledgementAfterDelay:acknowledgement;
+}
+
+#pragma mark Download & Install Updates
+
+- (void)showDownloadInitiatedWithCancellation:(void (^)(void))__unused cancellation
+{
+}
+
+- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
+{
+ self addUpdateButtonWithTitle:@"Downloading…";
+ self.contentLengthDownloaded = 0;
+ self.expectedContentLength = expectedContentLength;
+}
+
+- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length
+{
+ self.contentLengthDownloaded += length;
+ 
+ // In case our expected content length was incorrect
+ if (self.contentLengthDownloaded > self.expectedContentLength) {
+ self.expectedContentLength = self.contentLengthDownloaded;
+ }
+ 
+ if (self.expectedContentLength > 0) {
+ double progress = (double)self.contentLengthDownloaded / self.expectedContentLength;
+ self addUpdateButtonWithTitle:NSString stringWithFormat:@"Downloading (%0.0f%%)", progress * 100 action:nil;
+ }
+}
+
+- (void)showDownloadDidStartExtractingUpdate
+{
+ self addUpdateButtonWithTitle:@"Extracting…";
+}
+
+- (void)showExtractionReceivedProgress:(double)progress
+{
+ self addUpdateButtonWithTitle:NSString stringWithFormat:@"Extracting (%d%%)…", (int)(progress * 100);
+}
+
+- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)applicationTerminated retryTerminatingApplication:(void (^)(void))__unused retryTerminatingApplication
+{
+ if (applicationTerminated) {
+ self addUpdateButtonWithTitle:@"Installing…";
+ } else {
+ // In case our termination request fails or is delayed
+ self removeUpdateButton;
+ }
+}
+
+- (void)showUpdateInstalledAndRelaunched:(BOOL)__unused relaunched acknowledgement:(void (^)(void))acknowledgement
+{
+ self addUpdateButtonWithTitle:@"Installation Finished!";
+ 
+ self acceptAcknowledgementAfterDelay:acknowledgement;
+}
+
+#pragma mark Aborting Everything
+
+- (void)dismissUpdateInstallation
+{
+ self removeUpdateButton;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUTestApplicationDelegate.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUTestApplicationDelegate.m Added

@@ -0,0 +1,374 @@
+//
+// SUTestApplicationDelegate.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 7/25/15.
+// Copyright (c) 2015 Sparkle Project. All rights reserved.
+//
+
+#import "SUTestApplicationDelegate.h"
+#import "SUUpdateSettingsWindowController.h"
+#import "SUFileManager.h"
+#import "SUTestWebServer.h"
+#import "TestAppHelperProtocol.h"
+#import "ed25519.h"
+#import <Sparkle/Sparkle.h>
+#import "SUPopUpTitlebarUserDriver.h"
+#import "SUBinaryDeltaCreate.h"
+
+@interface SUTestApplicationDelegate () <NSMenuItemValidation, SPUUpdaterDelegate>
+
+@property (nonatomic) SPUUpdater *updater;
+@property (nonatomic) SUUpdateSettingsWindowController *updateSettingsWindowController;
+@property (nonatomic) SUTestWebServer *webServer;
+@property (nonatomic, copy) NSString *testMode;
+
+@end
+
+@implementation SUTestApplicationDelegate
+
+@synthesize updater = _updater;
+@synthesize updateSettingsWindowController = _updateSettingsWindowController;
+@synthesize webServer = _webServer;
+@synthesize testMode = _testMode;
+
+- (void)applicationDidFinishLaunching:(NSNotification * __unused)notification
+{
+ NSBundle *mainBundle = NSBundle mainBundle;
+ 
+ NSString *testModeEnv = NSProcessInfo processInfo environment objectForKey:@"TEST_MODE";
+ NSString *testMode;
+ if (testModeEnv == nil) {
+ testMode = @"REGULAR";
+ } else {
+ testMode = testModeEnv;
+ }
+ 
+ self.testMode = testMode;
+ 
+ // Check if we are already up to date
+ NSString *mainBundleVersion = (NSString *)mainBundle objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey;
+ 
+ if ((mainBundleVersion hasPrefix:@"2." && testMode isEqualToString:@"REGULAR") || ((mainBundleVersion isEqualToString:@"2.1" || mainBundleVersion isEqualToString:@"2.2") && testMode isEqualToString:@"DELTA") || (mainBundleVersion isEqualToString:@"2.2" && testMode isEqualToString:@"AUTOMATIC")) {
+ NSAlert *alreadyUpdatedAlert = NSAlert alloc init;
+ alreadyUpdatedAlert.messageText = @"Update succeeded!";
+ alreadyUpdatedAlert.informativeText = @"This is the updated version of Sparkle Test App.\n\nDelete and rebuild the app to test updates again.";
+ alreadyUpdatedAlert runModal;
+ 
+ NSApplication sharedApplication terminate:nil;
+ }
+ 
+#if SPARKLE_BUILD_UI_BITS
+ // Detect as early as possible if the shift key is held down
+ BOOL shiftKeyHeldDown = (NSEvent modifierFlags & NSEventModifierFlagShift) != 0;
+#endif
+ 
+ // Apple's file manager may not work well over the network (on macOS 10.11.4 as of writing this), but at the same time
+ // I don't want to have to export SUFileManager in release mode. The test app is primarily
+ // aimed to be used in debug mode, so I think this is a good compromise
+#if DEBUG
+ SUFileManager *fileManager = SUFileManager alloc init;
+#else
+ NSFileManager *fileManager = NSFileManager defaultManager;
+#endif
+ 
+ // Locate user's cache directory
+ NSError *cacheError = nil;
+ NSURL *cacheDirectoryURL = NSFileManager defaultManager URLForDirectory:NSCachesDirectory inDomain:NSUserDomainMask appropriateForURL:nil create:YES error:&cacheError;
+ 
+ if (cacheDirectoryURL == nil) {
+ NSLog(@"Failed to locate cache directory with error: %@", cacheError);
+ abort();
+ }
+ 
+ NSString *bundleIdentifier = mainBundle.bundleIdentifier;
+ assert(bundleIdentifier != nil);
+ 
+ // Create a directory that'll be used for our web server listing
+ NSURL *serverDirectoryURL = cacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier URLByAppendingPathComponent:@"ServerData";
+ if (serverDirectoryURL checkResourceIsReachableAndReturnError:nil) {
+ NSError *removeServerDirectoryError = nil;
+ 
+ if (!fileManager removeItemAtURL:serverDirectoryURL error:&removeServerDirectoryError) {
+ abort();
+ }
+ }
+ 
+ NSError *createDirectoryError = nil;
+ if (!NSFileManager defaultManager createDirectoryAtURL:serverDirectoryURL withIntermediateDirectories:YES attributes:nil error:&createDirectoryError) {
+ NSLog(@"Failed creating directory at %@ with error %@", serverDirectoryURL.path, createDirectoryError);
+ abort();
+ }
+ 
+ NSURL *bundleURL = mainBundle.bundleURL;
+ assert(bundleURL != nil);
+ 
+ // Copy main bundle into server directory
+ NSString *bundleURLLastComponent = bundleURL.lastPathComponent;
+ assert(bundleURLLastComponent != nil);
+ 
+ NSURL *destinationBundleURL = serverDirectoryURL URLByAppendingPathComponent:bundleURLLastComponent;
+ NSError *copyBundleError = nil;
+ if (!fileManager copyItemAtURL:bundleURL toURL:destinationBundleURL error:&copyBundleError) {
+ NSLog(@"Failed to copy main bundle into server directory with error %@", copyBundleError);
+ abort();
+ }
+ 
+ // Update bundle's version keys to latest version
+ NSURL *infoURL = destinationBundleURL URLByAppendingPathComponent:@"Contents" URLByAppendingPathComponent:@"Info.plist";
+ 
+ BOOL infoFileExists = infoURL checkResourceIsReachableAndReturnError:nil;
+ assert(infoFileExists);
+ 
+ NSString *finalUpdatedVersion;
+ if (testMode isEqualToString:@"REGULAR") {
+ finalUpdatedVersion = @"2.0";
+ } else if (testMode isEqualToString:@"DELTA") {
+ finalUpdatedVersion = @"2.1";
+ } else if (testMode isEqualToString:@"AUTOMATIC") {
+ finalUpdatedVersion = @"2.2";
+ } else {
+ assert(false);
+ }
+ 
+ NSMutableDictionary *infoDictionary = NSMutableDictionary alloc initWithContentsOfURL:infoURL;
+ infoDictionary setObject:finalUpdatedVersion forKey:(__bridge NSString *)kCFBundleVersionKey;
+ infoDictionary setObject:finalUpdatedVersion forKey:@"CFBundleShortVersionString";
+ 
+ BOOL wroteInfoFile = infoDictionary writeToURL:infoURL atomically:NO;
+ assert(wroteInfoFile);
+ 
+ // Overwrite and add new data
+ {
+ NSURL *screenshotURL = destinationBundleURL URLByAppendingPathComponent:@"Contents" URLByAppendingPathComponent:@"Resources" URLByAppendingPathComponent:@"screenshot" URLByAppendingPathExtension:@"png";
+ assert(screenshotURL checkResourceIsReachableAndReturnError:NULL);
+ 
+ NSMutableData *screenshotData = NSMutableData dataWithContentsOfURL:screenshotURL;
+ 
+ uint32_t garbage = 1337;
+ screenshotData appendBytes:&garbage length:sizeof(garbage);
+ 
+ BOOL wroteData = screenshotData writeToURL:screenshotURL atomically:NO;
+ assert(wroteData);
+ 
+ NSURL *newDataURL = screenshotURL URLByDeletingLastPathComponent URLByAppendingPathComponent:@"new_file";
+ assert(newDataURL != nil);
+ 
+ BOOL wroteNewData = NSData dataWithBytes:&garbage length:sizeof(garbage) writeToURL:newDataURL atomically:NO;
+ assert(wroteNewData);
+ }
+ 
+ self signApplicationIfRequiredAtPath:destinationBundleURL.path completion:^{
+ dispatch_async(dispatch_get_main_queue(), ^{
+ // Change current working directory so web server knows where to list files
+ NSString *serverDirectoryPath = serverDirectoryURL.path;
+ assert(serverDirectoryPath != nil);
+ 
+ NSString * const appcastName = @"sparkletestcast";
+ NSString * const appcastExtension = @"xml";
+ 
+ // Copy our appcast over to the server directory
+ NSURL *appcastDestinationURL = serverDirectoryURL URLByAppendingPathComponent:appcastName URLByAppendingPathExtension:appcastExtension;
+ NSError *copyAppcastError = nil;
+ NSURL *appcastURL = mainBundle URLForResource:appcastName withExtension:appcastExtension;
+ assert(appcastURL != nil);
+ if (!fileManager copyItemAtURL:appcastURL toURL:appcastDestinationURL error:&copyAppcastError) {
+ NSLog(@"Failed to copy appcast into cache directory with error %@", copyAppcastError);
+ abort();
+ }
+ 
+ // Update the appcast with the file size and signature of the update archive
+ // We could be using some sort of XML parser instead of doing string substitutions, but for now, this is easier
+ NSError *appcastError = nil;
+ NSMutableString *appcastContents = NSMutableString alloc initWithContentsOfURL:appcastDestinationURL encoding:NSUTF8StringEncoding error:&appcastError;
+ if (appcastContents == nil) {
+ NSLog(@"Failed to load appcast contents with error %@", appcastError);
+ abort();
+ }
+ 
+ // Don't ever do this at home, kids (seriously)
+ // (that is, including the private key inside of your application)
+ const unsigned char self_sign_demo_only_insecure_hack64 = {200, 238, 135, 84, 10, 189, 3, 193, 61, 208, 203, 30, 133, 47, 12, 22, 19, 52, 252, 99, 110, 205, 209, 94, 215, 144, 201, 70, 27, 162, 163, 108, 0, 164, 68, 184, 226, 93, 121, 199, 172, 17, 26, 64, 89, 68, 232, 41, 2, 26, 245, 175, 158, 165, 42, 55, 5, 97, 8, 243, 251, 164, 93, 9};
+ // in normal app this goes to Info.plist
+ const unsigned char public_key32 = {121, 17, 79, 45, 155, 141, 51, 169, 188, 110, 91, 102, 182, 147, 215, 225, 252, 202, 110, 231, 200, 215, 62, 171, 40, 145, 237, 128, 130, 44, 150, 89};
+ unsigned char signature64;
+ 
+ if (testMode isEqualToString:@"DELTA") {
+ NSError *deltaCreationError = nil;
+ NSURL *patchURL = serverDirectoryURL URLByAppendingPathComponent:@"patch.delta";
+ if (!createBinaryDelta(bundleURL.path, destinationBundleURL.path, patchURL.path, SUBinaryDeltaMajorVersionDefault, SPUDeltaCompressionModeDefault, 0, NO, &deltaCreationError)) {
+ NSLog(@"Failed to create binary delta patch: %@", deltaCreationError);
+ abort();
+ }
+ 
+ NSData *archive = NSData dataWithContentsOfURL:patchURL;
+ assert(archive != nil);
+ 
+ ed25519_sign(signature, archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
+ 
+ NSString *signatureString = NSData dataWithBytes:signature length:64 base64EncodedStringWithOptions:0;
+ 
+ // Obtain the file attributes to get the file size of our update later
+ NSError *fileAttributesError = nil;
+ NSString *archiveURLPath = patchURL.path;
+ assert(archiveURLPath != nil);
+ NSDictionary *archiveFileAttributes = NSFileManager defaultManager attributesOfItemAtPath:archiveURLPath error:&fileAttributesError;
+ if (archiveFileAttributes == nil) {
+ NSLog(@"Failed to retrieve file attributes from delta archive with error %@", fileAttributesError);
+ abort();
+ }
+ 
+ NSUInteger numberOfLengthReplacements = appcastContents replaceOccurrencesOfString:@"$INSERT_DELTA_ARCHIVE_LENGTH" withString:NSString stringWithFormat:@"%llu", archiveFileAttributes.fileSize options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length);
+ assert(numberOfLengthReplacements == 1);
+ 
+ NSUInteger numberOfSignatureReplacements = appcastContents replaceOccurrencesOfString:@"$INSERT_DELTA_EDDSA_SIGNATURE" withString:signatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length);
+ assert(numberOfSignatureReplacements == 1);
+ 
+ NSUInteger numberOfFromVersionReplacements = appcastContents replaceOccurrencesOfString:@"$INSERT_DELTA_FROM_VERSION" withString:mainBundleVersion options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length);
+ assert(numberOfFromVersionReplacements == 1);
+ 
+ NSError *writeAppcastError = nil;
+ if (!appcastContents writeToURL:appcastDestinationURL atomically:NO encoding:NSUTF8StringEncoding error:&writeAppcastError) {
+ NSLog(@"Failed to write updated appcast with error %@", writeAppcastError);
+ abort();
+ }
+ } else {
+ // Create the archive for our update
+ NSString *zipName = @"Sparkle_Test_App.zip";
+ NSTask *dittoTask = NSTask alloc init;
+ dittoTask.launchPath = @"/usr/bin/ditto";
+ dittoTask.arguments = @@"-c", @"-k", @"--sequesterRsrc", @"--keepParent", (NSString *)destinationBundleURL.lastPathComponent, zipName;
+ dittoTask.currentDirectoryPath = serverDirectoryPath;
+ dittoTask launch;
+ dittoTask waitUntilExit;
+ 
+ assert(dittoTask.terminationStatus == 0);
+ 
+ NSURL *archiveURL = serverDirectoryURL URLByAppendingPathComponent:zipName;
+ NSData *archive = NSData dataWithContentsOfURL:archiveURL;
+ assert(archive != nil);
+
+ ed25519_sign(signature, archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
+
+ NSString *signatureString = NSData dataWithBytes:signature length:64 base64EncodedStringWithOptions:0;
+ 
+ // Obtain the file attributes to get the file size of our update later
+ NSError *fileAttributesError = nil;
+ NSString *archiveURLPath = archiveURL.path;
+ assert(archiveURLPath != nil);
+ NSDictionary *archiveFileAttributes = NSFileManager defaultManager attributesOfItemAtPath:archiveURLPath error:&fileAttributesError;
+ if (archiveFileAttributes == nil) {
+ NSLog(@"Failed to retrieve file attributes from archive with error %@", fileAttributesError);
+ abort();
+ }
+ 
+ NSUInteger numberOfLengthReplacements = appcastContents replaceOccurrencesOfString:@"$INSERT_ARCHIVE_LENGTH" withString:NSString stringWithFormat:@"%llu", archiveFileAttributes.fileSize options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length);
+ assert(numberOfLengthReplacements == 2);
+ 
+ NSUInteger numberOfSignatureReplacements = appcastContents replaceOccurrencesOfString:@"$INSERT_EDDSA_SIGNATURE" withString:signatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length);
+ assert(numberOfSignatureReplacements == 2);
+ 
+ NSError *writeAppcastError = nil;
+ if (!appcastContents writeToURL:appcastDestinationURL atomically:NO encoding:NSUTF8StringEncoding error:&writeAppcastError) {
+ NSLog(@"Failed to write updated appcast with error %@", writeAppcastError);
+ abort();
+ }
+ }
+ 
+ fileManager removeItemAtURL:destinationBundleURL error:NULL;
+ 
+ // Finally start the server
+ SUTestWebServer *webServer = SUTestWebServer alloc initWithPort:1337 workingDirectory:serverDirectoryPath;
+ if (!webServer) {
+ NSLog(@"Failed to create the web server");
+ abort();
+ }
+ self.webServer = webServer;
+ 
+ // Set up updater and the updater settings window
+ {
+ self.updateSettingsWindowController = SUUpdateSettingsWindowController alloc init;
+ 
+ NSWindow *settingsWindow = self.updateSettingsWindowController.window;
+ 
+ NSBundle *hostBundle = NSBundle mainBundle;
+ NSBundle *applicationBundle = hostBundle;
+ 
+ id<SPUUserDriver> userDriver;
+#if SPARKLE_BUILD_UI_BITS
+ if (shiftKeyHeldDown) {
+ userDriver = SUPopUpTitlebarUserDriver alloc initWithWindow:settingsWindow;
+ } else {
+ userDriver = SPUStandardUserDriver alloc initWithHostBundle:hostBundle delegate:nil;
+ }
+#else
+ userDriver = SUPopUpTitlebarUserDriver alloc initWithWindow:settingsWindow;
+#endif
+ 
+ SPUUpdater *updater = SPUUpdater alloc initWithHostBundle:hostBundle applicationBundle:applicationBundle userDriver:userDriver delegate:self;
+ 
+ self.updater = updater;
+ self.updateSettingsWindowController.updater = updater;
+ 
+ NSError *updaterError = nil;
+ if (!updater startUpdater:&updaterError) {
+ NSLog(@"Failed to start updater with error: %@", updaterError);
+ 
+ NSAlert *alert = NSAlert alloc init;
+ alert.messageText = @"Updater Error";
+ alert.informativeText = @"The Updater failed to start. For detailed error information, check the Console.app log.";
+ alert addButtonWithTitle:@"OK";
+ alert runModal;
+ }
+ 
+ self.updateSettingsWindowController showWindow:nil;
+ }
+ });
+ };
+}
+
+- (NSSet<NSString *> *)allowedChannelsForUpdater:(SPUUpdater *)updater
+{
+ if (self.testMode isEqualToString:@"DELTA") {
+ return NSSet setWithObject:@"delta";
+ } else if (self.testMode isEqualToString:@"AUTOMATIC") {
+ return NSSet setWithObject:@"automatic";
+ } else {
+ return NSSet set;
+ }
+}
+
+- (void)signApplicationIfRequiredAtPath:(NSString *)applicationPath completion:(void (^)(void))completionBlock
+{
+ // This is unfortunately necessary for testing sandboxing
+ NSXPCConnection *codeSignConnection = NSXPCConnection alloc initWithServiceName:@"org.sparkle-project.TestAppHelper";
+ codeSignConnection.remoteObjectInterface = NSXPCInterface interfaceWithProtocol:@protocol(TestAppHelperProtocol);
+ codeSignConnection resume;
+ 
+ (id<TestAppHelperProtocol>)codeSignConnection.remoteObjectProxy codeSignApplicationAtPath:applicationPath reply:^(BOOL success) {
+ assert(success);
+ codeSignConnection invalidate;
+ 
+ completionBlock();
+ };
+}
+
+- (void)applicationWillTerminate:(NSNotification * __unused)notification
+{
+ self.webServer close;
+}
+
+- (IBAction)checkForUpdates:(id __unused)sender
+{
+ self.updater checkForUpdates;
+}
+
+- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+{
+ if (menuItem.action == @selector(checkForUpdates:)) {
+ return self.updater.canCheckForUpdates;
+ }
+ return YES;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUTestWebServer.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUTestWebServer.m Added

@@ -0,0 +1,263 @@
+//
+// SUTestWebServer.m
+// Sparkle
+//
+// Created by Kevin Wojniak on 10/8/15.
+// Copyright © 2015 Sparkle Project. All rights reserved.
+//
+
+#import "SUTestWebServer.h"
+#import <sys/socket.h>
+#import <netinet/in.h>
+
+@class SUTestWebServerConnection;
+
+@protocol SUTestWebServerConnectionDelegate <NSObject>
+@required
+- (void)connectionDidClose:(SUTestWebServerConnection*)sender;
+@end
+
+@interface SUTestWebServerConnection : NSObject <NSStreamDelegate>
+
+@property (nonatomic) NSString* workingDirectory;
+@property (nonatomic, weak) id<SUTestWebServerConnectionDelegate> delegate;
+@property (nonatomic) NSInputStream *inputStream;
+@property (nonatomic) NSOutputStream *outputStream;
+@property (nonatomic) NSData *dataToWrite;
+@property (nonatomic) NSInteger numBytesToWrite;
+
+@end
+
+@implementation SUTestWebServerConnection
+
+@synthesize workingDirectory = _workingDirectory;
+@synthesize delegate = _delegate;
+@synthesize inputStream = _inputStream;
+@synthesize outputStream = _outputStream;
+@synthesize dataToWrite = _dataToWrite;
+@synthesize numBytesToWrite = _numBytesToWrite;
+
+- (instancetype)initWithNativeHandle:(CFSocketNativeHandle)handle workingDirectory:(NSString*)workingDirectory delegate:(id<SUTestWebServerConnectionDelegate>)delegate {
+ self = super init;
+ assert(self != nil);
+ 
+ _workingDirectory = workingDirectory;
+ _delegate = delegate;
+ 
+ CFReadStreamRef readStream = NULL;
+ CFWriteStreamRef writeStream = NULL;
+ CFStreamCreatePairWithSocket(NULL, handle, &readStream, &writeStream);
+ assert(readStream != NULL);
+ assert(writeStream != NULL);
+ 
+ _inputStream = (__bridge NSInputStream*)readStream;
+ assert(_inputStream != nil);
+ _inputStream.delegate = self;
+ 
+ _outputStream = (__bridge NSOutputStream*)writeStream;
+ assert(_outputStream != nil);
+ _outputStream.delegate = self;
+ 
+ _inputStream scheduleInRunLoop:NSRunLoop currentRunLoop forMode:NSDefaultRunLoopMode;
+ _outputStream scheduleInRunLoop:NSRunLoop currentRunLoop forMode:NSDefaultRunLoopMode;
+ _inputStream open;
+ _outputStream open;
+ 
+ return self;
+}
+
+- (void)close {
+ NSInputStream *inputStream = self.inputStream;
+ NSOutputStream *outputStream = self.outputStream;
+ if (inputStream == nil) {
+ assert(outputStream == nil);
+ return;
+ }
+ inputStream close;
+ outputStream close;
+ inputStream removeFromRunLoop:NSRunLoop currentRunLoop forMode:NSDefaultRunLoopMode;
+ outputStream removeFromRunLoop:NSRunLoop currentRunLoop forMode:NSDefaultRunLoopMode;
+ self.inputStream = nil;
+ self.outputStream = nil;
+ self.delegate connectionDidClose:self;
+}
+
+- (void)stream:(NSStream *)aStream handleEvent:(NSStreamEvent)eventCode {
+ if (eventCode == NSStreamEventEndEncountered) {
+ self close;
+ return;
+ }
+ if (aStream == self.inputStream && eventCode == NSStreamEventHasBytesAvailable) {
+ uint8_t buffer8096;
+ const NSInteger numBytes = self.inputStream read:buffer maxLength:sizeof(buffer);
+ if (numBytes > 0) {
+ NSString *request = NSString alloc initWithBytes:buffer length:(NSUInteger)numBytes encoding:NSUTF8StringEncoding;
+ NSArray *lines = request componentsSeparatedByString:@"\r\n";
+ NSString *requestLine = lines.count >= 3 ? lines objectAtIndex:0 : nil;
+ NSArray *parts = requestLine ? requestLine componentsSeparatedByString:@" " : nil;
+ // Only process GET requests for existing files
+ if ((NSString *)parts objectAtIndex:0 isEqualToString:@"GET") {
+ // Use NSURL to strip out query parameters
+ NSString *path = NSURL URLWithString:parts objectAtIndex:1 relativeToURL:nil.path;
+ NSString *filePath = self.workingDirectory stringByAppendingString:path;
+ BOOL isDir = NO;
+ if (!NSFileManager defaultManager fileExistsAtPath:filePath isDirectory:&isDir || isDir) {
+ NSLog(@"%@ - 404", requestLine);
+ self write404;
+ } else {
+ NSLog(@"%@ - 200", requestLine);
+ self write:NSData dataWithContentsOfFile:filePath status:YES;
+ }
+ } else {
+ NSLog(@"%@ - 404", requestLine);
+ self write404;
+ }
+ }
+ } else if (aStream == self.outputStream && eventCode == NSStreamEventHasSpaceAvailable && self.dataToWrite != nil) {
+ self checkIfCanWriteNow;
+ }
+}
+
+- (void)write404 {
+ NSString *body = @"<html><head><title>404 Not Found</title></head><body><h1>Not Found</h1></body></html>";
+ self write:body dataUsingEncoding:NSUTF8StringEncoding status:NO;
+}
+
+- (void)write:(NSData*)body status:(BOOL)status {
+ NSString *state = status ? @"200 OK" : @"404 Not Found";
+ NSString *header = NSString stringWithFormat:@"HTTP/1.0 %@\r\nContent-Length: %lu\r\n\r\n", state, body.length;
+ NSMutableData *response = header dataUsingEncoding:NSUTF8StringEncoding mutableCopy;
+ response appendData:body;
+ self queueWrite:response;
+}
+
+- (void)queueWrite:(NSData*)data {
+ assert(self.dataToWrite == nil);
+ assert(data != nil);
+ assert(data.length > 0);
+ self.dataToWrite = data;
+ self.numBytesToWrite = (NSInteger)data.length;
+ self checkIfCanWriteNow;
+}
+
+- (void)checkIfCanWriteNow {
+ assert(self.dataToWrite != nil);
+ if (self.numBytesToWrite == 0) {
+ // nothing more to write, we're done.
+ self.dataToWrite = nil;
+ self.numBytesToWrite = -1;
+ } else if (self.outputStream.hasSpaceAvailable) {
+ self writeNow;
+ }
+ // otherwise wait for space available event
+}
+
+- (void)writeNow {
+ assert(self.outputStream != nil);
+ assert(self.outputStream.hasSpaceAvailable);
+ assert(self.dataToWrite != nil);
+ NSData *dataToWrite = self.dataToWrite;
+ const uint8_t *bytesOffset = (const uint8_t*)dataToWrite.bytes + ((NSInteger)dataToWrite.length - self.numBytesToWrite);
+ const NSInteger bytesWritten = self.outputStream write:bytesOffset maxLength:(NSUInteger)self.numBytesToWrite;
+ if (bytesWritten > 0) {
+ self.numBytesToWrite = self.numBytesToWrite - bytesWritten;
+ assert(self.numBytesToWrite >= 0);
+ // wait for next space available event to write more
+ } else {
+ NSLog(@"Error: bytes written = %ld (%@)", bytesWritten, NSString stringWithUTF8String:strerror(errno));
+ }
+}
+
+@end
+
+@interface SUTestWebServer () <SUTestWebServerConnectionDelegate> {
+ CFSocketRef _socket;
+}
+
+@property (nonatomic) NSMutableArray *connections;
+@property (nonatomic) NSString *workingDirectory;
+
+- (void)accept:(CFSocketNativeHandle)address;
+
+@end
+
+static void connectCallback(CFSocketRef __unused s, CFSocketCallBackType type, CFDataRef __unused address, const void *data, void *info) {
+ if (type == kCFSocketAcceptCallBack) {
+ assert(data != NULL);
+ assert(info != NULL);
+ SUTestWebServer *server = (__bridge SUTestWebServer*)info;
+ assert(server != nil);
+ server accept:*(const CFSocketNativeHandle*)data;
+ }
+}
+
+@implementation SUTestWebServer
+
+@synthesize connections = _connections;
+@synthesize workingDirectory = _workingDirectory;
+
+- (instancetype)initWithPort:(int)port workingDirectory:(NSString*)workingDirectory {
+ self = super init;
+ assert(self != nil);
+ 
+ CFSocketContext ctx;
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.info = (__bridge void*)self;
+ _socket = CFSocketCreate(NULL, 0, 0, 0, kCFSocketAcceptCallBack, connectCallback, &ctx);
+ assert(_socket != NULL);
+ 
+ struct sockaddr_in address;
+ memset(&address, 0, sizeof(address));
+ address.sin_len = sizeof(address);
+ address.sin_family = AF_INET;
+ address.sin_port = htons(port);
+ address.sin_addr.s_addr = INADDR_ANY;
+ 
+ // will fail if port is in use.
+ CFSocketError socketErr = CFSocketSetAddress(_socket, (CFDataRef)NSData dataWithBytes:&address length:sizeof(address));
+ if (socketErr != kCFSocketSuccess) {
+ NSLog(@"Socket error: %@", NSString stringWithUTF8String:strerror(errno));
+ return nil;
+ }
+ 
+ _connections = NSMutableArray alloc init;
+ _workingDirectory = workingDirectory;
+
+ CFRunLoopSourceRef source = CFSocketCreateRunLoopSource(NULL, _socket, 0);
+ assert(source != NULL);
+ CFRunLoopAddSource(CFRunLoopGetCurrent(), source, kCFRunLoopDefaultMode);
+ CFRelease(source);
+ 
+ return self;
+}
+
+- (void)connectionDidClose:(SUTestWebServerConnection *)sender {
+ assert(self.connections != nil);
+ assert(self.connections containsObject:sender);
+ self.connections removeObject:sender;
+}
+
+- (void)accept:(CFSocketNativeHandle)address {
+ SUTestWebServerConnection *conn = SUTestWebServerConnection alloc initWithNativeHandle:address workingDirectory:self.workingDirectory delegate:self;
+ assert(conn != nil);
+ if (conn) {
+ assert(self.connections != nil);
+ self.connections addObject:conn;
+ }
+}
+
+- (void)close {
+ for (SUTestWebServerConnection *conn in self.connections) {
+ conn close;
+ }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdirect-ivar-access"
+ if (_socket) {
+ CFSocketInvalidate(_socket);
+ CFRelease(_socket);
+ _socket = NULL;
+ }
+#pragma clang diagnostic pop
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUUpdateSettingsWindowController.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUUpdateSettingsWindowController.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/SUUpdateSettingsWindowController.xib Added

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+ <dependencies>
+ <deployment identifier="macosx"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+ </dependencies>
+ <objects>
+ <customObject id="-2" userLabel="File's Owner" customClass="SUUpdateSettingsWindowController">
+ <connections>
+ <outlet property="window" destination="Sg3-gX-Lin" id="wMT-bp-cDf"/>
+ </connections>
+ </customObject>
+ <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+ <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+ <userDefaultsController representsSharedInstance="YES" id="ppb-Rb-fc7" userLabel="Shared User Defaults Controller"/>
+ <window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="Sg3-gX-Lin" userLabel="Options Window">
+ <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+ <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES"/>
+ <rect key="contentRect" x="543" y="572" width="314" height="149"/>
+ <rect key="screenRect" x="0.0" y="0.0" width="1366" height="745"/>
+ <value key="minSize" type="size" width="213" height="107"/>
+ <view key="contentView" id="0o9-QI-P26">
+ <rect key="frame" x="0.0" y="0.0" width="314" height="149"/>
+ <autoresizingMask key="autoresizingMask"/>
+ <subviews>
+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Ztb-OP-JVc">
+ <rect key="frame" x="22" y="88" width="225" height="18"/>
+ <buttonCell key="cell" type="check" title="Automatically check for updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="tLK-9z-r4H">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.updater.automaticallyChecksForUpdates" id="23i-l2-Iol"/>
+ </connections>
+ </button>
+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="z6k-h3-dCv">
+ <rect key="frame" x="22" y="68" width="228" height="18"/>
+ <buttonCell key="cell" type="check" title="Automatically download updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="lEd-7a-Fwr">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.updater.automaticallyDownloadsUpdates" id="JjR-6W-VVm"/>
+ </connections>
+ </button>
+ <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wFV-vU-Dle">
+ <rect key="frame" x="22" y="48" width="224" height="18"/>
+ <buttonCell key="cell" type="check" title="Send system profile information" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="vXw-Wi-ZkC">
+ <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+ 
+ </buttonCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.updater.sendsSystemProfile" id="neZ-PW-Ps7"/>
+ </connections>
+ </button>
+ <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mU2-vs-cVn">
+ <rect key="frame" x="21" y="112" width="106" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Debug options:" id="GIS-sb-n98">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="7Is-To-hSg">
+ <rect key="frame" x="18" y="22" width="157" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Check for updates every" id="ObK-Ox-eAR">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XCP-rZ-MyN">
+ <rect key="frame" x="241" y="22" width="63" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="seconds" id="Cng-TF-emj">
+ 
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ajc-nf-0sD">
+ <rect key="frame" x="180" y="20" width="56" height="22"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="gV9-qi-vv1">
+ 
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <connections>
+ <binding destination="-2" name="value" keyPath="self.updater.updateCheckInterval" id="U5m-Up-VEZ"/>
+ </connections>
+ </textField>
+ </subviews>
+ </view>
+ <point key="canvasLocation" x="233" y="312.5"/>
+ </window>
+ </objects>
+</document>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/Sparkle-Test-App.entitlements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/TestApplication-Info.plist Added

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>Sparkle Test App</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.5.1</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.5.1</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>SUEnableSystemProfiling</key>
+	<true/>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>SUFeedURL</key>
+	<string>http://localhost:1337/sparkletestcast.xml</string>
+	<key>SUPublicEDKey</key>
+	<string>eRFPLZuNM6m8bltmtpPX4fzKbufI1z6rKJHtgIIsllk=</string>
+	<key>SUEnableInstallerLauncherService</key>
+	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ar.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ar.lproj/MainMenu.strings Added

@@ -0,0 +1,162 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Bring All to Front";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimize";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Window";
+
+/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */
+"29.title" = "MainMenu";
+
+/* Class = "NSMenuItem"; title = "Sparkle Test App"; ObjectID = "56"; */
+"56.title" = "Sparkle Test App";
+
+/* Class = "NSMenu"; title = "Sparkle Test App"; ObjectID = "57"; */
+"57.title" = "Sparkle Test App";
+
+/* Class = "NSMenuItem"; title = "About Sparkle Test App"; ObjectID = "58"; */
+"58.title" = "About Sparkle Test App";
+
+/* Class = "NSMenuItem"; title = "Open..."; ObjectID = "72"; */
+"72.title" = "Open...";
+
+/* Class = "NSMenuItem"; title = "Close"; ObjectID = "73"; */
+"73.title" = "Close";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "75"; */
+"75.title" = "Save";
+
+/* Class = "NSMenuItem"; title = "Page Setup…"; ObjectID = "77"; */
+"77.title" = "Page Setup…";
+
+/* Class = "NSMenuItem"; title = "Print…"; ObjectID = "78"; */
+"78.title" = "Print…";
+
+/* Class = "NSMenuItem"; title = "Save As…"; ObjectID = "80"; */
+"80.title" = "Save As…";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "81"; */
+"81.title" = "File";
+
+/* Class = "NSMenuItem"; title = "New"; ObjectID = "82"; */
+"82.title" = "New";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "83"; */
+"83.title" = "File";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Help";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Help";
+
+/* Class = "NSMenuItem"; title = "Sparkle Test App Help"; ObjectID = "111"; */
+"111.title" = "Sparkle Test App Help";
+
+/* Class = "NSMenuItem"; title = "Revert"; ObjectID = "112"; */
+"112.title" = "Revert";
+
+/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "124"; */
+"124.title" = "Open Recent";
+
+/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "125"; */
+"125.title" = "Open Recent";
+
+/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "126"; */
+"126.title" = "Clear Menu";
+
+/* Class = "NSMenu"; title = "Services"; ObjectID = "130"; */
+"130.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "131"; */
+"131.title" = "Services";
+
+/* Class = "NSMenuItem"; title = "Hide Sparkle Test App"; ObjectID = "134"; */
+"134.title" = "Hide Sparkle Test App";
+
+/* Class = "NSMenuItem"; title = "Quit Sparkle Test App"; ObjectID = "136"; */
+"136.title" = "Quit Sparkle Test App";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Hide Others";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Show All";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "154"; */
+"154.title" = "Find…";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "155"; */
+"155.title" = "Jump to Selection";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "157"; */
+"157.title" = "Copy";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "158"; */
+"158.title" = "Undo";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "159"; */
+"159.title" = "Find";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "160"; */
+"160.title" = "Cut";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "161"; */
+"161.title" = "Use Selection for Find";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "162"; */
+"162.title" = "Find Previous";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "163"; */
+"163.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "164"; */
+"164.title" = "Delete";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "167"; */
+"167.title" = "Find Next";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "168"; */
+"168.title" = "Find";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "169"; */
+"169.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "171"; */
+"171.title" = "Paste";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "172"; */
+"172.title" = "Select All";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "173"; */
+"173.title" = "Redo";
+
+/* Class = "NSMenuItem"; title = "Spelling"; ObjectID = "184"; */
+"184.title" = "Spelling";
+
+/* Class = "NSMenu"; title = "Spelling"; ObjectID = "185"; */
+"185.title" = "Spelling";
+
+/* Class = "NSMenuItem"; title = "Spelling…"; ObjectID = "187"; */
+"187.title" = "Spelling…";
+
+/* Class = "NSMenuItem"; title = "Check Spelling"; ObjectID = "189"; */
+"189.title" = "Check Spelling";
+
+/* Class = "NSMenuItem"; title = "Check Spelling as You Type"; ObjectID = "191"; */
+"191.title" = "Check Spelling as You Type";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "204"; */
+"204.title" = "Paste and Match Style";
+
+/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "207"; */
+"207.title" = "Check for Updates…";

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ca.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ca.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/cs.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/cs.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/da.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/da.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/de.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/de.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/el.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/el.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/en.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/en.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/es.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/es.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fa.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fa.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fi.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fi.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/fr.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/he.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/he.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/hr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/hr.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/hu.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/hu.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/is.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/is.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/it.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/it.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ja.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ja.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ko.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ko.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/main.m Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/nb.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/nb.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/nl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/nl.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pl.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pt-BR.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pt-BR.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pt-PT.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/pt-PT.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ro.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ro.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ru.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/ru.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/screenshot.png Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sk.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sk.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sl.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sl.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sparkletestcast.xml Added

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <channel>
+ <title>Sparkle Test App Changelog</title>
+ <description>Most recent changes with links to updates.</description>
+ <language>en</language>
+ <item>
+ <title>Version 2.2</title>
+ <sparkle:version>2.2</sparkle:version>
+ <link>https://sparkle-project.org</link>
+ <sparkle:channel>automatic</sparkle:channel>
+ <sparkle:fullReleaseNotesLink>releasenotes.html</sparkle:fullReleaseNotesLink>
+ <description>
+ <!CDATA
+ <ul>
+ <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+ </ul>
+ >
+ </description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="$INSERT_ARCHIVE_LENGTH" type="application/octet-stream" sparkle:edSignature="$INSERT_EDDSA_SIGNATURE" />
+ </item>
+ 
+ <item>
+ <title>Version 2.1</title>
+ <sparkle:version>2.1</sparkle:version>
+ <link>https://sparkle-project.org</link>
+ <sparkle:channel>delta</sparkle:channel>
+ <sparkle:fullReleaseNotesLink>releasenotes.html</sparkle:fullReleaseNotesLink>
+ <description>
+ <!CDATA
+ <ul>
+ <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+ <li>Suspendisse sed felis ac ante ultrices rhoncus. Etiam quis elit vel nibh placerat facilisis in id leo.</li>
+ </ul>
+ >
+ </description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ 
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="100000" type="application/octet-stream" sparkle:edSignature="ootgYIwmnS1wa7Q/5SXDXnOVdKnjkjrFhm/D7ukW77k=" />
+ 
+ <sparkle:deltas>
+ <enclosure url="http://localhost:1337/patch.delta"
+ sparkle:deltaFrom="$INSERT_DELTA_FROM_VERSION"
+ length="$INSERT_DELTA_ARCHIVE_LENGTH"
+ type="application/octet-stream"
+ sparkle:edSignature="$INSERT_DELTA_EDDSA_SIGNATURE" />
+ </sparkle:deltas>
+ </item>
+ 
+ <item>
+ <title>Version 2.0</title>
+ <sparkle:version>2.0</sparkle:version>
+ <link>https://sparkle-project.org</link>
+ <sparkle:fullReleaseNotesLink>releasenotes.html</sparkle:fullReleaseNotesLink>
+ <description>
+ <!CDATA
+ <ul>
+ <li>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</li>
+ <li>Suspendisse sed felis ac ante ultrices rhoncus. Etiam quis elit vel nibh placerat facilisis in id leo.</li>
+ <li>Vestibulum nec tortor odio, nec malesuada libero. Cras vel convallis nunc.</li>
+ <li>Suspendisse tristique massa eget velit consequat tincidunt. Praesent sodales hendrerit <a href="#">pretium</a>.</li>
+ </ul>
+ >
+ </description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="$INSERT_ARCHIVE_LENGTH" type="application/octet-stream" sparkle:edSignature="$INSERT_EDDSA_SIGNATURE" />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sv.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/sv.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/th.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/th.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/tr.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/tr.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/uk.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/uk.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_CN.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_CN.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_HK.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_HK.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_TW.lproj Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/TestApplication/zh_TW.lproj/MainMenu.strings Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/.swiftlint.yml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/Both.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/Both.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/Both.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/Both.bundle/Contents/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/Both.bundle/Contents/Resources/test-pubkey.pem Added

@@ -0,0 +1,36 @@
+-----BEGIN PUBLIC KEY-----
+MIIGOjCCBC0GByqGSM44BAEwggQgAoICAQCHyAu13F9I72JZzN9KgVhrprKnRH7n
+dJJP5ZVHaSqm5PbRmHbnT06DGMxloZc8Nd5QWwG6N+5O1I9ZZjnIrc9Qzodho8hM
+KNInrfCEy/lTHjydvQvYG2LitbknapgGTf57BWEIYSiAQyP8Gs6lTVZmGrqSJdRC
+Kdt29OmFKLhWVn5hm2nx7PCbRT7FzrRyX8jkjCUKSeI/s1j3jpjFT5nGutAsSYNS
+Y/ifH1/IRejv9kRUEWM7qEU/ue3C18qCoDsmTSQVh+E1MIBWqeaWWAGrw7JO4cxR
+cgR6eeDYp8plTw//e9dSn1u/6ArnQ4QAoZP8Q6MfJMABgg07lltRIQYiXnUNPE4c
+xzMQ6kxbKLBi2VyeKm/mQ5oO6PH+59Lw0Q1YhchAXCO171fx2s4W2UGcIjdNbyhs
+My5iSEICwXQQgAvTEC08An8aYi5waEpQ1fnnkQcawTgRoBL2gMNsQOkZdERbJr2X
+zNJfLwGoDnNJTD8V4FCAeHieOAqmlGsqRc7mKPq2EVW7GH6vzWBJbZc71rmk7EwY
+2zvpR9aFam71ivmFgLYwLrRef3vd+AGbIc2WOcIADJ9JIa6HF1gK8LSym/t+/2ws
+fQ1FHpjHmYZICJqac1SQ6KZhMz9q35yKqBSaNmiv+mXBg7W6Jfckjg8mGgxvTdL+
+VDRDlK9K6bxClwIVAPd9bTMe17hl3ipR0X6O2UOmt799AoICABPfIvExHzdmJK+G
+kx+o28PNNw9ZAte2RxZWm8b0m9MW+jdeWDrhGbbk7nVJn6i6xaaRgJDWuZnKUQbC
+0WwjOm9fXnjBmnQhacJu0RGyr/b+akzZ4Y/7N+SBxRjasLVTFd+msQ2NE1PkXps5
+rhJWVMu9R9xp0qR/e+rh/Cax7nSq5UNAqSy9gzHkOhjS7s6UJ1yfCEO5Xfcvb7ND
+RpLIeBYbLT3OSkSd6kkFvMtb0Sl/WZ7z88flkdNGbutAcJVQzBcfQIwCuXyOYzUr
+8TcIB5j4c19MN9yfkykgemieC0uz/xzgtZt6g6bFfQNONmJ0YGoEPkz1GftI6dx/
+324vh4KhLfBjKDKFB8Pt9JKI9nQA7P10GlwWeA+IpSTzjlJq3x35u220K7tc/5xr
+TDMEftBemn/dvb/bJ9h+iSciZ7EcnN2RXB7SfykUAohE9DdEUlmjip6DYLP+hSN2
+oHiVmDVjv3XEGYQfATuxQmwcveHTYZmPId8XF2wkGiy6w0BY0NN+4oEuZga4YvEK
+3MVF2VEzM0onFzNgszwb+KaUfcA+eycthidca+sJzmOGAMWCx/vydNryMcWVXABF
+IRxbZVaXHCWf1RhAf0jcsiz9+JIuScAB2J26Oy2shPGOmesvuUHeUTqzvEJ2G77j
+k9Mps+1fbzySKX3PQEwA/qQ11qT6A4ICBQACggIAbDXVjXtIxAM4TSt9FSep+H1j
+yRoEXgisf5Q6eU6I7Wf6kAoW6bHw76S/OHgcMBYX7Z42kbVbna/rIAVfHnfrAaZY
+ygYVqbxTKdhi0c8IxR2qyF9Z5UK68C/EP0SHjHJrFRAnYgwkqvJXbemHFB4c0Ds1
+iIL47Kas8o/WvLpT1VzlHXFyFKvRxNMdeJsy8/LBSrQpRUiKcJFM2lg+O8cNWsRd
+kHTeWnjLrZT2rpPUIkSQZdbR16VBI8nS4pYpzdZ/N2zy+2S5dup7jMNtnLbXVT3X
+AjSjiYHRZPQUnX0pG3qA0BzDuA0U3MdBs8Wf7YhGd8XLbAfdo5zPSM9GimJrGH0s
+q4XKLHAEXUPfSuDGOdG8l990MujcRrewocwX5La1X/Nc4TDClCPUOVbf1aqy7LXY
+TB1M+nHvTb5HhtIrZYSHmsdpWlcLj5mYde/nvFXmNu3RNVCLhMzQDV9S/U1hqNcH
+m/BX2VTJ0xqhFIlA5UVrKZpnAEISKcFjwmZo7GuA1ENw2vhuvswjfYQ3OMfEr258
+0b1tKNMWrkbCgHdALjT/VdRUtte7RyGvsMccUHu6MHPowFRxbT3lWUqj1LKdZYnT
+uERL4E1J2VIP1/x2upPPWl/wbQjxplsRQrSY+cQCfWM22Wtilouh+CdEc+1DNKs/
+bKZWFUcty/GYmXtxTTk=
+-----END PUBLIC KEY-----

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/Resources/test-pubkey.pem Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature/CodeResources Added

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict>
+		<key>Resources/test-pubkey.pem</key>
+		<data>
+		pR1EGsp5nhk1vr/xfQPT8es9ZBw=
+		</data>
+	</dict>
+	<key>files2</key>
+	<dict>
+		<key>Resources/test-pubkey.pem</key>
+		<dict>
+			<key>hash</key>
+			<data>
+			pR1EGsp5nhk1vr/xfQPT8es9ZBw=
+			</data>
+			<key>hash2</key>
+			<data>
+			zD/XQJu4ElPWE6sfqtzoR2vEjdfgi98j/hiRoYZqv9w=
+			</data>
+		</dict>
+	</dict>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^^/+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBoth.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/Resources/test-pubkey.pem Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature/CodeResources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedBothNew.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/Resources/test-pubkey.pem Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature/CodeResources Changed

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalid.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature/CodeResources Added

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>files</key>
+	<dict/>
+	<key>files2</key>
+	<dict/>
+	<key>rules</key>
+	<dict>
+		<key>^Resources/</key>
+		<true/>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^version.plist$</key>
+		<true/>
+	</dict>
+	<key>rules2</key>
+	<dict>
+		<key>.*\.dSYM($|/)</key>
+		<dict>
+			<key>weight</key>
+			<real>11</real>
+		</dict>
+		<key>^(.*/)?\.DS_Store$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>2000</real>
+		</dict>
+		<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^.*</key>
+		<true/>
+		<key>^Info\.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^PkgInfo$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^Resources/.*\.lproj/</key>
+		<dict>
+			<key>optional</key>
+			<true/>
+			<key>weight</key>
+			<real>1000</real>
+		</dict>
+		<key>^Resources/.*\.lproj/locversion.plist$</key>
+		<dict>
+			<key>omit</key>
+			<true/>
+			<key>weight</key>
+			<real>1100</real>
+		</dict>
+		<key>^Resources/Base\.lproj/</key>
+		<dict>
+			<key>weight</key>
+			<real>1010</real>
+		</dict>
+		<key>^^/+$</key>
+		<dict>
+			<key>nested</key>
+			<true/>
+			<key>weight</key>
+			<real>10</real>
+		</dict>
+		<key>^embedded\.provisionprofile$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+		<key>^version\.plist$</key>
+		<dict>
+			<key>weight</key>
+			<real>20</real>
+		</dict>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedInvalidOnly.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature/CodeResources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOldED.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature/CodeResources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnly.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature/CodeDirectory Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature/CodeRequirements Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature/CodeRequirements-1 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature/CodeResources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/CodeSignedOnlyNew.bundle/Contents/_CodeSignature/CodeSignature Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/DSAOnly.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/DSAOnly.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/DSAOnly.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/DSAOnly.bundle/Contents/Resources Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/DSAOnly.bundle/Contents/Resources/test-pubkey.pem Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/EDOnly.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/EDOnly.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/EDOnly.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/None.bundle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/None.bundle/Contents Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/None.bundle/Contents/Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SUUpdateValidatorTest/resign-all.sh Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.dmg Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.enc.dmg Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.tar Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.tar.bz2 Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.tar.gz Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.tar.xz Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp.zip Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp_bad_extraneous.zip Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSignApp_bad_header.zip Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/SparkleTestCodeSign_apfs.dmg Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/signed-test-file.txt Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/test-links.xml Added

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ <title>Version 3.0</title>
+ <pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
+ <sparkle:releaseNotesLink>https://sparkle-project.org/notes/relnote-3.0.txt</sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>https://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
+ <link>https://sparkle-project.org</link>
+ <enclosure url="https://sparkle-project.org/release-3.0.zip" sparkle:version="3.0" length="1346234" />
+ </item>
+ <item>
+ <title>Version 2.0</title>
+ <pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
+ <sparkle:releaseNotesLink>http://sparkle-project.org/notes/relnote-2.0.txt</sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>http://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
+ <link>http://sparkle-project.org</link>
+ <enclosure url="http://sparkle-project.org/release-2.0.zip" sparkle:version="2.0" length="1346234" />
+ </item>
+ <item>
+ <title>Version 1.0</title>
+ <pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
+ <sparkle:releaseNotesLink>file://sparkle-project.org/notes/relnote-1.0.txt</sparkle:releaseNotesLink>
+ <sparkle:fullReleaseNotesLink>file://sparkle-project.org/fullnotes.txt</sparkle:fullReleaseNotesLink>
+ <link>file://sparkle-project.org</link>
+ <enclosure url="file://sparkle-project.org/release-1.0.zip" sparkle:version="1.0" length="1346234" />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/test-pubkey.pem Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/test-relative-urls.xml Added

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ <title>Version 3.0</title>
+ <pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
+ <sparkle:releaseNotesLink>notes/relnote-3.0.txt</sparkle:releaseNotesLink>
+ <enclosure url="release-3.0.zip" sparkle:version="3.0" length="1346234" />
+ </item>
+ <item>
+ <title>Version 2.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <sparkle:version>2.0</sparkle:version>
+ <link>/info/info-2.0.txt</link>
+ </item>
+ <item>
+ <title>Version 1.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <sparkle:version>1.0</sparkle:version>
+ <sparkle:fullReleaseNotesLink>notes/fullnotes.txt</sparkle:fullReleaseNotesLink>
+ <enclosure url="release-1.0.zip" sparkle:version="1.0" length="1346234" />
+ </item>
+ <item>
+ <title>Version 0.9</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <sparkle:version>0.9</sparkle:version>
+ <sparkle:fullReleaseNotesLink>https://sparkle-project.org/releasenotes.html</sparkle:fullReleaseNotesLink>
+ <enclosure url="release-0.9.zip" sparkle:version="0.9" length="1346234" />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/test.pkg Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast.xml Added

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ <title>Version 2.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ 
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" sparkle:version="2.0" />
+ <sparkle:criticalUpdate sparkle:version="1.5" />
+ </item>
+ 
+ <item>
+ <title>Version 3.0</title>
+ <sparkle:version>3.0</sparkle:version>
+ <sparkle:phasedRolloutInterval>86400</sparkle:phasedRolloutInterval>
+ 
+ <sparkle:tags><sparkle:criticalUpdate /></sparkle:tags>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:deltas>
+ <enclosure url="http://localhost:1337/3.0_from_2.0.patch"
+ sparkle:deltaFrom="2.0"
+ length="1235"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ 
+ <enclosure url="http://localhost:1337/3.0_from_1.0.patch"
+ sparkle:deltaFrom="1.0"
+ length="1485"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ </sparkle:deltas>
+ </item>
+ 
+ <item>
+ <title>Version 4.0</title>
+ <sparkle:version>4.0</sparkle:version>
+ <pubDate>Sat, 26 Jul 2014 15:20:13 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:minimumSystemVersion>17.0.0</sparkle:minimumSystemVersion>
+ </item>
+ 
+ <item>
+ <title>Version 5.0</title>
+ <sparkle:version>5.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:maximumSystemVersion>2.0.0</sparkle:maximumSystemVersion>
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_channels.xml Added

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ 
+ <item>
+ <title>Version 2.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" sparkle:version="2.0" />
+ <sparkle:criticalUpdate sparkle:version="1.5" />
+ </item>
+ 
+ <item>
+ <title>Version 3.0</title>
+ <sparkle:tags><sparkle:criticalUpdate /></sparkle:tags>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" sparkle:version="3.0" length="1346234" />
+ <sparkle:deltas>
+ <enclosure url="http://localhost:1337/3.0_from_2.0.patch"
+ sparkle:version="3.0"
+ sparkle:deltaFrom="2.0"
+ length="1235"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ 
+ <enclosure url="http://localhost:1337/3.0_from_1.0.patch"
+ sparkle:version="3.0"
+ sparkle:deltaFrom="1.0"
+ length="1485"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ </sparkle:deltas>
+ 
+ <sparkle:channel></sparkle:channel>
+ </item>
+ 
+ <item>
+ <title>Version 4.0</title>
+ <sparkle:version>4.0</sparkle:version>
+ <pubDate>Sat, 26 Jul 2014 15:20:13 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:channel>beta</sparkle:channel>
+ </item>
+ 
+ <item>
+ <title>Version 5.0</title>
+ <sparkle:version>5.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:channel>nightly</sparkle:channel>
+ </item>
+ 
+ <item>
+ <title>Version 6.0</title>
+ <sparkle:version>6.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" sparkle:os="windows" />
+ </item>
+ 
+ <item>
+ <title>Version 7.0</title>
+ <sparkle:version>7.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" sparkle:deltaFrom="5.0" sparkle:edSignature="..." />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_info_updates.xml Added

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ 
+ <item>
+ <title>Version 2.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" sparkle:version="2.0" />
+ </item>
+ 
+ <item>
+ <title>Version 3.0</title>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" sparkle:version="3.0" length="1346234" />
+ <sparkle:informationalUpdate>
+ <sparkle:version>2.5</sparkle:version>
+ <sparkle:version>2.4</sparkle:version>
+ <sparkle:belowVersion>0.5</sparkle:belowVersion>
+ </sparkle:informationalUpdate>
+ <link>http://sparkle-project.org</link>
+ </item>
+ 
+ <item>
+ <title>Version 4.0</title>
+ <pubDate>Sat, 26 Jul 2014 15:20:13 +0000</pubDate>
+ <sparkle:version>4.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ <sparkle:informationalUpdate></sparkle:informationalUpdate>
+ <link>http://sparkle-project.org</link>
+ <sparkle:deltas>
+ <enclosure url="http://localhost:1337/4.0_from_2.0.patch"
+ sparkle:deltaFrom="2.0"
+ length="1235"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ 
+ <enclosure url="http://localhost:1337/4.0_from_1.0.patch"
+ sparkle:deltaFrom="1.0"
+ length="1485"
+ type="application/octet-stream"
+ sparkle:edSignature="..." />
+ </sparkle:deltas>
+ </item>
+ 
+ <item>
+ <title>Version 5.0</title>
+ <sparkle:version>5.0</sparkle:version>
+ <link>http://sparkle-project.org</link>
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_minimumAutoupdateVersion.xml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_minimumAutoupdateVersionSkipping.xml Added

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ <title>Version 4.1</title>
+ <sparkle:version>4.1</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>4.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 4.0</title>
+ <sparkle:version>4.0</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>4.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 3.9</title>
+ <sparkle:version>3.9</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>3.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 3.0</title>
+ <sparkle:version>3.0</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>3.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 2.0</title>
+ <sparkle:version>2.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_minimumAutoupdateVersionSkipping2.xml Added

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ <title>Version 4.1</title>
+ <sparkle:version>4.1</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>4.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 4.0</title>
+ <sparkle:version>4.0</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>4.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 3.9</title>
+ <sparkle:version>3.9</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>3.0</sparkle:minimumAutoupdateVersion>
+ <sparkle:ignoreSkippedUpgradesBelowVersion>3.5</sparkle:ignoreSkippedUpgradesBelowVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 3.0</title>
+ <sparkle:version>3.0</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>3.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ <item>
+ <title>Version 2.0</title>
+ 
+ <sparkle:ignoreSkippedUpgradesBelowVersion>2.0</sparkle:ignoreSkippedUpgradesBelowVersion>
+ <sparkle:version>2.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="1346234" />
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testappcast_phasedRollout.xml Added

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
+ <channel>
+ <title>For unit test only</title>
+ <item>
+ 
+ <title>Version 3.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <sparkle:version>3.0</sparkle:version>
+ <sparkle:minimumAutoupdateVersion>2.0</sparkle:minimumAutoupdateVersion>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
+ <sparkle:phasedRolloutInterval>86400</sparkle:phasedRolloutInterval>
+ <sparkle:criticalUpdate></sparkle:criticalUpdate>
+ </item>
+ 
+ <item>
+ <title>Version 2.0</title>
+ <description>desc</description>
+ <pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
+ <sparkle:version>2.0</sparkle:version>
+ <enclosure url="http://localhost:1337/Sparkle_Test_App.zip" />
+ <sparkle:phasedRolloutInterval>86400</sparkle:phasedRolloutInterval>
+ </item>
+ </channel>
+</rss>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testlocalizedreleasenotesappcast.xml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Resources/testnamespaces.xml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUAppcastTest.swift Added

@@ -0,0 +1,976 @@
+//
+//  SUAppcastTest.swift
+//  Sparkle
+//
+//  Created by Kornel on 17/02/2016.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import XCTest
+import Sparkle
+
+class SUAppcastTest: XCTestCase {
+
+    func testParseAppcast() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator.default
+            let hostVersion = "1.0"
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+            
+            let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+            let items = appcast.items
+
+            XCTAssertEqual(4, items.count)
+
+            XCTAssertEqual("Version 2.0", items0.title)
+            XCTAssertEqual("desc", items0.itemDescription)
+            XCTAssertEqual("Sat, 26 Jul 2014 15:20:11 +0000", items0.dateString)
+            XCTAssertTrue(items0.isCriticalUpdate)
+            XCTAssertEqual(items0.versionString, "2.0")
+
+            // This is the best release matching our system version
+            XCTAssertEqual("Version 3.0", items1.title)
+            XCTAssertNil(items1.itemDescription)
+            XCTAssertNil(items1.dateString)
+            XCTAssertTrue(items1.isCriticalUpdate)
+            XCTAssertEqual(items1.phasedRolloutInterval, 86400)
+            XCTAssertEqual(items1.versionString, "3.0")
+
+            XCTAssertEqual("Version 4.0", items2.title)
+            XCTAssertNil(items2.itemDescription)
+            XCTAssertEqual("Sat, 26 Jul 2014 15:20:13 +0000", items2.dateString)
+            XCTAssertFalse(items2.isCriticalUpdate)
+
+            XCTAssertEqual("Version 5.0", items3.title)
+            XCTAssertNil(items3.itemDescription)
+            XCTAssertNil(items3.dateString)
+            XCTAssertFalse(items3.isCriticalUpdate)
+
+            // Test best appcast item & a delta update item
+            let currentDate = Date()
+            let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+            
+            let supportedAppcastItems = supportedAppcast.items
+            
+            var deltaItem: SUAppcastItem?
+            let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcastItems, getDeltaItem: &deltaItem, withHostVersion: "1.0", comparator: SUStandardVersionComparator())
+
+            XCTAssertEqual(bestAppcastItem, items1)
+            XCTAssertEqual(deltaItem!.fileURL!.lastPathComponent, "3.0_from_1.0.patch")
+            XCTAssertEqual(deltaItem!.versionString, "3.0")
+
+            // Test latest delta update item available
+            var latestDeltaItem: SUAppcastItem?
+            SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcastItems, getDeltaItem: &latestDeltaItem, withHostVersion: "2.0", comparator: SUStandardVersionComparator())
+
+            XCTAssertEqual(latestDeltaItem!.fileURL!.lastPathComponent, "3.0_from_2.0.patch")
+
+            // Test a delta item that does not exist
+            var nonexistantDeltaItem: SUAppcastItem?
+            SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcastItems, getDeltaItem: &nonexistantDeltaItem, withHostVersion: "2.1", comparator: SUStandardVersionComparator())
+
+            XCTAssertNil(nonexistantDeltaItem)
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testChannelsAndMacOSReleases() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_channels", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator.default
+            let hostVersion = "1.0"
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+            
+            let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+            XCTAssertEqual(6, appcast.items.count)
+            
+            do {
+                let filteredAppcast = SUAppcastDriver.filterAppcast(appcast, forMacOSAndAllowedChannels: "beta", "nightly")
+                XCTAssertEqual(4, filteredAppcast.items.count)
+                
+                XCTAssertEqual("2.0", filteredAppcast.items0.versionString)
+                XCTAssertEqual("3.0", filteredAppcast.items1.versionString)
+                XCTAssertEqual("4.0", filteredAppcast.items2.versionString)
+                XCTAssertEqual("5.0", filteredAppcast.items3.versionString)
+            }
+            
+            do {
+                let filteredAppcast = SUAppcastDriver.filterAppcast(appcast, forMacOSAndAllowedChannels: )
+                XCTAssertEqual(2, filteredAppcast.items.count)
+                XCTAssertEqual("2.0", filteredAppcast.items0.versionString)
+                XCTAssertEqual("3.0", filteredAppcast.items1.versionString)
+            }
+            
+            do {
+                let filteredAppcast = SUAppcastDriver.filterAppcast(appcast, forMacOSAndAllowedChannels: "beta")
+                XCTAssertEqual(3, filteredAppcast.items.count)
+                XCTAssertEqual("2.0", filteredAppcast.items0.versionString)
+                XCTAssertEqual("3.0", filteredAppcast.items1.versionString)
+                XCTAssertEqual("4.0", filteredAppcast.items2.versionString)
+            }
+            
+            do {
+                let filteredAppcast = SUAppcastDriver.filterAppcast(appcast, forMacOSAndAllowedChannels: "nightly")
+                XCTAssertEqual(3, filteredAppcast.items.count)
+                XCTAssertEqual("2.0", filteredAppcast.items0.versionString)
+                XCTAssertEqual("3.0", filteredAppcast.items1.versionString)
+                XCTAssertEqual("5.0", filteredAppcast.items2.versionString)
+            }
+            
+            do {
+                let filteredAppcast = SUAppcastDriver.filterAppcast(appcast, forMacOSAndAllowedChannels: "madeup")
+                XCTAssertEqual("2.0", filteredAppcast.items0.versionString)
+                XCTAssertEqual("3.0", filteredAppcast.items1.versionString)
+                XCTAssertEqual(2, filteredAppcast.items.count)
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testCriticalUpdateVersion() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator.default
+            
+            // If critical update version is 1.5 and host version is 1.0, update should be marked critical
+            do {
+                let hostVersion = "1.0"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                XCTAssertTrue(appcast.items0.isCriticalUpdate)
+            }
+            
+            // If critical update version is 1.5 and host version is 1.5, update should not be marked critical
+            do {
+                let hostVersion = "1.5"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                XCTAssertFalse(appcast.items0.isCriticalUpdate)
+            }
+            
+            // If critical update version is 1.5 and host version is 1.6, update should not be marked critical
+            do {
+                let hostVersion = "1.6"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                XCTAssertFalse(appcast.items0.isCriticalUpdate)
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testInformationalUpdateVersions() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_info_updates", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator.default
+            
+            // Test informational updates from version 1.0
+            do {
+                let hostVersion = "1.0"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertFalse(appcast.items0.isInformationOnlyUpdate)
+                XCTAssertFalse(appcast.items1.isInformationOnlyUpdate)
+                XCTAssertTrue(appcast.items2.isInformationOnlyUpdate)
+                XCTAssertTrue(appcast.items3.isInformationOnlyUpdate)
+                
+                // Test delta updates inheriting informational only updates
+                do {
+                    let deltaUpdate = appcast.items2.deltaUpdates!"2.0"!
+                    XCTAssertTrue(deltaUpdate.isInformationOnlyUpdate)
+                }
+            }
+            
+            // Test informational updates from version 2.3
+            do {
+                let hostVersion = "2.3"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertFalse(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 2.4
+            do {
+                let hostVersion = "2.4"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertTrue(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 2.5
+            do {
+                let hostVersion = "2.5"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertTrue(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 2.6
+            do {
+                let hostVersion = "2.6"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertFalse(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 0.5
+            do {
+                let hostVersion = "0.5"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertFalse(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 0.4
+            do {
+                let hostVersion = "0.4"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertTrue(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+            // Test informational updates from version 0.0
+            do {
+                let hostVersion = "0.0"
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertTrue(appcast.items1.isInformationOnlyUpdate)
+            }
+            
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testMinimumAutoupdateVersion() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_minimumAutoupdateVersion", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator()
+            
+            do {
+                // Test appcast without a filter
+                
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertEqual(2, appcast.items.count)
+            }
+            
+            let currentDate = Date()
+            // Because 3.0 has minimum autoupdate version of 2.0, we should be offered 2.0
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                XCTAssertEqual(1, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+            }
+            
+            // We should be offered 3.0 if host version is 2.0
+            do {
+                let hostVersion = "2.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                XCTAssertEqual(2, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+            }
+            
+            // We should be offered 3.0 if host version is 2.5
+            do {
+                let hostVersion = "2.5"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                XCTAssertEqual(2, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+            }
+            
+            // Because 3.0 has minimum autoupdate version of 2.0, we would be be offered 2.0, but not if it has been skipped
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                // There should be no items if 2.0 is skipped from 1.0 and 3.0 fails minimum autoupdate version
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "2.0", majorVersion: nil, majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                    XCTAssertEqual(0, supportedAppcast.items.count)
+                }
+                
+                // Try again but allowing minimum autoupdate version to fail
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "2.0", majorVersion: nil, majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip 3.0
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+                }
+                
+                // Allow minimum autoupdate version to fail skipping both 2.0 and 3.0
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "2.0", majorVersion: "3.0", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(0, supportedAppcast.items.count)
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip "2.5"
+                // This should implicitly only skip 2.0
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "2.5", majorVersion: nil, majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+                }
+                
+                // This should not skip anything but require passing minimum autoupdate version
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "1.5", majorVersion: nil, majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+                }
+                
+                // This should not skip anything but allow failing minimum autoupdate version
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "1.5", majorVersion: nil, majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(2, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+                }
+                
+                // This should not skip anything but require passing minimum autoupdate version
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "1.5", majorVersion: "1.0", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+                }
+                
+                // This should not skip anything but allow failing minimum autoupdate version
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "1.5", majorVersion: "1.0", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(2, supportedAppcast.items.count)
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "3.0")
+                }
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testMinimumAutoupdateVersionAdvancedSkipping() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_minimumAutoupdateVersionSkipping", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator()
+            
+            do {
+                // Test appcast without a filter
+                
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                XCTAssertEqual(5, appcast.items.count)
+            }
+            
+            let currentDate = Date()
+            // Because 3.0 has minimum autoupdate version of 3.0, and 4.0 has minimum autoupdate version of 4.0, we should be offered 2.0
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                
+                XCTAssertEqual(1, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+            }
+            
+            // Allow minimum autoupdate version to fail and only skip major version "3.0"
+            // This should skip all 3.x versions, but not 4.x versions nor 2.x versions
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: nil)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+            
+                XCTAssertEqual(3, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "4.1")
+            }
+            
+            // Allow minimum autoupdate version to pass and only skip major version "3.0"
+            // This should only return back the latest minor version available
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: nil)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+            
+                XCTAssertEqual(1, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+            }
+            
+            // Allow minimum autoupdate version to fail and only skip major version "4.0"
+            // This should skip all 3.x versions and 4.x versions but not 2.x versions
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "4.0", majorSubreleaseVersion: nil)
+                
+                let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+            
+                XCTAssertEqual(1, supportedAppcast.items.count)
+                
+                let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                
+                XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testMinimumAutoupdateVersionIgnoringSkipping() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_minimumAutoupdateVersionSkipping2", withExtension: "xml")!
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator()
+            
+            let currentDate = Date()
+            
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                // Allow minimum autoupdate version to fail and only skip major version "3.0" with no subrelease version
+                // This should skip all 3.x versions except for 3.9 which ignores skipped upgrades below 3.5, but not 4.x versions nor 2.x versions
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(4, supportedAppcast.items.count)
+                    
+                    XCTAssertEqual(supportedAppcast.items0.versionString, "4.1")
+                    XCTAssertEqual(supportedAppcast.items1.versionString, "4.0")
+                    XCTAssertEqual(supportedAppcast.items2.versionString, "3.9")
+                    XCTAssertEqual(supportedAppcast.items3.versionString, "2.0")
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "4.1")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip major version "3.0" with subrelease version 3.4
+                // This should skip all 3.x versions except for 3.9 which ignores skipped upgrades below 3.5, but not 4.x versions nor 2.x versions
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.4", majorSubreleaseVersion: nil)
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(4, supportedAppcast.items.count)
+                    
+                    XCTAssertEqual(supportedAppcast.items0.versionString, "4.1")
+                    XCTAssertEqual(supportedAppcast.items1.versionString, "4.0")
+                    XCTAssertEqual(supportedAppcast.items2.versionString, "3.9")
+                    XCTAssertEqual(supportedAppcast.items3.versionString, "2.0")
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "4.1")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip major version "3.0" with subrelease version 3.5
+                // This should skip all 3.x versions, but not 4.x versions nor 2.x versions
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: "3.5")
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(3, supportedAppcast.items.count)
+                    
+                    XCTAssertEqual(supportedAppcast.items0.versionString, "4.1")
+                    XCTAssertEqual(supportedAppcast.items1.versionString, "4.0")
+                    XCTAssertEqual(supportedAppcast.items2.versionString, "2.0")
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "4.1")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip major version "3.0" with subrelease version 3.5.1
+                // This should skip all 3.x versions, but not 4.x versions nor 2.x versions
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "3.0", majorSubreleaseVersion: "3.5.1")
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(3, supportedAppcast.items.count)
+                    
+                    XCTAssertEqual(supportedAppcast.items0.versionString, "4.1")
+                    XCTAssertEqual(supportedAppcast.items1.versionString, "4.0")
+                    XCTAssertEqual(supportedAppcast.items2.versionString, "2.0")
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "4.1")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip major version "4.0" with subrelease version 4.0
+                // This should skip all 3.x versions and 4.x versions, but not 2.x versions
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: nil, majorVersion: "4.0", majorSubreleaseVersion: "4.0")
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    
+                    XCTAssertEqual(supportedAppcast.items0.versionString, "2.0")
+                    
+                    let bestAppcastItem = SUAppcastDriver.bestItem(fromAppcastItems: supportedAppcast.items, getDeltaItem: nil, withHostVersion: hostVersion, comparator: versionComparator)
+                    
+                    XCTAssertEqual(bestAppcastItem.versionString, "2.0")
+                }
+                
+                // Allow minimum autoupdate version to fail and only skip major version "4.0" with subrelease version 4.0, and skip minor version 2.1
+                // This should skip everything
+                do {
+                    let skippedUpdate = SPUSkippedUpdate(minorVersion: "2.1", majorVersion: "4.0", majorSubreleaseVersion: "4.0")
+                    
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: nil, skippedUpdate: skippedUpdate, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: false)
+                
+                    XCTAssertEqual(0, supportedAppcast.items.count)
+                }
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testPhasedGroupRollouts() {
+        let testURL = Bundle(for: SUAppcastTest.self).url(forResource: "testappcast_phasedRollout", withExtension: "xml")!
+        
+        let dateFormatter = DateFormatter()
+        dateFormatter.dateFormat = "E, dd MMM yyyy HH:mm:ss Z"
+        
+        do {
+            let testData = try Data(contentsOf: testURL)
+            
+            let versionComparator = SUStandardVersionComparator()
+            
+            // Because 3.0 has minimum autoupdate version of 2.0, we should be offered 2.0
+            do {
+                let hostVersion = "1.0"
+                
+                let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                
+                do {
+                    // Test no group
+                    let group: NSNumber? = nil
+                    let currentDate = Date()
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                    
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                    XCTAssertEqual("2.0", supportedAppcast.items0.versionString)
+                }
+                
+                do {
+                    // Test 0 group with current date (way ahead of pubDate)
+                    let group: NSNumber? = nil
+                    let currentDate = Date()
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                    
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                }
+                
+                do {
+                    // Test 6th group with current date (way ahead of pubDate)
+                    let group = 6 as NSNumber
+                    let currentDate = Date()
+                    let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                    
+                    XCTAssertEqual(1, supportedAppcast.items.count)
+                }
+                
+                do {
+                    let currentDate = dateFormatter.date(from: "Wed, 23 Jul 2014 15:20:11 +0000")!
+                    
+                    do {
+                        // Test group 0 with current date 3 days before rollout
+                        // No update should be found
+                        let group = 0 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(0, supportedAppcast.items.count)
+                    }
+                    
+                    do {
+                        // Test group 6 with current date 3 days before rollout
+                        // No update should be found still
+                        let group = 6 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(0, supportedAppcast.items.count)
+                    }
+                }
+                
+                do {
+                    let currentDate = dateFormatter.date(from: "Mon, 28 Jul 2014 15:20:11 +0000")!
+                    
+                    do {
+                        // Test group 0 with current date 2 days after rollout
+                        let group = 0 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(1, supportedAppcast.items.count)
+                    }
+                    
+                    do {
+                        // Test group 1 with current date 3 days after rollout
+                        let group = 1 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(1, supportedAppcast.items.count)
+                    }
+                    
+                    do {
+                        // Test group 2 with current date 3 days after rollout
+                        let group = 2 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(1, supportedAppcast.items.count)
+                    }
+                    
+                    do {
+                        // Test group 3 with current date 3 days after rollout
+                        let group = 3 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(0, supportedAppcast.items.count)
+                    }
+                    
+                    do {
+                        // Test group 6 with current date 3 days after rollout
+                        let group = 6 as NSNumber
+                        
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(0, supportedAppcast.items.count)
+                    }
+                }
+                
+                // Test critical updates which ignore phased rollouts
+                do {
+                    let hostVersion = "2.0"
+                    
+                    let stateResolver = SPUAppcastItemStateResolver(hostVersion: hostVersion, applicationVersionComparator: versionComparator, standardVersionComparator: versionComparator)
+                    let appcast = try SUAppcast(xmlData: testData, relativeTo: nil, stateResolver: stateResolver)
+                    
+                    do {
+                        // Test no group
+                        let group: NSNumber? = nil
+                        let currentDate = Date()
+                        let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                        
+                        XCTAssertEqual(2, supportedAppcast.items.count)
+                        XCTAssertEqual("3.0", supportedAppcast.items0.versionString)
+                    }
+                    
+                    do {
+                        let currentDate = dateFormatter.date(from: "Wed, 23 Jul 2014 15:20:11 +0000")!
+                        
+                        do {
+                            // Test group 0 with current date 3 days before rollout
+                            let group = 0 as NSNumber
+                            
+                            let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                            
+                            XCTAssertEqual(1, supportedAppcast.items.count)
+                            XCTAssertEqual("3.0", supportedAppcast.items0.versionString)
+                        }
+                    }
+                    
+                    do {
+                        let currentDate = dateFormatter.date(from: "Mon, 28 Jul 2014 15:20:11 +0000")!
+                        
+                        do {
+                            // Test group 6 with current date 3 days after rollout
+                            let group = 6 as NSNumber
+                            
+                            let supportedAppcast = SUAppcastDriver.filterSupportedAppcast(appcast, phasedUpdateGroup: group, skippedUpdate: nil, currentDate: currentDate, hostVersion: hostVersion, versionComparator: versionComparator, testOSVersion: true, testMinimumAutoupdateVersion: true)
+                            
+                            XCTAssertEqual(1, supportedAppcast.items.count)
+                            XCTAssertEqual("3.0", supportedAppcast.items0.versionString)
+                        }
+                    }
+                }
+            }
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+
+    func testParseAppcastWithLocalizedReleaseNotes() {
+        let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "testlocalizedreleasenotesappcast",
+                                                            ofType: "xml")!
+        let testFileUrl = URL(fileURLWithPath: testFile)
+        XCTAssertNotNil(testFileUrl)
+
+        do {
+            let testFileData = try Data(contentsOf: testFileUrl)
+            
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
+            
+            let appcast = try SUAppcast(xmlData: testFileData, relativeTo: testFileUrl, stateResolver: stateResolver)
+            let items = appcast.items
+            XCTAssertEqual("https://sparkle-project.org/#localized_notes_link_works", items0.releaseNotesURL!.absoluteString)
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+
+    func testNamespaces() {
+        let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "testnamespaces", ofType: "xml")!
+        let testData = NSData(contentsOfFile: testFile)!
+
+        do {
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
+            
+            let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver)
+            let items = appcast.items
+
+            XCTAssertEqual(2, items.count)
+
+            XCTAssertEqual("Version 2.0", items1.title)
+            XCTAssertEqual("desc", items1.itemDescription)
+            XCTAssertNotNil(items0.releaseNotesURL)
+            XCTAssertEqual("https://sparkle-project.org/#works", items0.releaseNotesURL!.absoluteString)
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+    
+    func testLinks() {
+        let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-links", ofType: "xml")!
+        let testData = NSData(contentsOfFile: testFile)!
+        
+        do {
+            let baseURL: URL? = nil
+            
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
+            
+            let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: baseURL, stateResolver: stateResolver)
+            let items = appcast.items
+            
+            XCTAssertEqual(3, items.count)
+            
+            // Test https
+            XCTAssertEqual("https://sparkle-project.org/notes/relnote-3.0.txt", items0.releaseNotesURL?.absoluteString)
+            XCTAssertEqual("https://sparkle-project.org/fullnotes.txt", items0.fullReleaseNotesURL?.absoluteString)
+            XCTAssertEqual("https://sparkle-project.org", items0.infoURL?.absoluteString)
+            XCTAssertEqual("https://sparkle-project.org/release-3.0.zip", items0.fileURL?.absoluteString)
+            
+            // Test http
+            XCTAssertEqual("http://sparkle-project.org/notes/relnote-2.0.txt", items1.releaseNotesURL?.absoluteString)
+            XCTAssertEqual("http://sparkle-project.org/fullnotes.txt", items1.fullReleaseNotesURL?.absoluteString)
+            XCTAssertEqual("http://sparkle-project.org", items1.infoURL?.absoluteString)
+            XCTAssertEqual("http://sparkle-project.org/release-2.0.zip", items1.fileURL?.absoluteString)
+            
+            // Test bad file URLs
+            XCTAssertEqual(nil, items2.releaseNotesURL?.absoluteString)
+            XCTAssertEqual(nil, items2.fullReleaseNotesURL?.absoluteString)
+            XCTAssertEqual(nil, items2.infoURL?.absoluteString)
+            XCTAssertEqual(nil, items2.fileURL?.absoluteString)
+            
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+
+    func testRelativeURLs() {
+        let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-relative-urls", ofType: "xml")!
+        let testData = NSData(contentsOfFile: testFile)!
+
+        do {
+            let baseURL = URL(string: "https://fake.sparkle-project.org/updates/index.xml")!
+            
+            let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
+            
+            let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: baseURL, stateResolver: stateResolver)
+            let items = appcast.items
+
+            XCTAssertEqual(4, items.count)
+
+            XCTAssertEqual("https://fake.sparkle-project.org/updates/release-3.0.zip", items0.fileURL?.absoluteString)
+            XCTAssertEqual("https://fake.sparkle-project.org/updates/notes/relnote-3.0.txt", items0.releaseNotesURL?.absoluteString)
+
+            XCTAssertEqual("https://fake.sparkle-project.org/info/info-2.0.txt", items1.infoURL?.absoluteString)
+            
+            XCTAssertEqual("https://fake.sparkle-project.org/updates/notes/fullnotes.txt", items2.fullReleaseNotesURL?.absoluteString)
+            
+            // If a different base URL is in the feed, we should respect the base URL in the feed
+            XCTAssertEqual("https://sparkle-project.org/releasenotes.html", items3.fullReleaseNotesURL?.absoluteString)
+
+        } catch let err as NSError {
+            NSLog("%@", err)
+            XCTFail(err.localizedDescription)
+        }
+    }
+
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUBinaryDeltaTest.m Added

@@ -0,0 +1,2196 @@
+//
+// SUBinaryDeltaTest.m
+// Sparkle
+//
+// Created by Jake Petroules on 2014-08-22.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+#import "SUBinaryDeltaCommon.h"
+#import "SUBinaryDeltaCreate.h"
+#import "SUBinaryDeltaApply.h"
+#import <sys/stat.h>
+#include <sys/xattr.h>
+
+@interface SUBinaryDeltaTest : XCTestCase
+
+@end
+
+typedef void (^SUDeltaHandler)(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory);
+
+@implementation SUBinaryDeltaTest
+
+- (void)testTemporaryDirectory
+{
+ NSString *tmp1 = temporaryDirectory(@"Sparklęエンジン");
+ NSString *tmp2 = temporaryDirectory(@"Sparklęエンジン");
+ NSLog(@"Temporary directories: %@, %@", tmp1, tmp2);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-messaging-id"
+ XCTAssertNotEqualObjects(tmp1, tmp2);
+#pragma clang diagnostic pop
+ XCTAssert(YES, @"Pass");
+}
+
+- (void)testTemporaryFile
+{
+ NSString *tmp1 = temporaryFilename(@"Sparklęエンジン");
+ NSString *tmp2 = temporaryFilename(@"Sparklęエンジン");
+ NSLog(@"Temporary files: %@, %@", tmp1, tmp2);
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-messaging-id"
+ XCTAssertNotEqualObjects(tmp1, tmp2);
+#pragma clang diagnostic pop
+ XCTAssert(YES, @"Pass");
+}
+
+- (BOOL)createAndApplyPatchUsingVersion:(SUBinaryDeltaMajorVersion)majorVersion compressionMode:(SPUDeltaCompressionMode)compressionMode beforeDiffHandler:(SUDeltaHandler)beforeDiffHandler afterDiffHandler:(SUDeltaHandler)afterDiffHandler afterPatchHandler:(SUDeltaHandler)afterPatchHandler
+{
+ NSString *sourceDirectory = temporaryDirectory(@"Spąrkle_temp1エンジン");
+ NSString *destinationDirectory = temporaryDirectory(@"Spąrkle_temp2エンジン");
+
+ NSString *diffFile = temporaryFilename(@"Spąrkle_diffエンジン");
+ NSString *patchDirectory = temporaryDirectory(@"Spąrkle_patchエンジン");
+
+ XCTAssertNotNil(sourceDirectory);
+ XCTAssertNotNil(destinationDirectory);
+ XCTAssertNotNil(diffFile);
+ 
+ NSFileManager *fileManager = NSFileManager alloc init;
+ 
+ if (beforeDiffHandler != nil) {
+ beforeDiffHandler(fileManager, sourceDirectory, destinationDirectory);
+ }
+ 
+ NSError *createDiffError = nil;
+ BOOL createdDiff = createBinaryDelta(sourceDirectory, destinationDirectory, diffFile, majorVersion, compressionMode, 0, NO, &createDiffError);
+ if (!createdDiff) {
+ NSLog(@"Creating binary diff failed with error: %@", createDiffError);
+ } else if (afterDiffHandler != nil) {
+ afterDiffHandler(fileManager, sourceDirectory, destinationDirectory);
+ }
+ 
+ NSError *applyDiffError = nil;
+ BOOL appliedDiff = NO;
+ if (createdDiff) {
+ if (applyBinaryDelta(sourceDirectory, patchDirectory, diffFile, NO, ^(__unused double progress){}, &applyDiffError)) {
+ appliedDiff = YES;
+ 
+ if (afterPatchHandler != nil) {
+ afterPatchHandler(fileManager, destinationDirectory, patchDirectory);
+ }
+ } else {
+ NSLog(@"Applying binary diff failed with error: %@", applyDiffError);
+ }
+ }
+ 
+ XCTAssertTrue(fileManager removeItemAtPath:sourceDirectory error:nil);
+ XCTAssertTrue(fileManager removeItemAtPath:destinationDirectory error:nil);
+ XCTAssertTrue(fileManager removeItemAtPath:patchDirectory error:nil);
+ XCTAssertTrue(fileManager removeItemAtPath:diffFile error:nil);
+ 
+ return appliedDiff;
+}
+
+- (BOOL)createAndApplyPatchWithBeforeDiffHandler:(SUDeltaHandler)beforeDiffHandler afterDiffHandler:(SUDeltaHandler)afterDiffHandler afterPatchHandler:(SUDeltaHandler)afterPatchHandler
+{
+ return self createAndApplyPatchWithBeforeDiffHandler:beforeDiffHandler afterDiffHandler:afterDiffHandler afterPatchHandler:afterPatchHandler testingVersion2Delta:YES;
+}
+
+- (BOOL)createAndApplyPatchWithBeforeDiffHandler:(SUDeltaHandler)beforeDiffHandler afterDiffHandler:(SUDeltaHandler)afterDiffHandler afterPatchHandler:(SUDeltaHandler)afterPatchHandler testingVersion2Delta:(BOOL)testingVersion2Delta
+{
+ XCTAssertEqual(SUBinaryDeltaMajorVersion3, SUBinaryDeltaMajorVersionLatest);
+ 
+ BOOL version3DeltaFormatWithLZMASuccess = self createAndApplyPatchUsingVersion:SUBinaryDeltaMajorVersion3 compressionMode:SPUDeltaCompressionModeLZMA beforeDiffHandler:beforeDiffHandler afterDiffHandler:afterDiffHandler afterPatchHandler:afterPatchHandler;
+ 
+ BOOL version3DeltaFormatWithBZIP2Success = self createAndApplyPatchUsingVersion:SUBinaryDeltaMajorVersion3 compressionMode:SPUDeltaCompressionModeBzip2 beforeDiffHandler:beforeDiffHandler afterDiffHandler:afterDiffHandler afterPatchHandler:afterPatchHandler;
+ 
+ BOOL version3DeltaFormatWithZLIBSuccess = self createAndApplyPatchUsingVersion:SUBinaryDeltaMajorVersion3 compressionMode:SPUDeltaCompressionModeZLIB beforeDiffHandler:beforeDiffHandler afterDiffHandler:afterDiffHandler afterPatchHandler:afterPatchHandler;
+ 
+ BOOL version2FormatSuccess = !testingVersion2Delta || self createAndApplyPatchUsingVersion:SUBinaryDeltaMajorVersion2 compressionMode:SPUDeltaCompressionModeDefault beforeDiffHandler:beforeDiffHandler afterDiffHandler:afterDiffHandler afterPatchHandler:afterPatchHandler;
+ 
+ return (version3DeltaFormatWithLZMASuccess && version3DeltaFormatWithBZIP2Success && version3DeltaFormatWithZLIBSuccess && version2FormatSuccess);
+}
+
+- (void)createAndApplyPatchWithHandler:(SUDeltaHandler)handler
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:handler afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertTrue(success);
+}
+
+- (BOOL)testDirectoryHashEqualityWithSource:(NSString *)source destination:(NSString *)destination
+{
+ XCTAssertNotNil(source);
+ XCTAssertNotNil(destination);
+ 
+ NSString *beforeHash = hashOfTree(source);
+ NSString *afterHash = hashOfTree(destination);
+ 
+ XCTAssertNotNil(beforeHash);
+ XCTAssertNotNil(afterHash);
+ 
+ return beforeHash isEqualToString:afterHash;
+}
+
+- (void)testNoFilesDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testEmptyDataDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSData *emptyData = NSData data;
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"AĄエンジン";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"AĄエンジン";
+
+ XCTAssertTrue(emptyData writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(emptyData writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDifferentlyNamedEmptyDataDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSData *emptyData = NSData data;
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ XCTAssertTrue(emptyData writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(emptyData writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testEmptyDirectoryDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDifferentlyNamedEmptyDirectoryDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSameNonexistantSymlinkDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDifferentNonexistantSymlinkDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"C" error:&error) {
+ NSLog(@"Failed creating empty symlink with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testNonexistantSymlinkPermissionDiff
+{
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink to source with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink to destination with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (lchmod(sourceFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ // 0755 and 0777 should result in the same hash
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ NSDictionary *attributes = fileManager attributesOfItemAtPath:destinationFile error:&error;
+ if (attributes == nil) {
+ NSLog(@"Failed to retrieve attributes with error: %@", error);
+ XCTFail("Failed to retrieve symlink attributes");
+ }
+ 
+ NSNumber *permissionAttribute = attributesNSFilePosixPermissions;
+ XCTAssertNotNil(permissionAttribute);
+ 
+ unsigned short permissions = permissionAttribute.unsignedShortValue & PERMISSION_FLAGS;
+ XCTAssertEqual(permissions, VALID_SYMBOLIC_LINK_PERMISSIONS);
+ };
+}
+
+- (void)testNonexistantSymlinkPermissionBadDiff
+{
+ // Even though destination has a 0777 symlink permission, we only respect 0755 for symlinks
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink to source with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Failed creating empty symlink to destination with error: %@", error);
+ XCTFail("Failed to create empty symlink");
+ }
+ 
+ if (lchmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ NSDictionary *attributes = fileManager attributesOfItemAtPath:destinationFile error:&error;
+ if (attributes == nil) {
+ NSLog(@"Failed to retrieve attributes with error: %@", error);
+ XCTFail("Failed to retrieve symlink attributes");
+ }
+ 
+ NSNumber *permissionAttribute = attributesNSFilePosixPermissions;
+ XCTAssertNotNil(permissionAttribute);
+ 
+ unsigned short permissions = permissionAttribute.unsignedShortValue & PERMISSION_FLAGS;
+ XCTAssertEqual(permissions, VALID_SYMBOLIC_LINK_PERMISSIONS);
+ };
+}
+
+- (void)testSmallDataDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testInvalidSource
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *__unused destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData dataWithBytes:"testt" length:5 writeToFile:sourceFile atomically:YES);
+ } afterPatchHandler:nil;
+ XCTAssertFalse(success);
+}
+
+- (NSData *)bigData1
+{
+ const size_t bufferSize = 4096*32;
+ uint8_t *buffer = calloc(1, bufferSize);
+ XCTAssertTrue(buffer != NULL);
+ 
+ return NSData dataWithBytesNoCopy:buffer length:bufferSize;
+}
+
+- (NSData *)bigData2
+{
+ const size_t bufferSize = 4096*32;
+ uint8_t *buffer = calloc(1, bufferSize);
+ XCTAssertTrue(buffer != NULL);
+ 
+ for (size_t bufferIndex = 0; bufferIndex < bufferSize; ++bufferIndex) {
+ bufferbufferIndex = 1;
+ }
+ 
+ return NSData dataWithBytesNoCopy:buffer length:bufferSize;
+}
+
+- (void)testBigDataSameDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigDataDifferentDiff
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularFileAdded
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"lol" length:3 writeToFile:destinationFile2 atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+// Make sure old version patches are no longer supported
+- (void)testRegularFileAddedWithVersion1Delta
+{
+ XCTAssertFalse(self createAndApplyPatchUsingVersion:SUBinaryDeltaMajorVersion1 compressionMode:SPUDeltaCompressionModeDefault beforeDiffHandler:nil afterDiffHandler:nil afterPatchHandler:nil);
+}
+
+- (void)testDirectoryAdded
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *destinationFile3 = destinationFile2 stringByAppendingPathComponent:@"C";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile1 atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:destinationFile2 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile3 atomically:YES);
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryAddedWithOddPermissions
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *destinationFile3 = destinationFile2 stringByAppendingPathComponent:@"C";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile1 atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:destinationFile2 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile3 atomically:YES);
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:destinationFile2 error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryPermissionsChanged
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceDir = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destDir = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceDir withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destDir withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:destDir error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularFileRemoved
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"lol" length:3 writeToFile:sourceFile2 atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryRemoved
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"B";
+ NSString *sourceFile3 = sourceFile2 stringByAppendingPathComponent:@"C";
+ 
+ XCTAssertTrue(NSData data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:sourceFile1 atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile2 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self bigData2 writeToFile:sourceFile3 atomically:YES);
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularFileMove
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R2";
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:sourceFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:destinationFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ NSData *data = NSData dataWithBytes:"loltes" length:6;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testLargerRegularFileMoveWithFileInPlace
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R2";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile3 = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/X";
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:sourceFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:destinationFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile2 atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile3 atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMove
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularFileMoveWithPermissionChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R2";
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:sourceFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:destinationFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ NSData *data = NSData dataWithBytes:"loltes" length:6;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ if (chmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithPermissionChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ if (chmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInSource
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ if (chmod(sourceFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInDestination
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ if (chmod(destinationFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInSourceAndOtherFileAtDestinationPresent
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile2 atomically:YES);
+ 
+ if (chmod(sourceFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInDestinationAndOtherFileAtDestinationPresent
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile2 atomically:YES);
+ 
+ if (chmod(destinationFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInSourceAndOtherFileAtSourcePresent
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *sourceFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile2 atomically:YES);
+ 
+ if (chmod(sourceFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (chmod(sourceFile2 fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularLargerFileMoveWithNoWritablePermissionInDestinationAndOtherFileAtSourcePresent
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ NSString *sourceFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = self bigData2;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile2 atomically:YES);
+ 
+ if (chmod(destinationFile fileSystemRepresentation, 0444) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSymbolicLinkMove
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ 
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R2";
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:sourceFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:destinationFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ NSError *error = nil;
+ 
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"C" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"C" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testLargerSymbolicLinkMove
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ 
+ NSString *destinationPath = @"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest";
+ 
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:destinationPath error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:destinationPath error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSymbolicLinkMoveWithPermissionChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A/B/C/D/E/F/G/H/I/J/K/L/M/N/O/P/Q/R2";
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:sourceFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ fileManager createDirectoryAtURL:NSURL fileURLWithPath:destinationFile.stringByDeletingLastPathComponent withIntermediateDirectories:YES attributes:nil error:NULL;
+ 
+ NSError *error = nil;
+ 
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"C" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"C" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (lchmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testLargerSymbolicLinkMoveWithPermissionChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ 
+ NSString *destinationPath = @"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest";
+ 
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:destinationPath error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:destinationPath error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (lchmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testCaseSensitiveRegularFileMove
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"b";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"a";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = NSData dataWithBytes:"loltest" length:7;
+ 
+ XCTAssertTrue(data writeToFile:sourceFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:sourceFile2 atomically:YES);
+ 
+ XCTAssertTrue(data writeToFile:destinationFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile2 atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRemovingSymlink
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testAddingSymlink
+{
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ NSDictionary *attributes = fileManager attributesOfItemAtPath:destinationFile error:&error;
+ if (attributes == nil) {
+ NSLog(@"Failed to retrieve attributes with error: %@", error);
+ XCTFail("Failed to retrieve symlink attributes");
+ }
+ 
+ NSNumber *permissionAttribute = attributesNSFilePosixPermissions;
+ XCTAssertNotNil(permissionAttribute);
+ 
+ // Test default symlink permissons are correct
+ unsigned short permissions = permissionAttribute.unsignedShortValue & PERMISSION_FLAGS;
+ XCTAssertEqual(permissions, VALID_SYMBOLIC_LINK_PERMISSIONS);
+ };
+}
+
+- (void)testAddingSymlinkWithWrongPermissions
+{
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:destinationFile withDestinationPath:@"B" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ if (lchmod(destinationFile fileSystemRepresentation, 0777) != 0) {
+ NSLog(@"Change Permission Error..");
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ NSDictionary *attributes = fileManager attributesOfItemAtPath:destinationFile error:&error;
+ if (attributes == nil) {
+ NSLog(@"Failed to retrieve attributes with error: %@", error);
+ XCTFail("Failed to retrieve symlink attributes");
+ }
+ 
+ NSNumber *permissionAttribute = attributesNSFilePosixPermissions;
+ XCTAssertNotNil(permissionAttribute);
+ 
+ // Test that we only respect valid symlink permissions for >= version 3 deltas
+ unsigned short permissions = permissionAttribute.unsignedShortValue & PERMISSION_FLAGS;
+ XCTAssertEqual(permissions, VALID_SYMBOLIC_LINK_PERMISSIONS);
+ } testingVersion2Delta:NO;
+}
+
+- (void)testSmallFilePermissionChangeWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = NSData dataWithBytes:"loltest" length:7;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFilePermissionChangeWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = self bigData1;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSmallFilePermissionChangeWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFilePermissionChangeWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFilePermissionChangeInDirectoriesWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Contents/Hello/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Contents/Meek/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileChangeInDirectoriesWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Contents/Hello/";
+ NSString *destinationA = destinationDirectory stringByAppendingPathComponent:@"Contents/Meek/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationA stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileChangeInDirectoriesWithContentChangeAndNoWritablePermissionInSource
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Contents/Hello/";
+ NSString *destinationA = destinationDirectory stringByAppendingPathComponent:@"Contents/Meek/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationA stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileChangeInDirectoriesWithContentChangeAndNoWritablePermissionInDestination
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Contents/Hello/";
+ NSString *destinationA = destinationDirectory stringByAppendingPathComponent:@"Contents/Meek/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationA stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testMultipleBigFileChangeInDirectoriesWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Contents/Hello/";
+ NSString *sourceA2 = sourceDirectory stringByAppendingPathComponent:@"Contents/whaat/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Contents/Meek/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA2 withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceA2 stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"A";
+ 
+ NSMutableData *data2 = NSMutableData dataWithData:self bigData1;
+ uint32_t foo = 100;
+ data2 appendBytes:&foo length:sizeof(foo);
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data2 writeToFile:sourceFile2 atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSmallFileNoWritablePermissionInSourceWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSmallFileNoWritablePermissionInDestinationWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileNoWritablePermissionInSourceWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileNoWritablePermissionInDestinationWithNoContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSmallFileNoWritablePermissionInSourceWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSmallFileNoWritablePermissionInDestinationWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:@"lawl" length:4 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileNoWritablePermissionInSourceWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testBigFileNoWritablePermissionInDestinationWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0444} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testFileSystemCompression
+{
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A2";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ {
+ // We only track executable files to decide if we want to apply file system compression over the entire bundle
+ int lchmodResult = lchmod(destinationFile.fileSystemRepresentation, 0755);
+ XCTAssertEqual(lchmodResult, 0);
+ }
+ 
+ NSTask *dittoTask = NSTask alloc init;
+ dittoTask.executableURL = NSURL fileURLWithPath:@"/usr/bin/ditto" isDirectory:NO;
+ 
+ dittoTask.arguments = @@"--hfsCompression", destinationFile, destinationFile2;
+ 
+ NSError *launchError = nil;
+ BOOL launched = dittoTask launchAndReturnError:&launchError;
+ if (!launched) {
+ XCTFail(@"Failed to launch ditto: %@", launchError);
+ }
+ dittoTask waitUntilExit;
+ 
+ XCTAssertEqual(dittoTask.terminationStatus, 0);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *__unused fileManager, NSString *__unused sourceDirectory, NSString *destinationDirectory) {
+ 
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A2";
+ 
+ // Both files should have file system compression applied
+ {
+ struct stat statStruct = {0};
+ int result = lstat(destinationFile.fileSystemRepresentation, &statStruct);
+ XCTAssertEqual(result, 0);
+ 
+ if ((statStruct.st_flags & UF_COMPRESSED) == 0) {
+ XCTFail(@"First destination file is not compressed!");
+ }
+ }
+ {
+ struct stat statStruct = {0};
+ int result = lstat(destinationFile2.fileSystemRepresentation, &statStruct);
+ XCTAssertEqual(result, 0);
+ 
+ if ((statStruct.st_flags & UF_COMPRESSED) == 0) {
+ XCTFail(@"Second destination file is not compressed!");
+ }
+ }
+ } testingVersion2Delta:NO;
+}
+
+- (void)testNoFileSystemCompression
+{
+ self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A2";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile2 atomically:YES);
+ 
+ {
+ // We only usually track executable files to decide if we want to apply file system compression over the entire bundle
+ int lchmodResult = lchmod(destinationFile.fileSystemRepresentation, 0755);
+ XCTAssertEqual(lchmodResult, 0);
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:^(NSFileManager *__unused fileManager, NSString *__unused sourceDirectory, NSString *destinationDirectory) {
+ 
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"A2";
+ 
+ // Both files should not have file system compression applied
+ {
+ struct stat statStruct = {0};
+ int result = lstat(destinationFile.fileSystemRepresentation, &statStruct);
+ XCTAssertEqual(result, 0);
+ 
+ if ((statStruct.st_flags & UF_COMPRESSED) != 0) {
+ XCTFail(@"First destination file is compressed!");
+ }
+ }
+ {
+ struct stat statStruct = {0};
+ int result = lstat(destinationFile2.fileSystemRepresentation, &statStruct);
+ XCTAssertEqual(result, 0);
+ 
+ if ((statStruct.st_flags & UF_COMPRESSED) != 0) {
+ XCTFail(@"Second destination file is compressed!");
+ }
+ }
+ } testingVersion2Delta:NO;
+}
+
+- (void)testFrameworkVersionChanged
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testFrameworkExecutableVersionChanged
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testFrameworkVersionChangedWithPermissionChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Foo.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryPermissionChangeWithContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceFile1 stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationFile1 stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile2 atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile2 atomically:YES);
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0766} ofItemAtPath:sourceFile1 error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile1 error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryChangeWithExecutableContentChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceFile1 stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationFile1 stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile2 atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile2 atomically:YES);
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:sourceFile1 error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile1 error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertTrue(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testOddPermissionsInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = NSData dataWithBytes:"loltest" length:7;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertTrue(success);
+}
+
+- (void)testOddChangingPermissionsWithBigFilesInBothTrees
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0774} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertTrue(success);
+}
+
+- (void)testOddPermissionsWithBigFilesInBothTrees
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertTrue(success);
+}
+
+- (void)testBadPermissionsInBeforeTree
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = NSData dataWithBytes:"loltest" length:7;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testInvalidRegularFileWithACLInBeforeTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString * __unused destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:sourceFile atomically:YES);
+ 
+ acl_t acl = acl_init(1);
+ 
+ acl_entry_t entry;
+ XCTAssertEqual(0, acl_create_entry(&acl, &entry));
+ 
+ acl_permset_t permset;
+ XCTAssertEqual(0, acl_get_permset(entry, &permset));
+ 
+ XCTAssertEqual(0, acl_add_perm(permset, ACL_SEARCH));
+ 
+ XCTAssertEqual(0, acl_set_link_np(sourceFile fileSystemRepresentation, ACL_TYPE_EXTENDED, acl));
+ 
+ XCTAssertEqual(0, acl_free(acl));
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+- (void)testInvalidRegularFileWithACLInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *__unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ acl_t acl = acl_init(1);
+ 
+ acl_entry_t entry;
+ XCTAssertEqual(0, acl_create_entry(&acl, &entry));
+ 
+ acl_permset_t permset;
+ XCTAssertEqual(0, acl_get_permset(entry, &permset));
+ 
+ XCTAssertEqual(0, acl_add_perm(permset, ACL_SEARCH));
+ 
+ XCTAssertEqual(0, acl_set_link_np(destinationFile fileSystemRepresentation, ACL_TYPE_EXTENDED, acl));
+ 
+ XCTAssertEqual(0, acl_free(acl));
+ 
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+- (void)testInvalidDirectoryWithACLInBeforeTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString * __unused destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceFile withIntermediateDirectories:NO attributes:nil error:nil);
+ 
+ acl_t acl = acl_init(1);
+ 
+ acl_entry_t entry;
+ XCTAssertEqual(0, acl_create_entry(&acl, &entry));
+ 
+ acl_permset_t permset;
+ XCTAssertEqual(0, acl_get_permset(entry, &permset));
+ 
+ XCTAssertEqual(0, acl_add_perm(permset, ACL_SEARCH));
+ 
+ XCTAssertEqual(0, acl_set_link_np(sourceFile fileSystemRepresentation, ACL_TYPE_EXTENDED, acl));
+ 
+ XCTAssertEqual(0, acl_free(acl));
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+- (void)testInvalidDirectoryWithACLInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString * __unused sourceDirectory, NSString *destinationDirectory) {
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationFile withIntermediateDirectories:NO attributes:nil error:nil);
+ 
+ acl_t acl = acl_init(1);
+ 
+ acl_entry_t entry;
+ XCTAssertEqual(0, acl_create_entry(&acl, &entry));
+ 
+ acl_permset_t permset;
+ XCTAssertEqual(0, acl_get_permset(entry, &permset));
+ 
+ XCTAssertEqual(0, acl_add_perm(permset, ACL_SEARCH));
+ 
+ XCTAssertEqual(0, acl_set_link_np(destinationFile fileSystemRepresentation, ACL_TYPE_EXTENDED, acl));
+ 
+ XCTAssertEqual(0, acl_free(acl));
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+- (void)testRegularFileToSymlinkChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = NSData dataWithBytes:"A" length:1;
+ 
+ XCTAssertTrue(data writeToFile:sourceFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:sourceFile2 atomically:YES);
+ 
+ XCTAssertTrue(data writeToFile:destinationFile1 atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:destinationFile2 withDestinationPath:@"A" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ // This would fail with version 1.0
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testLargerRegularFileToSymlinkChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = NSData dataWithBytes:"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest" length:420;
+ 
+ XCTAssertTrue(data writeToFile:sourceFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:sourceFile2 atomically:YES);
+ 
+ XCTAssertTrue(data writeToFile:destinationFile1 atomically:YES);
+ 
+ NSString *destination = @"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest";
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:destinationFile2 withDestinationPath:destination error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ // This would fail with version 1.0
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testSymlinkToRegularFileChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = NSData dataWithBytes:"loltes" length:6;
+ 
+ XCTAssertTrue(data writeToFile:sourceFile1 atomically:YES);
+ 
+ XCTAssertTrue(data writeToFile:destinationFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile2 atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile2 withDestinationPath:@"A" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testLargerSymlinkToRegularFileChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"B";
+ 
+ NSData *data = NSData dataWithBytes:"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest" length:420;
+ 
+ XCTAssertTrue(data writeToFile:sourceFile1 atomically:YES);
+ 
+ XCTAssertTrue(data writeToFile:destinationFile1 atomically:YES);
+ XCTAssertTrue(data writeToFile:destinationFile2 atomically:YES);
+ 
+ NSString *destination = @"loltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltestloltest";
+ NSError *error = nil;
+ if (!fileManager createSymbolicLinkAtPath:sourceFile2 withDestinationPath:destination error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testRegularFileToDirectoryChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSData *data = NSData dataWithBytes:"loltes" length:6;
+ XCTAssertTrue(data writeToFile:sourceFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:destinationFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testDirectoryToRegularFileChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory");
+ }
+ 
+ NSData *data = NSData dataWithBytes:"loltest" length:7;
+ XCTAssertTrue(data writeToFile:destinationFile atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+// See issue #514 for more info
+- (void)testDirectoryToSymlinkChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceDirectory stringByAppendingPathComponent:@"Current";
+ NSString *sourceFile3 = sourceFile2 stringByAppendingPathComponent:@"B";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationFile1 stringByAppendingPathComponent:@"B";
+ NSString *destinationFile3 = destinationDirectory stringByAppendingPathComponent:@"Current";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory A in source");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:sourceFile2 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory Current in source");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory A in destination");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:destinationFile3 withDestinationPath:@"A/" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile3 atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile2 atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+// Opposite of the test method testDirectoryToSymlinkChange
+- (void)testSymlinkToDirectoryChange
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile1 = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *sourceFile2 = sourceFile1 stringByAppendingPathComponent:@"B";
+ NSString *sourceFile3 = sourceDirectory stringByAppendingPathComponent:@"Current";
+ 
+ NSString *destinationFile1 = destinationDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile2 = destinationDirectory stringByAppendingPathComponent:@"Current";
+ NSString *destinationFile3 = destinationFile2 stringByAppendingPathComponent:@"B";
+ 
+ NSError *error = nil;
+ if (!fileManager createDirectoryAtPath:sourceFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory A in source");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile1 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory A in destination");
+ }
+ 
+ if (!fileManager createDirectoryAtPath:destinationFile2 withIntermediateDirectories:NO attributes:nil error:&error) {
+ NSLog(@"Failed creating directory with error: %@", error);
+ XCTFail("Failed to create directory Current in destination");
+ }
+ 
+ if (!fileManager createSymbolicLinkAtPath:sourceFile3 withDestinationPath:@"A/" error:&error) {
+ NSLog(@"Error in creating symlink: %@", error);
+ XCTFail(@"Failed to create symlink");
+ }
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile2 atomically:YES);
+ XCTAssertTrue(self bigData1 writeToFile:destinationFile3 atomically:YES);
+ 
+ XCTAssertFalse(self testDirectoryHashEqualityWithSource:sourceDirectory destination:destinationDirectory);
+ };
+}
+
+- (void)testInvalidCodeSignatureExtendedAttributeInBeforeTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ // the actual data doesn't matter for testing purposes
+ const char xattrValue = "hello";
+ 
+ XCTAssertEqual(0, setxattr(sourceFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_DIRECTORY_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ XCTAssertEqual(0, setxattr(sourceFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_REQUIREMENTS_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ XCTAssertEqual(0, setxattr(sourceFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_SIGNATURE_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertFalse(success);
+}
+
+- (void)testInvalidCodeSignatureExtendedAttributeInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ // the actual data doesn't matter for testing purposes
+ const char xattrValue = "hello";
+ 
+ XCTAssertEqual(0, setxattr(destinationFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_DIRECTORY_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ XCTAssertEqual(0, setxattr(destinationFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_REQUIREMENTS_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ XCTAssertEqual(0, setxattr(destinationFile fileSystemRepresentation, APPLE_CODE_SIGN_XATTR_CODE_SIGNATURE_KEY, xattrValue, sizeof(xattrValue), 0, XATTR_CREATE));
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertFalse(success);
+}
+
+- (void)testCreatingPatchWithCustomIconInBeforeTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ NSImage *iconImage = NSImage imageNamed:NSImageNameAdvanced;
+ XCTAssertNotNil(iconImage);
+ 
+ BOOL setIcon = NSWorkspace sharedWorkspace setIcon:iconImage forFile:sourceDirectory options:0;
+ XCTAssertTrue(setIcon);
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertFalse(success);
+}
+
+- (void)testCreatingPatchWithCustomIconInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ 
+ NSImage *iconImage = NSImage imageNamed:NSImageNameAdvanced;
+ XCTAssertNotNil(iconImage);
+ 
+ BOOL setIcon = NSWorkspace sharedWorkspace setIcon:iconImage forFile:destinationDirectory options:0;
+ XCTAssertTrue(setIcon);
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ XCTAssertFalse(success);
+}
+
+- (void)testApplyingPatchAfterSettingCustomIcon
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceFile = sourceDirectory stringByAppendingPathComponent:@"A";
+ NSString *destinationFile = destinationDirectory stringByAppendingPathComponent:@"A";
+ 
+ XCTAssertTrue(NSData data writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(NSData dataWithBytes:"loltest" length:7 writeToFile:destinationFile atomically:YES);
+ } afterDiffHandler:^(NSFileManager *__unused fileManager, NSString *sourceDirectory, NSString *__unused destinationDirectory) {
+ NSImage *iconImage = NSImage imageNamed:NSImageNameAdvanced;
+ XCTAssertNotNil(iconImage);
+ 
+ BOOL setIcon = NSWorkspace sharedWorkspace setIcon:iconImage forFile:sourceDirectory options:0;
+ XCTAssertTrue(setIcon);
+ } afterPatchHandler:nil;
+ XCTAssertTrue(success);
+}
+
+- (void)testRegularSparkleFrameworkPresence
+{
+ self createAndApplyPatchWithHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"Sparkle";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"Sparkle";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ };
+}
+
+- (void)testInvalidSparkleFrameworkInBeforeTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"Sparkle";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"Sparkle";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ // Use invalid permission mode 0777
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0777} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+- (void)testInvalidSparkleFrameworkInAfterTree
+{
+ BOOL success = self createAndApplyPatchWithBeforeDiffHandler:^(NSFileManager *fileManager, NSString *sourceDirectory, NSString *destinationDirectory) {
+ NSString *sourceA = sourceDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/A/";
+ NSString *destinationB = destinationDirectory stringByAppendingPathComponent:@"Frameworks/Sparkle.framework/Versions/B/";
+ 
+ XCTAssertTrue(fileManager createDirectoryAtPath:sourceA withIntermediateDirectories:YES attributes:NULL error:NULL);
+ XCTAssertTrue(fileManager createDirectoryAtPath:destinationB withIntermediateDirectories:YES attributes:NULL error:NULL);
+ 
+ NSString *sourceFile = sourceA stringByAppendingPathComponent:@"Sparkle";
+ NSString *destinationFile = destinationB stringByAppendingPathComponent:@"Sparkle";
+ 
+ XCTAssertTrue(self bigData1 writeToFile:sourceFile atomically:YES);
+ XCTAssertTrue(self bigData2 writeToFile:destinationFile atomically:YES);
+ 
+ NSError *error = nil;
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0755} ofItemAtPath:sourceFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ 
+ // Use invalid permission mode 0700
+ if (!fileManager setAttributes:@{NSFilePosixPermissions : @0700} ofItemAtPath:destinationFile error:&error) {
+ NSLog(@"Change Permission Error: %@", error);
+ XCTFail(@"Failed setting file permissions");
+ }
+ } afterDiffHandler:nil afterPatchHandler:nil;
+ 
+ XCTAssertFalse(success);
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUCodeSigningVerifierTest.m Added

@@ -0,0 +1,252 @@
+//
+// SUCodeSigningVerifierTest.m
+// Sparkle
+//
+// Created by Isaac Wankerl on 04/13/2015.
+// Copyright (c) 2015 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+#import "SUCodeSigningVerifier.h"
+#import "SUAdHocCodeSigning.h"
+#import "SUFileManager.h"
+
+#if defined(__MAC_10_15)
+// In macOS 10.15 and later, pre-installed apps are installed under the System folder
+#define CALCULATOR_PATH @"/System/Applications/Calculator.app"
+#else
+#define CALCULATOR_PATH @"/Applications/Calculator.app"
+#endif
+
+@interface SUCodeSigningVerifierTest : XCTestCase
+
+@property (copy) NSURL *notSignedAppURL;
+@property (copy) NSURL *validSignedAppURL;
+@property (copy) NSURL *invalidSignedAppURL;
+@property (copy) NSURL *calculatorCopyURL;
+
+@end
+
+@implementation SUCodeSigningVerifierTest
+
+@synthesize notSignedAppURL = _notSignedAppURL;
+@synthesize validSignedAppURL = _validSignedAppURL;
+@synthesize invalidSignedAppURL = _invalidSignedAppURL;
+@synthesize calculatorCopyURL = _calculatorCopyURL;
+
++ (NSString *)calculatorApplicationPath
+{
+ NSString *applicationsDirectory = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSSystemDomainMask, NO) objectAtIndex:0;
+ NSString *calculatorPath = applicationsDirectory stringByAppendingPathComponent:@"Calculator.app";
+ return calculatorPath;
+}
+
+- (void)setUp
+{
+ super setUp;
+
+ NSBundle *unitTestBundle = NSBundle bundleForClass:self class;
+ NSString *zippedAppURL = unitTestBundle pathForResource:@"SparkleTestCodeSignApp" ofType:@"zip";
+
+ SUFileManager *fileManager = SUFileManager alloc init;
+ 
+ NSError *tempError = nil;
+ NSURL *tempDir = fileManager makeTemporaryDirectoryAppropriateForDirectoryURL:NSURL fileURLWithPath:zippedAppURL error:&tempError;
+
+ if (tempDir == nil) {
+ XCTFail(@"Failed to create temporary directory with error: %@", tempError);
+ return;
+ }
+
+ NSError *error = nil;
+ if (NSFileManager defaultManager createDirectoryAtURL:tempDir withIntermediateDirectories:YES attributes:nil error:&error) {
+ if (self unzip:zippedAppURL toPath:tempDir.path) {
+ self.notSignedAppURL = tempDir URLByAppendingPathComponent:@"SparkleTestCodeSignApp.app";
+ self setupValidSignedApp;
+ self setupCalculatorCopy;
+ self setupInvalidSignedApp;
+ }
+ else {
+ NSLog(@"Failed to unzip %@", zippedAppURL);
+ }
+ }
+ else {
+ NSLog(@"Failed to created dir %@ with error %@", tempDir, error);
+ }
+}
+
+- (void)tearDown
+{
+ super tearDown;
+
+ if (self.notSignedAppURL) {
+ NSURL *tempDir = self.notSignedAppURL URLByDeletingLastPathComponent;
+ NSFileManager defaultManager removeItemAtURL:tempDir error:nil;
+ }
+}
+
+- (void)setupValidSignedApp
+{
+ NSError *error = nil;
+ NSURL *tempDir = self.notSignedAppURL URLByDeletingLastPathComponent;
+ NSURL *signedAndValid = tempDir URLByAppendingPathComponent:@"valid-signed.app";
+
+ NSFileManager defaultManager removeItemAtURL:signedAndValid error:NULL;
+ if (!NSFileManager defaultManager copyItemAtURL:self.notSignedAppURL toURL:signedAndValid error:&error) {
+ XCTFail("Failed to copy %@ to %@ with error: %@", self.notSignedAppURL, signedAndValid, error);
+ }
+
+ self.validSignedAppURL = signedAndValid;
+
+ if (!self codesignAppURL:self.validSignedAppURL) {
+ XCTFail(@"Failed to codesign %@", self.validSignedAppURL);
+ }
+}
+
+- (void)setupCalculatorCopy
+{
+ NSURL *tempDir = self.notSignedAppURL URLByDeletingLastPathComponent;
+ NSURL *calculatorCopy = tempDir URLByAppendingPathComponent:@"calc.app";
+
+ NSFileManager defaultManager removeItemAtURL:calculatorCopy error:NULL;
+
+ NSString *calculatorPath = SUCodeSigningVerifierTest calculatorApplicationPath;
+ // Make a copy of the signed calculator app so we can match signatures later
+ // Matching signatures on ad-hoc signed apps does *not* work
+ NSError *copyError = nil;
+ // Don't check the return value of this operation - seems like on 10.11 the API can say it fails even though the operation really succeeds,
+ // which sounds like some kind of (SIP / attribute?) bug
+ NSFileManager defaultManager copyItemAtURL:NSURL fileURLWithPath:calculatorPath toURL:calculatorCopy error:&copyError;
+
+ if (!calculatorCopy checkResourceIsReachableAndReturnError:nil) {
+ XCTFail(@"Copied calculator application does not exist");
+ }
+
+ // Alter the signed copy slightly, this won't invalidate signature matching (although it will invalidate the integrity part of the signature)
+ // Which is what we want. If a user alters an app bundle, we should still be able to update as long as its identity is still valid
+ NSError *removeError = nil;
+ NSURL *calculatorPkgInfo = calculatorCopy URLByAppendingPathComponent:@"Contents" URLByAppendingPathComponent:@"PkgInfo";
+ XCTAssertNotNil(calculatorPkgInfo);
+ if (!NSFileManager defaultManager removeItemAtURL:calculatorPkgInfo error:&removeError) {
+ XCTFail(@"Failed to remove file in calculator copy with error: %@", removeError);
+ }
+
+ self.calculatorCopyURL = calculatorCopy;
+}
+
+- (void)setupInvalidSignedApp
+{
+ NSError *error = nil;
+ NSURL *tempDir = self.notSignedAppURL URLByDeletingLastPathComponent;
+ NSURL *signedAndInvalid = tempDir URLByAppendingPathComponent:@"invalid-signed.app";
+
+ NSFileManager defaultManager removeItemAtURL:signedAndInvalid error:NULL;
+ if (NSFileManager defaultManager copyItemAtURL:self.notSignedAppURL toURL:signedAndInvalid error:&error) {
+ self.invalidSignedAppURL = signedAndInvalid;
+ if (self codesignAppURL:self.invalidSignedAppURL) {
+ NSURL *fileInAppBundleToRemove = self.invalidSignedAppURL URLByAppendingPathComponent:@"Contents/Resources/test_app_only_dsa_pub.pem";
+ if (!NSFileManager defaultManager removeItemAtURL:fileInAppBundleToRemove error:&error) {
+ NSLog(@"Failed to remove %@ with error %@", fileInAppBundleToRemove, error);
+ }
+ }
+ else {
+ NSLog(@"Failed to codesign %@", self.invalidSignedAppURL);
+ }
+ }
+ else {
+ NSLog(@"Failed to copy %@ to %@ with error %@", self.notSignedAppURL, signedAndInvalid, error);
+ }
+}
+
+- (BOOL)unzip:(NSString *)zipPath toPath:(NSString *)destPath
+{
+ BOOL success = NO;
+ @try
+ {
+ NSTask *task = NSTask alloc init;
+ task.launchPath = @"/usr/bin/unzip";
+ task.currentDirectoryPath = destPath;
+ task.arguments = @zipPath;
+
+ task launch;
+ task waitUntilExit;
+ success = (task.terminationStatus == 0);
+ }
+ @catch (NSException *exception)
+ {
+ NSLog(@"exception: %@", exception);
+ }
+ return success;
+}
+
+- (BOOL)codesignAppURL:(NSURL *)appURL
+{
+ return SUAdHocCodeSigning codeSignApplicationAtPath:appURL.path;
+}
+
+- (void)testUnsignedApp
+{
+ XCTAssertFalse(SUCodeSigningVerifier bundleAtURLIsCodeSigned:self.notSignedAppURL, @"App not expected to be code signed");
+
+ NSError *error = nil;
+ XCTAssertFalse(SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:self.notSignedAppURL error:&error, @"signature should not be valid as it's not code signed");
+ XCTAssertNotNil(error, @"error should not be nil");
+}
+
+- (void)testValidSignedApp
+{
+ XCTAssertTrue(SUCodeSigningVerifier bundleAtURLIsCodeSigned:self.validSignedAppURL, @"App expected to be code signed");
+
+ NSError *error = nil;
+ XCTAssertTrue(SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:self.validSignedAppURL error:&error, @"signature should be valid");
+ XCTAssertNil(error, @"error should be nil");
+}
+
+- (void)testValidSignedCalculatorApp
+{
+ NSString *calculatorPath = SUCodeSigningVerifierTest calculatorApplicationPath;
+ NSURL *appPath = NSURL fileURLWithPath:calculatorPath;
+ XCTAssertTrue(SUCodeSigningVerifier bundleAtURLIsCodeSigned:appPath, @"App expected to be code signed");
+
+ NSError *error = nil;
+ XCTAssertTrue(SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:appPath error:&error, @"signature should be valid");
+ XCTAssertNil(error, @"error should be nil");
+}
+
+- (void)testValidMatchingSelf
+{
+ NSString *calculatorPath = SUCodeSigningVerifierTest calculatorApplicationPath;
+ NSError *error = nil;
+ NSURL *appPath = NSURL fileURLWithPath:calculatorPath;
+
+ XCTAssertTrue(SUCodeSigningVerifier codeSignatureAtBundleURL:appPath matchesSignatureAtBundleURL:appPath error:&error, @"Our valid signed app expected to having matching signature to itself");
+}
+
+- (void)testValidMatching
+{
+ NSString *calculatorPath = SUCodeSigningVerifierTest calculatorApplicationPath;
+ // We can't test our own app because matching with ad-hoc signed apps understandably does not succeed
+ NSError *error = nil;
+ NSURL *appPath = NSURL fileURLWithPath:calculatorPath;
+ XCTAssertTrue(SUCodeSigningVerifier codeSignatureAtBundleURL:appPath matchesSignatureAtBundleURL:self.calculatorCopyURL error:&error, @"The calculator app is expected to have matching identity signature to its altered copy");
+}
+
+- (void)testInvalidMatching
+{
+ NSString *calculatorPath = SUCodeSigningVerifierTest calculatorApplicationPath;
+ NSURL *appPath = NSURL fileURLWithPath:calculatorPath;
+ NSError *error = nil;
+ XCTAssertFalse(SUCodeSigningVerifier codeSignatureAtBundleURL:appPath matchesSignatureAtBundleURL:self.validSignedAppURL error:&error, @"Calculator app bundle expected to have different signature than our valid signed app");
+}
+
+- (void)testInvalidSignedApp
+{
+ XCTAssertTrue(SUCodeSigningVerifier bundleAtURLIsCodeSigned:self.invalidSignedAppURL, @"App expected to be code signed, but signature is invalid");
+
+ NSError *error = nil;
+ XCTAssertFalse(SUCodeSigningVerifier codeSignatureIsValidAtBundleURL:self.invalidSignedAppURL error:&error, @"signature should not be valid");
+ XCTAssertNotNil(error, @"error should not be nil");
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUFileManagerTest.swift Added

@@ -0,0 +1,325 @@
+//
+//  SUFileManagerTest.swift
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 9/26/15.
+//  Copyright © 2015 Sparkle Project. All rights reserved.
+//
+
+import XCTest
+
+class SUFileManagerTest: XCTestCase
+{
+    func makeTempFiles(_ testBlock: (SUFileManager, URL, URL, URL, URL, URL, URL) -> Void)
+    {
+        let fileManager = SUFileManager()
+        
+        let tempDirectoryURL = try! fileManager.makeTemporaryDirectoryAppropriate(forDirectoryURL: URL(fileURLWithPath: NSHomeDirectory()))
+
+        defer {
+            try! fileManager.removeItem(at: tempDirectoryURL)
+        }
+
+        let ordinaryFileURL = tempDirectoryURL.appendingPathComponent("a file written by sparkles unit tests")
+        try! "foo".data(using: String.Encoding.utf8)!.write(to: ordinaryFileURL, options: .atomic)
+
+        let directoryURL = tempDirectoryURL.appendingPathComponent("a directory written by sparkles unit tests")
+        try! FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: false, attributes: nil)
+
+        let fileInDirectoryURL = directoryURL.appendingPathComponent("a file inside a directory written by sparkles unit tests")
+        try! "bar baz".data(using: String.Encoding.utf8)!.write(to: fileInDirectoryURL, options: .atomic)
+
+        let validSymlinkURL = tempDirectoryURL.appendingPathComponent("symlink test")
+        try! FileManager.default.createSymbolicLink(at: validSymlinkURL, withDestinationURL: directoryURL)
+
+        let invalidSymlinkURL = tempDirectoryURL.appendingPathComponent("symlink test 2")
+        try! FileManager.default.createSymbolicLink(at: invalidSymlinkURL, withDestinationURL: (tempDirectoryURL.appendingPathComponent("does not exist")))
+
+        testBlock(fileManager, tempDirectoryURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, invalidSymlinkURL)
+    }
+
+    func testMoveFiles()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, invalidSymlinkURL in
+            XCTAssertNil(try? fileManager.moveItem(at: ordinaryFileURL, to: directoryURL))
+            XCTAssertNil(try? fileManager.moveItem(at: ordinaryFileURL, to: directoryURL.appendingPathComponent("foo").appendingPathComponent("bar")))
+            XCTAssertNil(try? fileManager.moveItem(at: rootURL.appendingPathComponent("does not exist"), to: directoryURL))
+
+            let newFileURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new file"))
+            try! fileManager.moveItem(at: ordinaryFileURL, to: newFileURL)
+            XCTAssertFalse(fileManager._itemExists(at: ordinaryFileURL))
+            XCTAssertTrue(fileManager._itemExists(at: newFileURL))
+
+            let newValidSymlinkURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new symlink"))
+            try! fileManager.moveItem(at: validSymlinkURL, to: newValidSymlinkURL)
+            XCTAssertFalse(fileManager._itemExists(at: validSymlinkURL))
+            XCTAssertTrue(fileManager._itemExists(at: newValidSymlinkURL))
+            XCTAssertTrue(fileManager._itemExists(at: directoryURL))
+
+            let newInvalidSymlinkURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new invalid symlink"))
+            try! fileManager.moveItem(at: invalidSymlinkURL, to: newInvalidSymlinkURL)
+            XCTAssertFalse(fileManager._itemExists(at: invalidSymlinkURL))
+            XCTAssertTrue(fileManager._itemExists(at: newValidSymlinkURL))
+
+            let newDirectoryURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new directory"))
+            try! fileManager.moveItem(at: directoryURL, to: newDirectoryURL)
+            XCTAssertFalse(fileManager._itemExists(at: directoryURL))
+            XCTAssertTrue(fileManager._itemExists(at: newDirectoryURL))
+            XCTAssertFalse(fileManager._itemExists(at: fileInDirectoryURL))
+            XCTAssertTrue(fileManager._itemExists(at: newDirectoryURL.appendingPathComponent(fileInDirectoryURL.lastPathComponent)))
+        }
+    }
+
+    func testCopyFiles()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, _, invalidSymlinkURL in
+            XCTAssertNil(try? fileManager.copyItem(at: ordinaryFileURL, to: directoryURL))
+            XCTAssertNil(try? fileManager.copyItem(at: ordinaryFileURL, to: directoryURL.appendingPathComponent("foo").appendingPathComponent("bar")))
+            XCTAssertNil(try? fileManager.copyItem(at: rootURL.appendingPathComponent("does not exist"), to: directoryURL))
+
+            let newFileURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new file"))
+            try! fileManager.copyItem(at: ordinaryFileURL, to: newFileURL)
+            XCTAssertTrue(fileManager._itemExists(at: ordinaryFileURL))
+            XCTAssertTrue(fileManager._itemExists(at: newFileURL))
+
+            let newSymlinkURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new symlink file"))
+            try! fileManager.copyItem(at: invalidSymlinkURL, to: newSymlinkURL)
+            XCTAssertTrue(fileManager._itemExists(at: newSymlinkURL))
+
+            let newDirectoryURL = (ordinaryFileURL.deletingLastPathComponent().appendingPathComponent("new directory"))
+            try! fileManager.copyItem(at: directoryURL, to: newDirectoryURL)
+            XCTAssertTrue(fileManager._itemExists(at: directoryURL))
+            XCTAssertTrue(fileManager._itemExists(at: newDirectoryURL))
+            XCTAssertTrue(fileManager._itemExists(at: fileInDirectoryURL))
+            XCTAssertTrue(fileManager._itemExists(at: newDirectoryURL.appendingPathComponent(fileInDirectoryURL.lastPathComponent)))
+        }
+    }
+
+    func testRemoveFiles()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, _ in
+            XCTAssertNil(try? fileManager.removeItem(at: rootURL.appendingPathComponent("does not exist")))
+
+            try! fileManager.removeItem(at: ordinaryFileURL)
+            XCTAssertFalse(fileManager._itemExists(at: ordinaryFileURL))
+
+            try! fileManager.removeItem(at: validSymlinkURL)
+            XCTAssertFalse(fileManager._itemExists(at: validSymlinkURL))
+            XCTAssertTrue(fileManager._itemExists(at: directoryURL))
+
+            try! fileManager.removeItem(at: directoryURL)
+            XCTAssertFalse(fileManager._itemExists(at: directoryURL))
+            XCTAssertFalse(fileManager._itemExists(at: fileInDirectoryURL))
+        }
+    }
+
+    func testReleaseFilesFromQuarantine()
+    {
+        makeTempFiles() { fileManager, _, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, _ in
+            try! fileManager.releaseItemFromQuarantine(atRootURL: ordinaryFileURL)
+            try! fileManager.releaseItemFromQuarantine(atRootURL: directoryURL)
+            try! fileManager.releaseItemFromQuarantine(atRootURL: validSymlinkURL)
+
+            let quarantineData = "does not really matter what is here".cString(using: String.Encoding.utf8)!
+            let quarantineDataLength = Int(strlen(quarantineData))
+
+            XCTAssertEqual(0, setxattr(ordinaryFileURL.path, SUAppleQuarantineIdentifier, quarantineData, quarantineDataLength, 0, XATTR_CREATE))
+            XCTAssertGreaterThan(getxattr(ordinaryFileURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW), 0)
+
+            try! fileManager.releaseItemFromQuarantine(atRootURL: ordinaryFileURL)
+            XCTAssertEqual(-1, getxattr(ordinaryFileURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW))
+
+            XCTAssertEqual(0, setxattr(directoryURL.path, SUAppleQuarantineIdentifier, quarantineData, quarantineDataLength, 0, XATTR_CREATE))
+            XCTAssertGreaterThan(getxattr(directoryURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW), 0)
+
+            XCTAssertEqual(0, setxattr(fileInDirectoryURL.path, SUAppleQuarantineIdentifier, quarantineData, quarantineDataLength, 0, XATTR_CREATE))
+            XCTAssertGreaterThan(getxattr(fileInDirectoryURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW), 0)
+
+            // Extended attributes can't be set on symbolic links currently
+            try! fileManager.releaseItemFromQuarantine(atRootURL: validSymlinkURL)
+            XCTAssertGreaterThan(getxattr(directoryURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW), 0)
+            XCTAssertEqual(-1, getxattr(validSymlinkURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW))
+
+            try! fileManager.releaseItemFromQuarantine(atRootURL: directoryURL)
+
+            XCTAssertEqual(-1, getxattr(directoryURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW))
+            XCTAssertEqual(-1, getxattr(fileInDirectoryURL.path, SUAppleQuarantineIdentifier, nil, 0, 0, XATTR_NOFOLLOW))
+        }
+    }
+
+    func groupIDAtPath(_ path: String) -> gid_t
+    {
+        let attributes = try! FileManager.default.attributesOfItem(atPath: path)
+        let groupID = attributesFileAttributeKey.groupOwnerAccountID as! NSNumber
+        return groupID.uint32Value
+    }
+
+    // Only the super user can alter user IDs, so changing user IDs is not tested here
+    // Instead we try to change the group ID - we just have to be a member of that group
+    func testAlterFilesGroupID()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, _ in
+            XCTAssertNil(try? fileManager.changeOwnerAndGroupOfItem(atRootURL: ordinaryFileURL, toMatch: rootURL.appendingPathComponent("does not exist")))
+
+            XCTAssertNil(try? fileManager.changeOwnerAndGroupOfItem(atRootURL: rootURL.appendingPathComponent("does not exist"), toMatch: ordinaryFileURL))
+
+            let everyoneGroup = getgrnam("everyone")
+            let everyoneGroupID = everyoneGroup?.pointee.gr_gid
+
+            let staffGroup = getgrnam("staff")
+            let staffGroupID = staffGroup?.pointee.gr_gid
+
+            XCTAssertNotEqual(staffGroupID, everyoneGroupID)
+
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(ordinaryFileURL.path))
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(directoryURL.path))
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(fileInDirectoryURL.path))
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(validSymlinkURL.path))
+
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: fileInDirectoryURL, toMatch: ordinaryFileURL)
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: ordinaryFileURL, toMatch: ordinaryFileURL)
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: validSymlinkURL, toMatch: ordinaryFileURL)
+
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(ordinaryFileURL.path))
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(directoryURL.path))
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(validSymlinkURL.path))
+
+            XCTAssertEqual(0, chown(ordinaryFileURL.path, getuid(), everyoneGroupID!))
+            XCTAssertEqual(everyoneGroupID, self.groupIDAtPath(ordinaryFileURL.path))
+
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: fileInDirectoryURL, toMatch: ordinaryFileURL)
+            XCTAssertEqual(everyoneGroupID, self.groupIDAtPath(fileInDirectoryURL.path))
+
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: fileInDirectoryURL, toMatch: directoryURL)
+            XCTAssertEqual(staffGroupID, self.groupIDAtPath(fileInDirectoryURL.path))
+
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: validSymlinkURL, toMatch: ordinaryFileURL)
+            XCTAssertEqual(everyoneGroupID, self.groupIDAtPath(validSymlinkURL.path))
+
+            try! fileManager.changeOwnerAndGroupOfItem(atRootURL: directoryURL, toMatch: ordinaryFileURL)
+            XCTAssertEqual(everyoneGroupID, self.groupIDAtPath(directoryURL.path))
+            XCTAssertEqual(everyoneGroupID, self.groupIDAtPath(fileInDirectoryURL.path))
+        }
+    }
+
+    func testUpdateFileModificationTime()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, _, validSymlinkURL, _ in
+            XCTAssertNil(try? fileManager.updateModificationAndAccessTimeOfItem(at: rootURL.appendingPathComponent("does not exist")))
+
+            let oldOrdinaryFileAttributes = try! FileManager.default.attributesOfItem(atPath: ordinaryFileURL.path)
+            let oldDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: directoryURL.path)
+            let oldValidSymlinkAttributes = try! FileManager.default.attributesOfItem(atPath: validSymlinkURL.path)
+
+            sleep(1); // wait for clock to advance
+
+            try! fileManager.updateModificationAndAccessTimeOfItem(at: ordinaryFileURL)
+            try! fileManager.updateModificationAndAccessTimeOfItem(at: directoryURL)
+            try! fileManager.updateModificationAndAccessTimeOfItem(at: validSymlinkURL)
+
+            let newOrdinaryFileAttributes = try! FileManager.default.attributesOfItem(atPath: ordinaryFileURL.path)
+            XCTAssertGreaterThan((newOrdinaryFileAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldOrdinaryFileAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+            let newDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: directoryURL.path)
+            XCTAssertGreaterThan((newDirectoryAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldDirectoryAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+            let newSymlinkAttributes = try! FileManager.default.attributesOfItem(atPath: validSymlinkURL.path)
+            XCTAssertGreaterThan((newSymlinkAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldValidSymlinkAttributesFileAttributeKey.modificationDate as! Date), 0)
+        }
+    }
+
+    func testUpdateFileAccessTime()
+    {
+        let accessTime: ((URL) -> timespec?) = { url in
+            var outputStat = stat()
+            let result = lstat(url.path, &outputStat)
+            if result != 0 {
+                return nil
+            } else {
+                return outputStat.st_atimespec
+            }
+        }
+
+        let timespecEqual: (timespec, timespec) -> Bool = {t1, t2 in
+            (t1.tv_sec == t2.tv_sec && t1.tv_nsec == t2.tv_nsec)
+        }
+
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, fileInDirectoryURL, validSymlinkURL, _ in
+            XCTAssertNil(try? fileManager.updateAccessTimeOfItem(atRootURL: rootURL.appendingPathComponent("does not exist")))
+
+            let oldOrdinaryFileTime = accessTime(ordinaryFileURL)!
+            let oldDirectoryTime = accessTime(directoryURL)!
+            let oldValidSymlinkTime = accessTime(validSymlinkURL)!
+
+            sleep(1); // wait for clock to advance
+
+            // Make sure access time haven't changed since; lstat() shouldn't have changed the access time..
+            XCTAssertTrue(timespecEqual(oldOrdinaryFileTime, accessTime(ordinaryFileURL)!))
+            XCTAssertTrue(timespecEqual(oldDirectoryTime, accessTime(directoryURL)!))
+            XCTAssertTrue(timespecEqual(oldValidSymlinkTime, accessTime(validSymlinkURL)!))
+
+            // Test the symlink and make sure the target directory doesn't change
+            try! fileManager.updateAccessTimeOfItem(atRootURL: validSymlinkURL)
+            XCTAssertFalse(timespecEqual(oldValidSymlinkTime, accessTime(validSymlinkURL)!))
+            XCTAssertTrue(timespecEqual(oldDirectoryTime, accessTime(directoryURL)!))
+
+            // Test an ordinary file
+            try! fileManager.updateAccessTimeOfItem(atRootURL: ordinaryFileURL)
+            XCTAssertFalse(timespecEqual(oldOrdinaryFileTime, accessTime(ordinaryFileURL)!))
+
+            // Test the directory and file inside the directory
+            try! fileManager.updateAccessTimeOfItem(atRootURL: directoryURL)
+            let newDirectoryTime = accessTime(directoryURL)!
+            XCTAssertFalse(timespecEqual(oldDirectoryTime, newDirectoryTime))
+            XCTAssertTrue(timespecEqual(newDirectoryTime, accessTime(fileInDirectoryURL)!))
+        }
+    }
+
+    func testFileExists()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, _, validSymlinkURL, invalidSymlinkURL in
+            XCTAssertTrue(fileManager._itemExists(at: ordinaryFileURL))
+            XCTAssertTrue(fileManager._itemExists(at: directoryURL))
+            XCTAssertFalse(fileManager._itemExists(at: rootURL.appendingPathComponent("does not exist")))
+
+            var isOrdinaryFileDirectory: ObjCBool = false
+            XCTAssertTrue(fileManager._itemExists(at: ordinaryFileURL, isDirectory: &isOrdinaryFileDirectory) && !isOrdinaryFileDirectory.boolValue)
+
+            var isDirectoryADirectory: ObjCBool = false
+            XCTAssertTrue(fileManager._itemExists(at: directoryURL, isDirectory: &isDirectoryADirectory) && isDirectoryADirectory.boolValue)
+
+            XCTAssertFalse(fileManager._itemExists(at: rootURL.appendingPathComponent("does not exist"), isDirectory: nil))
+
+            XCTAssertTrue(fileManager._itemExists(at: validSymlinkURL))
+
+            var validSymlinkIsADirectory: ObjCBool = false
+            XCTAssertTrue(fileManager._itemExists(at: validSymlinkURL, isDirectory: &validSymlinkIsADirectory) && !validSymlinkIsADirectory.boolValue)
+
+            // Symlink should still exist even if it doesn't point to a file that exists
+            XCTAssertTrue(fileManager._itemExists(at: invalidSymlinkURL))
+
+            var invalidSymlinkIsADirectory: ObjCBool = false
+            XCTAssertTrue(fileManager._itemExists(at: invalidSymlinkURL, isDirectory: &invalidSymlinkIsADirectory) && !invalidSymlinkIsADirectory.boolValue)
+        }
+    }
+
+    func testMakeDirectory()
+    {
+        makeTempFiles() { fileManager, rootURL, ordinaryFileURL, directoryURL, _, validSymlinkURL, _ in
+            XCTAssertNil(try? fileManager.makeDirectory(at: ordinaryFileURL))
+            XCTAssertNil(try? fileManager.makeDirectory(at: directoryURL))
+
+            XCTAssertNil(try? fileManager.makeDirectory(at: rootURL.appendingPathComponent("this should").appendingPathComponent("be a failure")))
+
+            let newDirectoryURL = rootURL.appendingPathComponent("new test directory")
+            XCTAssertFalse(fileManager._itemExists(at: newDirectoryURL))
+            try! fileManager.makeDirectory(at: newDirectoryURL)
+
+            var isDirectory: ObjCBool = false
+            XCTAssertTrue(fileManager._itemExists(at: newDirectoryURL, isDirectory: &isDirectory))
+
+            try! fileManager.removeItem(at: directoryURL)
+            XCTAssertNil(try? fileManager.makeDirectory(at: validSymlinkURL))
+        }
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUInstallerTest.m Added

@@ -0,0 +1,84 @@
+//
+// SUInstallerTest.m
+// Sparkle
+//
+// Created by Kornel on 24/04/2015.
+// Copyright (c) 2015 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+#import "SUHost.h"
+#import "SUInstaller.h"
+#import "SUInstallerProtocol.h"
+#import "SPUInstallationType.h"
+#import <unistd.h>
+
+@interface SUInstallerTest : XCTestCase
+
+@end
+
+@implementation SUInstallerTest
+
+- (void)setUp
+{
+ super setUp;
+ // Put setup code here. This method is called before the invocation of each test method in the class.
+}
+
+- (void)tearDown
+{
+ // Put teardown code here. This method is called after the invocation of each test method in the class.
+ super tearDown;
+}
+
+#if __clang_major__ >= 6
+- (void)testInstallIfRoot
+{
+ uid_t uid = getuid();
+
+ if (uid != 0) {
+ NSLog(@"Test must be run as root: sudo xcodebuild -project Sparkle.xcodeproj -scheme Sparkle '-only-testing:Sparkle Unit Tests/SUInstallerTest/testInstallIfRoot' test");
+ return;
+ }
+
+ NSString *expectedDestination = @"/tmp/sparklepkgtest.app";
+ NSFileManager *fm = NSFileManager defaultManager;
+ fm removeItemAtPath:expectedDestination error:nil;
+ XCTAssertFalse(fm fileExistsAtPath:expectedDestination isDirectory:nil);
+
+ NSBundle *bundle = NSBundle bundleForClass:self class;
+ NSString *path = bundle pathForResource:@"test" ofType:@"pkg";
+ XCTAssertNotNil(path);
+
+ SUHost *host = SUHost alloc initWithBundle:bundle;
+
+ NSError *installerError = nil;
+ // Note: we may not be using the "correct" home directory or user name (they will be root) but our test pkg does not have
+ // pre/post install scripts so it doesn't matter
+ id<SUInstallerProtocol> installer = SUInstaller installerForHost:host expectedInstallationType:SPUInstallationTypeGuidedPackage updateDirectory:path stringByDeletingLastPathComponent homeDirectory:NSHomeDirectory() userName:NSUserName() error:&installerError;
+ 
+ if (installer == nil) {
+ XCTFail(@"Installer is nil with error: %@", installerError);
+ return;
+ }
+ 
+ NSError *initialInstallError = nil;
+ if (!installer performInitialInstallation:&initialInstallError) {
+ XCTFail(@"Initial Installation failed with error: %@", initialInstallError);
+ return;
+ }
+
+ NSError *finalInstallError = nil;
+ if (!installer performFinalInstallationProgressBlock:nil error:&finalInstallError) {
+ XCTFail(@"Final installation failed with error: %@", finalInstallError);
+ return;
+ }
+
+ XCTAssertTrue(fm fileExistsAtPath:expectedDestination isDirectory:nil);
+
+ fm removeItemAtPath:expectedDestination error:nil;
+}
+#endif
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUSignatureVerifierTest.m Added

@@ -0,0 +1,222 @@
+//
+// SUSignatureVerifierTest.m
+// Sparkle
+//
+// Created by Kornel on 25/07/2014.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <XCTest/XCTest.h>
+#import "SUSignatureVerifier.h"
+#import "SUSignatures.h"
+
+@interface SUSignatureVerifierTest : XCTestCase
+@property NSString *testFile, *pubDSAKeyFile, *pubEdKey;
+@end
+
+@implementation SUSignatureVerifierTest
+@synthesize testFile, pubDSAKeyFile, pubEdKey;
+
+- (void)setUp
+{
+ super setUp;
+
+ self.testFile = NSBundle bundleForClass:self class pathForResource:@"signed-test-file" ofType:@"txt";
+ self.pubDSAKeyFile = NSBundle bundleForClass:self class pathForResource:@"test-pubkey" ofType:@"pem";
+ self.pubEdKey = @"rhHib+w769W2/6/t+oM1ZxgjBB93BfBKMLO0Qo1etQs=";
+}
+
+- (void)testVerifyFileAtPathUsingDSA
+{
+ NSString *pubKey = NSString stringWithContentsOfFile:self.pubDSAKeyFile encoding:NSASCIIStringEncoding error:nil;
+ XCTAssertNotNil(pubKey, @"Public key must be readable");
+
+ NSString *validSig = @"MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ==";
+
+ NSError *error = nil;
+ 
+ XCTAssertTrue(self checkFile:self.testFile
+ withDSAKey:pubKey
+ signature:validSig
+ error:&error,
+ @"Expected valid signature: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withDSAKey:@"lol"
+ signature:validSig
+ error:&error,
+ @"Invalid pubkey: %@", error);
+
+ XCTAssertFalse(self checkFile:self.pubDSAKeyFile
+ withDSAKey:pubKey
+ signature:validSig
+ error:&error,
+ @"Wrong file checked: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withDSAKey:pubKey
+ signature:@"MCwCFCIHCiYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="
+ error:&error,
+ @"Expected invalid signature: %@", error);
+
+ XCTAssertTrue(self checkFile:self.testFile
+ withDSAKey:pubKey
+ signature:@"MC0CFAsKO7cq2q7L5/FWe6ybVIQkwAwSAhUA2Q8GKsE309eugi/v3Kh1W3w3N8c="
+ error:&error,
+ @"Expected valid signature: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withDSAKey:pubKey
+ signature:@"MC0CFAsKO7cq2q7L5/FWe6ybVIQkwAwSAhUA2Q8GKsE309eugi/v3Kh1W3w3N8"
+ error:&error,
+ @"Expected invalid signature: %@", error);
+}
+
+- (void)testVerifyFileAtPathUsingED25519
+{
+ NSString *validSig = @"EIawm2YkDZ2gBfkEMF2+1VuuTeXnCGZOdnMdVgPPvDZioq7bvDayXqKkIIzSjKMmeFdcFJOHdnba5ZV60+gPBw==";
+
+ NSError *error = nil;
+ 
+ XCTAssertTrue(self checkFile:self.testFile
+ withEdKey:self.pubEdKey
+ signature:validSig
+ error:&error,
+ @"Expected valid signature: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withEdKey:@"lol"
+ signature:validSig
+ error:&error,
+ @"Invalid pubkey: %@", error);
+
+ XCTAssertFalse(self checkFile:self.pubDSAKeyFile
+ withEdKey:self.pubEdKey
+ signature:validSig
+ error:&error,
+ @"Wrong file checked: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withEdKey:self.pubEdKey
+ signature:@"wTcpXCgWoa4NrJpsfzS61FXJIbv963//12U2ef9xstzVOLPHYK2N4/ojgpDV5N1/NGG1uWMBgK+kEWp0Z5zMDQ=="
+ error:&error,
+ @"Expected wrong signature: %@", error);
+
+ XCTAssertFalse(self checkFile:self.testFile
+ withEdKey:self.pubEdKey
+ signature:@"lol"
+ error:&error,
+ @"Invalid signature: %@", error);
+}
+
+- (BOOL)checkFile:(NSString *)aFile withDSAKey:(NSString *)pubKey signature:(NSString *)sigString error:(NSError * __autoreleasing *)error
+{
+ SUPublicKeys *pubKeys = SUPublicKeys alloc initWithDsa:pubKey ed:nil;
+ SUSignatureVerifier *v = SUSignatureVerifier alloc initWithPublicKeys:pubKeys;
+
+ SUSignatures *sig = SUSignatures alloc initWithDsa:sigString ed:nil;
+
+ return v verifyFileAtPath:aFile signatures:sig error:error;
+}
+
+- (BOOL)checkFile:(NSString *)aFile withEdKey:(NSString *)pubKey signature:(NSString *)sigString error:(NSError * __autoreleasing *)error
+{
+ SUPublicKeys *pubKeys = SUPublicKeys alloc initWithDsa:nil ed:pubKey;
+ SUSignatureVerifier *v = SUSignatureVerifier alloc initWithPublicKeys:pubKeys;
+
+ SUSignatures *sig = SUSignatures alloc initWithDsa:nil ed:sigString;
+
+ return v verifyFileAtPath:aFile signatures:sig error:error;
+}
+
+- (void)testVerifyFileWithBothKeys
+{
+ NSString *dsaKey = NSString stringWithContentsOfFile:self.pubDSAKeyFile encoding:NSASCIIStringEncoding error:nil;
+ XCTAssertNotNil(dsaKey, @"Public key must be readable");
+
+ SUPublicKeys *pubKeys = SUPublicKeys alloc initWithDsa:dsaKey ed:self.pubEdKey;
+ SUSignatureVerifier *v = SUSignatureVerifier alloc initWithPublicKeys:pubKeys;
+ NSError *error = nil;
+
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:nil ed:nil error:&error,
+ @"Fail if no signatures are provided: %@", error);
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:@"lol" ed:@"lol" error:&error,
+ @"Fail if both signatures are invalid: %@", error);
+
+ NSString *dsaSig = @"MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ==";
+ NSString *wrongDSASig = @"MCwCFCIHCiYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ==";
+ NSString *edSig = @"EIawm2YkDZ2gBfkEMF2+1VuuTeXnCGZOdnMdVgPPvDZioq7bvDayXqKkIIzSjKMmeFdcFJOHdnba5ZV60+gPBw==";
+ NSString *wrongEdSig = @"wTcpXCgWoa4NrJpsfzS61FXJIbv963//12U2ef9xstzVOLPHYK2N4/ojgpDV5N1/NGG1uWMBgK+kEWp0Z5zMDQ==";
+
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:dsaSig ed:nil error:&error,
+ @"EdDSA signature must be present if app has EdDSA key: %@", error);
+ 
+ XCTAssertTrue(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:nil ed:edSig error:&error,
+ @"Allow just an EdDSA signature if that's all that's available: %@", error);
+
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:dsaSig ed:wrongEdSig error:&error,
+ @"Fail on a bad Ed25519 signature regardless: %@", error);
+ XCTAssertTrue(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:wrongDSASig ed:edSig error:&error,
+ @"Allow bad DSA signature if EdDSA signature is good: %@", error);
+
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:dsaSig ed:@"lol" error:&error,
+ @"Fail if the Ed25519 signature is invalid: %@", error);
+ XCTAssertFalse(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:@"lol" ed:edSig error:&error,
+ @"Fail if invalid DSA signature is used even if EdDSA signature is good: %@", error);
+
+ XCTAssertTrue(v verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:dsaSig ed:edSig error:&error,
+ @"Pass if both are valid: %@", error);
+}
+
+- (void)testVerifyFileWithWrongKey
+{
+ NSString *dsaSig = @"MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ==";
+ NSString *edSig = @"EIawm2YkDZ2gBfkEMF2+1VuuTeXnCGZOdnMdVgPPvDZioq7bvDayXqKkIIzSjKMmeFdcFJOHdnba5ZV60+gPBw==";
+
+ NSString *dsaKey = NSString stringWithContentsOfFile:self.pubDSAKeyFile encoding:NSASCIIStringEncoding error:nil;
+ XCTAssertNotNil(dsaKey, @"Public key must be readable");
+
+ SUPublicKeys *dsaOnlyKeys = SUPublicKeys alloc initWithDsa:dsaKey ed:nil;
+ SUSignatureVerifier *dsaOnlyVerifier = SUSignatureVerifier alloc initWithPublicKeys:dsaOnlyKeys;
+
+ NSError *error = nil;
+ XCTAssertFalse(dsaOnlyVerifier verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:nil ed:edSig error:&error,
+ @"DSA cannot verify an Ed signature: %@", error);
+
+ SUPublicKeys *edOnlyKeys = SUPublicKeys alloc initWithDsa:nil ed:self.pubEdKey;
+ SUSignatureVerifier *edOnlyVerifier = SUSignatureVerifier alloc initWithPublicKeys:edOnlyKeys;
+
+ XCTAssertFalse(edOnlyVerifier verifyFileAtPath:self.testFile
+ signatures:SUSignatures alloc initWithDsa:dsaSig ed:nil error:&error,
+ @"Ed cannot verify an DSA signature: %@", error);
+
+}
+
+- (void)testValidatePath
+{
+ NSString *dsaStr = NSString stringWithContentsOfFile:self.pubDSAKeyFile encoding:NSASCIIStringEncoding error:nil;
+ XCTAssertNotNil(dsaStr);
+ SUPublicKeys *pubkeys = SUPublicKeys alloc initWithDsa:dsaStr ed:nil;
+ XCTAssertNotNil(pubkeys);
+ XCTAssertNotNil(pubkeys.dsaPubKey);
+
+ SUSignatures *sig = SUSignatures alloc initWithDsa:@"MC0CFFMF3ha5kjvrJ9JTpTR8BenPN9QUAhUAzY06JRdtP17MJewxhK0twhvbKIE=" ed:nil;
+ XCTAssertNotNil(sig);
+ XCTAssertNotNil(sig.dsaSignature);
+
+ NSError *error = nil;
+ XCTAssertTrue(SUSignatureVerifier validatePath:self.testFile withSignatures:sig withPublicKeys:pubkeys error:&error, @"Expected valid signature: %@", error);
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUSpotlightImporterTest.swift Added

@@ -0,0 +1,60 @@
+//
+//  SUSpotlightImporterTest.swift
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/27/16.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import XCTest
+
+class SUSpotlightImporterTest: XCTestCase
+{
+    func testUpdatingSpotlightBundles()
+    {
+        let fileManager = SUFileManager()
+        let tempDirectoryURL = try! fileManager.makeTemporaryDirectoryAppropriate(forDirectoryURL: URL(fileURLWithPath: NSHomeDirectory()))
+
+        let bundleDirectory = tempDirectoryURL.appendingPathComponent("bundle.app")
+        try! fileManager.makeDirectory(at: bundleDirectory)
+
+        let innerDirectory = bundleDirectory.appendingPathComponent("foo")
+        try! fileManager.makeDirectory(at: innerDirectory)
+        try! Data().write(to: (bundleDirectory.appendingPathComponent("bar")), options: .atomicWrite)
+
+        let importerDirectory = innerDirectory.appendingPathComponent("baz.mdimporter")
+
+        try! fileManager.makeDirectory(at: importerDirectory)
+        try! fileManager.makeDirectory(at: innerDirectory.appendingPathComponent("flag"))
+
+        try! Data().write(to: (importerDirectory.appendingPathComponent("file")), options: .atomicWrite)
+
+        let oldFooDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.path)
+        let oldBarFileAttributes = try! FileManager.default.attributesOfItem(atPath: bundleDirectory.appendingPathComponent("bar").path)
+        let oldImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.path)
+        let oldFlagAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.appendingPathComponent("flag").path)
+        let oldFileInImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.appendingPathComponent("file").path)
+
+        sleep(1) // wait for clock to advance
+
+        // Update spotlight bundles
+        SUBinaryDeltaUnarchiver.updateSpotlightImporters(atBundlePath: bundleDirectory.path)
+
+        let newFooDirectoryAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.path)
+        XCTAssertEqual((newFooDirectoryAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldFooDirectoryAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+        let newBarFileAttributes = try! FileManager.default.attributesOfItem(atPath: bundleDirectory.appendingPathComponent("bar").path)
+        XCTAssertEqual((newBarFileAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldBarFileAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+        let newImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.path)
+        XCTAssertGreaterThan((newImporterAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldImporterAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+        let newFlagAttributes = try! FileManager.default.attributesOfItem(atPath: innerDirectory.appendingPathComponent("flag").path)
+        XCTAssertEqual((newFlagAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldFlagAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+        let newFileInImporterAttributes = try! FileManager.default.attributesOfItem(atPath: importerDirectory.appendingPathComponent("file").path)
+        XCTAssertEqual((newFileInImporterAttributesFileAttributeKey.modificationDate as! Date).timeIntervalSince(oldFileInImporterAttributesFileAttributeKey.modificationDate as! Date), 0)
+
+        try! fileManager.removeItem(at: tempDirectoryURL)
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUUnarchiverTest.swift Added

@@ -0,0 +1,141 @@
+//
+//  SUUnarchiverTest.swift
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 9/4/15.
+//  Copyright © 2015 Sparkle Project. All rights reserved.
+//
+
+import XCTest
+
+class SUUnarchiverTest: XCTestCase
+{
+    func unarchiveTestAppWithExtension(_ archiveExtension: String, password: String? = nil, resourceName: String = "SparkleTestCodeSignApp", extractedAppName: String = "SparkleTestCodeSignApp", expectingInstallationType installationType: String = SPUInstallationTypeApplication, expectingSuccess: Bool = true) {
+        let appName = resourceName
+        let archiveResourceURL = Bundle(for: type(of: self)).url(forResource: appName, withExtension: archiveExtension)!
+
+        let fileManager = FileManager.default
+
+        // Do not remove this temporary directory
+        // If we do want to clean up and remove it (which isn't necessary but nice), we'd have to remove it
+        // after *both* our unarchive success and failure calls below finish (they both have async completion blocks inside their implementation)
+        let tempDirectoryURL = try! fileManager.url(for: .itemReplacementDirectory, in: .userDomainMask, appropriateFor: URL(fileURLWithPath: NSHomeDirectory()), create: true)
+
+        let unarchivedSuccessExpectation = super.expectation(description: "Unarchived Success (format: \(archiveExtension))")
+        let unarchivedFailureExpectation = super.expectation(description: "Unarchived Failure (format: \(archiveExtension))")
+
+        let tempArchiveURL = tempDirectoryURL.appendingPathComponent(archiveResourceURL.lastPathComponent)
+        let extractedAppURL = tempDirectoryURL.appendingPathComponent(extractedAppName).appendingPathExtension("app")
+
+        self.unarchiveTestAppWithExtension(archiveExtension, appName: appName, tempDirectoryURL: tempDirectoryURL, tempArchiveURL: tempArchiveURL, archiveResourceURL: archiveResourceURL, password: password, expectingInstallationType: installationType, expectingSuccess: expectingSuccess, testExpectation: unarchivedSuccessExpectation)
+        self.unarchiveNonExistentFileTestFailureAppWithExtension(archiveExtension, tempDirectoryURL: tempDirectoryURL, password: password, expectingInstallationType: installationType, testExpectation: unarchivedFailureExpectation)
+
+        super.waitForExpectations(timeout: 30.0, handler: nil)
+
+        if !archiveExtension.hasSuffix("pkg") && expectingSuccess {
+            XCTAssertTrue(fileManager.fileExists(atPath: extractedAppURL.path))
+            XCTAssertEqual("6a60ab31430cfca8fb499a884f4a29f73e59b472", hashOfTree(extractedAppURL.path))
+        }
+    }
+
+    func unarchiveNonExistentFileTestFailureAppWithExtension(_ archiveExtension: String, tempDirectoryURL: URL, password: String?, expectingInstallationType installationType: String, testExpectation: XCTestExpectation) {
+        let tempArchiveURL = tempDirectoryURL.appendingPathComponent("error-invalid").appendingPathExtension(archiveExtension)
+        let unarchiver = SUUnarchiver.unarchiver(forPath: tempArchiveURL.path, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
+
+        unarchiver.unarchive(completionBlock: {(error: Error?) -> Void in
+            XCTAssertNotNil(error)
+            testExpectation.fulfill()
+        }, progressBlock: nil)
+    }
+
+    // swiftlint:disable function_parameter_count
+    func unarchiveTestAppWithExtension(_ archiveExtension: String, appName: String, tempDirectoryURL: URL, tempArchiveURL: URL, archiveResourceURL: URL, password: String?, expectingInstallationType installationType: String, expectingSuccess: Bool, testExpectation: XCTestExpectation) {
+
+        let fileManager = FileManager.default
+
+        try! fileManager.copyItem(at: archiveResourceURL, to: tempArchiveURL)
+
+        let unarchiver = SUUnarchiver.unarchiver(forPath: tempArchiveURL.path, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
+
+        unarchiver.unarchive(completionBlock: {(error: Error?) -> Void in
+            if expectingSuccess {
+                XCTAssertNil(error)
+            } else {
+                XCTAssertNotNil(error)
+            }
+            testExpectation.fulfill()
+        }, progressBlock: nil)
+    }
+
+    func testUnarchivingZip()
+    {
+        self.unarchiveTestAppWithExtension("zip")
+    }
+    
+    // This zip file has extraneous zero bytes added at the very end
+    func testUnarchivingBadZipWithExtaneousTrailingBytes() {
+        // We may receive a SIGPIPE error when writing data to a pipe
+        // The Autoupdate installer ignores SIGPIPE too
+        // We need to ignore it otherwise the xctest will terminate unexpectedly with exit code 13
+        signal(SIGPIPE, SIG_IGN)
+        
+        self.unarchiveTestAppWithExtension("zip", resourceName: "SparkleTestCodeSignApp_bad_extraneous", extractedAppName: "SparkleTestCodeSignApp", expectingSuccess: false)
+        
+        signal(SIGPIPE, SIG_DFL)
+    }
+    
+    func testUnarchivingBadZipWithMissingHeaderBytes() {
+        // We may receive a SIGPIPE error when writing data to a pipe
+        // The Autoupdate installer ignores SIGPIPE too
+        // We need to ignore it otherwise the xctest will terminate unexpectedly with exit code 13
+        signal(SIGPIPE, SIG_IGN)
+        
+        self.unarchiveTestAppWithExtension("zip", resourceName: "SparkleTestCodeSignApp_bad_header", extractedAppName: "SparkleTestCodeSignApp", expectingSuccess: false)
+        
+        signal(SIGPIPE, SIG_DFL)
+    }
+
+    func testUnarchivingTarDotGz()
+    {
+        self.unarchiveTestAppWithExtension("tar.gz")
+    }
+
+    func testUnarchivingTar()
+    {
+        self.unarchiveTestAppWithExtension("tar")
+    }
+
+    func testUnarchivingTarDotBz2()
+    {
+        self.unarchiveTestAppWithExtension("tar.bz2")
+    }
+
+    func testUnarchivingTarDotXz()
+    {
+        self.unarchiveTestAppWithExtension("tar.xz")
+    }
+
+    func testUnarchivingHFSDmgWithLicenseAgreement()
+    {
+        self.unarchiveTestAppWithExtension("dmg")
+    }
+
+    func testUnarchivingEncryptedDmgWithLicenseAgreement()
+    {
+        self.unarchiveTestAppWithExtension("enc.dmg", password: "testpass")
+    }
+    
+    func testUnarchivingAPFSDMG()
+    {
+        self.unarchiveTestAppWithExtension("dmg", resourceName: "SparkleTestCodeSign_apfs")
+    }
+    
+    func testUnarchivingFlatPackage()
+    {
+        self.unarchiveTestAppWithExtension("pkg", resourceName: "test", expectingInstallationType: SPUInstallationTypeGuidedPackage)
+        
+        self.unarchiveTestAppWithExtension("pkg", resourceName: "test", expectingInstallationType: SPUInstallationTypeInteractivePackage, expectingSuccess: false)
+        
+        self.unarchiveTestAppWithExtension("pkg", resourceName: "test", expectingInstallationType: SPUInstallationTypeApplication, expectingSuccess: false)
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUUpdateValidatorTest.swift Added

@@ -0,0 +1,179 @@
+//
+//  SUUpdateValidatorTest.swift
+//  Sparkle
+//
+//  Created by Jordan Rose on 2020-06-13.
+//  Copyright © 2020 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import XCTest
+
+class SUUpdateValidatorTest: XCTestCase {
+    enum BundleConfig: String, CaseIterable, Equatable {
+        case none = "None"
+        case dsaOnly = "DSAOnly"
+        case edOnly = "EDOnly"
+        case both = "Both"
+        case codeSignedOnly = "CodeSignedOnly"
+        case codeSignedBoth = "CodeSignedBoth"
+        case codeSignedOnlyNew = "CodeSignedOnlyNew"
+        case codeSignedBothNew = "CodeSignedBothNew"
+        case codeSignedOldED = "CodeSignedOldED"
+        case codeSignedInvalidOnly = "CodeSignedInvalidOnly"
+        case codeSignedInvalid = "CodeSignedInvalid"
+
+        var hasAnyKeys: Bool {
+            switch self {
+            case .none, .codeSignedOnly, .codeSignedOnlyNew, .codeSignedInvalidOnly:
+                return false
+            case .dsaOnly, .edOnly, .both, .codeSignedBoth, .codeSignedBothNew, .codeSignedOldED, .codeSignedInvalid:
+                return true
+            }
+        }
+    }
+
+    struct SignatureConfig: CaseIterable, Equatable, CustomDebugStringConvertible {
+        enum State: CaseIterable, Equatable {
+            case none, invalid, invalidFormat, valid
+        }
+
+        var dsa: State
+        var ed: State
+
+        static let allCases: SignatureConfig = State.allCases.flatMap { dsaState in
+            State.allCases.map { edState in
+                SignatureConfig(dsa: dsaState, ed: edState)
+            }
+        }
+
+        var debugDescription: String {
+            return "(dsa: \(self.dsa), ed: \(self.ed))"
+        }
+    }
+
+    func bundle(_ config: BundleConfig) -> Bundle {
+        let testBundle = Bundle(for: SUUpdateValidatorTest.self)
+        let configBundleURL = testBundle.url(forResource: config.rawValue, withExtension: "bundle", subdirectory: "SUUpdateValidatorTest")!
+        return Bundle(url: configBundleURL)!
+    }
+
+    func signatures(_ config: SignatureConfig) -> SUSignatures {
+        let dsaSig: String?
+        switch config.dsa {
+        case .none: dsaSig = nil
+        case .invalid: dsaSig = "ABwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="
+        // Use some invalid base64 strings
+        case .invalidFormat: dsaSig = "%%wCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="
+        case .valid: dsaSig = "MCwCFCIHCIYYkfZavNzTitTW5tlRp/k5AhQ40poFytqcVhIYdCxQznaXeJPJDQ=="
+        }
+
+        let edSig: String?
+        switch config.ed {
+        case .none: edSig = nil
+        case .invalid: edSig = "wTcpXCgWoa4NrJpsfzS61FXJIbv963//12U2ef9xstzVOLPHYK2N4/ojgpDV5N1/NGG1uWMBgK+kEWp0Z5zMDQ=="
+        // Use some invalid base64 strings
+        case .invalidFormat: edSig = "%%cpXCgWoa4NrJpsfzS61FXJIbv963//12U2ef9xstzVOLPHYK2N4/ojgpDV5N1/NGG1uWMBgK+kEWp0Z5zMDQ=="
+        case .valid: edSig = "EIawm2YkDZ2gBfkEMF2+1VuuTeXnCGZOdnMdVgPPvDZioq7bvDayXqKkIIzSjKMmeFdcFJOHdnba5ZV60+gPBw=="
+        }
+
+        return SUSignatures(dsa: dsaSig, ed: edSig)
+    }
+
+    var signedTestFilePath: String {
+        let testBundle = Bundle(for: SUUpdateValidatorTest.self)
+        return testBundle.path(forResource: "signed-test-file", ofType: "txt")!
+    }
+
+    func testPrevalidation(bundle bundleConfig: BundleConfig, signatures signatureConfig: SignatureConfig, expectedResult: Bool, line: UInt = #line) {
+        let host = SUHost(bundle: self.bundle(bundleConfig))
+        let signatures = self.signatures(signatureConfig)
+        let validator = SUUpdateValidator(downloadPath: self.signedTestFilePath, signatures: signatures, host: host)
+
+        let result = (try? validator.validateDownloadPath()) != nil
+        XCTAssertEqual(result, expectedResult, "bundle: \(bundleConfig), signatures: \(signatureConfig)", line: line)
+    }
+
+    func testPrevalidation() {
+        for signatureConfig in SignatureConfig.allCases {
+            testPrevalidation(bundle: .none, signatures: signatureConfig, expectedResult: false)
+            testPrevalidation(bundle: .dsaOnly, signatures: signatureConfig, expectedResult: signatureConfig.dsa == .valid)
+            testPrevalidation(bundle: .edOnly, signatures: signatureConfig, expectedResult: signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+            testPrevalidation(bundle: .both, signatures: signatureConfig, expectedResult: signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+        }
+    }
+
+    func testPostValidation(oldBundle oldBundleConfig: BundleConfig, newBundle newBundleConfig: BundleConfig, signatures signatureConfig: SignatureConfig, expectedResult: Bool, line: UInt = #line) {
+        let oldBundle = self.bundle(oldBundleConfig)
+        let host = SUHost(bundle: oldBundle)
+        let signatures = self.signatures(signatureConfig)
+
+        let validator = SUUpdateValidator(downloadPath: self.signedTestFilePath, signatures: signatures, host: host)
+
+        let updateDirectory = temporaryDirectory("SUUpdateValidatorTest")!
+        defer { try! FileManager.default.removeItem(atPath: updateDirectory) }
+        let newBundle = self.bundle(newBundleConfig)
+        try! FileManager.default.copyItem(at: newBundle.bundleURL, to: URL(fileURLWithPath: updateDirectory).appendingPathComponent(oldBundle.bundleURL.lastPathComponent))
+
+        let result = (try? validator.validate(withUpdateDirectory: updateDirectory)) != nil
+        XCTAssertEqual(result, expectedResult, "oldBundle: \(oldBundleConfig), newBundle: \(newBundleConfig), signatures: \(signatureConfig)", line: line)
+    }
+
+    func testPostValidation(bundle bundleConfig: BundleConfig, signatures signatureConfig: SignatureConfig, expectedResult: Bool, line: UInt = #line) {
+        testPostValidation(oldBundle: bundleConfig, newBundle: bundleConfig, signatures: signatureConfig, expectedResult: expectedResult, line: line)
+    }
+
+    func testPostValidationWithoutCodeSigning() {
+        for signatureConfig in SignatureConfig.allCases {
+            testPostValidation(bundle: .none, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(bundle: .dsaOnly, signatures: signatureConfig, expectedResult: signatureConfig.dsa == .valid)
+            testPostValidation(bundle: .edOnly, signatures: signatureConfig, expectedResult: signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+            testPostValidation(bundle: .both, signatures: signatureConfig, expectedResult: signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+        }
+    }
+
+    func testPostValidationWithCodeSigning() {
+        for signatureConfig in SignatureConfig.allCases {
+            testPostValidation(bundle: .codeSignedOnly, signatures: signatureConfig, expectedResult: true)
+            testPostValidation(bundle: .codeSignedBoth, signatures: signatureConfig, expectedResult: signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+
+            testPostValidation(bundle: .codeSignedInvalidOnly, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(bundle: .codeSignedInvalid, signatures: signatureConfig, expectedResult: false)
+        }
+    }
+
+    func testPostValidationWithKeyRemoval() {
+        for bundleConfig in BundleConfig.allCases {
+            testPostValidation(oldBundle: .dsaOnly, newBundle: bundleConfig, signatures: SignatureConfig(dsa: .valid, ed: .valid), expectedResult: bundleConfig.hasAnyKeys && bundleConfig != .codeSignedInvalid)
+            testPostValidation(oldBundle: .edOnly, newBundle: bundleConfig, signatures: SignatureConfig(dsa: .valid, ed: .valid), expectedResult: bundleConfig.hasAnyKeys && bundleConfig != .codeSignedInvalid)
+            testPostValidation(oldBundle: .both, newBundle: bundleConfig, signatures: SignatureConfig(dsa: .valid, ed: .valid), expectedResult: bundleConfig.hasAnyKeys && bundleConfig != .codeSignedInvalid)
+            testPostValidation(oldBundle: .codeSignedBoth, newBundle: bundleConfig, signatures: SignatureConfig(dsa: .valid, ed: .valid), expectedResult: bundleConfig.hasAnyKeys && bundleConfig != .codeSignedInvalid)
+        }
+    }
+
+    func testPostValidationWithKeyRotation() {
+        for signatureConfig in SignatureConfig.allCases {
+            let signatureIsValid = (signatureConfig.ed == .valid && signatureConfig.dsa != .invalidFormat)
+
+            // It's okay to add DSA keys or add code signing.
+            testPostValidation(oldBundle: .codeSignedOnly, newBundle: .codeSignedBoth, signatures: signatureConfig, expectedResult: signatureIsValid)
+            testPostValidation(oldBundle: .both, newBundle: .codeSignedBoth, signatures: signatureConfig, expectedResult: signatureIsValid)
+
+            // If you want to change your code signing, you have to be using both forms of auth.
+            testPostValidation(oldBundle: .codeSignedOnly, newBundle: .codeSignedOnlyNew, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(oldBundle: .codeSignedBoth, newBundle: .codeSignedOnlyNew, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(oldBundle: .codeSignedOnly, newBundle: .codeSignedBothNew, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(oldBundle: .codeSignedBoth, newBundle: .codeSignedBothNew, signatures: signatureConfig, expectedResult: signatureIsValid)
+
+            // If you want to change your keys, you have to be using both forms of auth.
+            testPostValidation(oldBundle: .codeSignedOldED, newBundle: .codeSignedOnly, signatures: signatureConfig, expectedResult: false)
+            testPostValidation(oldBundle: .codeSignedOldED, newBundle: .codeSignedBoth, signatures: signatureConfig, expectedResult: signatureIsValid)
+
+            // You can't change two things at once.
+            testPostValidation(oldBundle: .codeSignedOldED, newBundle: .codeSignedBothNew, signatures: signatureConfig, expectedResult: false)
+
+            // It's permitted to remove code signing too.
+            testPostValidation(oldBundle: .codeSignedBoth, newBundle: .both, signatures: signatureConfig, expectedResult: signatureIsValid)
+        }
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUUpdaterTest.m Added

@@ -0,0 +1,65 @@
+//
+// SUUpdaterTest.m
+// Sparkle
+//
+// Created by Jake Petroules on 2014-06-29.
+// Copyright (c) 2014 Sparkle Project. All rights reserved.
+//
+
+#import <XCTest/XCTest.h>
+#import "SUConstants.h"
+#import "SPUUpdater.h"
+#import "SPUStandardUserDriver.h"
+#import "SPUUpdaterDelegate.h"
+
+@interface SUUpdaterTest : XCTestCase <SPUUpdaterDelegate>
+@property (strong) SPUUpdater *updater;
+@end
+
+@implementation SUUpdaterTest
+
+@synthesize updater;
+
+- (void)setUp
+{
+ super setUp;
+ 
+ NSBundle *bundle = NSBundle bundleForClass:self class;
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+ // We really want a useless / not really functional user driver so we will pass nil here
+ // For real world applications we should pass a valid user driver which is why this is not a nullable parameter
+ self.updater = SPUUpdater alloc initWithHostBundle:bundle applicationBundle:bundle userDriver:nil delegate:self;
+#pragma clang diagnostic pop
+ 
+ NSError *error = nil;
+ if (!self.updater startUpdater:&error) {
+ NSLog(@"Updater error: %@", error);
+ abort();
+ }
+}
+
+- (void)tearDown
+{
+ self.updater = nil;
+ super tearDown;
+}
+
+- (NSString *)feedURLStringForUpdater:(id)__unused updater
+{
+ return @"https://test.example.com";
+}
+
+- (void)testFeedURL
+{
+ self.updater feedURL; // this WON'T throw
+}
+
+- (void)testSetTestFeedURL
+{
+ NSURL *emptyURL = NSURL URLWithString:@"";
+ XCTAssertNotNil(emptyURL);
+ self.updater setFeedURL:emptyURL; // this WON'T throw
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SUVersionComparisonTest.m Added

@@ -0,0 +1,116 @@
+//
+// SUVersionComparisonTest.m
+// Sparkle
+//
+// Created by Andy Matuschak on 4/15/08.
+// Copyright 2008 Andy Matuschak. All rights reserved.
+//
+
+#import <Sparkle/Sparkle.h>
+
+#import <XCTest/XCTest.h>
+
+@interface SUVersionComparisonTestCase : XCTestCase {
+}
+@end
+
+@implementation SUVersionComparisonTestCase
+
+#define SUAssertOrder(comparator, a, b, c) XCTAssertTrue(comparator compareVersion:a toVersion:b == c, @"b should be newer than a!")
+#define SUAssertAscending(comparator, a, b) SUAssertOrder(comparator, a, b, NSOrderedAscending)
+#define SUAssertDescending(comparator, a, b) SUAssertOrder(comparator, a, b, NSOrderedDescending)
+#define SUAssertEqual(comparator, a, b) SUAssertOrder(comparator, a, b, NSOrderedSame)
+
+- (void)testNumbers
+{
+ SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ SUAssertAscending(comparator, @"1.0", @"1.1");
+ SUAssertEqual(comparator, @"1.0", @"1.0");
+ SUAssertDescending(comparator, @"2.0", @"1.1");
+ SUAssertDescending(comparator, @"0.1", @"0.0.1");
+ //SUAssertDescending(comparator, @".1", @"0.0.1"); Known bug, but I'm not sure I care.
+ SUAssertAscending(comparator, @"0.1", @"0.1.2");
+ 
+ SUAssertEqual(comparator, @"1.0", @"1.0.0");
+ SUAssertEqual(comparator, @"1.0.0", @"1.0");
+}
+
+- (void)testCommitSHAs
+{
+ SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ SUAssertAscending(comparator, @"1.5.5-335d3e2", @"1.5.6-b252311");
+ SUAssertEqual(comparator, @"1.5.5-335d3e2", @"1.5.5-a655360");
+ SUAssertDescending(comparator, @"1.5.6-b252311", @"1.5.5-335d3e2");
+ 
+ SUAssertEqual(comparator, @"1.5-335d3e2", @"1.5.0-335d3e2");
+ SUAssertEqual(comparator, @"1.5.0-335d3e2", @"1.5-335d3e2");
+}
+
+- (void)testPrereleases
+{
+ SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ SUAssertAscending(comparator, @"1.5.5", @"1.5.6a1");
+ SUAssertAscending(comparator, @"1.1.0b1", @"1.1.0b2");
+ SUAssertAscending(comparator, @"1.1.1b2", @"1.1.2b1");
+ SUAssertAscending(comparator, @"1.1.1b2", @"1.1.2a1");
+ SUAssertAscending(comparator, @"1.0a1", @"1.0b1");
+ SUAssertAscending(comparator, @"1.0b1", @"1.0");
+ SUAssertAscending(comparator, @"0.9", @"1.0a1");
+ SUAssertAscending(comparator, @"1.0b", @"1.0b2");
+ SUAssertAscending(comparator, @"1.0b10", @"1.0b11");
+ SUAssertAscending(comparator, @"1.0b9", @"1.0b10");
+ SUAssertAscending(comparator, @"1.0rc", @"1.0");
+ SUAssertAscending(comparator, @"1.0b", @"1.0");
+ SUAssertAscending(comparator, @"1.0pre1", @"1.0");
+ 
+ SUAssertEqual(comparator, @"1.0pre1", @"1.0.0pre1");
+ SUAssertEqual(comparator, @"1.0.0pre1", @"1.0pre1");
+}
+
+- (void)testVersionsWithBuildNumbers
+{
+ SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ SUAssertAscending(comparator, @"1.0 (1234)", @"1.0 (1235)");
+ SUAssertAscending(comparator, @"1.0b1 (1234)", @"1.0 (1234)");
+ SUAssertAscending(comparator, @"1.0b5 (1234)", @"1.0b5 (1235)");
+ SUAssertAscending(comparator, @"1.0b5 (1234)", @"1.0.1b5 (1234)");
+ SUAssertAscending(comparator, @"1.0.1b5 (1234)", @"1.0.1b6 (1234)");
+ SUAssertAscending(comparator, @"2.0.0.2429", @"2.0.0.2430");
+ SUAssertAscending(comparator, @"1.1.1.1818", @"2.0.0.2430");
+ 
+ SUAssertAscending(comparator, @"3.3 (5847)", @"3.3.1b1 (5902)");
+ 
+ SUAssertEqual(comparator, @"3.3 (5847)", @"3.3.0 (5847)");
+ SUAssertEqual(comparator, @"3.3.0 (5847)", @"3.3 (5847)");
+ SUAssertEqual(comparator, @"1.1.1.1818", @"1.1.1.1818.0");
+ SUAssertEqual(comparator, @"1.1.1.1818.0", @"1.1.1.1818");
+ SUAssertEqual(comparator, @"3.3b1 (5902)", @"3.3.0b1 (5902)");
+ SUAssertEqual(comparator, @"3.3.0b1 (5902)", @"3.3b1 (5902)");
+}
+
+- (void)testWordsWithSpaceInFront
+{
+ // SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ //	SUAssertAscending(comparator, @"1.0 beta", @"1.0");
+ //	SUAssertAscending(comparator, @"1.0 - beta", @"1.0");
+ //	SUAssertAscending(comparator, @"1.0 alpha", @"1.0 beta");
+ //	SUAssertEqual(comparator, @"1.0 - beta", @"1.0beta");
+ //	SUAssertEqual(comparator, @"1.0 - beta", @"1.0 beta");
+}
+
+- (void)testVersionsWithReverseDateBasedNumbers
+{
+ SUStandardVersionComparator *comparator = SUStandardVersionComparator alloc init;
+ 
+ SUAssertAscending(comparator, @"201210251627", @"201211051041");
+ 
+ SUAssertEqual(comparator, @"201210251627.0", @"201210251627");
+ SUAssertEqual(comparator, @"201210251627", @"201210251627.0");
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/Sparkle Unit Tests-Bridging-Header.h Added

@@ -0,0 +1,55 @@
+//
+// Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "SUUnarchiver.h"
+#import "SUUnarchiverProtocol.h"
+#import "SUBinaryDeltaUnarchiver.h"
+#import "SUPipedUnarchiver.h"
+#import "SUBinaryDeltaCommon.h"
+#import "SUFileManager.h"
+#import "SUExport.h"
+#import "SUAppcast.h"
+#import "SUAppcast+Private.h"
+#import "SUAppcastItem.h"
+#import "SUAppcastDriver.h"
+#import "SUVersionComparisonProtocol.h"
+#import "SUStandardVersionComparator.h"
+#import "SUUpdateValidator.h"
+#import "SUHost.h"
+#import "SPUSkippedUpdate.h"
+#import "SUSignatures.h"
+#import "SPUInstallationType.h"
+#import "SPUAppcastItemStateResolver.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+// Duplicated to avoid exporting a private symbol from SUFileManager
+static const char *SUAppleQuarantineIdentifier = "com.apple.quarantine";
+
+@interface SUFileManager (Private)
+
+- (BOOL)_acquireAuthorizationWithError:(NSError *_Nullable __autoreleasing *_Nullable)error;
+
+- (BOOL)_itemExistsAtURL:(NSURL *)fileURL;
+- (BOOL)_itemExistsAtURL:(NSURL *)fileURL isDirectory:(nullable BOOL *)isDirectory;
+
+@end
+
+@interface SUAppcastDriver (Private)
+
++ (SUAppcastItem *)bestItemFromAppcastItems:(NSArray *)appcastItems getDeltaItem:(SUAppcastItem *_Nullable __autoreleasing *_Nullable)deltaItem withHostVersion:(NSString *)hostVersion comparator:(id<SUVersionComparison>)comparator;
+
++ (SUAppcast *)filterSupportedAppcast:(SUAppcast *)appcast phasedUpdateGroup:(NSNumber * _Nullable)phasedUpdateGroup skippedUpdate:(SPUSkippedUpdate * _Nullable)skippedUpdate currentDate:(NSDate *)currentDate hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator testOSVersion:(BOOL)testOSVersion testMinimumAutoupdateVersion:(BOOL)testMinimumAutoupdateVersion;
+
++ (SUAppcast *)filterAppcast:(SUAppcast *)appcast forMacOSAndAllowedChannels:(NSSet<NSString *> *)allowedChannels;
+
+@end
+
+@interface SUBinaryDeltaUnarchiver (Private)
+
++ (void)updateSpotlightImportersAtBundlePath:(NSString *)targetPath;
+
+@end
+
+NS_ASSUME_NONNULL_END

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Tests/SparkleTests-Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/UITests Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/UITests/.swiftlint.yml Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/UITests/SUTestApplicationTest.swift Added

@@ -0,0 +1,116 @@
+//
+//  SUTestApplicationTest.swift
+//  Sparkle
+//
+//  Created by Mayur Pawashe on 8/27/15.
+//  Copyright © 2015 Sparkle Project. All rights reserved.
+//
+
+import XCTest
+
+// The debugger may catch the Test app receiving a SIGTERM signal when Sparkle quits the app before installing the new one
+// So you may have better luck running these tests from the command line without the debugger attached:
+// xcodebuild -scheme UITests -configuration Debug test
+class SUTestApplicationTest: XCTestCase
+{
+    // TODO: don't hardcode bundle ID?
+    let TEST_APP_BUNDLE_ID = "org.sparkle-project.SparkleTestApp"
+
+    func runningTestApplication() -> NSRunningApplication
+    {
+        let runningApplications = NSRunningApplication.runningApplications(withBundleIdentifier: TEST_APP_BUNDLE_ID)
+        XCTAssertEqual(runningApplications.count, 1, "More than one or zero running instances of the Test Application are found")
+        return runningApplications0
+    }
+
+    func runTestApplication(testMode: String, automatic: Bool, expectedFinalVersion: String, launchSleep: UInt32, extractSleep: UInt32) {
+        let app = XCUIApplication()
+        app.launchArguments = 
+            "-AppleLanguages",
+            "(en)",
+            "-SUHasLaunchedBefore",
+            automatic ? "YES" : "NO",
+            "-SUEnableAutomaticChecks",
+            automatic ? "YES" : "NO",
+            "-SUAutomaticallyUpdate",
+            automatic ? "YES" : "NO",
+            "-SUScheduledCheckInterval",
+            "60"
+        
+        app.launchEnvironment = "TEST_MODE": testMode
+        app.launch()
+        
+        XCTAssertFalse(app.dialogs"alert".staticTexts"Update succeeded!".exists, "Update is already installed; please do a clean build")
+        
+        let initialRunningApplication = runningTestApplication()
+        let bundleURL = initialRunningApplication.bundleURL!
+        
+        // Give some time for the Test App to initialize its web server, create an update, and start its updater
+        sleep(launchSleep)
+        
+        let menuBarsQuery = app.menuBars
+        menuBarsQuery.menuBarItems"Sparkle Test App".click()
+        
+        let checkForUpdatesMenuItem = menuBarsQuery.menuItems"Check for Updates…"
+        if checkForUpdatesMenuItem.isEnabled {
+            checkForUpdatesMenuItem.click()
+        } else {
+            // We haven't checked for updates in a while so an automatic check was already done
+            // in this case click the main menu again to deactivate it
+            menuBarsQuery.menuBarItems"Sparkle Test App".click()
+        }
+        
+        if !automatic {
+            app.windows"SUUpdateAlert".buttons"Install Update".click()
+        
+            // Give some time for the update to finish downloading / extracting
+            sleep(extractSleep)
+            
+            app.windows"SUStatus".buttons"Install and Relaunch".click()
+        } else {
+            XCTAssertTrue(app.windows"SUUpdateAlert".buttons"Install and Relaunch".exists)
+            
+            // The app should install automatically on termination
+            app.terminate()
+        }
+        
+        // Wait for the new updated app to finish launching so we can test if it's the frontmost app
+        sleep(10)
+
+        // From now on, do not rely on XCUIApplication as it only works properly when the XCUITest framework launches the app.
+        
+        // Our new updated app should be launched now. Test if it's the active app and the old app is terminated.
+        // We used to run into timing issues where the updated app sometimes may not show up as the frontmost one
+        XCTAssertTrue(initialRunningApplication.isTerminated)
+        
+        // Verify the new bundle version
+
+        let infoCFDictionary = CFBundleCopyInfoDictionaryInDirectory(bundleURL as CFURL)
+        let infoDictionary = infoCFDictionary! as Dictionary
+        
+        let updatedVersion = infoDictionarykCFBundleVersionKey as! String
+        XCTAssertEqual(updatedVersion, expectedFinalVersion)
+        
+        // Clean up
+        if !automatic {
+            let newRunningApplication = self.runningTestApplication()
+            XCTAssertTrue(newRunningApplication.isActive)
+            
+            newRunningApplication.forceTerminate()
+        }
+        
+        sleep(10)
+    }
+    
+    func test1RegularUpdate() {
+        runTestApplication(testMode: "REGULAR", automatic: false, expectedFinalVersion: "2.0", launchSleep: 60, extractSleep: 30)
+    }
+    
+    func test2DeltaUpdate() {
+        runTestApplication(testMode: "DELTA", automatic: false, expectedFinalVersion: "2.1", launchSleep: 75, extractSleep: 45)
+    }
+    
+    func test3AutomaticUpdate() {
+        runTestApplication(testMode: "AUTOMATIC", automatic: true, expectedFinalVersion: "2.2", launchSleep: 75, extractSleep: 30)
+    }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/UITests/UITests-Info.plist Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/bscommon.c Added

@@ -0,0 +1,62 @@
+/*
+ * bscommon.c
+ * Sparkle
+ *
+ * Created by Mayur Pawashe on 5/16/16.
+ */
+
+#include "bscommon.h"
+#include <stdlib.h>
+
+u_char *readfile(const char *filename, off_t *outSize)
+{
+ int success = -1;
+ u_char *buffer = NULL;
+ 
+ FILE *file = fopen(filename, "r");
+ if (file == NULL) {
+ goto cleanup;
+ }
+ 
+ if (fseek(file, 0L, SEEK_END) != 0) {
+ goto cleanup;
+ }
+ 
+ long offset = ftell(file);
+ if (offset == -1) {
+ goto cleanup;
+ }
+ 
+ size_t size = (size_t)offset;
+ 
+ if (outSize != NULL) {
+ *outSize = (off_t)size;
+ }
+ 
+ /* Allocate size + 1 bytes instead of newsize bytes to ensure
+ that we never try to malloc(0) and get a NULL pointer */
+ buffer = malloc(size + 1);
+ if (buffer == NULL) {
+ goto cleanup;
+ }
+ 
+ if (fseek(file, 0L, SEEK_SET) != 0) {
+ goto cleanup;
+ }
+ 
+ if (fread(buffer, 1, size, file) < size) {
+ goto cleanup;
+ }
+ 
+ success = 0;
+cleanup:
+ if (success == -1) {
+ free(buffer);
+ buffer = NULL;
+ }
+ if (file != NULL) {
+ fclose(file);
+ }
+ 
+ return buffer;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/bscommon.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/bsdiff.c Added

@@ -0,0 +1,406 @@
+/*-
+ * Copyright 2003 - 2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions 
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if 0
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bsdiff/bsdiff.c, v 1.1 2005/08/06 01:59:05 cperciva Exp $");
+#endif
+
+#include <sys/types.h>
+#include "sais.h"
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "bscommon.h"
+
+#define MIN(x, y) (((x)<(y)) ? (x) : (y))
+
+/* matchlen(old, oldsize, new, newsize)
+ *
+ * Returns the length of the longest common prefix between 'old' and 'new'. */
+static off_t matchlen(u_char *old, off_t oldsize, u_char *new, off_t newsize)
+{
+ off_t i;
+
+ for (i = 0; (i < oldsize) && (i < newsize); i++)
+ {
+ if (oldi != newi)
+ break;
+ }
+
+ return i;
+}
+
+/* search(I, old, oldsize, new, newsize, st, en, pos)
+ *
+ * Searches for the longest prefix of 'new' that occurs in 'old', stores its
+ * offset in '*pos', and returns its length. 'I' should be the suffix sort of
+ * 'old', and 'st' and 'en' are the lowest and highest indices in the suffix
+ * sort to consider. If you're searching all suffixes, 'st = 0' and 'en =
+ * oldsize - 1'. */
+static off_t search(off_t *I, u_char *old, off_t oldsize,
+ u_char *new, off_t newsize, off_t st, off_t en, off_t *pos)
+{
+ off_t x, y;
+
+ if (en - st < 2) {
+ x = matchlen(old + Ist, oldsize - Ist, new, newsize);
+ y = matchlen(old + Ien, oldsize - Ien, new, newsize);
+
+ if (x > y) {
+ *pos = Ist;
+ return x;
+ } else {
+ *pos = Ien;
+ return y;
+ }
+ }
+
+ x = st + (en - st)/2;
+ if (memcmp(old + Ix, new, (size_t)(MIN(oldsize - Ix, newsize))) < 0) {
+ return search(I, old, oldsize, new, newsize, x, en, pos);
+ } else {
+ return search(I, old, oldsize, new, newsize, st, x, pos);
+ };
+}
+
+/* offtout(x, buf)
+ * 
+ * Writes the off_t 'x' portably to the array 'buf'. */
+static void offtout(off_t x, u_char *buf)
+{
+ off_t y;
+
+ if (x < 0)
+ y = -x;
+ else
+ y = x;
+
+ buf0 = (u_char)(y % 256);
+ y -= buf0;
+ y = y/256; buf1 = (u_char)(y%256); y -= buf1;
+ y = y/256; buf2 = (u_char)(y%256); y -= buf2;
+ y = y/256; buf3 = (u_char)(y%256); y -= buf3;
+ y = y/256; buf4 = (u_char)(y%256); y -= buf4;
+ y = y/256; buf5 = (u_char)(y%256); y -= buf5;
+ y = y/256; buf6 = (u_char)(y%256); y -= buf6;
+ y = y/256; buf7 = (u_char)(y%256);
+
+ if (x < 0)
+ buf7 |= 0x80;
+}
+
+int bsdiff(int argc, char *argv); // Added by AMM: suppresses a warning about the following not having a prototype.
+
+int bsdiff(int argc, char *argv)
+{
+ u_char *old = NULL,*new = NULL; /* contents of old, new files */
+ off_t oldsize = 0, newsize = 0; /* length of old, new files */
+ off_t *I = NULL,*V = NULL; /* arrays used for suffix sort; I is ordering */
+ off_t scan = 0; /* position of current match in old file */
+ off_t pos = 0; /* position of current match in new file */
+ off_t len = 0; /* length of current match */
+ off_t lastscan = 0; /* position of previous match in old file */
+ off_t lastpos = 0; /* position of previous match in new file */
+ off_t lastoffset = 0; /* lastpos - lastscan */
+ off_t oldscore = 0, scsc = 0; /* temp variables in match search */
+ off_t s = 0, Sf = 0, lenf = 0, Sb = 0, lenb = 0; /* temp vars in match extension */
+ off_t overlap = 0, Ss = 0, lens = 0;
+ off_t i = 0;
+ off_t dblen = 0, eblen = 0; /* length of diff, extra sections */
+ u_char *db = NULL,*eb = NULL; /* contents of diff, extra sections */
+ u_char buf8 = {0};
+ u_char header32 = {0};
+ FILE * pf = NULL;
+ int exitstatus = -1;
+
+ if (argc != 4) {
+ warnx("usage: %s oldfile newfile patchfile\n", argv0);
+ goto cleanup;
+ }
+
+ old = readfile(argv1, &oldsize);
+ if (old == NULL) {
+ warn("old file error: %s", argv1);
+ goto cleanup;
+ }
+
+ if (((I = malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL) ||
+ ((V = malloc(((size_t)oldsize + 1) * sizeof(off_t))) == NULL)) {
+ warn("Failed to allocate memory for I or V");
+ goto cleanup;
+ }
+
+ /* Do a suffix sort on the old file. */
+ I0 = oldsize;
+ sais(old, I+1, (int)oldsize);
+
+ free(V);
+ V = NULL;
+ 
+ new = readfile(argv2, &newsize);
+ if (new == NULL) {
+ warn("new file error: %s", argv2);
+ goto cleanup;
+ }
+
+ if (((db = malloc((size_t)newsize + 1)) == NULL) ||
+ ((eb = malloc((size_t)newsize + 1)) == NULL)) {
+ warn("Failed to allocate memory for db or eb");
+ goto cleanup;
+ }
+ dblen = 0;
+ eblen = 0;
+
+ /* Create the patch file */
+ if ((pf = fopen(argv3, "w")) == NULL) {
+ warn("%s", argv3);
+ goto cleanup;
+ }
+
+ /* Header is
+ 0 8 "BSDIFN40"
+ 8 8 length of ctrl block
+ 16 8 length of diff block
+ 24 8 length of new file */
+ /* File is
+ 0 32 Header
+ 32 ?? ctrl block
+ ?? ?? diff block
+ ?? ?? extra block */
+ memcpy(header, "BSDIFN40", 8);
+ offtout(0, header + 8);
+ offtout(0, header + 16);
+ offtout(newsize, header + 24);
+ if (fwrite(header, 32, 1, pf) != 1) {
+ warn("fwrite(%s)", argv3);
+ goto cleanup;
+ }
+
+ /* Compute the differences, writing ctrl as we go */
+ scan = 0;
+ len = 0;
+ lastscan = 0;
+ lastpos = 0;
+ lastoffset = 0;
+ while (scan < newsize) {
+ oldscore = 0;
+
+ for (scsc = scan += len; scan < newsize; scan++) {
+ /* 'oldscore' is the number of characters that match between the
+ * substrings 'oldlastoffset + scan:lastoffset + scsc' and
+ * 'newscan:scsc'. */
+ len = search(I, old, oldsize, new + scan, newsize - scan,
+ 0, oldsize, &pos);
+
+ /* If this match extends further than the last one, add any new
+ * matching characters to 'oldscore'. */
+ for (; scsc < scan + len; scsc++) {
+ if ((scsc + lastoffset < oldsize) &&
+ (oldscsc + lastoffset == newscsc))
+ oldscore++;
+ }
+
+ /* Choose this as our match if it contains more than eight
+ * characters that would be wrong if matched with a forward
+ * extension of the previous match instead. */
+ if (((len == oldscore) && (len != 0)) || 
+ (len > oldscore + 8))
+ break;
+
+ /* Since we're advancing 'scan' by 1, remove the character under it
+ * from 'oldscore' if it matches. */
+ if ((scan + lastoffset < oldsize) &&
+ (oldscan + lastoffset == newscan))
+ oldscore--;
+ }
+
+ /* Skip this section if we found an exact match that would be
+ * better serviced by a forward extension of the previous match. */
+ if ((len != oldscore) || (scan == newsize)) {
+ /* Figure out how far forward the previous match should be
+ * extended... */
+ s = 0;
+ Sf = 0;
+ lenf = 0;
+ for (i = 0; (lastscan + i < scan) && (lastpos + i < oldsize);) {
+ if (oldlastpos + i == newlastscan + i)
+ s++;
+ i++;
+ if (s * 2 - i > Sf * 2 - lenf) {
+ Sf = s;
+ lenf = i;
+ }
+ }
+
+ /* ... and how far backwards the next match should be extended. */
+ lenb = 0;
+ if (scan < newsize) {
+ s = 0;
+ Sb = 0;
+ for (i = 1; (scan >= lastscan + i) && (pos >= i); i++) {
+ if (oldpos - i == newscan - i)
+ s++;
+ if (s * 2 - i > Sb * 2 - lenb) {
+ Sb = s;
+ lenb = i;
+ }
+ }
+ }
+
+ /* If there is an overlap between the extensions, find the best
+ * dividing point in the middle and reset 'lenf' and 'lenb'
+ * accordingly. */
+ if (lastscan + lenf > scan - lenb) {
+ overlap = (lastscan + lenf) - (scan - lenb);
+ s = 0;
+ Ss = 0;
+ lens = 0;
+ for (i = 0; i < overlap; i++) {
+ if (newlastscan + lenf - overlap + i ==
+ oldlastpos + lenf - overlap + i)
+ s++;
+ if (newscan - lenb + i == oldpos - lenb + i)
+ s--;
+ if (s > Ss) {
+ Ss = s;
+ lens = i + 1;
+ }
+ }
+
+ lenf += lens - overlap;
+ lenb -= lens;
+ }
+
+ /* Write the diff data for the last match to the diff section... */
+ for (i = 0; i < lenf; i++)
+ dbdblen + i = newlastscan + i - oldlastpos + i;
+ /* ... and, if there's a gap between the extensions just
+ * calculated, write the data in that gap to the extra section. */
+ for (i = 0; i< (scan - lenb) - (lastscan + lenf); i++)
+ ebeblen + i = newlastscan + lenf + i;
+
+ /* Update the diff and extra section lengths accordingly. */
+ dblen += lenf;
+ eblen += (scan - lenb) - (lastscan + lenf);
+
+ /* Write the following triple of integers to the control section:
+ * - length of the diff
+ * - length of the extra section
+ * - offset between the end of the diff and the start of the next
+ * diff, in the old file
+ */
+ offtout(lenf, buf);
+ if (fwrite(buf, 8, 1, pf) != 1) {
+ warnx("fwrite");
+ goto cleanup;
+ }
+
+ offtout((scan - lenb) - (lastscan + lenf), buf);
+ if (fwrite(buf, 8, 1, pf) != 1) {
+ warn("fwrite");
+ goto cleanup;
+ }
+
+ offtout((pos - lenb) - (lastpos + lenf), buf);
+ if (fwrite(buf, 8, 1, pf) != 1) {
+ warn("fwrite");
+ goto cleanup;
+ }
+
+ /* Update the variables describing the last match. Note that
+ * 'lastscan' is set to the start of the current match _after_ the
+ * backwards extension; the data in that extension will be written
+ * in the next pass. */
+ lastscan = scan - lenb;
+ lastpos = pos - lenb;
+ lastoffset = pos - scan;
+ }
+ }
+
+ /* Compute size of compressed ctrl data */
+ if ((len = ftello(pf)) == -1) {
+ warn("ftello");
+ goto cleanup;
+ }
+ offtout(len - 32, header + 8);
+
+ /* Write diff data */
+ if (dblen && fwrite(db, (size_t)dblen, 1, pf) != 1) {
+ warn("fwrite");
+ goto cleanup;
+ }
+
+ /* Compute size of compressed diff data */
+ if ((newsize = ftello(pf)) == -1) {
+ warn("ftello");
+ goto cleanup;
+ }
+ offtout(newsize - len, header + 16);
+
+ /* Write extra data */
+ if (eblen && fwrite(eb, (size_t)eblen, 1, pf) != 1) {
+ warn("fwrite");
+ goto cleanup;
+ }
+
+ /* Seek to the beginning, write the header, and close the file */
+ if (fseeko(pf, 0, SEEK_SET)) {
+ warn("fseeko");
+ goto cleanup;
+ }
+ if (fwrite(header, 32, 1, pf) != 1) {
+ warn("fwrite(%s)", argv3);
+ goto cleanup;
+ }
+ if (fclose(pf)) {
+ warn("fclose");
+ pf = NULL;
+ goto cleanup;
+ }
+ pf = NULL;
+ 
+ exitstatus = 0;
+cleanup:
+
+ if (pf != NULL) {
+ fclose(pf);
+ }
+ 
+ /* Free the memory we used */
+ free(db);
+ free(eb);
+ free(I);
+ free(V);
+ free(old);
+ free(new);
+
+ return exitstatus;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/bspatch.c Added

@@ -0,0 +1,398 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted providing that the following conditions 
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if 0
+__FBSDID("$FreeBSD: src/usr.bin/bsdiff/bspatch/bspatch.c,v 1.1 2005/08/06 01:59:06 cperciva Exp $");
+#endif
+
+#include "bspatch.h"
+#include <bzlib.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <err.h>
+#include <unistd.h>
+#include <fcntl.h>
+
+#include "bscommon.h"
+
+/* Compatibility layer for reading either the old BSDIFF40 or the new BSDIFN40
+ patch formats: */
+
+typedef void* stream_t;
+
+typedef struct
+{
+ stream_t (*open)(FILE*);
+ void (*close)(stream_t);
+ off_t (*read)(stream_t, void*, off_t);
+} io_funcs_t;
+
+static stream_t BSDIFF40_open(FILE *f)
+{
+ int bzerr = 0;
+ BZFILE *s = NULL;
+ if ((s = BZ2_bzReadOpen(&bzerr, f, 0, 0, NULL, 0)) == NULL) {
+ warnx("BZ2_bzReadOpen, bz2err = %d", bzerr);
+ }
+ return s;
+}
+
+static void BSDIFF40_close(stream_t s)
+{
+ int bzerr;
+ BZ2_bzReadClose(&bzerr, (BZFILE*)s);
+}
+
+static off_t BSDIFF40_read(stream_t s, void *buf, off_t len)
+{
+ int bzerr = 0, lenread = 0;
+ lenread = BZ2_bzRead(&bzerr, (BZFILE*)s, buf, (int)len);
+ if (bzerr != BZ_OK && bzerr != BZ_STREAM_END) {
+ warnx("Corrupt patch\n");
+ lenread = -1;
+ }
+ return lenread;
+}
+
+static io_funcs_t BSDIFF40_funcs = {
+ BSDIFF40_open,
+ BSDIFF40_close,
+ BSDIFF40_read
+};
+
+
+static stream_t BSDIFN40_open(FILE *f)
+{
+ return f;
+}
+
+static void BSDIFN40_close(stream_t __unused s)
+{
+}
+
+static off_t BSDIFN40_read(stream_t s, void *buf, off_t len)
+{
+ return (off_t)fread(buf, 1, (size_t)len, (FILE*)s);
+}
+
+static io_funcs_t BSDIFN40_funcs = {
+ BSDIFN40_open,
+ BSDIFN40_close,
+ BSDIFN40_read
+};
+
+
+#ifndef u_char
+typedef unsigned char u_char;
+#endif
+
+static off_t offtin(u_char *buf)
+{
+ off_t y;
+
+ y=buf7&0x7F;
+ y=y*256;y+=buf6;
+ y=y*256;y+=buf5;
+ y=y*256;y+=buf4;
+ y=y*256;y+=buf3;
+ y=y*256;y+=buf2;
+ y=y*256;y+=buf1;
+ y=y*256;y+=buf0;
+
+ if(buf7&0x80) y=-y;
+
+ return y;
+}
+
+int bspatch(int argc,const char * const argv)
+{
+ FILE * f = NULL, * cpf = NULL, * dpf = NULL, * epf = NULL;
+ stream_t cstream = NULL, dstream = NULL, estream = NULL;
+ ssize_t oldsize = 0,newsize = 0;
+ ssize_t bzctrllen = 0,bzdatalen = 0;
+ u_char header32 = {0},buf8 = {0};
+ u_char *old = NULL, *new = NULL;
+ off_t oldpos = 0,newpos = 0;
+ off_t ctrl3 = {0};
+ off_t lenread = 0;
+ off_t i = 0;
+ io_funcs_t * io = NULL;
+ int exitstatus = -1;
+
+ if(argc!=4) {
+ warnx("usage: %s oldfile newfile patchfile\n",argv0);
+ goto cleanup;
+ }
+
+ /* Open patch file */
+ if ((f = fopen(argv3, "r")) == NULL) {
+ warn("fopen(%s)", argv3);
+ goto cleanup;
+ }
+
+ /*
+ File format:
+ 0 8 "BSDIFF40" (bzip2) or "BSDIFN40" (raw)
+ 8 8 X
+ 16 8 Y
+ 24 8 sizeof(newfile)
+ 32 X bzip2(control block)
+ 32+X Y bzip2(diff block)
+ 32+X+Y ??? bzip2(extra block)
+ with control block a set of triples (x,y,z) meaning "add x bytes
+ from oldfile to x bytes from the diff block; copy y bytes from the
+ extra block; seek forwards in oldfile by z bytes".
+ */
+
+ /* Read header */
+ if (fread(header, 1, 32, f) < 32) {
+ if (feof(f)) {
+ warnx("Corrupt patch\n");
+ } else {
+ warn("fread(%s)", argv3);
+ }
+ goto cleanup;
+ }
+
+ /* Check for appropriate magic */
+ if (memcmp(header, "BSDIFF40", 8) == 0)
+ io = &BSDIFF40_funcs;
+ else if (memcmp(header, "BSDIFN40", 8) == 0)
+ io = &BSDIFN40_funcs;
+ else {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Read lengths from header */
+ bzctrllen=offtin(header+8);
+ bzdatalen=offtin(header+16);
+ newsize=offtin(header+24);
+ if((bzctrllen<0) || (bzdatalen<0) || (newsize<0)) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Close patch file and re-open it via libbzip2 at the right places */
+ if (fclose(f)) {
+ warn("fclose(%s)", argv3);
+ f = NULL;
+ goto cleanup;
+ }
+ f = NULL;
+ 
+ if ((cpf = fopen(argv3, "r")) == NULL) {
+ warn("fopen(%s)", argv3);
+ goto cleanup;
+ }
+ if (fseeko(cpf, 32, SEEK_SET)) {
+ warn("fseeko(%s, %lld)", argv3,
+ (long long)32);
+ goto cleanup;
+ }
+ cstream = io->open(cpf);
+ if (cstream == NULL) {
+ warn("cstream open");
+ goto cleanup;
+ }
+ if ((dpf = fopen(argv3, "r")) == NULL) {
+ warn("fopen(%s)", argv3);
+ goto cleanup;
+ }
+ if (fseeko(dpf, 32 + bzctrllen, SEEK_SET)) {
+ warn("fseeko(%s, %lld)", argv3,
+ (long long)(32 + bzctrllen));
+ goto cleanup;
+ }
+ dstream = io->open(dpf);
+ if (dstream == NULL) {
+ warn("dstream open");
+ goto cleanup;
+ }
+ if ((epf = fopen(argv3, "r")) == NULL) {
+ warn("fopen(%s)", argv3);
+ goto cleanup;
+ }
+ if (fseeko(epf, 32 + bzctrllen + bzdatalen, SEEK_SET)) {
+ warn("fseeko(%s, %lld)", argv3,
+ (long long)(32 + bzctrllen + bzdatalen));
+ goto cleanup;
+ }
+ estream = io->open(epf);
+ if (estream == NULL) {
+ warn("estream open");
+ goto cleanup;
+ }
+ off_t size = 0;
+ old = readfile(argv1, &size);
+ if (old == NULL) {
+ warn("old file: %s", argv1);
+ goto cleanup;
+ }
+ 
+ oldsize = size;
+ 
+ if((new=malloc((size_t)newsize+1))==NULL) {
+ warn("Failed to allocate memory for new");
+ goto cleanup;
+ }
+
+ oldpos=0;newpos=0;
+ while(newpos<newsize) {
+ /* Read control data */
+ for(i=0;i<=2;i++) {
+ lenread = io->read(cstream, buf, 8);
+ if (lenread < 8) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+ ctrli=offtin(buf);
+ };
+
+ /* Sanity-check */
+ if(newpos+ctrl0>newsize) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Read diff string */
+ lenread = io->read(dstream, new + newpos, ctrl0);
+ if (lenread < 0 || lenread < ctrl0) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Add old data to diff string */
+ for(i=0;i<ctrl0;i++)
+ if((oldpos+i>=0) && (oldpos+i<oldsize))
+ newnewpos+i+=oldoldpos+i;
+
+ /* Adjust pointers */
+ newpos+=ctrl0;
+ oldpos+=ctrl0;
+
+ /* Sanity-check */
+ if(newpos+ctrl1>newsize) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Read extra string */
+ lenread = io->read(estream, new + newpos, ctrl1);
+ if (lenread < 0 || lenread < ctrl1) {
+ warnx("Corrupt patch\n");
+ goto cleanup;
+ }
+
+ /* Adjust pointers */
+ newpos+=ctrl1;
+ oldpos+=ctrl2;
+ };
+
+ /* Clean up the bzip2 reads */
+ io->close(cstream);
+ cstream = NULL;
+ io->close(dstream);
+ dstream = NULL;
+ io->close(estream);
+ estream = NULL;
+ 
+ if (fclose(cpf) != 0) {
+ warn("fclose cpf(%s)", argv3);
+ cpf = NULL;
+ goto cleanup;
+ }
+ cpf = NULL;
+ 
+ if (fclose(dpf) != 0) {
+ warn("fclose dpf(%s)", argv3);
+ dpf = NULL;
+ goto cleanup;
+ }
+ dpf = NULL;
+ 
+ if (fclose(epf) != 0) {
+ warn("fclose epf(%s)", argv3);
+ epf = NULL;
+ goto cleanup;
+ }
+ epf = NULL;
+
+ /* Write the new file */
+ f = fopen(argv2, "w");
+ if (f == NULL) {
+ warn("failed to write new file: %s", argv2);
+ goto cleanup;
+ }
+ 
+ if (fwrite(new, 1, (size_t)newsize, f) < (size_t)newsize) {
+ warn("failed to write to new file: %s", argv2);
+ goto cleanup;
+ }
+ 
+ if (fclose(f) != 0) {
+ warn("failed to close new file: %s", argv2);
+ f = NULL;
+ goto cleanup;
+ }
+ f = NULL;
+ 
+ exitstatus = 0;
+cleanup:
+ free(new);
+ free(old);
+ 
+ if (f != NULL) {
+ fclose(f);
+ }
+ 
+ if (estream != NULL) {
+ io->close(estream);
+ }
+ 
+ if (epf != NULL) {
+ fclose(epf);
+ }
+ 
+ if (dstream != NULL) {
+ io->close(dstream);
+ }
+ 
+ if (dpf != NULL) {
+ fclose(dpf);
+ }
+ 
+ if (cstream != NULL) {
+ io->close(cstream);
+ }
+ 
+ if (cpf != NULL) {
+ fclose(cpf);
+ }
+
+ return exitstatus;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/bspatch.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/sais.c Added

@@ -0,0 +1,543 @@
+/*
+ * sais.c for sais-lite
+ * Copyright (c) 2008-2010 Yuta Mori 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, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <assert.h>
+#include <stdlib.h>
+#include "sais.h"
+
+#ifndef UCHAR_SIZE
+# define UCHAR_SIZE 256
+#endif
+#ifndef MINBUCKETSIZE
+# define MINBUCKETSIZE 256
+#endif
+
+#define sais_bool_type int
+#define SAIS_LMSSORT2_LIMIT 0x3fffffff
+
+#define SAIS_MYMALLOC(_num, _type) ((_type *)malloc((_num) * sizeof(_type)))
+#define SAIS_MYFREE(_ptr, _num, _type) free((_ptr))
+#define chr(_a) (cs == sizeof(sais_index_type) ? ((const sais_index_type *)T)(_a) : ((const unsigned char *)T)(_a))
+
+// This file exhibits several "suspicious comma" warnings. Rather than risk
+// changing a nuanced behavior, I'm assuming the file has been time-tested and
+// behaves as expected in spite of the unconventional use of comma operators
+// in some expressions.
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcomma"
+
+/* find the start or end of each bucket */
+static
+void
+getCounts(const void *T, sais_index_type *C, sais_index_type n, sais_index_type k, int cs) {
+ sais_index_type i;
+ for(i = 0; i < k; ++i) { Ci = 0; }
+ for(i = 0; i < n; ++i) { ++Cchr(i); }
+}
+static
+void
+getBuckets(const sais_index_type *C, sais_index_type *B, sais_index_type k, sais_bool_type end) {
+ sais_index_type i, sum = 0;
+ if(end) { for(i = 0; i < k; ++i) { sum += Ci; Bi = sum; } }
+ else { for(i = 0; i < k; ++i) { sum += Ci; Bi = sum - Ci; } }
+}
+
+/* sort all type LMS suffixes */
+static
+void
+LMSsort1(const void *T, sais_index_type *SA,
+ sais_index_type *C, sais_index_type *B,
+ sais_index_type n, sais_index_type k, int cs) {
+ sais_index_type *b, i, j;
+ sais_index_type c0, c1;
+
+ /* compute SAl */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 0); /* find starts of buckets */
+ j = n - 1;
+ b = SA + Bc1 = chr(j);
+ --j;
+ *b++ = (chr(j) < c1) ? ~j : j;
+ for(i = 0; i < n; ++i) {
+ if(0 < (j = SAi)) {
+ assert(chr(j) >= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert(i < (b - SA));
+ --j;
+ *b++ = (chr(j) < c1) ? ~j : j;
+ SAi = 0;
+ } else if(j < 0) {
+ SAi = ~j;
+ }
+ }
+ /* compute SAs */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 1); /* find ends of buckets */
+ for(i = n - 1, b = SA + Bc1 = 0; 0 <= i; --i) {
+ if(0 < (j = SAi)) {
+ assert(chr(j) <= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert((b - SA) <= i);
+ --j;
+ *--b = (chr(j) > c1) ? ~(j + 1) : j;
+ SAi = 0;
+ }
+ }
+}
+static
+sais_index_type
+LMSpostproc1(const void *T, sais_index_type *SA,
+ sais_index_type n, sais_index_type m, int cs) {
+ sais_index_type i, j, p, q, plen, qlen, name;
+ sais_index_type c0, c1;
+ sais_bool_type diff;
+
+ /* compact all the sorted substrings into the first m items of SA
+ 2*m must be not larger than n (proveable) */
+ assert(0 < n);
+ for(i = 0; (p = SAi) < 0; ++i) { SAi = ~p; assert((i + 1) < n); }
+ if(i < m) {
+ for(j = i, ++i;; ++i) {
+ assert(i < n);
+ if((p = SAi) < 0) {
+ SAj++ = ~p; SAi = 0;
+ if(j == m) { break; }
+ }
+ }
+ }
+
+ /* store the length of all substrings */
+ i = n - 1; j = n - 1; c0 = chr(n - 1);
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ for(; 0 <= i;) {
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) <= c1));
+ if(0 <= i) {
+ SAm + ((i + 1) >> 1) = j - i; j = i + 1;
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ }
+ }
+
+ /* find the lexicographic names of all substrings */
+ for(i = 0, name = 0, q = n, qlen = 0; i < m; ++i) {
+ p = SAi, plen = SAm + (p >> 1), diff = 1;
+ if((plen == qlen) && ((q + plen) < n)) {
+ for(j = 0; (j < plen) && (chr(p + j) == chr(q + j)); ++j) { }
+ if(j == plen) { diff = 0; }
+ }
+ if(diff != 0) { ++name, q = p, qlen = plen; }
+ SAm + (p >> 1) = name;
+ }
+
+ return name;
+}
+static
+void
+LMSsort2(const void *T, sais_index_type *SA,
+ sais_index_type *C, sais_index_type *B, sais_index_type *D,
+ sais_index_type n, sais_index_type k, int cs) {
+ sais_index_type *b, i, j, t, d;
+ sais_index_type c0, c1;
+ assert(C != B);
+
+ /* compute SAl */
+ getBuckets(C, B, k, 0); /* find starts of buckets */
+ j = n - 1;
+ b = SA + Bc1 = chr(j);
+ --j;
+ t = (chr(j) < c1);
+ j += n;
+ *b++ = (t & 1) ? ~j : j;
+ for(i = 0, d = 0; i < n; ++i) {
+ if(0 < (j = SAi)) {
+ if(n <= j) { d += 1; j -= n; }
+ assert(chr(j) >= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert(i < (b - SA));
+ --j;
+ t = c0; t = (t << 1) | (chr(j) < c1);
+ if(Dt != d) { j += n; Dt = d; }
+ *b++ = (t & 1) ? ~j : j;
+ SAi = 0;
+ } else if(j < 0) {
+ SAi = ~j;
+ }
+ }
+ for(i = n - 1; 0 <= i; --i) {
+ if(0 < SAi) {
+ if(SAi < n) {
+ SAi += n;
+ for(j = i - 1; SAj < n; --j) { }
+ SAj -= n;
+ i = j;
+ }
+ }
+ }
+
+ /* compute SAs */
+ getBuckets(C, B, k, 1); /* find ends of buckets */
+ for(i = n - 1, d += 1, b = SA + Bc1 = 0; 0 <= i; --i) {
+ if(0 < (j = SAi)) {
+ if(n <= j) { d += 1; j -= n; }
+ assert(chr(j) <= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert((b - SA) <= i);
+ --j;
+ t = c0; t = (t << 1) | (chr(j) > c1);
+ if(Dt != d) { j += n; Dt = d; }
+ *--b = (t & 1) ? ~(j + 1) : j;
+ SAi = 0;
+ }
+ }
+}
+static
+sais_index_type
+LMSpostproc2(sais_index_type *SA, sais_index_type n, sais_index_type m) {
+ sais_index_type i, j, d, name;
+
+ /* compact all the sorted LMS substrings into the first m items of SA */
+ assert(0 < n);
+ for(i = 0, name = 0; (j = SAi) < 0; ++i) {
+ j = ~j;
+ if(n <= j) { name += 1; }
+ SAi = j;
+ assert((i + 1) < n);
+ }
+ if(i < m) {
+ for(d = i, ++i;; ++i) {
+ assert(i < n);
+ if((j = SAi) < 0) {
+ j = ~j;
+ if(n <= j) { name += 1; }
+ SAd++ = j; SAi = 0;
+ if(d == m) { break; }
+ }
+ }
+ }
+ if(name < m) {
+ /* store the lexicographic names */
+ for(i = m - 1, d = name + 1; 0 <= i; --i) {
+ if(n <= (j = SAi)) { j -= n; --d; }
+ SAm + (j >> 1) = d;
+ }
+ } else {
+ /* unset flags */
+ for(i = 0; i < m; ++i) {
+ if(n <= (j = SAi)) { j -= n; SAi = j; }
+ }
+ }
+
+ return name;
+}
+
+/* compute SA and BWT */
+static
+void
+induceSA(const void *T, sais_index_type *SA,
+ sais_index_type *C, sais_index_type *B,
+ sais_index_type n, sais_index_type k, int cs) {
+ sais_index_type *b, i, j;
+ sais_index_type c0, c1;
+ /* compute SAl */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 0); /* find starts of buckets */
+ j = n - 1;
+ b = SA + Bc1 = chr(j);
+ *b++ = ((0 < j) && (chr(j - 1) < c1)) ? ~j : j;
+ for(i = 0; i < n; ++i) {
+ j = SAi, SAi = ~j;
+ if(0 < j) {
+ --j;
+ assert(chr(j) >= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert(i < (b - SA));
+ *b++ = ((0 < j) && (chr(j - 1) < c1)) ? ~j : j;
+ }
+ }
+ /* compute SAs */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 1); /* find ends of buckets */
+ for(i = n - 1, b = SA + Bc1 = 0; 0 <= i; --i) {
+ if(0 < (j = SAi)) {
+ --j;
+ assert(chr(j) <= chr(j + 1));
+ if((c0 = chr(j)) != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert((b - SA) <= i);
+ *--b = ((j == 0) || (chr(j - 1) > c1)) ? ~j : j;
+ } else {
+ SAi = ~j;
+ }
+ }
+}
+static
+sais_index_type
+computeBWT(const void *T, sais_index_type *SA,
+ sais_index_type *C, sais_index_type *B,
+ sais_index_type n, sais_index_type k, int cs) {
+ sais_index_type *b, i, j, pidx = -1;
+ sais_index_type c0, c1;
+ /* compute SAl */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 0); /* find starts of buckets */
+ j = n - 1;
+ b = SA + Bc1 = chr(j);
+ *b++ = ((0 < j) && (chr(j - 1) < c1)) ? ~j : j;
+ for(i = 0; i < n; ++i) {
+ if(0 < (j = SAi)) {
+ --j;
+ assert(chr(j) >= chr(j + 1));
+ SAi = ~((sais_index_type)(c0 = chr(j)));
+ if(c0 != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert(i < (b - SA));
+ *b++ = ((0 < j) && (chr(j - 1) < c1)) ? ~j : j;
+ } else if(j != 0) {
+ SAi = ~j;
+ }
+ }
+ /* compute SAs */
+ if(C == B) { getCounts(T, C, n, k, cs); }
+ getBuckets(C, B, k, 1); /* find ends of buckets */
+ for(i = n - 1, b = SA + Bc1 = 0; 0 <= i; --i) {
+ if(0 < (j = SAi)) {
+ --j;
+ assert(chr(j) <= chr(j + 1));
+ SAi = (c0 = chr(j));
+ if(c0 != c1) { Bc1 = b - SA; b = SA + Bc1 = c0; }
+ assert((b - SA) <= i);
+ *--b = ((0 < j) && (chr(j - 1) > c1)) ? ~((sais_index_type)chr(j - 1)) : j;
+ } else if(j != 0) {
+ SAi = ~j;
+ } else {
+ pidx = i;
+ }
+ }
+ return pidx;
+}
+
+/* find the suffix array SA of T0..n-1 in {0..255}^n */
+static
+sais_index_type
+sais_main(const void *T, sais_index_type *SA,
+ sais_index_type fs, sais_index_type n, sais_index_type k, int cs,
+ sais_bool_type isbwt) {
+ sais_index_type *C, *B, *D, *RA, *b;
+ sais_index_type i, j, m, p, q, t, name, pidx = 0, newfs;
+ sais_index_type c0, c1;
+ unsigned int flags;
+
+ assert((T != NULL) && (SA != NULL));
+ assert((0 <= fs) && (0 < n) && (1 <= k));
+
+ if(k <= MINBUCKETSIZE) {
+ if((C = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) { return -2; }
+ if(k <= fs) {
+ B = SA + (n + fs - k);
+ flags = 1;
+ } else {
+ if((B = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) { SAIS_MYFREE(C, k, sais_index_type); return -2; }
+ flags = 3;
+ }
+ } else if(k <= fs) {
+ C = SA + (n + fs - k);
+ if(k <= (fs - k)) {
+ B = C - k;
+ flags = 0;
+ } else if(k <= (MINBUCKETSIZE * 4)) {
+ if((B = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) { return -2; }
+ flags = 2;
+ } else {
+ B = C;
+ flags = 8;
+ }
+ } else {
+ if((C = B = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) { return -2; }
+ flags = 4 | 8;
+ }
+ if((n <= SAIS_LMSSORT2_LIMIT) && (2 <= (n / k))) {
+ if(flags & 1) { flags |= ((k * 2) <= (fs - k)) ? 32 : 16; }
+ else if((flags == 0) && ((k * 2) <= (fs - k * 2))) { flags |= 32; }
+ }
+
+ /* stage 1: reduce the problem by at least 1/2
+ sort all the LMS-substrings */
+ getCounts(T, C, n, k, cs); getBuckets(C, B, k, 1); /* find ends of buckets */
+ for(i = 0; i < n; ++i) { SAi = 0; }
+ b = &t; i = n - 1; j = n; m = 0; c0 = chr(n - 1);
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ for(; 0 <= i;) {
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) <= c1));
+ if(0 <= i) {
+ *b = j; b = SA + --Bc1; j = i; ++m;
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ }
+ }
+
+ if(1 < m) {
+ if(flags & (16 | 32)) {
+ if(flags & 16) {
+ if((D = SAIS_MYMALLOC((size_t)k * 2, sais_index_type)) == NULL) {
+ if(flags & (1 | 4)) { SAIS_MYFREE(C, k, sais_index_type); }
+ if(flags & 2) { SAIS_MYFREE(B, k, sais_index_type); }
+ return -2;
+ }
+ } else {
+ D = B - k * 2;
+ }
+ assert((j + 1) < n);
+ ++Bchr(j + 1);
+ for(i = 0, j = 0; i < k; ++i) {
+ j += Ci;
+ if(Bi != j) { assert(SABi != 0); SABi += n; }
+ Di = Di + k = 0;
+ }
+ LMSsort2(T, SA, C, B, D, n, k, cs);
+ name = LMSpostproc2(SA, n, m);
+ if(flags & 16) { SAIS_MYFREE(D, k * 2, sais_index_type); }
+ } else {
+ LMSsort1(T, SA, C, B, n, k, cs);
+ name = LMSpostproc1(T, SA, n, m, cs);
+ }
+ } else if(m == 1) {
+ *b = j + 1;
+ name = 1;
+ } else {
+ name = 0;
+ }
+
+ /* stage 2: solve the reduced problem
+ recurse if names are not yet unique */
+ if(name < m) {
+ if(flags & 4) { SAIS_MYFREE(C, k, sais_index_type); }
+ if(flags & 2) { SAIS_MYFREE(B, k, sais_index_type); }
+ newfs = (n + fs) - (m * 2);
+ if((flags & (1 | 4 | 8)) == 0) {
+ if((k + name) <= newfs) { newfs -= k; }
+ else { flags |= 8; }
+ }
+ assert((n >> 1) <= (newfs + m));
+ RA = SA + m + newfs;
+ for(i = m + (n >> 1) - 1, j = m - 1; m <= i; --i) {
+ if(SAi != 0) {
+ RAj-- = SAi - 1;
+ }
+ }
+ if(sais_main(RA, SA, newfs, m, name, sizeof(sais_index_type), 0) != 0) {
+ if(flags & 1) { SAIS_MYFREE(C, k, sais_index_type); }
+ return -2;
+ }
+
+ i = n - 1; j = m - 1; c0 = chr(n - 1);
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ for(; 0 <= i;) {
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) <= c1));
+ if(0 <= i) {
+ RAj-- = i + 1;
+ do { c1 = c0; } while((0 <= --i) && ((c0 = chr(i)) >= c1));
+ }
+ }
+ for(i = 0; i < m; ++i) { SAi = RASAi; }
+ if(flags & 4) {
+ if((C = B = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) { return -2; }
+ }
+ if(flags & 2) {
+ if((B = SAIS_MYMALLOC((size_t)k, sais_index_type)) == NULL) {
+ if(flags & 1) { SAIS_MYFREE(C, k, sais_index_type); }
+ return -2;
+ }
+ }
+ }
+
+ /* stage 3: induce the result for the original problem */
+ if(flags & 8) { getCounts(T, C, n, k, cs); }
+ /* put all left-most S characters into their buckets */
+ if(1 < m) {
+ getBuckets(C, B, k, 1); /* find ends of buckets */
+ i = m - 1, j = n, p = SAm - 1, c1 = chr(p);
+ do {
+ q = Bc0 = c1;
+ while(q < j) { SA--j = 0; }
+ do {
+ SA--j = p;
+ if(--i < 0) { break; }
+ p = SAi;
+ } while((c1 = chr(p)) == c0);
+ } while(0 <= i);
+ while(0 < j) { SA--j = 0; }
+ }
+ if(isbwt == 0) { induceSA(T, SA, C, B, n, k, cs); }
+ else { pidx = computeBWT(T, SA, C, B, n, k, cs); }
+ if(flags & (1 | 4)) { SAIS_MYFREE(C, k, sais_index_type); }
+ if(flags & 2) { SAIS_MYFREE(B, k, sais_index_type); }
+
+ return pidx;
+}
+
+/*---------------------------------------------------------------------------*/
+
+sais_index_type
+sais(const unsigned char *T, sais_index_type *SA, int n) {
+ if((T == NULL) || (SA == NULL) || (n < 0)) { return -1; }
+ if(n <= 1) { if(n == 1) { SA0 = 0; } return 0; }
+ return sais_main(T, SA, 0, n, UCHAR_SIZE, sizeof(unsigned char), 0);
+}
+
+sais_index_type
+sais_int(const int *T, sais_index_type *SA, int n, int k) {
+ if((T == NULL) || (SA == NULL) || (n < 0) || (k <= 0)) { return -1; }
+ if(n <= 1) { if(n == 1) { SA0 = 0; } return 0; }
+ return sais_main(T, SA, 0, n, k, sizeof(int), 0);
+}
+
+sais_index_type
+sais_bwt(const unsigned char *T, unsigned char *U, sais_index_type *A, int n) {
+ int i;
+ sais_index_type pidx;
+ if((T == NULL) || (U == NULL) || (A == NULL) || (n < 0)) { return -1; }
+ if(n <= 1) { if(n == 1) { U0 = T0; } return n; }
+ pidx = sais_main(T, A, 0, n, UCHAR_SIZE, sizeof(unsigned char), 1);
+ if(pidx < 0) { return pidx; }
+ U0 = Tn - 1;
+ for(i = 0; i < pidx; ++i) { Ui + 1 = (unsigned char)Ai; }
+ for(i += 1; i < n; ++i) { Ui = (unsigned char)Ai; }
+ pidx += 1;
+ return pidx;
+}
+
+sais_index_type
+sais_int_bwt(const sais_index_type *T, sais_index_type *U, sais_index_type *A, int n, int k) {
+ int i;
+ sais_index_type pidx;
+ if((T == NULL) || (U == NULL) || (A == NULL) || (n < 0) || (k <= 0)) { return -1; }
+ if(n <= 1) { if(n == 1) { U0 = T0; } return n; }
+ pidx = sais_main(T, A, 0, n, k, sizeof(int), 1);
+ if(pidx < 0) { return pidx; }
+ U0 = Tn - 1;
+ for(i = 0; i < pidx; ++i) { Ui + 1 = Ai; }
+ for(i += 1; i < n; ++i) { Ui = Ai; }
+ pidx += 1;
+ return pidx;
+}
+
+#pragma clang diagnostic pop

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/bsdiff/sais.h Added

@@ -0,0 +1,59 @@
+/*
+ * sais.h for sais-lite
+ * Copyright (c) 2008-2010 Yuta Mori 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, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef SAIS_H
+#define SAIS_H 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include <sys/types.h>
+
+#define sais_index_type off_t
+
+/* find the suffix array SA of T0..n-1
+ use a working space (excluding T and SA) of at most 2n+O(lg n) */
+sais_index_type
+sais(const unsigned char *T, sais_index_type *SA, int n);
+
+/* find the suffix array SA of T0..n-1 in {0..k-1}^n
+ use a working space (excluding T and SA) of at most MAX(4k,2n) */
+sais_index_type
+sais_int(const int *T, sais_index_type *SA, int n, int k);
+
+/* burrows-wheeler transform */
+sais_index_type
+sais_bwt(const unsigned char *T, unsigned char *U, sais_index_type *A, int n);
+sais_index_type
+sais_int_bwt(const sais_index_type *T, sais_index_type *U, sais_index_type *A, int n, int k);
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif /* __cplusplus */
+
+#endif /* SAIS_H */

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/alterations.txt Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/license.txt Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/readme.md Added

@@ -0,0 +1,166 @@
+Ed25519
+=======
+
+This is a portable implementation of Ed25519(http://ed25519.cr.yp.to/) based
+on the SUPERCOP "ref10" implementation. Additionally there is key exchanging
+and scalar addition included to further aid building a PKI using Ed25519. All
+code is licensed under the permissive zlib license.
+
+All code is pure ANSI C without any dependencies, except for the random seed
+generation which uses standard OS cryptography APIs (`CryptGenRandom` on
+Windows, `/dev/urandom` on nix). If you wish to be entirely portable define
+`ED25519_NO_SEED`. This disables the `ed25519_create_seed` function, so if your
+application requires key generation you must supply your own seeding function
+(which is simply a 256 bit (32 byte) cryptographic random number generator).
+
+
+Performance
+-----------
+
+On a Windows machine with an Intel Pentium B970 @ 2.3GHz I got the following
+speeds (running on only one a single core):
+
+    Seed generation: 64us (15625 per second)
+    Key generation: 88us (11364 per second)
+    Message signing (short message): 87us (11494 per second)
+    Message verifying (short message): 228us (4386 per second)
+    Scalar addition: 100us (10000 per second)
+    Key exchange: 220us (4545 per second)
+
+The speeds on other machines may vary. Sign/verify times will be higher with
+longer messages. The implementation significantly benefits from 64 bit
+architectures, if possible compile as 64 bit.
+
+
+Usage
+-----
+
+Simply add all .c and .h files in the `src/` folder to your project and include
+`ed25519.h` in any file you want to use the API. If you prefer to use a shared
+library, only copy `ed25519.h` and define `ED25519_DLL` before importing. A
+windows DLL is pre-built.
+
+There are no defined types for seeds, private keys, public keys, shared secrets
+or signatures. Instead simple `unsigned char` buffers are used with the
+following sizes:
+
+```c
+unsigned char seed32;
+unsigned char signature64;
+unsigned char public_key32;
+unsigned char private_key64;
+unsigned char scalar32;
+unsigned char shared_secret32;
+```
+
+API
+---
+
+```c
+int ed25519_create_seed(unsigned char *seed);
+```
+
+Creates a 32 byte random seed in `seed` for key generation. `seed` must be a
+writable 32 byte buffer. Returns 0 on success, and nonzero on failure.
+
+```c
+void ed25519_create_keypair(unsigned char *public_key, unsigned char *private_key,
+                            const unsigned char *seed);
+```
+
+Creates a new key pair from the given seed. `public_key` must be a writable 32
+byte buffer, `private_key` must be a writable 64 byte buffer and `seed` must be
+a 32 byte buffer.
+
+```c
+void ed25519_sign(unsigned char *signature,
+                  const unsigned char *message, size_t message_len,
+                  const unsigned char *public_key, const unsigned char *private_key);
+```
+
+Creates a signature of the given message with the given key pair. `signature`
+must be a writable 64 byte buffer. `message` must have at least `message_len`
+bytes to be read. 
+
+```c
+int ed25519_verify(const unsigned char *signature,
+                   const unsigned char *message, size_t message_len,
+                   const unsigned char *public_key);
+```
+
+Verifies the signature on the given message using `public_key`. `signature`
+must be a readable 64 byte buffer. `message` must have at least `message_len`
+bytes to be read. Returns 1 if the signature matches, 0 otherwise.
+
+```c
+void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key,
+                        const unsigned char *scalar);
+```
+
+Adds `scalar` to the given key pair where scalar is a 32 byte buffer (possibly
+generated with `ed25519_create_seed`), generating a new key pair. You can
+calculate the public key sum without knowing the private key and vice versa by
+passing in `NULL` for the key you don't know. This is useful for enforcing
+randomness on a key pair by a third party while only knowing the public key,
+among other things.  Warning: the last bit of the scalar is ignored - if
+comparing scalars make sure to clear it with `scalar31 &= 127`.
+
+
+```c
+void ed25519_key_exchange(unsigned char *shared_secret,
+                          const unsigned char *public_key, const unsigned char *private_key);
+```
+
+Performs a key exchange on the given public key and private key, producing a
+shared secret. It is recommended to hash the shared secret before using it.
+`shared_secret` must be a 32 byte writable buffer where the shared secret will
+be stored.
+
+Example
+-------
+
+```c
+unsigned char seed32, public_key32, private_key64, signature64;
+unsigned char other_public_key32, other_private_key64, shared_secret32;
+const unsigned char message = "TEST MESSAGE";
+
+/* create a random seed, and a key pair out of that seed */
+if (ed25519_create_seed(seed)) {
+    printf("error while generating seed\n");
+    exit(1);
+}
+
+ed25519_create_keypair(public_key, private_key, seed);
+
+/* create signature on the message with the key pair */
+ed25519_sign(signature, message, strlen(message), public_key, private_key);
+
+/* verify the signature */
+if (ed25519_verify(signature, message, strlen(message), public_key)) {
+    printf("valid signature\n");
+} else {
+    printf("invalid signature\n");
+}
+
+/* create a dummy keypair to use for a key exchange, normally you'd only have
+the public key and receive it through some communication channel */
+if (ed25519_create_seed(seed)) {
+    printf("error while generating seed\n");
+    exit(1);
+}
+
+ed25519_create_keypair(other_public_key, other_private_key, seed);
+
+/* do a key exchange with other_public_key */
+ed25519_key_exchange(shared_secret, other_public_key, private_key);
+
+/* 
+    the magic here is that ed25519_key_exchange(shared_secret, public_key,
+    other_private_key); would result in the same shared_secret
+*/
+
+```
+
+License
+-------
+All code is released under the zlib license. See license.txt for details.

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/add_scalar.c Added

@@ -0,0 +1,69 @@
+#include "ed25519.h"
+#include "ge.h"
+#include "sc.h"
+#include "sha512.h"
+
+
+/* see http://crypto.stackexchange.com/a/6215/4697 */
+void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, const unsigned char *scalar) {
+ const unsigned char SC_132 = {1}; /* scalar with value 1 */
+ 
+ unsigned char n32; 
+ ge_p3 nB;
+ ge_p1p1 A_p1p1;
+ ge_p3 A;
+ ge_p3 public_key_unpacked;
+ ge_cached T;
+
+ sha512_context hash;
+ unsigned char hashbuf64;
+
+ int i;
+
+ /* copy the scalar and clear highest bit */
+ for (i = 0; i < 31; ++i) {
+ ni = scalari;
+ }
+ n31 = scalar31 & 127;
+
+ /* private key: a = n + t */
+ if (private_key) {
+ sc_muladd(private_key, SC_1, n, private_key);
+
+ // https://github.com/orlp/ed25519/issues/3
+ sha512_init(&hash);
+ sha512_update(&hash, private_key + 32, 32);
+ sha512_update(&hash, scalar, 32);
+ sha512_final(&hash, hashbuf);
+ for (i = 0; i < 32; ++i) {
+ private_key32 + i = hashbufi;
+ }
+ }
+
+ /* public key: A = nB + T */
+ if (public_key) {
+ /* if we know the private key we don't need a point addition, which is faster */
+ /* using a "timing attack" you could find out wether or not we know the private
+ key, but this information seems rather useless - if this is important pass
+ public_key and private_key seperately in 2 function calls */
+ if (private_key) {
+ ge_scalarmult_base(&A, private_key);
+ } else {
+ /* unpack public key into T */
+ ge_frombytes_negate_vartime(&public_key_unpacked, public_key);
+ fe_neg(public_key_unpacked.X, public_key_unpacked.X); /* undo negate */
+ fe_neg(public_key_unpacked.T, public_key_unpacked.T); /* undo negate */
+ ge_p3_to_cached(&T, &public_key_unpacked);
+
+ /* calculate n*B */
+ ge_scalarmult_base(&nB, n);
+
+ /* A = n*B + T */
+ ge_add(&A_p1p1, &nB, &T);
+ ge_p1p1_to_p3(&A, &A_p1p1);
+ }
+ 
+ /* pack public key */
+ ge_p3_tobytes(public_key, &A);
+ }
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/ed25519.h Added

@@ -0,0 +1,38 @@
+#ifndef ED25519_H
+#define ED25519_H
+
+#include <stddef.h>
+
+#if defined(_WIN32)
+ #if defined(ED25519_BUILD_DLL)
+ #define ED25519_DECLSPEC __declspec(dllexport)
+ #elif defined(ED25519_DLL)
+ #define ED25519_DECLSPEC __declspec(dllimport)
+ #else
+ #define ED25519_DECLSPEC
+ #endif
+#else
+ #define ED25519_DECLSPEC
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef ED25519_NO_SEED
+int ED25519_DECLSPEC ed25519_create_seed(unsigned char *seed);
+#endif
+
+void ED25519_DECLSPEC ed25519_create_keypair(unsigned char *public_key, unsigned char *private_key, const unsigned char *seed);
+void ED25519_DECLSPEC ed25519_sign(unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key, const unsigned char *private_key);
+int ED25519_DECLSPEC ed25519_verify(const unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key);
+void ED25519_DECLSPEC ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, const unsigned char *scalar);
+void ED25519_DECLSPEC ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key, const unsigned char *private_key);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/fe.c Added

@@ -0,0 +1,1491 @@
+#include "fixedint.h"
+#include "fe.h"
+
+
+/*
+ helper functions
+*/
+static uint64_t load_3(const unsigned char *in) {
+ uint64_t result;
+
+ result = (uint64_t) in0;
+ result |= ((uint64_t) in1) << 8;
+ result |= ((uint64_t) in2) << 16;
+
+ return result;
+}
+
+static uint64_t load_4(const unsigned char *in) {
+ uint64_t result;
+
+ result = (uint64_t) in0;
+ result |= ((uint64_t) in1) << 8;
+ result |= ((uint64_t) in2) << 16;
+ result |= ((uint64_t) in3) << 24;
+ 
+ return result;
+}
+
+
+
+/*
+ h = 0
+*/
+
+void fe_0(fe h) {
+ h0 = 0;
+ h1 = 0;
+ h2 = 0;
+ h3 = 0;
+ h4 = 0;
+ h5 = 0;
+ h6 = 0;
+ h7 = 0;
+ h8 = 0;
+ h9 = 0;
+}
+
+
+
+/*
+ h = 1
+*/
+
+void fe_1(fe h) {
+ h0 = 1;
+ h1 = 0;
+ h2 = 0;
+ h3 = 0;
+ h4 = 0;
+ h5 = 0;
+ h6 = 0;
+ h7 = 0;
+ h8 = 0;
+ h9 = 0;
+}
+
+
+
+/*
+ h = f + g
+ Can overlap h with f or g.
+
+ Preconditions:
+ |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+ |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+
+ Postconditions:
+ |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+*/
+
+void fe_add(fe h, const fe f, const fe g) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t g0 = g0;
+ int32_t g1 = g1;
+ int32_t g2 = g2;
+ int32_t g3 = g3;
+ int32_t g4 = g4;
+ int32_t g5 = g5;
+ int32_t g6 = g6;
+ int32_t g7 = g7;
+ int32_t g8 = g8;
+ int32_t g9 = g9;
+ int32_t h0 = f0 + g0;
+ int32_t h1 = f1 + g1;
+ int32_t h2 = f2 + g2;
+ int32_t h3 = f3 + g3;
+ int32_t h4 = f4 + g4;
+ int32_t h5 = f5 + g5;
+ int32_t h6 = f6 + g6;
+ int32_t h7 = f7 + g7;
+ int32_t h8 = f8 + g8;
+ int32_t h9 = f9 + g9;
+ 
+ h0 = h0;
+ h1 = h1;
+ h2 = h2;
+ h3 = h3;
+ h4 = h4;
+ h5 = h5;
+ h6 = h6;
+ h7 = h7;
+ h8 = h8;
+ h9 = h9;
+}
+
+
+
+/*
+ Replace (f,g) with (g,g) if b == 1;
+ replace (f,g) with (f,g) if b == 0.
+
+ Preconditions: b in {0,1}.
+*/
+
+void fe_cmov(fe f, const fe g, unsigned int b) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t g0 = g0;
+ int32_t g1 = g1;
+ int32_t g2 = g2;
+ int32_t g3 = g3;
+ int32_t g4 = g4;
+ int32_t g5 = g5;
+ int32_t g6 = g6;
+ int32_t g7 = g7;
+ int32_t g8 = g8;
+ int32_t g9 = g9;
+ int32_t x0 = f0 ^ g0;
+ int32_t x1 = f1 ^ g1;
+ int32_t x2 = f2 ^ g2;
+ int32_t x3 = f3 ^ g3;
+ int32_t x4 = f4 ^ g4;
+ int32_t x5 = f5 ^ g5;
+ int32_t x6 = f6 ^ g6;
+ int32_t x7 = f7 ^ g7;
+ int32_t x8 = f8 ^ g8;
+ int32_t x9 = f9 ^ g9;
+
+ b = (unsigned int) (- (int) b); /* silence warning */
+ x0 &= b;
+ x1 &= b;
+ x2 &= b;
+ x3 &= b;
+ x4 &= b;
+ x5 &= b;
+ x6 &= b;
+ x7 &= b;
+ x8 &= b;
+ x9 &= b;
+ 
+ f0 = f0 ^ x0;
+ f1 = f1 ^ x1;
+ f2 = f2 ^ x2;
+ f3 = f3 ^ x3;
+ f4 = f4 ^ x4;
+ f5 = f5 ^ x5;
+ f6 = f6 ^ x6;
+ f7 = f7 ^ x7;
+ f8 = f8 ^ x8;
+ f9 = f9 ^ x9;
+}
+
+/*
+ Replace (f,g) with (g,f) if b == 1;
+ replace (f,g) with (f,g) if b == 0.
+
+ Preconditions: b in {0,1}.
+*/
+
+void fe_cswap(fe f,fe g,unsigned int b) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t g0 = g0;
+ int32_t g1 = g1;
+ int32_t g2 = g2;
+ int32_t g3 = g3;
+ int32_t g4 = g4;
+ int32_t g5 = g5;
+ int32_t g6 = g6;
+ int32_t g7 = g7;
+ int32_t g8 = g8;
+ int32_t g9 = g9;
+ int32_t x0 = f0 ^ g0;
+ int32_t x1 = f1 ^ g1;
+ int32_t x2 = f2 ^ g2;
+ int32_t x3 = f3 ^ g3;
+ int32_t x4 = f4 ^ g4;
+ int32_t x5 = f5 ^ g5;
+ int32_t x6 = f6 ^ g6;
+ int32_t x7 = f7 ^ g7;
+ int32_t x8 = f8 ^ g8;
+ int32_t x9 = f9 ^ g9;
+ b = (unsigned int) (- (int) b); /* silence warning */
+ x0 &= b;
+ x1 &= b;
+ x2 &= b;
+ x3 &= b;
+ x4 &= b;
+ x5 &= b;
+ x6 &= b;
+ x7 &= b;
+ x8 &= b;
+ x9 &= b;
+ f0 = f0 ^ x0;
+ f1 = f1 ^ x1;
+ f2 = f2 ^ x2;
+ f3 = f3 ^ x3;
+ f4 = f4 ^ x4;
+ f5 = f5 ^ x5;
+ f6 = f6 ^ x6;
+ f7 = f7 ^ x7;
+ f8 = f8 ^ x8;
+ f9 = f9 ^ x9;
+ g0 = g0 ^ x0;
+ g1 = g1 ^ x1;
+ g2 = g2 ^ x2;
+ g3 = g3 ^ x3;
+ g4 = g4 ^ x4;
+ g5 = g5 ^ x5;
+ g6 = g6 ^ x6;
+ g7 = g7 ^ x7;
+ g8 = g8 ^ x8;
+ g9 = g9 ^ x9;
+}
+
+
+
+/*
+ h = f
+*/
+
+void fe_copy(fe h, const fe f) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ 
+ h0 = f0;
+ h1 = f1;
+ h2 = f2;
+ h3 = f3;
+ h4 = f4;
+ h5 = f5;
+ h6 = f6;
+ h7 = f7;
+ h8 = f8;
+ h9 = f9;
+}
+
+
+
+/*
+ Ignores top bit of h.
+*/
+
+void fe_frombytes(fe h, const unsigned char *s) {
+ int64_t h0 = load_4(s);
+ int64_t h1 = load_3(s + 4) << 6;
+ int64_t h2 = load_3(s + 7) << 5;
+ int64_t h3 = load_3(s + 10) << 3;
+ int64_t h4 = load_3(s + 13) << 2;
+ int64_t h5 = load_4(s + 16);
+ int64_t h6 = load_3(s + 20) << 7;
+ int64_t h7 = load_3(s + 23) << 5;
+ int64_t h8 = load_3(s + 26) << 4;
+ int64_t h9 = (load_3(s + 29) & 8388607) << 2;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+
+ carry9 = (h9 + (int64_t) (1 << 24)) >> 25;
+ h0 += carry9 * 19;
+ h9 -= carry9 << 25;
+ carry1 = (h1 + (int64_t) (1 << 24)) >> 25;
+ h2 += carry1;
+ h1 -= carry1 << 25;
+ carry3 = (h3 + (int64_t) (1 << 24)) >> 25;
+ h4 += carry3;
+ h3 -= carry3 << 25;
+ carry5 = (h5 + (int64_t) (1 << 24)) >> 25;
+ h6 += carry5;
+ h5 -= carry5 << 25;
+ carry7 = (h7 + (int64_t) (1 << 24)) >> 25;
+ h8 += carry7;
+ h7 -= carry7 << 25;
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ carry2 = (h2 + (int64_t) (1 << 25)) >> 26;
+ h3 += carry2;
+ h2 -= carry2 << 26;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry6 = (h6 + (int64_t) (1 << 25)) >> 26;
+ h7 += carry6;
+ h6 -= carry6 << 26;
+ carry8 = (h8 + (int64_t) (1 << 25)) >> 26;
+ h9 += carry8;
+ h8 -= carry8 << 26;
+
+ h0 = (int32_t) h0;
+ h1 = (int32_t) h1;
+ h2 = (int32_t) h2;
+ h3 = (int32_t) h3;
+ h4 = (int32_t) h4;
+ h5 = (int32_t) h5;
+ h6 = (int32_t) h6;
+ h7 = (int32_t) h7;
+ h8 = (int32_t) h8;
+ h9 = (int32_t) h9;
+}
+
+
+
+void fe_invert(fe out, const fe z) {
+ fe t0;
+ fe t1;
+ fe t2;
+ fe t3;
+ int i;
+
+ fe_sq(t0, z);
+
+ for (i = 1; i < 1; ++i) {
+ fe_sq(t0, t0);
+ }
+
+ fe_sq(t1, t0);
+
+ for (i = 1; i < 2; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t1, z, t1);
+ fe_mul(t0, t0, t1);
+ fe_sq(t2, t0);
+
+ for (i = 1; i < 1; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t1, t2);
+ fe_sq(t2, t1);
+
+ for (i = 1; i < 5; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t2, t1);
+ fe_sq(t2, t1);
+
+ for (i = 1; i < 10; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t2, t2, t1);
+ fe_sq(t3, t2);
+
+ for (i = 1; i < 20; ++i) {
+ fe_sq(t3, t3);
+ }
+
+ fe_mul(t2, t3, t2);
+ fe_sq(t2, t2);
+
+ for (i = 1; i < 10; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t2, t1);
+ fe_sq(t2, t1);
+
+ for (i = 1; i < 50; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t2, t2, t1);
+ fe_sq(t3, t2);
+
+ for (i = 1; i < 100; ++i) {
+ fe_sq(t3, t3);
+ }
+
+ fe_mul(t2, t3, t2);
+ fe_sq(t2, t2);
+
+ for (i = 1; i < 50; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t2, t1);
+ fe_sq(t1, t1);
+
+ for (i = 1; i < 5; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(out, t1, t0);
+}
+
+
+
+/*
+ return 1 if f is in {1,3,5,...,q-2}
+ return 0 if f is in {0,2,4,...,q-1}
+
+ Preconditions:
+ |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+*/
+
+int fe_isnegative(const fe f) {
+ unsigned char s32;
+
+ fe_tobytes(s, f);
+ 
+ return s0 & 1;
+}
+
+
+
+/*
+ return 1 if f == 0
+ return 0 if f != 0
+
+ Preconditions:
+ |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+*/
+
+int fe_isnonzero(const fe f) {
+ unsigned char s32;
+ unsigned char r;
+
+ fe_tobytes(s, f);
+
+ r = s0;
+ #define F(i) r |= si
+ F(1);
+ F(2);
+ F(3);
+ F(4);
+ F(5);
+ F(6);
+ F(7);
+ F(8);
+ F(9);
+ F(10);
+ F(11);
+ F(12);
+ F(13);
+ F(14);
+ F(15);
+ F(16);
+ F(17);
+ F(18);
+ F(19);
+ F(20);
+ F(21);
+ F(22);
+ F(23);
+ F(24);
+ F(25);
+ F(26);
+ F(27);
+ F(28);
+ F(29);
+ F(30);
+ F(31);
+ #undef F
+
+ return r != 0;
+}
+
+
+
+/*
+ h = f * g
+ Can overlap h with f or g.
+
+ Preconditions:
+ |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
+ |g| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
+
+ Postconditions:
+ |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
+ */
+
+ /*
+ Notes on implementation strategy:
+
+ Using schoolbook multiplication.
+ Karatsuba would save a little in some cost models.
+
+ Most multiplications by 2 and 19 are 32-bit precomputations;
+ cheaper than 64-bit postcomputations.
+
+ There is one remaining multiplication by 19 in the carry chain;
+ one *19 precomputation can be merged into this,
+ but the resulting data flow is considerably less clean.
+
+ There are 12 carries below.
+ 10 of them are 2-way parallelizable and vectorizable.
+ Can get away with 11 carries, but then data flow is much deeper.
+
+ With tighter constraints on inputs can squeeze carries into int32.
+*/
+
+void fe_mul(fe h, const fe f, const fe g) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t g0 = g0;
+ int32_t g1 = g1;
+ int32_t g2 = g2;
+ int32_t g3 = g3;
+ int32_t g4 = g4;
+ int32_t g5 = g5;
+ int32_t g6 = g6;
+ int32_t g7 = g7;
+ int32_t g8 = g8;
+ int32_t g9 = g9;
+ int32_t g1_19 = 19 * g1; /* 1.959375*2^29 */
+ int32_t g2_19 = 19 * g2; /* 1.959375*2^30; still ok */
+ int32_t g3_19 = 19 * g3;
+ int32_t g4_19 = 19 * g4;
+ int32_t g5_19 = 19 * g5;
+ int32_t g6_19 = 19 * g6;
+ int32_t g7_19 = 19 * g7;
+ int32_t g8_19 = 19 * g8;
+ int32_t g9_19 = 19 * g9;
+ int32_t f1_2 = 2 * f1;
+ int32_t f3_2 = 2 * f3;
+ int32_t f5_2 = 2 * f5;
+ int32_t f7_2 = 2 * f7;
+ int32_t f9_2 = 2 * f9;
+ int64_t f0g0 = f0 * (int64_t) g0;
+ int64_t f0g1 = f0 * (int64_t) g1;
+ int64_t f0g2 = f0 * (int64_t) g2;
+ int64_t f0g3 = f0 * (int64_t) g3;
+ int64_t f0g4 = f0 * (int64_t) g4;
+ int64_t f0g5 = f0 * (int64_t) g5;
+ int64_t f0g6 = f0 * (int64_t) g6;
+ int64_t f0g7 = f0 * (int64_t) g7;
+ int64_t f0g8 = f0 * (int64_t) g8;
+ int64_t f0g9 = f0 * (int64_t) g9;
+ int64_t f1g0 = f1 * (int64_t) g0;
+ int64_t f1g1_2 = f1_2 * (int64_t) g1;
+ int64_t f1g2 = f1 * (int64_t) g2;
+ int64_t f1g3_2 = f1_2 * (int64_t) g3;
+ int64_t f1g4 = f1 * (int64_t) g4;
+ int64_t f1g5_2 = f1_2 * (int64_t) g5;
+ int64_t f1g6 = f1 * (int64_t) g6;
+ int64_t f1g7_2 = f1_2 * (int64_t) g7;
+ int64_t f1g8 = f1 * (int64_t) g8;
+ int64_t f1g9_38 = f1_2 * (int64_t) g9_19;
+ int64_t f2g0 = f2 * (int64_t) g0;
+ int64_t f2g1 = f2 * (int64_t) g1;
+ int64_t f2g2 = f2 * (int64_t) g2;
+ int64_t f2g3 = f2 * (int64_t) g3;
+ int64_t f2g4 = f2 * (int64_t) g4;
+ int64_t f2g5 = f2 * (int64_t) g5;
+ int64_t f2g6 = f2 * (int64_t) g6;
+ int64_t f2g7 = f2 * (int64_t) g7;
+ int64_t f2g8_19 = f2 * (int64_t) g8_19;
+ int64_t f2g9_19 = f2 * (int64_t) g9_19;
+ int64_t f3g0 = f3 * (int64_t) g0;
+ int64_t f3g1_2 = f3_2 * (int64_t) g1;
+ int64_t f3g2 = f3 * (int64_t) g2;
+ int64_t f3g3_2 = f3_2 * (int64_t) g3;
+ int64_t f3g4 = f3 * (int64_t) g4;
+ int64_t f3g5_2 = f3_2 * (int64_t) g5;
+ int64_t f3g6 = f3 * (int64_t) g6;
+ int64_t f3g7_38 = f3_2 * (int64_t) g7_19;
+ int64_t f3g8_19 = f3 * (int64_t) g8_19;
+ int64_t f3g9_38 = f3_2 * (int64_t) g9_19;
+ int64_t f4g0 = f4 * (int64_t) g0;
+ int64_t f4g1 = f4 * (int64_t) g1;
+ int64_t f4g2 = f4 * (int64_t) g2;
+ int64_t f4g3 = f4 * (int64_t) g3;
+ int64_t f4g4 = f4 * (int64_t) g4;
+ int64_t f4g5 = f4 * (int64_t) g5;
+ int64_t f4g6_19 = f4 * (int64_t) g6_19;
+ int64_t f4g7_19 = f4 * (int64_t) g7_19;
+ int64_t f4g8_19 = f4 * (int64_t) g8_19;
+ int64_t f4g9_19 = f4 * (int64_t) g9_19;
+ int64_t f5g0 = f5 * (int64_t) g0;
+ int64_t f5g1_2 = f5_2 * (int64_t) g1;
+ int64_t f5g2 = f5 * (int64_t) g2;
+ int64_t f5g3_2 = f5_2 * (int64_t) g3;
+ int64_t f5g4 = f5 * (int64_t) g4;
+ int64_t f5g5_38 = f5_2 * (int64_t) g5_19;
+ int64_t f5g6_19 = f5 * (int64_t) g6_19;
+ int64_t f5g7_38 = f5_2 * (int64_t) g7_19;
+ int64_t f5g8_19 = f5 * (int64_t) g8_19;
+ int64_t f5g9_38 = f5_2 * (int64_t) g9_19;
+ int64_t f6g0 = f6 * (int64_t) g0;
+ int64_t f6g1 = f6 * (int64_t) g1;
+ int64_t f6g2 = f6 * (int64_t) g2;
+ int64_t f6g3 = f6 * (int64_t) g3;
+ int64_t f6g4_19 = f6 * (int64_t) g4_19;
+ int64_t f6g5_19 = f6 * (int64_t) g5_19;
+ int64_t f6g6_19 = f6 * (int64_t) g6_19;
+ int64_t f6g7_19 = f6 * (int64_t) g7_19;
+ int64_t f6g8_19 = f6 * (int64_t) g8_19;
+ int64_t f6g9_19 = f6 * (int64_t) g9_19;
+ int64_t f7g0 = f7 * (int64_t) g0;
+ int64_t f7g1_2 = f7_2 * (int64_t) g1;
+ int64_t f7g2 = f7 * (int64_t) g2;
+ int64_t f7g3_38 = f7_2 * (int64_t) g3_19;
+ int64_t f7g4_19 = f7 * (int64_t) g4_19;
+ int64_t f7g5_38 = f7_2 * (int64_t) g5_19;
+ int64_t f7g6_19 = f7 * (int64_t) g6_19;
+ int64_t f7g7_38 = f7_2 * (int64_t) g7_19;
+ int64_t f7g8_19 = f7 * (int64_t) g8_19;
+ int64_t f7g9_38 = f7_2 * (int64_t) g9_19;
+ int64_t f8g0 = f8 * (int64_t) g0;
+ int64_t f8g1 = f8 * (int64_t) g1;
+ int64_t f8g2_19 = f8 * (int64_t) g2_19;
+ int64_t f8g3_19 = f8 * (int64_t) g3_19;
+ int64_t f8g4_19 = f8 * (int64_t) g4_19;
+ int64_t f8g5_19 = f8 * (int64_t) g5_19;
+ int64_t f8g6_19 = f8 * (int64_t) g6_19;
+ int64_t f8g7_19 = f8 * (int64_t) g7_19;
+ int64_t f8g8_19 = f8 * (int64_t) g8_19;
+ int64_t f8g9_19 = f8 * (int64_t) g9_19;
+ int64_t f9g0 = f9 * (int64_t) g0;
+ int64_t f9g1_38 = f9_2 * (int64_t) g1_19;
+ int64_t f9g2_19 = f9 * (int64_t) g2_19;
+ int64_t f9g3_38 = f9_2 * (int64_t) g3_19;
+ int64_t f9g4_19 = f9 * (int64_t) g4_19;
+ int64_t f9g5_38 = f9_2 * (int64_t) g5_19;
+ int64_t f9g6_19 = f9 * (int64_t) g6_19;
+ int64_t f9g7_38 = f9_2 * (int64_t) g7_19;
+ int64_t f9g8_19 = f9 * (int64_t) g8_19;
+ int64_t f9g9_38 = f9_2 * (int64_t) g9_19;
+ int64_t h0 = f0g0 + f1g9_38 + f2g8_19 + f3g7_38 + f4g6_19 + f5g5_38 + f6g4_19 + f7g3_38 + f8g2_19 + f9g1_38;
+ int64_t h1 = f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19;
+ int64_t h2 = f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38;
+ int64_t h3 = f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19;
+ int64_t h4 = f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38;
+ int64_t h5 = f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19;
+ int64_t h6 = f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38;
+ int64_t h7 = f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19;
+ int64_t h8 = f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38;
+ int64_t h9 = f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0 ;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+
+ carry1 = (h1 + (int64_t) (1 << 24)) >> 25;
+ h2 += carry1;
+ h1 -= carry1 << 25;
+ carry5 = (h5 + (int64_t) (1 << 24)) >> 25;
+ h6 += carry5;
+ h5 -= carry5 << 25;
+
+ carry2 = (h2 + (int64_t) (1 << 25)) >> 26;
+ h3 += carry2;
+ h2 -= carry2 << 26;
+ carry6 = (h6 + (int64_t) (1 << 25)) >> 26;
+ h7 += carry6;
+ h6 -= carry6 << 26;
+
+ carry3 = (h3 + (int64_t) (1 << 24)) >> 25;
+ h4 += carry3;
+ h3 -= carry3 << 25;
+ carry7 = (h7 + (int64_t) (1 << 24)) >> 25;
+ h8 += carry7;
+ h7 -= carry7 << 25;
+
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry8 = (h8 + (int64_t) (1 << 25)) >> 26;
+ h9 += carry8;
+ h8 -= carry8 << 26;
+
+ carry9 = (h9 + (int64_t) (1 << 24)) >> 25;
+ h0 += carry9 * 19;
+ h9 -= carry9 << 25;
+
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+
+ h0 = (int32_t) h0;
+ h1 = (int32_t) h1;
+ h2 = (int32_t) h2;
+ h3 = (int32_t) h3;
+ h4 = (int32_t) h4;
+ h5 = (int32_t) h5;
+ h6 = (int32_t) h6;
+ h7 = (int32_t) h7;
+ h8 = (int32_t) h8;
+ h9 = (int32_t) h9;
+}
+
+
+/*
+h = f * 121666
+Can overlap h with f.
+
+Preconditions:
+ |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+
+Postconditions:
+ |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+*/
+
+void fe_mul121666(fe h, fe f) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int64_t h0 = f0 * (int64_t) 121666;
+ int64_t h1 = f1 * (int64_t) 121666;
+ int64_t h2 = f2 * (int64_t) 121666;
+ int64_t h3 = f3 * (int64_t) 121666;
+ int64_t h4 = f4 * (int64_t) 121666;
+ int64_t h5 = f5 * (int64_t) 121666;
+ int64_t h6 = f6 * (int64_t) 121666;
+ int64_t h7 = f7 * (int64_t) 121666;
+ int64_t h8 = f8 * (int64_t) 121666;
+ int64_t h9 = f9 * (int64_t) 121666;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+
+ carry9 = (h9 + (int64_t) (1<<24)) >> 25; h0 += carry9 * 19; h9 -= carry9 << 25;
+ carry1 = (h1 + (int64_t) (1<<24)) >> 25; h2 += carry1; h1 -= carry1 << 25;
+ carry3 = (h3 + (int64_t) (1<<24)) >> 25; h4 += carry3; h3 -= carry3 << 25;
+ carry5 = (h5 + (int64_t) (1<<24)) >> 25; h6 += carry5; h5 -= carry5 << 25;
+ carry7 = (h7 + (int64_t) (1<<24)) >> 25; h8 += carry7; h7 -= carry7 << 25;
+
+ carry0 = (h0 + (int64_t) (1<<25)) >> 26; h1 += carry0; h0 -= carry0 << 26;
+ carry2 = (h2 + (int64_t) (1<<25)) >> 26; h3 += carry2; h2 -= carry2 << 26;
+ carry4 = (h4 + (int64_t) (1<<25)) >> 26; h5 += carry4; h4 -= carry4 << 26;
+ carry6 = (h6 + (int64_t) (1<<25)) >> 26; h7 += carry6; h6 -= carry6 << 26;
+ carry8 = (h8 + (int64_t) (1<<25)) >> 26; h9 += carry8; h8 -= carry8 << 26;
+
+ h0 = (int32_t) h0;
+ h1 = (int32_t) h1;
+ h2 = (int32_t) h2;
+ h3 = (int32_t) h3;
+ h4 = (int32_t) h4;
+ h5 = (int32_t) h5;
+ h6 = (int32_t) h6;
+ h7 = (int32_t) h7;
+ h8 = (int32_t) h8;
+ h9 = (int32_t) h9;
+}
+
+
+/*
+h = -f
+
+Preconditions:
+ |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+
+Postconditions:
+ |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+*/
+
+void fe_neg(fe h, const fe f) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t h0 = -f0;
+ int32_t h1 = -f1;
+ int32_t h2 = -f2;
+ int32_t h3 = -f3;
+ int32_t h4 = -f4;
+ int32_t h5 = -f5;
+ int32_t h6 = -f6;
+ int32_t h7 = -f7;
+ int32_t h8 = -f8;
+ int32_t h9 = -f9;
+
+ h0 = h0;
+ h1 = h1;
+ h2 = h2;
+ h3 = h3;
+ h4 = h4;
+ h5 = h5;
+ h6 = h6;
+ h7 = h7;
+ h8 = h8;
+ h9 = h9;
+}
+
+
+void fe_pow22523(fe out, const fe z) {
+ fe t0;
+ fe t1;
+ fe t2;
+ int i;
+ fe_sq(t0, z);
+
+ for (i = 1; i < 1; ++i) {
+ fe_sq(t0, t0);
+ }
+
+ fe_sq(t1, t0);
+
+ for (i = 1; i < 2; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t1, z, t1);
+ fe_mul(t0, t0, t1);
+ fe_sq(t0, t0);
+
+ for (i = 1; i < 1; ++i) {
+ fe_sq(t0, t0);
+ }
+
+ fe_mul(t0, t1, t0);
+ fe_sq(t1, t0);
+
+ for (i = 1; i < 5; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t0, t1, t0);
+ fe_sq(t1, t0);
+
+ for (i = 1; i < 10; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t1, t1, t0);
+ fe_sq(t2, t1);
+
+ for (i = 1; i < 20; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t2, t1);
+ fe_sq(t1, t1);
+
+ for (i = 1; i < 10; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t0, t1, t0);
+ fe_sq(t1, t0);
+
+ for (i = 1; i < 50; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t1, t1, t0);
+ fe_sq(t2, t1);
+
+ for (i = 1; i < 100; ++i) {
+ fe_sq(t2, t2);
+ }
+
+ fe_mul(t1, t2, t1);
+ fe_sq(t1, t1);
+
+ for (i = 1; i < 50; ++i) {
+ fe_sq(t1, t1);
+ }
+
+ fe_mul(t0, t1, t0);
+ fe_sq(t0, t0);
+
+ for (i = 1; i < 2; ++i) {
+ fe_sq(t0, t0);
+ }
+
+ fe_mul(out, t0, z);
+ return;
+}
+
+
+/*
+h = f * f
+Can overlap h with f.
+
+Preconditions:
+ |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
+
+Postconditions:
+ |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
+*/
+
+/*
+See fe_mul.c for discussion of implementation strategy.
+*/
+
+void fe_sq(fe h, const fe f) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t f0_2 = 2 * f0;
+ int32_t f1_2 = 2 * f1;
+ int32_t f2_2 = 2 * f2;
+ int32_t f3_2 = 2 * f3;
+ int32_t f4_2 = 2 * f4;
+ int32_t f5_2 = 2 * f5;
+ int32_t f6_2 = 2 * f6;
+ int32_t f7_2 = 2 * f7;
+ int32_t f5_38 = 38 * f5; /* 1.959375*2^30 */
+ int32_t f6_19 = 19 * f6; /* 1.959375*2^30 */
+ int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
+ int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
+ int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
+ int64_t f0f0 = f0 * (int64_t) f0;
+ int64_t f0f1_2 = f0_2 * (int64_t) f1;
+ int64_t f0f2_2 = f0_2 * (int64_t) f2;
+ int64_t f0f3_2 = f0_2 * (int64_t) f3;
+ int64_t f0f4_2 = f0_2 * (int64_t) f4;
+ int64_t f0f5_2 = f0_2 * (int64_t) f5;
+ int64_t f0f6_2 = f0_2 * (int64_t) f6;
+ int64_t f0f7_2 = f0_2 * (int64_t) f7;
+ int64_t f0f8_2 = f0_2 * (int64_t) f8;
+ int64_t f0f9_2 = f0_2 * (int64_t) f9;
+ int64_t f1f1_2 = f1_2 * (int64_t) f1;
+ int64_t f1f2_2 = f1_2 * (int64_t) f2;
+ int64_t f1f3_4 = f1_2 * (int64_t) f3_2;
+ int64_t f1f4_2 = f1_2 * (int64_t) f4;
+ int64_t f1f5_4 = f1_2 * (int64_t) f5_2;
+ int64_t f1f6_2 = f1_2 * (int64_t) f6;
+ int64_t f1f7_4 = f1_2 * (int64_t) f7_2;
+ int64_t f1f8_2 = f1_2 * (int64_t) f8;
+ int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
+ int64_t f2f2 = f2 * (int64_t) f2;
+ int64_t f2f3_2 = f2_2 * (int64_t) f3;
+ int64_t f2f4_2 = f2_2 * (int64_t) f4;
+ int64_t f2f5_2 = f2_2 * (int64_t) f5;
+ int64_t f2f6_2 = f2_2 * (int64_t) f6;
+ int64_t f2f7_2 = f2_2 * (int64_t) f7;
+ int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
+ int64_t f2f9_38 = f2 * (int64_t) f9_38;
+ int64_t f3f3_2 = f3_2 * (int64_t) f3;
+ int64_t f3f4_2 = f3_2 * (int64_t) f4;
+ int64_t f3f5_4 = f3_2 * (int64_t) f5_2;
+ int64_t f3f6_2 = f3_2 * (int64_t) f6;
+ int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
+ int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
+ int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
+ int64_t f4f4 = f4 * (int64_t) f4;
+ int64_t f4f5_2 = f4_2 * (int64_t) f5;
+ int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
+ int64_t f4f7_38 = f4 * (int64_t) f7_38;
+ int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
+ int64_t f4f9_38 = f4 * (int64_t) f9_38;
+ int64_t f5f5_38 = f5 * (int64_t) f5_38;
+ int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
+ int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
+ int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
+ int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
+ int64_t f6f6_19 = f6 * (int64_t) f6_19;
+ int64_t f6f7_38 = f6 * (int64_t) f7_38;
+ int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
+ int64_t f6f9_38 = f6 * (int64_t) f9_38;
+ int64_t f7f7_38 = f7 * (int64_t) f7_38;
+ int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
+ int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
+ int64_t f8f8_19 = f8 * (int64_t) f8_19;
+ int64_t f8f9_38 = f8 * (int64_t) f9_38;
+ int64_t f9f9_38 = f9 * (int64_t) f9_38;
+ int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+ int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
+ int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+ int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+ int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+ int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+ int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+ int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+ int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+ int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry1 = (h1 + (int64_t) (1 << 24)) >> 25;
+ h2 += carry1;
+ h1 -= carry1 << 25;
+ carry5 = (h5 + (int64_t) (1 << 24)) >> 25;
+ h6 += carry5;
+ h5 -= carry5 << 25;
+ carry2 = (h2 + (int64_t) (1 << 25)) >> 26;
+ h3 += carry2;
+ h2 -= carry2 << 26;
+ carry6 = (h6 + (int64_t) (1 << 25)) >> 26;
+ h7 += carry6;
+ h6 -= carry6 << 26;
+ carry3 = (h3 + (int64_t) (1 << 24)) >> 25;
+ h4 += carry3;
+ h3 -= carry3 << 25;
+ carry7 = (h7 + (int64_t) (1 << 24)) >> 25;
+ h8 += carry7;
+ h7 -= carry7 << 25;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry8 = (h8 + (int64_t) (1 << 25)) >> 26;
+ h9 += carry8;
+ h8 -= carry8 << 26;
+ carry9 = (h9 + (int64_t) (1 << 24)) >> 25;
+ h0 += carry9 * 19;
+ h9 -= carry9 << 25;
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ h0 = (int32_t) h0;
+ h1 = (int32_t) h1;
+ h2 = (int32_t) h2;
+ h3 = (int32_t) h3;
+ h4 = (int32_t) h4;
+ h5 = (int32_t) h5;
+ h6 = (int32_t) h6;
+ h7 = (int32_t) h7;
+ h8 = (int32_t) h8;
+ h9 = (int32_t) h9;
+}
+
+
+/*
+h = 2 * f * f
+Can overlap h with f.
+
+Preconditions:
+ |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
+
+Postconditions:
+ |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
+*/
+
+/*
+See fe_mul.c for discussion of implementation strategy.
+*/
+
+void fe_sq2(fe h, const fe f) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t f0_2 = 2 * f0;
+ int32_t f1_2 = 2 * f1;
+ int32_t f2_2 = 2 * f2;
+ int32_t f3_2 = 2 * f3;
+ int32_t f4_2 = 2 * f4;
+ int32_t f5_2 = 2 * f5;
+ int32_t f6_2 = 2 * f6;
+ int32_t f7_2 = 2 * f7;
+ int32_t f5_38 = 38 * f5; /* 1.959375*2^30 */
+ int32_t f6_19 = 19 * f6; /* 1.959375*2^30 */
+ int32_t f7_38 = 38 * f7; /* 1.959375*2^30 */
+ int32_t f8_19 = 19 * f8; /* 1.959375*2^30 */
+ int32_t f9_38 = 38 * f9; /* 1.959375*2^30 */
+ int64_t f0f0 = f0 * (int64_t) f0;
+ int64_t f0f1_2 = f0_2 * (int64_t) f1;
+ int64_t f0f2_2 = f0_2 * (int64_t) f2;
+ int64_t f0f3_2 = f0_2 * (int64_t) f3;
+ int64_t f0f4_2 = f0_2 * (int64_t) f4;
+ int64_t f0f5_2 = f0_2 * (int64_t) f5;
+ int64_t f0f6_2 = f0_2 * (int64_t) f6;
+ int64_t f0f7_2 = f0_2 * (int64_t) f7;
+ int64_t f0f8_2 = f0_2 * (int64_t) f8;
+ int64_t f0f9_2 = f0_2 * (int64_t) f9;
+ int64_t f1f1_2 = f1_2 * (int64_t) f1;
+ int64_t f1f2_2 = f1_2 * (int64_t) f2;
+ int64_t f1f3_4 = f1_2 * (int64_t) f3_2;
+ int64_t f1f4_2 = f1_2 * (int64_t) f4;
+ int64_t f1f5_4 = f1_2 * (int64_t) f5_2;
+ int64_t f1f6_2 = f1_2 * (int64_t) f6;
+ int64_t f1f7_4 = f1_2 * (int64_t) f7_2;
+ int64_t f1f8_2 = f1_2 * (int64_t) f8;
+ int64_t f1f9_76 = f1_2 * (int64_t) f9_38;
+ int64_t f2f2 = f2 * (int64_t) f2;
+ int64_t f2f3_2 = f2_2 * (int64_t) f3;
+ int64_t f2f4_2 = f2_2 * (int64_t) f4;
+ int64_t f2f5_2 = f2_2 * (int64_t) f5;
+ int64_t f2f6_2 = f2_2 * (int64_t) f6;
+ int64_t f2f7_2 = f2_2 * (int64_t) f7;
+ int64_t f2f8_38 = f2_2 * (int64_t) f8_19;
+ int64_t f2f9_38 = f2 * (int64_t) f9_38;
+ int64_t f3f3_2 = f3_2 * (int64_t) f3;
+ int64_t f3f4_2 = f3_2 * (int64_t) f4;
+ int64_t f3f5_4 = f3_2 * (int64_t) f5_2;
+ int64_t f3f6_2 = f3_2 * (int64_t) f6;
+ int64_t f3f7_76 = f3_2 * (int64_t) f7_38;
+ int64_t f3f8_38 = f3_2 * (int64_t) f8_19;
+ int64_t f3f9_76 = f3_2 * (int64_t) f9_38;
+ int64_t f4f4 = f4 * (int64_t) f4;
+ int64_t f4f5_2 = f4_2 * (int64_t) f5;
+ int64_t f4f6_38 = f4_2 * (int64_t) f6_19;
+ int64_t f4f7_38 = f4 * (int64_t) f7_38;
+ int64_t f4f8_38 = f4_2 * (int64_t) f8_19;
+ int64_t f4f9_38 = f4 * (int64_t) f9_38;
+ int64_t f5f5_38 = f5 * (int64_t) f5_38;
+ int64_t f5f6_38 = f5_2 * (int64_t) f6_19;
+ int64_t f5f7_76 = f5_2 * (int64_t) f7_38;
+ int64_t f5f8_38 = f5_2 * (int64_t) f8_19;
+ int64_t f5f9_76 = f5_2 * (int64_t) f9_38;
+ int64_t f6f6_19 = f6 * (int64_t) f6_19;
+ int64_t f6f7_38 = f6 * (int64_t) f7_38;
+ int64_t f6f8_38 = f6_2 * (int64_t) f8_19;
+ int64_t f6f9_38 = f6 * (int64_t) f9_38;
+ int64_t f7f7_38 = f7 * (int64_t) f7_38;
+ int64_t f7f8_38 = f7_2 * (int64_t) f8_19;
+ int64_t f7f9_76 = f7_2 * (int64_t) f9_38;
+ int64_t f8f8_19 = f8 * (int64_t) f8_19;
+ int64_t f8f9_38 = f8 * (int64_t) f9_38;
+ int64_t f9f9_38 = f9 * (int64_t) f9_38;
+ int64_t h0 = f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38;
+ int64_t h1 = f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38;
+ int64_t h2 = f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19;
+ int64_t h3 = f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38;
+ int64_t h4 = f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38;
+ int64_t h5 = f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38;
+ int64_t h6 = f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19;
+ int64_t h7 = f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38;
+ int64_t h8 = f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38;
+ int64_t h9 = f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+ h0 += h0;
+ h1 += h1;
+ h2 += h2;
+ h3 += h3;
+ h4 += h4;
+ h5 += h5;
+ h6 += h6;
+ h7 += h7;
+ h8 += h8;
+ h9 += h9;
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry1 = (h1 + (int64_t) (1 << 24)) >> 25;
+ h2 += carry1;
+ h1 -= carry1 << 25;
+ carry5 = (h5 + (int64_t) (1 << 24)) >> 25;
+ h6 += carry5;
+ h5 -= carry5 << 25;
+ carry2 = (h2 + (int64_t) (1 << 25)) >> 26;
+ h3 += carry2;
+ h2 -= carry2 << 26;
+ carry6 = (h6 + (int64_t) (1 << 25)) >> 26;
+ h7 += carry6;
+ h6 -= carry6 << 26;
+ carry3 = (h3 + (int64_t) (1 << 24)) >> 25;
+ h4 += carry3;
+ h3 -= carry3 << 25;
+ carry7 = (h7 + (int64_t) (1 << 24)) >> 25;
+ h8 += carry7;
+ h7 -= carry7 << 25;
+ carry4 = (h4 + (int64_t) (1 << 25)) >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry8 = (h8 + (int64_t) (1 << 25)) >> 26;
+ h9 += carry8;
+ h8 -= carry8 << 26;
+ carry9 = (h9 + (int64_t) (1 << 24)) >> 25;
+ h0 += carry9 * 19;
+ h9 -= carry9 << 25;
+ carry0 = (h0 + (int64_t) (1 << 25)) >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ h0 = (int32_t) h0;
+ h1 = (int32_t) h1;
+ h2 = (int32_t) h2;
+ h3 = (int32_t) h3;
+ h4 = (int32_t) h4;
+ h5 = (int32_t) h5;
+ h6 = (int32_t) h6;
+ h7 = (int32_t) h7;
+ h8 = (int32_t) h8;
+ h9 = (int32_t) h9;
+}
+
+
+/*
+h = f - g
+Can overlap h with f or g.
+
+Preconditions:
+ |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+ |g| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
+
+Postconditions:
+ |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+*/
+
+void fe_sub(fe h, const fe f, const fe g) {
+ int32_t f0 = f0;
+ int32_t f1 = f1;
+ int32_t f2 = f2;
+ int32_t f3 = f3;
+ int32_t f4 = f4;
+ int32_t f5 = f5;
+ int32_t f6 = f6;
+ int32_t f7 = f7;
+ int32_t f8 = f8;
+ int32_t f9 = f9;
+ int32_t g0 = g0;
+ int32_t g1 = g1;
+ int32_t g2 = g2;
+ int32_t g3 = g3;
+ int32_t g4 = g4;
+ int32_t g5 = g5;
+ int32_t g6 = g6;
+ int32_t g7 = g7;
+ int32_t g8 = g8;
+ int32_t g9 = g9;
+ int32_t h0 = f0 - g0;
+ int32_t h1 = f1 - g1;
+ int32_t h2 = f2 - g2;
+ int32_t h3 = f3 - g3;
+ int32_t h4 = f4 - g4;
+ int32_t h5 = f5 - g5;
+ int32_t h6 = f6 - g6;
+ int32_t h7 = f7 - g7;
+ int32_t h8 = f8 - g8;
+ int32_t h9 = f9 - g9;
+
+ h0 = h0;
+ h1 = h1;
+ h2 = h2;
+ h3 = h3;
+ h4 = h4;
+ h5 = h5;
+ h6 = h6;
+ h7 = h7;
+ h8 = h8;
+ h9 = h9;
+}
+
+
+
+/*
+Preconditions:
+ |h| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
+
+Write p=2^255-19; q=floor(h/p).
+Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
+
+Proof:
+ Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
+ Also have |h-2^230 h9|<2^231 so |19 2^(-255)(h-2^230 h9)|<1/4.
+
+ Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
+ Then 0<y<1.
+
+ Write r=h-pq.
+ Have 0<=r<=p-1=2^255-20.
+ Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
+
+ Write x=r+19(2^-255)r+y.
+ Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
+
+ Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
+ so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
+*/
+
+void fe_tobytes(unsigned char *s, const fe h) {
+ int32_t h0 = h0;
+ int32_t h1 = h1;
+ int32_t h2 = h2;
+ int32_t h3 = h3;
+ int32_t h4 = h4;
+ int32_t h5 = h5;
+ int32_t h6 = h6;
+ int32_t h7 = h7;
+ int32_t h8 = h8;
+ int32_t h9 = h9;
+ int32_t q;
+ int32_t carry0;
+ int32_t carry1;
+ int32_t carry2;
+ int32_t carry3;
+ int32_t carry4;
+ int32_t carry5;
+ int32_t carry6;
+ int32_t carry7;
+ int32_t carry8;
+ int32_t carry9;
+ q = (19 * h9 + (((int32_t) 1) << 24)) >> 25;
+ q = (h0 + q) >> 26;
+ q = (h1 + q) >> 25;
+ q = (h2 + q) >> 26;
+ q = (h3 + q) >> 25;
+ q = (h4 + q) >> 26;
+ q = (h5 + q) >> 25;
+ q = (h6 + q) >> 26;
+ q = (h7 + q) >> 25;
+ q = (h8 + q) >> 26;
+ q = (h9 + q) >> 25;
+ /* Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20. */
+ h0 += 19 * q;
+ /* Goal: Output h-2^255 q, which is between 0 and 2^255-20. */
+ carry0 = h0 >> 26;
+ h1 += carry0;
+ h0 -= carry0 << 26;
+ carry1 = h1 >> 25;
+ h2 += carry1;
+ h1 -= carry1 << 25;
+ carry2 = h2 >> 26;
+ h3 += carry2;
+ h2 -= carry2 << 26;
+ carry3 = h3 >> 25;
+ h4 += carry3;
+ h3 -= carry3 << 25;
+ carry4 = h4 >> 26;
+ h5 += carry4;
+ h4 -= carry4 << 26;
+ carry5 = h5 >> 25;
+ h6 += carry5;
+ h5 -= carry5 << 25;
+ carry6 = h6 >> 26;
+ h7 += carry6;
+ h6 -= carry6 << 26;
+ carry7 = h7 >> 25;
+ h8 += carry7;
+ h7 -= carry7 << 25;
+ carry8 = h8 >> 26;
+ h9 += carry8;
+ h8 -= carry8 << 26;
+ carry9 = h9 >> 25;
+ h9 -= carry9 << 25;
+
+ /* h10 = carry9 */
+ /*
+ Goal: Output h0+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
+ Have h0+...+2^230 h9 between 0 and 2^255-1;
+ evidently 2^255 h10-2^255 q = 0.
+ Goal: Output h0+...+2^230 h9.
+ */
+ s0 = (unsigned char) (h0 >> 0);
+ s1 = (unsigned char) (h0 >> 8);
+ s2 = (unsigned char) (h0 >> 16);
+ s3 = (unsigned char) ((h0 >> 24) | (h1 << 2));
+ s4 = (unsigned char) (h1 >> 6);
+ s5 = (unsigned char) (h1 >> 14);
+ s6 = (unsigned char) ((h1 >> 22) | (h2 << 3));
+ s7 = (unsigned char) (h2 >> 5);
+ s8 = (unsigned char) (h2 >> 13);
+ s9 = (unsigned char) ((h2 >> 21) | (h3 << 5));
+ s10 = (unsigned char) (h3 >> 3);
+ s11 = (unsigned char) (h3 >> 11);
+ s12 = (unsigned char) ((h3 >> 19) | (h4 << 6));
+ s13 = (unsigned char) (h4 >> 2);
+ s14 = (unsigned char) (h4 >> 10);
+ s15 = (unsigned char) (h4 >> 18);
+ s16 = (unsigned char) (h5 >> 0);
+ s17 = (unsigned char) (h5 >> 8);
+ s18 = (unsigned char) (h5 >> 16);
+ s19 = (unsigned char) ((h5 >> 24) | (h6 << 1));
+ s20 = (unsigned char) (h6 >> 7);
+ s21 = (unsigned char) (h6 >> 15);
+ s22 = (unsigned char) ((h6 >> 23) | (h7 << 3));
+ s23 = (unsigned char) (h7 >> 5);
+ s24 = (unsigned char) (h7 >> 13);
+ s25 = (unsigned char) ((h7 >> 21) | (h8 << 4));
+ s26 = (unsigned char) (h8 >> 4);
+ s27 = (unsigned char) (h8 >> 12);
+ s28 = (unsigned char) ((h8 >> 20) | (h9 << 6));
+ s29 = (unsigned char) (h9 >> 2);
+ s30 = (unsigned char) (h9 >> 10);
+ s31 = (unsigned char) (h9 >> 18);
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/fe.h Added

@@ -0,0 +1,41 @@
+#ifndef FE_H
+#define FE_H
+
+#include "fixedint.h"
+
+
+/*
+    fe means field element.
+    Here the field is \Z/(2^255-19).
+    An element t, entries t0...t9, represents the integer
+    t0+2^26 t1+2^51 t2+2^77 t3+2^102 t4+...+2^230 t9.
+    Bounds on each ti vary depending on context.
+*/
+
+
+typedef int32_t fe10;
+
+
+void fe_0(fe h);
+void fe_1(fe h);
+
+void fe_frombytes(fe h, const unsigned char *s);
+void fe_tobytes(unsigned char *s, const fe h);
+
+void fe_copy(fe h, const fe f);
+int fe_isnegative(const fe f);
+int fe_isnonzero(const fe f);
+void fe_cmov(fe f, const fe g, unsigned int b);
+void fe_cswap(fe f, fe g, unsigned int b);
+
+void fe_neg(fe h, const fe f);
+void fe_add(fe h, const fe f, const fe g);
+void fe_invert(fe out, const fe z);
+void fe_sq(fe h, const fe f);
+void fe_sq2(fe h, const fe f);
+void fe_mul(fe h, const fe f, const fe g);
+void fe_mul121666(fe h, fe f);
+void fe_pow22523(fe out, const fe z);
+void fe_sub(fe h, const fe f, const fe g);
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/fixedint.h Added

@@ -0,0 +1,72 @@
+/*
+ Portable header to provide the 32 and 64 bits type.
+
+ Not a compatible replacement for <stdint.h>, do not blindly use it as such.
+*/
+
+#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined(__WATCOMC__) && (defined(_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_) || defined(__UINT_FAST64_TYPE__)) )) && !defined(FIXEDINT_H_INCLUDED)
+ #include <stdint.h>
+ #define FIXEDINT_H_INCLUDED
+
+ #if defined(__WATCOMC__) && __WATCOMC__ >= 1250 && !defined(UINT64_C)
+ #include <limits.h>
+ #define UINT64_C(x) (x + (UINT64_MAX - UINT64_MAX))
+ #endif
+#endif
+
+
+#ifndef FIXEDINT_H_INCLUDED
+ #define FIXEDINT_H_INCLUDED
+ 
+ #include <limits.h>
+
+ /* (u)int32_t */
+ #ifndef uint32_t
+ #if (ULONG_MAX == 0xffffffffUL)
+ typedef unsigned long uint32_t;
+ #elif (UINT_MAX == 0xffffffffUL)
+ typedef unsigned int uint32_t;
+ #elif (USHRT_MAX == 0xffffffffUL)
+ typedef unsigned short uint32_t;
+ #endif
+ #endif
+
+
+ #ifndef int32_t
+ #if (LONG_MAX == 0x7fffffffL)
+ typedef signed long int32_t;
+ #elif (INT_MAX == 0x7fffffffL)
+ typedef signed int int32_t;
+ #elif (SHRT_MAX == 0x7fffffffL)
+ typedef signed short int32_t;
+ #endif
+ #endif
+
+
+ /* (u)int64_t */
+ #if (defined(__STDC__) && defined(__STDC_VERSION__) && __STDC__ && __STDC_VERSION__ >= 199901L)
+ typedef long long int64_t;
+ typedef unsigned long long uint64_t;
+
+ #define UINT64_C(v) v ##ULL
+ #define INT64_C(v) v ##LL
+ #elif defined(__GNUC__)
+ __extension__ typedef long long int64_t;
+ __extension__ typedef unsigned long long uint64_t;
+
+ #define UINT64_C(v) v ##ULL
+ #define INT64_C(v) v ##LL
+ #elif defined(__MWERKS__) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__APPLE_CC__) || defined(_LONG_LONG) || defined(_CRAYC)
+ typedef long long int64_t;
+ typedef unsigned long long uint64_t;
+
+ #define UINT64_C(v) v ##ULL
+ #define INT64_C(v) v ##LL
+ #elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined(__BORLANDC__) && __BORLANDC__ > 0x460) || defined(__alpha) || defined(__DECC)
+ typedef __int64 int64_t;
+ typedef unsigned __int64 uint64_t;
+
+ #define UINT64_C(v) v ##UI64
+ #define INT64_C(v) v ##I64
+ #endif
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/ge.c Added

@@ -0,0 +1,467 @@
+#include "ge.h"
+#include "precomp_data.h"
+
+
+/*
+r = p + q
+*/
+
+void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q) {
+ fe t0;
+ fe_add(r->X, p->Y, p->X);
+ fe_sub(r->Y, p->Y, p->X);
+ fe_mul(r->Z, r->X, q->YplusX);
+ fe_mul(r->Y, r->Y, q->YminusX);
+ fe_mul(r->T, q->T2d, p->T);
+ fe_mul(r->X, p->Z, q->Z);
+ fe_add(t0, r->X, r->X);
+ fe_sub(r->X, r->Z, r->Y);
+ fe_add(r->Y, r->Z, r->Y);
+ fe_add(r->Z, t0, r->T);
+ fe_sub(r->T, t0, r->T);
+}
+
+
+static void slide(signed char *r, const unsigned char *a) {
+ int i;
+ int b;
+ int k;
+
+ for (i = 0; i < 256; ++i) {
+ ri = 1 & (ai >> 3 >> (i & 7));
+ }
+
+ for (i = 0; i < 256; ++i)
+ if (ri) {
+ for (b = 1; b <= 6 && i + b < 256; ++b) {
+ if (ri + b) {
+ if (ri + (ri + b << b) <= 15) {
+ ri += ri + b << b;
+ ri + b = 0;
+ } else if (ri - (ri + b << b) >= -15) {
+ ri -= ri + b << b;
+
+ for (k = i + b; k < 256; ++k) {
+ if (!rk) {
+ rk = 1;
+ break;
+ }
+
+ rk = 0;
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+}
+
+/*
+r = a * A + b * B
+where a = a0+256*a1+...+256^31 a31.
+and b = b0+256*b1+...+256^31 b31.
+B is the Ed25519 base point (x,4/5) with x positive.
+*/
+
+void ge_double_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A, const unsigned char *b) {
+ signed char aslide256;
+ signed char bslide256;
+ ge_cached Ai8; /* A,3A,5A,7A,9A,11A,13A,15A */
+ ge_p1p1 t;
+ ge_p3 u;
+ ge_p3 A2;
+ int i;
+ slide(aslide, a);
+ slide(bslide, b);
+ ge_p3_to_cached(&Ai0, A);
+ ge_p3_dbl(&t, A);
+ ge_p1p1_to_p3(&A2, &t);
+ ge_add(&t, &A2, &Ai0);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai1, &u);
+ ge_add(&t, &A2, &Ai1);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai2, &u);
+ ge_add(&t, &A2, &Ai2);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai3, &u);
+ ge_add(&t, &A2, &Ai3);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai4, &u);
+ ge_add(&t, &A2, &Ai4);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai5, &u);
+ ge_add(&t, &A2, &Ai5);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai6, &u);
+ ge_add(&t, &A2, &Ai6);
+ ge_p1p1_to_p3(&u, &t);
+ ge_p3_to_cached(&Ai7, &u);
+ ge_p2_0(r);
+
+ for (i = 255; i >= 0; --i) {
+ if (aslidei || bslidei) {
+ break;
+ }
+ }
+
+ for (; i >= 0; --i) {
+ ge_p2_dbl(&t, r);
+
+ if (aslidei > 0) {
+ ge_p1p1_to_p3(&u, &t);
+ ge_add(&t, &u, &Aiaslidei / 2);
+ } else if (aslidei < 0) {
+ ge_p1p1_to_p3(&u, &t);
+ ge_sub(&t, &u, &Ai(-aslidei) / 2);
+ }
+
+ if (bslidei > 0) {
+ ge_p1p1_to_p3(&u, &t);
+ ge_madd(&t, &u, &Bibslidei / 2);
+ } else if (bslidei < 0) {
+ ge_p1p1_to_p3(&u, &t);
+ ge_msub(&t, &u, &Bi(-bslidei) / 2);
+ }
+
+ ge_p1p1_to_p2(r, &t);
+ }
+}
+
+
+static const fe d = {
+ -10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116
+};
+
+static const fe sqrtm1 = {
+ -32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482
+};
+
+int ge_frombytes_negate_vartime(ge_p3 *h, const unsigned char *s) {
+ fe u;
+ fe v;
+ fe v3;
+ fe vxx;
+ fe check;
+ fe_frombytes(h->Y, s);
+ fe_1(h->Z);
+ fe_sq(u, h->Y);
+ fe_mul(v, u, d);
+ fe_sub(u, u, h->Z); /* u = y^2-1 */
+ fe_add(v, v, h->Z); /* v = dy^2+1 */
+ fe_sq(v3, v);
+ fe_mul(v3, v3, v); /* v3 = v^3 */
+ fe_sq(h->X, v3);
+ fe_mul(h->X, h->X, v);
+ fe_mul(h->X, h->X, u); /* x = uv^7 */
+ fe_pow22523(h->X, h->X); /* x = (uv^7)^((q-5)/8) */
+ fe_mul(h->X, h->X, v3);
+ fe_mul(h->X, h->X, u); /* x = uv^3(uv^7)^((q-5)/8) */
+ fe_sq(vxx, h->X);
+ fe_mul(vxx, vxx, v);
+ fe_sub(check, vxx, u); /* vx^2-u */
+
+ if (fe_isnonzero(check)) {
+ fe_add(check, vxx, u); /* vx^2+u */
+
+ if (fe_isnonzero(check)) {
+ return -1;
+ }
+
+ fe_mul(h->X, h->X, sqrtm1);
+ }
+
+ if (fe_isnegative(h->X) == (s31 >> 7)) {
+ fe_neg(h->X, h->X);
+ }
+
+ fe_mul(h->T, h->X, h->Y);
+ return 0;
+}
+
+
+/*
+r = p + q
+*/
+
+void ge_madd(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q) {
+ fe t0;
+ fe_add(r->X, p->Y, p->X);
+ fe_sub(r->Y, p->Y, p->X);
+ fe_mul(r->Z, r->X, q->yplusx);
+ fe_mul(r->Y, r->Y, q->yminusx);
+ fe_mul(r->T, q->xy2d, p->T);
+ fe_add(t0, p->Z, p->Z);
+ fe_sub(r->X, r->Z, r->Y);
+ fe_add(r->Y, r->Z, r->Y);
+ fe_add(r->Z, t0, r->T);
+ fe_sub(r->T, t0, r->T);
+}
+
+
+/*
+r = p - q
+*/
+
+void ge_msub(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q) {
+ fe t0;
+
+ fe_add(r->X, p->Y, p->X);
+ fe_sub(r->Y, p->Y, p->X);
+ fe_mul(r->Z, r->X, q->yminusx);
+ fe_mul(r->Y, r->Y, q->yplusx);
+ fe_mul(r->T, q->xy2d, p->T);
+ fe_add(t0, p->Z, p->Z);
+ fe_sub(r->X, r->Z, r->Y);
+ fe_add(r->Y, r->Z, r->Y);
+ fe_sub(r->Z, t0, r->T);
+ fe_add(r->T, t0, r->T);
+}
+
+
+/*
+r = p
+*/
+
+void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p) {
+ fe_mul(r->X, p->X, p->T);
+ fe_mul(r->Y, p->Y, p->Z);
+ fe_mul(r->Z, p->Z, p->T);
+}
+
+
+
+/*
+r = p
+*/
+
+void ge_p1p1_to_p3(ge_p3 *r, const ge_p1p1 *p) {
+ fe_mul(r->X, p->X, p->T);
+ fe_mul(r->Y, p->Y, p->Z);
+ fe_mul(r->Z, p->Z, p->T);
+ fe_mul(r->T, p->X, p->Y);
+}
+
+
+void ge_p2_0(ge_p2 *h) {
+ fe_0(h->X);
+ fe_1(h->Y);
+ fe_1(h->Z);
+}
+
+
+
+/*
+r = 2 * p
+*/
+
+void ge_p2_dbl(ge_p1p1 *r, const ge_p2 *p) {
+ fe t0;
+
+ fe_sq(r->X, p->X);
+ fe_sq(r->Z, p->Y);
+ fe_sq2(r->T, p->Z);
+ fe_add(r->Y, p->X, p->Y);
+ fe_sq(t0, r->Y);
+ fe_add(r->Y, r->Z, r->X);
+ fe_sub(r->Z, r->Z, r->X);
+ fe_sub(r->X, t0, r->Y);
+ fe_sub(r->T, r->T, r->Z);
+}
+
+
+void ge_p3_0(ge_p3 *h) {
+ fe_0(h->X);
+ fe_1(h->Y);
+ fe_1(h->Z);
+ fe_0(h->T);
+}
+
+
+/*
+r = 2 * p
+*/
+
+void ge_p3_dbl(ge_p1p1 *r, const ge_p3 *p) {
+ ge_p2 q;
+ ge_p3_to_p2(&q, p);
+ ge_p2_dbl(r, &q);
+}
+
+
+
+/*
+r = p
+*/
+
+static const fe d2 = {
+ -21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199
+};
+
+void ge_p3_to_cached(ge_cached *r, const ge_p3 *p) {
+ fe_add(r->YplusX, p->Y, p->X);
+ fe_sub(r->YminusX, p->Y, p->X);
+ fe_copy(r->Z, p->Z);
+ fe_mul(r->T2d, p->T, d2);
+}
+
+
+/*
+r = p
+*/
+
+void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p) {
+ fe_copy(r->X, p->X);
+ fe_copy(r->Y, p->Y);
+ fe_copy(r->Z, p->Z);
+}
+
+
+void ge_p3_tobytes(unsigned char *s, const ge_p3 *h) {
+ fe recip;
+ fe x;
+ fe y;
+ fe_invert(recip, h->Z);
+ fe_mul(x, h->X, recip);
+ fe_mul(y, h->Y, recip);
+ fe_tobytes(s, y);
+ s31 ^= fe_isnegative(x) << 7;
+}
+
+
+static unsigned char equal(signed char b, signed char c) {
+ unsigned char ub = b;
+ unsigned char uc = c;
+ unsigned char x = ub ^ uc; /* 0: yes; 1..255: no */
+ uint64_t y = x; /* 0: yes; 1..255: no */
+ y -= 1; /* large: yes; 0..254: no */
+ y >>= 63; /* 1: yes; 0: no */
+ return (unsigned char) y;
+}
+
+static unsigned char negative(signed char b) {
+ uint64_t x = b; /* 18446744073709551361..18446744073709551615: yes; 0..255: no */
+ x >>= 63; /* 1: yes; 0: no */
+ return (unsigned char) x;
+}
+
+static void cmov(ge_precomp *t, const ge_precomp *u, unsigned char b) {
+ fe_cmov(t->yplusx, u->yplusx, b);
+ fe_cmov(t->yminusx, u->yminusx, b);
+ fe_cmov(t->xy2d, u->xy2d, b);
+}
+
+
+static void select(ge_precomp *t, int pos, signed char b) {
+ ge_precomp minust;
+ unsigned char bnegative = negative(b);
+ unsigned char babs = b - (((-bnegative) & b) << 1);
+ fe_1(t->yplusx);
+ fe_1(t->yminusx);
+ fe_0(t->xy2d);
+ cmov(t, &basepos0, equal(babs, 1));
+ cmov(t, &basepos1, equal(babs, 2));
+ cmov(t, &basepos2, equal(babs, 3));
+ cmov(t, &basepos3, equal(babs, 4));
+ cmov(t, &basepos4, equal(babs, 5));
+ cmov(t, &basepos5, equal(babs, 6));
+ cmov(t, &basepos6, equal(babs, 7));
+ cmov(t, &basepos7, equal(babs, 8));
+ fe_copy(minust.yplusx, t->yminusx);
+ fe_copy(minust.yminusx, t->yplusx);
+ fe_neg(minust.xy2d, t->xy2d);
+ cmov(t, &minust, bnegative);
+}
+
+/*
+h = a * B
+where a = a0+256*a1+...+256^31 a31
+B is the Ed25519 base point (x,4/5) with x positive.
+
+Preconditions:
+ a31 <= 127
+*/
+
+void ge_scalarmult_base(ge_p3 *h, const unsigned char *a) {
+ signed char e64;
+ signed char carry;
+ ge_p1p1 r;
+ ge_p2 s;
+ ge_precomp t;
+ int i;
+
+ for (i = 0; i < 32; ++i) {
+ e2 * i + 0 = (ai >> 0) & 15;
+ e2 * i + 1 = (ai >> 4) & 15;
+ }
+
+ /* each ei is between 0 and 15 */
+ /* e63 is between 0 and 7 */
+ carry = 0;
+
+ for (i = 0; i < 63; ++i) {
+ ei += carry;
+ carry = ei + 8;
+ carry >>= 4;
+ ei -= carry << 4;
+ }
+
+ e63 += carry;
+ /* each ei is between -8 and 8 */
+ ge_p3_0(h);
+
+ for (i = 1; i < 64; i += 2) {
+ select(&t, i / 2, ei);
+ ge_madd(&r, h, &t);
+ ge_p1p1_to_p3(h, &r);
+ }
+
+ ge_p3_dbl(&r, h);
+ ge_p1p1_to_p2(&s, &r);
+ ge_p2_dbl(&r, &s);
+ ge_p1p1_to_p2(&s, &r);
+ ge_p2_dbl(&r, &s);
+ ge_p1p1_to_p2(&s, &r);
+ ge_p2_dbl(&r, &s);
+ ge_p1p1_to_p3(h, &r);
+
+ for (i = 0; i < 64; i += 2) {
+ select(&t, i / 2, ei);
+ ge_madd(&r, h, &t);
+ ge_p1p1_to_p3(h, &r);
+ }
+}
+
+
+/*
+r = p - q
+*/
+
+void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q) {
+ fe t0;
+ 
+ fe_add(r->X, p->Y, p->X);
+ fe_sub(r->Y, p->Y, p->X);
+ fe_mul(r->Z, r->X, q->YminusX);
+ fe_mul(r->Y, r->Y, q->YplusX);
+ fe_mul(r->T, q->T2d, p->T);
+ fe_mul(r->X, p->Z, q->Z);
+ fe_add(t0, r->X, r->X);
+ fe_sub(r->X, r->Z, r->Y);
+ fe_add(r->Y, r->Z, r->Y);
+ fe_sub(r->Z, t0, r->T);
+ fe_add(r->T, t0, r->T);
+}
+
+
+void ge_tobytes(unsigned char *s, const ge_p2 *h) {
+ fe recip;
+ fe x;
+ fe y;
+ fe_invert(recip, h->Z);
+ fe_mul(x, h->X, recip);
+ fe_mul(y, h->Y, recip);
+ fe_tobytes(s, y);
+ s31 ^= fe_isnegative(x) << 7;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/ge.h Added

@@ -0,0 +1,74 @@
+#ifndef GE_H
+#define GE_H
+
+#include "fe.h"
+
+
+/*
+ge means group element.
+
+Here the group is the set of pairs (x,y) of field elements (see fe.h)
+satisfying -x^2 + y^2 = 1 + d x^2y^2
+where d = -121665/121666.
+
+Representations:
+  ge_p2 (projective): (X:Y:Z) satisfying x=X/Z, y=Y/Z
+  ge_p3 (extended): (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
+  ge_p1p1 (completed): ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
+  ge_precomp (Duif): (y+x,y-x,2dxy)
+*/
+
+typedef struct {
+  fe X;
+  fe Y;
+  fe Z;
+} ge_p2;
+
+typedef struct {
+  fe X;
+  fe Y;
+  fe Z;
+  fe T;
+} ge_p3;
+
+typedef struct {
+  fe X;
+  fe Y;
+  fe Z;
+  fe T;
+} ge_p1p1;
+
+typedef struct {
+  fe yplusx;
+  fe yminusx;
+  fe xy2d;
+} ge_precomp;
+
+typedef struct {
+  fe YplusX;
+  fe YminusX;
+  fe Z;
+  fe T2d;
+} ge_cached;
+
+void ge_p3_tobytes(unsigned char *s, const ge_p3 *h);
+void ge_tobytes(unsigned char *s, const ge_p2 *h);
+int ge_frombytes_negate_vartime(ge_p3 *h, const unsigned char *s);
+
+void ge_add(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q);
+void ge_sub(ge_p1p1 *r, const ge_p3 *p, const ge_cached *q);
+void ge_double_scalarmult_vartime(ge_p2 *r, const unsigned char *a, const ge_p3 *A, const unsigned char *b);
+void ge_madd(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q);
+void ge_msub(ge_p1p1 *r, const ge_p3 *p, const ge_precomp *q);
+void ge_scalarmult_base(ge_p3 *h, const unsigned char *a);
+
+void ge_p1p1_to_p2(ge_p2 *r, const ge_p1p1 *p);
+void ge_p1p1_to_p3(ge_p3 *r, const ge_p1p1 *p);
+void ge_p2_0(ge_p2 *h);
+void ge_p2_dbl(ge_p1p1 *r, const ge_p2 *p);
+void ge_p3_0(ge_p3 *h);
+void ge_p3_dbl(ge_p1p1 *r, const ge_p3 *p);
+void ge_p3_to_cached(ge_cached *r, const ge_p3 *p);
+void ge_p3_to_p2(ge_p2 *r, const ge_p3 *p);
+
+#endif

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/key_exchange.c Added

@@ -0,0 +1,79 @@
+#include "ed25519.h"
+#include "fe.h"
+
+void ed25519_key_exchange(unsigned char *shared_secret, const unsigned char *public_key, const unsigned char *private_key) {
+ unsigned char e32;
+ unsigned int i;
+ 
+ fe x1;
+ fe x2;
+ fe z2;
+ fe x3;
+ fe z3;
+ fe tmp0;
+ fe tmp1;
+
+ int pos;
+ unsigned int swap;
+ unsigned int b;
+
+ /* copy the private key and make sure it's valid */
+ for (i = 0; i < 32; ++i) {
+ ei = private_keyi;
+ }
+
+ e0 &= 248;
+ e31 &= 63;
+ e31 |= 64;
+
+ /* unpack the public key and convert edwards to montgomery */
+ /* due to CodesInChaos: montgomeryX = (edwardsY + 1)*inverse(1 - edwardsY) mod p */
+ fe_frombytes(x1, public_key);
+ fe_1(tmp1);
+ fe_add(tmp0, x1, tmp1);
+ fe_sub(tmp1, tmp1, x1);
+ fe_invert(tmp1, tmp1);
+ fe_mul(x1, tmp0, tmp1);
+
+ fe_1(x2);
+ fe_0(z2);
+ fe_copy(x3, x1);
+ fe_1(z3);
+
+ swap = 0;
+ for (pos = 254; pos >= 0; --pos) {
+ b = epos / 8 >> (pos & 7);
+ b &= 1;
+ swap ^= b;
+ fe_cswap(x2, x3, swap);
+ fe_cswap(z2, z3, swap);
+ swap = b;
+
+ /* from montgomery.h */
+ fe_sub(tmp0, x3, z3);
+ fe_sub(tmp1, x2, z2);
+ fe_add(x2, x2, z2);
+ fe_add(z2, x3, z3);
+ fe_mul(z3, tmp0, x2);
+ fe_mul(z2, z2, tmp1);
+ fe_sq(tmp0, tmp1);
+ fe_sq(tmp1, x2);
+ fe_add(x3, z3, z2);
+ fe_sub(z2, z3, z2);
+ fe_mul(x2, tmp1, tmp0);
+ fe_sub(tmp1, tmp1, tmp0);
+ fe_sq(z2, z2);
+ fe_mul121666(z3, tmp1);
+ fe_sq(x3, x3);
+ fe_add(tmp0, tmp0, z3);
+ fe_mul(z3, x1, z2);
+ fe_mul(z2, tmp1, tmp0);
+ }
+
+ fe_cswap(x2, x3, swap);
+ fe_cswap(z2, z3, swap);
+
+ fe_invert(z2, z2);
+ fe_mul(x2, x2, z2);
+ fe_tobytes(shared_secret, x2);
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/keypair.c Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/precomp_data.h Added

@@ -0,0 +1,1391 @@
+static const ge_precomp Bi8 = {
+    {
+        { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605 },
+        { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378 },
+        { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546 },
+    },
+    {
+        { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024 },
+        { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574 },
+        { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357 },
+    },
+    {
+        { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380 },
+        { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306 },
+        { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942 },
+    },
+    {
+        { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766 },
+        { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701 },
+        { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300 },
+    },
+    {
+        { -22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877 },
+        { -6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951 },
+        { 4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784 },
+    },
+    {
+        { -25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436 },
+        { 25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918 },
+        { 23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877 },
+    },
+    {
+        { -33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800 },
+        { -25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305 },
+        { -13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300 },
+    },
+    {
+        { -3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876 },
+        { -24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619 },
+        { -3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683 },
+    },
+};
+
+
+/* baseij = (j+1)*256^i*B */
+static const ge_precomp base328 = {
+    {
+        {
+            { 25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605 },
+            { -12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378 },
+            { -8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546 },
+        },
+        {
+            { -12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303 },
+            { -21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081 },
+            { 26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697 },
+        },
+        {
+            { 15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024 },
+            { 16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574 },
+            { 30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357 },
+        },
+        {
+            { -17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540 },
+            { 23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397 },
+            { 7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325 },
+        },
+        {
+            { 10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380 },
+            { 4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306 },
+            { 19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942 },
+        },
+        {
+            { -15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777 },
+            { -8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737 },
+            { -18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652 },
+        },
+        {
+            { 5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766 },
+            { -30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701 },
+            { 28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300 },
+        },
+        {
+            { 14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726 },
+            { -7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955 },
+            { 27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425 },
+        },
+    },
+    {
+        {
+            { -13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171 },
+            { 27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510 },
+            { 17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660 },
+        },
+        {
+            { -10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639 },
+            { 29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963 },
+            { 5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950 },
+        },
+        {
+            { -27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568 },
+            { 12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335 },
+            { 25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628 },
+        },
+        {
+            { -26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007 },
+            { -2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772 },
+            { -22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653 },
+        },
+        {
+            { 2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567 },
+            { 13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686 },
+            { 21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372 },
+        },
+        {
+            { -13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887 },
+            { -23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954 },
+            { -29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953 },
+        },
+        {
+            { 24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833 },
+            { -16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532 },
+            { -22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876 },
+        },
+        {
+            { 2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268 },
+            { 33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214 },
+            { 1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038 },
+        },
+    },
+    {
+        {
+            { 6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800 },
+            { 4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645 },
+            { -4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664 },
+        },
+        {
+            { 1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933 },
+            { -25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182 },
+            { -17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222 },
+        },
+        {
+            { -18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991 },
+            { 20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880 },
+            { 9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092 },
+        },
+        {
+            { -16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295 },
+            { 19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788 },
+            { 8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553 },
+        },
+        {
+            { -15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026 },
+            { 11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347 },
+            { -18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033 },
+        },
+        {
+            { -23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395 },
+            { -27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278 },
+            { 1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890 },
+        },
+        {
+            { 32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995 },
+            { -30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596 },
+            { -11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891 },
+        },
+        {
+            { 31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060 },
+            { 11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608 },
+            { -20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606 },
+        },
+    },
+    {
+        {
+            { 7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389 },
+            { -19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016 },
+            { -11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341 },
+        },
+        {
+            { -22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505 },
+            { 14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553 },
+            { -28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655 },
+        },
+        {
+            { 15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220 },
+            { 12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631 },
+            { -4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099 },
+        },
+        {
+            { 26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556 },
+            { 14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749 },
+            { 236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930 },
+        },
+        {
+            { 1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391 },
+            { 5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253 },
+            { 20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066 },
+        },
+        {
+            { 24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958 },
+            { -11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082 },
+            { -28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383 },
+        },
+        {
+            { -30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521 },
+            { -11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807 },
+            { 23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948 },
+        },
+        {
+            { 9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134 },
+            { -32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455 },
+            { 27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629 },
+        },
+    },
+    {
+        {
+            { -8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069 },
+            { -32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746 },
+            { 24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919 },
+        },
+        {
+            { 11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837 },
+            { 8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906 },
+            { -28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771 },
+        },
+        {
+            { -25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817 },
+            { 10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098 },
+            { 10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409 },
+        },
+        {
+            { -12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504 },
+            { -26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727 },
+            { 28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420 },
+        },
+        {
+            { -32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003 },
+            { -1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605 },
+            { -30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384 },
+        },
+        {
+            { -26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701 },
+            { -23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683 },
+            { 29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708 },
+        },
+        {
+            { -3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563 },
+            { -19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260 },
+            { -5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387 },
+        },
+        {
+            { -19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672 },
+            { 23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686 },
+            { -24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665 },
+        },
+    },
+    {
+        {
+            { 11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182 },
+            { -31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277 },
+            { 14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628 },
+        },
+        {
+            { -4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474 },
+            { -26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539 },
+            { -25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822 },
+        },
+        {
+            { -10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970 },
+            { 19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756 },
+            { -24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508 },
+        },
+        {
+            { -26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683 },
+            { -10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655 },
+            { -20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158 },
+        },
+        {
+            { -4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125 },
+            { -15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839 },
+            { -20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664 },
+        },
+        {
+            { 27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294 },
+            { -18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899 },
+            { -11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070 },
+        },
+        {
+            { 3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294 },
+            { -15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949 },
+            { -21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083 },
+        },
+        {
+            { 31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420 },
+            { -5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940 },
+            { 29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396 },
+        },
+    },
+    {
+        {
+            { -12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567 },
+            { 20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127 },
+            { -16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294 },
+        },
+        {
+            { -12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887 },
+            { 22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964 },
+            { 16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195 },
+        },
+        {
+            { 9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244 },
+            { 24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999 },
+            { -1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762 },
+        },
+        {
+            { -18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274 },
+            { -33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236 },
+            { -16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605 },
+        },
+        {
+            { -13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761 },
+            { -22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884 },
+            { -6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482 },
+        },
+        {
+            { -24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638 },
+            { -11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490 },
+            { -32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170 },
+        },
+        {
+            { 5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736 },
+            { 10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124 },
+            { -17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392 },
+        },
+        {
+            { 8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029 },
+            { 6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048 },
+            { 28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958 },
+        },
+    },
+    {
+        {
+            { 24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593 },
+            { 26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071 },
+            { -11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692 },
+        },
+        {
+            { 11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687 },
+            { -160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441 },
+            { -20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001 },
+        },
+        {
+            { -938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460 },
+            { -19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007 },
+            { -21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762 },
+        },
+        {
+            { 15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005 },
+            { -9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674 },
+            { 4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035 },
+        },
+        {
+            { 7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590 },
+            { -2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957 },
+            { -30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812 },
+        },
+        {
+            { 33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740 },
+            { -18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122 },
+            { -27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158 },
+        },
+        {
+            { 8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885 },
+            { 26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140 },
+            { 19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857 },
+        },
+        {
+            { 801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155 },
+            { 19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260 },
+            { 19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483 },
+        },
+    },
+    {
+        {
+            { -3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677 },
+            { 32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815 },
+            { 22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751 },
+        },
+        {
+            { -16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203 },
+            { -11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208 },
+            { 1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230 },
+        },
+        {
+            { 16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850 },
+            { -21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389 },
+            { -9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968 },
+        },
+        {
+            { -11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689 },
+            { 14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880 },
+            { 5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304 },
+        },
+        {
+            { 30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632 },
+            { -3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412 },
+            { 20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566 },
+        },
+        {
+            { -20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038 },
+            { -26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232 },
+            { -1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943 },
+        },
+        {
+            { 17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856 },
+            { 23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738 },
+            { 15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971 },
+        },
+        {
+            { -27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718 },
+            { -13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697 },
+            { -11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883 },
+        },
+    },
+    {
+        {
+            { 5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912 },
+            { -26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358 },
+            { 3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849 },
+        },
+        {
+            { 29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307 },
+            { -14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977 },
+            { -6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335 },
+        },
+        {
+            { -29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644 },
+            { -22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616 },
+            { -27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735 },
+        },
+        {
+            { -21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099 },
+            { 29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341 },
+            { -936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336 },
+        },
+        {
+            { -23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646 },
+            { 31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425 },
+            { -17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388 },
+        },
+        {
+            { -31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743 },
+            { -16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822 },
+            { -8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462 },
+        },
+        {
+            { 18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985 },
+            { 9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702 },
+            { -22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797 },
+        },
+        {
+            { 21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293 },
+            { 27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100 },
+            { 19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688 },
+        },
+    },
+    {
+        {
+            { 12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186 },
+            { 2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610 },
+            { -2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707 },
+        },
+        {
+            { 7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220 },
+            { 915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025 },
+            { 32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044 },
+        },
+        {
+            { 32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992 },
+            { -4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027 },
+            { 21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197 },
+        },
+        {
+            { 8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901 },
+            { 31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952 },
+            { 19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878 },
+        },
+        {
+            { -28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390 },
+            { 32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730 },
+            { 2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730 },
+        },
+        {
+            { -19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180 },
+            { -30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272 },
+            { -15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715 },
+        },
+        {
+            { -22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970 },
+            { -31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772 },
+            { -17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865 },
+        },
+        {
+            { 15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750 },
+            { 20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373 },
+            { 32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348 },
+        },
+    },
+    {
+        {
+            { 9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144 },
+            { -22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195 },
+            { 5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086 },
+        },
+        {
+            { -13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684 },
+            { -8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518 },
+            { -2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233 },
+        },
+        {
+            { -5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793 },
+            { -2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794 },
+            { 580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435 },
+        },
+        {
+            { 23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921 },
+            { 13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518 },
+            { 2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563 },
+        },
+        {
+            { 14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278 },
+            { -27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024 },
+            { 4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030 },
+        },
+        {
+            { 10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783 },
+            { 27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717 },
+            { 6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844 },
+        },
+        {
+            { 14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333 },
+            { 16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048 },
+            { 22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760 },
+        },
+        {
+            { -4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760 },
+            { -15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757 },
+            { -2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112 },
+        },
+    },
+    {
+        {
+            { -19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468 },
+            { 3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184 },
+            { 10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289 },
+        },
+        {
+            { 15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066 },
+            { 24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882 },
+            { 13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226 },
+        },
+        {
+            { 16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101 },
+            { 29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279 },
+            { -6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811 },
+        },
+        {
+            { 27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709 },
+            { 20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714 },
+            { -2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121 },
+        },
+        {
+            { 9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464 },
+            { 12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847 },
+            { 13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400 },
+        },
+        {
+            { 4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414 },
+            { -15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158 },
+            { 17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045 },
+        },
+        {
+            { -461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415 },
+            { -5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459 },
+            { -31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079 },
+        },
+        {
+            { 21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412 },
+            { -20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743 },
+            { -14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836 },
+        },
+    },
+    {
+        {
+            { 12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022 },
+            { 18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429 },
+            { -6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065 },
+        },
+        {
+            { 30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861 },
+            { 10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000 },
+            { -33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101 },
+        },
+        {
+            { 32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815 },
+            { 29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642 },
+            { 10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966 },
+        },
+        {
+            { 25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574 },
+            { -21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742 },
+            { -18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689 },
+        },
+        {
+            { 12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020 },
+            { -10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772 },
+            { 3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982 },
+        },
+        {
+            { -14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953 },
+            { -16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218 },
+            { -17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265 },
+        },
+        {
+            { 29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073 },
+            { -3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325 },
+            { -11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798 },
+        },
+        {
+            { -4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870 },
+            { -7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863 },
+            { -13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927 },
+        },
+    },
+    {
+        {
+            { -2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267 },
+            { -9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663 },
+            { 22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862 },
+        },
+        {
+            { -25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673 },
+            { 15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943 },
+            { 15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020 },
+        },
+        {
+            { -4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238 },
+            { 11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064 },
+            { 14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795 },
+        },
+        {
+            { 15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052 },
+            { -10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904 },
+            { 29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531 },
+        },
+        {
+            { -13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979 },
+            { -5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841 },
+            { 10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431 },
+        },
+        {
+            { 10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324 },
+            { -31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940 },
+            { 10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320 },
+        },
+        {
+            { -15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184 },
+            { 14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114 },
+            { 30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878 },
+        },
+        {
+            { 12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784 },
+            { -2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091 },
+            { -16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585 },
+        },
+    },
+    {
+        {
+            { -8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208 },
+            { 10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864 },
+            { 17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661 },
+        },
+        {
+            { 7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233 },
+            { 26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212 },
+            { -12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525 },
+        },
+        {
+            { -24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068 },
+            { 9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397 },
+            { -8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988 },
+        },
+        {
+            { 5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889 },
+            { 32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038 },
+            { 14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697 },
+        },
+        {
+            { 20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875 },
+            { -25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905 },
+            { -25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656 },
+        },
+        {
+            { 11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818 },
+            { 27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714 },
+            { 10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203 },
+        },
+        {
+            { 20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931 },
+            { -30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024 },
+            { -23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084 },
+        },
+        {
+            { -1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204 },
+            { 20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817 },
+            { 27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667 },
+        },
+    },
+    {
+        {
+            { 11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504 },
+            { -12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768 },
+            { -19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255 },
+        },
+        {
+            { 6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790 },
+            { 1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438 },
+            { -22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333 },
+        },
+        {
+            { 17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971 },
+            { 31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905 },
+            { 29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409 },
+        },
+        {
+            { 12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409 },
+            { 6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499 },
+            { -8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363 },
+        },
+        {
+            { 28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664 },
+            { -11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324 },
+            { -21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940 },
+        },
+        {
+            { 13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990 },
+            { -17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914 },
+            { -25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290 },
+        },
+        {
+            { 24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257 },
+            { -6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433 },
+            { -16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236 },
+        },
+        {
+            { -12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045 },
+            { 11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093 },
+            { -1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347 },
+        },
+    },
+    {
+        {
+            { -28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191 },
+            { -15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507 },
+            { -12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906 },
+        },
+        {
+            { 3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018 },
+            { -16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109 },
+            { -23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926 },
+        },
+        {
+            { -24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528 },
+            { 8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625 },
+            { -32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286 },
+        },
+        {
+            { 2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033 },
+            { 27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866 },
+            { 21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896 },
+        },
+        {
+            { 30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075 },
+            { 26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347 },
+            { -22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437 },
+        },
+        {
+            { -5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165 },
+            { -18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588 },
+            { -32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193 },
+        },
+        {
+            { -19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017 },
+            { -28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883 },
+            { 21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961 },
+        },
+        {
+            { 8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043 },
+            { 29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663 },
+            { -20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362 },
+        },
+    },
+    {
+        {
+            { -33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860 },
+            { 2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466 },
+            { -24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063 },
+        },
+        {
+            { -26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997 },
+            { -1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295 },
+            { -13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369 },
+        },
+        {
+            { 9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385 },
+            { 18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109 },
+            { 2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906 },
+        },
+        {
+            { 4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424 },
+            { -19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185 },
+            { 7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962 },
+        },
+        {
+            { -7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325 },
+            { 10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593 },
+            { 696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404 },
+        },
+        {
+            { -11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644 },
+            { 17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801 },
+            { 26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804 },
+        },
+        {
+            { -31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884 },
+            { -586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577 },
+            { -9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849 },
+        },
+        {
+            { 32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473 },
+            { -8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644 },
+            { -2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319 },
+        },
+    },
+    {
+        {
+            { -11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599 },
+            { -9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768 },
+            { -27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084 },
+        },
+        {
+            { -27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328 },
+            { -15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369 },
+            { 20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920 },
+        },
+        {
+            { 12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815 },
+            { -32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025 },
+            { -21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397 },
+        },
+        {
+            { -20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448 },
+            { 6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981 },
+            { 30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165 },
+        },
+        {
+            { 32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501 },
+            { 17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073 },
+            { -1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861 },
+        },
+        {
+            { 14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845 },
+            { -1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211 },
+            { 18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870 },
+        },
+        {
+            { 10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096 },
+            { 33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803 },
+            { -32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168 },
+        },
+        {
+            { 30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965 },
+            { -14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505 },
+            { 18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598 },
+        },
+    },
+    {
+        {
+            { 5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782 },
+            { 5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900 },
+            { -31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479 },
+        },
+        {
+            { -12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208 },
+            { 8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232 },
+            { 17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719 },
+        },
+        {
+            { 16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271 },
+            { -4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326 },
+            { -8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132 },
+        },
+        {
+            { 14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300 },
+            { 8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570 },
+            { 15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670 },
+        },
+        {
+            { -2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994 },
+            { -12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913 },
+            { 31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317 },
+        },
+        {
+            { -25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730 },
+            { 842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096 },
+            { -4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078 },
+        },
+        {
+            { -15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411 },
+            { -19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905 },
+            { -9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654 },
+        },
+        {
+            { -28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870 },
+            { -23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498 },
+            { 12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579 },
+        },
+    },
+    {
+        {
+            { 14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677 },
+            { 10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647 },
+            { -2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743 },
+        },
+        {
+            { -25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468 },
+            { 21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375 },
+            { -25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155 },
+        },
+        {
+            { 6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725 },
+            { -12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612 },
+            { -10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943 },
+        },
+        {
+            { -30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944 },
+            { 30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928 },
+            { 9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406 },
+        },
+        {
+            { 22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139 },
+            { -8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963 },
+            { -31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693 },
+        },
+        {
+            { 1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734 },
+            { -448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680 },
+            { -24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410 },
+        },
+        {
+            { -9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931 },
+            { -16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654 },
+            { 22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710 },
+        },
+        {
+            { 29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180 },
+            { -26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684 },
+            { -10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895 },
+        },
+    },
+    {
+        {
+            { 22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501 },
+            { -11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413 },
+            { 6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880 },
+        },
+        {
+            { -8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874 },
+            { 22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962 },
+            { -7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899 },
+        },
+        {
+            { 21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152 },
+            { 9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063 },
+            { 7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080 },
+        },
+        {
+            { -9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146 },
+            { -17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183 },
+            { -19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133 },
+        },
+        {
+            { -32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421 },
+            { -3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622 },
+            { -4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197 },
+        },
+        {
+            { 2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663 },
+            { 31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753 },
+            { 4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755 },
+        },
+        {
+            { -9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862 },
+            { -26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118 },
+            { 26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171 },
+        },
+        {
+            { 15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380 },
+            { 16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824 },
+            { 28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270 },
+        },
+    },
+    {
+        {
+            { -817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438 },
+            { -31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584 },
+            { -594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562 },
+        },
+        {
+            { 30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471 },
+            { 18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610 },
+            { 19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269 },
+        },
+        {
+            { -30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650 },
+            { 14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369 },
+            { 19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461 },
+        },
+        {
+            { 30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462 },
+            { -5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793 },
+            { -2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218 },
+        },
+        {
+            { -24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226 },
+            { 18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019 },
+            { -15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037 },
+        },
+        {
+            { 31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171 },
+            { -17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132 },
+            { -28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841 },
+        },
+        {
+            { 21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181 },
+            { -33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210 },
+            { -1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040 },
+        },
+        {
+            { 3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935 },
+            { 24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105 },
+            { -28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814 },
+        },
+    },
+    {
+        {
+            { 793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852 },
+            { 5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581 },
+            { -4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646 },
+        },
+        {
+            { 10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844 },
+            { 10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025 },
+            { 27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453 },
+        },
+        {
+            { -23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068 },
+            { 4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192 },
+            { -17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921 },
+        },
+        {
+            { -9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259 },
+            { -12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426 },
+            { -5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072 },
+        },
+        {
+            { -17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305 },
+            { 13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832 },
+            { 28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943 },
+        },
+        {
+            { -16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011 },
+            { 24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447 },
+            { 17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494 },
+        },
+        {
+            { -28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245 },
+            { -20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859 },
+            { 28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915 },
+        },
+        {
+            { 16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707 },
+            { 10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848 },
+            { -11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224 },
+        },
+    },
+    {
+        {
+            { -25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391 },
+            { 15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215 },
+            { -23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101 },
+        },
+        {
+            { 23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713 },
+            { 21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849 },
+            { -7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930 },
+        },
+        {
+            { -29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940 },
+            { -21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031 },
+            { -17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404 },
+        },
+        {
+            { -25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243 },
+            { -23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116 },
+            { -24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525 },
+        },
+        {
+            { -23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509 },
+            { -10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883 },
+            { 15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865 },
+        },
+        {
+            { -3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660 },
+            { 4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273 },
+            { -28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138 },
+        },
+        {
+            { -25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560 },
+            { -10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135 },
+            { 2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941 },
+        },
+        {
+            { -4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739 },
+            { 18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756 },
+            { -30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819 },
+        },
+    },
+    {
+        {
+            { -6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347 },
+            { -27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028 },
+            { 21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075 },
+        },
+        {
+            { 16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799 },
+            { -2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609 },
+            { -25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817 },
+        },
+        {
+            { -23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989 },
+            { -30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523 },
+            { 4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278 },
+        },
+        {
+            { 31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045 },
+            { 19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377 },
+            { 24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480 },
+        },
+        {
+            { 17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016 },
+            { 510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426 },
+            { 18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525 },
+        },
+        {
+            { 13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396 },
+            { 9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080 },
+            { 12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892 },
+        },
+        {
+            { 15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275 },
+            { 11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074 },
+            { 20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140 },
+        },
+        {
+            { -16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717 },
+            { -1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101 },
+            { 24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127 },
+        },
+    },
+    {
+        {
+            { -12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632 },
+            { -26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415 },
+            { -31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160 },
+        },
+        {
+            { 31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876 },
+            { 22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625 },
+            { -15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478 },
+        },
+        {
+            { 27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164 },
+            { 26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595 },
+            { -7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248 },
+        },
+        {
+            { -16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858 },
+            { 15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193 },
+            { 8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184 },
+        },
+        {
+            { -18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942 },
+            { -1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635 },
+            { 21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948 },
+        },
+        {
+            { 11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935 },
+            { -25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415 },
+            { -15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416 },
+        },
+        {
+            { -7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018 },
+            { 4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778 },
+            { 366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659 },
+        },
+        {
+            { -24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385 },
+            { 18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503 },
+            { 476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329 },
+        },
+    },
+    {
+        {
+            { 20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056 },
+            { -13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838 },
+            { 24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948 },
+        },
+        {
+            { -3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691 },
+            { -15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118 },
+            { -23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517 },
+        },
+        {
+            { -20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269 },
+            { -6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904 },
+            { -23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589 },
+        },
+        {
+            { -28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193 },
+            { -7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910 },
+            { -30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930 },
+        },
+        {
+            { -7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667 },
+            { 25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481 },
+            { -9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876 },
+        },
+        {
+            { 22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640 },
+            { -8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278 },
+            { -21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112 },
+        },
+        {
+            { 26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272 },
+            { 17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012 },
+            { -10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221 },
+        },
+        {
+            { 30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046 },
+            { 13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345 },
+            { -19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310 },
+        },
+    },
+    {
+        {
+            { 19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937 },
+            { 31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636 },
+            { -9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008 },
+        },
+        {
+            { -2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429 },
+            { -15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576 },
+            { 31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066 },
+        },
+        {
+            { -9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490 },
+            { -12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104 },
+            { 33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053 },
+        },
+        {
+            { 31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275 },
+            { -20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511 },
+            { 22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095 },
+        },
+        {
+            { -28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439 },
+            { 23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939 },
+            { -23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424 },
+        },
+        {
+            { 2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310 },
+            { 3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608 },
+            { -32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079 },
+        },
+        {
+            { -23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101 },
+            { 21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418 },
+            { 18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576 },
+        },
+        {
+            { 30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356 },
+            { 9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996 },
+            { -26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099 },
+        },
+    },
+    {
+        {
+            { -26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728 },
+            { -13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658 },
+            { -10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242 },
+        },
+        {
+            { -21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001 },
+            { -4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766 },
+            { 18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373 },
+        },
+        {
+            { 26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458 },
+            { -17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628 },
+            { -13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657 },
+        },
+        {
+            { -23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062 },
+            { 25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616 },
+            { 31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014 },
+        },
+        {
+            { 24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383 },
+            { -25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814 },
+            { -20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718 },
+        },
+        {
+            { 30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417 },
+            { 2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222 },
+            { 33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444 },
+        },
+        {
+            { -20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597 },
+            { 23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970 },
+            { 1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799 },
+        },
+        {
+            { -5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647 },
+            { 13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511 },
+            { -29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032 },
+        },
+    },
+    {
+        {
+            { 9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834 },
+            { -23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461 },
+            { 29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062 },
+        },
+        {
+            { -25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516 },
+            { -20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547 },
+            { -24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240 },
+        },
+        {
+            { -17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038 },
+            { -33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741 },
+            { 16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103 },
+        },
+        {
+            { -19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747 },
+            { -1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323 },
+            { 31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016 },
+        },
+        {
+            { -14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373 },
+            { 15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228 },
+            { -2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141 },
+        },
+        {
+            { 16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399 },
+            { 11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831 },
+            { -185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376 },
+        },
+        {
+            { -32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313 },
+            { -18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958 },
+            { -6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577 },
+        },
+        {
+            { -22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743 },
+            { 29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684 },
+            { -20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476 },
+        },
+    },
+};

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/sc.c Added

@@ -0,0 +1,809 @@
+#include "fixedint.h"
+#include "sc.h"
+
+static uint64_t load_3(const unsigned char *in) {
+ uint64_t result;
+
+ result = (uint64_t) in0;
+ result |= ((uint64_t) in1) << 8;
+ result |= ((uint64_t) in2) << 16;
+
+ return result;
+}
+
+static uint64_t load_4(const unsigned char *in) {
+ uint64_t result;
+
+ result = (uint64_t) in0;
+ result |= ((uint64_t) in1) << 8;
+ result |= ((uint64_t) in2) << 16;
+ result |= ((uint64_t) in3) << 24;
+ 
+ return result;
+}
+
+/*
+Input:
+ s0+256*s1+...+256^63*s63 = s
+
+Output:
+ s0+256*s1+...+256^31*s31 = s mod l
+ where l = 2^252 + 27742317777372353535851937790883648493.
+ Overwrites s in place.
+*/
+
+void sc_reduce(unsigned char *s) {
+ int64_t s0 = 2097151 & load_3(s);
+ int64_t s1 = 2097151 & (load_4(s + 2) >> 5);
+ int64_t s2 = 2097151 & (load_3(s + 5) >> 2);
+ int64_t s3 = 2097151 & (load_4(s + 7) >> 7);
+ int64_t s4 = 2097151 & (load_4(s + 10) >> 4);
+ int64_t s5 = 2097151 & (load_3(s + 13) >> 1);
+ int64_t s6 = 2097151 & (load_4(s + 15) >> 6);
+ int64_t s7 = 2097151 & (load_3(s + 18) >> 3);
+ int64_t s8 = 2097151 & load_3(s + 21);
+ int64_t s9 = 2097151 & (load_4(s + 23) >> 5);
+ int64_t s10 = 2097151 & (load_3(s + 26) >> 2);
+ int64_t s11 = 2097151 & (load_4(s + 28) >> 7);
+ int64_t s12 = 2097151 & (load_4(s + 31) >> 4);
+ int64_t s13 = 2097151 & (load_3(s + 34) >> 1);
+ int64_t s14 = 2097151 & (load_4(s + 36) >> 6);
+ int64_t s15 = 2097151 & (load_3(s + 39) >> 3);
+ int64_t s16 = 2097151 & load_3(s + 42);
+ int64_t s17 = 2097151 & (load_4(s + 44) >> 5);
+ int64_t s18 = 2097151 & (load_3(s + 47) >> 2);
+ int64_t s19 = 2097151 & (load_4(s + 49) >> 7);
+ int64_t s20 = 2097151 & (load_4(s + 52) >> 4);
+ int64_t s21 = 2097151 & (load_3(s + 55) >> 1);
+ int64_t s22 = 2097151 & (load_4(s + 57) >> 6);
+ int64_t s23 = (load_4(s + 60) >> 3);
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+ int64_t carry10;
+ int64_t carry11;
+ int64_t carry12;
+ int64_t carry13;
+ int64_t carry14;
+ int64_t carry15;
+ int64_t carry16;
+
+ s11 += s23 * 666643;
+ s12 += s23 * 470296;
+ s13 += s23 * 654183;
+ s14 -= s23 * 997805;
+ s15 += s23 * 136657;
+ s16 -= s23 * 683901;
+ s23 = 0;
+ s10 += s22 * 666643;
+ s11 += s22 * 470296;
+ s12 += s22 * 654183;
+ s13 -= s22 * 997805;
+ s14 += s22 * 136657;
+ s15 -= s22 * 683901;
+ s22 = 0;
+ s9 += s21 * 666643;
+ s10 += s21 * 470296;
+ s11 += s21 * 654183;
+ s12 -= s21 * 997805;
+ s13 += s21 * 136657;
+ s14 -= s21 * 683901;
+ s21 = 0;
+ s8 += s20 * 666643;
+ s9 += s20 * 470296;
+ s10 += s20 * 654183;
+ s11 -= s20 * 997805;
+ s12 += s20 * 136657;
+ s13 -= s20 * 683901;
+ s20 = 0;
+ s7 += s19 * 666643;
+ s8 += s19 * 470296;
+ s9 += s19 * 654183;
+ s10 -= s19 * 997805;
+ s11 += s19 * 136657;
+ s12 -= s19 * 683901;
+ s19 = 0;
+ s6 += s18 * 666643;
+ s7 += s18 * 470296;
+ s8 += s18 * 654183;
+ s9 -= s18 * 997805;
+ s10 += s18 * 136657;
+ s11 -= s18 * 683901;
+ s18 = 0;
+ carry6 = (s6 + (1 << 20)) >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry8 = (s8 + (1 << 20)) >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry10 = (s10 + (1 << 20)) >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry12 = (s12 + (1 << 20)) >> 21;
+ s13 += carry12;
+ s12 -= carry12 << 21;
+ carry14 = (s14 + (1 << 20)) >> 21;
+ s15 += carry14;
+ s14 -= carry14 << 21;
+ carry16 = (s16 + (1 << 20)) >> 21;
+ s17 += carry16;
+ s16 -= carry16 << 21;
+ carry7 = (s7 + (1 << 20)) >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry9 = (s9 + (1 << 20)) >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry11 = (s11 + (1 << 20)) >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ carry13 = (s13 + (1 << 20)) >> 21;
+ s14 += carry13;
+ s13 -= carry13 << 21;
+ carry15 = (s15 + (1 << 20)) >> 21;
+ s16 += carry15;
+ s15 -= carry15 << 21;
+ s5 += s17 * 666643;
+ s6 += s17 * 470296;
+ s7 += s17 * 654183;
+ s8 -= s17 * 997805;
+ s9 += s17 * 136657;
+ s10 -= s17 * 683901;
+ s17 = 0;
+ s4 += s16 * 666643;
+ s5 += s16 * 470296;
+ s6 += s16 * 654183;
+ s7 -= s16 * 997805;
+ s8 += s16 * 136657;
+ s9 -= s16 * 683901;
+ s16 = 0;
+ s3 += s15 * 666643;
+ s4 += s15 * 470296;
+ s5 += s15 * 654183;
+ s6 -= s15 * 997805;
+ s7 += s15 * 136657;
+ s8 -= s15 * 683901;
+ s15 = 0;
+ s2 += s14 * 666643;
+ s3 += s14 * 470296;
+ s4 += s14 * 654183;
+ s5 -= s14 * 997805;
+ s6 += s14 * 136657;
+ s7 -= s14 * 683901;
+ s14 = 0;
+ s1 += s13 * 666643;
+ s2 += s13 * 470296;
+ s3 += s13 * 654183;
+ s4 -= s13 * 997805;
+ s5 += s13 * 136657;
+ s6 -= s13 * 683901;
+ s13 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = (s0 + (1 << 20)) >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry2 = (s2 + (1 << 20)) >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry4 = (s4 + (1 << 20)) >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry6 = (s6 + (1 << 20)) >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry8 = (s8 + (1 << 20)) >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry10 = (s10 + (1 << 20)) >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry1 = (s1 + (1 << 20)) >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry3 = (s3 + (1 << 20)) >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry5 = (s5 + (1 << 20)) >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry7 = (s7 + (1 << 20)) >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry9 = (s9 + (1 << 20)) >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry11 = (s11 + (1 << 20)) >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = s0 >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry1 = s1 >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry2 = s2 >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry3 = s3 >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry4 = s4 >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry5 = s5 >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry6 = s6 >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry7 = s7 >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry8 = s8 >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry9 = s9 >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry10 = s10 >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry11 = s11 >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = s0 >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry1 = s1 >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry2 = s2 >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry3 = s3 >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry4 = s4 >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry5 = s5 >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry6 = s6 >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry7 = s7 >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry8 = s8 >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry9 = s9 >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry10 = s10 >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+
+ s0 = (unsigned char) (s0 >> 0);
+ s1 = (unsigned char) (s0 >> 8);
+ s2 = (unsigned char) ((s0 >> 16) | (s1 << 5));
+ s3 = (unsigned char) (s1 >> 3);
+ s4 = (unsigned char) (s1 >> 11);
+ s5 = (unsigned char) ((s1 >> 19) | (s2 << 2));
+ s6 = (unsigned char) (s2 >> 6);
+ s7 = (unsigned char) ((s2 >> 14) | (s3 << 7));
+ s8 = (unsigned char) (s3 >> 1);
+ s9 = (unsigned char) (s3 >> 9);
+ s10 = (unsigned char) ((s3 >> 17) | (s4 << 4));
+ s11 = (unsigned char) (s4 >> 4);
+ s12 = (unsigned char) (s4 >> 12);
+ s13 = (unsigned char) ((s4 >> 20) | (s5 << 1));
+ s14 = (unsigned char) (s5 >> 7);
+ s15 = (unsigned char) ((s5 >> 15) | (s6 << 6));
+ s16 = (unsigned char) (s6 >> 2);
+ s17 = (unsigned char) (s6 >> 10);
+ s18 = (unsigned char) ((s6 >> 18) | (s7 << 3));
+ s19 = (unsigned char) (s7 >> 5);
+ s20 = (unsigned char) (s7 >> 13);
+ s21 = (unsigned char) (s8 >> 0);
+ s22 = (unsigned char) (s8 >> 8);
+ s23 = (unsigned char) ((s8 >> 16) | (s9 << 5));
+ s24 = (unsigned char) (s9 >> 3);
+ s25 = (unsigned char) (s9 >> 11);
+ s26 = (unsigned char) ((s9 >> 19) | (s10 << 2));
+ s27 = (unsigned char) (s10 >> 6);
+ s28 = (unsigned char) ((s10 >> 14) | (s11 << 7));
+ s29 = (unsigned char) (s11 >> 1);
+ s30 = (unsigned char) (s11 >> 9);
+ s31 = (unsigned char) (s11 >> 17);
+}
+
+
+
+/*
+Input:
+ a0+256*a1+...+256^31*a31 = a
+ b0+256*b1+...+256^31*b31 = b
+ c0+256*c1+...+256^31*c31 = c
+
+Output:
+ s0+256*s1+...+256^31*s31 = (ab+c) mod l
+ where l = 2^252 + 27742317777372353535851937790883648493.
+*/
+
+void sc_muladd(unsigned char *s, const unsigned char *a, const unsigned char *b, const unsigned char *c) {
+ int64_t a0 = 2097151 & load_3(a);
+ int64_t a1 = 2097151 & (load_4(a + 2) >> 5);
+ int64_t a2 = 2097151 & (load_3(a + 5) >> 2);
+ int64_t a3 = 2097151 & (load_4(a + 7) >> 7);
+ int64_t a4 = 2097151 & (load_4(a + 10) >> 4);
+ int64_t a5 = 2097151 & (load_3(a + 13) >> 1);
+ int64_t a6 = 2097151 & (load_4(a + 15) >> 6);
+ int64_t a7 = 2097151 & (load_3(a + 18) >> 3);
+ int64_t a8 = 2097151 & load_3(a + 21);
+ int64_t a9 = 2097151 & (load_4(a + 23) >> 5);
+ int64_t a10 = 2097151 & (load_3(a + 26) >> 2);
+ int64_t a11 = (load_4(a + 28) >> 7);
+ int64_t b0 = 2097151 & load_3(b);
+ int64_t b1 = 2097151 & (load_4(b + 2) >> 5);
+ int64_t b2 = 2097151 & (load_3(b + 5) >> 2);
+ int64_t b3 = 2097151 & (load_4(b + 7) >> 7);
+ int64_t b4 = 2097151 & (load_4(b + 10) >> 4);
+ int64_t b5 = 2097151 & (load_3(b + 13) >> 1);
+ int64_t b6 = 2097151 & (load_4(b + 15) >> 6);
+ int64_t b7 = 2097151 & (load_3(b + 18) >> 3);
+ int64_t b8 = 2097151 & load_3(b + 21);
+ int64_t b9 = 2097151 & (load_4(b + 23) >> 5);
+ int64_t b10 = 2097151 & (load_3(b + 26) >> 2);
+ int64_t b11 = (load_4(b + 28) >> 7);
+ int64_t c0 = 2097151 & load_3(c);
+ int64_t c1 = 2097151 & (load_4(c + 2) >> 5);
+ int64_t c2 = 2097151 & (load_3(c + 5) >> 2);
+ int64_t c3 = 2097151 & (load_4(c + 7) >> 7);
+ int64_t c4 = 2097151 & (load_4(c + 10) >> 4);
+ int64_t c5 = 2097151 & (load_3(c + 13) >> 1);
+ int64_t c6 = 2097151 & (load_4(c + 15) >> 6);
+ int64_t c7 = 2097151 & (load_3(c + 18) >> 3);
+ int64_t c8 = 2097151 & load_3(c + 21);
+ int64_t c9 = 2097151 & (load_4(c + 23) >> 5);
+ int64_t c10 = 2097151 & (load_3(c + 26) >> 2);
+ int64_t c11 = (load_4(c + 28) >> 7);
+ int64_t s0;
+ int64_t s1;
+ int64_t s2;
+ int64_t s3;
+ int64_t s4;
+ int64_t s5;
+ int64_t s6;
+ int64_t s7;
+ int64_t s8;
+ int64_t s9;
+ int64_t s10;
+ int64_t s11;
+ int64_t s12;
+ int64_t s13;
+ int64_t s14;
+ int64_t s15;
+ int64_t s16;
+ int64_t s17;
+ int64_t s18;
+ int64_t s19;
+ int64_t s20;
+ int64_t s21;
+ int64_t s22;
+ int64_t s23;
+ int64_t carry0;
+ int64_t carry1;
+ int64_t carry2;
+ int64_t carry3;
+ int64_t carry4;
+ int64_t carry5;
+ int64_t carry6;
+ int64_t carry7;
+ int64_t carry8;
+ int64_t carry9;
+ int64_t carry10;
+ int64_t carry11;
+ int64_t carry12;
+ int64_t carry13;
+ int64_t carry14;
+ int64_t carry15;
+ int64_t carry16;
+ int64_t carry17;
+ int64_t carry18;
+ int64_t carry19;
+ int64_t carry20;
+ int64_t carry21;
+ int64_t carry22;
+
+ s0 = c0 + a0 * b0;
+ s1 = c1 + a0 * b1 + a1 * b0;
+ s2 = c2 + a0 * b2 + a1 * b1 + a2 * b0;
+ s3 = c3 + a0 * b3 + a1 * b2 + a2 * b1 + a3 * b0;
+ s4 = c4 + a0 * b4 + a1 * b3 + a2 * b2 + a3 * b1 + a4 * b0;
+ s5 = c5 + a0 * b5 + a1 * b4 + a2 * b3 + a3 * b2 + a4 * b1 + a5 * b0;
+ s6 = c6 + a0 * b6 + a1 * b5 + a2 * b4 + a3 * b3 + a4 * b2 + a5 * b1 + a6 * b0;
+ s7 = c7 + a0 * b7 + a1 * b6 + a2 * b5 + a3 * b4 + a4 * b3 + a5 * b2 + a6 * b1 + a7 * b0;
+ s8 = c8 + a0 * b8 + a1 * b7 + a2 * b6 + a3 * b5 + a4 * b4 + a5 * b3 + a6 * b2 + a7 * b1 + a8 * b0;
+ s9 = c9 + a0 * b9 + a1 * b8 + a2 * b7 + a3 * b6 + a4 * b5 + a5 * b4 + a6 * b3 + a7 * b2 + a8 * b1 + a9 * b0;
+ s10 = c10 + a0 * b10 + a1 * b9 + a2 * b8 + a3 * b7 + a4 * b6 + a5 * b5 + a6 * b4 + a7 * b3 + a8 * b2 + a9 * b1 + a10 * b0;
+ s11 = c11 + a0 * b11 + a1 * b10 + a2 * b9 + a3 * b8 + a4 * b7 + a5 * b6 + a6 * b5 + a7 * b4 + a8 * b3 + a9 * b2 + a10 * b1 + a11 * b0;
+ s12 = a1 * b11 + a2 * b10 + a3 * b9 + a4 * b8 + a5 * b7 + a6 * b6 + a7 * b5 + a8 * b4 + a9 * b3 + a10 * b2 + a11 * b1;
+ s13 = a2 * b11 + a3 * b10 + a4 * b9 + a5 * b8 + a6 * b7 + a7 * b6 + a8 * b5 + a9 * b4 + a10 * b3 + a11 * b2;
+ s14 = a3 * b11 + a4 * b10 + a5 * b9 + a6 * b8 + a7 * b7 + a8 * b6 + a9 * b5 + a10 * b4 + a11 * b3;
+ s15 = a4 * b11 + a5 * b10 + a6 * b9 + a7 * b8 + a8 * b7 + a9 * b6 + a10 * b5 + a11 * b4;
+ s16 = a5 * b11 + a6 * b10 + a7 * b9 + a8 * b8 + a9 * b7 + a10 * b6 + a11 * b5;
+ s17 = a6 * b11 + a7 * b10 + a8 * b9 + a9 * b8 + a10 * b7 + a11 * b6;
+ s18 = a7 * b11 + a8 * b10 + a9 * b9 + a10 * b8 + a11 * b7;
+ s19 = a8 * b11 + a9 * b10 + a10 * b9 + a11 * b8;
+ s20 = a9 * b11 + a10 * b10 + a11 * b9;
+ s21 = a10 * b11 + a11 * b10;
+ s22 = a11 * b11;
+ s23 = 0;
+ carry0 = (s0 + (1 << 20)) >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry2 = (s2 + (1 << 20)) >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry4 = (s4 + (1 << 20)) >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry6 = (s6 + (1 << 20)) >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry8 = (s8 + (1 << 20)) >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry10 = (s10 + (1 << 20)) >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry12 = (s12 + (1 << 20)) >> 21;
+ s13 += carry12;
+ s12 -= carry12 << 21;
+ carry14 = (s14 + (1 << 20)) >> 21;
+ s15 += carry14;
+ s14 -= carry14 << 21;
+ carry16 = (s16 + (1 << 20)) >> 21;
+ s17 += carry16;
+ s16 -= carry16 << 21;
+ carry18 = (s18 + (1 << 20)) >> 21;
+ s19 += carry18;
+ s18 -= carry18 << 21;
+ carry20 = (s20 + (1 << 20)) >> 21;
+ s21 += carry20;
+ s20 -= carry20 << 21;
+ carry22 = (s22 + (1 << 20)) >> 21;
+ s23 += carry22;
+ s22 -= carry22 << 21;
+ carry1 = (s1 + (1 << 20)) >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry3 = (s3 + (1 << 20)) >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry5 = (s5 + (1 << 20)) >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry7 = (s7 + (1 << 20)) >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry9 = (s9 + (1 << 20)) >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry11 = (s11 + (1 << 20)) >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ carry13 = (s13 + (1 << 20)) >> 21;
+ s14 += carry13;
+ s13 -= carry13 << 21;
+ carry15 = (s15 + (1 << 20)) >> 21;
+ s16 += carry15;
+ s15 -= carry15 << 21;
+ carry17 = (s17 + (1 << 20)) >> 21;
+ s18 += carry17;
+ s17 -= carry17 << 21;
+ carry19 = (s19 + (1 << 20)) >> 21;
+ s20 += carry19;
+ s19 -= carry19 << 21;
+ carry21 = (s21 + (1 << 20)) >> 21;
+ s22 += carry21;
+ s21 -= carry21 << 21;
+ s11 += s23 * 666643;
+ s12 += s23 * 470296;
+ s13 += s23 * 654183;
+ s14 -= s23 * 997805;
+ s15 += s23 * 136657;
+ s16 -= s23 * 683901;
+ s23 = 0;
+ s10 += s22 * 666643;
+ s11 += s22 * 470296;
+ s12 += s22 * 654183;
+ s13 -= s22 * 997805;
+ s14 += s22 * 136657;
+ s15 -= s22 * 683901;
+ s22 = 0;
+ s9 += s21 * 666643;
+ s10 += s21 * 470296;
+ s11 += s21 * 654183;
+ s12 -= s21 * 997805;
+ s13 += s21 * 136657;
+ s14 -= s21 * 683901;
+ s21 = 0;
+ s8 += s20 * 666643;
+ s9 += s20 * 470296;
+ s10 += s20 * 654183;
+ s11 -= s20 * 997805;
+ s12 += s20 * 136657;
+ s13 -= s20 * 683901;
+ s20 = 0;
+ s7 += s19 * 666643;
+ s8 += s19 * 470296;
+ s9 += s19 * 654183;
+ s10 -= s19 * 997805;
+ s11 += s19 * 136657;
+ s12 -= s19 * 683901;
+ s19 = 0;
+ s6 += s18 * 666643;
+ s7 += s18 * 470296;
+ s8 += s18 * 654183;
+ s9 -= s18 * 997805;
+ s10 += s18 * 136657;
+ s11 -= s18 * 683901;
+ s18 = 0;
+ carry6 = (s6 + (1 << 20)) >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry8 = (s8 + (1 << 20)) >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry10 = (s10 + (1 << 20)) >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry12 = (s12 + (1 << 20)) >> 21;
+ s13 += carry12;
+ s12 -= carry12 << 21;
+ carry14 = (s14 + (1 << 20)) >> 21;
+ s15 += carry14;
+ s14 -= carry14 << 21;
+ carry16 = (s16 + (1 << 20)) >> 21;
+ s17 += carry16;
+ s16 -= carry16 << 21;
+ carry7 = (s7 + (1 << 20)) >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry9 = (s9 + (1 << 20)) >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry11 = (s11 + (1 << 20)) >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ carry13 = (s13 + (1 << 20)) >> 21;
+ s14 += carry13;
+ s13 -= carry13 << 21;
+ carry15 = (s15 + (1 << 20)) >> 21;
+ s16 += carry15;
+ s15 -= carry15 << 21;
+ s5 += s17 * 666643;
+ s6 += s17 * 470296;
+ s7 += s17 * 654183;
+ s8 -= s17 * 997805;
+ s9 += s17 * 136657;
+ s10 -= s17 * 683901;
+ s17 = 0;
+ s4 += s16 * 666643;
+ s5 += s16 * 470296;
+ s6 += s16 * 654183;
+ s7 -= s16 * 997805;
+ s8 += s16 * 136657;
+ s9 -= s16 * 683901;
+ s16 = 0;
+ s3 += s15 * 666643;
+ s4 += s15 * 470296;
+ s5 += s15 * 654183;
+ s6 -= s15 * 997805;
+ s7 += s15 * 136657;
+ s8 -= s15 * 683901;
+ s15 = 0;
+ s2 += s14 * 666643;
+ s3 += s14 * 470296;
+ s4 += s14 * 654183;
+ s5 -= s14 * 997805;
+ s6 += s14 * 136657;
+ s7 -= s14 * 683901;
+ s14 = 0;
+ s1 += s13 * 666643;
+ s2 += s13 * 470296;
+ s3 += s13 * 654183;
+ s4 -= s13 * 997805;
+ s5 += s13 * 136657;
+ s6 -= s13 * 683901;
+ s13 = 0;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = (s0 + (1 << 20)) >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry2 = (s2 + (1 << 20)) >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry4 = (s4 + (1 << 20)) >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry6 = (s6 + (1 << 20)) >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry8 = (s8 + (1 << 20)) >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry10 = (s10 + (1 << 20)) >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry1 = (s1 + (1 << 20)) >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry3 = (s3 + (1 << 20)) >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry5 = (s5 + (1 << 20)) >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry7 = (s7 + (1 << 20)) >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry9 = (s9 + (1 << 20)) >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry11 = (s11 + (1 << 20)) >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = s0 >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry1 = s1 >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry2 = s2 >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry3 = s3 >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry4 = s4 >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry5 = s5 >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry6 = s6 >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry7 = s7 >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry8 = s8 >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry9 = s9 >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry10 = s10 >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ carry11 = s11 >> 21;
+ s12 += carry11;
+ s11 -= carry11 << 21;
+ s0 += s12 * 666643;
+ s1 += s12 * 470296;
+ s2 += s12 * 654183;
+ s3 -= s12 * 997805;
+ s4 += s12 * 136657;
+ s5 -= s12 * 683901;
+ s12 = 0;
+ carry0 = s0 >> 21;
+ s1 += carry0;
+ s0 -= carry0 << 21;
+ carry1 = s1 >> 21;
+ s2 += carry1;
+ s1 -= carry1 << 21;
+ carry2 = s2 >> 21;
+ s3 += carry2;
+ s2 -= carry2 << 21;
+ carry3 = s3 >> 21;
+ s4 += carry3;
+ s3 -= carry3 << 21;
+ carry4 = s4 >> 21;
+ s5 += carry4;
+ s4 -= carry4 << 21;
+ carry5 = s5 >> 21;
+ s6 += carry5;
+ s5 -= carry5 << 21;
+ carry6 = s6 >> 21;
+ s7 += carry6;
+ s6 -= carry6 << 21;
+ carry7 = s7 >> 21;
+ s8 += carry7;
+ s7 -= carry7 << 21;
+ carry8 = s8 >> 21;
+ s9 += carry8;
+ s8 -= carry8 << 21;
+ carry9 = s9 >> 21;
+ s10 += carry9;
+ s9 -= carry9 << 21;
+ carry10 = s10 >> 21;
+ s11 += carry10;
+ s10 -= carry10 << 21;
+ 
+ s0 = (unsigned char) (s0 >> 0);
+ s1 = (unsigned char) (s0 >> 8);
+ s2 = (unsigned char) ((s0 >> 16) | (s1 << 5));
+ s3 = (unsigned char) (s1 >> 3);
+ s4 = (unsigned char) (s1 >> 11);
+ s5 = (unsigned char) ((s1 >> 19) | (s2 << 2));
+ s6 = (unsigned char) (s2 >> 6);
+ s7 = (unsigned char) ((s2 >> 14) | (s3 << 7));
+ s8 = (unsigned char) (s3 >> 1);
+ s9 = (unsigned char) (s3 >> 9);
+ s10 = (unsigned char) ((s3 >> 17) | (s4 << 4));
+ s11 = (unsigned char) (s4 >> 4);
+ s12 = (unsigned char) (s4 >> 12);
+ s13 = (unsigned char) ((s4 >> 20) | (s5 << 1));
+ s14 = (unsigned char) (s5 >> 7);
+ s15 = (unsigned char) ((s5 >> 15) | (s6 << 6));
+ s16 = (unsigned char) (s6 >> 2);
+ s17 = (unsigned char) (s6 >> 10);
+ s18 = (unsigned char) ((s6 >> 18) | (s7 << 3));
+ s19 = (unsigned char) (s7 >> 5);
+ s20 = (unsigned char) (s7 >> 13);
+ s21 = (unsigned char) (s8 >> 0);
+ s22 = (unsigned char) (s8 >> 8);
+ s23 = (unsigned char) ((s8 >> 16) | (s9 << 5));
+ s24 = (unsigned char) (s9 >> 3);
+ s25 = (unsigned char) (s9 >> 11);
+ s26 = (unsigned char) ((s9 >> 19) | (s10 << 2));
+ s27 = (unsigned char) (s10 >> 6);
+ s28 = (unsigned char) ((s10 >> 14) | (s11 << 7));
+ s29 = (unsigned char) (s11 >> 1);
+ s30 = (unsigned char) (s11 >> 9);
+ s31 = (unsigned char) (s11 >> 17);
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/sc.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/seed.c Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/sha512.c Added

@@ -0,0 +1,275 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ *
+ * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
+ */
+
+#include "fixedint.h"
+#include "sha512.h"
+
+/* the K array */
+static const uint64_t K80 = {
+ UINT64_C(0x428a2f98d728ae22), UINT64_C(0x7137449123ef65cd), 
+ UINT64_C(0xb5c0fbcfec4d3b2f), UINT64_C(0xe9b5dba58189dbbc),
+ UINT64_C(0x3956c25bf348b538), UINT64_C(0x59f111f1b605d019), 
+ UINT64_C(0x923f82a4af194f9b), UINT64_C(0xab1c5ed5da6d8118),
+ UINT64_C(0xd807aa98a3030242), UINT64_C(0x12835b0145706fbe), 
+ UINT64_C(0x243185be4ee4b28c), UINT64_C(0x550c7dc3d5ffb4e2),
+ UINT64_C(0x72be5d74f27b896f), UINT64_C(0x80deb1fe3b1696b1), 
+ UINT64_C(0x9bdc06a725c71235), UINT64_C(0xc19bf174cf692694),
+ UINT64_C(0xe49b69c19ef14ad2), UINT64_C(0xefbe4786384f25e3), 
+ UINT64_C(0x0fc19dc68b8cd5b5), UINT64_C(0x240ca1cc77ac9c65),
+ UINT64_C(0x2de92c6f592b0275), UINT64_C(0x4a7484aa6ea6e483), 
+ UINT64_C(0x5cb0a9dcbd41fbd4), UINT64_C(0x76f988da831153b5),
+ UINT64_C(0x983e5152ee66dfab), UINT64_C(0xa831c66d2db43210), 
+ UINT64_C(0xb00327c898fb213f), UINT64_C(0xbf597fc7beef0ee4),
+ UINT64_C(0xc6e00bf33da88fc2), UINT64_C(0xd5a79147930aa725), 
+ UINT64_C(0x06ca6351e003826f), UINT64_C(0x142929670a0e6e70),
+ UINT64_C(0x27b70a8546d22ffc), UINT64_C(0x2e1b21385c26c926), 
+ UINT64_C(0x4d2c6dfc5ac42aed), UINT64_C(0x53380d139d95b3df),
+ UINT64_C(0x650a73548baf63de), UINT64_C(0x766a0abb3c77b2a8), 
+ UINT64_C(0x81c2c92e47edaee6), UINT64_C(0x92722c851482353b),
+ UINT64_C(0xa2bfe8a14cf10364), UINT64_C(0xa81a664bbc423001),
+ UINT64_C(0xc24b8b70d0f89791), UINT64_C(0xc76c51a30654be30),
+ UINT64_C(0xd192e819d6ef5218), UINT64_C(0xd69906245565a910), 
+ UINT64_C(0xf40e35855771202a), UINT64_C(0x106aa07032bbd1b8),
+ UINT64_C(0x19a4c116b8d2d0c8), UINT64_C(0x1e376c085141ab53), 
+ UINT64_C(0x2748774cdf8eeb99), UINT64_C(0x34b0bcb5e19b48a8),
+ UINT64_C(0x391c0cb3c5c95a63), UINT64_C(0x4ed8aa4ae3418acb), 
+ UINT64_C(0x5b9cca4f7763e373), UINT64_C(0x682e6ff3d6b2b8a3),
+ UINT64_C(0x748f82ee5defb2fc), UINT64_C(0x78a5636f43172f60), 
+ UINT64_C(0x84c87814a1f0ab72), UINT64_C(0x8cc702081a6439ec),
+ UINT64_C(0x90befffa23631e28), UINT64_C(0xa4506cebde82bde9), 
+ UINT64_C(0xbef9a3f7b2c67915), UINT64_C(0xc67178f2e372532b),
+ UINT64_C(0xca273eceea26619c), UINT64_C(0xd186b8c721c0c207), 
+ UINT64_C(0xeada7dd6cde0eb1e), UINT64_C(0xf57d4f7fee6ed178),
+ UINT64_C(0x06f067aa72176fba), UINT64_C(0x0a637dc5a2c898a6), 
+ UINT64_C(0x113f9804bef90dae), UINT64_C(0x1b710b35131c471b),
+ UINT64_C(0x28db77f523047d84), UINT64_C(0x32caab7b40c72493), 
+ UINT64_C(0x3c9ebe0a15c9bebc), UINT64_C(0x431d67c49c100d4c),
+ UINT64_C(0x4cc5d4becb3e42b6), UINT64_C(0x597f299cfc657e2a), 
+ UINT64_C(0x5fcb6fab3ad6faec), UINT64_C(0x6c44198c4a475817)
+};
+
+/* Various logical functions */
+
+#define ROR64c(x, y) \
+ ( ((((x)&UINT64_C(0xFFFFFFFFFFFFFFFF))>>((uint64_t)(y)&UINT64_C(63))) | \
+ ((x)<<((uint64_t)(64-((y)&UINT64_C(63)))))) & UINT64_C(0xFFFFFFFFFFFFFFFF))
+
+#define STORE64H(x, y) \
+ { (y)0 = (unsigned char)(((x)>>56)&255); (y)1 = (unsigned char)(((x)>>48)&255); \
+ (y)2 = (unsigned char)(((x)>>40)&255); (y)3 = (unsigned char)(((x)>>32)&255); \
+ (y)4 = (unsigned char)(((x)>>24)&255); (y)5 = (unsigned char)(((x)>>16)&255); \
+ (y)6 = (unsigned char)(((x)>>8)&255); (y)7 = (unsigned char)((x)&255); }
+
+#define LOAD64H(x, y) \
+ { x = (((uint64_t)((y)0 & 255))<<56)|(((uint64_t)((y)1 & 255))<<48) | \
+ (((uint64_t)((y)2 & 255))<<40)|(((uint64_t)((y)3 & 255))<<32) | \
+ (((uint64_t)((y)4 & 255))<<24)|(((uint64_t)((y)5 & 255))<<16) | \
+ (((uint64_t)((y)6 & 255))<<8)|(((uint64_t)((y)7 & 255))); }
+
+
+#define Ch(x,y,z) (z ^ (x & (y ^ z)))
+#define Maj(x,y,z) (((x | y) & z) | (x & y)) 
+#define S(x, n) ROR64c(x, n)
+#define R(x, n) (((x) &UINT64_C(0xFFFFFFFFFFFFFFFF))>>((uint64_t)n))
+#define Sigma0(x) (S(x, 28) ^ S(x, 34) ^ S(x, 39))
+#define Sigma1(x) (S(x, 14) ^ S(x, 18) ^ S(x, 41))
+#define Gamma0(x) (S(x, 1) ^ S(x, 8) ^ R(x, 7))
+#define Gamma1(x) (S(x, 19) ^ S(x, 61) ^ R(x, 6))
+#ifndef MIN
+ #define MIN(x, y) ( ((x)<(y))?(x):(y) )
+#endif
+
+/* compress 1024-bits */
+static int sha512_compress(sha512_context *md, unsigned char *buf)
+{
+ uint64_t S8, W80, t0, t1;
+ int i;
+
+ /* copy state into S */
+ for (i = 0; i < 8; i++) {
+ Si = md->statei;
+ }
+
+ /* copy the state into 1024-bits into W0..15 */
+ for (i = 0; i < 16; i++) {
+ LOAD64H(Wi, buf + (8*i));
+ }
+
+ /* fill W16..79 */
+ for (i = 16; i < 80; i++) {
+ Wi = Gamma1(Wi - 2) + Wi - 7 + Gamma0(Wi - 15) + Wi - 16;
+ } 
+
+/* Compress */
+ #define RND(a,b,c,d,e,f,g,h,i) \
+ t0 = h + Sigma1(e) + Ch(e, f, g) + Ki + Wi; \
+ t1 = Sigma0(a) + Maj(a, b, c);\
+ d += t0; \
+ h = t0 + t1;
+
+ for (i = 0; i < 80; i += 8) {
+ RND(S0,S1,S2,S3,S4,S5,S6,S7,i+0);
+ RND(S7,S0,S1,S2,S3,S4,S5,S6,i+1);
+ RND(S6,S7,S0,S1,S2,S3,S4,S5,i+2);
+ RND(S5,S6,S7,S0,S1,S2,S3,S4,i+3);
+ RND(S4,S5,S6,S7,S0,S1,S2,S3,i+4);
+ RND(S3,S4,S5,S6,S7,S0,S1,S2,i+5);
+ RND(S2,S3,S4,S5,S6,S7,S0,S1,i+6);
+ RND(S1,S2,S3,S4,S5,S6,S7,S0,i+7);
+ }
+
+ #undef RND
+
+
+
+ /* feedback */
+ for (i = 0; i < 8; i++) {
+ md->statei = md->statei + Si;
+ }
+
+ return 0;
+}
+
+
+/**
+ Initialize the hash state
+ @param md The hash state you wish to initialize
+ @return 0 if successful
+*/
+int sha512_init(sha512_context * md) {
+ if (md == NULL) return 1;
+
+ md->curlen = 0;
+ md->length = 0;
+ md->state0 = UINT64_C(0x6a09e667f3bcc908);
+ md->state1 = UINT64_C(0xbb67ae8584caa73b);
+ md->state2 = UINT64_C(0x3c6ef372fe94f82b);
+ md->state3 = UINT64_C(0xa54ff53a5f1d36f1);
+ md->state4 = UINT64_C(0x510e527fade682d1);
+ md->state5 = UINT64_C(0x9b05688c2b3e6c1f);
+ md->state6 = UINT64_C(0x1f83d9abfb41bd6b);
+ md->state7 = UINT64_C(0x5be0cd19137e2179);
+
+ return 0;
+}
+
+/**
+ Process a block of memory though the hash
+ @param md The hash state
+ @param in The data to hash
+ @param inlen The length of the data (octets)
+ @return 0 if successful
+*/
+int sha512_update (sha512_context * md, const unsigned char *in, size_t inlen) 
+{ 
+ size_t n;
+ size_t i; 
+ int err; 
+ if (md == NULL) return 1; 
+ if (in == NULL) return 1; 
+ if (md->curlen > sizeof(md->buf)) { 
+ return 1; 
+ } 
+ while (inlen > 0) { 
+ if (md->curlen == 0 && inlen >= 128) { 
+ if ((err = sha512_compress (md, (unsigned char *)in)) != 0) { 
+ return err; 
+ } 
+ md->length += 128 * 8; 
+ in += 128; 
+ inlen -= 128; 
+ } else { 
+ n = MIN(inlen, (128 - md->curlen));
+
+ for (i = 0; i < n; i++) {
+ md->bufi + md->curlen = ini;
+ }
+
+
+ md->curlen += n; 
+ in += n; 
+ inlen -= n; 
+ if (md->curlen == 128) { 
+ if ((err = sha512_compress (md, md->buf)) != 0) { 
+ return err; 
+ } 
+ md->length += 8*128; 
+ md->curlen = 0; 
+ } 
+ } 
+ } 
+ return 0; 
+}
+
+/**
+ Terminate the hash to get the digest
+ @param md The hash state
+ @param out out The destination of the hash (64 bytes)
+ @return 0 if successful
+*/
+ int sha512_final(sha512_context * md, unsigned char *out)
+ {
+ int i;
+
+ if (md == NULL) return 1;
+ if (out == NULL) return 1;
+
+ if (md->curlen >= sizeof(md->buf)) {
+ return 1;
+ }
+
+ /* increase the length of the message */
+ md->length += md->curlen * UINT64_C(8);
+
+ /* append the '1' bit */
+ md->bufmd->curlen++ = (unsigned char)0x80;
+
+ /* if the length is currently above 112 bytes we append zeros
+ * then compress. Then we can fall back to padding zeros and length
+ * encoding like normal.
+ */
+ if (md->curlen > 112) {
+ while (md->curlen < 128) {
+ md->bufmd->curlen++ = (unsigned char)0;
+ }
+ sha512_compress(md, md->buf);
+ md->curlen = 0;
+ }
+
+ /* pad upto 120 bytes of zeroes 
+ * note: that from 112 to 120 is the 64 MSB of the length. We assume that you won't hash
+ * > 2^64 bits of data... :-)
+ */
+while (md->curlen < 120) {
+ md->bufmd->curlen++ = (unsigned char)0;
+}
+
+ /* store length */
+STORE64H(md->length, md->buf+120);
+sha512_compress(md, md->buf);
+
+ /* copy output */
+for (i = 0; i < 8; i++) {
+ STORE64H(md->statei, out+(8*i));
+}
+
+return 0;
+}
+
+int sha512(const unsigned char *message, size_t message_len, unsigned char *out)
+{
+ sha512_context ctx;
+ int ret;
+ if ((ret = sha512_init(&ctx))) return ret;
+ if ((ret = sha512_update(&ctx, message, message_len))) return ret;
+ if ((ret = sha512_final(&ctx, out))) return ret;
+ return 0;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/sha512.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/sign.c Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/Vendor/ed25519-sparkle/src/verify.c Added

@@ -0,0 +1,77 @@
+#include "ed25519.h"
+#include "sha512.h"
+#include "ge.h"
+#include "sc.h"
+
+static int consttime_equal(const unsigned char *x, const unsigned char *y) {
+    unsigned char r = 0;
+
+    r = x0 ^ y0;
+    #define F(i) r |= xi ^ yi
+    F(1);
+    F(2);
+    F(3);
+    F(4);
+    F(5);
+    F(6);
+    F(7);
+    F(8);
+    F(9);
+    F(10);
+    F(11);
+    F(12);
+    F(13);
+    F(14);
+    F(15);
+    F(16);
+    F(17);
+    F(18);
+    F(19);
+    F(20);
+    F(21);
+    F(22);
+    F(23);
+    F(24);
+    F(25);
+    F(26);
+    F(27);
+    F(28);
+    F(29);
+    F(30);
+    F(31);
+    #undef F
+
+    return !r;
+}
+
+int ed25519_verify(const unsigned char *signature, const unsigned char *message, size_t message_len, const unsigned char *public_key) {
+    unsigned char h64;
+    unsigned char checker32;
+    sha512_context hash;
+    ge_p3 A;
+    ge_p2 R;
+
+    if (signature63 & 224) {
+        return 0;
+    }
+
+    if (ge_frombytes_negate_vartime(&A, public_key) != 0) {
+        return 0;
+    }
+
+    sha512_init(&hash);
+    sha512_update(&hash, signature, 32);
+    sha512_update(&hash, public_key, 32);
+    sha512_update(&hash, message, message_len);
+    sha512_final(&hash, h);
+    
+    sc_reduce(h);
+    ge_double_scalarmult_vartime(&R, h, &A, signature + 32);
+    ge_tobytes(checker, &R);
+
+    if (!consttime_equal(checker, signature)) {
+        return 0;
+    }
+
+    return 1;
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/bin Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/bin/old_dsa_scripts Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/bin/old_dsa_scripts/sign_update Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/Appcast.swift Added

@@ -0,0 +1,540 @@
+//
+// Created by Kornel on 23/12/2016.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+
+func makeError(code: SUError, _ description: String) -> NSError {
+ return NSError(domain: SUSparkleErrorDomain, code: Int(OSStatus(code.rawValue)), userInfo: 
+ NSLocalizedDescriptionKey: description,
+ )
+}
+
+typealias UpdateVersion = String
+typealias FeedName = String
+
+struct Appcast {
+ let inferredAppName: String
+ let versionsInFeed: UpdateVersion
+ let ignoredVersionsToInsert: Set<UpdateVersion>
+ let archives: UpdateVersion: ArchiveItem
+ let deltaPathsUsed: Set<String>
+ let deltaFromVersionsUsed: Set<UpdateVersion>
+}
+
+func makeAppcasts(archivesSourceDir: URL, outputPathURL: URL?, cacheDirectory cacheDir: URL, keys: PrivateKeys, versions: Set<String>?, maxVersionsPerBranchInFeed: Int, newChannel: String?, majorVersion: String?, maximumDeltas: Int, deltaCompressionModeDescription: String, deltaCompressionLevel: UInt8, disableNestedCodeCheck: Bool, downloadURLPrefix: URL?, releaseNotesURLPrefix: URL?, verbose: Bool) throws -> FeedName: Appcast {
+ let standardComparator = SUStandardVersionComparator()
+ let descendingVersionComparator: (String, String) -> Bool = {
+ return standardComparator.compareVersion($0, toVersion: $1) == .orderedDescending
+ }
+ 
+ let allUpdates = (try unarchiveUpdates(archivesSourceDir: archivesSourceDir, archivesDestDir: cacheDir, disableNestedCodeCheck: disableNestedCodeCheck, verbose: verbose))
+ .sorted(by: { descendingVersionComparator($0.version, $1.version) })
+
+ if allUpdates.count == 0 {
+ throw makeError(code: .noUpdateError, "No usable archives found in \(archivesSourceDir.path)")
+ }
+ 
+ // Apply download and release notes prefixes
+ for update in allUpdates {
+ update.downloadUrlPrefix = downloadURLPrefix
+ update.releaseNotesURLPrefix = releaseNotesURLPrefix
+ }
+
+ // Group updates by appcast feed
+ var updatesByAppcast: FeedName: ArchiveItem = :
+ for update in allUpdates {
+ let appcastFile = update.feedURL?.lastPathComponent ?? "appcast.xml"
+ updatesByAppcastappcastFile, default: .append(update)
+ }
+ 
+ // If a (single) output filename was specified on the command-line, but more than one
+ // appcast file was found in the archives, then it's an error.
+ if let outputPathURL = outputPathURL, updatesByAppcast.count > 1 {
+ throw makeError(code: .appcastError, "Cannot write to \(outputPathURL.path): multiple appcasts found")
+ }
+ 
+ let group = DispatchGroup()
+ 
+ var appcastByFeed: FeedName: Appcast = :
+ for (feed, updates) in updatesByAppcast {
+ var archivesTable: UpdateVersion: ArchiveItem = :
+ for update in updates {
+ archivesTableupdate.version = update
+ }
+ 
+ let feedURL = outputPathURL ?? archivesSourceDir.appendingPathComponent(feed)
+ 
+ // Find all the update versions & branches from our existing feed (if available)
+ let feedUpdateBranches: UpdateVersion: UpdateBranch
+ if let reachable = try? feedURL.checkResourceIsReachable(), reachable {
+ feedUpdateBranches = try readAppcast(archives: archivesTable, appcastURL: feedURL)
+ } else {
+ feedUpdateBranches = :
+ }
+ 
+ // Find which versions are new and old but aren't in the feed and that we should ignore/skip
+ var ignoredVersionsToInsert: Set<UpdateVersion> = Set()
+ var ignoredOldVersions: Set<UpdateVersion> = Set()
+ if let versions = versions {
+ // Note for this path we may be adding old updates to ignoredVersionsToInsert too.
+ // It is difficult to differentiate between old and potential new updates that aren't in the feed
+ // As a consequence, some old updates may not be pruned with this option.
+ for update in updates {
+ if feedUpdateBranchesupdate.version == nil && !versions.contains(update.version) {
+ ignoredVersionsToInsert.insert(update.version)
+ }
+ }
+ } else {
+ // If the user doesn't specify which versions to generate updates for,
+ // then by default we ignore generating updates that are less than the latest update in the existing feed
+ // The reason why we need to do this is because new branch-specific flags the user can specify like the channel
+ // or the major version will be applied to new unknown updates. We can only absolutely be sure to apply this to
+ // updates that are greater in version than the top of the current feed, or if the user uses --versions.
+ for latestUpdateCandidate in updates {
+ if feedUpdateBrancheslatestUpdateCandidate.version != nil {
+ // Found the latest update in the feed
+ let latestUpdateVersionInFeed = latestUpdateCandidate.version
+ 
+ // Filter out any new potential updates that are less than our latest update in our existing feed
+ for update in updates {
+ if feedUpdateBranchesupdate.version == nil && descendingVersionComparator(latestUpdateVersionInFeed, update.version) {
+ ignoredOldVersions.insert(update.version)
+ }
+ }
+ break
+ }
+ }
+ }
+ 
+ // Find new update versions and their branches
+ var newUpdateBranches: UpdateVersion: UpdateBranch = :
+ do {
+ for update in updates {
+ if !ignoredOldVersions.contains(update.version) && !ignoredVersionsToInsert.contains(update.version) && feedUpdateBranchesupdate.version == nil {
+ newUpdateBranchesupdate.version = UpdateBranch(minimumSystemVersion: update.minimumSystemVersion, maximumSystemVersion: nil, minimumAutoupdateVersion: majorVersion, channel: newChannel)
+ }
+ }
+ }
+ 
+ // Compute latest versions per distinct branch we need to keep
+ // Also compute the batch of recent versions we should preserve/add in the feed
+ let versionsPreservedInFeed: UpdateVersion
+ var latestVersionPerBranch: Set<UpdateVersion> = 
+ do {
+ // Group update versions by branch
+ var updatesGroupedByBranch: UpdateBranch: UpdateVersion = :
+
+ for (version, branch) in feedUpdateBranches {
+ updatesGroupedByBranchbranch, default: .append(version)
+ }
+ for (version, branch) in newUpdateBranches {
+ updatesGroupedByBranchbranch, default: .append(version)
+ }
+ 
+ // Grab latest batch of versions per branch
+ for (branch, versions) in updatesGroupedByBranch {
+ updatesGroupedByBranchbranch = Array(versions.sorted(by: descendingVersionComparator).prefix(maxVersionsPerBranchInFeed))
+ }
+ 
+ // Remove extraneous versions for branches that have converged,
+ // as long as the user doesn't opt into keeping all versions in the feed
+ if maxVersionsPerBranchInFeed < Int.max {
+ for (branch, versions) in updatesGroupedByBranch {
+ guard branch.channel != nil else {
+ continue
+ }
+ 
+ let defaultChannelBranch = UpdateBranch(minimumSystemVersion: branch.minimumSystemVersion, maximumSystemVersion: branch.maximumSystemVersion, minimumAutoupdateVersion: branch.minimumAutoupdateVersion, channel: nil)
+ 
+ guard let defaultChannelVersions = updatesGroupedByBranchdefaultChannelBranch else {
+ continue
+ }
+ 
+ if descendingVersionComparator(defaultChannelVersions0, versions0) {
+ updatesGroupedByBranchbranch = versions0
+ }
+ }
+ }
+ 
+ // Grab latest versions per branch
+ var latestBatchOfVersionsPerBranch: Set<UpdateVersion> = 
+ for (_, versions) in updatesGroupedByBranch {
+ latestBatchOfVersionsPerBranch.formUnion(versions)
+ latestVersionPerBranch.insert(versions0)
+ }
+ 
+ versionsPreservedInFeed = Array(latestBatchOfVersionsPerBranch).sorted(by: descendingVersionComparator)
+ }
+
+ // Update signatures for the latest updates we keep in the feed
+ for version in versionsPreservedInFeed {
+ guard let update = archivesTableversion else {
+ continue
+ }
+ 
+ group.enter()
+ DispatchQueue.global().async {
+ if let privateDSAKey = keys.privateDSAKey {
+ do {
+ update.dsaSignature = try dsaSignature(path: update.archivePath, privateDSAKey: privateDSAKey)
+ } catch {
+ print(update, error)
+ }
+ } else if update.supportsDSA {
+ print("Note: did not sign with legacy DSA \(update.archivePath.path) because private DSA key file was not specified")
+ }
+ if let publicEdKey = update.publicEdKey {
+ if let privateEdKey = keys.privateEdKey, let expectedPublicKey = keys.publicEdKey {
+ if publicEdKey == expectedPublicKey {
+ do {
+ update.edSignature = try edSignature(path: update.archivePath, publicEdKey: publicEdKey, privateEdKey: privateEdKey)
+ } catch {
+ print(update, error)
+ }
+ } else {
+ print("Warning: SUPublicEDKey in the app \(update.archivePath.path) does not match key EdDSA in the Keychain. Run generate_keys and update Info.plist to match")
+ }
+ } else {
+ print("Warning: could not sign \(update.archivePath.path) due to lack of private EdDSA key")
+ }
+ }
+
+ group.leave()
+ }
+ }
+ 
+ // Generate delta updates from the latest updates we keep
+ // Keep track of which delta archives we need referenced in the appcast still
+ var deltaPathsUsed: Set<String> = 
+ var deltaFromVersionsUsed: Set<UpdateVersion> = 
+ for version in versionsPreservedInFeed {
+ guard let latestItem = archivesTableversion else {
+ continue
+ }
+ 
+ // We only generate deltas for the latest version per branch,
+ // but we still wanted to record the used delta updates for a batch of recent updates
+ // This is to support rollback in case the top newly generated update isn't exactly what the user wants
+ let generatingDeltas = latestVersionPerBranch.contains(version)
+ var numDeltas = 0
+ let appBaseName = latestItem.appPath.deletingPathExtension().lastPathComponent
+ for item in updates {
+ if numDeltas >= maximumDeltas {
+ break
+ }
+
+ // No downgrades
+ if .orderedAscending != standardComparator.compareVersion(item.version, toVersion: latestItem.version) {
+ continue
+ }
+ 
+ // Old version will not be able to verify the new version
+ if !item.supportsDSA && item.publicEdKey == nil {
+ continue
+ }
+
+ let deltaBaseName = appBaseName + latestItem.version + "-" + item.version
+ let deltaPath = archivesSourceDir.appendingPathComponent(deltaBaseName).appendingPathExtension("delta")
+ 
+ deltaPathsUsed.insert(deltaPath.path)
+ deltaFromVersionsUsed.insert(item.version)
+ 
+ numDeltas += 1
+ 
+ if !generatingDeltas {
+ continue
+ }
+
+ var delta: DeltaUpdate
+ let ignoreMarkerPath = cacheDir.appendingPathComponent(deltaPath.lastPathComponent).appendingPathExtension(".ignore")
+ let fm = FileManager.default
+ if fm.fileExists(atPath: ignoreMarkerPath.path) {
+ continue
+ }
+ if !fm.fileExists(atPath: deltaPath.path) {
+ // Test if old and new app have the same code signing signature. If not, omit a warning.
+ // This is a good time to do this check because our delta handling code sets a marker
+ // to avoid this path each time generate_appcast is called.
+ let oldAppCodeSigned = SUCodeSigningVerifier.bundle(atURLIsCodeSigned: item.appPath)
+ let newAppCodeSigned = SUCodeSigningVerifier.bundle(atURLIsCodeSigned: latestItem.appPath)
+ 
+ if oldAppCodeSigned != newAppCodeSigned && !newAppCodeSigned {
+ print("Warning: New app is not code signed but older version (\(item)) is: \(latestItem)")
+ } else if oldAppCodeSigned && newAppCodeSigned {
+ do {
+ try SUCodeSigningVerifier.codeSignature(atBundleURL: item.appPath, matchesSignatureAtBundleURL: latestItem.appPath)
+ } catch {
+ print("Warning: found mismatch code signing identity between \(item) and \(latestItem)")
+ }
+ }
+ 
+ do {
+ // Decide the most appropriate delta version
+ let deltaVersion: SUBinaryDeltaMajorVersion
+ if let frameworkVersion = item.frameworkVersion {
+ switch standardComparator.compareVersion(frameworkVersion, toVersion: "2010") {
+ case .orderedSame:
+ fallthrough
+ case .orderedDescending:
+ deltaVersion = .version3
+ case .orderedAscending:
+ deltaVersion = .version2
+ }
+ } else {
+ deltaVersion = SUBinaryDeltaMajorVersionDefault
+ print("Warning: Sparkle.framework version for \(item.appPath.lastPathComponent) (\(item.shortVersion) (\(item.version))) was not found. Falling back to generating delta using default delta version..")
+ }
+ 
+ let requestedDeltaCompressionMode = deltaCompressionModeFromDescription(deltaCompressionModeDescription, nil)
+ 
+ // Version 2 formats only support bzip2, none, and default options
+ let deltaCompressionMode: SPUDeltaCompressionMode
+ if deltaVersion == .version2 {
+ switch requestedDeltaCompressionMode {
+ case .LZFSE:
+ fallthrough
+ case .LZ4:
+ fallthrough
+ case .LZMA:
+ fallthrough
+ case .ZLIB:
+ deltaCompressionMode = .bzip2
+ print("Warning: Delta compression mode '\(deltaCompressionModeDescription)' was requested but using default compression instead because version 2 delta file from version \(item.version) needs to be generated..")
+ case SPUDeltaCompressionModeDefault:
+ fallthrough
+ case .none:
+ fallthrough
+ case .bzip2:
+ deltaCompressionMode = requestedDeltaCompressionMode
+ @unknown default:
+ // This shouldn't happen
+ print("Warning: failed to parse delta compression mode \(deltaCompressionModeDescription). There is a logic bug in generate_appcast.")
+ deltaCompressionMode = SPUDeltaCompressionModeDefault
+ }
+ } else {
+ deltaCompressionMode = requestedDeltaCompressionMode
+ }
+ 
+ delta = try DeltaUpdate.create(from: item, to: latestItem, deltaVersion: deltaVersion, deltaCompressionMode: deltaCompressionMode, deltaCompressionLevel: deltaCompressionLevel, archivePath: deltaPath)
+ } catch {
+ print("Could not create delta update", deltaPath.path, error)
+ continue
+ }
+ } else {
+ delta = DeltaUpdate(fromVersion: item.version, archivePath: deltaPath, sparkleExecutableFileSize: item.sparkleExecutableFileSize, sparkleLocales: item.sparkleLocales)
+ }
+
+ // Require delta to be a bit smaller
+ if delta.fileSize / 7 > latestItem.fileSize / 8 {
+ markDeltaAsIgnored(delta: delta, markerPath: ignoreMarkerPath)
+ continue
+ }
+
+ group.enter()
+ DispatchQueue.global().async {
+ if item.supportsDSA, let privateDSAKey = keys.privateDSAKey {
+ do {
+ delta.dsaSignature = try dsaSignature(path: deltaPath, privateDSAKey: privateDSAKey)
+ } catch {
+ print(delta.archivePath.lastPathComponent, error)
+ }
+ }
+ if let publicEdKey = item.publicEdKey, let privateEdKey = keys.privateEdKey {
+ do {
+ delta.edSignature = try edSignature(path: deltaPath, publicEdKey: publicEdKey, privateEdKey: privateEdKey)
+ } catch {
+ print(delta.archivePath.lastPathComponent, error)
+ }
+ }
+ if delta.dsaSignature != nil || delta.edSignature != nil {
+ latestItem.deltas.append(delta)
+ } else {
+ markDeltaAsIgnored(delta: delta, markerPath: ignoreMarkerPath)
+ print("Delta \(delta.archivePath.path) ignored, because it could not be signed")
+ }
+ group.leave()
+ }
+ }
+ }
+ 
+ let inferredAppName = updates0.appPath.deletingPathExtension().lastPathComponent
+ let appcast = Appcast(inferredAppName: inferredAppName, versionsInFeed: versionsPreservedInFeed, ignoredVersionsToInsert: ignoredVersionsToInsert, archives: archivesTable, deltaPathsUsed: deltaPathsUsed, deltaFromVersionsUsed: deltaFromVersionsUsed)
+ appcastByFeedfeed = appcast
+ }
+ 
+ group.wait()
+
+ return appcastByFeed
+}
+
+func moveOldUpdatesFromAppcasts(archivesSourceDir: URL, oldFilesDirectory: URL, cacheDirectory: URL, appcasts: Appcast, autoPruneUpdates: Bool) -> (movedCount: Int, prunedCount: Int) {
+ let fileManager = FileManager.default
+ let suFileManager = SUFileManager()
+ 
+ // Create old files updates directory if needed
+ var createdOldFilesDirectory = false
+ let makeOldFilesDirectory: () -> Bool = {
+ guard !createdOldFilesDirectory else {
+ return true
+ }
+ 
+ if fileManager.fileExists(atPath: oldFilesDirectory.path) {
+ createdOldFilesDirectory = true
+ return true
+ }
+ 
+ do {
+ try fileManager.createDirectory(at: oldFilesDirectory, withIntermediateDirectories: false)
+ 
+ createdOldFilesDirectory = true
+ 
+ return true
+ } catch {
+ print("Warning: failed to create \(oldFilesDirectory.lastPathComponent) in \(archivesSourceDir.lastPathComponent): \(error)")
+ return false
+ }
+ }
+ 
+ var movedItemsCount = 0
+ 
+ // Move aside all old unused update items
+ for appcast in appcasts {
+ let versionsInFeedSet = Set(appcast.versionsInFeed)
+ for (version, update) in appcast.archives {
+ guard !versionsInFeedSet.contains(version) && !appcast.deltaFromVersionsUsed.contains(version) && !appcast.ignoredVersionsToInsert.contains(version) else {
+ continue
+ }
+ 
+ let archivePath = update.archivePath
+ 
+ guard makeOldFilesDirectory() else {
+ return (movedItemsCount, 0)
+ }
+ 
+ do {
+ try suFileManager.updateModificationAndAccessTimeOfItem(at: archivePath)
+ } catch {
+ print("Warning: failed to update modification time for \(archivePath.path): \(error)")
+ }
+ 
+ do {
+ try fileManager.moveItem(at: archivePath, to: oldFilesDirectory.appendingPathComponent(archivePath.lastPathComponent))
+ 
+ movedItemsCount += 1
+ 
+ // Remove cache for the update
+ let appCachePath = update.appPath.deletingLastPathComponent()
+ let _ = try? fileManager.removeItem(at: appCachePath)
+ } catch {
+ print("Warning: failed to move \(archivePath.lastPathComponent) to \(oldFilesDirectory.lastPathComponent): \(error)")
+ }
+ 
+ let releaseNotesFile = archivePath.deletingPathExtension().appendingPathExtension("html")
+ if fileManager.fileExists(atPath: releaseNotesFile.path) {
+ do {
+ try suFileManager.updateModificationAndAccessTimeOfItem(at: releaseNotesFile)
+ } catch {
+ print("Warning: failed to update modification time for \(releaseNotesFile.path): \(error)")
+ }
+ 
+ do {
+ try fileManager.moveItem(at: releaseNotesFile, to: oldFilesDirectory.appendingPathComponent(releaseNotesFile.lastPathComponent))
+ 
+ movedItemsCount += 1
+ } catch {
+ print("Warning: failed to move \(releaseNotesFile.lastPathComponent) to \(oldFilesDirectory.lastPathComponent): \(error)")
+ }
+ }
+ }
+ }
+ 
+ // Move aside all unused delta items in the archives directory
+ // We will be missing out on ignore markers in the cache for delta items because they're difficult to fetch
+ // However they are zero-sized so they don't take much space anyway
+ do {
+ let directoryContents = try fileManager.contentsOfDirectory(atPath: archivesSourceDir.path)
+ for filename in directoryContents {
+ guard filename.hasSuffix(".delta") else {
+ continue
+ }
+ 
+ let deltaURL = archivesSourceDir.appendingPathComponent(filename)
+ do {
+ var foundDeltaItemUsage = false
+ for appcast in appcasts {
+ if appcast.deltaPathsUsed.contains(deltaURL.path) {
+ foundDeltaItemUsage = true
+ break
+ }
+ }
+ 
+ guard !foundDeltaItemUsage else {
+ continue
+ }
+ }
+ 
+ guard makeOldFilesDirectory() else {
+ return (movedItemsCount, 0)
+ }
+ 
+ movedItemsCount += 1
+ 
+ do {
+ try suFileManager.updateModificationAndAccessTimeOfItem(at: deltaURL)
+ } catch {
+ print("Warning: Failed to update modification time for \(deltaURL.lastPathComponent): \(error)")
+ }
+ 
+ do {
+ try fileManager.moveItem(at: deltaURL, to: oldFilesDirectory.appendingPathComponent(filename))
+ } catch {
+ print("Warning: failed to move \(deltaURL.lastPathComponent) to \(oldFilesDirectory.lastPathComponent): \(error)")
+ }
+ }
+ } catch {
+ print("Warning: failed to list contents of \(archivesSourceDir.lastPathComponent) during pruning: \(error)")
+ }
+ 
+ var pruneCount = 0
+ if autoPruneUpdates {
+ // Garbage collect the old updates directory
+ do {
+ let directoryContents = try fileManager.contentsOfDirectory(atPath: oldFilesDirectory.path)
+ 
+ // Delete files that have roughly not been touched for 14 days
+ let prunedFileDeletionInterval: TimeInterval = 86400 * 14
+ 
+ let currentDate = Date()
+ for filename in directoryContents {
+ guard !filename.hasPrefix(".") else {
+ continue
+ }
+ 
+ let fileURL = oldFilesDirectory.appendingPathComponent(filename)
+ 
+ if let resourceValues = try? fileURL.resourceValues(forKeys: .contentModificationDateKey),
+ let lastModificationDate = resourceValues.contentModificationDate {
+ if currentDate.timeIntervalSince(lastModificationDate) >= prunedFileDeletionInterval {
+ do {
+ try fileManager.removeItem(at: fileURL)
+ pruneCount += 1
+ } catch {
+ print("Warning: failed to delete old update file \(oldFilesDirectory.lastPathComponent)/\(fileURL.lastPathComponent): \(error)")
+ }
+ }
+ }
+ }
+ } catch {
+ // Nothing to log for failing to fetch prunedDirectory
+ }
+ }
+ 
+ return (movedItemsCount, pruneCount)
+}
+
+func markDeltaAsIgnored(delta: DeltaUpdate, markerPath: URL) {
+ _ = try? FileManager.default.removeItem(at: delta.archivePath)
+ _ = try? Data.init().write(to: markerPath); // 0-sized file
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/ArchiveItem.swift Added

@@ -0,0 +1,360 @@
+//
+// Created by Kornel on 22/12/2016.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import UniformTypeIdentifiers
+
+struct UpdateBranch: Hashable {
+ let minimumSystemVersion: String?
+ let maximumSystemVersion: String?
+ let minimumAutoupdateVersion: String?
+ let channel: String?
+}
+
+class DeltaUpdate {
+ let fromVersion: String
+ let archivePath: URL
+ var dsaSignature: String?
+ var edSignature: String?
+ let sparkleExecutableFileSize: Int?
+ let sparkleLocales: String?
+
+ init(fromVersion: String, archivePath: URL, sparkleExecutableFileSize: Int?, sparkleLocales: String?) {
+ self.archivePath = archivePath
+ self.fromVersion = fromVersion
+ self.sparkleExecutableFileSize = sparkleExecutableFileSize
+ self.sparkleLocales = sparkleLocales
+ }
+
+ var fileSize: Int64 {
+ let archiveFileAttributes = try! FileManager.default.attributesOfItem(atPath: self.archivePath.path)
+ return (archiveFileAttributes.size as! NSNumber).int64Value
+ }
+
+ class func create(from: ArchiveItem, to: ArchiveItem, deltaVersion: SUBinaryDeltaMajorVersion, deltaCompressionMode: SPUDeltaCompressionMode, deltaCompressionLevel: UInt8, archivePath: URL) throws -> DeltaUpdate {
+ var createDiffError: NSError?
+
+ if !createBinaryDelta(from.appPath.path, to.appPath.path, archivePath.path, deltaVersion, deltaCompressionMode, deltaCompressionLevel, false, &createDiffError) {
+ throw createDiffError!
+ }
+ 
+ // Ensure applying the diff also succeeds
+ let fileManager = FileManager.default
+ 
+ let tempApplyToPath = to.appPath.deletingLastPathComponent().appendingPathComponent(".temp_" + to.appPath.lastPathComponent)
+ let _ = try? fileManager.removeItem(at: tempApplyToPath)
+ 
+ var applyDiffError: NSError?
+ if !applyBinaryDelta(from.appPath.path, tempApplyToPath.path, archivePath.path, false, { _ in
+ }, &applyDiffError) {
+ let _ = try? fileManager.removeItem(at: archivePath)
+ throw applyDiffError!
+ }
+ 
+ let _ = try? fileManager.removeItem(at: tempApplyToPath)
+
+ return DeltaUpdate(fromVersion: from.version, archivePath: archivePath, sparkleExecutableFileSize: from.sparkleExecutableFileSize, sparkleLocales: from.sparkleLocales)
+ }
+}
+
+class ArchiveItem: CustomStringConvertible {
+ let version: String
+ // swiftlint:disable identifier_name
+ let _shortVersion: String?
+ let minimumSystemVersion: String
+ let frameworkVersion: String?
+ let sparkleExecutableFileSize: Int?
+ let sparkleLocales: String?
+ let archivePath: URL
+ let appPath: URL
+ let feedURL: URL?
+ let publicEdKey: Data?
+ let supportsDSA: Bool
+ let archiveFileAttributes: FileAttributeKey: Any
+ var deltas: DeltaUpdate
+
+ var dsaSignature: String?
+ var edSignature: String?
+ var downloadUrlPrefix: URL?
+ var releaseNotesURLPrefix: URL?
+
+ init(version: String, shortVersion: String?, feedURL: URL?, minimumSystemVersion: String?, frameworkVersion: String?, sparkleExecutableFileSize: Int?, sparkleLocales: String?, publicEdKey: String?, supportsDSA: Bool, appPath: URL, archivePath: URL) throws {
+ self.version = version
+ self._shortVersion = shortVersion
+ self.feedURL = feedURL
+ self.minimumSystemVersion = minimumSystemVersion ?? "10.13"
+ self.frameworkVersion = frameworkVersion
+ self.sparkleExecutableFileSize = sparkleExecutableFileSize
+ self.sparkleLocales = sparkleLocales
+ self.archivePath = archivePath
+ self.appPath = appPath
+ self.supportsDSA = supportsDSA
+ if let publicEdKey = publicEdKey {
+ self.publicEdKey = Data(base64Encoded: publicEdKey)
+ } else {
+ self.publicEdKey = nil
+ }
+ let path = (self.archivePath.path as NSString).resolvingSymlinksInPath
+ self.archiveFileAttributes = try FileManager.default.attributesOfItem(atPath: path)
+ self.deltas = 
+ }
+
+ convenience init(fromArchive archivePath: URL, unarchivedDir: URL, validateBundle: Bool, disableNestedCodeCheck: Bool) throws {
+ let resourceKeys: URLResourceKey
+ if #available(macOS 11, *) {
+ resourceKeys = .contentTypeKey
+ } else {
+ resourceKeys = .typeIdentifierKey
+ }
+ let items = try FileManager.default.contentsOfDirectory(at: unarchivedDir, includingPropertiesForKeys: resourceKeys, options: .skipsHiddenFiles)
+
+ let bundles = items.filter({
+ if let resourceValues = try? $0.resourceValues(forKeys: Set(resourceKeys)) {
+ if #available(macOS 11, *) {
+ return resourceValues.contentType!.conforms(to: .bundle)
+ } else {
+ return UTTypeConformsTo(resourceValues.typeIdentifier! as CFString, kUTTypeBundle)
+ }
+ } else {
+ return false
+ }
+ })
+ if bundles.count > 0 {
+ if bundles.count > 1 {
+ throw makeError(code: .unarchivingError, "Too many bundles in \(unarchivedDir.path) \(bundles)")
+ }
+
+ let appPath = bundles0
+ 
+ // If requested to validate the bundle, ensure it is properly signed
+ if validateBundle && SUCodeSigningVerifier.bundle(atURLIsCodeSigned: appPath) {
+ try SUCodeSigningVerifier.codeSignatureIsValid(atBundleURL: appPath, checkNestedCode: !disableNestedCodeCheck)
+ }
+ 
+ guard let infoPlist = NSDictionary(contentsOf: appPath.appendingPathComponent("Contents/Info.plist")) else {
+ throw makeError(code: .unarchivingError, "No plist \(appPath.path)")
+ }
+ guard let version = infoPlistkCFBundleVersionKey! as? String else {
+ throw makeError(code: .unarchivingError, "No Version \(kCFBundleVersionKey as String? ?? "missing kCFBundleVersionKey") \(appPath)")
+ }
+ let shortVersion = infoPlist"CFBundleShortVersionString" as? String
+ let publicEdKey = infoPlistSUPublicEDKeyKey as? String
+ let supportsDSA = infoPlistSUPublicDSAKeyKey != nil || infoPlistSUPublicDSAKeyFileKey != nil
+
+ var feedURL: URL?
+ if let feedURLStr = infoPlist"SUFeedURL" as? String {
+ feedURL = URL(string: feedURLStr)
+ if feedURL?.pathExtension == "php" {
+ feedURL = feedURL!.deletingLastPathComponent()
+ feedURL = feedURL!.appendingPathComponent("appcast.xml")
+ }
+ }
+ 
+ var frameworkVersion: String? = nil
+ let sparkleExecutableFileSize: Int?
+ let sparkleLocales: String?
+ do {
+ let canonicalFrameworksURL = appPath.appendingPathComponent("Contents/Frameworks/Sparkle.framework")
+ 
+ let frameworksURL: URL?
+ let usingLegacySparkleCore: Bool
+ if !FileManager.default.fileExists(atPath: canonicalFrameworksURL.path) {
+ // Try legacy SparkleCore framework that was shipping in early 2.0 betas
+ let sparkleCoreFrameworksURL = appPath.appendingPathComponent("Contents/Frameworks/SparkleCore.framework")
+ if FileManager.default.fileExists(atPath: sparkleCoreFrameworksURL.path) {
+ frameworksURL = sparkleCoreFrameworksURL
+ usingLegacySparkleCore = true
+ } else {
+ frameworksURL = nil
+ usingLegacySparkleCore = false
+ }
+ } else {
+ frameworksURL = canonicalFrameworksURL
+ usingLegacySparkleCore = false
+ }
+ 
+ if let frameworksURL = frameworksURL {
+ let resourcesURL = frameworksURL.appendingPathComponent("Resources").resolvingSymlinksInPath()
+ 
+ if let frameworkInfoPlist = NSDictionary(contentsOf: resourcesURL.appendingPathComponent("Info.plist")) {
+ frameworkVersion = frameworkInfoPlistkCFBundleVersionKey as String as? String
+ }
+ 
+ let frameworkExecutableURL = frameworksURL.appendingPathComponent(!usingLegacySparkleCore ? "Sparkle" : "SparkleCore").resolvingSymlinksInPath()
+ do {
+ let resourceValues = try frameworkExecutableURL.resourceValues(forKeys: .fileSizeKey)
+ 
+ sparkleExecutableFileSize = resourceValues.fileSize
+ } catch {
+ sparkleExecutableFileSize = nil
+ }
+ 
+ do {
+ let fileManager = FileManager.default
+ let resourcesDirectoryContents = try fileManager.contentsOfDirectory(atPath: resourcesURL.path)
+ let localeExtension = ".lproj"
+ let localeExtensionCount = localeExtension.count
+ let maxLocalesToProcess = 7
+ var localesPresent: String = 
+ var localeIndex = 0
+ for filename in resourcesDirectoryContents {
+ guard filename.hasSuffix(localeExtension) else {
+ continue
+ }
+ 
+ // English and Base directories are the least likely to be stripped,
+ // so let's not bother recording them.
+ guard filename != "en" && filename != "Base" else {
+ continue
+ }
+ 
+ let locale = String(filename.dropLast(localeExtensionCount))
+ localesPresent.append(locale)
+ localeIndex += 1
+ 
+ if localeIndex >= maxLocalesToProcess {
+ break
+ }
+ }
+ 
+ if localesPresent.count > 0 {
+ sparkleLocales = localesPresent.joined(separator: ",")
+ } else {
+ sparkleLocales = nil
+ }
+ } catch {
+ sparkleLocales = nil
+ }
+ } else {
+ sparkleExecutableFileSize = nil
+ sparkleLocales = nil
+ }
+ }
+
+ try self.init(version: version,
+ shortVersion: shortVersion,
+ feedURL: feedURL,
+ minimumSystemVersion: infoPlist"LSMinimumSystemVersion" as? String,
+ frameworkVersion: frameworkVersion,
+ sparkleExecutableFileSize: sparkleExecutableFileSize,
+ sparkleLocales: sparkleLocales,
+ publicEdKey: publicEdKey,
+ supportsDSA: supportsDSA,
+ appPath: appPath,
+ archivePath: archivePath)
+ } else {
+ throw makeError(code: .missingUpdateError, "No supported items in \(unarchivedDir) \(items) note: only .app bundles are supported")
+ }
+ }
+
+ var shortVersion: String {
+ return self._shortVersion ?? self.version
+ }
+
+ var description: String {
+ return "\(self.archivePath) \(self.version)"
+ }
+
+ var archiveURL: URL? {
+ guard let escapedFilename = self.archivePath.lastPathComponent.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
+ return nil
+ }
+ if let downloadUrlPrefix = self.downloadUrlPrefix {
+ // if a download url prefix was given use this one
+ return URL(string: escapedFilename, relativeTo: downloadUrlPrefix)
+ } else if let relativeFeedUrl = self.feedURL {
+ return URL(string: escapedFilename, relativeTo: relativeFeedUrl)
+ }
+ return URL(string: escapedFilename)
+ }
+
+ var pubDate: String {
+ let date = self.archiveFileAttributes.creationDate as! Date
+ let formatter = DateFormatter()
+ formatter.locale = Locale(identifier: "en_US_POSIX")
+ formatter.dateFormat = "EEE, dd MMM yyyy HH:mm:ss ZZ"
+ return formatter.string(from: date)
+ }
+
+ var fileSize: Int64 {
+ return (self.archiveFileAttributes.size as! NSNumber).int64Value
+ }
+
+ private var releaseNotesPath: URL? {
+ var basename = self.archivePath.deletingPathExtension()
+ if basename.pathExtension == "tar" { // tar.gz
+ basename = basename.deletingPathExtension()
+ }
+ let releaseNotes = basename.appendingPathExtension("html")
+ if !FileManager.default.fileExists(atPath: releaseNotes.path) {
+ return nil
+ }
+ return releaseNotes
+ }
+
+ private func getReleaseNotesAsHTMLFragment(_ path: URL, _ maxCDATAThreshold: Int) -> String? {
+ if let html = try? String(contentsOf: path) {
+ if html.utf8.count <= maxCDATAThreshold &&
+ !html.localizedCaseInsensitiveContains("<!DOCTYPE") &&
+ !html.localizedCaseInsensitiveContains("<body") {
+ return html
+ }
+ }
+ return nil
+ }
+ 
+ func releaseNotesHTML(maxCDATAThreshold: Int) -> String? {
+ if let path = self.releaseNotesPath {
+ return self.getReleaseNotesAsHTMLFragment(path, maxCDATAThreshold)
+ }
+ return nil
+ }
+ 
+ func releaseNotesURL(maxCDATAThreshold: Int) -> URL? {
+ guard let path = self.releaseNotesPath else {
+ return nil
+ }
+ // The file is already used as inline description
+ if self.getReleaseNotesAsHTMLFragment(path, maxCDATAThreshold) != nil {
+ return nil
+ }
+ return self.releaseNoteURL(for: path.lastPathComponent)
+ }
+ 
+ func releaseNoteURL(for unescapedFilename: String) -> URL? {
+ guard let escapedFilename = unescapedFilename.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) else {
+ return nil
+ }
+ if let releaseNotesURLPrefix = self.releaseNotesURLPrefix {
+ // If a URL prefix for release notes was passed on the commandline, use it
+ return URL(string: escapedFilename, relativeTo: releaseNotesURLPrefix)
+ } else if let relativeURL = self.feedURL {
+ return URL(string: escapedFilename, relativeTo: relativeURL)
+ } else {
+ return URL(string: escapedFilename)
+ }
+ }
+
+ func localizedReleaseNotes() -> (String, URL) {
+ var basename = archivePath.deletingPathExtension()
+ if basename.pathExtension == "tar" {
+ basename = basename.deletingPathExtension()
+ }
+ var localizedReleaseNotes = (String, URL)()
+ for languageCode in Locale.isoLanguageCodes {
+ let localizedReleaseNoteURL = basename
+ .appendingPathExtension(languageCode)
+ .appendingPathExtension("html")
+ if (try? localizedReleaseNoteURL.checkResourceIsReachable()) ?? false,
+ let localizedReleaseNoteRemoteURL = self.releaseNoteURL(for: localizedReleaseNoteURL.lastPathComponent)
+ {
+ localizedReleaseNotes.append((languageCode, localizedReleaseNoteRemoteURL))
+ }
+ }
+ return localizedReleaseNotes
+ }
+
+ let mimeType = "application/octet-stream"
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/Bridging-Header.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/FeedXML.swift Added

@@ -0,0 +1,484 @@
+//
+// Created by Kornel on 22/12/2016.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+
+func findElement(name: String, parent: XMLElement) -> XMLElement? {
+ if let found = try? parent.nodes(forXPath: name) {
+ if found.count > 0 {
+ if let element = found0 as? XMLElement {
+ return element
+ }
+ }
+ }
+ return nil
+}
+
+func findOrCreateElement(name: String, parent: XMLElement) -> XMLElement {
+ if let element = findElement(name: name, parent: parent) {
+ return element
+ }
+ let element = XMLElement(name: name)
+ parent.addChild(element)
+ return element
+}
+
+func text(_ text: String) -> XMLNode {
+ return XMLNode.text(withStringValue: text) as! XMLNode
+}
+
+func extractVersion(parent: XMLNode) -> String? {
+ guard let itemElement = parent as? XMLElement else {
+ return nil
+ }
+ 
+ // Look for version attribute in enclosure
+ if let enclosure = findElement(name: "enclosure", parent: itemElement) {
+ if let versionAttribute = enclosure.attribute(forName: SUAppcastAttributeVersion) {
+ return versionAttribute.stringValue
+ }
+ }
+
+ // Look for top level version element
+ if let versionElement = findElement(name: SUAppcastElementVersion, parent: itemElement) {
+ return versionElement.stringValue
+ }
+
+ return nil
+}
+
+func readAppcast(archives: String: ArchiveItem, appcastURL: URL) throws -> String: UpdateBranch {
+ let options: XMLNode.Options = 
+ XMLNode.Options.nodeLoadExternalEntitiesNever,
+ XMLNode.Options.nodePreserveCDATA,
+ XMLNode.Options.nodePreserveWhitespace,
+ 
+ let doc = try XMLDocument(contentsOf: appcastURL, options: options)
+ 
+ let rootNodes = try doc.nodes(forXPath: "/rss")
+ if rootNodes.count != 1 {
+ throw makeError(code: .appcastError, "Weird XML? \(appcastURL.path)")
+ }
+ 
+ let root = rootNodes0 as! XMLElement
+ 
+ let channelNodes = try root.nodes(forXPath: "channel")
+ if channelNodes.count == 0 {
+ throw makeError(code: .appcastError, "Weird Feed? No channels: \(appcastURL.path)")
+ }
+ 
+ let channel = channelNodes0 as! XMLElement
+ 
+ guard let itemNodes = try? channel.nodes(forXPath: "item") else {
+ return :
+ }
+ 
+ var updateBranches: String: UpdateBranch = :
+ for item in itemNodes {
+ guard let item = item as? XMLElement else {
+ continue
+ }
+ 
+ let version: String?
+ if let versionElement = findElement(name: SUAppcastElementVersion, parent: item) {
+ version = versionElement.stringValue
+ } else if let enclosure = findElement(name: "enclosure", parent: item), let versionAttribute = enclosure.attribute(forName: SUAppcastAttributeVersion) {
+ version = versionAttribute.stringValue
+ } else {
+ version = nil
+ }
+ 
+ guard let version = version else {
+ continue
+ }
+ 
+ let minimumSystemVersion: String?
+ if let minVer = findElement(name: SUAppcastElementMinimumSystemVersion, parent: item) {
+ minimumSystemVersion = minVer.stringValue
+ } else if let archive = archivesversion {
+ minimumSystemVersion = archive.minimumSystemVersion
+ } else {
+ minimumSystemVersion = nil
+ }
+ 
+ let maximumSystemVersion: String?
+ if let maxVer = findElement(name: SUAppcastElementMaximumSystemVersion, parent: item) {
+ maximumSystemVersion = maxVer.stringValue
+ } else {
+ maximumSystemVersion = nil
+ }
+ 
+ let minimumAutoupdateVersion: String?
+ if let minimumAutoupdateVersionElement = findElement(name: SUAppcastElementMinimumAutoupdateVersion, parent: item) {
+ minimumAutoupdateVersion = minimumAutoupdateVersionElement.stringValue
+ } else {
+ minimumAutoupdateVersion = nil
+ }
+ 
+ let sparkleChannel: String?
+ if let sparkleChannelElement = findElement(name: SUAppcastElementChannel, parent: item) {
+ sparkleChannel = sparkleChannelElement.stringValue
+ } else {
+ sparkleChannel = nil
+ }
+ 
+ let updateBranch = UpdateBranch(minimumSystemVersion: minimumSystemVersion, maximumSystemVersion: maximumSystemVersion, minimumAutoupdateVersion: minimumAutoupdateVersion, channel: sparkleChannel)
+ 
+ updateBranchesversion = updateBranch
+ }
+ 
+ return updateBranches
+}
+
+func writeAppcast(appcastDestPath: URL, appcast: Appcast, fullReleaseNotesLink: String?, maxCDATAThreshold: Int, link: String?, newChannel: String?, majorVersion: String?, ignoreSkippedUpgradesBelowVersion: String?, phasedRolloutInterval: Int?, criticalUpdateVersion: String?, informationalUpdateVersions: String?) throws -> (numNewUpdates: Int, numExistingUpdates: Int, numUpdatesRemoved: Int) {
+ let appBaseName = appcast.inferredAppName
+
+ let sparkleNS = "http://www.andymatuschak.org/xml-namespaces/sparkle"
+
+ var doc: XMLDocument
+ do {
+ let options: XMLNode.Options = 
+ XMLNode.Options.nodeLoadExternalEntitiesNever,
+ XMLNode.Options.nodePreserveCDATA,
+ XMLNode.Options.nodePreserveWhitespace,
+ 
+ doc = try XMLDocument(contentsOf: appcastDestPath, options: options)
+ } catch {
+ let root = XMLElement(name: "rss")
+ root.addAttribute(XMLNode.attribute(withName: "xmlns:sparkle", stringValue: sparkleNS) as! XMLNode)
+ root.addAttribute(XMLNode.attribute(withName: "version", stringValue: "2.0") as! XMLNode)
+ doc = XMLDocument(rootElement: root)
+ doc.isStandalone = true
+ }
+
+ var channel: XMLElement
+
+ let rootNodes = try doc.nodes(forXPath: "/rss")
+ if rootNodes.count != 1 {
+ throw makeError(code: .appcastError, "Weird XML? \(appcastDestPath.path)")
+ }
+ let root = rootNodes0 as! XMLElement
+ let channelNodes = try root.nodes(forXPath: "channel")
+ var numUpdatesRemoved: Int = 0
+ 
+ if channelNodes.count > 0 {
+ channel = channelNodes0 as! XMLElement
+ 
+ // Enumerate through all existing update items and remove any that we aren't going to keep
+ let versionsInFeedSet = Set(appcast.versionsInFeed)
+ var nodesToRemove: XMLElement = 
+ if let itemNodes = try? channel.nodes(forXPath: "item") {
+ for item in itemNodes {
+ guard let item = item as? XMLElement else {
+ continue
+ }
+ 
+ let version: String?
+ if let versionElement = findElement(name: SUAppcastElementVersion, parent: item) {
+ version = versionElement.stringValue
+ } else if let enclosure = findElement(name: "enclosure", parent: item), let versionAttribute = enclosure.attribute(forName: SUAppcastAttributeVersion) {
+ version = versionAttribute.stringValue
+ } else {
+ version = nil
+ }
+ 
+ guard let version = version else {
+ continue
+ }
+ 
+ if !versionsInFeedSet.contains(version) {
+ nodesToRemove.append(item)
+ }
+ }
+ 
+ // Remove old nodes from highest-to-lowest index order
+ for node in nodesToRemove.reversed() {
+ channel.removeChild(at: node.index)
+ }
+ 
+ numUpdatesRemoved = nodesToRemove.count
+ }
+ } else {
+ channel = XMLElement(name: "channel")
+ channel.addChild(XMLElement.element(withName: "title", stringValue: appBaseName) as! XMLElement)
+ root.addChild(channel)
+ }
+ 
+ var numNewUpdates = 0
+ var numExistingUpdates = 0
+ 
+ let versionComparator = SUStandardVersionComparator()
+
+ var numItems = 0
+ for version in appcast.versionsInFeed {
+ guard let update = appcast.archivesversion else {
+ continue
+ }
+ 
+ var item: XMLElement
+ 
+ var existingItems = try channel.nodes(forXPath: "itemenclosure@\(SUAppcastAttributeVersion)=\"\(update.version)\"")
+ if existingItems.count == 0 {
+ // Fall back to see if any items are using the element version variant
+ existingItems = try channel.nodes(forXPath: "item\(SUAppcastElementVersion)=\"\(update.version)\"")
+ }
+ 
+ let createNewItem = (existingItems.count == 0)
+ 
+ if createNewItem {
+ numNewUpdates += 1
+ } else {
+ numExistingUpdates += 1
+ }
+ numItems += 1
+
+ if createNewItem {
+ item = XMLElement.element(withName: "item") as! XMLElement
+ 
+ // When we insert a new item, find the best place to insert the new update item in
+ // This takes account of existing items and even ones that we don't have existing info on
+ var foundBestUpdateInsertion = false
+ if let itemNodes = try? channel.nodes(forXPath: "item") {
+ for childItemNode in itemNodes {
+ guard let childItemNode = childItemNode as? XMLElement else {
+ continue
+ }
+ 
+ guard let childItemVersion = extractVersion(parent: childItemNode) else {
+ continue
+ }
+
+ if versionComparator.compareVersion(update.version, toVersion: childItemVersion) == .orderedDescending {
+ channel.insertChild(item, at: childItemNode.index)
+ foundBestUpdateInsertion = true
+ break
+ }
+ }
+ }
+
+ if !foundBestUpdateInsertion {
+ channel.addChild(item)
+ }
+ } else {
+ item = existingItems0 as! XMLElement
+ }
+
+ if nil == findElement(name: "title", parent: item) {
+ item.addChild(XMLElement.element(withName: "title", stringValue: update.shortVersion) as! XMLElement)
+ }
+ if nil == findElement(name: "pubDate", parent: item) {
+ item.addChild(XMLElement.element(withName: "pubDate", stringValue: update.pubDate) as! XMLElement)
+ }
+ 
+ if createNewItem {
+ // Set link
+ if let link = link,
+ let linkElement = XMLElement.element(withName: SURSSElementLink, uri: sparkleNS) as? XMLElement {
+ linkElement.setChildren(text(link))
+ item.addChild(linkElement)
+ }
+ 
+ if let fullReleaseNotesLink = fullReleaseNotesLink,
+ let fullReleaseNotesElement = XMLElement.element(withName: SUAppcastElementFullReleaseNotesLink, uri: sparkleNS) as? XMLElement {
+ fullReleaseNotesElement.setChildren(text(fullReleaseNotesLink))
+ item.addChild(fullReleaseNotesElement)
+ }
+ 
+ // Set new channel name
+ if let newChannelName = newChannel,
+ let channelNameElement = XMLElement.element(withName: SUAppcastElementChannel, uri: sparkleNS) as? XMLElement {
+ channelNameElement.setChildren(text(newChannelName))
+ item.addChild(channelNameElement)
+ }
+ 
+ // Set last major version
+ if let minimumAutoupdateVersion = majorVersion,
+ let minimumAutoupdateVersionElement = XMLElement.element(withName: SUAppcastElementMinimumAutoupdateVersion, uri: sparkleNS) as? XMLElement {
+ minimumAutoupdateVersionElement.setChildren(text(minimumAutoupdateVersion))
+ item.addChild(minimumAutoupdateVersionElement)
+ }
+ 
+ // Set ignore skipped upgrades below version
+ if let ignoreSkippedUpgradesBelowVersion = ignoreSkippedUpgradesBelowVersion, let ignoreSkippedUpgradesBelowVersionElement = XMLElement.element(withName: SUAppcastElementIgnoreSkippedUpgradesBelowVersion, uri: sparkleNS) as? XMLElement {
+ ignoreSkippedUpgradesBelowVersionElement.setChildren(text(ignoreSkippedUpgradesBelowVersion))
+ item.addChild(ignoreSkippedUpgradesBelowVersionElement)
+ }
+ 
+ // Set phased rollout interval
+ if let phasedRolloutInterval = phasedRolloutInterval,
+ let phasedRolloutIntervalElement = XMLElement.element(withName: SUAppcastElementPhasedRolloutInterval, uri: sparkleNS) as? XMLElement {
+ phasedRolloutIntervalElement.setChildren(text(String(phasedRolloutInterval)))
+ item.addChild(phasedRolloutIntervalElement)
+ }
+ 
+ // Set last critical update version
+ if let criticalUpdateVersion = criticalUpdateVersion,
+ let criticalUpdateElement = XMLElement.element(withName: SUAppcastElementCriticalUpdate, uri: sparkleNS) as? XMLElement {
+ if criticalUpdateVersion.count > 0 {
+ criticalUpdateElement.setAttributesWith(SUAppcastAttributeVersion: criticalUpdateVersion)
+ }
+ item.addChild(criticalUpdateElement)
+ }
+ 
+ // Set informational update versions
+ if let informationalUpdateVersions = informationalUpdateVersions,
+ let informationalUpdateElement = XMLElement.element(withName: SUAppcastElementInformationalUpdate, uri: sparkleNS) as? XMLElement {
+ let versionElements: XMLElement = informationalUpdateVersions.compactMap({ informationalUpdateVersion in
+ let element: XMLElement?
+ let informationalVersionText: String
+ if informationalUpdateVersion.hasPrefix("<") {
+ element = XMLElement.element(withName: SUAppcastElementBelowVersion, uri: sparkleNS) as? XMLElement
+ informationalVersionText = String(informationalUpdateVersion.dropFirst())
+ } else {
+ element = XMLElement.element(withName: SUAppcastElementVersion, uri: sparkleNS) as? XMLElement
+ informationalVersionText = informationalUpdateVersion
+ }
+ 
+ element?.setChildren(text(informationalVersionText))
+ return element
+ })
+ 
+ informationalUpdateElement.setChildren(versionElements)
+ item.addChild(informationalUpdateElement)
+ }
+ }
+ 
+ var versionElement = findElement(name: SUAppcastElementVersion, parent: item)
+ if nil == versionElement {
+ versionElement = XMLElement.element(withName: SUAppcastElementVersion, uri: sparkleNS) as? XMLElement
+ item.addChild(versionElement!)
+ }
+ versionElement?.setChildren(text(update.version))
+ 
+ var shortVersionElement = findElement(name: SUAppcastElementShortVersionString, parent: item)
+ if nil == shortVersionElement {
+ shortVersionElement = XMLElement.element(withName: SUAppcastElementShortVersionString, uri: sparkleNS) as? XMLElement
+ item.addChild(shortVersionElement!)
+ }
+ shortVersionElement?.setChildren(text(update.shortVersion))
+
+ if let html = update.releaseNotesHTML(maxCDATAThreshold: maxCDATAThreshold) {
+ let descElement = findOrCreateElement(name: "description", parent: item)
+ let cdata = XMLNode(kind: .text, options: .nodeIsCDATA)
+ cdata.stringValue = html
+ descElement.setChildren(cdata)
+ }
+ 
+ // Override the minimum system version with the version from the archive,
+ // only if an existing item doesn't specify one
+ let minimumSystemVersion: String
+ var minVer = findElement(name: SUAppcastElementMinimumSystemVersion, parent: item)
+ if let minVer = minVer {
+ minimumSystemVersion = minVer.stringValue ?? update.minimumSystemVersion
+ } else {
+ minVer = XMLElement.element(withName: SUAppcastElementMinimumSystemVersion, uri: sparkleNS) as? XMLElement
+ item.addChild(minVer!)
+ 
+ minimumSystemVersion = update.minimumSystemVersion
+ }
+ minVer?.setChildren(text(minimumSystemVersion))
+
+ // Look for an existing release notes element
+ let releaseNotesXpath = "\(SUAppcastElementReleaseNotesLink)"
+ let results = ((try? item.nodes(forXPath: releaseNotesXpath)) as? XMLElement)?
+ .filter { !($0.attributes ?? )
+ .contains(where: { $0.name == SUXMLLanguage }) }
+ let relElement = results?.first
+ 
+ if let url = update.releaseNotesURL(maxCDATAThreshold: maxCDATAThreshold) {
+ // The update includes a valid release notes URL
+ if let existingReleaseNotesElement = relElement {
+ // The existing item includes a release notes element. Update it.
+ existingReleaseNotesElement.stringValue = url.absoluteString
+ } else {
+ // The existing item doesn't have a release notes element. Add one.
+ item.addChild(XMLElement.element(withName: SUAppcastElementReleaseNotesLink, stringValue: url.absoluteString) as! XMLElement)
+ }
+ } else if let childIndex = relElement?.index {
+ // The update doesn't include a release notes URL. Remove it.
+ item.removeChild(at: childIndex)
+ }
+
+ let languageNotesNodes = ((try? item.nodes(forXPath: releaseNotesXpath)) as? XMLElement)?
+ .map { ($0, $0.attribute(forName: SUXMLLanguage)?.stringValue )}
+ .filter { $0.1 != nil } ?? 
+ for (node, language) in languageNotesNodes.reversed()
+ where !update.localizedReleaseNotes().contains(where: { $0.0 == language }) {
+ item.removeChild(at: node.index)
+ }
+ for (language, url) in update.localizedReleaseNotes() {
+ if !languageNotesNodes.contains(where: { $0.1 == language }) {
+ let localizedNode = XMLNode.element(
+ withName: SUAppcastElementReleaseNotesLink,
+ children: XMLNode.text(withStringValue: url.absoluteString) as! XMLNode,
+ attributes: XMLNode.attribute(withName: SUXMLLanguage, stringValue: language) as! XMLNode)
+ item.addChild(localizedNode as! XMLNode)
+ }
+ }
+
+ var enclosure = findElement(name: "enclosure", parent: item)
+ if nil == enclosure {
+ enclosure = XMLElement.element(withName: "enclosure") as? XMLElement
+ item.addChild(enclosure!)
+ }
+
+ guard let archiveURL = update.archiveURL?.absoluteString else {
+ throw makeError(code: .appcastError, "Bad archive name or feed URL")
+ }
+ var attributes = 
+ XMLNode.attribute(withName: "url", stringValue: archiveURL) as! XMLNode,
+ XMLNode.attribute(withName: "length", stringValue: String(update.fileSize)) as! XMLNode,
+ XMLNode.attribute(withName: "type", stringValue: update.mimeType) as! XMLNode,
+ 
+ if let sig = update.edSignature {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeEDSignature, uri: sparkleNS, stringValue: sig) as! XMLNode)
+ }
+ if let sig = update.dsaSignature {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeDSASignature, uri: sparkleNS, stringValue: sig) as! XMLNode)
+ }
+ enclosure!.attributes = attributes
+
+ if update.deltas.count > 0 {
+ var deltas = findElement(name: SUAppcastElementDeltas, parent: item)
+ if nil == deltas {
+ deltas = XMLElement.element(withName: SUAppcastElementDeltas, uri: sparkleNS) as? XMLElement
+ item.addChild(deltas!)
+ } else {
+ deltas!.setChildren()
+ }
+ for delta in update.deltas {
+ var attributes = 
+ XMLNode.attribute(withName: "url", stringValue: URL(string: delta.archivePath.lastPathComponent.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlPathAllowed)!, relativeTo: update.archiveURL)!.absoluteString) as! XMLNode,
+ XMLNode.attribute(withName: SUAppcastAttributeDeltaFrom, uri: sparkleNS, stringValue: delta.fromVersion) as! XMLNode,
+ XMLNode.attribute(withName: "length", stringValue: String(delta.fileSize)) as! XMLNode,
+ XMLNode.attribute(withName: "type", stringValue: "application/octet-stream") as! XMLNode,
+ 
+ 
+ if let sparkleExecutableFileSize = delta.sparkleExecutableFileSize {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeDeltaFromSparkleExecutableSize, stringValue: String(sparkleExecutableFileSize)) as! XMLNode)
+ }
+ 
+ if let sparkleLocales = delta.sparkleLocales {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeDeltaFromSparkleLocales, stringValue: sparkleLocales) as! XMLNode)
+ }
+ 
+ if let sig = delta.edSignature {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeEDSignature, uri: sparkleNS, stringValue: sig) as! XMLNode)
+ }
+ if let sig = delta.dsaSignature {
+ attributes.append(XMLNode.attribute(withName: SUAppcastAttributeDSASignature, uri: sparkleNS, stringValue: sig) as! XMLNode)
+ }
+ deltas!.addChild(XMLNode.element(withName: "enclosure", children: nil, attributes: attributes) as! XMLElement)
+ }
+ }
+ }
+
+ let options: XMLNode.Options = .nodeCompactEmptyElement, .nodePrettyPrint
+ let docData = doc.xmlData(options: options)
+ _ = try XMLDocument(data: docData, options: XMLNode.Options()); // Verify that it was generated correctly, which does not always happen!
+ try docData.write(to: appcastDestPath)
+ 
+ return (numNewUpdates, numExistingUpdates, numUpdatesRemoved)
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/Signatures.swift Added

@@ -0,0 +1,107 @@
+//
+// Created by Kornel on 23/12/2016.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+
+struct PrivateKeys {
+ var privateDSAKey: SecKey?
+ var privateEdKey: Data?
+ var publicEdKey: Data?
+
+ init(privateDSAKey: SecKey?, privateEdKey: Data?, publicEdKey: Data?) {
+ self.privateDSAKey = privateDSAKey
+ self.privateEdKey = privateEdKey
+ self.publicEdKey = publicEdKey
+ }
+}
+
+func loadPrivateDSAKey(at privateKeyURL: URL) throws -> SecKey {
+ let data = try Data(contentsOf: privateKeyURL)
+
+ var cfitems: CFArray?
+ var format = SecExternalFormat.formatOpenSSL
+ var type = SecExternalItemType.itemTypePrivateKey
+
+ let status = SecItemImport(data as CFData, nil, &format, &type, SecItemImportExportFlags(rawValue: UInt32(0)), nil, nil, &cfitems)
+ if status != errSecSuccess || cfitems == nil {
+ print("Private DSA key file", privateKeyURL.path, "exists, but it could not be read. SecItemImport error", status)
+ throw NSError(domain: SUSparkleErrorDomain, code: Int(OSStatus(SUError.signatureError.rawValue)), userInfo: nil)
+ }
+
+ if format != SecExternalFormat.formatOpenSSL || type != SecExternalItemType.itemTypePrivateKey {
+ throw makeError(code: .signatureError, "Not an OpensSSL private key \(format) \(type)")
+ }
+
+ return (cfitems! as NSArray)0 as! SecKey
+}
+
+func loadPrivateDSAKey(named keyName: String, fromKeychainAt keychainURL: URL) throws -> SecKey {
+ var keychain: SecKeychain?
+
+ guard SecKeychainOpen(keychainURL.path, &keychain) == errSecSuccess, keychain != nil else {
+ throw NSError(domain: SUSparkleErrorDomain, code: Int(OSStatus(SUError.signatureError.rawValue)), userInfo: nil)
+ }
+
+ let query: CFString: CFTypeRef = 
+ kSecClass: kSecClassKey,
+ kSecAttrKeyClass: kSecAttrKeyClassPrivate,
+ kSecAttrLabel: keyName as CFString,
+ kSecMatchLimit: kSecMatchLimitOne,
+ kSecUseKeychain: keychain!,
+ kSecReturnRef: kCFBooleanTrue,
+ 
+
+ var item: CFTypeRef?
+ guard SecItemCopyMatching(query as CFDictionary, &item) == errSecSuccess, item != nil else {
+ throw NSError(domain: SUSparkleErrorDomain, code: Int(OSStatus(SUError.signatureError.rawValue)), userInfo: nil)
+ }
+
+ return item! as! SecKey
+}
+
+func dsaSignature(path: URL, privateDSAKey: SecKey) throws -> String {
+
+ var error: Unmanaged<CFError>?
+
+ let stream = InputStream(fileAtPath: path.path)!
+ let dataReadTransform = SecTransformCreateReadTransformWithReadStream(stream)
+
+ let dataDigestTransform = SecDigestTransformCreate(kSecDigestSHA1, 20, nil)
+ guard let dataSignTransform = SecSignTransformCreate(privateDSAKey, &error) else {
+ print("can't use the key")
+ throw error!.takeRetainedValue()
+ }
+
+ let group = SecTransformCreateGroupTransform()
+ SecTransformConnectTransforms(dataReadTransform, kSecTransformOutputAttributeName, dataDigestTransform, kSecTransformInputAttributeName, group, &error)
+ if error != nil {
+ throw error!.takeRetainedValue()
+ }
+
+ SecTransformConnectTransforms(dataDigestTransform, kSecTransformOutputAttributeName, dataSignTransform, kSecTransformInputAttributeName, group, &error)
+ if error != nil {
+ throw error!.takeRetainedValue()
+ }
+
+ let result = SecTransformExecute(group, &error)
+ if error != nil {
+ throw error!.takeRetainedValue()
+ }
+ guard let resultData = result as? Data else {
+ throw makeError(code: .signatureError, "SecTransformExecute returned non-data")
+ }
+ return resultData.base64EncodedString()
+}
+
+func edSignature(path: URL, publicEdKey: Data, privateEdKey: Data) throws -> String {
+ assert(publicEdKey.count == 32)
+ assert(privateEdKey.count == 64)
+ let data = Array(try Data.init(contentsOf: path, options: .mappedIfSafe))
+ var output = Array<UInt8>(repeating: 0, count: 64)
+ let pubkey = Array(publicEdKey), privkey = Array(privateEdKey)
+ 
+ ed25519_sign(&output, data, data.count, pubkey, privkey)
+ return Data(output).base64EncodedString()
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/URL+Hashing.swift Added

@@ -0,0 +1,58 @@
+//
+// URL+Hashing.swift
+// generate_appcast
+//
+// Created by Nate Weaver on 2020-05-01.
+// Copyright © 2020 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import CommonCrypto
+
+extension FileHandle {
+
+ /// Calculate the SHA-256 hash of the file referenced by the file handle.
+ ///
+ /// - Returns: The SHA-256 hash of the file (as a hexadecimal string).
+ func sha256String() -> String {
+ // This uses CommonCrypto instead of CryptoKit so it can work on macOS < 10.15
+ var context = CC_SHA256_CTX()
+ CC_SHA256_Init(&context)
+
+ while true {
+ let data = self.readData(ofLength: 65_536)
+
+ guard data.count > 0 else { break }
+
+ _ = data.withUnsafeBytes {
+ CC_SHA256_Update(&context, $0.baseAddress, numericCast($0.count))
+ }
+ }
+
+ let hash = UnsafeMutableBufferPointer<UInt8>.allocate(capacity: Int(CC_SHA256_DIGEST_LENGTH))
+
+ CC_SHA256_Final(hash.baseAddress, &context)
+
+ defer {
+ hash.deallocate()
+ }
+ 
+ return hash.reduce("") { $0 + String(format: "%02x", $1) }
+ }
+
+}
+
+extension URL {
+
+ /// Calculates the SHA-256 hash of the file referened by the URL.
+ ///
+ /// - Returns: The SHA-256 hash of the file (as a hexadecimal string), or `nil` if
+ /// the URL doesn't point to a file.
+ func sha256String() -> String? {
+ guard self.isFileURL else { return nil }
+ guard let filehandle = try? FileHandle(forReadingFrom: self) else { return nil }
+
+ return filehandle.sha256String()
+ }
+
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/Unarchive.swift Added

@@ -0,0 +1,112 @@
+//
+//  Created by Kornel on 22/12/2016.
+//  Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+
+func unarchive(itemPath: URL, archiveDestDir: URL, callback: @escaping (Error?) -> Void) {
+    let fileManager = FileManager.default
+    let tempDir = archiveDestDir.appendingPathExtension("tmp")
+    let itemCopy = tempDir.appendingPathComponent(itemPath.lastPathComponent)
+
+    _ = try? fileManager.createDirectory(at: tempDir, withIntermediateDirectories: true, attributes: :)
+
+    do {
+        do {
+            try fileManager.linkItem(at: itemPath, to: itemCopy)
+        } catch {
+            try fileManager.copyItem(at: itemPath, to: itemCopy)
+        }
+        if let unarchiver = SUUnarchiver.unarchiver(forPath: itemCopy.path, updatingHostBundlePath: nil, decryptionPassword: nil, expectingInstallationType: SPUInstallationTypeApplication) {
+            unarchiver.unarchive(completionBlock: { (error: Error?) in
+                if error != nil {
+                    callback(error)
+                    return
+                }
+
+                _ = try? fileManager.removeItem(at: itemCopy)
+                do {
+                    try fileManager.moveItem(at: tempDir, to: archiveDestDir)
+                    callback(nil)
+                } catch {
+                    callback(error)
+                }
+            }, progressBlock: nil)
+        } else {
+            _ = try? fileManager.removeItem(at: itemCopy)
+            callback(makeError(code: .unarchivingError, "Not a supported archive format: \(itemCopy)"))
+        }
+    } catch {
+        _ = try? fileManager.removeItem(at: tempDir)
+        callback(error)
+    }
+}
+
+func unarchiveUpdates(archivesSourceDir: URL, archivesDestDir: URL, disableNestedCodeCheck: Bool, verbose: Bool) throws -> ArchiveItem {
+    if verbose {
+        print("Unarchiving to temp directory", archivesDestDir.path)
+    }
+
+    let group = DispatchGroup()
+
+    let fileManager = FileManager.default
+
+    var unarchived: ArchiveItem = 
+
+    let dir = try fileManager.contentsOfDirectory(atPath: archivesSourceDir.path)
+    var running = 0
+    for item in dir.filter({ !$0.hasPrefix(".") && !$0.hasSuffix(".delta") && !$0.hasSuffix(".xml") && !$0.hasSuffix(".html") }) {
+        let itemPath = archivesSourceDir.appendingPathComponent(item)
+        var isDir: ObjCBool = false
+        if fileManager.fileExists(atPath: itemPath.path, isDirectory: &isDir) && isDir.boolValue {
+            continue
+        }
+        
+        let archiveDestDir: URL
+        if let hash = itemPath.sha256String() {
+            archiveDestDir = archivesDestDir.appendingPathComponent(hash)
+        } else {
+            archiveDestDir = archivesDestDir.appendingPathComponent(itemPath.lastPathComponent)
+        }
+
+        let addItem = { (validateBundle: Bool) in
+            do {
+                let item = try ArchiveItem(fromArchive: itemPath, unarchivedDir: archiveDestDir, validateBundle: validateBundle, disableNestedCodeCheck: disableNestedCodeCheck)
+                if verbose {
+                    print("Found archive", item)
+                }
+                objc_sync_enter(unarchived)
+                unarchived.append(item)
+                objc_sync_exit(unarchived)
+            } catch {
+                print("Skipped", item, error)
+            }
+        }
+
+        if fileManager.fileExists(atPath: archiveDestDir.path) {
+            addItem(false)
+        } else {
+            group.enter()
+            unarchive(itemPath: itemPath, archiveDestDir: archiveDestDir) { (error: Error?) in
+                if let error = error {
+                    print("Could not unarchive", itemPath.path, error)
+                } else {
+                    addItem(true)
+                }
+                group.leave()
+            }
+        }
+
+        // Crude limit of concurrency
+        running += 1
+        if running >= 8 {
+            running = 0
+            group.wait()
+        }
+    }
+
+    group.wait()
+
+    return unarchived
+}

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_appcast/main.swift Added

@@ -0,0 +1,318 @@
+//
+// main.swift
+// Appcast
+//
+// Created by Kornel on 20/12/2016.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import ArgumentParser
+
+func loadPrivateKeys(_ account: String, _ privateDSAKey: SecKey?, _ privateEdString: String?) -> PrivateKeys {
+ var privateEdKey: Data?
+ var publicEdKey: Data?
+ var item: CFTypeRef?
+ var keys: Data?
+
+ // private + public key is provided as argument
+ if let privateEdString = privateEdString {
+ if privateEdString.count == 128, let data = Data(base64Encoded: privateEdString) {
+ keys = data
+ } else {
+ print("Warning: Private key not found in the argument. Please provide a valid key.")
+ }
+ }
+ // get keys from kechain instead
+ else {
+ let res = SecItemCopyMatching(
+ kSecClass as String: kSecClassGenericPassword,
+ kSecAttrService as String: "https://sparkle-project.org",
+ kSecAttrAccount as String: account,
+ kSecAttrProtocol as String: kSecAttrProtocolSSH,
+ kSecReturnData as String: kCFBooleanTrue!,
+ as CFDictionary, &item)
+ if res == errSecSuccess, let encoded = item as? Data, let data = Data(base64Encoded: encoded) {
+ keys = data
+ } else {
+ print("Warning: Private key for account \(account) not found in the Keychain (\(res)). Please run the generate_keys tool")
+ }
+ }
+
+ if let keys = keys {
+ privateEdKey = keys0..<64
+ publicEdKey = keys64...
+ }
+ return PrivateKeys(privateDSAKey: privateDSAKey, privateEdKey: privateEdKey, publicEdKey: publicEdKey)
+}
+
+let DEFAULT_MAX_CDATA_THRESHOLD = 1000
+
+struct GenerateAppcast: ParsableCommand {
+ static let programName = "generate_appcast"
+ static let programNamePath: String = CommandLine.arguments.first ?? "./\(programName)"
+ static let cacheDirectory = FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask)0.appendingPathComponent("Sparkle_generate_appcast")
+ static let oldFilesDirectoryName = "old_updates"
+ 
+ static let DEFAULT_MAX_VERSIONS_PER_BRANCH_IN_FEED = 3
+ static let DEFAULT_MAXIMUM_DELTAS = 5
+ 
+ @Option(help: ArgumentHelp("The account name in your keychain associated with your private EdDSA (ed25519) key to use for signing new updates."))
+ var account : String = "ed25519"
+ 
+ @Option(name: .customLong("ed-key-file"), help: ArgumentHelp("Path to the private EdDSA key file. If not specified, the private EdDSA key will be read from the Keychain instead. '-' can be used to echo the EdDSA key from a 'secret' environment variable to the standard input stream. For example: echo \"$PRIVATE_KEY_SECRET\" | ./\(programName) --ed-key-file -", valueName: "private-EdDSA-key-file"))
+ var privateEdKeyPath: String?
+ 
+ @Option(name: .customShort("f"), help: ArgumentHelp("Path to the private DSA key file. Only use this option for transitioning to EdDSA from older updates.", valueName: "private-dsa-key-file"), transform: { URL(fileURLWithPath: $0) })
+ var privateDSAKeyURL: URL?
+ 
+ @Option(name: .customShort("n"), help: ArgumentHelp("The name of the private DSA key. This option must be used together with `-k`. Only use this option for transitioning to EdDSA from older updates.", valueName: "dsa-key-name"))
+ var privateDSAKeyName: String?
+ 
+ @Option(name: .customShort("s"), help: ArgumentHelp("(DEPRECATED): The private EdDSA string (128 characters). This option is deprecated. Please use the Keychain, or pass the key as standard input when using the --ed-key-file - option instead.", valueName: "private-EdDSA-key"))
+ var privateEdString : String?
+ 
+ @Option(name: .customShort("k"), help: ArgumentHelp("The path to the keychain to look up the private DSA key. This option must be used together with `-n`. Only use this option for transitioning to EdDSA from older updates.", valueName: "keychain-for-dsa"), transform: { URL(fileURLWithPath: $0) })
+ var keychainURL: URL?
+ 
+ @Option(name: .customLong("download-url-prefix"), help: ArgumentHelp("A URL that will be used as prefix for the URL from where updates will be downloaded.", valueName: "url"), transform: { URL(string: $0) })
+ var downloadURLPrefix : URL?
+ 
+ @Option(name: .customLong("release-notes-url-prefix"), help: ArgumentHelp("A URL that will be used as prefix for constructing URLs for release notes.", valueName: "url"), transform: { URL(string: $0) })
+ var releaseNotesURLPrefix : URL?
+ 
+ @Option(name: .customLong("full-release-notes-url"), help: ArgumentHelp("A URL that will be used for the full release notes.", valueName: "url"))
+ var fullReleaseNotesURL: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("A URL to the application's website which Sparkle may use for directing users to if they cannot download a new update from within the application. This will be used for new generated update items. By default, no product link is used.", valueName: "link"))
+ var link: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("An optional comma delimited list of application versions (specified by CFBundleVersion) to generate new update items for. By default, new update items are inferred from the available archives and current feed. Use this option if you need to insert only a specific new version or insert an old update in the feed at a different branch point (e.g. with a different minimum OS version or channel).", valueName: "versions"), transform: { Set($0.components(separatedBy: ",")) })
+ var versions: Set<String>?
+ 
+ @Option(name: .customLong("maximum-versions"), help: ArgumentHelp("The maximum number of versions to preserve in the generated appcast for each branch point (e.g. with a different minimum OS requirement). If this value is 0, then all items in the appcast are preserved.", valueName: "maximum-versions"), transform: { value -> Int in
+ if let intValue = Int(value) {
+ return (intValue <= 0) ? Int.max : intValue
+ } else {
+ return DEFAULT_MAX_VERSIONS_PER_BRANCH_IN_FEED
+ }
+ })
+ var maxVersionsPerBranchInFeed: Int = DEFAULT_MAX_VERSIONS_PER_BRANCH_IN_FEED
+ 
+ @Option(name: .long, help: ArgumentHelp("The maximum number of delta items to create for the latest update for each branch point (e.g. with a different minimum OS requirement).", valueName: "maximum-deltas"))
+ var maximumDeltas: Int = DEFAULT_MAXIMUM_DELTAS
+ 
+ @Option(name: .long, help: ArgumentHelp(COMPRESSION_METHOD_ARGUMENT_DESCRIPTION, valueName: "delta-compression"))
+ var deltaCompression: String = "default"
+ 
+ @Option(name: .long, help: ArgumentHelp(COMPRESSION_LEVEL_ARGUMENT_DESCRIPTION, valueName: "delta-compression-level"))
+ var deltaCompressionLevel: UInt8 = 0
+ 
+ @Option(name: .long, help: ArgumentHelp("The Sparkle channel name that will be used for generating new updates. By default, no channel is used. Old applications need to be using Sparkle 2 to use this feature.", valueName: "channel-name"))
+ var channel: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("The last major or minimum autoupdate sparkle:version that will be used for generating new updates. By default, no last major version is used.", valueName: "major-version"))
+ var majorVersion: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("Ignore skipped major upgrades below this specified version. Only applicable for major upgrades.", valueName: "below-version"))
+ var ignoreSkippedUpgradesBelowVersion: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("The phased rollout interval in seconds that will be used for generating new updates. By default, no phased rollout interval is used.", valueName: "phased-rollout-interval"), transform: { Int($0) })
+ var phasedRolloutInterval: Int?
+ 
+ @Option(name: .long, help: ArgumentHelp("The last critical update sparkle:version that will be used for generating new updates. An empty string argument will treat this update as critical coming from any application version. By default, no last critical update version is used. Old applications need to be using Sparkle 2 to use this feature.", valueName: "critical-update-version"))
+ var criticalUpdateVersion: String?
+ 
+ @Option(name: .long, help: ArgumentHelp("A comma delimited list of application sparkle:version's that will see newly generated updates as being informational only. An empty string argument will treat this update as informational coming from any application version. Prefix a version string with '<' to indicate (eg \"<2.5\") to indicate older versions than the one specified should treat the update as informational only. By default, updates are not informational only. --link must also be provided. Old applications need to be using Sparkle 2 to use this feature, and 2.1 or later to use the '<' upper bound feature.", valueName: "informational-update-versions"), transform: { $0.components(separatedBy: ",").filter({$0.count > 0}) })
+ var informationalUpdateVersions: String?
+ 
+ @Flag(name: .customLong("auto-prune-update-files"), help: ArgumentHelp("Automatically remove old update files in \(oldFilesDirectoryName) that haven't been touched in 2 weeks"))
+ var autoPruneUpdates: Bool = false
+ 
+ @Option(name: .customShort("o"), help: ArgumentHelp("Path to filename for the generated appcast (allowed when only one will be created).", valueName: "output-path"), transform: { URL(fileURLWithPath: $0) })
+ var outputPathURL: URL?
+ 
+ @Argument(help: "The path to the directory containing the update archives and delta files.", transform: { URL(fileURLWithPath: $0, isDirectory: true) })
+ var archivesSourceDir: URL
+ 
+ @Flag(help: .hidden)
+ var verbose: Bool = false
+ 
+ // CDATA text must contain <= this number of characters
+ @Option(name: .customLong("max-cdata-threshold"), help: .hidden)
+ var maxCDATAThreshold: Int = DEFAULT_MAX_CDATA_THRESHOLD
+ 
+ @Flag(name: .customLong("disable-nested-code-check"), help: .hidden)
+ var disableNestedCodeCheck: Bool = false
+ 
+ static var configuration = CommandConfiguration(
+ abstract: "Generate appcast from a directory of Sparkle update archives.",
+ discussion: """
+ Appcast files and deltas will be written to the archives directory.
+ 
+ If an appcast file is already present in the archives directory, that file will be re-used and updated with new entries.
+ Otherwise, a new appcast file will be generated and written.
+ 
+ Old updates are automatically removed from the generated appcast feed and their update files are moved to \(oldFilesDirectoryName)/
+ If --auto-prune-update-files is passed, old update files in this directory are deleted after 2 weeks.
+ You may want to exclude files from this directory from being uploaded.
+ 
+ Use the --versions option if you need to insert an update that is older than the latest update in your feed, or
+ if you need to insert only a specific new version with certain parameters.
+ 
+ .html files that have the same filename as an archive (except for the file extension) will be used for release notes for that item.
+ If the contents of these files are short (< \(DEFAULT_MAX_CDATA_THRESHOLD) characters) and do not include a DOCTYPE or body tags, they will be treated as embedded CDATA release notes.
+ 
+ For new update entries, Sparkle infers the minimum system OS requirement based on your update's LSMinimumSystemVersion provided
+ by your application's Info.plist. If none is found, \(programName) defaults to Sparkle's own minimum system requirement (macOS 10.13).
+ 
+ An example of an archives directory may look like:
+ ./my-app-release-zipfiles/
+ MyApp 1.0.zip
+ MyApp 1.0.html
+ MyApp 1.1.zip
+ MyApp 1.1.html
+ appcast.xml
+ \(oldFilesDirectoryName)/
+ 
+ EXAMPLES:
+ \(programNamePath) ./my-app-release-zipfiles/
+ \(programNamePath) -o appcast-name.xml ./my-app-release-zipfiles/
+ 
+ For more advanced options that can be used for publishing updates, see https://sparkle-project.org/documentation/publishing/ for further documentation.
+ 
+ Extracted archives that are needed are cached in \((cacheDirectory.path as NSString).abbreviatingWithTildeInPath) to avoid re-computation in subsequent runs.
+ 
+ Note that \(programName) does not support package-based (.pkg) updates.
+ """)
+ 
+ func validate() throws {
+ guard (keychainURL == nil) == (privateDSAKeyName == nil) else {
+ throw ValidationError("Both -n <dsa-key-name> and -k <keychain> options must be provided together, or neither should be provided.")
+ }
+ 
+ // Both keychain/dsa key name options, and private dsa key file options cannot coexist
+ guard (keychainURL == nil) || (privateDSAKeyURL == nil) else {
+ throw ValidationError("-f <private-dsa-key-file> cannot be provided if -n <dsa-key-name> and -k <keychain> is provided")
+ }
+ 
+ guard (privateEdKeyPath == nil) || (privateEdString == nil) else {
+ throw ValidationError("--ed-key-file <private-EdDSA-key-file> cannot be provided if -s <private-EdDSA-key> is provided")
+ }
+ 
+ if let versions = versions {
+ guard versions.count > 0 else {
+ throw ValidationError("--versions must specify at least one application version.")
+ }
+ }
+ 
+ guard (informationalUpdateVersions == nil) || (link != nil) else {
+ throw ValidationError("--link must be specified if --informational-update-versions is specified.")
+ }
+ 
+ guard deltaCompressionLevel >= 0 && deltaCompressionLevel <= 9 else {
+ throw ValidationError("Invalid --delta-compression-level value was passed.")
+ }
+ 
+ var validCompression: ObjCBool = false
+ let _ = deltaCompressionModeFromDescription(deltaCompression, &validCompression)
+ if !validCompression.boolValue {
+ throw ValidationError("Invalid --delta-compression \(deltaCompression) was passed.")
+ }
+ }
+ 
+ func run() throws {
+ // Extract the keys
+ let privateDSAKey : SecKey?
+ if let privateDSAKeyURL = privateDSAKeyURL {
+ do {
+ privateDSAKey = try loadPrivateDSAKey(at: privateDSAKeyURL)
+ } catch {
+ print("Unable to load DSA private key from", privateDSAKeyURL.path, "\n", error)
+ throw ExitCode(1)
+ }
+ } else if let keychainURL = keychainURL, let privateDSAKeyName = privateDSAKeyName {
+ do {
+ privateDSAKey = try loadPrivateDSAKey(named: privateDSAKeyName, fromKeychainAt: keychainURL)
+ } catch {
+ print("Unable to load DSA private key '\(privateDSAKeyName)' from keychain at", keychainURL.path, "\n", error)
+ throw ExitCode(1)
+ }
+ } else {
+ privateDSAKey = nil
+ }
+ 
+ let privateEdKeyString: String?
+ if let privateEdString = privateEdString {
+ privateEdKeyString = privateEdString
+ 
+ print("Warning: The -s option for passing the private EdDSA key is insecure and deprecated. Please see its help usage for more information.")
+ } else if let privateEdKeyPath = privateEdKeyPath {
+ do {
+ let privateKeyString: String
+ if privateEdKeyPath == "-" && !FileManager.default.fileExists(atPath: privateEdKeyPath) {
+ if let line = readLine(strippingNewline: true) {
+ privateKeyString = line
+ } else {
+ print("Unable to read EdDSA private key from standard input")
+ throw ExitCode(1)
+ }
+ } else {
+ privateKeyString = try String(contentsOf: URL(fileURLWithPath: privateEdKeyPath))
+ }
+ 
+ privateEdKeyString = privateKeyString
+ } catch {
+ print("Unable to load EdDSA private key from", privateEdKeyPath, "\n", error)
+ throw ExitCode(1)
+ }
+ } else {
+ privateEdKeyString = nil
+ }
+ 
+ let keys = loadPrivateKeys(account, privateDSAKey, privateEdKeyString)
+ 
+ do {
+ let appcastsByFeed = try makeAppcasts(archivesSourceDir: archivesSourceDir, outputPathURL: outputPathURL, cacheDirectory: GenerateAppcast.cacheDirectory, keys: keys, versions: versions, maxVersionsPerBranchInFeed: maxVersionsPerBranchInFeed, newChannel: channel, majorVersion: majorVersion, maximumDeltas: maximumDeltas, deltaCompressionModeDescription: deltaCompression, deltaCompressionLevel: deltaCompressionLevel, disableNestedCodeCheck: disableNestedCodeCheck, downloadURLPrefix: downloadURLPrefix, releaseNotesURLPrefix: releaseNotesURLPrefix, verbose: verbose)
+ 
+ let oldFilesDirectory = archivesSourceDir.appendingPathComponent(GenerateAppcast.oldFilesDirectoryName)
+ 
+ let pluralizeWord = { $0 == 1 ? $1 : "\($1)s" }
+ 
+ for (appcastFile, appcast) in appcastsByFeed {
+ // If an output filename was specified, use it.
+ // Otherwise, use the name of the appcast file found in the archive.
+ let appcastDestPath = outputPathURL ?? URL(fileURLWithPath: appcastFile,
+ relativeTo: archivesSourceDir)
+
+ // Write the appcast
+ let (numNewUpdates, numExistingUpdates, numUpdatesRemoved) = try writeAppcast(appcastDestPath: appcastDestPath, appcast: appcast, fullReleaseNotesLink: fullReleaseNotesURL, maxCDATAThreshold: maxCDATAThreshold, link: link, newChannel: channel, majorVersion: majorVersion, ignoreSkippedUpgradesBelowVersion: ignoreSkippedUpgradesBelowVersion, phasedRolloutInterval: phasedRolloutInterval, criticalUpdateVersion: criticalUpdateVersion, informationalUpdateVersions: informationalUpdateVersions)
+
+ // Inform the user, pluralizing "update" if necessary
+ let pluralizeUpdates = { pluralizeWord($0, "update") }
+ let newUpdatesString = pluralizeUpdates(numNewUpdates)
+ let existingUpdatesString = pluralizeUpdates(numExistingUpdates)
+ let removedUpdatesString = pluralizeUpdates(numUpdatesRemoved)
+ 
+ print("Wrote \(numNewUpdates) new \(newUpdatesString), updated \(numExistingUpdates) existing \(existingUpdatesString), and removed \(numUpdatesRemoved) old \(removedUpdatesString) in \(appcastFile)")
+ }
+ 
+ let (moveCount, prunedCount) = moveOldUpdatesFromAppcasts(archivesSourceDir: archivesSourceDir, oldFilesDirectory: oldFilesDirectory, cacheDirectory: GenerateAppcast.cacheDirectory, appcasts: Array(appcastsByFeed.values), autoPruneUpdates: autoPruneUpdates)
+ if moveCount > 0 {
+ print("Moved \(moveCount) old update \(pluralizeWord(moveCount, "file")) to \(oldFilesDirectory.lastPathComponent)")
+ }
+ if prunedCount > 0 {
+ print("Pruned \(prunedCount) old update \(pluralizeWord(prunedCount, "file"))")
+ }
+ } catch {
+ print("Error generating appcast from directory", archivesSourceDir.path, "\n", error)
+ throw ExitCode(1)
+ }
+ }
+}
+
+DispatchQueue.global().async(execute: {
+ GenerateAppcast.main()
+ CFRunLoopStop(CFRunLoopGetMain())
+})
+CFRunLoopRun()

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_keys Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_keys/Bridging-Header.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/generate_keys/main.swift Added

@@ -0,0 +1,280 @@
+//
+// main.swift
+// generate_keys
+//
+// Created by Kornel on 15/09/2018.
+// Copyright © 2018 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import Security
+import ArgumentParser
+
+let PRIVATE_KEY_LABEL = "Private key for signing Sparkle updates"
+
+private func commonKeychainItemAttributes(account: String) -> String: Any {
+ /// Attributes used for both adding a new item and matching an existing one.
+ return 
+ /// The type of the item (a generic password).
+ kSecClass as String: kSecClassGenericPassword as String,
+ 
+ /// The service string for the item (the Sparkle homepage URL).
+ kSecAttrService as String: "https://sparkle-project.org",
+ 
+ /// The account name for the item (in this case, the key type).
+ kSecAttrAccount as String: account,
+ 
+ /// The protocol used by the service (not actually used, so we claim SSH).
+ kSecAttrProtocol as String: kSecAttrProtocolSSH as String,
+ 
+}
+
+private func failure(_ message: String) -> Never {
+ /// Checking for both `TERM` and `isatty()` correctly detects Xcode.
+ if ProcessInfo.processInfo.environment"TERM" != nil && isatty(STDOUT_FILENO) != 0 {
+ print("\u{001b}1;91mERROR:\u{001b}0m ", terminator: "")
+ } else {
+ print("ERROR: ", terminator: "")
+ }
+ print(message)
+ exit(1)
+}
+
+func findKeyPair(account: String) -> Data? {
+ var item: CFTypeRef?
+ let res = SecItemCopyMatching(commonKeychainItemAttributes(account: account).merging(
+ /// Return a matched item's value as a CFData object.
+ kSecReturnData as String: kCFBooleanTrue!,
+ , uniquingKeysWith: { $1 }) as CFDictionary, &item)
+ 
+ switch res {
+ case errSecSuccess:
+ if let keys = (item as? Data).flatMap({ Data(base64Encoded: $0) }) {
+ return keys
+ } else {
+ failure("""
+ Item found, but is corrupt or has been overwritten!
+
+ Please delete the existing item from the keychain and try again.
+ """)
+ }
+ case errSecItemNotFound:
+ return nil
+ case errSecAuthFailed:
+ failure("""
+ Access denied. Can't check existing keys in the keychain.
+ 
+ Go to Keychain Access.app, lock the login keychain, then unlock it again.
+ """)
+ case errSecUserCanceled:
+ failure("""
+ User canceled the authorization request.
+ 
+ To retry, run this tool again.
+ """)
+ case errSecInteractionNotAllowed:
+ failure("""
+ The operating system has blocked access to the Keychain.
+ 
+ You may be trying to run this command from a script over SSH, which is not supported.
+ """)
+ case let res:
+ print("""
+ Unable to access an existing item in the Keychain due to an unknown error: \(res).
+ 
+ You can look up this error at <https://osstatus.com/search/results?search=\(res)>
+ """)
+ // Note: Don't bother percent-encoding `res`, it's always an integer value and will not need escaping.
+ }
+ exit(1)
+}
+
+func generateKeyPair() -> (publicEdKey: Data, privateEdKey: Data) {
+ var seed = Array<UInt8>(repeating: 0, count: 32)
+ var publicEdKey = Array<UInt8>(repeating: 0, count: 32)
+ var privateEdKey = Array<UInt8>(repeating: 0, count: 64)
+
+ guard ed25519_create_seed(&seed) == 0 else {
+ failure("Unable to initialize random seed. Try restarting your computer.")
+ }
+ ed25519_create_keypair(&publicEdKey, &privateEdKey, seed)
+ 
+ return (Data(publicEdKey), Data(privateEdKey))
+}
+
+func storeKeyPair(account: String, publicEdKey: Data, privateEdKey: Data) {
+ let query = commonKeychainItemAttributes(account: account).merging(
+ /// Mark the new item as sensitive (requires keychain password to export - e.g. a private key).
+ kSecAttrIsSensitive as String: kCFBooleanTrue!,
+
+ /// Mark the new item as permanent (supposedly, "stored in the keychain when created", but not actually
+ /// used for generic passwords - we set it anyway for good measure).
+ kSecAttrIsPermanent as String: kCFBooleanTrue!,
+
+ /// The label of the new item (shown as its name/title in Keychain Access).
+ kSecAttrLabel as String: PRIVATE_KEY_LABEL,
+
+ /// A comment regarding the item's content (can be viewed in Keychain Access; we give the public key here).
+ kSecAttrComment as String: "Public key (SUPublicEDKey value) for this key is:\n\n\(Data(publicEdKey).base64EncodedString())",
+
+ /// A short description of the item's contents (shown as "kind" in Keychain Access").
+ kSecAttrDescription as String: "private key",
+
+ /// The actual data content of the new item.
+ kSecValueData as String: (privateEdKey + publicEdKey).base64EncodedData() as CFData
+ 
+ , uniquingKeysWith: { $1 }) as CFDictionary
+ 
+ switch SecItemAdd(query, nil) {
+ case errSecSuccess:
+ break
+ case errSecDuplicateItem:
+ failure("You already have a conflicting key in your Keychain which was not found during lookup.")
+ case errSecAuthFailed:
+ failure("""
+ System denied access to the Keychain. Unable to save the new key.
+ Go to Keychain Access.app, lock the login keychain, then unlock it again.
+ """)
+ case let res:
+ failure("""
+ The key could not be saved to the Keychain due to an unknown error: \(res).
+ 
+ You can look up this error at <https://osstatus.com/search/results?search=\(res)>
+ """)
+ }
+}
+
+func printNewPublicKeyUsage(_ publicKey: Data) {
+ print("""
+ A key has been generated and saved in your keychain. Add the `SUPublicEDKey` key to
+ the Info.plist of each app for which you intend to use Sparkle for distributing
+ updates. It should appear like this:
+ 
+ <key>SUPublicEDKey</key>
+ <string>\(publicKey.base64EncodedString())</string>
+ 
+ """)
+}
+
+struct GenerateKeys: ParsableCommand {
+ @Option(help: ArgumentHelp("The account name to use when generating or looking up keys from your keychain. If this is not specified, a default global account is used instead. We recommend using different accounts for different organizations."))
+ var account: String = "ed25519"
+ 
+ @Flag(name: .customShort("p"), help: ArgumentHelp("Looks up and just prints the existing public key stored in the Keychain."))
+ var lookUpPublicKey: Bool = false
+ 
+ @Option(name: .customShort("x"), help: ArgumentHelp("Exports your private key from your login keychain and writes it to private-key-file. Note the contents of this sensitive exported file are the same as the password to the \"\(PRIVATE_KEY_LABEL)\" item in your keychain.", valueName: "private-key-file"))
+ var exportedPrivateKeyFile: String?
+ 
+ @Option(name: .customShort("f"), help: ArgumentHelp("Imports the private key from private-key-file into your keychain instead of generating a new key. This file has likely been exported via -x option from another machine. Any existing \"\(PRIVATE_KEY_LABEL)\" items listed in Keychain Access may need to be removed manually first before proceeding.", valueName: "private-key-file"))
+ var importedPrivateKeyFile: String?
+ 
+ static var configuration: CommandConfiguration = CommandConfiguration(
+ abstract: "Generate public & private keys for signing Sparkle based app updates.",
+ discussion: """
+ This tool generates a public & private keys and uses the macOS Keychain to store
+ the private key for signing app updates which will be distributed via Sparkle.
+ This key will be associated with your user account.
+ 
+ Note: You only need one signing key, no matter how many apps you embed Sparkle in.
+ 
+ The keychain may ask permission for this tool to access an existing key, if one
+ exists, or for permission to save the new key. You must allow access in order to
+ successfully proceed.
+ 
+ In the default mode ran without any arguments, the public key and how it should be used
+ in your application's Info.plist will be printed. If a private key was already generated in your Keychain,
+ that key will be used and not overridden.
+ 
+ You may additionally use options to only look up the existing public key for automation (-p),
+ export the private key from your Keychain to a file for transferring the key (-x), or
+ import the private key into your Keychain from a file (-f).
+ """)
+ 
+ func validate() throws {
+ if lookUpPublicKey {
+ guard exportedPrivateKeyFile == nil && importedPrivateKeyFile == nil else {
+ throw ValidationError("-p option cannot be provided together with -x or -f.")
+ }
+ } else {
+ guard exportedPrivateKeyFile == nil || importedPrivateKeyFile == nil else {
+ throw ValidationError("Both -x and -f options cannot be provided together.")
+ }
+ }
+ }
+ 
+ func run() throws {
+ if lookUpPublicKey {
+ /// Lookup mode - print just the pubkey and exit
+ if let keyPair = findKeyPair(account: account) {
+ let pubKey = keyPair64...
+ print(pubKey.base64EncodedString())
+ } else {
+ failure("No existing signing key found!")
+ }
+ } else if let exportedPrivateKeyFile = exportedPrivateKeyFile {
+ /// Export mode - export the key-pair file from the user's keychain
+ let exportURL = URL(fileURLWithPath: exportedPrivateKeyFile)
+ if let reachable = try? exportURL.checkResourceIsReachable(), reachable {
+ failure("private-key-file already exists: \(exportURL.path)")
+ }
+ 
+ guard let keyPair = findKeyPair(account: account) else {
+ failure("No existing signing key found!")
+ }
+ 
+ do {
+ try keyPair.base64EncodedString().write(to: exportURL, atomically: true, encoding: .utf8)
+ } catch {
+ failure("Failed to write exported file: \(error)")
+ }
+ } else if let importedPrivateKeyFile = importedPrivateKeyFile {
+ /// Import mode - import the specifed key-pair file
+ let privateAndPublicBase64KeyFile = importedPrivateKeyFile
+ let privateAndPublicBase64Key: String
+ do {
+ privateAndPublicBase64Key = try String(contentsOfFile: privateAndPublicBase64KeyFile)
+ } catch {
+ failure("Failed to read private-key-file: \(error)")
+ }
+ 
+ guard let privateAndPublicKey = Data(base64Encoded: privateAndPublicBase64Key.trimmingCharacters(in: .whitespacesAndNewlines), options: .init()) else {
+ failure("Failed to decode base64 encoded key data from: \(privateAndPublicBase64Key)")
+ }
+ 
+ guard privateAndPublicKey.count == 64 + 32 else {
+ failure("Imported key must be 96 bytes decoded. Instead it is \(privateAndPublicKey.count) bytes decoded.")
+ }
+ 
+ print("Importing signing key..\n")
+ 
+ let publicKey = privateAndPublicKey64...
+ let privateKey = privateAndPublicKey0..<64
+ 
+ storeKeyPair(account: account, publicEdKey: publicKey, privateEdKey: privateKey)
+ 
+ printNewPublicKeyUsage(publicKey)
+ } else {
+ /// Default mode - find an existing public key and print its usage, or generate new keys
+ if let keyPair = findKeyPair(account: account) {
+ let pubKey = keyPair64...
+ print("""
+ A pre-existing signing key was found. This is how it should appear in your Info.plist:
+
+ <key>SUPublicEDKey</key>
+ <string>\(pubKey.base64EncodedString())</string>
+ 
+ """)
+ } else {
+ print("Generating a new signing key. This may take a moment, depending on your machine.")
+ 
+ let (pubKey, privKey) = generateKeyPair()
+ storeKeyPair(account: account, publicEdKey: pubKey, privateEdKey: privKey)
+ 
+ printNewPublicKeyUsage(pubKey)
+ }
+ }
+ }
+}
+
+GenerateKeys.main()

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sign_update Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sign_update/Bridging-Header.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sign_update/main.swift Added

@@ -0,0 +1,176 @@
+//
+// main.swift
+// sign_update
+//
+// Created by Kornel on 16/09/2018.
+// Copyright © 2018 Sparkle Project. All rights reserved.
+//
+
+import Foundation
+import Security
+import ArgumentParser
+
+func findKeysInKeychain(account: String) throws -> (Data, Data) {
+ var item: CFTypeRef?
+ let res = SecItemCopyMatching(
+ kSecClass as String: kSecClassGenericPassword,
+ kSecAttrService as String: "https://sparkle-project.org",
+ kSecAttrAccount as String: account,
+ kSecAttrProtocol as String: kSecAttrProtocolSSH,
+ kSecReturnData as String: kCFBooleanTrue!,
+ as CFDictionary, &item)
+ if res == errSecSuccess, let encoded = item as? Data, let keys = Data(base64Encoded: encoded) {
+ return (keys0..<64, keys64..<(64+32))
+ } else if res == errSecItemNotFound {
+ print("ERROR! Signing key not found for account \(account). Please run generate_keys tool first or provide key with --ed-key-file <private_key_file>")
+ } else if res == errSecAuthFailed {
+ print("ERROR! Access denied. Can't get keys from the keychain.")
+ print("Go to Keychain Access.app, lock the login keychain, then unlock it again.")
+ } else if res == errSecUserCanceled {
+ print("ABORTED! You've cancelled the request to read the key from the Keychain. Please run the tool again.")
+ } else if res == errSecInteractionNotAllowed {
+ print("ERROR! The operating system has blocked access to the Keychain.")
+ } else {
+ print("ERROR! Unable to access required key in the Keychain: \(res) (you can look it up at osstatus.com)")
+ }
+ throw ExitCode.failure
+}
+
+func findKeys(inFile privateAndPublicBase64KeyFile: String) throws -> (Data, Data) {
+ let privateAndPublicBase64Key: String
+ if privateAndPublicBase64KeyFile == "-" && !FileManager.default.fileExists(atPath: privateAndPublicBase64KeyFile) {
+ if let line = readLine(strippingNewline: true) {
+ privateAndPublicBase64Key = line
+ } else {
+ print("ERROR! Unable to read EdDSA private key from standard input")
+ throw ExitCode(1)
+ }
+ } else {
+ privateAndPublicBase64Key = try String(contentsOfFile: privateAndPublicBase64KeyFile)
+ }
+ return try findKeys(inString: privateAndPublicBase64Key)
+}
+
+func findKeys(inString privateAndPublicBase64Key: String) throws -> (Data, Data) {
+ guard let privateAndPublicKey = Data(base64Encoded: privateAndPublicBase64Key.trimmingCharacters(in: .whitespacesAndNewlines), options: .init()) else {
+ print("ERROR! Failed to decode base64 encoded key data from: \(privateAndPublicBase64Key)")
+ throw ExitCode.failure
+ }
+ 
+ guard privateAndPublicKey.count == 64 + 32 else {
+ print("ERROR! Imported key must be 96 bytes decoded. Instead it is \(privateAndPublicKey.count) bytes decoded.")
+ throw ExitCode.failure
+ }
+ 
+ let publicKey = privateAndPublicKey64...
+ let privateKey = privateAndPublicKey0..<64
+ 
+ return (privateKey, publicKey)
+}
+
+func edSignature(data: Data, publicEdKey: Data, privateEdKey: Data) -> String {
+ assert(publicEdKey.count == 32)
+ assert(privateEdKey.count == 64)
+ let data = Array(data)
+ var output = Array<UInt8>(repeating: 0, count: 64)
+ let pubkey = Array(publicEdKey), privkey = Array(privateEdKey)
+ 
+ ed25519_sign(&output, data, data.count, pubkey, privkey)
+ return Data(output).base64EncodedString()
+}
+
+struct SignUpdate: ParsableCommand {
+ static let programName = "sign_update"
+ 
+ @Option(help: ArgumentHelp("The account name in your keychain associated with your private EdDSA (ed25519) key to use for signing the update."))
+ var account: String = "ed25519"
+ 
+ @Flag(help: ArgumentHelp("Verify that the update is signed correctly. If this is set, a second argument <verify-signature> denoting the signature must be passed after the <update-path>.", valueName: "verify"))
+ var verify: Bool = false
+ 
+ @Option(name: .customShort("f"), .customLong("ed-key-file"), help: ArgumentHelp("Path to the file containing the private EdDSA (ed25519) key. '-' can be used to echo the EdDSA key from a 'secret' environment variable to the standard input stream. For example: echo \"$PRIVATE_KEY_SECRET\" | ./\(programName) --ed-key-file -", valueName: "private-key-file"))
+ var privateKeyFile: String?
+ 
+ @Flag(name: .customShort("p"), help: ArgumentHelp("Only prints the signature when signing an update."))
+ var printOnlySignature: Bool = false
+ 
+ @Argument(help: "The update archive, delta update, or package (pkg) to sign or verify.")
+ var updatePath: String
+ 
+ @Argument(help: "The signature to verify when --verify is passed.")
+ var verifySignature: String?
+ 
+ @Option(name: .customShort("s"), help: ArgumentHelp("(DEPRECATED): The private EdDSA (ed25519) key. Please use the Keychain, or pass the key as standard input when using --ed-key-file - instead.", valueName: "private-key"))
+ var privateKey: String?
+ 
+ static var configuration: CommandConfiguration = CommandConfiguration(
+ abstract: "Sign or verify an update using your EdDSA (ed25519) keys.",
+ discussion: "The EdDSA keys are automatically read from the Keychain if no <private-key-file> is specified.\n\nWhen signing, this tool will output an EdDSA signature and length attributes to use for your update's appcast item enclosure. You can use -p to only print the EdDSA signature for automation.")
+ 
+ func validate() throws {
+ guard privateKey == nil || privateKeyFile == nil else {
+ throw ValidationError("Both --ed-key-file <private-key-file> and -s <private-key> options cannot be provided.")
+ }
+ 
+ guard !verify || verifySignature != nil else {
+ throw ValidationError("<verify-signature> must be passed as a second argument after <update-path> if --verify is passed.")
+ }
+ 
+ guard !verify || !printOnlySignature else {
+ throw ValidationError("Both --verify and -p options cannot be provided.")
+ }
+ }
+ 
+ func run() throws {
+ let (priv, pub): (Data, Data)
+ 
+ if let privateKey = privateKey {
+ fputs("Warning: The -s option for passing the private EdDSA key is insecure and deprecated. Please see its help usage for more information.\n", stderr)
+ 
+ (priv, pub) = try findKeys(inString: privateKey)
+ } else if let privateKeyFile = privateKeyFile {
+ (priv, pub) = try findKeys(inFile: privateKeyFile)
+ } else {
+ (priv, pub) = try findKeysInKeychain(account: account)
+ }
+ 
+ let data = try Data.init(contentsOf: URL.init(fileURLWithPath: updatePath), options: .mappedIfSafe)
+ if verify {
+ // Verify the signature
+ guard let verifySignature = verifySignature else {
+ print("Error: failed to unwrap verifySignature, which is unexpected")
+ throw ExitCode.failure
+ }
+ 
+ guard let signatureData = Data(base64Encoded: verifySignature, options: .ignoreUnknownCharacters) else {
+ print("Error: failed to decode base64 signature: \(verifySignature)")
+ throw ExitCode.failure
+ }
+ 
+ let signatureBytes = Array(signatureData)
+ guard signatureBytes.count == 64 else {
+ print("Error: signature passed in has an invalid byte count.")
+ throw ExitCode.failure
+ }
+ 
+ let dataBytes = Array(data)
+ let publicKeyBytes = Array(pub)
+ 
+ if ed25519_verify(signatureBytes, dataBytes, data.count, publicKeyBytes) == 0 {
+ print("Error: failed to pass signing verification.")
+ throw ExitCode.failure
+ }
+ } else {
+ // Sign the update
+ let sig = edSignature(data: data, publicEdKey: pub, privateEdKey: priv)
+ 
+ if printOnlySignature {
+ print(sig)
+ } else {
+ print("sparkle:edSignature=\"\(sig)\" length=\"\(data.count)\"")
+ }
+ }
+ }
+}
+
+SignUpdate.main()

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/Info.plist Added

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>${CURRENT_PROJECT_VERSION}</string>
+	<key>LSUIElement</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Sparkle Project. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
+</dict>
+</plist>

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/SPUCommandLineDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/SPUCommandLineDriver.m Added

@@ -0,0 +1,296 @@
+//
+// SUCommandLineDriver.m
+// sparkle-cli
+//
+// Created by Mayur Pawashe on 4/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUCommandLineDriver.h"
+#import <Sparkle/Sparkle.h>
+#import <Sparkle/SUInstallerLauncher+Private.h>
+#import <Sparkle/SPUUserAgent+Private.h>
+#import "SPUCommandLineUserDriver.h"
+
+#define SPARKLE_CLI_ERROR_DOMAIN @"sparkle-cli"
+
+typedef NS_ENUM(NSInteger, CLIErrorCode) {
+ CLIErrorCodeCannotPerformCheck = 1,
+ CLIErrorCodeCannotInstallPackage,
+ CLIErrorCodeCannotInstallMajorUpgrade
+};
+
+typedef NS_ENUM(int, CLIErrorExitStatus) {
+ CLIErrorExitStatusMajorUpgradeNotAllowed = 2,
+ CLIErrorExitStatusInstallerInteractionNotAllowed = 3,
+ CLIErrorExitStatusUpdateNotFound = 4,
+ CLIErrorExitStatusUpdateCancelledAuthorization = 5,
+ CLIErrorExitStatusUpdatePermissionRequested = 6,
+ CLIErrorCodeCannotInstallInteractivePackageAsRoot = 7,
+ CLIErrorExitStatusInstallationWriteNoPermissionError = 8,
+};
+
+@interface SPUCommandLineDriver () <SPUUpdaterDelegate>
+
+@property (nonatomic, readonly) SPUUpdater *updater;
+@property (nonatomic, readonly) BOOL verbose;
+@property (nonatomic) BOOL probingForUpdates;
+@property (nonatomic, readonly) BOOL interactive;
+@property (nonatomic, readonly) BOOL allowMajorUpgrades;
+@property (nonatomic, readonly) NSSet<NSString *> *allowedChannels;
+@property (nonatomic, copy, readonly, nullable) NSString *customFeedURL;
+@property (nonatomic, readonly) SUUpdatePermissionResponse *updatePermissionResponse;
+
+@end
+
+@implementation SPUCommandLineDriver
+
+@synthesize updater = _updater;
+@synthesize verbose = _verbose;
+@synthesize probingForUpdates = _probingForUpdates;
+@synthesize interactive = _interactive;
+@synthesize allowMajorUpgrades = _allowMajorUpgrades;
+@synthesize allowedChannels = _allowedChannels;
+@synthesize customFeedURL = _customFeedURL;
+@synthesize updatePermissionResponse = _updatePermissionResponse;
+
+- (instancetype)initWithUpdateBundlePath:(NSString *)updateBundlePath applicationBundlePath:(nullable NSString *)applicationBundlePath allowedChannels:(NSSet<NSString *> *)allowedChannels customFeedURL:(nullable NSString *)customFeedURL userAgentName:(nullable NSString *)customUserAgentName updatePermissionResponse:(nullable SUUpdatePermissionResponse *)updatePermissionResponse deferInstallation:(BOOL)deferInstallation interactiveInstallation:(BOOL)interactiveInstallation allowMajorUpgrades:(BOOL)allowMajorUpgrades verbose:(BOOL)verbose
+{
+ self = super init;
+ if (self != nil) {
+ NSBundle *updateBundle = NSBundle bundleWithPath:updateBundlePath;
+ if (updateBundle == nil) {
+ return nil;
+ }
+ 
+ NSBundle *applicationBundle = nil;
+ if (applicationBundlePath == nil) {
+ applicationBundle = updateBundle;
+ } else {
+ applicationBundle = NSBundle bundleWithPath:(NSString * _Nonnull)applicationBundlePath;
+ if (applicationBundle == nil) {
+ return nil;
+ }
+ }
+ 
+ _verbose = verbose;
+ _interactive = interactiveInstallation;
+ _allowMajorUpgrades = allowMajorUpgrades;
+ _allowedChannels = allowedChannels;
+ _customFeedURL = customFeedURL copy;
+ _updatePermissionResponse = updatePermissionResponse;
+ 
+ id <SPUUserDriver> userDriver = SPUCommandLineUserDriver alloc initWithUpdatePermissionResponse:updatePermissionResponse deferInstallation:deferInstallation verbose:verbose;
+ _updater = SPUUpdater alloc initWithHostBundle:updateBundle applicationBundle:applicationBundle userDriver:userDriver delegate:self;
+ 
+ {
+ // Retrieve a suitable user agent.
+ NSString *userAgentString;
+ NSBundle *mainBundle = NSBundle mainBundle;
+ if (customUserAgentName != nil) {
+ // Let's use the user agent name that the user passed to us
+ userAgentString = SPUMakeUserAgentWithBundle(mainBundle, NSString stringWithFormat:@" (%@)", customUserAgentName);
+ } else {
+ // Are we embedded inside of another responsible app?
+ NSURL *parentDirectoryURL = mainBundle.bundleURL.URLByDeletingLastPathComponent;
+ NSURL *parentParentDirectoryURL = parentDirectoryURL.URLByDeletingLastPathComponent;
+ 
+ if (parentParentDirectoryURL.lastPathComponent isEqualToString:@"Contents" && (parentDirectoryURL.lastPathComponent isEqualToString:@"Resources" || parentDirectoryURL.lastPathComponent isEqualToString:@"MacOS" || parentDirectoryURL.lastPathComponent isEqualToString:@"Helpers")) {
+ NSURL *responsibleApplicationURL = parentParentDirectoryURL.URLByDeletingLastPathComponent;
+ NSBundle *responsibleBundle = NSBundle bundleWithURL:responsibleApplicationURL;
+ if (responsibleBundle == nil) {
+ userAgentString = SPUMakeUserAgentWithBundle(mainBundle, nil);
+ } else {
+ userAgentString = SPUMakeUserAgentWithBundle(responsibleBundle, @" (sparkle)");
+ }
+ } else {
+ userAgentString = SPUMakeUserAgentWithBundle(mainBundle, nil);
+ }
+ }
+ 
+ _updater.userAgentString = userAgentString;
+ }
+ }
+ return self;
+}
+
+- (void)updater:(SPUUpdater *)__unused updater willScheduleUpdateCheckAfterDelay:(NSTimeInterval)delay __attribute__((noreturn))
+{
+ if (self.verbose) {
+ fprintf(stderr, "Last update check occurred too soon. Try again after %0.0f second(s).", delay);
+ }
+ exit(EXIT_SUCCESS);
+}
+
+- (void)updaterWillNotScheduleUpdateCheck:(SPUUpdater *)__unused updater __attribute__((noreturn))
+{
+ if (self.verbose) {
+ fprintf(stderr, "Automatic update checks are disabled. Exiting.\n");
+ }
+ exit(EXIT_SUCCESS);
+}
+
+- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SPUUpdater *)__unused updater
+{
+ if (self.updatePermissionResponse == nil) {
+ // We don't want to make this decision on behalf of the user.
+ fprintf(stderr, "Error: Asked to grant update permission and --grant-automatic-checks is not specified. Exiting.\n");
+ exit(CLIErrorExitStatusUpdatePermissionRequested);
+ }
+ 
+ return YES;
+}
+
+// If the installation is not interactive, we should not perform an update check if we don't have permission to update the bundle path
+- (BOOL)updater:(SPUUpdater *)updater mayPerformUpdateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error
+{
+ switch (updateCheck) {
+ case SPUUpdateCheckUpdates:
+ case SPUUpdateCheckUpdatesInBackground:
+ if (self.interactive || !SPUSystemNeedsAuthorizationAccessForBundlePath(self.updater.hostBundle.bundlePath)) {
+ return YES;
+ }
+ 
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SPARKLE_CLI_ERROR_DOMAIN code:CLIErrorCodeCannotPerformCheck userInfo:@{ NSLocalizedDescriptionKey: @"A new update check cannot be performed because updating this bundle will require user authorization. Please use --interactive or run as root to allow this." };
+ }
+ 
+ return NO;
+ case SPUUpdateCheckUpdateInformation:
+ return YES;
+ }
+}
+
+// If the installation is not interactive, we should only proceed with application based updates and not package-based ones
+- (BOOL)updater:(SPUUpdater *)updater shouldProceedWithUpdate:(nonnull SUAppcastItem *)updateItem updateCheck:(SPUUpdateCheck)updateCheck error:(NSError * __autoreleasing *)error
+{
+ // We can always probe for update information
+ if (updateCheck == SPUUpdateCheckUpdateInformation) {
+ return YES;
+ }
+ 
+ // If we encounter a major upgrade and not allowed to act on it, then error
+ if (updateItem.majorUpgrade && !self.allowMajorUpgrades) {
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SPARKLE_CLI_ERROR_DOMAIN code:CLIErrorCodeCannotInstallMajorUpgrade userInfo:@{ NSLocalizedDescriptionKey: @"Major upgrade available but not allowed to install it. Pass --allow-major-upgrades to allow this." };
+ }
+ 
+ return NO;
+ }
+ 
+ if (!self.interactive && geteuid() != 0) { // applicable for non-root only
+ if (!updateItem.installationType isEqualToString:SPUInstallationTypeApplication) {
+ // Any package based updates will require authorization and therefore interaction
+ if (error != NULL) {
+ *error = NSError errorWithDomain:SPARKLE_CLI_ERROR_DOMAIN code:CLIErrorCodeCannotInstallPackage userInfo:@{ NSLocalizedDescriptionKey: NSString stringWithFormat:@"A new package-based update has been found (%@), but installing it will require user authorization. Please use --interactive to allow this.", updateItem.versionString };
+ }
+ return NO;
+ }
+ }
+ 
+ return YES;
+}
+
+- (NSSet<NSString *> *)allowedChannelsForUpdater:(SPUUpdater *)__unused updater
+{
+ return self.allowedChannels;
+}
+
+- (nullable NSString *)feedURLStringForUpdater:(SPUUpdater *)__unused updater
+{
+ return self.customFeedURL;
+}
+
+// In case we find an update during probing
+- (void)updater:(SPUUpdater *)__unused updater didFindValidUpdate:(SUAppcastItem *)item
+{
+ if (self.probingForUpdates) {
+ if (self.verbose) {
+ if (item.majorUpgrade) {
+ fprintf(stderr, "Major upgrade available.\n");
+ } else {
+ fprintf(stderr, "Update available!\n");
+ }
+ }
+ }
+}
+
+- (void)updater:(SPUUpdater *)updater didFinishUpdateCycleForUpdateCheck:(SPUUpdateCheck)__unused updateCheck error:(nullable NSError *)error __attribute__((noreturn))
+{
+ if (error == nil) {
+ if (self.verbose) {
+ fprintf(stderr, "Exiting.\n");
+ }
+ exit(EXIT_SUCCESS);
+ } else if (error.domain isEqualToString:SPARKLE_CLI_ERROR_DOMAIN) {
+ fprintf(stderr, "%s\n", error.localizedDescription.UTF8String);
+ 
+ if (error.code == CLIErrorCodeCannotInstallMajorUpgrade) {
+ // Major upgrades are not allowed
+ exit(CLIErrorExitStatusMajorUpgradeNotAllowed);
+ } else {
+ // This is one of our own interactive update failures
+ exit(CLIErrorExitStatusInstallerInteractionNotAllowed);
+ }
+ } else if (error.code == SUNoUpdateError) {
+ if (self.verbose) {
+ fprintf(stderr, "No new update available!\n");
+ }
+ exit(CLIErrorExitStatusUpdateNotFound);
+ } else if (error.code == SUInstallationCanceledError) {
+ // User canceled authorization themselves
+ assert(self.interactive);
+ if (self.verbose) {
+ fprintf(stderr, "Update was cancelled.\n");
+ }
+ exit(CLIErrorExitStatusUpdateCancelledAuthorization);
+ } else if (error.code == SUInstallationRootInteractiveError) {
+ fprintf(stderr, "%s\n", error.localizedDescription.UTF8String);
+ exit(CLIErrorCodeCannotInstallInteractivePackageAsRoot);
+ } else if (error.code == SUInstallationWriteNoPermissionError) {
+ fprintf(stderr, "Error: %s", error.localizedDescription.UTF8String);
+ if (error.localizedRecoverySuggestion != nil) {
+ fprintf(stderr, " %s", error.localizedRecoverySuggestion.UTF8String);
+ }
+ fprintf(stderr, "\n");
+ exit(CLIErrorExitStatusInstallationWriteNoPermissionError);
+ } else {
+ fprintf(stderr, "Error: Update has failed due to error %ld (%s). %s\n", (long)error.code, error.domain.UTF8String, error.localizedDescription.UTF8String);
+ exit(EXIT_FAILURE);
+ }
+}
+
+- (BOOL)updater:(SPUUpdater *)updater shouldDownloadReleaseNotesForUpdate:(nonnull SUAppcastItem *)__unused item
+{
+ return self.verbose;
+}
+
+- (void)startUpdater
+{
+ NSError *updaterError = nil;
+ if (!self.updater startUpdater:&updaterError) {
+ fprintf(stderr, "Error: Failed to initialize updater with error (%ld): %s\n", updaterError.code, updaterError.localizedDescription.UTF8String);
+ exit(EXIT_FAILURE);
+ }
+}
+
+- (void)runAndCheckForUpdatesNow:(BOOL)checkForUpdatesNow
+{
+ self startUpdater;
+ 
+ if (checkForUpdatesNow) {
+ // When we start the updater, this scheduled check will start afterwards too
+ self.updater checkForUpdates;
+ }
+}
+
+- (void)probeForUpdates
+{
+ self startUpdater;
+ 
+ // When we start the updater, this info check will start afterwards too
+ self.probingForUpdates = YES;
+ self.updater checkForUpdateInformation;
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/SPUCommandLineUserDriver.h Added

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/SPUCommandLineUserDriver.m Added

@@ -0,0 +1,244 @@
+//
+// SUCommandLineUserDriver.m
+// Sparkle
+//
+// Created by Mayur Pawashe on 4/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import "SPUCommandLineUserDriver.h"
+#import <AppKit/AppKit.h>
+#import <Sparkle/Sparkle.h>
+
+@interface SPUCommandLineUserDriver ()
+
+@property (nonatomic, nullable, readonly) SUUpdatePermissionResponse *updatePermissionResponse;
+@property (nonatomic, readonly) BOOL deferInstallation;
+@property (nonatomic, readonly) BOOL verbose;
+@property (nonatomic) uint64_t bytesDownloaded;
+@property (nonatomic) uint64_t bytesToDownload;
+
+@end
+
+@implementation SPUCommandLineUserDriver
+
+@synthesize updatePermissionResponse = _updatePermissionResponse;
+@synthesize deferInstallation = _deferInstallation;
+@synthesize verbose = _verbose;
+@synthesize bytesDownloaded = _bytesDownloaded;
+@synthesize bytesToDownload = _bytesToDownload;
+
+- (instancetype)initWithUpdatePermissionResponse:(nullable SUUpdatePermissionResponse *)updatePermissionResponse deferInstallation:(BOOL)deferInstallation verbose:(BOOL)verbose
+{
+ self = super init;
+ if (self != nil) {
+ _updatePermissionResponse = updatePermissionResponse;
+ _deferInstallation = deferInstallation;
+ _verbose = verbose;
+ }
+ return self;
+}
+
+- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)__unused request reply:(void (^)(SUUpdatePermissionResponse *))reply
+{
+ if (self.verbose) {
+ fprintf(stderr, "Granting permission for automatic update checks with sending system profile %s...\n", self.updatePermissionResponse.sendSystemProfile ? "enabled" : "disabled");
+ }
+ reply(self.updatePermissionResponse);
+}
+
+- (void)showUserInitiatedUpdateCheckWithCancellation:(void (^)(void))__unused cancellation
+{
+ if (self.verbose) {
+ fprintf(stderr, "Checking for Updates...\n");
+ }
+}
+
+- (void)displayReleaseNotes:(const char * _Nullable)releaseNotes
+{
+ if (releaseNotes != NULL) {
+ fprintf(stderr, "Release notes:\n");
+ fprintf(stderr, "%s\n", releaseNotes);
+ }
+}
+
+- (void)displayHTMLReleaseNotes:(NSData *)releaseNotes
+{
+ // Note: this is the only API we rely on here that references AppKit
+ // We shouldn't invoke it when the calling process is ran under root.
+ // If only there was an API to translated HTML -> text that didn't rely on AppKit..
+ if (geteuid() != 0) {
+ NSAttributedString *attributedString = NSAttributedString alloc initWithHTML:releaseNotes documentAttributes:nil;
+ self displayReleaseNotes:attributedString.string.UTF8String;
+ }
+}
+
+- (void)displayPlainTextReleaseNotes:(NSData *)releaseNotes encoding:(NSStringEncoding)encoding
+{
+ NSString *string = NSString alloc initWithData:releaseNotes encoding:encoding;
+ self displayReleaseNotes:string.UTF8String;
+}
+
+- (void)showUpdateWithAppcastItem:(SUAppcastItem *)appcastItem updateAdjective:(NSString *)updateAdjective
+{
+ if (self.verbose) {
+ fprintf(stderr, "Found %s update! (%s)\n", updateAdjective.UTF8String, appcastItem.displayVersionString.UTF8String);
+ 
+ if (appcastItem.itemDescription != nil) {
+ NSData *descriptionData = appcastItem.itemDescription dataUsingEncoding:NSUTF8StringEncoding;
+ if (descriptionData != nil) {
+ self displayHTMLReleaseNotes:descriptionData;
+ }
+ }
+ }
+}
+
+- (void)showUpdateFoundWithAppcastItem:(SUAppcastItem *)appcastItem state:(SPUUserUpdateState *)state reply:(void (^)(SPUUserUpdateChoice))reply
+{
+ if (appcastItem.informationOnlyUpdate) {
+ fprintf(stderr, "Found information for new update: %s\n", appcastItem.infoURL.absoluteString.UTF8String);
+ reply(SPUUserUpdateChoiceDismiss);
+ } else {
+ switch (state.stage) {
+ case SPUUserUpdateStageNotDownloaded:
+ self showUpdateWithAppcastItem:appcastItem updateAdjective:@"new";
+ reply(SPUUserUpdateChoiceInstall);
+ break;
+ case SPUUserUpdateStageDownloaded:
+ self showUpdateWithAppcastItem:appcastItem updateAdjective:@"downloaded";
+ reply(SPUUserUpdateChoiceInstall);
+ break;
+ case SPUUserUpdateStageInstalling:
+ if (self.deferInstallation) {
+ if (self.verbose) {
+ fprintf(stderr, "Deferring Installation.\n");
+ }
+ reply(SPUUserUpdateChoiceDismiss);
+ } else {
+ reply(SPUUserUpdateChoiceInstall);
+ }
+ break;
+ }
+ }
+}
+
+- (void)showUpdateInFocus
+{
+}
+
+- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData
+{
+ if (self.verbose) {
+ if (downloadData.MIMEType != nil && downloadData.MIMEType isEqualToString:@"text/plain") {
+ NSStringEncoding encoding;
+ if (downloadData.textEncodingName == nil) {
+ encoding = NSUTF8StringEncoding;
+ } else {
+ CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)downloadData.textEncodingName);
+ if (cfEncoding != kCFStringEncodingInvalidId) {
+ encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
+ } else {
+ encoding = NSUTF8StringEncoding;
+ }
+ }
+ self displayPlainTextReleaseNotes:downloadData.data encoding:encoding;
+ } else {
+ self displayHTMLReleaseNotes:downloadData.data;
+ }
+ }
+}
+
+- (void)showUpdateReleaseNotesFailedToDownloadWithError:(NSError *)error
+{
+ if (self.verbose) {
+ fprintf(stderr, "Error: Unable to download release notes: %s\n", error.localizedDescription.UTF8String);
+ }
+}
+
+- (void)showUpdateNotFoundWithError:(NSError *)__unused error acknowledgement:(void (^)(void))acknowledgement
+{
+ acknowledgement();
+}
+
+- (void)showUpdaterError:(NSError *)__unused error acknowledgement:(void (^)(void))acknowledgement
+{
+ acknowledgement();
+}
+
+- (void)showDownloadInitiatedWithCancellation:(void (^)(void))__unused cancellation
+{
+ if (self.verbose) {
+ fprintf(stderr, "Downloading Update...\n");
+ }
+}
+
+- (void)showDownloadDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
+{
+ if (self.verbose) {
+ fprintf(stderr, "Downloading %llu bytes...\n", expectedContentLength);
+ }
+ self.bytesDownloaded = 0;
+ self.bytesToDownload = expectedContentLength;
+}
+
+- (void)showDownloadDidReceiveDataOfLength:(uint64_t)length
+{
+ self.bytesDownloaded += length;
+ 
+ // In case our expected content length was incorrect
+ if (self.bytesDownloaded > self.bytesToDownload) {
+ self.bytesToDownload = self.bytesDownloaded;
+ }
+ 
+ if (self.bytesToDownload > 0 && self.verbose) {
+ fprintf(stderr, "Downloaded %llu out of %llu bytes (%.0f%%)\n", self.bytesDownloaded, self.bytesToDownload, (self.bytesDownloaded * 100.0 / self.bytesToDownload));
+ }
+}
+
+- (void)showDownloadDidStartExtractingUpdate
+{
+ if (self.verbose) {
+ fprintf(stderr, "Extracting Update...\n");
+ }
+}
+
+- (void)showExtractionReceivedProgress:(double)progress
+{
+ if (self.verbose) {
+ fprintf(stderr, "Extracting Update (%.0f%%)\n", progress * 100);
+ }
+}
+
+- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
+{
+ if (self.deferInstallation) {
+ if (self.verbose) {
+ fprintf(stderr, "Deferring Installation.\n");
+ }
+ installUpdateHandler(SPUUserUpdateChoiceDismiss);
+ } else {
+ installUpdateHandler(SPUUserUpdateChoiceInstall);
+ }
+}
+
+- (void)showInstallingUpdateWithApplicationTerminated:(BOOL)__unused applicationTerminated retryTerminatingApplication:(void (^)(void))__unused retryTerminatingApplication
+{
+ if (self.verbose) {
+ fprintf(stderr, "Installing Update...\n");
+ }
+}
+
+- (void)showUpdateInstalledAndRelaunched:(BOOL)__unused relaunched acknowledgement:(void (^)(void))acknowledgement
+{
+ if (self.verbose) {
+ fprintf(stderr, "Installation Finished.\n");
+ }
+ 
+ acknowledgement();
+}
+
+- (void)dismissUpdateInstallation
+{
+}
+
+@end

HandBrake-1.5.1.tar.xz/macosx/Sparkle/sparkle-cli/main.m Added

@@ -0,0 +1,200 @@
+//
+// main.m
+// sparkle-cli
+//
+// Created by Mayur Pawashe on 4/10/16.
+// Copyright © 2016 Sparkle Project. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <Sparkle/Sparkle.h>
+#import "SPUCommandLineDriver.h"
+#include <getopt.h>
+
+#define APPLICATION_FLAG "application"
+#define DEFER_FLAG "defer-install"
+#define VERBOSE_FLAG "verbose"
+#define CHECK_NOW_FLAG "check-immediately"
+#define GRANT_AUTOMATIC_CHECKING_FLAG "grant-automatic-checks"
+#define SEND_PROFILE_FLAG "send-profile"
+#define PROBE_FLAG "probe"
+#define INTERACTIVE_FLAG "interactive"
+#define FEED_URL_FLAG "feed-url"
+#define CHANNELS_FLAG "channels"
+#define ALLOW_MAJOR_UPGRADES_FLAG "allow-major-upgrades"
+#define USER_AGENT_NAME "user-agent-name"
+
+static void printUsage(char **argv)
+{
+ fprintf(stderr, "Usage: %s bundle --%s app-path --%s --%s --%s chan1,chan2,… --%s feed-url --%s display-name --%s --%s --%s --%s --%s --%s\n", argv0, APPLICATION_FLAG, CHECK_NOW_FLAG, PROBE_FLAG, CHANNELS_FLAG, FEED_URL_FLAG, USER_AGENT_NAME, GRANT_AUTOMATIC_CHECKING_FLAG, SEND_PROFILE_FLAG, DEFER_FLAG, INTERACTIVE_FLAG, ALLOW_MAJOR_UPGRADES_FLAG, VERBOSE_FLAG);
+ fprintf(stderr, "Description:\n");
+ fprintf(stderr, " Check if any new updates for a Sparkle supported bundle need to be installed.\n\n");
+ fprintf(stderr, " If any new updates need to be installed, the user application\n is terminated and the update is installed immediately unless --%s\n is specified. If the application was alive, then it will be relaunched after.\n\n", DEFER_FLAG);
+ fprintf(stderr, " To check if an update is available without installing, use --%s.\n\n", PROBE_FLAG);
+ fprintf(stderr, " if no updates are available now, or if the last update check was recently\n (unless --%s is specified) then nothing is done.\n\n", CHECK_NOW_FLAG);
+ fprintf(stderr, " If update permission is requested and --%s is not\n specified, then checking for updates is aborted.\n\n", GRANT_AUTOMATIC_CHECKING_FLAG);
+ fprintf(stderr, " Unless --%s is specified, this tool will not request for escalated\n authorization. Alternatively, this tool can be run as root under an active user login\n session, which will not require (and disallow) interaction.\n\n", INTERACTIVE_FLAG);
+ fprintf(stderr, " If --%s is specified, this tool will exit leaving a spawned process\n for finishing the installation after the target application terminates.\n\n", DEFER_FLAG);
+ fprintf(stderr, " If update installation fails due to not having permission (e.g. from Gatekeeper) to replace the old bundle, an exit status of 8 is returned.\n");
+ fprintf(stderr, " Please specify --%s if you intend to use this tool in an automated way.\n", USER_AGENT_NAME);
+ fprintf(stderr, "Options:\n");
+ fprintf(stderr, " --%s\n Path to the application to watch for termination and to relaunch.\n If not provided, this is assumed to be the same as the bundle.\n", APPLICATION_FLAG);
+ fprintf(stderr, " --%s\n Immediately checks for updates to install.\n Without this, updates are checked only when needed on a scheduled basis.\n", CHECK_NOW_FLAG);
+ fprintf(stderr, " --%s\n Probe for updates. Check if any updates are available but do not install.\n An exit status of 0 is returned if a new update is available.\n", PROBE_FLAG);
+ fprintf(stderr, " --%s\n Allows probing and installing major upgrades. Without passing this, an exit\n status of 2 is returned if a major upgrade is found.\n", ALLOW_MAJOR_UPGRADES_FLAG);
+ fprintf(stderr, " --%s\n List of allowed Sparkle channels to look for updates in. By default,\n only the default channel is used.\n", CHANNELS_FLAG);
+ fprintf(stderr, " --%s\n URL for appcast feed. This URL will be used for the feed instead of the one\n in the bundle's Info.plist or in the bundle's user defaults.\n", FEED_URL_FLAG);
+ fprintf(stderr, " --%s\n Display name that will be included as a part of the User-Agent string.\n We encourage setting this so developers know what is querying their feed.\n Otherwise, this value may be set and inferred automatically.\n", USER_AGENT_NAME);
+ fprintf(stderr, " --%s\n Allows prompting the user for an authorization dialog prompt if the\n installer needs elevated privileges, or allows performing an interactive\n installer package. Without passing this, an exit status of 3 is returned\n if an update requires user interaction. An exit status of 5 is returned\n if the user cancels the authorization prompt.\n", INTERACTIVE_FLAG);
+ fprintf(stderr, " --%s\n If update permission is requested, this enables automatic update checks.\n Note that this behavior may overwrite the user's defaults for the bundle.\n This option has no effect if --%s is passed, or if the\n user has replied to this request already, or if the developer configured\n to skip it. Without passing this, an exit status of 6 is returned\n if permission is needed.\n", GRANT_AUTOMATIC_CHECKING_FLAG, CHECK_NOW_FLAG);
+ fprintf(stderr, " --%s\n Choose to send system profile information if update permission is requested.\n This option can only take effect if --%s is passed.\n", SEND_PROFILE_FLAG, GRANT_AUTOMATIC_CHECKING_FLAG);
+ fprintf(stderr, " --%s\n Defer installation until after the application terminates on its own. The\n application will not be relaunched unless the installation is resumed later.\n", DEFER_FLAG);
+ fprintf(stderr, " --%s\n Enable verbose logging.\n", VERBOSE_FLAG);
+}
+
+int main(int argc, char **argv)
+{
+ @autoreleasepool
+ {
+ struct option longOptions = {
+ {APPLICATION_FLAG, required_argument, NULL, 0},
+ {CHANNELS_FLAG, required_argument, NULL, 0},
+ {FEED_URL_FLAG, required_argument, NULL, 0},
+ {USER_AGENT_NAME, required_argument, NULL, 0},
+ {DEFER_FLAG, no_argument, NULL, 0},
+ {VERBOSE_FLAG, no_argument, NULL, 0},
+ {CHECK_NOW_FLAG, no_argument, NULL, 0},
+ {GRANT_AUTOMATIC_CHECKING_FLAG, no_argument, NULL, 0},
+ {SEND_PROFILE_FLAG, no_argument, NULL, 0},
+ {PROBE_FLAG, no_argument, NULL, 0},
+ {INTERACTIVE_FLAG, no_argument, NULL, 0},
+ {ALLOW_MAJOR_UPGRADES_FLAG, no_argument, NULL, 0},
+ {0, 0, 0, 0}
+ };
+ 
+ NSString *applicationPath = nil;
+ NSString *feedURL = nil;
+ NSString *userAgentName = nil;
+ NSSet<NSString *> *channels = NSSet set;
+ BOOL deferInstall = NO;
+ BOOL verbose = NO;
+ BOOL checkForUpdatesNow = NO;
+ BOOL grantAutomaticChecking = NO;
+ BOOL sendProfile = NO;
+ BOOL probeForUpdates = NO;
+ BOOL interactive = NO;
+ BOOL allowMajorUpgrades = NO;
+ 
+ while (YES) {
+ int optionIndex = 0;
+ int choice = getopt_long(argc, argv, "", longOptions, &optionIndex);
+ if (choice == -1) {
+ break;
+ }
+ switch (choice) {
+ case 0:
+ if (strcmp(APPLICATION_FLAG, longOptionsoptionIndex.name) == 0) {
+ assert(optarg != NULL);
+ 
+ applicationPath = NSString alloc initWithUTF8String:optarg;
+ if (applicationPath == nil) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ } else if (strcmp(FEED_URL_FLAG, longOptionsoptionIndex.name) == 0) {
+ assert(optarg != NULL);
+ 
+ feedURL = NSString alloc initWithUTF8String:optarg;
+ if (feedURL == nil) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ } else if (strcmp(USER_AGENT_NAME, longOptionsoptionIndex.name) == 0) {
+ assert(optarg != NULL);
+ 
+ userAgentName = NSString alloc initWithUTF8String:optarg;
+ if (userAgentName == nil) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ } else if (strcmp(CHANNELS_FLAG, longOptionsoptionIndex.name) == 0) {
+ assert(optarg != NULL);
+ 
+ NSString *channelsString = NSString alloc initWithUTF8String:optarg;
+ if (channelsString == nil) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ 
+ if (channelsString.length > 0) {
+ channels = NSSet setWithArray:channelsString componentsSeparatedByString:@",";
+ }
+ } else if (strcmp(DEFER_FLAG, longOptionsoptionIndex.name) == 0) {
+ deferInstall = YES;
+ } else if (strcmp(VERBOSE_FLAG, longOptionsoptionIndex.name) == 0) {
+ verbose = YES;
+ } else if (strcmp(CHECK_NOW_FLAG, longOptionsoptionIndex.name) == 0) {
+ checkForUpdatesNow = YES;
+ } else if (strcmp(GRANT_AUTOMATIC_CHECKING_FLAG, longOptionsoptionIndex.name) == 0) {
+ grantAutomaticChecking = YES;
+ } else if (strcmp(SEND_PROFILE_FLAG, longOptionsoptionIndex.name) == 0) {
+ sendProfile = YES;
+ } else if (strcmp(PROBE_FLAG, longOptionsoptionIndex.name) == 0) {
+ probeForUpdates = YES;
+ } else if (strcmp(INTERACTIVE_FLAG, longOptionsoptionIndex.name) == 0) {
+ interactive = YES;
+ } else if (strcmp(ALLOW_MAJOR_UPGRADES_FLAG, longOptionsoptionIndex.name) == 0) {
+ allowMajorUpgrades = YES;
+ }
+ case ':':
+ break;
+ case '?':
+ printUsage(argv);
+ return EXIT_FAILURE;
+ default:
+ abort();
+ }
+ }
+ 
+ if (optind >= argc) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ 
+ NSString *updatePath = NSString alloc initWithUTF8String:argvoptind;
+ if (updatePath == nil) {
+ printUsage(argv);
+ return EXIT_FAILURE;
+ }
+ 
+ if (probeForUpdates && (applicationPath != nil || deferInstall || checkForUpdatesNow || interactive)) {
+ fprintf(stderr, "Error: --%s does not work together with --%s, --%s, --%s, --%s\n", PROBE_FLAG, APPLICATION_FLAG, DEFER_FLAG, CHECK_NOW_FLAG, INTERACTIVE_FLAG);
+ return EXIT_FAILURE;
+ }
+ 
+ if (interactive && geteuid() == 0) {
+ fprintf(stderr, "Error: --%s is not supported when running as root\n", INTERACTIVE_FLAG);
+ return EXIT_FAILURE;
+ }
+ 
+ SUUpdatePermissionResponse *updatePermissionResponse = nil;
+ if (grantAutomaticChecking) {
+ updatePermissionResponse = SUUpdatePermissionResponse alloc initWithAutomaticUpdateChecks:YES sendSystemProfile:sendProfile;
+ }
+ 
+ SPUCommandLineDriver *driver = SPUCommandLineDriver alloc initWithUpdateBundlePath:updatePath applicationBundlePath:applicationPath allowedChannels:channels customFeedURL:feedURL userAgentName:userAgentName updatePermissionResponse:updatePermissionResponse deferInstallation:deferInstall interactiveInstallation:interactive allowMajorUpgrades:allowMajorUpgrades verbose:verbose;
+ if (driver == nil) {
+ fprintf(stderr, "Error: Failed to initialize updater. Are the bundle paths provided valid?\n");
+ return EXIT_FAILURE;
+ }
+ 
+ if (probeForUpdates) {
+ driver probeForUpdates;
+ } else {
+ driver runAndCheckForUpdatesNow:checkForUpdatesNow;
+ }
+ NSRunLoop currentRunLoop run;
+ }
+ 
+ return EXIT_SUCCESS;
+}

HandBrake-1.5.1.tar.xz/macosx/co.lproj Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/AddPreset.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "5Xb-gz-QEa"; */
+"5Xb-gz-QEa.title" = "Abbandunà";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a description for the new preset. The description will be shown when hovering the cursor over the preset in the presets list."; ObjectID = "8kl-Sh-Gh7"; */
+"8kl-Sh-Gh7.ibShadowedToolTip" = "Scrivite una discrizzione per a nova prerigatura. A discrizzione serà affissata quandu vo passerete u cursore sopra a prerigatura nant’à a lista di e prerigature.";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "75B-xq-Qbe"; */
+"75B-xq-Qbe.title" = "Cunfina di risuluzione :";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "a0j-nw-n23"; */
+"a0j-nw-n23.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "aez-2b-JXx"; */
+"aez-2b-JXx.ibShadowedToolTip" = "U cumpurtamentu di a selezzione determineghja e traccie è e preferenze impiegate quandu a prerigatura hè selezziunata.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a name for the new preset. This name will be displayed in the presets list."; ObjectID = "aKg-n4-OUS"; */
+"aKg-n4-OUS.ibShadowedToolTip" = "Scrivite un nome per a nova prerigatura Stu nome serà affissatu nant’à a lista di e prerigature.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Picture Size controls how video dimensions are applied when selecting the preset.\n\nNone uses the currently set dimensions.\n\nCustom allows you to set a maximum width and/or height.\n\nSource maximum uses the full dimensions of each source."; ObjectID = "bma-pS-phM"; */
+"bma-pS-phM.ibShadowedToolTip" = "Dimensione di fiura cuntrolleghja cumu e dimensioni di a video sò appiecate quandu una prerigatura hè selezziunata.\n\nNisuna impiegheghja e dimensioni definite attualmente.\n\nPersunalizata vi permette di definisce una larghezza è/o altezza massima.\n\nFonte massima impiegheghja e dimensioni sane d’ogni fonte.";
+
+/* Class = "NSWindow"; title = "New Preset"; ObjectID = "dbZ-Wo-9nG"; */
+"dbZ-Wo-9nG.title" = "Nova prerigatura";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "Deg-rS-mRc"; */
+"Deg-rS-mRc.title" = "Aghjunghje";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Width"; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibExternalAccessibilityDescription" = "Larghezza di a fiura";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width."; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibShadowedToolTip" = "Larghezza massima di l’allucamentu di a video permessa da a prerigatura. Definisce à 0 per una larghezza senza cunfine.";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "hc8-1h-Jye"; */
+"hc8-1h-Jye.title" = "Discrizzione :";
+
+/* Class = "NSTextFieldCell"; title = "Audio:"; ObjectID = "HKp-K9-MF4"; */
+"HKp-K9-MF4.title" = "Audio :";
+
+/* Class = "NSTextFieldCell"; title = "Category:"; ObjectID = "IyE-Lz-32s"; */
+"IyE-Lz-32s.title" = "Categuria :";
+
+/* Class = "NSTextFieldCell"; title = "Preset Name:"; ObjectID = "jhj-Et-ncF"; */
+"jhj-Et-ncF.title" = "Nome di a prerigatura :";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "LPX-Rc-KLa"; */
+"LPX-Rc-KLa.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Height"; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibExternalAccessibilityDescription" = "Altezza di a fiura";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height."; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibShadowedToolTip" = "Altezza massima di l’allucamentu di a video permessa da a prerigatura. Definisce à 0 per un’altezza senza cunfine.";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "Nfk-ix-xIv"; */
+"Nfk-ix-xIv.title" = "x";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "nWJ-0b-fUA"; */
+"nWJ-0b-fUA.ibShadowedToolTip" = "U cumpurtamentu di a selezzione determineghja e traccie è e preferenze impiegate quandu a prerigatura hè selezziunata.";
+
+/* Class = "NSTextFieldCell"; title = "Subtitles:"; ObjectID = "OYE-GG-Vo3"; */
+"OYE-GG-Vo3.title" = "Sottutituli :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qsA-gt-zdK"; */
+"qsA-gt-zdK.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "Sf8-HP-mhE"; */
+"Sf8-HP-mhE.title" = "Nova categuria…";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tQ1-PN-kvh"; */
+"tQ1-PN-kvh.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Resolution Limit allows you to set a maximum width and/or height."; ObjectID = "z6B-ig-ouq"; */
+"z6B-ig-ouq.ibShadowedToolTip" = "Cunfina di risuluzione vi permette di definisce una larghezza è/o altezza massima.";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Audio.strings Added

@@ -0,0 +1,150 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibExternalAccessibilityDescription" = "Guadagnu";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibShadowedToolTip" = "Guadagnu audio in decibel (dB). Aummenteghja o diminuisce u vulume audio.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "5xO-DR-4cR"; */
+"5xO-DR-4cR.headerCell.title" = "Guadagnu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibExternalAccessibilityDescription" = "Traccia selezziunata";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio language and type."; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibShadowedToolTip" = "Lingua è furmatu audio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "6Iz-D8-zzz"; */
+"6Iz-D8-zzz.title" = "Cellula di testu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "7sz-4X-5jA"; */
+"7sz-4X-5jA.headerCell.title" = "Traccia";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aaP-HB-s4f"; */
+"aaP-HB-s4f.title" = "Cellula di testu";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "AMA-Ul-v2f"; */
+"AMA-Ul-v2f.title" = "Aghjunghje tutte e traccie";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "aYF-d5-Ya6"; */
+"aYF-d5-Ya6.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "BBQ-FP-aQN"; */
+"BBQ-FP-aQN.ibExternalAccessibilityDescription" = "Guadagnu";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "eAS-E5-fip"; */
+"eAS-E5-fip.headerCell.title" = "DRC";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "eFn-1M-3hk"; */
+"eFn-1M-3hk.title" = "Cellula di testu";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "fqs-Q8-hNY"; */
+"fqs-Q8-hNY.title" = "Caccià tutte e traccie";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "gtC-MM-esd"; */
+"gtC-MM-esd.ibShadowedToolTip" = "Guadagnu audio in decibel (dB). Aummenteghja o diminuisce u vulume audio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "HKE-hO-jOm"; */
+"HKE-hO-jOm.title" = "Cellula di testu";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hlm-8l-ATk"; */
+"hlm-8l-ATk.ibShadowedIsNilPlaceholder" = "Autumaticu";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "HM0-a4-pm5"; */
+"HM0-a4-pm5.title" = "Aghjunghje tutte e traccie";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Ifq-hI-oCs"; */
+"Ifq-hI-oCs.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "jub-Uq-qYL"; */
+"jub-Uq-qYL.headerCell.title" = "Frequenza di campiunariu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "kmi-ru-dRe"; */
+"kmi-ru-dRe.title" = "Cellula di testu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "l8E-uG-8fo"; */
+"l8E-uG-8fo.title" = "Cellula di testu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibExternalAccessibilityDescription" = "Mischiera";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibShadowedToolTip" = "Tipu di mischiera. Cuntrolla cumu l’audio multi-canali hè mischiatu in un numeru inferiore di canali o s’è i canali d’origine sò cunservati.\n\nL’ozzioni Dolby Surround è Dolby Pro Logic II cunvertiscenu l’audio multi-canali in stereo è cudificanu i canali addiziunali, via una matrice, per una ripruduzzione surround nant’à l’apparechji cumpatibile, tuttu mantenendu a cumpatibilità stereo.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "lnO-sZ-6xv"; */
+"lnO-sZ-6xv.headerCell.title" = "Cudecu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "MZ7-W1-uGl"; */
+"MZ7-W1-uGl.title" = "Cellula di testu";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "nII-CW-aWc"; */
+"nII-CW-aWc.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "o3M-fP-6Ps"; */
+"o3M-fP-6Ps.ibShadowedToolTip" = "Cumpressione di a stesa dinamica (DRC). Riduce a sfarenza di vulume trà i soni forti è muderati. S’appieca solu à e traccie AC-3 quandu a cudificazione hè fatta ver di un altru furmatu.\n\n0 : Ùn appiecà micca a cumpressione DRC.\n1 : Appiecà DRC secondu à e sugestioni di cumpressione incurpurate in a traccia di fonte.\n\nI valori superiore à 1 aummentanu u vulume di i soni muderati. I valori superiore à 2,5 ùn sò micca ricumandati perchè ponu cagiunà una disturzione chì si sente.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "obP-lK-sY0"; */
+"obP-lK-sY0.headerCell.title" = "Flussu binariu";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "Pfh-Bc-83k"; */
+"Pfh-Bc-83k.title" = "Traccie";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "q2P-Tg-cBJ"; */
+"q2P-Tg-cBJ.title" = "Ricaricà";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Q4T-80-wxf"; */
+"Q4T-80-wxf.title" = "0";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibExternalAccessibilityDescription" = "Frequenza di campiunariu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibShadowedToolTip" = "Frequenza di campiunariu audio in kilohertz (kHz). Autumaticu hè ricumandatu.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibExternalAccessibilityDescription" = "Flussu binariu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibShadowedToolTip" = "Flussu binariu audio in kilobit à a seconda (kbps). I chjuchi valori riducenu a qualità di l’audio. I valori maiò impieganu più di dati è ponu esse menu cumpatibile.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "qS7-Xr-9N8"; */
+"qS7-Xr-9N8.headerCell.title" = "Mischiera";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "sq7-Ux-T6D"; */
+"sq7-Ux-T6D.title" = "Ricaricà";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "TK6-fY-4Sk"; */
+"TK6-fY-4Sk.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibExternalAccessibilityDescription" = "Cudecu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibShadowedToolTip" = "Cudificatore audio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "U4U-1b-rQF"; */
+"U4U-1b-rQF.title" = "Cellula di testu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure audio tracks Selection Behavior. These settings affect which tracks will be added to the audio tracks list, and the settings used for each track."; ObjectID = "vFP-nq-IQg"; */
+"vFP-nq-IQg.ibShadowedToolTip" = "Cunfigureghja u cumpurtamentu di selezzione di e traccie audio. Ste preferenze affettanu a scelta di e traccie chì seranu aghjunte à a lista di e traccie audio, ma dinù e preferenze impiegate per ogni traccia.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Vxo-66-Mrx"; */
+"Vxo-66-Mrx.title" = "Altre viste";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the audio tracks list using the configured Selection Behavior."; ObjectID = "wcL-rL-aYS"; */
+"wcL-rL-aYS.ibShadowedToolTip" = "Ricaricheghja a lista di e traccie audio impieghendu u cumpurtamentu di selezzione cunfiguratu.";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Audio tracks"; ObjectID = "yix-PF-sqH"; */
+"yix-PF-sqH.ibExternalAccessibilityDescription" = "Traccie audio";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "YlA-ue-5oE"; */
+"YlA-ue-5oE.title" = "Caccià tutte e traccie";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibShadowedToolTip" = "Cumpressione di a stesa dinamica (DRC). Riduce a sfarenza di vulume trà i soni forti è muderati. S’appieca solu à e traccie AC-3 quandu a cudificazione hè fatta ver di un altru furmatu.\n\n0 : Ùn appiecà micca a cumpressione DRC.\n1 : Appiecà DRC secondu à e sugestioni di cumpressione incurpurate in a traccia di fonte.\n\nI valori superiore à 1 aummentanu u vulume di i soni muderati. I valori superiore à 2,5 ùn sò micca ricumandati perchè ponu cagiunà una disturzione chì si sente.";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Audio tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the audio Selection Behavior dialog."; ObjectID = "Yzu-Rk-hTv"; */
+"Yzu-Rk-hTv.ibShadowedToolTip" = "Lista di e traccie audio. U cumpurtamentu è e preferenze di selezzione di e traccie sò caricati da a prerigatura selezziunata è ponu esse cunfigurati via u dialogu di u cumpurtamentu di selezzione audio.";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/AudioDefaults.strings Added

@@ -0,0 +1,216 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "0HY-xB-cvO"; */
+"0HY-xB-cvO.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu FLAC. Què permette di selezziunà a ricopia FLAC quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "0kT-0J-3k2"; */
+"0kT-0J-3k2.headerCell.title" = "Mischiera";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1XC-VS-X3g"; */
+"1XC-VS-X3g.title" = "Cellula di testu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "3o5-Gn-Vao"; */
+"3o5-Gn-Vao.title" = "Cellula di testu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibExternalAccessibilityDescription" = "Cudecu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibShadowedToolTip" = "Cudificatore audio.";
+
+/* Class = "NSTextFieldCell"; title = "Audio encoder settings for each selected track:"; ObjectID = "007-WM-RmC"; */
+"007-WM-RmC.title" = "Preferenze di u cudificatore audio per ogni traccia selezziunata :";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "7sl-o7-pUh"; */
+"7sl-o7-pUh.title" = "Cellula di testu";
+
+/* Class = "NSButtonCell"; title = "DTS"; ObjectID = "8mC-Wx-myL"; */
+"8mC-Wx-myL.title" = "DTS";
+
+/* Class = "NSButtonCell"; title = "Use only first encoder for secondary audio"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "Impiegà solu u primu cudificatore per a traccia audio secundaria";
+
+/* Class = "NSTextFieldCell"; title = "Passthru Fallback:"; ObjectID = "AQe-Sg-Qgh"; */
+"AQe-Sg-Qgh.title" = "In casu di fiascu di a ricopia :";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Audio Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "Lingue di a traccia audio";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "Selezziunà e lingue à impiegà cù a preferenza di cumpurtamentu di selezzione di traccia audio.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibShadowedToolTip" = "Cumpressione di a stesa dinamica (DRC). Riduce a sfarenza di vulume trà i soni forti è muderati. S’appieca solu à e traccie AC-3 quandu a cudificazione hè fatta ver di un altru furmatu.\n\n0 : Ùn appiecà micca a cumpressione DRC.\n1 : Appiecà DRC secondu à e sugestioni di cumpressione incurpurate in a traccia di fonte.\n\nI valori superiore à 1 aummentanu u vulume di i soni muderati. I valori superiore à 2,5 ùn sò micca ricumandati perchè ponu cagiunà una disturzione chì si sente.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports E-AC3. This permits E-AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "BK7-c4-kkk"; */
+"BK7-c4-kkk.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu E-AC3. Què permette di selezziunà a ricopia E-AC3 quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSButtonCell"; title = "AAC"; ObjectID = "cUX-iP-UAs"; */
+"cUX-iP-UAs.title" = "AAC";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibExternalAccessibilityDescription" = "Guadagnu";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibShadowedToolTip" = "Guadagnu audio in decibel (dB). Aummenteghja o diminuisce u vulume audio.";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibShadowedToolTip" = "Cumpressione di a stesa dinamica (DRC). Riduce a sfarenza di vulume trà i soni forti è muderati. S’appieca solu à e traccie AC-3 quandu a cudificazione hè fatta ver di un altru furmatu.\n\n0 : Ùn appiecà micca a cumpressione DRC.\n1 : Appiecà DRC secondu à e sugestioni di cumpressione incurpurate in a traccia di fonte.\n\nI valori superiore à 1 aummentanu u vulume di i soni muderati. I valori superiore à 2,5 ùn sò micca ricumandati perchè ponu cagiunà una disturzione chì si sente.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "dpw-He-8eZ"; */
+"dpw-He-8eZ.title" = "Cellula di testu";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "DxT-bF-prJ"; */
+"DxT-bF-prJ.ibShadowedIsNilPlaceholder" = "Autumaticu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "E93-Md-aWa"; */
+"E93-Md-aWa.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu DTS. Què permette di selezziunà a ricopia DTS quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fgl-Ev-ELt"; */
+"fgl-Ev-ELt.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu AC3. Què permette di selezziunà a ricopia AC3 quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "fH9-oV-QdJ"; */
+"fH9-oV-QdJ.title" = "Cellula di testu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fzd-MO-xaB"; */
+"fzd-MO-xaB.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu AAC. Què permette di selezziunà a ricopia AAC quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "Cumpurtamentu di a selezzione di traccia :";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu MP2. Què permette di selezziunà a ricopia MP2 quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "Tutte e lingue selezziunate chì currispondenu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibExternalAccessibilityDescription" = "Flussu binariu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibShadowedToolTip" = "Flussu binariu audio in kilobit à a seconda (kbps). I chjuchi valori riducenu a qualità di l’audio. I valori maiò impieganu più di dati è ponu esse menu cumpatibile.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibExternalAccessibilityDescription" = "Mischiera";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibShadowedToolTip" = "Tipu di mischiera. Cuntrolla cumu l’audio multi-canali hè mischiatu in un numeru inferiore di canali o s’è i canali d’origine sò cunservati.\n\nL’ozzioni Dolby Surround è Dolby Pro Logic II cunvertiscenu l’audio multi-canali in stereo è cudificanu i canali addiziunali, via una matrice, per una ripruduzzione surround nant’à l’apparechji cumpatibile, tuttu mantenendu a cumpatibilità stereo.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "IxI-o9-jMs"; */
+"IxI-o9-jMs.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu DTS-HD. Què permette di selezziunà a ricopia DTS-HD quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "Prima lingua selezziunata chì currisponde";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Jn4-1L-J1g"; */
+"Jn4-1L-J1g.title" = "Abbandunà";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "kDe-1L-VkD"; */
+"kDe-1L-VkD.title" = "Vai";
+
+/* Class = "NSWindow"; title = "Audio Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "Cumpurtamentu di a selezzione audio";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder to use when a track suitable for passthru is unavailable."; ObjectID = "LdN-Cx-ZJY"; */
+"LdN-Cx-ZJY.ibShadowedToolTip" = "Cudificatore audio à impiegà quandu una traccia adattata à a ricopia hè indispunibule.";
+
+/* Class = "NSButtonCell"; title = "DTS-HD"; ObjectID = "LX6-kc-5vq"; */
+"LX6-kc-5vq.title" = "DTS-HD";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "LxC-Qx-psh"; */
+"LxC-Qx-psh.headerCell.title" = "Frequenza di campiunariu";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "Lingue :";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "MiI-OV-waZ"; */
+"MiI-OV-waZ.title" = "0";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "Nisuna";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "N7h-CJ-quV"; */
+"N7h-CJ-quV.headerCell.title" = "Guadagnu";
+
+/* Class = "NSButtonCell"; title = "FLAC"; ObjectID = "naS-No-CdV"; */
+"naS-No-CdV.title" = "FLAC";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "Cumpurtamentu di a selezzione di traccia.\n\n« Nisuna » ùn selezziunerà alcuna traccia audio.\n\n« Prima lingua selezziunata chì currisponde » aghjunghje a prima traccia audio chì currisponde à ognuna di e lingue selezziunate chì si trovanu in a fonte.\n\n« Tutte e lingue selezziunate chì currispondenu » aghjunghje tutte e traccie audio chì currispondenu à ognuna di e lingue selezziunate chì si trovanu in a fonte.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "os0-Jl-OXF"; */
+"os0-Jl-OXF.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu TrueHD. Què permette di selezziunà a ricopia TrueHD quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips0 = "Add Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips0" = "Aghjunghje una traccia audio";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips1 = "Remove Selected Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips1" = "Caccià a traccia audio selezziunata";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
+"OVr-Jm-VrK.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
+"pR9-d4-SNf.headerCell.title" = "Cudecu";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
+"PtB-Wp-B9X.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibExternalAccessibilityDescription" = "Frequenza di campiunariu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibShadowedToolTip" = "Frequenza di campiunariu audio in kilohertz (kHz). Autumaticu hè ricumandatu.";
+
+/* Class = "NSTextFieldCell"; title = "Auto Passthru:"; ObjectID = "s6s-EH-5CB"; */
+"s6s-EH-5CB.title" = "Ricopia autumatica :";
+
+/* Class = "NSButtonCell"; title = "MP3"; ObjectID = "sdZ-Rx-JoG"; */
+"sdZ-Rx-JoG.title" = "MP3";
+
+/* Class = "NSButtonCell"; title = "E-AC3"; ObjectID = "u9h-dn-wcK"; */
+"u9h-dn-wcK.title" = "E-AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Only the primary audio track will be encoded with the full encoder list. All additional audio tracks will be encoded with first encoder only."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "Solu a traccia audio principale sera cudificata cù a lista sana di i cudificatori. Tutte e traccie audio addiziunale seranu cudificate solu cù u primu cudificatore.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "uFK-z7-8Yj"; */
+"uFK-z7-8Yj.title" = "Cellula di testu";
+
+/* Class = "NSMenuItem"; title = "Item"; ObjectID = "UJy-A2-Bb1"; */
+"UJy-A2-Bb1.title" = "Elementu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "vhn-7C-4aZ"; */
+"vhn-7C-4aZ.headerCell.title" = "Flussu binariu";
+
+/* Class = "NSButtonCell"; title = "AC3"; ObjectID = "VnE-3R-bUf"; */
+"VnE-3R-bUf.title" = "AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "vUx-OV-W5T"; */
+"vUx-OV-W5T.ibShadowedToolTip" = "Attivà st’ozzione s’è u vostru apparechju di ripruduzzione accetta u furmatu MP3. Què permette di selezziunà a ricopia MP3 quandu l’ozzione di ricopia autumatica hè attivata.";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "XKL-2e-Dlv"; */
+"XKL-2e-Dlv.title" = "Cellula di vista di tavula";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibExternalAccessibilityDescription" = "Guadagnu";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibShadowedToolTip" = "Guadagnu audio in decibel (dB). Aummenteghja o diminuisce u vulume audio.";
+
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
+/* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
+"z9d-P3-6UP.title" = "TrueHD";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "zX9-T9-wKy"; */
+"zX9-T9-wKy.headerCell.title" = "DRC";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/ChaptersTitles.strings Added

@@ -0,0 +1,57 @@
+/* Class = "NSTableColumn"; headerCell.title = "Index"; ObjectID = "0iF-eL-NOC"; */
+"0iF-eL-NOC.headerCell.title" = "Indice";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Export the list of chapter names to a CSV file."; ObjectID = "3SP-6e-RPS"; */
+"3SP-6e-RPS.ibShadowedToolTip" = "Espurtà a lista di i nomi di capitulu in un schedariu CSV.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a chapter markers track to the video."; ObjectID = "7Xf-c0-jsr"; */
+"7Xf-c0-jsr.ibShadowedToolTip" = "Aghjunghje una traccia di marcatori di capitulu à a video.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "All-Bz-NLv"; */
+"All-Bz-NLv.title" = "Cellula di testu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FyM-2X-9xs"; */
+"FyM-2X-9xs.title" = "Cellula di testu";
+
+/* Class = "NSTextFieldCell"; title = "1"; ObjectID = "G9p-Cg-wyC"; */
+"G9p-Cg-wyC.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Export Chapters…"; ObjectID = "h0O-zg-OF9"; */
+"h0O-zg-OF9.title" = "Espurtà i capituli…";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Chapter titles"; ObjectID = "InF-gR-Lia"; */
+"InF-gR-Lia.ibExternalAccessibilityDescription" = "Tituli di i capituli";
+
+/* Class = "NSButtonCell"; title = "Create chapter markers"; ObjectID = "lJL-wX-DVP"; */
+"lJL-wX-DVP.title" = "Creà marcatori di capitulu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Start"; ObjectID = "NlF-th-Cg9"; */
+"NlF-th-Cg9.headerCell.title" = "Principià";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ozt-ED-g1M"; */
+"ozt-ED-g1M.title" = "Cellula di testu";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "pAo-XM-bvP"; */
+"pAo-XM-bvP.title" = "Cellula di testu";
+
+/* Class = "NSButtonCell"; title = "Import Chapters…"; ObjectID = "PM3-Ue-0kW"; */
+"PM3-Ue-0kW.title" = "Impurtà i capituli…";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "QVB-Cw-DJD"; */
+"QVB-Cw-DJD.headerCell.title" = "Durata";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Import a list of chapter names from a CSV file."; ObjectID = "Ron-3B-rYg"; */
+"Ron-3B-rYg.ibShadowedToolTip" = "Impurtà una lista di i nomi di capitulu da un schedariu CSV.";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "UjY-nz-uSt"; */
+"UjY-nz-uSt.title" = "Titulu";
+
+/* Class = "NSTextFieldCell"; title = "Duration"; ObjectID = "Vmq-zJ-NEA"; */
+"Vmq-zJ-NEA.title" = "Durata";
+
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "Z6H-lJ-ipr"; */
+"Z6H-lJ-ipr.headerCell.title" = "Titulu";
+
+/* Class = "NSTextFieldCell"; title = "Timestamp"; ObjectID = "zaN-qY-tke"; */
+"zaN-qY-tke.title" = "Stampiglia di tempu";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/ExceptionAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBAddCategoryController.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "Rifilà inghjò";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu inferiore.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "Rifilà insù";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "Rifilà insù";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu superiore.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "Girà a fiura di 90 gradi in u sensu di e sfiere d’arilogiu.";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "Persunalizatu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "Rifilà à diritta";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu dirittu.";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "Nisunu";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "Autumaticu";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "Rifilà inghjò";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "Rifilà à manca";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu superiore.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "Rifilà à diritta";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "Rifilà à manca";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBEncodingProgressHUDController.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBFiltersViewController.strings Added

@@ -0,0 +1,210 @@
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibExternalAccessibilityDescription" = "Rigatura di riduzzione di trostu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibShadowedToolTip" = "Rigatura di riduzzione di trostu. Adattazioni addiziunale di a prerigatura di riduzzione di trostu per megliurà e preferenze per scenarii specifichi.\n\n« None » (Nisuna) impiegheghja e preferenze di prerigatura predefinite.\n\n« Film » (Filmu) affineghja e preferenze per un adopru cù a maiò parte di i cuntenuti d’azzione.\n\n« Grain » (Granellu) tratta solu i canali di culore. Ghjuvevule per preservà l’aspettu cinematograficu di u granellu di luminanza, tuttu riducendu o cacciendu u rumore di culore.\n\n« High Motion » (Mossa presta) riduce u sparghjimentu di i culori in e scene rapide impediscendu u trattamentu tempurale di i canali di culore. Ghjuvevule per e video di sport è d’azzione.\n\n« Animation » (Animazione) hè ghjuvevule per l’animazione in celluloide, cum’è a fiura mossa.\n\n« Tape » (Scagninu) hè ghjuvevule per e video nant’à un frisgiu magneticu analogicu di bassa qualità, cum’è e VHS, quandu « Filmu » ùn produce micca u risultatu aspettatu.\n\n« Sprite » (Spiritibugliettu) hè ghjuvevule per i ghjochi 2D in 1, 4, 8 o 16 bit. Ùn hè micca previstu per e video di alta definizione.";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "Rigatura :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
+"6nG-zk-FMo.ibShadowedToolTip" = "Prerigatura di u filtru di disintricciamentu.\n\nA prerigatura predefinita hè ben equilibrata trà vitezza è a qualità.\n\nIgnurà a verificazione spaciale permette à Yadif d’ignurà a currezzione di certi effetti parassiti pudendu esse impediti per un legeru aumentu di a vitezza.\n\nEEDI2 impiegheghja una cudificazione d’interpolazione più lenta è di più bella qualità per a dipettinera. Ghjuvevule per e fonti e più difficiule.\n\nBob pruva di preservà megliu a mossa per una chjuca penalità à a risuluzione percepita.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
+"8am-ve-1Xl.title" = "Prerigatura :";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "Persunalizatu :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
+"akB-JW-MPe.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
+"b6A-ax-2Ed.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "Parametri d’arrutata persunalizati.\n\nSintassa Unsharp : y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nPredefinizioni Unsharp : y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nSintassa Lapsharp : y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nPredefinizioni Lapsharp : y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "L’arrutata amendeghja l’aspettu di i detaglii, sopratuttu di i bordi. E preferenze troppu forte d’arrutata ponu dannighjà a qualità di a fiura creendu effetti parassiti è aumentendu u rumore, ciò chì pò riduce a faccindaghjine di a cumpressione.\n\n- « Unsharp » hè un filtru di maschera floscia à usu generale. Funziuneghja imbrugliendu, è dopu calculendu a sfarenza trà a fiura imbrugliata è a fiura d’origine.\n\n- « Lapsharp » arruteghja impieghendu nocciuli di convuluzione s’avvicinendu di i filtri di bordu Laplacian, pruducendu ognitantu risultati di più bella qualità chì a maschera floscia.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibExternalAccessibilityDescription" = "Rigatura d’arrutata";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock tune. Further adjusts the Deblock preset to optimize settings for specific scenarios."; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibShadowedToolTip" = "Rigatura di sblucchime. Adattazioni addiziunale di a prerigatura di sblucchime per megliurà e preferenze per scenarii specifichi.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Deblock Preset"; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibExternalAccessibilityDescription" = "Prerigatura di sblucchime";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibShadowedToolTip" = "U filtru di sblucchime riduce l’effetti parassiti cagiunati da una cumpressione video di bassa qualità.Dumandà per rimpiazzà u schedariu.";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "Persunalizatu :";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "Prerigatura d’arrutata";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "Prerigatura di u filtru d’arrutata. Definisce a forza di u filtru.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibExternalAccessibilityDescription" = "Prerigatura di riduzzione di trostu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibShadowedToolTip" = "Prerigatura di u filtru di riduzzione di trostu. Definisce a forza di u filtru.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "Prerigatura :";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
+"Da7-pY-5vu.title" = "Persunalizatu :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Detelecine removes comb artifacts that are the result of telecine, a process for converting film frame rates to television frame rates."; ObjectID = "DER-tS-cLx"; */
+"DER-tS-cLx.ibShadowedToolTip" = "U filtru « detelesinema » caccia l’effetti parassiti chì sò cagiunati da u telesinema, un trattamentu chì cunvertisce e frequenze di fiure d’un filmu ver di frequenze di fiure di a televisiò.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
+"DI9-Ed-acp.ibShadowedToolTip" = "Parametri persunalizati di sblucchime.\n\nstrength=s:thresh=t:blocksize=b";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
+"DvX-m9-Q6u.title" = "Persunalizatu :";
+
+/* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
+"gKq-xF-AZE.title" = "Sblucchime :";
+
+/* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
+"h7g-eE-vgv.title" = "Scala di grisgiu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "Rigatura d’arrutata";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "Rigatura d’arrutata. Adattazioni addiziunale di a prerigatura d’arrutata per megliurà e preferenze per scenarii specifichi.\n\n« None » (Nisuna) impiegheghja e preferenze di prerigatura predefinite.\n\n- « Unsharp » pò esse rigatu per un’arrutata Ultrafina, Fina, Mediana, Roza, o Assai roza. Selezziunate una rigatura secondu à a risuluzione di a fiura aspettata è a finezza di detaglii à amendà.\n\nA rigatura « Lapsharp's Film » (Filmu) affineghja e preferenze per un adopru cù a maiò parte di i cuntenuti d’azzione. Impiegheghja un nocciulu Laplacianu isotropicu per rende più netti tutti i bordi d’una manera simile, è l’infurmazioni di luminanza (lucidezza) sò più arrutate chè quelle di u culore.\n\nA rigatura « Lapsharp's Grain » (Granellu) hè simile à Film, ma impiegheghja un Laplacianu isotropicu à nocciulu Gaussianu per riduce l’zffetti nant’à u rumore è granellu. Ghjuvevule per preservà u granellu è cum’è alternativa à Film.\n\nA rigatura « Lapsharp's Animation » (Animazione) hè ghjuvevule per l’animazione in celluloide, cum’è a fiura mossa. Hè uguale à Film, ma a forza di u trattamentu hè ridutta per impedisce di creà effetti parassiti.\n\nA rigatura « Lapsharp's Sprite » (Spiritibugliettu) hè ghjuvevule per i ghjochi 2D in 1, 4, 8 o 16 bit. Impiegheghja un nocciulu Laplacianu à 4 vicini chì amendeghja i cuntorni verticale è orizuntale più chì i cuntorni diagunale.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "Prerigatura d’allisciata cromatica";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "Spaziu culorimetricu :";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "Rigatura :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
+"IHH-Se-l6d.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise reduces or removes the appearance of noise and grain. This can improve compression efficiency and create higher quality video at smaller file sizes. Overly strong Denoise settings may damage picture quality by discarding detail.\n\nNLMeans is a high quality denoise filter with a cost to speed. Use where quality is more important than speed.\n\nHQDN3D is an adaptive low-pass filter, faster than NLMeans but less effective at preserving fine detail."; ObjectID = "ins-7X-kbN"; */
+"ins-7X-kbN.ibShadowedToolTip" = "U filtru di riduzzione di trostu riduce o caccia l’aspettu di rumore è di granellu d’un filmu. Què pò megliurà u rendimentu di a cumpressione è creà una video di più bella qualità cù schedarii più chjuchi. E preferenze troppu forte di riduzzione di trostu ponu dannighjà a qualità di a fiura scartendu i detaglii.\n\n- « NLMeans » hè un filtru di riduzzione di trostu d’alta qualità chì fà dinù cresce a vitezza di a cudificazione. Impiegatelu quandu a qualità hè più impurtante chè a vitezza.\n\n- « HQDN3D » hè un filtru passu-bassu adattevule, più prestu chè NLMeans ma menu efficiente per preservà i detaglii i più fini.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom deleteline settings."; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibExternalAccessibilityDescription" = "Preferenze persunalizate di detelesinema.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Detelecine parameters.\n\nSyntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0"; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibShadowedToolTip" = "Parametri persunalizati di detelesinema.\n\nSintassa : skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nPredefinizione : skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
+"IQG-Nn-HTb.ibShadowedToolTip" = "L’abbentata d’intricciamentu, quandu l’ozzione hè attiva, permette à u filtru di disintricciamentu di trattà solu e fiure video chì sò intricciate.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "Rigatura d’allisciata cromatica";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "Rigatura d’allisciata cromatica. Adattazioni addiziunale di a prerigatura d’allisciata cromatica per megliurà e preferenze per scenarii specifichi.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
+"KiY-kz-54k.title" = "Persunalizatu :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
+"n6U-tH-vo0.title" = "Persunalizatu :";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "Persunalizatu :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
+"pIO-dE-81w.title" = "Altre viste";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
+"Psx-nN-XiT.ibShadowedToolTip" = "« Scala di grisgiu » caccia u cumpunente culore di a video. Di solitu, hè chjamata video di neru è biancu.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
+"PyP-FP-gGx.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qey-Yo-9sX"; */
+"qey-Yo-9sX.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
+"Qz4-EY-GFO.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
+"r64-vI-ymx.ibShadowedToolTip" = "Parametri di disintricciamentu persunalizati.\n\nSintassa Yadif : mode=m:parity=p\n\nPredefinizione Yadif : mode=3\n\nSintassa di dipettinera : mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nPredefinizione di dipettinera : mode=7";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rfp-ah-CVB"; */
+"rfp-ah-CVB.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Interlace Detection parameters.\n\nSyntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16"; ObjectID = "rPg-F2-gtl"; */
+"rPg-F2-gtl.ibShadowedToolTip" = "Parametri d’abbentata d’intricciamentu persunalizati.\n\nSintassa : mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nPredefinizione : mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
+
+/* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
+"Rxe-Xm-vXj.title" = "Riduzzione di trostu :";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "Prerigatura di u spaziu culorimetricu";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
+"tje-4P-jKt.title" = "Rigatura :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
+"tlc-kS-W8X.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "Arrutà :";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
+"uDH-ts-vs5.title" = "Culore :";
+
+/* Class = "NSTextFieldCell"; title = "Deinterlace:"; ObjectID = "VsK-mC-9Pj"; */
+"VsK-mC-9Pj.title" = "Disintricciamentu :";
+
+/* Class = "NSTextFieldCell"; title = "Detelecine:"; ObjectID = "vTS-MJ-8nt"; */
+"vTS-MJ-8nt.title" = "Detelesinema :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace removes comb artifacts from the picture.\n\nYadif is a popular and fast deinterlacer.\n\nDecomb switches between multiple interpolation algorithms for speed and quality."; ObjectID = "xct-UB-bKm"; */
+"xct-UB-bKm.ibShadowedToolTip" = "U filtru di disintricciamentu caccia l’effetti parassiti da a fiura.\n\n- « Yadif » hè un filtru di disintricciamentu populare è rapidu.\n\n- « Dipettinera » bilanceghja trà parechje cudificazioni d’interpolazione per favurisce a vitezza è a qualità.";
+
+/* Class = "NSTextFieldCell"; title = "Interlace Detection:"; ObjectID = "xHD-vC-ePQ"; */
+"xHD-vC-ePQ.title" = "Abbentata di l’intricciamentu :";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "xqk-dM-L3o"; */
+"xqk-dM-L3o.title" = "Persunalizatu :";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
+"ydN-tP-vpt.title" = "Rigatura :";
+
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = "Allisciata cromatica :";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
+"ZR9-YG-pfn.ibShadowedToolTip" = "Parametri persunalizati di riduzzione di trostu.\n\nSintassa NLMeans : y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nPredefinizioni NLMeans : y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nSintassa HQDN3D : y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nPredefinizioni HQDN3D : y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
+"zvZ-ZX-yKE.title" = "Prerigatura :";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBPictureHUDController.strings Added

@@ -0,0 +1,39 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Scale preview to fill the display."; ObjectID = "12K-c3-Z7A"; */
+"12K-c3-Z7A.ibShadowedToolTip" = "Fighjulata di a scala per riempie l’affissera.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Encode and play a preview video using current settings."; ObjectID = "16b-R9-bBU"; */
+"16b-R9-bBU.ibShadowedToolTip" = "Cudificà è leghje una video di fighjulata impieghendu e preferenze attuale.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Duration to encode in seconds."; ObjectID = "ASA-X8-16P"; */
+"ASA-X8-16P.ibShadowedToolTip" = "Durata in seconde per a cudificazione.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "KrC-nR-rYk"; */
+"KrC-nR-rYk.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "sec"; ObjectID = "ksF-Ma-hB1"; */
+"ksF-Ma-hB1.title" = "sec";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show cropping settings"; ObjectID = "mV7-hU-tMt"; */
+"mV7-hU-tMt.ibShadowedToolTip" = "Affissà e preferenze di rifilatura";
+
+/* Class = "NSButtonCell"; title = "Crop"; ObjectID = "NWd-Lq-c1A"; */
+"NWd-Lq-c1A.title" = "Rifilà";
+
+/* Class = "NSButtonCell"; title = "Scale To Screen"; ObjectID = "STc-Po-p1X"; */
+"STc-Po-p1X.title" = "Adattà à u screnu";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "USR-Qf-N5v"; */
+"USR-Qf-N5v.title" = "Durata :";
+
+/* Class = "NSButtonCell"; title = "Live Preview"; ObjectID = "vkh-GY-5qx"; */
+"vkh-GY-5qx.title" = "Fighjulata istantanea";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "preview image"; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibExternalAccessibilityDescription" = "fiura di fighjulata";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Starting point for the preview encode."; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibShadowedToolTip" = "Puntu iniziale per a cudificazione di fighjulata.";
+
+/* Class = "NSMenuItem"; title = "240"; ObjectID = "XYh-Ls-slf"; */
+"XYh-Ls-slf.title" = "240";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBPictureViewController.strings Added

@@ -0,0 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "Permette a culata in gamma";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "Dimensione d’affissera :";
+
+/* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
+"1O3-th-4M5.title" = "Fermata";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibExternalAccessibilityDescription" = "Rifilà inghjò";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu inferiore";
+
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
+"2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
+"2s0-5k-fjU.ibExternalAccessibilityDescription" = "Altezza di l’allucamentu";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "Altezza di l’allucamentu";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "Prupurzioni :";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "Imbuttisce insù";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "Quantità in pixel d’imburrera di u bordu superiore";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "Nisunu";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
+"6W6-RI-fBx.ibExternalAccessibilityDescription" = "Rifilà inghjò";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "Autumaticu";
+
+/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
+"8vS-Mw-bny.title" = "Anamorficu :";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "Imbuttisce insù";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "Larghezza di cambiamentu di scala";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "Larghezza di cambiamentu di scala di a video. Ghjè a larghezza à cudificà in numeru di pixel. A larghezza di cambiamentu di scala pò esse sfarente di quella di l’affissera secondu à e preferenze anamorfiche è quelle di u riempiimentu";
+
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC SD";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibExternalAccessibilityDescription" = "Rifilà insù";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu superiore";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "Culore persunalizatu di u bordu";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "Culore persunalizatu di u bordu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "Larghezza d’affissera";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "Risuluzione è messa à a scala";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "Culore di u bordu aghjunta à u giru di a video";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "Imbuttisce à diritta";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "Quantità in pixel d’imburrera di u bordu dirittu";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "Cunfina di risuluzione :";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
+"Ddg-4D-el9.ibExternalAccessibilityDescription" = "Rifilà à diritta";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "Altezza d’affissera";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "Neru";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "Autumaticu";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "Orizuntale";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "Rivultamentu :";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
+"f12-Dh-fDw.title" = "Persunalizatu";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "Nisunu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "Girà a fiura di 90 gradi in u sensu di e sfiere d’arilogiu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "Altezza massima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "L’altezza massima cù quella a video serà arregistrata.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "Impiegà a risuluzione a più alta permessa da e preferenze insù";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "Biancu";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "Dimensione ottimale";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Larghezza di l’allucamentu";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "Nisunu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "Altezza di l’allucamentu";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "Altezza di cambiamentu di scala di a video. Ghjè l’altezza à cudificà in numeru di pixel. L’altezza di cambiamentu di scala pò esse sfarente di quella di l’affissera secondu à e preferenze anamorfiche è quelle di u riempiimentu";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
+"hN1-S9-zl8.title" = "x";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "Riempiimentu :";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "Larghezza di l’allucamentu";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "Imbuttisce à manca";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "Larghezza d’affissera";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "Autumaticu";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "Grisgiu";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "Dimensione d’allucamentu :";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
+"krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "Imbuttisce à manca";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "Quantità in pixel d’imburrera di u bordu mancu";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "Dimensione à a scala :";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "Persunalizatu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibExternalAccessibilityDescription" = "Rifilà à manca";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu superiore";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Numeratore d’aspetu di pixel";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "U furmatu pixel definisce a forma, a larghezza è l’altezza di i punti elementarii d’una fiura (pixel).\n\nUn raportu 1:1 definisce un pixel quadratu. D’altri valori definiscenu forme rettangulare.\nI lettori cambieranu e dimensioni di a fiura per currisponde à l’aspettu specificatu.";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "Prupurzioni :";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
+"Mke-9L-LvB.ibExternalAccessibilityDescription" = "Rifilà insù";
+
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "Larghezza è altezza";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Dinuminatore d’aspetu di pixel";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "U furmatu pixel definisce a forma, a larghezza è l’altezza di i punti elementarii d’una fiura (pixel).\n\nUn raportu 1:1 definisce un pixel quadratu. D’altri valori definiscenu forme rettangulare.\nI lettori cambieranu e dimensioni di a fiura per currisponde à l’aspettu specificatu.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "Larghezza massima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "A larghezza massima cù quella a video serà arregistrata.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
+"ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "Culore :";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "Persunalizatu";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "Altezza (Letterbox)";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "Grisgiu scuru";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
+"qSV-uB-Iup.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p HD";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "Rifilà à manca";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "S’è l’ozzione hè disattivata, e dimensioni à a scala seranu cunfinate à quelle di a fonte";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "Aspettu di fiura (pixel) :";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "U cambiamentu di dimensione di l’affissera stinzerà a video";
+
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
+
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "Dimensioni di a fonte";
+
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "Orientazione è inquadratura";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "Imbuttisce à diritta";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
+"uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
+
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "Dimensioni finale";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "Rotazione :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "Cumu appiecà e preferenze di rifilatura";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "Aghjunghje un bordu à u giru di a video";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "Persunalizatu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "« Anamorficu » permette dimensioni arbitrarie d’allucamentu tuttu preservendu l’aspettu d’origine durante a ripruduzzione.\n\n- « Automatic » megliureghja a risuluzione d’allucamentu tuttu preservendu e prupurzioni d’affissera d’origine. Ricumandatu.\n\n- « None » disattiveghja « Anamorficu ». E dimensioni d’allucamentu di a video è quelle di l’affissera seranu uguale. Solu ghjuvevule per a cumpatibilità cù certi apparechji anziani.\n\n- « Custom » permette di definisce dapervoi tutte e preferenze. Ghjuvevule per currege un aspettu incurrettu d’affissera di a fonte è per i prufessiunali chì anu bisognu d’un cuntrollu espertu in post-pruduzzione.";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "Larghezza (Pillarbox)";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "Dimensione d’affissera :";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "Imbuttisce inghjò";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "Quantità in pixel d’imburrera di u bordu inferiore";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibExternalAccessibilityDescription" = "Rifilà à diritta";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "Quantità in pixel di rifilatura di u bordu dirittu";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
+"x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p HD";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "Invertisce a fiura (cum’è un spechju) secondu à l’asse orizuntale";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "Persunalizatu";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL SD";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "Bordi";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "Inquadratura :";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "Imbuttisce inghjò";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "Dimensione d’allucamentu :";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBPlayerHUDController.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "6A0-9h-5UY"; */
+"6A0-9h-5UY.title" = "00:00:00";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "6BQ-wU-p2C"; */
+"6BQ-wU-p2C.title" = "Traccie";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "End Live Preview"; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibExternalAccessibilityDescription" = "Piantà a fighjulata istantanea";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Exit player and return to still image previews."; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibShadowedToolTip" = "Esce di u lettore è rivultà à a fighjulata di e fiure.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibExternalAccessibilityDescription" = "Andà à a fine";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibShadowedToolTip" = "Andà à a fine";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "dGi-LK-P1E"; */
+"dGi-LK-P1E.title" = "00:00:00";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibExternalAccessibilityDescription" = "Ammutulisce";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibShadowedToolTip" = "Ammutulisce";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Volume Control"; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibExternalAccessibilityDescription" = "Cuntrollu di u vulume";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change volume."; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibShadowedToolTip" = "Trascinà per cambià u vulume.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibExternalAccessibilityDescription" = "Vulume massimu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibShadowedToolTip" = "Vulume massimu";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Timeline"; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibExternalAccessibilityDescription" = "Linea tempurale";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change timeline position."; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibShadowedToolTip" = "Trascinà per cambià a pusizione nant’à a linea tempurale.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibExternalAccessibilityDescription" = "Lettura / Pausa";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibShadowedToolTip" = "Cummutazione Lettura/Pausa";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Time Remaining"; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibExternalAccessibilityDescription" = "Tempu rimanente";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Time remaining."; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibShadowedToolTip" = "Tempu rimanente.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Current Timeline Position"; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibExternalAccessibilityDescription" = "Pusizione attuale nant’à a linea tempurale";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Current timeline position."; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibShadowedToolTip" = "Pusizione attuale nant’à a linea tempurale.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Tracks Selection"; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibExternalAccessibilityDescription" = "Selezzione di e traccie";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Enable or disable tracks."; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibShadowedToolTip" = "Attivà o disattivà traccie.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibExternalAccessibilityDescription" = "Andà à u principiu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibShadowedToolTip" = "Andà à u principiu";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBPreviewViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBQueueInfoViewController.strings Added

@@ -0,0 +1,24 @@
+/* Class = "NSTextFieldCell"; title = "Statistics"; ObjectID = "aCP-yp-iZy"; */
+"aCP-yp-iZy.title" = "Statistiche";
+
+/* Class = "NSTextFieldCell"; title = "Summary"; ObjectID = "cx1-rC-AMC"; */
+"cx1-rC-AMC.title" = "Riassuntu";
+
+/* Class = "NSButtonCell"; title = "Edit"; ObjectID = "erY-5X-50l"; */
+"erY-5X-50l.title" = "Mudificà";
+
+/* Class = "NSTextFieldCell"; title = "Summary"; ObjectID = "GaR-qk-UW7"; */
+"GaR-qk-UW7.title" = "Riassuntu";
+
+/* Class = "NSButtonCell"; title = "Reset"; ObjectID = "hgl-N3-x4S"; */
+"hgl-N3-x4S.title" = "Reinizià";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reset the job state"; ObjectID = "oq4-g0-srt"; */
+"oq4-g0-srt.ibShadowedToolTip" = "Reinizià u statu di u travagliu";
+
+/* Class = "NSTextFieldCell"; title = "Statistics"; ObjectID = "S15-bh-qKU"; */
+"S15-bh-qKU.title" = "Statistiche";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Open the job in the main window for editing"; ObjectID = "Z14-gh-hWn"; */
+"Z14-gh-hWn.ibShadowedToolTip" = "Apre u travagliu in a finestra principale per mudificallu";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBQueueTableViewController.strings Added

@@ -0,0 +1,42 @@
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "5AR-we-iHC"; */
+"5AR-we-iHC.title" = "Caccià tutti i travagli";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "5Rl-P0-bhc"; */
+"5Rl-P0-bhc.title" = "Cellula di vista di tavula";
+
+/* Class = "NSMenuItem"; title = "Show Destination in Finder"; ObjectID = "c1Z-ZC-b8b"; */
+"c1Z-ZC-b8b.title" = "Affissà a destinazione in u Finder";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "DTF-om-j0l"; */
+"DTF-om-j0l.title" = "Mudificà";
+
+/* Class = "NSTextFieldCell"; title = "Encoding status"; ObjectID = "eEU-Dr-Qh8"; */
+"eEU-Dr-Qh8.title" = "Statu di a cudificazione";
+
+/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "egD-8R-PTJ"; */
+"egD-8R-PTJ.title" = "Caccià";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "gNj-D1-wa7"; */
+"gNj-D1-wa7.title" = "Caccià i travagli compii";
+
+/* Class = "NSMenuItem"; title = "Move to Bottom"; ObjectID = "HwR-LP-IK8"; */
+"HwR-LP-IK8.title" = "Dispiazzà à a fine";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "K6c-HW-um8"; */
+"K6c-HW-um8.title" = "Cellula di testu";
+
+/* Class = "NSMenuItem"; title = "Move to Top"; ObjectID = "NN5-Yq-Cth"; */
+"NN5-Yq-Cth.title" = "Dispiazzà à u principiu";
+
+/* Class = "NSMenuItem"; title = "Show Source in Finder"; ObjectID = "Pps-jm-zcd"; */
+"Pps-jm-zcd.title" = "Affissà a fonte in u Finder";
+
+/* Class = "NSMenuItem"; title = "Reset"; ObjectID = "xMs-43-lL0"; */
+"xMs-43-lL0.title" = "Reinizià";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "xSd-Hl-5Qk"; */
+"xSd-Hl-5Qk.title" = "Cellula di vista di tavula";
+
+/* Class = "NSMenuItem"; title = "Show Activity Log in Finder"; ObjectID = "zA7-r8-i4L"; */
+"zA7-r8-i4L.title" = "Affissà u ghjurnale d¹attività in u Finder";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBRenamePresetController.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBSummaryViewController.strings Added

@@ -0,0 +1,69 @@
+/* Class = "NSTextFieldCell"; title = "Tracks:"; ObjectID = "3mF-Bb-Gon"; */
+"3mF-Bb-Gon.title" = "Traccie :";
+
+/* Class = "NSTextFieldCell"; title = "Size:"; ObjectID = "B4a-co-0ly"; */
+"B4a-co-0ly.title" = "Dimensione :";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
+"BHq-Mt-3eA.ibExternalAccessibilityDescription" = "Riassuntu di i filtri";
+
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "Cunservazione di i metadati cummuni";
+
+/* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
+"De0-Je-MAm.title" = "Alineà u principiu di l’audio/video";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "Cupià i metadati da a fonte ver di a destinazione";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
+"fPv-Vw-I89.ibShadowedToolTip" = "Alineeghja e stampiglie iniziale di tutti i flussi audio è video framittendu fiure viote o squassendu fiure. Què pò megliurà a sincrunizazione audio/video per i lettori disfunziunendu chì ùn rispettanu micca e liste di mudificazioni MP4.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
+"Jaw-pH-rhf.ibExternalAccessibilityDescription" = "Riassuntu di dimensione";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "Perfezziunà u MP4 per u scaricamentu prugressivu. Dopu a cudificazione, i dati sò riorganizati è riscritti per permette una lettura istantanea nant’à una reta, senza avè à scaricà u schedariu sanu.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
+"lUi-Oc-208.ibShadowedToolTip" = "Perfezziunà u MP4 per u scaricamentu prugressivu. Dopu a cudificazione, i dati sò riorganizati è riscritti per permette una lettura istantanea nant’à una reta, senza avè à scaricà u schedariu sanu.";
+
+/* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
+"m5a-0z-QQ4.ibExternalAccessibilityDescription" = "Fighjulata";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Megliuratu per u Web";
+
+/* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
+"OCw-f6-uA0.title" = "Filtri :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Q1Z-yT-7iY"; */
+"Q1Z-yT-7iY.title" = "Altre viste";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility."; ObjectID = "QKv-GR-d2g"; */
+"QKv-GR-d2g.ibShadowedToolTip" = "Aghjunghje un marcatore apposta per permette a lettura nant’à l’iPod di 5a generazione circa 2006. D’altre preferenze ponu affettà a cumpatibilità.";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "RIB-ME-Yhh"; */
+"RIB-ME-Yhh.title" = "Nisunu";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "RXJ-DZ-4mh"; */
+"RXJ-DZ-4mh.title" = "Furmatu :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Container format. Video, audio, and other tracks are combined into a single file of this type. Affects compatibility."; ObjectID = "txV-1R-WoD"; */
+"txV-1R-WoD.ibShadowedToolTip" = "Furmatu di u cuntenentu. E traccie video, audio è altre sò addunite in un schedariu unicu di stu tipu. Què affetta a cumpatibilità.";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "wcc-5d-Dgj"; */
+"wcc-5d-Dgj.title" = "Megliuratu per u Web";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xmy-Jl-mR4"; */
+"xmy-Jl-mR4.title" = "Nisunu";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xzc-qg-AMn"; */
+"xzc-qg-AMn.title" = "Nisunu";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Tracks summary"; ObjectID = "yRE-5c-FhX"; */
+"yRE-5c-FhX.ibExternalAccessibilityDescription" = "Riassuntu di e traccie";
+
+/* Class = "NSButtonCell"; title = "iPod 5G Support"; ObjectID = "zz5-qY-GSA"; */
+"zz5-qY-GSA.title" = "Ghjestione di l’iPod 5G";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBTitleSelection.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "4XY-C0-SwE"; */
+"4XY-C0-SwE.headerCell.title" = "Titulu";
+
+/* Class = "NSTextFieldCell"; title = "Select the titles to add to the queue:"; ObjectID = "5tD-fg-g4t"; */
+"5tD-fg-g4t.title" = "Selezziunà i tituli à aghjunghje à a fila d’attesa :";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "a6r-ky-REh"; */
+"a6r-ky-REh.headerCell.title" = "Durata";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dsG-Ho-vsT"; */
+"dsG-Ho-vsT.title" = "Cellula di vista di tavula";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Finestra";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Fcv-FE-8Fv"; */
+"Fcv-FE-8Fv.title" = "Cellula di testu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "FQY-Ye-g0f"; */
+"FQY-Ye-g0f.headerCell.title" = "Nome";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hQc-RA-phB"; */
+"hQc-RA-phB.title" = "0";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "jHg-nh-9NJ"; */
+"jHg-nh-9NJ.title" = "Abbandunà";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JqJ-5C-Yhw"; */
+"JqJ-5C-Yhw.title" = "Cuntrollà";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "k84-a6-eZ7"; */
+"k84-a6-eZ7.title" = "Cuntrollà";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "mOe-XL-tl1"; */
+"mOe-XL-tl1.title" = "Aghjunghje";
+
+/* Class = "NSMenuItem"; title = "Deselect All"; ObjectID = "PXF-7D-BKR"; */
+"PXF-7D-BKR.title" = "Ùn selezziunà &nunda";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedDisplayPattern = "%{value1}@"; ObjectID = "xTt-zi-wf0"; */
+"xTt-zi-wf0.ibShadowedDisplayPattern" = "%{valore1}@";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "zwi-rc-q6x"; */
+"zwi-rc-q6x.title" = "Cellula di testu";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/HBTrackTitleViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Localizable.strings Added

@@ -0,0 +1,506 @@
+/* Preview -> size info label */
+" Scaled To Screen" = " Adattata à u screnu";
+
+/* No comment provided by engineer. */
+"- --:--" = "- --:--";
+
+/* No comment provided by engineer. */
+"--:--" = "--:--";
+
+/* Preview -> size info label */
+"(%.0f%% actual size)" = "(%.0f%% di a dimensione reale)";
+
+/* Preview -> size info label */
+"(Actual size)" = "(Dimensione attuale)";
+
+/* Main Window -> preset modified */
+"(Modified)" = "(mudificata)";
+
+/* Queue status */
+"%lu encode pending" = "%lu cudificazione in attesa";
+
+/* Queue status */
+"%lu encodes pending" = "%lu cudificazioni in attesa";
+
+/* No comment provided by engineer. */
+"%lu jobs selected" = "%lu travaglii selezziunati";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p HD";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p HD";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K Ultra HD";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K Ultra HD";
+
+/* Destination same as source alert -> message
+   File already exists alert -> message */
+"A file already exists at the selected destination." = "Un schedariu esiste dighjà in a destinazione selezziunata.";
+
+/* Picture HUD -> scale button */
+"Actual Scale" = "Scala attuale";
+
+/* Queue undo action name */
+"Add Job To Queue" = "Aghjunghje un travagliu à a fila d’attesa";
+
+/* Queue undo action name */
+"Add Jobs To Queue" = "Aghjunghje travaglii à a fila d’attesa";
+
+/* Touch bar */
+"Add Preset" = "Aghjunghje una prerigatura";
+
+/* Touch bar */
+"Add Titles To Queue" = "Aghjunghje tituli à a fila d’attesa";
+
+/* Touch bar */
+"Add To Queue" = "Aghjunghje à a fila d’attesa";
+
+/* Preferences Advanced Toolbar Item */
+"Advanced" = "Espertu";
+
+/* HBLanguage -> Any language */
+"Any" = "Qualsisia";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected preset?" = "Site sicuru di vulè squassà a prerigatura selezziunata ?";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected presets?" = "Site sicuru di vulè squassà e prerigature selezziunate ?";
+
+/* Quit Alert -> message */
+"Are you sure you want to quit HandBrake?" = "Site sicuru di vulè esce da HandBrake ?";
+
+/* Copy Protection Alert -> first button */
+"Attempt Scan Anyway" = "Pruvà quantunque l’esplurazione";
+
+/* Player HUD -> audio menu */
+"Audio" = "Audio";
+
+/* Copy Protection Alert -> second button
+   Delete preset alert -> second button
+   File already exists alert -> first button
+   File already exists in queue alert -> first button
+   Preview -> live preview alert alternate button
+   Touch bar */
+"Cancel" = "Abbandunà";
+
+/* Touch bar */
+"Cancel Encoding" = "Abbandunà a cudificazione";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Cancel Scan" = "Abbandunà l’esplurazione";
+
+/* Toolbar Open/Cancel Item */
+"Cancel Scanning Source" = "Abbandunà l’esplurazione di e fonte";
+
+/* Preferences -> Output Name Token */
+"Chapters" = "Capituli";
+
+/* Main Window -> Destination open panel */
+"Choose" = "Sceglie";
+
+/* Queue Alert -> cancel rip first button */
+"Continue Encoding" = "Cuntinuà a cudificazione";
+
+/* Copy Protection Alert -> message */
+"Copy-Protected sources are not supported." = "E fonte prutette contr’à a copia ùn sò micca accettate.";
+
+/* Preferences -> Output Name Token */
+"Creation-Date" = "Data di creazione";
+
+/* Preferences -> Output Name Token */
+"Creation-Time" = "Ora di creazione";
+
+/* Touch bar */
+"Current Time" = "Ora attuale";
+
+/* Add preset window -> picture setting */
+"Custom" = "Persunalizatu";
+
+/* Preferences -> Output Name Token */
+"Date" = "Data";
+
+/* Delete preset alert -> first button */
+"Delete Preset" = "Squassà a prerigatura";
+
+/* Delete preset alert -> first button */
+"Delete Presets" = "Squassà e prerigature";
+
+/* File already exists alert -> informative text
+   File already exists in queue alert -> informative text */
+"Do you want to overwrite %@?" = "Vulete rimpiazzà %@ ?";
+
+/* Quit Alert -> second button */
+"Don't Quit" = "Ùn micca esce";
+
+/* Touch bar */
+"Done" = "Fattu";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode canceled" = "Cudificazione abbandunata";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode complete" = "Cudificazione compia";
+
+/* HBQueueItemView -> Encode state accessibility label
+   Queue done notification failed message */
+"Encode failed" = "Cudificazione fiasca";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode ready" = "Cudificazione pronta";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode working" = "Cudificazione in corsu";
+
+/* No comment provided by engineer. */
+"Encoding %lu Jobs" = "Cudificazione di %lu travaglii";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "Cudificazione di u travagliu : %@";
+
+/* Job statistics */
+"Ended at:" = "Compiu à :";
+
+/* Export presets save panel title */
+"Export preset" = "Espurtà a prerigatura";
+
+/* Export presets save panel title */
+"Export presets" = "Espurtà e prerigature";
+
+/* File already exists alert -> message */
+"File already exists." = "U schedariu esiste dighjà.";
+
+/* Preferences General Toolbar Item */
+"General" = "Generale";
+
+/* Main Window -> title */
+"HandBrake" = "HandBrake";
+
+/* Preview -> live preview alert message */
+"HandBrake can't open the preview." = "HandBrake ùn pò micca apre a fighjulata.";
+
+/* Preview -> live preview alert informative text */
+"HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?" = "HandBrake ùn pò micca leghje sta cumbinazione di furmatu video/audio/cuntenente. Vulete aprelu cù un lettore esternu ?";
+
+/* Quit Alert -> informative text */
+"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?" = "S’è vo iscete d’HandBrake, a vostra cudificazione attuale serà ricaricata in a fila d’attesa à u prossimu avviu. Vulete esce quantunque ?";
+
+/* Import preset open panel title */
+"Import presets" = "Impurtà prerigature";
+
+/* Chapters import -> invalid CSV line count description */
+"Incorrect line count" = "Numeru di linee incurrettu";
+
+/* Chapters import -> invalid CSV description */
+"Invalid chapters CSV file" = "Schedariu di capituli CSV inaccettevule";
+
+/* Queue Edit Alert -> stop and edit first button
+   Queue Stop Alert -> stop and remove first button */
+"Keep Encoding" = "Cuntinuà a cudificazione";
+
+/* Touch bar */
+"Live Preview" = "Fighjulata istantanea";
+
+/* Queue undo action name */
+"Move Job in Queue" = "Dispiazzà u travagliu in a fila d’attesa";
+
+/* Queue undo action name */
+"Move Jobs in Queue" = "Dispiazzà i travaglii in a fila d’attesa";
+
+/* Queue status */
+"No encode pending" = "Nisuna cudificazione in attesa";
+
+/* Preview -> accessibility label */
+"No image" = "Nisuna fiura";
+
+/* No comment provided by engineer. */
+"No job selected" = "Nisunu travagliu selezziunatu";
+
+/* Main Window -> Info text */
+"No Valid Source Found" = "Ùn si pò truvà nisuna fonte";
+
+/* Add preset window -> picture setting */
+"None" = "Nisunu";
+
+/* Queue Done Alert -> shut down first button
+   Queue Done Alert -> sleep first button */
+"OK" = "Vai";
+
+/* File already exists alert -> informative text */
+"One or more file already exists. Do you want to overwrite?" = "Unu o parechji schedarii esistenu dighjà. Vulete rimpiazzalli ?";
+
+/* Preview -> live preview alert default button */
+"Open in external player" = "Apre cù un lettore esternu";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Open Source" = "Fonte aperta";
+
+/* File already exists alert -> second button
+   File already exists in queue alert -> second button */
+"Overwrite" = "Rimpiazzà";
+
+/* Toolbar Pause Item */
+"Pause" = "Pausa";
+
+/* Queue -> pause/resume menu
+   Toolbar Pause Item
+   Touch bar */
+"Pause Encoding" = "Interrompe a cudificazione";
+
+/* Touch bar */
+"Pause/Resume Encoding" = "Interrompe / cuntinuà a cudificazione";
+
+/* Job statistics */
+"Paused time:" = "Durata di pausa :";
+
+/* Video -> Framerate */
+"Peak Framerate (VFR)" = "Frequenza di fiure di cresta (VFR)";
+
+/* Touch bar */
+"Play/Pause" = "Lettura / Pausa";
+
+/* Add preset window -> name alert informative text
+   Rename preset window -> name alert informative text */
+"Please enter a name." = "Scrivite un nome.";
+
+/* Copy Protection Alert -> informative text */
+"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function. This warning will be shown only once each time HandBrake is run." = "Ci vole à sapè chì HandBrake ùn accetta micca di caccià a prutezzione contr’à a copia nant’à i dischi DVD. S’è vo vulete fà sta funzione, ci vulerà à impiegà un prugramma esternu. St’avertimentu serà affissatu solu una volta à ogni avviu d’HandBrake.";
+
+/* Queue Done Alert -> shut down second button
+   Queue Done Alert -> sleep second button */
+"Preferences…" = "Preferenze…";
+
+/* Preview -> progress formatter title */
+"preview" = "fighjulata";
+
+/* Preview -> window title */
+"Preview" = "Fighjulata";
+
+/* Preview -> window title format */
+"Preview - %@ %@" = "Fighjulata - %1$@ %2$@";
+
+/* Preview -> accessibility label */
+"Preview Image, Size: %zu x %zu, Scale: %.0f%%" = "Fighjulata di a fiura, dimensione : %1$zu x %2$zu, scala : %3$.0f%%";
+
+/* Touch bar */
+"Previews" = "Apprezzazioni";
+
+/* Queue done alert message
+   Queue notification alert message */
+"Put down that cocktail…" = "Punite stu bichjeru…";
+
+/* Preferences -> Output Name Token */
+"Quality/Bitrate" = "Qualità / Flussu binariu";
+
+/* Queue window title */
+"Queue" = "Fila d’attesa";
+
+/* Queue window title */
+"Queue (%@)" = "Fila d’attesa (%@)";
+
+/* Quit Alert -> first button */
+"Quit" = "Esce";
+
+/* Touch bar */
+"Remaining Time" = "Tempu rimanentu";
+
+/* HBQueueItemView -> Remove button accessibility label */
+"Remove job" = "Caccià u travagliu";
+
+/* Queue undo action name */
+"Remove Job From Queue" = "Caccià u travagliu da a fila d’attesa";
+
+/* Queue undo action name */
+"Remove Jobs From Queue" = "Caccià i travaglii da a fila d’attesa";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "Nova esplurazione per pudè mudificà";
+
+/* Toolbar Pause Item */
+"Resume" = "Ripiglià";
+
+/* Queue -> pause/resume men
+   Toolbar Pause Item */
+"Resume Encoding" = "Ripiglià a cudificazione";
+
+/* HBQueueItemView -> Reveal button accessibility label */
+"Reveal destination in Finder" = "Palisà a destinazione in u Finder";
+
+/* Job statistics */
+"Run time:" = "Durata di cudificazione :";
+
+/* Export presets panel prompt */
+"Save" = "Arregistrà";
+
+/* Picture HUD -> scale button
+   Touch bar */
+"Scale To Screen" = "Adattà à u screnu";
+
+/* Queue Alert -> cancel rip informative text */
+"Select Continue Encoding to dismiss this dialog without making changes." = "Selezziunate « Cuntinuà a cudificazione » per righjittà stu dialogu senza fà nisunu cambiamentu.";
+
+/* Preferences -> send to app destination open panel */
+"Select the desired external application" = "Selezziunate l’appiecazione esterna desiderata";
+
+/* Titles selection sheet -> informative text */
+"Select the titles to add to the queue using the %@ preset:" = "Selezziunà i tituli à aghjunghje à a fila d’attesa impieghendu a prerigatura %@ :";
+
+/* Notification -> Show in Finder */
+"Show" = "Affissà";
+
+/* Touch bar */
+"Show Activity Window" = "Affissà a finestra d’attività";
+
+/* Touch bar */
+"Show Preview Window" = "Affissà a finestra di fighjulata";
+
+/* Job statistics */
+"Size:" = "Dimensione :";
+
+/* Queue Alert -> cancel rip second button */
+"Skip Current Job" = "Tralascià u travagliu in corsu";
+
+/* Touch bar */
+"Slider" = "Cursore";
+
+/* Preferences -> Output Name Token */
+"Source" = "Fonte";
+
+/* Toolbar Start/Stop Item */
+"Start" = "Principià";
+
+/* Menu Start/Stop Item
+   Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Start Encoding" = "Principià a cudificazione";
+
+/* Toolbar Start/Stop Item */
+"Start Queue" = "Principià a fila d’attesa";
+
+/* Touch bar */
+"Start/Stop Encoding" = "Principià / Piantà a cudificazione";
+
+/* Job statistics */
+"Started at:" = "Principiatu à :";
+
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
+"Stop" = "Piantà";
+
+/* Queue -> Stop action */
+"Stop action." = "Piantà l’azzione in corsu.";
+
+/* Queue Alert -> cancel rip third button */
+"Stop After Current Job" = "Piantà dopu à u travagliu in corsu";
+
+/* Queue Alert -> cancel rip fourth button */
+"Stop All" = "Tuttu piantà";
+
+/* Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Stop Encoding" = "Piantà a cudificazione";
+
+/* Queue Stop Alert -> stop and remove second button */
+"Stop Encoding and Delete" = "Piantà a cudificazione è squassà";
+
+/* Queue Edit Alert -> stop and edit second button */
+"Stop Encoding and Edit" = "Piantà a cudificazione è mudificà";
+
+/* Queue Edit Alert -> stop and edit message */
+"Stop This Encode and Edit It?" = "Piantà sta cudificazione è mudificalla ?";
+
+/* Queue Stop Alert -> stop and remove message */
+"Stop This Encode and Remove It?" = "Piantà sta cudificazione è squassalla ?";
+
+/* Player HUD -> subtitles menu */
+"Subtitles" = "Sottutituli";
+
+/* Queue Done Alert -> shut down message */
+"The computer will shut down after encoding is done." = "L’urdinatore si pianterà dopu à a fine di a cudificazione.";
+
+/* Queue Done Alert -> sleep message */
+"The computer will sleep after encoding is done." = "L’urdinatore si mitterà in veghja dopu à a fine di a cudificazione.";
+
+/* Chapters import -> invalid CSV recovery suggestion */
+"The CSV file is not a valid chapters CSV file." = "U schedariu CSV ùn hè micca un schedariu di capituli accettevule.";
+
+/* Destination same as source alert -> informative text */
+"The destination is the same as the source, you can not overwrite your source file!" = "A destinazione hè listessa chì a fonte, ùn si pò micca rimpiazzà u schedariu di fonte !";
+
+/* Chapters import -> invalid CSV line count recovery suggestion */
+"The line count in the chapters CSV file does not match the number of chapters in the movie." = "U numeru di linee di u schedariu di capituli CSV ùn currisponde micca à u numeru di i capituli di u filmu.";
+
+/* Add preset window -> name alert message
+   Rename preset window -> name alert message */
+"The preset name cannot be empty." = "U nome di a prerigatura ùn pò micca esse viotu.";
+
+/* File already exists in queue alert -> message */
+"There is already a queue item for this destination." = "Ci hè dighjà un elementu in a fila d’attesa per sta destinazione.";
+
+/* Invalid destination alert -> informative text */
+"This is not a valid destination directory!" = "U cartulare di destinazione ùn hè micca accettevule !";
+
+/* Preferences -> Output Name Token */
+"Time" = "Tempu";
+
+/* Preferences -> Output Name Token */
+"Title" = "Titulu";
+
+/* HBLanguage -> Unknown language */
+"Unknown" = "Scunnisciutu";
+
+/* Video -> Framerate */
+"Variable Framerate" = "Frequenza di fiure variabile (VFR)";
+
+/* Invalid destination alert -> message */
+"Warning!" = "Avertimentu !";
+
+/* No comment provided by engineer. */
+"Working" = "Travagliu in corsu";
+
+/* Queue Alert -> cancel rip message */
+"You are currently encoding. What would you like to do?" = "Una cudificazione hè in corsu. Chì vulete fa ?";
+
+/* Delete preset alert -> informative text */
+"You can't undo this action." = "Ùn si pò disfà st’azzione.";
+
+/* Queue Done Alert -> shut down informative text */
+"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences." = "Avete sceltu di piantà l’urdinatore dopu à a fine di a cudificazione. Per disattivà sta piantata, andate in e Preferenze d’HandBrake.";
+
+/* Queue Done Alert -> sleep informative text */
+"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences." = "Avete sceltu di mette l’urdinatore in veghja dopu à a fine di a cudificazione. Per disattivà a messa in veghja, andate in e Preferenze d’HandBrake.";
+
+/* Queue -> disk almost full alert informative text */
+"You need to make more space available on your destination disk." = "Ci vole à liberà più di spaziu nant’à u vostru discu di destinazione.";
+
+/* Queue -> disk almost full alert message */
+"Your destination disk is almost full." = "U vostru discu di destinazione hè guasi pienu.";
+
+/* Queue done notification message */
+"Your encode %@ couldn't be completed." = "A vostra cudificazione %@ ùn hè stata micca compia.";
+
+/* Queue done notification message */
+"Your encode %@ is done!" = "A vostra cudificazione hè compia !";
+
+/* Queue done alert informative text */
+"Your HandBrake queue is done!" = "A vostra fila d’attesa d’HandBrake hè compia !";
+
+/* Queue Edit Alert -> stop and edit informative text
+   Queue Stop Alert -> stop and remove informative text */
+"Your movie will be lost if you don't continue encoding." = "U vostru filmu serà persu s’è vo ùn cuntinuate micca a cudificazione.";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/MainMenu.strings Added

@@ -0,0 +1,270 @@
+/* Class = "NSMenu"; title = "Services"; ObjectID = "0te-ai-fgD"; */
+"0te-ai-fgD.title" = "Servizii";
+
+/* Class = "NSMenuItem"; title = "Rename…"; ObjectID = "1GQ-n3-jfY"; */
+"1GQ-n3-jfY.title" = "Rinuminà…";
+
+/* Class = "NSMenuItem"; title = "Filters"; ObjectID = "6rE-SM-AGi"; */
+"6rE-SM-AGi.title" = "Filtri";
+
+/* Class = "NSMenuItem"; title = "Summary"; ObjectID = "9ie-b7-RaS"; */
+"9ie-b7-RaS.title" = "Riassuntu";
+
+/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */
+"29.title" = "ListinuPrincipale";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "56"; */
+"56.title" = "HandBrake";
+
+/* Class = "NSMenu"; title = "HandBrake"; ObjectID = "57"; */
+"57.title" = "HandBrake";
+
+/* Class = "NSMenuItem"; title = "About HandBrake"; ObjectID = "58"; */
+"58.title" = "Apprupositu d’HandBrake";
+
+/* Class = "NSMenuItem"; title = "Quit HandBrake"; ObjectID = "136"; */
+"136.title" = "Piantà Handbrake";
+
+/* Class = "NSMenuItem"; title = "Hide HandBrake"; ObjectID = "971"; */
+"971.title" = "Piattà HandBrake";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "973"; */
+"973.title" = "Piattà l’altri";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "1189"; */
+"1189.title" = "Finestra";
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "1190"; */
+"1190.title" = "Mette tuttu di fronte";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "1191"; */
+"1191.title" = "Impuculì in u Dock";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "1192"; */
+"1192.title" = "Finestra";
+
+/* Class = "NSMenuItem"; title = "Open Source…"; ObjectID = "1198"; */
+"1198.title" = "Apre una fonte…";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1200"; */
+"1200.title" = "Schedariu";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1209"; */
+"1209.title" = "Schedariu";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "1429"; */
+"1429.title" = "Aiutu";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "1431"; */
+"1431.title" = "Aiutu";
+
+/* Class = "NSMenuItem"; title = "HandBrake Website"; ObjectID = "1432"; */
+"1432.title" = "Situ web di HandBrake";
+
+/* Class = "NSMenuItem"; title = "Online Community Forums"; ObjectID = "1433"; */
+"1433.title" = "Fori in linea di a cumunità";
+
+/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "1445"; */
+"1445.title" = "Preferenze…";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "1795"; */
+"1795.title" = "Mudificà";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "1796"; */
+"1796.title" = "Mudificà";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "1797"; */
+"1797.title" = "Squassà";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "1798"; */
+"1798.title" = "Tuttu selezziunà";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "1799"; */
+"1799.title" = "Disfà";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "1801"; */
+"1801.title" = "Rifà";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "1802"; */
+"1802.title" = "Circà";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "1803"; */
+"1803.title" = "Circà";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "1804"; */
+"1804.title" = "Andà à a selezzione";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "1805"; */
+"1805.title" = "Circà…";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "1806"; */
+"1806.title" = "Circà seguente";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "1807"; */
+"1807.title" = "Circà precedente";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "1808"; */
+"1808.title" = "Impiegà a selezzione per circà";
+
+/* Class = "NSMenuItem"; title = "Spelling"; ObjectID = "1810"; */
+"1810.title" = "Ortugrafia";
+
+/* Class = "NSMenu"; title = "Spelling"; ObjectID = "1811"; */
+"1811.title" = "Ortugrafia";
+
+/* Class = "NSMenuItem"; title = "Spelling…"; ObjectID = "1812"; */
+"1812.title" = "Ortugrafia…";
+
+/* Class = "NSMenuItem"; title = "Check Spelling"; ObjectID = "1813"; */
+"1813.title" = "Verificà l’ortugrafia";
+
+/* Class = "NSMenuItem"; title = "Check Spelling as You Type"; ObjectID = "1814"; */
+"1814.title" = "Verificà l’ortugrafia durante a scrittura";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "1815"; */
+"1815.title" = "Taglià";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "1816"; */
+"1816.title" = "Cupià";
+
+/* Class = "NSMenuItem"; title = "Speech"; ObjectID = "1817"; */
+"1817.title" = "Voce";
+
+/* Class = "NSMenu"; title = "Speech"; ObjectID = "1818"; */
+"1818.title" = "Voce";
+
+/* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "1819"; */
+"1819.title" = "Piantà u discorsu";
+
+/* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "1820"; */
+"1820.title" = "Principià un discorsu";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "1821"; */
+"1821.title" = "Incullà";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "1822"; */
+"1822.title" = "Incullà è fà currisponde u stilu";
+
+/* Class = "NSMenuItem"; title = "Presets View"; ObjectID = "1884"; */
+"1884.title" = "Vista di e prerigature";
+
+/* Class = "NSMenuItem"; title = "Presets"; ObjectID = "1948"; */
+"1948.title" = "Prerigature";
+
+/* Class = "NSMenu"; title = "Presets"; ObjectID = "1949"; */
+"1949.title" = "Prerigature";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "1950"; */
+"1950.title" = "Reinizià e prerigature officiale";
+
+/* Class = "NSMenuItem"; title = "New Preset…"; ObjectID = "1955"; */
+"1955.title" = "Nova prerigatura…";
+
+/* Class = "NSMenuItem"; title = "Online Documentation"; ObjectID = "1985"; */
+"1985.title" = "Documentazione in linea";
+
+/* Class = "NSMenuItem"; title = "Activity Window"; ObjectID = "2295"; */
+"2295.title" = "Finestre attive";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "2368"; */
+"2368.title" = "HandBrake";
+
+/* Class = "NSMenuItem"; title = "Select Default"; ObjectID = "2421"; */
+"2421.title" = "Selezziunà a prerigatura predefinita";
+
+/* Class = "NSMenuItem"; title = "Add To Queue"; ObjectID = "2443"; */
+"2443.title" = "Aghjunghje à a fila d’attesa";
+
+/* Class = "NSMenuItem"; title = "Start Encoding"; ObjectID = "2444"; */
+"2444.title" = "Principià a cudificazione";
+
+/* Class = "NSMenuItem"; title = "Queue"; ObjectID = "2445"; */
+"2445.title" = "Fila d’attesa";
+
+/* Class = "NSMenuItem"; title = "Pause Encoding"; ObjectID = "2494"; */
+"2494.title" = "Interrompe a cudificazione";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "2508"; */
+"2508.title" = "Chjode a finestra";
+
+/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "4964"; */
+"4964.title" = "Cuntrollà e nove versioni…";
+
+/* Class = "NSMenuItem"; title = "Preview Window"; ObjectID = "5157"; */
+"5157.title" = "Finestra di fighjulata";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "5188"; */
+"5188.title" = "Espurtà…";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "5192"; */
+"5192.title" = "Impurtà…";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "5280"; */
+"5280.title" = "Tuttu affissà";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "5897"; */
+"5897.title" = "Aghjunghje i tituli à a fila d’attesa…";
+
+/* Class = "NSMenuItem"; title = "Audio"; ObjectID = "brQ-mu-8JM"; */
+"brQ-mu-8JM.title" = "Audio";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "CN3-Rh-gVf"; */
+"CN3-Rh-gVf.title" = "Squassà";
+
+/* Class = "NSMenuItem"; title = "Subtitles"; ObjectID = "Csx-2S-iUe"; */
+"Csx-2S-iUe.title" = "Sottutituli";
+
+/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "fNa-z2-K1i"; */
+"fNa-z2-K1i.title" = "Apre un schedariu recente";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "frQ-v5-pRa"; */
+"frQ-v5-pRa.title" = "Sceglie cum’è predefinizione";
+
+/* Class = "NSMenuItem"; title = "View"; ObjectID = "Hzp-jb-hme"; */
+"Hzp-jb-hme.title" = "Vista";
+
+/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "IsV-5A-bqx"; */
+"IsV-5A-bqx.title" = "Affissà a barra d’attrezzi";
+
+/* Class = "NSMenuItem"; title = "Video"; ObjectID = "Jef-U4-eQT"; */
+"Jef-U4-eQT.title" = "Video";
+
+/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "KKV-n0-Fmr"; */
+"KKV-n0-Fmr.title" = "Persunalizà a barra d’attrezzi…";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "lab-Ly-3p3"; */
+"lab-Ly-3p3.title" = "Arregistrà";
+
+/* Class = "NSMenuItem"; title = "Chapters"; ObjectID = "lCU-PH-gal"; */
+"lCU-PH-gal.title" = "Capituli";
+
+/* Class = "NSMenuItem"; title = "Enter Full Screen"; ObjectID = "mGX-7Z-siB"; */
+"mGX-7Z-siB.title" = "Attivà u modu di screnu sanu";
+
+/* Class = "NSMenu"; title = "View"; ObjectID = "ndG-Ig-Yol"; */
+"ndG-Ig-Yol.title" = "Vista";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "oYh-V7-kbx"; */
+"oYh-V7-kbx.title" = "Aghjunghje tutti i tituli à a fila d’attesa";
+
+/* Class = "NSMenuItem"; title = "Dimension"; ObjectID = "shS-hb-XSI"; */
+"shS-hb-XSI.title" = "Dimensione";
+
+/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "ukX-HN-SXk"; */
+"ukX-HN-SXk.title" = "Apre un schedariu recente";
+
+/* Class = "NSMenuItem"; title = "Switch to Next Title"; ObjectID = "viv-aA-SoB"; */
+"viv-aA-SoB.title" = "Passà à u titulu seguente";
+
+/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "wPw-Uj-Gxi"; */
+"wPw-Uj-Gxi.title" = "Viutà u listinu";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "wvb-60-cWL"; */
+"wvb-60-cWL.title" = "Nova categuria…";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "XcG-Aw-Gdb"; */
+"XcG-Aw-Gdb.title" = "Servizii";
+
+/* Class = "NSMenuItem"; title = "Switch to Previous Title"; ObjectID = "zgj-Iv-4xJ"; */
+"zgj-Iv-4xJ.title" = "Passà à u titulu precedente";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/MainWindow.strings Added

@@ -0,0 +1,273 @@
+/* Class = "NSTabViewItem"; label = "Filters"; ObjectID = "0UB-bG-kwS"; */
+"0UB-bG-kwS.label" = "Filtri";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
+"2vD-zN-YMe.ibShadowedToolTip" = "Arregistrà a nova prerigatura…";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
+"3w9-Iu-3u2.ibShadowedToolTip" = "Titulu à analizà.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "Aghjunghje à a fila d’attesa";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
+"6E4-AG-PEh.title" = "0";
+
+/* Class = "NSToolbarItem"; label = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.label" = "Apre una fonte";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.paletteLabel" = "Apre una fonte";
+
+/* Class = "NSToolbarItem"; toolTip = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.toolTip" = "Apre una fonte";
+
+/* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
+"21.title" = "HandBrake";
+
+/* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
+"1475.label" = "Audio";
+
+/* Class = "NSTabViewItem"; label = "Video"; ObjectID = "1477"; */
+"1477.label" = "Video";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Source file"; ObjectID = "1538"; */
+"1538.ibExternalAccessibilityDescription" = "Schedariu di fonte";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Source file name."; ObjectID = "1539"; */
+"1539.ibShadowedToolTip" = "Nome di u schedariu di fonte.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Title, or video clip, to encode. The longest title is selected by default.\n\nBlu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature."; ObjectID = "1541"; */
+"1541.ibShadowedToolTip" = "Titulu o video à cudificà. A predefinizione selezziuneghja u titulu u più longu.\n\nI dischi di fonte Blu-ray è DVD anu aspessu parechji tituli, è di regula, u più longu hè l’elementu principale.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1542"; */
+"1542.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Start Chapter"; ObjectID = "1545"; */
+"1545.ibExternalAccessibilityDescription" = "Capitulu di principiu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "First chapter to encode."; ObjectID = "1545"; */
+"1545.ibShadowedToolTip" = "Primu capitulu à cudificà.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1546"; */
+"1546.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "End Chapter"; ObjectID = "1548"; */
+"1548.ibExternalAccessibilityDescription" = "Capitulu di fine";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Last chapter to encode."; ObjectID = "1548"; */
+"1548.ibShadowedToolTip" = "Ultimu capitulu à cudificà.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1549"; */
+"1549.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Duration"; ObjectID = "1554"; */
+"1554.ibExternalAccessibilityDescription" = "Durata";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Duration of the selected source range in Hours:Minutes:Seconds."; ObjectID = "1554"; */
+"1554.ibShadowedToolTip" = "Durata di a stesa di fonte selezziunata in Ore:Minuti:Seconde.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Output filename"; ObjectID = "1561"; */
+"1561.ibExternalAccessibilityDescription" = "Nomi di u schedariu d’esciuta";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "File name. This is what your new video will be named."; ObjectID = "1561"; */
+"1561.ibShadowedToolTip" = "Nome di u schedariu. Ghjè u nome cù quellu a vostra video serà chjamata.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Browse Destination"; ObjectID = "1562"; */
+"1562.ibExternalAccessibilityDescription" = "Sceglie a destinazione";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Browse to select a new destination path for your encode."; ObjectID = "1562"; */
+"1562.ibShadowedToolTip" = "Navigà per selezziunà un novu chjassu di destinazione per a vostra cudificazione.";
+
+/* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
+"1989.label" = "Capituli";
+
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "Cudificazione di u travagliu 1 : Test.mp4";
+
+/* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
+"4905.title" = "Fonte :";
+
+/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "4907"; */
+"4907.title" = "Titulu :";
+
+/* Class = "NSTextFieldCell"; title = "Save As:"; ObjectID = "4913"; */
+"4913.title" = "Arregistrà cù u nome :";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "4914"; */
+"4914.title" = "Durata :";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "4915"; */
+"4915.title" = "00:00:00";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "4920"; */
+"4920.title" = "Navigà…";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "4923"; */
+"4923.title" = "Prerigatura :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video angle to encode. Only applicable to multi-angle DVD and Blu-ray."; ObjectID = "5181"; */
+"5181.ibShadowedToolTip" = "Angulu di video à cudificà. Cuncerne solu i dischi DVD è Blu-ray multi-anguli.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5183"; */
+"5183.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Angle:"; ObjectID = "5185"; */
+"5185.title" = "Angulu :";
+
+/* Class = "NSTabViewItem"; label = "Subtitles"; ObjectID = "5194"; */
+"5194.label" = "Sottutituli";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in seconds"; ObjectID = "5491"; */
+"5491.ibExternalAccessibilityDescription" = "Ora di principiu in seconde";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First second to encode."; ObjectID = "5491"; */
+"5491.ibShadowedToolTip" = "Prima seconda à cudificà.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in seconds"; ObjectID = "5493"; */
+"5493.ibExternalAccessibilityDescription" = "Ora di fine in seconde";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last second to encode."; ObjectID = "5493"; */
+"5493.ibShadowedToolTip" = "Ultima seconda à cudificà.";
+
+/* Class = "NSTextFieldCell"; title = "–"; ObjectID = "5506"; */
+"5506.title" = "–";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Range Selection"; ObjectID = "5513"; */
+"5513.ibExternalAccessibilityDescription" = "Selezzione di a stesa";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Source range selection. By default, all chapters are selected and the entire source is encoded."; ObjectID = "5513"; */
+"5513.ibShadowedToolTip" = "Selezzione di a stesa di fonte. Senza precisà, tutti i capituli sò selezziunati è a fonte hè cudificata sana sana.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5515"; */
+"5515.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in frames"; ObjectID = "5521"; */
+"5521.ibExternalAccessibilityDescription" = "Ora di principiu in fiure";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First frame to encode."; ObjectID = "5521"; */
+"5521.ibShadowedToolTip" = "Prima fiura à cudificà.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in frames"; ObjectID = "5523"; */
+"5523.ibExternalAccessibilityDescription" = "Ora di fine in fiure";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
+"5523.ibShadowedToolTip" = "Ultima fiura à cudificà.";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "Aghjunghje tutti i tituli à a fila d’attesa";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
+"AhR-pK-Oz4.ibShadowedToolTip" = "Ricaricà e preferenze per a prerigatura attualmente selezziunata. I cambiamenti seranu persi.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
+"BA0-eg-2Ka.label" = "Riassuntu";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Preset selection"; ObjectID = "bWH-Lp-mKY"; */
+"bWH-Lp-mKY.ibExternalAccessibilityDescription" = "Selezzione di a prerigatura";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.label" = "Principià";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.paletteLabel" = "Principià a cudificazione";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.toolTip" = "Principià a cudificazione";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "cgS-BU-Nfd"; */
+"cgS-BU-Nfd.title" = "Ricaricà";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "d0E-xw-bxh"; */
+"d0E-xw-bxh.title" = "Scatula";
+
+/* Class = "NSToolbarItem"; label = "Preview"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.label" = "Fighjulata";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.paletteLabel" = "Affissà a finestra di fighjulata";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.toolTip" = "Affissà a finestra di fighjulata";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
+"DN4-48-aOI.ibShadowedToolTip" = "Analizà solu u titulu specificatu invece di tutti i tituli.";
+
+/* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
+"eij-Sn-QmJ.label" = "Dimensioni";
+
+/* Class = "NSButtonCell"; title = "Scan only title:"; ObjectID = "eQA-t2-FcV"; */
+"eQA-t2-FcV.title" = "Analizà solu u titulu :";
+
+/* Class = "NSToolbarItem"; label = "Queue"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.label" = "Fila d’attesa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.paletteLabel" = "Affissà a finestra di a fila d’attesa";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.toolTip" = "Affissà a finestra di a fila d’attesa";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
+"IOU-3L-nvB.title" = "Arregistrà a nova prerigatura…";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "Aghjunghje i tituli à a fila d’attesa…";
+
+/* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
+"IxV-PW-oYh.title" = "Stesa :";
+
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "Prugressione";
+
+/* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
+"OYP-3T-FnA.title" = "Prerigatura selezziunata";
+
+/* Class = "NSToolbarItem"; label = "Activity"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.label" = "Attività";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.paletteLabel" = "Affissà a finestra d’attività";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.toolTip" = "Affissà a finestra d’attività";
+
+/* Class = "NSPathControl"; ibExternalAccessibilityDescription = "Destination folder path"; ObjectID = "PJi-21-hie"; */
+"PJi-21-hie.ibExternalAccessibilityDescription" = "Chjassu di u cartulare di destinazione";
+
+/* Class = "NSToolbarItem"; label = "Presets"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.label" = "Prerigature";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.paletteLabel" = "Affissà a lista di e prerigature";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.toolTip" = "Affissà a lista di e prerigature";
+
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "Aghjunghje à a fila d’attesa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "Aghjunghje à a fila d’attesa";
+
+/* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
+"rfK-nQ-Aq2.title" = "In :";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.label" = "Pausa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.paletteLabel" = "Interrompe a cudificazione";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.toolTip" = "Interrompe a cudificazione";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "Scatula";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/OutputPanel.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/PicturePreview.strings Added

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Preferences.strings Added

@@ -0,0 +1,264 @@
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "3dN-MN-DcP"; */
+"3dN-MN-DcP.title" = "Furmatu :";
+
+/* Class = "NSWindow"; title = "Preferences"; ObjectID = "5"; */
+"5.title" = "Preferenze";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "290"; */
+"290.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "292"; */
+"292.title" = "Autumaticu";
+
+/* Class = "NSButtonCell"; title = "Automatically name output files"; ObjectID = "302"; */
+"302.title" = "Numinà autumaticamente i schedarii d’esciuta";
+
+/* Class = "NSTextFieldCell"; title = "When Done:"; ObjectID = "304"; */
+"304.title" = "Quandu hè compiu :";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates weekly"; ObjectID = "305"; */
+"305.title" = "Cuntrollà autumaticamente i rinnovi tutte e settimane";
+
+/* Class = "NSButtonCell"; title = "Send file to:"; ObjectID = "306"; */
+"306.title" = "Mandà u schedariu à :";
+
+/* Class = "NSTextFieldCell"; title = "At Launch:"; ObjectID = "307"; */
+"307.title" = "À u lanciu :";
+
+/* Class = "NSTextFieldCell"; title = "Output Files:"; ObjectID = "308"; */
+"308.title" = "Schedarii d’esciuta :";
+
+/* Class = "NSButtonCell"; title = "Store Activity Logs in same location as video"; ObjectID = "348"; */
+"348.title" = "Arregistrà i ghjurnali d¹attività in u listessu locu chì a video";
+
+/* Class = "NSTextFieldCell"; title = "Activity Logs:"; ObjectID = "351"; */
+"351.title" = "Ghjurnali d’attività :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "352"; */
+"352.ibShadowedToolTip" = "Numeru d’apprezzazioni di fiure à analizà. Valori più alti ponu aummentà a precisione di a rifilatura autumatica à u preghjudiziu di u tempu d’analisa di u titulu.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "354"; */
+"354.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "10"; ObjectID = "355"; */
+"355.title" = "10";
+
+/* Class = "NSMenuItem"; title = "15"; ObjectID = "356"; */
+"356.title" = "15";
+
+/* Class = "NSMenuItem"; title = "20"; ObjectID = "357"; */
+"357.title" = "20";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "359"; */
+"359.ibShadowedToolTip" = "Numeru d’apprezzazioni di fiure à analizà. Valori più alti ponu aummentà a precisione di a rifilatura autumatica à u preghjudiziu di u tempu d’analisa di u titulu.";
+
+/* Class = "NSTextFieldCell"; title = "Number of picture previews to scan:"; ObjectID = "360"; */
+"360.title" = "Numeru d’apprezzazioni di fiure à analizà :";
+
+/* Class = "NSMenuItem"; title = "25"; ObjectID = "361"; */
+"361.title" = "25";
+
+/* Class = "NSMenuItem"; title = "30"; ObjectID = "362"; */
+"362.title" = "30";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "363"; */
+"363.ibShadowedToolTip" = "Livellu di verbusità. A verbusità estesa arregistreghja più d’infurmazioni tecniche in u ghjurnale d’attività. A verbusità minimale ne arregistreghja menu.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "365"; */
+"365.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "Extended"; ObjectID = "368"; */
+"368.title" = "Estesa";
+
+/* Class = "NSMenuItem"; title = "Standard"; ObjectID = "369"; */
+"369.title" = "Classica";
+
+/* Class = "NSMenuItem"; title = "Minimised"; ObjectID = "370"; */
+"370.title" = "Minimale";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "371"; */
+"371.ibShadowedToolTip" = "Livellu di verbusità. A verbusità estesa arregistreghja più d’infurmazioni tecniche in u ghjurnale d’attività. A verbusità minimale ne arregistreghja menu.";
+
+/* Class = "NSTextFieldCell"; title = "Verbosity Level:"; ObjectID = "372"; */
+"372.title" = "Livellu di verbusità :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "387"; */
+"387.ibShadowedToolTip" = "Determineghja a granularità di u cuntrollu di qualità custente di x264. I chjuchi valori permettenu aumenti più fini di qualità.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "389"; */
+"389.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "0.20"; ObjectID = "390"; */
+"390.title" = "0,20";
+
+/* Class = "NSMenuItem"; title = "0.25"; ObjectID = "391"; */
+"391.title" = "0,25";
+
+/* Class = "NSMenuItem"; title = "0.50"; ObjectID = "393"; */
+"393.title" = "0,50";
+
+/* Class = "NSMenuItem"; title = "1.0"; ObjectID = "394"; */
+"394.title" = "1,0";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "395"; */
+"395.ibShadowedToolTip" = "Determineghja a granularità di u cuntrollu di qualità custente di x264. I chjuchi valori permettenu aumenti più fini di qualità.";
+
+/* Class = "NSTextFieldCell"; title = "Constant Quality fractional granularity:"; ObjectID = "396"; */
+"396.title" = "Granularità frazziunale di qualità custente :";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)."; ObjectID = "398"; */
+"398.ibShadowedToolTip" = "Impiegà « libdvdnav » per leghje i DVD. Disattivate solu per i DVD dubitosi in i casi (scarsi) induve « libdvdread » funziuneghja megliu.";
+
+/* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
+"399.title" = "Impiegà libdvdnav (piuttostu chì libdvdread)";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
+"449.title" = "Nisunu";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "451"; */
+"451.title" = "Navigà…";
+
+/* Class = "NSButtonCell"; title = "Play System Alert Sound"; ObjectID = "458"; */
+"458.title" = "Sunà un sonu d’alerta di u sistema";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped."; ObjectID = "463"; */
+"463.ibShadowedToolTip" = "Durata minima in seconde di i tituli DVD è Blu-ray. I tituli più corti seranu tralasciati.";
+
+/* Class = "NSTextFieldCell"; title = "Ignore DVD and Blu-ray titles shorter than:"; ObjectID = "464"; */
+"464.title" = "Tralascià i tituli di DVD è Blu-ray più corti chì :";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum title duration in seconds. Shorter titles will be skipped."; ObjectID = "480"; */
+"480.ibShadowedToolTip" = "Durata minima in seconde di u titulu. I tituli più corti seranu tralasciati.";
+
+/* Class = "NSMenuItem"; title = ".m4v"; ObjectID = "484"; */
+"484.title" = ".m4v";
+
+/* Class = "NSMenuItem"; title = ".mp4"; ObjectID = "485"; */
+"485.title" = ".mp4";
+
+/* Class = "NSTextFieldCell"; title = "Default MP4 Extension:"; ObjectID = "487"; */
+"487.title" = "Estensione MP4 predefinita :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "493"; */
+"493.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "494"; */
+"494.title" = "Ùn fà nunda";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "495"; */
+"495.title" = "Alerta";
+
+/* Class = "NSMenuItem"; title = "Alert And Notification"; ObjectID = "496"; */
+"496.title" = "Alerta è nutificazione";
+
+/* Class = "NSMenuItem"; title = "Put Computer To Sleep"; ObjectID = "497"; */
+"497.title" = "Mette l’urdinatore in veghja";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "498"; */
+"498.title" = "Piantà l’urdinatore";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "499"; */
+"499.title" = "Nutificazione";
+
+/* Class = "NSMenuItem"; title = "35"; ObjectID = "514"; */
+"514.title" = "35";
+
+/* Class = "NSMenuItem"; title = "40"; ObjectID = "515"; */
+"515.title" = "40";
+
+/* Class = "NSMenuItem"; title = "45"; ObjectID = "516"; */
+"516.title" = "45";
+
+/* Class = "NSMenuItem"; title = "50"; ObjectID = "517"; */
+"517.title" = "50";
+
+/* Class = "NSMenuItem"; title = "55"; ObjectID = "518"; */
+"518.title" = "55";
+
+/* Class = "NSMenuItem"; title = "60"; ObjectID = "519"; */
+"519.title" = "60";
+
+/* Class = "NSButtonCell"; title = "Show preview images"; ObjectID = "Aao-Tf-JeJ"; */
+"Aao-Tf-JeJ.title" = "Affissà e fiure di fighjulata";
+
+/* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
+"BPU-E2-N8l.title" = "Sempre squassà l’elementi compii dopu à a fine di a cudificazione";
+
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "Analisa :";
+
+/* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
+"cqp-xU-GOe.title" = "Cudificatore :";
+
+/* Class = "NSTextFieldCell"; title = "Drag labels to Format to compose a naming format."; ObjectID = "dQ6-Dh-9sD"; */
+"dQ6-Dh-9sD.title" = "Fate trascinà l’etichette in Furmatu per cumpone un furmatu di dinuminazione.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "None"; ObjectID = "f36-PN-c5F"; */
+"f36-PN-c5F.ibShadowedIsNilPlaceholder" = "Nisunu";
+
+/* Class = "NSTextFieldCell"; title = "Queue:"; ObjectID = "FKi-zh-5gc"; */
+"FKi-zh-5gc.title" = "Fila d’attesa :";
+
+/* Class = "NSTextFieldCell"; title = "GB"; ObjectID = "FZE-ZR-g93"; */
+"FZE-ZR-g93.title" = "Go";
+
+/* Class = "NSButtonCell"; title = "Change case to Title Case"; ObjectID = "ggR-Zs-P8G"; */
+"ggR-Zs-P8G.title" = "Maiuscula Per Ogni Lettera Iniziale";
+
+/* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
+"GQJ-go-PoN.title" = "Riassuntu :";
+
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "Numeru di cudificazioni simultanei :";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
+
+/* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
+"klQ-DW-Kc6.title" = "seconde";
+
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "Cunservà e mudificazioni di prerigatura quandu un novu titulu hè selezziunatu";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
+"lgn-RF-k0d.title" = "Caccià da u cartulare di i ghjurnali d’attività quelli più vechji di 30 ghjorni";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "Valori più alti ponu aiutà à aduprà cumpletamente a CPU s’è una sola cudificazione ùn pò riesce à impiegà tutti i cori CPU dispunibule.";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
+"PaR-zw-opS.ibShadowedToolTip" = "Spaziu liberu minimu nant’à u discu di destinazione.";
+
+/* Class = "NSButtonCell"; title = "Replace underscores with spaces"; ObjectID = "pUi-lK-cHw"; */
+"pUi-lK-cHw.title" = "Rimpiazzà i spazii sottulineati da spazii classichi";
+
+/* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
+"Tk3-Ig-fFI.ibShadowedToolTip" = "Fate trascinà l’etichette in u campu Furmatu per cumpone un furmatu di dinuminazione.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "Altre viste";
+
+/* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
+"Uxv-oN-c1r.title" = "Reinizià cù « Ùn fà nunda » à u lanciu";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "Prerigatura :";
+
+/* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
+"wo5-iR-2mb.title" = "Caccià a puntuazione cumuna";
+
+/* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
+"yG9-mz-tqQ.title" = "Interrompe a fila d’attesa s’è u spaziu di discu hè inferiore à :";
+
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
+
+/* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
+"Zqz-Kn-xOS.title" = "Affissà u pannellu d’apertura di fonte";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Presets.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "Creà una nova prerigatura cù e preferenze selezziunate attualmente.";
+
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "Squassà a prerigatura selezziunata.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "Cellula di testu";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
+"cm5-Kl-dB3.title" = "Reinizià e prerigature officiale";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "D2t-YG-Frn"; */
+"D2t-YG-Frn.title" = "Sceglie cum’è predefinizione";
+
+/* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
+"Io0-Vm-Qez.title" = "Nova categuria";
+
+/* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
+"LQk-kD-5sj.title" = "Listinu di l’azzioni nant’à e prerigature";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "LUl-ag-Iu6"; */
+"LUl-ag-Iu6.title" = "Impurtà…";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "oBC-Nh-TwB"; */
+"oBC-Nh-TwB.title" = "Cellula di vista di tavula";
+
+/* Class = "NSTextFieldCell"; title = "Presets"; ObjectID = "r4V-6L-SO8"; */
+"r4V-6L-SO8.title" = "Prerigature";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Presets"; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibExternalAccessibilityDescription" = "Prerigature";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.\n\nOverrides all encode settings. Settings may be further adjusted after selecting a preset."; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibShadowedToolTip" = "E prerigature sò gruppi di preferenze di cudificazione custruiti per scenarii specifichi. Selezziunate quella chì currisponde u più à u vostru bisognu.\n\nRimpiazzeghja tutte e preferenze di cudificazione. E preferenze ponu esse addattate dopu a selezzione di a prerigatura.";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "xEQ-Un-J0n"; */
+"xEQ-Un-J0n.title" = "Espurtà…";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Additional Options"; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibExternalAccessibilityDescription" = "Ozzioni addiziunale";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Show additional options."; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibShadowedToolTip" = "Affissà l’ozzioni addiziunale.";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Queue.strings Added

@@ -0,0 +1,72 @@
+/* Class = "NSMenuItem"; title = "Reset Failed Jobs"; ObjectID = "0zn-7P-JbR"; */
+"0zn-7P-JbR.title" = "Reinizià i travagli fiaschi";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "9tg-YJ-DuI"; */
+"9tg-YJ-DuI.title" = "Caccià i travagli compii";
+
+/* Class = "NSWindow"; title = "Queue"; ObjectID = "2576"; */
+"2576.title" = "Fila d’attesa";
+
+/* Class = "NSToolbarItem"; label = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.label" = "Quandu hè compiu";
+
+/* Class = "NSToolbarItem"; paletteLabel = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.paletteLabel" = "Quandu hè compiu";
+
+/* Class = "NSToolbarItem"; toolTip = "Action to perform when encoding is complete."; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.toolTip" = "Azzione à fà quandu a cudificazione hè compia.";
+
+/* Class = "NSMenuItem"; title = "Alert and Notification"; ObjectID = "aat-1N-Odn"; */
+"aat-1N-Odn.title" = "Alerta è nutificazione";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.label" = "Azzione";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.paletteLabel" = "Azzione";
+
+/* Class = "NSToolbarItem"; label = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.label" = "Detaglii";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.paletteLabel" = "Detaglii";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "fAD-ky-zo6"; */
+"fAD-ky-zo6.title" = "Alerta";
+
+/* Class = "NSMenuItem"; title = "Put Computer to Sleep"; ObjectID = "GUQ-xb-HVS"; */
+"GUQ-xb-HVS.title" = "Mette l’urdinatore in veghja";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "jDL-sB-8e3"; */
+"jDL-sB-8e3.title" = "Nutificazione";
+
+/* Class = "NSMenuItem"; title = "Reset All Jobs"; ObjectID = "kPX-am-UX1"; */
+"kPX-am-UX1.title" = "Reinizià tutti i travagli";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "QmP-SQ-XKK"; */
+"QmP-SQ-XKK.title" = "Piantà l’urdinatore";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.label" = "Pausa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause/Resume"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.paletteLabel" = "Interrompe / Ripiglià";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.toolTip" = "Interrompe a cudificazione";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "sm5-26-sAg"; */
+"sm5-26-sAg.title" = "Ùn fà nunda";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.label" = "Principià";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start/Cancel"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.paletteLabel" = "Lancià / Abbandunà";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.toolTip" = "Principià a cudificazione";
+
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "Tvo-xt-sag"; */
+"Tvo-xt-sag.title" = "Caccià tutti i travagli";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Subtitles.strings Added

@@ -0,0 +1,174 @@
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Subtitles tracks"; ObjectID = "0yM-wE-D2x"; */
+"0yM-wE-D2x.ibExternalAccessibilityDescription" = "Traccie di sottutitulu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Encoding"; ObjectID = "1Qg-We-ltR"; */
+"1Qg-We-ltR.headerCell.title" = "Cudificazione";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "4PX-In-DpF"; */
+"4PX-In-DpF.title" = "Aghjunghje tutte e traccie";
+
+/* Class = "NSTableColumn"; headerCell.title = "Language"; ObjectID = "9ka-9O-WDj"; */
+"9ka-9O-WDj.headerCell.title" = "Lingua";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ABd-Ec-K2L"; */
+"ABd-Ec-K2L.title" = "Altre viste";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "SRT/SSA Offset"; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibExternalAccessibilityDescription" = "Staccamentu SRT/SSA";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Positive or negative offset in milliseconds (ms) for the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibShadowedToolTip" = "Staccamentu pusitivu o nigativu, in milliseconde (ms), per a traccia di fonte selezziunata à u furmatu SRT/SSA. Ùn s’appieca micca à l’altri furmati.";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "cSW-OC-qKA"; */
+"cSW-OC-qKA.title" = "Finestra accaduta";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "dap-ee-kor"; */
+"dap-ee-kor.title" = "Elementu 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "fAW-To-EeP"; */
+"fAW-To-EeP.title" = "Elementu 3";
+
+/* Class = "NSTableColumn"; headerCell.title = "Offset"; ObjectID = "Fgh-pZ-6uu"; */
+"Fgh-pZ-6uu.headerCell.title" = "Staccamentu";
+
+/* Class = "NSTableColumn"; headerCell.title = "Burned In"; ObjectID = "fIe-Fg-ufj"; */
+"fIe-Fg-ufj.headerCell.title" = "Intarsiati";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Fr7-eG-NuL"; */
+"Fr7-eG-NuL.title" = "Altre viste";
+
+/* Class = "NSTableColumn"; headerCell.title = "Default"; ObjectID = "fvq-pE-sOC"; */
+"fvq-pE-sOC.headerCell.title" = "Predefinitu";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "fXD-7h-jMl"; */
+"fXD-7h-jMl.title" = "Aghjunghje una traccia di sottutitulu esterna…";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "g4b-FM-qX4"; */
+"g4b-FM-qX4.title" = "Elementu 2";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gHY-6m-ASb"; */
+"gHY-6m-ASb.title" = "Elementu 2";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "gYk-0C-2tR"; */
+"gYk-0C-2tR.title" = "Cellula di testu";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Forced subtitles only"; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibExternalAccessibilityDescription" = "Solu sottutituli sfurzati";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Forced Only. Use only subtitles marked as “forced” in the selected source track."; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibShadowedToolTip" = "Sfurzatu solu. Impiega solu i sottutituli marcati cum’è « sfurzatu » per a traccia selezziunata.";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hhH-c3-gD0"; */
+"hhH-c3-gD0.title" = "0";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "HQq-Mp-4sI"; */
+"HQq-Mp-4sI.title" = "Elementu 2";
+
+/* Class = "NSMenuItem"; ibShadowedToolTip = "Add new SRT/SSA subtitle to the list."; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.ibShadowedToolTip" = "Aghjunghje una nova traccia di sottutitulu SRT/SSA à a lista.";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.title" = "Aghjunghje una traccia di sottutitulu esterna…";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Language"; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibExternalAccessibilityDescription" = "Lingua SRT/SSA";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Language of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibShadowedToolTip" = "Lingua di a traccia di fonte selezziunata à u furmatu SRT/SSA. Ùn s’appieca micca à l’altri furmati.";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "jcM-HL-QJ6"; */
+"jcM-HL-QJ6.title" = "Ricaricà";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "jG8-uo-1tv"; */
+"jG8-uo-1tv.title" = "Ricaricà";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JLr-Qi-X0X"; */
+"JLr-Qi-X0X.title" = "Cuntrollà";
+
+/* Class = "NSTableColumn"; headerCell.title = "Forced Only"; ObjectID = "klV-Gy-igk"; */
+"klV-Gy-igk.headerCell.title" = "Sfurzatu solu";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Default"; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibExternalAccessibilityDescription" = "Predefinitu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Default flag. Mark the selected subtitles track as the default to be displayed on playback."; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibShadowedToolTip" = "Bandera predefinita. Marca a traccia di sottutituli selezziunata cum’è a traccia predefinita à affissà durante a ripruduzzione.";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "mVi-zH-KUq"; */
+"mVi-zH-KUq.title" = "Caccià tutte e traccie";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "N3S-st-yGv"; */
+"N3S-st-yGv.headerCell.title" = "Traccia";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "ooy-Sh-Edm"; */
+"ooy-Sh-Edm.title" = "Cuntrollà";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "oxg-bs-1si"; */
+"oxg-bs-1si.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "pwm-PV-1x4"; */
+"pwm-PV-1x4.title" = "Cumpurtamentu di a selezzione…";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "QRj-KI-a03"; */
+"QRj-KI-a03.title" = "Testu";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure subtitle tracks Selection Behavior. These settings affect which tracks will be added to the subtitle tracks list, and the settings used for each track."; ObjectID = "QsM-28-Pya"; */
+"QsM-28-Pya.ibShadowedToolTip" = "Cunfigureghja u cumpurtamentu di selezzione di e traccie di sottutitulu. Ste preferenze affettanu a scelta di e traccie chì seranu aghjunte à a lista di e traccie di sottutitulu, ma dinù e preferenze impiegate per ogni traccia.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Character Encoding"; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibExternalAccessibilityDescription" = "Cudificazione di caratteru SRT/SSA";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Character encoding/codeset of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibShadowedToolTip" = "Cudificazione di caratteru di a traccia di fonte selezziunata à u furmatu SRT/SSA. Ùn s’appieca micca à l’altri furmati.";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "R8a-qg-ASg"; */
+"R8a-qg-ASg.title" = "Caccià tutte e traccie";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "R9w-Bn-CCt"; */
+"R9w-Bn-CCt.title" = "Cuntrollà";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "Rj8-KI-k4L"; */
+"Rj8-KI-k4L.title" = "Elementu 1";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "S2I-Jd-Lyg"; */
+"S2I-Jd-Lyg.title" = "Aghjunghje tutte e traccie";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Subtitle tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the subtitle Selection Behavior dialog."; ObjectID = "Syo-rH-vof"; */
+"Syo-rH-vof.ibShadowedToolTip" = "Lista di e traccie di sottutitulu. U cumpurtamentu è e preferenze di selezzione di e traccie sò caricati da a prerigatura selezziunata è ponu esse cunfigurati via u dialogu di u cumpurtamentu di selezzione di sottutitulu.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibExternalAccessibilityDescription" = "Traccia selezziunata";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Subtitles language and type."; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibShadowedToolTip" = "Lingua è furmatu di sottutitulu.";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "ThR-Cn-Vfr"; */
+"ThR-Cn-Vfr.title" = "Elementu 3";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "TJO-RZ-jgb"; */
+"TJO-RZ-jgb.title" = "Traccie";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Umu-1b-U1Z"; */
+"Umu-1b-U1Z.title" = "Altre viste";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "UOP-xa-WpP"; */
+"UOP-xa-WpP.title" = "Altre viste";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "vHW-fn-RSG"; */
+"vHW-fn-RSG.title" = "Finestra accaduta";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the subtitles tracks list using the configured Selection Behavior."; ObjectID = "Vxx-gk-9kY"; */
+"Vxx-gk-9kY.ibShadowedToolTip" = "Ricaricheghja a lista di e traccie di sottutitulu impieghendu u cumpurtamentu di selezzione cunfiguratu.";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "yDg-DK-z5D"; */
+"yDg-DK-z5D.title" = "Elementu 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "yEC-jb-q8b"; */
+"yEC-jb-q8b.title" = "Elementu 3";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Burned In"; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibExternalAccessibilityDescription" = "Intarsiati";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burned In. Make the selected subtitles permanent by overlaying them onto the video track."; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibShadowedToolTip" = "Intarsiati. Rindite permanente i sottutituli selezziunati incavalchenduli à a traccia video.";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/SubtitlesDefaults.strings Added

@@ -0,0 +1,87 @@
+/* Class = "NSButtonCell"; title = "Add Closed Captions when available"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "Aghjunghje e legende chjose (CC) s’elle sò dispunibule";
+
+/* Class = "NSButtonCell"; title = "DVD Subtitles"; ObjectID = "69Q-xB-Vyq"; */
+"69Q-xB-Vyq.title" = "Sottutituli DVD";
+
+/* Class = "NSTextFieldCell"; title = "Burn-In Behavior:"; ObjectID = "640-NB-Uby"; */
+"640-NB-Uby.title" = "Cumpurtamentu di l’intarsiatura :";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Subtitles Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "Lingue di a traccia di sottutituli";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "Selezziunà e lingue à impiegà cù a preferenza di cumpurtamentu di selezzione di traccia audio.";
+
+/* Class = "NSButtonCell"; title = "Blu-ray Subtitles"; ObjectID = "bfV-9D-6dh"; */
+"bfV-9D-6dh.title" = "Sottutituli Blu-ray";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded. Use this option if your playback software or device does not support DVD subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "ceZ-On-t5S"; */
+"ceZ-On-t5S.ibShadowedToolTip" = "Intarsia a prima traccia di sottutitulu selezziunata di u DVD. Tutte l’altre traccie di sottutitulu di u DVD seranu scartate. Impiegà st’ozzione s’è u vostru prugramma di ripruduzzione o s’è u vostru apparechju ùn accetta micca i sottutituli DVD.\n\nSolu una traccia di sottutitulu pò esse intarsiata.";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio, then First Selected Track"; ObjectID = "d79-2j-fhc"; */
+"d79-2j-fhc.title" = "Traccia audio straniera eppò a prima traccia selezziunata";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "ego-rt-a64"; */
+"ego-rt-a64.title" = "Abbandunà";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "ej8-4k-1vd"; */
+"ej8-4k-1vd.title" = "Nisuna";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "Cumpurtamentu di a selezzione di traccia :";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "Tutte e lingue selezziunate chì currispondenu";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "iLI-Nb-D7t"; */
+"iLI-Nb-D7t.title" = "Vai";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "Prima lingua selezziunata chì currisponde";
+
+/* Class = "NSWindow"; title = "Subtitles Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "Cumpurtamentu di a selezzione di i sottutituli";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Burn-In Behavior. Select which subtitles to make permanent by overlaying them onto the video track.\n\nOnly one subtitles track can be burned in."; ObjectID = "Lsa-kB-2BP"; */
+"Lsa-kB-2BP.ibShadowedToolTip" = "Cumpurtamentu di l’intarsiatura. Scelta di i sottutituli à rende permanente incavalchenduli à a traccia video.\n\nSolu una traccia di sottutitulu pò esse intarsiata.";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "Lingue :";
+
+/* Class = "NSMenuItem"; title = "First Selected Track"; ObjectID = "mnl-P8-dtK"; */
+"mnl-P8-dtK.title" = "Prima traccia selezziunata";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "Nisuna";
+
+/* Class = "NSTextFieldCell"; title = "Only one subtitles burn-in option will be applied, starting with the first (top)."; ObjectID = "N4s-K9-RwM"; */
+"N4s-K9-RwM.title" = "Una sola ozzione d’intarsiatura di sottutitulu serà appiecata, principiendu da a prima (insù).";
+
+/* Class = "NSTextFieldCell"; title = "Options:"; ObjectID = "NJl-q3-zXL"; */
+"NJl-q3-zXL.title" = "Ozzioni :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "Cumpurtamentu di a selezzione di traccia.\n\n« Nisuna » ùn selezziunerà alcuna traccia audio.\n\n« Prima lingua selezziunata chì currisponde » aghjunghje a prima traccia audio chì currisponde à ognuna di e lingue selezziunate chì si trovanu in a fonte.\n\n« Tutte e lingue selezziunate chì currispondenu » aghjunghje tutte e traccie audio chì currispondenu à ognuna di e lingue selezziunate chì si trovanu in a fonte.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
+"OOC-GZ-OFA.ibShadowedToolTip" = "« Ricerca di traccia audio straniera » analisa a fonte per circà e corte sequenze audio in lingua straniera o scunnisciuta chì seranu affissate autumaticamente.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
+"Px8-G6-NVX.ibShadowedToolTip" = "Intarsia a prima traccia di sottutitulu selezziunata di u Blu-ray. Tutte l’altre traccie di sottutitulu di u Blu-ray seranu scartate. Impiegà st’ozzione s’è u vostru prugramma di ripruduzzione o s’è u vostru apparechju ùn accetta micca i sottutituli Blu-ray.\n\nSolu una traccia di sottutitulu pò esse intarsiata.";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
+"QRd-XH-6TH.title" = "Traccia di sottutitulu audio straniera";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "qVQ-fS-w1S"; */
+"qVQ-fS-w1S.title" = "Cellula di vista di tavula";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add Closed Caption subtitles as a soft subtitle track (not burned-in)."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "Aghjunghje sottutituli di legende chjose (CC) cum’è una traccia di sottutituli incavalcati (micca intarsiati).";
+
+/* Class = "NSButtonCell"; title = "Add Foreign Audio Search"; ObjectID = "vNY-OC-hTJ"; */
+"vNY-OC-hTJ.title" = "Aghjunghje una ricerca audio straniera";
+

HandBrake-1.5.1.tar.xz/macosx/co.lproj/Video.strings Added

@@ -0,0 +1,123 @@
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "4Hq-BG-Ulb"; */
+"4Hq-BG-Ulb.ibShadowedIsNilPlaceholder" = "autumaticu";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "6Cs-jo-8Q6"; */
+"6Cs-jo-8Q6.title" = "Altre viste";
+
+/* Class = "NSButtonCell"; title = "Constant Framerate"; ObjectID = "6Dd-IP-Pwt"; */
+"6Dd-IP-Pwt.title" = "Frequenza di fiure custente";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder level. Sets and ensures compliance with the specified video compression standard level. Overrides all other settings."; ObjectID = "8CM-4G-oId"; */
+"8CM-4G-oId.ibShadowedToolTip" = "Livellu di cudificatore video. Definisce è assicureghja a cunfurmità cù u livellu classicu di cumpressione video specificatu. Supraneghja tutte l’altre preferenze.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Framerate (Frames Per Second). Number of pictures displayed during each second of video."; ObjectID = "9tc-EO-QMd"; */
+"9tc-EO-QMd.ibShadowedToolTip" = "Frequenza di fiure (Fiure à a Seconda). Numeru di fiure affissate durante ogni seconda di video.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Average Bitrate varies quality to ensure the data rate remains relatively consistent throughout the video."; ObjectID = "A3o-Zx-OfM"; */
+"A3o-Zx-OfM.ibShadowedToolTip" = "« Flussu medianu » fà svarià a qualità per assicurassi chì u flussu di dati stà guasi custente a video sana.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Aes-nP-7qS"; */
+"Aes-nP-7qS.title" = "Altre viste";
+
+/* Class = "NSButton"; ibShadowedToolTip = "2-pass encoding analyzes the entire source video before encoding. The information gathered enables the encoder to make more informed decisions about quality and data rate in Average Bitrate mode."; ObjectID = "bnV-aE-FVh"; */
+"bnV-aE-FVh.ibShadowedToolTip" = "A cudificazione à 2 passi analisa a fonte video sana nanzu di cudificà. L’infurmazioni raccolti permettenu à u cudificatore d’accumudà di manera più precisa a qualità è u flussu di dati in u modu « Flussu medianu ».";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "bvD-W7-O0N"; */
+"bvD-W7-O0N.title" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Unparse:"; ObjectID = "CLk-dp-1b7"; */
+"CLk-dp-1b7.title" = "Micca analisatu :";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "cRF-pz-1jt"; */
+"cRF-pz-1jt.title" = "Ozzioni di u cudificatore :";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "CRz-On-Jen"; */
+"CRz-On-Jen.ibShadowedIsNilPlaceholder" = "autumaticu";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder tune. Further adjusts encoder preset to optimize settings for specific scenarios."; ObjectID = "cXd-X7-OhB"; */
+"cXd-X7-OhB.ibShadowedToolTip" = "Rigatura di u cudificatore video. Adattazioni addiziunale di a prerigatura di u cudificatore per megliurà e preferenze per scenarii specifichi.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Displays all internal video encoder options."; ObjectID = "dwn-bf-Ua0"; */
+"dwn-bf-Ua0.ibShadowedToolTip" = "Affissa tutte l’ozzioni di u cudificatore internu.";
+
+/* Class = "NSButtonCell"; title = "Fast Decode"; ObjectID = "EcY-w1-bc8"; */
+"EcY-w1-bc8.title" = "Discudificazione rapida";
+
+/* Class = "NSTextFieldCell"; title = "Quality:"; ObjectID = "F3s-qR-qeE"; */
+"F3s-qR-qeE.title" = "Qualità :";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Video encoder preset. Adjusts encoder settings to balance compression efficiency and encoding speed. Slower encoder presets may use settings that are less compatible with certain devices."; ObjectID = "fue-2d-Bjn"; */
+"fue-2d-Bjn.ibShadowedToolTip" = "Prerigatura di u cudificatore video. Adatteghja e preferenze di u cudificatore per bilancià trà a faccindaghjine di a cumpressione è a vitezza di cudificazione. E prerigature di cudificatore più lente ponu impiegà preferenze chì sò menu cumpatibile cù certi apparechji.";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "fzT-im-zKN"; */
+"fzT-im-zKN.title" = "Rigatura :";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar"; ObjectID = "gEp-lv-YUY"; */
+"gEp-lv-YUY.ibShadowedToolTip" = "Ozzioni addiziunale di u cudificatore video Solu per un impiegu espertu.\n\nSintassa : option-1=mamma:opt2=babbu";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "gIJ-Xs-uVF"; */
+"gIJ-Xs-uVF.title" = "Altre viste";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Constant Quality varies bitrate to ensure visual quality remains relatively consistent throughout the video.\n\nAdjust the quality slider to the right to increase quality or to the left to decrease quality, in small increments of plus or minus 1-2.\n\nRecommended values for the x264 and x265 encoders are RF 18-28. Higher quality settings may produce extremely large files.\n\nx264 is lossless at RF 0."; ObjectID = "GPu-Ht-bKg"; */
+"GPu-Ht-bKg.ibShadowedToolTip" = "« Qualità custente » fà svarià u flussu binariu per assicurassi chì a qualità visuale stà guasi custente a video sana.\n\nAccumudà u cursore di qualità à manu diritta per aummentà a qualità o à manu manca per diminuiscela, in chjuchi passi di più o menu 1-2.\n\nI valori ricumandati per i cudificatori x264 è x265 sò RF 18-28. E preferenze di qualità più alte ponu pruduce schedarii assai vuluminosi.\n\nDefinita à RF 0, a cudificazione x264 hè senza perdita.";
+
+/* Class = "NSTextFieldCell"; title = "Profile:"; ObjectID = "Hho-GY-qOR"; */
+"Hho-GY-qOR.title" = "Prufilu :";
+
+/* Class = "NSTextFieldCell"; title = "Additional Options:"; ObjectID = "ja7-Zr-y1P"; */
+"ja7-Zr-y1P.title" = "Ozzioni addiziunale :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Jj0-Qw-HF8"; */
+"Jj0-Qw-HF8.title" = "Altre viste";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder profile. Sets and ensures compliance with the specified video compression standard profile. Overrides all other settings."; ObjectID = "kh8-d2-hSD"; */
+"kh8-d2-hSD.ibShadowedToolTip" = "Prufilu di u cudificatore video. Definisce è assicureghja a cunfurmità cù u prufilu classicu di cumpressione video specificatu. Supraneghja tutte l’altre preferenze.";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "kPs-u2-fDn"; */
+"kPs-u2-fDn.title" = "Ozzioni di u cudificatore :";
+
+/* Class = "NSTextFieldCell"; title = "Video Encoder:"; ObjectID = "Mrb-6Q-0YM"; */
+"Mrb-6Q-0YM.title" = "Cudificatore video :";
+
+/* Class = "NSButtonCell"; title = "2-pass encoding"; ObjectID = "nPA-nO-Eik"; */
+"nPA-nO-Eik.title" = "Cudificazione à 2 passi";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Turbo first pass speeds up the first pass of a 2-pass encode for a slight penalty to analysis."; ObjectID = "olm-zg-k9Y"; */
+"olm-zg-k9Y.ibShadowedToolTip" = "U primu passu in modu Turbo accelereghja u primu passu d’una cudificazione à 2 passi per una chjuca carenza in l’analisa.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "QWu-rv-zfM"; */
+"QWu-rv-zfM.title" = "Prerigatura :";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar,baz"; ObjectID = "rbo-w6-ENd"; */
+"rbo-w6-ENd.ibShadowedToolTip" = "Ozzioni addiziunale di u cudificatore video Solu per un impiegu espertu.\n\nSintassa : option-1=mamma:opt2=babbu,missiavu";
+
+/* Class = "NSTextFieldCell"; title = "RF:"; ObjectID = "rRB-9F-pHn"; */
+"rRB-9F-pHn.title" = "RF :";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rXn-NC-pEv"; */
+"rXn-NC-pEv.title" = "Altre viste";
+
+/* Class = "NSTextFieldCell"; title = "Framerate (FPS):"; ObjectID = "SJc-tv-AMH"; */
+"SJc-tv-AMH.title" = "Frequenza di fiure (FPS) :";
+
+/* Class = "NSTextFieldCell"; title = "Level:"; ObjectID = "sTM-lk-DBC"; */
+"sTM-lk-DBC.title" = "Livellu :";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Fast Decode uses settings that reduce CPU usage during playback of the encoded video. Useful for devices that struggle to play video without stuttering."; ObjectID = "stU-Fo-Avu"; */
+"stU-Fo-Avu.ibShadowedToolTip" = "A discudificazione rapida impiega preferenze chì riducenu l’adopru di a CPU durante a ripruduzzione di a video cudificata. Què hè ghjuvevule per l’apparechji chì strazianu per leghje video senza barbagliulà.";
+
+/* Class = "NSButtonCell"; title = "Average Bitrate (kbps):"; ObjectID = "VQe-CK-YDR"; */
+"VQe-CK-YDR.title" = "Flussu medianu (kbps) :";
+
+/* Class = "NSButtonCell"; title = "Turbo first pass"; ObjectID = "vSc-VB-NEv"; */
+"vSc-VB-NEv.title" = "Primu passu in modu Turbo";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder. Determines video type and settings used during encoding."; ObjectID = "xwK-Yu-a1e"; */
+"xwK-Yu-a1e.ibShadowedToolTip" = "Cudificatore video. Determineghja u tipu di a video è e preferenze impiegate durante a cudificazione.";
+
+/* Class = "NSButtonCell"; title = "Constant Quality"; ObjectID = "ZjL-cY-O5f"; */
+"ZjL-cY-O5f.title" = "Qualità custente";
+
+/* Class = "NSButtonCell"; title = "Variable Framerate"; ObjectID = "zZo-75-1WG"; */
+"zZo-75-1WG.title" = "Frequenza di fiure variabile (VFR)";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/AddPreset.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/AddPreset.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/AudioDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/AudioDefaults.strings Changed

@@ -82,6 +82,9 @@
 /* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
 "GbM-vm-RC2.title" = "Spurverhalten Sprache:";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "Dies aktivieren, wenn das Abspielgerät MP2 unterstützt. Dies erlaubt das Durchschleifen von MP2, wenn das automatische Durchschleifen aktiviert ist.";
+
 /* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
 "GZP-q7-SYy.title" = "Alle passenden ausgewählten Sprachen";
 
@@ -154,21 +157,12 @@
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
 "OVr-Jm-VrK.title" = "0";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Alle zeigen";
-
 /* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
 "pR9-d4-SNf.headerCell.title" = "Codec";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
 "PtB-Wp-B9X.title" = "OtherViews";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all audio languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Zeige alle Sprachen";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all audio languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Zeige alle Audiosprachen in der Sprachliste.";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
 "r80-yv-59n.ibExternalAccessibilityDescription" = "Samplerate";
 
@@ -211,6 +205,9 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
 "xnA-03-Bul.ibShadowedToolTip" = "Verstärkung des Tons in Dezibel (dB). Erhöht oder erniedrigt die Lautstärke.";
 
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
 /* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
 "z9d-P3-6UP.title" = "TrueHD";

HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "Unten beschneiden";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "Pixel die von unten abgeschnitten werden.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "Oben beschneiden";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "Oben beschneiden";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "Pixel die von oben abgeschnitten werden.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "Dreht das Bild im Uhrzeigersinn in 90°-Schritten.";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "Eigene";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "Rechts beschneiden";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "Pixel die von der rechten Ecke abgeschnitten werden.";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "Ohne";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "Automatisch";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "Unten beschneiden";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "Links beschneiden";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "Pixel die von der linken Ecke abgeschnitten werden.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "Rechts beschneiden";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "Links beschneiden";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBFiltersViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBFiltersViewController.strings Changed

@@ -1,20 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Rotate:"; ObjectID = "1nr-nE-3a6"; */
-"1nr-nE-3a6.title" = "Rotieren:";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibExternalAccessibilityDescription" = "Entrauschabstimmung";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibShadowedToolTip" = "Entrauschabstimmung. Weitere Beeinflussung des Entrauschfilters für spezielle Szenarien.\n\nNone: Verwendet die Standardeinstellungen.\n\nFilm: Einstellung für die meisten Live-Action-Filme.\n\nGrain: Bearbeitet nur den Farbkanal. Nützlich um das filmtypische Aussehen mit körniger Luminanz zu erhalten, aber Farbrauschen zu entfernen.\n\nHigh Motion: Reduziert farbige Nachzieheffekte bei schnellen Bewegungen indem es zeitweise den Farbkanal nicht bearbeitet. Hilfreich für Sport- und Action-Filme.\n\nAnimation: Ist nützlich für animierte Filme, wie Anime und Cartoons.\n\nTape: Ist gedacht für Filme von analogen Videobändern mit wenig Details, wie VHS, wenn die Film-Einstellung kein vernünftiges Ergebnis produziert.\n\nSprite ist nützlich für 1-/4-/8-/16-bit 2D-Spiele. Sprite ist nicht geeignet für qualitativ hochwertige Videos.";
 
-/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "1zF-s5-Lic"; */
-"1zF-s5-Lic.title" = "Voreinstellung:";
-
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibExternalAccessibilityDescription" = "Schärfen-Abstimmung";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibShadowedToolTip" = "Schärfen-Abstimmung. Erweiterte Einstellung der Schärfen-Option für bestimmte Szenarien.\n\nNone: Verwendet die Standardeinstellungen.\n\nUnscharf Maskieren kann abgestimmt werden auf Ultrafein, Fein, Medium, Grob, oder Sehr Grob. Die Auswahl sollte anhand der Auflösung des Ausgangsmaterials und der Feinheit der zu erhöhenden Details getroffen werden.\n\nLapsharp's Abstimmung Film: Ist für die meisten Live-Action-Filme. Film benutzt einen isotropen Laplace-Algorithmus um alle Kanten identisch zu schärfen. Luminanz-Informationen (Helligkeit) werden mehr geschärft als die Farbinformationen.\n\nLapsharp's Abstimmung Grain: Ist ähnlich zu Film, aber verwendet einen benutzt einen isotropen Laplace-Gauss-Algorithmus um die Effekte von Rauschen und Körnung zu reduzieren. Nützlich um Körnungen zu erhalten bzw. als Alternative zur Film-Abstimmung.\n\nLapsharp's Abstimmung Animation: Ist nützlich für animierte Filme, wie Anime und Cartoons. Animation ist identisch zu Film, aber mit geringerer Stärke um ungewünschte Artefakte zu vermeiden.\n\nLapsharp's Abstimmung Sprite: Ist nützlich für 1-/4-/8-/16-bit 2D-Spiele. Sprite benutzt einen (4-neighbor) Laplace-Algorithmus, der vertikale und horizontale Kanten mehr erhöht als diagonale.";
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "Abstimmung:";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
 "6nG-zk-FMo.ibShadowedToolTip" = "Deinterlace-Voreinstellungen.\n\nDefault (Standard): ist eine gute Balance zwischen Qualität und Geschwindigkeit.\n\nSkip Spatial Check: Yadif überspringt einige Korrekturen mit geringem Geschwindigkeitsgewinn.\n\nEEDI2: benutzt einen langsameren Algorithmus hoher Qualität für das Decomb. Für die meisten schwierigen Quellen geeignet.\n\nBob: versucht besser Bewegungen zu erhalten, mit kleinen Einbußen in der Auflösung.";
@@ -22,8 +13,8 @@
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
 "8am-ve-1Xl.title" = "Voreinstellung:";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "9su-F2-NUw"; */
-"9su-F2-NUw.title" = "OtherViews";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "Eigene:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
 "akB-JW-MPe.title" = "OtherViews";
@@ -31,14 +22,11 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
 "b6A-ax-2Ed.title" = "OtherViews";
 
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibExternalAccessibilityDescription" = "Voreinstellungen des Schärfefilters";
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "Eigene Schärfeparameter.\n\nUnscharf Maskieren-Syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnscharf Maskieren Standard: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp-Syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp-Standard: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibShadowedToolTip" = "Voreinstellungen des Schärfefilters. Stellt die Stärke des Filters ein.";
-
-/* Class = "NSMenuItem"; title = "180°"; ObjectID = "bEe-EV-Q73"; */
-"bEe-EV-Q73.title" = "180°";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "Schärfen erhöht die Detaildarstellung, speziell Kanten. Zu starkes schärfen schädigt die Bildqualität durch Ringartefakte und die Erhöhung von Bildrauschen, dies kann die Kompressionseffizienz erniedrigen.\n\nUnscharf Maskieren ist ein allgemeiner Filter. Er schärft durch Unschärfe und errechnet dann den Unterschied zwischen unscharfem Bild und dem Original.\n\nLapsharp schärft mit Hilfe von Convolution angenähert an den Laplaceschen Kantenfilter, gibt häufig bessere Ergebnisse als Unscharf Maskieren.";
 
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
 "bRd-Km-Wa8.ibExternalAccessibilityDescription" = "Schärfen-Abstimmung";
@@ -52,12 +40,24 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
 "bz8-FC-vYp.ibShadowedToolTip" = "Deblock reduziert Blockartefakte, die durch Videokompression niedriger Qualität entstehen.";
 
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "Eigene:";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "Voreinstellungen des Schärfefilters";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "Voreinstellungen des Schärfefilters. Stellt die Stärke des Filters ein.";
+
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibExternalAccessibilityDescription" = "Voreinstellung des Entrauschfilters";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibShadowedToolTip" = "Voreinstellung des Entrauschfilters. Beeinflusst die Stärke des Filters.";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "Voreinstellung:";
+
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
 "Da7-pY-5vu.title" = "Eigene:";
 
@@ -67,26 +67,29 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
 "DI9-Ed-acp.ibShadowedToolTip" = "Eigene Deblock-Parameter.\n\nstrength=s:thresh=t:blocksize=b";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "dsH-ZQ-dBs"; */
-"dsH-ZQ-dBs.ibShadowedToolTip" = "Dreht das Bild im Uhrzeigersinn in 90°-Schritten.";
-
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
 "DvX-m9-Q6u.title" = "Eigene:";
 
-/* Class = "NSMenuItem"; title = "0°"; ObjectID = "eZj-V7-e0o"; */
-"eZj-V7-e0o.title" = "0°";
-
-/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "Gg8-cE-gaL"; */
-"Gg8-cE-gaL.title" = "Schärfen:";
-
 /* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
 "gKq-xF-AZE.title" = "Deblock:";
 
 /* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
 "h7g-eE-vgv.title" = "Graustufen";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "Hht-Rt-VA0"; */
-"Hht-Rt-VA0.ibShadowedToolTip" = "Eigene Schärfeparameter.\n\nUnscharf Maskieren-Syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnscharf Maskieren Standard: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp-Syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp-Standard: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "Schärfen-Abstimmung";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "Schärfen-Abstimmung. Erweiterte Einstellung der Schärfen-Option für bestimmte Szenarien.\n\nNone: Verwendet die Standardeinstellungen.\n\nUnscharf Maskieren kann abgestimmt werden auf Ultrafein, Fein, Medium, Grob, oder Sehr Grob. Die Auswahl sollte anhand der Auflösung des Ausgangsmaterials und der Feinheit der zu erhöhenden Details getroffen werden.\n\nLapsharp's Abstimmung Film: Ist für die meisten Live-Action-Filme. Film benutzt einen isotropen Laplace-Algorithmus um alle Kanten identisch zu schärfen. Luminanz-Informationen (Helligkeit) werden mehr geschärft als die Farbinformationen.\n\nLapsharp's Abstimmung Grain: Ist ähnlich zu Film, aber verwendet einen benutzt einen isotropen Laplace-Gauss-Algorithmus um die Effekte von Rauschen und Körnung zu reduzieren. Nützlich um Körnungen zu erhalten bzw. als Alternative zur Film-Abstimmung.\n\nLapsharp's Abstimmung Animation: Ist nützlich für animierte Filme, wie Anime und Cartoons. Animation ist identisch zu Film, aber mit geringerer Stärke um ungewünschte Artefakte zu vermeiden.\n\nLapsharp's Abstimmung Sprite: Ist nützlich für 1-/4-/8-/16-bit 2D-Spiele. Sprite benutzt einen (4-neighbor) Laplace-Algorithmus, der vertikale und horizontale Kanten mehr erhöht als diagonale.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "Chroma-Glättung-Voreinstellung";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "Farbraum:";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "Abstimmung:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
 "IHH-Se-l6d.title" = "OtherViews";
@@ -103,26 +106,29 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
 "IQG-Nn-HTb.ibShadowedToolTip" = "Interlace-Erkennung, wenn aktiviert, erlaubt es dem Deinterlacefilter nur betroffene Einzelbilder zu bearbeiten.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis."; ObjectID = "IWV-25-FSC"; */
-"IWV-25-FSC.ibShadowedToolTip" = "Spiegelt das Bild an der horizontalen Achse.";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "Chroma-Glättung-Abstimmung";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jmH-62-gce"; */
-"jmH-62-gce.title" = "OtherViews";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "Abstimmung der Chroma-Glättung. Zusätzliche Anpassung der Chroma-Glättung, um die Einstellungen für bestimmte Szenarien zu optimieren.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
 "KiY-kz-54k.title" = "Eigene:";
 
-/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "N6B-kA-kMA"; */
-"N6B-kA-kMA.title" = "Abstimmung:";
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "OtherViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
 "n6U-tH-vo0.title" = "Eigene:";
 
-/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oqh-kd-lEw"; */
-"oqh-kd-lEw.title" = "Eigene:";
-
-/* Class = "NSMenuItem"; title = "90°"; ObjectID = "OyA-fK-x19"; */
-"OyA-fK-x19.title" = "90°";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "Eigene:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
 "pIO-dE-81w.title" = "OtherViews";
@@ -130,12 +136,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
 "Psx-nN-XiT.ibShadowedToolTip" = "Graustufen entfernt alle Farben aus dem Video. Oft als Schwarz-Weiß-Film bezeichnet.";
 
-/* Class = "NSMenuItem"; title = "270°"; ObjectID = "PY6-PT-J4z"; */
-"PY6-PT-J4z.title" = "270°";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "pYa-Af-F47"; */
-"pYa-Af-F47.ibShadowedToolTip" = "Schärfen erhöht die Detaildarstellung, speziell Kanten. Zu starkes schärfen schädigt die Bildqualität durch Ringartefakte und die Erhöhung von Bildrauschen, dies kann die Kompressionseffizienz erniedrigen.\n\nUnscharf Maskieren ist ein allgemeiner Filter. Er schärft durch Unschärfe und errechnet dann den Unterschied zwischen unscharfem Bild und dem Original.\n\nLapsharp schärft mit Hilfe von Convolution angenähert an den Laplaceschen Kantenfilter, gibt häufig bessere Ergebnisse als Unscharf Maskieren.";
-
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
 "PyP-FP-gGx.title" = "OtherViews";
 
@@ -145,6 +145,9 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
 "Qz4-EY-GFO.title" = "OtherViews";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "OtherViews";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
 "r64-vI-ymx.ibShadowedToolTip" = "Eigene Deinterlaceparameter.\n\nYadif-Syntax: mode=m:parity=p\n\nYadif-Standard: mode=3\n\nDecomb-Syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb-Standard: mode=7";
 
@@ -157,8 +160,8 @@
 /* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
 "Rxe-Xm-vXj.title" = "Entrauschen:";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tAS-YR-VfA"; */
-"tAS-YR-VfA.title" = "OtherViews";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "Voreinstellung des Farbraums";
 
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
 "tje-4P-jKt.title" = "Abstimmung:";
@@ -166,8 +169,8 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
 "tlc-kS-W8X.title" = "OtherViews";
 
-/* Class = "NSButtonCell"; title = "Flip"; ObjectID = "Tvl-40-1Tc"; */
-"Tvl-40-1Tc.title" = "Spiegeln";
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "Schärfen:";
 
 /* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
 "uDH-ts-vs5.title" = "Farbe:";
@@ -190,9 +193,18 @@
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
 "ydN-tP-vpt.title" = "Abstimmung:";
 
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = "Chroma-Glättung:";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
 "ZR9-YG-pfn.ibShadowedToolTip" = "Eigene Entrauschparameter.\n\nNLMeans-Syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans-Standard: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D-Syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D-Standard: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "OtherViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "OtherViews";
+
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
 "zvZ-ZX-yKE.title" = "Voreinstellung:";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBPictureHUDController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBPictureHUDController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBPictureViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBPictureViewController.strings Changed

@@ -1,177 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "Hochskalieren zulassen";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "Anzeigegröße:";
+
 /* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
 "1O3-th-4M5.title" = "Aus";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
 "1Z0-JT-vst.ibExternalAccessibilityDescription" = "Unten beschneiden";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "1Z0-JT-vst"; */
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
 "1Z0-JT-vst.ibShadowedToolTip" = "Pixel die von unten abgeschnitten werden.";
 
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
+
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
 "2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
 "2s0-5k-fjU.ibExternalAccessibilityDescription" = "Speicherhöhe";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Keep Aspect Ratio maintains the original display aspect of the source. Disabling this may result in a stretched or squeezed picture."; ObjectID = "6G0-MW-iVa"; */
-"6G0-MW-iVa.ibShadowedToolTip" = "Bildformat erhalten, behält das Bildformat des originalen Videos bei. Eine Deaktivierung kann zu gestauchten oder gequetschten Videos führen.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "Speicherhöhe";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "Bildformat:";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "Oben füllen";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "Betrag des oberen Randes in Pixel";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "Ohne";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
 "6W6-RI-fBx.ibExternalAccessibilityDescription" = "Unten beschneiden";
 
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "Automatisch";
+
 /* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
-"8vS-Mw-bny.title" = "Anamorphisch:";
+"8vS-Mw-bny.title" = "Anamorph:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "Oben füllen";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "Skalierte Breite";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibExternalAccessibilityDescription" = "Speicherbreite";
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "Skalierte Videobreite. Ist die Breite in Pixel in die das Video encodiert werden soll. Die skalierte Breite kann von der Anzeigegröße abweichen, abhängig von den anamorphen Einstellungen und der Füllung.";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage width. This is the number of pixels wide to be encoded. Storage width may differ from display width depending on anamorphic settings."; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibShadowedToolTip" = "Videospeicherbreite. Ist die Breite in Pixel in die das Video encodiert werden soll. Diese Anzeigegröße kann von der Originalgröße abweichen, abhängig von den anamorphischen Einstellungen.";
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC SD";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
 "41c-48-2XJ.ibExternalAccessibilityDescription" = "Oben beschneiden";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "41c-48-2XJ"; */
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
 "41c-48-2XJ.ibShadowedToolTip" = "Pixel die von oben abgeschnitten werden.";
 
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "b3y-yE-sYc"; */
-"b3y-yE-sYc.title" = "Automatisch";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "Eigene Randfarbe";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "Eigene Randfarbe";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "Anzeigebreite";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "Auflösung & Skalierung";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "Farbe des hinzugefügten Randes um das Video";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "cNr-IZ-H9j"; */
-"cNr-IZ-H9j.title" = "x";
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "Rechts füllen";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "Betrag des rechten Randes in Pixel";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "Auflösungslimit:";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
 "Ddg-4D-el9.ibExternalAccessibilityDescription" = "Rechts beschneiden";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "Anzeigehöhe";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "Schwarz";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "Automatisch";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "Horizontal";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "Spiegeln:";
+
 /* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
 "f12-Dh-fDw.title" = "Eigene";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
-"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Speicherbreite";
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "Ohne";
 
-/* Class = "NSTextFieldCell"; title = "PAR:"; ObjectID = "gVj-RG-PcL"; */
-"gVj-RG-PcL.title" = "PAR:";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "Dreht das Bild im Uhrzeigersinn in 90°-Schritten";
 
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "haC-cO-jDm"; */
-"haC-cO-jDm.title" = "Beschneiden:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "Maximale Höhe";
 
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "hcF-CZ-p0E"; */
-"hcF-CZ-p0E.title" = "Bildformat erhalten";
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "Die maximale Höhe in der das Video gespeichert wird.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "Benutze die höchstmögliche Auflösung die obigen Einstellungen zulassen";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "Weiß";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "Optimale Größe";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Speicherbreite";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "Ohne";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
 "Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "Speicherhöhe";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage height. This is the number of pixels tall to be encoded. Storage height may differ from display height depending on anamorphic settings."; ObjectID = "Hkl-7Z-J2e"; */
-"Hkl-7Z-J2e.ibShadowedToolTip" = "Videospeicherhöhe. Die Anzahl der Pixel der Höhe in der das Video encodiert wird. Diese Anzeigegröße kann von der Originalgröße abweichen, abhängig von den anamorphischen Einstellungen.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "Skalierte Videohöhe. Ist die Höhe in Pixel in die das Video encodiert werden soll. Die skalierte Höhe kann von der Anzeigegröße abweichen, abhängig von den anamorphen Einstellungen und der Füllung.";
 
 /* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
 "hN1-S9-zl8.title" = "x";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ration Numerator"; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibExternalAccessibilityDescription" = "Pixelbildformat-Numerator";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "Füllen:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "Speicherbreite";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibShadowedToolTip" = "Das Bildformat definiert die Form des Videos in Pixel bzw. wie anamorphische Videos skaliert werden um die korrekte Bildgröße und Dimension sicherzustellen. Nicht-anamorphische Videos (1:1 PAR) werden während dem Abspielen nicht skaliert.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "Links füllen";
 
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "jXn-fo-wNU"; */
-"jXn-fo-wNU.title" = "Modulus:";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "Anzeigebreite";
 
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "JyN-AK-Hae"; */
-"JyN-AK-Hae.title" = "Auto";
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "Automatisch";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "Grau";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "Bildgröße:";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
 "krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "L7V-2e-qf9"; */
-"L7V-2e-qf9.title" = "Bildgröße:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "Links füllen";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "Betrag des linken Randes in Pixel";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "Skalierte Größe:";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
 
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "Lbl-i2-YJg"; */
-"Lbl-i2-YJg.title" = "8";
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "Eigene";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
 "LTu-ic-Ty9.ibExternalAccessibilityDescription" = "Links beschneiden";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "LTu-ic-Ty9"; */
-"LTu-ic-Ty9.ibShadowedToolTip" = "Pixel die von der linken Ecke abgeschnitten werden.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "Pixel die von links abgeschnitten werden.";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Width"; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Anzeigebreite";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Pixel-Bildpunkt Zähler";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display width. This is the number of pixels wide your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibShadowedToolTip" = "Anzeigebreite. Dies ist die Anzahl an Pixeln in der Breite die das Video in seiner nativen Auflösung haben wird und ergibt sich aus dem Bildformat.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "Das Pixelformat definiert die Form der Pixel.\n\nEin Verhältnis von 1:1 definiert ein quadratisches Pixel. Andere Werte definieren rechteckige Formen.\nDas Abspielgerät skalieren das Bild, um das angegebene Seitenverhältnis zu erreichen.";
 
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "MgF-Gw-0fD"; */
-"MgF-Gw-0fD.title" = "4";
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "Bildformat:";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
 "Mke-9L-LvB.ibExternalAccessibilityDescription" = "Oben beschneiden";
 
-/* Class = "NSView"; ibExternalAccessibilityDescription = "Cropping"; ObjectID = "Mri-4y-8rX"; */
-"Mri-4y-8rX.ibExternalAccessibilityDescription" = "Beschneiden";
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "Breite & Höhe füllen";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Height"; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Anzeigehöhe";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Pixel-Bildpunkt Nenner";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display height. This is the number of pixels tall your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibShadowedToolTip" = "Anzeigehöhe. Dies ist die Anzahl an Pixeln in der Höhe die das Video in seiner nativen Auflösung haben wird und ergibt sich aus dem Bildformat.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "Das Pixelformat definiert die Form der Pixel.\n\nEin Verhältnis von 1:1 definiert ein quadratisches Pixel. Andere Werte definieren rechteckige Formen.\nDas Abspielgerät skalieren das Bild, um das angegebene Seitenverhältnis zu erreichen.";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Ensure storage dimensions are multiples of this value. Higher values are only necessary for compatibility with certain legacy devices. Set to 2 unless you have a specific compatibility concern."; ObjectID = "ns0-ar-I7c"; */
-"ns0-ar-I7c.ibShadowedToolTip" = "Stellt sicher, dass die Bildgröße ein Mehrfaches dieses Wertes ist. Höhere Werte sind nur sinnvoll aus Kompatibilitätsgründen mit manchen Geräten. Empfohlen ist ein Wert von 2, es sei denn es gibt Kompatibilitätsbedenken.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "Maximale Breite";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "Die maximale Breite in der das Video gespeichert wird.";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
 "ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "OWb-6v-ggg"; */
-"OWb-6v-ggg.title" = "2";
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "Farbe:";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "Eigene";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "Höhe füllen (Letterbox)";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "Dunkles Grau";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
 "qSV-uB-Iup.title" = "OtherViews";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "v"; ObjectID = "r9l-cH-pFW"; */
-"r9l-cH-pFW.ibExternalAccessibilityDescription" = "v";
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p HD";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "Links beschneiden";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "Wenn aktiviert, wird die skalierbare Bildgröße nicht mehr auf die Abmessungen der Quelle beschränkt";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ratio Denominator"; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibExternalAccessibilityDescription" = "Pixelbildformat-Denominator";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibShadowedToolTip" = "Pixelbildformat (PAR) beschreibt die Form der gespeicherten Pixel bzw. wie das anamorphe Video skaliert werden soll um die korrekte Dimension zu bekommen. Nicht-anamorphe Videos (1:1 PAR) werden währen dem Abspielen nicht skaliert.";
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "Pixelformat:";
 
-/* Class = "NSMatrix"; ibShadowedToolTip = "Cropping mode.\n\nAutomatic detects and removes black borders from the video.\n\nCustom allows for manual settings."; ObjectID = "RTr-3u-52l"; */
-"RTr-3u-52l.ibShadowedToolTip" = "Beschneiden.\n\nAutomatisch: Erkennt und entfernt schwarze Ränder vom Video.\n\nEigene: Erlaubt benutzerdefinierte Einstellungen.";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "S7K-vF-t1n"; */
-"S7K-vF-t1n.title" = "Radio";
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "Das Ändern der Anzeigegröße wird das Bild strecken";
 
-/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "SPg-s0-Oh0"; */
-"SPg-s0-Oh0.title" = "Anzeigegröße:";
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
 
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "Uiw-Nb-u5X"; */
-"Uiw-Nb-u5X.title" = "Loose";
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "Bildgröße der Quelle";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "und-OA-MLn"; */
-"und-OA-MLn.title" = "OtherViews";
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "Ausrichtung & Beschnitt";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "Rechts füllen";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
 "uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
 
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "uTT-yC-MFJ"; */
-"uTT-yC-MFJ.title" = "16";
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "Finale Bildgröße";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "Drehung:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "Definiert wie Beschnitt-Einstellungen angewendet werden";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "Füge einen Rand um das Video hinzu";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "Eigene";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "Anamorph erlaubt beliebige Speichermaße bei gleichzeitiger Beibehaltung des Originalseitenverhältnisses während der Wiedergabe.\n\nAutomatisch, maximiert die Speicherauflösung unter Beibehaltung des ursprünglichen Anzeige-Seitenverhältnisses. Empfohlen.\n\nAus, deaktiviert die anamorphe Darstellung. Die Abmessungen des Videospeichers und die Abmessungen der Anzeige sind identisch. Nur nützlich für die Kompatibilität mit bestimmten älteren Geräten.\n\nBenutzerdefiniert, ermöglicht die manuelle Einstellung aller Parameter. Nützlich für die Korrektur eines falschen Quellanzeigeformats und für Profis, die eine erweiterte Kontrolle in der Postproduktion benötigen.";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "Breite füllen (Pillarbox)";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "uuL-JR-73C"; */
-"uuL-JR-73C.title" = "x";
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "Anzeigegröße:";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nOff disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nAuto maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nLoose is similar to Auto, but attempts to preserve the storage aspect ratio. This can result in a slight storage resolution loss compared to Auto.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
-"w1f-3S-up0.ibShadowedToolTip" = "Anamorphisch erlaubt willkürliche Videospeicherdimensionen, aber behält das ursprüngliche Bildformat während dem Abspielen.\n\nAus: Deaktiviert die anamorphische Anpassung. Die Speicher- und Anzeigegröße des Videos wird identisch sein. Nur sinnvoll aus Kompatibilitätsgründen.\n\nAuto: Maximiert die Speichergröße und behält dabei das ursprüngliche Bildformat bei. Empfohlen.\n\nLoose: Ist ähnlich zu Auto, aber versucht das Bildformat der Speichergröße zu erhalten. Dies kann zu Einbußen in der Auflösung des Videos führen.\n\nEigene: Erlaubt eine manuelle Eingabe der Parameter. Nützlich um falsche Bildformate zu korrigieren oder für spezielle professionelle Bedürfnisse in der Postproduktion.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "Unten füllen";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "Betrag des unteren Randes in Pixel";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
 "wsq-TS-cC6.ibExternalAccessibilityDescription" = "Rechts beschneiden";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "wsq-TS-cC6"; */
-"wsq-TS-cC6.ibShadowedToolTip" = "Pixel die von der rechten Ecke abgeschnitten werden.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "Pixel die von rechts abgeschnitten werden.";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
 "x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "zmf-MM-j1I"; */
-"zmf-MM-j1I.title" = "Eigene:";
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p HD";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "Spiegelt das Bild an der horizontalen Achse";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "Eigene";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL SD";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "Ränder";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "Beschneiden:";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "Unten füllen";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "Bildgröße:";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBQueueInfoViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBQueueInfoViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBQueueTableViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBQueueTableViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBSummaryViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBSummaryViewController.strings Changed

@@ -7,21 +7,33 @@
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
 "BHq-Mt-3eA.ibExternalAccessibilityDescription" = "Filterübersicht";
 
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "Metadaten-Passthru";
+
 /* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
 "De0-Je-MAm.title" = "A/V synchron";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "Kopiert die Metadaten der Quelldatei in die Ausgabedatei";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
 "fPv-Vw-I89.ibShadowedToolTip" = "Gleicht die Zeitleiste der Video- und Tonspur aneinander an, indem leere Einzelbilder hinzugefügt werden oder Einzelbilder entfernt werden. Kann die Audio/Video-Synchronisation bei manchen defekten Abspielgeräten verbessern, die keine MP4-Bearbeitungslisten berücksichtigen.";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
 "Jaw-pH-rhf.ibExternalAccessibilityDescription" = "Größenübersicht";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "Optimiert MP4 für den schrittweißen Download. Nach der Encodierung werden die Daten so umgeschrieben, dass ein direktes Abspielen übers Internet ermöglicht wird ohne den gesamten Film herunterladen zu müssen.";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
 "lUi-Oc-208.ibShadowedToolTip" = "Optimiert MP4 für den schrittweißen Download. Nach der Encodierung werden die Daten so umgeschrieben, dass ein direktes Abspielen übers Internet ermöglicht wird ohne den gesamten Film herunterladen zu müssen.";
 
 /* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
 "m5a-0z-QQ4.ibExternalAccessibilityDescription" = "Vorschau";
 
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Web-optimiert";
+
 /* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
 "OCw-f6-uA0.title" = "Filter:";
 
@@ -29,7 +41,7 @@
 "Q1Z-yT-7iY.title" = "OtherViews";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility."; ObjectID = "QKv-GR-d2g"; */
-"QKv-GR-d2g.ibShadowedToolTip" = "Fügt einen speziellen MP4-Marker hinzu um das Abspielen auf alten iPod der 5. Generation (ca. 2006) zu ermöglichen. Andere Einstellungen können möglicherweise die Kompatibilität beeinflussen. ";
+"QKv-GR-d2g.ibShadowedToolTip" = "Fügt einen speziellen MP4-Marker hinzu um das Abspielen auf alten iPod der 5. Generation (ca. 2006) zu ermöglichen. Andere Einstellungen können möglicherweise die Kompatibilität beeinflussen.";
 
 /* Class = "NSTextFieldCell"; title = "None"; ObjectID = "RIB-ME-Yhh"; */
 "RIB-ME-Yhh.title" = "Keine";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/HBTrackTitleViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/HBTrackTitleViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/Localizable.strings Changed

@@ -1,3 +1,6 @@
+/* Job statistics */
+" (%@ %% of the source file)" = " (%@ %% der Quelldatei)";
+
 /* Preview -> size info label */
 " Scaled To Screen" = " An Bildschirm anpassen";
 
@@ -16,14 +19,38 @@
 /* Main Window -> preset modified */
 "(Modified)" = "(Modifiziert)";
 
+/* Job statistics */
+"%@ fps" = "%@ BpS";
+
 /* Queue status */
-"%d encode pending" = "%d Encodierung anstehend";
+"%lu encode pending" = "%lu Encodierung anstehend";
 
 /* Queue status */
-"%d encodes pending" = "%d Encodierungen anstehend";
+"%lu encodes pending" = "%lu Encodierungen anstehend";
 
 /* No comment provided by engineer. */
-"%llu jobs selected" = "%llu Aufgaben ausgewählt";
+"%lu jobs selected" = "%lu Aufgaben ausgewählt";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p HD";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p HD";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K Ultra HD";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K Ultra HD";
 
 /* Destination same as source alert -> message
    File already exists alert -> message */
@@ -68,6 +95,9 @@
 /* Player HUD -> audio menu */
 "Audio" = "Audio";
 
+/* Job statistics */
+"Average speed:" = "Durchschn. Geschw.:";
+
 /* Copy Protection Alert -> second button
    Delete preset alert -> second button
    File already exists alert -> first button
@@ -132,9 +162,6 @@
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode canceled" = "Encodierung abgebrochen";
 
-/* Queue status */
-"Encode Canceled." = "Encodierung abgebrochen.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode complete" = "Encodierung abgeschlossen";
 
@@ -142,12 +169,6 @@
    Queue done notification failed message */
 "Encode failed" = "Encodierung fehlgeschlagen";
 
-/* Queue status */
-"Encode Failed." = "Encodierung fehlgeschlagen.";
-
-/* Queue status */
-"Encode Finished." = "Encodierung beendet.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode ready" = "Bereit zum Encodieren";
 
@@ -155,7 +176,10 @@
 "Encode working" = "Encodierung in Arbeit";
 
 /* No comment provided by engineer. */
-"Encoding %@\n%@" = "Encodiere %1$@\n%2$@";
+"Encoding %lu Jobs" = "Encodiere %lu Aufgaben";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "Encodierung: %@";
 
 /* Job statistics */
 "Ended at:" = "Beendet um:";
@@ -206,6 +230,9 @@
 /* Queue undo action name */
 "Move Jobs in Queue" = "Aufgaben zu Warteschlange hinzufügen";
 
+/* Queue status */
+"No encode pending" = "Keine Encodierungen anstehend";
+
 /* Preview -> accessibility label */
 "No image" = "Kein Bild";
 
@@ -213,10 +240,13 @@
 "No job selected" = "Keine Aufgabe ausgewählt";
 
 /* Main Window -> Info text */
+"No Valid Preset" = "Keine gültige Voreinstellung";
+
+/* Main Window -> Info text */
 "No Valid Source Found" = "Keine gültige Quelle gefunden";
 
 /* Add preset window -> picture setting */
-"None" = "Keine";
+"None" = "Ohne";
 
 /* Queue Done Alert -> shut down first button
    Queue Done Alert -> sleep first button */
@@ -310,6 +340,9 @@
 /* Queue undo action name */
 "Remove Jobs From Queue" = "Aufgaben aus der Warteschlange entfernen";
 
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "Neuüberprüfung zur Bearbeitung";
+
 /* Toolbar Pause Item */
 "Resume" = "Fortsetzen";
 
@@ -360,9 +393,6 @@
 /* Preferences -> Output Name Token */
 "Source" = "Quelle";
 
-/* Add preset window -> picture setting */
-"Source Maximum" = "Quellenmaximum";
-
 /* Toolbar Start/Stop Item */
 "Start" = "Start";
 
@@ -380,9 +410,13 @@
 /* Job statistics */
 "Started at:" = "Gestartet um:";
 
-/* Toolbar Start/Stop Item */
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
 "Stop" = "Stop";
 
+/* Queue -> Stop action */
+"Stop action." = "Aktion stoppen";
+
 /* Queue Alert -> cancel rip third button */
 "Stop After Current Job" = "Nach momentaner Aufgabe stoppen";
 
@@ -418,7 +452,7 @@
 "The CSV file is not a valid chapters CSV file." = "Die CSV-Datei ist keine gültige Kapitel-Datei.";
 
 /* Destination same as source alert -> informative text */
-"The destination is the same as the source, you can not overwrite your source file!" = "Das Ziel ist mit der Quelle identisch, die Quelle kann nicht überschrieben werden!";
+"The destination is the same as the source, you can not overwrite your source file!" = "Die Ausgabe ist mit der Quelle identisch, die Quelle kann nicht überschrieben werden!";
 
 /* Chapters import -> invalid CSV line count recovery suggestion */
 "The line count in the chapters CSV file does not match the number of chapters in the movie." = "Der Zeilenzähler der Kapitel-CSV-Datei stimmt nicht mit der Anzahl der Kapitel des Films überein.";
@@ -427,17 +461,11 @@
    Rename preset window -> name alert message */
 "The preset name cannot be empty." = "Der Name der Voreinstellung kann nicht leer sein.";
 
-/* Queue -> Multiple instances alert informative text */
-"The queue will be shared between the instances." = "Die Warteschlange wird zwischen den Instanzen geteilt.";
-
 /* File already exists in queue alert -> message */
 "There is already a queue item for this destination." = "Es existiert schon ein Objekt für dieses Ziel in der Warteschlange.";
 
-/* Queue -> Multiple instances alert message */
-"There is already an instance of HandBrake running." = "Es läuft schon eine Instanz von HandBrake.";
-
 /* Invalid destination alert -> informative text */
-"This is not a valid destination directory!" = "Dies ist kein gültiges Zielverzeichnis.";
+"This is not a valid destination directory!" = "Dies ist kein gültiges Ausgabeverzeichnis.";
 
 /* Preferences -> Output Name Token */
 "Time" = "Zeit";
@@ -454,6 +482,9 @@
 /* Invalid destination alert -> message */
 "Warning!" = "Warnung!";
 
+/* No comment provided by engineer. */
+"Working" = "Arbeiten";
+
 /* Queue Alert -> cancel rip message */
 "You are currently encoding. What would you like to do?" = "Sie sind momentan am encodieren. Was wollen Sie tun?";
 
@@ -470,7 +501,7 @@
 "You need to make more space available on your destination disk." = "Der Speicherplatz auf dem Zielmedium ist nicht ausreichend.";
 
 /* Queue -> disk almost full alert message */
-"Your destination disk is almost full." = "Ihr Ziel-Speichermedium ist fast voll.";
+"Your destination disk is almost full." = "Ihr Zielmedium ist fast voll.";
 
 /* Queue done notification message */
 "Your encode %@ couldn't be completed." = "Die Encodierung %@ konnte nicht ausgeführt werden.";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/MainMenu.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/MainMenu.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/MainWindow.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/MainWindow.strings Changed

@@ -4,12 +4,12 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
 "2vD-zN-YMe.ibShadowedToolTip" = "Neue Voreinstellung speichern …";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "3Gk-ma-r2w"; */
-"3Gk-ma-r2w.ibShadowedIsNilPlaceholder" = "";
-
 /* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
 "3w9-Iu-3u2.ibShadowedToolTip" = "Titel zum überprüfen.";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "Zur Warteschlange hinzufügen";
+
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
 "6E4-AG-PEh.title" = "0";
 
@@ -25,18 +25,6 @@
 /* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
 "21.title" = "HandBrake";
 
-/* Class = "NSToolbarItem"; label = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.label" = "Alle Titel zur Warteschlange hinzufügen";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.paletteLabel" = "Alle Titel zur Warteschlange hinzufügen";
-
-/* Class = "NSToolbarItem"; toolTip = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.toolTip" = "Alle Titel zur Warteschlange hinzufügen";
-
-/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "046-kc-MnL"; */
-"046-kc-MnL.title" = "Titel zur Warteschlange hinzufügen …";
-
 /* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
 "1475.label" = "Audio";
 
@@ -86,7 +74,7 @@
 "1561.ibShadowedToolTip" = "Dateiname. Dies wird der neue Name der encodierten Datei.";
 
 /* Class = "NSButton"; ibExternalAccessibilityDescription = "Browse Destination"; ObjectID = "1562"; */
-"1562.ibExternalAccessibilityDescription" = "Ziel auswählen";
+"1562.ibExternalAccessibilityDescription" = "Ausgabe auswählen";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Browse to select a new destination path for your encode."; ObjectID = "1562"; */
 "1562.ibShadowedToolTip" = "Einen neuen Pfad zum Abspeichern des Videos wählen.";
@@ -94,8 +82,8 @@
 /* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
 "1989.label" = "Kapitel";
 
-/* Class = "NSTextFieldCell"; title = "DO NOT TRANSLATE THIS NIB FILE"; ObjectID = "4846"; */
-"4846.title" = "DO NOT TRANSLATE THIS NIB FILE";
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "Encodierungsaufgabe 1: Test.mp4";
 
 /* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
 "4905.title" = "Quelle:";
@@ -166,9 +154,15 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
 "5523.ibShadowedToolTip" = "Letzte Einzelbilder zum Encodieren.";
 
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "Alle Titel zur Warteschlange hinzufügen";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
 "AhR-pK-Oz4.ibShadowedToolTip" = "Läd die Encodiereinstellungen der momentan ausgewählte Voreinstellung neu. Änderungen werden verworfen.";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
 "BA0-eg-2Ka.label" = "Übersicht";
 
@@ -202,15 +196,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
 "DN4-48-aOI.ibShadowedToolTip" = "Nur den ausgewählten, statt alle Titel überprüfen.";
 
-/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.label" = "Zur Warteschlange hinzufügen";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.paletteLabel" = "Aur Warteschlange hinzufügen";
-
-/* Class = "NSToolbarItem"; toolTip = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.toolTip" = "Zur Warteschlange hinzufügen";
-
 /* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
 "eij-Sn-QmJ.label" = "Bildgröße";
 
@@ -226,17 +211,20 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
 "HCx-ku-nF7.toolTip" = "Warteschlange zeigen";
 
-/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "INL-y9-Gwp"; */
-"INL-y9-Gwp.title" = "Alle Titel zur Warteschlange hinzufügen";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
 
 /* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
 "IOU-3L-nvB.title" = "Neue Voreinstellung speichern …";
 
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "Titel zur Warteschlange hinzufügen …";
+
 /* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
 "IxV-PW-oYh.title" = "Bereich:";
 
-/* Class = "NSMenuItem"; title = "Add Title To Queue"; ObjectID = "L8z-c6-E1u"; */
-"L8z-c6-E1u.title" = "Titel zur Warteschlange hinzufügen";
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "Fortschritt";
 
 /* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
 "OYP-3T-FnA.title" = "Voreinstellung wählen";
@@ -251,7 +239,7 @@
 "p7Q-L3-zcW.toolTip" = "Aktivitätsfenster zeigen";
 
 /* Class = "NSPathControl"; ibExternalAccessibilityDescription = "Destination folder path"; ObjectID = "PJi-21-hie"; */
-"PJi-21-hie.ibExternalAccessibilityDescription" = "Pfad des Zielordners";
+"PJi-21-hie.ibExternalAccessibilityDescription" = "Pfad des Ausgabeordners";
 
 /* Class = "NSToolbarItem"; label = "Presets"; ObjectID = "qhv-9l-2FH"; */
 "qhv-9l-2FH.label" = "Voreinstellungen";
@@ -262,9 +250,18 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
 "qhv-9l-2FH.toolTip" = "Voreinstellungen zeigen";
 
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "Zur Warteschlange hinzufügen";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "Zur Warteschlange hinzufügen";
+
 /* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
 "rfK-nQ-Aq2.title" = "Zielort:";
 
+/* Class = "NSMenuItem"; title = "Reveal in Finder"; ObjectID = "rK6-EB-N9Z"; */
+"rK6-EB-N9Z.title" = "Im Finder anzeigen";
+
 /* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.label" = "Anhalten";
 
@@ -274,3 +271,6 @@
 /* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.toolTip" = "Encodierung anhalten";
 
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "Box";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/Preferences.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/Preferences.strings Changed

@@ -112,9 +112,6 @@
 /* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
 "399.title" = "Libdvdnav verwenden (anstelle von libdvdread)";
 
-/* Class = "NSTextFieldCell"; title = "DVD Reader:"; ObjectID = "443"; */
-"443.title" = "DVD-Leser:";
-
 /* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
 "449.title" = "Keine";
 
@@ -187,8 +184,8 @@
 /* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
 "BPU-E2-N8l.title" = "Nach erfolgter Encodierung Einträge abgeschlossener Aufgaben immer entfernen";
 
-/* Class = "NSTextFieldCell"; title = "Title Scan:"; ObjectID = "c0L-TU-WML"; */
-"c0L-TU-WML.title" = "Titelüberprüfung:";
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "Überprüfen:";
 
 /* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
 "cqp-xU-GOe.title" = "Encoder:";
@@ -211,14 +208,32 @@
 /* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
 "GQJ-go-PoN.title" = "Übersicht:";
 
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "Anzahl simultaner Encodierungen:";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
+
 /* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
 "klQ-DW-Kc6.title" = "Sekunden";
 
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "Bei Auswahl eines neuen Titels, Änderungen an Voreinstellungen beibehalten";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
 /* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
 "lgn-RF-k0d.title" = "Alte Aktivitätsprotokolle nach 30 Tagen löschen";
 
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "Höhere Werte können helfen, die CPU voll auszunutzen, wenn eine einzelne Codierung nicht alle verfügbaren CPU-Kerne ausreizt.";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
-"PaR-zw-opS.ibShadowedToolTip" = "Minimaler freier Speicherplatz auf dem Zielvolume in GB.";
+"PaR-zw-opS.ibShadowedToolTip" = "Minimaler freier Speicherplatz auf dem Ausgabevolume in GB.";
 
 /* Class = "NSButtonCell"; title = "Replace underscores with spaces"; ObjectID = "pUi-lK-cHw"; */
 "pUi-lK-cHw.title" = "Unterstriche durch Leerzeichen ersetzen";
@@ -226,14 +241,23 @@
 /* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
 "Tk3-Ig-fFI.ibShadowedToolTip" = "Labels in das Formatfenster ziehen, um das Benennungsschema festzulegen.";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
 "Uxv-oN-c1r.title" = "Bei jedem Start auf „Nichts tun“ zurücksetzen";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "Voreinstellung:";
+
 /* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
 "wo5-iR-2mb.title" = "Punktationen entfernen";
 
 /* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
-"yG9-mz-tqQ.title" = "Warteschlange anhalten, wenn der verfügbare Speicherplatz kleiner ist als (GB):";
+"yG9-mz-tqQ.title" = "Warteschlange anhalten, wenn verfügbarer Speicherplatz kleiner als:";
+
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
 
 /* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
 "Zqz-Kn-xOS.title" = "Öffnen-Dialog anzeigen";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/Presets.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/Presets.strings Changed

@@ -1,11 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
-"4tC-UE-40G.title" = "Text Cell";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "Erstellt neue benutzerdefinierte Voreinstellungen basierend auf den momentanen Einstellungen.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Delete Preset"; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibExternalAccessibilityDescription" = "Voreinstellung löschen";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "Lösche die ausgewählte Voreinstellung.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Delete the selected preset."; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibShadowedToolTip" = "Lösche die ausgewählte Voreinstellung.";
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "Text Cell";
 
 /* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
 "cm5-Kl-dB3.title" = "Offizielle Voreinstellungen zurücksetzen";
@@ -16,12 +16,6 @@
 /* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
 "Io0-Vm-Qez.title" = "Neue Kategorie";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "New Preset"; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibExternalAccessibilityDescription" = "Neue Voreinstellung";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Create a new custom preset based on the currently selected settings."; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibShadowedToolTip" = "Erstellt neue benutzerdefinierte Voreinstellungen basierend auf den momentanen Einstellungen.";
-
 /* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
 "LQk-kD-5sj.title" = "Voreinstellungen des Dienste-Menüs";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/SubtitlesDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/SubtitlesDefaults.strings Changed

@@ -70,18 +70,9 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
 "OOC-GZ-OFA.ibShadowedToolTip" = "Fremdsprachensuche durchsucht die Quelle nach kurzen Sequenzen an fremdsprachigem Audio die standardmäßig angezeigt werden.";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Alle anzeigen";
-
 /* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
 "Px8-G6-NVX.ibShadowedToolTip" = "Brenne den ersten ausgewählten Untertitel der Blu-Ray ein. Alle anderen Untertitel werden verworfen. Diese Option ist zu verwenden, wenn das Blu-Ray-Abspielgerät Untertitel nicht unterstützt.\n\nEs kann nur jeweils ein Untertitel eingebrannt werden.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all subtitles languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Alle Untertitelsprachen anzeigen";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all subtitles languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Zeige alle Untertitelsprachen in der Sprachenliste.";
-
 /* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
 "QRd-XH-6TH.title" = "Fremdsprachenuntertitel";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/de.lproj/Video.strings -> HandBrake-1.5.1.tar.xz/macosx/de.lproj/Video.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/AddPreset.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/AddPreset.strings Changed

@@ -4,8 +4,8 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Enter a description for the new preset. The description will be shown when hovering the cursor over the preset in the presets list."; ObjectID = "8kl-Sh-Gh7"; */
 "8kl-Sh-Gh7.ibShadowedToolTip" = "Entrer une description pour le nouveau préréglage. Cette description s'affichera lorsque vous passez votre curseur au-dessus du préréglage dans la liste des préréglages.";
 
-/* Class = "NSTextFieldCell"; title = "Dimensions:"; ObjectID = "75B-xq-Qbe"; */
-"75B-xq-Qbe.title" = "Dimensions :";
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "75B-xq-Qbe"; */
+"75B-xq-Qbe.title" = "Limite de la résolution :";
 
 /* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "a0j-nw-n23"; */
 "a0j-nw-n23.title" = "Comportement de la sélection…";
@@ -29,7 +29,7 @@
 "gOg-oO-8ar.ibExternalAccessibilityDescription" = "Largeur de l'image";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width."; ObjectID = "gOg-oO-8ar"; */
-"gOg-oO-8ar.ibShadowedToolTip" = "Stockage maximal en largeur de la vidéo suivant le préréglage autorisé en pixels. Réglez sur 0 pour une largeur illimitée. ";
+"gOg-oO-8ar.ibShadowedToolTip" = "Stockage maximal en largeur de la vidéo suivant le préréglage autorisé en pixels. Réglez sur 0 pour une largeur illimitée.";
 
 /* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "hc8-1h-Jye"; */
 "hc8-1h-Jye.title" = "Description :";
@@ -46,6 +46,9 @@
 /* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "LPX-Rc-KLa"; */
 "LPX-Rc-KLa.title" = "Comportement de la sélection…";
 
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Height"; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibExternalAccessibilityDescription" = "Hauteur de l'image";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height."; ObjectID = "Mga-dS-8BF"; */
 "Mga-dS-8BF.ibShadowedToolTip" = "Stockage maximal en hauteur de la vidéo suivant le préréglage autorisé en pixels. Réglez sur 0 pour une hauteur illimitée.";
 
@@ -67,6 +70,6 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tQ1-PN-kvh"; */
 "tQ1-PN-kvh.title" = "AutresVues";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Picture Size controls how video dimensions are applied when selecting the preset.\n\nNone uses the currently set dimensions.\n\nCustom allows you to set a maximum width and/or height.\n\nSource maximum uses the full dimensions of each source."; ObjectID = "z6B-ig-ouq"; */
-"z6B-ig-ouq.ibShadowedToolTip" = "Taille de l'image contrôle la manière dont les dimensions de la vidéo sont appliquées lorsque le préréglage est sélectionné.\n\nAucun utilise les dimensions actuellement sélectionnées.\n\nPersonnalisé vous permet de définir une largeur et/ou une hauteur maximum.\n\nMaximum de la source utilise les dimensions complètes de chacune des sources..";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Resolution Limit allows you to set a maximum width and/or height."; ObjectID = "z6B-ig-ouq"; */
+"z6B-ig-ouq.ibShadowedToolTip" = "Limite de Résolution permet de régler une largeur et/ou hauteur maximale.";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Audio.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Audio.strings Changed

@@ -146,5 +146,5 @@
 "yPh-4R-HRQ.ibShadowedToolTip" = "Compression de la Plage Dynamique (alias DRC). Réduit la différence de volume entre les sons forts et calmes. S'applique uniquement aux sources AC-3, lorsqu'elles sont encodées vers un autre format.\n\n0 : Ne pas appliquer de DRC.\n1 : Appliquer une DRC selon les éventuels indices présents dans la piste source.\n\nUne valeur supérieure à 1 augmente le volume des sons calmes. Une valeur supérieure à 2.5 n'est pas recommandée car elle peut introduire une distorsion audible.";
 
 /* Class = "NSScrollView"; ibShadowedToolTip = "Audio tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the audio Selection Behavior dialog."; ObjectID = "Yzu-Rk-hTv"; */
-"Yzu-Rk-hTv.ibShadowedToolTip" = "Liste des pistes audio. Le comportement et les paramètres de sélection de piste sont chargés à partir des préréglages sélectionnés et peuvent être configurés à l'aide de la boîte de dialogue audio. ";
+"Yzu-Rk-hTv.ibShadowedToolTip" = "Liste des pistes audio. Le comportement et les paramètres de sélection de piste sont chargés à partir des préréglages sélectionnés et peuvent être configurés à l'aide de la boîte de dialogue audio.";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/AudioDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/AudioDefaults.strings Changed

@@ -80,7 +80,10 @@
 "fzd-MO-xaB.ibShadowedToolTip" = "Activez-le si l'appareil de lecture supporte l'AAC. Cela permet de copier la piste AAC lorsque la copie de la piste audio est sélectionnée.";
 
 /* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
-"GbM-vm-RC2.title" = "Suivre le comportement de la sélection : ";
+"GbM-vm-RC2.title" = "Suivre le comportement de la sélection :";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "Activer cette option si votre appareil supporte le MP2. Cela permet au passthru MP2 d'être sélectionné lorsque la sélection automatique du passthru est activée.";
 
 /* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
 "GZP-q7-SYy.title" = "Toutes les langues correspodnandantes sélectionnées";
@@ -154,29 +157,20 @@
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
 "OVr-Jm-VrK.title" = "0";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Tout afficher";
-
 /* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
 "pR9-d4-SNf.headerCell.title" = "Codec";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
 "PtB-Wp-B9X.title" = "AutresVues";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all audio languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Afficher toutes les langues audio";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all audio languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Afficher toutes les langues audio de la liste des langues.";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
 "r80-yv-59n.ibExternalAccessibilityDescription" = "Fréquence d'échantillonnage";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "r80-yv-59n"; */
-"r80-yv-59n.ibShadowedToolTip" = "Fréquence d'échantillonnage audio en kilohertz (kHz). Automatique est recommandé. ";
+"r80-yv-59n.ibShadowedToolTip" = "Fréquence d'échantillonnage audio en kilohertz (kHz). Automatique est recommandé.";
 
 /* Class = "NSTextFieldCell"; title = "Auto Passthru:"; ObjectID = "s6s-EH-5CB"; */
-"s6s-EH-5CB.title" = "Copie automatique : ";
+"s6s-EH-5CB.title" = "Copie automatique :";
 
 /* Class = "NSButtonCell"; title = "MP3"; ObjectID = "sdZ-Rx-JoG"; */
 "sdZ-Rx-JoG.title" = "MP3";
@@ -185,7 +179,7 @@
 "u9h-dn-wcK.title" = "E-AC3";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Only the primary audio track will be encoded with the full encoder list. All additional audio tracks will be encoded with first encoder only."; ObjectID = "uF5-6E-EIe"; */
-"uF5-6E-EIe.ibShadowedToolTip" = "Seule la piste audio principale sera codée avec la liste complète des encodeurs. Toutes les pistes audio seront encodées avec le premier encodeur uniquement. ";
+"uF5-6E-EIe.ibShadowedToolTip" = "Seule la piste audio principale sera codée avec la liste complète des encodeurs. Toutes les pistes audio seront encodées avec le premier encodeur uniquement.";
 
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "uFK-z7-8Yj"; */
 "uFK-z7-8Yj.title" = "Cellule de texte";
@@ -211,6 +205,9 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
 "xnA-03-Bul.ibShadowedToolTip" = "Gain audio en décibels (dB). Augmente ou diminue le volume audio.";
 
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
 /* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
 "z9d-P3-6UP.title" = "TrueHD";

HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "Recadrer en bas";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "Taille du recadrage de la bordure basse, en pixels.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "Recadrer en haut";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "Recadrer en haut";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "Taille du recadrage de la bordure haute, en pixels.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "Tourner l'image de 90 degrés dans le sens horaire.";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "Personnaliser";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "Recadrer à droite";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "Taille du recadrage de la bordure droite, en pixels.";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "Aucun";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "Automatique";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "Recadrer en bas";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "Recadrer à gauche";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "Taille du recadrage de la bordure gauche, en pixels.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "Recadrer à droite";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "Recadrer à gauche";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBFiltersViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBFiltersViewController.strings Changed

@@ -1,20 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Rotate:"; ObjectID = "1nr-nE-3a6"; */
-"1nr-nE-3a6.title" = "Pivoter :";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibExternalAccessibilityDescription" = "Réglage de réduction du bruit";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibShadowedToolTip" = "Réglage de réduction du bruit. Ajuste en outre le préréglage de réduction du bruitpour optimiser les paramètres en fonction d'un scénario spécifique.\n\n\"Aucun\" utilise les paramètres par défaut.\n\n\"Film\" affine les paramètres pour une utilisation avec la plupart des contenus d'action.\n\n\"Grain\" n'impacte que les canaux des couleurs. Utile pour préserver l'aspect film du grain de luminance, en réduisant ou supprimant le bruit de couleur.\n\n\"Mouvement rapide\" réduit la persistance de couleur dans les scènes rapides, en évitant le traitement temporel des canaux de couleur. Utile pour les vidéos de sport ou d'action.\n\n\"Animation\" est utile pour les films d'animation, comme des dessins animés ou des mangas.\n\n\"Bande\" est utile pour les sources analogiques de faible qualité, comme les cassettes VHS, lorsque le mode \"Film\" ne produit pas le résultat escompté.\n\n\"Sprite\" est utile pour les jeux 2D en 1, 4, 8 ou 16 bits. Ce mode n'est pas recommandé pour les vidéos haute définition.";
 
-/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "1zF-s5-Lic"; */
-"1zF-s5-Lic.title" = "Préréglage :";
-
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibExternalAccessibilityDescription" = "Réglage Renforcer";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibShadowedToolTip" = "Réglage Renforcer. Ajuste le préréglage Renforcer pour optimiser les réglages en fonction d'un scénario spécifique.\n\n\"Aucun\" utilise le préréglage par défaut.\n\n\"Flou\" peut être réglé parmi les modes de flou Ultrafin, Fin, Medium, Grossier et Très Grossier. Faites votre choix en fonction de la résolution de sortie souhaitée et la finesse des détails à améliorer.\n\n\"Film Lapsharp\" affine les réglages pour s'adapter à la plupart des scènes d'action. Ce mode utilise un algorithme laplacien isotropique pour améliorer tous les contours uniformément, et la luminance est également plus affinée par rapport à la chrominance de l'image.\n\n\"Grain Lapsharp\" est semblable au mode Film, à la différence près qu'il ajoute du flou gaussien afin de réduire l'effet du bruit et du grain sur l'image. Utile pour préserver le grain de l'image et comme bonne alternative au mode Film.\n\n\"Animation Lapsharp\" est utile pour les films d'animation, comme les dessins animés ou les animes. Même action que le mode Film, mais avec un niveau moindre afin d'éviter les artefacts dans l'image.\n\n\"Sprite Laspharp\"  est utile pour les jeux 2D en 1, 2, 4, 8 ou 16 bits. Ce mode utilise un algorithme laplacien et améliorer plus fortement les bordures horizontales et verticales que les bordures en diagonale..";
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "Régler :";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
 "6nG-zk-FMo.ibShadowedToolTip" = "Préréglage du filtre de Désentrelacement.\n\n\"Défaut\" est un bon compromis entre rapidité et qualité.\n\n\"Eviter Vérification Spatiale\" permet d'éviter de corriger certains artefacts évitables, pour une nette amélioration des performances.\n\n\"EEDI2\" utilise un algorithme d'interpolation plus lent et de meilleure qualité pour le Decomb. Utile pour la plupart des sources difficiles.\n\n\"Bob\" tente de préserver au mieux le mouvement, en minimisant l'impact perceptible sur la résolution.";
@@ -22,8 +13,8 @@
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
 "8am-ve-1Xl.title" = "Préréglage :";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "9su-F2-NUw"; */
-"9su-F2-NUw.title" = "AutresVues";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "Personnalisé :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
 "akB-JW-MPe.title" = "AutresVues";
@@ -31,14 +22,11 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
 "b6A-ax-2Ed.title" = "AutresVues";
 
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibExternalAccessibilityDescription" = "Préréglage Affiner";
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "Paramètres personnalisés Affiner.\n\nSyntaxe Flou : y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nFlou par défaut : y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nSyntaxe Lapsharp : y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp par défaut : y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibShadowedToolTip" = "Préréglage du filtre Affiner. Régler la force du filtre.";
-
-/* Class = "NSMenuItem"; title = "180°"; ObjectID = "bEe-EV-Q73"; */
-"bEe-EV-Q73.title" = "180°";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "La netteté améliore l'apparence des détails, en particulier des bords. Des paramètres de netteté excessivement forts peuvent endommager la qualité de l'image en créant des artefacts et en améliorant le bruit, ce qui peut réduire l'efficacité de la compression. \n\nLe flou est un filtre de réduction de la netteté à usage général. Il s'affine en en flouttant, puis en calculant la différence entre l'image floue et l'original. \n\nLapsharp aide le noyaux de convolution en se rapprochant des filtres de bord en bord, produisant parfois des résultats de meilleure qualité que le masquage flou.";
 
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
 "bRd-Km-Wa8.ibExternalAccessibilityDescription" = "Réglage Renforcer";
@@ -52,12 +40,24 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
 "bz8-FC-vYp.ibShadowedToolTip" = "Le déblocage réduit les artefacts générés par une compression vidéo de mauvaise qualité.";
 
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "Personnalisé :";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "Préréglage Affiner";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "Préréglage du filtre Affiner. Régler la force du filtre.";
+
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibExternalAccessibilityDescription" = "Préréglage de réduction du bruit";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibShadowedToolTip" = "Préréglage du filtre de réduction du bruit. Ajuster la force du filtre.";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "Préréglage :";
+
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
 "Da7-pY-5vu.title" = "Personnalisé :";
 
@@ -67,32 +67,35 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
 "DI9-Ed-acp.ibShadowedToolTip" = "Paramètres de l'anti-blocs personnalisés.\n\nstrength=s:thresh=t:blocksize=b";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "dsH-ZQ-dBs"; */
-"dsH-ZQ-dBs.ibShadowedToolTip" = "Tourner l'image de 90 degrés dans le sens horaire.";
-
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
 "DvX-m9-Q6u.title" = "Personnalisé :";
 
-/* Class = "NSMenuItem"; title = "0°"; ObjectID = "eZj-V7-e0o"; */
-"eZj-V7-e0o.title" = "0°";
-
-/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "Gg8-cE-gaL"; */
-"Gg8-cE-gaL.title" = "Augmenter la netteté :";
-
 /* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
-"gKq-xF-AZE.title" = "Débloquer : ";
+"gKq-xF-AZE.title" = "Débloquer :";
 
 /* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
 "h7g-eE-vgv.title" = "Niveau de gris";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "Hht-Rt-VA0"; */
-"Hht-Rt-VA0.ibShadowedToolTip" = "Paramètres personnalisés Affiner.\n\nSyntaxe Flou : y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nFlou par défaut : y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nSyntaxe Lapsharp : y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp par défaut : y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "Réglage Renforcer";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "Réglage Renforcer. Ajuste le préréglage Renforcer pour optimiser les réglages en fonction d'un scénario spécifique.\n\n« Aucun » utilise le préréglage par défaut.\n\n« Flou » peut être réglé parmi les modes de flou Ultrafin, Fin, Medium, Grossier et Très Grossier. Faites votre choix en fonction de la résolution de sortie souhaitée et la finesse des détails à améliorer.\n\n« Film Lapsharp »  affine les réglages pour s'adapter à la plupart des scènes d'action. Ce mode utilise un algorithme laplacien isotropique pour améliorer tous les contours uniformément, et la saturation est également plus affinée par rapport à la chrominance de l’image.\n\n« Grain Lapsharp » est semblable au mode Film, à la différence près qu'il ajoute du flou gaussien afin de réduire l'effet du bruit et du grain sur l'image. Utile pour préserver le grain de l'image et comme bonne alternative au mode Film.\n\n« Animation Lapsharp » est utile pour les films d'animation, comme les dessins animés ou les animes. Même action que le mode Film, mais avec un niveau moindre afin d'éviter les artefacts dans l’image.\n\n« Sprite Laspharp » est utile pour les jeux 2D en 1, 2, 4, 8 ou 16 bits. Ce mode utilise un algorithme laplacien et améliorer plus fortement les bordures horizontales et verticales que les bordures en diagonale..";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "Préréglage de lissage chromatique :";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "Espace colorimétrique :";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "Régler :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
 "IHH-Se-l6d.title" = "AutresVues";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise reduces or removes the appearance of noise and grain. This can improve compression efficiency and create higher quality video at smaller file sizes. Overly strong Denoise settings may damage picture quality by discarding detail.\n\nNLMeans is a high quality denoise filter with a cost to speed. Use where quality is more important than speed.\n\nHQDN3D is an adaptive low-pass filter, faster than NLMeans but less effective at preserving fine detail."; ObjectID = "ins-7X-kbN"; */
-"ins-7X-kbN.ibShadowedToolTip" = "Réduction du bruit réduit ou supprime l'apparence du bruit et le grain. Ceci peut améliorer l'efficacité de la compression et crée une vidéo de grande qualité pour une taille de fichier réduite. Une valeur excessive de de réduction du bruit peut endommager la qualité de l'image en supprimant des détails.\n\nNLMeans est un filtre de réduction du bruit haute qualité, avec une conséquence sur la rapidité. A utiliser lorsque la qualité est plus importante que la rapidité.\n\nHQDN3D est un filtre passe-bas adaptatif, plus rapide que NLMeans mais moins efficace pour conserver le niveau de détail. ";
+"ins-7X-kbN.ibShadowedToolTip" = "Réduction du bruit réduit ou supprime l'apparence du bruit et le grain. Ceci peut améliorer l'efficacité de la compression et crée une vidéo de grande qualité pour une taille de fichier réduite. Une valeur excessive de de réduction du bruit peut endommager la qualité de l'image en supprimant des détails.\n\nNLMeans est un filtre de réduction du bruit haute qualité, avec une conséquence sur la rapidité. A utiliser lorsque la qualité est plus importante que la rapidité.\n\nHQDN3D est un filtre passe-bas adaptatif, plus rapide que NLMeans mais moins efficace pour conserver le niveau de détail.";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom deleteline settings."; ObjectID = "ipJ-z3-XnJ"; */
 "ipJ-z3-XnJ.ibExternalAccessibilityDescription" = "Paramètres de suppression de ligne personnalisées.";
@@ -103,26 +106,29 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
 "IQG-Nn-HTb.ibShadowedToolTip" = "Détection de l'Entrelacement, si actif, permet au filtre de Désentrelacement de ne traiter que les images réellement entrelacées.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis."; ObjectID = "IWV-25-FSC"; */
-"IWV-25-FSC.ibShadowedToolTip" = "Retourne (en mode miroir) l'image selon l'axe horizontal.";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "Réglage Doux de la Chroma";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jmH-62-gce"; */
-"jmH-62-gce.title" = "AutresVues";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "Réglage Doux de la Chroma. Ajustement du préréglage Doux de la Chroma afin d'optimiser les réglages pour des scénarios spécifiques.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "AutresVues";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
 "KiY-kz-54k.title" = "Personnalisé :";
 
-/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "N6B-kA-kMA"; */
-"N6B-kA-kMA.title" = "Régler :";
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "AutresVues";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "AutresVues";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
 "n6U-tH-vo0.title" = "Personnalisé :";
 
-/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oqh-kd-lEw"; */
-"oqh-kd-lEw.title" = "Personnalisé :";
-
-/* Class = "NSMenuItem"; title = "90°"; ObjectID = "OyA-fK-x19"; */
-"OyA-fK-x19.title" = "90°";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "Personnalisé :";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
 "pIO-dE-81w.title" = "AutresVues";
@@ -130,12 +136,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
 "Psx-nN-XiT.ibShadowedToolTip" = "Niveau de gris supprime la couleur de la vidéo. SImilaire à la vidéo en noir et blanc.";
 
-/* Class = "NSMenuItem"; title = "270°"; ObjectID = "PY6-PT-J4z"; */
-"PY6-PT-J4z.title" = "270°";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "pYa-Af-F47"; */
-"pYa-Af-F47.ibShadowedToolTip" = "La netteté améliore l'apparence des détails, en particulier des bords. Des paramètres de netteté excessivement forts peuvent endommager la qualité de l'image en créant des artefacts et en améliorant le bruit, ce qui peut réduire l'efficacité de la compression. \n\nLe flou est un filtre de réduction de la netteté à usage général. Il s'affine en en flouttant, puis en calculant la différence entre l'image floue et l'original. \n\nLapsharp aide le noyaux de convolution en se rapprochant des filtres de bord en bord, produisant parfois des résultats de meilleure qualité que le masquage flou.";
-
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
 "PyP-FP-gGx.title" = "AutresVues";
 
@@ -145,6 +145,9 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
 "Qz4-EY-GFO.title" = "AutresVues";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "AutresVues";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
 "r64-vI-ymx.ibShadowedToolTip" = "Paramètres personnalisés Désentrelacement.\n\nSyntaxe Yadif: mode=m:parity=p\n\nYadif par défaut: mode=3\n\nSyntaxe Decomb: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb par défaut: mode=7";
 
@@ -157,8 +160,8 @@
 /* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
 "Rxe-Xm-vXj.title" = "Réduction du bruit :";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tAS-YR-VfA"; */
-"tAS-YR-VfA.title" = "AutresVues";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "Préréglage d'espace colorimétrique";
 
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
 "tje-4P-jKt.title" = "Régler :";
@@ -166,8 +169,8 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
 "tlc-kS-W8X.title" = "AutresVues";
 
-/* Class = "NSButtonCell"; title = "Flip"; ObjectID = "Tvl-40-1Tc"; */
-"Tvl-40-1Tc.title" = "Retourner";
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "Augmenter la netteté :";
 
 /* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
 "uDH-ts-vs5.title" = "Couleur :";
@@ -190,9 +193,18 @@
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
 "ydN-tP-vpt.title" = "Régler :";
 
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = " Lissage chromatique :";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
 "ZR9-YG-pfn.ibShadowedToolTip" = "Paramètres personnalisés de réduction du bruit.\n\nSyntaxe NLMeans : y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nParamètres par défaut NLMeans : y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nSyntaxe HQDN3D : y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nParamètres par défaut HQDN3D : y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "AutresVues";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "AutresVues";
+
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
 "zvZ-ZX-yKE.title" = "Préréglage :";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBPictureHUDController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBPictureHUDController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBPictureViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBPictureViewController.strings Changed

@@ -1,177 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "Autoriser l'upscaling";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "Taille de l'écran :";
+
 /* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
 "1O3-th-4M5.title" = "Off";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
 "1Z0-JT-vst.ibExternalAccessibilityDescription" = "Recadrer en bas";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "1Z0-JT-vst"; */
-"1Z0-JT-vst.ibShadowedToolTip" = "Taille du recadrage de la bordure basse, en pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibShadowedToolTip" = "Quantité de découpe du bord bas en pixels";
+
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
 "2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
 "2s0-5k-fjU.ibExternalAccessibilityDescription" = "Hauteur Stockage";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Keep Aspect Ratio maintains the original display aspect of the source. Disabling this may result in a stretched or squeezed picture."; ObjectID = "6G0-MW-iVa"; */
-"6G0-MW-iVa.ibShadowedToolTip" = "\"Maintien du ratio\" conserve le rapport d'aspect d'affichage de la source. Désactiver cette fonctionnalité peut engendrer une image étirée ou compressée.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "Hauteur Stockage";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "Rapport d’aspect :";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "Bordure haute";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "Taille de la bordure haute en pixels";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "Aucun";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
 "6W6-RI-fBx.ibExternalAccessibilityDescription" = "Recadrer en bas";
 
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "Automatique";
+
 /* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
 "8vS-Mw-bny.title" = "Anamorphique :";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibExternalAccessibilityDescription" = "Largeur Stockage";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "Bordure haute";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "Largeur mise à l'échelle";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "Largeur de la vidéo mise à l'échelle. Représente le nombre de pixels en largeur devant être encodés. La largeur mise à l'échelle peut différer de celle d'affichage en fonction des paramètre anamorphiques et des paramètres de remplissage";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage width. This is the number of pixels wide to be encoded. Storage width may differ from display width depending on anamorphic settings."; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibShadowedToolTip" = "Largeur du stockage vidéo. Représente la largeur à encoder, en nombre de pixels. La Largeur de stockage peut différer de la largeur d'affichage, en fonction de réglages anamorphiques.";
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC SD";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
 "41c-48-2XJ.ibExternalAccessibilityDescription" = "Recadrer en haut";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "41c-48-2XJ"; */
-"41c-48-2XJ.ibShadowedToolTip" = "Taille du recadrage de la bordure haute, en pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibShadowedToolTip" = "Montant du recadrage de la bordure supérieure en pixels";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "Personnaliser la couleur de la bordure";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "Personnaliser la couleur de la bordure";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "Largeur d'affichage";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "Résolution et mise à l'échelle";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "Couleur de la bordure ajoutée autour de la vidéo";
 
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "b3y-yE-sYc"; */
-"b3y-yE-sYc.title" = "Automatique";
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "cNr-IZ-H9j"; */
-"cNr-IZ-H9j.title" = "x";
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "Bordure de droite";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "Montant de la bordure droite en pixels";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "Limite de la résolution :";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
 "Ddg-4D-el9.ibExternalAccessibilityDescription" = "Recadrer à droite";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "Hauteur d'affichage";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "Noir";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "Automatique";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "Horizontal";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "Retournement :";
+
 /* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
 "f12-Dh-fDw.title" = "Personnaliser";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
-"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Largeur Stockage";
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "Aucun";
 
-/* Class = "NSTextFieldCell"; title = "PAR:"; ObjectID = "gVj-RG-PcL"; */
-"gVj-RG-PcL.title" = "PAR :";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "Fait pivoter l'image dans le sens horaire par incréments de 90 degrés";
 
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "haC-cO-jDm"; */
-"haC-cO-jDm.title" = "Recadrage :";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "Hauteur maximale";
 
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "hcF-CZ-p0E"; */
-"hcF-CZ-p0E.title" = "Conserver le ratio d'aspect";
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "La hauteur maximale à laquelle la vidéo sera stockée.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "Utiliser la plus haute résolution autorisée par les paramètres ci-dessus";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "Blanc";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "Taille optimale";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Largeur Stockage";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "Aucun";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
 "Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "Hauteur Stockage";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage height. This is the number of pixels tall to be encoded. Storage height may differ from display height depending on anamorphic settings."; ObjectID = "Hkl-7Z-J2e"; */
-"Hkl-7Z-J2e.ibShadowedToolTip" = "Hauteur de stockage vidéo. C'est le nombre de pixels de hauteur à coder. La hauteur de stockage peut différer de la hauteur d'affichage en fonction des paramètres anamorphiques. ";
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "Hauteur de la vidéo mise à l'échelle. Représente le nombre de pixels en largeur devant être encodés. La hauteur mise à l'échelle peut différer de celle d'affichage en fonction des paramètre anamorphiques et des paramètres de remplissage";
 
 /* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
 "hN1-S9-zl8.title" = "x";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ration Numerator"; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibExternalAccessibilityDescription" = "Numérateur du format d'image en pixels";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "Remplir :";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "Largeur Stockage";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibShadowedToolTip" = "Le format des pixels définit la forme des pixels de stockage ou la mise à l'échelle de la vidéo anamorphique pour créer le format et les dimensions adéquates de l'affichage. La vidéo non anamorphique (1:1 PAR) n'est pas mise à l'échelle pendant la lecture.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "Bordure de gauche";
 
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "jXn-fo-wNU"; */
-"jXn-fo-wNU.title" = "Module :";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "Largeur d'affichage";
 
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "JyN-AK-Hae"; */
-"JyN-AK-Hae.title" = "Auto";
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "Automatique";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "Gris";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "Taille du stockage :";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
 "krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "L7V-2e-qf9"; */
-"L7V-2e-qf9.title" = "Taille du stockage :";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "Bordure de gauche";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "Montant du recadrage de la bordure gauche en pixels";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "Taille mise à l’échelle :";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
 
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "Lbl-i2-YJg"; */
-"Lbl-i2-YJg.title" = "8";
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "Personnaliser";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
 "LTu-ic-Ty9.ibExternalAccessibilityDescription" = "Recadrer à gauche";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "LTu-ic-Ty9"; */
-"LTu-ic-Ty9.ibShadowedToolTip" = "Taille du recadrage de la bordure gauche, en pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "Montant du recadrage de la bordure gauche en pixels";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Width"; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Largeur d'affichage";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Numérateur de l'aspect du pixel";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display width. This is the number of pixels wide your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibShadowedToolTip" = "Largeur d'affichage. Représente la largeur, en nombre de pixels, de votre vidéo dans sa résolution native, et est le résultat d'une mise à l'échelle des dimensions, suivant l'aspect des pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "L'aspect du pixel définit la forme des pixels.\n\nUn rapport de 1:1 définit un pixel carré. D'autres valeurs définissent des formes rectangulaires.\nLes lecteurs mettront l'image à l'échelle afin d'obtenir l'aspect spécifié.";
 
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "MgF-Gw-0fD"; */
-"MgF-Gw-0fD.title" = "4";
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "Rapport d’aspect :";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
 "Mke-9L-LvB.ibExternalAccessibilityDescription" = "Recadrer en haut";
 
-/* Class = "NSView"; ibExternalAccessibilityDescription = "Cropping"; ObjectID = "Mri-4y-8rX"; */
-"Mri-4y-8rX.ibExternalAccessibilityDescription" = "Recadrage";
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "Largeur et hauteur";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Height"; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Hauteur de l'affichage";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Dénominateur de l'aspect du pixel";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display height. This is the number of pixels tall your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibShadowedToolTip" = "Hauteur d'affichage. Représente la hauteur, en nombre de pixels, de votre vidéo dans sa résolution native, et est le résultat d'une mise à l'échelle des dimensions, suivant l'aspect des pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "L'aspect du pixel définit la forme des pixels.\n\nUn rapport de 1:1 définit un pixel carré. D'autres valeurs définissent des formes rectangulaires.\nLes lecteurs mettront l'image à l'échelle afin d'obtenir l'aspect spécifié.";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Ensure storage dimensions are multiples of this value. Higher values are only necessary for compatibility with certain legacy devices. Set to 2 unless you have a specific compatibility concern."; ObjectID = "ns0-ar-I7c"; */
-"ns0-ar-I7c.ibShadowedToolTip" = "Assurez-vous que les dimensions de stockage sont des multiples de cette valeur. Des valeurs plus élevées ne sont pas nécessaires pour que la compatibilité avec certains anciens appareils. Définissez la valeur sur 2 sauf si vous avez un problème de compatibilité spécifique.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "Largeur maximum";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "La largeur maximale à laquelle la vidéo sera stockée.";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
 "ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "OWb-6v-ggg"; */
-"OWb-6v-ggg.title" = "2";
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "Couleur :";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "Personnaliser";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "Hauteur (Letterbox)";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "Gris foncé";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
 "qSV-uB-Iup.title" = "AutresVues";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "v"; ObjectID = "r9l-cH-pFW"; */
-"r9l-cH-pFW.ibExternalAccessibilityDescription" = "v";
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p HD";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "Recadrer à gauche";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "Lorsque cette option est désactivée, les dimensions mises à l'échelle seront limitées aux dimensions sources.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ratio Denominator"; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibExternalAccessibilityDescription" = "Dénominateur du format d'image en pixels";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibShadowedToolTip" = "Le format des pixels définit la forme des pixels de stockage oui la mise à l'échelle de la vidéo anamorphique pour créer le format et les dimensions corrects de l'affichage. La vidéo non anamorphique (1:1 PAR) n'est pas mise à l'échelle pendant la lecture.";
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "Aspect des pixels :";
 
-/* Class = "NSMatrix"; ibShadowedToolTip = "Cropping mode.\n\nAutomatic detects and removes black borders from the video.\n\nCustom allows for manual settings."; ObjectID = "RTr-3u-52l"; */
-"RTr-3u-52l.ibShadowedToolTip" = "Mode de recadrage.\n\n\"Automatique\" détecte et supprime les bordures noires de la vidéo.\n\n\"Personnalisé\" autorise des réglages manuels.";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "S7K-vF-t1n"; */
-"S7K-vF-t1n.title" = "Radio";
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "Modifier la taille de l'écran étirera la vidéo";
 
-/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "SPg-s0-Oh0"; */
-"SPg-s0-Oh0.title" = "Taille de l'écran :";
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
 
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "Uiw-Nb-u5X"; */
-"Uiw-Nb-u5X.title" = "Perte";
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "Dimensions de la source";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "und-OA-MLn"; */
-"und-OA-MLn.title" = "AutresVues";
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "Orientation et recadrage ";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "Bordure de droite";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
 "uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
 
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "uTT-yC-MFJ"; */
-"uTT-yC-MFJ.title" = "16";
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "Dimensions finales";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "Rotation :";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "Comment appliquer le paramètre de recadrage";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "Ajouter une bordure autour de la vidéo";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "Personnaliser";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "L'anamorphisme autorise le stockage arbitraire tout en préservant le rapport d'aspect d'origine lors de la lecture.\n\nAutomatique maximise la résolution de stockage tout en conservant le rapport d'aspect originel. Recommandé.\n\nAucun désactive l'anamorphisme. Les dimensions de stockage vidéo et d'affichage seront identiques. Utiliser uniquement pour assurer la compatibilité avec certains appareils anciens.\n\nPersonnaliser permet l'ajustement manuel de l'ensemble des paramètres. Utile pour corriger un rapport d'affichage source incorrect et pour les professionnels nécessitants un contrôle avancé en post-production.";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "Largeur (Pillarbox)";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "uuL-JR-73C"; */
-"uuL-JR-73C.title" = "x";
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "Taille de l'écran :";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nOff disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nAuto maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nLoose is similar to Auto, but attempts to preserve the storage aspect ratio. This can result in a slight storage resolution loss compared to Auto.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
-"w1f-3S-up0.ibShadowedToolTip" = "\"Anamorphique\" permet des dimensions arbitraires tout en préservant l'aspect originel durant la lecture.\n\n\"Off\" désactive l'anamorphisme. Les dimensions de la vidéo stockée et celles de la vidéo à afficher seront identiques. Utile seulement pour la compatibilité avec des anciens appareils.\n\n\"Auto\" maximise la résolution de stockage, en préservant le rapport d'aspect d'origine. Recommandé.\n\n\"Perte\" est similaire à \"Auto\" mais tente de conserver le rapport d'aspect au stockage. Ceci peut provoquer une perte de résolution de stockage, par rapport au mode \"Auto\".\n\n\"Personnalisé\" permet de personnaliser manuellement tous les réglages. Utile pour corriger un rapport d'aspect erroné ou pour les professionnels nécessitant des contrôles avancés en post-production.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "Bordure du bas";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "Montant du recadrage de la bordure inférieure en pixels";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
 "wsq-TS-cC6.ibExternalAccessibilityDescription" = "Recadrer à droite";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "wsq-TS-cC6"; */
-"wsq-TS-cC6.ibShadowedToolTip" = "Taille du recadrage de la bordure droite, en pixels.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "Montant du recadrage de la bordure droite en pixels";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
 "x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "zmf-MM-j1I"; */
-"zmf-MM-j1I.title" = "Personnalisé :";
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p HD";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "Retourne (miroir) l'image selon l'axe horizontal";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "Personnaliser";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL SD";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "Bordures";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "Recadrage :";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "Bordure du bas";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "Taille du stockage :";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBPlayerHUDController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBPlayerHUDController.strings Changed

@@ -17,7 +17,7 @@
 "CQ0-pk-SFk.ibShadowedToolTip" = "Aller à la fin";
 
 /* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "dGi-LK-P1E"; */
-"dGi-LK-P1E.title" = "00:00:00\n";
+"dGi-LK-P1E.title" = "00:00:00";
 
 /* Class = "NSButton"; ibExternalAccessibilityDescription = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
 "euL-Tg-dmT.ibExternalAccessibilityDescription" = "Couper le son";
@@ -29,7 +29,7 @@
 "gzA-no-jdv.ibExternalAccessibilityDescription" = "Contrôler le volume";
 
 /* Class = "NSSlider"; ibShadowedToolTip = "Drag to change volume."; ObjectID = "gzA-no-jdv"; */
-"gzA-no-jdv.ibShadowedToolTip" = "Glisser pour modifier le volume";
+"gzA-no-jdv.ibShadowedToolTip" = "Glisser pour modifier le volume.";
 
 /* Class = "NSButton"; ibExternalAccessibilityDescription = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
 "Kiv-cL-wYI.ibExternalAccessibilityDescription" = "Volume maximum";
@@ -59,7 +59,7 @@
 "uYx-2C-8et.ibExternalAccessibilityDescription" = "Position actuelle dans la chronologie";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Current timeline position."; ObjectID = "uYx-2C-8et"; */
-"uYx-2C-8et.ibShadowedToolTip" = "Position actuelle dans la chronologie";
+"uYx-2C-8et.ibShadowedToolTip" = "Position actuelle dans la chronologie.";
 
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Tracks Selection"; ObjectID = "Vj1-Za-AUV"; */
 "Vj1-Za-AUV.ibExternalAccessibilityDescription" = "Sélection des pistes";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBQueueInfoViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBQueueInfoViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBQueueTableViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBQueueTableViewController.strings Changed

@@ -5,10 +5,10 @@
 "5Rl-P0-bhc.title" = "Cellule Vue Table";
 
 /* Class = "NSMenuItem"; title = "Show Destination in Finder"; ObjectID = "c1Z-ZC-b8b"; */
-"c1Z-ZC-b8b.title" = "Afficher la destination dans Finder";
+"c1Z-ZC-b8b.title" = "Afficher la destination dans le Finder";
 
 /* Class = "NSMenuItem"; title = "Edit"; ObjectID = "DTF-om-j0l"; */
-"DTF-om-j0l.title" = "Édition";
+"DTF-om-j0l.title" = "Modifier";
 
 /* Class = "NSTextFieldCell"; title = "Encoding status"; ObjectID = "eEU-Dr-Qh8"; */
 "eEU-Dr-Qh8.title" = "État de l'encodage";
@@ -19,9 +19,15 @@
 /* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "gNj-D1-wa7"; */
 "gNj-D1-wa7.title" = "Supprimer les tâches terminées";
 
+/* Class = "NSMenuItem"; title = "Move to Bottom"; ObjectID = "HwR-LP-IK8"; */
+"HwR-LP-IK8.title" = "Déplacer vers le bas";
+
 /* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "K6c-HW-um8"; */
 "K6c-HW-um8.title" = "Cellule de texte";
 
+/* Class = "NSMenuItem"; title = "Move to Top"; ObjectID = "NN5-Yq-Cth"; */
+"NN5-Yq-Cth.title" = "Déplacer vers le haut";
+
 /* Class = "NSMenuItem"; title = "Show Source in Finder"; ObjectID = "Pps-jm-zcd"; */
 "Pps-jm-zcd.title" = "Montrer l'emplacement du fichier source dans le Finder";
 
@@ -32,5 +38,5 @@
 "xSd-Hl-5Qk.title" = "Cellule Vue Table";
 
 /* Class = "NSMenuItem"; title = "Show Activity Log in Finder"; ObjectID = "zA7-r8-i4L"; */
-"zA7-r8-i4L.title" = "Afficher le journal d'activité dans Finder";
+"zA7-r8-i4L.title" = "Afficher le journal d'activité dans le Finder";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBSummaryViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBSummaryViewController.strings Changed

@@ -7,21 +7,33 @@
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
 "BHq-Mt-3eA.ibExternalAccessibilityDescription" = "Résumé des filtres";
 
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "Métadonnées communes passthru";
+
 /* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
 "De0-Je-MAm.title" = "Aligner le début Audio/Vidéo";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "Copier les métadonnées de la source vers la sortie";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
 "fPv-Vw-I89.ibShadowedToolTip" = "Aligne les horodateurs de tous les flux audio et vidéo en insérant des images vides ou en supprimant des images. Peut améliorer la synchronisation audio/vidéo pour les lecteurs cassés qui ne respectent pas les listes de montage MP4.";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
 "Jaw-pH-rhf.ibExternalAccessibilityDescription" = "Taille du résumé";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "Optimiser MP4 pour le téléchargement progressif. Après le codage, les données sont réorganisées et réécrites pour permettre une lecture immédiate sur un réseau, sans avoir à télécharger le fichier entier.";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
 "lUi-Oc-208.ibShadowedToolTip" = "Optimiser MP4 pour le téléchargement progressif. Après le codage, les données sont réorganisées et réécrites pour permettre une lecture immédiate sur un réseau, sans avoir à télécharger le fichier entier.";
 
 /* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
 "m5a-0z-QQ4.ibExternalAccessibilityDescription" = "Aperçu";
 
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Optimisé pour le Web";
+
 /* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
 "OCw-f6-uA0.title" = "Filtres :";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBTitleSelection.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBTitleSelection.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/HBTrackTitleViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/HBTrackTitleViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Localizable.strings Changed

@@ -1,5 +1,8 @@
+/* Job statistics */
+" (%@ %% of the source file)" = " (%@ %% du fichier source)";
+
 /* Preview -> size info label */
-" Scaled To Screen" = "À l'échelle de l'écran";
+" Scaled To Screen" = " À l'échelle de l'écran";
 
 /* No comment provided by engineer. */
 "- --:--" = "- --:--";
@@ -16,14 +19,38 @@
 /* Main Window -> preset modified */
 "(Modified)" = "(Modifié)";
 
+/* Job statistics */
+"%@ fps" = "%@ ips";
+
 /* Queue status */
-"%d encode pending" = "%d tâche en attente";
+"%lu encode pending" = "%lu encodage en attente";
 
 /* Queue status */
-"%d encodes pending" = "%d tâches en attente";
+"%lu encodes pending" = "%lu encodages en attente";
 
 /* No comment provided by engineer. */
-"%llu jobs selected" = "%llu tâches sélectionnées";
+"%lu jobs selected" = "%lu tâches sélectionnées";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p HD";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p HD";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K Ultra HD";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K Ultra HD";
 
 /* Destination same as source alert -> message
    File already exists alert -> message */
@@ -33,10 +60,10 @@
 "Actual Scale" = "Échelle réelle";
 
 /* Queue undo action name */
-"Add Job To Queue" = "Ajouter un fichier à la file d'attente";
+"Add Job To Queue" = "Ajouter une tâche à la file d'attente";
 
 /* Queue undo action name */
-"Add Jobs To Queue" = "Ajouter des fichiers à la file d'attente";
+"Add Jobs To Queue" = "Ajouter des tâches à la file d'attente";
 
 /* Touch bar */
 "Add Preset" = "Ajouter un préréglage";
@@ -50,11 +77,17 @@
 /* Preferences Advanced Toolbar Item */
 "Advanced" = "Avancé";
 
+/* HBLanguage -> Any language */
+"Any" = "Tout";
+
 /* Delete preset alert -> message */
 "Are you sure you want to permanently delete the selected preset?" = "Êtes-vous sûr de vouloir supprimer définitivement le préréglage sélectionné ?";
 
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected presets?" = "Êtes-vous sûr de vouloir supprimer définitivement les préréglages sélectionnés ?";
+
 /* Quit Alert -> message */
-"Are you sure you want to quit HandBrake?" = "Êtes-vous sûr(e) de vouloir quitter HandBrake ?";
+"Are you sure you want to quit HandBrake?" = "Êtes-vous sûr(e) de vouloir quitter HandBrake ?";
 
 /* Copy Protection Alert -> first button */
 "Attempt Scan Anyway" = "Tenter quand même la numérisation";
@@ -62,6 +95,9 @@
 /* Player HUD -> audio menu */
 "Audio" = "Audio";
 
+/* Job statistics */
+"Average speed:" = "Vitesse moyenne :";
+
 /* Copy Protection Alert -> second button
    Delete preset alert -> second button
    File already exists alert -> first button
@@ -110,6 +146,9 @@
 /* Delete preset alert -> first button */
 "Delete Preset" = "Effacer le préréglage";
 
+/* Delete preset alert -> first button */
+"Delete Presets" = "Supprimer les préréglages";
+
 /* File already exists alert -> informative text
    File already exists in queue alert -> informative text */
 "Do you want to overwrite %@?" = "Voulez-vous remplacer %@ ?";
@@ -123,9 +162,6 @@
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode canceled" = "Encodage interrompu";
 
-/* Queue status */
-"Encode Canceled." = "Encodage interrompu.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode complete" = "Encodage terminé";
 
@@ -133,12 +169,6 @@
    Queue done notification failed message */
 "Encode failed" = "Échec de l'encodage";
 
-/* Queue status */
-"Encode Failed." = "Échec de l'encodage";
-
-/* Queue status */
-"Encode Finished." = "Encodage terminé.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode ready" = "Prêt à encoder";
 
@@ -146,10 +176,16 @@
 "Encode working" = "Encodage en cours";
 
 /* No comment provided by engineer. */
-"Encoding %@\n%@" = "Encodage %1$@\n%2$@";
+"Encoding %lu Jobs" = "Encodage de %lu tâches";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "Encodage de la tâche : %@";
 
 /* Job statistics */
-"Ended at:" = "Fini à : ";
+"Ended at:" = "Fini à :";
+
+/* Export presets save panel title */
+"Export preset" = "Exporter préréglage";
 
 /* Export presets save panel title */
 "Export presets" = "Exporter les préréglages";
@@ -164,7 +200,7 @@
 "HandBrake" = "HandBrake";
 
 /* Preview -> live preview alert message */
-"HandBrake can't open the preview." = "HandBrake ne peut pas ouvrir l'aperçu";
+"HandBrake can't open the preview." = "HandBrake ne peut pas ouvrir l'aperçu.";
 
 /* Preview -> live preview alert informative text */
 "HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?" = "HandBrake ne peut pas lire cette combinaison de format video/audio/conteneur. Voulez-vous l'ouvrir dans un lecteur externe ?";
@@ -194,6 +230,9 @@
 /* Queue undo action name */
 "Move Jobs in Queue" = "Déplacer les tâches dans la file d'attente";
 
+/* Queue status */
+"No encode pending" = "Aucun encodage en cours";
+
 /* Preview -> accessibility label */
 "No image" = "Pas d'image";
 
@@ -201,6 +240,9 @@
 "No job selected" = "Aucune tâche sélectionnée";
 
 /* Main Window -> Info text */
+"No Valid Preset" = "Pas de préréglage valide";
+
+/* Main Window -> Info text */
 "No Valid Source Found" = "Aucune source valide trouvée";
 
 /* Add preset window -> picture setting */
@@ -236,7 +278,7 @@
 "Pause/Resume Encoding" = "Mettre en pause/Reprendre l'encodage";
 
 /* Job statistics */
-"Paused time:" = "Temps de pause :";
+"Paused time:" = "Temps de pause :";
 
 /* Video -> Framerate */
 "Peak Framerate (VFR)" = "Fréquence de pointe (VFR)";
@@ -272,7 +314,7 @@
 
 /* Queue done alert message
    Queue notification alert message */
-"Put down that cocktail…" = "Reposez ce cocktail...";
+"Put down that cocktail…" = "Reposez ce cocktail…";
 
 /* Preferences -> Output Name Token */
 "Quality/Bitrate" = "Qualité/Débit";
@@ -298,6 +340,9 @@
 /* Queue undo action name */
 "Remove Jobs From Queue" = "Supprimer les tâches de la file d'attente";
 
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "Nouveau scan pour modification";
+
 /* Toolbar Pause Item */
 "Resume" = "Reprendre";
 
@@ -306,10 +351,13 @@
 "Resume Encoding" = "Reprendre l'encodage";
 
 /* HBQueueItemView -> Reveal button accessibility label */
-"Reveal destination in Finder" = "Révéler la destination dans Finder";
+"Reveal destination in Finder" = "Révéler la destination dans le Finder";
 
 /* Job statistics */
-"Run time:" = "Temps d'exécution :";
+"Run time:" = "Temps d'exécution :";
+
+/* Export presets panel prompt */
+"Save" = "Enregistrer";
 
 /* Picture HUD -> scale button
    Touch bar */
@@ -337,7 +385,7 @@
 "Size:" = "Taille :";
 
 /* Queue Alert -> cancel rip second button */
-"Skip Current Job" = "Ignorer le travail en cours";
+"Skip Current Job" = "Ignorer la tâche en cours";
 
 /* Touch bar */
 "Slider" = "Curseur";
@@ -345,9 +393,6 @@
 /* Preferences -> Output Name Token */
 "Source" = "Source";
 
-/* Add preset window -> picture setting */
-"Source Maximum" = "Maximum de la source";
-
 /* Toolbar Start/Stop Item */
 "Start" = "Démarrer";
 
@@ -363,13 +408,17 @@
 "Start/Stop Encoding" = "Démarrer/Arrêter l'encodage";
 
 /* Job statistics */
-"Started at:" = "Commencé à :";
+"Started at:" = "Commencé à :";
 
-/* Toolbar Start/Stop Item */
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
 "Stop" = "Arrêter";
 
+/* Queue -> Stop action */
+"Stop action." = "Arrêter l'action en cours.";
+
 /* Queue Alert -> cancel rip third button */
-"Stop After Current Job" = "Arrêter après l'encodage actuel";
+"Stop After Current Job" = "Arrêter après la tâche actuelle";
 
 /* Queue Alert -> cancel rip fourth button */
 "Stop All" = "Tout arrêter";
@@ -403,7 +452,7 @@
 "The CSV file is not a valid chapters CSV file." = "Ce fichier CSV n'est pas un fichier de chapitres valide.";
 
 /* Destination same as source alert -> informative text */
-"The destination is the same as the source, you can not overwrite your source file!" = "La destination est la même que celle de votre fichier source, vous ne pouvez pas écraser votre fichier source ! ";
+"The destination is the same as the source, you can not overwrite your source file!" = "La destination est la même que celle de votre fichier source, vous ne pouvez pas écraser votre fichier source !";
 
 /* Chapters import -> invalid CSV line count recovery suggestion */
 "The line count in the chapters CSV file does not match the number of chapters in the movie." = "Le nombre de lignes du fichier CSV des chapitres ne correspond pas au nombre de chapitres pour ce film.";
@@ -412,14 +461,8 @@
    Rename preset window -> name alert message */
 "The preset name cannot be empty." = "Le nom du préréglage ne peut être vide.";
 
-/* Queue -> Multiple instances alert informative text */
-"The queue will be shared between the instances." = "La file d'attente sera partagée entre les instances.";
-
 /* File already exists in queue alert -> message */
-"There is already a queue item for this destination." = "Il existe déjà un élément dans la file d'attente pour cette destination. ";
-
-/* Queue -> Multiple instances alert message */
-"There is already an instance of HandBrake running." = "Il y a déjà une instance d'HandBrake lancée.";
+"There is already a queue item for this destination." = "Il existe déjà un élément dans la file d'attente pour cette destination.";
 
 /* Invalid destination alert -> informative text */
 "This is not a valid destination directory!" = "Le dossier de destination n'est pas valide !";
@@ -439,6 +482,9 @@
 /* Invalid destination alert -> message */
 "Warning!" = "Attention !";
 
+/* No comment provided by engineer. */
+"Working" = "Travail en cours";
+
 /* Queue Alert -> cancel rip message */
 "You are currently encoding. What would you like to do?" = "Un encodage est en cours. Que voulez-vous faire ?";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/MainMenu.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/MainMenu.strings Changed

@@ -1,8 +1,8 @@
 /* Class = "NSMenu"; title = "Services"; ObjectID = "0te-ai-fgD"; */
 "0te-ai-fgD.title" = "Services";
 
-/* Class = "NSMenuItem"; title = "Rename Preset…"; ObjectID = "1GQ-n3-jfY"; */
-"1GQ-n3-jfY.title" = "Renommer le préréglage…";
+/* Class = "NSMenuItem"; title = "Rename…"; ObjectID = "1GQ-n3-jfY"; */
+"1GQ-n3-jfY.title" = "Renommer…";
 
 /* Class = "NSMenuItem"; title = "Filters"; ObjectID = "6rE-SM-AGi"; */
 "6rE-SM-AGi.title" = "Filtres";
@@ -113,7 +113,7 @@
 "1811.title" = "Orthographe";
 
 /* Class = "NSMenuItem"; title = "Spelling…"; ObjectID = "1812"; */
-"1812.title" = "Orthographe...";
+"1812.title" = "Orthographe…";
 
 /* Class = "NSMenuItem"; title = "Check Spelling"; ObjectID = "1813"; */
 "1813.title" = "Vérifier l'orthographe";
@@ -158,7 +158,7 @@
 "1950.title" = "Réinitialiser les préréglages officiels";
 
 /* Class = "NSMenuItem"; title = "New Preset…"; ObjectID = "1955"; */
-"1955.title" = "Nouveau préréglage";
+"1955.title" = "Nouveau préréglage…";
 
 /* Class = "NSMenuItem"; title = "Online Documentation"; ObjectID = "1985"; */
 "1985.title" = "Documentation en ligne";
@@ -169,8 +169,8 @@
 /* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "2368"; */
 "2368.title" = "HandBrake";
 
-/* Class = "NSMenuItem"; title = "Select Default Preset"; ObjectID = "2421"; */
-"2421.title" = "Sélectionner comme préréglage par défaut";
+/* Class = "NSMenuItem"; title = "Select Default"; ObjectID = "2421"; */
+"2421.title" = "Sélectionner la valeur par défaut";
 
 /* Class = "NSMenuItem"; title = "Add To Queue"; ObjectID = "2443"; */
 "2443.title" = "Ajouter à la file d'attente";
@@ -208,8 +208,8 @@
 /* Class = "NSMenuItem"; title = "Audio"; ObjectID = "brQ-mu-8JM"; */
 "brQ-mu-8JM.title" = "Audio";
 
-/* Class = "NSMenuItem"; title = "Delete Preset"; ObjectID = "CN3-Rh-gVf"; */
-"CN3-Rh-gVf.title" = "Supprimer le préréglage";
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "CN3-Rh-gVf"; */
+"CN3-Rh-gVf.title" = "Effacer";
 
 /* Class = "NSMenuItem"; title = "Subtitles"; ObjectID = "Csx-2S-iUe"; */
 "Csx-2S-iUe.title" = "Sous-titres";
@@ -217,8 +217,8 @@
 /* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "fNa-z2-K1i"; */
 "fNa-z2-K1i.title" = "Ouvrir un élément récent";
 
-/* Class = "NSMenuItem"; title = "Make Default Preset"; ObjectID = "frQ-v5-pRa"; */
-"frQ-v5-pRa.title" = "Sélectionner comme préréglage par défaut";
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "frQ-v5-pRa"; */
+"frQ-v5-pRa.title" = "Rendre par défaut";
 
 /* Class = "NSMenuItem"; title = "View"; ObjectID = "Hzp-jb-hme"; */
 "Hzp-jb-hme.title" = "Présentation";
@@ -232,6 +232,9 @@
 /* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "KKV-n0-Fmr"; */
 "KKV-n0-Fmr.title" = "Personnaliser la barre d'outils…";
 
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "lab-Ly-3p3"; */
+"lab-Ly-3p3.title" = "Enregistrer";
+
 /* Class = "NSMenuItem"; title = "Chapters"; ObjectID = "lCU-PH-gal"; */
 "lCU-PH-gal.title" = "Chapitres";
 
@@ -250,12 +253,18 @@
 /* Class = "NSMenu"; title = "Open Recent"; ObjectID = "ukX-HN-SXk"; */
 "ukX-HN-SXk.title" = "Ouvrir un élément récent";
 
+/* Class = "NSMenuItem"; title = "Switch to Next Title"; ObjectID = "viv-aA-SoB"; */
+"viv-aA-SoB.title" = "Passer au titre suivant";
+
 /* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "wPw-Uj-Gxi"; */
 "wPw-Uj-Gxi.title" = "Effacer le menu";
 
-/* Class = "NSMenuItem"; title = "New Category"; ObjectID = "wvb-60-cWL"; */
-"wvb-60-cWL.title" = "Nouvelle Catégorie";
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "wvb-60-cWL"; */
+"wvb-60-cWL.title" = "Nouvelle catégorie…";
 
 /* Class = "NSMenuItem"; title = "Services"; ObjectID = "XcG-Aw-Gdb"; */
 "XcG-Aw-Gdb.title" = "Services";
 
+/* Class = "NSMenuItem"; title = "Switch to Previous Title"; ObjectID = "zgj-Iv-4xJ"; */
+"zgj-Iv-4xJ.title" = "Passer au titre précédent";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/MainWindow.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/MainWindow.strings Changed

@@ -2,14 +2,14 @@
 "0UB-bG-kwS.label" = "Filtres";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
-"2vD-zN-YMe.ibShadowedToolTip" = "Sauvegarder le nouveau préréglage";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "3Gk-ma-r2w"; */
-"3Gk-ma-r2w.ibShadowedIsNilPlaceholder" = "";
+"2vD-zN-YMe.ibShadowedToolTip" = "Sauvegarder le nouveau préréglage…";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
 "3w9-Iu-3u2.ibShadowedToolTip" = "Titre à scanner.";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "Ajouter à la file d'attente";
+
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
 "6E4-AG-PEh.title" = "0";
 
@@ -25,18 +25,6 @@
 /* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
 "21.title" = "HandBrake";
 
-/* Class = "NSToolbarItem"; label = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.label" = "Ajouter les titres à la file d'attente";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.paletteLabel" = "Ajouter les titres à la file d'attente";
-
-/* Class = "NSToolbarItem"; toolTip = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.toolTip" = "Ajouter les titres à la file d'attente";
-
-/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "046-kc-MnL"; */
-"046-kc-MnL.title" = "Ajouter les titres à la file d'attente…";
-
 /* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
 "1475.label" = "Audio";
 
@@ -77,7 +65,7 @@
 "1554.ibExternalAccessibilityDescription" = "Durée";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Duration of the selected source range in Hours:Minutes:Seconds."; ObjectID = "1554"; */
-"1554.ibShadowedToolTip" = "Durée de la source sélectionnée au format Heures:Minutes:Secondes";
+"1554.ibShadowedToolTip" = "Durée de la source sélectionnée au format Heures:Minutes:Secondes.";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Output filename"; ObjectID = "1561"; */
 "1561.ibExternalAccessibilityDescription" = "Nom de fichier de la sortie";
@@ -94,8 +82,8 @@
 /* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
 "1989.label" = "Chapitres";
 
-/* Class = "NSTextFieldCell"; title = "DO NOT TRANSLATE THIS NIB FILE"; ObjectID = "4846"; */
-"4846.title" = "DO NOT TRANSLATE↵THIS NIB FILE";
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "Encodage de la tâche 1 : Test.mp4";
 
 /* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
 "4905.title" = "Source :";
@@ -166,9 +154,15 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
 "5523.ibShadowedToolTip" = "Dernière image à encoder.";
 
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "Ajouter tous les titres à la file d'attente";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
 "AhR-pK-Oz4.ibShadowedToolTip" = "Recharger les réglages par défaut pour le préréglage en cours. Toute modification sera perdue.";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
 "BA0-eg-2Ka.label" = "Résumé";
 
@@ -202,15 +196,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
 "DN4-48-aOI.ibShadowedToolTip" = "Scanner uniquement les titres spécifiés parmi tous les titres.";
 
-/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.label" = "Ajouter à la file d'attente";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.paletteLabel" = "Ajouter à la file d'attente";
-
-/* Class = "NSToolbarItem"; toolTip = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.toolTip" = "Ajouter à la file d'attente";
-
 /* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
 "eij-Sn-QmJ.label" = "Dimensions";
 
@@ -226,17 +211,20 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
 "HCx-ku-nF7.toolTip" = "Afficher la fenêtre de la file d'attente";
 
-/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "INL-y9-Gwp"; */
-"INL-y9-Gwp.title" = "Ajouter tous les titres à la file d'attente";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
 
 /* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
-"IOU-3L-nvB.title" = "Sauvegarder le nouveau préréglage";
+"IOU-3L-nvB.title" = "Sauvegarder le nouveau préréglage…";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "Ajouter les titres à la file d'attente…";
 
 /* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
 "IxV-PW-oYh.title" = "Plage :";
 
-/* Class = "NSMenuItem"; title = "Add Title To Queue"; ObjectID = "L8z-c6-E1u"; */
-"L8z-c6-E1u.title" = "Ajouter le titre à la file d'attente";
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "Progression";
 
 /* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
 "OYP-3T-FnA.title" = "Préréglage sélectionné";
@@ -262,9 +250,18 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
 "qhv-9l-2FH.toolTip" = "Montrer la liste des préréglages";
 
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "Ajouter à la file d'attente";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "Ajouter à la file d'attente";
+
 /* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
 "rfK-nQ-Aq2.title" = "Vers :";
 
+/* Class = "NSMenuItem"; title = "Reveal in Finder"; ObjectID = "rK6-EB-N9Z"; */
+"rK6-EB-N9Z.title" = "Afficher dans le Finder ";
+
 /* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.label" = "Pause";
 
@@ -274,3 +271,6 @@
 /* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.toolTip" = "Mettre en pause l'encodage";
 
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "Boîte";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Preferences.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Preferences.strings Changed

@@ -35,7 +35,7 @@
 "351.title" = "Journaux d'activité :";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "352"; */
-"352.ibShadowedToolTip" = "Nombre de prévisualisations d'images à numériser. Des valeurs plus élevées peuvent augmenter la précision du recadrage automatique aux dépens du temps de balayage du titre. ";
+"352.ibShadowedToolTip" = "Nombre de prévisualisations d'images à numériser. Des valeurs plus élevées peuvent augmenter la précision du recadrage automatique aux dépens du temps de balayage du titre.";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "354"; */
 "354.title" = "AutresVues";
@@ -50,7 +50,7 @@
 "357.title" = "20";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "359"; */
-"359.ibShadowedToolTip" = "Nombre de prévisualisations d'images à numériser. Des valeurs plus élevées peuvent augmenter la précision du recadrage automatique aux dépens du temps de balayage du titre. ";
+"359.ibShadowedToolTip" = "Nombre de prévisualisations d'images à numériser. Des valeurs plus élevées peuvent augmenter la précision du recadrage automatique aux dépens du temps de balayage du titre.";
 
 /* Class = "NSTextFieldCell"; title = "Number of picture previews to scan:"; ObjectID = "360"; */
 "360.title" = "Nombre d'aperçu d'images à lire :";
@@ -83,7 +83,7 @@
 "372.title" = "Niveau de verbosité :";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "387"; */
-"387.ibShadowedToolTip" = "Détermine la granularité du contrôle qualité constant de x264. Des valeurs plus petites permettent des incréments de qualité plus fins. ";
+"387.ibShadowedToolTip" = "Détermine la granularité du contrôle qualité constant de x264. Des valeurs plus petites permettent des incréments de qualité plus fins.";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "389"; */
 "389.title" = "AutresVues";
@@ -101,7 +101,7 @@
 "394.title" = "1.0";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "395"; */
-"395.ibShadowedToolTip" = "Détermine la granularité du contrôle qualité constant de x264. Des valeurs plus petites permettent des incréments de qualité plus fins. ";
+"395.ibShadowedToolTip" = "Détermine la granularité du contrôle qualité constant de x264. Des valeurs plus petites permettent des incréments de qualité plus fins.";
 
 /* Class = "NSTextFieldCell"; title = "Constant Quality fractional granularity:"; ObjectID = "396"; */
 "396.title" = "Granularité fractionnelle constant de la qualité :";
@@ -112,9 +112,6 @@
 /* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
 "399.title" = "Utiliser libdvdnav (au lieu de libdvdread)";
 
-/* Class = "NSTextFieldCell"; title = "DVD Reader:"; ObjectID = "443"; */
-"443.title" = "Lecteur DVD :";
-
 /* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
 "449.title" = "Aucune";
 
@@ -187,11 +184,11 @@
 /* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
 "BPU-E2-N8l.title" = "Toujours effacer les éléments terminés après la fin de l'encodage";
 
-/* Class = "NSTextFieldCell"; title = "Title Scan:"; ObjectID = "c0L-TU-WML"; */
-"c0L-TU-WML.title" = "Scan du titre :";
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "Scan :";
 
 /* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
-"cqp-xU-GOe.title" = "Encodeur :";
+"cqp-xU-GOe.title" = "Encodeur :";
 
 /* Class = "NSTextFieldCell"; title = "Drag labels to Format to compose a naming format."; ObjectID = "dQ6-Dh-9sD"; */
 "dQ6-Dh-9sD.title" = "Glisser les labels vers Format pour composer un format de nommage.";
@@ -209,14 +206,32 @@
 "ggR-Zs-P8G.title" = "Changer la casse pour la casse de titre";
 
 /* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
-"GQJ-go-PoN.title" = "Résumé : ";
+"GQJ-go-PoN.title" = "Résumé :";
+
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "Nombre d'encodages simultanés :";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
 
 /* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
 "klQ-DW-Kc6.title" = "secondes";
 
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "Conserver les préréglages personnalisés lors de la sélection d'un nouveau titre";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
 /* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
 "lgn-RF-k0d.title" = "Nettoyer les anciens journaux du journal d'activité principal après 30 jours";
 
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "Des valeurs plus élevées pourraient aider à tirer pleinement parti du processeur si une seule tâche ne permet pas d'utiliser tous les cœurs du processeur. ";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
 "PaR-zw-opS.ibShadowedToolTip" = "Espace libre minimum sur le disque destinataire.";
 
@@ -226,15 +241,24 @@
 /* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
 "Tk3-Ig-fFI.ibShadowedToolTip" = "Faites glisser les étiquettes dans le champ Format pour composer un format de dénomination.";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "AutresVues";
+
 /* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
 "Uxv-oN-c1r.title" = "Rétablir à \"Ne rien faire\" au démarrage";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "Préréglage :";
+
 /* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
 "wo5-iR-2mb.title" = "Retirer la ponctuation";
 
 /* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
 "yG9-mz-tqQ.title" = "Mettre en pause la file d'attente si l'espace disque est inférieur à :";
 
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
+
 /* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
 "Zqz-Kn-xOS.title" = "Afficher le panneau d'ouverture de source";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Presets.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Presets.strings Changed

@@ -1,11 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
-"4tC-UE-40G.title" = "Cellule de texte";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "Créer un nouveau préréglage personnalisé à partir des paramètres sélectionnés.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Delete Preset"; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibExternalAccessibilityDescription" = "Effacer le préréglage";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "Effacer le préréglage sélectionné.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Delete the selected preset."; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibShadowedToolTip" = "Effacer le préréglage sélectionné.";
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "Cellule de texte";
 
 /* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
 "cm5-Kl-dB3.title" = "Réinitialiser les préréglages officiels";
@@ -16,12 +16,6 @@
 /* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
 "Io0-Vm-Qez.title" = "Nouvelle Catégorie";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "New Preset"; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibExternalAccessibilityDescription" = "Nouveau préréglage";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Create a new custom preset based on the currently selected settings."; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibShadowedToolTip" = "Créer un nouveau préréglage personnalisé à partir des paramètres sélectionnés.";
-
 /* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
 "LQk-kD-5sj.title" = "Menu préréglage des actions";
 
@@ -29,7 +23,7 @@
 "LUl-ag-Iu6.title" = "Importer…";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "oBC-Nh-TwB"; */
-"oBC-Nh-TwB.title" = "Vue des cellules du tableau ";
+"oBC-Nh-TwB.title" = "Vue des cellules du tableau";
 
 /* Class = "NSTextFieldCell"; title = "Presets"; ObjectID = "r4V-6L-SO8"; */
 "r4V-6L-SO8.title" = "Préréglages";
@@ -47,5 +41,5 @@
 "Ybq-Zt-sta.ibExternalAccessibilityDescription" = "Options additionnelles";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Show additional options."; ObjectID = "Ybq-Zt-sta"; */
-"Ybq-Zt-sta.ibShadowedToolTip" = "Afficher les options additionnelles";
+"Ybq-Zt-sta.ibShadowedToolTip" = "Afficher les options additionnelles.";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Queue.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Queue.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Subtitles.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Subtitles.strings Changed

@@ -92,7 +92,7 @@
 "mdO-Qu-3Pb.ibExternalAccessibilityDescription" = "Défaut";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Default flag. Mark the selected subtitles track as the default to be displayed on playback."; ObjectID = "mdO-Qu-3Pb"; */
-"mdO-Qu-3Pb.ibShadowedToolTip" = "Drapeau par défaut. Marque la piste de sous-titres sélectionnée comme la piste par défaut à afficher lors de la lecture. ";
+"mdO-Qu-3Pb.ibShadowedToolTip" = "Drapeau par défaut. Marque la piste de sous-titres sélectionnée comme la piste par défaut à afficher lors de la lecture.";
 
 /* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "mVi-zH-KUq"; */
 "mVi-zH-KUq.title" = "Supprimer toutes les pistes";
@@ -170,5 +170,5 @@
 "zpm-9Z-Hsq.ibExternalAccessibilityDescription" = "Incrustés";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Burned In. Make the selected subtitles permanent by overlaying them onto the video track."; ObjectID = "zpm-9Z-Hsq"; */
-"zpm-9Z-Hsq.ibShadowedToolTip" = "Incrustés. Rendez les sous-titres sélectionnés permanents en les superposant à la piste vidéo. ";
+"zpm-9Z-Hsq.ibShadowedToolTip" = "Incrustés. Rendez les sous-titres sélectionnés permanents en les superposant à la piste vidéo.";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/SubtitlesDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/SubtitlesDefaults.strings Changed

@@ -29,7 +29,7 @@
 "ej8-4k-1vd.title" = "Aucune";
 
 /* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
-"GbM-vm-RC2.title" = "Suivre le comportement de la sélection : ";
+"GbM-vm-RC2.title" = "Suivre le comportement de la sélection :";
 
 /* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
 "GZP-q7-SYy.title" = "Toutes les langues sélectionnées";
@@ -70,26 +70,17 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
 "OOC-GZ-OFA.ibShadowedToolTip" = "\"Recherche langue étrangère\" scanne la source à la recherche d'éventuelles courtes séquences audio en langue étrangère ou inconnue, qui seront affichées par défaut.";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Tout afficher";
-
 /* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
 "Px8-G6-NVX.ibShadowedToolTip" = "Incruste la première piste de sous-titre Blu-ray sélectionnée. Toutes les autres pistes de sous-titres Blu-ray seront rejetées. Utilisez cette option si votre logiciel ou appareil de lecture ne supporte pas les sous-titres Blu-ray.\n\nIl n'est possible d'incruster qu'une seule piste de sous-titres.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all subtitles languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Afficher toutes les langues des sous-titres";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all subtitles languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Afficher tous les langages de sous-titres dans la liste \"Langues\".";
-
 /* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
 "QRd-XH-6TH.title" = "Piste de sous-titres audio étrangers";
 
 /* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "qVQ-fS-w1S"; */
-"qVQ-fS-w1S.title" = "Vue des cellules du tableau ";
+"qVQ-fS-w1S.title" = "Vue des cellules du tableau";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Add Closed Caption subtitles as a soft subtitle track (not burned-in)."; ObjectID = "uF5-6E-EIe"; */
-"uF5-6E-EIe.ibShadowedToolTip" = "Ajoutez des sous-titres codés en tant que piste de sous-titres souples (non intégrés). ";
+"uF5-6E-EIe.ibShadowedToolTip" = "Ajoutez des sous-titres codés en tant que piste de sous-titres souples (non intégrés).";
 
 /* Class = "NSButtonCell"; title = "Add Foreign Audio Search"; ObjectID = "vNY-OC-hTJ"; */
 "vNY-OC-hTJ.title" = "Ajouter une recherche audio étrangère";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/fr.lproj/Video.strings -> HandBrake-1.5.1.tar.xz/macosx/fr.lproj/Video.strings Changed

@@ -25,12 +25,6 @@
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "bvD-W7-O0N"; */
 "bvD-W7-O0N.title" = "0";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "c27-4i-SiJ"; */
-"c27-4i-SiJ.ibShadowedIsNilPlaceholder" = "0";
-
-/* Class = "CocoaBindingsConnection"; ibShadowedNotApplicablePlaceholder = "0"; ObjectID = "c27-4i-SiJ"; */
-"c27-4i-SiJ.ibShadowedNotApplicablePlaceholder" = "0";
-
 /* Class = "NSTextFieldCell"; title = "Unparse:"; ObjectID = "CLk-dp-1b7"; */
 "CLk-dp-1b7.title" = "Non analysé :";
 
@@ -41,7 +35,7 @@
 "CRz-On-Jen.ibShadowedIsNilPlaceholder" = "automatique";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder tune. Further adjusts encoder preset to optimize settings for specific scenarios."; ObjectID = "cXd-X7-OhB"; */
-"cXd-X7-OhB.ibShadowedToolTip" = "Réglage de l'encodage vidéo. Ajuste le préréglage de l'encodeur pour aligner ses réglages à un scénario spécifique.";
+"cXd-X7-OhB.ibShadowedToolTip" = "Réglage de l'encodage vidéo. Ajuste le préréglage de l'encodeur pour optimiser les réglages à des scénarii spécifiques.";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Displays all internal video encoder options."; ObjectID = "dwn-bf-Ua0"; */
 "dwn-bf-Ua0.ibShadowedToolTip" = "Affiche toutes les options de l'encodeur vidéo interne.";
@@ -53,13 +47,13 @@
 "F3s-qR-qeE.title" = "Qualité :";
 
 /* Class = "NSSlider"; ibShadowedToolTip = "Video encoder preset. Adjusts encoder settings to balance compression efficiency and encoding speed. Slower encoder presets may use settings that are less compatible with certain devices."; ObjectID = "fue-2d-Bjn"; */
-"fue-2d-Bjn.ibShadowedToolTip" = "Encodeur vidéo prédéfini. Ajuste les paramètres du codeur pour équilibrer l'efficacité de la compression et la vitesse de codage. Les préréglages d'encodeur plus lents peuvent utiliser des paramètres moins compatibles avec certains appareils. ";
+"fue-2d-Bjn.ibShadowedToolTip" = "Préréglage de l'encodeur vidéo. Ajuste les paramètres de l'encodeur pour ajuster l'efficacité de la compression et la vitesse de codage. Les préréglages d'encodeur plus lents peuvent utiliser des paramètres moins compatibles avec certains appareils.";
 
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "fzT-im-zKN"; */
 "fzT-im-zKN.title" = "Régler :";
 
 /* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar"; ObjectID = "gEp-lv-YUY"; */
-"gEp-lv-YUY.ibShadowedToolTip" = "Options supplémentaire d'encodeur vidéo. Pour utilisation avancée seulement. \n\nSyntaxe : option-1=foo:opt2=bar";
+"gEp-lv-YUY.ibShadowedToolTip" = "Options supplémentaire d'encodeur vidéo. Pour une utilisation avancée seulement. \n\nSyntaxe : option-1=foo:opt2=bar";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "gIJ-Xs-uVF"; */
 "gIJ-Xs-uVF.title" = "AutresVues";
@@ -89,7 +83,7 @@
 "nPA-nO-Eik.title" = "Encodage en 2 passes";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Turbo first pass speeds up the first pass of a 2-pass encode for a slight penalty to analysis."; ObjectID = "olm-zg-k9Y"; */
-"olm-zg-k9Y.ibShadowedToolTip" = "Turbo premier passage accélère le premier passage d'un encodage à 2 passes pour une légère pénalité d'analyse. ";
+"olm-zg-k9Y.ibShadowedToolTip" = "Turbo premier passage accélère le premier passage d'un encodage à 2 passes pour une légère pénalité d'analyse.";
 
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "QWu-rv-zfM"; */
 "QWu-rv-zfM.title" = "Préréglage :";
@@ -110,7 +104,7 @@
 "sTM-lk-DBC.title" = "Niveau :";
 
 /* Class = "NSButton"; ibShadowedToolTip = "Fast Decode uses settings that reduce CPU usage during playback of the encoded video. Useful for devices that struggle to play video without stuttering."; ObjectID = "stU-Fo-Avu"; */
-"stU-Fo-Avu.ibShadowedToolTip" = "Le décodage rapide utilise des paramètres qui réduisent l'utilisation du processeur lors de la lecture de la vidéo encodée. Utile pour les appareils qui ont du mal à lire des vidéos sans lague. ";
+"stU-Fo-Avu.ibShadowedToolTip" = "Le décodage rapide utilise des paramètres qui réduisent l'utilisation du processeur lors de la lecture de la vidéo encodée. Utile pour les appareils qui ont du mal à lire des vidéos sans lague.";
 
 /* Class = "NSButtonCell"; title = "Average Bitrate (kbps):"; ObjectID = "VQe-CK-YDR"; */
 "VQe-CK-YDR.title" = "Débit moyen (kbps) :";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/hbsign -> HandBrake-1.5.1.tar.xz/macosx/hbsign Changed

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 # Copyright (C) 2012-2017 VLC authors and VideoLAN
 # Copyright (C) 2012-2014 Felix Paul Kühne <fkuehne at videolan dot org>
-# Copyright (C) 2018-2020 Damiano Galassi <damiog@gmail.com>
-# Copyright (C) 2018-2020 Bradley Sepos <bradley@bradleysepos.com>
+# Copyright (C) 2018-2022 Damiano Galassi <damiog@gmail.com>
+# Copyright (C) 2018-2022 Bradley Sepos <bradley@bradleysepos.com>
 #
 # Based on VLC's codesign.sh
 #
@@ -89,17 +89,13 @@
 fi
 
 SCRIPTDIR=$(dirname "${SELF}")
-
-
 RUNTIME_FLAGS=""
 if "${RUNTIME}" == true ; then
 RUNTIME_FLAGS="--options=runtime"
 fi
-
 ENTITLEMENTS_MAIN_FLAGS=""
 ENTITLEMENTS_XPC_FLAGS=""
 ENTITLEMENTS_CLI_FLAGS=""
-
 if "${SANDBOX}" == true ; then
 ENTITLEMENTS_MAIN_FLAGS="--entitlements $SCRIPTDIR/HandBrake.entitlements"
 ENTITLEMENTS_XPC_FLAGS="--entitlements $SCRIPTDIR/HandBrakeXPCService/HandBrakeXPCService.entitlements"
@@ -109,26 +105,42 @@
 ENTITLEMENTS_XPC_FLAGS="--entitlements $SCRIPTDIR/HandBrakeXPCService/HandBrakeXPCService-RuntimeOnly.entitlements"
 ENTITLEMENTS_CLI_FLAGS="${ENTITLEMENTS_XPC_FLAGS}"
 fi
+ENTITLEMENTS_CLI_FLAGS="${ENTITLEMENTS_CLI_FLAGS:+$ENTITLEMENTS_CLI_FLAGS }--prefix fr.handbrake."
 
-function sign { # sign flags target
+function sign { # sign target flags
 local TARGET FLAGS ERR
- TARGET="${2:-}"
+ TARGET="${1:-}"
 if "${TARGET}" == "" ; then
- ERR="${SELF_NAME}: target not specified to sign function\ncommand was: sign ${1:-} ${2:-}"
+ ERR="${SELF_NAME}: target not specified to sign function"
 echo -e "${ERR}" >> "${LOG}"
 exit_with_error 1 "${ERR}"
 fi
+ if "${2:-}" == "main" ; then
+ FLAGS="${ENTITLEMENTS_MAIN_FLAGS}"
+ elif "${2:-}" == "xpc" ; then
+ FLAGS="${ENTITLEMENTS_XPC_FLAGS}"
+ elif "${2:-}" == "cli" ; then
+ FLAGS="${ENTITLEMENTS_CLI_FLAGS}"
+ else
+ FLAGS=""
+ fi
+ codesign --force --verbose $RUNTIME_FLAGS $FLAGS -s "${IDENTITY}" "${TARGET}" >>"${LOG}" 2>&1 || exit_with_error 1 "Signing failed. More info may be available in ${LOG}"
+}
 
- FLAGS="${1:-}"
- if "${FLAGS}" == "main" ; then
- codesign --force --verbose $RUNTIME_FLAGS $ENTITLEMENTS_MAIN_FLAGS -s "${IDENTITY}" "${2:-}" >>"${LOG}" 2>&1 || exit_with_error 1 "Signing failed. More info may be available in ${LOG}"
- elif "${FLAGS}" == "xpc" ; then
- codesign --force --verbose $RUNTIME_FLAGS $ENTITLEMENTS_XPC_FLAGS -s "${IDENTITY}" "${2:-}" >>"${LOG}" 2>&1 || exit_with_error 1 "Signing failed. More info may be available in ${LOG}"
- elif "${FLAGS}" == "cli" ; then
- codesign --force --verbose $RUNTIME_FLAGS $ENTITLEMENTS_CLI_FLAGS --prefix fr.handbrake. -s "${IDENTITY}" "${2:-}" >>"${LOG}" 2>&1 || exit_with_error 1 "Signing failed. More info may be available in ${LOG}"
+function verify { # verify target deep
+ local TARGET FLAGS ERR
+ TARGET="${1:-}"
+ if "${TARGET}" == "" ; then
+ ERR="${SELF_NAME}: target not specified to verify function"
+ echo -e "${ERR}" >> "${LOG}"
+ exit_with_error 1 "${ERR}"
+ fi
+ if "${2:-}" == "deep" ; then
+ FLAGS="--deep --strict --verbose=4"
 else
- codesign --force --verbose $RUNTIME_FLAGS -s "${IDENTITY}" "${2:-}" >>"${LOG}" 2>&1 || exit_with_error 1 "Signing failed. More info may be available in ${LOG}"
+ FLAGS="-vv"
 fi
+ codesign --verify $FLAGS "${TARGET}" >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
 }
 
 echo "Script dir: ${SCRIPTDIR}"
@@ -139,65 +151,70 @@
 for TARGET in "${@}"; do
 
 TARGET="${TARGET#./}"
- echo "${TARGET}:"
 
 if "${TARGET##*/}" == 'HandBrake.app' ; then
- echo " Signing Frameworks"
+ echo "${TARGET}:"
+
 find "${TARGET}"/Contents/Frameworks -type f -name ".DS_Store" -exec rm '{}' \; >/dev/null 2>&1
 find "${TARGET}"/Contents/Frameworks -type f -name "*.textile" -exec rm '{}' \; >/dev/null 2>&1
 find "${TARGET}"/Contents/Frameworks -type f -name "*.txt" -exec rm '{}' \; >/dev/null 2>&1
- sign "default" "${TARGET}"/Contents/Frameworks/HandBrakeKit.framework/Versions/A
- sign "default" "${TARGET}"/Contents/Frameworks/Sparkle.framework/Resources/Autoupdate
- sign "default" "${TARGET}"/Contents/Frameworks/Sparkle.framework/Resources/Updater.app
- sign "default" "${TARGET}"/Contents/Frameworks/Sparkle.framework/Versions/A
- for FILE in $(find "${TARGET}"/Contents/Frameworks -type f -name "*.h" -o -name "*.nib" -o -name "*.plist" -o -name "*.strings" -exec echo {} \; >/dev/null 2>&1)
- do
- sign "default" "${FILE}"
- done
+ rm -rf "${TARGET}"/Contents/Frameworks/Sparkle.framework/Versions/A/Updater.app
+ rm -rf "${TARGET}"/Contents/Frameworks/Sparkle.framework/Versions/A/Autoupdate
 
- echo " Signing Headers"
- for FILE in $(find "${TARGET}"/Contents/MacOS/include -type f -exec echo {} \; >/dev/null 2>&1)
- do
- sign "default" "${FILE}"
- done
+ echo " Signing Frameworks"
+ sign "${TARGET}"/Contents/Frameworks/Sparkle.framework/Versions/A
+ sign "${TARGET}"/Contents/Frameworks/HandBrakeKit.framework/Versions/A
+
+ echo " Signing Updater App"
+ sign "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app
+ sign "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Autoupdate
 
 echo " Signing XPC Services"
- sign "xpc" "${TARGET}"/Contents/XPCServices/HandBrakeXPCService.xpc
- sign "default" "${TARGET}"/Contents/XPCServices/org.sparkle-project.Downloader.xpc
- sign "default" "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerConnection.xpc
- sign "default" "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerLauncher.xpc
- sign "default" "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerStatus.xpc
- fi
 
- echo " Signing Executable"
- if "${TARGET##*/}" == 'HandBrakeCLI' ; then
- sign "cli" "${TARGET}"
- else
- sign "main" "${TARGET}"
- fi
+ OIFS="${IFS}"
+ IFS=$'\n'
+ XPC=($(find -s "${TARGET}"/Contents/XPCServices -type d -regex ".*/HandBrakeXPCService0-9*\.xpc" 2>/dev/null))
+ XPC_EXT=($(find -s "${TARGET}"/Contents/XPCServices -type d -regex ".*/org\.sparkle-project.*\.xpc" 2>/dev/null))
+ IFS="${OIFS}"
+ for FILE in "${XPC@}"; do
+ sign "${FILE}" xpc
+ done
+ for FILE in "${XPC_EXT@}"; do
+ sign "${FILE}"
+ done
+
+ echo " Signing App Bundle"
+ sign "${TARGET}" main
 
- if "${TARGET##*/}" == 'HandBrake.app' ; then
 echo " Validating Frameworks"
- codesign --verify -vv "${TARGET}"/Contents/Frameworks/HandBrakeKit.framework >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- codesign --verify -vv "${TARGET}"/Contents/Frameworks/Sparkle.framework >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
+ verify "${TARGET}"/Contents/Frameworks/Sparkle.framework
+ verify "${TARGET}"/Contents/Frameworks/HandBrakeKit.framework
 
- echo " Validating Updater.app"
- codesign --verify -vv "${TARGET}"/Contents/Frameworks/Sparkle.framework/Versions/Current/Resources/Updater.app >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
+ echo " Validating Updater App"
+ verify "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app
 
 echo " Validating XPC Services"
- codesign --verify -vv "${TARGET}"/Contents/XPCServices/HandBrakeXPCService.xpc >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- codesign --verify -vv "${TARGET}"/Contents/XPCServices/org.sparkle-project.Downloader.xpc >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- codesign --verify -vv "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerConnection.xpc >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- codesign --verify -vv "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerLauncher.xpc >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- codesign --verify -vv "${TARGET}"/Contents/XPCServices/org.sparkle-project.InstallerStatus.xpc >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
- fi
+ for FILE in "${XPC@}" "${XPC_EXT@}"; do
+ verify "${FILE}"
+ done
 
- echo " Validating Bundle"
- codesign --verify --deep --strict --verbose=4 "${TARGET}" >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
+ echo " Validating App Bundle"
+ verify "${TARGET}" deep
 
- if "${TARGET##*/}" != 'HandBrakeCLI' ; then
- echo " Validating Execution Privileges"
- spctl -a -t exec -vv "${TARGET}" >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
+		if "${IDENTITY}" != "-" ; then
+ 	echo " Validating Execution Privileges"
+	 spctl -a -t exec -vv "${TARGET}" >>"${LOG}" 2>&1 || exit_with_error 1 "Validation failed. More info may be available in ${LOG}"
+	 fi
+ elif "${TARGET##*/}" == 'HandBrakeCLI' ; then
+ echo "${TARGET}:"
+
+ echo " Signing Executable"
+ sign "${TARGET}" cli
+
+ echo " Validating Executable"
+ verify "${TARGET}" deep
+ else
+ exit_with_error 1 "This script does not know how to sign the specified target."
 fi
 
 done

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/AddPreset.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/AddPreset.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/AudioDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/AudioDefaults.strings Changed

@@ -82,6 +82,9 @@
 /* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
 "GbM-vm-RC2.title" = "Comportamento di selezione traccia:";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "Abilita questa opzione se il tuo dispositivo di riproduzione supporta MP2. Ciò consente di utilizzare il passthru MP2 quando è abilitata la selezione automatica passthru.";
+
 /* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
 "GZP-q7-SYy.title" = "Tutte quelle corrispondenti alle lingue selezione";
 
@@ -154,21 +157,12 @@
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
 "OVr-Jm-VrK.title" = "0";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Mostra tutte";
-
 /* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
 "pR9-d4-SNf.headerCell.title" = "Codec";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
 "PtB-Wp-B9X.title" = "OtherViews";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all audio languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Mostra tutte le lingue";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all audio languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Mostra tutte le lingue nell'elenco delle Lingue.";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
 "r80-yv-59n.ibExternalAccessibilityDescription" = "Frequenza di campionamento";
 
@@ -211,6 +205,9 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
 "xnA-03-Bul.ibShadowedToolTip" = "Guadagno audio in decibel (dB). Aumenta o diminuisce il volume dell'audio.";
 
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
 /* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
 "z9d-P3-6UP.title" = "TrueHD";

HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "Ritaglio dal fondo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "Quantità di ritaglio del bordo inferiore in pixel.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "Ritaglio dall'alto";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "Ritaglio dall'alto";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "Quantità di ritaglio del bordo superiore in pixel.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "Ruota l'immagine in senso orario in incrementi di 90 gradi.";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "Personalizzato";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "Ritaglio a destra";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "Quantità di ritaglio del bordo destro in pixel.";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "Nessuno";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "Automatico";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "Ritaglio dal fondo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "Ritaglia a sinistra";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "Quantità di ritaglio del bordo sinistro in pixel.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "Ritaglio a destra";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "Ritaglia a sinistra";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBFiltersViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBFiltersViewController.strings Changed

@@ -1,20 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Rotate:"; ObjectID = "1nr-nE-3a6"; */
-"1nr-nE-3a6.title" = "Rotazione:";
-
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibExternalAccessibilityDescription" = "Regolazione Denoise";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
 "1XQ-md-5cQ.ibShadowedToolTip" = "Regolazioni Denoise. Regola ulteriormente il preset Denoise per ottimizzare le impostazioni per scenari specifici\n\nNessuno usa le impostazioni del preset predefinite.\n\nFilm perfeziona le impostazioni per l'utilizzo con la maggior parte dei contenuti di azioni live.\n\nGrain elabora solo i canali di colore. Utile per preservare l'aspetto filmogeno della grana della luminanza riducendo o rimuovendo il rumore del colore.\n\nHigh Motion riduce la sbavatura dei colori nelle scene in movimento elevato evitando l'elaborazione temporale per i canali dei colori. Utile per video sportivi e d'azione.\n\nAnimation è utile per l'animazione cel come anime e cartoni animati.\n\nTape è utile per sorgenti analogiche a nastro a basso dettaglio come VHS, in cui Film non produce un risultato desiderabile.\n\nSprite è utile per giochi bidimensionali a 1-/4-/8-/16-bit. Sprite non è progettato per video ad alta definizione.";
 
-/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "1zF-s5-Lic"; */
-"1zF-s5-Lic.title" = "Preset:";
-
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibExternalAccessibilityDescription" = "Regolazione Sharpen";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "6he-FC-h6S"; */
-"6he-FC-h6S.ibShadowedToolTip" = "Regolazioni Sharpen. Regola ulteriormente l'impostazione Precisione per ottimizzare le impostazioni per scenari specifici.\n\nNessuno usa le impostazioni del preset predefinite.\n\nL'effetto di contrasto può essere regolato per la nitidezza Ultrafine, Fine, Medium, Coarse, o Very Coarse. Selezionane uno basato sulla risoluzione dell'immagine in uscita e sulla finezza dei dettagli da migliorare.\n\nLapsharp Film perfeziona le impostazioni per l'utilizzo con la maggior parte dei contenuti di azione dal vivo. Il film usa un kernel islottico laplaciano per affilare tutti i bordi in modo simile, e le informazioni sulla luminanza (luminosità) sono più nitide delle informazioni sulla crominanza (colore).\n\nLapsharp Grain è simile a Film, ma utilizza un Laplacian isotropico di kernel gaussiano per ridurre l'effetto su rumore e grana. Utile per preservare la grana e come alternativa generale alla regolazione Film.\n\nLapsharp Animation è utile per l'animazione cel come anime e cartoni animati. Animation è identica a Film, ma la forza complessiva è ridotta per evitare la creazione di artefatti\n\nLa regolazione Sprite di Lapsharp è utile per i giochi bidimensionali a 1-/4-/8-/16-bit. Sprite usa un kernel di Laplacian a 4 vicini che migliora i bordi verticali e orizzontali più che i bordi diagonali.";
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "Regolazione:";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
 "6nG-zk-FMo.ibShadowedToolTip" = "Preset filtro deinterlaccio. \n\nL'impostazione predefinita è ben bilanciata per velocità e qualità.\n\nSkip Spatial Check consente a Yadif di ignorare alcuni artefatti evitabili per un leggero aumento di velocità.\n\nEEDI2 utilizza un algoritmo di interpolazione più lento e di qualità superiore per Decomb. Utile per le sorgenti più difficili.\n\nBob tenta di preservare meglio il movimento per una leggera penalità alla risoluzione percepita.";
@@ -22,8 +13,8 @@
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
 "8am-ve-1Xl.title" = "Preset:";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "9su-F2-NUw"; */
-"9su-F2-NUw.title" = "OtherViews";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "Personalizzato:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
 "akB-JW-MPe.title" = "OtherViews";
@@ -31,14 +22,11 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
 "b6A-ax-2Ed.title" = "OtherViews";
 
-/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibExternalAccessibilityDescription" = "Preset Sharpen";
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "Parametri Sharpen personalizzati.\n\nUnsharp sintassi: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp sintassi: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "bac-vC-bD4"; */
-"bac-vC-bD4.ibShadowedToolTip" = "Sharpen filtro Denoise. Imposta la forza del filtro.";
-
-/* Class = "NSMenuItem"; title = "180°"; ObjectID = "bEe-EV-Q73"; */
-"bEe-EV-Q73.title" = "180°";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "La nitidezza migliora l'aspetto dei dettagli, in particolare i bordi. Le impostazioni di nitidezza eccessivamente forti possono danneggiare la qualità delle immagini creando artefatti che squillano e migliorando il rumore, che può ridurre l'efficienza di compressione.\n\nUnsharp è un filtro per maschere di contrasto generico. Aumenta la nitidezza sfocando, quindi calcola la differenza tra l'immagine sfocata e l'originale.\n\nLapsharp aumenta la nitidezza usando i nuclei di convoluzione che si avvicinano ai filtri di bordo laplaciani, a volte producendo risultati di qualità superiore rispetto al mascheramento di contrasto.";
 
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
 "bRd-Km-Wa8.ibExternalAccessibilityDescription" = "Regolazione Sharpen";
@@ -52,12 +40,24 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
 "bz8-FC-vYp.ibShadowedToolTip" = "Il deblock riduce gli artefatti a blocchi causati dalla compressione video di bassa qualità.";
 
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "Personalizzato:";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "Preset Sharpen";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "Sharpen filtro Denoise. Imposta la forza del filtro.";
+
 /* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibExternalAccessibilityDescription" = "Preset Denoise";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
 "cTy-PO-BSd.ibShadowedToolTip" = "Preset filtro Denoise. Imposta la forza del filtro.";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "Preset:";
+
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
 "Da7-pY-5vu.title" = "Personalizzato:";
 
@@ -67,26 +67,29 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
 "DI9-Ed-acp.ibShadowedToolTip" = "Parametri Deblock personalizzati.\n\nstrength=s:thresh=t:blocksize=b";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "dsH-ZQ-dBs"; */
-"dsH-ZQ-dBs.ibShadowedToolTip" = "Ruota l'immagine in senso orario in incrementi di 90 gradi.";
-
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
 "DvX-m9-Q6u.title" = "Personalizzato:";
 
-/* Class = "NSMenuItem"; title = "0°"; ObjectID = "eZj-V7-e0o"; */
-"eZj-V7-e0o.title" = "0°";
-
-/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "Gg8-cE-gaL"; */
-"Gg8-cE-gaL.title" = "Sharpen:";
-
 /* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
 "gKq-xF-AZE.title" = "Deblock:";
 
 /* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
 "h7g-eE-vgv.title" = "Scala di grigi";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "Hht-Rt-VA0"; */
-"Hht-Rt-VA0.ibShadowedToolTip" = "Parametri Sharpen personalizzati.\n\nUnsharp sintassi: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp sintassi: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "Regolazione Sharpen";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "Regolazioni Sharpen. Regola ulteriormente l'impostazione Precisione per ottimizzare le impostazioni per scenari specifici.\n\nNessuno usa le impostazioni del preset predefinite.\n\nL'effetto di contrasto può essere regolato per la nitidezza Ultrafine, Fine, Medium, Coarse, o Very Coarse. Selezionane uno basato sulla risoluzione dell'immagine in uscita e sulla finezza dei dettagli da migliorare.\n\nLapsharp Film perfeziona le impostazioni per l'utilizzo con la maggior parte dei contenuti di azione dal vivo. Il film usa un kernel islottico laplaciano per affilare tutti i bordi in modo simile, e le informazioni sulla luminanza (luminosità) sono più nitide delle informazioni sulla crominanza (colore).\n\nLapsharp Grain è simile a Film, ma utilizza un Laplacian isotropico di kernel gaussiano per ridurre l'effetto su rumore e grana. Utile per preservare la grana e come alternativa generale alla regolazione Film.\n\nLapsharp Animation è utile per l'animazione cel come anime e cartoni animati. Animation è identica a Film, ma la forza complessiva è ridotta per evitare la creazione di artefatti\n\nLa regolazione Sprite di Lapsharp è utile per i giochi bidimensionali a 1-/4-/8-/16-bit. Sprite usa un kernel di Laplacian a 4 vicini che migliora i bordi verticali e orizzontali più che i bordi diagonali.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "Preset Chroma Smooth";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "Spazio di colore:";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "Regolazione:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
 "IHH-Se-l6d.title" = "OtherViews";
@@ -103,26 +106,29 @@
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
 "IQG-Nn-HTb.ibShadowedToolTip" = "Rilevamento interlacciato, quando abilitato, consente dal filtro di deinterlacciamento di elaborare solo i fotogrammi video interlacciati.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis."; ObjectID = "IWV-25-FSC"; */
-"IWV-25-FSC.ibShadowedToolTip" = "Specchia l'immagine sull'asse orizzontale.";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "Regolazione Chroma Smooth";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jmH-62-gce"; */
-"jmH-62-gce.title" = "OtherViews";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "Regolazioni Chroma Smooth. Regola ulteriormente il preset di Chroma Smooth per ottimizzare le impostazioni per scenari specifici.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
 "KiY-kz-54k.title" = "Personalizzato:";
 
-/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "N6B-kA-kMA"; */
-"N6B-kA-kMA.title" = "Regolazione:";
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "OtherViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
 "n6U-tH-vo0.title" = "Personalizzato:";
 
-/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oqh-kd-lEw"; */
-"oqh-kd-lEw.title" = "Personalizzato:";
-
-/* Class = "NSMenuItem"; title = "90°"; ObjectID = "OyA-fK-x19"; */
-"OyA-fK-x19.title" = "90°";
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "Personalizzato:";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
 "pIO-dE-81w.title" = "OtherViews";
@@ -130,12 +136,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
 "Psx-nN-XiT.ibShadowedToolTip" = "Scala di grigi rimuove le componenti dei colori del video. Conosciuto anche come video in bianco e nero.";
 
-/* Class = "NSMenuItem"; title = "270°"; ObjectID = "PY6-PT-J4z"; */
-"PY6-PT-J4z.title" = "270°";
-
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "pYa-Af-F47"; */
-"pYa-Af-F47.ibShadowedToolTip" = "La nitidezza migliora l'aspetto dei dettagli, in particolare i bordi. Le impostazioni di nitidezza eccessivamente forti possono danneggiare la qualità delle immagini creando artefatti che squillano e migliorando il rumore, che può ridurre l'efficienza di compressione.\n\nUnsharp è un filtro per maschere di contrasto generico. Aumenta la nitidezza sfocando, quindi calcola la differenza tra l'immagine sfocata e l'originale.\n\nLapsharp aumenta la nitidezza usando i nuclei di convoluzione che si avvicinano ai filtri di bordo laplaciani, a volte producendo risultati di qualità superiore rispetto al mascheramento di contrasto.";
-
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
 "PyP-FP-gGx.title" = "OtherViews";
 
@@ -145,6 +145,9 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
 "Qz4-EY-GFO.title" = "OtherViews";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "OtherViews";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
 "r64-vI-ymx.ibShadowedToolTip" = "Parametri Deinterlace personalizzati.\n\nYadif sintassi: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb sintassi: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7";
 
@@ -157,8 +160,8 @@
 /* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
 "Rxe-Xm-vXj.title" = "Denoise:";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tAS-YR-VfA"; */
-"tAS-YR-VfA.title" = "OtherViews";
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "Preset spazio di colore";
 
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
 "tje-4P-jKt.title" = "Regolazione:";
@@ -166,8 +169,8 @@
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
 "tlc-kS-W8X.title" = "OtherViews";
 
-/* Class = "NSButtonCell"; title = "Flip"; ObjectID = "Tvl-40-1Tc"; */
-"Tvl-40-1Tc.title" = "Specchia";
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "Sharpen:";
 
 /* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
 "uDH-ts-vs5.title" = "Colore:";
@@ -190,9 +193,18 @@
 /* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
 "ydN-tP-vpt.title" = "Regolazione:";
 
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = "Chroma Smooth:";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
 "ZR9-YG-pfn.ibShadowedToolTip" = "Parametri Denoise personalizzati.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "OtherViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "OtherViews";
+
 /* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
 "zvZ-ZX-yKE.title" = "Preset:";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBPictureHUDController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBPictureHUDController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBPictureViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBPictureViewController.strings Changed

@@ -1,177 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "Consenti ampliamento";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "Dim. di visualizzazione:";
+
 /* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
 "1O3-th-4M5.title" = "Spento";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
 "1Z0-JT-vst.ibExternalAccessibilityDescription" = "Ritaglio dal fondo";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "1Z0-JT-vst"; */
-"1Z0-JT-vst.ibShadowedToolTip" = "Quantità di ritaglio del bordo inferiore in pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibShadowedToolTip" = "Quantità di ritaglio del bordo inferiore in pixel";
+
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
 "2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
 "2s0-5k-fjU.ibExternalAccessibilityDescription" = "Altezza di archiviazione";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Keep Aspect Ratio maintains the original display aspect of the source. Disabling this may result in a stretched or squeezed picture."; ObjectID = "6G0-MW-iVa"; */
-"6G0-MW-iVa.ibShadowedToolTip" = "\"Mantieni rapporto dimensioni\" mantiene il rapporto di visualizzazione originale della sorgente. Disabilitare questa opzione potrebbe causare un'immagine allungata o compressa.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "Altezza di archiviazione";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "Rapporto dimensione:";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "Riempimento dall'alto";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "Quantità di bordo superiore in pixel";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "Nessuno";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
 "6W6-RI-fBx.ibExternalAccessibilityDescription" = "Ritaglio dal fondo";
 
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "Automatico";
+
 /* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
 "8vS-Mw-bny.title" = "Anamorfico:";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibExternalAccessibilityDescription" = "Larghezza di archiviazione";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "Riempimento dall'alto";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "Larghezza ridimensionata";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "Larghezza ridimensionata del video. Questo è il numero di pixel di larghezza da codificare. La larghezza in scala può differire dalla larghezza di visualizzazione a seconda delle impostazioni anamorfiche e delle impostazioni di riempimento";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage width. This is the number of pixels wide to be encoded. Storage width may differ from display width depending on anamorphic settings."; ObjectID = "9hH-As-JSa"; */
-"9hH-As-JSa.ibShadowedToolTip" = "Larghezza di archiviazione video. Questo è il numero di pixel di larghezza da codificare. La larghezza di archiviazione può differire dalla larghezza di visualizzazione a seconda delle impostazioni anamorfiche.";
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC SD";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
 "41c-48-2XJ.ibExternalAccessibilityDescription" = "Ritaglio dall'alto";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "41c-48-2XJ"; */
-"41c-48-2XJ.ibShadowedToolTip" = "Quantità di ritaglio del bordo superiore in pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibShadowedToolTip" = "Quantità di ritaglio del bordo superiore in pixel";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "Colore personalizzato del bordo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "Colore personalizzato del bordo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "Larghezza visualizzazione";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "Risoluzione e ridimensionamento";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "Colore del bordo inserito attorno al video";
 
-/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "b3y-yE-sYc"; */
-"b3y-yE-sYc.title" = "Automatico";
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "cNr-IZ-H9j"; */
-"cNr-IZ-H9j.title" = "x";
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "Riempimento da destra";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "Quantità di bordo destro in pixel";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "Limite risoluzione:";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
 "Ddg-4D-el9.ibExternalAccessibilityDescription" = "Ritaglio a destra";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "Altezza visualizzazione";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "Nero";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "Automatico";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "Orizzontale";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "Specchio:";
+
 /* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
 "f12-Dh-fDw.title" = "Personalizzato";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
-"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Larghezza di archiviazione";
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "Nessuno";
 
-/* Class = "NSTextFieldCell"; title = "PAR:"; ObjectID = "gVj-RG-PcL"; */
-"gVj-RG-PcL.title" = "PAR:";
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "Ruota l'immagine in senso orario in incrementi di 90 gradi";
 
-/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "haC-cO-jDm"; */
-"haC-cO-jDm.title" = "Ritaglio:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "Altezza massima";
 
-/* Class = "NSButtonCell"; title = "Keep Aspect Ratio"; ObjectID = "hcF-CZ-p0E"; */
-"hcF-CZ-p0E.title" = "Mantieni rapporto dimensioni";
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "L'altezza massima in cui verrà archiviato il video";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "Usa la risoluzione più alta consentita dalle impostazioni di cui sopra";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "Bianco";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "Dimensione ottimale";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Larghezza di archiviazione";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "Nessuno";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
 "Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "Altezza di archiviazione";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Video storage height. This is the number of pixels tall to be encoded. Storage height may differ from display height depending on anamorphic settings."; ObjectID = "Hkl-7Z-J2e"; */
-"Hkl-7Z-J2e.ibShadowedToolTip" = "Altezza di archiviazione video. Questo è il numero di pixel di altezza da codificare. L'altezza di archiviazione può differire dall'altezza di visualizzazione a seconda delle impostazioni anamorfiche.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "Altezza ridimensionata del video. Questo è il numero di pixel di altezza da codificare. L'altezza in scala può differire dall'altezza di visualizzazione a seconda delle impostazioni anamorfiche e delle impostazioni di riempimento";
 
 /* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
 "hN1-S9-zl8.title" = "x";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ration Numerator"; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibExternalAccessibilityDescription" = "Numeratore rapporto dimensioni pixel";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "Riempimento:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "Larghezza di archiviazione";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "JC3-5O-BXA"; */
-"JC3-5O-BXA.ibShadowedToolTip" = "Il rapporto di dimensione in pixel definisce la forma dei pixel di archiviazione, o come ridimensionare il video anamorfico per creare l'aspetto e le dimensioni corretti di visualizzazione. Il video non anamorfico (PAR 1: 1) non viene ridimensionato durante la riproduzione.";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "Riempimento da sinistra";
 
-/* Class = "NSTextFieldCell"; title = "Modulus:"; ObjectID = "jXn-fo-wNU"; */
-"jXn-fo-wNU.title" = "Modulo:";
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "Larghezza visualizzazione";
 
-/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "JyN-AK-Hae"; */
-"JyN-AK-Hae.title" = "Auto";
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "Automatico";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "Grigio";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "Dim. di archiviazione:";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
 "krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "L7V-2e-qf9"; */
-"L7V-2e-qf9.title" = "Dimensioni di archiviazione:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "Riempimento a sinistra";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "Quantità di bordo sinistro in pixel";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "Ridimensionato:";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
 
-/* Class = "NSMenuItem"; title = "8"; ObjectID = "Lbl-i2-YJg"; */
-"Lbl-i2-YJg.title" = "8";
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "Personalizzato";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
 "LTu-ic-Ty9.ibExternalAccessibilityDescription" = "Ritaglia a sinistra";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "LTu-ic-Ty9"; */
-"LTu-ic-Ty9.ibShadowedToolTip" = "Quantità di ritaglio del bordo sinistro in pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "Quantità di ritaglio del bordo sinistro in pixel";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Width"; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Larghezza di visualizzazione:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Numeratore rapporto dimensione";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display width. This is the number of pixels wide your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "LWv-Y9-b0S"; */
-"LWv-Y9-b0S.ibShadowedToolTip" = "Larghezza di visualizzazione Questo è il numero di pixel che il video apparirà con la sua risoluzione nativa, ed è il risultato del ridimensionamento delle dimensioni dello spazio di archiviazione in base all'aspetto dei pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "Il rapporto dei pixel definisce la forma dei pixel. \n\nUn rapporto 1: 1 definisce un pixel quadrato. Altri valori definiscono forme rettangolari. \nI riproduttori ridimensioneranno l'immagine per ottenere il rapporto specificato.";
 
-/* Class = "NSMenuItem"; title = "4"; ObjectID = "MgF-Gw-0fD"; */
-"MgF-Gw-0fD.title" = "4";
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "Rapporto dimensione:";
 
 /* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
 "Mke-9L-LvB.ibExternalAccessibilityDescription" = "Ritaglio dall'alto";
 
-/* Class = "NSView"; ibExternalAccessibilityDescription = "Cropping"; ObjectID = "Mri-4y-8rX"; */
-"Mri-4y-8rX.ibExternalAccessibilityDescription" = "Ritaglio";
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "Larghezza e altezza";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display Height"; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Altezza visualizzazione:";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Denominatore rapporto dimensione";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Display height. This is the number of pixels tall your video will appear to be at its native resolution, and is the result of scaling the storage dimensions by the pixel aspect."; ObjectID = "nQe-Vq-Og2"; */
-"nQe-Vq-Og2.ibShadowedToolTip" = "Altezza di visualizzazione. Questo è il numero di pixel per l'altezza che il tuo video sembra essere alla sua risoluzione nativa, ed è il risultato del ridimensionamento delle dimensioni dello spazio di archiviazione in base all'aspetto dei pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "Il rapporto dei pixel definisce la forma dei pixel. \n\nUn rapporto 1: 1 definisce un pixel quadrato. Altri valori definiscono forme rettangolari. \nI riproduttori ridimensioneranno l'immagine per ottenere il rapporto specificato.";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Ensure storage dimensions are multiples of this value. Higher values are only necessary for compatibility with certain legacy devices. Set to 2 unless you have a specific compatibility concern."; ObjectID = "ns0-ar-I7c"; */
-"ns0-ar-I7c.ibShadowedToolTip" = "Assicura che le dimensioni di archiviazione siano multipli di questo valore. Valori più alti sono necessari solo per la compatibilità con determinati dispositivi legacy. Impostare su 2 a meno che non si abbia un problema di compatibilità specifico.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "Dimensione massima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "La larghezza massima in cui verrà archiviato il video";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
 "ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSMenuItem"; title = "2"; ObjectID = "OWb-6v-ggg"; */
-"OWb-6v-ggg.title" = "2";
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "Colore:";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "Personalizzato";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "Altezza (Letterbox)";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "Grigio scuro";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
 "qSV-uB-Iup.title" = "OtherViews";
 
-/* Class = "NSStepper"; ibExternalAccessibilityDescription = "v"; ObjectID = "r9l-cH-pFW"; */
-"r9l-cH-pFW.ibExternalAccessibilityDescription" = "v";
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p HD";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "Ritaglia a sinistra";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "Se non abilitato, le dimensioni ridimensionate saranno limitate alle dimensioni di origine";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Ratio Denominator"; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibExternalAccessibilityDescription" = "Denominatore rapporto dimensioni pixel";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Pixel Aspect Ratio defines the shape of the storage pixels, or how to scale anamorphic video to create the correct display aspect and dimensions. Non-anamorphic video (1:1 PAR) is not scaled during playback."; ObjectID = "rFi-0b-3BX"; */
-"rFi-0b-3BX.ibShadowedToolTip" = "Il rapporto di dimensione in pixel definisce la forma dei pixel di archiviazione, o come ridimensionare il video anamorfico per creare l'aspetto e le dimensioni corretti di visualizzazione. Il video non anamorfico (PAR 1: 1) non viene ridimensionato durante la riproduzione.";
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "Rapporto Pixel:";
 
-/* Class = "NSMatrix"; ibShadowedToolTip = "Cropping mode.\n\nAutomatic detects and removes black borders from the video.\n\nCustom allows for manual settings."; ObjectID = "RTr-3u-52l"; */
-"RTr-3u-52l.ibShadowedToolTip" = "Modalità di ritaglio.\n\nAutomatico rileva e rimuove i bordi neri dal video.\n\nPersonalizzato consente le impostazioni manuali.";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Radio"; ObjectID = "S7K-vF-t1n"; */
-"S7K-vF-t1n.title" = "Radio";
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "La modifica delle dimensioni di visualizzazione allungherà il video";
 
-/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "SPg-s0-Oh0"; */
-"SPg-s0-Oh0.title" = "Dimensioni di visualizzazione:";
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
 
-/* Class = "NSMenuItem"; title = "Loose"; ObjectID = "Uiw-Nb-u5X"; */
-"Uiw-Nb-u5X.title" = "Sciolto";
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "Dimensioni sorgente";
 
-/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "und-OA-MLn"; */
-"und-OA-MLn.title" = "OtherViews";
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "Orientamento e ritaglio";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "Riempimento da destra";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
 "uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
 
-/* Class = "NSMenuItem"; title = "16"; ObjectID = "uTT-yC-MFJ"; */
-"uTT-yC-MFJ.title" = "16";
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "Dimensioni finali";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "Rotazione:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "Come usare le impostazioni di ritaglio";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "Aggiungi un bordo attorno al video";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "Personalizzato";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "L'anamorfico consente dimensioni di archiviazione arbitrarie preservando il rapporto originale durante la riproduzione. \n\nAutomatico massimizza la risoluzione di archiviazione preservando le proporzioni di visualizzazione originali. Consigliato.\n\nNessuno disabilita l'anamorfico. Le dimensioni di archiviazione video e le dimensioni di visualizzazione saranno identiche. Utile solo per la compatibilità con alcuni dispositivi legacy. \n\nPersonalizzato consente l'impostazione manuale di tutti i parametri. Utile per correggere un rapporto di visualizzazione della sorgente errato e per i professionisti che necessitano di un controllo avanzato in post-produzione.";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "Larghezza (Pillarbox)";
 
-/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "uuL-JR-73C"; */
-"uuL-JR-73C.title" = "x";
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "Dim. di visualizzazione:";
 
-/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nOff disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nAuto maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nLoose is similar to Auto, but attempts to preserve the storage aspect ratio. This can result in a slight storage resolution loss compared to Auto.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
-"w1f-3S-up0.ibShadowedToolTip" = "Anamorfico consente dimensioni di archiviazione arbitrarie preservando l'aspetto originale durante la riproduzione\n\nSpento disabilita l'anamorfico. Le dimensioni di archiviazione video e le dimensioni di visualizzazione saranno identiche. Utile solo per la compatibilità con determinati dispositivi legacy.\n\nAuto ottimizza la risoluzione di archiviazione preservando le proporzioni originali dello schermo. Raccomandato.\n\nSciolto è simile a Auto, ma tenta di preservare le proporzioni di archiviazione. Ciò può comportare una leggera perdita di risoluzione di archiviazione rispetto a Auto.\n\nPersonalizzata consente di impostare manualmente tutti i parametri. Utile per correggere un aspetto di visualizzazione sorgente errato e per i professionisti che necessitano di controllo avanzato in fase di post-produzione.";
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "Riempimento dal fondo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "Quantità di bordo inferiore in pixel";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
 "wsq-TS-cC6.ibExternalAccessibilityDescription" = "Ritaglio a destra";
 
-/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "wsq-TS-cC6"; */
-"wsq-TS-cC6.ibShadowedToolTip" = "Quantità di ritaglio del bordo destro in pixel.";
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "Quantità di ritaglio del bordo destro in pixel";
 
 /* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
 "x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
 
-/* Class = "NSButtonCell"; title = "Custom:"; ObjectID = "zmf-MM-j1I"; */
-"zmf-MM-j1I.title" = "Personalizzato:";
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p HD";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "Capovolge (specchia) l'immagine sull'asse orizzontale";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "Personalizzato";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL SD";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "Bordi";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "Ritaglio:";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "Riempimento dal fondo";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "Dim. di archiviazione:";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBQueueInfoViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBQueueInfoViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBQueueTableViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBQueueTableViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBSummaryViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBSummaryViewController.strings Changed

@@ -7,21 +7,33 @@
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
 "BHq-Mt-3eA.ibExternalAccessibilityDescription" = "Sommario filtri";
 
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "Mantieni metadata";
+
 /* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
 "De0-Je-MAm.title" = "Allinea inizio A/V";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "Copia i metadata dalla sorgente alla destinazione";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
 "fPv-Vw-I89.ibShadowedToolTip" = "Allinea i marcatori temporali iniziali di tutti i flussi video e audio inserendo dei fotogrammi vuoti o eliminando fotogrammi. Potrebbe migliorare la sincronizzazione audio/video su riproduttori non conformi che non rispettano gli elenchi di modiche MP4.";
 
 /* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
 "Jaw-pH-rhf.ibExternalAccessibilityDescription" = "Sommario dimensione";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "Ottimizza MP4 per il download progressivo. Dopo la codifica, i dati vengono riorganizzati e riscritti per consentire la riproduzione immediata su una rete, senza la necessità di scaricare l'intero file.";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
 "lUi-Oc-208.ibShadowedToolTip" = "Ottimizza MP4 per il download progressivo. Dopo la codifica, i dati vengono riorganizzati e riscritti per consentire la riproduzione immediata su una rete, senza la necessità di scaricare l'intero file.";
 
 /* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
 "m5a-0z-QQ4.ibExternalAccessibilityDescription" = "Anteprima";
 
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Ottimizza per web";
+
 /* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
 "OCw-f6-uA0.title" = "Filtri:";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/HBTrackTitleViewController.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/HBTrackTitleViewController.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/Localizable.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/Localizable.strings Changed

@@ -1,3 +1,6 @@
+/* Job statistics */
+" (%@ %% of the source file)" = " (%@ %% del file originale)";
+
 /* Preview -> size info label */
 " Scaled To Screen" = " Adattata allo schermo";
 
@@ -16,14 +19,38 @@
 /* Main Window -> preset modified */
 "(Modified)" = "(Modificato)";
 
+/* Job statistics */
+"%@ fps" = "%@ fps";
+
 /* Queue status */
-"%d encode pending" = "%d conversione in sospeso";
+"%lu encode pending" = "%lu conversione in sospeso";
 
 /* Queue status */
-"%d encodes pending" = "%d conversioni in sospeso";
+"%lu encodes pending" = "%lu conversioni in sospeso";
 
 /* No comment provided by engineer. */
-"%llu jobs selected" = "%llu lavori selezionati";
+"%lu jobs selected" = "%lu lavori selezionati";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p HD";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p HD";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K Ultra HD";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K Ultra HD";
 
 /* Destination same as source alert -> message
    File already exists alert -> message */
@@ -68,6 +95,9 @@
 /* Player HUD -> audio menu */
 "Audio" = "Audio";
 
+/* Job statistics */
+"Average speed:" = "Velocità media:";
+
 /* Copy Protection Alert -> second button
    Delete preset alert -> second button
    File already exists alert -> first button
@@ -132,9 +162,6 @@
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode canceled" = "Conversione annullata";
 
-/* Queue status */
-"Encode Canceled." = "Conversione annullata.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode complete" = "Conversione completata";
 
@@ -142,12 +169,6 @@
    Queue done notification failed message */
 "Encode failed" = "Conversione fallita";
 
-/* Queue status */
-"Encode Failed." = "Conversione fallita.";
-
-/* Queue status */
-"Encode Finished." = "Conversione completata.";
-
 /* HBQueueItemView -> Encode state accessibility label */
 "Encode ready" = "Conversione pronta";
 
@@ -155,10 +176,13 @@
 "Encode working" = "Conversione in corso";
 
 /* No comment provided by engineer. */
-"Encoding %@\n%@" = "Converto %1$@\n%2$@";
+"Encoding %lu Jobs" = "Converto %lu lavori";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "Converto lavoro: %@";
 
 /* Job statistics */
-"Ended at:" = "Completato alle:";
+"Ended at:" = "Completato il:";
 
 /* Export presets save panel title */
 "Export preset" = "Esporta";
@@ -206,6 +230,9 @@
 /* Queue undo action name */
 "Move Jobs in Queue" = "sposta lavori nella coda";
 
+/* Queue status */
+"No encode pending" = "Nessuna conversione in sospeso";
+
 /* Preview -> accessibility label */
 "No image" = "Nessuna immagine";
 
@@ -213,6 +240,9 @@
 "No job selected" = "Nessun lavoro selezionato";
 
 /* Main Window -> Info text */
+"No Valid Preset" = "Nessun preset valido";
+
+/* Main Window -> Info text */
 "No Valid Source Found" = "Nessuna sorgente valida trovata";
 
 /* Add preset window -> picture setting */
@@ -310,6 +340,9 @@
 /* Queue undo action name */
 "Remove Jobs From Queue" = "rimuovi lavori dalla coda";
 
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "Analizzo per rendere modificabile";
+
 /* Toolbar Pause Item */
 "Resume" = "Riprendi";
 
@@ -321,7 +354,7 @@
 "Reveal destination in Finder" = "Mostra destinazione nel Finder";
 
 /* Job statistics */
-"Run time:" = "Tempo di conversione:";
+"Run time:" = "Tempo:";
 
 /* Export presets panel prompt */
 "Save" = "Salva";
@@ -349,7 +382,7 @@
 "Show Preview Window" = "Mostra finestra di anteprima";
 
 /* Job statistics */
-"Size:" = "Dim.:";
+"Size:" = "Dimensione:";
 
 /* Queue Alert -> cancel rip second button */
 "Skip Current Job" = "Salta lavoro attuale";
@@ -360,9 +393,6 @@
 /* Preferences -> Output Name Token */
 "Source" = "Sorgente";
 
-/* Add preset window -> picture setting */
-"Source Maximum" = "Massimo della sorgente";
-
 /* Toolbar Start/Stop Item */
 "Start" = "Avvia";
 
@@ -378,11 +408,15 @@
 "Start/Stop Encoding" = "Avvia/Interrompi conversione";
 
 /* Job statistics */
-"Started at:" = "Avviato alle:";
+"Started at:" = "Avviato il:";
 
-/* Toolbar Start/Stop Item */
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
 "Stop" = "Interrompi";
 
+/* Queue -> Stop action */
+"Stop action." = "Azione di interruzione.";
+
 /* Queue Alert -> cancel rip third button */
 "Stop After Current Job" = "Interrompi dopo il lavoro attuale";
 
@@ -427,15 +461,9 @@
    Rename preset window -> name alert message */
 "The preset name cannot be empty." = "Il nome del preset non può essere vuoto.";
 
-/* Queue -> Multiple instances alert informative text */
-"The queue will be shared between the instances." = "La coda sarà condivisa tra le istanze.";
-
 /* File already exists in queue alert -> message */
 "There is already a queue item for this destination." = "Un elemento della coda è già presente per questa destinazione.";
 
-/* Queue -> Multiple instances alert message */
-"There is already an instance of HandBrake running." = "Un'altra istanza di HandBrake è già in esecuzione.";
-
 /* Invalid destination alert -> informative text */
 "This is not a valid destination directory!" = "La cartella di destinazione non è valida!";
 
@@ -454,6 +482,9 @@
 /* Invalid destination alert -> message */
 "Warning!" = "Attenzione!";
 
+/* No comment provided by engineer. */
+"Working" = "Lavoro";
+
 /* Queue Alert -> cancel rip message */
 "You are currently encoding. What would you like to do?" = "Attualmente stai convertendo. Come preferisci continuare?";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/MainMenu.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/MainMenu.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/MainWindow.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/MainWindow.strings Changed

@@ -4,12 +4,12 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
 "2vD-zN-YMe.ibShadowedToolTip" = "Salva nuovo preset…";
 
-/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "3Gk-ma-r2w"; */
-"3Gk-ma-r2w.ibShadowedIsNilPlaceholder" = "";
-
 /* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
 "3w9-Iu-3u2.ibShadowedToolTip" = "Titolo da analizzare";
 
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "Aggiungi in coda";
+
 /* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
 "6E4-AG-PEh.title" = "0";
 
@@ -25,18 +25,6 @@
 /* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
 "21.title" = "HandBrake";
 
-/* Class = "NSToolbarItem"; label = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.label" = "Aggiungi titoli alla coda";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.paletteLabel" = "Aggiungi titoli alla coda";
-
-/* Class = "NSToolbarItem"; toolTip = "Add Titles To Queue"; ObjectID = "38K-hd-P5J"; */
-"38K-hd-P5J.toolTip" = "Aggiungi titoli alla coda";
-
-/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "046-kc-MnL"; */
-"046-kc-MnL.title" = "Aggiungi titoli alla coda…";
-
 /* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
 "1475.label" = "Audio";
 
@@ -94,8 +82,8 @@
 /* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
 "1989.label" = "Capitoli";
 
-/* Class = "NSTextFieldCell"; title = "DO NOT TRANSLATE THIS NIB FILE"; ObjectID = "4846"; */
-"4846.title" = "DO NOT TRANSLATE↵THIS NIB FILE";
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "Converto lavoro 1: Test.mp4";
 
 /* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
 "4905.title" = "Sorgente:";
@@ -119,13 +107,13 @@
 "4923.title" = "Preset:";
 
 /* Class = "NSPopUpButton"; ibShadowedToolTip = "Video angle to encode. Only applicable to multi-angle DVD and Blu-ray."; ObjectID = "5181"; */
-"5181.ibShadowedToolTip" = "Angolo video da convertire. Si applica solo a DVD e Blu-ray multi-angoli.";
+"5181.ibShadowedToolTip" = "Angolazione video da convertire. Si applica solo a DVD e Blu-ray multi-angolazioni.";
 
 /* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5183"; */
 "5183.title" = "OtherViews";
 
 /* Class = "NSTextFieldCell"; title = "Angle:"; ObjectID = "5185"; */
-"5185.title" = "Angolo:";
+"5185.title" = "Angolazione:";
 
 /* Class = "NSTabViewItem"; label = "Subtitles"; ObjectID = "5194"; */
 "5194.label" = "Sottotitoli";
@@ -166,9 +154,15 @@
 /* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
 "5523.ibShadowedToolTip" = "Ultimo fotogramma da comprimere.";
 
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "Aggiungi tutti i titoli alla coda";
+
 /* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
 "AhR-pK-Oz4.ibShadowedToolTip" = "Ricarica le impostazioni di conversione dal preset attualmente selezionato. Le modifiche verranno perse.";
 
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
 /* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
 "BA0-eg-2Ka.label" = "Sommario";
 
@@ -202,15 +196,6 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
 "DN4-48-aOI.ibShadowedToolTip" = "Scansiona solo il titolo specificato invece di tutti i titoli.";
 
-/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.label" = "Aggiungi in coda";
-
-/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.paletteLabel" = "Aggiungi in coda";
-
-/* Class = "NSToolbarItem"; toolTip = "Add To Queue"; ObjectID = "DZZ-Fe-wjw"; */
-"DZZ-Fe-wjw.toolTip" = "Aggiungi in coda";
-
 /* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
 "eij-Sn-QmJ.label" = "Dimensioni";
 
@@ -226,17 +211,20 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
 "HCx-ku-nF7.toolTip" = "Mostra finestra della coda";
 
-/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "INL-y9-Gwp"; */
-"INL-y9-Gwp.title" = "Aggiungi tutti i titoli alla coda";
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
 
 /* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
 "IOU-3L-nvB.title" = "Salva nuovo preset…";
 
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "Aggiungi titoli alla coda…";
+
 /* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
 "IxV-PW-oYh.title" = "Intervallo:";
 
-/* Class = "NSMenuItem"; title = "Add Title To Queue"; ObjectID = "L8z-c6-E1u"; */
-"L8z-c6-E1u.title" = "Aggiungi titolo alla coda";
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "Progresso";
 
 /* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
 "OYP-3T-FnA.title" = "Preset selezionato";
@@ -262,9 +250,18 @@
 /* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
 "qhv-9l-2FH.toolTip" = "Mostra elenco preset";
 
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "Aggiungi in coda";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "Aggiungi in coda";
+
 /* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
 "rfK-nQ-Aq2.title" = "In:";
 
+/* Class = "NSMenuItem"; title = "Reveal in Finder"; ObjectID = "rK6-EB-N9Z"; */
+"rK6-EB-N9Z.title" = "Mostra nel Finder";
+
 /* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.label" = "Pausa";
 
@@ -274,3 +271,6 @@
 /* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
 "wTQ-KF-5KW.toolTip" = "Metti la conversione in pausa";
 
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "Box";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/Preferences.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/Preferences.strings Changed

@@ -112,9 +112,6 @@
 /* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
 "399.title" = "Usa libdvdnav (al posto di libdvdread)";
 
-/* Class = "NSTextFieldCell"; title = "DVD Reader:"; ObjectID = "443"; */
-"443.title" = "Lettore DVD:";
-
 /* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
 "449.title" = "Nessuno";
 
@@ -187,8 +184,8 @@
 /* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
 "BPU-E2-N8l.title" = "Rimuovi automaticamente gli elementi completati";
 
-/* Class = "NSTextFieldCell"; title = "Title Scan:"; ObjectID = "c0L-TU-WML"; */
-"c0L-TU-WML.title" = "Scansione titoli:";
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "Scansione:";
 
 /* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
 "cqp-xU-GOe.title" = "Codificatore:";
@@ -211,12 +208,30 @@
 /* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
 "GQJ-go-PoN.title" = "Sommario:";
 
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "Numero di conversioni simultanee:";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
+
 /* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
 "klQ-DW-Kc6.title" = "secondi";
 
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "Mantieni le modifiche del preset quando selezioni un nuovo titolo";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
 /* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
 "lgn-RF-k0d.title" = "Rimuovi i vecchi resoconti dalla cartella dei Resoconti di attività dopo 30 giorni";
 
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "Valori più alti possono aiutare a utilizzare completamente la CPU se una singola codifica non può riesce ad utilizzare tutti i core CPU disponibili.";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
 /* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
 "PaR-zw-opS.ibShadowedToolTip" = "Minimo spazio libero sul disco di destinazione.";
 
@@ -226,15 +241,24 @@
 /* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
 "Tk3-Ig-fFI.ibShadowedToolTip" = "Trascina le etichette nel campo Formato per comporre un formato del nome.";
 
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "OtherViews";
+
 /* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
 "Uxv-oN-c1r.title" = "Ripristina a \"Non far nulla\" all'avvio";
 
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "Preset:";
+
 /* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
 "wo5-iR-2mb.title" = "Rimuovi la punteggiatura comune";
 
 /* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
 "yG9-mz-tqQ.title" = "Metti in pausa la coda se lo spazio sul disco è minore di:";
 
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
+
 /* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
 "Zqz-Kn-xOS.title" = "Mostra il pannello apri sorgente";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/Presets.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/Presets.strings Changed

@@ -1,11 +1,11 @@
-/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
-"4tC-UE-40G.title" = "Text Cell";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "Crea un nuovo preset personalizzato basandosi sulle impostazioni attualmente selezionate.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Delete Preset"; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibExternalAccessibilityDescription" = "Elimina preset";
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "Elimina il preset selezionato.";
 
-/* Class = "NSButton"; ibShadowedToolTip = "Delete the selected preset."; ObjectID = "b3V-8w-euU"; */
-"b3V-8w-euU.ibShadowedToolTip" = "Elimina il preset selezionato.";
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "Text Cell";
 
 /* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
 "cm5-Kl-dB3.title" = "Reimposta preset ufficiali";
@@ -16,12 +16,6 @@
 /* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
 "Io0-Vm-Qez.title" = "Nuova categoria";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "New Preset"; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibExternalAccessibilityDescription" = "Nuovo preset";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Create a new custom preset based on the currently selected settings."; ObjectID = "kfi-wq-mgV"; */
-"kfi-wq-mgV.ibShadowedToolTip" = "Crea un nuovo preset personalizzato basandosi sulle impostazioni attualmente selezionate.";
-
 /* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
 "LQk-kD-5sj.title" = "Menu delle azioni sui preset";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/SubtitlesDefaults.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/SubtitlesDefaults.strings Changed

@@ -70,18 +70,9 @@
 /* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
 "OOC-GZ-OFA.ibShadowedToolTip" = "Ricerca audio stranieri scansiona la sorgente per brevi sequenze di audio straniero o alieno che vengono visualizzate di default.";
 
-/* Class = "NSButtonCell"; title = "Show All"; ObjectID = "PiQ-bA-7P1"; */
-"PiQ-bA-7P1.title" = "Mostra tutte";
-
 /* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
 "Px8-G6-NVX.ibShadowedToolTip" = "Sovraimprime la prima traccia sottotitoli Blu-ray selezionata. Tutte le altre tracce sottotitoli Blu-ray saranno scartate. Usa questa opzione se il software o il dispositivo di riproduzione non supporta i sottotitoli Blu-ray.\n\nÈ possibile sovraimprimere solo una traccia di sottotitoli.";
 
-/* Class = "NSButton"; ibExternalAccessibilityDescription = "Show all subtitles languages"; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibExternalAccessibilityDescription" = "Mostra tutte le lingue";
-
-/* Class = "NSButton"; ibShadowedToolTip = "Show all subtitles languages in the Languages list."; ObjectID = "QAt-5X-NBT"; */
-"QAt-5X-NBT.ibShadowedToolTip" = "Mostra tutte le lingue nell'elenco delle Lingue.";
-
 /* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
 "QRd-XH-6TH.title" = "Traccia audio sottotitoli straniera";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/it.lproj/Video.strings -> HandBrake-1.5.1.tar.xz/macosx/it.lproj/Video.strings Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/module.defs -> HandBrake-1.5.1.tar.xz/macosx/module.defs Changed

@@ -4,7 +4,6 @@
 MACOSX.src/   = $(SRC/)macosx/
 MACOSX.build/ = $(BUILD/)macosx/
 MACOSX.xroot/ = $(BUILD/)xroot/
-MACOSX.xarchive/ = $(BUILD/)xroot/HandBrake/
 
 MACOSX.m4.in  = $(wildcard $(MACOSX.src/)*.m4)
 MACOSX.m4.out = $(MACOSX.m4.in:$(MACOSX.src/)%.m4=$(MACOSX.build/)%)
@@ -33,6 +32,12 @@
 MACOSX.map.g.std  = debug
 MACOSX.map.g.max  = debug
 
+## mapping from symbolic optimization value to actual level
+MACOSX.map.O.none            = 0
+MACOSX.map.O.size            = s
+MACOSX.map.O.size-aggressive = z
+MACOSX.map.O.speed           = 3
+
 ## xcconfig: must be one of macosx/xcconfig/*.xcconfig
 MACOSX.xcconfig = $(foreach x,$(XCODE.xcconfig),-xcconfig $(MACOSX.src/)xcconfig/$(x))
 MACOSX.sdk      = $(foreach sdk,$(GCC.sysroot),-sdk $(sdk))
@@ -63,47 +68,85 @@
         EXTERNAL_DRIVER='$(XCODE.driver)' \
         EXTERNAL_GOALS='$(3)' \
         EXTERNAL_JOBS='$(MACOSX.JOBS)' \
+        EXTERNAL_O='$(MACOSX.map.O.$(MACOSX.GCC.O))' \
         EXTERNAL_VARS='$(-*-command-variables-*-)' \
         \
         $(MACOSX.extra_cflags) \
         \
         $(2) )
 
-MACOSX.XCODE_ARCHIVE = $(strip \
-    $(XCODEBUILD.exe) \
-        $(MACOSX.project) \
-        $(foreach t,$(1),-scheme $t) \
-        $(MACOSX.configuration) \
-        $(MACOSX.xcconfig) \
-        \
-        SYMROOT='$(XCODE.symroot)' \
-        CONFIGURATION_BUILD_DIR='$(XCODE.symroot)' \
-        CONFIGURATION_TEMP_DIR='$(XCODE.symroot)' \
-        \
-        -derivedDataPath '$(MACOSX.xarchive/)' \
-        -archivePath '$(MACOSX.xarchive/)' \
-        \
-        EXTERNAL_BUILD='$(abspath $(BUILD))' \
-        EXTERNAL_CONF_ARGS='$(CONF.args)' \
-        EXTERNAL_DRIVER='$(XCODE.driver)' \
-        EXTERNAL_GOALS='$(3)' \
-        EXTERNAL_JOBS='$(MACOSX.JOBS)' \
-        EXTERNAL_VARS='$(-*-command-variables-*-)' \
-        \
-        $(MACOSX.extra_cflags) \
-        \
-        $(2) ) ; $(strip \
-    $(XCODEBUILD.exe) \
-        -exportArchive \
-        -exportOptionsPlist '$(MACOSX.src/)archive.plist' \
-        -exportPath '$(MACOSX.xarchive/)' \
-        -archivePath '$(MACOSX.xarchive/)' )
-
-ifeq (1,$(SECURITY.sandbox))
-    MACOSX.SIGN = $(strip $(MACOSX.src/)hbsign -sr '$(ID)' $(MACOSX.xroot/)HandBrake.app $(MACOSX.xroot/)HandBrakeCLI)
-else
-    MACOSX.SIGN = $(strip $(MACOSX.src/)hbsign -r '$(ID)' $(MACOSX.xroot/)HandBrake.app $(MACOSX.xroot/)HandBrakeCLI)
-endif
+MACOSX.SIGN.flags = $(if $(filter 1,$(SECURITY.sandbox)),-sr,-r)
+MACOSX.SIGN.id = $(if $(ID),$(ID),-)
+MACOSX.SIGN = $(strip $(MACOSX.src/)hbsign $(MACOSX.SIGN.flags) '$(MACOSX.SIGN.id)' $(MACOSX.xroot/)HandBrake.app $(MACOSX.xroot/)HandBrakeCLI)
 
 MACOSX.NOTARIZE = $(strip $(MACOSX.src/)hbnotarize '$(USERNAME)' $(MACOSX.xroot/)HandBrake.app $(MACOSX.xroot/)HandBrakeCLI)
 
+###############################################################################
+##
+## Universal binary
+##
+###############################################################################
+
+MACOSX.UB.xcconfigs = osx1013.arm64 osx1013.x86_64
+MACOSX.UB.builds    = $(wildcard $(foreach n,$(MACOSX.UB.xcconfigs),$(SRC/)build.$n))
+MACOSX.UB.first     = $(word 1,$(MACOSX.UB.xcconfigs))
+MACOSX.UB.more      = $(wordlist 2,999,$(MACOSX.UB.xcconfigs))
+
+MACOSX.UB.products/ = $(MACOSX.xroot/)
+
+MACOSX.UB.app/         = HandBrake.app/Contents/
+MACOSX.UB.frameworks/  = $(MACOSX.UB.app/)Frameworks/
+MACOSX.UB.xpcServices/ = $(MACOSX.UB.app/)XPCServices/
+
+MACOSX.UB.contents = $(MACOSX.UB.app/)MacOS/HandBrake \
+              $(MACOSX.UB.frameworks/)HandBrakeKit.framework/Versions/A/HandBrakeKit \
+              $(MACOSX.UB.frameworks/)Sparkle.framework/Versions/A/Sparkle \
+              $(MACOSX.UB.frameworks/)Sparkle.framework/Versions/A/Autoupdate \
+              $(MACOSX.UB.frameworks/)Sparkle.framework/Versions/A/Updater.app/Contents/MacOS/Updater \
+              $(MACOSX.UB.xpcServices/)HandBrakeXPCService.xpc/Contents/MacOS/HandBrakeXPCService \
+              $(MACOSX.UB.xpcServices/)HandBrakeXPCService2.xpc/Contents/MacOS/HandBrakeXPCService2 \
+              $(MACOSX.UB.xpcServices/)HandBrakeXPCService3.xpc/Contents/MacOS/HandBrakeXPCService3 \
+              $(MACOSX.UB.xpcServices/)HandBrakeXPCService4.xpc/Contents/MacOS/HandBrakeXPCService4 \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.Downloader.xpc/Contents/MacOS/org.sparkle-project.Downloader \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.InstallerConnection.xpc/Contents/MacOS/org.sparkle-project.InstallerConnection \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/org.sparkle-project.InstallerLauncher \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Autoupdate \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.InstallerLauncher.xpc/Contents/MacOS/Updater.app/Contents/MacOS/Updater \
+              $(MACOSX.UB.xpcServices/)org.sparkle-project.InstallerStatus.xpc/Contents/MacOS/org.sparkle-project.InstallerStatus
+
+MACOSX.UB.BUILD = $(SRC/)configure --force --build=$(BUILD/)ub.$(1) --xcode-config=$(1) $(CONF.args) --launch
+
+## linefeed is important
+define MACOSX.UB.BUILD.item
+    $(call MACOSX.UB.BUILD,$(1)) --launch-jobs=0
+
+endef
+
+define MACOSX.UB.BUILD.SERIAL
+    $(foreach n,$(MACOSX.UB.xcconfigs),$(call MACOSX.UB.BUILD.item,$n))
+endef
+
+define MACOSX.UB.BUILD.lipo
+    $(LIPO.exe) $(foreach n,$(MACOSX.UB.xcconfigs),ub.$n/$(MACOSX.UB.products/)$1) -create -output $(MACOSX.UB.products/)$1
+
+endef
+
+define MACOSX.UB.COMBINE
+    $(RM.exe) -fr $(MACOSX.UB.products/)
+    $(MKDIR.exe) -p $(MACOSX.UB.products/)
+
+    $(CP.exe) ub.$(MACOSX.UB.first)/$(MACOSX.UB.products/)HandBrakeCLI $(MACOSX.UB.products/).
+    $(LIPO.exe) $(foreach n,$(MACOSX.UB.xcconfigs),ub.$n/$(MACOSX.UB.products/)HandBrakeCLI) -create -output $(MACOSX.UB.products/)HandBrakeCLI
+
+    $(CP.exe) -R ub.$(MACOSX.UB.first)/$(MACOSX.UB.products/)HandBrake.app $(MACOSX.UB.products/).
+    $(foreach n,$(MACOSX.UB.contents),$(call MACOSX.UB.BUILD.lipo,$n))
+
+    @sync
+    @echo ""
+    @echo "$@: { $(MACOSX.UB.xcconfigs) } combined -> $(MACOSX.UB.products/)HandBrakeCLI"
+    @echo "$@: UB executable size: `du -sh $(MACOSX.UB.products/)HandBrakeCLI | awk '{ print $$1 }'`"
+    @echo ""
+    @echo "$@: { $(MACOSX.UB.xcconfigs) } combined -> $(MACOSX.UB.products/)HandBrake.app"
+    @echo "$@: UB executable size: `du -sh $(MACOSX.UB.products/)$(1) | awk '{ print $$1 }'`"
+    @echo ""
+endef

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/module.rules -> HandBrake-1.5.1.tar.xz/macosx/module.rules Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/macosx/module.xcodebuild -> HandBrake-1.5.1.tar.xz/macosx/module.xcodebuild Changed

@@ -1,18 +1,20 @@
 ## This file is processed only when shunting build through xcodebuild
 
-.PHONY: macosx.build macosx.sign macosx.notarize macosx.archive macosx.clean macosx.install macosx.install-strip macosx.uninstall
+.PHONY: macosx.build macosx.ub macosx.sign macosx.notarize macosx.clean macosx.install macosx.install-strip macosx.uninstall
 
 macosx.build:
 	$(call MACOSX.XCODE,HandBrakeCLI HandBrake,build)
 
+macosx.ub:
+	$(call MACOSX.UB.BUILD.SERIAL)
+	$(call MACOSX.UB.COMBINE)
+	$(call MACOSX.SIGN)
+
 macosx.sign:
-	$(call MACOSX.SIGN,HandBrakeCLI HandBrake,sign)
+	$(call MACOSX.SIGN)
 
 macosx.notarize:
-	$(call MACOSX.NOTARIZE,HandBrakeCLI HandBrake,notarize)
-
-macosx.archive:
-	$(call MACOSX.XCODE_ARCHIVE,HandBrake-Distribution,archive)
+	$(call MACOSX.NOTARIZE)
 
 macosx.clean:
 	$(call MACOSX.XCODE,HandBrakeCLI HandBrake,clean)
@@ -34,9 +36,9 @@
 	$(RM.exe) -f $(PREFIX/)bin/HandBrakeCLI
 
 build: macosx.build
+ub: macosx.ub
 sign: macosx.sign
 notarize: macosx.notarize
-archive: macosx.archive
 clean: macosx.clean
 install: macosx.install
 install-strip: macosx.install-strip
@@ -45,7 +47,7 @@
 
 ###############################################################################
 
-MACOSX.goals = $(filter-out build sign notarize archive clean install,$(MAKECMDGOALS))
+MACOSX.goals = $(filter-out build ub sign notarize clean install,$(MAKECMDGOALS))
 
 $(MACOSX.goals): __goals__
 	@true

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/AddPreset.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "5Xb-gz-QEa"; */
+"5Xb-gz-QEa.title" = "Cancelar";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a description for the new preset. The description will be shown when hovering the cursor over the preset in the presets list."; ObjectID = "8kl-Sh-Gh7"; */
+"8kl-Sh-Gh7.ibShadowedToolTip" = "Digite uma descrição para a nova predefinição. A descrição será mostrada ao pairar o cursor sobre a predefinição na lista predefinições.";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "75B-xq-Qbe"; */
+"75B-xq-Qbe.title" = "Limite de Resolução:";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "a0j-nw-n23"; */
+"a0j-nw-n23.title" = "Comportamento de seleção...";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "aez-2b-JXx"; */
+"aez-2b-JXx.ibShadowedToolTip" = "O Comportamento de Seleção determina as faixas e as configurações usadas quando a pré-configuração é selecionada.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a name for the new preset. This name will be displayed in the presets list."; ObjectID = "aKg-n4-OUS"; */
+"aKg-n4-OUS.ibShadowedToolTip" = "Digite um nome para a nova predefinição. Este nome será exibido na lista predefinições.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Picture Size controls how video dimensions are applied when selecting the preset.\n\nNone uses the currently set dimensions.\n\nCustom allows you to set a maximum width and/or height.\n\nSource maximum uses the full dimensions of each source."; ObjectID = "bma-pS-phM"; */
+"bma-pS-phM.ibShadowedToolTip" = "O Tamanho da imagem controla como as dimensões do vídeo são aplicadas ao selecionar a predefinição.\n\nNenhum deles usa as dimensões atualmente definidas.\n\nO personalizado permite definir uma largura máxima e/ou altura.\n\nO máximo de origem usa todas as dimensões de cada fonte.";
+
+/* Class = "NSWindow"; title = "New Preset"; ObjectID = "dbZ-Wo-9nG"; */
+"dbZ-Wo-9nG.title" = "Nova Predefinição";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "Deg-rS-mRc"; */
+"Deg-rS-mRc.title" = "Adicionar";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Width"; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibExternalAccessibilityDescription" = "Largura de imagem";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width."; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibShadowedToolTip" = "Largura máxima de armazenamento de vídeo em pixels permitida pela predefinição. Definido para 0 para largura ilimitada.";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "hc8-1h-Jye"; */
+"hc8-1h-Jye.title" = "Descrição:";
+
+/* Class = "NSTextFieldCell"; title = "Audio:"; ObjectID = "HKp-K9-MF4"; */
+"HKp-K9-MF4.title" = "Áudio:";
+
+/* Class = "NSTextFieldCell"; title = "Category:"; ObjectID = "IyE-Lz-32s"; */
+"IyE-Lz-32s.title" = "Categoria:";
+
+/* Class = "NSTextFieldCell"; title = "Preset Name:"; ObjectID = "jhj-Et-ncF"; */
+"jhj-Et-ncF.title" = "Nome Atual:";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "LPX-Rc-KLa"; */
+"LPX-Rc-KLa.title" = "Comportamento de seleção...";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Height"; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibExternalAccessibilityDescription" = "Altura da imagem";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height."; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibShadowedToolTip" = "Altura máxima de armazenamento de vídeo em pixels permitida pela predefinição. Ajuste para 0 para altura ilimitada.";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "Nfk-ix-xIv"; */
+"Nfk-ix-xIv.title" = "x";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "nWJ-0b-fUA"; */
+"nWJ-0b-fUA.ibShadowedToolTip" = "O Comportamento de Seleção determina as faixas e as configurações usadas quando a pré-configuração é selecionada.";
+
+/* Class = "NSTextFieldCell"; title = "Subtitles:"; ObjectID = "OYE-GG-Vo3"; */
+"OYE-GG-Vo3.title" = "Legendas:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qsA-gt-zdK"; */
+"qsA-gt-zdK.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "Sf8-HP-mhE"; */
+"Sf8-HP-mhE.title" = "Nova categoria...";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tQ1-PN-kvh"; */
+"tQ1-PN-kvh.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Resolution Limit allows you to set a maximum width and/or height."; ObjectID = "z6B-ig-ouq"; */
+"z6B-ig-ouq.ibShadowedToolTip" = "O limite de resolução permite que você defina o limite máximo de largura e de altura.";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Audio.strings Added

@@ -0,0 +1,150 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibExternalAccessibilityDescription" = "Ganho";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibShadowedToolTip" = "Ganho de áudio em decibéis (dB). Aumenta ou diminui o volume de áudio.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "5xO-DR-4cR"; */
+"5xO-DR-4cR.headerCell.title" = "Ganho";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibExternalAccessibilityDescription" = "Faixa selecionada";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio language and type."; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibShadowedToolTip" = "Tipo e Idioma do Audio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "6Iz-D8-zzz"; */
+"6Iz-D8-zzz.title" = "Célula de Texto";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "7sz-4X-5jA"; */
+"7sz-4X-5jA.headerCell.title" = "Faixa";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aaP-HB-s4f"; */
+"aaP-HB-s4f.title" = "Célula de Texto";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "AMA-Ul-v2f"; */
+"AMA-Ul-v2f.title" = "Adicionar Todas as Faixas";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "aYF-d5-Ya6"; */
+"aYF-d5-Ya6.title" = "Comportamento de seleção...";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "BBQ-FP-aQN"; */
+"BBQ-FP-aQN.ibExternalAccessibilityDescription" = "Ganho";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "eAS-E5-fip"; */
+"eAS-E5-fip.headerCell.title" = "Rdc";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "eFn-1M-3hk"; */
+"eFn-1M-3hk.title" = "Célula de Texto";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "fqs-Q8-hNY"; */
+"fqs-Q8-hNY.title" = "Remova todas as faixas";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "gtC-MM-esd"; */
+"gtC-MM-esd.ibShadowedToolTip" = "Ganho de áudio em decibéis (dB). Aumenta ou diminui o volume de áudio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "HKE-hO-jOm"; */
+"HKE-hO-jOm.title" = "Célula de Texto";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hlm-8l-ATk"; */
+"hlm-8l-ATk.ibShadowedIsNilPlaceholder" = "Auto";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "HM0-a4-pm5"; */
+"HM0-a4-pm5.title" = "Adicionar Todas as Faixas";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Ifq-hI-oCs"; */
+"Ifq-hI-oCs.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "jub-Uq-qYL"; */
+"jub-Uq-qYL.headerCell.title" = "Taxa de amostragem";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "kmi-ru-dRe"; */
+"kmi-ru-dRe.title" = "Célula de Texto";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "l8E-uG-8fo"; */
+"l8E-uG-8fo.title" = "Célula de Texto";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibExternalAccessibilityDescription" = "Mixagem";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibShadowedToolTip" = "Tipo de mistura. Controla como o áudio multicanal é misturado em menos canais ou se os canais originais são preservados.\n\nDolby Surround e Dolby Pro Logic II convertem áudio multicanal em canais estéreo e matriz codificam canais adicionais para reprodução surround em equipamentos compatíveis, mantendo a compatibilidade estéreo.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "lnO-sZ-6xv"; */
+"lnO-sZ-6xv.headerCell.title" = "Codec";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "MZ7-W1-uGl"; */
+"MZ7-W1-uGl.title" = "Célula de Texto";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "nII-CW-aWc"; */
+"nII-CW-aWc.ibExternalAccessibilityDescription" = "Rdc";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "o3M-fP-6Ps"; */
+"o3M-fP-6Ps.ibShadowedToolTip" = "Compressão dinâmica de alcance. Reduz a diferença de volume entre sons altos e silenciosos. Só se aplica às faixas de origem AC-3 ao codificar para outro formato.\n\n0: Não aplique RDC.\n1: Aplique RDC de acordo com as dicas de compressão incorporadas na faixa de origem.\n\nValores maiores que 1 aumentam ainda mais o volume de sons silenciosos. Valores superiores a 2,5 são tipicamente desnecessários e podem introduzir distorção audível.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "obP-lK-sY0"; */
+"obP-lK-sY0.headerCell.title" = "Bitrate";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "Pfh-Bc-83k"; */
+"Pfh-Bc-83k.title" = "Faixas";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "q2P-Tg-cBJ"; */
+"q2P-Tg-cBJ.title" = "Recarregar";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Q4T-80-wxf"; */
+"Q4T-80-wxf.title" = "0";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibExternalAccessibilityDescription" = "Taxa de amostragem";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibShadowedToolTip" = "Taxa de amostra de áudio em kilohertz (kHz). Auto é recomendado.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibExternalAccessibilityDescription" = "Bitrate";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibShadowedToolTip" = "Taxa de bits de áudio em kilobits por segundo (kbps). Valores menores reduzem a qualidade do áudio. Valores maiores usam mais dados e podem ser menos compatíveis.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "qS7-Xr-9N8"; */
+"qS7-Xr-9N8.headerCell.title" = "Mixagem";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "sq7-Ux-T6D"; */
+"sq7-Ux-T6D.title" = "Recarregar";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "TK6-fY-4Sk"; */
+"TK6-fY-4Sk.title" = "Comportamento de seleção...";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibExternalAccessibilityDescription" = "Codec";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibShadowedToolTip" = "Codificador de áudio.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "U4U-1b-rQF"; */
+"U4U-1b-rQF.title" = "Célula de Texto";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure audio tracks Selection Behavior. These settings affect which tracks will be added to the audio tracks list, and the settings used for each track."; ObjectID = "vFP-nq-IQg"; */
+"vFP-nq-IQg.ibShadowedToolTip" = "Configurar faixas de áudio Comportamento de seleção. Essas configurações afetam quais faixas serão adicionadas à lista de faixas de áudio e às configurações usadas para cada faixa.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Vxo-66-Mrx"; */
+"Vxo-66-Mrx.title" = "OutrosViews";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the audio tracks list using the configured Selection Behavior."; ObjectID = "wcL-rL-aYS"; */
+"wcL-rL-aYS.ibShadowedToolTip" = "Recarregue a lista de faixas de áudio usando o comportamento de seleção configurado.";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Audio tracks"; ObjectID = "yix-PF-sqH"; */
+"yix-PF-sqH.ibExternalAccessibilityDescription" = "Faixas de áudio";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "YlA-ue-5oE"; */
+"YlA-ue-5oE.title" = "Remova todas as faixas";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibExternalAccessibilityDescription" = "Rdc";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibShadowedToolTip" = "Compressão dinâmica de alcance. Reduz a diferença de volume entre sons altos e silenciosos. Só se aplica às faixas de origem AC-3 ao codificar para outro formato.\n\n0: Não aplique RDC.\n1: Aplique RDC de acordo com as dicas de compressão incorporadas na faixa de origem.\n\nValores maiores que 1 aumentam ainda mais o volume de sons silenciosos. Valores superiores a 2,5 são tipicamente desnecessários e podem introduzir distorção audível.";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Audio tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the audio Selection Behavior dialog."; ObjectID = "Yzu-Rk-hTv"; */
+"Yzu-Rk-hTv.ibShadowedToolTip" = "Lista de faixas de áudio. O comportamento e as configurações de seleção de faixa são carregados a partir da pré-definição selecionada e podem ser configurados usando a caixa de diálogo Comportamento de Seleção de áudio.";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/AudioDefaults.strings Added

@@ -0,0 +1,216 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "0HY-xB-cvO"; */
+"0HY-xB-cvO.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar o FLAC. Isso permite que o passthru FLAC seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "0kT-0J-3k2"; */
+"0kT-0J-3k2.headerCell.title" = "Mixagem";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1XC-VS-X3g"; */
+"1XC-VS-X3g.title" = "Célula de Texto";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "3o5-Gn-Vao"; */
+"3o5-Gn-Vao.title" = "Célula de Texto";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibExternalAccessibilityDescription" = "Codec";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibShadowedToolTip" = "Codificador de áudio.";
+
+/* Class = "NSTextFieldCell"; title = "Audio encoder settings for each selected track:"; ObjectID = "007-WM-RmC"; */
+"007-WM-RmC.title" = "Configurações de codificador de áudio para cada faixa selecionada:";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "7sl-o7-pUh"; */
+"7sl-o7-pUh.title" = "Célula de Texto";
+
+/* Class = "NSButtonCell"; title = "DTS"; ObjectID = "8mC-Wx-myL"; */
+"8mC-Wx-myL.title" = "Dts";
+
+/* Class = "NSButtonCell"; title = "Use only first encoder for secondary audio"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "Use apenas o primeiro codificador para áudio secundário";
+
+/* Class = "NSTextFieldCell"; title = "Passthru Fallback:"; ObjectID = "AQe-Sg-Qgh"; */
+"AQe-Sg-Qgh.title" = "Passthru Fallback:";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Audio Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "Linguagens de Faixa de Áudio";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "Selecione os idiomas a serem usados com a configuração Comportamento de seleção de faixas.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibExternalAccessibilityDescription" = "Rdc";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibShadowedToolTip" = "Compressão dinâmica de alcance. Reduz a diferença de volume entre sons altos e silenciosos. Só se aplica às faixas de origem AC-3 ao codificar para outro formato.\n\n0: Não aplique RDC.\n1: Aplique RDC de acordo com as dicas de compressão incorporadas na faixa de origem.\n\nValores maiores que 1 aumentam ainda mais o volume de sons silenciosos. Valores superiores a 2,5 são tipicamente desnecessários e podem introduzir distorção audível.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports E-AC3. This permits E-AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "BK7-c4-kkk"; */
+"BK7-c4-kkk.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar o E-AC3. Isso permite que o E-AC3 passthru seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSButtonCell"; title = "AAC"; ObjectID = "cUX-iP-UAs"; */
+"cUX-iP-UAs.title" = "AAC";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibExternalAccessibilityDescription" = "Ganho";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibShadowedToolTip" = "Ganho de áudio em decibéis (dB). Aumenta ou diminui o volume de áudio.";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibExternalAccessibilityDescription" = "Rdc";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibShadowedToolTip" = "Compressão dinâmica de alcance. Reduz a diferença de volume entre sons altos e silenciosos. Só se aplica às faixas de origem AC-3 ao codificar para outro formato.\n\n0: Não aplique RDC.\n1: Aplique RDC de acordo com as dicas de compressão incorporadas na faixa de origem.\n\nValores maiores que 1 aumentam ainda mais o volume de sons silenciosos. Valores superiores a 2,5 são tipicamente desnecessários e podem introduzir distorção audível.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "dpw-He-8eZ"; */
+"dpw-He-8eZ.title" = "Célula de Texto";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "DxT-bF-prJ"; */
+"DxT-bF-prJ.ibShadowedIsNilPlaceholder" = "Auto";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "E93-Md-aWa"; */
+"E93-Md-aWa.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar ODTs. Isso permite que o DTS passthru seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fgl-Ev-ELt"; */
+"fgl-Ev-ELt.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar o AC3. Isso permite que o AC3 passthru seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "fH9-oV-QdJ"; */
+"fH9-oV-QdJ.title" = "Célula de Texto";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fzd-MO-xaB"; */
+"fzd-MO-xaB.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar o AAC. Isso permite que o passthru AAC seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "Comportamento de Seleção de Faixa:";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "Ative isto se o dispositivo de reprodução for compatível com MP2. Isso permite que o MP2 passe direto para ser selecionado quando a seleção de passagem direta automática for ativada.";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "Todos os Idiomas Selecionados Correspondentes";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibExternalAccessibilityDescription" = "Bitrate";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibShadowedToolTip" = "Taxa de bits de áudio em kilobits por segundo (kbps). Valores menores reduzem a qualidade do áudio. Valores maiores usam mais dados e podem ser menos compatíveis.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibExternalAccessibilityDescription" = "Mixagem";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibShadowedToolTip" = "Tipo de mistura. Controla como o áudio multicanal é misturado em menos canais ou se os canais originais são preservados.\n\nDolby Surround e Dolby Pro Logic II convertem áudio multicanal em canais estéreo e matriz codificam canais adicionais para reprodução surround em equipamentos compatíveis, mantendo a compatibilidade estéreo.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "IxI-o9-jMs"; */
+"IxI-o9-jMs.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar o DTS-HD. Isso permite que o passthru DTS-HD seja selecionado quando o passthru automático está ativado.";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "Primeiros idiomas selecionados correspondentes";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Jn4-1L-J1g"; */
+"Jn4-1L-J1g.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "kDe-1L-VkD"; */
+"kDe-1L-VkD.title" = "OK";
+
+/* Class = "NSWindow"; title = "Audio Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "Comportamento de Seleção de Áudio";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder to use when a track suitable for passthru is unavailable."; ObjectID = "LdN-Cx-ZJY"; */
+"LdN-Cx-ZJY.ibShadowedToolTip" = "Codificador de áudio para usar quando uma faixa adequada para passthru não estiver disponível.";
+
+/* Class = "NSButtonCell"; title = "DTS-HD"; ObjectID = "LX6-kc-5vq"; */
+"LX6-kc-5vq.title" = "DTS-HD";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "LxC-Qx-psh"; */
+"LxC-Qx-psh.headerCell.title" = "Taxa de amostragem";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "Idioma:";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "MiI-OV-waZ"; */
+"MiI-OV-waZ.title" = "0";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "Nenhum";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "N7h-CJ-quV"; */
+"N7h-CJ-quV.headerCell.title" = "Ganho";
+
+/* Class = "NSButtonCell"; title = "FLAC"; ObjectID = "naS-No-CdV"; */
+"naS-No-CdV.title" = "FLAC";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "Track Selection Behavior.\n\nNenhum deles selecionará nenhuma faixa de áudio por padrão.\n\nFirst Matching Selected Languages adiciona a primeira faixa de áudio que corresponde a cada um dos idiomas selecionados presentes na fonte.\n\nTodos os Idiomas Selecionados Correspondentes adicionam todas as faixas de áudio que correspondem a cada um dos idiomas selecionados presentes na fonte.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "os0-Jl-OXF"; */
+"os0-Jl-OXF.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar TrueHD. Isso permite que o TrueHD passthru seja selecionado quando o passthru automático selecion estiver ativado.";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips0 = "Add Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips0" = "Adicionar Faixa de Áudio";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips1 = "Remove Selected Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips1" = "Remover faixa de áudio selecionada";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
+"OVr-Jm-VrK.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
+"pR9-d4-SNf.headerCell.title" = "Codec";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
+"PtB-Wp-B9X.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibExternalAccessibilityDescription" = "Taxa de amostragem";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibShadowedToolTip" = "Taxa de amostra de áudio em kilohertz (kHz). Auto é recomendado.";
+
+/* Class = "NSTextFieldCell"; title = "Auto Passthru:"; ObjectID = "s6s-EH-5CB"; */
+"s6s-EH-5CB.title" = "Auto Passthru:";
+
+/* Class = "NSButtonCell"; title = "MP3"; ObjectID = "sdZ-Rx-JoG"; */
+"sdZ-Rx-JoG.title" = "MP3";
+
+/* Class = "NSButtonCell"; title = "E-AC3"; ObjectID = "u9h-dn-wcK"; */
+"u9h-dn-wcK.title" = "E-AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Only the primary audio track will be encoded with the full encoder list. All additional audio tracks will be encoded with first encoder only."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "Apenas a faixa de áudio principal será codificada com a lista completa de codificadores. Todas as faixas de áudio adicionais serão codificadas apenas com o primeiro codificador.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "uFK-z7-8Yj"; */
+"uFK-z7-8Yj.title" = "Célula de Texto";
+
+/* Class = "NSMenuItem"; title = "Item"; ObjectID = "UJy-A2-Bb1"; */
+"UJy-A2-Bb1.title" = "Item";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "vhn-7C-4aZ"; */
+"vhn-7C-4aZ.headerCell.title" = "Bitrate";
+
+/* Class = "NSButtonCell"; title = "AC3"; ObjectID = "VnE-3R-bUf"; */
+"VnE-3R-bUf.title" = "AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "vUx-OV-W5T"; */
+"vUx-OV-W5T.ibShadowedToolTip" = "Habilite isso se o dispositivo de reprodução suportar MP3. Isso permite que o MP3 passthru seja selecionado quando o passthru automático estiver ativado.";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "XKL-2e-Dlv"; */
+"XKL-2e-Dlv.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibExternalAccessibilityDescription" = "Ganho";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibShadowedToolTip" = "Ganho de áudio em decibéis (dB). Aumenta ou diminui o volume de áudio.";
+
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
+/* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
+"z9d-P3-6UP.title" = "TrueHD";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "zX9-T9-wKy"; */
+"zX9-T9-wKy.headerCell.title" = "Rdc";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/ChaptersTitles.strings Added

@@ -0,0 +1,57 @@
+/* Class = "NSTableColumn"; headerCell.title = "Index"; ObjectID = "0iF-eL-NOC"; */
+"0iF-eL-NOC.headerCell.title" = "Índice";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Export the list of chapter names to a CSV file."; ObjectID = "3SP-6e-RPS"; */
+"3SP-6e-RPS.ibShadowedToolTip" = "Exporte a lista de nomes de capítulos para um arquivo CSV.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a chapter markers track to the video."; ObjectID = "7Xf-c0-jsr"; */
+"7Xf-c0-jsr.ibShadowedToolTip" = "Adicione uma faixa de marcadores de capítulo ao vídeo.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "All-Bz-NLv"; */
+"All-Bz-NLv.title" = "Célula de Texto";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FyM-2X-9xs"; */
+"FyM-2X-9xs.title" = "Célula de Texto";
+
+/* Class = "NSTextFieldCell"; title = "1"; ObjectID = "G9p-Cg-wyC"; */
+"G9p-Cg-wyC.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Export Chapters…"; ObjectID = "h0O-zg-OF9"; */
+"h0O-zg-OF9.title" = "Capítulos de exportação...";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Chapter titles"; ObjectID = "InF-gR-Lia"; */
+"InF-gR-Lia.ibExternalAccessibilityDescription" = "Títulos de capítulos";
+
+/* Class = "NSButtonCell"; title = "Create chapter markers"; ObjectID = "lJL-wX-DVP"; */
+"lJL-wX-DVP.title" = "Criar marcadores de capítulos";
+
+/* Class = "NSTableColumn"; headerCell.title = "Start"; ObjectID = "NlF-th-Cg9"; */
+"NlF-th-Cg9.headerCell.title" = "Começo";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ozt-ED-g1M"; */
+"ozt-ED-g1M.title" = "Célula de Texto";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "pAo-XM-bvP"; */
+"pAo-XM-bvP.title" = "Célula de Texto";
+
+/* Class = "NSButtonCell"; title = "Import Chapters…"; ObjectID = "PM3-Ue-0kW"; */
+"PM3-Ue-0kW.title" = "Capítulos de importação...";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "QVB-Cw-DJD"; */
+"QVB-Cw-DJD.headerCell.title" = "Duração";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Import a list of chapter names from a CSV file."; ObjectID = "Ron-3B-rYg"; */
+"Ron-3B-rYg.ibShadowedToolTip" = "Importe uma lista de nomes de capítulos de um arquivo CSV.";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "UjY-nz-uSt"; */
+"UjY-nz-uSt.title" = "Título";
+
+/* Class = "NSTextFieldCell"; title = "Duration"; ObjectID = "Vmq-zJ-NEA"; */
+"Vmq-zJ-NEA.title" = "Duração";
+
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "Z6H-lJ-ipr"; */
+"Z6H-lJ-ipr.headerCell.title" = "Título";
+
+/* Class = "NSTextFieldCell"; title = "Timestamp"; ObjectID = "zaN-qY-tke"; */
+"zaN-qY-tke.title" = "Data/Hora";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/ExceptionAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBAddCategoryController.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "Corte da parte de baixo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "A quantidade de corte da borda de baixo em pixels.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "Corte do topo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "Corte do topo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "A maior quantidade de corte de borda em pixels.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "Gire a imagem no sentido horário em incrementos de 90 graus.";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "Personalizado";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "Crop right";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "Quantidade de corte da borda direita em pixels.";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "Nenhum";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "Automático";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "Corte da parte de baixo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "Corte do lado esquerdo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "Quantidade de corte da borda esquerda em pixels.";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "Crop right";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "Corte do lado esquerdo";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBEncodingProgressHUDController.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBFiltersViewController.strings Added

@@ -0,0 +1,210 @@
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibExternalAccessibilityDescription" = "Denoise Tune";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibShadowedToolTip" = "Denoise tune. Ajusta ainda mais a predefinição de Denoise para otimizar configurações para cenários específicos.\n\nNenhum deles usa as configurações de predefinição padrão.\n\nO filme refina as configurações para uso com a maioria dos conteúdos em live action.\n\nO grão só processa canais coloridos. Útil para preservar o visual de filme de grãos de luminância enquanto reduz ou remove o ruído de cores.\n\nHigh Motion reduz a mancha de cor em cenas de movimento alto, evitando o processamento temporal para canais de cores. Útil para vídeos de esportes e ação.\n\nAnimação é útil para animação cel, como anime e desenhos animados.\n\nA fita é útil para fontes de fita analógica de baixo detalhe, como vhs, onde o filme não produz um resultado desejável.\n\nSprite é útil para jogos bidimensionais de 1-/4-/8-/16 bits. Sprite não foi projetado para vídeo de alta definição.";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "Música:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
+"6nG-zk-FMo.ibShadowedToolTip" = "Predefinição do filtro de desinterlace.\n\nA inadimplência é bem equilibrada para velocidade e qualidade.\n\nSkip Spatial Check permite que Yadif pule a correção de certos artefatos evitáveis para um leve aumento de velocidade.\n\nO EEDI2 usa um algoritmo de interpolação mais lento e de maior qualidade para o Decomb. Útil para as fontes mais difíceis.\n\nBob tenta preservar melhor a moção para uma ligeira penalidade à resolução percebida.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
+"8am-ve-1Xl.title" = "Predefinição:";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "Personalizado:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
+"akB-JW-MPe.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
+"b6A-ax-2Ed.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "Parâmetros de sharpen personalizados.\n\nSintaxe unsharp: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nPadrão de unsharp: y-strength=0,25:y-size=7:cb-strength=0,25:cb-size=7\n\nSintaxe de lapsharp: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nPadrão de lapsharp: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "A nitidez melhora a aparência dos detalhes, especialmente as bordas. Configurações de sharpen excessivamente fortes podem danificar a qualidade da imagem criando artefatos de toque e aumentando o ruído, o que pode reduzir a eficiência da compressão.\n\nUnsharp é um filtro de mascaramento sem compartilhamento de propósito geral. Ele afia embaçado, em seguida, calculando a diferença entre a imagem borrada e o original.\n\nLapsharp afia usando núcleos de convolução aproximando filtros de borda laplaciana, às vezes produzindo resultados de maior qualidade do que mascaramento não-har.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibExternalAccessibilityDescription" = "Afiar Sintonia";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock tune. Further adjusts the Deblock preset to optimize settings for specific scenarios."; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibShadowedToolTip" = "Deblock tune. Ajusta ainda mais a predefinição do Deblock para otimizar as configurações para cenários específicos.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Deblock Preset"; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibExternalAccessibilityDescription" = "Predefinição de bloco";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibShadowedToolTip" = "O deblock reduz artefatos bloqueados causados pela compressão de vídeo de baixa qualidade.";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "Personalizado:";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "Afiar Pré-definição";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "Afiar a predefinição do filtro. Define a força do filtro.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibExternalAccessibilityDescription" = "Predefinição de denoise";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibShadowedToolTip" = "Predefinição do filtro de denoise. Define a força do filtro.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "Predefinição:";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
+"Da7-pY-5vu.title" = "Personalizado:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Detelecine removes comb artifacts that are the result of telecine, a process for converting film frame rates to television frame rates."; ObjectID = "DER-tS-cLx"; */
+"DER-tS-cLx.ibShadowedToolTip" = "A Detelecine remove artefatos de pente que são o resultado do telecine, um processo para converter taxas de quadros de filme para taxas de quadros de televisão.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
+"DI9-Ed-acp.ibShadowedToolTip" = "Parâmetros personalizados do Deblock.\n\nforça=s:thresh=t:blocksize=b";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
+"DvX-m9-Q6u.title" = "Personalizado:";
+
+/* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
+"gKq-xF-AZE.title" = "Deblock:";
+
+/* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
+"h7g-eE-vgv.title" = "Escala de cinzas";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "Afiar Sintonia";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "Afiar a melodia. Ajusta ainda mais a predefinição do Sharpen para otimizar as configurações para cenários específicos.\n\nNenhum deles usa as configurações de predefinição padrão.\n\nO unharp pode ser ajustado para afiação ultrafina, fina, média, grosseira ou muito grosseira. Selecione um com base na resolução da imagem de saída e fineza de detalhes para melhorar.\n\nA música Film da Lapsharp refina as configurações para uso com a maioria dos conteúdos de ação ao vivo. O filme usa um kernel laplaciano isotrópico para aguçar todas as bordas de forma semelhante, e as informações de luminância (brilho) são aguçadas mais do que informações de crominância (cor).\n\nA melodia de Grão de Lapsharp é semelhante ao Film, mas usa um laplacian isotrópico do kernel gaussiano para reduzir o efeito sobre o ruído e o grão. Útil para preservar grãos e como uma alternativa geral à melodia do filme.\n\nA música animação de Lapsharp é útil para animações cel, como anime e desenhos animados. A animação é idêntica ao Filme, mas a força geral é reduzida para evitar a criação de artefatos.\n\nA música Sprite da Lapsharp é útil para jogos bidimensionais de 1-/4-/8-/16 bits. O Sprite usa um kernel laplaciano de 4 vizinhos que melhora as bordas verticais e horizontais mais do que as bordas diagonais.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "Predefinição da suavização do croma";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "Espaço de cor:";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "Música:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
+"IHH-Se-l6d.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise reduces or removes the appearance of noise and grain. This can improve compression efficiency and create higher quality video at smaller file sizes. Overly strong Denoise settings may damage picture quality by discarding detail.\n\nNLMeans is a high quality denoise filter with a cost to speed. Use where quality is more important than speed.\n\nHQDN3D is an adaptive low-pass filter, faster than NLMeans but less effective at preserving fine detail."; ObjectID = "ins-7X-kbN"; */
+"ins-7X-kbN.ibShadowedToolTip" = "Denoise reduz ou remove a aparência de ruído e grãos. Isso pode melhorar a eficiência da compressão e criar vídeos de maior qualidade em tamanhos de arquivo menores. Configurações de denoise excessivamente fortes podem danificar a qualidade da imagem descartando detalhes.\n\nNLMeans é um filtro de denoise de alta qualidade com um custo para acelerar. Use onde a qualidade é mais importante do que a velocidade.\n\nHQDN3D é um filtro de baixa passagem adaptativo, mais rápido do que o NLMeans, mas menos eficaz na preservação de detalhes finos.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom deleteline settings."; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibExternalAccessibilityDescription" = "Configurações personalizadas de exclusão.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Detelecine parameters.\n\nSyntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0"; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibShadowedToolTip" = "Parâmetros detelecina personalizados.\n\nSintaxe: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nPadrão: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
+"IQG-Nn-HTb.ibShadowedToolTip" = "A detecção de entrelaçamento, quando habilitada, permite que o filtro Deinterlace processe apenas quadros de vídeo entrelaçados.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "Ajuste da suavização do croma";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "Ajuste da suavização do croma. Ajusta ainda mais a predefinição do ajuste da suavização do croma para otimizar as configurações em cenários específicos.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
+"KiY-kz-54k.title" = "Personalizado:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
+"n6U-tH-vo0.title" = "Personalizado:";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "Personalizado:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
+"pIO-dE-81w.title" = "OutrosViews";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
+"Psx-nN-XiT.ibShadowedToolTip" = "A escala de cinza remove o componente de cor do vídeo. Muitas vezes referido como vídeo Black & White.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
+"PyP-FP-gGx.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qey-Yo-9sX"; */
+"qey-Yo-9sX.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
+"Qz4-EY-GFO.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
+"r64-vI-ymx.ibShadowedToolTip" = "Parâmetros personalizados do Deinterlace.\n\nSintaxe yadif: mode=m:parity=p\n\nPadrão yadif: mode=3\n\nSintaxe decomb: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nPadrão de decomb: mode=7";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rfp-ah-CVB"; */
+"rfp-ah-CVB.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Interlace Detection parameters.\n\nSyntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16"; ObjectID = "rPg-F2-gtl"; */
+"rPg-F2-gtl.ibShadowedToolTip" = "Parâmetros personalizados de detecção de entrelaçamento.\n\nSintaxe: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nPadrão: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
+
+/* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
+"Rxe-Xm-vXj.title" = "Denoise:";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "Predefinição do espaço de cor";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
+"tje-4P-jKt.title" = "Música:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
+"tlc-kS-W8X.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "Afiar";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
+"uDH-ts-vs5.title" = "Cor:";
+
+/* Class = "NSTextFieldCell"; title = "Deinterlace:"; ObjectID = "VsK-mC-9Pj"; */
+"VsK-mC-9Pj.title" = "Deinterlace:";
+
+/* Class = "NSTextFieldCell"; title = "Detelecine:"; ObjectID = "vTS-MJ-8nt"; */
+"vTS-MJ-8nt.title" = "Detelecina:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace removes comb artifacts from the picture.\n\nYadif is a popular and fast deinterlacer.\n\nDecomb switches between multiple interpolation algorithms for speed and quality."; ObjectID = "xct-UB-bKm"; */
+"xct-UB-bKm.ibShadowedToolTip" = "Deinterlace remove artefatos de pente da imagem.\n\nYadif é um desinterlacer popular e rápido.\n\nDecomb alterna entre múltiplos algoritmos de interpolação para velocidade e qualidade.";
+
+/* Class = "NSTextFieldCell"; title = "Interlace Detection:"; ObjectID = "xHD-vC-ePQ"; */
+"xHD-vC-ePQ.title" = "Detecção de entrelaçamento:";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "xqk-dM-L3o"; */
+"xqk-dM-L3o.title" = "Personalizado:";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
+"ydN-tP-vpt.title" = "Música:";
+
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = "Suavização do croma:";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
+"ZR9-YG-pfn.ibShadowedToolTip" = "Parâmetros personalizados de denoise.\n\nSintaxe NLMeans: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nPADRÃO NLMeans: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nSintaxe HQDN3D: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nPadrão HQDN3D: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
+"zvZ-ZX-yKE.title" = "Predefinição:";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBPictureHUDController.strings Added

@@ -0,0 +1,39 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Scale preview to fill the display."; ObjectID = "12K-c3-Z7A"; */
+"12K-c3-Z7A.ibShadowedToolTip" = "Escama a visualização para preencher o visor.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Encode and play a preview video using current settings."; ObjectID = "16b-R9-bBU"; */
+"16b-R9-bBU.ibShadowedToolTip" = "Codificar e reproduzir um vídeo de pré-visualização usando as configurações atuais.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Duration to encode in seconds."; ObjectID = "ASA-X8-16P"; */
+"ASA-X8-16P.ibShadowedToolTip" = "Duração para codificar em segundos.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "KrC-nR-rYk"; */
+"KrC-nR-rYk.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "sec"; ObjectID = "ksF-Ma-hB1"; */
+"ksF-Ma-hB1.title" = "seg";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show cropping settings"; ObjectID = "mV7-hU-tMt"; */
+"mV7-hU-tMt.ibShadowedToolTip" = "Mostre as configurações de corte";
+
+/* Class = "NSButtonCell"; title = "Crop"; ObjectID = "NWd-Lq-c1A"; */
+"NWd-Lq-c1A.title" = "Corte";
+
+/* Class = "NSButtonCell"; title = "Scale To Screen"; ObjectID = "STc-Po-p1X"; */
+"STc-Po-p1X.title" = "Escala para tela";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "USR-Qf-N5v"; */
+"USR-Qf-N5v.title" = "Duração:";
+
+/* Class = "NSButtonCell"; title = "Live Preview"; ObjectID = "vkh-GY-5qx"; */
+"vkh-GY-5qx.title" = "Visualização ao vivo";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "preview image"; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibExternalAccessibilityDescription" = "imagem de visualização";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Starting point for the preview encode."; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibShadowedToolTip" = "Ponto de partida para a visualização da codificação.";
+
+/* Class = "NSMenuItem"; title = "240"; ObjectID = "XYh-Ls-slf"; */
+"XYh-Ls-slf.title" = "240";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBPictureViewController.strings Added

@@ -0,0 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "Permita a ampliação";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "Tamanho do display:";
+
+/* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
+"1O3-th-4M5.title" = "Desligado";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibExternalAccessibilityDescription" = "Fundo de colheita";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibShadowedToolTip" = "A quantidade de corte da borda de baixo em pixels.";
+
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
+"2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
+"2s0-5k-fjU.ibExternalAccessibilityDescription" = "Altura de Armazenamento";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "Altura de Armazenamento";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "Proporção do aspecto:";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "Preencha a parte de cima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "A quantidade da borda de cima em pixels";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "Nenhum";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
+"6W6-RI-fBx.ibExternalAccessibilityDescription" = "Corte da parte de baixo";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "Automático";
+
+/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
+"8vS-Mw-bny.title" = "Anamórfico:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "Preencha o topo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "Largura da escala";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "Altura da escala do vídeo. Esta é a quantidade horizontal de pixels que serão codificados. A largura da escala pode diferir da largura da tela dependendo das configurações anamórficas e das configurações de preenchimento.";
+
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC SD";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibExternalAccessibilityDescription" = "Corte do topo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibShadowedToolTip" = "A quantidade de corte da borda de cima em pixels";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "Cor personalizada da borda";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "Cor personalizada da borda";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "Largura da tela";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "Resolução & Escala";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "A cor da borda que será adicionada ao vídeo";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "Preencha o lado direito";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "A quantidade da borda direita em pixels";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "Limite da resolução:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
+"Ddg-4D-el9.ibExternalAccessibilityDescription" = "Corte do lado direito";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "Altura da tela";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "Preto";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "Automático";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "Horizontal";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "Invertendo:";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
+"f12-Dh-fDw.title" = "Personalizado";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "Nenhum";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "Gire a imagem no sentido horário em incrementos de 90 graus.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "Altura máxima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "A altura máxima do armazenamento do vídeo.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "Use a mais alta resolução permitida pela configuração acima";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "Branco";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "Tamanho otimizado";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "Largura do armazenamento";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "Nenhum";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "Altura do armazenamento";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "Altura da escala do vídeo. Esta é a quantidade vertical de pixels que serão codificados. A altura da escala pode diferir da altura da tela dependendo das configurações anamórficas e das configurações de preenchimento.";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
+"hN1-S9-zl8.title" = "x";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "Complete:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "Largura de Armazenamento";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "Preencha o lado esquerdo";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "Largura da tela";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "Automático";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "Cinza";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "Tamanho de Armazenamento:";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
+"krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "Preencha o lado esquerdo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "A quantidade da borda esquerda em pixels";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "Tamanho escalado:";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "Personalizado";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibExternalAccessibilityDescription" = "Corte do lado esquerdo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "A quantidade de corte da borda esquerda em pixels";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "Numerador do aspecto do pixel";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "O aspecto do pixel define o seu formato.\n\nUma proporção 1:1 define um pixel quadrado. Outros valores definem as formas retangulares.\nOs jogadores poderão expandir a imagem de forma a atingir o aspecto desejado.";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "Proporção do aspecto:";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
+"Mke-9L-LvB.ibExternalAccessibilityDescription" = "Corte do topo";
+
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "Largura & Altura";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "Denominador do aspecto do pixel";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "O aspecto do pixel define o seu formato.\n\nUma proporção 1:1 define um pixel quadrado. Outros valores definem as formas retangulares.\nOs jogadores poderão expandir a imagem de forma a atingir o aspecto desejado.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "Largura máxima";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "A largura máxima do armazenamento do vídeo.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
+"ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "Cor:";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "Personalizado";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "Altura (Faixa preta)";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "Cinza escuro";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
+"qSV-uB-Iup.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p HD";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "Cultura esquerda";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "Se não for ativado, as dimensões que forem escaladas serão limitadas as dimensões da origem";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "Proporção do pixel:";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "Ao alterar o tamanho da tela o vídeo será esticado";
+
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
+
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "Dimensões da origem";
+
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "Orientação & Corte";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "Preencha o lado direito";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
+"uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
+
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "Dimensões finais";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "Rotação";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "Configurações de como aplicar o corte";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "Adicione uma borda ao redor do vídeo";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K Ultra HD";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "Personalizado";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "O anamórfico permite dimensões arbitrárias de armazenamento enquanto preserva o aspecto original durante a reprodução.\n\nMaximiza automaticamente a resolução de armazenamento enquanto preserva a relação de aspecto original da tela. Recomendado.\n\nNenhum desativa o anamórfico. As dimensões de armazenamento do vídeo e da exibição serão idênticas. É útil apenas para compatibilidade com certos dispositivos antigos.\n\nPersonalizado permite o ajuste manual de todos os parâmetros. É útil para corrigir um aspecto de exibição incorreta da fonte e para profissionais que precisam de controle avançado na pós-produção.";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "Largura (Barra preta)";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "Tamanho do display:";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "Preencha a parte de baixo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "A quantidade da borda de baixo em pixels.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibExternalAccessibilityDescription" = "Crop right";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "A quantidade de corte da borda direita em pixels";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
+"x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p HD";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "Inverte (espelha) a imagem no eixo horizontal";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "Personalizado";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL SD";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "Boardas";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "Corte:";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "Preencha a parte de baixo";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "Tamanho de Armazenamento:";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBPlayerHUDController.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "6A0-9h-5UY"; */
+"6A0-9h-5UY.title" = "00:00:00";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "6BQ-wU-p2C"; */
+"6BQ-wU-p2C.title" = "Faixas";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "End Live Preview"; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibExternalAccessibilityDescription" = "Visualização ao vivo final";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Exit player and return to still image previews."; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibShadowedToolTip" = "Sair do jogador e retornar às visualizações de imagem.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibExternalAccessibilityDescription" = "Vá para o fim";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibShadowedToolTip" = "Vá para o fim";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "dGi-LK-P1E"; */
+"dGi-LK-P1E.title" = "00:00:00";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibExternalAccessibilityDescription" = "Volume mudo";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibShadowedToolTip" = "Volume mudo";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Volume Control"; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibExternalAccessibilityDescription" = "Controle de Volume";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change volume."; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibShadowedToolTip" = "Arraste para alterar o volume.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibExternalAccessibilityDescription" = "Volume completo";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibShadowedToolTip" = "Volume completo";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Timeline"; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibExternalAccessibilityDescription" = "Linha do tempo";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change timeline position."; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibShadowedToolTip" = "Arraste para alterar a posição da linha do tempo.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibExternalAccessibilityDescription" = "Tocar/Pausar";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibShadowedToolTip" = "Mudar Tocar/Pausar";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Time Remaining"; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibExternalAccessibilityDescription" = "Tempo Restante";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Time remaining."; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibShadowedToolTip" = "Tempo restante.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Current Timeline Position"; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibExternalAccessibilityDescription" = "Posição atual da linha do tempo";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Current timeline position."; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibShadowedToolTip" = "Posição atual da linha do tempo.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Tracks Selection"; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibExternalAccessibilityDescription" = "Seleção de Faixas";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Enable or disable tracks."; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibShadowedToolTip" = "Habilite ou desabilitar faixas.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibExternalAccessibilityDescription" = "Vá para o começo";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibShadowedToolTip" = "Vá para o começo";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBPreviewViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBQueueInfoViewController.strings Added

@@ -0,0 +1,24 @@
+/* Class = "NSTextFieldCell"; title = "Statistics"; ObjectID = "aCP-yp-iZy"; */
+"aCP-yp-iZy.title" = "Estatísticas";
+
+/* Class = "NSTextFieldCell"; title = "Summary"; ObjectID = "cx1-rC-AMC"; */
+"cx1-rC-AMC.title" = "Sumário";
+
+/* Class = "NSButtonCell"; title = "Edit"; ObjectID = "erY-5X-50l"; */
+"erY-5X-50l.title" = "Editar";
+
+/* Class = "NSTextFieldCell"; title = "Summary"; ObjectID = "GaR-qk-UW7"; */
+"GaR-qk-UW7.title" = "Sumário";
+
+/* Class = "NSButtonCell"; title = "Reset"; ObjectID = "hgl-N3-x4S"; */
+"hgl-N3-x4S.title" = "Reiniciar";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reset the job state"; ObjectID = "oq4-g0-srt"; */
+"oq4-g0-srt.ibShadowedToolTip" = "Redefina o estado do trabalho";
+
+/* Class = "NSTextFieldCell"; title = "Statistics"; ObjectID = "S15-bh-qKU"; */
+"S15-bh-qKU.title" = "Estatísticas";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Open the job in the main window for editing"; ObjectID = "Z14-gh-hWn"; */
+"Z14-gh-hWn.ibShadowedToolTip" = "Para editar, abra o trabalho na janela principal";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBQueueTableViewController.strings Added

@@ -0,0 +1,42 @@
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "5AR-we-iHC"; */
+"5AR-we-iHC.title" = "Remover todos os trabalhos";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "5Rl-P0-bhc"; */
+"5Rl-P0-bhc.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSMenuItem"; title = "Show Destination in Finder"; ObjectID = "c1Z-ZC-b8b"; */
+"c1Z-ZC-b8b.title" = "Mostrar Destino no Localizador";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "DTF-om-j0l"; */
+"DTF-om-j0l.title" = "Editar";
+
+/* Class = "NSTextFieldCell"; title = "Encoding status"; ObjectID = "eEU-Dr-Qh8"; */
+"eEU-Dr-Qh8.title" = "Status de codificação";
+
+/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "egD-8R-PTJ"; */
+"egD-8R-PTJ.title" = "Remover";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "gNj-D1-wa7"; */
+"gNj-D1-wa7.title" = "Remover trabalhos concluídos";
+
+/* Class = "NSMenuItem"; title = "Move to Bottom"; ObjectID = "HwR-LP-IK8"; */
+"HwR-LP-IK8.title" = "Mover para baixo";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "K6c-HW-um8"; */
+"K6c-HW-um8.title" = "Célula de Texto";
+
+/* Class = "NSMenuItem"; title = "Move to Top"; ObjectID = "NN5-Yq-Cth"; */
+"NN5-Yq-Cth.title" = "Mover para cima";
+
+/* Class = "NSMenuItem"; title = "Show Source in Finder"; ObjectID = "Pps-jm-zcd"; */
+"Pps-jm-zcd.title" = "Mostrar Fonte no Localizador";
+
+/* Class = "NSMenuItem"; title = "Reset"; ObjectID = "xMs-43-lL0"; */
+"xMs-43-lL0.title" = "Reiniciar";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "xSd-Hl-5Qk"; */
+"xSd-Hl-5Qk.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSMenuItem"; title = "Show Activity Log in Finder"; ObjectID = "zA7-r8-i4L"; */
+"zA7-r8-i4L.title" = "Mostrar Log de Atividade no Localizador";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBRenamePresetController.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBSummaryViewController.strings Added

@@ -0,0 +1,69 @@
+/* Class = "NSTextFieldCell"; title = "Tracks:"; ObjectID = "3mF-Bb-Gon"; */
+"3mF-Bb-Gon.title" = "Faixas:";
+
+/* Class = "NSTextFieldCell"; title = "Size:"; ObjectID = "B4a-co-0ly"; */
+"B4a-co-0ly.title" = "Tamanho:";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
+"BHq-Mt-3eA.ibExternalAccessibilityDescription" = "Resumo de filtros";
+
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "Cópia direta dos metadados comuns";
+
+/* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
+"De0-Je-MAm.title" = "Alinhar Começo do A/V";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "Copie os metadados a partir da origem para a saída";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
+"fPv-Vw-I89.ibShadowedToolTip" = "Alinha os horários iniciais de todos os fluxos de áudio e vídeo inserindo quadros em branco ou ignorando quadros. Pode melhorar a sincronização de áudio/vídeo para jogadores quebrados que não honram listas de edição MP4.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
+"Jaw-pH-rhf.ibExternalAccessibilityDescription" = "Tamanho do sumário";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "Otimize MP4 para download progressivo. Após a codificação, os dados são reorganizados e reescritos para permitir a reprodução imediata em uma rede, sem precisar baixar todo o arquivo.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
+"lUi-Oc-208.ibShadowedToolTip" = "Otimize MP4 para download progressivo. Após a codificação, os dados são reorganizados e reescritos para permitir a reprodução imediata em uma rede, sem precisar baixar todo o arquivo.";
+
+/* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
+"m5a-0z-QQ4.ibExternalAccessibilityDescription" = "Pré-visualização";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Otimizado para Web";
+
+/* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
+"OCw-f6-uA0.title" = "Filtros:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Q1Z-yT-7iY"; */
+"Q1Z-yT-7iY.title" = "OutrosViews";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility."; ObjectID = "QKv-GR-d2g"; */
+"QKv-GR-d2g.ibShadowedToolTip" = "Adicione um marcador MP4 especial para permitir a reprodução em dispositivos vintage iPod 5ª Geração por volta de 2006. Outras configurações podem afetar a compatibilidade.";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "RIB-ME-Yhh"; */
+"RIB-ME-Yhh.title" = "Nenhum";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "RXJ-DZ-4mh"; */
+"RXJ-DZ-4mh.title" = "Formato:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Container format. Video, audio, and other tracks are combined into a single file of this type. Affects compatibility."; ObjectID = "txV-1R-WoD"; */
+"txV-1R-WoD.ibShadowedToolTip" = "Formato contêiner. Vídeo, áudio e outras faixas são combinadas em um único arquivo deste tipo. Afeta a compatibilidade.";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "wcc-5d-Dgj"; */
+"wcc-5d-Dgj.title" = "Otimizado para Web";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xmy-Jl-mR4"; */
+"xmy-Jl-mR4.title" = "Nenhum";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xzc-qg-AMn"; */
+"xzc-qg-AMn.title" = "Nenhum";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Tracks summary"; ObjectID = "yRE-5c-FhX"; */
+"yRE-5c-FhX.ibExternalAccessibilityDescription" = "Resumo de faixas";
+
+/* Class = "NSButtonCell"; title = "iPod 5G Support"; ObjectID = "zz5-qY-GSA"; */
+"zz5-qY-GSA.title" = "Compatível com iPod 5G";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBTitleSelection.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "4XY-C0-SwE"; */
+"4XY-C0-SwE.headerCell.title" = "Título";
+
+/* Class = "NSTextFieldCell"; title = "Select the titles to add to the queue:"; ObjectID = "5tD-fg-g4t"; */
+"5tD-fg-g4t.title" = "Selecione os títulos a serem adicionados à fila:";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "a6r-ky-REh"; */
+"a6r-ky-REh.headerCell.title" = "Duração";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dsG-Ho-vsT"; */
+"dsG-Ho-vsT.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "Janela";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Fcv-FE-8Fv"; */
+"Fcv-FE-8Fv.title" = "Célula de Texto";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "FQY-Ye-g0f"; */
+"FQY-Ye-g0f.headerCell.title" = "Nome";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hQc-RA-phB"; */
+"hQc-RA-phB.title" = "0";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "jHg-nh-9NJ"; */
+"jHg-nh-9NJ.title" = "Cancelar";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JqJ-5C-Yhw"; */
+"JqJ-5C-Yhw.title" = "Checar";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "k84-a6-eZ7"; */
+"k84-a6-eZ7.title" = "Checar";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "mOe-XL-tl1"; */
+"mOe-XL-tl1.title" = "Adicionar";
+
+/* Class = "NSMenuItem"; title = "Deselect All"; ObjectID = "PXF-7D-BKR"; */
+"PXF-7D-BKR.title" = "Limpar seleção";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedDisplayPattern = "%{value1}@"; ObjectID = "xTt-zi-wf0"; */
+"xTt-zi-wf0.ibShadowedDisplayPattern" = "%{value1}@";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "zwi-rc-q6x"; */
+"zwi-rc-q6x.title" = "Célula de Texto";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/HBTrackTitleViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Localizable.strings Added

@@ -0,0 +1,518 @@
+/* Job statistics */
+" (%@ %% of the source file)" = " (%@ %% do arquivo do código fonte)";
+
+/* Preview -> size info label */
+" Scaled To Screen" = " Redimensionado Para Tela";
+
+/* No comment provided by engineer. */
+"- --:--" = "- --:--";
+
+/* No comment provided by engineer. */
+"--:--" = "--:--";
+
+/* Preview -> size info label */
+"(%.0f%% actual size)" = "(%.0f%% tamanho atual)";
+
+/* Preview -> size info label */
+"(Actual size)" = "(Tamanho atual)";
+
+/* Main Window -> preset modified */
+"(Modified)" = "(Modificado)";
+
+/* Job statistics */
+"%@ fps" = "%@ fps";
+
+/* Queue status */
+"%lu encode pending" = "%lu codificação pendente";
+
+/* Queue status */
+"%lu encodes pending" = "%lu codificações pendentes";
+
+/* No comment provided by engineer. */
+"%lu jobs selected" = "%lu tarefas selecionadas";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p HD";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p HD";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K Ultra HD";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K Ultra HD";
+
+/* Destination same as source alert -> message
+   File already exists alert -> message */
+"A file already exists at the selected destination." = "Um arquivo já existe no destino selecionado.";
+
+/* Picture HUD -> scale button */
+"Actual Scale" = "Escala Atual";
+
+/* Queue undo action name */
+"Add Job To Queue" = "Adicionar Tarefa à Fila";
+
+/* Queue undo action name */
+"Add Jobs To Queue" = "Adicionar Tarefas à Fila";
+
+/* Touch bar */
+"Add Preset" = "Adicionar Pré-definição";
+
+/* Touch bar */
+"Add Titles To Queue" = "Adicionar Títulos à Fila";
+
+/* Touch bar */
+"Add To Queue" = "Adicionar à Fila";
+
+/* Preferences Advanced Toolbar Item */
+"Advanced" = "Avançado";
+
+/* HBLanguage -> Any language */
+"Any" = "Qualquer";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected preset?" = "Tem certeza de que deseja excluir permanentemente a pré-definição selecionada?";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected presets?" = "Tem certeza de que deseja excluir permanentemente a pré-definição selecionada?";
+
+/* Quit Alert -> message */
+"Are you sure you want to quit HandBrake?" = "Tem certeza que quer sair do HandBrake?";
+
+/* Copy Protection Alert -> first button */
+"Attempt Scan Anyway" = "Tentar fazer a Varredura de Qualquer Maneira";
+
+/* Player HUD -> audio menu */
+"Audio" = "Áudio";
+
+/* Job statistics */
+"Average speed:" = "Velocidade média:";
+
+/* Copy Protection Alert -> second button
+   Delete preset alert -> second button
+   File already exists alert -> first button
+   File already exists in queue alert -> first button
+   Preview -> live preview alert alternate button
+   Touch bar */
+"Cancel" = "Cancelar";
+
+/* Touch bar */
+"Cancel Encoding" = "Cancelar Codificação";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Cancel Scan" = "Cancelar Varredura";
+
+/* Toolbar Open/Cancel Item */
+"Cancel Scanning Source" = "Cancelar a Fonte de Varredura";
+
+/* Preferences -> Output Name Token */
+"Chapters" = "Capítulos";
+
+/* Main Window -> Destination open panel */
+"Choose" = "Escolher";
+
+/* Queue Alert -> cancel rip first button */
+"Continue Encoding" = "Continuar Codificação";
+
+/* Copy Protection Alert -> message */
+"Copy-Protected sources are not supported." = "As fontes protegidas por cópia não são suportadas.";
+
+/* Preferences -> Output Name Token */
+"Creation-Date" = "Data de Criação";
+
+/* Preferences -> Output Name Token */
+"Creation-Time" = "Tempo de Criação";
+
+/* Touch bar */
+"Current Time" = "Hora Atual";
+
+/* Add preset window -> picture setting */
+"Custom" = "Personalizado";
+
+/* Preferences -> Output Name Token */
+"Date" = "Data";
+
+/* Delete preset alert -> first button */
+"Delete Preset" = "Excluir Predefinição";
+
+/* Delete preset alert -> first button */
+"Delete Presets" = "Excluir predefinições";
+
+/* File already exists alert -> informative text
+   File already exists in queue alert -> informative text */
+"Do you want to overwrite %@?" = "Você quer substituir %@?";
+
+/* Quit Alert -> second button */
+"Don't Quit" = "Não desista.";
+
+/* Touch bar */
+"Done" = "Concluído";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode canceled" = "Encode cancelado";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode complete" = "Codificação completa";
+
+/* HBQueueItemView -> Encode state accessibility label
+   Queue done notification failed message */
+"Encode failed" = "Encode falhou";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode ready" = "Encode pronto";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode working" = "Encode trabalhando";
+
+/* No comment provided by engineer. */
+"Encoding %lu Jobs" = "Codificando %lu tarefas";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "Tarefa de codificação: %@";
+
+/* Job statistics */
+"Ended at:" = "Terminou em:";
+
+/* Export presets save panel title */
+"Export preset" = "Predefinição de exportação";
+
+/* Export presets save panel title */
+"Export presets" = "Exportar Predefinições";
+
+/* File already exists alert -> message */
+"File already exists." = "O arquivo já existe.";
+
+/* Preferences General Toolbar Item */
+"General" = "Geral";
+
+/* Main Window -> title */
+"HandBrake" = "Sua fila do HandBrake está concluída!";
+
+/* Preview -> live preview alert message */
+"HandBrake can't open the preview." = "O HandBrake não pode abrir a pré-visualização.";
+
+/* Preview -> live preview alert informative text */
+"HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?" = "O HandBrake não pode reproduzir essa combinação de formato de vídeo/áudio/contêiner. Você quer abri-lo em um jogador externo?";
+
+/* Quit Alert -> informative text */
+"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?" = "Se você sair do HandBrake, seu código atual será recarregado na sua fila no próximo lançamento. Você quer parar de qualquer maneira?";
+
+/* Import preset open panel title */
+"Import presets" = "Importar Predefinições";
+
+/* Chapters import -> invalid CSV line count description */
+"Incorrect line count" = "Contagem de linhas incorreta";
+
+/* Chapters import -> invalid CSV description */
+"Invalid chapters CSV file" = "Arquivo CSV de capítulos inválidos";
+
+/* Queue Edit Alert -> stop and edit first button
+   Queue Stop Alert -> stop and remove first button */
+"Keep Encoding" = "Manter a codificação";
+
+/* Touch bar */
+"Live Preview" = "Visualização ao vivo";
+
+/* Queue undo action name */
+"Move Job in Queue" = "Mova o trabalho na fila";
+
+/* Queue undo action name */
+"Move Jobs in Queue" = "Mova empregos na fila";
+
+/* Queue status */
+"No encode pending" = "Não há codificações pendentes";
+
+/* Preview -> accessibility label */
+"No image" = "Sem imagem";
+
+/* No comment provided by engineer. */
+"No job selected" = "Nenhum trabalho selecionado";
+
+/* Main Window -> Info text */
+"No Valid Preset" = "Nenhuma predefinição válida";
+
+/* Main Window -> Info text */
+"No Valid Source Found" = "Nenhuma fonte válida encontrada";
+
+/* Add preset window -> picture setting */
+"None" = "Nenhum";
+
+/* Queue Done Alert -> shut down first button
+   Queue Done Alert -> sleep first button */
+"OK" = "OK";
+
+/* File already exists alert -> informative text */
+"One or more file already exists. Do you want to overwrite?" = "Um ou mais arquivos já existem. Você quer substituir?";
+
+/* Preview -> live preview alert default button */
+"Open in external player" = "Aberto em jogador externo";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Open Source" = "Código-Fonte Aberto";
+
+/* File already exists alert -> second button
+   File already exists in queue alert -> second button */
+"Overwrite" = "Sobrescrever";
+
+/* Toolbar Pause Item */
+"Pause" = "Pausa";
+
+/* Queue -> pause/resume menu
+   Toolbar Pause Item
+   Touch bar */
+"Pause Encoding" = "Codificação de pausa";
+
+/* Touch bar */
+"Pause/Resume Encoding" = "Codificação pausa/currículo";
+
+/* Job statistics */
+"Paused time:" = "Tempo pausado:";
+
+/* Video -> Framerate */
+"Peak Framerate (VFR)" = "Taxa de quadro de pico (VFR)";
+
+/* Touch bar */
+"Play/Pause" = "Tocar/Pausar";
+
+/* Add preset window -> name alert informative text
+   Rename preset window -> name alert informative text */
+"Please enter a name." = "Por favor informe um nome.";
+
+/* Copy Protection Alert -> informative text */
+"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function. This warning will be shown only once each time HandBrake is run." = "Observe que o HandBrake não suporta a remoção da proteção de cópias de discos de DVD. Você pode se desejar usar qualquer outro software de terceiros para esta função. Este aviso será mostrado apenas uma vez que o HandBrake for executado.";
+
+/* Queue Done Alert -> shut down second button
+   Queue Done Alert -> sleep second button */
+"Preferences…" = "Preferências: ";
+
+/* Preview -> progress formatter title */
+"preview" = "visualização";
+
+/* Preview -> window title */
+"Preview" = "Pré-visualização";
+
+/* Preview -> window title format */
+"Preview - %@ %@" = "Pré-visualização - %1$@ %2$ @";
+
+/* Preview -> accessibility label */
+"Preview Image, Size: %zu x %zu, Scale: %.0f%%" = "Imagem de visualização, tamanho: %1$zu x %2$zu, Escala: %3$.0f%%";
+
+/* Touch bar */
+"Previews" = "Pré-visualizações";
+
+/* Queue done alert message
+   Queue notification alert message */
+"Put down that cocktail…" = "Abaixe o coquetel...";
+
+/* Preferences -> Output Name Token */
+"Quality/Bitrate" = "Qualidade/Bitrate";
+
+/* Queue window title */
+"Queue" = "Fila";
+
+/* Queue window title */
+"Queue (%@)" = "Começar a Fila";
+
+/* Quit Alert -> first button */
+"Quit" = "Sair";
+
+/* Touch bar */
+"Remaining Time" = "Tempo Restante";
+
+/* HBQueueItemView -> Remove button accessibility label */
+"Remove job" = "Remova o trabalho";
+
+/* Queue undo action name */
+"Remove Job From Queue" = "Remover o trabalho da fila";
+
+/* Queue undo action name */
+"Remove Jobs From Queue" = "Remover empregos da fila";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "Reformulando para edição";
+
+/* Toolbar Pause Item */
+"Resume" = "Currículo";
+
+/* Queue -> pause/resume men
+   Toolbar Pause Item */
+"Resume Encoding" = "Codificação de currículo";
+
+/* HBQueueItemView -> Reveal button accessibility label */
+"Reveal destination in Finder" = "Revelar destino no Finder";
+
+/* Job statistics */
+"Run time:" = "Tempo de execução:";
+
+/* Export presets panel prompt */
+"Save" = "Salvar";
+
+/* Picture HUD -> scale button
+   Touch bar */
+"Scale To Screen" = "Escala para tela";
+
+/* Queue Alert -> cancel rip informative text */
+"Select Continue Encoding to dismiss this dialog without making changes." = "Selecione Continuar codificação para descartar essa caixa de diálogo sem fazer alterações.";
+
+/* Preferences -> send to app destination open panel */
+"Select the desired external application" = "Selecione o aplicativo externo desejado";
+
+/* Titles selection sheet -> informative text */
+"Select the titles to add to the queue using the %@ preset:" = "Selecione os títulos para adicionar à fila usando a predefinição %@:";
+
+/* Notification -> Show in Finder */
+"Show" = "Mostrar";
+
+/* Touch bar */
+"Show Activity Window" = "Mostrar Janela de Atividades";
+
+/* Touch bar */
+"Show Preview Window" = "Mostrar Janela de Pré-visualização";
+
+/* Job statistics */
+"Size:" = "Tamanho:";
+
+/* Queue Alert -> cancel rip second button */
+"Skip Current Job" = "Pular Tarefa Atual";
+
+/* Touch bar */
+"Slider" = "Slider";
+
+/* Preferences -> Output Name Token */
+"Source" = "Fonte";
+
+/* Toolbar Start/Stop Item */
+"Start" = "Começo";
+
+/* Menu Start/Stop Item
+   Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Start Encoding" = "Começar a Codificar";
+
+/* Toolbar Start/Stop Item */
+"Start Queue" = "Começar a Fila";
+
+/* Touch bar */
+"Start/Stop Encoding" = "Começar/Parar Codificação";
+
+/* Job statistics */
+"Started at:" = "Começou em:";
+
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
+"Stop" = "Parar";
+
+/* Queue -> Stop action */
+"Stop action." = "Pare a ação.";
+
+/* Queue Alert -> cancel rip third button */
+"Stop After Current Job" = "Pare Após a Tarefa Atual";
+
+/* Queue Alert -> cancel rip fourth button */
+"Stop All" = "Parar Tudo";
+
+/* Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Stop Encoding" = "Parar Codificação";
+
+/* Queue Stop Alert -> stop and remove second button */
+"Stop Encoding and Delete" = "Pare a Codificação e Apague";
+
+/* Queue Edit Alert -> stop and edit second button */
+"Stop Encoding and Edit" = "Pare a Codificação e Edite";
+
+/* Queue Edit Alert -> stop and edit message */
+"Stop This Encode and Edit It?" = "Pare Essa Codificação e Edite-a?";
+
+/* Queue Stop Alert -> stop and remove message */
+"Stop This Encode and Remove It?" = "Pare Essa Codificação e Remova-a?";
+
+/* Player HUD -> subtitles menu */
+"Subtitles" = "Legendas";
+
+/* Queue Done Alert -> shut down message */
+"The computer will shut down after encoding is done." = "O computador desligará depois que a codificação estiver pronta.";
+
+/* Queue Done Alert -> sleep message */
+"The computer will sleep after encoding is done." = "O computador dormirá depois que a codificação estiver pronta.";
+
+/* Chapters import -> invalid CSV recovery suggestion */
+"The CSV file is not a valid chapters CSV file." = "O arquivo CSV não é um arquivo CSV de capítulos válidos.";
+
+/* Destination same as source alert -> informative text */
+"The destination is the same as the source, you can not overwrite your source file!" = "O destino é o mesmo que a fonte, você não pode substituir seu arquivo de origem!";
+
+/* Chapters import -> invalid CSV line count recovery suggestion */
+"The line count in the chapters CSV file does not match the number of chapters in the movie." = "A contagem de linhas nos capítulos CSV arquivo não corresponde ao número de capítulos no filme.";
+
+/* Add preset window -> name alert message
+   Rename preset window -> name alert message */
+"The preset name cannot be empty." = "O nome da pré-definição não pode estar vazio.";
+
+/* File already exists in queue alert -> message */
+"There is already a queue item for this destination." = "Já existe um item de fila para este destino.";
+
+/* Invalid destination alert -> informative text */
+"This is not a valid destination directory!" = "Este não é um diretório de destino válido!";
+
+/* Preferences -> Output Name Token */
+"Time" = "Tempo";
+
+/* Preferences -> Output Name Token */
+"Title" = "Título";
+
+/* HBLanguage -> Unknown language */
+"Unknown" = "Desconhecido";
+
+/* Video -> Framerate */
+"Variable Framerate" = "Framerate Variável";
+
+/* Invalid destination alert -> message */
+"Warning!" = "Aviso!";
+
+/* No comment provided by engineer. */
+"Working" = "Trabalhando";
+
+/* Queue Alert -> cancel rip message */
+"You are currently encoding. What would you like to do?" = "Você está atualmente codificando. O que você gostaria de fazer?";
+
+/* Delete preset alert -> informative text */
+"You can't undo this action." = "Você não pode desfazer esta ação.";
+
+/* Queue Done Alert -> shut down informative text */
+"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences." = "Você escolheu desligar o computador depois de codificar. Para desligar esta opção, vá até as opções do HandBrake.";
+
+/* Queue Done Alert -> sleep informative text */
+"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences." = "Você selecionou para o computador dormir após a codificação. Para desligar o modo dormir, vá para as preferências do HandBrake.";
+
+/* Queue -> disk almost full alert informative text */
+"You need to make more space available on your destination disk." = "Você precisa liberar mais espaço no seu disco de destino.";
+
+/* Queue -> disk almost full alert message */
+"Your destination disk is almost full." = "Seu disco de destino está quase cheio.";
+
+/* Queue done notification message */
+"Your encode %@ couldn't be completed." = "Sua codificação %@ não pode ser completada.";
+
+/* Queue done notification message */
+"Your encode %@ is done!" = "Sua codificação %@ está concluída!";
+
+/* Queue done alert informative text */
+"Your HandBrake queue is done!" = "Sua fila do HandBrake está concluída!";
+
+/* Queue Edit Alert -> stop and edit informative text
+   Queue Stop Alert -> stop and remove informative text */
+"Your movie will be lost if you don't continue encoding." = "Seu filme será perdido se você não continuar codificando.";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/MainMenu.strings Added

@@ -0,0 +1,270 @@
+/* Class = "NSMenu"; title = "Services"; ObjectID = "0te-ai-fgD"; */
+"0te-ai-fgD.title" = "Serviços";
+
+/* Class = "NSMenuItem"; title = "Rename…"; ObjectID = "1GQ-n3-jfY"; */
+"1GQ-n3-jfY.title" = "_Renomear";
+
+/* Class = "NSMenuItem"; title = "Filters"; ObjectID = "6rE-SM-AGi"; */
+"6rE-SM-AGi.title" = "Filtros";
+
+/* Class = "NSMenuItem"; title = "Summary"; ObjectID = "9ie-b7-RaS"; */
+"9ie-b7-RaS.title" = "Sumário";
+
+/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */
+"29.title" = "MenuPrincipal";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "56"; */
+"56.title" = "Sua fila do HandBrake está concluída!";
+
+/* Class = "NSMenu"; title = "HandBrake"; ObjectID = "57"; */
+"57.title" = "Sua fila do HandBrake está concluída!";
+
+/* Class = "NSMenuItem"; title = "About HandBrake"; ObjectID = "58"; */
+"58.title" = "Sobre o HandBrake";
+
+/* Class = "NSMenuItem"; title = "Quit HandBrake"; ObjectID = "136"; */
+"136.title" = "Desista do Freio de Mão";
+
+/* Class = "NSMenuItem"; title = "Hide HandBrake"; ObjectID = "971"; */
+"971.title" = "Esconder freio de mão";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "973"; */
+"973.title" = "Esconder outros";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "1189"; */
+"1189.title" = "Janela";
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "1190"; */
+"1190.title" = "Trazer Tudo para a Frente";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "1191"; */
+"1191.title" = "Minimizar";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "1192"; */
+"1192.title" = "Janela";
+
+/* Class = "NSMenuItem"; title = "Open Source…"; ObjectID = "1198"; */
+"1198.title" = "Código Aberto...";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1200"; */
+"1200.title" = "Arquivo";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1209"; */
+"1209.title" = "Arquivo";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "1429"; */
+"1429.title" = "Ajuda";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "1431"; */
+"1431.title" = "Ajuda";
+
+/* Class = "NSMenuItem"; title = "HandBrake Website"; ObjectID = "1432"; */
+"1432.title" = "Site do HandBrake";
+
+/* Class = "NSMenuItem"; title = "Online Community Forums"; ObjectID = "1433"; */
+"1433.title" = "Fóruns da Comunidade Online";
+
+/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "1445"; */
+"1445.title" = "Preferências: ";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "1795"; */
+"1795.title" = "Editar";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "1796"; */
+"1796.title" = "Editar";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "1797"; */
+"1797.title" = "Excluir";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "1798"; */
+"1798.title" = "Selecionar Tudo";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "1799"; */
+"1799.title" = "Desfazer";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "1801"; */
+"1801.title" = "Refazer";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "1802"; */
+"1802.title" = "Localizar";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "1803"; */
+"1803.title" = "Localizar";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "1804"; */
+"1804.title" = "Pular para seleção";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "1805"; */
+"1805.title" = "_Localizar";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "1806"; */
+"1806.title" = "Localizar Próximo";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "1807"; */
+"1807.title" = "Localizar anterior";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "1808"; */
+"1808.title" = "Use a Seleção para Achar";
+
+/* Class = "NSMenuItem"; title = "Spelling"; ObjectID = "1810"; */
+"1810.title" = "Soletrando";
+
+/* Class = "NSMenu"; title = "Spelling"; ObjectID = "1811"; */
+"1811.title" = "Soletrando";
+
+/* Class = "NSMenuItem"; title = "Spelling…"; ObjectID = "1812"; */
+"1812.title" = "Soletrando...";
+
+/* Class = "NSMenuItem"; title = "Check Spelling"; ObjectID = "1813"; */
+"1813.title" = "Verificar Ortografia";
+
+/* Class = "NSMenuItem"; title = "Check Spelling as You Type"; ObjectID = "1814"; */
+"1814.title" = "Verifique a Ortografia Enquanto Você Digita";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "1815"; */
+"1815.title" = "Cortar";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "1816"; */
+"1816.title" = "Copiar";
+
+/* Class = "NSMenuItem"; title = "Speech"; ObjectID = "1817"; */
+"1817.title" = "Fala";
+
+/* Class = "NSMenu"; title = "Speech"; ObjectID = "1818"; */
+"1818.title" = "Fala";
+
+/* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "1819"; */
+"1819.title" = "Pare de Falar";
+
+/* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "1820"; */
+"1820.title" = "Começar a Falar";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "1821"; */
+"1821.title" = "Colar";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "1822"; */
+"1822.title" = "Colar e Estilo de Partida";
+
+/* Class = "NSMenuItem"; title = "Presets View"; ObjectID = "1884"; */
+"1884.title" = "Visualização de predefinições";
+
+/* Class = "NSMenuItem"; title = "Presets"; ObjectID = "1948"; */
+"1948.title" = "Pré definições";
+
+/* Class = "NSMenu"; title = "Presets"; ObjectID = "1949"; */
+"1949.title" = "Pré definições";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "1950"; */
+"1950.title" = "Redefinir predefinições oficiais";
+
+/* Class = "NSMenuItem"; title = "New Preset…"; ObjectID = "1955"; */
+"1955.title" = "Novo Predefinido...";
+
+/* Class = "NSMenuItem"; title = "Online Documentation"; ObjectID = "1985"; */
+"1985.title" = "Documentação Online";
+
+/* Class = "NSMenuItem"; title = "Activity Window"; ObjectID = "2295"; */
+"2295.title" = "Janela da Atividade";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "2368"; */
+"2368.title" = "Sua fila do HandBrake está concluída!";
+
+/* Class = "NSMenuItem"; title = "Select Default"; ObjectID = "2421"; */
+"2421.title" = "Selecione Padrão";
+
+/* Class = "NSMenuItem"; title = "Add To Queue"; ObjectID = "2443"; */
+"2443.title" = "Adicionar à Fila";
+
+/* Class = "NSMenuItem"; title = "Start Encoding"; ObjectID = "2444"; */
+"2444.title" = "Começar a Codificar";
+
+/* Class = "NSMenuItem"; title = "Queue"; ObjectID = "2445"; */
+"2445.title" = "Fila";
+
+/* Class = "NSMenuItem"; title = "Pause Encoding"; ObjectID = "2494"; */
+"2494.title" = "Codificação de pausa";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "2508"; */
+"2508.title" = "Fechar Janela";
+
+/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "4964"; */
+"4964.title" = "Verificar Atualizações...";
+
+/* Class = "NSMenuItem"; title = "Preview Window"; ObjectID = "5157"; */
+"5157.title" = "Mostrar Janela de Pré-visualização";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "5188"; */
+"5188.title" = "Exportar…";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "5192"; */
+"5192.title" = "&Importar";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "5280"; */
+"5280.title" = "Mostrar Todos";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "5897"; */
+"5897.title" = "Adicionar Títulos à Fila...";
+
+/* Class = "NSMenuItem"; title = "Audio"; ObjectID = "brQ-mu-8JM"; */
+"brQ-mu-8JM.title" = "Áudio";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "CN3-Rh-gVf"; */
+"CN3-Rh-gVf.title" = "Excluir";
+
+/* Class = "NSMenuItem"; title = "Subtitles"; ObjectID = "Csx-2S-iUe"; */
+"Csx-2S-iUe.title" = "Legendas";
+
+/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "fNa-z2-K1i"; */
+"fNa-z2-K1i.title" = "Abrir Recente";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "frQ-v5-pRa"; */
+"frQ-v5-pRa.title" = "Tornar Padrão";
+
+/* Class = "NSMenuItem"; title = "View"; ObjectID = "Hzp-jb-hme"; */
+"Hzp-jb-hme.title" = "Ver";
+
+/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "IsV-5A-bqx"; */
+"IsV-5A-bqx.title" = "Mostrar Barra de Ferramentas";
+
+/* Class = "NSMenuItem"; title = "Video"; ObjectID = "Jef-U4-eQT"; */
+"Jef-U4-eQT.title" = "Vídeo";
+
+/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "KKV-n0-Fmr"; */
+"KKV-n0-Fmr.title" = "Personalize a barra de ferramentas...";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "lab-Ly-3p3"; */
+"lab-Ly-3p3.title" = "Salvar";
+
+/* Class = "NSMenuItem"; title = "Chapters"; ObjectID = "lCU-PH-gal"; */
+"lCU-PH-gal.title" = "Capítulos";
+
+/* Class = "NSMenuItem"; title = "Enter Full Screen"; ObjectID = "mGX-7Z-siB"; */
+"mGX-7Z-siB.title" = "Digite tela cheia";
+
+/* Class = "NSMenu"; title = "View"; ObjectID = "ndG-Ig-Yol"; */
+"ndG-Ig-Yol.title" = "Ver";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "oYh-V7-kbx"; */
+"oYh-V7-kbx.title" = "Adicionar Todos os Títulos à Fila";
+
+/* Class = "NSMenuItem"; title = "Dimension"; ObjectID = "shS-hb-XSI"; */
+"shS-hb-XSI.title" = "Dimensão";
+
+/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "ukX-HN-SXk"; */
+"ukX-HN-SXk.title" = "Abrir Recente";
+
+/* Class = "NSMenuItem"; title = "Switch to Next Title"; ObjectID = "viv-aA-SoB"; */
+"viv-aA-SoB.title" = "Alterne para o próximo título";
+
+/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "wPw-Uj-Gxi"; */
+"wPw-Uj-Gxi.title" = "Limpar Menu";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "wvb-60-cWL"; */
+"wvb-60-cWL.title" = "Nova categoria...";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "XcG-Aw-Gdb"; */
+"XcG-Aw-Gdb.title" = "Serviços";
+
+/* Class = "NSMenuItem"; title = "Switch to Previous Title"; ObjectID = "zgj-Iv-4xJ"; */
+"zgj-Iv-4xJ.title" = "Alterne para o título anterior";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/MainWindow.strings Added

@@ -0,0 +1,276 @@
+/* Class = "NSTabViewItem"; label = "Filters"; ObjectID = "0UB-bG-kwS"; */
+"0UB-bG-kwS.label" = "Filtros";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
+"2vD-zN-YMe.ibShadowedToolTip" = "Salve novo predefinido...";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
+"3w9-Iu-3u2.ibShadowedToolTip" = "Título para varrer.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "Adicionar à Fila";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
+"6E4-AG-PEh.title" = "0";
+
+/* Class = "NSToolbarItem"; label = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.label" = "Código-Fonte Aberto";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.paletteLabel" = "Código-Fonte Aberto";
+
+/* Class = "NSToolbarItem"; toolTip = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.toolTip" = "Código-Fonte Aberto";
+
+/* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
+"21.title" = "Sua fila do HandBrake está concluída!";
+
+/* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
+"1475.label" = "Áudio";
+
+/* Class = "NSTabViewItem"; label = "Video"; ObjectID = "1477"; */
+"1477.label" = "Vídeo";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Source file"; ObjectID = "1538"; */
+"1538.ibExternalAccessibilityDescription" = "Arquivo fonte";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Source file name."; ObjectID = "1539"; */
+"1539.ibShadowedToolTip" = "Nome do arquivo fonte.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Title, or video clip, to encode. The longest title is selected by default.\n\nBlu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature."; ObjectID = "1541"; */
+"1541.ibShadowedToolTip" = "Título, ou clipe de vídeo, para codificar. O título mais longo é selecionado por padrão.\n\nAs fontes de Blu-ray e DVD geralmente têm vários títulos, o mais longo dos quais é tipicamente a principal característica.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1542"; */
+"1542.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Start Chapter"; ObjectID = "1545"; */
+"1545.ibExternalAccessibilityDescription" = "Começar Capítulo";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "First chapter to encode."; ObjectID = "1545"; */
+"1545.ibShadowedToolTip" = "Primeiro capítulo para codificar.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1546"; */
+"1546.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "End Chapter"; ObjectID = "1548"; */
+"1548.ibExternalAccessibilityDescription" = "Capítulo Final";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Last chapter to encode."; ObjectID = "1548"; */
+"1548.ibShadowedToolTip" = "Último capítulo para codificar.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1549"; */
+"1549.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Duration"; ObjectID = "1554"; */
+"1554.ibExternalAccessibilityDescription" = "Duração";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Duration of the selected source range in Hours:Minutes:Seconds."; ObjectID = "1554"; */
+"1554.ibShadowedToolTip" = "Duração do intervalo de origem selecionado em Horas:Minutos:Segundos.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Output filename"; ObjectID = "1561"; */
+"1561.ibExternalAccessibilityDescription" = "Nome de arquivo de saída";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "File name. This is what your new video will be named."; ObjectID = "1561"; */
+"1561.ibShadowedToolTip" = "Nome do arquivo. É assim que seu novo vídeo será nomeado.";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Browse Destination"; ObjectID = "1562"; */
+"1562.ibExternalAccessibilityDescription" = "Procurar Destino";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Browse to select a new destination path for your encode."; ObjectID = "1562"; */
+"1562.ibShadowedToolTip" = "Navegue para selecionar um novo caminho de destino para o seu código.";
+
+/* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
+"1989.label" = "Capítulos";
+
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "Tarefa de codificação 1: Test.mp4";
+
+/* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
+"4905.title" = "Fonte:";
+
+/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "4907"; */
+"4907.title" = "Título:";
+
+/* Class = "NSTextFieldCell"; title = "Save As:"; ObjectID = "4913"; */
+"4913.title" = "Salvar como:";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "4914"; */
+"4914.title" = "Duração:";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "4915"; */
+"4915.title" = "00:00:00";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "4920"; */
+"4920.title" = "Navegar…";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "4923"; */
+"4923.title" = "Predefinição:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video angle to encode. Only applicable to multi-angle DVD and Blu-ray."; ObjectID = "5181"; */
+"5181.ibShadowedToolTip" = "Ângulo de vídeo para codificar. Aplicável apenas a DVD multi-ângulo e Blu-ray.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5183"; */
+"5183.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Angle:"; ObjectID = "5185"; */
+"5185.title" = "Ângulo:";
+
+/* Class = "NSTabViewItem"; label = "Subtitles"; ObjectID = "5194"; */
+"5194.label" = "Legendas";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in seconds"; ObjectID = "5491"; */
+"5491.ibExternalAccessibilityDescription" = "Tempo de início em segundos";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First second to encode."; ObjectID = "5491"; */
+"5491.ibShadowedToolTip" = "Primeiro segundo para codificar.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in seconds"; ObjectID = "5493"; */
+"5493.ibExternalAccessibilityDescription" = "Tempo de término em segundos";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last second to encode."; ObjectID = "5493"; */
+"5493.ibShadowedToolTip" = "Último segundo para codificar.";
+
+/* Class = "NSTextFieldCell"; title = "–"; ObjectID = "5506"; */
+"5506.title" = "–";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Range Selection"; ObjectID = "5513"; */
+"5513.ibExternalAccessibilityDescription" = "Seleção de intervalo";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Source range selection. By default, all chapters are selected and the entire source is encoded."; ObjectID = "5513"; */
+"5513.ibShadowedToolTip" = "Seleção de alcance de origem. Por padrão, todos os capítulos são selecionados e toda a fonte é codificada.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5515"; */
+"5515.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in frames"; ObjectID = "5521"; */
+"5521.ibExternalAccessibilityDescription" = "Tempo de início em frames";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First frame to encode."; ObjectID = "5521"; */
+"5521.ibShadowedToolTip" = "Primeiro quadro para codificar.";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in frames"; ObjectID = "5523"; */
+"5523.ibExternalAccessibilityDescription" = "Fim do tempo em quadros";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
+"5523.ibShadowedToolTip" = "Último quadro para codificar.";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "Adicionar Todos os Títulos à Fila";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
+"AhR-pK-Oz4.ibShadowedToolTip" = "Recarregue as configurações de codificação para a predefinição selecionada no momento. As modificações serão descartadas.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
+"BA0-eg-2Ka.label" = "Sumário";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Preset selection"; ObjectID = "bWH-Lp-mKY"; */
+"bWH-Lp-mKY.ibExternalAccessibilityDescription" = "Seleção predefinida";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.label" = "Começo";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.paletteLabel" = "Começar a Codificar";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.toolTip" = "Começar a Codificar";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "cgS-BU-Nfd"; */
+"cgS-BU-Nfd.title" = "Recarregar";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "d0E-xw-bxh"; */
+"d0E-xw-bxh.title" = "Caixa";
+
+/* Class = "NSToolbarItem"; label = "Preview"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.label" = "Pré-visualização";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.paletteLabel" = "Mostrar Janela de Pré-visualização";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.toolTip" = "Mostrar Janela de Pré-visualização";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
+"DN4-48-aOI.ibShadowedToolTip" = "Digitalize apenas o título especificado em vez de todos os títulos.";
+
+/* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
+"eij-Sn-QmJ.label" = "Dimensões";
+
+/* Class = "NSButtonCell"; title = "Scan only title:"; ObjectID = "eQA-t2-FcV"; */
+"eQA-t2-FcV.title" = "Digitalize apenas o título:";
+
+/* Class = "NSToolbarItem"; label = "Queue"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.label" = "Fila";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.paletteLabel" = "Mostrar Janela de Fila";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.toolTip" = "Mostrar Janela de Fila";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
+"IOU-3L-nvB.title" = "Salve novo predefinido...";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "Adicionar Títulos à Fila...";
+
+/* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
+"IxV-PW-oYh.title" = "Intervalo:";
+
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "Andamento";
+
+/* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
+"OYP-3T-FnA.title" = "Pré-definição Selecionada";
+
+/* Class = "NSToolbarItem"; label = "Activity"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.label" = "Atividade";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.paletteLabel" = "Mostrar Janela de Atividades";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.toolTip" = "Mostrar Janela de Atividades";
+
+/* Class = "NSPathControl"; ibExternalAccessibilityDescription = "Destination folder path"; ObjectID = "PJi-21-hie"; */
+"PJi-21-hie.ibExternalAccessibilityDescription" = "Caminho da pasta de destino";
+
+/* Class = "NSToolbarItem"; label = "Presets"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.label" = "Pré definições";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.paletteLabel" = "Mostrar Lista de Pré-definições";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.toolTip" = "Mostrar Lista de Pré-definições";
+
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "Adicionar à Fila";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "Adicionar à Fila";
+
+/* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
+"rfK-nQ-Aq2.title" = "Para:";
+
+/* Class = "NSMenuItem"; title = "Reveal in Finder"; ObjectID = "rK6-EB-N9Z"; */
+"rK6-EB-N9Z.title" = "Exiba no finder";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.label" = "Pausa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.paletteLabel" = "Codificação de pausa";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.toolTip" = "Codificação de pausa";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "Caixa";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/OutputPanel.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/PicturePreview.strings Added

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Preferences.strings Added

@@ -0,0 +1,264 @@
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "3dN-MN-DcP"; */
+"3dN-MN-DcP.title" = "Formato:";
+
+/* Class = "NSWindow"; title = "Preferences"; ObjectID = "5"; */
+"5.title" = "Preferências";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "290"; */
+"290.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "292"; */
+"292.title" = "Auto";
+
+/* Class = "NSButtonCell"; title = "Automatically name output files"; ObjectID = "302"; */
+"302.title" = "Nomear automaticamente arquivos de saída";
+
+/* Class = "NSTextFieldCell"; title = "When Done:"; ObjectID = "304"; */
+"304.title" = "Quando Concluído:";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates weekly"; ObjectID = "305"; */
+"305.title" = "Verifique automaticamente se há atualizações semanais";
+
+/* Class = "NSButtonCell"; title = "Send file to:"; ObjectID = "306"; */
+"306.title" = "Enviar arquivo para:";
+
+/* Class = "NSTextFieldCell"; title = "At Launch:"; ObjectID = "307"; */
+"307.title" = "No lançamento:";
+
+/* Class = "NSTextFieldCell"; title = "Output Files:"; ObjectID = "308"; */
+"308.title" = "Arquivos de saída:";
+
+/* Class = "NSButtonCell"; title = "Store Activity Logs in same location as video"; ObjectID = "348"; */
+"348.title" = "Registros de atividades da loja no mesmo local que o vídeo";
+
+/* Class = "NSTextFieldCell"; title = "Activity Logs:"; ObjectID = "351"; */
+"351.title" = "Logs de Atividade:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "352"; */
+"352.ibShadowedToolTip" = "Número de visualizações de imagens para digitalizar. Valores mais altos podem aumentar a precisão automática de corte em detrimento do tempo de varredura do título.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "354"; */
+"354.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "10"; ObjectID = "355"; */
+"355.title" = "10";
+
+/* Class = "NSMenuItem"; title = "15"; ObjectID = "356"; */
+"356.title" = "15";
+
+/* Class = "NSMenuItem"; title = "20"; ObjectID = "357"; */
+"357.title" = "20";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "359"; */
+"359.ibShadowedToolTip" = "Número de visualizações de imagens para digitalizar. Valores mais altos podem aumentar a precisão automática de corte em detrimento do tempo de varredura do título.";
+
+/* Class = "NSTextFieldCell"; title = "Number of picture previews to scan:"; ObjectID = "360"; */
+"360.title" = "Número de visualizações de imagens para digitalizar:";
+
+/* Class = "NSMenuItem"; title = "25"; ObjectID = "361"; */
+"361.title" = "25";
+
+/* Class = "NSMenuItem"; title = "30"; ObjectID = "362"; */
+"362.title" = "30";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "363"; */
+"363.ibShadowedToolTip" = "Nível de verbosidade. Verbosidade estendida registra mais informações técnicas no Registro de Atividades. Verbosidade mínima registra menos.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "365"; */
+"365.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "Extended"; ObjectID = "368"; */
+"368.title" = "Extendido";
+
+/* Class = "NSMenuItem"; title = "Standard"; ObjectID = "369"; */
+"369.title" = "Padrão";
+
+/* Class = "NSMenuItem"; title = "Minimised"; ObjectID = "370"; */
+"370.title" = "Minimizado";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "371"; */
+"371.ibShadowedToolTip" = "Nível de verbosidade. Verbosidade estendida registra mais informações técnicas no Registro de Atividades. Verbosidade mínima registra menos.";
+
+/* Class = "NSTextFieldCell"; title = "Verbosity Level:"; ObjectID = "372"; */
+"372.title" = "Nível de Verbosidade:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "387"; */
+"387.ibShadowedToolTip" = "Determina a granularidade do controle x264 de qualidade constante. Valores menores permitem incrementos de qualidade mais finos.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "389"; */
+"389.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "0.20"; ObjectID = "390"; */
+"390.title" = "0.20";
+
+/* Class = "NSMenuItem"; title = "0.25"; ObjectID = "391"; */
+"391.title" = "0.25";
+
+/* Class = "NSMenuItem"; title = "0.50"; ObjectID = "393"; */
+"393.title" = "0.50";
+
+/* Class = "NSMenuItem"; title = "1.0"; ObjectID = "394"; */
+"394.title" = "1.0";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "395"; */
+"395.ibShadowedToolTip" = "Determina a granularidade do controle x264 de qualidade constante. Valores menores permitem incrementos de qualidade mais finos.";
+
+/* Class = "NSTextFieldCell"; title = "Constant Quality fractional granularity:"; ObjectID = "396"; */
+"396.title" = "Granularidade fracionária de qualidade constante:";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)."; ObjectID = "398"; */
+"398.ibShadowedToolTip" = "Use libdvdnav para ler DVDs. Só desabilite isso para DVDs problemáticos onde libdvdread funciona melhor (raro).";
+
+/* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
+"399.title" = "Use libdvdnav (em vez de libdvdread)";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
+"449.title" = "Nenhum";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "451"; */
+"451.title" = "Navegar…";
+
+/* Class = "NSButtonCell"; title = "Play System Alert Sound"; ObjectID = "458"; */
+"458.title" = "Reproduzir som de alerta do sistema";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped."; ObjectID = "463"; */
+"463.ibShadowedToolTip" = "Duração mínima do título de DVD e Blu-ray em segundos. Títulos mais curtos serão ignorados.";
+
+/* Class = "NSTextFieldCell"; title = "Ignore DVD and Blu-ray titles shorter than:"; ObjectID = "464"; */
+"464.title" = "Ignore os títulos de DVD e Blu-ray mais curtos que:";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum title duration in seconds. Shorter titles will be skipped."; ObjectID = "480"; */
+"480.ibShadowedToolTip" = "Duração mínima do título em segundos. Títulos mais curtos serão ignorados.";
+
+/* Class = "NSMenuItem"; title = ".m4v"; ObjectID = "484"; */
+"484.title" = ".m4v";
+
+/* Class = "NSMenuItem"; title = ".mp4"; ObjectID = "485"; */
+"485.title" = ".mp4";
+
+/* Class = "NSTextFieldCell"; title = "Default MP4 Extension:"; ObjectID = "487"; */
+"487.title" = "Extensão MP4 padrão:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "493"; */
+"493.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "494"; */
+"494.title" = "Fazer nada";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "495"; */
+"495.title" = "Alerta";
+
+/* Class = "NSMenuItem"; title = "Alert And Notification"; ObjectID = "496"; */
+"496.title" = "Alerta e Notificação";
+
+/* Class = "NSMenuItem"; title = "Put Computer To Sleep"; ObjectID = "497"; */
+"497.title" = "Colocar computador para dormir";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "498"; */
+"498.title" = "Desligar Computador";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "499"; */
+"499.title" = "Notificação";
+
+/* Class = "NSMenuItem"; title = "35"; ObjectID = "514"; */
+"514.title" = "35";
+
+/* Class = "NSMenuItem"; title = "40"; ObjectID = "515"; */
+"515.title" = "40";
+
+/* Class = "NSMenuItem"; title = "45"; ObjectID = "516"; */
+"516.title" = "45";
+
+/* Class = "NSMenuItem"; title = "50"; ObjectID = "517"; */
+"517.title" = "50";
+
+/* Class = "NSMenuItem"; title = "55"; ObjectID = "518"; */
+"518.title" = "55";
+
+/* Class = "NSMenuItem"; title = "60"; ObjectID = "519"; */
+"519.title" = "60";
+
+/* Class = "NSButtonCell"; title = "Show preview images"; ObjectID = "Aao-Tf-JeJ"; */
+"Aao-Tf-JeJ.title" = "Mostrar Pré-visualização de Imagens";
+
+/* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
+"BPU-E2-N8l.title" = "Sempre limpe os itens completos após o código ser concluído";
+
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "Varredura:";
+
+/* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
+"cqp-xU-GOe.title" = "%1$@ ▸ Codificador: %2$@";
+
+/* Class = "NSTextFieldCell"; title = "Drag labels to Format to compose a naming format."; ObjectID = "dQ6-Dh-9sD"; */
+"dQ6-Dh-9sD.title" = "Arraste rótulos para Formato para compor um formato de nomeação.";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "None"; ObjectID = "f36-PN-c5F"; */
+"f36-PN-c5F.ibShadowedIsNilPlaceholder" = "Nenhum";
+
+/* Class = "NSTextFieldCell"; title = "Queue:"; ObjectID = "FKi-zh-5gc"; */
+"FKi-zh-5gc.title" = "Adicionar Títulos à Fila...";
+
+/* Class = "NSTextFieldCell"; title = "GB"; ObjectID = "FZE-ZR-g93"; */
+"FZE-ZR-g93.title" = "GB";
+
+/* Class = "NSButtonCell"; title = "Change case to Title Case"; ObjectID = "ggR-Zs-P8G"; */
+"ggR-Zs-P8G.title" = "Mudar caso para Caso de Título";
+
+/* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
+"GQJ-go-PoN.title" = "Sumário:";
+
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "Quantidade de codificações simultâneas:";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
+
+/* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
+"klQ-DW-Kc6.title" = "segundos";
+
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "Mantenha a predefinição das edições ao selecionar um novo título";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
+"lgn-RF-k0d.title" = "Remova registros antigos da pasta principais registros de atividades após 30 dias";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "Valores mais altos podem contribuir para a plena utilização da CPU caso uma única codificação não puder ser distribuída para todos os núcleos disponíveis da CPU.";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
+"PaR-zw-opS.ibShadowedToolTip" = "Espaço livre mínimo no disco de destino.";
+
+/* Class = "NSButtonCell"; title = "Replace underscores with spaces"; ObjectID = "pUi-lK-cHw"; */
+"pUi-lK-cHw.title" = "Substituir sublinhados por espaços";
+
+/* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
+"Tk3-Ig-fFI.ibShadowedToolTip" = "Arraste rótulos para o campo Formato para compor um formato de nomeação.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "OutrosViews";
+
+/* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
+"Uxv-oN-c1r.title" = "Reset para \"Não Fazer nada\" no lançamento";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "Predefinição:";
+
+/* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
+"wo5-iR-2mb.title" = "Remover pontuação comum";
+
+/* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
+"yG9-mz-tqQ.title" = "Pausa na fila se o espaço do disco for menor do que:";
+
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
+
+/* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
+"Zqz-Kn-xOS.title" = "Mostrar painel Código Aberto";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Presets.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "Crie uma nova predefinição personalizada com base nas configurações selecionadas atualmente.";
+
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "Exclua a predefinição selecionada.";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "Célula de Texto";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
+"cm5-Kl-dB3.title" = "Redefinir predefinições oficiais";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "D2t-YG-Frn"; */
+"D2t-YG-Frn.title" = "Tornar Padrão";
+
+/* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
+"Io0-Vm-Qez.title" = "Nova Categoria";
+
+/* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
+"LQk-kD-5sj.title" = "Menu de ação predefinições";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "LUl-ag-Iu6"; */
+"LUl-ag-Iu6.title" = "&Importar";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "oBC-Nh-TwB"; */
+"oBC-Nh-TwB.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSTextFieldCell"; title = "Presets"; ObjectID = "r4V-6L-SO8"; */
+"r4V-6L-SO8.title" = "Pré definições";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Presets"; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibExternalAccessibilityDescription" = "Pré definições";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.\n\nOverrides all encode settings. Settings may be further adjusted after selecting a preset."; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibShadowedToolTip" = "Predefinições são grupos de configurações de codificação sob medida para cenários específicos. Selecione o mais próximo que corresponde à sua intenção.\n\nSubstitui todas as configurações de código. As configurações podem ser ajustadas após a seleção de uma predefinição.";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "xEQ-Un-J0n"; */
+"xEQ-Un-J0n.title" = "Exportar…";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Additional Options"; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibExternalAccessibilityDescription" = "Opções Adicionais";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Show additional options."; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibShadowedToolTip" = "Mostar opções adicionais.";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Queue.strings Added

@@ -0,0 +1,72 @@
+/* Class = "NSMenuItem"; title = "Reset Failed Jobs"; ObjectID = "0zn-7P-JbR"; */
+"0zn-7P-JbR.title" = "Redefinir trabalhos com falha";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "9tg-YJ-DuI"; */
+"9tg-YJ-DuI.title" = "Remover trabalhos concluídos";
+
+/* Class = "NSWindow"; title = "Queue"; ObjectID = "2576"; */
+"2576.title" = "Fila";
+
+/* Class = "NSToolbarItem"; label = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.label" = "Quando Concluído";
+
+/* Class = "NSToolbarItem"; paletteLabel = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.paletteLabel" = "Quando Concluído";
+
+/* Class = "NSToolbarItem"; toolTip = "Action to perform when encoding is complete."; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.toolTip" = "Ação que vai ser executada quando a codificação estiver completa.";
+
+/* Class = "NSMenuItem"; title = "Alert and Notification"; ObjectID = "aat-1N-Odn"; */
+"aat-1N-Odn.title" = "Alerta e Notificação";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.label" = "Ação";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.paletteLabel" = "Ação";
+
+/* Class = "NSToolbarItem"; label = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.label" = "Destalhes";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.paletteLabel" = "Destalhes";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "fAD-ky-zo6"; */
+"fAD-ky-zo6.title" = "Alerta";
+
+/* Class = "NSMenuItem"; title = "Put Computer to Sleep"; ObjectID = "GUQ-xb-HVS"; */
+"GUQ-xb-HVS.title" = "Coloque o computador para dormir";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "jDL-sB-8e3"; */
+"jDL-sB-8e3.title" = "Notificação";
+
+/* Class = "NSMenuItem"; title = "Reset All Jobs"; ObjectID = "kPX-am-UX1"; */
+"kPX-am-UX1.title" = "Redefinir todos os empregos";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "QmP-SQ-XKK"; */
+"QmP-SQ-XKK.title" = "Desligar Computador";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.label" = "Pausa";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause/Resume"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.paletteLabel" = "Pausa/Currículo";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.toolTip" = "Codificação de pausa";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "sm5-26-sAg"; */
+"sm5-26-sAg.title" = "Fazer nada";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.label" = "Começo";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start/Cancel"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.paletteLabel" = "Começo/Cancelar";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.toolTip" = "Começar a Codificar";
+
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "Tvo-xt-sag"; */
+"Tvo-xt-sag.title" = "Remover todos os trabalhos";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Subtitles.strings Added

@@ -0,0 +1,174 @@
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Subtitles tracks"; ObjectID = "0yM-wE-D2x"; */
+"0yM-wE-D2x.ibExternalAccessibilityDescription" = "Legendas de faixas";
+
+/* Class = "NSTableColumn"; headerCell.title = "Encoding"; ObjectID = "1Qg-We-ltR"; */
+"1Qg-We-ltR.headerCell.title" = "Codificação";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "4PX-In-DpF"; */
+"4PX-In-DpF.title" = "Adicionar Todas as Faixas";
+
+/* Class = "NSTableColumn"; headerCell.title = "Language"; ObjectID = "9ka-9O-WDj"; */
+"9ka-9O-WDj.headerCell.title" = "Linguagem";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ABd-Ec-K2L"; */
+"ABd-Ec-K2L.title" = "OutrosViews";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "SRT/SSA Offset"; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibExternalAccessibilityDescription" = "Deslocamento SRT/SSA";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Positive or negative offset in milliseconds (ms) for the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibShadowedToolTip" = "Compensação positiva ou negativa em milissegundos (ms) para a faixa de origem do formato SRT/SSA selecionada. Não se aplica a outros formatos.";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "cSW-OC-qKA"; */
+"cSW-OC-qKA.title" = "Pop Up";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "dap-ee-kor"; */
+"dap-ee-kor.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "fAW-To-EeP"; */
+"fAW-To-EeP.title" = "Item 3";
+
+/* Class = "NSTableColumn"; headerCell.title = "Offset"; ObjectID = "Fgh-pZ-6uu"; */
+"Fgh-pZ-6uu.headerCell.title" = "Deslocamento";
+
+/* Class = "NSTableColumn"; headerCell.title = "Burned In"; ObjectID = "fIe-Fg-ufj"; */
+"fIe-Fg-ufj.headerCell.title" = "Queimado Em";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Fr7-eG-NuL"; */
+"Fr7-eG-NuL.title" = "OutrosViews";
+
+/* Class = "NSTableColumn"; headerCell.title = "Default"; ObjectID = "fvq-pE-sOC"; */
+"fvq-pE-sOC.headerCell.title" = "Padrão";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "fXD-7h-jMl"; */
+"fXD-7h-jMl.title" = "Adicionar Faixa Externa de Legendas...";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "g4b-FM-qX4"; */
+"g4b-FM-qX4.title" = "Item 2";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gHY-6m-ASb"; */
+"gHY-6m-ASb.title" = "Item 2";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "gYk-0C-2tR"; */
+"gYk-0C-2tR.title" = "Célula de Texto";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Forced subtitles only"; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibExternalAccessibilityDescription" = "Apenas legendas forçadas";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Forced Only. Use only subtitles marked as “forced” in the selected source track."; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibShadowedToolTip" = "Só forçado. Use apenas legendas marcadas como \"forçadas\" na faixa de origem selecionada.";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hhH-c3-gD0"; */
+"hhH-c3-gD0.title" = "0";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "HQq-Mp-4sI"; */
+"HQq-Mp-4sI.title" = "Item 2";
+
+/* Class = "NSMenuItem"; ibShadowedToolTip = "Add new SRT/SSA subtitle to the list."; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.ibShadowedToolTip" = "Adicione a nova legenda SRT/SSA à lista.";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.title" = "Adicionar Faixa Externa de Legendas...";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Language"; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibExternalAccessibilityDescription" = "Idioma SRT/SSA";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Language of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibShadowedToolTip" = "Idioma da faixa de origem do formato SRT/SSA selecionada. Não se aplica a outros formatos.";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "jcM-HL-QJ6"; */
+"jcM-HL-QJ6.title" = "Recarregar";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "jG8-uo-1tv"; */
+"jG8-uo-1tv.title" = "Recarregar";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JLr-Qi-X0X"; */
+"JLr-Qi-X0X.title" = "Checar";
+
+/* Class = "NSTableColumn"; headerCell.title = "Forced Only"; ObjectID = "klV-Gy-igk"; */
+"klV-Gy-igk.headerCell.title" = "Somente forçado";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Default"; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibExternalAccessibilityDescription" = "Padrão";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Default flag. Mark the selected subtitles track as the default to be displayed on playback."; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibShadowedToolTip" = "Bandeira padrão. Marque a faixa de legendas selecionadas como o padrão a ser exibido na reprodução.";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "mVi-zH-KUq"; */
+"mVi-zH-KUq.title" = "Remova todas as faixas";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "N3S-st-yGv"; */
+"N3S-st-yGv.headerCell.title" = "Faixa";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "ooy-Sh-Edm"; */
+"ooy-Sh-Edm.title" = "Checar";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "oxg-bs-1si"; */
+"oxg-bs-1si.title" = "Comportamento de seleção...";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "pwm-PV-1x4"; */
+"pwm-PV-1x4.title" = "Comportamento de seleção...";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "QRj-KI-a03"; */
+"QRj-KI-a03.title" = "Texto";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure subtitle tracks Selection Behavior. These settings affect which tracks will be added to the subtitle tracks list, and the settings used for each track."; ObjectID = "QsM-28-Pya"; */
+"QsM-28-Pya.ibShadowedToolTip" = "Configurar a legenda rastreia Comportamento de seleção. Essas configurações afetam quais faixas serão adicionadas à lista de faixas de legenda e às configurações usadas para cada faixa.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Character Encoding"; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibExternalAccessibilityDescription" = "Codificação de Caracteres SRT/SSA";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Character encoding/codeset of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibShadowedToolTip" = "Codificação/codeset de caracteres da faixa-fonte de formato SRT/SSA selecionada. Não se aplica a outros formatos.";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "R8a-qg-ASg"; */
+"R8a-qg-ASg.title" = "Remova todas as faixas";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "R9w-Bn-CCt"; */
+"R9w-Bn-CCt.title" = "Checar";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "Rj8-KI-k4L"; */
+"Rj8-KI-k4L.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "S2I-Jd-Lyg"; */
+"S2I-Jd-Lyg.title" = "Adicionar Todas as Faixas";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Subtitle tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the subtitle Selection Behavior dialog."; ObjectID = "Syo-rH-vof"; */
+"Syo-rH-vof.ibShadowedToolTip" = "Lista de faixas de legendas. O comportamento e as configurações de seleção de faixa são carregados a partir da predefinição selecionada e podem ser configurados usando a caixa de diálogo Comportamento de Seleção da legenda.";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibExternalAccessibilityDescription" = "Faixa selecionada";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Subtitles language and type."; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibShadowedToolTip" = "Idioma de legendas e tipo.";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "ThR-Cn-Vfr"; */
+"ThR-Cn-Vfr.title" = "Item 3";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "TJO-RZ-jgb"; */
+"TJO-RZ-jgb.title" = "Faixas";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Umu-1b-U1Z"; */
+"Umu-1b-U1Z.title" = "OutrosViews";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "UOP-xa-WpP"; */
+"UOP-xa-WpP.title" = "OutrosViews";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "vHW-fn-RSG"; */
+"vHW-fn-RSG.title" = "Pop Up";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the subtitles tracks list using the configured Selection Behavior."; ObjectID = "Vxx-gk-9kY"; */
+"Vxx-gk-9kY.ibShadowedToolTip" = "Recarregar a lista de faixas de legendas usando o comportamento de seleção configurado.";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "yDg-DK-z5D"; */
+"yDg-DK-z5D.title" = "Item 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "yEC-jb-q8b"; */
+"yEC-jb-q8b.title" = "Item 3";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Burned In"; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibExternalAccessibilityDescription" = "Queimado Em";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burned In. Make the selected subtitles permanent by overlaying them onto the video track."; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibShadowedToolTip" = "Queimado Em. Torna permanentes as legendas selecionadas sobrepondo-as na faixa de vídeo.";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/SubtitlesDefaults.strings Added

@@ -0,0 +1,87 @@
+/* Class = "NSButtonCell"; title = "Add Closed Captions when available"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "Adicionar closed caption quando disponível";
+
+/* Class = "NSButtonCell"; title = "DVD Subtitles"; ObjectID = "69Q-xB-Vyq"; */
+"69Q-xB-Vyq.title" = "Legendas de DVD";
+
+/* Class = "NSTextFieldCell"; title = "Burn-In Behavior:"; ObjectID = "640-NB-Uby"; */
+"640-NB-Uby.title" = "Comportamento de Queimar-Em:";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Subtitles Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "Idiomas de Faixas de Legendas";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "Selecione os idiomas a serem usados com a configuração Comportamento de seleção de faixas.";
+
+/* Class = "NSButtonCell"; title = "Blu-ray Subtitles"; ObjectID = "bfV-9D-6dh"; */
+"bfV-9D-6dh.title" = "Legendas Blu-ray";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded. Use this option if your playback software or device does not support DVD subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "ceZ-On-t5S"; */
+"ceZ-On-t5S.ibShadowedToolTip" = "Grave na primeira faixa de legendas do DVD selecionada. Todas as outras faixas de legendas do DVD serão descartadas. Use esta opção se o software de reprodução ou dispositivo não tiver suporte a legendas de DVD.\n\nApenas uma faixa de legendas pode ser queimada.";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio, then First Selected Track"; ObjectID = "d79-2j-fhc"; */
+"d79-2j-fhc.title" = "Áudio estrangeiro, em seguida, primeira faixa selecionada";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "ego-rt-a64"; */
+"ego-rt-a64.title" = "Cancelar";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "ej8-4k-1vd"; */
+"ej8-4k-1vd.title" = "Nenhum";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "Comportamento de Seleção de Faixa:";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "Todos os Idiomas Selecionados Correspondentes";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "iLI-Nb-D7t"; */
+"iLI-Nb-D7t.title" = "OK";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "Primeiros idiomas selecionados correspondentes";
+
+/* Class = "NSWindow"; title = "Subtitles Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "Comportamento da Seleção de Legendas";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Burn-In Behavior. Select which subtitles to make permanent by overlaying them onto the video track.\n\nOnly one subtitles track can be burned in."; ObjectID = "Lsa-kB-2BP"; */
+"Lsa-kB-2BP.ibShadowedToolTip" = "Comportamento de burn-in. Selecione quais legendas tornar permanentes sobrepondo-as à faixa de vídeo.\n\nApenas uma faixa de legendas pode ser queimada.";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "Idioma:";
+
+/* Class = "NSMenuItem"; title = "First Selected Track"; ObjectID = "mnl-P8-dtK"; */
+"mnl-P8-dtK.title" = "Primeira faixa selecionada";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "Nenhum";
+
+/* Class = "NSTextFieldCell"; title = "Only one subtitles burn-in option will be applied, starting with the first (top)."; ObjectID = "N4s-K9-RwM"; */
+"N4s-K9-RwM.title" = "Apenas uma opção de burn-in de legendas será aplicada, começando pela primeira (topo).";
+
+/* Class = "NSTextFieldCell"; title = "Options:"; ObjectID = "NJl-q3-zXL"; */
+"NJl-q3-zXL.title" = "Opções:";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "Track Selection Behavior.\n\nNenhum deles selecionará nenhuma faixa de áudio por padrão.\n\nFirst Matching Selected Languages adiciona a primeira faixa de áudio que corresponde a cada um dos idiomas selecionados presentes na fonte.\n\nTodos os Idiomas Selecionados Correspondentes adicionam todas as faixas de áudio que correspondem a cada um dos idiomas selecionados presentes na fonte.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
+"OOC-GZ-OFA.ibShadowedToolTip" = "A Pesquisa de Áudio Estrangeira verifica a fonte para sequências curtas de áudio estrangeiro ou alienígena que são exibidas por padrão.";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
+"Px8-G6-NVX.ibShadowedToolTip" = "Grave na primeira faixa de legenda blu-ray selecionada. Todas as outras faixas de legenda blu-ray serão descartadas. Use esta opção se o software ou dispositivo de reprodução não tiver suporte a legendas Blu-ray.\n\nApenas uma faixa de legendas pode ser queimada.";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
+"QRd-XH-6TH.title" = "Faixa de legendas de áudio estrangeiras";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "qVQ-fS-w1S"; */
+"qVQ-fS-w1S.title" = "Célula de Exibição da Tabela";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add Closed Caption subtitles as a soft subtitle track (not burned-in)."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "Adicione legendas closed caption como uma faixa de legenda leve (não gravadas).";
+
+/* Class = "NSButtonCell"; title = "Add Foreign Audio Search"; ObjectID = "vNY-OC-hTJ"; */
+"vNY-OC-hTJ.title" = "Adicionar Pesquisa de Áudio Estrangeira";
+

HandBrake-1.5.1.tar.xz/macosx/pt-BR.lproj/Video.strings Added

@@ -0,0 +1,123 @@
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "4Hq-BG-Ulb"; */
+"4Hq-BG-Ulb.ibShadowedIsNilPlaceholder" = "auto";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "6Cs-jo-8Q6"; */
+"6Cs-jo-8Q6.title" = "OutrosViews";
+
+/* Class = "NSButtonCell"; title = "Constant Framerate"; ObjectID = "6Dd-IP-Pwt"; */
+"6Dd-IP-Pwt.title" = "Framerate Constante";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder level. Sets and ensures compliance with the specified video compression standard level. Overrides all other settings."; ObjectID = "8CM-4G-oId"; */
+"8CM-4G-oId.ibShadowedToolTip" = "Nível de codificador de vídeo. Define e garante a conformidade com o nível padrão de compressão de vídeo especificado. Substitui todas as outras configurações.";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Framerate (Frames Per Second). Number of pictures displayed during each second of video."; ObjectID = "9tc-EO-QMd"; */
+"9tc-EO-QMd.ibShadowedToolTip" = "Framerate (Quadros por segundo). Número de imagens exibidas durante cada segundo de vídeo.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Average Bitrate varies quality to ensure the data rate remains relatively consistent throughout the video."; ObjectID = "A3o-Zx-OfM"; */
+"A3o-Zx-OfM.ibShadowedToolTip" = "O Bitrate médio varia de qualidade para garantir que a taxa de dados permaneça relativamente consistente durante todo o vídeo.";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Aes-nP-7qS"; */
+"Aes-nP-7qS.title" = "OutrosViews";
+
+/* Class = "NSButton"; ibShadowedToolTip = "2-pass encoding analyzes the entire source video before encoding. The information gathered enables the encoder to make more informed decisions about quality and data rate in Average Bitrate mode."; ObjectID = "bnV-aE-FVh"; */
+"bnV-aE-FVh.ibShadowedToolTip" = "A codificação de 2 passes analisa todo o vídeo de origem antes da codificação. As informações coletadas permitem que o codificador tote decisões mais informadas sobre qualidade e taxa de dados no modo Bitrate Médio.";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "bvD-W7-O0N"; */
+"bvD-W7-O0N.title" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Unparse:"; ObjectID = "CLk-dp-1b7"; */
+"CLk-dp-1b7.title" = "Unparse:";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "cRF-pz-1jt"; */
+"cRF-pz-1jt.title" = "Opções de codificador:";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "CRz-On-Jen"; */
+"CRz-On-Jen.ibShadowedIsNilPlaceholder" = "auto";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder tune. Further adjusts encoder preset to optimize settings for specific scenarios."; ObjectID = "cXd-X7-OhB"; */
+"cXd-X7-OhB.ibShadowedToolTip" = "Vídeo em vídeo. Ajusta ainda mais a predefinição do codificador para otimizar as configurações para cenários específicos.";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Displays all internal video encoder options."; ObjectID = "dwn-bf-Ua0"; */
+"dwn-bf-Ua0.ibShadowedToolTip" = "Exibe todas as opções internas de codificador de vídeo.";
+
+/* Class = "NSButtonCell"; title = "Fast Decode"; ObjectID = "EcY-w1-bc8"; */
+"EcY-w1-bc8.title" = "Decodificador rápido";
+
+/* Class = "NSTextFieldCell"; title = "Quality:"; ObjectID = "F3s-qR-qeE"; */
+"F3s-qR-qeE.title" = "Qualidade:";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Video encoder preset. Adjusts encoder settings to balance compression efficiency and encoding speed. Slower encoder presets may use settings that are less compatible with certain devices."; ObjectID = "fue-2d-Bjn"; */
+"fue-2d-Bjn.ibShadowedToolTip" = "Pré-definição do codificador de vídeo. Ajusta as configurações do codificador para equilibrar a eficiência da compressão e a velocidade de codificação. Pré-definições de codificadores mais lentas podem usar configurações menos compatíveis com determinados dispositivos.";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "fzT-im-zKN"; */
+"fzT-im-zKN.title" = "Música:";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar"; ObjectID = "gEp-lv-YUY"; */
+"gEp-lv-YUY.ibShadowedToolTip" = "Opções adicionais de codificador de vídeo. Apenas para uso avançado.\n\nSintaxe: option-1=foo:opt2=bar";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "gIJ-Xs-uVF"; */
+"gIJ-Xs-uVF.title" = "OutrosViews";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Constant Quality varies bitrate to ensure visual quality remains relatively consistent throughout the video.\n\nAdjust the quality slider to the right to increase quality or to the left to decrease quality, in small increments of plus or minus 1-2.\n\nRecommended values for the x264 and x265 encoders are RF 18-28. Higher quality settings may produce extremely large files.\n\nx264 is lossless at RF 0."; ObjectID = "GPu-Ht-bKg"; */
+"GPu-Ht-bKg.ibShadowedToolTip" = "A Qualidade Constante varia bitrate para garantir que a qualidade visual permaneça relativamente consistente durante todo o vídeo.\n\nAjuste o controle deslizante de qualidade para a direita para aumentar a qualidade ou para a esquerda para diminuir a qualidade, em pequenos incrementos de mais ou menos 1-2.\n\nOs valores recomendados para os codificadores x264 e x265 são RF 18-28. Configurações de maior qualidade podem produzir arquivos extremamente grandes.\n\nx264 é sem perdas em RF 0.";
+
+/* Class = "NSTextFieldCell"; title = "Profile:"; ObjectID = "Hho-GY-qOR"; */
+"Hho-GY-qOR.title" = "Perfil:";
+
+/* Class = "NSTextFieldCell"; title = "Additional Options:"; ObjectID = "ja7-Zr-y1P"; */
+"ja7-Zr-y1P.title" = "Opções Adicionais:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Jj0-Qw-HF8"; */
+"Jj0-Qw-HF8.title" = "OutrosViews";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder profile. Sets and ensures compliance with the specified video compression standard profile. Overrides all other settings."; ObjectID = "kh8-d2-hSD"; */
+"kh8-d2-hSD.ibShadowedToolTip" = "Perfil de codificador de vídeo. Define e garante a conformidade com o perfil padrão de compressão de vídeo especificado. Substitui todas as outras configurações.";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "kPs-u2-fDn"; */
+"kPs-u2-fDn.title" = "Opções de codificador:";
+
+/* Class = "NSTextFieldCell"; title = "Video Encoder:"; ObjectID = "Mrb-6Q-0YM"; */
+"Mrb-6Q-0YM.title" = "Codificador do Vídeo:";
+
+/* Class = "NSButtonCell"; title = "2-pass encoding"; ObjectID = "nPA-nO-Eik"; */
+"nPA-nO-Eik.title" = "Codificação de 2 passes";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Turbo first pass speeds up the first pass of a 2-pass encode for a slight penalty to analysis."; ObjectID = "olm-zg-k9Y"; */
+"olm-zg-k9Y.ibShadowedToolTip" = "O primeiro passe turbo acelera o primeiro passe de uma codificação de 2 passes para uma pequena penalidade à análise.";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "QWu-rv-zfM"; */
+"QWu-rv-zfM.title" = "Predefinição:";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar,baz"; ObjectID = "rbo-w6-ENd"; */
+"rbo-w6-ENd.ibShadowedToolTip" = "Opções adicionais de codificador de vídeo. Apenas para uso avançado.\n\nSintaxe: option-1=foo:opt2=bar,baz";
+
+/* Class = "NSTextFieldCell"; title = "RF:"; ObjectID = "rRB-9F-pHn"; */
+"rRB-9F-pHn.title" = "Rf:";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rXn-NC-pEv"; */
+"rXn-NC-pEv.title" = "OutrosViews";
+
+/* Class = "NSTextFieldCell"; title = "Framerate (FPS):"; ObjectID = "SJc-tv-AMH"; */
+"SJc-tv-AMH.title" = "Framerate (FPS):";
+
+/* Class = "NSTextFieldCell"; title = "Level:"; ObjectID = "sTM-lk-DBC"; */
+"sTM-lk-DBC.title" = "Nível:";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Fast Decode uses settings that reduce CPU usage during playback of the encoded video. Useful for devices that struggle to play video without stuttering."; ObjectID = "stU-Fo-Avu"; */
+"stU-Fo-Avu.ibShadowedToolTip" = "O Fast Decode usa configurações que reduzem o uso da CPU durante a reprodução do vídeo codificado. Útil para dispositivos que lutam para reproduzir vídeo sem gaguejar.";
+
+/* Class = "NSButtonCell"; title = "Average Bitrate (kbps):"; ObjectID = "VQe-CK-YDR"; */
+"VQe-CK-YDR.title" = "Média de Bitrate (kbps):";
+
+/* Class = "NSButtonCell"; title = "Turbo first pass"; ObjectID = "vSc-VB-NEv"; */
+"vSc-VB-NEv.title" = "Turbo primeiro passe";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder. Determines video type and settings used during encoding."; ObjectID = "xwK-Yu-a1e"; */
+"xwK-Yu-a1e.ibShadowedToolTip" = "Codificador de vídeo. Determina o tipo de vídeo e as configurações usadas durante a codificação.";
+
+/* Class = "NSButtonCell"; title = "Constant Quality"; ObjectID = "ZjL-cY-O5f"; */
+"ZjL-cY-O5f.title" = "Qualidade Constante";
+
+/* Class = "NSButtonCell"; title = "Variable Framerate"; ObjectID = "zZo-75-1WG"; */
+"zZo-75-1WG.title" = "Framerate Variável";
+

HandBrake-1.5.1.tar.xz/macosx/ru.lproj/HBCroppingView.strings Changed

HandBrake-1.5.1.tar.xz/macosx/xcconfig/base/arch.arm64.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/xcconfig/base/os.osx1013.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/xcconfig/osx1013.arm64.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/xcconfig/osx1013.x86_64.xcconfig Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/AddPreset.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "5Xb-gz-QEa"; */
+"5Xb-gz-QEa.title" = "取消";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a description for the new preset. The description will be shown when hovering the cursor over the preset in the presets list."; ObjectID = "8kl-Sh-Gh7"; */
+"8kl-Sh-Gh7.ibShadowedToolTip" = "为新的预设输入描述。将光标悬停在预设列表中的预置上时，将显示该描述。";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "75B-xq-Qbe"; */
+"75B-xq-Qbe.title" = "分辨率限制：";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "a0j-nw-n23"; */
+"a0j-nw-n23.title" = "选择行为";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "aez-2b-JXx"; */
+"aez-2b-JXx.ibShadowedToolTip" = "选择行为决定了选择预设时使用的音轨和设置。";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Enter a name for the new preset. This name will be displayed in the presets list."; ObjectID = "aKg-n4-OUS"; */
+"aKg-n4-OUS.ibShadowedToolTip" = "为新的预设输入一个名称。此名称将显示在预设列表中。";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Picture Size controls how video dimensions are applied when selecting the preset.\n\nNone uses the currently set dimensions.\n\nCustom allows you to set a maximum width and/or height.\n\nSource maximum uses the full dimensions of each source."; ObjectID = "bma-pS-phM"; */
+"bma-pS-phM.ibShadowedToolTip" = "画面大小控制选择预设时如何应用视频尺寸。\n\n无：使用当前设置的尺寸。\n\n自定义：允许您设置最大宽度和/或高度。\n\n最大源：使用每个源的完整尺寸。";
+
+/* Class = "NSWindow"; title = "New Preset"; ObjectID = "dbZ-Wo-9nG"; */
+"dbZ-Wo-9nG.title" = "新的预设";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "Deg-rS-mRc"; */
+"Deg-rS-mRc.title" = "添加";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Width"; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibExternalAccessibilityDescription" = "画面宽度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage width in pixels allowed by the preset. Set to 0 for unlimited width."; ObjectID = "gOg-oO-8ar"; */
+"gOg-oO-8ar.ibShadowedToolTip" = "预设允许的最大视频存储宽度，以像素为单位。设置为 0 为无限宽度。";
+
+/* Class = "NSTextFieldCell"; title = "Description:"; ObjectID = "hc8-1h-Jye"; */
+"hc8-1h-Jye.title" = "描述：";
+
+/* Class = "NSTextFieldCell"; title = "Audio:"; ObjectID = "HKp-K9-MF4"; */
+"HKp-K9-MF4.title" = "音频：";
+
+/* Class = "NSTextFieldCell"; title = "Category:"; ObjectID = "IyE-Lz-32s"; */
+"IyE-Lz-32s.title" = "类别：";
+
+/* Class = "NSTextFieldCell"; title = "Preset Name:"; ObjectID = "jhj-Et-ncF"; */
+"jhj-Et-ncF.title" = "预设名称：";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "LPX-Rc-KLa"; */
+"LPX-Rc-KLa.title" = "选择行为";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Picture Height"; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibExternalAccessibilityDescription" = "画面高度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Maximum video storage height in pixels allowed by the preset. Set to 0 for unlimited height."; ObjectID = "Mga-dS-8BF"; */
+"Mga-dS-8BF.ibShadowedToolTip" = "预设允许的最大视频存储高度，以像素为单位。设置为 0 为无限高度。";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "Nfk-ix-xIv"; */
+"Nfk-ix-xIv.title" = "x";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Selection Behavior determines the track(s) and settings used when the preset is selected."; ObjectID = "nWJ-0b-fUA"; */
+"nWJ-0b-fUA.ibShadowedToolTip" = "选择行为决定了选择预置时使用的轨道和设置。";
+
+/* Class = "NSTextFieldCell"; title = "Subtitles:"; ObjectID = "OYE-GG-Vo3"; */
+"OYE-GG-Vo3.title" = "字幕：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qsA-gt-zdK"; */
+"qsA-gt-zdK.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "Sf8-HP-mhE"; */
+"Sf8-HP-mhE.title" = "新分类...";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tQ1-PN-kvh"; */
+"tQ1-PN-kvh.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Resolution Limit allows you to set a maximum width and/or height."; ObjectID = "z6B-ig-ouq"; */
+"z6B-ig-ouq.ibShadowedToolTip" = "分辨率限制允许您设置一个最大宽度和/或高度。";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Audio.strings Added

@@ -0,0 +1,150 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibExternalAccessibilityDescription" = "增益";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "2c7-G5-4KL"; */
+"2c7-G5-4KL.ibShadowedToolTip" = "以分贝（dB）为单位进行音频增益。 增大或减小音量。";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "5xO-DR-4cR"; */
+"5xO-DR-4cR.headerCell.title" = "增益";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibExternalAccessibilityDescription" = "已选轨道";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio language and type."; ObjectID = "6iN-2G-JDF"; */
+"6iN-2G-JDF.ibShadowedToolTip" = "音频语言与类型";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "6Iz-D8-zzz"; */
+"6Iz-D8-zzz.title" = "文本单元格";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "7sz-4X-5jA"; */
+"7sz-4X-5jA.headerCell.title" = "轨道";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "aaP-HB-s4f"; */
+"aaP-HB-s4f.title" = "文本单元格";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "AMA-Ul-v2f"; */
+"AMA-Ul-v2f.title" = "添加所有轨道";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "aYF-d5-Ya6"; */
+"aYF-d5-Ya6.title" = "选择行为";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "BBQ-FP-aQN"; */
+"BBQ-FP-aQN.ibExternalAccessibilityDescription" = "增益";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "eAS-E5-fip"; */
+"eAS-E5-fip.headerCell.title" = "DRC";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "eFn-1M-3hk"; */
+"eFn-1M-3hk.title" = "文本单元格";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "fqs-Q8-hNY"; */
+"fqs-Q8-hNY.title" = "移除所有轨道";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "gtC-MM-esd"; */
+"gtC-MM-esd.ibShadowedToolTip" = "以分贝（dB）为单位进行音频增益。 增大或减小音量。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "HKE-hO-jOm"; */
+"HKE-hO-jOm.title" = "文本单元格";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "hlm-8l-ATk"; */
+"hlm-8l-ATk.ibShadowedIsNilPlaceholder" = "自动";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "HM0-a4-pm5"; */
+"HM0-a4-pm5.title" = "添加所有轨道";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Ifq-hI-oCs"; */
+"Ifq-hI-oCs.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "jub-Uq-qYL"; */
+"jub-Uq-qYL.headerCell.title" = "采样率";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "kmi-ru-dRe"; */
+"kmi-ru-dRe.title" = "文本单元格";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "l8E-uG-8fo"; */
+"l8E-uG-8fo.title" = "文本单元格";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibExternalAccessibilityDescription" = "混音";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "LLW-KN-65P"; */
+"LLW-KN-65P.ibShadowedToolTip" = "混音类型。控制多轨道音频如何混合成较少的音轨，或是否保留原音轨。\n\nDolby Surround 与 Dolby Pro Logic II 会将多轨音频转换为立体声并将额外的音轨矩阵编码，从而给适应的设备提供立体声环绕播放，同时也能保持立体声的兼容性。";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "lnO-sZ-6xv"; */
+"lnO-sZ-6xv.headerCell.title" = "编解码器";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "MZ7-W1-uGl"; */
+"MZ7-W1-uGl.title" = "文本单元格";
+
+/* Class = "NSSliderCell"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "nII-CW-aWc"; */
+"nII-CW-aWc.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "o3M-fP-6Ps"; */
+"o3M-fP-6Ps.ibShadowedToolTip" = "动态范围压缩。 减小大声和安静声之间的音量差异。编码为其他格式时，仅适用于 AC-3 源轨道。 \n\n0：不应用 DRC。\n1：应用 DRC 提示提示压缩嵌入源轨道中。\n\n值大于 1 会进一步增加安静的音量。 通常不需要大于 2.5 的值，并且可能会引起音频失真。";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "obP-lK-sY0"; */
+"obP-lK-sY0.headerCell.title" = "比特率";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "Pfh-Bc-83k"; */
+"Pfh-Bc-83k.title" = "轨道";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "q2P-Tg-cBJ"; */
+"q2P-Tg-cBJ.title" = "重新加载";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "Q4T-80-wxf"; */
+"Q4T-80-wxf.title" = "0";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibExternalAccessibilityDescription" = "采样率";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "QA9-1y-Pyj"; */
+"QA9-1y-Pyj.ibShadowedToolTip" = "音频采样率（千赫兹/kHz）。推荐自动。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibExternalAccessibilityDescription" = "比特率";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "Qg1-iw-07b"; */
+"Qg1-iw-07b.ibShadowedToolTip" = "音频比特率，单位是千比特/秒（kbps）。较小的值会降低音频质量。较大的值会使用更多的数据，可能兼容性较差。";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "qS7-Xr-9N8"; */
+"qS7-Xr-9N8.headerCell.title" = "混音";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "sq7-Ux-T6D"; */
+"sq7-Ux-T6D.title" = "重新加载";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "TK6-fY-4Sk"; */
+"TK6-fY-4Sk.title" = "选择行为";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibExternalAccessibilityDescription" = "编解码器";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "tYY-w7-ZIq"; */
+"tYY-w7-ZIq.ibShadowedToolTip" = "音频编码器。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "U4U-1b-rQF"; */
+"U4U-1b-rQF.title" = "文本单元格";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure audio tracks Selection Behavior. These settings affect which tracks will be added to the audio tracks list, and the settings used for each track."; ObjectID = "vFP-nq-IQg"; */
+"vFP-nq-IQg.ibShadowedToolTip" = "配置音轨选择行为。这些设置影响哪些轨道将被添加到音频轨道列表，以及每个轨道所使用的设置。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Vxo-66-Mrx"; */
+"Vxo-66-Mrx.title" = "其他视图";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the audio tracks list using the configured Selection Behavior."; ObjectID = "wcL-rL-aYS"; */
+"wcL-rL-aYS.ibShadowedToolTip" = "使用配置的选择重新加载音轨列表。";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Audio tracks"; ObjectID = "yix-PF-sqH"; */
+"yix-PF-sqH.ibExternalAccessibilityDescription" = "音轨";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "YlA-ue-5oE"; */
+"YlA-ue-5oE.title" = "移除所有轨道";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "yPh-4R-HRQ"; */
+"yPh-4R-HRQ.ibShadowedToolTip" = "动态范围压缩。 减小大声和安静声之间的音量差异。编码为其他格式时，仅适用于AC-3源轨道。 \n\n0：不应用 DRC。\n1：应用 DRC 提示提示压缩嵌入源轨道中。\n\n值大于 1 会进一步增加安静的音量。 通常不需要大于2.5的值，并且可能会引起音频失真。";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Audio tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the audio Selection Behavior dialog."; ObjectID = "Yzu-Rk-hTv"; */
+"Yzu-Rk-hTv.ibShadowedToolTip" = "音轨列表。曲目的选择和设置从选定的预设中加载，并且可以使用“音频选择行为”对话框进行配置。";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/AudioDefaults.strings Added

@@ -0,0 +1,216 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports FLAC. This permits FLAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "0HY-xB-cvO"; */
+"0HY-xB-cvO.ibShadowedToolTip" = "如果播放设备支持 FLAC，请启用此选项。这允许在启用自动直通选择时选择 FLAC 直通。";
+
+/* Class = "NSTableColumn"; headerCell.title = "Mixdown"; ObjectID = "0kT-0J-3k2"; */
+"0kT-0J-3k2.headerCell.title" = "混音";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "1XC-VS-X3g"; */
+"1XC-VS-X3g.title" = "文本单元格";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "3o5-Gn-Vao"; */
+"3o5-Gn-Vao.title" = "文本单元格";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Codec"; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibExternalAccessibilityDescription" = "编解码器";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder."; ObjectID = "6lx-af-rBL"; */
+"6lx-af-rBL.ibShadowedToolTip" = "音频编码器。";
+
+/* Class = "NSTextFieldCell"; title = "Audio encoder settings for each selected track:"; ObjectID = "007-WM-RmC"; */
+"007-WM-RmC.title" = "为每个所选轨道设置音频编码器：";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "7sl-o7-pUh"; */
+"7sl-o7-pUh.title" = "文本单元格";
+
+/* Class = "NSButtonCell"; title = "DTS"; ObjectID = "8mC-Wx-myL"; */
+"8mC-Wx-myL.title" = "DTS";
+
+/* Class = "NSButtonCell"; title = "Use only first encoder for secondary audio"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "为次要音频仅使用首选编码器";
+
+/* Class = "NSTextFieldCell"; title = "Passthru Fallback:"; ObjectID = "AQe-Sg-Qgh"; */
+"AQe-Sg-Qgh.title" = "直通回退：";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Audio Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "音轨语言";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "选择要与“轨道选择行为”设置一起使用的语言。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "BaY-Lo-8xn"; */
+"BaY-Lo-8xn.ibShadowedToolTip" = "动态范围压缩。 减小大声和安静声之间的音量差异。编码为其他格式时，仅适用于AC-3源轨道。 \n\n0：不应用 DRC。\n1：应用 DRC 提示提示压缩嵌入源轨道中。\n\n值大于 1 会进一步增加安静的音量。 通常不需要大于2.5的值，并且可能会引起音频失真。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports E-AC3. This permits E-AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "BK7-c4-kkk"; */
+"BK7-c4-kkk.ibShadowedToolTip" = "如果播放设备支持 E-AC3，请启用此选项。这允许在启用自动直通选择时选择 E-AC3 直通。";
+
+/* Class = "NSButtonCell"; title = "AAC"; ObjectID = "cUX-iP-UAs"; */
+"cUX-iP-UAs.title" = "AAC";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibExternalAccessibilityDescription" = "增益";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "DbI-6O-BzA"; */
+"DbI-6O-BzA.ibShadowedToolTip" = "以分贝（dB）为单位进行音频增益。 增大或减小音量。";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "DRC"; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibExternalAccessibilityDescription" = "DRC";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Dynamic Range Compression. Reduces the volume difference between loud and quiet sounds. Only applies to AC-3 source tracks when encoding to another format.\n\n0: Do not apply DRC.\n1: Apply DRC according to the compression hints embedded in the source track.\n\nValues greater than 1 further increase the volume of quiet sounds. Values greater than 2.5 are typically unnecessary and may introduce audible distortion."; ObjectID = "DGi-Dl-5nh"; */
+"DGi-Dl-5nh.ibShadowedToolTip" = "动态范围压缩。 减小大声和安静声之间的音量差异。编码为其他格式时，仅适用于AC-3源轨道。 \n\n0：不应用 DRC。\n1：应用 DRC 提示提示压缩嵌入源轨道中。\n\n值大于 1 会进一步增加安静的音量。 通常不需要大于2.5的值，并且可能会引起音频失真。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "dpw-He-8eZ"; */
+"dpw-He-8eZ.title" = "文本单元格";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "Auto"; ObjectID = "DxT-bF-prJ"; */
+"DxT-bF-prJ.ibShadowedIsNilPlaceholder" = "自动";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS. This permits DTS passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "E93-Md-aWa"; */
+"E93-Md-aWa.ibShadowedToolTip" = "如果播放设备支持 DTS，请启用此选项。这允许在启用自动直通选择时选择 DTS 直通。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AC3. This permits AC3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fgl-Ev-ELt"; */
+"fgl-Ev-ELt.ibShadowedToolTip" = "如果播放设备支持 AC3，请启用此选项。这允许在启用自动直通选择时选择 AC3 直通。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "fH9-oV-QdJ"; */
+"fH9-oV-QdJ.title" = "文本单元格";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports AAC. This permits AAC passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "fzd-MO-xaB"; */
+"fzd-MO-xaB.ibShadowedToolTip" = "如果播放设备支持 AAC，请启用此选项。这允许在启用自动直通选择时选择 AAC 直通。";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "轨道选择行为：";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP2. This permits MP2 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "GHJ-25-kZl"; */
+"GHJ-25-kZl.ibShadowedToolTip" = "如果播放设备支持 MP2，请启用此选项。这允许在启用自动直通选择时选择 MP2 直通。";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "所有匹配的选定语言";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Bitrate"; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibExternalAccessibilityDescription" = "比特率";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio bit rate in kilobits per second (kbps). Smaller values reduce audio quality. Larger values use more data and may be less compatible."; ObjectID = "hHP-dw-nba"; */
+"hHP-dw-nba.ibShadowedToolTip" = "音频比特率（千比特每秒/Kbps）。小的数值会减少音频质量，大的数值会使用更多的数据，或许会降低兼容性";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Mixdown"; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibExternalAccessibilityDescription" = "混音";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Mixdown type. Controls how multi-channel audio is mixed into fewer channels, or whether the original channels are preserved.\n\nDolby Surround and Dolby Pro Logic II convert multi-channel audio to stereo and matrix encode additional channels for surround reproduction on compatible equipment, while maintaining stereo compatibility."; ObjectID = "igm-hS-rrD"; */
+"igm-hS-rrD.ibShadowedToolTip" = "混音类型。控制多轨道音频如何混合成较少的音轨，或是否保留原音轨。\n\nDolby Surround 与 Dolby Pro Logic II 会将多轨音频转换为立体声并将额外的音轨矩阵编码，从而给适应的设备提供立体声环绕播放，同时也能保持立体声的兼容性。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports DTS-HD. This permits DTS-HD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "IxI-o9-jMs"; */
+"IxI-o9-jMs.ibShadowedToolTip" = "如果播放设备支持 DTS-HD，请启用此选项。这允许在启用自动直通选择时选择 DTS-HD 直通。";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "优先匹配已选语言";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "Jn4-1L-J1g"; */
+"Jn4-1L-J1g.title" = "取消";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "kDe-1L-VkD"; */
+"kDe-1L-VkD.title" = "确定";
+
+/* Class = "NSWindow"; title = "Audio Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "音频选择行为";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio encoder to use when a track suitable for passthru is unavailable."; ObjectID = "LdN-Cx-ZJY"; */
+"LdN-Cx-ZJY.ibShadowedToolTip" = "音频编码器所使用的音轨不适用直通";
+
+/* Class = "NSButtonCell"; title = "DTS-HD"; ObjectID = "LX6-kc-5vq"; */
+"LX6-kc-5vq.title" = "DTS-HD";
+
+/* Class = "NSTableColumn"; headerCell.title = "Samplerate"; ObjectID = "LxC-Qx-psh"; */
+"LxC-Qx-psh.headerCell.title" = "采样率";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "语言：";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "MiI-OV-waZ"; */
+"MiI-OV-waZ.title" = "0";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "无";
+
+/* Class = "NSTableColumn"; headerCell.title = "Gain"; ObjectID = "N7h-CJ-quV"; */
+"N7h-CJ-quV.headerCell.title" = "增益";
+
+/* Class = "NSButtonCell"; title = "FLAC"; ObjectID = "naS-No-CdV"; */
+"naS-No-CdV.title" = "FLAC";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "轨道选择行为。\n\n默认情况下，没有人会选择任何音轨。\n\n第一个匹配的选择语言添加了与源中存在的每个选择的语言匹配的第一个音频轨道。\n\n所有匹配的选定语言都添加了匹配源中所选语言的所有音轨。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports TrueHD. This permits TrueHD passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "os0-Jl-OXF"; */
+"os0-Jl-OXF.ibShadowedToolTip" = "如果播放设备支持 TrueHD，请启用此选项。这允许在启用自动通过选择时选择 TrueHD 直通。";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips0 = "Add Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips0" = "添加音轨";
+
+/* Class = "NSSegmentedCell"; otA-K4-TxM.ibShadowedToolTips1 = "Remove Selected Audio Track"; ObjectID = "otA-K4-TxM"; */
+"otA-K4-TxM.ibShadowedToolTips1" = "移除所选音轨";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "OVr-Jm-VrK"; */
+"OVr-Jm-VrK.title" = "0";
+
+/* Class = "NSTableColumn"; headerCell.title = "Codec"; ObjectID = "pR9-d4-SNf"; */
+"pR9-d4-SNf.headerCell.title" = "编解码器";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PtB-Wp-B9X"; */
+"PtB-Wp-B9X.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Samplerate"; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibExternalAccessibilityDescription" = "采样率";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Audio sample rate in kilohertz (kHz). Auto is recommended."; ObjectID = "r80-yv-59n"; */
+"r80-yv-59n.ibShadowedToolTip" = "音频采样率（千赫兹）。推荐自动（auto）。";
+
+/* Class = "NSTextFieldCell"; title = "Auto Passthru:"; ObjectID = "s6s-EH-5CB"; */
+"s6s-EH-5CB.title" = "自动直通：";
+
+/* Class = "NSButtonCell"; title = "MP3"; ObjectID = "sdZ-Rx-JoG"; */
+"sdZ-Rx-JoG.title" = "MP3";
+
+/* Class = "NSButtonCell"; title = "E-AC3"; ObjectID = "u9h-dn-wcK"; */
+"u9h-dn-wcK.title" = "E-AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Only the primary audio track will be encoded with the full encoder list. All additional audio tracks will be encoded with first encoder only."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "只有主音轨才会用完整的编码器列表进行编码。所有其他音轨将只用第一个编码器进行编码。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "uFK-z7-8Yj"; */
+"uFK-z7-8Yj.title" = "文本单元格";
+
+/* Class = "NSMenuItem"; title = "Item"; ObjectID = "UJy-A2-Bb1"; */
+"UJy-A2-Bb1.title" = "项目";
+
+/* Class = "NSTableColumn"; headerCell.title = "Bitrate"; ObjectID = "vhn-7C-4aZ"; */
+"vhn-7C-4aZ.headerCell.title" = "比特率";
+
+/* Class = "NSButtonCell"; title = "AC3"; ObjectID = "VnE-3R-bUf"; */
+"VnE-3R-bUf.title" = "AC3";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Enable this if your playback device supports MP3. This permits MP3 passthru to be selected when automatic passthru selecion is enabled."; ObjectID = "vUx-OV-W5T"; */
+"vUx-OV-W5T.ibShadowedToolTip" = "如果播放设备支持 MP3，请启用此选项。这允许在启用自动直通选择时选择 MP3 直通。";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "XKL-2e-Dlv"; */
+"XKL-2e-Dlv.title" = "表单视图单元格";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Gain"; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibExternalAccessibilityDescription" = "增益";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Audio gain in decibels (dB). Increases or decreases audio volume."; ObjectID = "xnA-03-Bul"; */
+"xnA-03-Bul.ibShadowedToolTip" = "以分贝（dB）为单位进行音频增益。 增大或减小音量。";
+
+/* Class = "NSButtonCell"; title = "MP2"; ObjectID = "Z8O-AS-UdA"; */
+"Z8O-AS-UdA.title" = "MP2";
+
+/* Class = "NSButtonCell"; title = "TrueHD"; ObjectID = "z9d-P3-6UP"; */
+"z9d-P3-6UP.title" = "TrueHD";
+
+/* Class = "NSTableColumn"; headerCell.title = "DRC"; ObjectID = "zX9-T9-wKy"; */
+"zX9-T9-wKy.headerCell.title" = "DRC";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/ChaptersTitles.strings Added

@@ -0,0 +1,57 @@
+/* Class = "NSTableColumn"; headerCell.title = "Index"; ObjectID = "0iF-eL-NOC"; */
+"0iF-eL-NOC.headerCell.title" = "索引";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Export the list of chapter names to a CSV file."; ObjectID = "3SP-6e-RPS"; */
+"3SP-6e-RPS.ibShadowedToolTip" = "将章节名称列表导出为 CSV 文件。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a chapter markers track to the video."; ObjectID = "7Xf-c0-jsr"; */
+"7Xf-c0-jsr.ibShadowedToolTip" = "添加一个章节标记轨道到视频。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "All-Bz-NLv"; */
+"All-Bz-NLv.title" = "文本单元格";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "FyM-2X-9xs"; */
+"FyM-2X-9xs.title" = "文本单元格";
+
+/* Class = "NSTextFieldCell"; title = "1"; ObjectID = "G9p-Cg-wyC"; */
+"G9p-Cg-wyC.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Export Chapters…"; ObjectID = "h0O-zg-OF9"; */
+"h0O-zg-OF9.title" = "导出章节...";
+
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Chapter titles"; ObjectID = "InF-gR-Lia"; */
+"InF-gR-Lia.ibExternalAccessibilityDescription" = "章节标题";
+
+/* Class = "NSButtonCell"; title = "Create chapter markers"; ObjectID = "lJL-wX-DVP"; */
+"lJL-wX-DVP.title" = "创建章节标记";
+
+/* Class = "NSTableColumn"; headerCell.title = "Start"; ObjectID = "NlF-th-Cg9"; */
+"NlF-th-Cg9.headerCell.title" = "开始";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "ozt-ED-g1M"; */
+"ozt-ED-g1M.title" = "文本单元格";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "pAo-XM-bvP"; */
+"pAo-XM-bvP.title" = "文本单元格";
+
+/* Class = "NSButtonCell"; title = "Import Chapters…"; ObjectID = "PM3-Ue-0kW"; */
+"PM3-Ue-0kW.title" = "导入章节...";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "QVB-Cw-DJD"; */
+"QVB-Cw-DJD.headerCell.title" = "时长";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Import a list of chapter names from a CSV file."; ObjectID = "Ron-3B-rYg"; */
+"Ron-3B-rYg.ibShadowedToolTip" = "从 CSV 文件导入章节名称列表。";
+
+/* Class = "NSTextFieldCell"; title = "Title"; ObjectID = "UjY-nz-uSt"; */
+"UjY-nz-uSt.title" = "标题";
+
+/* Class = "NSTextFieldCell"; title = "Duration"; ObjectID = "Vmq-zJ-NEA"; */
+"Vmq-zJ-NEA.title" = "时长";
+
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "Z6H-lJ-ipr"; */
+"Z6H-lJ-ipr.headerCell.title" = "标题";
+
+/* Class = "NSTextFieldCell"; title = "Timestamp"; ObjectID = "zaN-qY-tke"; */
+"zaN-qY-tke.title" = "时间戳";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/ExceptionAlert.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBAddCategoryController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBCroppingView.strings Added

@@ -0,0 +1,48 @@
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibExternalAccessibilityDescription" = "裁剪底部";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels."; ObjectID = "6Gj-ZU-E1E"; */
+"6Gj-ZU-E1E.ibShadowedToolTip" = "底部边缘的裁切量，以像素为单位。";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "8e5-zI-IBg"; */
+"8e5-zI-IBg.ibExternalAccessibilityDescription" = "裁剪顶部";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibExternalAccessibilityDescription" = "裁剪顶部";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels."; ObjectID = "Cp5-xz-x1h"; */
+"Cp5-xz-x1h.ibShadowedToolTip" = "顶部部边缘的裁剪量，以像素为单位。";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments."; ObjectID = "cWv-q0-EN9"; */
+"cWv-q0-EN9.ibShadowedToolTip" = "将画面顺时针旋转 90 度。";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "dD5-og-dxx"; */
+"dD5-og-dxx.title" = "自定义";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibExternalAccessibilityDescription" = "裁剪右侧";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels."; ObjectID = "php-p6-Nz6"; */
+"php-p6-Nz6.ibShadowedToolTip" = "右侧边缘的裁剪量，以像素为单位。";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "Pqk-fS-pyy"; */
+"Pqk-fS-pyy.title" = "无";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "sUG-Cw-nQU"; */
+"sUG-Cw-nQU.title" = "自动";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "sWf-fq-lvl"; */
+"sWf-fq-lvl.ibExternalAccessibilityDescription" = "裁剪底部";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibExternalAccessibilityDescription" = "裁剪左侧";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels."; ObjectID = "Td7-sa-0TV"; */
+"Td7-sa-0TV.ibShadowedToolTip" = "左侧边缘的裁剪量，以像素为单位。";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "y7P-yk-q46"; */
+"y7P-yk-q46.ibExternalAccessibilityDescription" = "裁剪右侧";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "Yua-R6-mWU"; */
+"Yua-R6-mWU.ibExternalAccessibilityDescription" = "裁剪左侧";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBEncodingProgressHUDController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBFiltersViewController.strings Added

@@ -0,0 +1,210 @@
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Tune"; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibExternalAccessibilityDescription" = "降噪调优";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nFilm refines settings for use with most live action content.\n\nGrain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.\n\nHigh Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.\n\nAnimation is useful for cel animation such as anime and cartoons.\n\nTape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.\n\nSprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video."; ObjectID = "1XQ-md-5cQ"; */
+"1XQ-md-5cQ.ibShadowedToolTip" = "降噪调优。进一步调整降噪预设以针对特定场景设置优化。\n\n无：使用默认预设设置。\n\n电影：会优化设置，以用于大多数实况转播内容。\n\n颗粒：仅处理彩色通道。 在保留亮度颗粒外观的同时，减少或消除彩色噪点时很有用。\n\n高速画面：通过避免对颜色通道的时间处理，减少了高速场景中的颜色拖影。 适用于体育和动作视频。\n\n动画：对于诸如动漫和卡通很有用。\n\n磁带：适用于低细节的模拟磁带源，例如 VHS，在这种情况下电影不会产生理想的效果。\n\nSprite：可用于 1-/4-/8-/16-bit 2D 游戏。 Sprite 不适用于高清视频。";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "5Vt-0j-92R"; */
+"5Vt-0j-92R.title" = "调优：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace filter preset.\n\nDefault is well balanced for speed and quality.\n\nSkip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.\n\nEEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.\n\nBob attempts to better preserve motion for a slight penalty to perceived resolution."; ObjectID = "6nG-zk-FMo"; */
+"6nG-zk-FMo.ibShadowedToolTip" = "反交错预设。\n\n默认：是质量和速度之间的良好平衡。\n\nSkip Spatial Check：可以让 Yadif 跳过对某些可避免的伪影的纠正，以获得轻微的速度提升。\n\nEEDI2：使用较慢的、高质量的插值算法来处理 Decomb。对于最困难的源很有用。\n\nBob：试图更好地保护运动，以达到对感知分辨率的轻微降低。";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "8am-ve-1Xl"; */
+"8am-ve-1Xl.title" = "预设：";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "aem-qz-Cqk"; */
+"aem-qz-Cqk.title" = "自定义：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "akB-JW-MPe"; */
+"akB-JW-MPe.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "b6A-ax-2Ed"; */
+"b6A-ax-2Ed.title" = "其他视图";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Sharpen parameters.\n\nUnsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap"; ObjectID = "bBr-vV-iAz"; */
+"bBr-vV-iAz.ibShadowedToolTip" = "自定义锐化参数。\n\nUnsharp 语法：y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c\n\nUnsharp 默认值：y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7\n\nLapsharp 语法：y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c\n\nLapsharp 默认值：y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.\n\nUnsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\n\nLapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking."; ObjectID = "boo-YC-gWm"; */
+"boo-YC-gWm.ibShadowedToolTip" = "锐化可以增强外观细节，特别是边缘。过强的锐化设置可能会产生环形伪影并增加噪声，从而损害图像质量，从而降低压缩效率。\n\nUnsharp 是一个通用的非锐化掩蔽滤镜。它通过模糊来锐化，然后计算模糊的画面和原始画面之间的差异。\n\nLapsharp 锐化使用近似 Laplacian 边缘滤波器的卷积核进行锐化，有时会产生比 Unsharp Masking 更高质量的结果。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibExternalAccessibilityDescription" = "锐化调优";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock tune. Further adjusts the Deblock preset to optimize settings for specific scenarios."; ObjectID = "bRd-Km-Wa8"; */
+"bRd-Km-Wa8.ibShadowedToolTip" = "去块效应调优。进一步调整去块效应预设以针对特定场景设置优化。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Deblock Preset"; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibExternalAccessibilityDescription" = "去区块滤镜预设";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deblock reduces blocky artifacts caused by low quality video compression."; ObjectID = "bz8-FC-vYp"; */
+"bz8-FC-vYp.ibShadowedToolTip" = "去块效应会减少由低质量视频压缩造成的块状伪影。";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "CFV-ur-emt"; */
+"CFV-ur-emt.title" = "自定义：";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Preset"; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibExternalAccessibilityDescription" = "锐化预设";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen filter preset. Sets the strength of the filter."; ObjectID = "cG4-79-P9J"; */
+"cG4-79-P9J.ibShadowedToolTip" = "锐化滤镜预设。 设置过滤器的强度。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Denoise Preset"; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibExternalAccessibilityDescription" = "降噪预设";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise filter preset. Sets the strength of the filter."; ObjectID = "cTy-PO-BSd"; */
+"cTy-PO-BSd.ibShadowedToolTip" = "降噪滤镜预设。设置滤镜的强度。";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "D7G-kY-TSj"; */
+"D7G-kY-TSj.title" = "预设：";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "Da7-pY-5vu"; */
+"Da7-pY-5vu.title" = "自定义：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Detelecine removes comb artifacts that are the result of telecine, a process for converting film frame rates to television frame rates."; ObjectID = "DER-tS-cLx"; */
+"DER-tS-cLx.ibShadowedToolTip" = "反胶卷过带消除了由胶转磁产生的梳状伪影，胶卷过带是一个将电影帧率转换为电视帧率的过程。";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deblock parameters.\n\nstrength=s:thresh=t:blocksize=b"; ObjectID = "DI9-Ed-acp"; */
+"DI9-Ed-acp.ibShadowedToolTip" = "自定义去块效应参数。\n\nstrength=s:thresh=t:blocksize=b";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "DvX-m9-Q6u"; */
+"DvX-m9-Q6u.title" = "自定义：";
+
+/* Class = "NSTextFieldCell"; title = "Deblock:"; ObjectID = "gKq-xF-AZE"; */
+"gKq-xF-AZE.title" = "去块效应：";
+
+/* Class = "NSButtonCell"; title = "Grayscale"; ObjectID = "h7g-eE-vgv"; */
+"h7g-eE-vgv.title" = "灰度";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Sharpen Tune"; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibExternalAccessibilityDescription" = "锐化调优";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.\n\nNone uses the default preset settings.\n\nUnsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.\n\nLapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.\n\nLapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.\n\nLapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.\n\nLapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges."; ObjectID = "Hcn-5m-N9x"; */
+"Hcn-5m-N9x.ibShadowedToolTip" = "锐化调优。进一步调整锐化预设以针对特定场景设置优化。\n\n无：使用默认的预设设置。\n\nUnsharp：可以调整为超细、细、中、粗或非常粗的锐化。根据输出画面的分辨率和要增强的细节的精细程度选择一个。\n\nLapsharp 的 Film 调优：细化设置，适用于大多数真人表演内容。电影使用各向同性的 Laplacian 内核对所有边缘进行类似的锐化，并且亮度（亮度）信息的锐化程度高于色度（颜色）信息。\n\nLapsharp 的 Grain 调优：与 Film 类似，但使用高斯内核的各向同性 Laplacian 来减少对噪声和纹理的影响。对于保留颗粒和作为 Film 调优的一般替代方案很有用。\n\nLapsharp 的 Animation 调优：对于动画和漫画等赛璐珞动画很有用。动画与Film 相同，但整体强度降低，以避免产生伪影。\n\nLapsharp 的 Sprite 调优：对 1-/4-/8-/16 位的 2D 游戏很有用。Sprite 使用 4-neighbor 的 Laplacian 内核，它对垂直和水平边缘的增强大于对角线边缘。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Preset"; ObjectID = "hiK-Va-rbJ"; */
+"hiK-Va-rbJ.ibExternalAccessibilityDescription" = "色度平滑预设";
+
+/* Class = "NSTextFieldCell"; title = "Colorspace:"; ObjectID = "HVj-4g-OVv"; */
+"HVj-4g-OVv.title" = "色彩空间：";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "hyH-QP-Zdi"; */
+"hyH-QP-Zdi.title" = "调优：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "IHH-Se-l6d"; */
+"IHH-Se-l6d.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Denoise reduces or removes the appearance of noise and grain. This can improve compression efficiency and create higher quality video at smaller file sizes. Overly strong Denoise settings may damage picture quality by discarding detail.\n\nNLMeans is a high quality denoise filter with a cost to speed. Use where quality is more important than speed.\n\nHQDN3D is an adaptive low-pass filter, faster than NLMeans but less effective at preserving fine detail."; ObjectID = "ins-7X-kbN"; */
+"ins-7X-kbN.ibShadowedToolTip" = "降噪可以减少或去除噪音和颗粒的外观。这可以提高压缩效率，并以较小的文件大小创建更高质量的视频。过强的降噪设置可能会因为丢弃细节而损害画面质量。\n\nNLMeans：是一个以速度为代价的高质量降噪过滤器。在质量比速度更重要的地方使用。\n\nHQDN3D：是一个自适应低通滤波器，比 NLMeans 更快，但在保留精细细节方面效果较差。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom deleteline settings."; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibExternalAccessibilityDescription" = "自定义反胶卷过带设置。";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Detelecine parameters.\n\nSyntax: skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\nDefault: skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0"; ObjectID = "ipJ-z3-XnJ"; */
+"ipJ-z3-XnJ.ibShadowedToolTip" = "自定义反胶卷过带参数。\n\n语法：skip-left=s:skip-right=s:skip-top=s:skip-bottom=s:strict-breaks=s:plane=p:parity=p:disable=d\n\n默认值：skip-left=1:skip-right=1:skip-top=4:skip-bottom=4:plane=0";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames."; ObjectID = "IQG-Nn-HTb"; */
+"IQG-Nn-HTb.ibShadowedToolTip" = "启用隔行扫描后，允许去隔行过滤器只处理隔行视频帧。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Chroma Smooth Tune"; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibExternalAccessibilityDescription" = "色度平滑调优";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Chroma Smooth tune. Further adjusts the Chroma Smooth preset to optimize settings for specific scenarios."; ObjectID = "jFk-Eg-o2W"; */
+"jFk-Eg-o2W.ibShadowedToolTip" = "色度平滑调优。进一步调整色度平滑预设以针对特定场景设置优化。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "jQg-bp-pb3"; */
+"jQg-bp-pb3.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "KiY-kz-54k"; */
+"KiY-kz-54k.title" = "自定义：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "lad-BT-Hgz"; */
+"lad-BT-Hgz.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "MJr-ob-Uoe"; */
+"MJr-ob-Uoe.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "n6U-tH-vo0"; */
+"n6U-tH-vo0.title" = "自定义：";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "oWz-qF-JYk"; */
+"oWz-qF-JYk.title" = "自定义：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "pIO-dE-81w"; */
+"pIO-dE-81w.title" = "其他视图";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Grayscale removes the color component of the video. Often referred to as Black & White video."; ObjectID = "Psx-nN-XiT"; */
+"Psx-nN-XiT.ibShadowedToolTip" = "灰度消除了视频的颜色分量。通常被称为黑白视频。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "PyP-FP-gGx"; */
+"PyP-FP-gGx.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qey-Yo-9sX"; */
+"qey-Yo-9sX.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Qz4-EY-GFO"; */
+"Qz4-EY-GFO.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "r9i-tL-qtD"; */
+"r9i-tL-qtD.title" = "其他视图";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Deinterlace parameters.\n\nYadif syntax: mode=m:parity=p\n\nYadif default: mode=3\n\nDecomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb default: mode=7"; ObjectID = "r64-vI-ymx"; */
+"r64-vI-ymx.ibShadowedToolTip" = "自定义反交错参数。\n\nYadif 语法：mode=m:parity=p\n\nYadif 默认值：mode=3\n\nDecomb 语法：mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p\n\nDecomb 默认值：mode=7";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rfp-ah-CVB"; */
+"rfp-ah-CVB.title" = "其他视图";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Interlace Detection parameters.\n\nSyntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\nDefault: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16"; ObjectID = "rPg-F2-gtl"; */
+"rPg-F2-gtl.ibShadowedToolTip" = "自定义隔行扫描参数。\n\n语法：mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d\n\n默认值：mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16";
+
+/* Class = "NSTextFieldCell"; title = "Denoise:"; ObjectID = "Rxe-Xm-vXj"; */
+"Rxe-Xm-vXj.title" = "降噪：";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Colorspace Preset"; ObjectID = "ScE-ad-pHc"; */
+"ScE-ad-pHc.ibExternalAccessibilityDescription" = "色彩空间预设";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "tje-4P-jKt"; */
+"tje-4P-jKt.title" = "调优：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "tlc-kS-W8X"; */
+"tlc-kS-W8X.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Sharpen:"; ObjectID = "TwB-ag-L1L"; */
+"TwB-ag-L1L.title" = "锐化：";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "uDH-ts-vs5"; */
+"uDH-ts-vs5.title" = "颜色：";
+
+/* Class = "NSTextFieldCell"; title = "Deinterlace:"; ObjectID = "VsK-mC-9Pj"; */
+"VsK-mC-9Pj.title" = "反交错：";
+
+/* Class = "NSTextFieldCell"; title = "Detelecine:"; ObjectID = "vTS-MJ-8nt"; */
+"vTS-MJ-8nt.title" = "反胶卷过带：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Deinterlace removes comb artifacts from the picture.\n\nYadif is a popular and fast deinterlacer.\n\nDecomb switches between multiple interpolation algorithms for speed and quality."; ObjectID = "xct-UB-bKm"; */
+"xct-UB-bKm.ibShadowedToolTip" = "反交错可以去除画面中的梳状伪影。\n\nYadif 是一个流行的和快速的反交错器。\n\nDecomb 在多种插值算法之间切换，以保证速度和质量。";
+
+/* Class = "NSTextFieldCell"; title = "Interlace Detection:"; ObjectID = "xHD-vC-ePQ"; */
+"xHD-vC-ePQ.title" = "隔行扫描：";
+
+/* Class = "NSTextFieldCell"; title = "Custom:"; ObjectID = "xqk-dM-L3o"; */
+"xqk-dM-L3o.title" = "自定义：";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "ydN-tP-vpt"; */
+"ydN-tP-vpt.title" = "调优：";
+
+/* Class = "NSTextFieldCell"; title = "Chroma Smooth:"; ObjectID = "ZLl-Q6-HpE"; */
+"ZLl-Q6-HpE.title" = "色度平滑：";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom Denoise parameters.\n\nNLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3"; ObjectID = "ZR9-YG-pfn"; */
+"ZR9-YG-pfn.ibShadowedToolTip" = "自定义降噪参数。\n\nNLMeans 语法：y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t\n\nNLMeans 默认值：y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0\n\nHQDN3D 语法：y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c\n\nHQDN3D 默认值：y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ztV-i0-btG"; */
+"ztV-i0-btG.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "zV7-gM-Qpk"; */
+"zV7-gM-Qpk.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "zvZ-ZX-yKE"; */
+"zvZ-ZX-yKE.title" = "预设：";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBPictureHUDController.strings Added

@@ -0,0 +1,39 @@
+/* Class = "NSButton"; ibShadowedToolTip = "Scale preview to fill the display."; ObjectID = "12K-c3-Z7A"; */
+"12K-c3-Z7A.ibShadowedToolTip" = "缩放预览到填充填充整个屏幕";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Encode and play a preview video using current settings."; ObjectID = "16b-R9-bBU"; */
+"16b-R9-bBU.ibShadowedToolTip" = "使用当前设置播放和编码一段预览视频";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Duration to encode in seconds."; ObjectID = "ASA-X8-16P"; */
+"ASA-X8-16P.ibShadowedToolTip" = "编码持续时间，以秒为单位。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "KrC-nR-rYk"; */
+"KrC-nR-rYk.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "sec"; ObjectID = "ksF-Ma-hB1"; */
+"ksF-Ma-hB1.title" = "秒";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Show cropping settings"; ObjectID = "mV7-hU-tMt"; */
+"mV7-hU-tMt.ibShadowedToolTip" = "显示裁剪设置";
+
+/* Class = "NSButtonCell"; title = "Crop"; ObjectID = "NWd-Lq-c1A"; */
+"NWd-Lq-c1A.title" = "裁剪";
+
+/* Class = "NSButtonCell"; title = "Scale To Screen"; ObjectID = "STc-Po-p1X"; */
+"STc-Po-p1X.title" = "缩放到屏幕大小";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "USR-Qf-N5v"; */
+"USR-Qf-N5v.title" = "时长：";
+
+/* Class = "NSButtonCell"; title = "Live Preview"; ObjectID = "vkh-GY-5qx"; */
+"vkh-GY-5qx.title" = "实时预览";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "preview image"; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibExternalAccessibilityDescription" = "预览图";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Starting point for the preview encode."; ObjectID = "wUk-SQ-GhS"; */
+"wUk-SQ-GhS.ibShadowedToolTip" = "预览编码的开头。";
+
+/* Class = "NSMenuItem"; title = "240"; ObjectID = "XYh-Ls-slf"; */
+"XYh-Ls-slf.title" = "240";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBPictureViewController.strings Added

@@ -0,0 +1,396 @@
+/* Class = "NSButtonCell"; title = "Allow Upscaling"; ObjectID = "0kU-Uy-P4P"; */
+"0kU-Uy-P4P.title" = "允许向上缩放";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "1AB-bM-qTs"; */
+"1AB-bM-qTs.title" = "显示大小：";
+
+/* Class = "NSMenuItem"; title = "Off"; ObjectID = "1O3-th-4M5"; */
+"1O3-th-4M5.title" = "关";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibExternalAccessibilityDescription" = "裁剪底部";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge cropping amount in pixels"; ObjectID = "1Z0-JT-vst"; */
+"1Z0-JT-vst.ibShadowedToolTip" = "底部边缘的裁剪量，以像素为单位";
+
+/* Class = "NSMenuItem"; title = "2160p 4K Ultra HD"; ObjectID = "1Zm-mM-8Tb"; */
+"1Zm-mM-8Tb.title" = "2160p 4K 超高清";
+
+/* Class = "NSMenuItem"; title = "180°"; ObjectID = "1zy-53-Bvd"; */
+"1zy-53-Bvd.title" = "180°";
+
+/* Class = "NSMenuItem"; title = "1440p 2.5K Quad HD"; ObjectID = "2ax-HE-Amt"; */
+"2ax-HE-Amt.title" = "1440p 2.5K Quad HD";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "2fq-yE-LSA"; */
+"2fq-yE-LSA.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "2jg-kg-z9e"; */
+"2jg-kg-z9e.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "2s0-5k-fjU"; */
+"2s0-5k-fjU.ibExternalAccessibilityDescription" = "存储高度";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "3HN-8C-yAS"; */
+"3HN-8C-yAS.ibExternalAccessibilityDescription" = "存储高度";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "3Ze-5A-gL3"; */
+"3Ze-5A-gL3.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "5Tj-xw-QuU"; */
+"5Tj-xw-QuU.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "5Vi-N9-9kM"; */
+"5Vi-N9-9kM.title" = "宽高比：";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibExternalAccessibilityDescription" = "上内边距";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge border amount in pixels"; ObjectID = "6Jp-gt-DbX"; */
+"6Jp-gt-DbX.ibShadowedToolTip" = "顶部边缘的边框量，单位是像素。";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "6Qy-ik-hiE"; */
+"6Qy-ik-hiE.title" = "无";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop bottom"; ObjectID = "6W6-RI-fBx"; */
+"6W6-RI-fBx.ibExternalAccessibilityDescription" = "裁剪底部";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "7rG-Qv-khx"; */
+"7rG-Qv-khx.title" = "自动";
+
+/* Class = "NSTextFieldCell"; title = "Anamorphic:"; ObjectID = "8vS-Mw-bny"; */
+"8vS-Mw-bny.title" = "变形：";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad top"; ObjectID = "09f-sT-7la"; */
+"09f-sT-7la.ibExternalAccessibilityDescription" = "上内边距";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Scaled Width"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibExternalAccessibilityDescription" = "缩放宽度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled width. This is the number of pixels wide to be encoded. Scaled width may differ from display width depending on anamorphic settings and fill settings"; ObjectID = "9hH-As-JSa"; */
+"9hH-As-JSa.ibShadowedToolTip" = "视频缩放的宽度。这是要被编码的像素宽度。缩放后的宽度可能与显示宽度不同，这取决于变形设置和填充设置";
+
+/* Class = "NSMenuItem"; title = "480p NTSC SD"; ObjectID = "21C-Hg-mk4"; */
+"21C-Hg-mk4.title" = "480p NTSC 标清";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibExternalAccessibilityDescription" = "裁剪顶部";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Top edge cropping amount in pixels"; ObjectID = "41c-48-2XJ"; */
+"41c-48-2XJ.ibShadowedToolTip" = "顶部边缘的裁剪量，以像素为单位";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibExternalAccessibilityDescription" = "自定义边框颜色";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Custom border color"; ObjectID = "aby-WS-tzS"; */
+"aby-WS-tzS.ibShadowedToolTip" = "自定义边框颜色";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "Ag1-Tk-hCm"; */
+"Ag1-Tk-hCm.ibExternalAccessibilityDescription" = "显示宽度";
+
+/* Class = "NSTextFieldCell"; title = "Resolution & Scaling"; ObjectID = "aVx-b3-2AK"; */
+"aVx-b3-2AK.title" = "分辨率 & 缩放";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Color of the border added around the video"; ObjectID = "BjH-qa-mJM"; */
+"BjH-qa-mJM.ibShadowedToolTip" = "在视频周围添加的边框颜色";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "byr-LI-ap5"; */
+"byr-LI-ap5.title" = "0 x 0";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "C6R-PR-3gu"; */
+"C6R-PR-3gu.title" = "x";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "c9F-IW-Rln"; */
+"c9F-IW-Rln.title" = "0 x 0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibExternalAccessibilityDescription" = "右内边距";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge border amount in pixels"; ObjectID = "ck0-Gu-lGg"; */
+"ck0-Gu-lGg.ibShadowedToolTip" = "右侧边缘的边框量，以像素为单位";
+
+/* Class = "NSTextFieldCell"; title = "Resolution Limit:"; ObjectID = "d0T-QG-WXU"; */
+"d0T-QG-WXU.title" = "分辨率限制：";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "Ddg-4D-el9"; */
+"Ddg-4D-el9.ibExternalAccessibilityDescription" = "裁剪右侧";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "DN4-KZ-LRc"; */
+"DN4-KZ-LRc.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "dnG-b9-LQR"; */
+"dnG-b9-LQR.title" = "1:1";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "E5O-kn-GYm"; */
+"E5O-kn-GYm.ibExternalAccessibilityDescription" = "ceaa80fca5ba3e8646366fa50fbb4322_tr";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Display height"; ObjectID = "eEF-b3-4o9"; */
+"eEF-b3-4o9.ibExternalAccessibilityDescription" = "显示高度";
+
+/* Class = "NSMenuItem"; title = "Black"; ObjectID = "EM5-tR-x3U"; */
+"EM5-tR-x3U.title" = "黑色";
+
+/* Class = "NSButtonCell"; title = "Automatic"; ObjectID = "eOi-50-jLK"; */
+"eOi-50-jLK.title" = "自动";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "ePc-i4-vPZ"; */
+"ePc-i4-vPZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSButtonCell"; title = "Horizontal"; ObjectID = "EqJ-eR-Fz7"; */
+"EqJ-eR-Fz7.title" = "水平";
+
+/* Class = "NSTextFieldCell"; title = "Flipping:"; ObjectID = "ewx-pd-ANc"; */
+"ewx-pd-ANc.title" = "翻转：";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "f12-Dh-fDw"; */
+"f12-Dh-fDw.title" = "自定义";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "fau-iA-M1E"; */
+"fau-iA-M1E.title" = "无";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Rotate the picture clockwise in 90 degree increments"; ObjectID = "ffe-SL-kPm"; */
+"ffe-SL-kPm.ibShadowedToolTip" = "以 90 度为单位顺时针旋转画面。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum height"; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibExternalAccessibilityDescription" = "最大高度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum height that the video will be stored at."; ObjectID = "FGm-oJ-FVW"; */
+"FGm-oJ-FVW.ibShadowedToolTip" = "视频将被存储的最大高度。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use highest resolution permitted by above settings"; ObjectID = "fjj-ZH-nqb"; */
+"fjj-ZH-nqb.ibShadowedToolTip" = "使用上述设置所允许的最高分辨率";
+
+/* Class = "NSMenuItem"; title = "White"; ObjectID = "fQM-vV-sUg"; */
+"fQM-vV-sUg.title" = "白色";
+
+/* Class = "NSButtonCell"; title = "Optimal Size"; ObjectID = "FUA-5p-imC"; */
+"FUA-5p-imC.title" = "最佳大小";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "FwZ-6T-zJe"; */
+"FwZ-6T-zJe.ibExternalAccessibilityDescription" = "存储宽度";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "gWL-mx-RIK"; */
+"gWL-mx-RIK.title" = "无";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Storage Height"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibExternalAccessibilityDescription" = "存储高度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Video scaled height. This is the number of pixels tall to be encoded. Scaled height may differ from display height depending on anamorphic settings and fill settings"; ObjectID = "Hkl-7Z-J2e"; */
+"Hkl-7Z-J2e.ibShadowedToolTip" = "视频缩放的高度。这是要被编码的像素高度。缩放后的高度可能与显示高度不同，这取决于变形设置和填充设置";
+
+/* Class = "NSTextFieldCell"; title = "x"; ObjectID = "hN1-S9-zl8"; */
+"hN1-S9-zl8.title" = "x";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "hTi-U4-PGY"; */
+"hTi-U4-PGY.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Fill:"; ObjectID = "iqM-GW-fCe"; */
+"iqM-GW-fCe.title" = "填充：";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Storage Width"; ObjectID = "iuc-JG-bhU"; */
+"iuc-JG-bhU.ibExternalAccessibilityDescription" = "存储宽度";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "iZc-Ks-efB"; */
+"iZc-Ks-efB.ibExternalAccessibilityDescription" = "左内边距";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Display width"; ObjectID = "jru-UG-Rf6"; */
+"jru-UG-Rf6.ibExternalAccessibilityDescription" = "显示宽度";
+
+/* Class = "NSMenuItem"; title = "Automatic"; ObjectID = "JyN-AK-Hae"; */
+"JyN-AK-Hae.title" = "自动";
+
+/* Class = "NSMenuItem"; title = "Gray"; ObjectID = "K6n-ea-Zty"; */
+"K6n-ea-Zty.title" = "灰色";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "kOg-k4-0N2"; */
+"kOg-k4-0N2.title" = "存储大小：";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "krD-da-wuz"; */
+"krD-da-wuz.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad left"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibExternalAccessibilityDescription" = "左内边距";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge border amount in pixels"; ObjectID = "l2V-GK-BgU"; */
+"l2V-GK-BgU.ibShadowedToolTip" = "左侧边缘的边框量，以像素为单位";
+
+/* Class = "NSTextFieldCell"; title = "Scaled Size:"; ObjectID = "L7V-2e-qf9"; */
+"L7V-2e-qf9.title" = "缩放大小：";
+
+/* Class = "NSTextFieldCell"; title = "1:1"; ObjectID = "lIt-eN-Uyd"; */
+"lIt-eN-Uyd.title" = "1:1";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "LQm-LK-6tr"; */
+"LQm-LK-6tr.title" = "自定义";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibExternalAccessibilityDescription" = "裁剪左侧";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Left edge cropping amount in pixels"; ObjectID = "LTu-ic-Ty9"; */
+"LTu-ic-Ty9.ibShadowedToolTip" = "左侧边缘的裁剪量，以像素为单位";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Numerator"; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibExternalAccessibilityDescription" = "像素宽高比的数值";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "LWv-Y9-b0S"; */
+"LWv-Y9-b0S.ibShadowedToolTip" = "像素的宽高比定义了像素的形状。\n\nA 1:1 的比例定义了一个正方形像素。其他值定义了矩形的形状。\n播放器将缩放图像，以实现指定的长宽比。";
+
+/* Class = "NSTextFieldCell"; title = "Aspect Ratio:"; ObjectID = "Lz1-Cx-d30"; */
+"Lz1-Cx-d30.title" = "宽高比：";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop top"; ObjectID = "Mke-9L-LvB"; */
+"Mke-9L-LvB.ibExternalAccessibilityDescription" = "裁剪顶部";
+
+/* Class = "NSMenuItem"; title = "Width & Height"; ObjectID = "N5d-nG-TZV"; */
+"N5d-nG-TZV.title" = "宽 & 高";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pixel Aspect Denominator"; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibExternalAccessibilityDescription" = "像素宽高比分母";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Pixel aspect defines the shape of the pixels.\n\nA 1:1 ratio defines a square pixel. Other values define rectangulars shapers.\nPlayers will scale the image in order to achieve the specified aspect."; ObjectID = "nQe-Vq-Og2"; */
+"nQe-Vq-Og2.ibShadowedToolTip" = "像素的宽高比定义了像素的形状。\n\nA 1:1 的比例定义了一个正方形像素。其他值定义了矩形的形状。\n播放器将缩放图像，以实现指定的长宽比。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Maximum width"; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibExternalAccessibilityDescription" = "最大宽度";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "The maximum width that the video will be stored at."; ObjectID = "NRy-vc-8qX"; */
+"NRy-vc-8qX.ibShadowedToolTip" = "视频将被存储的最大宽度。";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "ob5-QF-mOC"; */
+"ob5-QF-mOC.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Color:"; ObjectID = "OCX-n7-THw"; */
+"OCX-n7-THw.title" = "颜色：";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "owa-gb-koC"; */
+"owa-gb-koC.title" = "自定义";
+
+/* Class = "NSMenuItem"; title = "Height (Letterbox)"; ObjectID = "p7U-Ee-kt4"; */
+"p7U-Ee-kt4.title" = "高度（上下黑边）";
+
+/* Class = "NSMenuItem"; title = "Dark Gray"; ObjectID = "pWs-NL-FVO"; */
+"pWs-NL-FVO.title" = "深灰色";
+
+/* Class = "NSMenuItem"; title = "0°"; ObjectID = "qsi-r7-kNQ"; */
+"qsi-r7-kNQ.title" = "0°";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "QSp-61-LWu"; */
+"QSp-61-LWu.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "qSV-uB-Iup"; */
+"qSV-uB-Iup.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "1080p HD"; ObjectID = "qzy-K8-2tY"; */
+"qzy-K8-2tY.title" = "1080p 高清";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Crop left"; ObjectID = "r9l-cH-pFW"; */
+"r9l-cH-pFW.ibExternalAccessibilityDescription" = "裁剪左侧";
+
+/* Class = "NSButton"; ibShadowedToolTip = "If not enabled, scaled dimensions will be limited to source dimensions"; ObjectID = "ROS-UT-TiG"; */
+"ROS-UT-TiG.ibShadowedToolTip" = "如果不启用，缩放的尺寸将被限制在源尺寸内";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sg1-tR-fnw"; */
+"sg1-tR-fnw.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "-"; ObjectID = "SGn-b9-JVZ"; */
+"SGn-b9-JVZ.ibShadowedIsNilPlaceholder" = "-";
+
+/* Class = "NSTextFieldCell"; title = "Pixel Aspect:"; ObjectID = "SPg-s0-Oh0"; */
+"SPg-s0-Oh0.title" = "像素宽高比：";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "sut-JO-hwX"; */
+"sut-JO-hwX.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Changing the displays size will stretch the video"; ObjectID = "tHu-FW-tzx"; */
+"tHu-FW-tzx.ibShadowedToolTip" = "改变显示的大小将拉伸视频";
+
+/* Class = "NSMenuItem"; title = "270°"; ObjectID = "tIU-4H-3Xm"; */
+"tIU-4H-3Xm.title" = "270°";
+
+/* Class = "NSTextFieldCell"; title = "Source Dimensions"; ObjectID = "Trk-C5-Npx"; */
+"Trk-C5-Npx.title" = "源尺寸";
+
+/* Class = "NSTextFieldCell"; title = "Orientation & Cropping"; ObjectID = "u2U-SJ-szy"; */
+"u2U-SJ-szy.title" = "方向 & 裁剪";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad right"; ObjectID = "uoH-Hv-lNp"; */
+"uoH-Hv-lNp.ibExternalAccessibilityDescription" = "右内边距";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = " "; ObjectID = "uqQ-uA-3xF"; */
+"uqQ-uA-3xF.ibExternalAccessibilityDescription" = "0b36a71978ca057bf0594fec41410ec0_tr";
+
+/* Class = "NSTextFieldCell"; title = ":"; ObjectID = "uuL-JR-73C"; */
+"uuL-JR-73C.title" = ":";
+
+/* Class = "NSTextFieldCell"; title = "Final Dimensions"; ObjectID = "Ux1-Pc-XSD"; */
+"Ux1-Pc-XSD.title" = "最终尺寸";
+
+/* Class = "NSMenuItem"; title = "90°"; ObjectID = "V1G-sQ-eqd"; */
+"V1G-sQ-eqd.title" = "90°";
+
+/* Class = "NSTextFieldCell"; title = "Rotation:"; ObjectID = "vb2-DA-Pgr"; */
+"vb2-DA-Pgr.title" = "旋转：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "How to apply crop settings"; ObjectID = "vfx-ON-9ys"; */
+"vfx-ON-9ys.ibShadowedToolTip" = "如何应用裁剪设置";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Add a border around the video"; ObjectID = "vKr-fn-Ujh"; */
+"vKr-fn-Ujh.ibShadowedToolTip" = "在视频周围添加边框";
+
+/* Class = "NSMenuItem"; title = "4320p 8K Ultra HD"; ObjectID = "Vrx-BH-ry2"; */
+"Vrx-BH-ry2.title" = "4320p 8K 超高清";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "vzz-ej-1nx"; */
+"vzz-ej-1nx.title" = "自定义";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.\n\nAutomatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.\n\nNone disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.\n\nCustom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production."; ObjectID = "w1f-3S-up0"; */
+"w1f-3S-up0.ibShadowedToolTip" = "变形功能允许任意的存储尺寸，同时在播放时保留原始的长宽比。\n\n自动最大限度地提高存储分辨率，同时保留原始显示的长宽比。推荐使用。\n\n无：禁用变形功能。视频存储尺寸和显示尺寸将是相同的。只有在与某些传统设备兼容时才有用。\n\n自定义：允许手动设置所有参数。对于纠正不正确的源显示尺寸和在后期制作中需要高级控制的专业人员来说是有用的。";
+
+/* Class = "NSMenuItem"; title = "Width (Pillarbox)"; ObjectID = "W5p-nd-4WK"; */
+"W5p-nd-4WK.title" = "宽度（左右黑边）";
+
+/* Class = "NSTextFieldCell"; title = "Display Size:"; ObjectID = "WBD-tH-x3h"; */
+"WBD-tH-x3h.title" = "显示大小：";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibExternalAccessibilityDescription" = "下内边距";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Bottom edge border amount in pixels"; ObjectID = "WfM-tx-rC5"; */
+"WfM-tx-rC5.ibShadowedToolTip" = "底部边缘的边框量，单位是像素。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Crop right"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibExternalAccessibilityDescription" = "裁剪右侧";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Right edge cropping amount in pixels"; ObjectID = "wsq-TS-cC6"; */
+"wsq-TS-cC6.ibShadowedToolTip" = "右侧边缘的裁剪量，以像素为单位";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "0"; ObjectID = "x0H-9t-WiF"; */
+"x0H-9t-WiF.ibShadowedIsNilPlaceholder" = "0";
+
+/* Class = "NSMenuItem"; title = "720p HD"; ObjectID = "Xao-1P-xPT"; */
+"Xao-1P-xPT.title" = "720p 高清";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Flips (mirrors) the picture on the horizontal axis"; ObjectID = "xNB-9k-4uD"; */
+"xNB-9k-4uD.ibShadowedToolTip" = "在水平轴上翻转（镜像）画面";
+
+/* Class = "NSMenuItem"; title = "Custom"; ObjectID = "Xun-U2-N6F"; */
+"Xun-U2-N6F.title" = "自定义";
+
+/* Class = "NSMenuItem"; title = "576p PAL SD"; ObjectID = "yue-jq-T1X"; */
+"yue-jq-T1X.title" = "576p PAL 标清";
+
+/* Class = "NSTextFieldCell"; title = "Borders"; ObjectID = "ywF-EG-IYr"; */
+"ywF-EG-IYr.title" = "边框";
+
+/* Class = "NSTextFieldCell"; title = "Cropping:"; ObjectID = "zsq-Le-41g"; */
+"zsq-Le-41g.title" = "裁剪：";
+
+/* Class = "NSTextFieldCell"; title = "0 x 0"; ObjectID = "ZTy-fJ-cDa"; */
+"ZTy-fJ-cDa.title" = "0 x 0";
+
+/* Class = "NSStepper"; ibExternalAccessibilityDescription = "Pad bottom"; ObjectID = "zVm-0W-Jxg"; */
+"zVm-0W-Jxg.ibExternalAccessibilityDescription" = "下内边距";
+
+/* Class = "NSTextFieldCell"; title = "Storage Size:"; ObjectID = "ZZ9-XW-Uib"; */
+"ZZ9-XW-Uib.title" = "存储大小：";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBPlayerHUDController.strings Added

@@ -0,0 +1,75 @@
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "6A0-9h-5UY"; */
+"6A0-9h-5UY.title" = "00:00:00";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "6BQ-wU-p2C"; */
+"6BQ-wU-p2C.title" = "轨道";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "End Live Preview"; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibExternalAccessibilityDescription" = "停止实时预览";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Exit player and return to still image previews."; ObjectID = "84p-08-fGK"; */
+"84p-08-fGK.ibShadowedToolTip" = "退出播放器并回到静止图像预览。";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibExternalAccessibilityDescription" = "转到结尾";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To End"; ObjectID = "CQ0-pk-SFk"; */
+"CQ0-pk-SFk.ibShadowedToolTip" = "转到结尾";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "dGi-LK-P1E"; */
+"dGi-LK-P1E.title" = "00:00:00";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibExternalAccessibilityDescription" = "静音";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Mute Volume"; ObjectID = "euL-Tg-dmT"; */
+"euL-Tg-dmT.ibShadowedToolTip" = "静音";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Volume Control"; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibExternalAccessibilityDescription" = "音量控制";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change volume."; ObjectID = "gzA-no-jdv"; */
+"gzA-no-jdv.ibShadowedToolTip" = "拖动以改变音量大小。";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibExternalAccessibilityDescription" = "音量全开";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Full Volume"; ObjectID = "Kiv-cL-wYI"; */
+"Kiv-cL-wYI.ibShadowedToolTip" = "音量全开";
+
+/* Class = "NSSlider"; ibExternalAccessibilityDescription = "Timeline"; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibExternalAccessibilityDescription" = "时间轴";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Drag to change timeline position."; ObjectID = "lBp-JT-ehn"; */
+"lBp-JT-ehn.ibShadowedToolTip" = "拖动以改变时间轴位置";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibExternalAccessibilityDescription" = "播放/暂停";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Toggle Play/Pause"; ObjectID = "mLA-ei-4sK"; */
+"mLA-ei-4sK.ibShadowedToolTip" = "切换 播放/暂停";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Time Remaining"; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibExternalAccessibilityDescription" = "剩余时间";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Time remaining."; ObjectID = "PVD-pq-1ZG"; */
+"PVD-pq-1ZG.ibShadowedToolTip" = "剩余时间。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Current Timeline Position"; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibExternalAccessibilityDescription" = "当前时间轴位置";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Current timeline position."; ObjectID = "uYx-2C-8et"; */
+"uYx-2C-8et.ibShadowedToolTip" = "当前时间轴位置。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Tracks Selection"; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibExternalAccessibilityDescription" = "轨道选择";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Enable or disable tracks."; ObjectID = "Vj1-Za-AUV"; */
+"Vj1-Za-AUV.ibShadowedToolTip" = "启用或禁用轨道。";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibExternalAccessibilityDescription" = "转到开头";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Go To Beginning"; ObjectID = "WuP-9l-8AN"; */
+"WuP-9l-8AN.ibShadowedToolTip" = "转到开头";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBPreviewViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBQueueInfoViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBQueueTableViewController.strings Added

@@ -0,0 +1,42 @@
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "5AR-we-iHC"; */
+"5AR-we-iHC.title" = "移除所有任务";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "5Rl-P0-bhc"; */
+"5Rl-P0-bhc.title" = "表视图单元格";
+
+/* Class = "NSMenuItem"; title = "Show Destination in Finder"; ObjectID = "c1Z-ZC-b8b"; */
+"c1Z-ZC-b8b.title" = "在访达打开目标位置";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "DTF-om-j0l"; */
+"DTF-om-j0l.title" = "编辑";
+
+/* Class = "NSTextFieldCell"; title = "Encoding status"; ObjectID = "eEU-Dr-Qh8"; */
+"eEU-Dr-Qh8.title" = "编码状态";
+
+/* Class = "NSMenuItem"; title = "Remove"; ObjectID = "egD-8R-PTJ"; */
+"egD-8R-PTJ.title" = "移除";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "gNj-D1-wa7"; */
+"gNj-D1-wa7.title" = "移除已完成的任务";
+
+/* Class = "NSMenuItem"; title = "Move to Bottom"; ObjectID = "HwR-LP-IK8"; */
+"HwR-LP-IK8.title" = "移到底部";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "K6c-HW-um8"; */
+"K6c-HW-um8.title" = "文本单元格";
+
+/* Class = "NSMenuItem"; title = "Move to Top"; ObjectID = "NN5-Yq-Cth"; */
+"NN5-Yq-Cth.title" = "移到顶部";
+
+/* Class = "NSMenuItem"; title = "Show Source in Finder"; ObjectID = "Pps-jm-zcd"; */
+"Pps-jm-zcd.title" = "在访达打开来源";
+
+/* Class = "NSMenuItem"; title = "Reset"; ObjectID = "xMs-43-lL0"; */
+"xMs-43-lL0.title" = "重置";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "xSd-Hl-5Qk"; */
+"xSd-Hl-5Qk.title" = "表视图单元格";
+
+/* Class = "NSMenuItem"; title = "Show Activity Log in Finder"; ObjectID = "zA7-r8-i4L"; */
+"zA7-r8-i4L.title" = "在访达打开活动日志";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBRenamePresetController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBSummaryViewController.strings Added

@@ -0,0 +1,69 @@
+/* Class = "NSTextFieldCell"; title = "Tracks:"; ObjectID = "3mF-Bb-Gon"; */
+"3mF-Bb-Gon.title" = "轨道：";
+
+/* Class = "NSTextFieldCell"; title = "Size:"; ObjectID = "B4a-co-0ly"; */
+"B4a-co-0ly.title" = "大小：";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Filters summary"; ObjectID = "BHq-Mt-3eA"; */
+"BHq-Mt-3eA.ibExternalAccessibilityDescription" = "过滤器概要";
+
+/* Class = "NSButtonCell"; title = "Passthru Common Metadata"; ObjectID = "CZZ-bW-jZc"; */
+"CZZ-bW-jZc.title" = "直通通用元数据";
+
+/* Class = "NSButtonCell"; title = "Align A/V Start"; ObjectID = "De0-Je-MAm"; */
+"De0-Je-MAm.title" = "对齐音视频开头";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Copy metadata from source to output"; ObjectID = "eJx-BO-rhL"; */
+"eJx-BO-rhL.ibShadowedToolTip" = "将元数据从源复制到输出";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists."; ObjectID = "fPv-Vw-I89"; */
+"fPv-Vw-I89.ibShadowedToolTip" = "通过插入空白帧或丢弃帧来对齐所有音频和视频流的初始时间戳。可能会改善不遵守 MP4 编辑列表的垃圾播放器的播放音频/视频的同步性。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Size summary"; ObjectID = "Jaw-pH-rhf"; */
+"Jaw-pH-rhf.ibExternalAccessibilityDescription" = "大小概要";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "JNB-kV-52S"; */
+"JNB-kV-52S.ibShadowedToolTip" = "优化 MP4 使其可以渐进式下载。编码后，数据将重新组织和重写以允许通过网络立即播放，而无需下载整个文件。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file."; ObjectID = "lUi-Oc-208"; */
+"lUi-Oc-208.ibShadowedToolTip" = "优化 MP4 使其可以渐进式下载。编码后，数据将重新组织和重写以允许通过网络立即播放，而无需下载整个文件。";
+
+/* Class = "NSView"; ibExternalAccessibilityDescription = "Preview"; ObjectID = "m5a-0z-QQ4"; */
+"m5a-0z-QQ4.ibExternalAccessibilityDescription" = "预览";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "ma8-UR-dx2"; */
+"ma8-UR-dx2.title" = "Web 优化";
+
+/* Class = "NSTextFieldCell"; title = "Filters:"; ObjectID = "OCw-f6-uA0"; */
+"OCw-f6-uA0.title" = "滤镜：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Q1Z-yT-7iY"; */
+"Q1Z-yT-7iY.title" = "其他视图";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility."; ObjectID = "QKv-GR-d2g"; */
+"QKv-GR-d2g.ibShadowedToolTip" = "添加一个特殊的 MP4 标记，可以允许在 2006 年左右的老式第 5 代 iPod 设备上播放。其他设置可能会受其影响。";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "RIB-ME-Yhh"; */
+"RIB-ME-Yhh.title" = "无";
+
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "RXJ-DZ-4mh"; */
+"RXJ-DZ-4mh.title" = "格式：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Container format. Video, audio, and other tracks are combined into a single file of this type. Affects compatibility."; ObjectID = "txV-1R-WoD"; */
+"txV-1R-WoD.ibShadowedToolTip" = "容器格式。视频，音频和其他轨道被合并到所选类型的单个文件中。不同的格式兼容性不同。";
+
+/* Class = "NSButtonCell"; title = "Web Optimized"; ObjectID = "wcc-5d-Dgj"; */
+"wcc-5d-Dgj.title" = "Web 优化";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xmy-Jl-mR4"; */
+"xmy-Jl-mR4.title" = "无";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "xzc-qg-AMn"; */
+"xzc-qg-AMn.title" = "无";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Tracks summary"; ObjectID = "yRE-5c-FhX"; */
+"yRE-5c-FhX.ibExternalAccessibilityDescription" = "轨道概要";
+
+/* Class = "NSButtonCell"; title = "iPod 5G Support"; ObjectID = "zz5-qY-GSA"; */
+"zz5-qY-GSA.title" = "iPod 5 代支持";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBTitleSelection.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSTableColumn"; headerCell.title = "Title"; ObjectID = "4XY-C0-SwE"; */
+"4XY-C0-SwE.headerCell.title" = "标题";
+
+/* Class = "NSTextFieldCell"; title = "Select the titles to add to the queue:"; ObjectID = "5tD-fg-g4t"; */
+"5tD-fg-g4t.title" = "选择要添加到队列的标题：";
+
+/* Class = "NSTableColumn"; headerCell.title = "Duration"; ObjectID = "a6r-ky-REh"; */
+"a6r-ky-REh.headerCell.title" = "时长";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "dsG-Ho-vsT"; */
+"dsG-Ho-vsT.title" = "表视图单元格";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "F0z-JX-Cv5"; */
+"F0z-JX-Cv5.title" = "窗口";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "Fcv-FE-8Fv"; */
+"Fcv-FE-8Fv.title" = "文本单元格";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "FQY-Ye-g0f"; */
+"FQY-Ye-g0f.headerCell.title" = "名称";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hQc-RA-phB"; */
+"hQc-RA-phB.title" = "0";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "jHg-nh-9NJ"; */
+"jHg-nh-9NJ.title" = "取消";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JqJ-5C-Yhw"; */
+"JqJ-5C-Yhw.title" = "检查";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "k84-a6-eZ7"; */
+"k84-a6-eZ7.title" = "检查";
+
+/* Class = "NSButtonCell"; title = "Add"; ObjectID = "mOe-XL-tl1"; */
+"mOe-XL-tl1.title" = "添加";
+
+/* Class = "NSMenuItem"; title = "Deselect All"; ObjectID = "PXF-7D-BKR"; */
+"PXF-7D-BKR.title" = "全部取消选择";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedDisplayPattern = "%{value1}@"; ObjectID = "xTt-zi-wf0"; */
+"xTt-zi-wf0.ibShadowedDisplayPattern" = "%{value1}@";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "zwi-rc-q6x"; */
+"zwi-rc-q6x.title" = "文本单元格";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/HBTrackTitleViewController.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Localizable.strings Added

@@ -0,0 +1,518 @@
+/* Job statistics */
+" (%@ %% of the source file)" = "（源文件的 %@ %%）";
+
+/* Preview -> size info label */
+" Scaled To Screen" = "缩放到屏幕";
+
+/* No comment provided by engineer. */
+"- --:--" = "- --:--";
+
+/* No comment provided by engineer. */
+"--:--" = "--:--";
+
+/* Preview -> size info label */
+"(%.0f%% actual size)" = "（%.0f%% 实际大小）";
+
+/* Preview -> size info label */
+"(Actual size)" = "（实际大小）";
+
+/* Main Window -> preset modified */
+"(Modified)" = "(已修改)";
+
+/* Job statistics */
+"%@ fps" = "%@ fps";
+
+/* Queue status */
+"%lu encode pending" = "%lu 个编码待处理";
+
+/* Queue status */
+"%lu encodes pending" = "%lu 个编码待处理";
+
+/* No comment provided by engineer. */
+"%lu jobs selected" = "已选择 %lu 个任务";
+
+/* Add preset window -> picture setting */
+"480p NTSC SD" = "480p NTSC SD";
+
+/* Add preset window -> picture setting */
+"576p PAL SD" = "576p PAL SD";
+
+/* Add preset window -> picture setting */
+"720p HD" = "720p 高清";
+
+/* Add preset window -> picture setting */
+"1080p HD" = "1080p 高清";
+
+/* Add preset window -> picture setting */
+"1440p 2.5K Quad HD" = "1440p 2.5K Quad HD";
+
+/* Add preset window -> picture setting */
+"2160p 4K Ultra HD" = "2160p 4K 超高清";
+
+/* Add preset window -> picture setting */
+"4320p 8K Ultra HD" = "4320p 8K 超高清";
+
+/* Destination same as source alert -> message
+   File already exists alert -> message */
+"A file already exists at the selected destination." = "所选目标上已存在文件。";
+
+/* Picture HUD -> scale button */
+"Actual Scale" = "实际比例";
+
+/* Queue undo action name */
+"Add Job To Queue" = "将任务添加到队列";
+
+/* Queue undo action name */
+"Add Jobs To Queue" = "将多个任务添加到队列";
+
+/* Touch bar */
+"Add Preset" = "添加预设";
+
+/* Touch bar */
+"Add Titles To Queue" = "添加标题到队列";
+
+/* Touch bar */
+"Add To Queue" = "添加到队列";
+
+/* Preferences Advanced Toolbar Item */
+"Advanced" = "高级";
+
+/* HBLanguage -> Any language */
+"Any" = "任何";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected preset?" = "您确定要永久删除选定的预设吗？";
+
+/* Delete preset alert -> message */
+"Are you sure you want to permanently delete the selected presets?" = "您确定要永久删除选定的预设吗？";
+
+/* Quit Alert -> message */
+"Are you sure you want to quit HandBrake?" = "您确定要退出 HandBrake 吗？";
+
+/* Copy Protection Alert -> first button */
+"Attempt Scan Anyway" = "仍然尝试扫描";
+
+/* Player HUD -> audio menu */
+"Audio" = "音频";
+
+/* Job statistics */
+"Average speed:" = "平均速度：";
+
+/* Copy Protection Alert -> second button
+   Delete preset alert -> second button
+   File already exists alert -> first button
+   File already exists in queue alert -> first button
+   Preview -> live preview alert alternate button
+   Touch bar */
+"Cancel" = "取消";
+
+/* Touch bar */
+"Cancel Encoding" = "取消编码";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Cancel Scan" = "取消扫描";
+
+/* Toolbar Open/Cancel Item */
+"Cancel Scanning Source" = "取消扫描源";
+
+/* Preferences -> Output Name Token */
+"Chapters" = "章节";
+
+/* Main Window -> Destination open panel */
+"Choose" = "选择";
+
+/* Queue Alert -> cancel rip first button */
+"Continue Encoding" = "继续编码";
+
+/* Copy Protection Alert -> message */
+"Copy-Protected sources are not supported." = "不支持复制受保护的源。";
+
+/* Preferences -> Output Name Token */
+"Creation-Date" = "创建日期";
+
+/* Preferences -> Output Name Token */
+"Creation-Time" = "创建时间";
+
+/* Touch bar */
+"Current Time" = "当前时间";
+
+/* Add preset window -> picture setting */
+"Custom" = "自定义";
+
+/* Preferences -> Output Name Token */
+"Date" = "日期";
+
+/* Delete preset alert -> first button */
+"Delete Preset" = "删除预设";
+
+/* Delete preset alert -> first button */
+"Delete Presets" = "删除预设";
+
+/* File already exists alert -> informative text
+   File already exists in queue alert -> informative text */
+"Do you want to overwrite %@?" = "您是否确认覆盖 %@？";
+
+/* Quit Alert -> second button */
+"Don't Quit" = "不要退出";
+
+/* Touch bar */
+"Done" = "完成";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode canceled" = "编码取消";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode complete" = "编码完成";
+
+/* HBQueueItemView -> Encode state accessibility label
+   Queue done notification failed message */
+"Encode failed" = "编码失败";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode ready" = "已准备编码";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Encode working" = "编码工作中";
+
+/* No comment provided by engineer. */
+"Encoding %lu Jobs" = "编码 %lu 个任务";
+
+/* No comment provided by engineer. */
+"Encoding Job: %@" = "编码任务：%@";
+
+/* Job statistics */
+"Ended at:" = "结束于：";
+
+/* Export presets save panel title */
+"Export preset" = "导出预设";
+
+/* Export presets save panel title */
+"Export presets" = "导出预设";
+
+/* File already exists alert -> message */
+"File already exists." = "文件已存在。";
+
+/* Preferences General Toolbar Item */
+"General" = "通用";
+
+/* Main Window -> title */
+"HandBrake" = "HandBrake";
+
+/* Preview -> live preview alert message */
+"HandBrake can't open the preview." = "HandBrake 无法打开这个预览。";
+
+/* Preview -> live preview alert informative text */
+"HandBrake can't playback this combination of video/audio/container format. Do you want to open it in an external player?" = "HandBrake 无法播放这种视频/音频/容器格式的组合。您想在外部播放器中打开它吗？";
+
+/* Quit Alert -> informative text */
+"If you quit HandBrake your current encode will be reloaded into your queue at next launch. Do you want to quit anyway?" = "如果您退出 HandBrake，您当前的编码将在下一次启动时重新加载到你的队列中。真的想要退出吗?";
+
+/* Import preset open panel title */
+"Import presets" = "导入预设";
+
+/* Chapters import -> invalid CSV line count description */
+"Incorrect line count" = "行数不正确";
+
+/* Chapters import -> invalid CSV description */
+"Invalid chapters CSV file" = "无效的章节 CSV 文件";
+
+/* Queue Edit Alert -> stop and edit first button
+   Queue Stop Alert -> stop and remove first button */
+"Keep Encoding" = "继续编码";
+
+/* Touch bar */
+"Live Preview" = "实时预览";
+
+/* Queue undo action name */
+"Move Job in Queue" = "在队列中移动任务";
+
+/* Queue undo action name */
+"Move Jobs in Queue" = "在队列中移动多个任务";
+
+/* Queue status */
+"No encode pending" = "没有待处理的编码";
+
+/* Preview -> accessibility label */
+"No image" = "没有图像";
+
+/* No comment provided by engineer. */
+"No job selected" = "没有选中的任务";
+
+/* Main Window -> Info text */
+"No Valid Preset" = "没有有效的预设";
+
+/* Main Window -> Info text */
+"No Valid Source Found" = "没有找到有效源";
+
+/* Add preset window -> picture setting */
+"None" = "无";
+
+/* Queue Done Alert -> shut down first button
+   Queue Done Alert -> sleep first button */
+"OK" = "确定";
+
+/* File already exists alert -> informative text */
+"One or more file already exists. Do you want to overwrite?" = "一个或多个文件已存在。你是否确定覆盖？";
+
+/* Preview -> live preview alert default button */
+"Open in external player" = "在外部播放器中打开";
+
+/* Toolbar Open/Cancel Item
+   Touch bar */
+"Open Source" = "打开源";
+
+/* File already exists alert -> second button
+   File already exists in queue alert -> second button */
+"Overwrite" = "覆盖";
+
+/* Toolbar Pause Item */
+"Pause" = "暂停";
+
+/* Queue -> pause/resume menu
+   Toolbar Pause Item
+   Touch bar */
+"Pause Encoding" = "暂停编码";
+
+/* Touch bar */
+"Pause/Resume Encoding" = "暂停/继续编码";
+
+/* Job statistics */
+"Paused time:" = "暂停时间：";
+
+/* Video -> Framerate */
+"Peak Framerate (VFR)" = "峰值帧率（VFR）";
+
+/* Touch bar */
+"Play/Pause" = "播放/暂停";
+
+/* Add preset window -> name alert informative text
+   Rename preset window -> name alert informative text */
+"Please enter a name." = "请输入一个名称。";
+
+/* Copy Protection Alert -> informative text */
+"Please note that HandBrake does not support the removal of copy-protection from DVD Discs. You can if you wish use any other 3rd party software for this function. This warning will be shown only once each time HandBrake is run." = "请注意，HandBrake 不支持去除 DVD 光盘的防拷贝保护。如果您愿意，您可以使用任何其他第三方软件来实现这一功能。这个警告在每次运行 HandBrake 时只显示一次。";
+
+/* Queue Done Alert -> shut down second button
+   Queue Done Alert -> sleep second button */
+"Preferences…" = "偏好设置…";
+
+/* Preview -> progress formatter title */
+"preview" = "预览";
+
+/* Preview -> window title */
+"Preview" = "预览";
+
+/* Preview -> window title format */
+"Preview - %@ %@" = "预览 - %1$@ %2$@";
+
+/* Preview -> accessibility label */
+"Preview Image, Size: %zu x %zu, Scale: %.0f%%" = "预览图，大小：%1$zu x %2$zu，缩放：%3$.0f%%";
+
+/* Touch bar */
+"Previews" = "预览";
+
+/* Queue done alert message
+   Queue notification alert message */
+"Put down that cocktail…" = "放下那杯鸡尾酒…";
+
+/* Preferences -> Output Name Token */
+"Quality/Bitrate" = "质量/码率";
+
+/* Queue window title */
+"Queue" = "队列";
+
+/* Queue window title */
+"Queue (%@)" = "队列 (%@)";
+
+/* Quit Alert -> first button */
+"Quit" = "退出";
+
+/* Touch bar */
+"Remaining Time" = "剩余时间";
+
+/* HBQueueItemView -> Remove button accessibility label */
+"Remove job" = "移除任务";
+
+/* Queue undo action name */
+"Remove Job From Queue" = "从队列移除任务";
+
+/* Queue undo action name */
+"Remove Jobs From Queue" = "从队列移除多个任务";
+
+/* HBQueueItemView -> Encode state accessibility label */
+"Rescanning for editing" = "重新扫描以进行编辑";
+
+/* Toolbar Pause Item */
+"Resume" = "继续";
+
+/* Queue -> pause/resume men
+   Toolbar Pause Item */
+"Resume Encoding" = "继续编码";
+
+/* HBQueueItemView -> Reveal button accessibility label */
+"Reveal destination in Finder" = "在访达中显示目标";
+
+/* Job statistics */
+"Run time:" = "运行时间：";
+
+/* Export presets panel prompt */
+"Save" = "保存";
+
+/* Picture HUD -> scale button
+   Touch bar */
+"Scale To Screen" = "缩放到屏幕";
+
+/* Queue Alert -> cancel rip informative text */
+"Select Continue Encoding to dismiss this dialog without making changes." = "选择“继续编码”，可以在不做任何修改的情况下关闭这个对话框。";
+
+/* Preferences -> send to app destination open panel */
+"Select the desired external application" = "选择所需的外部应用程序";
+
+/* Titles selection sheet -> informative text */
+"Select the titles to add to the queue using the %@ preset:" = "使用 %@ 预设将选择的标题添加到队列：";
+
+/* Notification -> Show in Finder */
+"Show" = "显示";
+
+/* Touch bar */
+"Show Activity Window" = "显示活动窗口";
+
+/* Touch bar */
+"Show Preview Window" = "显示预览窗口";
+
+/* Job statistics */
+"Size:" = "大小：";
+
+/* Queue Alert -> cancel rip second button */
+"Skip Current Job" = "跳过当前任务";
+
+/* Touch bar */
+"Slider" = "滑块";
+
+/* Preferences -> Output Name Token */
+"Source" = "来源";
+
+/* Toolbar Start/Stop Item */
+"Start" = "开始";
+
+/* Menu Start/Stop Item
+   Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Start Encoding" = "开始编码";
+
+/* Toolbar Start/Stop Item */
+"Start Queue" = "开始队列";
+
+/* Touch bar */
+"Start/Stop Encoding" = "开始/停止编码";
+
+/* Job statistics */
+"Started at:" = "开始于：";
+
+/* Queue -> Stop action
+   Toolbar Start/Stop Item */
+"Stop" = "停止";
+
+/* Queue -> Stop action */
+"Stop action." = "停止动作。";
+
+/* Queue Alert -> cancel rip third button */
+"Stop After Current Job" = "当前任务后停止";
+
+/* Queue Alert -> cancel rip fourth button */
+"Stop All" = "全部停止";
+
+/* Queue -> start/stop menu
+   Toolbar Start/Stop Item */
+"Stop Encoding" = "停止编码";
+
+/* Queue Stop Alert -> stop and remove second button */
+"Stop Encoding and Delete" = "停止编码并删除";
+
+/* Queue Edit Alert -> stop and edit second button */
+"Stop Encoding and Edit" = "停止编码并编辑";
+
+/* Queue Edit Alert -> stop and edit message */
+"Stop This Encode and Edit It?" = "停止编码并编辑？";
+
+/* Queue Stop Alert -> stop and remove message */
+"Stop This Encode and Remove It?" = "停止编码并删除？";
+
+/* Player HUD -> subtitles menu */
+"Subtitles" = "字幕";
+
+/* Queue Done Alert -> shut down message */
+"The computer will shut down after encoding is done." = "编码完成之后将会关闭计算机。";
+
+/* Queue Done Alert -> sleep message */
+"The computer will sleep after encoding is done." = "编码完成之后将计算机休眠。";
+
+/* Chapters import -> invalid CSV recovery suggestion */
+"The CSV file is not a valid chapters CSV file." = "这个 CSV 文件不是包含有效章节信息的 CSV 文件。";
+
+/* Destination same as source alert -> informative text */
+"The destination is the same as the source, you can not overwrite your source file!" = "目标与源文件相同，您不能覆盖您的源文件！";
+
+/* Chapters import -> invalid CSV line count recovery suggestion */
+"The line count in the chapters CSV file does not match the number of chapters in the movie." = "章节 CSV 文件中的行数与视频中的章节数不一致。";
+
+/* Add preset window -> name alert message
+   Rename preset window -> name alert message */
+"The preset name cannot be empty." = "预设名称不能为空。";
+
+/* File already exists in queue alert -> message */
+"There is already a queue item for this destination." = "这个目标已经有一个队列项目。";
+
+/* Invalid destination alert -> informative text */
+"This is not a valid destination directory!" = "这不是有效的目标目录！";
+
+/* Preferences -> Output Name Token */
+"Time" = "时间";
+
+/* Preferences -> Output Name Token */
+"Title" = "标题";
+
+/* HBLanguage -> Unknown language */
+"Unknown" = "未知";
+
+/* Video -> Framerate */
+"Variable Framerate" = "可变帧率";
+
+/* Invalid destination alert -> message */
+"Warning!" = "警告！";
+
+/* No comment provided by engineer. */
+"Working" = "工作中";
+
+/* Queue Alert -> cancel rip message */
+"You are currently encoding. What would you like to do?" = "您目前正在进行编码。您想做什么？";
+
+/* Delete preset alert -> informative text */
+"You can't undo this action." = "您不能撤销这个操作。";
+
+/* Queue Done Alert -> shut down informative text */
+"You have selected to shut down the computer after encoding. To turn off shut down, go to the HandBrake preferences." = "您已选择在编码后关闭计算机。要停止关机，请到 HandBrake 选项中取消。";
+
+/* Queue Done Alert -> sleep informative text */
+"You have selected to sleep the computer after encoding. To turn off sleeping, go to the HandBrake preferences." = "您已选择在编码后让计算机休眠。要停止休眠，请到 HandBrake 选项中取消。";
+
+/* Queue -> disk almost full alert informative text */
+"You need to make more space available on your destination disk." = "您需要在目标磁盘上腾出更多空间。";
+
+/* Queue -> disk almost full alert message */
+"Your destination disk is almost full." = "您的目标磁盘几乎已满。";
+
+/* Queue done notification message */
+"Your encode %@ couldn't be completed." = "您的编码 %@ 无法完成。";
+
+/* Queue done notification message */
+"Your encode %@ is done!" = "您的编码 %@ 已完成！";
+
+/* Queue done alert informative text */
+"Your HandBrake queue is done!" = "您的 HandBrake 队列已完成！";
+
+/* Queue Edit Alert -> stop and edit informative text
+   Queue Stop Alert -> stop and remove informative text */
+"Your movie will be lost if you don't continue encoding." = "如果不继续编码您的视频将会丢失。";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/MainMenu.strings Added

@@ -0,0 +1,270 @@
+/* Class = "NSMenu"; title = "Services"; ObjectID = "0te-ai-fgD"; */
+"0te-ai-fgD.title" = "服务";
+
+/* Class = "NSMenuItem"; title = "Rename…"; ObjectID = "1GQ-n3-jfY"; */
+"1GQ-n3-jfY.title" = "重命名…";
+
+/* Class = "NSMenuItem"; title = "Filters"; ObjectID = "6rE-SM-AGi"; */
+"6rE-SM-AGi.title" = "滤镜";
+
+/* Class = "NSMenuItem"; title = "Summary"; ObjectID = "9ie-b7-RaS"; */
+"9ie-b7-RaS.title" = "摘要";
+
+/* Class = "NSMenu"; title = "MainMenu"; ObjectID = "29"; */
+"29.title" = "主菜单";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "56"; */
+"56.title" = "HandBrake";
+
+/* Class = "NSMenu"; title = "HandBrake"; ObjectID = "57"; */
+"57.title" = "HandBrake";
+
+/* Class = "NSMenuItem"; title = "About HandBrake"; ObjectID = "58"; */
+"58.title" = "关于 HandBrake";
+
+/* Class = "NSMenuItem"; title = "Quit HandBrake"; ObjectID = "136"; */
+"136.title" = "退出 HandBrake";
+
+/* Class = "NSMenuItem"; title = "Hide HandBrake"; ObjectID = "971"; */
+"971.title" = "隐藏 HandBrake";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "973"; */
+"973.title" = "隐藏其他";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "1189"; */
+"1189.title" = "窗口";
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "1190"; */
+"1190.title" = "前置所有";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "1191"; */
+"1191.title" = "最小化";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "1192"; */
+"1192.title" = "窗口";
+
+/* Class = "NSMenuItem"; title = "Open Source…"; ObjectID = "1198"; */
+"1198.title" = "打开源…";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1200"; */
+"1200.title" = "文件";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1209"; */
+"1209.title" = "文件";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "1429"; */
+"1429.title" = "帮助";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "1431"; */
+"1431.title" = "帮助";
+
+/* Class = "NSMenuItem"; title = "HandBrake Website"; ObjectID = "1432"; */
+"1432.title" = "HandBrake 网站";
+
+/* Class = "NSMenuItem"; title = "Online Community Forums"; ObjectID = "1433"; */
+"1433.title" = "在线社区论坛";
+
+/* Class = "NSMenuItem"; title = "Preferences…"; ObjectID = "1445"; */
+"1445.title" = "偏好设置…";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "1795"; */
+"1795.title" = "编辑";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "1796"; */
+"1796.title" = "编辑";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "1797"; */
+"1797.title" = "删除";
+
+/* Class = "NSMenuItem"; title = "Select All"; ObjectID = "1798"; */
+"1798.title" = "全选";
+
+/* Class = "NSMenuItem"; title = "Undo"; ObjectID = "1799"; */
+"1799.title" = "撤消";
+
+/* Class = "NSMenuItem"; title = "Redo"; ObjectID = "1801"; */
+"1801.title" = "重做";
+
+/* Class = "NSMenuItem"; title = "Find"; ObjectID = "1802"; */
+"1802.title" = "查找";
+
+/* Class = "NSMenu"; title = "Find"; ObjectID = "1803"; */
+"1803.title" = "查找";
+
+/* Class = "NSMenuItem"; title = "Jump to Selection"; ObjectID = "1804"; */
+"1804.title" = "跳至所选";
+
+/* Class = "NSMenuItem"; title = "Find…"; ObjectID = "1805"; */
+"1805.title" = "查找...";
+
+/* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "1806"; */
+"1806.title" = "查找下一个";
+
+/* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "1807"; */
+"1807.title" = "查找上一个";
+
+/* Class = "NSMenuItem"; title = "Use Selection for Find"; ObjectID = "1808"; */
+"1808.title" = "选择查找到的结果";
+
+/* Class = "NSMenuItem"; title = "Spelling"; ObjectID = "1810"; */
+"1810.title" = "拼写";
+
+/* Class = "NSMenu"; title = "Spelling"; ObjectID = "1811"; */
+"1811.title" = "拼写";
+
+/* Class = "NSMenuItem"; title = "Spelling…"; ObjectID = "1812"; */
+"1812.title" = "拼写...";
+
+/* Class = "NSMenuItem"; title = "Check Spelling"; ObjectID = "1813"; */
+"1813.title" = "拼写检查";
+
+/* Class = "NSMenuItem"; title = "Check Spelling as You Type"; ObjectID = "1814"; */
+"1814.title" = "键入时检查拼写";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "1815"; */
+"1815.title" = "剪切";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "1816"; */
+"1816.title" = "复制";
+
+/* Class = "NSMenuItem"; title = "Speech"; ObjectID = "1817"; */
+"1817.title" = "听写";
+
+/* Class = "NSMenu"; title = "Speech"; ObjectID = "1818"; */
+"1818.title" = "听写";
+
+/* Class = "NSMenuItem"; title = "Stop Speaking"; ObjectID = "1819"; */
+"1819.title" = "停止讲话";
+
+/* Class = "NSMenuItem"; title = "Start Speaking"; ObjectID = "1820"; */
+"1820.title" = "开始讲话";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "1821"; */
+"1821.title" = "粘贴";
+
+/* Class = "NSMenuItem"; title = "Paste and Match Style"; ObjectID = "1822"; */
+"1822.title" = "粘贴并匹配样式";
+
+/* Class = "NSMenuItem"; title = "Presets View"; ObjectID = "1884"; */
+"1884.title" = "预设视图";
+
+/* Class = "NSMenuItem"; title = "Presets"; ObjectID = "1948"; */
+"1948.title" = "预设";
+
+/* Class = "NSMenu"; title = "Presets"; ObjectID = "1949"; */
+"1949.title" = "预设";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "1950"; */
+"1950.title" = "重设官方预设";
+
+/* Class = "NSMenuItem"; title = "New Preset…"; ObjectID = "1955"; */
+"1955.title" = "新的预设...";
+
+/* Class = "NSMenuItem"; title = "Online Documentation"; ObjectID = "1985"; */
+"1985.title" = "在线文档";
+
+/* Class = "NSMenuItem"; title = "Activity Window"; ObjectID = "2295"; */
+"2295.title" = "活动窗口";
+
+/* Class = "NSMenuItem"; title = "HandBrake"; ObjectID = "2368"; */
+"2368.title" = "HandBrake";
+
+/* Class = "NSMenuItem"; title = "Select Default"; ObjectID = "2421"; */
+"2421.title" = "选择默认的";
+
+/* Class = "NSMenuItem"; title = "Add To Queue"; ObjectID = "2443"; */
+"2443.title" = "添加到队列";
+
+/* Class = "NSMenuItem"; title = "Start Encoding"; ObjectID = "2444"; */
+"2444.title" = "开始编码";
+
+/* Class = "NSMenuItem"; title = "Queue"; ObjectID = "2445"; */
+"2445.title" = "队列";
+
+/* Class = "NSMenuItem"; title = "Pause Encoding"; ObjectID = "2494"; */
+"2494.title" = "暂停编码";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "2508"; */
+"2508.title" = "关闭窗口";
+
+/* Class = "NSMenuItem"; title = "Check for Updates…"; ObjectID = "4964"; */
+"4964.title" = "检测更新...";
+
+/* Class = "NSMenuItem"; title = "Preview Window"; ObjectID = "5157"; */
+"5157.title" = "预览窗口";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "5188"; */
+"5188.title" = "导出...";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "5192"; */
+"5192.title" = "导入...";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "5280"; */
+"5280.title" = "全部显示";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "5897"; */
+"5897.title" = "添加标题到队列...";
+
+/* Class = "NSMenuItem"; title = "Audio"; ObjectID = "brQ-mu-8JM"; */
+"brQ-mu-8JM.title" = "音频";
+
+/* Class = "NSMenuItem"; title = "Delete"; ObjectID = "CN3-Rh-gVf"; */
+"CN3-Rh-gVf.title" = "删除";
+
+/* Class = "NSMenuItem"; title = "Subtitles"; ObjectID = "Csx-2S-iUe"; */
+"Csx-2S-iUe.title" = "字幕";
+
+/* Class = "NSMenuItem"; title = "Open Recent"; ObjectID = "fNa-z2-K1i"; */
+"fNa-z2-K1i.title" = "最近打开";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "frQ-v5-pRa"; */
+"frQ-v5-pRa.title" = "设为默认";
+
+/* Class = "NSMenuItem"; title = "View"; ObjectID = "Hzp-jb-hme"; */
+"Hzp-jb-hme.title" = "视图";
+
+/* Class = "NSMenuItem"; title = "Show Toolbar"; ObjectID = "IsV-5A-bqx"; */
+"IsV-5A-bqx.title" = "显示工具栏";
+
+/* Class = "NSMenuItem"; title = "Video"; ObjectID = "Jef-U4-eQT"; */
+"Jef-U4-eQT.title" = "视频";
+
+/* Class = "NSMenuItem"; title = "Customize Toolbar…"; ObjectID = "KKV-n0-Fmr"; */
+"KKV-n0-Fmr.title" = "自定义工具栏...";
+
+/* Class = "NSMenuItem"; title = "Save"; ObjectID = "lab-Ly-3p3"; */
+"lab-Ly-3p3.title" = "保存";
+
+/* Class = "NSMenuItem"; title = "Chapters"; ObjectID = "lCU-PH-gal"; */
+"lCU-PH-gal.title" = "章节";
+
+/* Class = "NSMenuItem"; title = "Enter Full Screen"; ObjectID = "mGX-7Z-siB"; */
+"mGX-7Z-siB.title" = "进入全屏模式";
+
+/* Class = "NSMenu"; title = "View"; ObjectID = "ndG-Ig-Yol"; */
+"ndG-Ig-Yol.title" = "视图";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "oYh-V7-kbx"; */
+"oYh-V7-kbx.title" = "添加所有标题到队列";
+
+/* Class = "NSMenuItem"; title = "Dimension"; ObjectID = "shS-hb-XSI"; */
+"shS-hb-XSI.title" = "尺寸";
+
+/* Class = "NSMenu"; title = "Open Recent"; ObjectID = "ukX-HN-SXk"; */
+"ukX-HN-SXk.title" = "最近打开";
+
+/* Class = "NSMenuItem"; title = "Switch to Next Title"; ObjectID = "viv-aA-SoB"; */
+"viv-aA-SoB.title" = "切换到下一个标题";
+
+/* Class = "NSMenuItem"; title = "Clear Menu"; ObjectID = "wPw-Uj-Gxi"; */
+"wPw-Uj-Gxi.title" = "清空菜单";
+
+/* Class = "NSMenuItem"; title = "New Category…"; ObjectID = "wvb-60-cWL"; */
+"wvb-60-cWL.title" = "新分类...";
+
+/* Class = "NSMenuItem"; title = "Services"; ObjectID = "XcG-Aw-Gdb"; */
+"XcG-Aw-Gdb.title" = "服务";
+
+/* Class = "NSMenuItem"; title = "Switch to Previous Title"; ObjectID = "zgj-Iv-4xJ"; */
+"zgj-Iv-4xJ.title" = "切换到上一个标题";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/MainWindow.strings Added

@@ -0,0 +1,276 @@
+/* Class = "NSTabViewItem"; label = "Filters"; ObjectID = "0UB-bG-kwS"; */
+"0UB-bG-kwS.label" = "滤镜";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Save New Preset…"; ObjectID = "2vD-zN-YMe"; */
+"2vD-zN-YMe.ibShadowedToolTip" = "保存新的预设";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Title to scan."; ObjectID = "3w9-Iu-3u2"; */
+"3w9-Iu-3u2.ibShadowedToolTip" = "标题扫描。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add To Queue"; ObjectID = "3xl-Xh-n9j"; */
+"3xl-Xh-n9j.ibShadowedToolTip" = "添加到队列";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "6E4-AG-PEh"; */
+"6E4-AG-PEh.title" = "0";
+
+/* Class = "NSToolbarItem"; label = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.label" = "打开源";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.paletteLabel" = "打开源";
+
+/* Class = "NSToolbarItem"; toolTip = "Open Source"; ObjectID = "8r8-nZ-dYs"; */
+"8r8-nZ-dYs.toolTip" = "打开源";
+
+/* Class = "NSWindow"; title = "HandBrake"; ObjectID = "21"; */
+"21.title" = "HandBrake";
+
+/* Class = "NSTabViewItem"; label = "Audio"; ObjectID = "1475"; */
+"1475.label" = "音频";
+
+/* Class = "NSTabViewItem"; label = "Video"; ObjectID = "1477"; */
+"1477.label" = "视频";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Source file"; ObjectID = "1538"; */
+"1538.ibExternalAccessibilityDescription" = "源文件";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Source file name."; ObjectID = "1539"; */
+"1539.ibShadowedToolTip" = "源文件名。";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Title, or video clip, to encode. The longest title is selected by default.\n\nBlu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature."; ObjectID = "1541"; */
+"1541.ibShadowedToolTip" = "标题或视频片段进行编码。默认选中最长的标题。\n\n蓝光和 DVD 来源通常具有多个标题，其中最长的通常是主要部分。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1542"; */
+"1542.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Start Chapter"; ObjectID = "1545"; */
+"1545.ibExternalAccessibilityDescription" = "开始章节";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "First chapter to encode."; ObjectID = "1545"; */
+"1545.ibShadowedToolTip" = "要编码的第一个章节。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1546"; */
+"1546.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "End Chapter"; ObjectID = "1548"; */
+"1548.ibExternalAccessibilityDescription" = "结束章节";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Last chapter to encode."; ObjectID = "1548"; */
+"1548.ibShadowedToolTip" = "要编码的最后一个章节。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "1549"; */
+"1549.title" = "其他视图";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Duration"; ObjectID = "1554"; */
+"1554.ibExternalAccessibilityDescription" = "时长";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Duration of the selected source range in Hours:Minutes:Seconds."; ObjectID = "1554"; */
+"1554.ibShadowedToolTip" = "所选源范围的总时间，以时:分:秒格式显示。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Output filename"; ObjectID = "1561"; */
+"1561.ibExternalAccessibilityDescription" = "输出文件名";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "File name. This is what your new video will be named."; ObjectID = "1561"; */
+"1561.ibShadowedToolTip" = "文件名。这就是您新视频的名字。";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Browse Destination"; ObjectID = "1562"; */
+"1562.ibExternalAccessibilityDescription" = "浏览目标";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Browse to select a new destination path for your encode."; ObjectID = "1562"; */
+"1562.ibShadowedToolTip" = "浏览来为编码文件选择一个新的目标路径。";
+
+/* Class = "NSTabViewItem"; label = "Chapters"; ObjectID = "1989"; */
+"1989.label" = "章节";
+
+/* Class = "NSTextFieldCell"; title = "Encoding Job 1: Test.mp4"; ObjectID = "4846"; */
+"4846.title" = "编码任务 1：Test.mp4";
+
+/* Class = "NSTextFieldCell"; title = "Source:"; ObjectID = "4905"; */
+"4905.title" = "源：";
+
+/* Class = "NSTextFieldCell"; title = "Title:"; ObjectID = "4907"; */
+"4907.title" = "标题：";
+
+/* Class = "NSTextFieldCell"; title = "Save As:"; ObjectID = "4913"; */
+"4913.title" = "另存为:";
+
+/* Class = "NSTextFieldCell"; title = "Duration:"; ObjectID = "4914"; */
+"4914.title" = "时长：";
+
+/* Class = "NSTextFieldCell"; title = "00:00:00"; ObjectID = "4915"; */
+"4915.title" = "00:00:00";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "4920"; */
+"4920.title" = "浏览…";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "4923"; */
+"4923.title" = "预设：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video angle to encode. Only applicable to multi-angle DVD and Blu-ray."; ObjectID = "5181"; */
+"5181.ibShadowedToolTip" = "视频角度进行编码。仅适用于含有多角度 DVD 和蓝光光盘。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5183"; */
+"5183.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Angle:"; ObjectID = "5185"; */
+"5185.title" = "角度：";
+
+/* Class = "NSTabViewItem"; label = "Subtitles"; ObjectID = "5194"; */
+"5194.label" = "字幕";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in seconds"; ObjectID = "5491"; */
+"5491.ibExternalAccessibilityDescription" = "开始时间（秒）";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First second to encode."; ObjectID = "5491"; */
+"5491.ibShadowedToolTip" = "需要编码的初始秒数。";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in seconds"; ObjectID = "5493"; */
+"5493.ibExternalAccessibilityDescription" = "结束时间（秒）";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last second to encode."; ObjectID = "5493"; */
+"5493.ibShadowedToolTip" = "需要编码的最后秒数。";
+
+/* Class = "NSTextFieldCell"; title = "–"; ObjectID = "5506"; */
+"5506.title" = "–";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Range Selection"; ObjectID = "5513"; */
+"5513.ibExternalAccessibilityDescription" = "范围选择";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Source range selection. By default, all chapters are selected and the entire source is encoded."; ObjectID = "5513"; */
+"5513.ibShadowedToolTip" = "源范围选择。默认情况下将选择所有章节，并对整个源进行编码。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "5515"; */
+"5515.title" = "其他视图";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "Start time in frames"; ObjectID = "5521"; */
+"5521.ibExternalAccessibilityDescription" = "开始时间（以帧为单位）";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "First frame to encode."; ObjectID = "5521"; */
+"5521.ibShadowedToolTip" = "需要编码的初始帧";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "End time in frames"; ObjectID = "5523"; */
+"5523.ibExternalAccessibilityDescription" = "需要编码的最后帧";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Last frame to encode."; ObjectID = "5523"; */
+"5523.ibShadowedToolTip" = "结束时间（已帧为单位）";
+
+/* Class = "NSMenuItem"; title = "Add All Titles To Queue"; ObjectID = "a37-Yd-bYR"; */
+"a37-Yd-bYR.title" = "添加所有标题到队列";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the encoding settings for the currently selected preset. Modifications will be discarded."; ObjectID = "AhR-pK-Oz4"; */
+"AhR-pK-Oz4.ibShadowedToolTip" = "重新加载当前所选预设的编码设置。修改将被还原。";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "aID-g7-zTF"; */
+"aID-g7-zTF.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSTabViewItem"; label = "Summary"; ObjectID = "BA0-eg-2Ka"; */
+"BA0-eg-2Ka.label" = "摘要";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Preset selection"; ObjectID = "bWH-Lp-mKY"; */
+"bWH-Lp-mKY.ibExternalAccessibilityDescription" = "预设选择";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.label" = "开始";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.paletteLabel" = "开始编码";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "byg-kj-sEM"; */
+"byg-kj-sEM.toolTip" = "开始编码";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "cgS-BU-Nfd"; */
+"cgS-BU-Nfd.title" = "重新加载";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "d0E-xw-bxh"; */
+"d0E-xw-bxh.title" = "盒子";
+
+/* Class = "NSToolbarItem"; label = "Preview"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.label" = "预览";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.paletteLabel" = "显示预览窗口";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Preview Window"; ObjectID = "dK4-jt-v4K"; */
+"dK4-jt-v4K.toolTip" = "显示预览窗口";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Scan only the specified title instead of all titles."; ObjectID = "DN4-48-aOI"; */
+"DN4-48-aOI.ibShadowedToolTip" = "仅扫描指定的标题，而不扫描所有标题。";
+
+/* Class = "NSTabViewItem"; label = "Dimensions"; ObjectID = "eij-Sn-QmJ"; */
+"eij-Sn-QmJ.label" = "尺寸";
+
+/* Class = "NSButtonCell"; title = "Scan only title:"; ObjectID = "eQA-t2-FcV"; */
+"eQA-t2-FcV.title" = "仅扫描标题：";
+
+/* Class = "NSToolbarItem"; label = "Queue"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.label" = "队列";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.paletteLabel" = "显示队列窗口";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Queue Window"; ObjectID = "HCx-ku-nF7"; */
+"HCx-ku-nF7.toolTip" = "显示队列窗口";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = " "; ObjectID = "Iat-pL-ttI"; */
+"Iat-pL-ttI.ibShadowedIsNilPlaceholder" = "";
+
+/* Class = "NSButtonCell"; title = "Save New Preset…"; ObjectID = "IOU-3L-nvB"; */
+"IOU-3L-nvB.title" = "保存新的预设…";
+
+/* Class = "NSMenuItem"; title = "Add Titles To Queue…"; ObjectID = "iVg-1G-9ym"; */
+"iVg-1G-9ym.title" = "添加标题到队列...";
+
+/* Class = "NSTextFieldCell"; title = "Range:"; ObjectID = "IxV-PW-oYh"; */
+"IxV-PW-oYh.title" = "范围：";
+
+/* Class = "NSTextFieldCell"; title = "Progress"; ObjectID = "KUR-YZ-Da8"; */
+"KUR-YZ-Da8.title" = "进度";
+
+/* Class = "NSMenuItem"; title = "Selected Preset"; ObjectID = "OYP-3T-FnA"; */
+"OYP-3T-FnA.title" = "选择预设";
+
+/* Class = "NSToolbarItem"; label = "Activity"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.label" = "活动";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.paletteLabel" = "显示活动日志窗口";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Activity Window"; ObjectID = "p7Q-L3-zcW"; */
+"p7Q-L3-zcW.toolTip" = "显示活动日志窗口";
+
+/* Class = "NSPathControl"; ibExternalAccessibilityDescription = "Destination folder path"; ObjectID = "PJi-21-hie"; */
+"PJi-21-hie.ibExternalAccessibilityDescription" = "目标文件夹路径";
+
+/* Class = "NSToolbarItem"; label = "Presets"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.label" = "预设";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.paletteLabel" = "显示预设列表";
+
+/* Class = "NSToolbarItem"; toolTip = "Show Presets List"; ObjectID = "qhv-9l-2FH"; */
+"qhv-9l-2FH.toolTip" = "显示预设列表";
+
+/* Class = "NSToolbarItem"; label = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.label" = "添加到队列";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Add To Queue"; ObjectID = "Qoa-tj-Rj2"; */
+"Qoa-tj-Rj2.paletteLabel" = "添加到队列";
+
+/* Class = "NSTextFieldCell"; title = "To:"; ObjectID = "rfK-nQ-Aq2"; */
+"rfK-nQ-Aq2.title" = "至：";
+
+/* Class = "NSMenuItem"; title = "Reveal in Finder"; ObjectID = "rK6-EB-N9Z"; */
+"rK6-EB-N9Z.title" = "在访达中显示";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.label" = "暂停";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.paletteLabel" = "暂停编码";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "wTQ-KF-5KW"; */
+"wTQ-KF-5KW.toolTip" = "暂停编码";
+
+/* Class = "NSBox"; title = "Box"; ObjectID = "zcd-K2-F7w"; */
+"zcd-K2-F7w.title" = "盒子";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/OutputPanel.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/PicturePreview.strings Added

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Preferences.strings Added

@@ -0,0 +1,264 @@
+/* Class = "NSTextFieldCell"; title = "Format:"; ObjectID = "3dN-MN-DcP"; */
+"3dN-MN-DcP.title" = "格式：";
+
+/* Class = "NSWindow"; title = "Preferences"; ObjectID = "5"; */
+"5.title" = "首选项";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "290"; */
+"290.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "292"; */
+"292.title" = "自动";
+
+/* Class = "NSButtonCell"; title = "Automatically name output files"; ObjectID = "302"; */
+"302.title" = "自动命名输出文件";
+
+/* Class = "NSTextFieldCell"; title = "When Done:"; ObjectID = "304"; */
+"304.title" = "当完成时：";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates weekly"; ObjectID = "305"; */
+"305.title" = "每周自动检查更新";
+
+/* Class = "NSButtonCell"; title = "Send file to:"; ObjectID = "306"; */
+"306.title" = "发送文件至：";
+
+/* Class = "NSTextFieldCell"; title = "At Launch:"; ObjectID = "307"; */
+"307.title" = "启动时：";
+
+/* Class = "NSTextFieldCell"; title = "Output Files:"; ObjectID = "308"; */
+"308.title" = "输出文件：";
+
+/* Class = "NSButtonCell"; title = "Store Activity Logs in same location as video"; ObjectID = "348"; */
+"348.title" = "储存活动日志到视频相同位置。";
+
+/* Class = "NSTextFieldCell"; title = "Activity Logs:"; ObjectID = "351"; */
+"351.title" = "活动日志：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "352"; */
+"352.ibShadowedToolTip" = "要扫描的预览画面数。较高的值可能会增加自动裁剪精度，但会牺牲标题扫描时间。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "354"; */
+"354.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "10"; ObjectID = "355"; */
+"355.title" = "10";
+
+/* Class = "NSMenuItem"; title = "15"; ObjectID = "356"; */
+"356.title" = "15";
+
+/* Class = "NSMenuItem"; title = "20"; ObjectID = "357"; */
+"357.title" = "20";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Number of picture previews to scan. Higher values may increase automatic cropping accuracy at the expense of title scan time."; ObjectID = "359"; */
+"359.ibShadowedToolTip" = "要扫描的预览画面数。较高的值可能会增加自动裁剪精度，但会牺牲标题扫描时间。";
+
+/* Class = "NSTextFieldCell"; title = "Number of picture previews to scan:"; ObjectID = "360"; */
+"360.title" = "预览画面的扫描次数：";
+
+/* Class = "NSMenuItem"; title = "25"; ObjectID = "361"; */
+"361.title" = "25";
+
+/* Class = "NSMenuItem"; title = "30"; ObjectID = "362"; */
+"362.title" = "30";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "363"; */
+"363.ibShadowedToolTip" = "详细程度。扩展详细程度将更多技术信息记录到活动日志中。最小的详细程度记录较少。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "365"; */
+"365.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Extended"; ObjectID = "368"; */
+"368.title" = "扩展";
+
+/* Class = "NSMenuItem"; title = "Standard"; ObjectID = "369"; */
+"369.title" = "标准";
+
+/* Class = "NSMenuItem"; title = "Minimised"; ObjectID = "370"; */
+"370.title" = "最小化";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Verbosity Level. Extended verbosity records more technical information to the Activity Log. Minimal verbosity records less."; ObjectID = "371"; */
+"371.ibShadowedToolTip" = "详细程度。扩展详细程度将更多技术信息记录到活动日志中。最小的详细程度记录较少。";
+
+/* Class = "NSTextFieldCell"; title = "Verbosity Level:"; ObjectID = "372"; */
+"372.title" = "详细程度：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "387"; */
+"387.ibShadowedToolTip" = "设定 x264 恒定质量控件的颗粒度。值越小质量越高。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "389"; */
+"389.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "0.20"; ObjectID = "390"; */
+"390.title" = "0.20";
+
+/* Class = "NSMenuItem"; title = "0.25"; ObjectID = "391"; */
+"391.title" = "0.25";
+
+/* Class = "NSMenuItem"; title = "0.50"; ObjectID = "393"; */
+"393.title" = "0.50";
+
+/* Class = "NSMenuItem"; title = "1.0"; ObjectID = "394"; */
+"394.title" = "1.0";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Determines the granularity of the x264 Constant Quality control. Smaller values allow for finer quality increments."; ObjectID = "395"; */
+"395.ibShadowedToolTip" = "设定 x264 恒定质量控件的颗粒度。值越小质量越高。";
+
+/* Class = "NSTextFieldCell"; title = "Constant Quality fractional granularity:"; ObjectID = "396"; */
+"396.title" = "恒定质量颗粒度：";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Use libdvdnav to read DVDs. Only disable this for problematic DVDs where libdvdread works better (rare)."; ObjectID = "398"; */
+"398.ibShadowedToolTip" = "使用 libdvdnav 读取 DVD。仅对 libdvdread 效果更好的或有问题的 DVD 禁用此功能（不常见）。";
+
+/* Class = "NSButtonCell"; title = "Use libdvdnav (instead of libdvdread)"; ObjectID = "399"; */
+"399.title" = "使用 libdvdnav（而不是 libdvdread）";
+
+/* Class = "NSTextFieldCell"; title = "None"; ObjectID = "449"; */
+"449.title" = "无";
+
+/* Class = "NSButtonCell"; title = "Browse…"; ObjectID = "451"; */
+"451.title" = "浏览…";
+
+/* Class = "NSButtonCell"; title = "Play System Alert Sound"; ObjectID = "458"; */
+"458.title" = "播放系统警报声音";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped."; ObjectID = "463"; */
+"463.ibShadowedToolTip" = "DVD 和 蓝光光盘 标题的最短持续时间（以秒为单位）。小于此时间的短标题将被跳过。";
+
+/* Class = "NSTextFieldCell"; title = "Ignore DVD and Blu-ray titles shorter than:"; ObjectID = "464"; */
+"464.title" = "忽略以下 DVD 和 蓝光光盘 标题：";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum title duration in seconds. Shorter titles will be skipped."; ObjectID = "480"; */
+"480.ibShadowedToolTip" = "最小标题持续时间（以秒为单位）。短标题将被跳过。";
+
+/* Class = "NSMenuItem"; title = ".m4v"; ObjectID = "484"; */
+"484.title" = ".m4v";
+
+/* Class = "NSMenuItem"; title = ".mp4"; ObjectID = "485"; */
+"485.title" = ".mp4";
+
+/* Class = "NSTextFieldCell"; title = "Default MP4 Extension:"; ObjectID = "487"; */
+"487.title" = "默认 MP4 扩展名：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "493"; */
+"493.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "494"; */
+"494.title" = "无操作";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "495"; */
+"495.title" = "警报";
+
+/* Class = "NSMenuItem"; title = "Alert And Notification"; ObjectID = "496"; */
+"496.title" = "警报和通知";
+
+/* Class = "NSMenuItem"; title = "Put Computer To Sleep"; ObjectID = "497"; */
+"497.title" = "让电脑进入睡眠状态";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "498"; */
+"498.title" = "关闭电脑";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "499"; */
+"499.title" = "通知";
+
+/* Class = "NSMenuItem"; title = "35"; ObjectID = "514"; */
+"514.title" = "35";
+
+/* Class = "NSMenuItem"; title = "40"; ObjectID = "515"; */
+"515.title" = "40";
+
+/* Class = "NSMenuItem"; title = "45"; ObjectID = "516"; */
+"516.title" = "45";
+
+/* Class = "NSMenuItem"; title = "50"; ObjectID = "517"; */
+"517.title" = "50";
+
+/* Class = "NSMenuItem"; title = "55"; ObjectID = "518"; */
+"518.title" = "55";
+
+/* Class = "NSMenuItem"; title = "60"; ObjectID = "519"; */
+"519.title" = "60";
+
+/* Class = "NSButtonCell"; title = "Show preview images"; ObjectID = "Aao-Tf-JeJ"; */
+"Aao-Tf-JeJ.title" = "显示预览图";
+
+/* Class = "NSButtonCell"; title = "Always clear completed items after an encode completes"; ObjectID = "BPU-E2-N8l"; */
+"BPU-E2-N8l.title" = "始终在编码完成后清除已完成的项目";
+
+/* Class = "NSTextFieldCell"; title = "Scan:"; ObjectID = "c0L-TU-WML"; */
+"c0L-TU-WML.title" = "扫描：";
+
+/* Class = "NSTextFieldCell"; title = "Encoder:"; ObjectID = "cqp-xU-GOe"; */
+"cqp-xU-GOe.title" = "编码：";
+
+/* Class = "NSTextFieldCell"; title = "Drag labels to Format to compose a naming format."; ObjectID = "dQ6-Dh-9sD"; */
+"dQ6-Dh-9sD.title" = "将标签拖到格式栏以组成命名格式。";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "None"; ObjectID = "f36-PN-c5F"; */
+"f36-PN-c5F.ibShadowedIsNilPlaceholder" = "无";
+
+/* Class = "NSTextFieldCell"; title = "Queue:"; ObjectID = "FKi-zh-5gc"; */
+"FKi-zh-5gc.title" = "队列：";
+
+/* Class = "NSTextFieldCell"; title = "GB"; ObjectID = "FZE-ZR-g93"; */
+"FZE-ZR-g93.title" = "GB";
+
+/* Class = "NSButtonCell"; title = "Change case to Title Case"; ObjectID = "ggR-Zs-P8G"; */
+"ggR-Zs-P8G.title" = "更改为标题大小写";
+
+/* Class = "NSTextFieldCell"; title = "Summary:"; ObjectID = "GQJ-go-PoN"; */
+"GQJ-go-PoN.title" = "摘要：";
+
+/* Class = "NSTextFieldCell"; title = "Number of simultaneous encodes:"; ObjectID = "iGS-b5-ip7"; */
+"iGS-b5-ip7.title" = "同时编码的数量：";
+
+/* Class = "NSMenuItem"; title = "2"; ObjectID = "JcO-br-AXz"; */
+"JcO-br-AXz.title" = "2";
+
+/* Class = "NSTextFieldCell"; title = "seconds"; ObjectID = "klQ-DW-Kc6"; */
+"klQ-DW-Kc6.title" = "秒";
+
+/* Class = "NSButtonCell"; title = "Keep preset edits when selecting a new title"; ObjectID = "L3N-te-KLg"; */
+"L3N-te-KLg.title" = "选择新标题时保留预设的编辑内容";
+
+/* Class = "NSMenuItem"; title = "1"; ObjectID = "l8v-ns-6UR"; */
+"l8v-ns-6UR.title" = "1";
+
+/* Class = "NSButtonCell"; title = "Remove old logs from main Activity Logs folder after 30 days"; ObjectID = "lgn-RF-k0d"; */
+"lgn-RF-k0d.title" = "30 天后从主“活动日志”文件夹中删除旧日志";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Higher values may help to fully utilize the CPU if a single encode can't scale to all available CPU cores."; ObjectID = "MLd-Te-AbW"; */
+"MLd-Te-AbW.ibShadowedToolTip" = "如果单个编码不能扩展到所有可用的 CPU 内核，更高的值可能有助于充分利用 CPU。";
+
+/* Class = "NSMenuItem"; title = "4"; ObjectID = "nTJ-DB-eOd"; */
+"nTJ-DB-eOd.title" = "4";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Minimum free space on destination disk."; ObjectID = "PaR-zw-opS"; */
+"PaR-zw-opS.ibShadowedToolTip" = "目标磁盘上最小可用空间。";
+
+/* Class = "NSButtonCell"; title = "Replace underscores with spaces"; ObjectID = "pUi-lK-cHw"; */
+"pUi-lK-cHw.title" = "用空格替换下划线";
+
+/* Class = "NSTokenField"; ibShadowedToolTip = "Drag labels to the Format field to compose a naming format."; ObjectID = "Tk3-Ig-fFI"; */
+"Tk3-Ig-fFI.ibShadowedToolTip" = "将标签拖到格式字段来组成命名格式。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "TpU-3v-fhx"; */
+"TpU-3v-fhx.title" = "其他视图";
+
+/* Class = "NSButtonCell"; title = "Reset to \"Do nothing\" on launch"; ObjectID = "Uxv-oN-c1r"; */
+"Uxv-oN-c1r.title" = "启动时重置为“无操作”";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "wiP-Ia-DfB"; */
+"wiP-Ia-DfB.title" = "预设：";
+
+/* Class = "NSButtonCell"; title = "Remove common punctuation"; ObjectID = "wo5-iR-2mb"; */
+"wo5-iR-2mb.title" = "删除常见的标点符号";
+
+/* Class = "NSButtonCell"; title = "Pause queue if disk space is lower than:"; ObjectID = "yG9-mz-tqQ"; */
+"yG9-mz-tqQ.title" = "如果磁盘空间少于以下，则暂停队列：";
+
+/* Class = "NSMenuItem"; title = "3"; ObjectID = "ZGL-FR-zSW"; */
+"ZGL-FR-zSW.title" = "3";
+
+/* Class = "NSButtonCell"; title = "Show Open Source panel"; ObjectID = "Zqz-Kn-xOS"; */
+"Zqz-Kn-xOS.title" = "显示打开源面板";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Presets.strings Added

@@ -0,0 +1,45 @@
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips0 = "Create a new custom preset based on the currently selected settings."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips0" = "根据当前选择的设置创建一个新的自定义预设。";
+
+/* Class = "NSSegmentedCell"; 0di-xq-jgi.ibShadowedToolTips1 = "Delete the selected preset."; ObjectID = "0di-xq-jgi"; */
+"0di-xq-jgi.ibShadowedToolTips1" = "删除所选预设。";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "4tC-UE-40G"; */
+"4tC-UE-40G.title" = "文本单元格";
+
+/* Class = "NSMenuItem"; title = "Reset Official Presets"; ObjectID = "cm5-Kl-dB3"; */
+"cm5-Kl-dB3.title" = "重设官方预设";
+
+/* Class = "NSMenuItem"; title = "Make Default"; ObjectID = "D2t-YG-Frn"; */
+"D2t-YG-Frn.title" = "设为默认";
+
+/* Class = "NSMenuItem"; title = "New Category"; ObjectID = "Io0-Vm-Qez"; */
+"Io0-Vm-Qez.title" = "新分类";
+
+/* Class = "NSMenu"; title = "Presets Action Menu"; ObjectID = "LQk-kD-5sj"; */
+"LQk-kD-5sj.title" = "预设动作菜单";
+
+/* Class = "NSMenuItem"; title = "Import…"; ObjectID = "LUl-ag-Iu6"; */
+"LUl-ag-Iu6.title" = "导入...";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "oBC-Nh-TwB"; */
+"oBC-Nh-TwB.title" = "表视图单元格";
+
+/* Class = "NSTextFieldCell"; title = "Presets"; ObjectID = "r4V-6L-SO8"; */
+"r4V-6L-SO8.title" = "预设";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Presets"; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibExternalAccessibilityDescription" = "预设";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.\n\nOverrides all encode settings. Settings may be further adjusted after selecting a preset."; ObjectID = "uad-bt-uKD"; */
+"uad-bt-uKD.ibShadowedToolTip" = "预设是为特定场景量身定制的一组编码设置。选择最符合您需要的一个。\n\n覆盖所有编码设置。选择预设后可以进一步调整设置。";
+
+/* Class = "NSMenuItem"; title = "Export…"; ObjectID = "xEQ-Un-J0n"; */
+"xEQ-Un-J0n.title" = "导出...";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Additional Options"; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibExternalAccessibilityDescription" = "附加选项";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Show additional options."; ObjectID = "Ybq-Zt-sta"; */
+"Ybq-Zt-sta.ibShadowedToolTip" = "显示附加选项";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Queue.strings Added

@@ -0,0 +1,72 @@
+/* Class = "NSMenuItem"; title = "Reset Failed Jobs"; ObjectID = "0zn-7P-JbR"; */
+"0zn-7P-JbR.title" = "重置失败的任务";
+
+/* Class = "NSMenuItem"; title = "Remove Completed Jobs"; ObjectID = "9tg-YJ-DuI"; */
+"9tg-YJ-DuI.title" = "移除已完成的任务";
+
+/* Class = "NSWindow"; title = "Queue"; ObjectID = "2576"; */
+"2576.title" = "队列";
+
+/* Class = "NSToolbarItem"; label = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.label" = "当任务完成后";
+
+/* Class = "NSToolbarItem"; paletteLabel = "When Done"; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.paletteLabel" = "当任务完成后";
+
+/* Class = "NSToolbarItem"; toolTip = "Action to perform when encoding is complete."; ObjectID = "a3c-kV-98E"; */
+"a3c-kV-98E.toolTip" = "编码完成后要执行的操作。";
+
+/* Class = "NSMenuItem"; title = "Alert and Notification"; ObjectID = "aat-1N-Odn"; */
+"aat-1N-Odn.title" = "警报和通知";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.label" = "动作";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "DCB-WP-NRs"; */
+"DCB-WP-NRs.paletteLabel" = "动作";
+
+/* Class = "NSToolbarItem"; label = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.label" = "详情";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Details"; ObjectID = "DfN-Iw-bzy"; */
+"DfN-Iw-bzy.paletteLabel" = "详情";
+
+/* Class = "NSMenuItem"; title = "Alert"; ObjectID = "fAD-ky-zo6"; */
+"fAD-ky-zo6.title" = "警报";
+
+/* Class = "NSMenuItem"; title = "Put Computer to Sleep"; ObjectID = "GUQ-xb-HVS"; */
+"GUQ-xb-HVS.title" = "让电脑进入睡眠状态";
+
+/* Class = "NSMenuItem"; title = "Notification"; ObjectID = "jDL-sB-8e3"; */
+"jDL-sB-8e3.title" = "通知";
+
+/* Class = "NSMenuItem"; title = "Reset All Jobs"; ObjectID = "kPX-am-UX1"; */
+"kPX-am-UX1.title" = "重置所有任务";
+
+/* Class = "NSMenuItem"; title = "Shut Down Computer"; ObjectID = "QmP-SQ-XKK"; */
+"QmP-SQ-XKK.title" = "关闭电脑";
+
+/* Class = "NSToolbarItem"; label = "Pause"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.label" = "暂停";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Pause/Resume"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.paletteLabel" = "暂停/继续";
+
+/* Class = "NSToolbarItem"; toolTip = "Pause Encoding"; ObjectID = "s7o-pK-heI"; */
+"s7o-pK-heI.toolTip" = "暂停编码";
+
+/* Class = "NSMenuItem"; title = "Do Nothing"; ObjectID = "sm5-26-sAg"; */
+"sm5-26-sAg.title" = "无操作";
+
+/* Class = "NSToolbarItem"; label = "Start"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.label" = "开始";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Start/Cancel"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.paletteLabel" = "开始/取消";
+
+/* Class = "NSToolbarItem"; toolTip = "Start Encoding"; ObjectID = "SX6-mq-Hck"; */
+"SX6-mq-Hck.toolTip" = "开始编码";
+
+/* Class = "NSMenuItem"; title = "Remove All Jobs"; ObjectID = "Tvo-xt-sag"; */
+"Tvo-xt-sag.title" = "移除所有任务";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Subtitles.strings Added

@@ -0,0 +1,174 @@
+/* Class = "NSTableView"; ibExternalAccessibilityDescription = "Subtitles tracks"; ObjectID = "0yM-wE-D2x"; */
+"0yM-wE-D2x.ibExternalAccessibilityDescription" = "字幕轨道";
+
+/* Class = "NSTableColumn"; headerCell.title = "Encoding"; ObjectID = "1Qg-We-ltR"; */
+"1Qg-We-ltR.headerCell.title" = "编码";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "4PX-In-DpF"; */
+"4PX-In-DpF.title" = "添加所有轨道";
+
+/* Class = "NSTableColumn"; headerCell.title = "Language"; ObjectID = "9ka-9O-WDj"; */
+"9ka-9O-WDj.headerCell.title" = "语言";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "ABd-Ec-K2L"; */
+"ABd-Ec-K2L.title" = "其他视图";
+
+/* Class = "NSTextField"; ibExternalAccessibilityDescription = "SRT/SSA Offset"; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibExternalAccessibilityDescription" = "SRT/SSA 偏移";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Positive or negative offset in milliseconds (ms) for the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "aJi-zQ-0cg"; */
+"aJi-zQ-0cg.ibShadowedToolTip" = "所选 SRT/SSA 格式源轨道的正或负偏移，单位为毫秒（ms）。不适用于其他格式。";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "cSW-OC-qKA"; */
+"cSW-OC-qKA.title" = "弹出";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "dap-ee-kor"; */
+"dap-ee-kor.title" = "项目 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "fAW-To-EeP"; */
+"fAW-To-EeP.title" = "项目 3";
+
+/* Class = "NSTableColumn"; headerCell.title = "Offset"; ObjectID = "Fgh-pZ-6uu"; */
+"Fgh-pZ-6uu.headerCell.title" = "偏移";
+
+/* Class = "NSTableColumn"; headerCell.title = "Burned In"; ObjectID = "fIe-Fg-ufj"; */
+"fIe-Fg-ufj.headerCell.title" = "烧入";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Fr7-eG-NuL"; */
+"Fr7-eG-NuL.title" = "其他视图";
+
+/* Class = "NSTableColumn"; headerCell.title = "Default"; ObjectID = "fvq-pE-sOC"; */
+"fvq-pE-sOC.headerCell.title" = "默认";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "fXD-7h-jMl"; */
+"fXD-7h-jMl.title" = "添加外部字幕轨…";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "g4b-FM-qX4"; */
+"g4b-FM-qX4.title" = "项目 2";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "gHY-6m-ASb"; */
+"gHY-6m-ASb.title" = "项目 2";
+
+/* Class = "NSTextFieldCell"; title = "Text Cell"; ObjectID = "gYk-0C-2tR"; */
+"gYk-0C-2tR.title" = "文本单元格";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Forced subtitles only"; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibExternalAccessibilityDescription" = "仅强制字幕";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Forced Only. Use only subtitles marked as “forced” in the selected source track."; ObjectID = "HC5-ql-Vcr"; */
+"HC5-ql-Vcr.ibShadowedToolTip" = "仅强制。在选定的源音轨中仅使用标记为“强制”的字幕。";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "hhH-c3-gD0"; */
+"hhH-c3-gD0.title" = "0";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "HQq-Mp-4sI"; */
+"HQq-Mp-4sI.title" = "项目 2";
+
+/* Class = "NSMenuItem"; ibShadowedToolTip = "Add new SRT/SSA subtitle to the list."; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.ibShadowedToolTip" = "添加新的 SRT/SSA 字幕至列表。";
+
+/* Class = "NSMenuItem"; title = "Add External Subtitles Track…"; ObjectID = "HW0-PS-t0U"; */
+"HW0-PS-t0U.title" = "添加外部字幕轨道…";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Language"; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibExternalAccessibilityDescription" = "SRT/SSA 语言";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Language of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "Inz-O5-B8g"; */
+"Inz-O5-B8g.ibShadowedToolTip" = "所选 SRT/SSA 格式源轨道的语言。不适用于其他格式。";
+
+/* Class = "NSMenuItem"; title = "Reload"; ObjectID = "jcM-HL-QJ6"; */
+"jcM-HL-QJ6.title" = "重新加载";
+
+/* Class = "NSButtonCell"; title = "Reload"; ObjectID = "jG8-uo-1tv"; */
+"jG8-uo-1tv.title" = "重新加载";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "JLr-Qi-X0X"; */
+"JLr-Qi-X0X.title" = "校验";
+
+/* Class = "NSTableColumn"; headerCell.title = "Forced Only"; ObjectID = "klV-Gy-igk"; */
+"klV-Gy-igk.headerCell.title" = "仅强制";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Default"; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibExternalAccessibilityDescription" = "默认";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Default flag. Mark the selected subtitles track as the default to be displayed on playback."; ObjectID = "mdO-Qu-3Pb"; */
+"mdO-Qu-3Pb.ibShadowedToolTip" = "默认标志。将所选字幕轨道标记为播放时的默认显示。";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "mVi-zH-KUq"; */
+"mVi-zH-KUq.title" = "移除全部轨道";
+
+/* Class = "NSTableColumn"; headerCell.title = "Track"; ObjectID = "N3S-st-yGv"; */
+"N3S-st-yGv.headerCell.title" = "音轨";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "ooy-Sh-Edm"; */
+"ooy-Sh-Edm.title" = "检查";
+
+/* Class = "NSButtonCell"; title = "Selection Behavior…"; ObjectID = "oxg-bs-1si"; */
+"oxg-bs-1si.title" = "选择行为";
+
+/* Class = "NSMenuItem"; title = "Selection Behavior…"; ObjectID = "pwm-PV-1x4"; */
+"pwm-PV-1x4.title" = "选择行为";
+
+/* Class = "NSTextFieldCell"; title = "Text"; ObjectID = "QRj-KI-a03"; */
+"QRj-KI-a03.title" = "文本";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Configure subtitle tracks Selection Behavior. These settings affect which tracks will be added to the subtitle tracks list, and the settings used for each track."; ObjectID = "QsM-28-Pya"; */
+"QsM-28-Pya.ibShadowedToolTip" = "配置字幕轨道的选择行为。这些设置影响哪些轨道将被添加到字幕轨道列表中，以及每个轨道使用的设置。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "SRT/SSA Character Encoding"; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibExternalAccessibilityDescription" = "SRT/SSA 字符编码";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Character encoding/codeset of the selected SRT/SSA format source track. Not applicable to other formats."; ObjectID = "QV0-kE-4yR"; */
+"QV0-kE-4yR.ibShadowedToolTip" = "所选 SRT/SSA 格式源轨道的字符编码/字符集。不适用于其他格式。";
+
+/* Class = "NSMenuItem"; title = "Remove All Tracks"; ObjectID = "R8a-qg-ASg"; */
+"R8a-qg-ASg.title" = "移除全部轨道";
+
+/* Class = "NSButtonCell"; title = "Check"; ObjectID = "R9w-Bn-CCt"; */
+"R9w-Bn-CCt.title" = "校验";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "Rj8-KI-k4L"; */
+"Rj8-KI-k4L.title" = "项目 1";
+
+/* Class = "NSMenuItem"; title = "Add All Tracks"; ObjectID = "S2I-Jd-Lyg"; */
+"S2I-Jd-Lyg.title" = "添加所有轨道";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Subtitle tracks list. Track selection behavior and settings are loaded from the selected preset, and may be configured using the subtitle Selection Behavior dialog."; ObjectID = "Syo-rH-vof"; */
+"Syo-rH-vof.ibShadowedToolTip" = "字幕轨道列表。曲目的选择和设置从所选预设中加载，并且可以使用字幕“选择行为”对话框进行配置。";
+
+/* Class = "NSPopUpButton"; ibExternalAccessibilityDescription = "Selected track"; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibExternalAccessibilityDescription" = "已选轨道";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Subtitles language and type."; ObjectID = "Tf3-cP-TGw"; */
+"Tf3-cP-TGw.ibShadowedToolTip" = "字幕语言与类型";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "ThR-Cn-Vfr"; */
+"ThR-Cn-Vfr.title" = "项目 3";
+
+/* Class = "NSMenuItem"; title = "Tracks"; ObjectID = "TJO-RZ-jgb"; */
+"TJO-RZ-jgb.title" = "轨道";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Umu-1b-U1Z"; */
+"Umu-1b-U1Z.title" = "其他视图";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "UOP-xa-WpP"; */
+"UOP-xa-WpP.title" = "其他视图";
+
+/* Class = "NSMenuItem"; title = "Pop Up"; ObjectID = "vHW-fn-RSG"; */
+"vHW-fn-RSG.title" = "弹出";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Reload the subtitles tracks list using the configured Selection Behavior."; ObjectID = "Vxx-gk-9kY"; */
+"Vxx-gk-9kY.ibShadowedToolTip" = "使用配置的选择重新加载字幕轨道列表。";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "yDg-DK-z5D"; */
+"yDg-DK-z5D.title" = "项目 1";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "yEC-jb-q8b"; */
+"yEC-jb-q8b.title" = "项目 3";
+
+/* Class = "NSButton"; ibExternalAccessibilityDescription = "Burned In"; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibExternalAccessibilityDescription" = "烧入";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burned In. Make the selected subtitles permanent by overlaying them onto the video track."; ObjectID = "zpm-9Z-Hsq"; */
+"zpm-9Z-Hsq.ibShadowedToolTip" = "烧入。将所选字幕通过叠加到视频轨道上而成为永久字幕。";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/SubtitlesDefaults.strings Added

@@ -0,0 +1,87 @@
+/* Class = "NSButtonCell"; title = "Add Closed Captions when available"; ObjectID = "66v-2g-DHn"; */
+"66v-2g-DHn.title" = "可用时添加隐藏式字幕";
+
+/* Class = "NSButtonCell"; title = "DVD Subtitles"; ObjectID = "69Q-xB-Vyq"; */
+"69Q-xB-Vyq.title" = "DVD 字幕";
+
+/* Class = "NSTextFieldCell"; title = "Burn-In Behavior:"; ObjectID = "640-NB-Uby"; */
+"640-NB-Uby.title" = "烧入行为：";
+
+/* Class = "NSScrollView"; ibExternalAccessibilityDescription = "Subtitles Track Languages"; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibExternalAccessibilityDescription" = "字幕轨语言";
+
+/* Class = "NSScrollView"; ibShadowedToolTip = "Select the languages to use with the Track Selection Behavior setting."; ObjectID = "aTC-39-h6S"; */
+"aTC-39-h6S.ibShadowedToolTip" = "选择要与“轨道选择行为”设置一起使用的语言。";
+
+/* Class = "NSButtonCell"; title = "Blu-ray Subtitles"; ObjectID = "bfV-9D-6dh"; */
+"bfV-9D-6dh.title" = "蓝光字幕";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected DVD subtitle track. All other DVD subtitle tracks will be discarded. Use this option if your playback software or device does not support DVD subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "ceZ-On-t5S"; */
+"ceZ-On-t5S.ibShadowedToolTip" = "烧入第一个选定的 DVD 字幕轨道。所有其他的 DVD 字幕轨道将被丢弃。如果你的播放软件或设备不支持 DVD 字幕，请使用此选项。\n\n只能烧入一个字幕轨道。";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio, then First Selected Track"; ObjectID = "d79-2j-fhc"; */
+"d79-2j-fhc.title" = "外语音频与字幕轨道";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "ego-rt-a64"; */
+"ego-rt-a64.title" = "取消";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "ej8-4k-1vd"; */
+"ej8-4k-1vd.title" = "无";
+
+/* Class = "NSTextFieldCell"; title = "Track Selection Behavior:"; ObjectID = "GbM-vm-RC2"; */
+"GbM-vm-RC2.title" = "轨道选择行为：";
+
+/* Class = "NSMenuItem"; title = "All Matching Selected Languages"; ObjectID = "GZP-q7-SYy"; */
+"GZP-q7-SYy.title" = "所有匹配的选定语言\n";
+
+/* Class = "NSButtonCell"; title = "OK"; ObjectID = "iLI-Nb-D7t"; */
+"iLI-Nb-D7t.title" = "确定";
+
+/* Class = "NSMenuItem"; title = "First Matching Selected Languages"; ObjectID = "jDd-Ji-7Sm"; */
+"jDd-Ji-7Sm.title" = "优先匹配已选语言";
+
+/* Class = "NSWindow"; title = "Subtitles Selection Behaviour"; ObjectID = "kwM-lz-5lG"; */
+"kwM-lz-5lG.title" = "选择字幕行为";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Kwy-lU-VuU"; */
+"Kwy-lU-VuU.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Burn-In Behavior. Select which subtitles to make permanent by overlaying them onto the video track.\n\nOnly one subtitles track can be burned in."; ObjectID = "Lsa-kB-2BP"; */
+"Lsa-kB-2BP.ibShadowedToolTip" = "烧入行为。选择哪些字幕通过叠加到视频轨道上而成为永久字幕。\n\n只能烧入一个字幕轨道。";
+
+/* Class = "NSTextFieldCell"; title = "Languages:"; ObjectID = "mAT-Jp-SG1"; */
+"mAT-Jp-SG1.title" = "语言：";
+
+/* Class = "NSMenuItem"; title = "First Selected Track"; ObjectID = "mnl-P8-dtK"; */
+"mnl-P8-dtK.title" = "首个已选轨道";
+
+/* Class = "NSMenuItem"; title = "None"; ObjectID = "mvw-Hg-JFM"; */
+"mvw-Hg-JFM.title" = "无";
+
+/* Class = "NSTextFieldCell"; title = "Only one subtitles burn-in option will be applied, starting with the first (top)."; ObjectID = "N4s-K9-RwM"; */
+"N4s-K9-RwM.title" = "只有一个字幕烧入选项将被应用，从第一个（顶部）开始。";
+
+/* Class = "NSTextFieldCell"; title = "Options:"; ObjectID = "NJl-q3-zXL"; */
+"NJl-q3-zXL.title" = "选项：";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Track Selection Behavior.\n\nNone will not select any audio tracks by default.\n\nFirst Matching Selected Languages adds the first audio track matching each of the selected languages present in the source.\n\nAll Matching Selected Languages adds all audio tracks matching each of the selected languages present in the source."; ObjectID = "oiD-QI-wly"; */
+"oiD-QI-wly.ibShadowedToolTip" = "轨道选择行为。\n\n默认情况下，没有人会选择任何音轨。\n\n第一个匹配的选择语言添加了与源中存在的每个选择的语言匹配的第一个音频轨道。\n\n所有匹配的选定语言都添加了匹配源中所选语言的所有音轨。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Foreign Audio Search scans the source for short sequences of foreign or alien audio that are displayed by default."; ObjectID = "OOC-GZ-OFA"; */
+"OOC-GZ-OFA.ibShadowedToolTip" = "外语音频搜索扫描源中默认显示的外语或外语音频的短序列。";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Burn in the first selected Blu-ray subtitle track. All other Blu-ray subtitle tracks will be discarded. Use this option if your playback software or device does not support Blu-ray subtitles.\n\nOnly one subtitles track can be burned in."; ObjectID = "Px8-G6-NVX"; */
+"Px8-G6-NVX.ibShadowedToolTip" = "烧入第一个选定的蓝光字幕轨道。所有其他蓝光字幕轨道将被丢弃。如果您的播放软件或设备不支持蓝光字幕，请使用此选项。\n\n只能烧入一个字幕轨道。";
+
+/* Class = "NSMenuItem"; title = "Foreign Audio Subtitles Track"; ObjectID = "QRd-XH-6TH"; */
+"QRd-XH-6TH.title" = "外语音频字幕轨道";
+
+/* Class = "NSTextFieldCell"; title = "Table View Cell"; ObjectID = "qVQ-fS-w1S"; */
+"qVQ-fS-w1S.title" = "表视图单元格";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Add Closed Caption subtitles as a soft subtitle track (not burned-in)."; ObjectID = "uF5-6E-EIe"; */
+"uF5-6E-EIe.ibShadowedToolTip" = "添加“隐藏式字幕”作为软字幕轨道（非烧入）。";
+
+/* Class = "NSButtonCell"; title = "Add Foreign Audio Search"; ObjectID = "vNY-OC-hTJ"; */
+"vNY-OC-hTJ.title" = "添加外语音频搜索";
+

HandBrake-1.5.1.tar.xz/macosx/zh.lproj/Video.strings Added

@@ -0,0 +1,123 @@
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "4Hq-BG-Ulb"; */
+"4Hq-BG-Ulb.ibShadowedIsNilPlaceholder" = "自动";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "6Cs-jo-8Q6"; */
+"6Cs-jo-8Q6.title" = "其他视图";
+
+/* Class = "NSButtonCell"; title = "Constant Framerate"; ObjectID = "6Dd-IP-Pwt"; */
+"6Dd-IP-Pwt.title" = "恒定帧率";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder level. Sets and ensures compliance with the specified video compression standard level. Overrides all other settings."; ObjectID = "8CM-4G-oId"; */
+"8CM-4G-oId.ibShadowedToolTip" = "视频编码器级别。设置并确保符合指定的视频压缩标准级别。覆盖所有其他设置。";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Framerate (Frames Per Second). Number of pictures displayed during each second of video."; ObjectID = "9tc-EO-QMd"; */
+"9tc-EO-QMd.ibShadowedToolTip" = "帧率（每秒帧数）。在每秒钟的视频中显示的画面数量。";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Average Bitrate varies quality to ensure the data rate remains relatively consistent throughout the video."; ObjectID = "A3o-Zx-OfM"; */
+"A3o-Zx-OfM.ibShadowedToolTip" = "平均比特率会改变质量，以确保整个视频的数据率保持相对一致。";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Aes-nP-7qS"; */
+"Aes-nP-7qS.title" = "其他视图";
+
+/* Class = "NSButton"; ibShadowedToolTip = "2-pass encoding analyzes the entire source video before encoding. The information gathered enables the encoder to make more informed decisions about quality and data rate in Average Bitrate mode."; ObjectID = "bnV-aE-FVh"; */
+"bnV-aE-FVh.ibShadowedToolTip" = "2 次编码在编码前对整个源视频进行分析。收集到的信息使编码器能够在平均比特率模式下对质量和数据速率做出更明智的决定。";
+
+/* Class = "NSTextFieldCell"; title = "0"; ObjectID = "bvD-W7-O0N"; */
+"bvD-W7-O0N.title" = "0";
+
+/* Class = "NSTextFieldCell"; title = "Unparse:"; ObjectID = "CLk-dp-1b7"; */
+"CLk-dp-1b7.title" = "未解析：";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "cRF-pz-1jt"; */
+"cRF-pz-1jt.title" = "编码选项：";
+
+/* Class = "CocoaBindingsConnection"; ibShadowedIsNilPlaceholder = "auto"; ObjectID = "CRz-On-Jen"; */
+"CRz-On-Jen.ibShadowedIsNilPlaceholder" = "自动";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder tune. Further adjusts encoder preset to optimize settings for specific scenarios."; ObjectID = "cXd-X7-OhB"; */
+"cXd-X7-OhB.ibShadowedToolTip" = "视频编码器调优。进一步调整编码器预设以针对特定场景设置优化。";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Displays all internal video encoder options."; ObjectID = "dwn-bf-Ua0"; */
+"dwn-bf-Ua0.ibShadowedToolTip" = "显示所有内部视频编码器选项。";
+
+/* Class = "NSButtonCell"; title = "Fast Decode"; ObjectID = "EcY-w1-bc8"; */
+"EcY-w1-bc8.title" = "快速解码";
+
+/* Class = "NSTextFieldCell"; title = "Quality:"; ObjectID = "F3s-qR-qeE"; */
+"F3s-qR-qeE.title" = "质量：";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Video encoder preset. Adjusts encoder settings to balance compression efficiency and encoding speed. Slower encoder presets may use settings that are less compatible with certain devices."; ObjectID = "fue-2d-Bjn"; */
+"fue-2d-Bjn.ibShadowedToolTip" = "视频编码器预设。调整编码器设置以平衡压缩效率和编码速度。较慢的编码器预设可能使用与某些设备不太兼容的设置。";
+
+/* Class = "NSTextFieldCell"; title = "Tune:"; ObjectID = "fzT-im-zKN"; */
+"fzT-im-zKN.title" = "调优：";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar"; ObjectID = "gEp-lv-YUY"; */
+"gEp-lv-YUY.ibShadowedToolTip" = "额外的视频编码器选项。仅供高级使用。\n\n语法：option-1=foo:opt2=bar";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "gIJ-Xs-uVF"; */
+"gIJ-Xs-uVF.title" = "其他视图";
+
+/* Class = "NSSlider"; ibShadowedToolTip = "Constant Quality varies bitrate to ensure visual quality remains relatively consistent throughout the video.\n\nAdjust the quality slider to the right to increase quality or to the left to decrease quality, in small increments of plus or minus 1-2.\n\nRecommended values for the x264 and x265 encoders are RF 18-28. Higher quality settings may produce extremely large files.\n\nx264 is lossless at RF 0."; ObjectID = "GPu-Ht-bKg"; */
+"GPu-Ht-bKg.ibShadowedToolTip" = "恒定质量会改变比特率，以确保整个视频的视觉质量保持相对一致。\n\n将质量滑块向右调整以提高质量，或向左调整以降低质量，以正负 1-2 的小幅度递增。\n\nx264 和 x265 编码器的推荐值是 RF 18-28。更高的质量设置可能会产生非常大的文件。\n\nx264 在 RF 0 时是无损的。";
+
+/* Class = "NSTextFieldCell"; title = "Profile:"; ObjectID = "Hho-GY-qOR"; */
+"Hho-GY-qOR.title" = "配置文件：";
+
+/* Class = "NSTextFieldCell"; title = "Additional Options:"; ObjectID = "ja7-Zr-y1P"; */
+"ja7-Zr-y1P.title" = "附加选项：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "Jj0-Qw-HF8"; */
+"Jj0-Qw-HF8.title" = "其他视图";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder profile. Sets and ensures compliance with the specified video compression standard profile. Overrides all other settings."; ObjectID = "kh8-d2-hSD"; */
+"kh8-d2-hSD.ibShadowedToolTip" = "视频编码器配置文件。设置并确保符合指定的视频压缩标准配置文件。覆盖所有其他设置。";
+
+/* Class = "NSTextFieldCell"; title = "Encoder Options:"; ObjectID = "kPs-u2-fDn"; */
+"kPs-u2-fDn.title" = "编码器选项：";
+
+/* Class = "NSTextFieldCell"; title = "Video Encoder:"; ObjectID = "Mrb-6Q-0YM"; */
+"Mrb-6Q-0YM.title" = "视频编码器：";
+
+/* Class = "NSButtonCell"; title = "2-pass encoding"; ObjectID = "nPA-nO-Eik"; */
+"nPA-nO-Eik.title" = "2-次编码";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Turbo first pass speeds up the first pass of a 2-pass encode for a slight penalty to analysis."; ObjectID = "olm-zg-k9Y"; */
+"olm-zg-k9Y.ibShadowedToolTip" = "加速第一次加速了二次编码的第一步，但对分析有轻微影响。";
+
+/* Class = "NSTextFieldCell"; title = "Preset:"; ObjectID = "QWu-rv-zfM"; */
+"QWu-rv-zfM.title" = "预设：";
+
+/* Class = "NSTextField"; ibShadowedToolTip = "Additional video encoder options. For advanced use only.\n\nSyntax: option-1=foo:opt2=bar,baz"; ObjectID = "rbo-w6-ENd"; */
+"rbo-w6-ENd.ibShadowedToolTip" = "额外的视频编码器选项。仅供高级使用。\n\n语法：option-1=foo:opt2=bar,baz";
+
+/* Class = "NSTextFieldCell"; title = "RF:"; ObjectID = "rRB-9F-pHn"; */
+"rRB-9F-pHn.title" = "RF：";
+
+/* Class = "NSMenu"; title = "OtherViews"; ObjectID = "rXn-NC-pEv"; */
+"rXn-NC-pEv.title" = "其他视图";
+
+/* Class = "NSTextFieldCell"; title = "Framerate (FPS):"; ObjectID = "SJc-tv-AMH"; */
+"SJc-tv-AMH.title" = "帧率（FPS）：";
+
+/* Class = "NSTextFieldCell"; title = "Level:"; ObjectID = "sTM-lk-DBC"; */
+"sTM-lk-DBC.title" = "级别：";
+
+/* Class = "NSButton"; ibShadowedToolTip = "Fast Decode uses settings that reduce CPU usage during playback of the encoded video. Useful for devices that struggle to play video without stuttering."; ObjectID = "stU-Fo-Avu"; */
+"stU-Fo-Avu.ibShadowedToolTip" = "快速解码使用的设置可以减少在播放编码视频时 CPU 的占用。这对那些播放视频会出现卡顿的设备很有用。";
+
+/* Class = "NSButtonCell"; title = "Average Bitrate (kbps):"; ObjectID = "VQe-CK-YDR"; */
+"VQe-CK-YDR.title" = "平均比特率（kbps）：";
+
+/* Class = "NSButtonCell"; title = "Turbo first pass"; ObjectID = "vSc-VB-NEv"; */
+"vSc-VB-NEv.title" = "加速第一遍编码";
+
+/* Class = "NSPopUpButton"; ibShadowedToolTip = "Video encoder. Determines video type and settings used during encoding."; ObjectID = "xwK-Yu-a1e"; */
+"xwK-Yu-a1e.ibShadowedToolTip" = "视频编码器。决定编码期间所使用的视频类型和设置。";
+
+/* Class = "NSButtonCell"; title = "Constant Quality"; ObjectID = "ZjL-cY-O5f"; */
+"ZjL-cY-O5f.title" = "恒定质量";
+
+/* Class = "NSButtonCell"; title = "Variable Framerate"; ObjectID = "zZo-75-1WG"; */
+"zZo-75-1WG.title" = "可变帧率";
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/config.guess -> HandBrake-1.5.1.tar.xz/make/config.guess Changed

@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright 1992-2019 Free Software Foundation, Inc.
+# Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-06-10'
+timestamp='2020-07-12'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -99,6 +99,8 @@
 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
+ # prevent multiple calls if $tmp is already set
+ test "$tmp" && return 0
 : "${TMPDIR=/tmp}"
 # shellcheck disable=SC2039
 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -274,12 +276,15 @@
 *:Sortix:*:*)
 	echo "$UNAME_MACHINE"-unknown-sortix
 	exit ;;
+ *:Twizzler:*:*)
+	echo "$UNAME_MACHINE"-unknown-twizzler
+	exit ;;
 *:Redox:*:*)
 	echo "$UNAME_MACHINE"-unknown-redox
 	exit ;;
 mips:OSF1:*.*)
- echo mips-dec-osf1
- exit ;;
+	echo mips-dec-osf1
+	exit ;;
 alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
 	*4.0)
@@ -921,7 +926,7 @@
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
 	exit ;;
 alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' /proc/cpuinfo 2>/dev/null` in
 	 EV5) UNAME_MACHINE=alphaev5 ;;
 	 EV56) UNAME_MACHINE=alphaev56 ;;
 	 PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -1090,7 +1095,17 @@
 	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
 	exit ;;
 x86_64:Linux:*:*)
-	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
+	set_cc_for_build
+	LIBCABI=$LIBC
+	if "$CC_FOR_BUILD" != no_compiler_found ; then
+	 if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_X32 >/dev/null
+	 then
+		LIBCABI="$LIBC"x32
+	 fi
+	fi
+	echo "$UNAME_MACHINE"-pc-linux-"$LIBCABI"
 	exit ;;
 xtensa*:Linux:*:*)
 	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1327,6 +1342,9 @@
 *:Rhapsody:*:*)
 	echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
 	exit ;;
+ arm64:Darwin:*:*)
+	echo aarch64-apple-darwin"$UNAME_RELEASE"
+	exit ;;
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p`
 	case $UNAME_PROCESSOR in
@@ -1624,6 +1642,12 @@
 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
 https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+EOF
+
+year=`echo $timestamp | sed 's,-.*,,'`
+# shellcheck disable=SC2003
+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
+ cat >&2 <<EOF
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to config-patches@gnu.org to
@@ -1651,6 +1675,7 @@
 UNAME_SYSTEM = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/configure.py -> HandBrake-1.5.1.tar.xz/make/configure.py Changed

@@ -528,6 +528,12 @@
 self.release = self3
 self.extra = self4
 
+ ## special mapping for Apple Silicon
+ ## config.guess returns aarch64, we need arm64
+ if self.vendor == 'apple' and self.system == 'darwin':
+ if self.machine == 'aarch64':
+ self0 = self.machine = 'arm64'
+
 ## nice formal name for 'system'
 self.systemf = platform.system()
 
@@ -544,15 +550,26 @@
 ###############################################################################
 
 class HostTupleAction( Action, list ):
- def __init__( self, cross=None ):
+ def __init__( self, cross=None, arch_gcc=None, xcode_opts=None ):
 super( HostTupleAction, self ).__init__( 'compute', 'host tuple', abort=True )
 # Initialize, but allow to be reset by options
- self.setHost(cross)
+ self.setHost(cross, arch_gcc, xcode_opts)
 
- def setHost( self, cross ):
+ def setHost( self, cross=None, arch_gcc=None, xcode_opts=None ):
 ## check if --cross spec was used; must maintain 5-tuple compatibility with regex
+
+ ## special mapping for Apple Silicon
+ ## config.guess returns aarch64, we need arm64
+ if build_tuple.vendor == 'apple' and build_tuple.system == 'darwin':
+ if build_tuple.spec.startswith('aarch64'):
+ build_tuple.spec = 'arm64' + build_tuple.spec.lstrip('aarch64')
+
 if cross is not None:
 self.spec = os.path.basename( cross ).rstrip( '-' )
+ elif arch_gcc is not None:
+ self.spec = arch_gcc + build_tuple.spec.lstrip(build_tuple.machine)
+ elif xcode_opts is not None and xcode_opts'config' is not None and not xcode_opts'disabled':
+ self.spec = xcode_opts'config'.split(".")-1 + build_tuple.spec.lstrip(build_tuple.machine)
 else:
 self.spec = build_tuple.spec
 
@@ -595,9 +612,9 @@
 
 def _action( self ):
 try:
- self.setHost(options.cross)
+ self.setHost(options.cross,arch_gcc,xcode_opts)
 except NameError:
- self.setHost(None)
+ self.setHost()
 
 ## glob-match against spec
 def match( self, *specs ):
@@ -674,7 +691,8 @@
 elif host_tuple.match( '*-*-mingw*' ):
 pass
 elif host_tuple.match( '*-*-darwin*' ):
- self.mode'x86_64' = 'x86_64-apple-darwin%s' % (host_tuple.release)
+ self.mode'arm64' = 'arm64-apple-darwin%s' % (host_tuple.release)
+ self.mode'x86_64' = 'x86_64-apple-darwin%s' % (host_tuple.release)
 elif host_tuple.match( '*-*-linux*' ):
 pass
 elif host_tuple.match( '*-*-solaris*' ):
@@ -863,7 +881,11 @@
 
 elif name == 'HASH':
 self.hash = value
- self.shorthash = value:7
+ elif name == 'SHORTHASH':
+ if value != '':
+ self.shorthash = value
+ else:
+ self.shorthash = self.hash
 
 # type-classification via repository URL
 if self.url == project.url_repo_ssh:
@@ -1088,8 +1110,9 @@
 self.rexprs.insert(0,rexpr)
 
 def _action( self ):
- ## pipe and redirect stderr to stdout; effects communicate result
- pipe = subprocess.Popen( self.command, stdout=subprocess.PIPE, stderr=subprocess.STDOUT )
+ with open(os.devnull, 'w') as devnull:
+ ## pipe and redirect stderr to dev/null; effects communicate result
+ pipe = subprocess.Popen( self.command, stdout=subprocess.PIPE, stderr=devnull )
 
 ## read data into memory buffers
 data = pipe.communicate()
@@ -1353,9 +1376,12 @@
 
 ## add security options
 grp = cli.add_argument_group( 'Security Options' )
- grp.add_argument( '--harden', dest="enable_harden", default=False, action='store_true', help='harden app to protect against buffer overflows' )
- h = IfHost( 'sandbox app to limit host system access (macOS only)', '*-*-darwin*', none=argparse.SUPPRESS).value
- grp.add_argument( '--sandbox', dest="enable_sandbox", default=False, action='store_true', help=(( '%s' %h ) if h != argparse.SUPPRESS else h) )
+ h = IfHost( 'hardening to protect against buffer overflows', '*-*-*', none=argparse.SUPPRESS).value
+ grp.add_argument( '--harden', dest="enable_harden", default=True, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ grp.add_argument( '--no-harden', dest="enable_harden", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
+ h = IfHost( 'sandboxing to limit host system access (macOS only)', '*-*-darwin*', none=argparse.SUPPRESS).value
+ grp.add_argument( '--sandbox', dest="enable_sandbox", default=True, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ grp.add_argument( '--no-sandbox', dest="enable_sandbox", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
 cli.add_argument_group( grp )
 
 ## add Xcode options
@@ -1409,16 +1435,20 @@
 grp.add_argument( '--enable-ffmpeg-aac', dest="enable_ffmpeg_aac", default=not host_tuple.match( '*-*-darwin*' ), action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
 grp.add_argument( '--disable-ffmpeg-aac', dest="enable_ffmpeg_aac", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
 
- h = IfHost( 'Nvidia NVENC video encoder', '*-*-linux*', '*-*-mingw*', none=argparse.SUPPRESS).value
- grp.add_argument( '--enable-nvenc', dest="enable_nvenc", default=IfHost( True, '*-*-linux*', '*-*-mingw*', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ h = IfHost( 'MediaFoundation video encoder', 'aarch64-w64-mingw32', none=argparse.SUPPRESS).value
+ grp.add_argument( '--enable-mf', dest="enable_mf", default=False, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ grp.add_argument( '--disable-mf', dest="enable_mf", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
+
+ h = IfHost( 'Nvidia NVENC video encoder', '*-*-linux*', 'x86_64-w64-mingw32', none=argparse.SUPPRESS).value
+ grp.add_argument( '--enable-nvenc', dest="enable_nvenc", default=IfHost( True, '*-*-linux*', 'x86_64-w64-mingw32', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
 grp.add_argument( '--disable-nvenc', dest="enable_nvenc", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
 
- h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-freebsd*', '*-*-mingw*', none=argparse.SUPPRESS).value
- grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "*-*-mingw*", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ h = IfHost( 'Intel QSV video encoder/decoder', '*-*-linux*', '*-*-freebsd*', 'x86_64-w64-mingw32', none=argparse.SUPPRESS).value
+ grp.add_argument( '--enable-qsv', dest="enable_qsv", default=IfHost(True, "x86_64-w64-mingw32", none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
 grp.add_argument( '--disable-qsv', dest="enable_qsv", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
 
- h = IfHost( 'AMD VCE video encoder', '*-*-linux*', '*-*-mingw*', none=argparse.SUPPRESS).value
- grp.add_argument( '--enable-vce', dest="enable_vce", default=IfHost(True, '*-*-mingw*', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
+ h = IfHost( 'AMD VCE video encoder', '*-*-linux*', 'x86_64-w64-mingw32', none=argparse.SUPPRESS).value
+ grp.add_argument( '--enable-vce', dest="enable_vce", default=IfHost(True, 'x86_64-w64-mingw32', none=False).value, action='store_true', help=(( 'enable %s' %h ) if h != argparse.SUPPRESS else h) )
 grp.add_argument( '--disable-vce', dest="enable_vce", action='store_false', help=(( 'disable %s' %h ) if h != argparse.SUPPRESS else h) )
 
 cli.add_argument_group( grp )
@@ -1561,20 +1591,38 @@
 project = Project()
 
 # options is created by parse_known_args(), which is called directly after
- # createCLI(). we need cross info earlier and cannot parse args twice, so
- # extract the info we need here
- cross = None
+ # createCLI(). we need some options info earlier and cannot parse args
+ # twice, so extract the info we need here from sys.argv
+ arch_gcc = None
+ cross = None
+ xcode_opts = { 'disabled': False, 'config': None }
 for i in range(len(sys.argv)):
- cross_pattern = re.compile( '^--cross=(.+)$' )
- m = cross_pattern.match( sys.argvi )
- if m:
+ if re.compile( '^--arch=(.+)$' ).match( sys.argvi ):
+ arch_gcc = sys.argvi7:
+ continue
+ elif re.compile( '^--arch$' ).match( sys.argvi ) and ((i + 1) < len(sys.argv)):
+ arch_gcc = sys.argvi+1
+ arch_gcc = None if arch_gcc == '' else arch_gcc
+ i = i + 1
+ continue
+ elif re.compile( '^--cross=(.+)$' ).match( sys.argvi ):
 cross = sys.argvi8:
 continue
- cross_pattern = re.compile( '^--cross$' )
- m = cross_pattern.match( sys.argvi )
- if m and ((i + 1) < len(sys.argv)):
+ elif re.compile( '^--cross$' ).match( sys.argvi ) and ((i + 1) < len(sys.argv)):
 cross = sys.argvi+1
 cross = None if cross == '' else cross
+ i = i + 1
+ continue
+ elif re.compile( '^--xcode-config=(.+)$' ).match( sys.argvi ):
+ xcode_opts'config' = sys.argvi15:
+ continue
+ elif re.compile( '^--xcode-config$' ).match( sys.argvi ) and ((i + 1) < len(sys.argv)):
+ xcode_opts'config' = sys.argvi+1
+ xcode_opts'config' = None if xcode_opts'config' == '' else xcode_opts'config'
+ i = i + 1
+ continue
+ elif re.compile( '^--disable-xcode$' ).match( sys.argvi ):
+ xcode_opts'disabled' = True
 continue
 
 ## create tools in a scope
@@ -1602,16 +1650,16 @@
 else:
 gmake = ToolProbe( 'GMAKE.exe', 'make', 'gmake', 'make', abort=True )
 
- autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf', abort=True, minversion=2,69,0 )
- automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=1,15,0 )
+ autoconf = ToolProbe( 'AUTOCONF.exe', 'autoconf', 'autoconf', abort=True, minversion=(2,71,0 if build_tuple.match('*-*-darwin*') else 2,69,0) )
+ automake = ToolProbe( 'AUTOMAKE.exe', 'automake', 'automake', abort=True, minversion=1,13,0 )
 libtool = ToolProbe( 'LIBTOOL.exe', 'libtool', 'libtool', abort=True )
 lipo = ToolProbe( 'LIPO.exe', 'lipo', 'lipo', abort=False )
- pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=0,29,0 )
+ pkgconfig = ToolProbe( 'PKGCONFIG.exe', 'pkgconfig', 'pkg-config', abort=True, minversion=0,27,0 )
 meson = ToolProbe( 'MESON.exe', 'meson', 'meson', abort=True, minversion=0,47,0 )
 nasm = ToolProbe( 'NASM.exe', 'asm', 'nasm', abort=True, minversion=2,13,0 )
 ninja = ToolProbe( 'NINJA.exe', 'ninja', 'ninja-build', 'ninja', abort=True )
 
- xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (build_tuple.match('*-*-darwin*') and cross is None) else False), versionopt='-version', minversion=10,3,0 )
+ xcodebuild = ToolProbe( 'XCODEBUILD.exe', 'xcodebuild', 'xcodebuild', abort=(True if (not xcode_opts'disabled' and (build_tuple.match('*-*-darwin*') and cross is None)) else False), versionopt='-version', minversion=10,3,0 )
 
 ## run tool probes
 for tool in ToolProbe.tools:
@@ -1647,7 +1695,7 @@
 optimizeMode = SelectMode( 'optimize', ('none','none'), ('speed','speed'), ('size','size'), default='speed' )
 
 # run host tuple and arch actions
- host_tuple = HostTupleAction(cross)
+ host_tuple = HostTupleAction(cross,arch_gcc,xcode_opts)
 arch = ArchAction(); arch.run()
 
 # create CLI and parse
@@ -1682,28 +1730,25 @@
 # Allow GTK mingw only on mingw
 options.enable_gtk_mingw = IfHost(options.enable_gtk_mingw, '*-*-mingw*',
 none=False).value
- # Disable NVENC on unsupported platforms
- options.enable_nvenc = IfHost(options.enable_nvenc, '*-*-linux*',
- '*-*-mingw*', none=False).value
 # NUMA is linux only and only needed with x265
 options.enable_numa = (IfHost(options.enable_numa, '*-*-linux*',
 none=False).value
 and options.enable_x265)
- # Disable QSV on unsupported platforms
- options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*', '*-*-freebsd*',
- '*-*-mingw*', none=False).value
- # Disable VCE on unsupported platforms
- options.enable_vce = IfHost(options.enable_vce, '*-*-linux*', '*-*-mingw*',
+ # Only allow these features on supported platforms
+ options.enable_mf = IfHost(options.enable_mf, 'aarch64-w64-mingw32',
 none=False).value
+ options.enable_nvenc = IfHost(options.enable_nvenc, '*-*-linux*',
+ 'x86_64-w64-mingw32', none=False).value
+ options.enable_qsv = IfHost(options.enable_qsv, '*-*-linux*', '*-*-freebsd*',
+ 'x86_64-w64-mingw32', none=False).value
+ options.enable_vce = IfHost(options.enable_vce, '*-*-linux*',
+ 'x86_64-w64-mingw32', none=False).value
 
 #####################################
 ## Additional library and tool checks
 #####################################
- if options.flatpak or host_tuple.match('*-*-darwin*', '*-*-mingw'):
- # Requires Jansson which requires CMake 3.1.0 or later
- Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True, minversion=3,1,0)
- else:
- Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True, minversion=2,8,12)
+ # Requires oneVPL which requires CMake 3.16.3 or later
+ Tools.cmake = ToolProbe('CMAKE.exe', 'cmake', 'cmake', abort=True, minversion=3,16,3)
 Tools.cmake.__init__( Tools.cmake.var, Tools.cmake.option, Tools.cmake.name, **Tools.cmake.kwargs )
 Tools.cmake.run()
 for action in Action.actions:
@@ -1972,7 +2017,7 @@
 doc.add( 'HOST.extra', host_tuple.extra )
 doc.add( 'HOST.title', host_tuple.title )
 
- doc.add( 'HOST.cross', int(options.cross != None or arch.mode.mode != arch.mode.default) )
+ doc.add( 'HOST.cross', int(options.cross != None or arch.mode.mode != arch.mode.default or build_tuple.machine != host_tuple.machine) )
 if options.cross:
 doc.add( 'HOST.cross.prefix', '%s-' % (options.cross) )
 else:
@@ -2002,6 +2047,7 @@
 doc.add( 'FEATURE.gtk.mingw', int( options.enable_gtk_mingw ))
 doc.add( 'FEATURE.gtk.update.checks', int( not options.disable_gtk_update_checks ))
 doc.add( 'FEATURE.gst', int( not options.disable_gst ))
+ doc.add( 'FEATURE.mf', int( options.enable_mf ))
 doc.add( 'FEATURE.nvenc', int( options.enable_nvenc ))
 doc.add( 'FEATURE.qsv', int( options.enable_qsv ))
 doc.add( 'FEATURE.vce', int( options.enable_vce ))
@@ -2025,7 +2071,7 @@
 doc.addBlank()
 if not dlfcn.fail:
 doc.add( 'HAS.dlfcn', 1 )
- elif not pthread.fail:
+ if not pthread.fail:
 doc.add( 'HAS.pthread', 1 )
 if not bz2.fail:
 doc.add( 'HAS.bz2', 1 )
@@ -2120,19 +2166,21 @@
 stdout.write( 'Build system: %s\n' % build_tuple.spec.rstrip('-') )
 stdout.write( 'Host system: %s\n' % host_tuple.spec.rstrip('-') )
 stdout.write( 'Target platform: %s' % host_tuple.system )
- stdout.write( ' (cross-compile)\n' ) if options.cross else stdout.write( '\n' )
+ stdout.write( ' (cross-compile)\n' ) if options.cross or build_tuple.machine != host_tuple.machine else stdout.write( '\n' )
 stdout.write( 'Harden: %s\n' % options.enable_harden )
 stdout.write( 'Sandbox: %s' % options.enable_sandbox )
 stdout.write( ' (%s)\n' % note_unsupported ) if not host_tuple.system == 'darwin' else stdout.write( '\n' )
 stdout.write( 'Enable FDK-AAC: %s\n' % options.enable_fdk_aac )
 stdout.write( 'Enable FFmpeg AAC: %s' % options.enable_ffmpeg_aac )
 stdout.write( ' (%s)\n' % note_required ) if host_tuple.system != 'darwin' else stdout.write( '\n' )
+ stdout.write( 'Enable MediaFound.: %s' % options.enable_mf )
+ stdout.write( ' (%s)\n' % note_unsupported ) if not host_tuple.match( 'aarch64-w64-mingw32' ) else stdout.write( '\n' )
 stdout.write( 'Enable NVENC: %s' % options.enable_nvenc )
- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
+ stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.match( 'x86_64-w64-mingw32' )) else stdout.write( '\n' )
 stdout.write( 'Enable QSV: %s' % options.enable_qsv )
- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'freebsd' or host_tuple.system == 'mingw') else stdout.write( '\n' )
+ stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.match( 'x86_64-w64-mingw32' ) or host_tuple.system == 'freebsd') else stdout.write( '\n' )
 stdout.write( 'Enable VCE: %s' % options.enable_vce )
- stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.system == 'mingw') else stdout.write( '\n' )
+ stdout.write( ' (%s)\n' % note_unsupported ) if not (host_tuple.system == 'linux' or host_tuple.match( 'x86_64-w64-mingw32' )) else stdout.write( '\n' )
 
 if options.launch:
 stdout.write( '%s\n' % ('-' * 79) )

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/include/contrib.defs -> HandBrake-1.5.1.tar.xz/make/include/contrib.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/include/main.defs -> HandBrake-1.5.1.tar.xz/make/include/main.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/include/main.rules -> HandBrake-1.5.1.tar.xz/make/include/main.rules Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/variant/darwin.defs -> HandBrake-1.5.1.tar.xz/make/variant/darwin.defs Changed

@@ -1,38 +0,0 @@
-UB.xcconfigs = osx1011.x86_64
-UB.builds    = $(wildcard $(foreach n,$(UB.xcconfigs),$(SRC/)build.$n))
-UB.first     = $(word 1,$(UB.xcconfigs))
-UB.more      = $(wordlist 2,999,$(UB.xcconfigs))
-UB.products/ = macosx/release/
-
-UB.BUILD = $(SRC/)configure --force --build=ub.$(1) --xcconfig=$(1) --launch --launch-quiet
-
-## linefeed is important
-define UB.BUILD.item
-	$(call UB.BUILD,$(1)) --launch-jobs=0
-
-endef
-
-define UB.BUILD.SERIAL
-	$(foreach n,$(UB.xcconfigs),$(call UB.BUILD.item,$n))
-endef
-
-define UB.BUILD.PARALLEL
-	$(call UB.BUILD,$(1)) >/dev/null 2>&1
-endef
-
-define UB.COMBINE
-	$(RM.exe) -fr ub.combine
-	$(MKDIR.exe) -p ub.combine
-	$(CP.exe) ub.$(UB.first)/$(UB.products/)HandBrakeCLI ub.combine/.
-	$(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)HandBrakeCLI) -create -output ub.combine/HandBrakeCLI
-	$(CP.exe) -R ub.$(UB.first)/$(UB.products/)HandBrake.app ub.combine/.
-	$(LIPO.exe) $(foreach n,$(UB.xcconfigs),ub.$n/$(UB.products/)$(1)) -create -output ub.combine/$(1)
-	@lipo -info ub.combine/$(1)
-	@sync
-	@echo ""
-	@echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrakeCLI"
-	@echo "$@: UB executable size: `du -sh ub.combine/HandBrakeCLI | awk '{ print $$1 }'`"
-	@echo ""
-	@echo "$@: { $(UB.xcconfigs) } combined -> ub.combine/HandBrake.app"
-	@echo "$@: UB executable size: `du -sh ub.combine/$(1) | awk '{ print $$1 }'`"
-endef

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/variant/netbsd.defs -> HandBrake-1.5.1.tar.xz/make/variant/netbsd.defs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/make/xcodemake -> HandBrake-1.5.1.tar.xz/make/xcodemake Changed

HandBrake-1.5.1.tar.xz/pkg/linux/debian/control.focal Added

@@ -0,0 +1,30 @@
+Source: handbrake
+Section: graphics
+Priority: optional
+Maintainer: John Stebbins <jstebbins.hb@gmail.com>
+Build-Depends: meson, ninja-build, debhelper (>= 6), autotools-dev, libtool, libtool-bin, libgudev-1.0-dev, intltool, autoconf, nasm (>= 2.13), cmake, libbz2-dev, zlib1g-dev, libgtk-3-dev, libnotify-dev, libgstreamer1.0-dev, libgstreamer-plugins-base1.0-dev, python (>= 2.6), libfribidi-dev (>= 0.19.0), libxml2-dev, libogg-dev, libtheora-dev, libvorbis-dev, libopus-dev, libsamplerate0-dev, libfreetype6-dev, libfontconfig1-dev, libass-dev, libmp3lame-dev, libx264-dev, libjansson-dev, libspeex-dev, liblzma-dev, libvpx-dev, libva-dev, libdrm-dev, libnuma-dev
+Standards-Version: 3.8.4
+Homepage: http://www.handbrake.fr/
+
+Package: handbrake-cli
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - command line
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the command-line variant,
+ HandBrakeCLI
+
+Package: handbrake-gtk
+Architecture: amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, gstreamer1.0-libav, gstreamer1.0-plugins-base, gstreamer1.0-plugins-good, gstreamer1.0-plugins-bad, gstreamer1.0-plugins-ugly, gstreamer1.0-pulseaudio
+Conflicts: handbrake
+Description: versatile DVD ripper and video transcoder - GTK GUI
+ HandBrake is a versatile, easy-to-use tool for converting DVDs and other videos
+ into H.264, MPEG-4, or OGG formatted media. It's particularly useful for making
+ videos that are compatible with portable video devices such as the Apple
+ iPod/iPhone. This package contains the graphical variant, ghb.
+
+

HandBrake-1.5.1.tar.xz/pkg/linux/debian/rules.focal Added

@@ -0,0 +1,85 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+PKGDESTDIR   = ../
+CONFIGURE    = ./configure
+BUILDDIR     = build
+FORCEVERSION = 
+
+$(BUILDDIR)/GNUmakefile: $(CONFIGURE)
+	dh_testdir
+	unset CFLAGS; unset CPPLAGS; unset CXXLAGS; $(CONFIGURE) --disable-gtk-update-checks --prefix=/usr --enable-qsv
+
+build:  $(BUILDDIR)/GNUmakefile
+	dh_testdir
+	#We must build both the main project and the GTK project
+	unset CFLAGS ; unset CPPLAGS ; unset CXXLAGS; $(MAKE) -C $(BUILDDIR)
+
+clean: 
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_installdirs
+	$(MAKE) -C $(BUILDDIR) DESTDIR=$(CURDIR)/debian/tmp install
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
+	dh_install --sourcedir=debian/tmp -i
+	dh_icons -i
+	dh_link -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i $(FORCEVERSION)
+	dh_md5sums -i
+	dh_builddeb --destdir=$(PKGDESTDIR) -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp -a
+	dh_installchangelogs -a
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_installman -a
+	dh_link -a
+	dh_icons -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a $(FORCEVERSION)
+	dh_md5sums -a
+	dh_builddeb -a --destdir=$(PKGDESTDIR) -- -Zxz
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json -> HandBrake-1.5.1.tar.xz/pkg/linux/flatpak/fr.handbrake.HandBrakeCLI.json Changed

@@ -1,7 +1,7 @@
 {
     "app-id": "fr.handbrake.HandBrakeCLI",
     "runtime": "org.freedesktop.Platform",
-    "runtime-version": "19.08",
+    "runtime-version": "21.08",
     "sdk": "org.freedesktop.Sdk",
     "command": "HandBrakeCLI",
     "finish-args": 
@@ -9,17 +9,17 @@
     ,
     "modules": 
         {
-            "name": "numactl",
+            "name": "numactl-cli",
             "sources": 
                 {
                     "type": "archive",
-                    "url": "https://github.com/numactl/numactl/releases/download/v2.0.12/numactl-2.0.12.tar.gz",
-                    "sha256": "55bbda363f5b32abd057b6fbb4551dd71323f5dbb66335ba758ba93de2ada729"
+                    "url": "https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz",
+                    "sha256": "991e254b867eb5951a44d2ae0bf1996a8ef0209e026911ef6c3ef4caf6f58c9a"
                 }
             
         },
         {
-            "name": "libass",
+            "name": "libass-cli",
             "config-opts": "--enable-asm", "--enable-harfbuzz",
                             "--enable-fontconfig",
             "sources": 
@@ -31,7 +31,7 @@
             
         },
         {
-            "name": "handbrake",
+            "name": "handbrake-cli",
             "no-autogen": true,
             "config-opts": "--flatpak", "--disable-gtk",
             "builddir": true,

HandBrake-1.5.1.tar.xz/pkg/linux/flatpak/fr.handbrake.ghb.Plugin.IntelMediaSDK.json Added

@@ -0,0 +1,119 @@
+{
+    "app-id": "fr.handbrake.ghb.Plugin.IntelMediaSDK",
+    "branch": "1",
+    "runtime": "fr.handbrake.ghb",
+    "runtime-version": "development",
+    "sdk": "org.gnome.Sdk//41",
+    "build-extension": true,
+    "separate-locales": false,
+    "appstream-compose": false,
+    "modules": 
+        {
+            "name": "intel-gmmlib",
+            "sources": 
+                {
+                    "type": "archive",
+                    "url": "https://github.com/intel/gmmlib/archive/refs/tags/intel-gmmlib-21.3.1.tar.gz",
+                    "sha256": "d26a6512a1b3ca604dabe035ddaf47b4b445bd503eac69a59e4acb2d1f54634b"
+                }
+            ,
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": 
+                "-DCMAKE_BUILD_TYPE=Release"
+            ,
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK",
+                "make-args": 
+                    "-v"
+                ,
+                "make-install-args": 
+                    "-v"
+                
+            }
+        },
+        {
+            "name": "libva",
+            "sources": 
+                {
+                    "type": "archive",
+                    "url": "https://github.com/intel/libva/releases/download/2.13.0/libva-2.13.0.tar.bz2",
+                    "sha256": "fad383f39f36115814bd0eda1496a4cc01761643bd962635400df2d4470ad460"
+                }
+            ,
+            "no-autogen": true,
+            "config-opts": "--with-drivers-path=/app/extensions/IntelMediaSDK/lib/dri",
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK"
+            }
+        },
+        {
+            "name": "libva-utils",
+            "sources": 
+                {
+                    "type": "archive",
+                    "url": "https://github.com/intel/libva-utils/releases/download/2.12.0/libva-utils-2.12.0.tar.bz2",
+                    "sha256": "bbe49e68fbdf379acc769e4c1680a76be3e2b48020ca320edafaf7235b62cc44"
+                }
+            ,
+            "no-autogen": true,
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK",
+                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
+            }
+        },
+        {
+            "name": "intel-media-driver",
+            "sources": 
+                {
+                    "type": "archive",
+                    "url": "https://github.com/intel/media-driver/archive/refs/tags/intel-media-21.3.4.tar.gz",
+                    "sha256": "4a8233c6a39d7ef7ccd22e43d3d3b890df71501844705783a6c364167a69cae2"
+                }
+            ,
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": 
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DMEDIA_RUN_TEST_SUITE=OFF"
+            ,
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK",
+                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
+            }
+        },
+        {
+            "name": "mediasdk",
+            "buildsystem": "cmake-ninja",
+            "builddir": true,
+            "config-opts": 
+                "-DCMAKE_BUILD_TYPE=Release",
+                "-DBUILD_SAMPLES=OFF",
+                "-DBUILD_TESTS=OFF",
+                "-DBUILD_TOOLS=OFF",
+                "-DBUILD_TESTS=OFF",
+                "-DMFX_ENABLE_SW_FALLBACK=OFF"
+            ,
+            "build-options": {
+                "prefix" : "/app/extensions/IntelMediaSDK",
+                "prepend-pkg-config-path": "/app/extensions/IntelMediaSDK/lib/pkgconfig"
+            },
+            "post-install": 
+                "install -Dp -m 644 ${FLATPAK_BUILDER_BUILDDIR}/fr.handbrake.ghb.Plugin.IntelMediaSDK.metainfo.xml --target-directory=${FLATPAK_DEST}/share/metainfo",
+                "appstream-compose --basename=fr.handbrake.ghb.Plugin.IntelMediaSDK --prefix=${FLATPAK_DEST} --origin=flatpak fr.handbrake.ghb.Plugin.IntelMediaSDK"
+            ,
+            "sources": 
+                {
+                    "type": "archive",
+                    "url": "https://github.com/Intel-Media-SDK/MediaSDK/archive/refs/tags/intel-mediasdk-21.3.5.tar.gz",
+                    "sha256": "3f13869298d3946d7d91e58846e274ef62cd5af2473f59f36b57b2c27ebfd87c"
+                },
+                {
+                    "type": "file",
+                    "path": "fr.handbrake.ghb.Plugin.IntelMediaSDK.metainfo.xml"
+                }
+            
+        }
+    
+}
+

HandBrake-1.5.1.tar.xz/pkg/linux/flatpak/fr.handbrake.ghb.Plugin.IntelMediaSDK.metainfo.xml Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/flatpak/fr.handbrake.ghb.json -> HandBrake-1.5.1.tar.xz/pkg/linux/flatpak/fr.handbrake.ghb.json Changed

@@ -1,7 +1,7 @@
 {
     "app-id": "fr.handbrake.ghb",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "3.34",
+    "runtime-version": "41",
     "sdk": "org.gnome.Sdk",
     "command": "ghb",
     "finish-args": 
@@ -12,6 +12,8 @@
         "--filesystem=host",
         "--filesystem=xdg-run/dconf",
         "--filesystem=xdg-run/gvfs",
+        "--filesystem=xdg-run/gvfsd",
+        "--filesystem=xdg-config/gtk-3.0",
         "--filesystem=~/.config/dconf:ro",
         "--talk-name=ca.desrt.dconf",
         "--talk-name=org.gtk.vfs.*",
@@ -21,7 +23,7 @@
         "--env=GIO_EXTRA_MODULES=/app/lib/gio/modules"
     ,
     "add-extensions": {
-        "fr.handbrake.plugin": {
+        "fr.handbrake.ghb.Plugin": {
             "version": "1",
             "directory": "extensions",
             "add-ld-path": "lib",
@@ -37,8 +39,8 @@
             "sources": 
                 {
                     "type": "archive",
-                    "url": "https://github.com/numactl/numactl/releases/download/v2.0.12/numactl-2.0.12.tar.gz",
-                    "sha256": "55bbda363f5b32abd057b6fbb4551dd71323f5dbb66335ba758ba93de2ada729"
+                    "url": "https://github.com/numactl/numactl/releases/download/v2.0.13/numactl-2.0.13.tar.gz",
+                    "sha256": "991e254b867eb5951a44d2ae0bf1996a8ef0209e026911ef6c3ef4caf6f58c9a"
                 }
             
         },
@@ -49,8 +51,8 @@
             "sources": 
                 {
                     "type": "archive",
-                    "url": "https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz",
-                    "sha256": "8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf"
+                    "url": "https://github.com/libass/libass/releases/download/0.15.2/libass-0.15.2.tar.gz",
+                    "sha256": "1b2a54dda819ef84fa2dee3069cf99748a886363d2adb630fde87fe046e2d1d5"
                 }
             
         },
@@ -59,6 +61,7 @@
             "no-autogen": true,
             "config-opts": 
                 "--flatpak",
+                "--debug=std",
                 "--disable-gtk-update-checks"
             ,
             "builddir": true,

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/module.defs -> HandBrake-1.5.1.tar.xz/pkg/linux/module.defs Changed

@@ -14,7 +14,7 @@
 ifeq ($(HB.repo.type),release)
     PKG.rpm.hb.version = $(tag)
 else ifeq ($(HB.repo.branch),)
-    PKG.rpm.hb.version = $(tab).$(HB.repo.shorthash)
+    PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash)
 else
     PKG.rpm.hb.version = $(tag).$(HB.repo.shorthash).$(HB.repo.branch)
 endif
@@ -99,8 +99,9 @@
 PKG.cli.build.flatpak = $(STAGE.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(HOST.machine).build
 PKG.cli.flatpak = $(PKG.out.flatpak/)$(PKG.cli.name.flatpak)-$(HB.version)-$(HOST.machine).flatpak
 
-PKG.mediasdk.name.flatpak = fr.handbrake.plugin.IntelMediaSDK
+PKG.mediasdk.name.flatpak = fr.handbrake.ghb.Plugin.IntelMediaSDK
 PKG.mediasdk.manifest.flathub = $(PKG.out.flatpak/)$(PKG.mediasdk.name.flatpak).json
+PKG.mediasdk.metainfo.flatpak = $(PKG.flatpak/)$(PKG.mediasdk.name.flatpak).metainfo.xml
 PKG.mediasdk.template.flatpak = $(PKG.flatpak/)$(PKG.mediasdk.name.flatpak).json
 PKG.mediasdk.manifest.flatpak = $(STAGE.out.flatpak/)$(PKG.mediasdk.name.flatpak).json
 PKG.mediasdk.build.flatpak = $(STAGE.out.flatpak/)$(PKG.mediasdk.name.flatpak)-$(HB.version)-$(HOST.machine).build

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/pkg/linux/module.rules -> HandBrake-1.5.1.tar.xz/pkg/linux/module.rules Changed

@@ -1,4 +1,6 @@
-pkg.create.flatpak:: contrib.fetch $(PKG.all.flatpak)
+pkg.create.flatpak:: $(PKG.all.flatpak)
+pkg.create.cli.flatpak:: $(PKG.cli.flatpak)
+pkg.create.gui.flatpak:: $(PKG.gui.flatpak)
 pkg.create.plugins.flatpak:: $(PKG.plugins.flatpak)
 pkg.create.flathub:: $(FLATHUB_MANIFEST)
 pkg.create.deb:: $(PKG.gui.deb) $(PKG.cli.deb)
@@ -72,29 +74,30 @@
 	$(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(HB_URL)" -s "$(HB_SHA256)" -t $(PKG.cli.template.flatpak) $(foreach m,$(CONTRIBS),-c "$(word 1,$($m.FETCH.url))" -s "$(word 1,$($m.FETCH.sha256))") $(FPRUNTIME) $(PKG.cli.manifest.flathub)
 
 $(PKG.gui.flatpak): GNUmakefile $(PKG.gui.template.flatpak) $(PKG.src.tar.bz2)
+	make contrib.fetch
 	$(MKDIR.exe) -p $(STAGE.out.flatpak/)
 	$(MKDIR.exe) -p $(PKG.out.flatpak/)
 	$(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.gui.template.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(PKG.gui.manifest.flatpak)
 	flatpak-builder --default-branch=$(PKG.branch.flatpak) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.gui.build.flatpak) $(PKG.gui.manifest.flatpak)
-	flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) $(PKG.gui.name.flatpak) $(PKG.branch.flatpak)
+	flatpak build-bundle $(PKG.repo.flatpak) $(PKG.gui.flatpak) $(PKG.gui.name.flatpak) $(PKG.branch.flatpak) --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
 $(PKG.cli.flatpak): GNUmakefile $(PKG.cli.template.flatpak) $(PKG.src.tar.bz2)
+	make contrib.fetch
 	$(MKDIR.exe) -p $(STAGE.out.flatpak/)
 	$(MKDIR.exe) -p $(PKG.out.flatpak/)
 	$(SRC/)scripts/create_flatpak_manifest.py $(FPQSV) -a "$(abspath $(PKG.src.tar.bz2))" -t $(PKG.cli.template.flatpak) $(foreach m,$(CONTRIBS),-c "$(abspath $(CONTRIB.download/)$($m.FETCH.basename))") $(PKG.cli.manifest.flatpak)
 	flatpak-builder --default-branch=$(PKG.branch.flatpak) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.cli.build.flatpak) $(PKG.cli.manifest.flatpak)
-	flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) $(PKG.cli.name.flatpak) $(PKG.branch.flatpak)
+	flatpak build-bundle $(PKG.repo.flatpak) $(PKG.cli.flatpak) $(PKG.cli.name.flatpak) $(PKG.branch.flatpak) --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 
 $(PKG.mediasdk.flatpak): GNUmakefile $(PKG.mediasdk.template.flatpak) $(PKG.gui.flatpak)
 	$(MKDIR.exe) -p $(STAGE.out.flatpak/)
 	$(MKDIR.exe) -p $(PKG.out.flatpak/)
-	$(CP.exe) -a $(PKG.flatpak/)patch $(STAGE.out.flatpak/)
 	$(SRC/)scripts/create_flatpak_manifest.py -p -r $(PKG.branch.flatpak) -t $(PKG.mediasdk.template.flatpak) $(PKG.mediasdk.manifest.flatpak)
 	-flatpak --user remove --noninteractive $(PKG.gui.name.flatpak)//$(PKG.branch.flatpak)
 	flatpak --user install --noninteractive $(PKG.gui.flatpak)
+	$(CP.exe) $(PKG.mediasdk.metainfo.flatpak) $(STAGE.out.flatpak/)
 	flatpak-builder --default-branch=$(PKG.branch.flatpak) --disable-cache --force-clean $(PGPSIGN) --repo=$(PKG.repo.flatpak) $(PKG.mediasdk.build.flatpak) $(PKG.mediasdk.manifest.flatpak)
-#	flatpak-builder --run $(PKG.mediasdk.build.flatpak) $(PKG.mediasdk.manifest.flatpak) bash
-	flatpak build-bundle --runtime $(PKG.repo.flatpak) $(PKG.mediasdk.flatpak) $(PKG.mediasdk.name.flatpak) $(PKG.plugin.version.flatpak)
+	flatpak build-bundle --runtime $(PKG.repo.flatpak) $(PKG.mediasdk.flatpak) $(PKG.mediasdk.name.flatpak) $(PKG.plugin.version.flatpak) --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo
 	-flatpak --user remove --noninteractive $(PKG.gui.name.flatpak)//$(PKG.branch.flatpak)
 
 #
@@ -122,29 +125,13 @@
 # Debian source package rules
 #
 pkg.push.src.deb:: $(PKG.src.deb.stamp)
-	(cd $(STAGE.out.src/)disco && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~disco1_source.changes )
 	(cd $(STAGE.out.src/)eoan && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~eoan1_source.changes )
+	(cd $(STAGE.out.src/)focal && dput handbrake-git-snapshots $(HB.name.lower)_$(HB.debversion)-zhb-1ppa1~focal1_source.changes )
 
 
 $(PKG.src.deb.stamp): GNUmakefile
 	-$(RM.exe) -rf $(STAGE.out.src/)
 	make contrib.fetch
-	$(MKDIR.exe) -p $(STAGE.out.src/)disco
-	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)disco/
-	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)disco/$(PKG.deb.basename)/version.txt
-	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)disco/$(PKG.deb.basename)
-	cp -a $(PKG.debian) $(STAGE.out.src/)disco/$(PKG.deb.basename)
-	$(CP.exe) $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/control.disco $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/control
-	$(CP.exe) $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/rules.disco $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/rules
-	echo "$(HB.name.lower) (1:$(HB.debversion)-zhb-1ppa1~disco1) disco; urgency=low" > $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	echo " * Snapshot: See commit history at" >> $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	echo " https://github.com/HandBrake/HandBrake" >> $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	echo "" >> $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	echo " -- John Stebbins <jstebbins.hb@gmail.com> $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)disco/$(PKG.deb.basename)/debian/changelog
-	$(TAR.exe) czf $(STAGE.out.src/)disco/$(PKG.src.deb.tar) -C $(STAGE.out.src/)disco $(PKG.deb.basename)
-	(cd $(STAGE.out.src/)disco/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
-	$(TOUCH.exe) $(PKG.src.deb.stamp)
 	$(MKDIR.exe) -p $(STAGE.out.src/)eoan
 	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)eoan/
 	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)eoan/$(PKG.deb.basename)/version.txt
@@ -160,4 +147,19 @@
 	echo " -- John Stebbins <jstebbins.hb@gmail.com> $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)eoan/$(PKG.deb.basename)/debian/changelog
 	$(TAR.exe) czf $(STAGE.out.src/)eoan/$(PKG.src.deb.tar) -C $(STAGE.out.src/)eoan $(PKG.deb.basename)
 	(cd $(STAGE.out.src/)eoan/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
+	$(MKDIR.exe) -p $(STAGE.out.src/)focal
+	$(GIT.exe) -C $(SRC/) archive --format=tar --prefix=$(PKG.deb.basename)/ $(HB.repo.shorthash) | $(TAR.exe) -xC $(STAGE.out.src/)focal/
+	$(SRC/)scripts/repo-info.sh $(SRC/) > $(STAGE.out.src/)focal/$(PKG.deb.basename)/version.txt
+	$(CP.exe) -a $(SRC/)download $(STAGE.out.src/)focal/$(PKG.deb.basename)
+	cp -a $(PKG.debian) $(STAGE.out.src/)focal/$(PKG.deb.basename)
+	$(CP.exe) $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/control.focal $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/control
+	$(CP.exe) $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/rules.focal $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/rules
+	echo "$(HB.name.lower) (1:$(HB.debversion)-zhb-1ppa1~focal1) focal; urgency=low" > $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	echo " * Snapshot: See commit history at" >> $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	echo " https://github.com/HandBrake/HandBrake" >> $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	echo "" >> $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	echo " -- John Stebbins <jstebbins.hb@gmail.com> $(DEBIAN_CHANGELOG_DATE)" >> $(STAGE.out.src/)focal/$(PKG.deb.basename)/debian/changelog
+	$(TAR.exe) czf $(STAGE.out.src/)focal/$(PKG.src.deb.tar) -C $(STAGE.out.src/)focal $(PKG.deb.basename)
+	(cd $(STAGE.out.src/)focal/$(PKG.deb.basename) && debuild -S -kjstebbins.hb)
 	$(TOUCH.exe) $(PKG.src.deb.stamp)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/preset/preset_builtin.json -> HandBrake-1.5.1.tar.xz/preset/preset_builtin.json Changed

@@ -57,6 +57,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -104,7 +106,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -166,6 +167,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -213,7 +216,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 23.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -275,6 +277,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -322,7 +326,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -384,6 +387,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -431,7 +436,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -493,6 +497,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -540,7 +546,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -602,6 +607,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -649,7 +656,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -711,6 +717,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -758,7 +766,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -820,6 +827,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -867,7 +876,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": true,
                     "x264Option": "",
@@ -943,6 +951,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -990,7 +1000,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1066,6 +1075,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1113,7 +1124,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 19.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1189,6 +1199,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1236,7 +1248,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 18.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1312,6 +1323,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1359,7 +1372,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 18.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1435,6 +1447,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1482,7 +1496,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 18.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1558,6 +1571,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1605,7 +1620,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 17.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1681,6 +1695,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1728,7 +1744,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 16.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1804,6 +1819,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1851,7 +1868,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 16.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -1920,6 +1936,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -1967,7 +1985,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2029,6 +2046,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2076,7 +2095,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2138,6 +2156,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2185,7 +2205,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2247,6 +2266,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2294,7 +2315,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2356,6 +2376,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2403,7 +2425,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 25.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2465,6 +2486,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2512,7 +2535,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 23.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2574,6 +2596,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2621,7 +2645,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 23.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2683,6 +2706,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2730,7 +2755,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 23.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2792,6 +2816,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2839,7 +2865,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -2901,6 +2926,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -2948,7 +2975,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3010,6 +3036,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3057,7 +3085,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3119,6 +3146,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3166,7 +3195,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 19.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3228,6 +3256,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3275,7 +3305,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3291,7 +3320,8 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac"
+                        "copy:aac",
+                        "copy:ac3"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
@@ -3309,6 +3339,19 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
+                        },
+                        {
+                            "AudioBitrate": 640,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "copy:ac3",
+                            "AudioMixdown": "none",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -3344,6 +3387,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3358,12 +3403,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 1080p30",
+                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.",
+                    "PresetName": "Amazon Fire 2160p60 4K HEVC Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3376,22 +3421,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
+                    "VideoAvgBitrate": 8000,
                     "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
+                    "VideoEncoder": "x265",
+                    "VideoFramerate": "60",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
-                    "VideoPreset": "medium",
+                    "VideoPreset": "slow",
                     "VideoTune": "",
                     "VideoProfile": "main",
-                    "VideoLevel": "4.0",
-                    "VideoOptionExtra": "",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "strong-intra-smoothing=0:rect=0:aq-mode=1",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
+                    "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3400,7 +3444,8 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac"
+                        "copy:aac",
+                        "copy:ac3"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
@@ -3418,6 +3463,19 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
+                        },
+                        {
+                            "AudioBitrate": 640,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "copy:ac3",
+                            "AudioMixdown": "none",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -3453,6 +3511,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3467,12 +3527,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1280,
-                    "PictureHeight": 720,
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 720p30",
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).",
+                    "PresetName": "Amazon Fire 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3485,7 +3545,7 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 3000,
+                    "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
                     "VideoFramerate": "30",
@@ -3495,12 +3555,11 @@
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "main",
-                    "VideoLevel": "3.1",
+                    "VideoLevel": "4.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 21.0,
+                    "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3516,7 +3575,7 @@
                     ,
                     "AudioList": 
                         {
-                            "AudioBitrate": 128,
+                            "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
                             "AudioEncoder": "aac",
@@ -3562,6 +3621,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3576,12 +3637,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 720,
-                    "PictureHeight": 576,
+                    "PictureWidth": 1280,
+                    "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 576p25",
+                    "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.",
+                    "PresetName": "Amazon Fire 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3594,22 +3655,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 1800,
+                    "VideoAvgBitrate": 3000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
-                    "VideoFramerate": "25",
+                    "VideoFramerate": "30",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "main",
-                    "VideoLevel": "3.0",
+                    "VideoProfile": "high",
+                    "VideoLevel": "3.1",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 20.0,
+                    "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3625,7 +3685,7 @@
                     ,
                     "AudioList": 
                         {
-                            "AudioBitrate": 128,
+                            "AudioBitrate": 160,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
                             "AudioEncoder": "aac",
@@ -3671,6 +3731,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3685,12 +3747,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 720,
-                    "PictureHeight": 480,
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
-                    "PresetName": "Android 480p30",
+                    "PresetDescription": "H.264 video (up to 1080p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
+                    "PresetName": "Android 1080p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3703,7 +3765,7 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 1500,
+                    "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
                     "VideoFramerate": "30",
@@ -3713,12 +3775,11 @@
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "main",
-                    "VideoLevel": "3.0",
+                    "VideoLevel": "4.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 20.0,
+                    "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3727,8 +3788,7 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac",
-                        "copy:ac3"
+                        "copy:aac"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
@@ -3746,19 +3806,6 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
-                        },
-                        {
-                            "AudioBitrate": 640,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "copy:ac3",
-                            "AudioMixdown": "none",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -3794,6 +3841,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3808,12 +3857,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 3840,
-                    "PictureHeight": 2160,
+                    "PictureWidth": 1280,
+                    "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.",
-                    "PresetName": "Apple 2160p60 4K HEVC Surround",
+                    "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
+                    "PresetName": "Android 720p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3826,22 +3875,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 8000,
+                    "VideoAvgBitrate": 3000,
                     "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x265",
-                    "VideoFramerate": "60",
+                    "VideoEncoder": "x264",
+                    "VideoFramerate": "30",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
-                    "VideoPreset": "slow",
+                    "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "main",
-                    "VideoLevel": "auto",
-                    "VideoOptionExtra": "strong-intra-smoothing=0:rect=0:aq-mode=1",
+                    "VideoLevel": "3.1",
+                    "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 24.0,
+                    "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3850,15 +3898,14 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac",
-                        "copy:ac3"
+                        "copy:aac"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
                     ,
                     "AudioList": 
                         {
-                            "AudioBitrate": 160,
+                            "AudioBitrate": 128,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
                             "AudioEncoder": "aac",
@@ -3869,19 +3916,6 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
-                        },
-                        {
-                            "AudioBitrate": 640,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "copy:ac3",
-                            "AudioMixdown": "none",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -3917,6 +3951,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -3931,12 +3967,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
+                    "PictureWidth": 720,
+                    "PictureHeight": 576,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.",
-                    "PresetName": "Apple 1080p60 Surround",
+                    "PresetDescription": "H.264 video (up to 576p25) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
+                    "PresetName": "Android 576p25",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -3949,22 +3985,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
+                    "VideoAvgBitrate": 1800,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
-                    "VideoFramerate": "60",
+                    "VideoFramerate": "25",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "high",
-                    "VideoLevel": "4.2",
+                    "VideoProfile": "main",
+                    "VideoLevel": "3.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
+                    "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -3973,15 +4008,14 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac",
-                        "copy:ac3"
+                        "copy:aac"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
                     ,
                     "AudioList": 
                         {
-                            "AudioBitrate": 160,
+                            "AudioBitrate": 128,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
                             "AudioEncoder": "aac",
@@ -3992,19 +4026,6 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
-                        },
-                        {
-                            "AudioBitrate": 640,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "copy:ac3",
-                            "AudioMixdown": "none",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -4040,6 +4061,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4054,12 +4077,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
+                    "PictureWidth": 720,
+                    "PictureHeight": 480,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.",
-                    "PresetName": "Apple 1080p30 Surround",
+                    "PresetDescription": "H.264 video (up to 480p30) and AAC stereo audio, in an MP4 container. Compatible with Android devices.",
+                    "PresetName": "Android 480p30",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4072,7 +4095,7 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
+                    "VideoAvgBitrate": 1500,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
                     "VideoFramerate": "30",
@@ -4081,13 +4104,12 @@
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "high",
-                    "VideoLevel": "4.0",
+                    "VideoProfile": "main",
+                    "VideoLevel": "3.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
+                    "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4163,6 +4185,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4177,12 +4201,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1280,
-                    "PictureHeight": 720,
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.",
-                    "PresetName": "Apple 720p30 Surround",
+                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 7, 7 Plus, 8, 8 Plus, X, XR, XS, XS Max; Apple TV 4K.",
+                    "PresetName": "Apple 2160p60 4K HEVC Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4195,22 +4219,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 3000,
+                    "VideoAvgBitrate": 8000,
                     "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
+                    "VideoEncoder": "x265",
+                    "VideoFramerate": "60",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
-                    "VideoPreset": "medium",
+                    "VideoPreset": "slow",
                     "VideoTune": "",
-                    "VideoProfile": "high",
-                    "VideoLevel": "3.1",
-                    "VideoOptionExtra": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "strong-intra-smoothing=0:rect=0:aq-mode=1",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 21.0,
+                    "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4286,6 +4309,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4300,12 +4325,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 960,
-                    "PictureHeight": 540,
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.",
-                    "PresetName": "Apple 540p30 Surround",
+                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPad 5th and 6th Generation; iPad mini 2, 3, and 4; iPad Air 1st Generation and Air 2; iPad Pro 1st, 2nd, and 3rd Generation; Apple TV 4th Generation and later.",
+                    "PresetName": "Apple 1080p60 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4318,133 +4343,23 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 2500,
+                    "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
+                    "VideoFramerate": "60",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "high",
-                    "VideoLevel": "3.1",
-                    "VideoOptionExtra": "qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500",
-                    "VideoQualityType": 2,
-                    "VideoQualitySlider": 20.0,
-                    "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
-                    "VideoTwoPass": true,
-                    "VideoTurboTwoPass": false,
-                    "x264Option": "",
-                    "x264UseAdvancedOptions": false
-                },
-                {
-                    "AlignAVStart": false,
-                    "AudioCopyMask": 
-                        "copy:aac"
-                    ,
-                    "AudioEncoderFallback": "aac",
-                    "AudioLanguageList": 
-                    ,
-                    "AudioList": 
-                        {
-                            "AudioBitrate": 160,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "aac",
-                            "AudioMixdown": "stereo",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
-                        }
-                    ,
-                    "AudioSecondaryEncoderMode": true,
-                    "AudioTrackSelectionBehavior": "first",
-                    "ChapterMarkers": true,
-                    "ChildrenArray": 
-                    ,
-                    "Default": false,
-                    "FileFormat": "mp4",
-                    "Folder": false,
-                    "FolderOpen": false,
-                    "InlineParameterSets": false,
-                    "Mp4HttpOptimize": false,
-                    "Mp4iPodCompatible": true,
-                    "PictureAutoCrop": true,
-                    "PictureBottomCrop": 0,
-                    "PictureLeftCrop": 0,
-                    "PictureRightCrop": 0,
-                    "PictureTopCrop": 0,
-                    "PictureDARWidth": 0,
-                    "PictureDeblockPreset": "off",
-                    "PictureDeblockTune": "medium",
-                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
-                    "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
-                    "PictureDeinterlaceCustom": "",
-                    "PictureDeinterlaceFilter": "decomb",
-                    "PictureDeinterlacePreset": "default",
-                    "PictureDenoiseCustom": "",
-                    "PictureDenoiseFilter": "off",
-                    "PictureDenoisePreset": "light",
-                    "PictureDenoiseTune": "none",
-                    "PictureChromaSmoothCustom": "",
-                    "PictureChromaSmoothPreset": "off",
-                    "PictureChromaSmoothTune": "none",
-                    "PictureSharpenCustom": "",
-                    "PictureSharpenFilter": "off",
-                    "PictureSharpenPreset": "medium",
-                    "PictureSharpenTune": "none",
-                    "PictureDetelecine": "off",
-                    "PictureDetelecineCustom": "",
-                    "PictureItuPAR": false,
-                    "PictureKeepRatio": true,
-                    "PictureLooseCrop": false,
-                    "PictureModulus": 16,
-                    "PicturePAR": "off",
-                    "PicturePARWidth": 853,
-                    "PicturePARHeight": 720,
-                    "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 320,
-                    "PictureHeight": 240,
-                    "PictureForceHeight": 0,
-                    "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 240p30) and AAC stereo audio, in an MP4 container. Compatible with Apple iPod 5th Generation and later.",
-                    "PresetName": "Apple 240p30",
-                    "Type": 0,
-                    "UsesPictureFilters": true,
-                    "UsesPictureSettings": 1,
-                    "SubtitleAddCC": false,
-                    "SubtitleAddForeignAudioSearch": true,
-                    "SubtitleAddForeignAudioSubtitle": false,
-                    "SubtitleBurnBehavior": "foreign",
-                    "SubtitleBurnBDSub": true,
-                    "SubtitleBurnDVDSub": true,
-                    "SubtitleLanguageList": 
-                    ,
-                    "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 350,
-                    "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
-                    "VideoFramerateMode": "pfr",
-                    "VideoGrayScale": false,
-                    "VideoScaler": "swscale",
-                    "VideoPreset": "medium",
-                    "VideoTune": "",
-                    "VideoProfile": "baseline",
-                    "VideoLevel": "1.3",
+                    "VideoLevel": "4.2",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
-                    "VideoTurboTwoPass": true,
+                    "VideoTurboTwoPass": false,
                     "x264Option": "",
                     "x264UseAdvancedOptions": false
                 },
@@ -4495,7 +4410,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": true,
+                    "Mp4HttpOptimize": false,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -4518,6 +4433,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4532,12 +4449,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 3840,
-                    "PictureHeight": 2160,
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.",
-                    "PresetName": "Chromecast 2160p60 4K HEVC Surround",
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 5, 5s, SE, 6, 6 Plus, 6s, 6s Plus, and later; iPod touch 6th Generation; iPad 3rd, 4th Generation and later; iPad mini 1st Generation and later; Apple TV 3rd, 4th Generation and later.",
+                    "PresetName": "Apple 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4550,22 +4467,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 8000,
+                    "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x265",
-                    "VideoFramerate": "60",
+                    "VideoEncoder": "x264",
+                    "VideoFramerate": "30",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
-                    "VideoPreset": "slow",
+                    "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "main",
-                    "VideoLevel": "auto",
-                    "VideoOptionExtra": "strong-intra-smoothing=0:rect=0:aq-mode=1",
+                    "VideoProfile": "high",
+                    "VideoLevel": "4.0",
+                    "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 24.0,
+                    "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4618,7 +4534,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": true,
+                    "Mp4HttpOptimize": false,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -4641,6 +4557,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4655,12 +4573,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
+                    "PictureWidth": 1280,
+                    "PictureHeight": 720,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.",
-                    "PresetName": "Chromecast 1080p60 Surround",
+                    "PresetDescription": "H.264 video (up to 720p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 4, 4S, and later; iPod touch 4th, 5th Generation and later; iPad 1st Generation, iPad 2, and later; Apple TV 2nd Generation and later.",
+                    "PresetName": "Apple 720p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4673,22 +4591,21 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
+                    "VideoAvgBitrate": 3000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
-                    "VideoFramerate": "60",
+                    "VideoFramerate": "30",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "high",
-                    "VideoLevel": "4.2",
+                    "VideoLevel": "3.1",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
+                    "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4741,7 +4658,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": true,
+                    "Mp4HttpOptimize": false,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -4764,6 +4681,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4778,12 +4697,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
+                    "PictureWidth": 960,
+                    "PictureHeight": 540,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.",
-                    "PresetName": "Chromecast 1080p30 Surround",
+                    "PresetDescription": "H.264 video (up to 540p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Apple iPhone 1st Generation, 3G, 3GS, and later; iPod touch 1st, 2nd, 3rd Generation and later; iPod Classic; Apple TV 1st Generation and later.",
+                    "PresetName": "Apple 540p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4796,7 +4715,7 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
+                    "VideoAvgBitrate": 2500,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
                     "VideoFramerate": "30",
@@ -4806,12 +4725,11 @@
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "high",
-                    "VideoLevel": "4.0",
-                    "VideoOptionExtra": "",
+                    "VideoLevel": "3.1",
+                    "VideoOptionExtra": "qpmin=4:cabac=0:ref=2:b-pyramid=none:weightb=0:weightp=0:vbv-maxrate=9500:vbv-bufsize=9500",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
+                    "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4864,7 +4782,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": false,
+                    "Mp4HttpOptimize": true,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -4887,6 +4805,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -4905,8 +4825,8 @@
                     "PictureHeight": 2160,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 2nd Generation and later; Fire TV Cube, Fire TV Stick 4K.",
-                    "PresetName": "Amazon Fire 2160p60 4K HEVC Surround",
+                    "PresetDescription": "H.265 video (up to 2160p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast Ultra.",
+                    "PresetName": "Chromecast 2160p60 4K HEVC Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -4934,7 +4854,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -4987,7 +4906,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": false,
+                    "Mp4HttpOptimize": true,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -5010,6 +4929,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5028,8 +4949,8 @@
                     "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) audio, in an MP4 container. Compatible with Amazon Fire TV 1st Generation and later; Fire TV Stick 1st Generation and later; Fire HD 10 7th Generation (2017); Fire HDX 4th Generation (2014).",
-                    "PresetName": "Amazon Fire 1080p30 Surround",
+                    "PresetDescription": "H.264 video (up to 1080p60), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 3rd Generation.",
+                    "PresetName": "Chromecast 1080p60 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5045,19 +4966,18 @@
                     "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
+                    "VideoFramerate": "60",
                     "VideoFramerateMode": "pfr",
                     "VideoGrayScale": false,
                     "VideoScaler": "swscale",
                     "VideoPreset": "medium",
                     "VideoTune": "",
-                    "VideoProfile": "main",
-                    "VideoLevel": "4.0",
+                    "VideoProfile": "high",
+                    "VideoLevel": "4.2",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5066,7 +4986,8 @@
                 {
                     "AlignAVStart": false,
                     "AudioCopyMask": 
-                        "copy:aac"
+                        "copy:aac",
+                        "copy:ac3"
                     ,
                     "AudioEncoderFallback": "aac",
                     "AudioLanguageList": 
@@ -5084,6 +5005,19 @@
                             "AudioTrackQuality": -1.0,
                             "AudioTrackGainSlider": 0.0,
                             "AudioTrackDRCSlider": 0.0
+                        },
+                        {
+                            "AudioBitrate": 640,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "copy:ac3",
+                            "AudioMixdown": "none",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
                         }
                     ,
                     "AudioSecondaryEncoderMode": true,
@@ -5096,7 +5030,7 @@
                     "Folder": false,
                     "FolderOpen": false,
                     "InlineParameterSets": false,
-                    "Mp4HttpOptimize": false,
+                    "Mp4HttpOptimize": true,
                     "Mp4iPodCompatible": false,
                     "PictureAutoCrop": true,
                     "PictureBottomCrop": 0,
@@ -5119,6 +5053,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5133,12 +5069,12 @@
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1280,
-                    "PictureHeight": 720,
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
                     "PictureForceHeight": 0,
                     "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 720p30) and AAC stereo audio, in an MP4 container. Compatible with Amazon Fire HD 4th Generation (2014) and later; Kindle Fire HDX 3rd Generation (2013); Kindle Fire HD 2nd Generation (2012) and later.",
-                    "PresetName": "Amazon Fire 720p30",
+                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Google Chromecast 1st, 2nd Generation and later.",
+                    "PresetName": "Chromecast 1080p30 Surround",
                     "Type": 0,
                     "UsesPictureFilters": true,
                     "UsesPictureSettings": 1,
@@ -5151,7 +5087,7 @@
                     "SubtitleLanguageList": 
                     ,
                     "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 3000,
+                    "VideoAvgBitrate": 6000,
                     "VideoColorMatrixCodeOverride": 0,
                     "VideoEncoder": "x264",
                     "VideoFramerate": "30",
@@ -5161,12 +5097,11 @@
                     "VideoPreset": "medium",
                     "VideoTune": "",
                     "VideoProfile": "high",
-                    "VideoLevel": "3.1",
+                    "VideoLevel": "4.0",
                     "VideoOptionExtra": "",
                     "VideoQualityType": 2,
-                    "VideoQualitySlider": 21.0,
+                    "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5240,6 +5175,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5287,7 +5224,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5363,6 +5299,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5410,7 +5348,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5472,6 +5409,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5519,7 +5458,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5581,6 +5519,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5628,7 +5568,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5707,6 +5646,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5754,7 +5695,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5830,6 +5770,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -5877,7 +5819,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -5953,6 +5894,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6000,7 +5943,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6062,6 +6004,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6109,7 +6053,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6171,6 +6114,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6218,7 +6163,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6294,6 +6238,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6341,130 +6287,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
-                    "VideoTwoPass": true,
-                    "VideoTurboTwoPass": false,
-                    "x264Option": "",
-                    "x264UseAdvancedOptions": false
-                },
-                {
-                    "AlignAVStart": false,
-                    "AudioCopyMask": 
-                        "copy:aac",
-                        "copy:ac3"
-                    ,
-                    "AudioEncoderFallback": "aac",
-                    "AudioLanguageList": 
-                    ,
-                    "AudioList": 
-                        {
-                            "AudioBitrate": 160,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "aac",
-                            "AudioMixdown": "stereo",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
-                        },
-                        {
-                            "AudioBitrate": 640,
-                            "AudioCompressionLevel": -1.0,
-                            "AudioDitherMethod": "auto",
-                            "AudioEncoder": "copy:ac3",
-                            "AudioMixdown": "none",
-                            "AudioNormalizeMixLevel": false,
-                            "AudioSamplerate": "auto",
-                            "AudioTrackQualityEnable": false,
-                            "AudioTrackQuality": -1.0,
-                            "AudioTrackGainSlider": 0.0,
-                            "AudioTrackDRCSlider": 0.0
-                        }
-                    ,
-                    "AudioSecondaryEncoderMode": true,
-                    "AudioTrackSelectionBehavior": "first",
-                    "ChapterMarkers": false,
-                    "ChildrenArray": 
-                    ,
-                    "Default": false,
-                    "FileFormat": "mp4",
-                    "Folder": false,
-                    "FolderOpen": false,
-                    "InlineParameterSets": false,
-                    "Mp4HttpOptimize": false,
-                    "Mp4iPodCompatible": false,
-                    "PictureAutoCrop": true,
-                    "PictureBottomCrop": 0,
-                    "PictureLeftCrop": 0,
-                    "PictureRightCrop": 0,
-                    "PictureTopCrop": 0,
-                    "PictureDARWidth": 0,
-                    "PictureDeblockPreset": "off",
-                    "PictureDeblockTune": "medium",
-                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
-                    "PictureCombDetectCustom": "",
-                    "PictureCombDetectPreset": "default",
-                    "PictureDeinterlaceCustom": "",
-                    "PictureDeinterlaceFilter": "decomb",
-                    "PictureDeinterlacePreset": "default",
-                    "PictureDenoiseCustom": "",
-                    "PictureDenoiseFilter": "off",
-                    "PictureDenoisePreset": "light",
-                    "PictureDenoiseTune": "none",
-                    "PictureChromaSmoothCustom": "",
-                    "PictureChromaSmoothPreset": "off",
-                    "PictureChromaSmoothTune": "none",
-                    "PictureSharpenCustom": "",
-                    "PictureSharpenFilter": "off",
-                    "PictureSharpenPreset": "medium",
-                    "PictureSharpenTune": "none",
-                    "PictureDetelecine": "off",
-                    "PictureDetelecineCustom": "",
-                    "PictureItuPAR": false,
-                    "PictureKeepRatio": true,
-                    "PictureLooseCrop": false,
-                    "PictureModulus": 8,
-                    "PicturePAR": "off",
-                    "PicturePARWidth": 853,
-                    "PicturePARHeight": 720,
-                    "PictureRotate": "angle=0:hflip=0",
-                    "PictureWidth": 1920,
-                    "PictureHeight": 1080,
-                    "PictureForceHeight": 0,
-                    "PictureForceWidth": 0,
-                    "PresetDescription": "H.264 video (up to 1080p30), AAC stereo audio, and Dolby Digital (AC-3) surround audio, in an MP4 container. Compatible with Xbox 360.",
-                    "PresetName": "Xbox Legacy 1080p30 Surround",
-                    "Type": 0,
-                    "UsesPictureFilters": true,
-                    "UsesPictureSettings": 1,
-                    "SubtitleAddCC": false,
-                    "SubtitleAddForeignAudioSearch": true,
-                    "SubtitleAddForeignAudioSubtitle": false,
-                    "SubtitleBurnBehavior": "foreign",
-                    "SubtitleBurnBDSub": true,
-                    "SubtitleBurnDVDSub": true,
-                    "SubtitleLanguageList": 
-                    ,
-                    "SubtitleTrackSelectionBehavior": "none",
-                    "VideoAvgBitrate": 6000,
-                    "VideoColorMatrixCodeOverride": 0,
-                    "VideoEncoder": "x264",
-                    "VideoFramerate": "30",
-                    "VideoFramerateMode": "pfr",
-                    "VideoGrayScale": false,
-                    "VideoScaler": "swscale",
-                    "VideoPreset": "medium",
-                    "VideoTune": "",
-                    "VideoProfile": "main",
-                    "VideoLevel": "4.0",
-                    "VideoOptionExtra": "",
-                    "VideoQualityType": 2,
-                    "VideoQualitySlider": 22.0,
-                    "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6533,6 +6355,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6580,7 +6404,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6642,6 +6465,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6689,7 +6514,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6751,6 +6575,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6798,7 +6624,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6860,6 +6685,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -6907,7 +6734,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -6969,6 +6795,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7016,7 +6844,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7078,6 +6905,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7125,7 +6954,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7187,6 +7015,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7234,7 +7064,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7296,6 +7125,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7343,7 +7174,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7405,6 +7235,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7452,7 +7284,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7514,6 +7345,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7561,7 +7394,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7622,6 +7454,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7669,7 +7503,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 24.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7730,6 +7563,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7777,7 +7612,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7838,6 +7672,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7885,7 +7721,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 21.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -7946,6 +7781,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -7993,7 +7830,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8054,6 +7890,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8101,7 +7939,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 20.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8162,6 +7999,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8209,7 +8048,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 4.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8270,6 +8108,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8317,7 +8157,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 4.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8378,6 +8217,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8425,7 +8266,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 4.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8486,6 +8326,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8533,7 +8375,6 @@
                     "VideoQualityType": 1,
                     "VideoQualitySlider": 4.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8556,6 +8397,885 @@
                     ,
                     "AudioList": 
                         {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Nvidia NVENC hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 NVENC 2160p 4K",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 10500,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "nvenc_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "medium",
+                    "VideoTune": "",
+                    "VideoProfile": "auto",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "rc-lookahead=10",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 30.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Nvidia NVENC hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 NVENC 1080p",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 3750,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "nvenc_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "medium",
+                    "VideoTune": "",
+                    "VideoProfile": "auto",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "rc-lookahead=10",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 27.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Intel Quick Sync Video hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 QSV 2160p 4K",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 8000,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "qsv_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "speed",
+                    "VideoTune": "",
+                    "VideoProfile": "auto",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 24.0,
+                    "VideoQSVDecode": true,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Intel Quick Sync Video hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 QSV 1080p",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 2500,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "qsv_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "speed",
+                    "VideoTune": "",
+                    "VideoProfile": "auto",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 22.0,
+                    "VideoQSVDecode": true,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "AMD VCN hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 VCN 2160p 4K",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 12500,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "vce_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "balanced",
+                    "VideoTune": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 28.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "strength=strong:thresh=20:blocksize=8",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 853,
+                    "PicturePARHeight": 720,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "AMD VCN hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container.",
+                    "PresetName": "H.265 VCN 1080p",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 7250,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "vce_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "balanced",
+                    "VideoTune": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 2,
+                    "VideoQualitySlider": 25.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 1,
+                    "PicturePARHeight": 1,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 3840,
+                    "PictureHeight": 2160,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Hardware accelerated H.265 video (up to 2160p) and AAC stereo audio, in an MP4 container for ARM based platforms using Media Foundation",
+                    "PresetName": "H.265 MF 2160p 4K",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 9500,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "mf_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "balanced",
+                    "VideoTune": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 1,
+                    "VideoQualitySlider": 28.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                },
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
+                            "AudioBitrate": 160,
+                            "AudioCompressionLevel": -1.0,
+                            "AudioDitherMethod": "auto",
+                            "AudioEncoder": "aac",
+                            "AudioMixdown": "stereo",
+                            "AudioNormalizeMixLevel": false,
+                            "AudioSamplerate": "auto",
+                            "AudioTrackQualityEnable": false,
+                            "AudioTrackQuality": -1.0,
+                            "AudioTrackGainSlider": 0.0,
+                            "AudioTrackDRCSlider": 0.0
+                        }
+                    ,
+                    "AudioSecondaryEncoderMode": true,
+                    "AudioTrackSelectionBehavior": "first",
+                    "ChapterMarkers": true,
+                    "ChildrenArray": 
+                    ,
+                    "Default": false,
+                    "FileFormat": "mp4",
+                    "Folder": false,
+                    "FolderOpen": false,
+                    "Mp4HttpOptimize": false,
+                    "Mp4iPodCompatible": false,
+                    "PictureAutoCrop": false,
+                    "PictureBottomCrop": 0,
+                    "PictureLeftCrop": 0,
+                    "PictureRightCrop": 0,
+                    "PictureTopCrop": 0,
+                    "PictureDARWidth": 0,
+                    "PictureDeblockPreset": "off",
+                    "PictureDeblockTune": "medium",
+                    "PictureDeblockCustom": "",
+                    "PictureCombDetectCustom": "",
+                    "PictureCombDetectPreset": "off",
+                    "PictureDeinterlaceCustom": "",
+                    "PictureDeinterlaceFilter": "off",
+                    "PictureDeinterlacePreset": "default",
+                    "PictureDenoiseCustom": "",
+                    "PictureDenoiseFilter": "off",
+                    "PictureDenoisePreset": "medium",
+                    "PictureDenoiseTune": "none",
+                    "PictureChromaSmoothCustom": "",
+                    "PictureChromaSmoothPreset": "off",
+                    "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
+                    "PictureSharpenCustom": "",
+                    "PictureSharpenFilter": "off",
+                    "PictureSharpenPreset": "medium",
+                    "PictureSharpenTune": "none",
+                    "PictureDetelecine": "off",
+                    "PictureDetelecineCustom": "",
+                    "PictureItuPAR": false,
+                    "PictureKeepRatio": true,
+                    "PictureLooseCrop": false,
+                    "PictureModulus": 2,
+                    "PicturePAR": "auto",
+                    "PicturePARWidth": 1,
+                    "PicturePARHeight": 1,
+                    "PictureRotate": "angle=0:hflip=0",
+                    "PictureWidth": 1920,
+                    "PictureHeight": 1080,
+                    "PictureForceHeight": 0,
+                    "PictureForceWidth": 0,
+                    "PresetDescription": "Hardware accelerated H.265 video (up to 1080p) and AAC stereo audio, in an MP4 container for ARM based platforms using Media Foundation",
+                    "PresetName": "H.265 MF 1080p",
+                    "Type": 0,
+                    "UsesPictureFilters": true,
+                    "UsesPictureSettings": 1,
+                    "SubtitleAddCC": false,
+                    "SubtitleAddForeignAudioSearch": false,
+                    "SubtitleAddForeignAudioSubtitle": false,
+                    "SubtitleBurnBehavior": "none",
+                    "SubtitleBurnBDSub": false,
+                    "SubtitleBurnDVDSub": false,
+                    "SubtitleLanguageList": 
+                    ,
+                    "SubtitleTrackSelectionBehavior": "none",
+                    "VideoAvgBitrate": 5500,
+                    "VideoColorMatrixCodeOverride": 0,
+                    "VideoEncoder": "mf_h265",
+                    "VideoFramerate": "auto",
+                    "VideoFramerateMode": "vfr",
+                    "VideoGrayScale": false,
+                    "VideoScaler": "swscale",
+                    "VideoPreset": "balanced",
+                    "VideoTune": "",
+                    "VideoProfile": "main",
+                    "VideoLevel": "auto",
+                    "VideoOptionExtra": "",
+                    "VideoQualityType": 1,
+                    "VideoQualitySlider": 22.0,
+                    "VideoQSVDecode": false,
+                    "VideoTwoPass": false,
+                    "VideoTurboTwoPass": false,
+                    "x264Option": "",
+                    "x264UseAdvancedOptions": false
+                }
+            ,
+            "Folder": true,
+            "PresetName": "Hardware",
+            "Type": 0
+        },
+        {
+            "ChildrenArray": 
+                {
+                    "AlignAVStart": false,
+                    "AudioCopyMask": 
+                        "copy:aac"
+                    ,
+                    "AudioEncoderFallback": "none",
+                    "AudioLanguageList": 
+                    ,
+                    "AudioList": 
+                        {
                             "AudioBitrate": 320,
                             "AudioCompressionLevel": -1.0,
                             "AudioDitherMethod": "auto",
@@ -8602,6 +9322,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8649,7 +9371,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 2.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8711,6 +9432,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8758,7 +9481,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 10.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8820,6 +9542,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8867,7 +9591,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 18.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",
@@ -8929,6 +9652,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -8976,7 +9701,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 16.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": true,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/preset/preset_builtin.list -> HandBrake-1.5.1.tar.xz/preset/preset_builtin.list Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/preset/preset_cli_default.json -> HandBrake-1.5.1.tar.xz/preset/preset_cli_default.json Changed

@@ -62,6 +62,8 @@
                     "PictureChromaSmoothCustom": "",
                     "PictureChromaSmoothPreset": "off",
                     "PictureChromaSmoothTune": "none",
+                    "PictureColorspaceCustom": "",
+                    "PictureColorspacePreset": "off",
                     "PictureSharpenCustom": "",
                     "PictureSharpenFilter": "off",
                     "PictureSharpenPreset": "medium",
@@ -72,7 +74,7 @@
                     "PictureKeepRatio": true,
                     "PictureLooseCrop": false,
                     "PictureModulus": 2,
-                    "PicturePAR": "loose",
+                    "PicturePAR": "auto",
                     "PicturePARWidth": 853,
                     "PicturePARHeight": 720,
                     "PictureRotate": "angle=0:hflip=0",
@@ -109,7 +111,6 @@
                     "VideoQualityType": 2,
                     "VideoQualitySlider": 22.0,
                     "VideoQSVDecode": false,
-                    "VideoQSVAsyncDepth": 4,
                     "VideoTwoPass": false,
                     "VideoTurboTwoPass": false,
                     "x264Option": "",

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/preset/preset_template.json -> HandBrake-1.5.1.tar.xz/preset/preset_template.json Changed

@@ -39,8 +39,11 @@
         "Folder": false,
         "FolderOpen": false,
         "InlineParameterSets": false,
+        "MetadataPassthrough": true,
         "Mp4HttpOptimize": false,
         "Mp4iPodCompatible": false,
+        "PictureAllowUpscaling": false,
+        "PictureUseMaximumSize": true,
         "PictureAutoCrop": true,
         "PictureBottomCrop": 0,
         "PictureLeftCrop": 0,
@@ -62,6 +65,8 @@
         "PictureChromaSmoothCustom": "",
         "PictureChromaSmoothPreset": "off",
         "PictureChromaSmoothTune": "none",
+        "PictureColorspaceCustom": "",
+        "PictureColorspacePreset": "off",
         "PictureSharpenCustom": "",
         "PictureSharpenFilter": "off",
         "PictureSharpenPreset": "medium",
@@ -72,7 +77,13 @@
         "PictureKeepRatio": true,
         "PictureLooseCrop": false,
         "PictureModulus": 2,
-        "PicturePAR": "loose",
+        "PicturePadColor": "black",
+        "PicturePadMode": "none",
+        "PicturePadTop": 0,
+        "PicturePadBottom": 0,
+        "PicturePadLeft": 0 ,
+        "PicturePadRight": 0,
+        "PicturePAR": "auto",
         "PicturePARWidth": 853,
         "PicturePARHeight": 720,
         "PictureRotate": "angle=0:hflip=0",
@@ -81,10 +92,10 @@
         "PictureForceHeight": 0,
         "PictureForceWidth": 0,
         "PresetDescription": "",
+        "PresetDisabled": false,
         "PresetName": "Name Missing",
         "Type": 1,
         "UsesPictureFilters": true,
-        "UsesPictureSettings": 2,
         "SubtitleAddCC": false,
         "SubtitleAddForeignAudioSearch": false,
         "SubtitleAddForeignAudioSubtitle": false,
@@ -109,7 +120,6 @@
         "VideoQualityType": 2,
         "VideoQualitySlider": 20.0,
         "VideoQSVDecode": false,
-        "VideoQSVAsyncDepth": 4,
         "VideoTwoPass": false,
         "VideoTurboTwoPass": false,
         "x264Option": "",

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/scripts/mac-toolchain-build -> HandBrake-1.5.1.tar.xz/scripts/mac-toolchain-build Changed

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # mac-toolchain-build - download and build common macOS toolchain components
 #
-# Copyright 2020 Bradley Sepos
+# Copyright 2022 Bradley Sepos
 # Released under the MIT License. See LICENSE for details.
 # https://github.com/bradleysepos/mac-toolchain-build
 
@@ -104,6 +104,7 @@
 return 1
 fi
 fi
+ return 0
 done
 }
 
@@ -126,6 +127,15 @@
 trap - TERM && kill -- -$$
 }
 
+# tests whether a string is an exact match for an array item
+function in_array { # in_array needle haystack@
+ local e
+ for e in "${@:2}"; do
+ "${e}" == "${1}" && return 0
+ done
+ return 1
+}
+
 # builds toolchain components
 function mac_toolchain_build {
 set -o pipefail
@@ -144,13 +154,13 @@
 
 # versions
 local AUTOCONF_VER AUTOMAKE_VER CMAKE_VER LIBTOOL_VER MESON_VER NASM_VER NINJA_VER PKGCONFIG_VER VERSIONS
- AUTOCONF_VER="2.69"
- AUTOMAKE_VER="1.16.1"
- CMAKE_VER="3.16.3"
+ AUTOCONF_VER="2.71"
+ AUTOMAKE_VER="1.16.5"
+ CMAKE_VER="3.22.0"
 LIBTOOL_VER="2.4.6"
- MESON_VER="0.53.1"
- NASM_VER="2.14.02"
- NINJA_VER="1.10.0"
+ MESON_VER="0.60.2"
+ NASM_VER="2.15.05"
+ NINJA_VER="1.10.2"
 PKGCONFIG_VER="0.29.2"
 VERSIONS=("${AUTOCONF_VER}" "${AUTOMAKE_VER}" "${CMAKE_VER}" "${LIBTOOL_VER}" "${MESON_VER}" "${NASM_VER}" "${NINJA_VER}" "${PKGCONFIG_VER}")
 
@@ -180,20 +190,20 @@
 
 # checksums
 local AUTOCONF_SHA256 AUTOMAKE_SHA256 CMAKE_SHA256 LIBTOOL_SHA256 MESON_SHA256 NASM_SHA256 NINJA_SHA256 PKGCONFIG_SHA256 CHECKSUMS
- AUTOCONF_SHA256="954bd69b391edc12d6a4a51a2dd1476543da5c6bbf05a95b59dc0dd6fd4c2969"
- AUTOMAKE_SHA256="608a97523f97db32f1f5d5615c98ca69326ced2054c9f82e65bade7fc4c9dea8"
- CMAKE_SHA256="e54f16df9b53dac30fd626415833a6e75b0e47915393843da1825b096ee60668"
+ AUTOCONF_SHA256="431075ad0bf529ef13cb41e9042c542381103e80015686222b8a9d4abef42a1c"
+ AUTOMAKE_SHA256="07bd24ad08a64bc17250ce09ec56e921d6343903943e99ccf63bbf0705e34605"
+ CMAKE_SHA256="998c7ba34778d2dfdb3df8a695469e24b11e2bfa21fbe41b361a3f45e1c9345e"
 LIBTOOL_SHA256="e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3"
- MESON_SHA256="f69ff8ce6cb52cbfb9bcc844086fade76920a292a017e68201317eeacd3ab943"
- NASM_SHA256="34fd26c70a277a9fdd54cb5ecf389badedaf48047b269d1008fbc819b24e80bc"
- NINJA_SHA256="3810318b08489435f8efc19c05525e80a993af5a55baa0dfeae0465a9d45f99f"
+ MESON_SHA256="fc7c2f315b5b63fee0414b0b94b5a7d0e9c71c8c9bb8487314eb5a9a33984b8d"
+ NASM_SHA256="3c4b8339e5ab54b1bcb2316101f8985a5da50a3f9e504d43fa6f35668bee2fd0"
+ NINJA_SHA256="ce35865411f0490368a8fc383f29071de6690cbadc27704734978221f25e2bed"
 PKGCONFIG_SHA256="6fc69c01688c9458a57eb9a1664c9aba372ccda420a02bf4429fe610e7e7d591"
 CHECKSUMS=("${AUTOCONF_SHA256}" "${AUTOMAKE_SHA256}" "${CMAKE_SHA256}" "${LIBTOOL_SHA256}" "${MESON_SHA256}" "${NASM_SHA256}" "${NINJA_SHA256}" "${PKGCONFIG_SHA256}")
 
 # internal vars
 local NAME VERSION SELF SELF_NAME HELP SUDO TOTAL
 NAME="mac-toolchain-build"
- VERSION="2.1.0"
+ VERSION="2.7.0"
 SELF="${BASH_SOURCE0}"
 SELF_NAME=$(basename "${SELF}")
 HELP="\
@@ -355,9 +365,6 @@
 CPU_COUNT="${CPU_COUNT:-1}"
 "${JOBS}" -eq 0 && JOBS="${CPU_COUNT}"
 
- # begin output
- echo "${NAME} ${VERSION} (${JOBS} job$( ${JOBS} -gt 1 && echo 's'))"
-
 # list components
 if "${LIST}" == true ; then
 local COMPONENTS COMPONENTS_TEMP
@@ -369,6 +376,7 @@
 IFS=$'\n'
 COMPONENTS=($(sort <<< "${COMPONENTS_TEMP*}"))
 IFS="${OIFS}"
+ echo "${NAME} ${VERSION}"
 echo "Components:"
 for I in "${!COMPONENTS@}"; do
 echo " ${COMPONENTS$I}"
@@ -376,6 +384,9 @@
 return 0
 fi
 
+ # begin output
+ echo "${NAME} ${VERSION} (${JOBS} job$( ${JOBS} -gt 1 && echo 's'))"
+
 # mac only
 if "${SYS_NAME}" != "darwin" ; then
 echo "macOS/Darwin required" >&2
@@ -384,7 +395,7 @@
 
 # dependencies
 local DEPS
- DEPS=("curl" "shasum|sha256sum")
+ DEPS=("curl" "python3" "sed" "shasum|sha256sum")
 check_dependencies "${DEPS@}" || return 1
 
 # sha256 binary
@@ -401,17 +412,12 @@
 PREFIX="${1:-/usr/local}"
 
 # check installed tool versions, skip if adequate
- local INSTALLED_VERSIONS SKIP NOT_SKIPPED_TOTAL TOOL_PATH
+ local INSTALLED_VERSIONS SKIP NOT_SKIPPED_TOTAL
 INSTALLED_VERSIONS=()
 SKIP=()
 NOT_SKIPPED_TOTAL=0
 for I in "${!NAMES@}"; do
- if "${NAMESI}" == "meson" ; then
- TOOL_PATH=
- else
- TOOL_PATH="${PREFIX}/bin/"
- fi
- INSTALLED_VERSIONS$I=$("${TOOL_PATH}${NAMESI}" --version 2>&1 | head -n 1 | grep -Eo '0-9+\.0-9+(\.0-9+)?' 2>&1 | head -n 1)
+ INSTALLED_VERSIONS$I=$("${PREFIX}/bin/${NAMESI}" --version 2>&1 | head -n 1 | grep -Eo '0-9+\.0-9+(\.0-9+)?' 2>&1 | head -n 1)
 if "${FORCE}" == false && check_version_gte "${INSTALLED_VERSIONSI}" "${VERSIONSI}"; then
 SKIP$I=true
 else
@@ -572,7 +578,13 @@
 touch "${BUILD_DIR}/${NAMES$INDEX}.log"
 mkdir -pv "${BUILD_DIR}/${NAMES$INDEX}" > "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
 cd "${SOURCE_DIR}/${NAMES$INDEX}/${PKGS$INDEX%\.tar\.*}"
- ${SUDO} python3 setup.py install >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} python3 setup.py --no-user-cfg install --root="${PREFIX}" --prefix=/ --install-scripts=/bin --install-lib=/bin --single-version-externally-managed --no-compile --force >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} sed -i.bak '1s:.*:#!/usr/bin/env python3:' "${PREFIX}/bin/${NAMES$INDEX}" >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} rm -f "${PREFIX}/bin/${NAMES$INDEX}.bak" >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} rm -rf "${PREFIX}/bin/${NAMES$INDEX}build/__pycache__" >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} rm -rf "${PREFIX}/bin/${NAMES$INDEX}-${VERSIONS$INDEX}.dist-info" 2>&1 || return 1
+ ${SUDO} mv "${PREFIX}/bin/${NAMES$INDEX}-${VERSIONS$INDEX}"*.egg-info "${PREFIX}/bin/${NAMES$INDEX}-${VERSIONS$INDEX}.dist-info" >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
+ ${SUDO} mv "${PREFIX}/bin/${NAMES$INDEX}-${VERSIONS$INDEX}.dist-info/PKG-INFO" "${PREFIX}/bin/${NAMES$INDEX}-${VERSIONS$INDEX}.dist-info/METADATA" >> "${BUILD_DIR}/${NAMES$INDEX}.log" 2>&1 || return 1
 echo ""
 fi

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/scripts/manicure.rb -> HandBrake-1.5.1.tar.xz/scripts/manicure.rb Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/scripts/mingw-w64-build -> HandBrake-1.5.1.tar.xz/scripts/mingw-w64-build Changed

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # mingw-w64-build - download and build mingw-w64 toolchain
 #
-# Copyright 2019 Bradley Sepos
+# Copyright 2020 Bradley Sepos
 # Released under the MIT License. See LICENSE for details.
 # https://github.com/bradleysepos/mingw-w64-build
 
@@ -51,16 +51,6 @@
     fi
     FAILED=()
     for I in "${!URLS@}"; do
-        if ! curl --head -Lf --connect-timeout 30 "${URLSI}" >/dev/null 2>&1; then
-            FAILED+=("${URLSI}")
-            if  "$(( ${I} + 1 ))" -lt "${#URLS@}" ; then
-                continue
-            else
-                echo "unable to download from urls: ${FAILED@}" >&2
-                echo "unable to download to file: ${FILE}" >&2
-                return 1
-            fi
-        fi
         if ! touch "${FILE}" >/dev/null 2>&1; then
             echo "unable to create path: ${FILE}" >&2
             return 1
@@ -78,6 +68,7 @@
                 return 1
             fi
         fi
+        return 0
     done
 }
 
@@ -99,6 +90,15 @@
     trap - TERM && kill -- -$$
 }
 
+# tests whether a string is an exact match for an array item
+function in_array {  # in_array needle haystack@
+    local e
+    for e in "${@:2}"; do
+         "${e}" == "${1}"  && return 0
+    done
+    return 1
+}
+
 # builds mingw-w64
 function mingw-w64-build {  # mingw-w64-build args $TARGET_PARAM $TARGET_DIR
     set -o pipefail
@@ -117,20 +117,20 @@
 
     # versions
     local CONFIG_VER BINUTILS_VER MINGW_W64_VER GMP_VER MPFR_VER MPC_VER ISL_VER GCC_VER GDB_VER VERSIONS
-    CONFIG_VER="1912ca5"  # config.guess 2019-09-12
-    BINUTILS_VER="2.33.1"
-    MINGW_W64_VER="6.0.0"
-    GMP_VER="6.1.2"
-    MPFR_VER="4.0.2"
-    MPC_VER="1.1.0"
-    ISL_VER="0.21"
-    GCC_VER="9.2.0"
+    CONFIG_VER="77632d9"  # config.guess 2020-11-07
+    BINUTILS_VER="2.35.1"
+    MINGW_W64_VER="8.0.0"
+    GMP_VER="6.2.0"
+    MPFR_VER="4.1.0"
+    MPC_VER="1.2.1"
+    ISL_VER="0.22.1"
+    GCC_VER="10.2.0"
     VERSIONS=("${CONFIG_VER}" "${BINUTILS_VER}" "${MINGW_W64_VER}" "${GMP_VER}" "${MPFR_VER}" "${MPC_VER}" "${ISL_VER}" "${GCC_VER}")
 
     # filenames
     local CONFIG_PKG BINUTILS_PKG MINGW_W64_PKG GMP_PKG MPFR_PKG MPC_PKG ISL_PKG GCC_PKG GDB_PKG PKGS
     CONFIG_PKG="config-${CONFIG_VER}.tar.gz"
-    BINUTILS_PKG="binutils-${BINUTILS_VER}.tar.xz"
+    BINUTILS_PKG="binutils-${BINUTILS_VER}.tar.bz2"
     MINGW_W64_PKG="mingw-w64-v${MINGW_W64_VER}.tar.bz2"
     GMP_PKG="gmp-${GMP_VER}.tar.bz2"
     MPFR_PKG="mpfr-${MPFR_VER}.tar.gz"
@@ -140,33 +140,34 @@
     PKGS=("${CONFIG_PKG}" "${BINUTILS_PKG}" "${MINGW_W64_PKG}" "${GMP_PKG}" "${MPFR_PKG}" "${MPC_PKG}" "${ISL_PKG}" "${GCC_PKG}")
 
     # urls
-    local CONFIG_URLS BINUTILS_URLS MINGW_W64_URLS GMP_URLS MPFR_URLS MPC_URLS ISL_URLS GCC_URLS GDB_URLS URLS_VARNAMES
-    CONFIG_URLS=("https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=${CONFIG_VER};sf=tgz")
-    BINUTILS_URLS=("https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.xz")
-    MINGW_W64_URLS=("http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_W64_VER}.tar.bz2")
-    GMP_URLS=("https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2")
-    MPFR_URLS=("https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.gz")
-    MPC_URLS=("https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz")
-    ISL_URLS=("http://isl.gforge.inria.fr/isl-${ISL_VER}.tar.bz2")
-    GCC_URLS=("https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz")
+    local CONFIG_URLS BINUTILS_URLS MINGW_W64_URLS GMP_URLS MPFR_URLS MPC_URLS ISL_URLS GCC_URLS GDB_URLS URLS_VARNAMES ARCHIVE_URL
+    ARCHIVE_URL="https://github.com/bradleysepos/mingw-w64-build-deps/releases/download/archive"
+    CONFIG_URLS=("https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=${CONFIG_VER};sf=tgz" "${ARCHIVE_URL}/${CONFIG_PKG}")
+    BINUTILS_URLS=("https://ftp.gnu.org/gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2" "${ARCHIVE_URL}/${BINUTILS_PKG}")
+    MINGW_W64_URLS=("http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_W64_VER}.tar.bz2" "${ARCHIVE_URL}/${MINGW_W64_PKG}")
+    GMP_URLS=("https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VER}.tar.bz2" "${ARCHIVE_URL}/${GMP_PKG}")
+    MPFR_URLS=("https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VER}.tar.gz" "${ARCHIVE_URL}/${MPFR_PKG}")
+    MPC_URLS=("https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VER}.tar.gz" "${ARCHIVE_URL}/${MPC_PKG}")
+    ISL_URLS=("http://isl.gforge.inria.fr/isl-${ISL_VER}.tar.bz2" "${ARCHIVE_URL}/${ISL_PKG}")
+    GCC_URLS=("https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.gz" "${ARCHIVE_URL}/${GCC_PKG}")
     URLS_VARNAMES=('CONFIG_URLS' 'BINUTILS_URLS' 'MINGW_W64_URLS' 'GMP_URLS' 'MPFR_URLS' 'MPC_URLS' 'ISL_URLS' 'GCC_URLS')
 
     # checksums
     local CONFIG_SHA256 BINUTILS_SHA256 MINGW_W64_SHA256 GMP_SHA256 MPFR_SHA256 MPC_SHA256 ISL_SHA256 GCC_SHA256 GDB_SHA256 CHECKSUMS
-    CONFIG_SHA256="3b9142de353991dada446a1bc55599838c0e066091ed63a184a9abce50f54724"
-    BINUTILS_SHA256="ab66fc2d1c3ec0359b8e08843c9f33b63e8707efdff5e4cc5c200eae24722cbf"
-    MINGW_W64_SHA256="805e11101e26d7897fce7d49cbb140d7bac15f3e085a91e0001e80b2adaf48f0"
-    GMP_SHA256="5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2"
-    MPFR_SHA256="ae26cace63a498f07047a784cd3b0e4d010b44d2b193bab82af693de57a19a78"
-    MPC_SHA256="6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e"
-    ISL_SHA256="d18ca11f8ad1a39ab6d03d3dcb3365ab416720fcb65b42d69f34f51bf0a0e859"
-    GCC_SHA256="a931a750d6feadacbeecb321d73925cd5ebb6dfa7eff0802984af3aef63759f4"
+    CONFIG_SHA256="74a9d78c80258ae18e275c272056d6a7f606230c029890c614fa805ea44bb0bf"
+    BINUTILS_SHA256="320e7a1d0f46fcd9f413f1046e216cbe23bb2bce6deb6c6a63304425e48b1942"
+    MINGW_W64_SHA256="44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762"
+    GMP_SHA256="f51c99cb114deb21a60075ffb494c1a210eb9d7cb729ed042ddb7de9534451ea"
+    MPFR_SHA256="3127fe813218f3a1f0adf4e8899de23df33b4cf4b4b3831a5314f78e65ffa2d6"
+    MPC_SHA256="17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459"
+    ISL_SHA256="1a668ef92eb181a7c021e8531a3ca89fd71aa1b3744db56f68365ab0a224c5cd"
+    GCC_SHA256="27e879dccc639cd7b0cc08ed575c1669492579529b53c9ff27b0b96265fa867d"
     CHECKSUMS=("${CONFIG_SHA256}" "${BINUTILS_SHA256}" "${MINGW_W64_SHA256}" "${GMP_SHA256}" "${MPFR_SHA256}" "${MPC_SHA256}" "${ISL_SHA256}" "${GCC_SHA256}")
 
     # internal vars
     local NAME VERSION SELF SELF_NAME HELP
     NAME="mingw-w64-build"
-    VERSION="8.0.0"
+    VERSION="9.2.0"
     SELF="${BASH_SOURCE0}"
     SELF_NAME=$(basename "${SELF}")
     HELP="\
@@ -198,7 +199,6 @@
   x86_64.distclean
   pkgclean
 default install-dir: ${HOME}/toolchains/mingw-w64-${MINGW_W64_VER}-gcc-${GCC_VER}"
-    CREL=$(echo -e "\r"$(tput el))
 
     # args
     local FORCE JOBS LIST DISABLE_GDB OPTIND OPTSPEC OPTARRAY
@@ -337,13 +337,13 @@
     if  "${DISABLE_GDB}" == false  ||  "${LIST}" == true ; then
         GDB_NAME="gdb"
         NAMES+=("${GDB_NAME}")
-        GDB_VER="8.3.1"
+        GDB_VER="10.1"
         VERSIONS+=("${GDB_VER}")
         GDB_PKG="gdb-${GDB_VER}.tar.gz"
         PKGS+=("${GDB_PKG}")
-        GDB_URLS=("https://ftp.gnu.org/gnu/gdb/gdb-${GDB_VER}.tar.gz")
+        GDB_URLS=("https://ftp.gnu.org/gnu/gdb/gdb-${GDB_VER}.tar.gz" "${ARCHIVE_URL}/${GDB_PKG}")
         URLS_VARNAMES+=('GDB_URLS')
-        GDB_SHA256="26ce655216cd03f4611518a7a1c31d80ec8e884c16715e9ba8b436822e51434b"
+        GDB_SHA256="f12f388b99e1408c01308c3f753313fafa45517740c81ab7ed0d511b13e2cf55"
         CHECKSUMS+=("${GDB_SHA256}")
     fi
 
@@ -432,12 +432,24 @@
         TARGET_DIR="${HOME}/toolchains/mingw-w64-${MINGW_W64_VER}-gcc-${GCC_VER}"
     fi
 
+    # create target directory
+    mkdir -p "${TARGET_DIR}"
+    if  ! -d "${TARGET_DIR}" ; then
+        echo "unable to create directory: ${TARGET_DIR}" >&2
+        return 1
+    fi
+
     # directories
-    local MINGW_W64_DIR PKG_DIR SOURCE_DIR BUILD_DIR
+    local BASE_DIR MINGW_W64_DIR PKG_DIR SOURCE_DIR BUILD_DIR LOG_DIR
+    BASE_DIR=$(pwd)
+    cd "${TARGET_DIR}"
+    TARGET_DIR=$(pwd)
+    cd "${BASE_DIR}"
     MINGW_W64_DIR="${TARGET_DIR}/${PREFIX}"
     PKG_DIR="${TARGET_DIR}/pkg"
     SOURCE_DIR="${TARGET_DIR}/source.noindex"
     BUILD_DIR="${TARGET_DIR}/build-${PREFIX}.noindex"
+    LOG_DIR="${BUILD_DIR}"
 
     # clean
     case "${TARGET_PARAM}" in
@@ -469,7 +481,7 @@
         CLEAN_TOTAL=$((CLEAN_TOTAL+1))
         printf "Cleaning    %02i/%02i dist " "${CLEAN_INDEX}" "${CLEAN_TOTAL}"
         rm -rf "${MINGW_W64_DIR}"
-        echo -en "${CREL}"
+        echo ""
     elif  -e "${MINGW_W64_DIR}" ; then
         # prefix dir should not exist
         echo "unable to create directory (exists): ${MINGW_W64_DIR}" >&2
@@ -480,29 +492,20 @@
     printf "Cleaning    %02i/%02i source " "${CLEAN_INDEX}" "${CLEAN_TOTAL}"
     rm -rf "${SOURCE_DIR}"
     CLEAN_INDEX=$((CLEAN_INDEX+1))
-    echo -en "${CREL}"
+    echo ""
     printf "Cleaning    %02i/%02i build " "${CLEAN_INDEX}" "${CLEAN_TOTAL}"
     rm -rf "${BUILD_DIR}"
 
-    # create target directory
-    mkdir -p "${TARGET_DIR}"
-    if  ! -d "${TARGET_DIR}" ; then
-        echo "unable to create directory: ${TARGET_DIR}" >&2
-        return 1
-    fi
-
     # verify/fetch
     mkdir -p "${PKG_DIR}"
     if  ! -d "${PKG_DIR}" ; then
         echo "unable to create directory: ${PKG_DIR}" >&2
         return 1
     fi
-    echo ""
-    echo -n "Downloading "
     local DOWNLOAD_VERBOSE I URLS_IREF URLS CHECKSUM
     DOWNLOAD_VERBOSE=false
     for I in "${!PKGS@}"; do
-        echo -en "${CREL}"
+        echo ""
         printf "Downloading %02i/%02i %s " "$((I+1))" "${#PKGS@}" "${NAMESI} ${VERSIONSI}"
         URLS_IREF="${URLS_VARNAMESI}@"
         URLS="${!URLS_IREF}"
@@ -525,10 +528,8 @@
         echo "unable to create directory: ${SOURCE_DIR}" >&2
         return 1
     fi
-    echo ""
-    echo -n "Extracting "
     for I in "${!PKGS@}"; do
-        echo -en "${CREL}"
+        echo ""
         printf "Extracting  %02i/%02i %s " "$((I+1))" "${#PKGS@}" "${PKGSI}"
         if  -e "${SOURCE_DIR}/${NAMESI}" ; then
             rm -rf "${SOURCE_DIR}/${NAMESI}"
@@ -561,30 +562,28 @@
     if  "${DISABLE_GDB}" == true ; then
         TOTAL="$((${TOTAL} - 1))"
     fi
-    echo ""
-    echo -n "Building "
 
     # binutils
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "1" "${TOTAL}" "binutils ${BINUTILS_VER}"
-    touch "${BUILD_DIR}/binutils.log"
-    mkdir -pv "${BUILD_DIR}/binutils" > "${BUILD_DIR}/binutils.log" 2>&1 || return 1
+    touch "${LOG_DIR}/binutils.log"
+    mkdir -pv "${BUILD_DIR}/binutils" > "${LOG_DIR}/binutils.log" 2>&1 || return 1
     cd "${BUILD_DIR}/binutils"
-    "${SOURCE_DIR}/binutils/binutils-${BINUTILS_VER}/configure" CC=gcc CXX=g++ --build="${SYS_TYPE}" --target="${TARGET}" --with-sysroot="${MINGW_W64_DIR}" --prefix="${MINGW_W64_DIR}" --disable-multilib --disable-werror --disable-shared --enable-static >> "${BUILD_DIR}/binutils.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/binutils.log" 2>&1 || return 1
-    make install-strip >> "${BUILD_DIR}/binutils.log" 2>&1 || return 1
+    "${SOURCE_DIR}/binutils/binutils-${BINUTILS_VER}/configure" CC=gcc CXX=g++ --build="${SYS_TYPE}" --target="${TARGET}" --with-sysroot="${MINGW_W64_DIR}" --prefix="${MINGW_W64_DIR}" --disable-multilib --disable-nls --disable-werror --enable-lto --disable-shared --enable-static >> "${LOG_DIR}/binutils.log" 2>&1 || return 1
+    make -j "${JOBS}" MAKEINFO=true >> "${LOG_DIR}/binutils.log" 2>&1 || return 1
+    make install-strip MAKEINFO=true >> "${LOG_DIR}/binutils.log" 2>&1 || return 1
 
     # update PATH
     export PATH="${MINGW_W64_DIR}/bin:${PATH}"
 
     # mingw-w64 headers
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "2" "${TOTAL}" "mingw-w64 ${MINGW_W64_VER} headers"
-    touch "${BUILD_DIR}/mingw-w64-headers.log"
-    mkdir -pv "${BUILD_DIR}/mingw-w64-headers" > "${BUILD_DIR}/mingw-w64-headers.log" 2>&1 || return 1
+    touch "${LOG_DIR}/mingw-w64-headers.log"
+    mkdir -pv "${BUILD_DIR}/mingw-w64-headers" > "${LOG_DIR}/mingw-w64-headers.log" 2>&1 || return 1
     cd "${BUILD_DIR}/mingw-w64-headers"
-    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-headers/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" >> "${BUILD_DIR}/mingw-w64-headers.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/mingw-w64-headers.log" 2>&1 || return 1
+    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-headers/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" >> "${LOG_DIR}/mingw-w64-headers.log" 2>&1 || return 1
+    make install-strip >> "${LOG_DIR}/mingw-w64-headers.log" 2>&1 || return 1
 
     # create symlinks
     cd "${MINGW_W64_DIR}"
@@ -604,73 +603,73 @@
     fi
 
     # gmp
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "3" "${TOTAL}" "gmp ${GMP_VER}"
-    touch "${BUILD_DIR}/gmp.log"
+    touch "${LOG_DIR}/gmp.log"
     local GMP_DIR
     GMP_DIR="${BUILD_DIR}/gmp-${GMP_VER}-${SYS_ARCH}"
-    mkdir -pv "${BUILD_DIR}/gmp" > "${BUILD_DIR}/gmp.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/gmp" > "${LOG_DIR}/gmp.log" 2>&1 || return 1
     cd "${BUILD_DIR}/gmp"
-    "${SOURCE_DIR}/gmp/gmp-${GMP_VER}/configure" CC=gcc CXX=g++ CPPFLAGS=-fexceptions --build="${SYS_TYPE}" --prefix="${GMP_DIR}" --enable-cxx --disable-shared --enable-static >> "${BUILD_DIR}/gmp.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/gmp.log" 2>&1 || return 1
-    make check >> "${BUILD_DIR}/gmp.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/gmp.log" 2>&1 || return 1
+    "${SOURCE_DIR}/gmp/gmp-${GMP_VER}/configure" CC=gcc CXX=g++ CPPFLAGS=-fexceptions --build="${SYS_TYPE}" --prefix="${GMP_DIR}" --enable-cxx --disable-shared --enable-static >> "${LOG_DIR}/gmp.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/gmp.log" 2>&1 || return 1
+    make check >> "${LOG_DIR}/gmp.log" 2>&1 || return 1
+    make install >> "${LOG_DIR}/gmp.log" 2>&1 || return 1
 
     # mpfr
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "4" "${TOTAL}" "mpfr ${MPFR_VER}"
-    touch "${BUILD_DIR}/mpfr.log"
+    touch "${LOG_DIR}/mpfr.log"
     local MPFR_DIR
     MPFR_DIR="${BUILD_DIR}/mpfr-${MPFR_VER}-${SYS_ARCH}"
-    mkdir -pv "${BUILD_DIR}/mpfr" > "${BUILD_DIR}/mpfr.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/mpfr" > "${LOG_DIR}/mpfr.log" 2>&1 || return 1
     cd "${BUILD_DIR}/mpfr"
-    "${SOURCE_DIR}/mpfr/mpfr-${MPFR_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib" --build="${SYS_TYPE}" --prefix="${MPFR_DIR}" --with-gmp="${GMP_DIR}" --disable-shared --enable-static >> "${BUILD_DIR}/mpfr.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/mpfr.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/mpfr.log" 2>&1 || return 1
+    "${SOURCE_DIR}/mpfr/mpfr-${MPFR_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib" --build="${SYS_TYPE}" --prefix="${MPFR_DIR}" --with-gmp="${GMP_DIR}" --disable-shared --enable-static >> "${LOG_DIR}/mpfr.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/mpfr.log" 2>&1 || return 1
+    make install >> "${LOG_DIR}/mpfr.log" 2>&1 || return 1
 
     # mpc
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "5" "${TOTAL}" "mpc ${MPC_VER}"
-    touch "${BUILD_DIR}/mpc.log"
+    touch "${LOG_DIR}/mpc.log"
     local MPC_DIR
     MPC_DIR="${BUILD_DIR}/mpc-${MPC_VER}-${SYS_ARCH}"
-    mkdir -pv "${BUILD_DIR}/mpc" > "${BUILD_DIR}/mpc.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/mpc" > "${LOG_DIR}/mpc.log" 2>&1 || return 1
     cd "${BUILD_DIR}/mpc"
-    "${SOURCE_DIR}/mpc/mpc-${MPC_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib -L${MPFR_DIR}/lib" --build="${SYS_TYPE}" --prefix="${MPC_DIR}" --with-gmp="${GMP_DIR}" --with-mpfr="${MPFR_DIR}" --disable-shared --enable-static >> "${BUILD_DIR}/mpc.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/mpc.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/mpc.log" 2>&1 || return 1
+    "${SOURCE_DIR}/mpc/mpc-${MPC_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib -L${MPFR_DIR}/lib" --build="${SYS_TYPE}" --prefix="${MPC_DIR}" --with-gmp="${GMP_DIR}" --with-mpfr="${MPFR_DIR}" --disable-shared --enable-static >> "${LOG_DIR}/mpc.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/mpc.log" 2>&1 || return 1
+    make install >> "${LOG_DIR}/mpc.log" 2>&1 || return 1
 
     # isl
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "6" "${TOTAL}" "isl ${ISL_VER}"
-    touch "${BUILD_DIR}/isl.log"
+    touch "${LOG_DIR}/isl.log"
     local ISL_DIR
     ISL_DIR="${BUILD_DIR}/isl-${ISL_VER}-${SYS_ARCH}"
-    mkdir -pv "${BUILD_DIR}/isl" > "${BUILD_DIR}/isl.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/isl" > "${LOG_DIR}/isl.log" 2>&1 || return 1
     cd "${BUILD_DIR}/isl"
-    "${SOURCE_DIR}/isl/isl-${ISL_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib" --build="${SYS_TYPE}" --prefix="${ISL_DIR}" --with-gmp="${GMP_DIR}" --disable-shared --enable-static >> "${BUILD_DIR}/isl.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/isl.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/isl.log" 2>&1 || return 1
+    "${SOURCE_DIR}/isl/isl-${ISL_VER}/configure" CC=gcc CXX=g++ CFLAGS="-I${GMP_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib" --build="${SYS_TYPE}" --prefix="${ISL_DIR}" --with-gmp="${GMP_DIR}" --disable-shared --enable-static >> "${LOG_DIR}/isl.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/isl.log" 2>&1 || return 1
+    make install >> "${LOG_DIR}/isl.log" 2>&1 || return 1
 
     # gcc compilers
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "7" "${TOTAL}" "gcc ${GCC_VER} compilers"
-    touch "${BUILD_DIR}/gcc.log"
+    touch "${LOG_DIR}/gcc.log"
     local GCC_CONFIG_EXTRA
     GCC_CONFIG_EXTRA=()
     if  "${SYS_NAME}" == "darwin" ; then
         GCC_CONFIG_EXTRA+=("--with-system-zlib")
     fi
-    mkdir -pv "${BUILD_DIR}/gcc" > "${BUILD_DIR}/gcc.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/gcc" > "${LOG_DIR}/gcc.log" 2>&1 || return 1
     cd "${BUILD_DIR}/gcc"
-    "${SOURCE_DIR}/gcc/gcc-${GCC_VER}/configure" CFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include -I${MPC_DIR}/include -I${ISL_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include -I${MPC_DIR}/include -I${ISL_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib -L${MPFR_DIR}/lib -L${MPC_DIR}/lib -L${ISL_DIR}/lib" --build="${SYS_TYPE}" --host="${SYS_TYPE}" --target="${TARGET}" --prefix="${MINGW_W64_DIR}" --with-sysroot="${MINGW_W64_DIR}" --with-gmp="${GMP_DIR}" --with-mpfr="${MPFR_DIR}" --with-mpc="${MPC_DIR}" --with-isl="${ISL_DIR}" --disable-multilib --disable-nls --disable-libstdcxx-pch --disable-win32-registry --enable-checking=release --enable-languages=c,c++ --enable-lto --disable-shared --enable-static "${GCC_CONFIG_EXTRA@}" >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
-    make -j "${JOBS}" all-gcc >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
-    make install-gcc >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
+    "${SOURCE_DIR}/gcc/gcc-${GCC_VER}/configure" CFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include -I${MPC_DIR}/include -I${ISL_DIR}/include" CPPFLAGS="-I${GMP_DIR}/include -I${MPFR_DIR}/include -I${MPC_DIR}/include -I${ISL_DIR}/include" LDFLAGS="-L${GMP_DIR}/lib -L${MPFR_DIR}/lib -L${MPC_DIR}/lib -L${ISL_DIR}/lib" --build="${SYS_TYPE}" --host="${SYS_TYPE}" --target="${TARGET}" --prefix="${MINGW_W64_DIR}" --with-sysroot="${MINGW_W64_DIR}" --with-gmp="${GMP_DIR}" --with-mpfr="${MPFR_DIR}" --with-mpc="${MPC_DIR}" --with-isl="${ISL_DIR}" --disable-multilib --disable-nls --disable-libstdcxx-pch --disable-win32-registry --enable-checking=release --enable-languages=c,c++ --enable-lto --disable-shared --enable-static "${GCC_CONFIG_EXTRA@}" >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
+    make -j "${JOBS}" all-gcc >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
+    make install-strip-gcc >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
 
     # mingw-w64 runtime
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "8" "${TOTAL}" "mingw-w64 ${MINGW_W64_VER} runtime"
-    touch "${BUILD_DIR}/mingw-w64-crt.log"
+    touch "${LOG_DIR}/mingw-w64-crt.log"
     export CC=""
     export CXX=""
     local MINGW_W64_CONFIG_EXTRA
@@ -680,11 +679,11 @@
     elif  "${TARGET}" == "${TARGET_x86_64}" ; then
         MINGW_W64_CONFIG_EXTRA+=("--enable-lib64" "--disable-lib32")
     fi
-    mkdir -pv "${BUILD_DIR}/mingw-w64-crt" > "${BUILD_DIR}/mingw-w64-crt.log" 2>&1 || return 1
+    mkdir -pv "${BUILD_DIR}/mingw-w64-crt" > "${LOG_DIR}/mingw-w64-crt.log" 2>&1 || return 1
     cd "${BUILD_DIR}/mingw-w64-crt"
-    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-crt/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" --with-sysroot="${MINGW_W64_DIR}" "${MINGW_W64_CONFIG_EXTRA@}" >> "${BUILD_DIR}/mingw-w64-crt.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/mingw-w64-crt.log" 2>&1 || return 1
-    make install-strip >> "${BUILD_DIR}/mingw-w64-crt.log" 2>&1 || return 1
+    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-crt/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" --with-sysroot="${MINGW_W64_DIR}" "${MINGW_W64_CONFIG_EXTRA@}" >> "${LOG_DIR}/mingw-w64-crt.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/mingw-w64-crt.log" 2>&1 || return 1
+    make install-strip >> "${LOG_DIR}/mingw-w64-crt.log" 2>&1 || return 1
 
     # relocate and symlink libs
     cd "${MINGW_W64_DIR}"
@@ -694,39 +693,41 @@
     ln -s ../lib lib
 
     # gcc libraries
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "9" "${TOTAL}" "gcc ${GCC_VER} libraries"
-    touch "${BUILD_DIR}/gcc.log"
+    touch "${LOG_DIR}/gcc.log"
     cd "${BUILD_DIR}/gcc"
-    make -j "${JOBS}" all-target-libgcc >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
-    make -j "${JOBS}" install-target-libgcc >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
-    make install-strip >> "${BUILD_DIR}/gcc.log" 2>&1 || return 1
+    make -j "${JOBS}" all-target-libgcc >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
+    make -j "${JOBS}" install-target-libgcc >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
+    make install-strip >> "${LOG_DIR}/gcc.log" 2>&1 || return 1
 
     # winpthreads
-    echo -en "${CREL}"
+    echo ""
     printf "Building    %02i/%02i %s " "10" "${TOTAL}" "winpthreads"
-    touch "${BUILD_DIR}/winpthreads.log"
-    mkdir -pv "${BUILD_DIR}/winpthreads" > "${BUILD_DIR}/winpthreads.log" 2>&1 || return 1
+    touch "${LOG_DIR}/winpthreads.log"
+    mkdir -pv "${BUILD_DIR}/winpthreads" > "${LOG_DIR}/winpthreads.log" 2>&1 || return 1
     cd "${BUILD_DIR}/winpthreads"
-    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-libraries/winpthreads/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" --disable-shared --enable-static >> "${BUILD_DIR}/winpthreads.log" 2>&1 || return 1
-    make -j "${JOBS}" >> "${BUILD_DIR}/winpthreads.log" 2>&1 || return 1
-    make install >> "${BUILD_DIR}/winpthreads.log" 2>&1 || return 1
+    "${SOURCE_DIR}/mingw-w64/mingw-w64-v${MINGW_W64_VER}/mingw-w64-libraries/winpthreads/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" --disable-shared --enable-static >> "${LOG_DIR}/winpthreads.log" 2>&1 || return 1
+    make -j "${JOBS}" >> "${LOG_DIR}/winpthreads.log" 2>&1 || return 1
+    make install-strip >> "${LOG_DIR}/winpthreads.log" 2>&1 || return 1
 
     # gdb
     if  "${DISABLE_GDB}" == false ; then
-        echo -en "${CREL}"
+        echo ""
         printf "Building    %02i/%02i %s " "11" "${TOTAL}" "gdb"
-        touch "${BUILD_DIR}/gdb.log"
-        mkdir -pv "${BUILD_DIR}/gdb" > "${BUILD_DIR}/gdb.log" 2>&1 || return 1
+        touch "${LOG_DIR}/gdb.log"
+        mkdir -pv "${BUILD_DIR}/gdb" > "${LOG_DIR}/gdb.log" 2>&1 || return 1
         cd "${BUILD_DIR}/gdb"
         # https://sourceware.org/bugzilla/show_bug.cgi?id=18113
         echo '#!/bin/sh' > makeinfo
         echo 'echo "makeinfo (GNU texinfo) 5.2"' >> makeinfo
         chmod a+x makeinfo
-        "${SOURCE_DIR}/gdb/gdb-${GDB_VER}/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" --disable-shared --enable-static MAKEINFO="${BUILD_DIR}/gdb/makeinfo" >> "${BUILD_DIR}/gdb.log" 2>&1 || return 1
-        make -j "${JOBS}" >> "${BUILD_DIR}/gdb.log" 2>&1 || return 1
-        make install >> "${BUILD_DIR}/gdb.log" 2>&1 || return 1
+        "${SOURCE_DIR}/gdb/gdb-${GDB_VER}/configure" --build="${SYS_TYPE}" --host="${TARGET}" --prefix="${MINGW_W64_DIR}" -disable-multilib --enable-checking=release --enable-languages=c,c++ --enable-lto --disable-shared --enable-static MAKEINFO="${BUILD_DIR}/gdb/makeinfo" >> "${LOG_DIR}/gdb.log" 2>&1 || return 1
+        make -j "${JOBS}" >> "${LOG_DIR}/gdb.log" 2>&1 || return 1
+        make install >> "${LOG_DIR}/gdb.log" 2>&1 || return 1
+        "${TARGET}"-strip "${MINGW_W64_DIR}/bin/gdb.exe" >> "${LOG_DIR}/gdb.log" 2>&1 || return 1
+        "${TARGET}"-strip "${MINGW_W64_DIR}/bin/gdbserver.exe" >> "${LOG_DIR}/gdb.log" 2>&1 || return 1
     fi
 
     # clean up
@@ -754,9 +755,17 @@
 trap - EXIT INT TERM
 
 if  "${CODE}" -ne 0 ; then
+    PARAMS=()
+    for PARAM in "${@}"; do
+        if  "${PARAM#-}" != "${PARAM}" ; then
+            continue
+        fi
+        PARAMS+=("${PARAM}")
+    done
+    TDIR="${PARAMS1}"
     echo ""
     echo "error: subprocess returned non-zero error code (${CODE})" >&2
-    echo "logs and temporary files may exist at ${2:-$HOME/toolchains}" >&2
+    echo "logs and temporary files may exist at ${TDIR:-$HOME/toolchains}" >&2
     exit 1
 fi
 exit 0

HandBrake-1.5.1.tar.xz/test/fr.handbrake.HandBrakeCLI.metainfo.xml.template Added

@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<component type="console-application">
+ <id>fr.handbrake.HandBrakeCLI</id>
+ <metadata_license>CC0</metadata_license>
+ <project_license>GPL-2.0+</project_license>
+ <name>HandBrakeCLI</name>
+ <summary>Video Transcoder</summary>
+
+ <description>
+ 
+ HandBrake is a tool for converting video from nearly any format to a
+ selection of modern, widely supported codecs.
+ 
+ Reasons you'll love Handbrake:
+ <ul>
+ <li>Convert video from nearly any format</li>
+ <li>Free and Open Source</li>
+ <li>Multi-Platform (Windows, Mac and Linux)</li>
+ </ul>
+ </description>
+
+ <url type="homepage">https://handbrake.fr/</url>
+ <url type="help">https://handbrake.fr/docs/</url>
+ <url type="bugtracker">https://github.com/HandBrake/HandBrake/issues</url>
+ <mimetypes>
+ <mimetype>application/ogg</mimetype>
+ <mimetype>application/x-extension-mp4</mimetype>
+ <mimetype>application/x-flac</mimetype>
+ <mimetype>application/x-matroska</mimetype>
+ <mimetype>application/x-ogg</mimetype>
+ <mimetype>audio/ac3</mimetype>
+ <mimetype>audio/mp4</mimetype>
+ <mimetype>audio/mpeg</mimetype>
+ <mimetype>audio/ogg</mimetype>
+ <mimetype>audio/x-flac</mimetype>
+ <mimetype>audio/x-matroska</mimetype>
+ <mimetype>audio/x-mp3</mimetype>
+ <mimetype>audio/x-mpeg</mimetype>
+ <mimetype>audio/x-vorbis</mimetype>
+ <mimetype>video/mp4</mimetype>
+ <mimetype>video/mp4v-es</mimetype>
+ <mimetype>video/mpeg</mimetype>
+ <mimetype>video/msvideo</mimetype>
+ <mimetype>video/quicktime</mimetype>
+ <mimetype>video/vnd.divx</mimetype>
+ <mimetype>video/x-avi</mimetype>
+ <mimetype>video/x-m4v</mimetype>
+ <mimetype>video/x-matroska</mimetype>
+ <mimetype>video/x-mpeg</mimetype>
+ <mimetype>video/ogg</mimetype>
+ <mimetype>video/x-ogm+ogg</mimetype>
+ <mimetype>video/x-theora+ogg</mimetype>
+ <mimetype>x-content/video-dvd</mimetype>
+ <mimetype>x-content/video-vcd</mimetype>
+ <mimetype>x-content/video-svcd</mimetype>
+ </mimetypes>
+
+ <provides>
+ <binary>HandBrakeCLI</binary>
+ </provides>
+
+ <releases>
+ RELEASE_TAG
+ </releases>
+
+ <content_rating type="oars-1.1">
+ <content_attribute id="violence-cartoon">none</content_attribute>
+ <content_attribute id="violence-fantasy">none</content_attribute>
+ <content_attribute id="violence-realistic">none</content_attribute>
+ <content_attribute id="violence-bloodshed">none</content_attribute>
+ <content_attribute id="violence-sexual">none</content_attribute>
+ <content_attribute id="violence-desecration">none</content_attribute>
+ <content_attribute id="violence-slavery">none</content_attribute>
+ <content_attribute id="violence-worship">none</content_attribute>
+ <content_attribute id="drugs-alcohol">none</content_attribute>
+ <content_attribute id="drugs-narcotics">none</content_attribute>
+ <content_attribute id="drugs-tobacco">none</content_attribute>
+ <content_attribute id="sex-nudity">none</content_attribute>
+ <content_attribute id="sex-themes">none</content_attribute>
+ <content_attribute id="sex-homosexuality">none</content_attribute>
+ <content_attribute id="sex-prostitution">none</content_attribute>
+ <content_attribute id="sex-adultery">none</content_attribute>
+ <content_attribute id="sex-appearance">none</content_attribute>
+ <content_attribute id="language-profanity">none</content_attribute>
+ <content_attribute id="language-humor">none</content_attribute>
+ <content_attribute id="language-discrimination">none</content_attribute>
+ <content_attribute id="social-chat">none</content_attribute>
+ <content_attribute id="social-info">none</content_attribute>
+ <content_attribute id="social-audio">none</content_attribute>
+ <content_attribute id="social-location">none</content_attribute>
+ <content_attribute id="social-contacts">none</content_attribute>
+ <content_attribute id="money-purchasing">none</content_attribute>
+ <content_attribute id="money-gambling">none</content_attribute>
+ </content_rating>
+
+</component>
+

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/module.defs -> HandBrake-1.5.1.tar.xz/test/module.defs Changed

@@ -15,16 +15,16 @@
 
 TEST.GCC.l = \
         ass avformat avfilter avcodec avutil swresample postproc mp3lame dvdnav \
-        dvdread fribidi \
-        swscale vpx theoraenc theoradec vorbis vorbisenc ogg x264 \
-        bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d
+        dvdread fribidi swscale vpx theoraenc theoradec vorbis vorbisenc ogg \
+        x264 bluray freetype xml2 bz2 z jansson harfbuzz opus speex lzma dav1d \
+        turbojpeg zimg
 
 ifeq (,$(filter $(HOST.system),darwin cygwin mingw))
     TEST.GCC.l += fontconfig
 endif
 
 ifeq (1,$(FEATURE.qsv))
-    TEST.GCC.l += mfx
+    TEST.GCC.l += vpl
 ifneq (,$(filter $(HOST.system),linux freebsd))
     TEST.GCC.l += va va-drm
 endif
@@ -38,9 +38,9 @@
 
 TEST.install.exe = $(DESTDIR)$(PREFIX/)bin/$(notdir $(TEST.exe))
 ifeq (1,$(FEATURE.flatpak))
-    TEST.appdata.template = $(TEST.src/)fr.handbrake.HandBrakeCLI.appdata.xml.template
-    TEST.appdata = $(TEST.build/)fr.handbrake.HandBrakeCLI.appdata.xml
-    TEST.install.appdata = $(DESTDIR)$(PREFIX/)share/metainfo/$(notdir $(TEST.appdata))
+    TEST.metainfo.template = $(TEST.src/)fr.handbrake.HandBrakeCLI.metainfo.xml.template
+    TEST.metainfo = $(TEST.build/)fr.handbrake.HandBrakeCLI.metainfo.xml
+    TEST.install.metainfo = $(DESTDIR)$(PREFIX/)share/metainfo/$(notdir $(TEST.metainfo))
 endif
 
 ###############################################################################
@@ -48,13 +48,13 @@
 TEST.out += $(TEST.c.o)
 TEST.out += $(TEST.exe)
 ifeq (1,$(FEATURE.flatpak))
-    TEST.out += $(TEST.appdata)
+    TEST.out += $(TEST.metainfo)
 endif
 
 BUILD.out += $(TEST.out)
 BUILD.out += $(TEST.install.exe)
 ifeq (1,$(FEATURE.flatpak))
-    BUILD.out += $(TEST.install.appdata)
+    BUILD.out += $(TEST.install.metainfo)
 endif
 
 ###############################################################################
@@ -62,7 +62,7 @@
 TEST.GCC.I += $(LIBHB.GCC.I)
 
 ifeq ($(HOST.system),darwin)
-    TEST.GCC.f += IOKit CoreServices CoreText CoreGraphics AudioToolbox VideoToolbox CoreMedia CoreVideo Foundation
+    TEST.GCC.f += IOKit CoreServices CoreText CoreGraphics AudioToolbox VideoToolbox CoreMedia CoreVideo Foundation DiskArbitration
     TEST.GCC.l += iconv
 else ifeq ($(HOST.system),linux)
     TEST.GCC.l += pthread dl m
@@ -89,7 +89,10 @@
 else
     TEST.GCC.l += pthreadGC2
 endif
-    TEST.GCC.l += bcrypt iconv ws2_32 regex uuid ole32
+    TEST.GCC.l += bcrypt iconv ws2_32 regex uuid ole32 gdi32
+    ifeq (1,$(FEATURE.mf))
+        TEST.GCC.l += mfplat strmiids
+    endif
     TEST.GCC.D += PTW32_STATIC_LIB
     TEST.GCC.args.extra.exe++ += -static
 endif #   (1-mingw,$(HOST.cross)-$(HOST.system))

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/module.rules -> HandBrake-1.5.1.tar.xz/test/module.rules Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/parsecsv.c -> HandBrake-1.5.1.tar.xz/test/parsecsv.c Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/parsecsv.h -> HandBrake-1.5.1.tar.xz/test/parsecsv.h Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/test/test.c -> HandBrake-1.5.1.tar.xz/test/test.c Changed

@@ -1,6 +1,6 @@
 /* test.c
 
- Copyright (c) 2003-2020 HandBrake Team
+ Copyright (c) 2003-2022 HandBrake Team
 This file is part of the HandBrake source code
 Homepage: <http://handbrake.fr/>.
 It may be used under the terms of the GNU General Public License v2.
@@ -57,6 +57,7 @@
 #define HQDN3D_DEFAULT_PRESET "medium"
 #define ROTATE_DEFAULT "angle=180:hflip=0"
 #define DEBLOCK_DEFAULT_PRESET "medium"
+#define COLORSPACE_DEFAULT_PRESET "bt709"
 
 /* Options */
 static int debug = HB_DEBUG_ALL;
@@ -75,6 +76,9 @@
 static int twoPass = -1;
 static int pad_disable = 0;
 static char * pad = NULL;
+static int colorspace_disable = 0;
+static int colorspace_custom = 0;
+static char * colorspace = NULL;
 static int deinterlace_disable = 0;
 static int deinterlace_custom = 0;
 static char * deinterlace = NULL;
@@ -195,6 +199,7 @@
 static uint64_t min_title_duration = 10;
 #if HB_PROJECT_FEATURE_QSV
 static int qsv_async_depth = -1;
+static int qsv_adapter = -1;
 static int qsv_decode = -1;
 #endif
 
@@ -1230,6 +1235,7 @@
 case HB_FILTER_DEINTERLACE:
 case HB_FILTER_NLMEANS:
 case HB_FILTER_CHROMA_SMOOTH:
+ case HB_FILTER_COLORSPACE:
 case HB_FILTER_UNSHARP:
 case HB_FILTER_LAPSHARP:
 case HB_FILTER_DECOMB:
@@ -1345,11 +1351,13 @@
 " Start encoding at a given offset in seconds,\n"
 " frames, or pts (on a 90kHz clock)\n"
 " (e.g. seconds:10, frames:300, pts:900000).\n"
+" Units must match --stop-at units, if specified.\n"
 " --stop-at <string:number>\n"
 " Stop encoding after a given duration in seconds,\n"
 " frames, or pts (on a 90kHz clock) has passed\n"
 " (e.g. seconds:10, frames:300, pts:900000).\n"
 " Duration is relative to --start-at, if specified.\n"
+" Units must match --start-at units, if specified.\n"
 "\n"
 "\n"
 "Destination Options ----------------------------------------------------------\n"
@@ -1611,7 +1619,7 @@
 encoder = NULL;
 while ((encoder = hb_audio_encoder_get_next(encoder)) != NULL)
 {
- if (hb_audio_dither_is_supported(encoder->codec))
+ if (hb_audio_dither_is_supported(encoder->codec, 0))
 {
 fprintf(out, " %s\n", encoder->short_name);
 }
@@ -1791,6 +1799,10 @@
 " The position of image in pad may also be set.\n");
 showFilterKeys(out, HB_FILTER_PAD);
 fprintf( out,
+" --colorspace <string> Convert colorspace, transfer characteristics or color primaries.\n");
+ showFilterPresets(out, HB_FILTER_COLORSPACE);
+ showFilterKeys(out, HB_FILTER_COLORSPACE);
+ fprintf( out,
 " -g, --grayscale Grayscale encoding\n"
 " --no-grayscale Disable preset 'grayscale'\n"
 "\n"
@@ -1927,8 +1939,15 @@
 " explicitly synchronized.\n"
 " Omit 'number' for zero.\n"
 " (default: 4)\n"
+ );
+#if defined(_WIN32) || defined(__MINGW32__)
+ fprintf( out,
+" --qsv-adapter=index\n"
+" Set QSV hardware graphics adapter index\n"
+" (default: QSV hardware graphics adapter with highest hardware generation)\n"
 "\n"
 );
+#endif
 }
 #endif
 }
@@ -2135,35 +2154,36 @@
 #define AUDIO_DITHER 294
 #define QSV_BASELINE 295
 #define QSV_ASYNC_DEPTH 296
- #define QSV_IMPLEMENTATION 297
- #define FILTER_NLMEANS 298
- #define FILTER_NLMEANS_TUNE 299
- #define AUDIO_LANG_LIST 300
- #define SUBTITLE_LANG_LIST 301
- #define PRESET_EXPORT 302
- #define PRESET_EXPORT_DESC 303
- #define PRESET_EXPORT_FILE 304
- #define PRESET_IMPORT 305
- #define PRESET_IMPORT_GUI 306
- #define VERSION 307
- #define DESCRIBE 308
- #define PAD 309
- #define FILTER_COMB_DETECT 310
- #define QUEUE_IMPORT 311
- #define FILTER_UNSHARP 312
- #define FILTER_UNSHARP_TUNE 313
- #define FILTER_LAPSHARP 314
- #define FILTER_LAPSHARP_TUNE 315
- #define JSON_LOGGING 316
- #define SSA_FILE 317
- #define SSA_OFFSET 318
- #define SSA_LANG 319
- #define SSA_DEFAULT 320
- #define SSA_BURN 321
- #define FILTER_CHROMA_SMOOTH 322
- #define FILTER_CHROMA_SMOOTH_TUNE 323
- #define FILTER_DEBLOCK_TUNE 324
-
+ #define QSV_ADAPTER 297
+ #define QSV_IMPLEMENTATION 298
+ #define FILTER_NLMEANS 299
+ #define FILTER_NLMEANS_TUNE 300
+ #define AUDIO_LANG_LIST 301
+ #define SUBTITLE_LANG_LIST 302
+ #define PRESET_EXPORT 303
+ #define PRESET_EXPORT_DESC 304
+ #define PRESET_EXPORT_FILE 305
+ #define PRESET_IMPORT 306
+ #define PRESET_IMPORT_GUI 307
+ #define VERSION 308
+ #define DESCRIBE 309
+ #define PAD 310
+ #define FILTER_COMB_DETECT 311
+ #define QUEUE_IMPORT 312
+ #define FILTER_UNSHARP 313
+ #define FILTER_UNSHARP_TUNE 314
+ #define FILTER_LAPSHARP 315
+ #define FILTER_LAPSHARP_TUNE 316
+ #define JSON_LOGGING 317
+ #define SSA_FILE 318
+ #define SSA_OFFSET 319
+ #define SSA_LANG 320
+ #define SSA_DEFAULT 321
+ #define SSA_BURN 322
+ #define FILTER_CHROMA_SMOOTH 323
+ #define FILTER_CHROMA_SMOOTH_TUNE 324
+ #define FILTER_DEBLOCK_TUNE 325
+ #define FILTER_COLORSPACE 326
 for( ;; )
 {
 static struct option long_options =
@@ -2177,6 +2197,7 @@
 #if HB_PROJECT_FEATURE_QSV
 { "qsv-baseline", no_argument, NULL, QSV_BASELINE, },
 { "qsv-async-depth", required_argument, NULL, QSV_ASYNC_DEPTH, },
+ { "qsv-adapter", required_argument, NULL, QSV_ADAPTER },
 { "qsv-implementation", required_argument, NULL, QSV_IMPLEMENTATION, },
 { "disable-qsv-decoding", no_argument, &qsv_decode, 0, },
 { "enable-qsv-decoding", no_argument, &qsv_decode, 1, },
@@ -2282,6 +2303,8 @@
 { "no-loose-crop", no_argument, &loose_crop, 0 },
 { "pad", required_argument, NULL, PAD },
 { "no-pad", no_argument, &pad_disable, 1 },
+ { "colorspace", required_argument, NULL, FILTER_COLORSPACE},
+ { "no-colorspace", no_argument, &colorspace_disable, 1 },
 
 // mapping of legacy option names for backwards compatibility
 { "qsv-preset", required_argument, NULL, ENCODER_PRESET, },
@@ -2732,6 +2755,17 @@
 free(nlmeans_tune);
 nlmeans_tune = strdup(optarg);
 break;
+ case FILTER_COLORSPACE:
+ free(colorspace);
+ if (optarg != NULL)
+ {
+ colorspace = strdup(optarg);
+ }
+ else
+ {
+ colorspace = strdup(COLORSPACE_DEFAULT_PRESET);
+ }
+ break;
 case FILTER_CHROMA_SMOOTH:
 free(chroma_smooth);
 if (optarg != NULL)
@@ -3083,6 +3117,9 @@
 case QSV_ASYNC_DEPTH:
 qsv_async_depth = atoi(optarg);
 break;
+ case QSV_ADAPTER:
+ qsv_adapter = atoi(optarg);
+ break;
 case QSV_IMPLEMENTATION:
 hb_qsv_impl_set_preferred(optarg);
 break;
@@ -3167,6 +3204,31 @@
 }
 }
 
+ if (colorspace != NULL)
+ {
+ if (colorspace_disable)
+ {
+ fprintf(stderr,
+ "Incompatible options --colorspace and --no-colorspace\n");
+ return -1;
+ }
+ if (!hb_validate_filter_preset(HB_FILTER_COLORSPACE, colorspace, NULL, NULL))
+ {
+ // Nothing to do, but must validate preset before
+ // attempting to validate custom settings to prevent potential
+ // false positive
+ }
+ else if (!hb_validate_filter_string(HB_FILTER_COLORSPACE, colorspace))
+ {
+ colorspace_custom = 1;
+ }
+ else
+ {
+ fprintf(stderr, "Invalid colorspace option %s\n", colorspace);
+ return -1;
+ }
+ }
+
 if (deinterlace != NULL)
 {
 if (deinterlace_disable)
@@ -4162,6 +4224,11 @@
 hb_dict_set(preset, "VideoQSVAsyncDepth",
 hb_value_int(qsv_async_depth));
 }
+ if (qsv_adapter >= 0)
+ {
+ hb_dict_set(preset, "VideoQSVAdapterIndex",
+ hb_value_int(qsv_adapter));
+ }
 if (qsv_decode != -1)
 {
 hb_dict_set(preset, "VideoQSVDecode", hb_value_int(qsv_decode));
@@ -4178,10 +4245,14 @@
 if (width > 0)
 {
 hb_dict_set(preset, "PictureForceWidth", hb_value_int(width));
+ hb_dict_set(preset, "PictureUseMaximumSize", hb_value_bool(0));
+ hb_dict_set(preset, "PictureAllowUpscaling", hb_value_bool(1));
 }
 if (height > 0)
 {
 hb_dict_set(preset, "PictureForceHeight", hb_value_int(height));
+ hb_dict_set(preset, "PictureUseMaximumSize", hb_value_bool(0));
+ hb_dict_set(preset, "PictureAllowUpscaling", hb_value_bool(1));
 }
 if (crop0 >= 0 || crop1 >= 0 || crop2 >= 0 || crop3 >= 0)
 {
@@ -4470,6 +4541,26 @@
 {
 hb_dict_set(preset, "PicturePad", hb_value_string(pad));
 }
+ if (colorspace_disable)
+ {
+ hb_dict_set(preset, "PictureColorspacePreset", hb_value_string("off"));
+ }
+ if (colorspace != NULL)
+ {
+ hb_dict_set(preset, "PictureColorspacePreset", hb_value_string(colorspace));
+ if (!colorspace_custom)
+ {
+ hb_dict_set(preset, "PictureColorspacePreset",
+ hb_value_string(colorspace));
+ }
+ else
+ {
+ hb_dict_set(preset, "PictureColorspacePreset",
+ hb_value_string("custom"));
+ hb_dict_set(preset, "PictureColorspaceCustom",
+ hb_value_string(colorspace));
+ }
+ }
 
 return preset;
 }
@@ -5019,7 +5110,7 @@
 int codec;
 audio_dict = hb_value_array_get(audio_array, ii);
 codec = hb_value_get_int(hb_dict_get(audio_dict, "Encoder"));
- if (hb_audio_dither_is_supported(codec))
+ if (hb_audio_dither_is_supported(codec, 0))
 {
 hb_dict_set(audio_dict, "DitherMethod",
 hb_value_double(dither));

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/HandBrake.Installer.wixproj Added

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform>x86</Platform>
+ <ProductVersion>3.10</ProductVersion>
+ <ProjectGuid>02684a37-c3e0-43f6-a4f0-2465afedd6df</ProjectGuid>
+ <SchemaVersion>2.0</SchemaVersion>
+ <OutputName>HandBrake</OutputName>
+ <OutputType>Package</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+ <DefineConstants>Debug;HBPROFILE=$(HBPROFILE)</DefineConstants>
+ <OutputPath>bin\$(Configuration)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+ <DefineConstants>Release;HBPROFILE=$(HBPROFILE)</DefineConstants>
+ <OutputPath>bin\$(Configuration)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <Compile Include="Product.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <WixExtension Include="WixUIExtension">
+ <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+ <Name>WixUIExtension</Name>
+ </WixExtension>
+ <WixExtension Include="WixNetFxExtension">
+ <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+ <Name>WixNetFxExtension</Name>
+ </WixExtension>
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="assets\COPYING.rtf" />
+ <Content Include="gfx\banner.bmp" />
+ <Content Include="gfx\dialog.bmp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="gfx\" />
+ <Folder Include="assets" />
+ </ItemGroup>
+ <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+ <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+ <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+ </Target>
+ <PropertyGroup>
+ <SuppressValidation>true</SuppressValidation>
+ </PropertyGroup>
+ 
+</Project>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/Product.wxs Added

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+ <?if $(var.Configuration)=Debug ?>
+ <?define msiProductId = "fd19ef0e-77c4-47a6-b1e4-4cea0b3a4c94" ?>
+ <?define productName = "HandBrake Nightly" ?>
+ <?define installDir = "Nightly" ?>
+ <?define ToastActivatorCLSID = "" ?>
+ <?define packagePath = "..\HandBrakeWPF\bin\publish" ?>
+ <?else ?>
+ <?define msiProductId = "fd19ef0e-77c4-47a6-b1e4-4cea0b3a4c93" ?>
+ <?define productName = "HandBrake" ?>
+ <?define installDir = "HandBrake" ?>
+ <?define ToastActivatorCLSID = "" ?>
+ <?define packagePath = "..\HandBrakeWPF\bin\publish" ?>
+ <?endif ?>
+
+ <Product Id="$(var.msiProductId)" Name="$(var.productName)" Language="1033" Version="1.5.1.0" Manufacturer="HandBrake Team" UpgradeCode="$(var.msiProductId)">
+ <Package InstallerVersion="200" Platform="x64" Compressed="yes" InstallScope="perMachine" />
+
+ <MajorUpgrade DowngradeErrorMessage="A newer version of ProductName is already installed." />
+
+ <Media Id="1" Cabinet="product.cab" EmbedCab="yes"/>
+
+ <Icon Id="ProductIcon" SourceFile="..\HandBrakeWPF\handbrakepineapple.ico"/>
+
+ <Property Id="ARPPRODUCTICON" Value="ProductIcon"/>
+ <Property Id="ARPHELPLINK" Value="https://www.handbrake.fr/docs"/>
+ <Property Id="ARPURLINFOABOUT" Value="https://www.handbrake.fr"/>
+ <Property Id="ARPNOREPAIR" Value="1"/>
+ <Property Id="WIXUI_INSTALLDIR" Value="APPDIR" />
+
+ <UIRef Id="WixUI_InstallDir" />
+
+ <WixVariable Id="WixUILicenseRtf" Value="assets\COPYING.rtf" />
+
+ <WixVariable Id="WixUIBannerBmp" Value="gfx\banner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="gfx\dialog.bmp" />
+ <WixVariable Id="WixUIInfoIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
+ <WixVariable Id="WixUIUpIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
+ <WixVariable Id="WixUINewIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
+
+ 
+ <Property Id="WINDOWSBUILDNUMBER" Secure="yes">
+	 <RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
+ </Property>
+ <Condition Message="HandBrake is only supported on Windows 10 version 1909 (build 18363) or higher.">
+	 <!CDATA(WINDOWSBUILDNUMBER >= 18363)>
+ </Condition>
+ 
+ 
+ <Directory Id="TARGETDIR" Name="SourceDir">
+
+ <Directory Id="ProgramFiles64Folder">
+ <Directory Id="INSTALLDIR" Name="HandBrakeTeam">
+ <Directory Id="APPDIR" Name="$(var.installDir)">
+
+ <Component Win64="yes" Id="ApplicationFiles" Guid="cbae29e7-6d39-49bb-8c76-0305c3d42181">
+ 
+ <File Source="$(var.packagePath)\HandBrake.exe" />
+ <File Source="$(var.packagePath)\HandBrake.Worker.exe" />
+ <File Source="$(var.packagePath)\hb.dll"/>
+ <File Source="$(var.packagePath)\portable.ini.template"/>
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="DIR_Shortcuts" Name="$(var.productName)" />
+ </Directory>
+
+ </Directory>
+ </Directory>
+
+ 
+ <DirectoryRef Id="DIR_Shortcuts">
+ <Component Id="AppShortcuts" Win64="yes">
+
+ 
+ <Shortcut Id="SCUT_Shortcuts_Shell" Name="$(var.productName)" Target="#HandBrake.exe" WorkingDirectory="APPLICATIONROOTDIRECTORY">
+ 
+ <ShortcutProperty Key="System.AppUserModel.ID" Value="HandBrakeTeam.$(var.productName)"/>
+ 
+ <ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID" Value="{cbae29e7-6d39-49bb-8c76-0305c3d42181}"/>
+ </Shortcut>
+
+ 
+ <Shortcut Id="SCUT_Shortcuts_Uninstall" Name="Uninstall $(var.productName)" Target="System64Foldermsiexec.exe" Arguments="/x ProductCode"/>
+ <RemoveFolder Id="REMOVE_Shortcuts" On="uninstall" />
+ <RegistryValue Root="HKCU" Key="Software\HandBakeTeam\$(var.installDir)" Name="installedShortcut" Type="integer" Value="1" KeyPath="yes" />
+
+ </Component>
+ </DirectoryRef>
+
+ 
+ <Feature Id="DefaultFeature" Level="1">
+ <ComponentRef Id="ApplicationFiles"/>
+ <ComponentRef Id="AppShortcuts"/>
+ </Feature>
+
+ </Product>
+</Wix>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/assets Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/assets/COPYING.rtf Added

@@ -0,0 +1,545 @@
+{\rtf1\adeflang1025\ansi\ansicpg1252\uc1\adeff31507\deff0\stshfdbch31505\stshfloch31506\stshfhich31506\stshfbi31507\deflang2057\deflangfe2057\themelang2057\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f34\fbidi \froman\fcharset0\fprq2{\*\panose 02040503050406030204}Cambria Math;}
+{\f37\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}{\flomajor\f31500\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbmajor\f31501\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhimajor\f31502\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0302020204030204}Calibri Light;}
+{\fbimajor\f31503\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\flominor\f31504\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}
+{\fdbminor\f31505\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fhiminor\f31506\fbidi \fswiss\fcharset0\fprq2{\*\panose 020f0502020204030204}Calibri;}
+{\fbiminor\f31507\fbidi \froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f43\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\f44\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\f46\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f47\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f48\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f49\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\f50\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f51\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f413\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}{\f414\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}
+{\f416\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\f417\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}{\f418\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\f419\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}
+{\f420\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\f421\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\flomajor\f31508\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fdbmajor\f31518\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fhimajor\f31528\fbidi \fswiss\fcharset238\fprq2 Calibri Light CE;}{\fhimajor\f31529\fbidi \fswiss\fcharset204\fprq2 Calibri Light Cyr;}{\fhimajor\f31531\fbidi \fswiss\fcharset161\fprq2 Calibri Light Greek;}
+{\fhimajor\f31532\fbidi \fswiss\fcharset162\fprq2 Calibri Light Tur;}{\fhimajor\f31533\fbidi \fswiss\fcharset177\fprq2 Calibri Light (Hebrew);}{\fhimajor\f31534\fbidi \fswiss\fcharset178\fprq2 Calibri Light (Arabic);}
+{\fhimajor\f31535\fbidi \fswiss\fcharset186\fprq2 Calibri Light Baltic;}{\fhimajor\f31536\fbidi \fswiss\fcharset163\fprq2 Calibri Light (Vietnamese);}{\fbimajor\f31538\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}
+{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
+{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31548\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\fdbminor\f31558\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
+{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
+{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31568\fbidi \fswiss\fcharset238\fprq2 Calibri CE;}
+{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
+{\fhiminor\f31573\fbidi \fswiss\fcharset177\fprq2 Calibri (Hebrew);}{\fhiminor\f31574\fbidi \fswiss\fcharset178\fprq2 Calibri (Arabic);}{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}
+{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31578\fbidi \froman\fcharset238\fprq2 Times New Roman CE;}{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
+{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
+{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}
+{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;
+\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;\red0\green0\blue0;\red0\green0\blue0;}{\*\defchp \fs22\loch\af31506\hich\af31506\dbch\af31505 }{\*\defpap 
+\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\sa160\sl259\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 
+\af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext0 \sqformat \spriority0 Normal;}{\*\cs10 \additive \ssemihidden \sunhideused \spriority1 Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tblind0\tblindtype3\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa160\sl259\slmult1
+\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 \snext11 \ssemihidden \sunhideused 
+Normal Table;}{\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\f31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 
+\snext15 \sqformat \spriority1 \styrsid15040160 No Spacing;}}{\*\rsidtbl \rsid9962314\rsid10752829\rsid15040160}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info
+{\operator Scott R}{\creatim\yr2020\mo4\dy4\hr13\min26}{\revtim\yr2020\mo4\dy4\hr13\min27}{\version3}{\edmins1}{\nofpages8}{\nofwords2700}{\nofchars15392}{\nofcharsws18056}{\vern123}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/word
+ml}}\paperw12240\paperh15840\margl1440\margr1440\margt1440\margb1440\gutter0\ltrsect 
+\widowctrl\ftnbj\aenddoc\trackmoves0\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0\showxmlerrors0\horzdoc\dghspace120\dgvspace120\dghorigin1701
+\dgvorigin1984\dghshow0\dgvshow3\jcompress\viewkind1\viewscale100\rsidroot10752829 \nouicompat \fet0{\*\wgrffmtfilter 2450}\nofeaturethrottle1\ilfomacatclnup0\ltrpar \sectd \ltrsect\linex0\sectdefaultcl\sftnbj {\*\pnseclvl1
+\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5
+\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang 
+{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s15\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15040160 \rtlch\fcs1 
+\af31507\afs22\alang1025 \ltrch\fcs0 \fs22\lang2057\langfe2057\loch\af31506\hich\af31506\dbch\af31505\cgrid\langnp2057\langfenp2057 {\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang9\langfe2057\langnp9\insrsid9962314 \hich\af31506\dbch\af31505\loch\f31506 
+ GNU GENERAL PUBLIC LICENSE
+\par \hich\af31506\dbch\af31505\loch\f31506 Version 2, June 1991
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+\par \hich\af31506\dbch\af31505\loch\f31506 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+\par \hich\af31506\dbch\af31505\loch\f31506 Everyone is permitted to copy and distribute verbatim copies
+\par \hich\af31506\dbch\af31505\loch\f31506 of this license document, but changing it is not allowed.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Preamble
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 The licenses for most software are\hich\af31506\dbch\af31505\loch\f31506 designed to take away your
+\par \hich\af31506\dbch\af31505\loch\f31506 freedom to share and change it. By contrast, the GNU General Public
+\par \hich\af31506\dbch\af31505\loch\f31506 License is intended to guarantee your freedom to share and change free
+\par \hich\af31506\dbch\af31505\loch\f31506 software--to make sure the software is free for all its users. This
+\par \hich\af31506\dbch\af31505\loch\f31506 General Public Lice\hich\af31506\dbch\af31505\loch\f31506 nse applies to most of the Free Software
+\par \hich\af31506\dbch\af31505\loch\f31506 Foundation's software and to any other program whose authors commit to
+\par \hich\af31506\dbch\af31505\loch\f31506 using it. (Some other Free Software Foundation software is covered by
+\par \hich\af31506\dbch\af31505\loch\f31506 the GNU Lesser General Public License instead.) You can apply it to
+\par \hich\af31506\dbch\af31505\loch\f31506 your\hich\af31506\dbch\af31505\loch\f31506 programs, too.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 When we speak of free software, we are referring to freedom, not
+\par \hich\af31506\dbch\af31505\loch\f31506 price. Our General Public Licenses are designed to make sure that you
+\par \hich\af31506\dbch\af31505\loch\f31506 have the freedom to distribute copies of free software (and charge for
+\par \hich\af31506\dbch\af31505\loch\f31506 this service if you wish), tha\hich\af31506\dbch\af31505\loch\f31506 t you receive source code or can get it
+\par \hich\af31506\dbch\af31505\loch\f31506 if you want it, that you can change the software or use pieces of it
+\par \hich\af31506\dbch\af31505\loch\f31506 in new free programs; and that you know you can do these things.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 To protect your rights, we need to make restrictions that forbid
+\par \hich\af31506\dbch\af31505\loch\f31506 anyone to deny\hich\af31506\dbch\af31505\loch\f31506 you these rights or to ask you to surrender the rights.
+\par \hich\af31506\dbch\af31505\loch\f31506 These restrictions translate to certain responsibilities for you if you
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute copies of the software, or if you modify it.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 For example, if you distribute copies of such a program, whether
+\par \hich\af31506\dbch\af31505\loch\f31506 gratis or for a fee, you must give the recipients all the rights that
+\par \hich\af31506\dbch\af31505\loch\f31506 you have. You must make sure that they, too, receive or can get the
+\par \hich\af31506\dbch\af31505\loch\f31506 source code. And you must show them these terms s\hich\af31506\dbch\af31505\loch\f31506 o they know their
+\par \hich\af31506\dbch\af31505\loch\f31506 rights.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 We protect your rights with two steps: (1) copyright the software, and
+\par \hich\af31506\dbch\af31505\loch\f31506 (2) offer you this license which gives you legal permission to copy,
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute and/or modify the software.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Also, for each author's protection and ours, \hich\af31506\dbch\af31505\loch\f31506 we want to make certain
+\par \hich\af31506\dbch\af31505\loch\f31506 that everyone understands that there is no warranty for this free
+\par \hich\af31506\dbch\af31505\loch\f31506 software. If the software is modified by someone else and passed on, we
+\par \hich\af31506\dbch\af31505\loch\f31506 want its recipients to know that what they have is not the original, so
+\par \hich\af31506\dbch\af31505\loch\f31506 that any problems int\hich\af31506\dbch\af31505\loch\f31506 roduced by others will not reflect on the original
+\par \hich\af31506\dbch\af31505\loch\f31506 authors' reputations.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Finally, any free program is threatened constantly by software
+\par \hich\af31506\dbch\af31505\loch\f31506 patents. We wish to avoid the danger that redistributors of a free
+\par \hich\af31506\dbch\af31505\loch\f31506 program will individually obtain patent licenses,\hich\af31506\dbch\af31505\loch\f31506 in effect making the
+\par \hich\af31506\dbch\af31505\loch\f31506 program proprietary. To prevent this, we have made it clear that any
+\par \hich\af31506\dbch\af31505\loch\f31506 patent must be licensed for everyone's free use or not licensed at all.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 The precise terms and conditions for copying, distribution and
+\par \hich\af31506\dbch\af31505\loch\f31506 modification follow.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 GNU GENERAL PUBLIC LICENSE
+\par \hich\af31506\dbch\af31505\loch\f31506 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 0. This License applies to any program or other work which contains
+\par \hich\af31506\dbch\af31505\loch\f31506 a notice placed by the copyright holder saying it may be distributed
+\par \hich\af31506\dbch\af31505\loch\f31506 un\hich\af31506\dbch\af31505\loch\f31506 der the terms of this General Public License. The "Program", below,
+\par \hich\af31506\dbch\af31505\loch\f31506 refers to any such program or work, and a "work based on the Program"
+\par \hich\af31506\dbch\af31505\loch\f31506 means either the Program or any derivative work under copyright law:
+\par \hich\af31506\dbch\af31505\loch\f31506 that is to say, a work containing the Program or\hich\af31506\dbch\af31505\loch\f31506 a portion of it,
+\par \hich\af31506\dbch\af31505\loch\f31506 either verbatim or with modifications and/or translated into another
+\par \hich\af31506\dbch\af31505\loch\f31506 language. (Hereinafter, translation is included without limitation in
+\par \hich\af31506\dbch\af31505\loch\f31506 the term "modification".) Each licensee is addressed as "you".
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Activities other than copying, di\hich\af31506\dbch\af31505\loch\f31506 stribution and modification are not
+\par \hich\af31506\dbch\af31505\loch\f31506 covered by this License; they are outside its scope. The act of
+\par \hich\af31506\dbch\af31505\loch\f31506 running the Program is not restricted, and the output from the Program
+\par \hich\af31506\dbch\af31505\loch\f31506 is covered only if its contents constitute a work based on the
+\par \hich\af31506\dbch\af31505\loch\f31506 Program (independent \hich\af31506\dbch\af31505\loch\f31506 of having been made by running the Program).
+\par \hich\af31506\dbch\af31505\loch\f31506 Whether that is true depends on what the Program does.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 1. You may copy and distribute verbatim copies of the Program's
+\par \hich\af31506\dbch\af31505\loch\f31506 source code as you receive it, in any medium, provided that you
+\par \hich\af31506\dbch\af31505\loch\f31506 conspicuously and appropr\hich\af31506\dbch\af31505\loch\f31506 iately publish on each copy an appropriate
+\par \hich\af31506\dbch\af31505\loch\f31506 copyright notice and disclaimer of warranty; keep intact all the
+\par \hich\af31506\dbch\af31505\loch\f31506 notices that refer to this License and to the absence of any warranty;
+\par \hich\af31506\dbch\af31505\loch\f31506 and give any other recipients of the Program a copy of this License
+\par \hich\af31506\dbch\af31505\loch\f31506 along wit\hich\af31506\dbch\af31505\loch\f31506 h the Program.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 You may charge a fee for the physical act of transferring a copy, and
+\par \hich\af31506\dbch\af31505\loch\f31506 you may at your option offer warranty protection in exchange for a fee.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 2. You may modify your copy or copies of the Program or any portion
+\par \hich\af31506\dbch\af31505\loch\f31506 of it, thus forming a work based on the Program, and copy and
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute such modifications or work under the terms of Section 1
+\par \hich\af31506\dbch\af31505\loch\f31506 above, provided that you also meet all of these condition\hich\af31506\dbch\af31505\loch\f31506 s:
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 a) You must cause the modified files to carry prominent notices
+\par \hich\af31506\dbch\af31505\loch\f31506 stating that you changed the files and the date of any change.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 b) You must cause any work that you distribute or publish, that in
+\par \hich\af31506\dbch\af31505\loch\f31506 whole or in part contains or is derived f\hich\af31506\dbch\af31505\loch\f31506 rom the Program or any
+\par \hich\af31506\dbch\af31505\loch\f31506 part thereof, to be licensed as a whole at no charge to all third
+\par \hich\af31506\dbch\af31505\loch\f31506 parties under the terms of this License.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 c) If the modified program normally reads commands interactively
+\par \hich\af31506\dbch\af31505\loch\f31506 when run, you must cause it, when started ru\hich\af31506\dbch\af31505\loch\f31506 nning for such
+\par \hich\af31506\dbch\af31505\loch\f31506 interactive use in the most ordinary way, to print or display an
+\par \hich\af31506\dbch\af31505\loch\f31506 announcement including an appropriate copyright notice and a
+\par \hich\af31506\dbch\af31505\loch\f31506 notice that there is no warranty (or else, saying that you provide
+\par \hich\af31506\dbch\af31505\loch\f31506 a warranty) and that users may r\hich\af31506\dbch\af31505\loch\f31506 edistribute the program under
+\par \hich\af31506\dbch\af31505\loch\f31506 these conditions, and telling the user how to view a copy of this
+\par \hich\af31506\dbch\af31505\loch\f31506 License. (Exception: if the Program itself is interactive but
+\par \hich\af31506\dbch\af31505\loch\f31506 does not normally print such an announcement, your work based on
+\par \hich\af31506\dbch\af31505\loch\f31506 the Program is n\hich\af31506\dbch\af31505\loch\f31506 ot required to print an announcement.)
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 These requirements apply to the modified work as a whole. If
+\par \hich\af31506\dbch\af31505\loch\f31506 identifiable sections of that work are not derived from the Program,
+\par \hich\af31506\dbch\af31505\loch\f31506 and can be reasonably considered independent and separate works in
+\par \hich\af31506\dbch\af31505\loch\f31506 themselves, then this License, and its terms, do not apply to those
+\par \hich\af31506\dbch\af31505\loch\f31506 sections when you distribute them as separate works. But when you
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute the same sections as part of a whole which \hich\af31506\dbch\af31505\loch\f31506 is a work based
+\par \hich\af31506\dbch\af31505\loch\f31506 on the Program, the distribution of the whole must be on the terms of
+\par \hich\af31506\dbch\af31505\loch\f31506 this License, whose permissions for other licensees extend to the
+\par \hich\af31506\dbch\af31505\loch\f31506 entire whole, and thus to each and every part regardless of who wrote it.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Thus, it is not the intent of\hich\af31506\dbch\af31505\loch\f31506 this section to claim rights or contest
+\par \hich\af31506\dbch\af31505\loch\f31506 your rights to work written entirely by you; rather, the intent is to
+\par \hich\af31506\dbch\af31505\loch\f31506 exercise the right to control the distribution of derivative or
+\par \hich\af31506\dbch\af31505\loch\f31506 collective works based on the Program.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 In addition, mere aggregation of another \hich\af31506\dbch\af31505\loch\f31506 work not based on the Program
+\par \hich\af31506\dbch\af31505\loch\f31506 with the Program (or with a work based on the Program) on a volume of
+\par \hich\af31506\dbch\af31505\loch\f31506 a storage or distribution medium does not bring the other work under
+\par \hich\af31506\dbch\af31505\loch\f31506 the scope of this License.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 3. You may copy and distribute the Program (or a work bas\hich\af31506\dbch\af31505\loch\f31506 ed on it,
+\par \hich\af31506\dbch\af31505\loch\f31506 under Section 2) in object code or executable form under the terms of
+\par \hich\af31506\dbch\af31505\loch\f31506 Sections 1 and 2 above provided that you also do one of the following:
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 a) Accompany it with the complete corresponding machine-readable
+\par \hich\af31506\dbch\af31505\loch\f31506 source code, which must be dist\hich\af31506\dbch\af31505\loch\f31506 ributed under the terms of Sections
+\par \hich\af31506\dbch\af31505\loch\f31506 1 and 2 above on a medium customarily used for software interchange; or,
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 b) Accompany it with a written offer, valid for at least three
+\par \hich\af31506\dbch\af31505\loch\f31506 years, to give any third party, for a charge no more than your
+\par \hich\af31506\dbch\af31505\loch\f31506 cost of physically performing source distribution, a complete
+\par \hich\af31506\dbch\af31505\loch\f31506 machine-readable copy of the corresponding source code, to be
+\par \hich\af31506\dbch\af31505\loch\f31506 distributed under the terms of Sections 1 and 2 above\hich\af31506\dbch\af31505\loch\f31506 on a medium
+\par \hich\af31506\dbch\af31505\loch\f31506 customarily used for software interchange; or,
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 c) Accompany it with the information you received as to the offer
+\par \hich\af31506\dbch\af31505\loch\f31506 to distribute corresponding source code. (This alternative is
+\par \hich\af31506\dbch\af31505\loch\f31506 allowed only for noncommercial distribution and on\hich\af31506\dbch\af31505\loch\f31506 ly if you
+\par \hich\af31506\dbch\af31505\loch\f31506 received the program in object code or executable form with such
+\par \hich\af31506\dbch\af31505\loch\f31506 an offer, in accord with Subsection b above.)
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 The source code for a work means the preferred form of the work for
+\par \hich\af31506\dbch\af31505\loch\f31506 making modifications to it. For an executable work, compl\hich\af31506\dbch\af31505\loch\f31506 ete source
+\par \hich\af31506\dbch\af31505\loch\f31506 code means all the source code for all modules it contains, plus any
+\par \hich\af31506\dbch\af31505\loch\f31506 associated interface definition files, plus the scripts used to
+\par \hich\af31506\dbch\af31505\loch\f31506 control compilation and installation of the executable. However, as a
+\par \hich\af31506\dbch\af31505\loch\f31506 special exception, the source code distri\hich\af31506\dbch\af31505\loch\f31506 buted need not include
+\par \hich\af31506\dbch\af31505\loch\f31506 anything that is normally distributed (in either source or binary
+\par \hich\af31506\dbch\af31505\loch\f31506 form) with the major components (compiler, kernel, and so on) of the
+\par \hich\af31506\dbch\af31505\loch\f31506 operating system on which the executable runs, unless that component
+\par \hich\af31506\dbch\af31505\loch\f31506 itself accompanies the execut\hich\af31506\dbch\af31505\loch\f31506 able.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 If distribution of executable or object code is made by offering
+\par \hich\af31506\dbch\af31505\loch\f31506 access to copy from a designated place, then offering equivalent
+\par \hich\af31506\dbch\af31505\loch\f31506 access to copy the source code from the same place counts as
+\par \hich\af31506\dbch\af31505\loch\f31506 distribution of the source code, even though third parties\hich\af31506\dbch\af31505\loch\f31506 are not
+\par \hich\af31506\dbch\af31505\loch\f31506 compelled to copy the source along with the object code.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 4. You may not copy, modify, sublicense, or distribute the Program
+\par \hich\af31506\dbch\af31505\loch\f31506 except as expressly provided under this License. Any attempt
+\par \hich\af31506\dbch\af31505\loch\f31506 otherwise to copy, modify, sublicense or distribute the Program is
+\par \hich\af31506\dbch\af31505\loch\f31506 void, and will automatically terminate your rights under this License.
+\par \hich\af31506\dbch\af31505\loch\f31506 However, parties who have received copies, or rights, from you under
+\par \hich\af31506\dbch\af31505\loch\f31506 this License will not have their licenses termina\hich\af31506\dbch\af31505\loch\f31506 ted so long as such
+\par \hich\af31506\dbch\af31505\loch\f31506 parties remain in full compliance.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 5. You are not required to accept this License, since you have not
+\par \hich\af31506\dbch\af31505\loch\f31506 signed it. However, nothing else grants you permission to modify or
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute the Program or its derivative works. These actions\hich\af31506\dbch\af31505\loch\f31506 are
+\par \hich\af31506\dbch\af31505\loch\f31506 prohibited by law if you do not accept this License. Therefore, by
+\par \hich\af31506\dbch\af31505\loch\f31506 modifying or distributing the Program (or any work based on the
+\par \hich\af31506\dbch\af31505\loch\f31506 Program), you indicate your acceptance of this License to do so, and
+\par \hich\af31506\dbch\af31505\loch\f31506 all its terms and conditions for copying, distribu\hich\af31506\dbch\af31505\loch\f31506 ting or modifying
+\par \hich\af31506\dbch\af31505\loch\f31506 the Program or works based on it.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 6. Each time you redistribute the Program (or any work based on the
+\par \hich\af31506\dbch\af31505\loch\f31506 Program), the recipient automatically receives a license from the
+\par \hich\af31506\dbch\af31505\loch\f31506 original licensor to copy, distribute or modify the Program subject\hich\af31506\dbch\af31505\loch\f31506 to
+\par \hich\af31506\dbch\af31505\loch\f31506 these terms and conditions. You may not impose any further
+\par \hich\af31506\dbch\af31505\loch\f31506 restrictions on the recipients' exercise of the rights granted herein.
+\par \hich\af31506\dbch\af31505\loch\f31506 You are not responsible for enforcing compliance by third parties to
+\par \hich\af31506\dbch\af31505\loch\f31506 this License.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 7. If, as a consequence of a court \hich\af31506\dbch\af31505\loch\f31506 judgment or allegation of patent
+\par \hich\af31506\dbch\af31505\loch\f31506 infringement or for any other reason (not limited to patent issues),
+\par \hich\af31506\dbch\af31505\loch\f31506 conditions are imposed on you (whether by court order, agreement or
+\par \hich\af31506\dbch\af31505\loch\f31506 otherwise) that contradict the conditions of this License, they do not
+\par \hich\af31506\dbch\af31505\loch\f31506 excuse you from the conditions of this License. If you cannot
+\par \hich\af31506\dbch\af31505\loch\f31506 distribute so as to satisfy simultaneously your obligations under this
+\par \hich\af31506\dbch\af31505\loch\f31506 License and any other pertinent obligations, then a\hich\af31506\dbch\af31505\loch\f31506 s a consequence you
+\par \hich\af31506\dbch\af31505\loch\f31506 may not distribute the Program at all. For example, if a patent
+\par \hich\af31506\dbch\af31505\loch\f31506 license would not permit royalty-free redistribution of the Program by
+\par \hich\af31506\dbch\af31505\loch\f31506 all those who receive copies directly or indirectly through you, then
+\par \hich\af31506\dbch\af31505\loch\f31506 the only way you could satisfy\hich\af31506\dbch\af31505\loch\f31506 both it and this License would be to
+\par \hich\af31506\dbch\af31505\loch\f31506 refrain entirely from distribution of the Program.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 If any portion of this section is held invalid or unenforceable under
+\par \hich\af31506\dbch\af31505\loch\f31506 any particular circumstance, the balance of the section is intended to
+\par \hich\af31506\dbch\af31505\loch\f31506 apply and the section as \hich\af31506\dbch\af31505\loch\f31506 a whole is intended to apply in other
+\par \hich\af31506\dbch\af31505\loch\f31506 circumstances.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 It is not the purpose of this section to induce you to infringe any
+\par \hich\af31506\dbch\af31505\loch\f31506 patents or other property right claims or to contest validity of any
+\par \hich\af31506\dbch\af31505\loch\f31506 such claims; this section has the sole purpose of protecting the
+\par \hich\af31506\dbch\af31505\loch\f31506 integrity of the free software distribution system, which is
+\par \hich\af31506\dbch\af31505\loch\f31506 implemented by public license practices. Many people have made
+\par \hich\af31506\dbch\af31505\loch\f31506 generous contributions to the wide range of software distributed
+\par \hich\af31506\dbch\af31505\loch\f31506 through that system in reliance on consistent application of that
+\par \hich\af31506\dbch\af31505\loch\f31506 system; it is up to the author/donor to decide if he or she is willing
+\par \hich\af31506\dbch\af31505\loch\f31506 to distribute software through any other system and a licensee cannot
+\par \hich\af31506\dbch\af31505\loch\f31506 impose that choice.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 This section is intended to make thoroughly clear what is believed to
+\par \hich\af31506\dbch\af31505\loch\f31506 be a consequence of the rest of this License.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 8. If the distribution and/or use of the Program is restricted in
+\par \hich\af31506\dbch\af31505\loch\f31506 certain countries either by patents or by copyrighted interfaces, the
+\par \hich\af31506\dbch\af31505\loch\f31506 o\hich\af31506\dbch\af31505\loch\f31506 riginal copyright holder who places the Program under this License
+\par \hich\af31506\dbch\af31505\loch\f31506 may add an explicit geographical distribution limitation excluding
+\par \hich\af31506\dbch\af31505\loch\f31506 those countries, so that distribution is permitted only in or among
+\par \hich\af31506\dbch\af31505\loch\f31506 countries not thus excluded. In such case, this Licen\hich\af31506\dbch\af31505\loch\f31506 se incorporates
+\par \hich\af31506\dbch\af31505\loch\f31506 the limitation as if written in the body of this License.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 9. The Free Software Foundation may publish revised and/or new versions
+\par \hich\af31506\dbch\af31505\loch\f31506 of the General Public License from time to time. Such new versions will
+\par \hich\af31506\dbch\af31505\loch\f31506 be similar in spirit to the presen\hich\af31506\dbch\af31505\loch\f31506 t version, but may differ in detail to
+\par \hich\af31506\dbch\af31505\loch\f31506 address new problems or concerns.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Each version is given a distinguishing version number. If the Program
+\par \hich\af31506\dbch\af31505\loch\f31506 specifies a version number of this License which applies to it and "any
+\par \hich\af31506\dbch\af31505\loch\f31506 later version", you have the option of \hich\af31506\dbch\af31505\loch\f31506 following the terms and conditions
+\par \hich\af31506\dbch\af31505\loch\f31506 either of that version or of any later version published by the Free
+\par \hich\af31506\dbch\af31505\loch\f31506 Software Foundation. If the Program does not specify a version number of
+\par \hich\af31506\dbch\af31505\loch\f31506 this License, you may choose any version ever published by the Free Software
+\par \hich\af31506\dbch\af31505\loch\f31506 F\hich\af31506\dbch\af31505\loch\f31506 oundation.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 10. If you wish to incorporate parts of the Program into other free
+\par \hich\af31506\dbch\af31505\loch\f31506 programs whose distribution conditions are different, write to the author
+\par \hich\af31506\dbch\af31505\loch\f31506 to ask for permission. For software which is copyrighted by the Free
+\par \hich\af31506\dbch\af31505\loch\f31506 Software Foundation, write to \hich\af31506\dbch\af31505\loch\f31506 the Free Software Foundation; we sometimes
+\par \hich\af31506\dbch\af31505\loch\f31506 make exceptions for this. Our decision will be guided by the two goals
+\par \hich\af31506\dbch\af31505\loch\f31506 of preserving the free status of all derivatives of our free software and
+\par \hich\af31506\dbch\af31505\loch\f31506 of promoting the sharing and reuse of software generally.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 NO WARRANTY
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+\par \hich\af31506\dbch\af31505\loch\f31506 FOR THE\hich\af31506\dbch\af31505\loch\f31506 PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+\par \hich\af31506\dbch\af31505\loch\f31506 OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+\par \hich\af31506\dbch\af31505\loch\f31506 PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+\par \hich\af31506\dbch\af31505\loch\f31506 OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, T\hich\af31506\dbch\af31505\loch\f31506 HE IMPLIED WARRANTIES OF
+\par \hich\af31506\dbch\af31505\loch\f31506 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+\par \hich\af31506\dbch\af31505\loch\f31506 TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+\par \hich\af31506\dbch\af31505\loch\f31506 PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+\par \hich\af31506\dbch\af31505\loch\f31506 REPAIR OR COR\hich\af31506\dbch\af31505\loch\f31506 RECTION.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+\par \hich\af31506\dbch\af31505\loch\f31506 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+\par \hich\af31506\dbch\af31505\loch\f31506 REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+\par \hich\af31506\dbch\af31505\loch\f31506 INCLUDING ANY GENERAL, SPEC\hich\af31506\dbch\af31505\loch\f31506 IAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+\par \hich\af31506\dbch\af31505\loch\f31506 OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+\par \hich\af31506\dbch\af31505\loch\f31506 TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+\par \hich\af31506\dbch\af31505\loch\f31506 YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE \hich\af31506\dbch\af31505\loch\f31506 WITH ANY OTHER
+\par \hich\af31506\dbch\af31505\loch\f31506 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+\par \hich\af31506\dbch\af31505\loch\f31506 POSSIBILITY OF SUCH DAMAGES.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 END OF TERMS AND CONDITIONS
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 How to Apply These Terms to Your New Programs
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 If you develop a new program, and you want it to be of the greatest
+\par \hich\af31506\dbch\af31505\loch\f31506 possible use to the public, the best way to achieve this is to make it
+\par \hich\af31506\dbch\af31505\loch\f31506 free software which everyone can redistribute and change\hich\af31506\dbch\af31505\loch\f31506 under these terms.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 To do so, attach the following notices to the program. It is safest
+\par \hich\af31506\dbch\af31505\loch\f31506 to attach them to the start of each source file to most effectively
+\par \hich\af31506\dbch\af31505\loch\f31506 convey the exclusion of warranty; and each file should have at least
+\par \hich\af31506\dbch\af31505\loch\f31506 the "copyright" line and a \hich\af31506\dbch\af31505\loch\f31506 pointer to where the full notice is found.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 <one line to give the program's name and a brief idea of what it does.>
+\par \hich\af31506\dbch\af31505\loch\f31506 Copyright (C) <year> <name of author>
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 This program is free software; you can redistribute it and/or modify
+\par \hich\af31506\dbch\af31505\loch\f31506 it under the te\hich\af31506\dbch\af31505\loch\f31506 rms of the GNU General Public License as published by
+\par \hich\af31506\dbch\af31505\loch\f31506 the Free Software Foundation; either version 2 of the License, or
+\par \hich\af31506\dbch\af31505\loch\f31506 (at your option) any later version.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 This program is distributed in the hope that it will be useful,
+\par \hich\af31506\dbch\af31505\loch\f31506 but WITHOUT ANY WAR\hich\af31506\dbch\af31505\loch\f31506 RANTY; without even the implied warranty of
+\par \hich\af31506\dbch\af31505\loch\f31506 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+\par \hich\af31506\dbch\af31505\loch\f31506 GNU General Public License for more details.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 You should have received a copy of the GNU General Public License along
+\par \hich\af31506\dbch\af31505\loch\f31506 with this progra\hich\af31506\dbch\af31505\loch\f31506 m; if not, write to the Free Software Foundation, Inc.,
+\par \hich\af31506\dbch\af31505\loch\f31506 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Also add information on how to contact you by electronic and paper mail.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 If the program is interactive, make it output a short notice like this
+\par \hich\af31506\dbch\af31505\loch\f31506 when it starts in an interactive mode:
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Gnomovision version 69, Copyright (C) year name of author
+\par \hich\af31506\dbch\af31505\loch\f31506 Gnomo\hich\af31506\dbch\af31505\loch\f31506 vision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+\par \hich\af31506\dbch\af31505\loch\f31506 This is free software, and you are welcome to redistribute it
+\par \hich\af31506\dbch\af31505\loch\f31506 under certain conditions; type `show c' for details.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 The hypothetical commands `show w' and `show c' should show the\hich\af31506\dbch\af31505\loch\f31506 appropriate
+\par \hich\af31506\dbch\af31505\loch\f31506 parts of the General Public License. Of course, the commands you use may
+\par \hich\af31506\dbch\af31505\loch\f31506 be called something other than `show w' and `show c'; they could even be
+\par \hich\af31506\dbch\af31505\loch\f31506 mouse-clicks or menu items--whatever suits your program.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 You should also get your employer (if \hich\af31506\dbch\af31505\loch\f31506 you work as a programmer) or your
+\par \hich\af31506\dbch\af31505\loch\f31506 school, if any, to sign a "copyright disclaimer" for the program, if
+\par \hich\af31506\dbch\af31505\loch\f31506 necessary. Here is a sample; alter the names:
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+\par \hich\af31506\dbch\af31505\loch\f31506 `Gnomovision' (which makes pas\hich\af31506\dbch\af31505\loch\f31506 ses at compilers) written by James Hacker.
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 <signature of Ty Coon>, 1 April 1989
+\par \hich\af31506\dbch\af31505\loch\f31506 Ty Coon, President of Vice
+\par 
+\par \hich\af31506\dbch\af31505\loch\f31506 This General Public License does not permit incorporating your program into
+\par \hich\af31506\dbch\af31505\loch\f31506 proprietary programs. If your program is a subroutine library, you\hich\af31506\dbch\af31505\loch\f31506 may
+\par \hich\af31506\dbch\af31505\loch\f31506 consider it more useful to permit linking proprietary applications with the
+\par \hich\af31506\dbch\af31505\loch\f31506 library. If this is what you want to do, use the GNU Lesser General
+\par \hich\af31506\dbch\af31505\loch\f31506 Public License instead of this License.}{\rtlch\fcs1 \af31507 \ltrch\fcs0 \lang9\langfe2057\langnp9\insrsid9962314 
+\par }{\*\themedata 504b030414000600080000002100e9de0fbfff0000001c020000130000005b436f6e74656e745f54797065735d2e786d6cac91cb4ec3301045f748fc83e52d4a
+9cb2400825e982c78ec7a27cc0c8992416c9d8b2a755fbf74cd25442a820166c2cd933f79e3be372bd1f07b5c3989ca74aaff2422b24eb1b475da5df374fd9ad
+5689811a183c61a50f98f4babebc2837878049899a52a57be670674cb23d8e90721f90a4d2fa3802cb35762680fd800ecd7551dc18eb899138e3c943d7e503b6
+b01d583deee5f99824e290b4ba3f364eac4a430883b3c092d4eca8f946c916422ecab927f52ea42b89a1cd59c254f919b0e85e6535d135a8de20f20b8c12c3b0
+0c895fcf6720192de6bf3b9e89ecdbd6596cbcdd8eb28e7c365ecc4ec1ff1460f53fe813d3cc7f5b7f020000ffff0300504b030414000600080000002100a5d6
+a7e7c0000000360100000b0000005f72656c732f2e72656c73848fcf6ac3300c87ef85bd83d17d51d2c31825762fa590432fa37d00e1287f68221bdb1bebdb4f
+c7060abb0884a4eff7a93dfeae8bf9e194e720169aaa06c3e2433fcb68e1763dbf7f82c985a4a725085b787086a37bdbb55fbc50d1a33ccd311ba548b6309512
+0f88d94fbc52ae4264d1c910d24a45db3462247fa791715fd71f989e19e0364cd3f51652d73760ae8fa8c9ffb3c330cc9e4fc17faf2ce545046e37944c69e462
+a1a82fe353bd90a865aad41ed0b5b8f9d6fd010000ffff0300504b0304140006000800000021006b799616830000008a0000001c0000007468656d652f746865
+6d652f7468656d654d616e616765722e786d6c0ccc4d0ac3201040e17da17790d93763bb284562b2cbaebbf600439c1a41c7a0d29fdbd7e5e38337cedf14d59b
+4b0d592c9c070d8a65cd2e88b7f07c2ca71ba8da481cc52c6ce1c715e6e97818c9b48d13df49c873517d23d59085adb5dd20d6b52bd521ef2cdd5eb9246a3d8b
+4757e8d3f729e245eb2b260a0238fd010000ffff0300504b030414000600080000002100b6f4679893070000c9200000160000007468656d652f7468656d652f
+7468656d65312e786d6cec59cd8b1bc915bf07f23f347d97f5d5ad8fc1f2a24fcfda33b6b164873dd648a5eef2547789aad28cc56208de532e81c026e49085bd
+ed21842cecc22eb9e48f31d8249b3f22afaa5bdd5552c99e191c3061463074977eefd5afde7bf5de53d5ddcf5e26d4bbc05c1096f6fcfa9d9aefe174ce16248d
+7afeb3d9a4d2f13d2151ba4094a5b8e76fb0f03fbbf7eb5fdd454732c609f6403e1547a8e7c752ae8eaa5531876124eeb0154ee1bb25e30992f0caa3ea82a34b
+d09bd06aa3566b55134452df4b51026a1f2f97648ebd9952e9dfdb2a1f53784da5500373caa74a35b6243476715e5708b11143cabd0b447b3eccb3609733fc52
+fa1e4542c2173dbfa6fffceabdbb5574940b517940d6909be8bf5c2e17589c37f49c3c3a2b260d823068f50bfd1a40e53e6edc1eb7c6ad429f06a0f91c569a71
+b175b61bc320c71aa0ecd1a17bd41e35eb16ded0dfdce3dc0fd5c7c26b50a63fd8c34f2643b0a285d7a00c1feee1c3417730b2f56b50866fede1dbb5fe28685b
+fa3528a6243ddf43d7c25673b85d6d0159327aec8477c360d26ee4ca4b144443115d6a8a254be5a1584bd00bc6270050408a24493db959e1259a43140f112567
+9c7827248a21f056286502866b8ddaa4d684ffea13e827ed5174849121ad780113b137a4f87862cec94af6fc07a0d537206f7ffef9cdeb1fdfbcfee9cd575fbd
+79fdf77c6eadca923b466964cafdf2dd1ffef3cd6fbd7ffff0ed2f5fff319b7a172f4cfcbbbffdeedd3ffef93ef5b0e2d2146ffff4fdbb1fbf7ffbe7dfffebaf
+5f3bb4f7393a33e1339260e13dc297de5396c0021dfcf119bf9ec42c46c494e8a791402952b338f48f656ca11f6d10450edc00db767cce21d5b880f7d72f2cc2
+d398af2571687c182716f094313a60dc6985876a2ec3ccb3751ab927e76b13f714a10bd7dc43945a5e1eaf579063894be530c616cd2714a5124538c5d253dfb1
+738c1dabfb8210cbaea764ce99604be97d41bc01224e93ccc899154da5d03149c02f1b1741f0b7659bd3e7de8051d7aa47f8c246c2de40d4417e86a965c6fb68
+2d51e252394309350d7e8264ec2239ddf0b9891b0b099e8e3065de78818570c93ce6b05ec3e90f21cdb8dd7e4a37898de4929cbb749e20c64ce4889d0f6394ac
+5cd829496313fbb938871045de13265df05366ef10f50e7e40e941773f27d872f787b3c133c8b026a53240d4376beef0e57dccacf89d6ee8126157aae9f3c44a
+b17d4e9cd131584756689f604cd1255a60ec3dfbdcc160c05696cd4bd20f62c82ac7d815580f901dabea3dc5027a25d5dcece7c91322ac909de2881de073bad9
+493c1b9426881fd2fc08bc6eda7c0ca52e7105c0633a3f37818f08f480102f4ea33c16a0c308ee835a9fc4c82a60ea5db8e375c32dff5d658fc1be7c61d1b8c2
+be04197c6d1948eca6cc7b6d3343d49aa00c9819822ec3956e41c4727f29a28aab165b3be596f6a62ddd00dd91d5f42424fd6007b4d3fb84ffbbde073a8cb77f
+f9c6b10f3e4ebfe3566c25ab6b763a8792c9f14e7f7308b7dbd50c195f904fbfa919a175fa04431dd9cf58b73dcd6d4fe3ffdff73487f6f36d2773a8dfb8ed64
+7ce8306e3b99fc70e5e3743265f3027d8d3af0c80e7af4b14f72f0d46749289dca0dc527421ffc08f83db398c0a092d3279eb838055cc5f0a8ca1c4c60e1228e
+b48cc799fc0d91f134462b381daafb4a492472d591f0564cc0a1911e76ea5678ba4e4ed9223becacd7d5c16656590592e5782d2cc6e1a04a66e856bb3cc02bd4
+6bb6913e68dd1250b2d721614c6693683a48b4b783ca48fa58178ce620a157f65158741d2c3a4afdd6557b2c805ae115f8c1edc1cff49e1f06200242701e07cd
+f942f92973f5d6bbda991fd3d3878c69450034d8db08283ddd555c0f2e4fad2e0bb52b78da2261849b4d425b46377822869fc17974aad1abd0b8aeafbba54b2d
+7aca147a3e08ad9246bbf33e1637f535c8ede6069a9a9982a6de65cf6f35430899395af5fc251c1ac363b282d811ea3717a211dcbccc25cf36fc4d32cb8a0b39
+4222ce0cae934e960d122231f728497abe5a7ee1069aea1ca2b9d51b90103e59725d482b9f1a3970baed64bc5ce2b934dd6e8c284b67af90e1b35ce1fc568bdf
+1cac24d91adc3d8d1797de195df3a708422c6cd795011744c0dd413db3e682c0655891c8caf8db294c79da356fa3740c65e388ae62945714339967709dca0b3a
+faadb081f196af190c6a98242f8467912ab0a651ad6a5a548d8cc3c1aafb6121653923699635d3ca2aaa6abab39835c3b60cecd8f26645de60b53531e434b3c2
+67a97b37e576b7b96ea74f28aa0418bcb09fa3ea5ea12018d4cac92c6a8af17e1a56393b1fb56bc776811fa07695226164fdd656ed8edd8a1ae19c0e066f54f9
+416e376a6168b9ed2bb5a5f5adb979b1cdce5e40f2184197bba6526857c2c92e47d0104d754f92a50dd8222f65be35e0c95b73d2f3bfac85fd60d80887955a27
+1c57826650ab74c27eb3d20fc3667d1cd66ba341e31514161927f530bbb19fc00506dde4f7f67a7cefee3ed9ded1dc99b3a4caf4dd7c5513d777f7f5c6e1bb7b
+8f40d2f9b2d598749bdd41abd26df627956034e854bac3d6a0326a0ddba3c9681876ba9357be77a1c141bf390c5ae34ea5551f0e2b41aba6e877ba9576d068f4
+8376bf330efaaff23606569ea58fdc16605ecdebde7f010000ffff0300504b0304140006000800000021000dd1909fb60000001b010000270000007468656d65
+2f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73848f4d0ac2301484f78277086f6fd3ba109126dd88d0add40384e4350d36
+3f2451eced0dae2c082e8761be9969bb979dc9136332de3168aa1a083ae995719ac16db8ec8e4052164e89d93b64b060828e6f37ed1567914b284d262452282e
+3198720e274a939cd08a54f980ae38a38f56e422a3a641c8bbd048f7757da0f19b017cc524bd62107bd5001996509affb3fd381a89672f1f165dfe514173d985
+0528a2c6cce0239baa4c04ca5bbabac4df000000ffff0300504b01022d0014000600080000002100e9de0fbfff0000001c020000130000000000000000000000
+0000000000005b436f6e74656e745f54797065735d2e786d6c504b01022d0014000600080000002100a5d6a7e7c0000000360100000b00000000000000000000
+000000300100005f72656c732f2e72656c73504b01022d00140006000800000021006b799616830000008a0000001c0000000000000000000000000019020000
+7468656d652f7468656d652f7468656d654d616e616765722e786d6c504b01022d0014000600080000002100b6f4679893070000c92000001600000000000000
+000000000000d60200007468656d652f7468656d652f7468656d65312e786d6c504b01022d00140006000800000021000dd1909fb60000001b01000027000000
+000000000000000000009d0a00007468656d652f7468656d652f5f72656c732f7468656d654d616e616765722e786d6c2e72656c73504b050600000000050005005d010000980b00000000}
+{\*\colorschememapping 3c3f786d6c2076657273696f6e3d22312e302220656e636f64696e673d225554462d3822207374616e64616c6f6e653d22796573223f3e0d0a3c613a636c724d
+617020786d6c6e733a613d22687474703a2f2f736368656d61732e6f70656e786d6c666f726d6174732e6f72672f64726177696e676d6c2f323030362f6d6169
+6e22206267313d226c743122207478313d22646b3122206267323d226c743222207478323d22646b322220616363656e74313d22616363656e74312220616363
+656e74323d22616363656e74322220616363656e74333d22616363656e74332220616363656e74343d22616363656e74342220616363656e74353d22616363656e74352220616363656e74363d22616363656e74362220686c696e6b3d22686c696e6b2220666f6c486c696e6b3d22666f6c486c696e6b222f3e}
+{\*\latentstyles\lsdstimax376\lsdlockeddef0\lsdsemihiddendef0\lsdunhideuseddef0\lsdqformatdef0\lsdprioritydef99{\lsdlockedexcept \lsdqformat1 \lsdpriority0 \lsdlocked0 Normal;\lsdqformat1 \lsdpriority9 \lsdlocked0 heading 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 2;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 3;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 5;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 6;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 7;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 8;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority9 \lsdlocked0 heading 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 5;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index 9;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 1;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 2;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 4;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 5;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 7;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 8;\lsdsemihidden1 \lsdunhideused1 \lsdpriority39 \lsdlocked0 toc 9;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 header;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footer;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 index heading;\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority35 \lsdlocked0 caption;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of figures;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 envelope return;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 footnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation reference;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 line number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 page number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote reference;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 endnote text;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 table of authorities;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 macro;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 toa heading;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Bullet 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Number 5;\lsdqformat1 \lsdpriority10 \lsdlocked0 Title;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Closing;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Signature;\lsdsemihidden1 \lsdunhideused1 \lsdpriority1 \lsdlocked0 Default Paragraph Font;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 4;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 List Continue 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Message Header;\lsdqformat1 \lsdpriority11 \lsdlocked0 Subtitle;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Salutation;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Date;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text First Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Note Heading;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Body Text Indent 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Block Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 FollowedHyperlink;\lsdqformat1 \lsdpriority22 \lsdlocked0 Strong;
+\lsdqformat1 \lsdpriority20 \lsdlocked0 Emphasis;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Document Map;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Plain Text;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 E-mail Signature;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Top of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Bottom of Form;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal (Web);\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Acronym;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Address;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Cite;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Code;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Definition;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Keyboard;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Preformatted;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Sample;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Typewriter;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 HTML Variable;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Normal Table;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 annotation subject;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 No List;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Outline List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 1;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Simple 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Classic 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Colorful 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 3;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Columns 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Grid 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 4;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 5;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 6;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 7;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table List 8;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table 3D effects 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Contemporary;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Elegant;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Professional;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Subtle 2;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 1;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 2;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Web 3;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Balloon Text;\lsdpriority39 \lsdlocked0 Table Grid;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Table Theme;\lsdsemihidden1 \lsdlocked0 Placeholder Text;
+\lsdqformat1 \lsdpriority1 \lsdlocked0 No Spacing;\lsdpriority60 \lsdlocked0 Light Shading;\lsdpriority61 \lsdlocked0 Light List;\lsdpriority62 \lsdlocked0 Light Grid;\lsdpriority63 \lsdlocked0 Medium Shading 1;\lsdpriority64 \lsdlocked0 Medium Shading 2;
+\lsdpriority65 \lsdlocked0 Medium List 1;\lsdpriority66 \lsdlocked0 Medium List 2;\lsdpriority67 \lsdlocked0 Medium Grid 1;\lsdpriority68 \lsdlocked0 Medium Grid 2;\lsdpriority69 \lsdlocked0 Medium Grid 3;\lsdpriority70 \lsdlocked0 Dark List;
+\lsdpriority71 \lsdlocked0 Colorful Shading;\lsdpriority72 \lsdlocked0 Colorful List;\lsdpriority73 \lsdlocked0 Colorful Grid;\lsdpriority60 \lsdlocked0 Light Shading Accent 1;\lsdpriority61 \lsdlocked0 Light List Accent 1;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 1;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 1;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 1;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 1;\lsdsemihidden1 \lsdlocked0 Revision;
+\lsdqformat1 \lsdpriority34 \lsdlocked0 List Paragraph;\lsdqformat1 \lsdpriority29 \lsdlocked0 Quote;\lsdqformat1 \lsdpriority30 \lsdlocked0 Intense Quote;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 1;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 1;
+\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 1;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 1;\lsdpriority70 \lsdlocked0 Dark List Accent 1;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 1;\lsdpriority72 \lsdlocked0 Colorful List Accent 1;
+\lsdpriority73 \lsdlocked0 Colorful Grid Accent 1;\lsdpriority60 \lsdlocked0 Light Shading Accent 2;\lsdpriority61 \lsdlocked0 Light List Accent 2;\lsdpriority62 \lsdlocked0 Light Grid Accent 2;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 2;
+\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 2;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 2;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 2;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 2;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 2;
+\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 2;\lsdpriority70 \lsdlocked0 Dark List Accent 2;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 2;\lsdpriority72 \lsdlocked0 Colorful List Accent 2;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 2;
+\lsdpriority60 \lsdlocked0 Light Shading Accent 3;\lsdpriority61 \lsdlocked0 Light List Accent 3;\lsdpriority62 \lsdlocked0 Light Grid Accent 3;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 3;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 3;
+\lsdpriority65 \lsdlocked0 Medium List 1 Accent 3;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 3;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 3;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 3;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 3;
+\lsdpriority70 \lsdlocked0 Dark List Accent 3;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 3;\lsdpriority72 \lsdlocked0 Colorful List Accent 3;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 3;\lsdpriority60 \lsdlocked0 Light Shading Accent 4;
+\lsdpriority61 \lsdlocked0 Light List Accent 4;\lsdpriority62 \lsdlocked0 Light Grid Accent 4;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 4;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 4;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 4;
+\lsdpriority66 \lsdlocked0 Medium List 2 Accent 4;\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 4;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 4;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 4;\lsdpriority70 \lsdlocked0 Dark List Accent 4;
+\lsdpriority71 \lsdlocked0 Colorful Shading Accent 4;\lsdpriority72 \lsdlocked0 Colorful List Accent 4;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 4;\lsdpriority60 \lsdlocked0 Light Shading Accent 5;\lsdpriority61 \lsdlocked0 Light List Accent 5;
+\lsdpriority62 \lsdlocked0 Light Grid Accent 5;\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 5;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 5;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 5;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 5;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 5;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 5;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 5;\lsdpriority70 \lsdlocked0 Dark List Accent 5;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 5;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 5;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 5;\lsdpriority60 \lsdlocked0 Light Shading Accent 6;\lsdpriority61 \lsdlocked0 Light List Accent 6;\lsdpriority62 \lsdlocked0 Light Grid Accent 6;
+\lsdpriority63 \lsdlocked0 Medium Shading 1 Accent 6;\lsdpriority64 \lsdlocked0 Medium Shading 2 Accent 6;\lsdpriority65 \lsdlocked0 Medium List 1 Accent 6;\lsdpriority66 \lsdlocked0 Medium List 2 Accent 6;
+\lsdpriority67 \lsdlocked0 Medium Grid 1 Accent 6;\lsdpriority68 \lsdlocked0 Medium Grid 2 Accent 6;\lsdpriority69 \lsdlocked0 Medium Grid 3 Accent 6;\lsdpriority70 \lsdlocked0 Dark List Accent 6;\lsdpriority71 \lsdlocked0 Colorful Shading Accent 6;
+\lsdpriority72 \lsdlocked0 Colorful List Accent 6;\lsdpriority73 \lsdlocked0 Colorful Grid Accent 6;\lsdqformat1 \lsdpriority19 \lsdlocked0 Subtle Emphasis;\lsdqformat1 \lsdpriority21 \lsdlocked0 Intense Emphasis;
+\lsdqformat1 \lsdpriority31 \lsdlocked0 Subtle Reference;\lsdqformat1 \lsdpriority32 \lsdlocked0 Intense Reference;\lsdqformat1 \lsdpriority33 \lsdlocked0 Book Title;\lsdsemihidden1 \lsdunhideused1 \lsdpriority37 \lsdlocked0 Bibliography;
+\lsdsemihidden1 \lsdunhideused1 \lsdqformat1 \lsdpriority39 \lsdlocked0 TOC Heading;\lsdpriority41 \lsdlocked0 Plain Table 1;\lsdpriority42 \lsdlocked0 Plain Table 2;\lsdpriority43 \lsdlocked0 Plain Table 3;\lsdpriority44 \lsdlocked0 Plain Table 4;
+\lsdpriority45 \lsdlocked0 Plain Table 5;\lsdpriority40 \lsdlocked0 Grid Table Light;\lsdpriority46 \lsdlocked0 Grid Table 1 Light;\lsdpriority47 \lsdlocked0 Grid Table 2;\lsdpriority48 \lsdlocked0 Grid Table 3;\lsdpriority49 \lsdlocked0 Grid Table 4;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 1;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 1;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 1;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 1;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 1;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 2;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 2;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 2;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 2;
+\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 3;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 3;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 3;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 3;
+\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 3;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 4;
+\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 4;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 4;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 4;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 4;
+\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 4;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 5;
+\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 5;\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 5;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 5;
+\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 5;\lsdpriority46 \lsdlocked0 Grid Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 Grid Table 2 Accent 6;\lsdpriority48 \lsdlocked0 Grid Table 3 Accent 6;
+\lsdpriority49 \lsdlocked0 Grid Table 4 Accent 6;\lsdpriority50 \lsdlocked0 Grid Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 Grid Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 Grid Table 7 Colorful Accent 6;
+\lsdpriority46 \lsdlocked0 List Table 1 Light;\lsdpriority47 \lsdlocked0 List Table 2;\lsdpriority48 \lsdlocked0 List Table 3;\lsdpriority49 \lsdlocked0 List Table 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful;\lsdpriority52 \lsdlocked0 List Table 7 Colorful;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 1;\lsdpriority47 \lsdlocked0 List Table 2 Accent 1;\lsdpriority48 \lsdlocked0 List Table 3 Accent 1;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 1;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 1;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 1;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 1;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 2;\lsdpriority47 \lsdlocked0 List Table 2 Accent 2;\lsdpriority48 \lsdlocked0 List Table 3 Accent 2;\lsdpriority49 \lsdlocked0 List Table 4 Accent 2;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 2;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 2;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 2;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 3;
+\lsdpriority47 \lsdlocked0 List Table 2 Accent 3;\lsdpriority48 \lsdlocked0 List Table 3 Accent 3;\lsdpriority49 \lsdlocked0 List Table 4 Accent 3;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 3;
+\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 3;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 3;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 4;\lsdpriority47 \lsdlocked0 List Table 2 Accent 4;
+\lsdpriority48 \lsdlocked0 List Table 3 Accent 4;\lsdpriority49 \lsdlocked0 List Table 4 Accent 4;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 4;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 4;
+\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 4;\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 5;\lsdpriority47 \lsdlocked0 List Table 2 Accent 5;\lsdpriority48 \lsdlocked0 List Table 3 Accent 5;
+\lsdpriority49 \lsdlocked0 List Table 4 Accent 5;\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 5;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 5;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 5;
+\lsdpriority46 \lsdlocked0 List Table 1 Light Accent 6;\lsdpriority47 \lsdlocked0 List Table 2 Accent 6;\lsdpriority48 \lsdlocked0 List Table 3 Accent 6;\lsdpriority49 \lsdlocked0 List Table 4 Accent 6;
+\lsdpriority50 \lsdlocked0 List Table 5 Dark Accent 6;\lsdpriority51 \lsdlocked0 List Table 6 Colorful Accent 6;\lsdpriority52 \lsdlocked0 List Table 7 Colorful Accent 6;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Mention;
+\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Hyperlink;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Hashtag;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Unresolved Mention;\lsdsemihidden1 \lsdunhideused1 \lsdlocked0 Smart Link;}}{\*\datastore 01050000
+02000000180000004d73786d6c322e534158584d4c5265616465722e362e3000000000000000000000060000
+d0cf11e0a1b11ae1000000000000000000000000000000003e000300feff090006000000000000000000000001000000010000000000000000100000feffffff00000000feffffff0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+fffffffffffffffffdfffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+ffffffffffffffffffffffffffffffff52006f006f007400200045006e00740072007900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000016000500ffffffffffffffffffffffff0c6ad98892f1d411a65f0040963251e500000000000000000000000060fd
+e3697c0ad601feffffff00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000
+00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffff000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000105000000000000}}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/gfx Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/gfx/banner.bmp Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Installer/gfx/dialog.bmp Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Attributes/DisplayNameLocalized.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Attributes/DisplayNameLocalized.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Attributes/ShortName.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Attributes/ShortName.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/HandBrake.Interop.csproj -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/HandBrake.Interop.csproj Changed

@@ -1,25 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 <PropertyGroup>
- <TargetFramework>netstandard2.0</TargetFramework>
- <Version>1.4.0</Version>
+ <TargetFramework>net6.0</TargetFramework>
+ <FileVersion>1.5.1.0</FileVersion>
+ <Version>1.5.1</Version>
 <Authors>HandBrake Team</Authors>
 <Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
- <Copyright>Copyright © 2003-2020 HandBrake Team</Copyright>
+ <Copyright>Copyright © 2003-2022 HandBrake Team</Copyright>
 <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
 <RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
 <RepositoryType>git</RepositoryType>
 <PackageTags>Video Transcoder</PackageTags>
- <Platforms>x64</Platforms>
- <PlatformTarget>x64</PlatformTarget>
+ <Platforms>AnyCPU</Platforms>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+ <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 </PropertyGroup>
 
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PlatformTarget>x64</PlatformTarget>
- </PropertyGroup>
-
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
- </ItemGroup>
-
 </Project>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeEncoderHelpers.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeEncoderHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="HandBrakeEncoderHelpers.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -14,19 +14,13 @@
 using System.Linq;
 
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
 using HandBrake.Interop.Interop.Helpers;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- /// <summary>
- /// The encoders.
- /// </summary>
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+ using HandBrake.Interop.Utilities;
+
 public static class HandBrakeEncoderHelpers
 {
- private static IHbFunctions hbFunctions;
 private static List<HBAudioEncoder> audioEncoders;
 private static List<HBVideoEncoder> videoEncoders;
 private static List<HBRate> videoFramerates;
@@ -40,9 +34,6 @@
 /// </summary>
 static HandBrakeEncoderHelpers()
 {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
-
 if (!HandBrakeUtils.IsInitialised())
 {
 throw new Exception("Please Initialise with HandBrakeUtils.EnsureGlobalInit before using!");
@@ -58,7 +49,7 @@
 {
 if (audioEncoders == null)
 {
- audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(hbFunctions.hb_audio_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToAudioEncoder);
+ audioEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBAudioEncoder>(HBFunctions.hb_audio_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToAudioEncoder);
 }
 
 return audioEncoders;
@@ -74,7 +65,7 @@
 {
 if (videoEncoders == null)
 {
- videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(hbFunctions.hb_video_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToVideoEncoder);
+ videoEncoders = InteropUtilities.ToListFromIterator<hb_encoder_s, HBVideoEncoder>(HBFunctions.hb_video_encoder_get_next, HandBrakeUnitConversionHelpers.NativeToVideoEncoder);
 }
 
 return videoEncoders;
@@ -90,7 +81,7 @@
 {
 if (videoFramerates == null)
 {
- videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(hbFunctions.hb_video_framerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
+ videoFramerates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_video_framerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
 }
 
 return videoFramerates;
@@ -106,7 +97,7 @@
 {
 if (mixdowns == null)
 {
- mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(hbFunctions.hb_mixdown_get_next, HandBrakeUnitConversionHelpers.NativeToMixdown);
+ mixdowns = InteropUtilities.ToListFromIterator<hb_mixdown_s, HBMixdown>(HBFunctions.hb_mixdown_get_next, HandBrakeUnitConversionHelpers.NativeToMixdown);
 }
 
 return mixdowns;
@@ -122,7 +113,7 @@
 {
 if (audioBitrates == null)
 {
- audioBitrates = InteropUtilities.ToListFromIterator<hb_rate_s, int>(hbFunctions.hb_audio_bitrate_get_next, b => b.rate);
+ audioBitrates = InteropUtilities.ToListFromIterator<hb_rate_s, int>(HBFunctions.hb_audio_bitrate_get_next, b => b.rate);
 }
 
 return audioBitrates;
@@ -138,7 +129,7 @@
 {
 if (audioSampleRates == null)
 {
- audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(hbFunctions.hb_audio_samplerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
+ audioSampleRates = InteropUtilities.ToListFromIterator<hb_rate_s, HBRate>(HBFunctions.hb_audio_samplerate_get_next, HandBrakeUnitConversionHelpers.NativeToRate);
 }
 
 return audioSampleRates;
@@ -154,7 +145,7 @@
 {
 if (containers == null)
 {
- containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(hbFunctions.hb_container_get_next, HandBrakeUnitConversionHelpers.NativeToContainer);
+ containers = InteropUtilities.ToListFromIterator<hb_container_s, HBContainer>(HBFunctions.hb_container_get_next, HandBrakeUnitConversionHelpers.NativeToContainer);
 }
 
 return containers;
@@ -168,7 +159,7 @@
 {
 get
 {
- return hbFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.IMPORTSRT) > 0;
+ return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.IMPORTSRT) > 0;
 }
 }
 
@@ -179,9 +170,9 @@
 {
 get
 {
- return hbFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.IMPORTSSA) > 0;
+ return HBFunctions.hb_subtitle_can_burn((int)hb_subtitle_s_subsource.IMPORTSSA) > 0;
 }
- }
+ }
 
 /// <summary>
 /// Gets the audio encoder with the specified short name.
@@ -269,7 +260,21 @@
 {
 return Containers.SingleOrDefault(c => c.ShortName == shortName);
 }
-
+
+ /// <summary>
+ /// Returns true if the given video encoder supports two-pass mode.
+ /// </summary>
+ /// <param name="encoderId">
+ /// The encoder ID.
+ /// </param>
+ /// <returns>
+ /// True if the given video encoder supports two-pass mode.
+ /// </returns>
+ public static bool VideoEncoderSupportsTwoPass(int encoderId)
+		{
+ return HBFunctions.hb_video_twopass_is_supported((uint)encoderId) > 0;
+		}
+
 /// <summary>
 /// Returns true if the subtitle source type can be set to forced only.
 /// </summary>
@@ -281,7 +286,7 @@
 /// </returns>
 public static bool SubtitleCanSetForcedOnly(int source)
 {
- return hbFunctions.hb_subtitle_can_force(source) > 0;
+ return HBFunctions.hb_subtitle_can_force(source) > 0;
 }
 
 /// <summary>
@@ -295,7 +300,7 @@
 /// </returns>
 public static bool SubtitleCanBurn(int source)
 {
- return hbFunctions.hb_subtitle_can_burn(source) > 0;
+ return HBFunctions.hb_subtitle_can_burn(source) > 0;
 }
 
 /// <summary>
@@ -312,7 +317,7 @@
 /// </returns>
 public static bool SubtitleCanPassthrough(int subtitleSourceType, int muxer)
 {
- return hbFunctions.hb_subtitle_can_pass(subtitleSourceType, muxer) > 0;
+ return HBFunctions.hb_subtitle_can_pass(subtitleSourceType, muxer) > 0;
 }
 
 /// <summary>
@@ -360,7 +365,7 @@
 /// The encoder to examine.
 /// </param>
 /// <returns>
- /// True if the given encoder is comatible with the given audio track.
+ /// True if the given encoder is compatible with the given audio track.
 /// </returns>
 /// <remarks>
 /// Only works with passthrough encoders.
@@ -384,7 +389,7 @@
 /// </returns>
 public static bool MixdownHasRemixSupport(HBMixdown mixdown, ulong layout)
 {
- return hbFunctions.hb_mixdown_has_remix_support(mixdown.Id, layout) > 0;
+ return HBFunctions.hb_mixdown_has_remix_support(mixdown.Id, layout) > 0;
 }
 
 /// <summary>
@@ -401,7 +406,7 @@
 /// </returns>
 public static bool MixdownHasCodecSupport(HBMixdown mixdown, HBAudioEncoder encoder)
 {
- return hbFunctions.hb_mixdown_has_codec_support(mixdown.Id, (uint)encoder.Id) > 0;
+ return HBFunctions.hb_mixdown_has_codec_support(mixdown.Id, (uint)encoder.Id) > 0;
 }
 
 /// <summary>
@@ -417,12 +422,15 @@
 /// <returns>True if available.</returns>
 public static bool MixdownIsSupported(HBMixdown mixdown, HBAudioEncoder encoder, long channelLayout)
 {
- return hbFunctions.hb_mixdown_is_supported(mixdown.Id, (uint)encoder.Id, (uint)channelLayout) > 0;
+ return HBFunctions.hb_mixdown_is_supported(mixdown.Id, (uint)encoder.Id, (uint)channelLayout) > 0;
 }
 
 /// <summary>
 /// Determines if DRC can be applied to the given track with the given encoder.
 /// </summary>
+ /// <param name="handle">
+ /// The handle.
+ /// </param>
 /// <param name="trackNumber">
 /// The track Number.
 /// </param>
@@ -437,7 +445,7 @@
 /// </returns>
 public static bool CanApplyDrc(IntPtr handle, int trackNumber, HBAudioEncoder encoder, int title)
 {
- return hbFunctions.hb_audio_can_apply_drc2(handle, title, trackNumber, encoder.Id) > 0; 
+ return HBFunctions.hb_audio_can_apply_drc2(handle, title, trackNumber, encoder.Id) > 0; 
 }
 
 /// <summary>
@@ -476,7 +484,7 @@
 return null;
 }
 
- int sanitizedMixdown = hbFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
+ int sanitizedMixdown = HBFunctions.hb_mixdown_get_best((uint)encoder.Id, layout, mixdown.Id);
 if (sanitizedMixdown != -1)
 {
 return Mixdowns.Single(m => m.Id == sanitizedMixdown);
@@ -499,7 +507,7 @@
 /// </returns>
 public static HBMixdown GetDefaultMixdown(HBAudioEncoder encoder, ulong layout)
 {
- int defaultMixdown = hbFunctions.hb_mixdown_get_default((uint)encoder.Id, layout);
+ int defaultMixdown = HBFunctions.hb_mixdown_get_default((uint)encoder.Id, layout);
 return Mixdowns.Single(m => m.Id == defaultMixdown);
 }
 
@@ -511,7 +519,7 @@
 /// <returns>The sanitized sample rate.</returns>
 public static int SanitizeSampleRate(HBAudioEncoder encoder, int sampleRate)
 {
- return hbFunctions.hb_audio_samplerate_find_closest(sampleRate, (uint)encoder.Id);
+ return HBFunctions.hb_audio_samplerate_find_closest(sampleRate, (uint)encoder.Id);
 }
 
 /// <summary>
@@ -534,7 +542,7 @@
 int low = 0;
 int high = 0;
 
- hbFunctions.hb_audio_bitrate_get_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
+ HBFunctions.hb_audio_bitrate_get_limits((uint)encoder.Id, sampleRate, mixdown.Id, ref low, ref high);
 
 return new BitrateLimits(low, high);
 }
@@ -555,7 +563,7 @@
 float granularity = 0;
 int direction = 0;
 
- hbFunctions.hb_video_quality_get_limits((uint)encoder.Id, ref low, ref high, ref granularity, ref direction);
+ HBFunctions.hb_video_quality_get_limits((uint)encoder.Id, ref low, ref high, ref granularity, ref direction);
 
 return new VideoQualityLimits(low, high, granularity, direction == 0);
 }
@@ -580,7 +588,7 @@
 /// </returns>
 public static int SanitizeAudioBitrate(int audioBitrate, HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
 {
- return hbFunctions.hb_audio_bitrate_get_best((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
+ return HBFunctions.hb_audio_bitrate_get_best((uint)encoder.Id, audioBitrate, sampleRate, mixdown.Id);
 }
 
 /// <summary>
@@ -600,7 +608,7 @@
 /// </returns>
 public static int GetDefaultBitrate(HBAudioEncoder encoder, int sampleRate, HBMixdown mixdown)
 {
- return hbFunctions.hb_audio_bitrate_get_default((uint)encoder.Id, sampleRate, mixdown.Id);
+ return HBFunctions.hb_audio_bitrate_get_default((uint)encoder.Id, sampleRate, mixdown.Id);
 }
 
 /// <summary>
@@ -616,7 +624,7 @@
 {
 float low = 0, high = 0, granularity = 0;
 int direction = 0;
- hbFunctions.hb_audio_quality_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+ HBFunctions.hb_audio_quality_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
 
 return new RangeLimits(direction == 0, granularity, high, low);
 }
@@ -634,7 +642,7 @@
 {
 float low = 0, high = 0, granularity = 0;
 int direction = 0;
- hbFunctions.hb_audio_compression_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
+ HBFunctions.hb_audio_compression_get_limits((uint)encoderId, ref low, ref high, ref granularity, ref direction);
 
 return new RangeLimits(direction == 0, granularity, high, low);
 }
@@ -650,7 +658,7 @@
 /// </returns>
 public static double GetDefaultQuality(HBAudioEncoder encoder)
 {
- return hbFunctions.hb_audio_quality_get_default((uint)encoder.Id);
+ return HBFunctions.hb_audio_quality_get_default((uint)encoder.Id);
 }
 
 /// <summary>
@@ -664,13 +672,18 @@
 /// </returns>
 public static double GetDefaultAudioCompression(HBAudioEncoder encoder)
 {
- return hbFunctions.hb_audio_compression_get_default((uint)encoder.Id);
+ return HBFunctions.hb_audio_compression_get_default((uint)encoder.Id);
 }
 
- public static uint BuildCopyMask(bool audioAllowMP3Pass, bool audioAllowAACPass, bool audioAllowAC3Pass, bool audioAllowDTSPass, bool audioAllowDTSHDPass, bool audioAllowEac3Pass, bool audioAllowFlacPass, bool audioAllowTruehdPass)
+ public static uint BuildCopyMask(bool audioAllowMP2Pass, bool audioAllowMP3Pass, bool audioAllowAACPass, bool audioAllowAC3Pass, bool audioAllowDTSPass, bool audioAllowDTSHDPass, bool audioAllowEac3Pass, bool audioAllowFlacPass, bool audioAllowTruehdPass)
 {
 uint mask = 0;
 
+ if (audioAllowMP2Pass)
+ {
+ mask |= NativeConstants.HB_ACODEC_MP2_PASS;
+ }
+
 if (audioAllowMP3Pass)
 {
 mask |= NativeConstants.HB_ACODEC_MP3_PASS;
@@ -713,5 +726,19 @@
 
 return mask;
 }
+
+ public static List<int> GetQsvAdaptorList()
+ {
+ if (HandBrakeHardwareEncoderHelper.IsQsvAvailable)
+ {
+ IntPtr gpuListPtr = HBFunctions.hb_qsv_adapters_list();
+
+ List<int> gpuList = InteropUtilities.ToListFromHandBrakeList<int>(gpuListPtr);
+
+ return gpuList;
+ }
+
+ return new List<int>();
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeFilterHelpers.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeHardwareEncoderHelper.cs Added

@@ -0,0 +1,214 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeHardwareEncoderHelper.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The System Information.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+ using System;
+ using System.Diagnostics;
+ using System.Runtime.InteropServices;
+
+ using HandBrake.Interop.Interop.HbLib;
+
+ public class HandBrakeHardwareEncoderHelper
+ {
+ private static bool? isNvencH264Available; // Local cache to prevent log spam.
+ private static bool? isNvencH265Available;
+
+ public static bool IsSafeMode
+ {
+ get
+ {
+ try
+ {
+ if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64)
+ {
+ return false;
+ }
+
+ return (HBFunctions.hb_qsv_available() + HBFunctions.hb_vce_h264_available()
+ + HBFunctions.hb_nvenc_h264_available()) == -3;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ /* QuickSync Support */
+
+ public static bool IsQsvAvailable
+ {
+ get
+ {
+ try
+ {
+ return HBFunctions.hb_qsv_available() > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ public static bool IsQsvAvailableH264
+ {
+ get
+ {
+ try
+ {
+ return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H264) > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ public static bool IsQsvAvailableH265
+ {
+ get
+ {
+ try
+ {
+ return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265) > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ public static int QsvHardwareGeneration
+ {
+ get
+ {
+ try
+ {
+ int adapter_index = HBFunctions.hb_qsv_get_adapter_index();
+ int qsv_platform = HBFunctions.hb_qsv_get_platform(adapter_index);
+ int hardware = HBFunctions.hb_qsv_hardware_generation(qsv_platform);
+ return hardware;
+ }
+ catch (Exception exc)
+ {
+ // Silent failure. -1 means unsupported.
+ Debug.WriteLine(exc);
+ return -1;
+ }
+ }
+ }
+
+ public static bool IsQsvAvailableH26510bit
+ {
+ get
+ {
+ try
+ {
+ return (HBFunctions.hb_qsv_available() & NativeConstants.HB_VCODEC_QSV_H265_10BIT) > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+ 
+ /* AMD VCE Support */
+
+ public static bool IsVceH264Available
+ {
+ get
+ {
+ try
+ {
+ return HBFunctions.hb_vce_h264_available() > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ public static bool IsVceH265Available
+ {
+ get
+ {
+ try
+ {
+ return HBFunctions.hb_vce_h265_available() > 0;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ /* Nvidia NVEnc Support */
+
+ public static bool IsNVEncH264Available
+ {
+ get
+ {
+ try
+ {
+ if (isNvencH264Available == null)
+ {
+ isNvencH264Available = HBFunctions.hb_nvenc_h264_available() > 0;
+ }
+ 
+ return isNvencH264Available.Value;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+
+ public static bool IsNVEncH265Available
+ {
+ get
+ {
+ try
+ {
+ if (!IsNVEncH264Available)
+ {
+ return false;
+ }
+
+ if (isNvencH265Available == null)
+ {
+ isNvencH265Available = HBFunctions.hb_nvenc_h265_available() > 0;
+ }
+
+ return isNvencH265Available.Value;
+ }
+ catch (Exception)
+ {
+ // Silent failure. Typically this means the dll hasn't been built with --enable-qsv
+ return false;
+ }
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeInstance.cs Changed

@@ -15,27 +15,24 @@
 using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Runtime.InteropServices;
+ using System.Text.Json;
 using System.Timers;
 
- using HandBrake.Interop.Interop.EventArgs;
- using HandBrake.Interop.Interop.Factories;
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
 using HandBrake.Interop.Interop.Helpers;
 using HandBrake.Interop.Interop.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+ using HandBrake.Interop.Interop.Interfaces.Model.Preview;
 using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.Scan;
 using HandBrake.Interop.Interop.Json.State;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Model.Preview;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- using Newtonsoft.Json;
+ using HandBrake.Interop.Utilities;
 
 public class HandBrakeInstance : IHandBrakeInstance, IDisposable
 {
- private IHbFunctions hbFunctions;
 private const double ScanPollIntervalMs = 250;
 private const double EncodePollIntervalMs = 250;
 private Timer scanPollTimer;
@@ -74,11 +71,6 @@
 public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
 
 /// <summary>
- /// Gets the handle.
- /// </summary>
- internal IntPtr Handle { get; private set; }
-
- /// <summary>
 /// Gets the number of previews created during scan.
 /// </summary>
 public int PreviewCount { get; private set; }
@@ -101,12 +93,19 @@
 /// <summary>
 /// Gets the HandBrake version string.
 /// </summary>
- public string Version => Marshal.PtrToStringAnsi(hbFunctions.hb_get_version(this.Handle));
+ public string Version => Marshal.PtrToStringAnsi(HBFunctions.hb_get_version(this.Handle));
 
 /// <summary>
 /// Gets the HandBrake build number.
 /// </summary>
- public int Build => hbFunctions.hb_get_build(this.Handle);
+ public int Build => HBFunctions.hb_get_build(this.Handle);
+
+ public bool IsRemoteInstance => false;
+
+ /// <summary>
+ /// Gets the handle.
+ /// </summary>
+ internal IntPtr Handle { get; private set; }
 
 /// <summary>
 /// Initializes this instance.
@@ -119,13 +118,10 @@
 /// </param>
 public void Initialize(int verbosity, bool noHardware)
 {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
-
 HandBrakeUtils.EnsureGlobalInit(noHardware);
 
 HandBrakeUtils.RegisterLogger();
- this.Handle = hbFunctions.hb_init(verbosity, update_check: 0);
+ this.Handle = HBFunctions.hb_init(verbosity, update_check: 0);
 }
 
 /// <summary>
@@ -148,7 +144,7 @@
 this.PreviewCount = previewCount;
 
 IntPtr pathPtr = InteropUtilities.ToUtf8PtrFromString(path);
- hbFunctions.hb_scan(this.Handle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
+ HBFunctions.hb_scan(this.Handle, pathPtr, titleIndex, previewCount, 1, (ulong)(minDuration.TotalSeconds * 90000));
 Marshal.FreeHGlobal(pathPtr);
 
 this.scanPollTimer = new Timer();
@@ -177,7 +173,7 @@
 public void StopScan()
 {
 this.scanPollTimer.Stop();
- hbFunctions.hb_scan_stop(this.Handle);
+ HBFunctions.hb_scan_stop(this.Handle);
 }
 
 /// <summary>
@@ -192,45 +188,21 @@
 /// <param name="previewNumber">
 /// The index of the preview to get (0-based).
 /// </param>
- /// <param name="deinterlace">
- /// True to enable basic deinterlace of preview images.
- /// </param>
 /// <returns>
 /// An image with the requested preview.
 /// </returns>
 HandleProcessCorruptedStateExceptions
- public RawPreviewData GetPreview(PreviewSettings settings, int previewNumber, bool deinterlace)
+ public RawPreviewData GetPreview(JsonEncodeObject settings, int previewNumber)
 {
- SourceTitle title = this.Titles.TitleList.FirstOrDefault(t => t.Index == settings.TitleNumber);
-
- // Create the Expected Output Geometry details for libhb.
- hb_geometry_settings_s uiGeometry = new hb_geometry_settings_s
- {
- crop = new { settings.Cropping.Top, settings.Cropping.Bottom, settings.Cropping.Left, settings.Cropping.Right },
- itu_par = 0,
- keep = (int)AnamorphicFactory.KeepSetting.HB_KEEP_WIDTH + (settings.KeepDisplayAspect ? 0x04 : 0), // TODO Keep Width?
- maxWidth = settings.MaxWidth,
- maxHeight = settings.MaxHeight,
- mode = (int)(hb_anamorphic_mode_t)settings.Anamorphic,
- modulus = settings.Modulus ?? 16,
- geometry = new hb_geometry_s
- {
- height = settings.Height,
- width = settings.Width,
- par = settings.Anamorphic != Anamorphic.Custom && settings.Anamorphic != Anamorphic.Automatic
- ? new hb_rational_t { den = title.Geometry.PAR.Den, num = title.Geometry.PAR.Num }
- : new hb_rational_t { den = settings.PixelAspectY, num = settings.PixelAspectX }
- }
- };
-
 // Fetch the image data from LibHb
- IntPtr resultingImageStuct = hbFunctions.hb_get_preview2(this.Handle, settings.TitleNumber, previewNumber, ref uiGeometry, deinterlace ? 1 : 0);
- hb_image_s image = InteropUtilities.ToStructureFromPtr<hb_image_s>(resultingImageStuct);
+ string taskJson = JsonSerializer.Serialize(settings, JsonSettings.Options);
+ IntPtr resultingImageStruct = HBFunctions.hb_get_preview3_json(this.Handle, previewNumber, taskJson);
+ hb_image_s image = InteropUtilities.ToStructureFromPtr<hb_image_s>(resultingImageStruct);
 
 // Copy the filled image buffer to a managed array.
 int stride_width = image.plane0.stride;
 int stride_height = image.plane0.height_stride;
- int imageBufferSize = stride_width * stride_height; // int imageBufferSize = outputWidth * outputHeight * 4;
+ int imageBufferSize = stride_width * stride_height;
 
 byte managedBuffer = new byteimageBufferSize;
 Marshal.Copy(image.plane0.data, managedBuffer, 0, imageBufferSize);
@@ -239,8 +211,8 @@
 
 // Close the image so we don't leak memory.
 IntPtr nativeJobPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
- Marshal.WriteIntPtr(nativeJobPtrPtr, resultingImageStuct);
- hbFunctions.hb_image_close(nativeJobPtrPtr);
+ Marshal.WriteIntPtr(nativeJobPtrPtr, resultingImageStruct);
+ HBFunctions.hb_image_close(nativeJobPtrPtr);
 Marshal.FreeHGlobal(nativeJobPtrPtr);
 
 return preview;
@@ -255,7 +227,7 @@
 /// <returns>True if DRC can be applied to the track with the given encoder.</returns>
 public bool CanApplyDrc(int trackNumber, HBAudioEncoder encoder, int title)
 {
- return hbFunctions.hb_audio_can_apply_drc2(this.Handle, title, trackNumber, encoder.Id) > 0;
+ return HBFunctions.hb_audio_can_apply_drc2(this.Handle, title, trackNumber, encoder.Id) > 0;
 }
 
 /// <summary>
@@ -267,12 +239,7 @@
 HandleProcessCorruptedStateExceptions
 public void StartEncode(JsonEncodeObject encodeObject)
 {
- JsonSerializerSettings settings = new JsonSerializerSettings
- {
- NullValueHandling = NullValueHandling.Ignore,
- };
-
- string encode = JsonConvert.SerializeObject(encodeObject, Formatting.Indented, settings);
+ string encode = JsonSerializer.Serialize(encodeObject, JsonSettings.Options);
 this.StartEncode(encode);
 }
 
@@ -283,8 +250,8 @@
 HandleProcessCorruptedStateExceptions
 public void StartEncode(string encodeJson)
 {
- hbFunctions.hb_add_json(this.Handle, InteropUtilities.ToUtf8PtrFromString(encodeJson));
- hbFunctions.hb_start(this.Handle);
+ HBFunctions.hb_add_json(this.Handle, InteropUtilities.ToUtf8PtrFromString(encodeJson));
+ HBFunctions.hb_start(this.Handle);
 
 this.encodePollTimer = new Timer();
 this.encodePollTimer.Interval = EncodePollIntervalMs;
@@ -309,7 +276,7 @@
 HandleProcessCorruptedStateExceptions
 public void PauseEncode()
 {
- hbFunctions.hb_pause(this.Handle);
+ HBFunctions.hb_pause(this.Handle);
 }
 
 /// <summary>
@@ -318,7 +285,7 @@
 HandleProcessCorruptedStateExceptions
 public void ResumeEncode()
 {
- hbFunctions.hb_resume(this.Handle);
+ HBFunctions.hb_resume(this.Handle);
 }
 
 /// <summary>
@@ -327,20 +294,20 @@
 HandleProcessCorruptedStateExceptions
 public void StopEncode()
 {
- hbFunctions.hb_stop(this.Handle);
+ HBFunctions.hb_stop(this.Handle);
 
 // Also remove all jobs from the queue (in case we stopped a 2-pass encode)
 var currentJobs = new List<IntPtr>();
 
- int jobs = hbFunctions.hb_count(this.Handle);
+ int jobs = HBFunctions.hb_count(this.Handle);
 for (int i = 0; i < jobs; i++)
 {
- currentJobs.Add(hbFunctions.hb_job(this.Handle, 0));
+ currentJobs.Add(HBFunctions.hb_job(this.Handle, 0));
 }
 
 foreach (IntPtr job in currentJobs)
 {
- hbFunctions.hb_rem(this.Handle, job);
+ HBFunctions.hb_rem(this.Handle, job);
 }
 }
 
@@ -353,10 +320,10 @@
 HandleProcessCorruptedStateExceptions
 public JsonState GetEncodeProgress()
 {
- IntPtr json = hbFunctions.hb_get_state_json(this.Handle);
+ IntPtr json = HBFunctions.hb_get_state_json(this.Handle);
 string statusJson = Marshal.PtrToStringAnsi(json);
 
- JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+ JsonState state = JsonSerializer.Deserialize<JsonState>(statusJson, JsonSettings.Options);
 return state;
 }
 
@@ -401,7 +368,7 @@
 // Free unmanaged objects.
 IntPtr handlePtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
 Marshal.WriteIntPtr(handlePtr, this.Handle);
- hbFunctions.hb_close(handlePtr);
+ HBFunctions.hb_close(handlePtr);
 Marshal.FreeHGlobal(handlePtr);
 
 this.disposed = true;
@@ -413,12 +380,12 @@
 HandleProcessCorruptedStateExceptions
 private void PollScanProgress()
 {
- IntPtr json = hbFunctions.hb_get_state_json(this.Handle);
+ IntPtr json = HBFunctions.hb_get_state_json(this.Handle);
 string statusJson = Marshal.PtrToStringAnsi(json);
 JsonState state = null;
 if (!string.IsNullOrEmpty(statusJson))
 {
- state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+ state = JsonSerializer.Deserialize<JsonState>(statusJson, JsonSettings.Options);
 }
 
 TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
@@ -434,12 +401,12 @@
 {
 this.scanPollTimer.Stop();
 
- var jsonMsg = hbFunctions.hb_get_title_set_json(this.Handle);
+ var jsonMsg = HBFunctions.hb_get_title_set_json(this.Handle);
 this.TitlesJson = InteropUtilities.ToStringFromUtf8Ptr(jsonMsg);
 
 if (!string.IsNullOrEmpty(this.TitlesJson))
 { 
- this.Titles = JsonConvert.DeserializeObject<JsonScanObject>(this.TitlesJson);
+ this.Titles = JsonSerializer.Deserialize<JsonScanObject>(this.TitlesJson, JsonSettings.Options);
 if (this.Titles != null)
 {
 this.FeatureTitle = this.Titles.MainFeature;
@@ -459,10 +426,10 @@
 HandleProcessCorruptedStateExceptions
 private void PollEncodeProgress()
 {
- IntPtr json = hbFunctions.hb_get_state_json(this.Handle);
+ IntPtr json = HBFunctions.hb_get_state_json(this.Handle);
 string statusJson = Marshal.PtrToStringAnsi(json);
 
- JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+ JsonState state = JsonSerializer.Deserialize<JsonState>(statusJson, JsonSettings.Options);
 
 TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
 
@@ -470,8 +437,16 @@
 {
 if (this.EncodeProgress != null)
 {
- TimeSpan eta = TimeSpan.FromSeconds(state.Working.ETASeconds);
- var progressEventArgs = new EncodeProgressEventArgs(state.Working.Progress, state.Working.Rate, state.Working.RateAvg, eta, state.Working.PassID, state.Working.Pass, state.Working.PassCount, taskState.Code);
+ TimeSpan eta = TimeSpan.FromSeconds(state?.Working?.ETASeconds ?? 0);
+ var progressEventArgs = new EncodeProgressEventArgs(0, 0, 0, TimeSpan.MinValue, 0, 0, 0, taskState.Code);
+ if (taskState == TaskState.Muxing || state.Working == null)
+ {
+ progressEventArgs = new EncodeProgressEventArgs(100, 0, 0, TimeSpan.MinValue, 0, 0, 0, taskState.Code);
+ }
+ else
+ {
+ progressEventArgs = new EncodeProgressEventArgs(state.Working.Progress, state.Working.Rate, state.Working.RateAvg, eta, state.Working.PassID, state.Working.Pass, state.Working.PassCount, taskState.Code);
+ }
 
 this.EncodeProgress(this, progressEventArgs);
 }
@@ -484,7 +459,7 @@
 {
 this.EncodeCompleted(
 this,
- new EncodeCompletedEventArgs(state.WorkDone.Error != (int)hb_error_code.HB_ERROR_NONE));
+ new EncodeCompletedEventArgs(state.WorkDone.Error));
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeLanguagesHelper.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakePictureHelpers.cs Added

@@ -0,0 +1,193 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakePictureHelpers.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Wrapper around functions in libhb.
+// See common.h for struct's / API
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+ using System;
+
+ using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+ public class HandBrakePictureHelpers
+ {
+ Flags
+ public enum KeepSetting
+ {
+ // From common.h
+ HB_KEEP_WIDTH = 0x01,
+ HB_KEEP_HEIGHT = 0x02,
+ HB_KEEP_DISPLAY_ASPECT = 0x04,
+ HB_KEEP_DISPLAY_WIDTH = 0x08,
+ HB_KEEP_PAD = 0x10,
+ }
+ 
+ Flags
+ public enum FlagsSetting
+ {
+ HB_GEO_SCALE_UP = 0x01,
+ HB_GEO_SCALE_BEST = 0x02,
+ }
+
+ public static AnamorphicResult GetAnamorphicSize(PictureSettingsJob job, PictureSettingsTitle sourceTitle, KeepSetting keepSetting, FlagsSetting flagSetting)
+ {
+ hb_rational_t computedPar;
+ switch (job.AnamorphicMode)
+ {
+ case Anamorphic.None:
+ computedPar = new hb_rational_t { den = 1, num = 1 };
+ break;
+ case Anamorphic.Custom:
+ computedPar = new hb_rational_t { den = job.ParH, num = job.ParW };
+ break;
+ default:
+ computedPar = new hb_rational_t { den = sourceTitle.ParH, num = sourceTitle.ParW };
+ break;
+ }
+
+ hb_geometry_settings_s uiGeometry = new hb_geometry_settings_s
+ {
+ crop = new { job.Crop.Top, job.Crop.Bottom, job.Crop.Left, job.Crop.Right },
+ pad = new { job.Pad.Top, job.Pad.Bottom, job.Pad.Left, job.Pad.Right },
+ flags = (int)flagSetting,
+ itu_par = 0,
+ keep = (int)keepSetting,
+ maxWidth = job.MaxWidth,
+ maxHeight = job.MaxHeight,
+ mode = (int)job.AnamorphicMode,
+ modulus = 2,
+ geometry = new hb_geometry_s { height = job.Height, width = job.Width, par = computedPar },
+ displayWidth = job.DarWidth,
+ displayHeight = job.DarHeight
+ };
+
+ // If we are rotated, the source title geometry must also be rotated. 
+ int titleWidth, titleHeight, titleParW, titleParH;
+ if (job.RotateAngle != 0)
+ {
+ PictureSettingsJob titleRepresentation = new PictureSettingsJob
+ {
+ Width = sourceTitle.Width,
+ Height = sourceTitle.Height,
+ RotateAngle = job.RotateAngle,
+ Hflip = job.Hflip,
+ ParW = sourceTitle.ParW,
+ ParH = sourceTitle.ParH,
+ Crop = new Cropping(),
+ Pad = new Padding()
+ };
+ RotateResult titleRotation = HandBrakePictureHelpers.RotateGeometry(titleRepresentation);
+ titleWidth = titleRotation.Width;
+ titleHeight = titleRotation.Height;
+ titleParW = titleRotation.ParNum;
+ titleParH = titleRotation.ParDen;
+ }
+ else
+ {
+ titleWidth = sourceTitle.Width;
+ titleHeight = sourceTitle.Height;
+ titleParW = sourceTitle.ParW;
+ titleParH = sourceTitle.ParH;
+ }
+
+ hb_geometry_s sourceGeometry = new hb_geometry_s
+ {
+ width = titleWidth,
+ height = titleHeight,
+ par = new hb_rational_t { den = titleParH, num = titleParW }
+ };
+
+ hb_geometry_s result = new hb_geometry_s();
+
+ HBFunctions.hb_set_anamorphic_size2(ref sourceGeometry, ref uiGeometry, ref result);
+
+ int outputWidth = result.width;
+ int outputHeight = result.height;
+ int outputParWidth = result.par.num;
+ int outputParHeight = result.par.den;
+ return new AnamorphicResult { OutputWidth = outputWidth, OutputHeight = outputHeight, OutputParWidth = outputParWidth, OutputParHeight = outputParHeight };
+ }
+
+ public static RotateResult RotateGeometry(PictureSettingsJob job)
+ {
+ hb_geometry_crop_s geometry = new hb_geometry_crop_s();
+ geometry.crop = new { job.Crop.Top, job.Crop.Bottom, job.Crop.Left, job.Crop.Right };
+ geometry.pad = new { job.Pad.Top, job.Pad.Bottom, job.Pad.Left, job.Pad.Right };
+ geometry.geometry = new hb_geometry_s
+ {
+ width = job.Width,
+ height = job.Height,
+ par = new hb_rational_t { num = job.ParW, den = job.ParH }
+ };
+
+ // Undo any previous rotation so that we are back at 0.
+ // Normally hflip is applied, then rotation.
+ // To revert, must apply rotation then hflip.
+ if (job.PreviousRotation.HasValue && job.PreviousRotation != 0)
+ {
+ HBFunctions.hb_rotate_geometry(ref geometry, ref geometry, 360 - job.PreviousRotation.Value, 0);
+ }
+
+ if (job.PreviousHflip.HasValue && job.PreviousHflip == 1)
+ {
+ HBFunctions.hb_rotate_geometry(ref geometry, ref geometry, 0, 1);
+ }
+ 
+ // Apply the new rotation and Horizontal flip value.
+ HBFunctions.hb_rotate_geometry(ref geometry, ref geometry, job.RotateAngle, job.Hflip);
+
+ RotateResult processedResult = new RotateResult
+ {
+ CropTop = geometry.crop0,
+ CropBottom = geometry.crop1,
+ CropLeft = geometry.crop2,
+ CropRight = geometry.crop3,
+ PadTop = geometry.pad0,
+ PadBottom = geometry.pad1,
+ PadLeft = geometry.pad2,
+ PadRight = geometry.pad3,
+ Width = geometry.geometry.width,
+ Height = geometry.geometry.height,
+ ParNum = geometry.geometry.par.num,
+ ParDen = geometry.geometry.par.den
+ };
+
+ return processedResult;
+ }
+
+ public static string GetNiceDisplayAspect(double displayWidth, double displayHeight)
+ {
+ string result;
+
+ double iaspect = displayWidth * 9 / displayHeight;
+ if (displayWidth / displayHeight > 1.9)
+ {
+ // x.x:1
+ result = string.Format("{0}:1", Math.Round(displayWidth / displayHeight, 2));
+ }
+ else if (iaspect >= 15)
+ {
+ // x.x:9
+ result = string.Format("{0}:9", Math.Round(displayWidth * 9 / displayHeight, 2));
+ }
+ else if (iaspect >= 9)
+ {
+ // x.x:3
+ result = string.Format("{0}:3", Math.Round(displayWidth * 3 / displayHeight, 2));
+ }
+ else
+ {
+ // 1:x.x
+ result = string.Format("1:{0}", Math.Round(displayHeight / displayWidth, 2));
+ }
+
+ return result;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakePresetService.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeSubtitleHelpers.cs Added

@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeSubtitleHelpers.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the HandBrakeSubtitleHelpers type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+ using HandBrake.Interop.Interop.HbLib;
+
+ public class HandBrakeSubtitleHelpers
+ {
+ public static int CheckCanForceSubtitle(int source)
+ {
+ return HBFunctions.hb_subtitle_can_force(source);
+ }
+
+ public static int CheckCanBurnSubtitle(int source)
+ {
+ return HBFunctions.hb_subtitle_can_burn(source);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeUnitConversionHelpers.cs Changed

@@ -1,9 +1,9 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeUnitConversionHelpers.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="HandBrakeUnitConversionHelpers.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-// Defines the HandrakeUnitConversionHelpers type.
+// Defines the HandBrakeUnitConversionHelpers type.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -12,25 +12,18 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+ using System.Runtime.InteropServices;
 
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
 using HandBrake.Interop.Interop.Helpers;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
 /// <summary>
 /// Converters for various encoding values.
 /// </summary>
 public static class HandBrakeUnitConversionHelpers
 {
- private static IHbFunctions hbFunctions;
- 
- /// <summary>
- /// Video Frame Rates
- /// </summary>
 private static readonly Dictionary<double, int> VideoRates;
 
 /// <summary>
@@ -38,9 +31,6 @@
 /// </summary>
 static HandBrakeUnitConversionHelpers()
 {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
-
 if (!HandBrakeUtils.IsInitialised())
 {
 throw new Exception("Please Initialise with HandBrakeUtils.EnsureGlobalInit before using!");
@@ -74,6 +64,41 @@
 
 return VideoRatesframerate;
 }
+ 
+ public static int GetFramerateFromName(string name)
+ {
+ IntPtr frameratePrt = Marshal.StringToHGlobalAnsi(name);
+
+ return HBFunctions.hb_video_framerate_get_from_name(frameratePrt);
+ }
+
+ /// <summary>
+ /// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
+ /// </summary>
+ /// <param name="pts">
+ /// The PTS to convert.
+ /// </param>
+ /// <returns>
+ /// The timespan for it.
+ /// </returns>
+ public static TimeSpan PtsToTimeSpan(ulong pts)
+ {
+ return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
+ }
+
+ /// <summary>
+ /// Converts the PTS amount to seconds.
+ /// </summary>
+ /// <param name="pts">
+ /// The PTS to convert.
+ /// </param>
+ /// <returns>
+ /// The corresponding number of seconds.
+ /// </returns>
+ public static double PtsToSeconds(ulong pts)
+ {
+ return (double)pts / 90000;
+ }
 
 /// <summary>
 /// Converts a native HB encoder structure to an Encoder model.
@@ -103,8 +128,8 @@
 var result = new HBAudioEncoder(
 encoder.muxers,
 HandBrakeEncoderHelpers.GetAudioCompressionLimits(encoder.codec),
- hbFunctions.hb_audio_compression_get_default((uint)encoder.codec),
- hbFunctions.hb_audio_quality_get_default((uint)encoder.codec),
+ HBFunctions.hb_audio_compression_get_default((uint)encoder.codec),
+ HBFunctions.hb_audio_quality_get_default((uint)encoder.codec),
 encoder.name,
 encoder.codec,
 HandBrakeEncoderHelpers.GetAudioQualityLimits(encoder.codec),
@@ -170,33 +195,5 @@
 string nativeName = InteropUtilities.ToStringFromUtf8Ptr(language.native_name);
 return new Language(englishName, nativeName, language.iso639_2);
 }
-
- /// <summary>
- /// Converts the PTS amount to a TimeSpan. There may be some accuracy loss here.
- /// </summary>
- /// <param name="pts">
- /// The PTS to convert.
- /// </param>
- /// <returns>
- /// The timespan for it.
- /// </returns>
- public static TimeSpan PtsToTimeSpan(ulong pts)
- {
- return TimeSpan.FromTicks((long)((pts * 10000000) / 90000));
- }
-
- /// <summary>
- /// Converts the PTS amount to seconds.
- /// </summary>
- /// <param name="pts">
- /// The PTS to convert.
- /// </param>
- /// <returns>
- /// The corresponding number of seconds.
- /// </returns>
- public static double PtsToSeconds(ulong pts)
- {
- return (double)pts / 90000;
- }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs Changed

@@ -1,386 +1,389 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="HandBrakeUtils.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// Defines the HandBrakeUtils type.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop
-{
- using System;
- using System.Collections.Generic;
- using System.Linq.Expressions;
- using System.Runtime.CompilerServices;
- using System.Runtime.ExceptionServices;
- using System.Runtime.InteropServices;
-
- using HandBrake.Interop.Interop.EventArgs;
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Json.Anamorphic;
- using HandBrake.Interop.Interop.Json.Shared;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
- using Newtonsoft.Json;
-
- /// <summary>
- /// HandBrake Interop Utilities
- /// </summary>
- public static class HandBrakeUtils
- {
- /// <summary>
- /// The callback for log messages from HandBrake.
- /// </summary>
- private static LoggingCallback loggingCallback;
-
- /// <summary>
- /// The callback for error messages from HandBrake.
- /// </summary>
- private static LoggingCallback errorCallback;
-
- /// <summary>
- /// True if the global initialize function has been called.
- /// </summary>
- private static bool globalInitialized;
-
- private static bool initSuccess = false;
- private static bool initNoHardware = false;
-
- /// <summary>
- /// Fires when HandBrake has logged a message.
- /// </summary>
- public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
-
- /// <summary>
- /// Fires when HandBrake has logged an error.
- /// </summary>
- public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
-
- private static IHbFunctions hbFunctions;
-
- static HandBrakeUtils()
- {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
- }
-
- /// <summary>
- /// Ensures the HB global initialize method has been called.
- /// </summary>
- public static void EnsureGlobalInit(bool initNoHardwareMode)
- {
- if (!globalInitialized)
- {
- try
- {
- if (initNoHardwareMode)
- {
- initNoHardware = true;
- if (hbFunctions.hb_global_init_no_hardware() == -1)
- {
- throw new InvalidOperationException("HB global init failed.");
- }
-
- initSuccess = true;
- }
- else
- {
- initSuccess = TryInit();
- }
- }
- catch (Exception)
- {
- initSuccess = false;
- }
-
- // Try without Hardware support. Bad drivers can sometimes cause issues.
- if (!initSuccess)
- {
- if (hbFunctions.hb_global_init_no_hardware() == -1)
- {
- throw new InvalidOperationException("HB global init failed.");
- }
- }
-
- globalInitialized = true;
- }
- }
-
- /// <summary>
- /// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
- /// </summary>
- /// <param name="enableDvdNav">
- /// True to enable LibDVDNav.
- /// </param>
- public static void SetDvdNav(bool enableDvdNav)
- {
- hbFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
- }
-
- /// <summary>
- /// Call before app shutdown. Performs global cleanup.
- /// </summary>
- public static void DisposeGlobal()
- {
- hbFunctions.hb_global_close();
- }
-
- /// <summary>
- /// Register the logger.
- /// </summary>
- public static void RegisterLogger()
- {
- // Register the logger if we have not already
- if (loggingCallback == null)
- {
- // Keep the callback as a member to prevent it from being garbage collected.
- loggingCallback = LoggingHandler;
- errorCallback = ErrorHandler;
- hbFunctions.hb_register_logger(loggingCallback);
- hbFunctions.hb_register_error_handler(errorCallback);
- }
- }
-
- /// <summary>
- /// Handles log messages from HandBrake.
- /// </summary>
- /// <param name="message">
- /// The log message (including newline).
- /// </param>
- public static void LoggingHandler(string message)
- {
- message = message.TrimEnd();
- if (!string.IsNullOrEmpty(message))
- {
- SendMessageEvent(message);
- }
- }
-
- /// <summary>
- /// Handles errors from HandBrake.
- /// </summary>
- /// <param name="message">
- /// The error message.
- /// </param>
- public static void ErrorHandler(string message)
- {
- if (!string.IsNullOrEmpty(message))
- {
- // These errors happen in normal operations. Log them as messages.
- if (message == "dvd: ifoOpen failed" || message.Contains("avformat_seek_file failed") || message.Contains("nav_get_title_list"))
- {
- SendMessageEvent(message);
- return;
- }
-
- SendErrorEvent(message);
- }
- }
-
- /// <summary>
- /// Gets the standard x264 option name given the starting point.
- /// </summary>
- /// <param name="name">
- /// The name.
- /// </param>
- /// <returns>
- /// The standard x264 option name.
- /// </returns>
- public static string SanitizeX264OptName(string name)
- {
- IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
- string sanitizedName = Marshal.PtrToStringAnsi(hbFunctions.hb_x264_encopt_name(namePtr));
- Marshal.FreeHGlobal(namePtr);
- return sanitizedName;
- }
-
- /// <summary>
- /// Checks to see if the given H.264 level is valid given the inputs.
- /// </summary>
- /// <param name="level">
- /// The level to check.
- /// </param>
- /// <param name="width">
- /// The output picture width.
- /// </param>
- /// <param name="height">
- /// The output picture height.
- /// </param>
- /// <param name="fpsNumerator">
- /// The rate numerator.
- /// </param>
- /// <param name="fpsDenominator">
- /// The rate denominator.
- /// </param>
- /// <param name="interlaced">
- /// True if x264 interlaced output is enabled.
- /// </param>
- /// <param name="fakeInterlaced">
- /// True if x264 fake interlacing is enabled.
- /// </param>
- /// <returns>
- /// True if the level is valid.
- /// </returns>
- public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
- {
- return hbFunctions.hb_check_h264_level(
- level,
- width,
- height,
- fpsNumerator,
- fpsDenominator,
- interlaced ? 1 : 0,
- fakeInterlaced ? 1 : 0) == 0;
- }
-
- /// <summary>
- /// Creates an X264 options string from the given settings.
- /// </summary>
- /// <param name="preset">
- /// The x264 preset.
- /// </param>
- /// <param name="tunes">
- /// The x264 tunes being used.
- /// </param>
- /// <param name="extraOptions">
- /// The extra options string.
- /// </param>
- /// <param name="profile">
- /// The H.264 profile.
- /// </param>
- /// <param name="level">
- /// The H.264 level.
- /// </param>
- /// <param name="width">
- /// The width of the final picture.
- /// </param>
- /// <param name="height">
- /// The height of the final picture.
- /// </param>
- /// <returns>
- /// The full x264 options string from the given inputs.
- /// </returns>
- public static string CreateX264OptionsString(
- string preset,
- IList<string> tunes,
- string extraOptions,
- string profile,
- string level,
- int width,
- int height)
- {
- if (width <= 0)
- {
- throw new ArgumentException("width must be positive.");
- }
-
- if (height <= 0)
- {
- throw new ArgumentException("height must be positive.");
- }
-
- IntPtr ptr = hbFunctions.hb_x264_param_unparse(
- 8,
- preset,
- string.Join(",", tunes),
- extraOptions,
- profile,
- level,
- width,
- height); // TODO add bit-depth support.
-
- string x264Settings = Marshal.PtrToStringAnsi(ptr);
-
- return x264Settings;
- }
-
- /// <summary>
- /// Gets the final size and PAR of the video, given anamorphic inputs.
- /// </summary>
- /// <param name="anamorphicGeometry">Anamorphic inputs.</param>
- /// <returns>The final size and PAR of the video.</returns>
- public static Geometry GetAnamorphicSize(AnamorphicGeometry anamorphicGeometry)
- {
- string encode = JsonConvert.SerializeObject(anamorphicGeometry, Formatting.Indented, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
- IntPtr json = hbFunctions.hb_set_anamorphic_size_json(Marshal.StringToHGlobalAnsi(encode));
- string result = Marshal.PtrToStringAnsi(json);
- return JsonConvert.DeserializeObject<Geometry>(result);
- }
-
- public static void Reduce(long den, long num, out long x, out long y)
- {
- // find the greatest common divisor of num & den by Euclid's algorithm
- long n = num, d = den;
- while (d > 0)
- {
- long t = d;
- d = n % d;
- n = t;
- }
-
- // at this point n is the gcd. if it's non-zero remove it from num
- // and den. Otherwise just return the original values.
- if (n > 0)
- {
- num /= n;
- den /= n;
- }
-
- x = num;
- y = den;
- }
-
- /// <summary>
- /// Sends the message logged event to any registered listeners.
- /// </summary>
- /// <param name="message">
- /// The message to send.
- /// </param>
- public static void SendMessageEvent(string message)
- {
- MessageLogged?.Invoke(null, new MessageLoggedEventArgs(message));
- }
-
- /// <summary>
- /// Sends the error logged event to any registered listeners.
- /// </summary>
- /// <param name="message">
- /// The message to send
- /// </param>
- public static void SendErrorEvent(string message)
- {
- ErrorLogged?.Invoke(null, new MessageLoggedEventArgs(message));
- }
-
- public static bool IsInitialised()
- {
- return initSuccess;
- }
-
- public static bool IsInitNoHardware()
- {
- return initNoHardware;
- }
-
- HandleProcessCorruptedStateExceptions
- private static bool TryInit()
- {
- try
- {
- if (hbFunctions.hb_global_init() == -1)
- {
- throw new InvalidOperationException("HB global init failed.");
- }
- }
- catch (Exception)
- {
- return false;
- }
-
- return true;
- }
- }
-}
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeUtils.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the HandBrakeUtils type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Runtime.ExceptionServices;
+ using System.Runtime.InteropServices;
+ using System.Text.Json;
+
+ using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
+ using HandBrake.Interop.Interop.Json.Anamorphic;
+ using HandBrake.Interop.Interop.Json.Shared;
+ using HandBrake.Interop.Utilities;
+
+ /// <summary>
+ /// HandBrake Interop Utilities
+ /// </summary>
+ public static class HandBrakeUtils
+ {
+ /// <summary>
+ /// The callback for log messages from HandBrake.
+ /// </summary>
+ private static LoggingCallback loggingCallback;
+
+ /// <summary>
+ /// The callback for error messages from HandBrake.
+ /// </summary>
+ private static LoggingCallback errorCallback;
+
+ /// <summary>
+ /// True if the global initialize function has been called.
+ /// </summary>
+ private static bool globalInitialized;
+
+ /// <summary>
+ /// True if we initialized without hardware support.
+ /// </summary>
+ private static bool initNoHardware = false;
+
+ /// <summary>
+ /// Fires when HandBrake has logged a message.
+ /// </summary>
+ public static event EventHandler<MessageLoggedEventArgs> MessageLogged;
+
+ /// <summary>
+ /// Fires when HandBrake has logged an error.
+ /// </summary>
+ public static event EventHandler<MessageLoggedEventArgs> ErrorLogged;
+
+ /// <summary>
+ /// Ensures the HB global initialize method has been called.
+ /// </summary>
+ /// <param name="initNoHardwareMode">
+ /// Init without hardware encoders.
+ /// </param>
+ public static void EnsureGlobalInit(bool initNoHardwareMode)
+ {
+ if (!globalInitialized)
+ {
+ bool initSuccess;
+ try
+ {
+ if (initNoHardwareMode)
+ {
+ initNoHardware = true;
+ if (HBFunctions.hb_global_init_no_hardware() == -1)
+ {
+ throw new InvalidOperationException("HB global init failed.");
+ }
+
+ initSuccess = true;
+ }
+ else
+ {
+ initSuccess = TryInit();
+ }
+ }
+ catch (Exception)
+ {
+ initSuccess = false;
+ }
+
+ // Try without Hardware support. Bad drivers can sometimes cause issues.
+ if (!initSuccess)
+ {
+ if (HBFunctions.hb_global_init_no_hardware() == -1)
+ {
+ throw new InvalidOperationException("HB global init failed.");
+ }
+
+ initNoHardware = true;
+ }
+
+ globalInitialized = true;
+ }
+ }
+
+ /// <summary>
+ /// Enables or disables LibDVDNav. If disabled libdvdread will be used instead.
+ /// </summary>
+ /// <param name="enableDvdNav">
+ /// True to enable LibDVDNav.
+ /// </param>
+ public static void SetDvdNav(bool enableDvdNav)
+ {
+ HBFunctions.hb_dvd_set_dvdnav(enableDvdNav ? 1 : 0);
+ }
+
+ /// <summary>
+ /// Call before app shutdown. Performs global cleanup.
+ /// </summary>
+ public static void DisposeGlobal()
+ {
+ HBFunctions.hb_global_close();
+ }
+
+ /// <summary>
+ /// Register the logger.
+ /// </summary>
+ public static void RegisterLogger()
+ {
+ // Register the logger if we have not already
+ if (loggingCallback == null)
+ {
+ // Keep the callback as a member to prevent it from being garbage collected.
+ loggingCallback = LoggingHandler;
+ errorCallback = ErrorHandler;
+ HBFunctions.hb_register_logger(loggingCallback);
+ HBFunctions.hb_register_error_handler(errorCallback);
+ }
+ }
+
+ /// <summary>
+ /// Handles log messages from HandBrake.
+ /// </summary>
+ /// <param name="message">
+ /// The log message (including newline).
+ /// </param>
+ public static void LoggingHandler(string message)
+ {
+ message = message.TrimEnd();
+ if (!string.IsNullOrEmpty(message))
+ {
+ SendMessageEvent(message);
+ }
+ }
+
+ /// <summary>
+ /// Handles errors from HandBrake.
+ /// </summary>
+ /// <param name="message">
+ /// The error message.
+ /// </param>
+ public static void ErrorHandler(string message)
+ {
+ if (!string.IsNullOrEmpty(message))
+ {
+ // These errors happen in normal operations. Log them as messages.
+ if (message == "dvd: ifoOpen failed" || message.Contains("avformat_seek_file failed") || message.Contains("nav_get_title_list"))
+ {
+ SendMessageEvent(message);
+ return;
+ }
+
+ SendErrorEvent(message);
+ }
+ }
+
+ /// <summary>
+ /// Gets the standard x264 option name given the starting point.
+ /// </summary>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <returns>
+ /// The standard x264 option name.
+ /// </returns>
+ public static string SanitizeX264OptName(string name)
+ {
+ IntPtr namePtr = Marshal.StringToHGlobalAnsi(name);
+ string sanitizedName = Marshal.PtrToStringAnsi(HBFunctions.hb_x264_encopt_name(namePtr));
+ Marshal.FreeHGlobal(namePtr);
+ return sanitizedName;
+ }
+
+ /// <summary>
+ /// Checks to see if the given H.264 level is valid given the inputs.
+ /// </summary>
+ /// <param name="level">
+ /// The level to check.
+ /// </param>
+ /// <param name="width">
+ /// The output picture width.
+ /// </param>
+ /// <param name="height">
+ /// The output picture height.
+ /// </param>
+ /// <param name="fpsNumerator">
+ /// The rate numerator.
+ /// </param>
+ /// <param name="fpsDenominator">
+ /// The rate denominator.
+ /// </param>
+ /// <param name="interlaced">
+ /// True if x264 interlaced output is enabled.
+ /// </param>
+ /// <param name="fakeInterlaced">
+ /// True if x264 fake interlacing is enabled.
+ /// </param>
+ /// <returns>
+ /// True if the level is valid.
+ /// </returns>
+ public static bool IsH264LevelValid(string level, int width, int height, int fpsNumerator, int fpsDenominator, bool interlaced, bool fakeInterlaced)
+ {
+ return HBFunctions.hb_check_h264_level(
+ level,
+ width,
+ height,
+ fpsNumerator,
+ fpsDenominator,
+ interlaced ? 1 : 0,
+ fakeInterlaced ? 1 : 0) == 0;
+ }
+
+ /// <summary>
+ /// Creates an X264 options string from the given settings.
+ /// </summary>
+ /// <param name="preset">
+ /// The x264 preset.
+ /// </param>
+ /// <param name="tunes">
+ /// The x264 tunes being used.
+ /// </param>
+ /// <param name="extraOptions">
+ /// The extra options string.
+ /// </param>
+ /// <param name="profile">
+ /// The H.264 profile.
+ /// </param>
+ /// <param name="level">
+ /// The H.264 level.
+ /// </param>
+ /// <param name="width">
+ /// The width of the final picture.
+ /// </param>
+ /// <param name="height">
+ /// The height of the final picture.
+ /// </param>
+ /// <returns>
+ /// The full x264 options string from the given inputs.
+ /// </returns>
+ public static string CreateX264OptionsString(
+ string preset,
+ IList<string> tunes,
+ string extraOptions,
+ string profile,
+ string level,
+ int width,
+ int height)
+ {
+ if (width <= 0)
+ {
+ throw new ArgumentException("width must be positive.");
+ }
+
+ if (height <= 0)
+ {
+ throw new ArgumentException("height must be positive.");
+ }
+
+ IntPtr ptr = HBFunctions.hb_x264_param_unparse(
+ 8,
+ preset,
+ string.Join(",", tunes),
+ extraOptions,
+ profile,
+ level,
+ width,
+ height); // TODO add bit-depth support.
+
+ string x264Settings = Marshal.PtrToStringAnsi(ptr);
+
+ return x264Settings;
+ }
+
+ /// <summary>
+ /// Gets the final size and PAR of the video, given anamorphic inputs.
+ /// </summary>
+ /// <param name="anamorphicGeometry">Anamorphic inputs.</param>
+ /// <returns>The final size and PAR of the video.</returns>
+ public static Geometry GetAnamorphicSize(AnamorphicGeometry anamorphicGeometry)
+ {
+ string encode = JsonSerializer.Serialize(anamorphicGeometry, JsonSettings.Options);
+ IntPtr json = HBFunctions.hb_set_anamorphic_size_json(Marshal.StringToHGlobalAnsi(encode));
+ string result = Marshal.PtrToStringAnsi(json);
+ return JsonSerializer.Deserialize<Geometry>(result, JsonSettings.Options);
+ }
+
+ public static void Reduce(long den, long num, out long x, out long y)
+ {
+ // find the greatest common divisor of num & den by Euclid's algorithm
+ long n = num, d = den;
+ while (d > 0)
+ {
+ long t = d;
+ d = n % d;
+ n = t;
+ }
+
+ // at this point n is the gcd. if it's non-zero remove it from num
+ // and den. Otherwise just return the original values.
+ if (n > 0)
+ {
+ num /= n;
+ den /= n;
+ }
+
+ x = num;
+ y = den;
+ }
+
+ /// <summary>
+ /// Sends the message logged event to any registered listeners.
+ /// </summary>
+ /// <param name="message">
+ /// The message to send.
+ /// </param>
+ public static void SendMessageEvent(string message)
+ {
+ MessageLogged?.Invoke(null, new MessageLoggedEventArgs(message));
+ }
+
+ /// <summary>
+ /// Sends the error logged event to any registered listeners.
+ /// </summary>
+ /// <param name="message">
+ /// The message to send
+ /// </param>
+ public static void SendErrorEvent(string message)
+ {
+ ErrorLogged?.Invoke(null, new MessageLoggedEventArgs(message));
+ }
+
+ /// <summary>
+ /// Returns true if we have successfully run global initialization.
+ /// </summary>
+ /// <returns>True if we have successfully run global initialization.</returns>
+ public static bool IsInitialised()
+ {
+ return globalInitialized;
+ }
+
+ /// <summary>
+ /// Returns true if we initialized without hardware support.
+ /// </summary>
+ /// <returns>True if we initialized without hardware support.</returns>
+ public static bool IsInitNoHardware()
+ {
+ return initNoHardware;
+ }
+
+ HandleProcessCorruptedStateExceptions
+ private static bool TryInit()
+ {
+ try
+ {
+ if (HBFunctions.hb_global_init() == -1)
+ {
+ throw new InvalidOperationException("HB global init failed.");
+ }
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+
+ return true;
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HandBrakeVersionHelper.cs Added

@@ -0,0 +1,58 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HandBrakeVersionHelper.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Version Utility
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop
+{
+ using System;
+ using System.Runtime.InteropServices;
+
+ using HandBrake.Interop.Interop.HbLib;
+
+ public class HandBrakeVersionHelper
+ {
+ /// <summary>
+ /// Gets the HandBrake version string.
+ /// </summary>
+ public static string Version
+ {
+ get
+ {
+ var versionPtr = HBFunctions.hb_get_version(IntPtr.Zero); // Pointer isn't actually used.
+ return Marshal.PtrToStringAnsi(versionPtr);
+ }
+ }
+
+ /// <summary>
+ /// Gets the HandBrake build number.
+ /// </summary>
+ public static int Build
+ {
+ get
+ {
+ return HBFunctions.hb_get_build(IntPtr.Zero);
+ }
+ }
+
+ public static string GetVersion()
+ {
+ return IsNightly() ? string.Format("Nightly {0} ({1})", Version, Build) : string.Format("{0} ({1})", Version, Build);
+ }
+
+ public static string GetVersionShort()
+ {
+ return string.Format("{0} {1}", Version, Build);
+ }
+
+ public static bool IsNightly()
+ {
+ // 01 = Unofficial Builds. 00 = Official Tagged Releases.
+ return Build.ToString().EndsWith("01");
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/HBDelegates.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/HBDelegates.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/HbFunctions.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/HbFunctions.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/NativeConstants.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_anamorphic_mode_t.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_anamorphic_mode_t.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_container_s.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_container_s.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_encoder_s.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_encoder_s.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_error_code.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_error_code.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_filter_ids.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_filter_ids.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_geometry.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_geometry.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="hb_geometry.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="hb_geometry.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -16,7 +16,7 @@
 /// The hb_geometry_s.
 /// </summary>
 StructLayout(LayoutKind.Sequential)
- public struct hb_geometry_s
+ internal struct hb_geometry_s
 {
 /// <summary>
 /// The width.
@@ -38,7 +38,7 @@
 /// The hb_ui_geometry_s.
 /// </summary>
 StructLayout(LayoutKind.Sequential)
- public struct hb_geometry_settings_s
+ internal struct hb_geometry_settings_s
 {
 /// <summary>
 /// Anamorphic mode, see job struct anamorphic
@@ -48,7 +48,9 @@
 /// <summary>
 /// Specifies settings that shouldn't be changed
 /// </summary>
- public int keep; 
+ public int keep;
+
+ public int flags;
 
 /// <summary>
 /// use dvd dimensions to determine PAR
@@ -58,14 +60,17 @@
 /// <summary>
 /// pixel alignment for loose anamorphic
 /// </summary>
- public int modulus; 
+ public int modulus;
 
 /// <summary>
- /// Cropping
+ /// Pixels cropped from source before scaling
 /// </summary>
 MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)
 public int crop;
 
+ MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)
+ public int pad;
+
 /// <summary>
 /// max destination storage width
 /// </summary>
@@ -76,6 +81,10 @@
 /// </summary>
 public int maxHeight;
 
+ public int displayWidth;
+
+ public int displayHeight;
+
 /// <summary>
 /// Pixel aspect used in custom anamorphic
 /// </summary>
@@ -86,7 +95,7 @@
 /// The hb_rational_t.
 /// </summary>
 StructLayout(LayoutKind.Sequential)
- public struct hb_rational_t
+ internal struct hb_rational_t
 {
 /// <summary>
 /// The num. W
@@ -98,4 +107,16 @@
 /// </summary>
 public int den;
 }
+
+ StructLayout(LayoutKind.Sequential)
+ struct hb_geometry_crop_s
+ {
+ MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)
+ public int crop;
+
+ MarshalAs(UnmanagedType.ByValArray, SizeConst = 4, ArraySubType = UnmanagedType.I4)
+ public int pad;
+
+ public hb_geometry_s geometry;
+ };
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_image_s.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_mixdown_s.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_mixdown_s.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_rate_s.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_rate_s.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_subtitle.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/hb_subtitle.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/iso639_lang_t.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/HbLib/iso639_lang_t.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/InteropUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/InteropUtilities.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="InteropUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="InteropUtilities.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -16,23 +16,12 @@
 using System.Text;
 
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
 
 /// <summary>
 /// Helper utilities for native interop.
 /// </summary>
 internal static class InteropUtilities
 {
- private static IHbFunctions hbFunctions;
-
- static InteropUtilities()
- {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
- }
-
 /// <summary>
 /// Reads the given native structure pointer.
 /// </summary>
@@ -273,7 +262,7 @@
 
 // Assign the new pointer to the job pointer and tell HB to clean the job up.
 Marshal.WriteIntPtr(nativeJobPtrPtr, nativeJobPtr);
- hbFunctions.hb_job_close(nativeJobPtrPtr);
+ HBFunctions.hb_job_close(nativeJobPtrPtr);
 
 // Free the pointer we used.
 Marshal.FreeHGlobal(nativeJobPtrPtr);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/NativeList.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/NativeList.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="NativeList.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="NativeList.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -15,16 +15,16 @@
 using System.Runtime.InteropServices;
 
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
 
 /// <summary>
 /// Represents a HandBrake style native list.
 /// </summary>
 internal class NativeList : IDisposable
 {
- private static IHbFunctions hbFunctions;
+ /// <summary>
+ /// The list of native memory locations allocated for this list.
+ /// </summary>
+ private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
 
 /// <summary>
 /// Initializes a new instance of the NativeList class.
@@ -33,14 +33,7 @@
 public NativeList(IntPtr listPtr)
 {
 this.Ptr = listPtr;
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- hbFunctions = hbFunctionsProvider.GetHbFunctionsWrapper();
 }
- 
- /// <summary>
- /// The list of native memory locations allocated for this list.
- /// </summary>
- private readonly List<IntPtr> allocatedMemory = new List<IntPtr>();
 
 /// <summary>
 /// Gets the pointer to the native list.
@@ -55,7 +48,7 @@
 get
 {
 Debug.WriteLine("Got a Zero Pointer in the NativeList");
- return this.Ptr == IntPtr.Zero ? 0 : hbFunctions.hb_list_count(this.Ptr);
+ return this.Ptr == IntPtr.Zero ? 0 : HBFunctions.hb_list_count(this.Ptr);
 }
 }
 
@@ -71,12 +64,25 @@
 }
 
 /// <summary>
+ /// Gets an item out of the list.
+ /// </summary>
+ /// <param name="i">Index in the list.</param>
+ /// <returns>The item at that index in the list.</returns>
+ public IntPtr thisint i
+ {
+ get
+ {
+ return HBFunctions.hb_list_item(this.Ptr, i);
+ }
+ }
+
+ /// <summary>
 /// Adds an item to the end of the list.
 /// </summary>
 /// <param name="item">The item to add.</param>
 public void Add(IntPtr item)
 {
- hbFunctions.hb_list_add(this.Ptr, item);
+ HBFunctions.hb_list_add(this.Ptr, item);
 }
 
 /// <summary>
@@ -86,7 +92,7 @@
 /// <param name="item">The item to insert.</param>
 public void Insert(int position, IntPtr item)
 {
- hbFunctions.hb_list_insert(this.Ptr, position, item);
+ HBFunctions.hb_list_insert(this.Ptr, position, item);
 }
 
 /// <summary>
@@ -95,20 +101,7 @@
 /// <param name="item">The item to remove.</param>
 public void Remove(IntPtr item)
 {
- hbFunctions.hb_list_rem(this.Ptr, item);
- }
-
- /// <summary>
- /// Gets an item out of the list.
- /// </summary>
- /// <param name="i">Index in the list.</param>
- /// <returns>The item at that index in the list.</returns>
- public IntPtr thisint i
- {
- get
- {
- return hbFunctions.hb_list_item(this.Ptr, i);
- }
+ HBFunctions.hb_list_rem(this.Ptr, item);
 }
 
 /// <summary>
@@ -118,7 +111,7 @@
 {
 IntPtr listPtrPtr = Marshal.AllocHGlobal(Marshal.SizeOf(typeof(IntPtr)));
 Marshal.WriteIntPtr(listPtrPtr, this.Ptr);
- hbFunctions.hb_list_close(listPtrPtr);
+ HBFunctions.hb_list_close(listPtrPtr);
 Marshal.FreeHGlobal(listPtrPtr);
 }
 
@@ -128,8 +121,7 @@
 /// <returns>The created list.</returns>
 public static NativeList CreateList()
 {
- IHbFunctionsProvider hbFunctionsProvider = new HbFunctionsProvider();
- return new NativeList(hbFunctionsProvider.GetHbFunctionsWrapper().hb_list_init());
+ return new NativeList(HBFunctions.hb_list_init());
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/Utilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Helpers/Utilities.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeCompletedEventArgs.cs Added

@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeCompletedEventArgs.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the EncodeCompletedEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.EventArgs
+{
+ using System;
+
+ /// <summary>
+ /// Encode Completed Event Args
+ /// </summary>
+ public class EncodeCompletedEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="EncodeCompletedEventArgs"/> class.
+ /// </summary>
+ /// <param name="error">
+ /// The error.
+ /// </param>
+ public EncodeCompletedEventArgs(int error)
+ {
+ this.Error = error;
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether an error occurred during the encode.
+ /// </summary>
+ public int Error { get; private set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/EncodeProgressEventArgs.cs Added

@@ -0,0 +1,120 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="EncodeProgressEventArgs.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the EncodeProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.EventArgs
+{
+ using System;
+
+ /// <summary>s
+ /// Encode Progress Event Args
+ /// </summary>
+ public class EncodeProgressEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="EncodeProgressEventArgs"/> class.
+ /// </summary>
+ /// <param name="fractionComplete">
+ /// The fraction complete.
+ /// </param>
+ /// <param name="currentFrameRate">
+ /// The current frame rate.
+ /// </param>
+ /// <param name="averageFrameRate">
+ /// The average frame rate.
+ /// </param>
+ /// <param name="estimatedTimeLeft">
+ /// The estimated time left.
+ /// </param>
+ /// <param name="passId">
+ /// The pass id.
+ /// </param>
+ /// <param name="pass">
+ /// The pass.
+ /// </param>
+ /// <param name="passCount">
+ /// The pass count.
+ /// </param>
+ /// <param name="stateCode">
+ /// The code for the state the encode process is in.
+ /// </param>
+ public EncodeProgressEventArgs(double fractionComplete, double currentFrameRate, double averageFrameRate, TimeSpan estimatedTimeLeft, int passId, int pass, int passCount, string stateCode)
+ {
+ this.FractionComplete = fractionComplete;
+ this.CurrentFrameRate = currentFrameRate;
+ this.AverageFrameRate = averageFrameRate;
+ this.EstimatedTimeLeft = estimatedTimeLeft;
+ this.PassId = passId;
+ this.Pass = pass;
+ this.PassCount = passCount;
+ this.StateCode = stateCode;
+ }
+
+ /// <summary>
+ /// Gets the % Complete.
+ /// </summary>
+ public double FractionComplete { get; private set; }
+
+ /// <summary>
+ /// Gets the Current FrameRate.
+ /// </summary>
+ public double CurrentFrameRate { get; private set; }
+
+ /// <summary>
+ /// Gets the Average FrameRate.
+ /// </summary>
+ public double AverageFrameRate { get; private set; }
+
+ /// <summary>
+ /// Gets the Estimated Time Left.
+ /// </summary>
+ public TimeSpan EstimatedTimeLeft { get; private set; }
+
+ /// <summary>
+ /// Gets the pass ID.
+ /// </summary>
+ /// <remarks>
+ /// -1: Subtitle scan
+ /// 0: Encode
+ /// 1: Encode first pass
+ /// 2: Encode second pass
+ /// </remarks>
+ public int PassId { get; private set; }
+
+ /// <summary>
+ /// Gets the current encoding pass. (1-based)
+ /// </summary>
+ public int Pass { get; private set; }
+
+ /// <summary>
+ /// Gets the pass count.
+ /// </summary>
+ public int PassCount { get; private set; }
+
+ /// <summary>
+ /// Gets the state code of the encode process.
+ /// </summary>
+ public string StateCode { get; }
+
+ /// <summary>
+ /// Gets a value indicating that we are doing a subtitle scan pass.
+ /// </summary>
+ public bool IsSubtitleScan
+ {
+ get
+ {
+ if (this.PassId == -1)
+ {
+ return true;
+ }
+
+ return false;
+ }
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/MessageLoggedEventArgs.cs Added

@@ -0,0 +1,35 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="MessageLoggedEventArgs.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the MessageLoggedEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.EventArgs
+{
+ using System;
+
+ /// <summary>
+ /// The Message Logged Event Args
+ /// </summary>
+ public class MessageLoggedEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="MessageLoggedEventArgs"/> class.
+ /// </summary>
+ /// <param name="message">
+ /// The message.
+ /// </param>
+ public MessageLoggedEventArgs(string message)
+ {
+ this.Message = message;
+ }
+
+ /// <summary>
+ /// Gets the Message.
+ /// </summary>
+ public string Message { get; private set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/EventArgs/ScanProgressEventArgs.cs Added

@@ -0,0 +1,71 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ScanProgressEventArgs.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ScanProgressEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.EventArgs
+{
+ using System;
+
+ /// <summary>
+ /// The Scan Progress Event Args
+ /// </summary>
+ public class ScanProgressEventArgs : EventArgs
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="ScanProgressEventArgs"/> class.
+ /// </summary>
+ /// <param name="progress">
+ /// The progress.
+ /// </param>
+ /// <param name="currentPreview">
+ /// The current preview.
+ /// </param>
+ /// <param name="previews">
+ /// The previews.
+ /// </param>
+ /// <param name="currentTitle">
+ /// The current title.
+ /// </param>
+ /// <param name="titles">
+ /// The titles.
+ /// </param>
+ public ScanProgressEventArgs(double progress, int currentPreview, int previews, int currentTitle, int titles)
+ {
+ this.Progress = progress;
+ this.CurrentPreview = currentPreview;
+ this.Previews = previews;
+ this.CurrentTitle = currentTitle;
+ this.Titles = titles;
+ }
+
+ /// <summary>
+ /// Gets the total progress fraction for the scan.
+ /// </summary>
+ public double Progress { get; private set; }
+
+ /// <summary>
+ /// Gets the current preview being processed on the scan.
+ /// </summary>
+ public int CurrentPreview { get; private set; }
+
+ /// <summary>
+ /// Gets the total number of previews to process.
+ /// </summary>
+ public int Previews { get; private set; }
+
+ /// <summary>
+ /// Gets the current title being processed on the scan.
+ /// </summary>
+ public int CurrentTitle { get; private set; }
+
+ /// <summary>
+ /// Gets the total number of titles to process.
+ /// </summary>
+ public int Titles { get; private set; }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/IEncodeInstance.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/IHandBrakeInstance.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="IHandBrakeInstance.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="IHandBrakeInstance.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -11,9 +11,10 @@
 {
 using System;
 
- using HandBrake.Interop.Interop.EventArgs;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
+ using HandBrake.Interop.Interop.Interfaces.Model.Preview;
+ using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.Scan;
- using HandBrake.Interop.Interop.Model.Preview;
 
 /// <summary>
 /// The Interface for HandBrakeInstance
@@ -25,7 +26,7 @@
 /// <summary>
 /// Fires when a scan has completed.
 /// </summary>
- event EventHandler<EventArgs> ScanCompleted;
+ event EventHandler<System.EventArgs> ScanCompleted;
 
 /// <summary>
 /// Fires for progress updates when scanning.
@@ -72,13 +73,10 @@
 /// <param name="previewNumber">
 /// The index of the preview to get (0-based).
 /// </param>
- /// <param name="deinterlace">
- /// True to enable basic deinterlace of preview images.
- /// </param>
 /// <returns>
 /// An image with the requested preview.
 /// </returns>
- RawPreviewData GetPreview(PreviewSettings job, int previewNumber, bool deinterlace);
+ RawPreviewData GetPreview(JsonEncodeObject job, int previewNumber);
 
 /// <summary>
 /// Starts a scan of the given path.

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/BitrateLimits.cs Added

@@ -0,0 +1,42 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="BitrateLimits.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the BitrateLimits type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ /// <summary>
+ /// Represents bitrate limits as a range.
+ /// </summary>
+ public class BitrateLimits
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="BitrateLimits"/> class.
+ /// </summary>
+ /// <param name="low">
+ /// The low.
+ /// </param>
+ /// <param name="high">
+ /// The high.
+ /// </param>
+ public BitrateLimits(int low, int high)
+ {
+ this.Low = low;
+ this.High = high;
+ }
+
+ /// <summary>
+ /// Gets the inclusive lower limit for the bitrate.
+ /// </summary>
+ public int Low { get; private set; }
+
+ /// <summary>
+ /// Gets the inclusive upper limit for the bitrate.
+ /// </summary>
+ public int High { get; private set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBAudioEncoder.cs Added

@@ -0,0 +1,131 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBAudioEncoder.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb audio encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ using HandBrake.Interop.Interop.HbLib;
+
+ /// <summary>
+ /// The hb audio encoder.
+ /// </summary>
+ public class HBAudioEncoder
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="HBAudioEncoder"/> class.
+ /// </summary>
+ /// <param name="compatibleContainers">
+ /// The compatible containers.
+ /// </param>
+ /// <param name="compressionLimits">
+ /// The compression limits.
+ /// </param>
+ /// <param name="defaultCompression">
+ /// The default compression.
+ /// </param>
+ /// <param name="defaultQuality">
+ /// The default quality.
+ /// </param>
+ /// <param name="displayName">
+ /// The display name.
+ /// </param>
+ /// <param name="id">
+ /// The id.
+ /// </param>
+ /// <param name="qualityLimits">
+ /// The quality limits.
+ /// </param>
+ /// <param name="shortName">
+ /// The short name.
+ /// </param>
+ public HBAudioEncoder(int compatibleContainers, RangeLimits compressionLimits, float defaultCompression, float defaultQuality, string displayName, int id, RangeLimits qualityLimits, string shortName)
+ {
+ this.CompatibleContainers = compatibleContainers;
+ this.CompressionLimits = compressionLimits;
+ this.DefaultCompression = defaultCompression;
+ this.DefaultQuality = defaultQuality;
+ this.DisplayName = displayName;
+ this.Id = id;
+ this.QualityLimits = qualityLimits;
+ this.ShortName = shortName;
+ }
+
+ /// <summary>
+ /// Gets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; private set; }
+
+ /// <summary>
+ /// Gets the compression limits.
+ /// </summary>
+ public RangeLimits CompressionLimits { get; private set; }
+
+ /// <summary>
+ /// Gets the default compression.
+ /// </summary>
+ public float DefaultCompression { get; private set; }
+
+ /// <summary>
+ /// Gets the default quality.
+ /// </summary>
+ public float DefaultQuality { get; private set; }
+
+ /// <summary>
+ /// Gets the display name.
+ /// </summary>
+ public string DisplayName { get; private set; }
+
+ /// <summary>
+ /// Gets the id.
+ /// </summary>
+ public int Id { get; private set; }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder is passthrough.
+ /// </summary>
+ public bool IsPassthrough
+ {
+ get
+ {
+ return (this.Id & NativeConstants.HB_ACODEC_PASS_FLAG) > 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets or sets the quality limits.
+ /// </summary>
+ public RangeLimits QualityLimits { get; set; }
+
+ /// <summary>
+ /// Gets or sets the short name.
+ /// </summary>
+ public string ShortName { get; set; }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder supports compression.
+ /// </summary>
+ public bool SupportsCompression
+ {
+ get
+ {
+ return this.CompressionLimits.High >= 0;
+ }
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether the encoder supports quality.
+ /// </summary>
+ public bool SupportsQuality
+ {
+ get
+ {
+ return this.QualityLimits.High >= 0;
+ }
+ }
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBMixdown.cs Added

@@ -0,0 +1,51 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBMixdown.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb mixdown.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ /// <summary>
+ /// The hb mixdown.
+ /// </summary>
+ public class HBMixdown
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="HBMixdown"/> class.
+ /// </summary>
+ /// <param name="displayName">
+ /// The display name.
+ /// </param>
+ /// <param name="id">
+ /// The id.
+ /// </param>
+ /// <param name="shortName">
+ /// The short name.
+ /// </param>
+ public HBMixdown(string displayName, int id, string shortName)
+ {
+ this.DisplayName = displayName;
+ this.Id = id;
+ this.ShortName = shortName;
+ }
+
+ /// <summary>
+ /// Gets the display name.
+ /// </summary>
+ public string DisplayName { get; private set; }
+
+ /// <summary>
+ /// Gets the id.
+ /// </summary>
+ public int Id { get; private set; }
+
+ /// <summary>
+ /// Gets the short name.
+ /// </summary>
+ public string ShortName { get; private set; }
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBRate.cs Added

@@ -0,0 +1,42 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBRate.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Represents a rate in HandBrake: audio sample rate or video framerate.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ /// <summary>
+ /// Represents a rate in HandBrake: audio sample rate or video framerate.
+ /// </summary>
+ public class HBRate
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="HBRate"/> class.
+ /// </summary>
+ /// <param name="name">
+ /// The name.
+ /// </param>
+ /// <param name="rate">
+ /// The rate.
+ /// </param>
+ public HBRate(string name, int rate)
+ {
+ this.Name = name;
+ this.Rate = rate;
+ }
+
+ /// <summary>
+ /// Gets the name to use for this rate.
+ /// </summary>
+ public string Name { get; private set; }
+
+ /// <summary>
+ /// Gets the raw rate.
+ /// </summary>
+ public int Rate { get; private set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/HBVideoEncoder.cs Added

@@ -0,0 +1,106 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBVideoEncoder.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ using System.Collections.Generic;
+
+ using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Helpers;
+
+ public class HBVideoEncoder
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="HBVideoEncoder"/> class.
+ /// </summary>
+ /// <param name="compatibleContainers">
+ /// The compatible containers.
+ /// </param>
+ /// <param name="displayName">
+ /// The display name.
+ /// </param>
+ /// <param name="id">
+ /// The id.
+ /// </param>
+ /// <param name="shortName">
+ /// The short name.
+ /// </param>
+ public HBVideoEncoder(int compatibleContainers, string displayName, int id, string shortName)
+ {
+ this.CompatibleContainers = compatibleContainers;
+ this.DisplayName = displayName;
+ this.Id = id;
+ this.ShortName = shortName;
+ }
+
+ /// <summary>
+ /// Gets the compatible containers.
+ /// </summary>
+ public int CompatibleContainers { get; private set; }
+
+ /// <summary>
+ /// Gets the display name.
+ /// </summary>
+ public string DisplayName { get; private set; }
+
+ /// <summary>
+ /// Gets the id.
+ /// </summary>
+ public int Id { get; private set; }
+
+ /// <summary>
+ /// Gets the short name.
+ /// </summary>
+ public string ShortName { get; private set; }
+
+ /// <summary>
+ /// Gets the list of presets this encoder supports. (null if the encoder doesn't support presets)
+ /// </summary>
+ public List<string> Presets
+ {
+ get
+ {
+ return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_presets(this.Id));
+ }
+ }
+
+ /// <summary>
+ /// Gets the list of tunes this encoder supports. (null if the encoder doesn't support tunes)
+ /// </summary>
+ public List<string> Tunes
+ {
+ get
+ {
+ return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_tunes(this.Id));
+ }
+ }
+
+ /// <summary>
+ /// Gets the list of profiles this encoder supports. (null if the encoder doesn't support profiles)
+ /// </summary>
+ public List<string> Profiles
+ {
+ get
+ {
+ return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_profiles(this.Id));
+ }
+ }
+
+ /// <summary>
+ /// Gets the list of levels this encoder supports. (null if the encoder doesn't support levels)
+ /// </summary>
+ public List<string> Levels
+ {
+ get
+ {
+ return InteropUtilities.ToStringListFromArrayPtr(HBFunctions.hb_video_encoder_get_levels(this.Id));
+ }
+ } 
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/RangeLimits.cs Added

@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RangeLimits.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The range limits.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ /// <summary>
+ /// The range limits.
+ /// </summary>
+ public class RangeLimits
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="RangeLimits"/> class.
+ /// </summary>
+ /// <param name="ascending">
+ /// The ascending.
+ /// </param>
+ /// <param name="granularity">
+ /// The granularity.
+ /// </param>
+ /// <param name="high">
+ /// The high.
+ /// </param>
+ /// <param name="low">
+ /// The low.
+ /// </param>
+ public RangeLimits(bool @ascending, float granularity, float high, float low)
+ {
+ this.Ascending = @ascending;
+ this.Granularity = granularity;
+ this.High = high;
+ this.Low = low;
+ }
+
+ /// <summary>
+ /// Gets a value indicating whether ascending.
+ /// </summary>
+ public bool Ascending { get; private set; }
+
+ /// <summary>
+ /// Gets the granularity.
+ /// </summary>
+ public float Granularity { get; private set; }
+
+ /// <summary>
+ /// Gets the high.
+ /// </summary>
+ public float High { get; private set; }
+
+ /// <summary>
+ /// Gets the low.
+ /// </summary>
+ public float Low { get; private set; }
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Encoders/VideoQualityLimits.cs Added

@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoQualityLimits.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the VideoQualityLimits type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Encoders
+{
+ /// <summary>
+ /// Represents limits on video quality for a particular encoder.
+ /// </summary>
+ public class VideoQualityLimits
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="VideoQualityLimits"/> class.
+ /// </summary>
+ /// <param name="low">
+ /// The low.
+ /// </param>
+ /// <param name="high">
+ /// The high.
+ /// </param>
+ /// <param name="granularity">
+ /// The granularity.
+ /// </param>
+ /// <param name="ascending">
+ /// The ascending.
+ /// </param>
+ public VideoQualityLimits(float low, float high, float granularity, bool @ascending)
+ {
+ this.Low = low;
+ this.High = high;
+ this.Granularity = granularity;
+ this.Ascending = @ascending;
+ }
+
+ /// <summary>
+ /// Gets the inclusive lower limit for the quality.
+ /// </summary>
+ public float Low { get; private set; }
+
+ /// <summary>
+ /// Gets the inclusive upper limit for the quality.
+ /// </summary>
+ public float High { get; private set; }
+
+ /// <summary>
+ /// Gets the granularity for the quality.
+ /// </summary>
+ public float Granularity { get; private set; }
+
+ /// <summary>
+ /// Gets a value indicating whether the quality increases as the number increases.
+ /// </summary>
+ public bool Ascending { get; private set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Filters/HBPresetTune.cs Added

@@ -0,0 +1,58 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBPresetTune.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// An object representing the key and name of a Filter Preset or Tune option.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Filters
+{
+ public class HBPresetTune
+ {
+ public HBPresetTune()
+ {
+ }
+
+ public HBPresetTune(string name, string shortName)
+ {
+ this.Name = name;
+ this.ShortName = shortName;
+ }
+
+ public string Name { get; set; }
+
+ public string ShortName { get; set; }
+
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj))
+ {
+ return false;
+ }
+
+ if (ReferenceEquals(this, obj))
+ {
+ return true;
+ }
+
+ if (obj.GetType() != this.GetType())
+ {
+ return false;
+ }
+
+ return this.Equals((HBPresetTune)obj);
+ }
+
+ public override int GetHashCode()
+ {
+ return this.ShortName != null ? this.ShortName.GetHashCode() : 0;
+ }
+
+ protected bool Equals(HBPresetTune other)
+ {
+ return string.Equals(this.ShortName, other.ShortName);
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBConfiguration.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/HBContainer.cs Added

@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="HBContainer.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The hb container.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model
+{
+ /// <summary>
+ /// The hb container.
+ /// </summary>
+ public class HBContainer
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="HBContainer"/> class.
+ /// </summary>
+ /// <param name="defaultExtension">
+ /// The default extension.
+ /// </param>
+ /// <param name="displayName">
+ /// The display name.
+ /// </param>
+ /// <param name="id">
+ /// The id.
+ /// </param>
+ /// <param name="shortName">
+ /// The short name.
+ /// </param>
+ public HBContainer(string defaultExtension, string displayName, int id, string shortName)
+ {
+ this.DefaultExtension = defaultExtension;
+ this.DisplayName = displayName;
+ this.Id = id;
+ this.ShortName = shortName;
+ }
+
+ /// <summary>
+ /// Gets the default extension.
+ /// </summary>
+ public string DefaultExtension { get; private set; }
+
+ /// <summary>
+ /// Gets the display name.
+ /// </summary>
+ public string DisplayName { get; private set; }
+
+ /// <summary>
+ /// Gets the id.
+ /// </summary>
+ public int Id { get; private set; }
+
+ /// <summary>
+ /// Gets the short name.
+ /// </summary>
+ public string ShortName { get; private set; }
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Language.cs Added

@@ -0,0 +1,76 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Language.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Represents a language.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model
+{
+ /// <summary>
+ /// Represents a language.
+ /// </summary>
+ public class Language
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Language"/> class.
+ /// </summary>
+ /// <param name="englishName">
+ /// The english name.
+ /// </param>
+ /// <param name="nativeName">
+ /// The native name.
+ /// </param>
+ /// <param name="code">
+ /// The code.
+ /// </param>
+ public Language(string englishName, string nativeName, string code)
+ {
+ this.EnglishName = englishName;
+ this.NativeName = nativeName;
+ this.Code = code;
+ }
+
+ /// <summary>
+ /// Gets the english name of the language.
+ /// </summary>
+ public string EnglishName { get; private set; }
+
+ /// <summary>
+ /// Gets the native name of the language.
+ /// </summary>
+ public string NativeName { get; private set; }
+
+ /// <summary>
+ /// Gets the language code.
+ /// </summary>
+ public string Code { get; private set; }
+
+ /// <summary>
+ /// Gets the display string for the language.
+ /// </summary>
+ public string Display
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(this.NativeName) && this.NativeName != this.EnglishName)
+ {
+ return this.EnglishName + " (" + this.NativeName + ")";
+ }
+
+ return this.EnglishName;
+ }
+ }
+
+ /// <summary>
+ /// Returns the display string for this language.
+ /// </summary>
+ /// <returns>The display string for this language.</returns>
+ public override string ToString()
+ {
+ return this.Display;
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Anamorphic.cs Added

@@ -0,0 +1,29 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Anamorphic.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Anamorphic type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
+{
+ using HandBrake.Interop.Attributes;
+
+ /// <summary>
+ /// The anamorphic.
+ /// </summary>
+ public enum Anamorphic
+ {
+ DisplayName("None")
+ ShortName("none")
+ None = 0,
+ DisplayName("Automatic")
+ ShortName("auto")
+ Automatic = 4,
+ DisplayName("Custom")
+ ShortName("custom")
+ Custom = 3
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/AnamorphicResult.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Cropping.cs Added

@@ -0,0 +1,99 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Cropping.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Cropping type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
+{
+ /// <summary>
+ /// The Cropping Model
+ /// </summary>
+ public class Cropping
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class. 
+ /// </summary>
+ public Cropping()
+ {
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class.
+ /// Copy Constructor
+ /// </summary>
+ /// <param name="cropping">
+ /// The cropping.
+ /// </param>
+ public Cropping(Cropping cropping)
+ {
+ this.Top = cropping.Top;
+ this.Bottom = cropping.Bottom;
+ this.Left = cropping.Left;
+ this.Right = cropping.Right;
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class. 
+ /// </summary>
+ /// <param name="top">
+ /// The Top Value
+ /// </param>
+ /// <param name="bottom">
+ /// The Bottom Value
+ /// </param>
+ /// <param name="left">
+ /// The Left Value
+ /// </param>
+ /// <param name="right">
+ /// The Right Value
+ /// </param>
+ public Cropping(int top, int bottom, int left, int right)
+ {
+ this.Top = top;
+ this.Bottom = bottom;
+ this.Left = left;
+ this.Right = right;
+ }
+
+ /// <summary>
+ /// Gets or sets Top.
+ /// </summary>
+ public int Top { get; set; }
+
+ /// <summary>
+ /// Gets or sets Bottom.
+ /// </summary>
+ public int Bottom { get; set; }
+
+ /// <summary>
+ /// Gets or sets Left.
+ /// </summary>
+ public int Left { get; set; }
+
+ /// <summary>
+ /// Gets or sets Right.
+ /// </summary>
+ public int Right { get; set; }
+
+ /// <summary>
+ /// Clone this model
+ /// </summary>
+ /// <returns>
+ /// A Cloned copy
+ /// </returns>
+ public Cropping Clone()
+ {
+ return new Cropping
+ {
+ Top = this.Top,
+ Bottom = this.Bottom,
+ Left = this.Left,
+ Right = this.Right
+ };
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/Padding.cs Added

@@ -0,0 +1,99 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Padding.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Padding type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
+{
+ /// <summary>
+ /// The Cropping Model
+ /// </summary>
+ public class Padding
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class. 
+ /// </summary>
+ public Padding()
+ {
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class.
+ /// Copy Constructor
+ /// </summary>
+ /// <param name="cropping">
+ /// The cropping.
+ /// </param>
+ public Padding(Cropping cropping)
+ {
+ this.Top = cropping.Top;
+ this.Bottom = cropping.Bottom;
+ this.Left = cropping.Left;
+ this.Right = cropping.Right;
+ }
+
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Cropping"/> class. 
+ /// </summary>
+ /// <param name="top">
+ /// The Top Value
+ /// </param>
+ /// <param name="bottom">
+ /// The Bottom Value
+ /// </param>
+ /// <param name="left">
+ /// The Left Value
+ /// </param>
+ /// <param name="right">
+ /// The Right Value
+ /// </param>
+ public Padding(int top, int bottom, int left, int right)
+ {
+ this.Top = top;
+ this.Bottom = bottom;
+ this.Left = left;
+ this.Right = right;
+ }
+
+ /// <summary>
+ /// Gets or sets Top.
+ /// </summary>
+ public int Top { get; set; }
+
+ /// <summary>
+ /// Gets or sets Bottom.
+ /// </summary>
+ public int Bottom { get; set; }
+
+ /// <summary>
+ /// Gets or sets Left.
+ /// </summary>
+ public int Left { get; set; }
+
+ /// <summary>
+ /// Gets or sets Right.
+ /// </summary>
+ public int Right { get; set; }
+
+ /// <summary>
+ /// Clone this model
+ /// </summary>
+ /// <returns>
+ /// A Cloned copy
+ /// </returns>
+ public Cropping Clone()
+ {
+ return new Cropping
+ {
+ Top = this.Top,
+ Bottom = this.Bottom,
+ Left = this.Left,
+ Right = this.Right
+ };
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsJob.cs Added

@@ -0,0 +1,46 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureSettingsJob.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
+{
+ public class PictureSettingsJob
+ {
+ public Cropping Crop { get; set; }
+
+ public Padding Pad { get; set; }
+
+ public int ParW { get; set; }
+
+ public int ParH { get; set; }
+
+ public bool ItuPar { get; set; }
+
+ public int Width { get; set; }
+
+ public int Height { get; set; }
+
+ public Anamorphic AnamorphicMode { get; set; }
+
+ public int MaxWidth { get; set; }
+
+ public int MaxHeight { get; set; }
+
+ public bool KeepDisplayAspect { get; set; }
+
+ public int DarWidth { get; set; }
+
+ public int DarHeight { get; set; }
+ 
+
+ public int? PreviousRotation { get; set; }
+
+ public int RotateAngle { get; set; }
+
+ public int? PreviousHflip { get; set; }
+
+ public int Hflip { get; set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/PictureSettingsTitle.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Picture/RotateResult.cs Added

@@ -0,0 +1,37 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RotateResult.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Picture
+{
+ public class RotateResult
+ {
+ public int CropTop { get; set; }
+
+ public int CropBottom { get; set; }
+
+ public int CropLeft { get; set; }
+
+ public int CropRight { get; set; }
+
+
+ public int PadTop { get; set; }
+
+ public int PadBottom { get; set; }
+
+ public int PadLeft { get; set; }
+
+ public int PadRight { get; set; }
+
+
+ public int Width { get; set; }
+
+ public int Height { get; set; }
+
+ public int ParNum { get; set; }
+
+ public int ParDen { get; set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Presets/PresetVersion.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Interfaces/Model/Preview/RawPreviewData.cs Added

@@ -0,0 +1,30 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="RawPreviewData.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Interfaces.Model.Preview
+{
+ public class RawPreviewData
+ {
+ public RawPreviewData(byte rawBitmapData, int strideWidth, int strideHeight, int width, int height)
+ {
+ this.RawBitmapData = rawBitmapData;
+ this.StrideWidth = strideWidth;
+ this.StrideHeight = strideHeight;
+ this.Width = width;
+ this.Height = height;
+ }
+
+ public byte RawBitmapData { get; }
+
+ public int StrideWidth { get; }
+
+ public int StrideHeight { get; }
+
+ public int Width { get; }
+
+ public int Height { get; }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/AnamorphicGeometry.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/AnamorphicGeometry.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/DestSettings.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Anamorphic/DestSettings.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Audio.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/AudioTrack.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Chapter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Chapter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Destination.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Filter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Filter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Filters.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Filters.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/JsonEncodeObject.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/JsonEncodeObject.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Metadata.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Metadata.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Mp4Options.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Mp4Options.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/QSV.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/QSV.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Range.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Range.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Source.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Source.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubImport.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubImport.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleSearch.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleSearch.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/SubtitleTrack.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Subtitles.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Subtitles.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Encode/Video.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Filters/PresetTune.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Filters/PresetTune.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/AudioList.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/AudioList.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/HBPreset.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/HBPreset.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/HBPresetCategory.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetTransportContainer.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Presets/PresetTransportContainer.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Queue/Task.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Queue/Task.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/AudioAttributes.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/AudioAttributes.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/Color.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/Color.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/Duration.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/Duration.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/FrameRate.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/FrameRate.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/JsonScanObject.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/JsonScanObject.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceAudioTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceAudioTrack.cs Changed

@@ -1,64 +1,69 @@
-// --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceAudioTrack.cs" company="HandBrake Project (http://handbrake.fr)">
-// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
-// </copyright>
-// <summary>
-// An audio track from the source video.
-// </summary>
-// --------------------------------------------------------------------------------------------------------------------
-
-namespace HandBrake.Interop.Interop.Json.Scan
-{
- /// <summary>
- /// An audio track from the source video.
- /// </summary>
- public class SourceAudioTrack
- {
- /// <summary>
- /// Gets or sets the bit rate.
- /// </summary>
- public int BitRate { get; set; }
-
- /// <summary>
- /// Gets or sets the channel layout.
- /// </summary>
- public long ChannelLayout { get; set; }
-
- /// <summary>
- /// Gets or sets the description.
- /// </summary>
- public string Description { get; set; }
-
- /// <summary>
- /// Gets or sets the language.
- /// </summary>
- public string Language { get; set; }
-
- /// <summary>
- /// Gets or sets the language code.
- /// </summary>
- public string LanguageCode { get; set; }
-
- /// <summary>
- /// Gets or sets the sample rate.
- /// </summary>
- public int SampleRate { get; set; }
-
- /// <summary>
- /// Gets or sets the codec.
- /// </summary>
- public int Codec { get; set; }
-
- public string CodecName { get; set; }
-
- public long LFECount { get; set; }
-
- public string ChannelLayoutName { get; set; }
-
- public int ChannelCount { get; set; }
-
- public AudioAttributes Attributes { get; set; }
-
- public string Name { get; set; }
- }
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SourceAudioTrack.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// An audio track from the source video.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Interop.Json.Scan
+{
+ /// <summary>
+ /// An audio track from the source video.
+ /// </summary>
+ public class SourceAudioTrack
+ {
+ /// <summary>
+ /// Gets or sets the track number (1-based).
+ /// </summary>
+ public int TrackNumber { get; set; }
+
+ /// <summary>
+ /// Gets or sets the bit rate.
+ /// </summary>
+ public int BitRate { get; set; }
+
+ /// <summary>
+ /// Gets or sets the channel layout.
+ /// </summary>
+ public long ChannelLayout { get; set; }
+
+ /// <summary>
+ /// Gets or sets the description.
+ /// </summary>
+ public string Description { get; set; }
+
+ /// <summary>
+ /// Gets or sets the language.
+ /// </summary>
+ public string Language { get; set; }
+
+ /// <summary>
+ /// Gets or sets the language code.
+ /// </summary>
+ public string LanguageCode { get; set; }
+
+ /// <summary>
+ /// Gets or sets the sample rate.
+ /// </summary>
+ public int SampleRate { get; set; }
+
+ /// <summary>
+ /// Gets or sets the codec.
+ /// </summary>
+ public int Codec { get; set; }
+
+ public string CodecName { get; set; }
+
+ public long LFECount { get; set; }
+
+ public string ChannelLayoutName { get; set; }
+
+ public int ChannelCount { get; set; }
+
+ public AudioAttributes Attributes { get; set; }
+
+ public string Name { get; set; }
+ }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceChapter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceChapter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceMetadata.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceMetadata.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SourceMetadata.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="SourceMetadata.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -15,14 +15,23 @@
 public class SourceMetadata
 {
 public string Name { get; set; }
+
 public string Artist { get; set; }
+
 public string Composer { get; set; }
+
 public string Comment { get; set; }
+
 public string Genre { get; set; }
+
 public string Album { get; set; }
+
 public string AlbumArtist { get; set; }
+
 public string Description { get; set; }
+
 public string LongDescription { get; set; }
+
 public string ReleaseDate { get; set; }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceSubtitleTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceSubtitleTrack.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceTitle.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SourceTitle.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SubtitleAttributes.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Scan/SubtitleAttributes.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="SubtitleAttributes.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="SubtitleAttributes.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -9,21 +9,31 @@
 
 namespace HandBrake.Interop.Interop.Json.Scan
 {
- using Newtonsoft.Json;
+ using System.Text.Json.Serialization;
 
 public class SubtitleAttributes
 {
- JsonProperty(PropertyName = "4By3")
+ JsonPropertyName("4By3")
 public bool FourByThree { get; set; }
+
 public bool Children { get; set; }
+
 public bool ClosedCaption { get; set; }
+
 public bool Commentary { get; set; }
+
 public bool Default { get; set; }
+
 public bool Forced { get; set; }
+
 public bool Large { get; set; }
+
 public bool Letterbox { get; set; }
+
 public bool Normal { get; set; }
+
 public bool PanScan { get; set; }
+
 public bool Wide { get; set; }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Shared/Geometry.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Shared/Geometry.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Shared/PAR.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/Shared/PAR.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/Scanning.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/Scanning.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/TaskState.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/TaskState.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="TaskState.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="TaskState.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -13,6 +13,8 @@
 
 public class TaskState
 {
+ private static readonly Dictionary<string, TaskState> TaskStates = new Dictionary<string, TaskState>();
+
 public static TaskState Idle = new TaskState("IDLE");
 public static TaskState Scanning = new TaskState("SCANNING");
 public static TaskState ScanDone = new TaskState("SCANDONE");
@@ -23,19 +25,17 @@
 public static TaskState Muxing = new TaskState("MUXING");
 public static TaskState Unknown = new TaskState("UNKNOWN");
 
- private static readonly Dictionary<string, TaskState> taskStates = new Dictionary<string, TaskState>();
-
 static TaskState()
 {
- taskStates.Add("IDLE", Idle);
- taskStates.Add("SCANNING", Scanning);
- taskStates.Add("SCANDONE", ScanDone);
- taskStates.Add("WORKING", Working);
- taskStates.Add("PAUSED", Paused);
- taskStates.Add("SEARCHING", Searching);
- taskStates.Add("WORKDONE", WorkDone);
- taskStates.Add("MUXING", Muxing);
- taskStates.Add("UNKNOWN", Unknown);
+ TaskStates.Add("IDLE", Idle);
+ TaskStates.Add("SCANNING", Scanning);
+ TaskStates.Add("SCANDONE", ScanDone);
+ TaskStates.Add("WORKING", Working);
+ TaskStates.Add("PAUSED", Paused);
+ TaskStates.Add("SEARCHING", Searching);
+ TaskStates.Add("WORKDONE", WorkDone);
+ TaskStates.Add("MUXING", Muxing);
+ TaskStates.Add("UNKNOWN", Unknown);
 }
 
 public TaskState(string code)
@@ -47,8 +47,7 @@
 
 public static TaskState FromRepositoryValue(string code)
 {
- TaskState state = null;
- if (taskStates.TryGetValue(code, out state))
+ if (TaskStates.TryGetValue(code, out TaskState state))
 {
 return state;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/WorkDone.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Interop/Json/State/WorkDone.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Properties Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Properties/PublishProfiles Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Properties/PublishProfiles/publish_arm64.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Properties/PublishProfiles/publish_portable.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Properties/PublishProfiles/publish_x64.pubxml Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Settings.StyleCop -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Settings.StyleCop Changed

@@ -1,4 +1,43 @@
 <StyleCopSettings Version="105">
+ <GlobalSettings>
+ <CollectionProperty Name="RecognizedWords">
+ <Value>avg</Value>
+ <Value>bd</Value>
+ <Value>codeset</Value>
+ <Value>Colour</Value>
+ <Value>decomb</Value>
+ <Value>deinterlace</Value>
+ <Value>denoise</Value>
+ <Value>dest</Value>
+ <Value>detelecine</Value>
+ <Value>drc</Value>
+ <Value>dvd</Value>
+ <Value>framerate</Value>
+ <Value>framerates</Value>
+ <Value>hb</Value>
+ <Value>init</Value>
+ <Value>interop</Value>
+ <Value>ipod</Value>
+ <Value>iso</Value>
+ <Value>itu</Value>
+ <Value>json</Value>
+ <Value>libdvdread</Value>
+ <Value>mixdown</Value>
+ <Value>mixdowns</Value>
+ <Value>mp</Value>
+ <Value>nav</Value>
+ <Value>num</Value>
+ <Value>passthrough</Value>
+ <Value>plist</Value>
+ <Value>pts</Value>
+ <Value>qsv</Value>
+ <Value>samplerate</Value>
+ <Value>scaler</Value>
+ <Value>srt</Value>
+ <Value>vob</Value>
+ <Value>vrate</Value>
+ </CollectionProperty>
+ </GlobalSettings>
 <Parsers>
 <Parser ParserId="StyleCop.CSharp.CsParser">
 <ParserSettings>
@@ -8,6 +47,13 @@
 </Parsers>
 <Analyzers>
 <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+ <Rules>
+ <Rule Name="PropertySummaryDocumentationMustMatchAccessors">
+ <RuleSettings>
+ <BooleanProperty Name="Enabled">False</BooleanProperty>
+ </RuleSettings>
+ </Rule>
+ </Rules>
 <AnalyzerSettings>
 <StringProperty Name="CompanyName">HandBrake Project (https://handbrake.fr)</StringProperty>
 <StringProperty Name="Copyright">This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.</StringProperty>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Utilities/CharCodesUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Utilities/CharCodesUtilities.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Utilities/JsonSettings.cs Added

@@ -0,0 +1,26 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="JsonSettings.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the JsonSettings type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Interop.Utilities
+{
+ using System.Text.Json;
+
+ public class JsonSettings
+ {
+ /// <summary>
+ /// For consistent use of JSON settings between this library and the consumers.
+ /// </summary>
+ public static JsonSerializerOptions Options = new JsonSerializerOptions
+ {
+ IgnoreNullValues = true,
+ WriteIndented = true,
+ PropertyNameCaseInsensitive = true
+ };
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Interop/Utilities/LanguageUtilities.cs Changed

@@ -1,5 +1,5 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="LanguageUtilities.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="LanguageUtilities.cs" company="HandBrake Project (https://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
@@ -10,17 +10,15 @@
 namespace HandBrake.Interop.Utilities
 {
 using System.Collections.Generic;
- using System.ComponentModel;
 using System.Linq;
 
- using HandBrake.Interop.Interop.HbLib;
-
 /// <summary>
 /// Language Utilities
 /// </summary>
 public class LanguageUtilities
 {
 public static string Any = "(Any)";
+
 private static IDictionary<string, string> languageMap;
 
 /// <summary>
@@ -268,7 +266,7 @@
 List<string> names = new List<string>();
 foreach (var item in languageCodes)
 {
- KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item); // Slightly inefficient but small set anyway so not a big issue.
+ KeyValuePair<string, string> name = MapLanguages().FirstOrDefault(v => v.Value == item); // Slightly inefficient but small set anyway so not a big issue.
 names.Add(name.Key);
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/HandBrake.Worker.csproj -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/HandBrake.Worker.csproj Changed

@@ -1,78 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
 <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
- <ProjectGuid>{F8370F37-B226-4830-AEE7-6D7AE403E3D2}</ProjectGuid>
 <OutputType>Exe</OutputType>
- <RootNamespace>HandBrake.Worker</RootNamespace>
- <AssemblyName>HandBrake.Worker</AssemblyName>
- <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <TargetFrameworkProfile />
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\x64\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DebugType>full</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- <OutputPath>bin\x64\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>x64</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
- <Prefer32Bit>true</Prefer32Bit>
- </PropertyGroup>
- <PropertyGroup>
+ <TargetFramework>net6.0</TargetFramework>
+ <PackageId>HandBrake.Worker</PackageId>
+ <Authors>HandBrake Team</Authors>
+ <Company>HandBrake Team</Company>
+ <Product>HandBrake.Worker</Product>
+ <Copyright>Copyright © 2003-2022 HandBrake Team</Copyright>
+ <Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
+ <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
+ <RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
+ <RepositoryType>git</RepositoryType>
+ <AssemblyVersion>1.5.1.0</AssemblyVersion>
+ <Platforms>AnyCPU</Platforms>
+ <PlatformTarget>AnyCPU</PlatformTarget>
 <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
+ <StartupObject />
+ <AssemblyName>HandBrake.Worker</AssemblyName>
+ <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+ <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+ <FileVersion>1.5.1.0</FileVersion>
+ <Version>1.5.1</Version>
 </PropertyGroup>
+
 <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="Routing\ApiRouter.cs" />
- <Compile Include="Registration\ConnectionRegistrar.cs" />
- <Compile Include="HttpServer.cs" />
- <Compile Include="Logging\Interfaces\ILogHandler.cs" />
- <Compile Include="Logging\LogHandler.cs" />
- <Compile Include="Logging\Models\LogMessage.cs" />
- <Compile Include="Program.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Registration\Model\ConnectionResult.cs" />
- <Compile Include="Utilities\HttpUtilities.cs" />
- </ItemGroup>
- <ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json">
- <Version>12.0.2</Version>
- <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
- </PackageReference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj">
- <Project>{087a2ba8-bac2-4577-a46f-07ff9d420016}</Project>
- <Name>HandBrake.Interop</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Content Include="handbrakepineapple.ico" />
+ <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj" />
 </ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+
 </Project>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/HttpServer.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/HttpServer.cs Changed

@@ -3,7 +3,7 @@
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-// This is a service worker for the HandBrake app. It allows us to run encodes / scans in a seperate process easily.
+// This is a service worker for the HandBrake app. It allows us to run encodes / scans in a separate process easily.
 // All API's expose the ApplicationServices models as JSON.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
@@ -16,90 +16,98 @@
 using System.Net;
 using System.Text;
 using System.Threading;
+ using System.Threading.Tasks;
+
+ using HandBrake.Worker.Logging;
+ using HandBrake.Worker.Services.Interfaces;
 
 public class HttpServer
 {
+ private readonly ITokenService tokenService;
+
 private readonly HttpListener httpListener = new HttpListener();
 private readonly Dictionary<string, Func<HttpListenerRequest, string>> apiHandlers;
 
- public HttpServer(Dictionary<string, Func<HttpListenerRequest, string>> apiCalls, int port)
+ private readonly bool failedStart;
+
+ public HttpServer(Dictionary<string, Func<HttpListenerRequest, string>> apiCalls, int port, ITokenService tokenService)
 {
 if (!HttpListener.IsSupported)
 {
 throw new NotSupportedException("HttpListener not supported on this computer.");
 }
 
+ this.tokenService = tokenService;
+
 // Store the Handlers
 this.apiHandlers = new Dictionary<string, Func<HttpListenerRequest, string>>(apiCalls);
 
- Console.WriteLine(Environment.NewLine + "Available APIs: ");
+ if (!tokenService.IsTokenSet())
+ {
+ ConsoleOutput.WriteLine("Worker: Token has not been initialised. API Access is limited!", ConsoleColor.Red);
+ Console.WriteLine(Environment.NewLine);
+ ConsoleOutput.WriteLine("API Information: ", ConsoleColor.Cyan);
+ Console.WriteLine("All calls require a 'token' in the HTTP header ");
+ }
+
 foreach (KeyValuePair<string, Func<HttpListenerRequest, string>> api in apiCalls)
 {
 string url = string.Format("http://127.0.0.1:{0}/{1}/", port, api.Key);
 this.httpListener.Prefixes.Add(url);
- Console.WriteLine(url);
+
+ if (!tokenService.IsTokenSet())
+ {
+ Console.WriteLine(" - " + url);
+ }
+ }
+
+ if (!tokenService.IsTokenSet())
+ {
+ Console.WriteLine();
 }
 
- Console.WriteLine(Environment.NewLine);
- 
- this.httpListener.Start();
+ try
+ {
+ this.httpListener.Start();
+ }
+ catch (Exception e)
+ {
+ this.failedStart = true;
+
+ Console.WriteLine("Worker: Unable to start HTTP Server. Maybe the port {0} is in use?", port);
+ Console.WriteLine("Worker Exception: " + e);
+ }
 }
 
- public void Run()
+ public async Task<bool> Run()
 {
- ThreadPool.QueueUserWorkItem((o) =>
+ if (this.failedStart)
+ {
+ return false;
+ }
+
+
+ while (this.httpListener.IsListening)
 {
 try
 {
- while (this.httpListener.IsListening)
+ var context = await this.httpListener.GetContextAsync();
+ lock (this.httpListener)
 {
- ThreadPool.QueueUserWorkItem(
- (c) =>
- {
- var context = c as HttpListenerContext;
- if (context == null)
- {
- return;
- }
-
- try
- {
- string path = context.Request.RawUrl.TrimStart('/').TrimEnd('/');
-
- Console.WriteLine("Handling call to: " + path);
-
- if (this.apiHandlers.TryGetValue(path, out var actionToPerform))
- {
- string rstr = actionToPerform(context.Request);
- byte buf = Encoding.UTF8.GetBytes(rstr);
- context.Response.ContentLength64 = buf.Length;
- context.Response.OutputStream.Write(buf, 0, buf.Length);
- }
- else
- {
- string rstr = "Error, There is a missing API handler.";
- byte buf = Encoding.UTF8.GetBytes(rstr);
- context.Response.ContentLength64 = buf.Length;
- context.Response.OutputStream.Write(buf, 0, buf.Length);
- }
- }
- catch (Exception exc)
- {
- Debug.WriteLine(exc);
- }
- finally
- {
- context?.Response.OutputStream.Close();
- }
- },
- this.httpListener.GetContext());
+ this.HandleRequest(context);
 }
 }
- catch (Exception exc)
+ catch (Exception e)
 {
- Debug.WriteLine(exc);
+ if (e is HttpListenerException)
+ {
+ Debug.WriteLine("Worker: " + e);
+ return false;
+ }
 }
- });
+ }
+
+ return true;
 }
 
 public void Stop()
@@ -107,5 +115,61 @@
 this.httpListener.Stop();
 this.httpListener.Close();
 }
+
+ private void HandleRequest(HttpListenerContext context)
+ {
+ try
+ {
+ if (context == null)
+ {
+ return;
+ }
+
+ Stopwatch watch = Stopwatch.StartNew();
+
+ string path = context.Request.RawUrl.TrimStart('/').TrimEnd('/');
+ string token = context.Request.Headers.Get("token");
+
+ if (!path.Equals("Version") && !tokenService.IsAuthenticated(token))
+ {
+ string rstr = string.Format("Worker: Access Denied to '/{0}'. The token provided in the HTTP header was not valid.", path);
+ ConsoleOutput.WriteLine(rstr, ConsoleColor.Red, true);
+ byte buf = Encoding.UTF8.GetBytes(rstr);
+ context.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
+ context.Response.ContentLength64 = buf.Length;
+ context.Response.OutputStream.Write(buf, 0, buf.Length);
+ return;
+ }
+
+ if (this.apiHandlers.TryGetValue(path, out var actionToPerform))
+ {
+ string rstr = actionToPerform(context.Request);
+ if (!string.IsNullOrEmpty(rstr))
+ {
+ byte buf = Encoding.UTF8.GetBytes(rstr);
+ context.Response.ContentLength64 = buf.Length;
+ context.Response.OutputStream.Write(buf, 0, buf.Length);
+ }
+ }
+ else
+ {
+ string rstr = "Error, There is a missing API handler.";
+ byte buf = Encoding.UTF8.GetBytes(rstr);
+ context.Response.ContentLength64 = buf.Length;
+ context.Response.OutputStream.Write(buf, 0, buf.Length);
+ }
+
+ watch.Stop();
+ Debug.WriteLine(string.Format(" - Processed call to: '/{0}', Took {1}ms", path, watch.ElapsedMilliseconds), ConsoleColor.White, true);
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine("Worker: Listener Thread: " + exc);
+ }
+ finally
+ {
+ context?.Response.OutputStream.Close();
+ }
+ }
 }
 }
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Logging/ConsoleOutput.cs Added

@@ -0,0 +1,40 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ConsoleOutput.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ConsoleOutput type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker.Logging
+{
+ using System;
+
+ public class ConsoleOutput
+ {
+ public static void WriteLine(string text, ConsoleColor colour = ConsoleColor.White, bool enableTimecode = false)
+ {
+ Console.ForegroundColor = colour;
+ if (enableTimecode)
+ {
+ string time = DateTime.Now.ToString("HH:mm:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo);
+ Console.WriteLine("{0} {1}", time, text);
+ }
+ else
+ {
+ Console.WriteLine(text);
+ }
+ 
+ Console.ResetColor();
+ }
+
+ public static void ClearLine()
+ {
+ int currentLineCursor = Console.CursorTop;
+ Console.SetCursorPosition(0, Console.CursorTop);
+ Console.Write(new string(' ', Console.WindowWidth));
+ Console.SetCursorPosition(0, currentLineCursor);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Logging/Interfaces/ILogHandler.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Logging/Interfaces/ILogHandler.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Logging/LogHandler.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Logging/LogHandler.cs Changed

@@ -10,26 +10,44 @@
 
 namespace HandBrake.Worker.Logging
 {
+ using System;
 using System.Collections.Generic;
+ using System.Diagnostics;
+ using System.IO;
 using System.Linq;
 using System.Text;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.EventArgs;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
 using HandBrake.Worker.Logging.Interfaces;
 using HandBrake.Worker.Logging.Models;
 
 public class LogHandler : ILogHandler
 {
 private readonly object lockObject = new object();
+ private readonly object fileWriterLock = new object();
+
 private readonly StringBuilder logBuilder = new StringBuilder();
 private readonly List<LogMessage> logMessages = new List<LogMessage>();
 
 private bool isLoggingEnabled = true;
+ private bool isDiskLoggingEnabled = false;
 private int messageIndex;
+ private StreamWriter fileWriter;
 
- public LogHandler()
+ public LogHandler(string logDirectory, string logFileName, bool enableDiskLogging)
 {
+ this.isDiskLoggingEnabled = enableDiskLogging;
+
+ if (this.isDiskLoggingEnabled)
+ {
+ lock (this.fileWriterLock)
+ {
+ // Todo Handle no log directory.
+ this.fileWriter = new StreamWriter(logFileName) { AutoFlush = true };
+ }
+ }
+
 HandBrakeUtils.MessageLogged += this.HandBrakeUtils_MessageLogged;
 HandBrakeUtils.ErrorLogged += this.HandBrakeUtils_ErrorLogged;
 }
@@ -78,17 +96,20 @@
 
 public void LogMessage(string content)
 {
+ Console.WriteLine(content);
+
 if (!this.isLoggingEnabled)
 {
 return;
 }
 
+ LogMessage msg = new LogMessage(content, this.messageIndex);
 lock (this.lockObject)
 {
- LogMessage msg = new LogMessage(content, this.messageIndex);
 this.messageIndex = this.messageIndex + 1;
 this.logMessages.Add(msg);
 this.logBuilder.AppendLine(msg.Content);
+ this.LogMessageToDisk(msg);
 
 if (this.logMessages.Count > 50000)
 {
@@ -96,6 +117,7 @@
 msg = new LogMessage("Log Service Pausing. Too Many Log messages. This may indicate a problem with your encode.", this.messageIndex);
 this.logMessages.Add(msg);
 this.logBuilder.AppendLine(msg.Content);
+ this.LogMessageToDisk(msg);
 
 this.isLoggingEnabled = false;
 }
@@ -112,6 +134,51 @@
 }
 }
 
+ public void ShutdownFileWriter()
+ {
+ try
+ {
+ lock (this.fileWriterLock)
+ {
+ if (this.fileWriter != null)
+ {
+ this.fileWriter.Flush();
+ this.fileWriter.Close();
+ this.fileWriter.Dispose();
+ }
+
+ this.fileWriter = null;
+ }
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc); // This exception doesn't warrant user interaction, but it should be logged
+ }
+ }
+
+ private void LogMessageToDisk(LogMessage msg)
+ {
+ if (!this.isDiskLoggingEnabled)
+ {
+ return;
+ }
+
+ try
+ {
+ lock (this.fileWriterLock)
+ {
+ if (this.fileWriter != null && this.fileWriter.BaseStream.CanWrite)
+ {
+ this.fileWriter.WriteLine(msg.Content);
+ }
+ }
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc); // This exception doesn't warrant user interaction, but it should be logged
+ }
+ }
+
 private void HandBrakeUtils_ErrorLogged(object sender, MessageLoggedEventArgs e)
 {
 if (e == null || string.IsNullOrEmpty(e.Message))

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Portable.cs Added

@@ -0,0 +1,88 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Portable.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Portable type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker
+{
+ using System;
+ using System.Collections.Generic;
+ using System.IO;
+
+ public class Portable
+ {
+ private static readonly string PortableFile = Path.Combine(Environment.CurrentDirectory, "portable.ini");
+ private static Dictionary<string, string> keyPairs = new Dictionary<string, string>();
+
+ public static bool Initialise()
+ {
+ if (!IsPortable())
+ {
+ return true;
+ }
+
+ // Read the INI file 
+ if (File.Exists(PortableFile))
+ {
+ try
+ {
+ using (StreamReader fileReader = new StreamReader(PortableFile))
+ {
+ string line;
+ while ((line = fileReader.ReadLine()) != null)
+ {
+ line = line.Trim();
+
+ if (line.StartsWith("#"))
+ {
+ continue; // Ignore Comments
+ }
+
+ string setting = line.Split('=');
+ if (setting.Length == 2)
+ {
+ keyPairs.Add(setting0.Trim(), setting1.Trim());
+ }
+ }
+ }
+ }
+ catch
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public static bool IsPortable()
+ {
+ if (!File.Exists(PortableFile))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public static bool IsProcessIsolationEnabled()
+ {
+ if (keyPairs.ContainsKey("process.isolation.enabled"))
+ {
+ string enabled = keyPairs"process.isolation.enabled";
+ if (!string.IsNullOrEmpty(enabled) && enabled.Trim() == "true")
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ return true; // Default to On.
+ }
+ }
+}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Program.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Program.cs Changed

@@ -14,20 +14,37 @@
 using System.Net;
 using System.Threading;
 
- using HandBrake.Worker.Registration;
+ using HandBrake.Interop.Interop;
+ using HandBrake.Worker.Logging;
 using HandBrake.Worker.Routing;
+ using HandBrake.Worker.Services;
+ using HandBrake.Worker.Services.Interfaces;
+ using HandBrake.Worker.Utilities;
 
 public class Program
 {
+ private static readonly ITokenService TokenService = new TokenService();
+
 private static ApiRouter router;
 private static ManualResetEvent manualResetEvent = new ManualResetEvent(false);
- private static ConnectionRegistrar registrar = new ConnectionRegistrar();
 
 public static void Main(string args)
 {
- int port = 8037; // Default Port;
- int verbosity = 1;
+ AppDomain.CurrentDomain.ProcessExit += CurrentDomain_ProcessExit;
+
+ Portable.Initialise();
 
+ if (!Portable.IsProcessIsolationEnabled())
+ {
+ Console.WriteLine("Worker is disabled in portable.ini");
+ Console.WriteLine("Press 'Enter' to exit");
+ Console.Read();
+ return;
+ }
+
+ int port = 8037; // Default Port;
+ string token;
+ 
 if (args.Length != 0)
 {
 foreach (string argument in args)
@@ -41,43 +58,56 @@
 }
 }
 
- if (argument.StartsWith("--verbosity"))
+ if (argument.StartsWith("--token"))
 {
- string value = argument.TrimStart("--port=".ToCharArray());
- if (int.TryParse(value, out var verbosityVal))
- {
- verbosity = verbosityVal;
- }
+ token = argument.TrimStart("--token=".ToCharArray());
+ TokenService.RegisterToken(token);
 }
 }
 }
 
- Console.WriteLine("Starting HandBrake Engine ...");
- router = new ApiRouter();
- router.Initialise(verbosity);
+ if (!TokenService.IsTokenSet())
+ {
+ ConsoleOutput.WriteLine("# HandBrake Worker", ConsoleColor.DarkYellow);
+ ConsoleOutput.WriteLine("*** Please note, this application should not be run standalone. To run the GUI, please use 'HandBrake.exe' *** ", ConsoleColor.Red);
+ Console.WriteLine();
+ }
 
- Console.WriteLine("Starting Web Server ...");
- Console.WriteLine("Using Port: {0}", port);
- Dictionary<string, Func<HttpListenerRequest, string>> apiHandlers = RegisterApiHandlers();
- HttpServer webServer = new HttpServer(apiHandlers, port);
- webServer.Run();
+ ConsoleOutput.WriteLine("Worker: Starting HandBrake Engine ...", ConsoleColor.White, true);
+ router = new ApiRouter();
+ router.TerminationEvent += Router_TerminationEvent;
 
- Console.WriteLine("Web Server Started");
+ ConsoleOutput.WriteLine(string.Format("Worker: Starting Web Server on port {0} ...", port), ConsoleColor.White, true);
 
- manualResetEvent.WaitOne();
+ Dictionary<string, Func<HttpListenerRequest, string>> apiHandlers = RegisterApiHandlers();
+ HttpServer webServer = new HttpServer(apiHandlers, port, TokenService);
+ if (webServer.Run().Result)
+ {
+ ConsoleOutput.WriteLine("Worker: Server Started", ConsoleColor.White, true);
+ manualResetEvent.WaitOne();
+ webServer.Stop();
+ }
+ else
+ {
+ ConsoleOutput.WriteLine("Worker is exiting ...");
+ }
+ }
 
- webServer.Stop();
+ private static void CurrentDomain_ProcessExit(object sender, EventArgs e)
+ {
+ HandBrakeUtils.DisposeGlobal();
 }
 
- public static Dictionary<string, Func<HttpListenerRequest, string>> RegisterApiHandlers()
+ private static Dictionary<string, Func<HttpListenerRequest, string>> RegisterApiHandlers()
 {
 Dictionary<string, Func<HttpListenerRequest, string>> apiHandlers =
 new Dictionary<string, Func<HttpListenerRequest, string>>();
 
- // Worker APIs
- apiHandlers.Add("Pair", registrar.Pair);
- apiHandlers.Add("GetToken", registrar.GetToken);
+ // Process Handling
 apiHandlers.Add("Shutdown", ShutdownServer);
+ apiHandlers.Add("IsTokenSet", IsTokenSet);
+ apiHandlers.Add("RegisterToken", RegisterToken);
+ apiHandlers.Add("Version", router.GetVersionInfo);
 
 // Logging
 apiHandlers.Add("GetAllLogMessages", router.GetAllLogMessages);
@@ -85,18 +115,40 @@
 apiHandlers.Add("ResetLogging", router.ResetLogging);
 
 // HandBrake APIs
- apiHandlers.Add("Version", router.GetVersionInfo); 
 apiHandlers.Add("StartEncode", router.StartEncode);
 apiHandlers.Add("PauseEncode", router.PauseEncode);
 apiHandlers.Add("ResumeEncode", router.ResumeEncode);
 apiHandlers.Add("StopEncode", router.StopEncode);
 apiHandlers.Add("PollEncodeProgress", router.PollEncodeProgress);
- apiHandlers.Add("SetConfiguration", router.SetConfiguration);
 
 return apiHandlers;
 }
 
- public static string ShutdownServer(HttpListenerRequest request)
+ private static string RegisterToken(HttpListenerRequest request)
+ {
+ string requestPostData = HttpUtilities.GetRequestPostData(request);
+ if (!string.IsNullOrEmpty(requestPostData))
+ {
+ TokenService.RegisterToken(requestPostData);
+ return true.ToString();
+ }
+
+ return false.ToString();
+ }
+
+ private static string IsTokenSet(HttpListenerRequest arg)
+ {
+ return TokenService.IsTokenSet().ToString();
+ }
+
+ private static void Router_TerminationEvent(object sender, EventArgs e)
+ {
+ Console.WriteLine("Worker: Termination event received. ");
+ manualResetEvent.Set();
+ Environment.Exit(0);
+ }
+ 
+ private static string ShutdownServer(HttpListenerRequest request)
 {
 manualResetEvent.Set();
 return "Server Terminated";

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Properties/PublishProfiles Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Properties/PublishProfiles/publish_arm64.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Properties/PublishProfiles/publish_portable.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Properties/PublishProfiles/publish_x64.pubxml Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.Worker/Routing/ApiRouter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/ApiRouter.cs Changed

@@ -3,7 +3,7 @@
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-// This is a service worker for the HandBrake app. It allows us to run encodes / scans in a seperate process easily.
+// This is a service worker for the HandBrake app. It allows us to run encodes / scans in a separate process easily.
 // All API's expose the ApplicationServices models as JSON.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
@@ -11,58 +11,53 @@
 namespace HandBrake.Worker.Routing
 {
 using System;
- using System.Collections.Generic;
 using System.Net;
+ using System.Text.Json;
 
 using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
 using HandBrake.Interop.Interop.Json.State;
 using HandBrake.Interop.Utilities;
 using HandBrake.Worker.Logging;
 using HandBrake.Worker.Logging.Interfaces;
- using HandBrake.Worker.Logging.Models;
+ using HandBrake.Worker.Routing.Commands;
+ using HandBrake.Worker.Routing.Results;
 using HandBrake.Worker.Utilities;
-
- using Newtonsoft.Json;
+ using HandBrake.Worker.Watcher;
 
 public class ApiRouter
 {
- private readonly JsonSerializerSettings jsonNetSettings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+ private JsonState completedState;
 private HandBrakeInstance handbrakeInstance;
 private ILogHandler logHandler;
- private bool isLoggingConfigured = false;
-
- public string Initialise(int verbosity)
- {
- if (this.handbrakeInstance == null)
- {
- this.handbrakeInstance = new HandBrakeInstance();
- }
+ private InstanceWatcher instanceWatcher;
 
- if (this.logHandler == null)
- {
- this.logHandler = new LogHandler();
- }
-
- this.handbrakeInstance.Initialize(verbosity, true);
-
- return null;
- }
+ public event EventHandler TerminationEvent; 
 
 public string GetVersionInfo(HttpListenerRequest request)
 {
- string versionInfo = JsonConvert.SerializeObject(VersionHelper.GetVersion(), Formatting.Indented, this.jsonNetSettings);
+ string versionInfo = JsonSerializer.Serialize(HandBrakeVersionHelper.GetVersion(), JsonSettings.Options);
 
 return versionInfo;
 }
 
 public string StartEncode(HttpListenerRequest request)
 {
+ this.completedState = null;
 string requestPostData = HttpUtilities.GetRequestPostData(request);
 
- Console.WriteLine(requestPostData);
- this.handbrakeInstance.StartEncode(requestPostData);
+ if (!string.IsNullOrEmpty(requestPostData))
+ {
+ EncodeCommand command = JsonSerializer.Deserialize<EncodeCommand>(requestPostData, JsonSettings.Options);
 
- return null;
+ this.Initialise(command.InitialiseCommand);
+ 
+ this.handbrakeInstance.StartEncode(command.EncodeJob);
+
+ return JsonSerializer.Serialize(new CommandResult() { WasSuccessful = true }, JsonSettings.Options);
+ }
+
+ return JsonSerializer.Serialize(new CommandResult() { WasSuccessful = false, Error = "No POST data" }, JsonSettings.Options);
 }
 
 public string StopEncode(HttpListenerRequest request)
@@ -88,32 +83,31 @@
 
 public string PollEncodeProgress(HttpListenerRequest request)
 {
+ if (this.completedState != null)
+ {
+ string json = JsonSerializer.Serialize(this.completedState, JsonSettings.Options);
+ return json;
+ }
+
 if (this.handbrakeInstance != null)
 {
 JsonState statusJson = this.handbrakeInstance.GetEncodeProgress();
- string versionInfo = JsonConvert.SerializeObject(statusJson, Formatting.Indented, this.jsonNetSettings);
+ string json = JsonSerializer.Serialize(statusJson, JsonSettings.Options);
 
- return versionInfo;
+ return json;
 }
 
 return null;
 }
 
- public string SetConfiguration(HttpListenerRequest request)
- {
- return null;
- }
-
-
 /* Logging API */
 
 // GET
 public string GetAllLogMessages(HttpListenerRequest request)
 {
- return JsonConvert.SerializeObject(this.logHandler.GetLogMessages(), Formatting.Indented, this.jsonNetSettings);
+ return JsonSerializer.Serialize(this.logHandler.GetLogMessages(), JsonSettings.Options);
 }
-
-
+ 
 // POST
 public string GetLogMessagesFromIndex(HttpListenerRequest request)
 {
@@ -121,7 +115,7 @@
 
 if (int.TryParse(requestPostData, out int index))
 {
- return JsonConvert.SerializeObject(this.logHandler.GetLogMessagesFromIndex(index), Formatting.Indented, this.jsonNetSettings);
+ return JsonSerializer.Serialize(this.logHandler.GetLogMessagesFromIndex(index), JsonSettings.Options);
 }
 
 return null;
@@ -133,5 +127,49 @@
 
 return null;
 }
+
+ public void OnTerminationEvent()
+ {
+ this.TerminationEvent?.Invoke(this, EventArgs.Empty);
+ }
+
+ private void HandbrakeInstance_EncodeCompleted(object sender, EncodeCompletedEventArgs e)
+ {
+ this.completedState = new JsonState() { WorkDone = new WorkDone() { Error = e.Error } };
+ this.completedState.State = "WORKDONE";
+ this.logHandler.ShutdownFileWriter();
+ this.handbrakeInstance.Dispose();
+ HandBrakeUtils.DisposeGlobal();
+ }
+
+ private void Initialise(InitCommand command)
+ {
+ if (this.handbrakeInstance == null)
+ {
+ this.handbrakeInstance = new HandBrakeInstance();
+ }
+
+ if (this.logHandler == null)
+ {
+ this.logHandler = new LogHandler(command.LogDirectory, command.LogFile, command.EnableDiskLogging);
+ }
+
+ if (!command.AllowDisconnectedWorker)
+ {
+ ConsoleOutput.WriteLine("Worker: Disconnected worker monitoring enabled!", ConsoleColor.White, true);
+ this.instanceWatcher = new InstanceWatcher(this);
+ this.instanceWatcher.Start(5000);
+ }
+
+ this.completedState = null;
+
+ this.handbrakeInstance.Initialize(command.LogVerbosity, !command.EnableHardwareAcceleration);
+ this.handbrakeInstance.EncodeCompleted += this.HandbrakeInstance_EncodeCompleted;
+
+ if (command.DisableLibDvdNav)
+ {
+ HandBrakeUtils.SetDvdNav(true); // TODO check this is correct
+ }
+ }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Commands Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Commands/EncodeCommand.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Commands/InitCommand.cs Added

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InitCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the InitCommand type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker.Routing.Commands
+{
+ public class InitCommand
+ {
+ public int LogVerbosity { get; set; }
+
+ public string LogDirectory { get; set; }
+
+ public string LogFile { get; set; }
+
+ public bool EnableDiskLogging { get; set; }
+
+ public bool EnableHardwareAcceleration { get; set; }
+
+ public bool DisableLibDvdNav { get; set; }
+
+ public bool AllowDisconnectedWorker { get; set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Results Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Results/CommandResult.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Routing/Results/ConnectionResult.cs Added

@@ -0,0 +1,31 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ConnectionResult.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ConnectionResult type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker.Routing.Results
+{
+ public class ConnectionResult
+ {
+ public ConnectionResult()
+ {
+ }
+
+ public ConnectionResult(bool isSuccessfulConnection, string token, string error)
+ {
+ this.IsSuccessfulConnection = isSuccessfulConnection;
+ this.Token = token;
+ this.Error = error;
+ }
+
+ public bool IsSuccessfulConnection { get; set; }
+ 
+ public string Token { get; set; }
+
+ public string Error { get; set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Services Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Services/Interfaces Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Services/Interfaces/ITokenService.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Services/TokenService.cs Added

@@ -0,0 +1,59 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TokenService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the TokenService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker.Services
+{
+ using HandBrake.Worker.Services.Interfaces;
+
+ public class TokenService : ITokenService
+ {
+ private readonly object lockObject = new object();
+ private string uiToken;
+ 
+ public string RegisterToken(string requestToken)
+ {
+ lock (this.lockObject)
+ {
+ // Don't allow users to override the current token
+ if (string.IsNullOrEmpty(this.uiToken))
+ {
+ this.uiToken = requestToken;
+ }
+
+ return string.Empty;
+ }
+ }
+
+ public bool IsTokenSet()
+ {
+ lock (this.lockObject)
+ {
+ return !string.IsNullOrEmpty(this.uiToken);
+ }
+ }
+
+ public bool IsAuthenticated(string token)
+ {
+ lock (this.lockObject)
+ {
+ if (string.IsNullOrEmpty(token))
+ {
+ return false;
+ }
+
+ if (token != this.uiToken)
+ {
+ return false;
+ }
+
+ return true;
+ }
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Watcher Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrake.Worker/Watcher/InstanceWatcher.cs Added

@@ -0,0 +1,51 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InstanceWatcher.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the InstanceWatcher type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrake.Worker.Watcher
+{
+ using System.Diagnostics;
+ using System.Timers;
+
+ using HandBrake.Worker.Routing;
+
+ public class InstanceWatcher
+ {
+ private readonly ApiRouter routerInstance;
+
+ private Timer timer;
+
+ public InstanceWatcher(ApiRouter routerInstance)
+ {
+ this.routerInstance = routerInstance;
+ }
+
+ public void Start(int ms)
+ {
+ if (this.timer != null)
+ {
+ this.timer.Stop();
+ }
+
+ this.timer = new Timer(ms) { AutoReset = true };
+ this.timer.Start();
+ this.timer.Elapsed += this.Timer_Elapsed;
+ }
+
+ private void Timer_Elapsed(object sender, ElapsedEventArgs e)
+ {
+ // Check if we are still attached to a UI. If not, terminate. 
+ Process uiProcesses = Process.GetProcessesByName("HandBrake");
+ if (uiProcesses.Length == 0)
+ {
+ this.routerInstance.StopEncode(null);
+ this.routerInstance.OnTerminationEvent();
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.sln -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.sln Changed

@@ -9,34 +9,34 @@
 		build.xml = build.xml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrakeTools", "HandBrakeTools\HandBrakeTools.csproj", "{3BAEBAC7-9042-4863-876F-C550ADCA66DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HandBrake.Worker", "HandBrake.Worker\HandBrake.Worker.csproj", "{F8370F37-B226-4830-AEE7-6D7AE403E3D2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrake.Worker", "HandBrake.Worker\HandBrake.Worker.csproj", "{F8370F37-B226-4830-AEE7-6D7AE403E3D2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrake.Interop", "HandBrake.Interop\HandBrake.Interop.csproj", "{ED5C8D53-0988-4CEB-934A-6B1D840C6335}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandBrakeWPF", "HandBrakeWPF\HandBrakeWPF.csproj", "{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "HandBrake.Installer", "HandBrake.Installer\HandBrake.Installer.wixproj", "{02684A37-C3E0-43F6-A4F0-2465AFEDD6DF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3BAEBAC7-9042-4863-876F-C550ADCA66DC}.Release|x64.ActiveCfg = Release|Any CPU
-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.ActiveCfg = Debug|x64
-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|x64.Build.0 = Debug|x64
-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.ActiveCfg = Release|x64
-		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|x64.Build.0 = Release|x64
-		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|x64.ActiveCfg = Debug|x64
-		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|x64.Build.0 = Debug|x64
-		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|x64.ActiveCfg = Release|x64
-		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|x64.Build.0 = Release|x64
-		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Debug|x64.ActiveCfg = Debug|x64
-		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Debug|x64.Build.0 = Debug|x64
-		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Release|x64.ActiveCfg = Release|x64
-		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Release|x64.Build.0 = Release|x64
+		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8370F37-B226-4830-AEE7-6D7AE403E3D2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED5C8D53-0988-4CEB-934A-6B1D840C6335}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3A8A5D8-2793-42FD-ADC5-9A296F1C4335}.Release|Any CPU.Build.0 = Release|Any CPU
+		{02684A37-C3E0-43F6-A4F0-2465AFEDD6DF}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{02684A37-C3E0-43F6-A4F0-2465AFEDD6DF}.Release|Any CPU.ActiveCfg = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrake.sln.DotSettings -> HandBrake-1.5.1.tar.xz/win/CS/HandBrake.sln.DotSettings Changed

@@ -791,6 +791,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AC/@EntryIndexedValue">AC</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTS/@EntryIndexedValue">DTS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTSHD/@EntryIndexedValue">DTSHD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GPU/@EntryIndexedValue">GPU</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HD/@EntryIndexedValue">HD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MP/@EntryIndexedValue">MP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RF/@EntryIndexedValue">RF</s:String>
@@ -1413,4 +1414,17 @@
 	<s:String x:Key="/Default/Housekeeping/VsSavedAutocompletionValue/OverrideParameterInfo/=Xaml/@EntryIndexedValue">NotOverridden</s:String>
 	<s:Int64 x:Key="/Default/OptionsGeneral/AutoDeleteWorkspaceOlderNDays/@EntryValue">10</s:Int64>
 	<s:String x:Key="/Default/SnapshotsStore/CurrentStore/@EntryValue">C:\Users\Scott\AppData\Local\JetBrains\Shared\vAny\Sessions</s:String>
-	<s:Int64 x:Key="/Default/StyleCopOptions/ParsingPerformance/@EntryValue">8</s:Int64></wpf:ResourceDictionary>
\ No newline at end of file
+	<s:Int64 x:Key="/Default/StyleCopOptions/ParsingPerformance/@EntryValue">8</s:Int64>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Colours/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=decomb/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=detelecine/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=interop/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=hb/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=passthrough/@EntryIndexedValue">True</s:Boolean>
+ <s:Boolean x:Key="/Default/UserDictionary/Words/=qsv/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=deinterlace/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=denoise/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=framerate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=mixdown/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=samplerate/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=vrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/App.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/App.xaml Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/App.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/App.xaml.cs Changed

@@ -17,12 +17,13 @@
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
+ using System.Windows.Interop;
+ using System.Windows.Media;
 
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
 
- using HandBrakeWPF.Helpers;
 using HandBrakeWPF.Instance;
 using HandBrakeWPF.Model;
 using HandBrakeWPF.Services.Interfaces;
@@ -31,7 +32,7 @@
 using HandBrakeWPF.ViewModels;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
+ using GeneralApplicationException = Exceptions.GeneralApplicationException;
 
 /// <summary>
 /// Interaction logic for App.xaml
@@ -44,9 +45,9 @@
 public App()
 {
 Application.Current.Dispatcher.UnhandledException += this.Dispatcher_UnhandledException;
- AppDomain.CurrentDomain.UnhandledException +=
- this.CurrentDomain_UnhandledException;
-
+ AppDomain.CurrentDomain.UnhandledException += this.CurrentDomain_UnhandledException;
+ AppDomain.CurrentDomain.ProcessExit += this.CurrentDomain_ProcessExit;
+ 
 ToolTipService.ShowDurationProperty.OverrideMetadata(typeof(DependencyObject), new FrameworkPropertyMetadata(15000));
 }
 
@@ -58,9 +59,8 @@
 /// </param>
 protected override void OnStartup(StartupEventArgs e)
 {
- // We don't support Windows XP / 2003 / 2003 R2 / Vista / 2008
- OperatingSystem os = Environment.OSVersion;
- if (((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 5)) || ((os.Platform == PlatformID.Win32NT) && (os.Version.Major == 6 && os.Version.Minor < 1)))
+ // We don't support Windows earlier than 10.
+ if (!SystemInfo.IsWindows10OrLater())
 {
 MessageBox.Show(HandBrakeWPF.Properties.Resources.OsVersionWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
 Application.Current.Shutdown();
@@ -120,14 +120,63 @@
 }
 }
 
- bool useDarkTheme = userSettingService.GetUserSetting<bool>(UserSettingConstants.UseDarkTheme);
- if (useDarkTheme && SystemInfo.IsWindows10())
+ int runCounter = userSettingService.GetUserSetting<int>(UserSettingConstants.RunCounter);
+
+ // Software Rendering 
+ if (e.Args.Any(f => f.Equals("--force-software-rendering")) || Portable.IsForcingSoftwareRendering() || userSettingService.GetUserSetting<bool>(UserSettingConstants.ForceSoftwareRendering))
+ {
+ RenderOptions.ProcessRenderMode = RenderMode.SoftwareOnly;
+ }
+
+ // Check if the user would like to check for updates AFTER the first run, but only once. 
+ if (runCounter == 1)
 {
- ResourceDictionary darkTheme = new ResourceDictionary();
- darkTheme.Source = new Uri("Themes/Dark.xaml", UriKind.Relative);
- Application.Current.Resources.MergedDictionaries.Add(darkTheme);
+ CheckForUpdateCheckPermission(userSettingService);
+ }
+
+ // Increment the counter so we can change startup behavior for the above warning and update check question.
+ userSettingService.SetUserSetting(UserSettingConstants.RunCounter, runCounter + 1); // Only display once.
+
+ // App Theme
+ DarkThemeMode useDarkTheme = (DarkThemeMode)userSettingService.GetUserSetting<int>(UserSettingConstants.DarkThemeMode);
+ ResourceDictionary dark = new ResourceDictionary { Source = new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml") };
+ ResourceDictionary light = new ResourceDictionary { Source = new Uri("pack://application:,,,/MahApps.Metro;component/Styles/Themes/Light.Blue.xaml") };
+
+ ResourceDictionary theme = new ResourceDictionary();
+ switch (useDarkTheme)
+ {
+ case DarkThemeMode.System:
+ if (SystemInfo.IsAppsUsingDarkTheme())
+ {
+ theme.Source = new Uri("Themes/Dark.xaml", UriKind.Relative);
+ Application.Current.Resources.MergedDictionaries.Add(theme);
+ Application.Current.Resources.MergedDictionaries.Add(dark);
+ }
+ else if (!SystemParameters.HighContrast)
+ {
+ theme.Source = new Uri("Themes/Light.xaml", UriKind.Relative);
+ Application.Current.Resources.MergedDictionaries.Add(theme);
+ Application.Current.Resources.MergedDictionaries.Add(light);
+ }
+ break;
+ case DarkThemeMode.Dark:
+ theme.Source = new Uri("Themes/Dark.xaml", UriKind.Relative);
+ Application.Current.Resources.MergedDictionaries.Add(theme);
+ Application.Current.Resources.MergedDictionaries.Add(dark);
+ break;
+ case DarkThemeMode.Light:
+ if (!SystemParameters.HighContrast)
+ {
+ theme.Source = new Uri("Themes/Light.xaml", UriKind.Relative);
+ Application.Current.Resources.MergedDictionaries.Add(theme);
+ Application.Current.Resources.MergedDictionaries.Add(light);
+ }
+
+ break;
 }
 
+ Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary { Source = new Uri("Views/Styles/Styles.xaml", UriKind.Relative) });
+
 // NO-Hardware Mode
 bool noHardware = e.Args.Any(f => f.Equals("--no-hardware")) || (Portable.IsPortable() && !Portable.IsHardwareEnabled());
 
@@ -138,14 +187,14 @@
 {
 HandBrakeInstanceManager.Init(noHardware);
 }
- catch (Exception exception)
+ catch (Exception)
 {
 if (!noHardware)
 {
 MessageBox.Show(HandBrakeWPF.Properties.Resources.Startup_InitFailed, HandBrakeWPF.Properties.Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 }
 
- throw exception;
+ throw;
 }
 
 // Initialise the GUI
@@ -160,6 +209,23 @@
 }
 }
 
+ private static void CheckForUpdateCheckPermission(IUserSettingService userSettingService)
+ {
+ if (Portable.IsPortable() && !Portable.IsUpdateCheckEnabled())
+ {
+ return; // If Portable Mode has disabled it, don't bother the user. Just accept it's disabled. 
+ }
+
+ MessageBoxResult result = MessageBox.Show(HandBrakeWPF.Properties.Resources.FirstRun_EnableUpdateCheck, HandBrakeWPF.Properties.Resources.FirstRun_EnableUpdateCheckHeader, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ // Be explicit setting it to true/false as it may have been turned on during first-run.
+ userSettingService.SetUserSetting(UserSettingConstants.UpdateStatus, result == MessageBoxResult.Yes);
+ }
+
+ private void CurrentDomain_ProcessExit(object sender, System.EventArgs e)
+ {
+ HandBrakeUtils.DisposeGlobal();
+ }
+
 /// <summary>
 /// Non-UI Thread exception handler.
 /// </summary>
@@ -171,10 +237,15 @@
 /// </param>
 private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
 {
- Caliburn.Micro.Execute.OnUIThreadAsync(() => {
+ Execute.BeginOnUIThread(
+ () => 
+ {
 if (e.ExceptionObject.GetType() == typeof(FileNotFoundException))
 {
- GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.8", (Exception)e.ExceptionObject);
+ GeneralApplicationException exception = new GeneralApplicationException(
+ "A file appears to be missing.",
+ "Try re-installing Microsoft .NET 5 Desktop Runtime",
+ (Exception)e.ExceptionObject);
 this.ShowError(exception);
 }
 else
@@ -198,7 +269,7 @@
 {
 if (e.Exception.GetType() == typeof(FileNotFoundException))
 {
- GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET Framework 4.7.1", e.Exception);
+ GeneralApplicationException exception = new GeneralApplicationException("A file appears to be missing.", "Try re-installing Microsoft .NET 5 Desktop Runtime", e.Exception);
 this.ShowError(exception);
 }
 else if (e.Exception.GetType() == typeof(GeneralApplicationException))
@@ -258,7 +329,7 @@
 
 try
 {
- windowManager.ShowDialog(errorView);
+ windowManager.ShowDialogAsync(errorView);
 }
 catch (Exception)
 {
@@ -271,8 +342,7 @@
 }
 catch (Exception)
 {
- MessageBox.Show("An Unknown Error has occurred. \n\n Exception:" + exception, "Unhandled Exception",
- MessageBoxButton.OK, MessageBoxImage.Error);
+ MessageBox.Show("An Unknown Error has occurred. \n\n Exception:" + exception, "Unhandled Exception", MessageBoxButton.OK, MessageBoxImage.Error);
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/AttachedProperties/WindowHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/AttachedProperties/WindowHelper.cs Changed

@@ -12,13 +12,14 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+ using System.Text.Json;
 using System.Windows;
 
 using Caliburn.Micro;
 
- using HandBrakeWPF.Services.Interfaces;
+ using HandBrake.Interop.Utilities;
 
- using Newtonsoft.Json;
+ using HandBrakeWPF.Services.Interfaces;
 
 public class WindowHelper
 {
@@ -64,7 +65,7 @@
 string key = string.Format("{0}.Settings", this.appWindow.Name);
 WindowInformation information = new WindowInformation(this.appWindow.Name, this.appWindow.WindowState, this.appWindow.RestoreBounds);
 
- string json = JsonConvert.SerializeObject(information, Formatting.Indented);
+ string json = JsonSerializer.Serialize(information, JsonSettings.Options);
 if (!string.IsNullOrEmpty(json))
 {
 this.userSettingService.SetUserSetting(key, json);
@@ -77,7 +78,7 @@
 string json = this.userSettingService.GetUserSetting<string>(key);
 if (!string.IsNullOrEmpty(json))
 {
- WindowInformation settings = JsonConvert.DeserializeObject<WindowInformation>(json);
+ WindowInformation settings = JsonSerializer.Deserialize<WindowInformation>(json, JsonSettings.Options);
 
 if (settings.Location != Rect.Empty)
 {
@@ -101,7 +102,7 @@
 string json = this.userSettingService.GetUserSetting<string>(key);
 if (!string.IsNullOrEmpty(json))
 {
- WindowInformation settings = JsonConvert.DeserializeObject<WindowInformation>(json);
+ WindowInformation settings = JsonSerializer.Deserialize<WindowInformation>(json, JsonSettings.Options);
 this.appWindow.WindowState = settings.WindowState;
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Behaviours/DoubleClickFileBehaviours.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Commands/AddPresetCommand.cs Added

@@ -0,0 +1,38 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AddPresetCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+ using System;
+ using System.Windows.Input;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.ViewModels.Interfaces;
+
+ public class AddPresetCommand : ICommand
+ {
+#nullable enable
+ public event EventHandler? CanExecuteChanged;
+
+ public bool CanExecute(object? parameter)
+ {
+ return true;
+ }
+
+ public void Execute(object? parameter)
+ {
+ IMainViewModel viewModel = IoC.Get<IMainViewModel>();
+ viewModel.PresetAdd();
+ }
+
+ protected virtual void OnCanExecuteChanged()
+ {
+ this.CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+ }
+#nullable disable
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Commands/InputBindingTrigger.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Commands/OpenOptionsScreenCommand.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Commands/OpenPresetManagerCommand.cs Added

@@ -0,0 +1,41 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="OpenPresetManagerCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the OpenPresetManagerCommand type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Commands
+{
+ using System;
+ using System.Windows.Input;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.ViewModels.Interfaces;
+
+ public class OpenPresetManagerCommand : ICommand
+ {
+#nullable enable
+ public event EventHandler? CanExecuteChanged;
+
+ public bool CanExecute(object? parameter)
+ {
+ return true;
+ }
+
+ public void Execute(object? parameter)
+ {
+ IMainViewModel viewModel = IoC.Get<IMainViewModel>();
+ viewModel.OpenPresetWindow();
+ }
+
+ protected virtual void OnCanExecuteChanged()
+ {
+ this.CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+ }
+#nullable disable
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Commands/ProcessShortcutCommand.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Constants.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Constants.cs Changed

@@ -18,6 +18,9 @@
         public const string Appcast64 = "https://handbrake.fr/appcast.x86_64.xml";
         public const string AppcastUnstable64 = "https://handbrake.fr/appcast_unstable.x86_64.xml";
 
+        public const string Appcast64Arm = "https://handbrake.fr/appcast.arm64.xml";
+        public const string AppcastUnstable64Arm = "https://handbrake.fr/appcast_unstable.arm64.xml";
+
         /* Languages */
         public const string Any = "(Any)";
         public const string Undefined = "und";
@@ -25,15 +28,15 @@
         /* Auto-name Constants */
         public const string Chapters = "{chapters}";
         public const string Title = "{title}";
-        public const string Quality = "{quality}";
+        public const string QualityBitrate = "{quality_bitrate}";
         public const string Date = "{date}";
         public const string Time = "{time}";
-        public const string CretaionDate = "{creation-date}";
+        public const string CreationDate = "{creation-date}";
         public const string CreationTime = "{creation-time}";
-        public const string Bitrate = "{bitrate}";
         public const string Preset = "{preset}";
-        public const string Source = "{source}";
 
+        /* Auto-name Path Constants */
+        public const string Source = "{source}";
         public const string SourcePath = "{source_path}";
         public const string SourceFolderName = "{source_folder_name}";

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/AlertPanel.xaml Changed

@@ -1,59 +1,46 @@
 <UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- x:Class="HandBrakeWPF.Controls.AlertPanel"
- >
+ x:Class="HandBrakeWPF.Controls.AlertPanel">
 
 <UserControl.Resources>
 <BooleanToVisibilityConverter x:Key="boolTovisibility" />
 </UserControl.Resources>
- 
- <Grid>
+
+ <Grid >
 <Grid.RowDefinitions>
 <RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- <StackPanel Grid.Row="0" Background="Black" Opacity="0.5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
-
- <Grid VerticalAlignment="Center" Grid.Row="1" HorizontalAlignment="Stretch"
-			Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
- 
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="240" MinHeight="220">
- <Image Source="../Views/Images/information64.png" VerticalAlignment="Center" Height="64" Margin="18,10" />
-
-
- <StackPanel VerticalAlignment="Center" Orientation="Vertical" >
- <StackPanel VerticalAlignment="Center" MinWidth="300">
- <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="26" FontFamily="Segoe UI Light" Margin="0,11,0,0" HorizontalAlignment="Left"
-						 FontWeight="Bold" TextWrapping="WrapWithOverflow"
-						 Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- />
-
- <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="14" FontFamily="Segoe UI Light" Margin="0,5" HorizontalAlignment="Left"
-						 Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-						 TextWrapping="WrapWithOverflow"
- />
- </StackPanel>
- 
- <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,5"
- x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" HorizontalAlignment="Right" IsDefault="True"
- Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
+ <StackPanel Grid.Row="0" ZIndex="-1" Background="Black" Opacity="0.75" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
 
- </StackPanel>
- </StackPanel>
+ <Border VerticalAlignment="Center" Grid.Row="0" Width="600" CornerRadius="4" BorderBrush="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Background="{DynamicResource Ui.Light}" BorderThickness="1">
+ <Grid VerticalAlignment="Center" ZIndex="100" HorizontalAlignment="Stretch" Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
 
- 
- </Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
 
- <StackPanel Grid.Row="2" Background="Black" Opacity="0.5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+ <Image Source="../Views/Images/information64.png" VerticalAlignment="Top" Height="64" Margin="18,10" Grid.Row="0" Grid.Column="0" />
 
- </Grid>
+ <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Vertical" Margin="0,20,20,0">
+ <TextBlock SnapsToDevicePixels="True" FontSize="24" FontFamily="Segoe UI" TextWrapping="WrapWithOverflow" 
+ Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
 
+ <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="12" Margin="0,5" HorizontalAlignment="Left" 
+ Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextWrapping="WrapWithOverflow" />
+ </StackPanel>
+
+ <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,15,15" Grid.Row="2" Grid.Column="1"
+ x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" HorizontalAlignment="Right" IsDefault="True"
+ Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
 
+ </Grid>
+ </Border>
+ </Grid>
 </UserControl>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/DropButton/DropButton.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/DropButton/DropButton.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/NumberBox.xaml.cs Changed

@@ -49,13 +49,13 @@
 /// The maximum property.
 /// </summary>
 public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register(
- MaximumPropertyName, typeof(double), typeof(NumberBox), new UIPropertyMetadata(double.MaxValue));
+ MaximumPropertyName, typeof(double?), typeof(NumberBox), new UIPropertyMetadata(double.MaxValue));
 
 /// <summary>
 /// The minimum property.
 /// </summary>
 public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register(
- MinimumPropertyName, typeof(double), typeof(NumberBox), new UIPropertyMetadata(double.MinValue));
+ MinimumPropertyName, typeof(double?), typeof(NumberBox), new UIPropertyMetadata(double.MinValue));
 
 /// <summary>
 /// The modulus property.
@@ -67,7 +67,7 @@
 /// The number property.
 /// </summary>
 public static readonly DependencyProperty NumberProperty = DependencyProperty.Register(
- "Number", typeof(double), typeof(NumberBox), new PropertyMetadata(OnNumberChanged));
+ "Number", typeof(double?), typeof(NumberBox), new PropertyMetadata(OnNumberChanged));
 
 /// <summary>
 /// The select all threshold.
@@ -141,11 +141,11 @@
 /// <summary>
 /// Gets or sets the maximum.
 /// </summary>
- public double Maximum
+ public double? Maximum
 {
 get
 {
- return (double)this.GetValue(MaximumProperty);
+ return (double?)this.GetValue(MaximumProperty);
 }
 set
 {
@@ -156,11 +156,11 @@
 /// <summary>
 /// Gets or sets the minimum.
 /// </summary>
- public double Minimum
+ public double? Minimum
 {
 get
 {
- return (double)this.GetValue(MinimumProperty);
+ return (double?)this.GetValue(MinimumProperty);
 }
 set
 {
@@ -203,11 +203,11 @@
 /// <summary>
 /// Gets or sets the number.
 /// </summary>
- public double Number
+ public double? Number
 {
 get
 {
- return (double)this.GetValue(NumberProperty);
+ return (double?)this.GetValue(NumberProperty);
 }
 
 set
@@ -293,19 +293,31 @@
 /// </summary>
 private void DecrementNumber()
 {
+ if (!this.Number.HasValue)
+ {
+ this.Number = 0; // Default to 0
+ }
+
 double newNumber;
 if (this.AllowEmpty && this.Number == 0)
 {
- newNumber = Math.Min(this.Maximum, -this.Increment);
+ if (this.Maximum.HasValue)
+ {
+ newNumber = Math.Min(this.Maximum.Value, -this.Increment);
+ }
+ else
+ {
+ newNumber = -this.Increment;
+ }
 }
 else
 {
- newNumber = this.Number - this.Increment;
+ newNumber = this.Number.Value - this.Increment;
 }
 
- if (newNumber < this.Minimum)
+ if (this.Minimum.HasValue && newNumber < this.Minimum)
 {
- newNumber = this.Minimum;
+ newNumber = this.Minimum.Value;
 }
 
 if (newNumber != this.Number)
@@ -372,19 +384,31 @@
 /// </summary>
 private void IncrementNumber()
 {
+ if (!this.Number.HasValue)
+ {
+ this.Number = 0; // Default to 0
+ }
+
 double newNumber;
 if (this.AllowEmpty && this.Number == 0)
 {
- newNumber = Math.Max(this.Minimum, this.Increment);
+ if (this.Maximum.HasValue)
+ {
+ newNumber = Math.Max(this.Minimum.Value, this.Increment);
+ }
+ else
+ {
+ newNumber = this.Increment;
+ }
 }
 else
 {
- newNumber = this.Number + this.Increment;
+ newNumber = this.Number.Value + this.Increment;
 }
 
- if (newNumber > this.Maximum)
+ if (this.Maximum.HasValue && newNumber > this.Maximum)
 {
- newNumber = this.Maximum;
+ newNumber = this.Maximum.Value;
 }
 
 if (newNumber != this.Number)
@@ -563,13 +587,18 @@
 /// </summary>
 private void RefreshNumberBox()
 {
+ if (!this.Number.HasValue)
+ {
+ return;
+ }
+
 if (this.AllowEmpty && this.Number == 0)
 {
 this.numberBox.Text = this.hasFocus ? string.Empty : this.NoneCaption;
 }
 else
 {
- this.numberBox.Text = this.Number.ToString(CultureInfo.InvariantCulture);
+ this.numberBox.Text = this.Number.Value.ToString(CultureInfo.InvariantCulture);
 }
 
 this.RefreshNumberBoxColor();

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/PresetPaneControl.xaml Added

@@ -0,0 +1,129 @@
+<UserControl x:Class="HandBrakeWPF.Controls.PresetPaneControl"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:loc="clr-namespace:HandBrakeWPF.Services.Presets.Model"
+ xmlns:cm="http://caliburnmicro.com"
+ xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
+ mc:Ignorable="d" 
+ d:DesignHeight="700" d:DesignWidth="400">
+
+ <UserControl.Resources>
+ <converters:ThemeImageConverter x:Key="themeConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ </UserControl.Resources>
+
+ <Border CornerRadius="4" BorderBrush="{StaticResource Ui.ContrastLight}" Background="{DynamicResource Ui.Light}" BorderThickness="1">
+ <Grid Margin="5" ZIndex="1">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <Grid.Resources>
+
+ <HierarchicalDataTemplate DataType="{x:Type loc:Preset}">
+ <StackPanel Orientation="Horizontal" >
+ <StackPanel.Resources>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsDefault}" Value="True" >
+ <Setter Property="FontStyle" Value="Italic" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding IsDefault}" Value="False" >
+ <Setter Property="FontStyle" Value="Normal" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding IsPresetDisabled}" Value="True">
+ <Setter Property="Foreground" Value="{StaticResource Ui.ContrastLight}" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Resources>
+ <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
+ <TextBlock Text="{x:Static Properties:Resources.Preset_Default}" Margin="10,0,0,0" Visibility="{Binding IsDefault, Converter={StaticResource boolToVisConverter}}" />
+ <TextBlock Text="{x:Static Properties:Resources.Preset_NotAvailable}" Margin="10,0,0,0" Visibility="{Binding IsPresetDisabled, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+ </HierarchicalDataTemplate>
+
+ <HierarchicalDataTemplate DataType="{x:Type loc:PresetDisplayCategory}" ItemsSource="{Binding Presets}">
+ <StackPanel Orientation="Horizontal" >
+ <TextBlock Text="{Binding Category}" FontSize="14" />
+ </StackPanel>
+ </HierarchicalDataTemplate>
+ </Grid.Resources>
+
+ <Grid Grid.Row="1" Margin="0,0,0,4">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Button Background="Transparent" cm:Message.Attach="Event Click = Action PresetAdd" AutomationProperties.Name="Add Preset" Height="29" BorderThickness="0" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AddPreset}">
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="18" Height="18" SnapsToDevicePixels="True" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Add.png'}" />
+ <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Text="{x:Static Properties:Resources.MainView_SaveNewPreset}" />
+ </StackPanel>
+ </Button.Content>
+ </Button>
+
+ <Button Background="Transparent" cm:Message.Attach="Event Click = Action OpenPresetWindow" AutomationProperties.Name="Add Preset" Height="29" BorderThickness="0" Grid.Column="2" >
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="18" Height="18" SnapsToDevicePixels="True" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}" />
+ <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Text="{x:Static Properties:Resources.PresetManger_Title}" />
+ </StackPanel>
+ </Button.Content>
+ </Button>
+ </Grid>
+
+ <TreeView x:Name="presetListTree" HorizontalAlignment="Stretch" AutomationProperties.Name="Presets List" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Presets}"
+ VerticalAlignment="Stretch" Grid.Row="2" 
+ ItemsSource="{Binding PresetsCategories}" Width="285"
+ SelectedItemChanged="PresetListTree_OnSelectedItemChanged"
+ PreviewMouseRightButtonDown="PresetListTree_OnPreviewMouseRightButtonDown">
+
+ <TreeView.CommandBindings>
+ <CommandBinding Command="Delete" Executed="Delete_Execute" />
+ </TreeView.CommandBindings>
+
+ <TreeView.ItemContainerStyle>
+ <Style BasedOn="{StaticResource {x:Type TreeViewItem}}" TargetType="TreeViewItem">
+ <Setter Property="HorizontalAlignment" Value="Stretch" />
+ <Setter Property="Padding" Value="0,3,3,3" />
+ <Setter Property="ToolTip" Value="{Binding Description}" />
+ <Setter Property="ToolTipService.InitialShowDelay" Value="1500"/>
+ <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+ <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}" />
+ <EventSetter Event="TreeViewItem.Collapsed" Handler="PresetTreeviewItemCollapsed" />
+ <Style.Triggers>
+ <Trigger Property="HasItems" Value="True">
+ <Setter Property="Focusable" Value="false" />
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </TreeView.ItemContainerStyle>
+
+ <TreeView.ContextMenu>
+ <ContextMenu AutomationProperties.Name="Presets List Context Menu" Opened="ContextMenu_OnOpened">
+ <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cm:Message.Attach="Event Click = Action PresetSetDefault" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" x:Name="editPresetMenuItem" cm:Message.Attach="Event Click = Action PresetManage" />
+ <MenuItem Header="{x:Static Properties:Resources.PresetManagerView_Delete}" Click="Delete_OnClick" InputGestureText="Del" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cm:Message.Attach="Event Click = Action PresetImport" />
+ <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cm:Message.Attach="Event Click = Action PresetExport" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cm:Message.Attach="Event Click = Action PresetReset" />
+ <MenuItem Header="{x:Static Properties:Resources.ManagePresetView_DeleteBuiltIn}" cm:Message.Attach="Event Click = Action PresetDeleteBuildIn" />
+ </ContextMenu>
+ </TreeView.ContextMenu>
+ </TreeView>
+ </Grid>
+
+ </Border>
+</UserControl>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/PresetPaneControl.xaml.cs Added

@@ -0,0 +1,127 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetPaneControl.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Controls
+{
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Input;
+ using System.Windows.Media;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.Services.Presets.Interfaces;
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.ViewModels;
+
+ public partial class PresetPaneControl : UserControl
+ {
+ private static readonly IPresetService presetService;
+
+ static PresetPaneControl()
+ {
+ presetService = IoC.Get<IPresetService>();
+ }
+
+ public PresetPaneControl()
+ {
+ InitializeComponent();
+ }
+
+ public static readonly DependencyProperty SelectedPresetProperty = DependencyProperty.Register("SelectedPreset", typeof(Preset), typeof(PresetPaneControl), new PropertyMetadata(null, OnSelectedPresetChanged));
+
+ public Preset SelectedPreset
+ {
+ get
+ {
+ return (Preset)this.GetValue(SelectedPresetProperty);
+ }
+ set
+ {
+ this.SetValue(SelectedPresetProperty, value);
+ }
+ }
+
+ private static void OnSelectedPresetChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
+ {
+ PresetPaneControl presetPane = dependencyObject as PresetPaneControl;
+ Preset preset = e.NewValue as Preset;
+ if (presetPane != null)
+ {
+ if (preset != null)
+ {
+ presetService.SetSelected(preset);
+ }
+ }
+ }
+
+ private void PresetTreeviewItemCollapsed(object sender, RoutedEventArgs e)
+ {
+ if (e.Source.GetType() == typeof(TreeViewItem))
+ {
+ TreeViewItem item = e.Source as TreeViewItem;
+ if (item != null && item.DataContext?.GetType() == typeof(PresetDisplayCategory))
+ {
+ item.IsSelected = false;
+ }
+ }
+ }
+
+ private void PresetListTree_OnSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+ {
+ if (e.Source.GetType() == typeof(TreeView))
+ {
+ if (e.NewValue != null && e.NewValue.GetType() == typeof(Preset))
+ {
+ ((MainViewModel)this.DataContext).SelectedPreset = (Preset)e.NewValue;
+ }
+ }
+ }
+
+ private void PresetListTree_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
+
+ if (treeViewItem != null)
+ {
+ treeViewItem.Focus();
+ e.Handled = true;
+ }
+ }
+
+ private static TreeViewItem VisualUpwardSearch(DependencyObject source)
+ {
+ while (source != null && !(source is TreeViewItem))
+ source = VisualTreeHelper.GetParent(source);
+
+ return source as TreeViewItem;
+ }
+
+ private void Delete_OnClick(object sender, RoutedEventArgs e)
+ {
+ Preset preset = this.presetListTree.SelectedItem as Preset;
+ if (preset != null)
+ {
+ ((MainViewModel)this.DataContext).PresetRemove(preset);
+ }
+ }
+
+ private void Delete_Execute(object sender, ExecutedRoutedEventArgs e)
+ {
+ Preset preset = this.presetListTree.SelectedItem as Preset;
+ if (preset != null)
+ {
+ ((MainViewModel)this.DataContext).PresetRemove(preset);
+ }
+ }
+
+ private void ContextMenu_OnOpened(object sender, RoutedEventArgs e)
+ {
+ Preset preset = this.presetListTree.SelectedItem as Preset;
+ this.editPresetMenuItem.IsEnabled = preset == null || !preset.IsPresetDisabled;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml Changed

@@ -25,9 +25,9 @@
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
@@ -40,7 +40,7 @@
 
 
 <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="20,8,0,0">
- <TextBlock Text="{x:Static Properties:Resources.SourceSelection_SourceSelection}" FontSize="26" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.SourceSelection_SourceSelection}" Style="{StaticResource pageHeader}" />
 </StackPanel>
 
 
@@ -121,7 +121,7 @@
 
 
 <StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
- <Button cal:Message.Attach="Event Click = Action CloseSourceSelection" Content="Cancel" IsCancel="True" Padding="8,2" />
+ <Button cal:Message.Attach="Event Click = Action CloseSourceSelection" Content="{x:Static Properties:Resources.Generic_Cancel}" IsCancel="True" Padding="8,2" />
 </StackPanel>
 
 <StackPanel Grid.Row="9" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,10,2,10">
@@ -137,16 +137,14 @@
 <Hyperlink x:Name="AboutHandBrake" NavigateUri="/" RequestNavigate="AboutHandBrake_OnRequestNavigate"> <TextBlock Text="{x:Static Properties:Resources.SourceSelection_AboutHandBrake}" /></Hyperlink>
 </TextBlock>
 </StackPanel>
-
 </Grid>
 
-
- <Grid Grid.Column="1" Background="Black" Opacity="0.65" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+ <Grid Grid.Column="1" Background="Black" Opacity="0.75" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 <Border BorderThickness="8" CornerRadius="4" VerticalAlignment="Center" HorizontalAlignment="Center">
 <Border.BorderBrush>
 <SolidColorBrush Color="White" Opacity=".65"/>
 </Border.BorderBrush>
- <TextBlock Text="{x:Static Properties:Resources.SourceSelection_DropFileHere}" Foreground="White" Margin="100,125,100,125" FontSize="26" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.SourceSelection_DropFileHere}" TextWrapping="WrapWithOverflow" Foreground="White" Margin="100,125,100,125" FontSize="30" />
 </Border>
 </Grid>
 </Grid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/SourceSelection.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml Changed

@@ -1,6 +1,6 @@
 <UserControl xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:ctr="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
 x:Class="HandBrakeWPF.Controls.StatusPanel"
 >
 
@@ -11,56 +11,45 @@
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- <StackPanel Grid.Row="0" Background="Black" Opacity="0.5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
+ <StackPanel Grid.Row="0" Background="Black" Opacity="0.75" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
 
- <Grid VerticalAlignment="Center" Grid.Row="1" HorizontalAlignment="Stretch"
-			Background="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
- 
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
+ <Border VerticalAlignment="Center" Grid.Row="0" Width="600" CornerRadius="4" BorderBrush="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" Background="{DynamicResource Ui.Light}" BorderThickness="1">
+ <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
 
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="260" MinHeight="220">
- <ctr:Loading HorizontalAlignment="Center" VerticalAlignment="Center" Height="45" Margin="18,10" />
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
 
- <StackPanel VerticalAlignment="Center" Orientation="Vertical" >
- <StackPanel VerticalAlignment="Center" MinWidth="300">
- <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="26" FontFamily="Segoe UI Light" Margin="0,11,0,0" HorizontalAlignment="Left"
-						 FontWeight="Bold" TextWrapping="WrapWithOverflow"
-						 Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- />
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Row="0" MaxHeight="260" MinHeight="220">
+ <mah:ProgressRing Foreground="#00589f" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,45,0" x:Name="progressRing" />
+ <StackPanel VerticalAlignment="Center" Orientation="Vertical" >
+ <StackPanel VerticalAlignment="Center" MinWidth="300">
+ <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" Style="{StaticResource pageHeader}" Margin="0,11,0,0" HorizontalAlignment="Left"
+ TextWrapping="WrapWithOverflow" Text="{Binding Message, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" />
 
- <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" FontFamily="Segoe UI Light" Margin="0,5" HorizontalAlignment="Left"
-						 Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" 
-						 TextWrapping="WrapWithOverflow"
- />
- </StackPanel>
+ <TextBlock SnapsToDevicePixels="True" VerticalAlignment="Top" FontSize="16" FontFamily="Segoe UI" Margin="0,5" HorizontalAlignment="Left"
+						 Text="{Binding SubMessage, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" TextWrapping="WrapWithOverflow" />
+ </StackPanel>
 
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+ <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
 
- <Button Content="{Binding SecondaryActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,5,0"
- x:Name="SecondaryActionCtl" Click="PerformSecondaryAction" Padding="8,2" Visibility="{Binding IsActionButton2Visibile, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
+ <Button Content="{Binding SecondaryActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,5,0"
+ x:Name="SecondaryActionCtl" Click="PerformSecondaryAction" Padding="8,2" Visibility="{Binding IsActionButton2Visible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
 
- <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"
+ <Button Content="{Binding ActionText, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}" Margin="0,10,0,0"
 x:Name="StatusActionButton" Click="StatusActionButton_OnClick" Padding="8,2" IsCancel="True"
 Visibility="{Binding IsActionButtonVisible, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}, Converter={StaticResource boolTovisibility}}" />
 
- </StackPanel>
+ </StackPanel>
 
+ </StackPanel>
 </StackPanel>
- </StackPanel>
 
- 
- </Grid>
-
- <StackPanel Grid.Row="2" Background="Black" Opacity="0.5" VerticalAlignment="Stretch" HorizontalAlignment="Stretch"/>
 
+ </Grid>
+ </Border>
 </Grid>
-
-
 </UserControl>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/StatusPanel.xaml.cs Changed

@@ -10,6 +10,7 @@
 namespace HandBrakeWPF.Controls
 {
 using System;
+ using System.Runtime.CompilerServices;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -25,10 +26,21 @@
 {
 InitializeComponent();
 this.Message = "Message";
+ this.progressRing.IsActive = false;
 }
 
 public static readonly DependencyProperty IsLoadingProperty =
- DependencyProperty.Register("IsLoading", typeof(bool), typeof(StatusPanel), new UIPropertyMetadata(false));
+ DependencyProperty.Register("IsLoading", typeof(bool), typeof(StatusPanel), new UIPropertyMetadata(false, PropertyChangedCallback));
+
+ private static void PropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+ {
+ StatusPanel p = d as StatusPanel;
+ if (p != null)
+ {
+ bool isLoadingState = (bool)e.NewValue;
+ p.progressRing.IsActive = isLoadingState;
+ }
+ }
 
 public static readonly DependencyProperty MessageProperty =
 DependencyProperty.Register("Message", typeof(string), typeof(StatusPanel), new UIPropertyMetadata("Loading..."));
@@ -151,7 +163,7 @@
 /// <summary>
 /// Gets a value indicating whether is action 2 button visible.
 /// </summary>
- public bool IsActionButton2Visibile
+ public bool IsActionButton2Visible
 {
 get
 {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Controls/TimeSpanBox.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioControlVisibilityConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioControlVisibilityConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioEncoderConverter.cs Changed

@@ -17,17 +17,15 @@
 using System.Windows.Data;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Utilities;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.Utilities;
 
- using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
+ using AudioEncoder = Services.Encode.Model.Models.AudioEncoder;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
 
- /// <summary>
- /// Audio Encoder Converter
- /// </summary>
 public class AudioEncoderConverter : IMultiValueConverter
 {
 /// <summary>
@@ -46,15 +44,27 @@
 /// The culture.
 /// </param>
 /// <returns>
- /// IEnumberable AudioEncoder or String encoder name.
+ /// IEnumerable AudioEncoder or String encoder name.
 /// </returns>
 public object Convert(object values, Type targetType, object parameter, CultureInfo culture)
 {
- // TODO -> Be smarter and only show the available Passthru options.
- if (values.Count() == 2)
+ if (values.Count() >= 2)
 {
 List<AudioEncoder> encoders = EnumHelper<AudioEncoder>.GetEnumList().ToList();
- EncodeTask task = values1 as EncodeTask;
+
+ OutputFormat outputFormat = OutputFormat.Mp4;
+ if (values1.GetType() == typeof(OutputFormat))
+ {
+ outputFormat = (OutputFormat)values1;
+ }
+ else
+ {
+ EncodeTask task = values1 as EncodeTask;
+ if (task != null)
+ {
+ outputFormat = task.OutputFormat;
+ }
+ }
 
 encoders.Remove(AudioEncoder.None); // Assume we never want to show this.
 
@@ -64,7 +74,7 @@
 encoders.Remove(AudioEncoder.fdkheaac);
 }
 
- if (task != null && task.OutputFormat == OutputFormat.Mp4)
+ if (outputFormat == OutputFormat.Mp4)
 {
 encoders.Remove(AudioEncoder.Vorbis);
 encoders.Remove(AudioEncoder.ffflac);
@@ -74,7 +84,7 @@
 
 encoders.Remove(AudioEncoder.TrueHDPassthrough);
 }
- else if (task != null && task.OutputFormat == OutputFormat.WebM)
+ else if (outputFormat == OutputFormat.WebM)
 {
 encoders.RemoveAll(ae => !(ae.Equals(AudioEncoder.Vorbis) || ae.Equals(AudioEncoder.Opus)));
 }
@@ -88,6 +98,7 @@
 encoders.Remove(AudioEncoder.AacPassthru);
 encoders.Remove(AudioEncoder.Ac3Passthrough);
 encoders.Remove(AudioEncoder.Mp3Passthru);
+ encoders.Remove(AudioEncoder.Mp2Passthru);
 encoders.Remove(AudioEncoder.Passthrough);
 encoders.Remove(AudioEncoder.TrueHDPassthrough);
 encoders.Remove(AudioEncoder.FlacPassthru);
@@ -95,6 +106,22 @@
 encoders.Add(AudioEncoder.None);
 }
 
+ if (values.Length == 3)
+ {
+ encoders.Remove(AudioEncoder.Passthrough); // Auto passthru doesn't make sense on the main window. instead only show supported passthrus. 
+
+ Audio sourceTrack = values2 as Audio;
+ RemoveIfNotSupported(AudioEncoder.DtsHDPassthrough, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.DtsPassthrough, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.EAc3Passthrough, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.AacPassthru, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.Ac3Passthrough, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.Mp3Passthru, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.TrueHDPassthrough, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.FlacPassthru, sourceTrack, encoders);
+ RemoveIfNotSupported(AudioEncoder.Mp2Passthru, sourceTrack, encoders);
+ }
+
 return EnumHelper<AudioEncoder>.GetEnumDisplayValuesSubset(encoders);
 }
 
@@ -134,5 +161,19 @@
 
 return null;
 }
+
+ private void RemoveIfNotSupported(AudioEncoder encoder, Audio sourceTrack, List<AudioEncoder> encoders)
+ {
+ if (sourceTrack == null)
+ {
+ return;
+ }
+
+ HBAudioEncoder encoderInfo = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(encoder));
+ if ((sourceTrack.Codec & encoderInfo.Id) == 0)
+ {
+ encoders.Remove(encoder);
+ }
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioMixdownListConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioQueueDisplayConverter.cs Changed

@@ -11,12 +11,15 @@
 {
 using System;
 using System.Collections.ObjectModel;
+ using System.Drawing.Drawing2D;
 using System.Globalization;
 using System.Text;
 using System.Windows.Data;
 
 using HandBrake.Interop.Utilities;
 
+ using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Encode.Model.Models;
 using HandBrakeWPF.Utilities;
 
 using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
@@ -47,7 +50,15 @@
 track.ScannedTrack.TrackNumber,
 track.ScannedTrack.Language);
 
- audioTracks.Append(string.Format("{0} - {1} To {2}{3}", trackName, track.TrackName, EnumHelper<AudioEncoder>.GetDisplay(track.Encoder), Environment.NewLine)); 
+ string quality = string.Empty;
+ if (!track.IsPassthru)
+ {
+ quality = track.EncoderRateType == AudioEncoderRateType.Quality
+ ? string.Format("{0} {1}", Resources.VideoView_Quality, track.Quality)
+ : track.Bitrate + " kbps";
+ }
+
+ audioTracks.Append(string.Format("{0} - {1} To {2} {3}{4}", trackName, track.TrackName, quality, EnumHelper<AudioEncoder>.GetDisplay(track.Encoder), Environment.NewLine)); 
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Audio/AudioRateTypeForDefaultsConverter.cs Added

@@ -0,0 +1,65 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="AudioRateTypeConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The audio rate type converter.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Audio
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+ using System.Linq;
+ using System.Windows.Data;
+
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
+ using HandBrakeWPF.Services.Encode.Model.Models;
+ using HandBrakeWPF.Utilities;
+
+ using AudioEncoderRateType = Services.Encode.Model.Models.AudioEncoderRateType;
+
+ public class AudioRateTypeForDefaultsConverter : IMultiValueConverter
+ {
+ public object Convert(object values, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (values == null || values.Length != 2)
+ {
+ return null;
+ }
+
+ IList<AudioEncoderRateType> fetchRateTypes = EnumHelper<AudioEncoderRateType>.GetEnumList().ToList();
+ List<string> types = new List<string>();
+ foreach (var item in fetchRateTypes)
+ {
+ types.Add(EnumHelper<AudioEncoderRateType>.GetDisplay(item));
+ }
+
+
+ AudioEncoder audioEncoder = values0 is AudioEncoder ? (AudioEncoder)values0 : AudioEncoder.None;
+ AudioEncoder fallbackEncoder = values1 is AudioEncoder ? (AudioEncoder)values1 : AudioEncoder.None;
+ 
+ HBAudioEncoder selectedEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(audioEncoder));
+ HBAudioEncoder selectedFallbackEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(fallbackEncoder));
+
+ if (selectedEncoder != null && selectedEncoder.IsPassthrough)
+ {
+ if (selectedFallbackEncoder != null && !selectedFallbackEncoder.SupportsQuality)
+ {
+ types.Remove(EnumHelper<AudioEncoderRateType>.GetDisplay(AudioEncoderRateType.Quality));
+ }
+ }
+
+ return types;
+ }
+
+ public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+ {
+ return null;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/BooleanToHiddenVisibilityConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/BooleanToHiddenVisibilityConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/EnumComboConverter.cs Changed

@@ -13,14 +13,14 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows.Data;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Model;
 
+ using HandBrakeWPF.Model.Filters;
 using HandBrakeWPF.Model.Options;
+ using HandBrakeWPF.Model.Video;
 using HandBrakeWPF.Services.Queue.Model;
 using HandBrakeWPF.Utilities;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using VideoEncoder = Model.Video.VideoEncoder;
 
 /// <summary>
 /// Enum Combo Converter
@@ -40,11 +40,6 @@
 return EnumHelper<VideoEncoder>.GetEnumDisplayValues(typeof(VideoEncoder));
 }
 
- if (value is IEnumerable<PresetPictureSettingsMode>)
- {
- return EnumHelper<PresetPictureSettingsMode>.GetEnumDisplayValues(typeof(PresetPictureSettingsMode));
- }
-
 if (value is IEnumerable<Detelecine>)
 {
 return EnumHelper<Detelecine>.GetEnumDisplayValues(typeof(Detelecine));
@@ -101,11 +96,6 @@
 return EnumHelper<VideoEncoder>.GetDisplay((VideoEncoder)value);
 }
 
- if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))
- {
- return EnumHelper<PresetPictureSettingsMode>.GetDisplay((PresetPictureSettingsMode)value);
- }
-
 if (targetType == typeof(Detelecine) || value.GetType() == typeof(Detelecine))
 {
 return EnumHelper<Detelecine>.GetDisplay((Detelecine)value);
@@ -176,11 +166,6 @@
 return EnumHelper<VideoEncoder>.GetValue(value.ToString());
 }
 
- if (targetType == typeof(PresetPictureSettingsMode) || value.GetType() == typeof(PresetPictureSettingsMode))
- {
- return EnumHelper<PresetPictureSettingsMode>.GetValue(value.ToString());
- }
-
 if (targetType == typeof(Denoise) || value.GetType() == typeof(Denoise))
 {
 return EnumHelper<Denoise>.GetValue(value.ToString());

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/DenoisePresetConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/SharpenPresetConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Filters/SharpenTuneConverter.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Main Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Main/PointToPointConverter.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/OptionTabConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/OptionTabConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Options/OptionsTabConverter.cs Changed

@@ -3,7 +3,7 @@
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
 // <summary>
-// The Options Tab Converter. Controls which tab is dispalyed.
+// The Options Tab Converter. Controls which tab is displayed.
 // </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@
 using HandBrakeWPF.Model;
 
 /// <summary>
- /// The Options Tab Converter. Controls which tab is dispalyed.
+ /// The Options Tab Converter. Controls which tab is displayed.
 /// </summary>
 public class OptionsTabConverter : IValueConverter
 {
@@ -55,9 +55,9 @@
 case OptionsTab.Video:
 if ((OptionsTab)parameter == OptionsTab.Video) return Visibility.Visible;
 break;
- //case OptionsTab.Experimental:
- // if ((OptionsTab)parameter == OptionsTab.Experimental) return Visibility.Visible;
- // break;
+ case OptionsTab.Reset:
+ if ((OptionsTab)parameter == OptionsTab.Reset) return Visibility.Visible;
+ break;
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Options/PresetDisplayModeConverter.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Options/RightToLeftConverter.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Options/ThemeSettingConverter.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Picture Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Picture/ResolutionLimitConverter.cs Added

@@ -0,0 +1,49 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ResolutionLimitConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Picture
+{
+ using System;
+ using System.ComponentModel;
+ using System.Globalization;
+ using System.Linq;
+ using System.Windows.Data;
+
+ using HandBrakeWPF.Model.Picture;
+ using HandBrakeWPF.Utilities;
+
+ public class ResolutionLimitConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (value != null && value.GetType() == typeof(BindingList<PictureSettingsResLimitModes>))
+ {
+ return
+ new BindingList<string>(
+ EnumHelper<PictureSettingsResLimitModes>.GetEnumDisplayValues(typeof(PictureSettingsResLimitModes)).ToList());
+ }
+
+ if (value != null && value.GetType() == typeof(PictureSettingsResLimitModes))
+ {
+ return EnumHelper<PictureSettingsResLimitModes>.GetDisplay((PictureSettingsResLimitModes)value);
+ }
+
+ return null;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ string name = value as string;
+ if (!string.IsNullOrEmpty(name))
+ {
+ return EnumHelper<PictureSettingsResLimitModes>.GetValue(name);
+ }
+
+ return null;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/PresetsMenuConverter.cs Changed

@@ -16,7 +16,14 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+
+ using Caliburn.Micro;
+
 using HandBrakeWPF.Commands;
+ using HandBrakeWPF.Model.Options;
+ using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Presets;
 using HandBrakeWPF.Services.Presets.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
 
@@ -25,6 +32,13 @@
 /// </summary>
 public class PresetsMenuConverter : IValueConverter
 {
+ private readonly IUserSettingService userSettingService;
+ 
+ public PresetsMenuConverter()
+ {
+ this.userSettingService = IoC.Get<IUserSettingService>();
+ }
+
 /// <summary>Converts a value. </summary>
 /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
 /// <param name="value">The value produced by the binding source.</param>
@@ -40,73 +54,173 @@
 return null;
 }
 
- Dictionary<string, MenuItem> groupedMenu = new Dictionary<string, MenuItem>();
- foreach (IPresetObject item in presets)
+ List<object> groupedMenu = new List<object>();
+
+ // Generate the Preset Manager Item
+ if (parameter != null && "true".Equals(parameter))
 {
- PresetDisplayCategory category = item as PresetDisplayCategory;
- if (category != null)
+ MenuItem savePresetMenuItem = new MenuItem
+ {
+ Header = Resources.MainView_SaveNewPreset,
+ Tag = null,
+ Command = new AddPresetCommand()
+ };
+ groupedMenu.Add(savePresetMenuItem);
+
+ MenuItem presetManagerMenuItem = new MenuItem
+ {
+ Header = Resources.PresetManger_Title,
+ Tag = null,
+ Command = new OpenPresetManagerCommand()
+ };
+ groupedMenu.Add(presetManagerMenuItem);
+
+
+ groupedMenu.Add(new Separator());
+ }
+
+ IEnumerable<IPresetObject> presetObjects = presets.ToList();
+
+ PresetDisplayMode mode = userSettingService.GetUserSetting<PresetDisplayMode>(UserSettingConstants.PresetMenuDisplayMode);
+
+ switch (mode)
+ {
+ case PresetDisplayMode.Flat:
+ GenerateFlatList(groupedMenu, presetObjects.ToList());
+ break;
+
+ case PresetDisplayMode.Partial:
+ GenerateUserPresets(groupedMenu, presetObjects.FirstOrDefault(p => p.Category == PresetService.UserPresetCategoryName));
+ GeneratePresets(groupedMenu, presetObjects.ToList(), mode);
+ break;
+
+ case PresetDisplayMode.Category:
+ GeneratePresets(groupedMenu, presetObjects.ToList(), mode);
+ break;
+ }
+
+ return groupedMenu;
+ }
+ 
+ private void GenerateUserPresets(List<object> groupedMenu, IPresetObject userPresets)
+ {
+ PresetDisplayCategory category = userPresets as PresetDisplayCategory;
+ if (category != null)
+ {
+ if (category.Presets.Count != 0)
 {
- ProcessCategory(groupedMenu, category);
- continue;
+ groupedMenu.Add(GenerateMenuHeader(category.Category));
+ groupedMenu.Add(new Separator());
 }
 
- Preset preset = item as Preset;
- if (preset != null)
+ foreach (var preset in category.Presets.Reverse())
 {
- ProcessPreset(groupedMenu, preset);
+ groupedMenu.Add(GeneratePresetMenuItem(preset));
 }
 }
-
- return groupedMenu.Values.ToList();
 }
 
- /// <summary>Converts a value. </summary>
- /// <returns>A converted value. If the method returns null, the valid null value is used.</returns>
- /// <param name="value">The value that is produced by the binding target.</param>
- /// <param name="targetType">The type to convert to.</param>
- /// <param name="parameter">The converter parameter to use.</param>
- /// <param name="culture">The culture to use in the converter.</param>
- public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ private void GeneratePresets(List<object> groupedMenu, IList<IPresetObject> userPresets, PresetDisplayMode displayMode)
 {
- throw new NotImplementedException();
- }
+ if (!userPresets.Any(s => s.Category != PresetService.UserPresetCategoryName))
+ {
+ return;
+ }
 
- private void ProcessPreset(Dictionary<string, MenuItem> groupedMenu, Preset preset)
- {
- if (groupedMenu.ContainsKey(preset.Category))
+ if (displayMode == PresetDisplayMode.Partial)
 {
- MenuItem newMeuItem = new MenuItem { Header = preset.Name, Tag = preset, Command = new PresetMenuSelectCommand(preset) };
- if (preset.IsDefault)
+ groupedMenu.Add(GenerateMenuHeader(Resources.Main_Presets));
+ groupedMenu.Add(new Separator());
+ }
+
+ foreach (IPresetObject presetCategory in userPresets)
+ {
+ if (displayMode == PresetDisplayMode.Partial && PresetService.UserPresetCategoryName.Equals(presetCategory.Category))
 {
- newMeuItem.FontStyle = FontStyles.Italic;
- newMeuItem.FontSize = 14;
+ continue; // In Partially Flat mode, we show the user presets flat so no need to include the category. 
 }
 
- groupedMenupreset.Category.Items.Add(newMeuItem);
+ PresetDisplayCategory category = presetCategory as PresetDisplayCategory;
+ if (category != null)
+ {
+ groupedMenu.Add(GeneratePresetGroup(category));
+ }
 }
- else
+ }
+
+ private MenuItem GeneratePresetGroup(PresetDisplayCategory category)
+ {
+ MenuItem group = new MenuItem();
+ group.Header = category.Category;
+ foreach (var preset in category.Presets)
 {
- MenuItem group = new MenuItem();
- group.Header = preset.Category;
+ group.Items.Add(GeneratePresetMenuItem(preset));
+ }
+
+ return group;
+ }
 
- MenuItem newMeuItem = new MenuItem { Header = preset.Name, Tag = preset, Command = new PresetMenuSelectCommand(preset) };
- if (preset.IsDefault)
+ private void GenerateFlatList(List<object> groupedMenu, IList<IPresetObject> userPresets)
+ {
+ foreach (IPresetObject presetCategory in userPresets)
+ {
+ PresetDisplayCategory category = presetCategory as PresetDisplayCategory;
+ if (category != null)
 {
- newMeuItem.FontStyle = FontStyles.Italic;
- newMeuItem.FontSize = 14;
- }
+ groupedMenu.Add(GenerateMenuHeader(category.Category));
 
- group.Items.Add(newMeuItem);
- groupedMenupreset.Category = group;
+ if (groupedMenu.Count != 0 && groupedMenu.LastOrDefault()?.GetType() != typeof(Separator))
+ {
+ groupedMenu.Add(new Separator());
+ }
+ 
+ foreach (var preset in category.Presets)
+ {
+ groupedMenu.Add(GeneratePresetMenuItem(preset));
+ }
+ }
 }
 }
 
- private void ProcessCategory(Dictionary<string, MenuItem> groupedMenu, PresetDisplayCategory category)
+ private MenuItem GeneratePresetMenuItem(Preset preset)
 {
- foreach (Preset preset in category.Presets)
+ MenuItem newMenuItem = new MenuItem { Header = preset.Name, Tag = preset, Command = new PresetMenuSelectCommand(preset), IsEnabled = !preset.IsPresetDisabled, ToolTip = preset.Description };
+
+ if (preset.IsDefault)
+ {
+ newMenuItem.Header = string.Format("{0} {1}", preset.Name, Resources.Preset_Default);
+ newMenuItem.FontStyle = FontStyles.Italic;
+ }
+
+ if (preset.IsPresetDisabled)
 {
- this.ProcessPreset(groupedMenu, preset);
+ newMenuItem.Header = string.Format("{0} {1}", preset.Name, Resources.Preset_NotAvailable);
 }
+ 
+ return newMenuItem;
+ }
+
+ private MenuItem GenerateMenuHeader(string name)
+ {
+ MenuItem presetLabelMenuItem = new MenuItem
+ {
+ Header = name,
+ Tag = null,
+ IsEnabled = false,
+ FontSize = 12.5,
+ Margin = new Thickness(0, 2, 0, 2)
+ };
+
+ presetLabelMenuItem.FontWeight = FontWeights.Bold;
+ presetLabelMenuItem.FontStyle = FontStyles.Normal;
+ presetLabelMenuItem.Margin = new Thickness(0, 4, 0, 0);
+
+ return presetLabelMenuItem;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
 }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Queue/FilterSettingsDescConverter.cs Added

@@ -0,0 +1,85 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FilterSettingsDescConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Queue
+{
+ using System;
+ using System.Collections.Generic;
+ using System.Globalization;
+ using System.Windows.Data;
+
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Utilities;
+ using HandBrakeWPF.ViewModelItems.Filters;
+
+ public class FilterSettingsDescConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ EncodeTask task = value as EncodeTask;
+ if (task != null)
+ {
+ List<string> filters = new List<string>();
+
+ if (task.Detelecine != Detelecine.Off)
+ {
+ filters.Add(Resources.SummaryView_Detelecine);
+ }
+
+ if (task.DeinterlaceFilter != DeinterlaceFilter.Off)
+ {
+ filters.Add(EnumHelper<DeinterlaceFilter>.GetShortName(task.DeinterlaceFilter));
+ }
+
+ if (task.Denoise != Denoise.Off)
+ {
+ filters.Add(task.Denoise.ToString());
+ }
+
+ if (task.Sharpen != Sharpen.Off)
+ {
+ filters.Add(task.Sharpen.ToString());
+ }
+
+ if (task.DeblockPreset != null && task.DeblockPreset.Key != DeblockFilter.Off)
+ {
+ filters.Add(Resources.SummaryView_Deblock);
+ }
+
+ if (task.Grayscale)
+ {
+ filters.Add(Resources.SummaryView_Grayscale);
+ }
+
+ if (task.Rotation != 0 || task.FlipVideo)
+ {
+ filters.Add(Resources.SummaryView_Rotation);
+ }
+
+ if (task.Colourspace != null && task.Colourspace.Key != ColourSpaceFilter.Off)
+ {
+ filters.Add(Resources.SummaryView_Colourspace);
+ }
+
+ if (filters.Count == 0)
+ {
+ return Resources.SummaryView_NoFilters;
+ }
+ 
+ return string.Join(", ", filters).TrimEnd(',').Trim();
+ }
+
+ return Resources.SummaryView_NoFilters;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Queue/PictureSettingsDescConverter.cs Added

@@ -0,0 +1,95 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureSettingsDescConverter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PictureSettingsDescConverter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Converters.Queue
+{
+ using System;
+ using System.Globalization;
+ using System.Windows.Data;
+
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+ using HandBrakeWPF.Services.Encode.Model;
+
+ /// <summary>
+ /// The picture settings desc converter.
+ /// </summary>
+ public class PictureSettingsDescConverter : IValueConverter
+ {
+ /// <summary>
+ /// Provides a textual description of the picture settings of an encode task.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ EncodeTask task = value as EncodeTask;
+ if (task != null)
+ {
+ string resolution = string.Empty;
+ switch (task.Anamorphic)
+ {
+ case Anamorphic.Automatic:
+ resolution = "Anamorphic: Automatic";
+ break;
+ case Anamorphic.Custom:
+ resolution = "Anamorphic: Custom, Resolution: " + task.Width + "x" + task.Height;
+ break;
+ case Anamorphic.None:
+ resolution = "Resolution: " + task.Width + "x" + task.Height;
+ break;
+ }
+
+ return resolution + Environment.NewLine + "Crop Top: " + task.Cropping.Top + ", Bottom: " + task.Cropping.Bottom + ", Left: "
+ + task.Cropping.Left + ", Right: " + task.Cropping.Right;
+ }
+
+ return string.Empty;
+ }
+
+ /// <summary>
+ /// The convert back.
+ /// </summary>
+ /// <param name="value">
+ /// The value.
+ /// </param>
+ /// <param name="targetType">
+ /// The target type.
+ /// </param>
+ /// <param name="parameter">
+ /// The parameter.
+ /// </param>
+ /// <param name="culture">
+ /// The culture.
+ /// </param>
+ /// <returns>
+ /// The <see cref="object"/>.
+ /// </returns>
+ /// <exception cref="NotImplementedException">
+ /// Not Used
+ /// </exception>
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/ResourceConverterBase.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/ResourceConverterBase.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Subtitles/CanBurnSubtitleConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Subtitles/SubtitlesQueueDisplayConverter.cs Changed

@@ -12,9 +12,12 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Globalization;
+ using System.Linq;
 using System.Text;
 using System.Windows.Data;
 
+ using HandBrakeWPF.Properties;
+
 using SubtitleTrack = HandBrakeWPF.Services.Encode.Model.Models.SubtitleTrack;
 
 /// <summary>
@@ -32,7 +35,7 @@
 public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 {
 ObservableCollection<SubtitleTrack> tracks = value as ObservableCollection<SubtitleTrack>;
- StringBuilder sutitleTracks = new StringBuilder();
+ StringBuilder subtitleTracks = new StringBuilder();
 if (tracks != null)
 {
 foreach (SubtitleTrack track in tracks)
@@ -41,11 +44,31 @@
 ? track.SourceTrack.ToString()
 : (track.SrtFileName + ".srt");
 
- sutitleTracks.AppendLine(text);
+ if (!string.IsNullOrEmpty(track.SrtFileName))
+ {
+ text += string.Format(", {0}", track.SrtCharCode);
+ }
+
+ if (track.Burned)
+ {
+ text = text + string.Format(", {0}", Resources.SummaryView_Burned);
+ }
+
+ if (track.Forced)
+ {
+ text = text + string.Format(", {0}", Resources.SummaryView_Forced);
+ }
+
+ if (track.Default)
+ {
+ text = text + string.Format(", {0}", Resources.SummaryView_Default);
+ }
+ 
+ subtitleTracks.AppendLine(text);
 }
 }
 
- return string.IsNullOrEmpty(sutitleTracks.ToString()) ? "None" : sutitleTracks.ToString().Trim();
+ return string.IsNullOrEmpty(subtitleTracks.ToString()) ? "None" : subtitleTracks.ToString().Trim();
 }
 
 /// <summary>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/ThemeImageConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/ThemeImageConverter.cs Changed

@@ -12,11 +12,11 @@
 using System;
 using System.Globalization;
 using System.Linq;
- using System.Threading;
 using System.Windows.Data;
 
 using Caliburn.Micro;
 
+ using HandBrakeWPF.Model;
 using HandBrakeWPF.Services.Interfaces;
 
 public class ThemeImageConverter : IValueConverter
@@ -28,7 +28,12 @@
 public ThemeImageConverter()
 {
 this.userSettingService = IoC.Get<IUserSettingService>();
- this.isDarkTheme = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseDarkTheme);
+ DarkThemeMode mode = (DarkThemeMode)this.userSettingService.GetUserSetting<int>(UserSettingConstants.DarkThemeMode);
+
+ if (mode == DarkThemeMode.Dark || (mode == DarkThemeMode.System && Utilities.SystemInfo.IsAppsUsingDarkTheme()))
+ {
+ this.isDarkTheme = true;
+ }
 }
 
 public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -36,24 +41,21 @@
 string image = parameter as string;
 if (!string.IsNullOrEmpty(image))
 {
- 
- string direcotry = "Images/"; 
+ string directory = "pack://application:,,,/Views/Images/";
 if (image.Contains("/"))
 {
 string components = image.Split('/');
 string file = components.LastOrDefault();
- direcotry = image.Replace(file, string.Empty);
+ directory = image.Replace(file, string.Empty);
 image = file;
 }
 
 if (this.isDarkTheme)
 {
- return direcotry + "Dark/" + image;
- }
- else
- {
- return direcotry + "Light/" + image;
+ return directory + "Dark/" + image;
 }
+
+ return directory + "Light/" + image;
 }
 
 return null;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Video/EncoderOptionsTooltipConverter.cs Changed

@@ -14,9 +14,8 @@
     using System.Linq;
     using System.Windows.Data;
 
-    using HandBrake.Interop.Interop.Model.Encoding;
-
     using EncodeTask = Services.Encode.Model.EncodeTask;
+    using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
     using VideoLevel = Services.Encode.Model.Models.Video.VideoLevel;
     using VideoPreset = Services.Encode.Model.Models.Video.VideoPreset;
     using VideoProfile = Services.Encode.Model.Models.Video.VideoProfile;
@@ -49,7 +48,8 @@
             {
                 VideoTune tune = task.VideoTunes.FirstOrDefault();
 
-                return string.Format("Preset: {0}{5}Tune: {1}{5}Profile: {2}{5}Level: {3}{5}Extra Arguments: {4}{5}",
+                return string.Format(
+                    "Preset: {0}, Tune: {1}{5}Profile: {2}, Level: {3}{5}Extra Arguments: {4}{5}",
                     task.VideoPreset != null ? task.VideoPreset.ShortName : VideoPreset.None.DisplayName,
                     tune != null ? tune.ShortName : VideoTune.None.DisplayName,
                     task.VideoProfile != null ? task.VideoProfile.ShortName : VideoProfile.Auto.DisplayName,

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Video/ScalingConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs Changed

@@ -13,17 +13,17 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+ using System.Runtime.InteropServices;
 using System.Windows.Data;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model.Encoding;
 
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using VideoEncoder = Model.Video.VideoEncoder;
 
 /// <summary>
 /// Video Encoder Converter
@@ -46,7 +46,7 @@
 /// The culture.
 /// </param>
 /// <returns>
- /// IEnumberable VideoEncoder or String encoder name.
+ /// IEnumerable VideoEncoder or String encoder name.
 /// </returns>
 public object Convert(object values, Type targetType, object parameter, CultureInfo culture)
 {
@@ -90,41 +90,47 @@
 encoders.RemoveAll(ve => !(ve.Equals(VideoEncoder.VP9) || ve.Equals(VideoEncoder.VP8)));
 }
 
- if (!isQsvEnabled || !SystemInfo.IsQsvAvailableH264)
+ if (!isQsvEnabled || !HandBrakeHardwareEncoderHelper.IsQsvAvailableH264)
 {
 encoders.Remove(VideoEncoder.QuickSync);
 }
 
- if (!isQsvEnabled || !SystemInfo.IsQsvAvailableH265)
+ if (!isQsvEnabled || !HandBrakeHardwareEncoderHelper.IsQsvAvailableH265)
 {
 encoders.Remove(VideoEncoder.QuickSyncH265);
 encoders.Remove(VideoEncoder.QuickSyncH26510b);
 }
- else if (!SystemInfo.IsQsvAvailableH26510bit)
+ else if (!HandBrakeHardwareEncoderHelper.IsQsvAvailableH26510bit)
 {
 encoders.Remove(VideoEncoder.QuickSyncH26510b);
 }
 
- if (!isVceEnabled || !SystemInfo.IsVceH264Available)
+ if (!isVceEnabled || !HandBrakeHardwareEncoderHelper.IsVceH264Available)
 {
 encoders.Remove(VideoEncoder.VceH264);
 }
 
- if (!isVceEnabled || !SystemInfo.IsVceH265Available)
+ if (!isVceEnabled || !HandBrakeHardwareEncoderHelper.IsVceH265Available)
 {
 encoders.Remove(VideoEncoder.VceH265);
 }
 
- if (!isNvencEnabled || !SystemInfo.IsNVEncH264Available)
+ if (!isNvencEnabled || !HandBrakeHardwareEncoderHelper.IsNVEncH264Available)
 {
 encoders.Remove(VideoEncoder.NvencH264);
 }
 
- if (!isNvencEnabled || !SystemInfo.IsNVEncH265Available)
+ if (!isNvencEnabled || !HandBrakeHardwareEncoderHelper.IsNVEncH265Available)
 {
 encoders.Remove(VideoEncoder.NvencH265);
 }
 
+ if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64)
+ {
+ encoders.Remove(VideoEncoder.MFH264);
+ encoders.Remove(VideoEncoder.MFH265);
+ }
+
 return EnumHelper<VideoEncoder>.GetEnumDisplayValuesSubset(encoders);
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Converters/Video/VideoOptionsTooltipConverter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/EventArgs/QueueProgressEventArgs.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/EventArgs/TabStatusEventArgs.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/EventArgs/TabStatusEventArgs.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Extensions/ListExtensions.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Extensions/ListExtensions.cs Changed

@@ -11,6 +11,8 @@
 {
 using System;
 using System.Collections;
+ using System.Collections.Generic;
+ using System.Linq;
 
 public static class ListExtensions
 {
@@ -75,5 +77,54 @@
 list.Swap<T>(index, index + 1);
 }
 }
+
+ public static void MoveToTop<T>(this IList list, IList<T> items)
+ {
+ List<T> moveList = items.ToList(); // Decouple from upstream.
+
+ // Remove all the existing items
+ foreach (var item in moveList)
+ {
+ list.Remove(item);
+ }
+
+ // Insert all items in order at the top of the list.
+ int index = 0;
+ foreach (var item in moveList)
+ {
+ list.Insert(index, item);
+ index = index +1;
+ }
+ }
+
+ public static void MoveToBottom<T>(this IList list, IList<T> items)
+ {
+ List<T> moveList = items.ToList(); // Decouple from upstream.
+
+ // Remove all the existing items
+ foreach (var item in moveList)
+ {
+ list.Remove(item);
+ }
+
+ // Insert all items in order at the top of the list.
+ foreach (var item in moveList)
+ {
+ list.Add(item);
+ }
+ }
+ 
+ public static IEnumerable<T> TakeLast<T>(this IList<T> list, int n)
+ {
+ if (list.Count - n < 0)
+ {
+ n = list.Count;
+ }
+
+ for (var i = list.Count - n; i < list.Count; i++)
+ {
+ yield return listi;
+ }
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Extensions/StringExtensions.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Factories/HBConfigurationFactory.cs Changed

@@ -11,7 +11,7 @@
 {
 using Caliburn.Micro;
 
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model;
 
 using HandBrakeWPF.Services.Interfaces;
 
@@ -34,23 +34,12 @@
 public static HBConfiguration Create()
 {
 HBConfiguration config = new HBConfiguration
- {
- IsDvdNavDisabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav),
- ScalingMode = UserSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode), 
- PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount), 
- Verbosity = UserSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity), 
- MinScanDuration = UserSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration), 
- SaveLogToCopyDirectory = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory), 
- SaveLogWithVideo = UserSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo), 
- SaveLogCopyDirectory = UserSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory), 
- RemoteServiceEnabled = UserSettingService.GetUserSetting<bool>(UserSettingConstants.RemoteServiceEnabled),
- RemoteServicePort = UserSettingService.GetUserSetting<int>(UserSettingConstants.RemoteServicePort),
- EnableVceEncoder = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableVceEncoder),
- EnableNvencEncoder = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableNvencEncoder),
- EnableQsvEncoder = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncEncoding),
- EnableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncDecoding),
- UseQSVDecodeForNonQSVEnc = UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseQSVDecodeForNonQSVEnc)
- };
+ {
+ PreviewScanCount = UserSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount),
+ EnableQuickSyncDecoding = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncDecoding),
+ UseQSVDecodeForNonQSVEnc = UserSettingService.GetUserSetting<bool>(UserSettingConstants.UseQSVDecodeForNonQSVEnc),
+ EnableQsvLowPower = UserSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncLowPower)
+ };
 
 return config;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/HandBrakeWPF.csproj -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/HandBrakeWPF.csproj Changed

@@ -1,63 +1,56 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk">
 
 <PropertyGroup>
 <OutputType>WinExe</OutputType>
- <TargetFramework>net48</TargetFramework>
+ <TargetFramework>net6.0-windows10.0.17763.0</TargetFramework>
 <UseWPF>true</UseWPF>
+ <UseWindowsForms>true</UseWindowsForms>
 <PackageId>HandBrake</PackageId>
 <Authors>HandBrake Team</Authors>
 <Company>HandBrake Team</Company>
 <Product>HandBrake</Product>
- <Copyright>Copyright © 2003-2020 HandBrake Team</Copyright>
+ <Copyright>Copyright © 2003-2022 HandBrake Team</Copyright>
 <Description>HandBrake is an open-source, GPL-licensed, multiplatform,video transcoder.</Description>
 <PackageProjectUrl>https://handbrake.fr</PackageProjectUrl>
 <RepositoryUrl>https://github.com/HandBrake/HandBrake</RepositoryUrl>
 <RepositoryType>git</RepositoryType>
- <AssemblyVersion>1.4.0.0</AssemblyVersion>
- <Platforms>x64</Platforms>
- <PlatformTarget>x64</PlatformTarget>
+ <AssemblyVersion>1.5.1.0</AssemblyVersion>
+ <Platforms>AnyCPU</Platforms>
+ <PlatformTarget>AnyCPU</PlatformTarget>
 <ApplicationIcon>handbrakepineapple.ico</ApplicationIcon>
 <StartupObject />
 <AssemblyName>HandBrake</AssemblyName>
 <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
- <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
+ <LangVersion>latest</LangVersion>
 </PropertyGroup>
 
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PlatformTarget>x64</PlatformTarget>
- <OutputPath>bin\x64\Debug</OutputPath>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+ <OutputPath>bin\Debug</OutputPath>
 </PropertyGroup>
 
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <PlatformTarget>x64</PlatformTarget>
- <OutputPath>bin\x64\Release</OutputPath>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <OutputPath>bin\Release</OutputPath>
 </PropertyGroup>
 
 <ItemGroup>
 <None Remove="handbrakepineapple.ico" />
 <None Remove="Views\Images\Dark\Reorder.png" />
 <None Remove="Views\Images\Light\Reorder.png" />
+ <None Remove="Views\Images\pause_small.png" />
 </ItemGroup>
 
 <ItemGroup>
- <PackageReference Include="Caliburn.Micro" Version="3.2.0" />
- <PackageReference Include="gong-wpf-dragdrop" Version="2.2.0" />
- <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
- <PackageReference Include="Ookii.Dialogs" Version="1.0.0" />
+ <PackageReference Include="Caliburn.Micro" Version="4.0.136-rc" />
+ <PackageReference Include="gong-wpf-dragdrop" Version="2.4.3" />
+ <PackageReference Include="MahApps.Metro" Version="2.4.9" />
+ <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
+ <PackageReference Include="Ookii.Dialogs.Wpf" Version="5.0.1" />
+ <PackageReference Include="System.Management" Version="6.0.0" />
 </ItemGroup>
 
 <ItemGroup>
 <ProjectReference Include="..\HandBrake.Interop\HandBrake.Interop.csproj" />
- <ProjectReference Include="..\HandBrake.Worker\HandBrake.Worker.csproj" />
- </ItemGroup>
-
- <ItemGroup>
- <Reference Include="PresentationFramework.Aero" />
- <Reference Include="System.Management" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Windows" />
- <Reference Include="System.Windows.Forms" />
 </ItemGroup>
 
 <ItemGroup>
@@ -109,6 +102,7 @@
 <Resource Include="Views\Images\logo128.png" />
 <Resource Include="Views\Images\logo64.png" />
 <Resource Include="Views\Images\Pause.png" />
+ <Resource Include="Views\Images\pause_small.png" />
 <Resource Include="Views\Images\Play.png" />
 <Resource Include="Views\Images\Play_small.png" />
 <Resource Include="Views\Images\question.png" />
@@ -152,12 +146,33 @@
 </ItemGroup>
 
 <ItemGroup>
+ <Page Update="Themes\Controls\ContextMenuLight.xaml">
+ <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+ </Page>
 <Page Update="Themes\Controls\GroupBoxDark.xaml">
 <SubType>Designer</SubType>
 </Page>
+ <Page Update="Themes\Controls\ToolbarLight.xaml">
+ <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+ <SubType>Designer</SubType>
+ </Page>
 <Page Update="Themes\Controls\ToolbarDark.xaml">
 <SubType>Designer</SubType>
 </Page>
+ <Page Update="Themes\Light.xaml">
+ <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+ </Page>
+ <Page Update="Views\Standalone\CropPanelView.xaml">
+ <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+ </Page>
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Properties\PublishProfiles\" />
 </ItemGroup>
 
+ <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+ <Exec Command="copy ..\HandBrake.Worker\bin\$(ConfigurationName)\*.* bin\$(ConfigurationName)" />
+ </Target>
+ 
 </Project>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Helpers/AutoNameHelper.cs Changed

@@ -12,22 +12,18 @@
 using System;
 using System.IO;
 using System.Linq;
- using System.Reflection;
- using System.Runtime.CompilerServices;
 
 using Caliburn.Micro;
 
- using HandBrake.Interop.Interop.Model.Encoding;
-
- using HandBrakeWPF.Converters;
 using HandBrakeWPF.Extensions;
 using HandBrakeWPF.Model.Options;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using VideoEncodeRateType = Model.Video.VideoEncodeRateType;
 
 /// <summary>
 /// The Destination AutoName Helper
@@ -38,7 +34,7 @@
 /// Function which generates the filename and path automatically based on 
 /// the Source Name, DVD title and DVD Chapters
 /// </summary>
- public static string AutoName(EncodeTask task, string sourceOrLabelName, Preset presetName)
+ public static string AutoName(EncodeTask task, string titleName, string sourceDisplayName, Preset presetName)
 {
 IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
 if (task.Destination == null)
@@ -46,6 +42,8 @@
 task.Destination = string.Empty;
 }
 
+ string sourceOrLabelName = !string.IsNullOrEmpty(titleName) ? titleName : sourceDisplayName;
+
 if (task.Title != 0)
 {
 // Get the Source Name and remove any invalid characters and clean it per users options.
@@ -138,25 +136,21 @@
 destinationFilename = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);
 destinationFilename =
 destinationFilename
- .RegexReplace(Constants.Source, sourceName)
- .RegexReplace(Constants.Title, dvdTitle)
- .RegexReplace(Constants.Chapters, combinedChapterTag)
- .RegexReplace(Constants.Date, DateTime.Now.Date.ToShortDateString().Replace('/', '-'))
- .RegexReplace(Constants.Time, DateTime.Now.ToString("HH-mm"))
- .RegexReplace(Constants.CretaionDate, createDate)
- .RegexReplace(Constants.CreationTime, createTime);
+ .Replace(Constants.Source, sourceName)
+ .Replace(Constants.Title, dvdTitle)
+ .Replace(Constants.Chapters, combinedChapterTag)
+ .Replace(Constants.Date, DateTime.Now.Date.ToShortDateString().Replace('/', '-'))
+ .Replace(Constants.Time, DateTime.Now.ToString("HH-mm"))
+ .Replace(Constants.CreationDate, createDate)
+ .Replace(Constants.CreationTime, createTime);
 
 if (task.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)
 {
- destinationFilename = destinationFilename.Replace(Constants.Quality, task.Quality.ToString());
- destinationFilename = destinationFilename.Replace(Constants.Bitrate, string.Empty);
+ destinationFilename = destinationFilename.Replace(Constants.QualityBitrate, task.Quality.ToString());
 }
 else
 {
- destinationFilename = destinationFilename.Replace(
- Constants.Bitrate,
- task.VideoBitrate.ToString());
- destinationFilename = destinationFilename.Replace(Constants.Quality, string.Empty);
+ destinationFilename = destinationFilename.Replace(Constants.QualityBitrate, task.VideoBitrate.ToString());
 }
 }
 else
@@ -196,8 +190,7 @@
 
 private static string GetAutonamePath(IUserSettingService userSettingService, EncodeTask task, string sourceName)
 {
- string autoNamePath = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim()
- .Replace("/", "\\");
+ string autoNamePath = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Trim().Replace("/", "\\");
 
 // If enabled, use the current Destination path.
 if (!userSettingService.GetUserSetting<bool>(UserSettingConstants.AlwaysUseDefaultPath) && !string.IsNullOrEmpty(task.Destination))
@@ -210,22 +203,22 @@
 }
 
 // Handle {source_path} 
- if (autoNamePath.StartsWith("{source_path}") && !string.IsNullOrEmpty(task.Source))
+ if (autoNamePath.StartsWith(Constants.SourcePath) && !string.IsNullOrEmpty(task.Source))
 {
- string savedPath = autoNamePath.Replace("{source_path}\\", string.Empty).Replace("{source_path}", string.Empty);
+ string savedPath = autoNamePath.Replace(Constants.SourcePath + "\\", string.Empty).Replace(Constants.SourcePath, string.Empty);
 string directory = Directory.Exists(task.Source) ? task.Source : Path.GetDirectoryName(task.Source);
 autoNamePath = Path.Combine(directory, savedPath);
 }
 
 // Handle {source}
- if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source}") && !string.IsNullOrEmpty(task.Source))
+ if (autoNamePath.Contains(Constants.Source) && !string.IsNullOrEmpty(task.Source))
 {
 sourceName = Path.GetInvalidPathChars().Aggregate(sourceName, (current, character) => current.Replace(character.ToString(), string.Empty));
- autoNamePath = autoNamePath.Replace("{source}", sourceName);
+ autoNamePath = autoNamePath.Replace(Constants.Source, sourceName);
 }
 
 // Handle {source_folder_name}
- if (userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Contains("{source_folder_name}") && !string.IsNullOrEmpty(task.Source))
+ if (autoNamePath.Contains(Constants.SourceFolderName) && !string.IsNullOrEmpty(task.Source))
 {
 // Second Case: We have a Path, with "{source_folder}" in it, therefore we need to replace it with the folder name from the source.
 string path = Path.GetDirectoryName(task.Source);
@@ -234,7 +227,7 @@
 string filesArray = path.Split(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
 string sourceFolder = filesArrayfilesArray.Length - 1;
 
- autoNamePath = userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNamePath).Replace("{source_folder_name}", sourceFolder);
+ autoNamePath = autoNamePath.Replace(Constants.SourceFolderName, sourceFolder);
 }
 }
 
@@ -266,17 +259,14 @@
 
 if (behaviour != AutonameFileCollisionBehaviour.AppendNumber)
 {
- if (autoNamePath?.ToLower() == task.Source?.ToLower())
+ autoNamePath = Path.Combine(Path.GetDirectoryName(autoNamePath), prefix + filenameWithoutExt + postfix + extension);
+
+ int counter = 0;
+ while (File.Exists(autoNamePath))
 {
- autoNamePath = Path.Combine(Path.GetDirectoryName(autoNamePath), prefix + filenameWithoutExt + postfix + extension);
-
- int counter = 0;
- while (File.Exists(autoNamePath))
- {
- counter = counter + 1;
- string appendedNumber = string.Format("({0})", counter);
- autoNamePath = Path.Combine(Path.GetDirectoryName(autoNamePath), prefix + filenameWithoutExt + postfix + appendedNumber + extension);
- }
+ counter = counter + 1;
+ string appendedNumber = string.Format("({0})", counter);
+ autoNamePath = Path.Combine(Path.GetDirectoryName(autoNamePath), prefix + filenameWithoutExt + postfix + appendedNumber + extension);
 }
 }
 else
@@ -313,7 +303,7 @@
 return default(DateTime);
 }
 
- throw e;
+ throw;
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/LogManager.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Helpers/LogManager.cs Changed

@@ -13,21 +13,50 @@
 
 using Caliburn.Micro;
 
- using HandBrake.Worker.Logging.Models;
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
 
- using HandBrakeWPF.Services.Logging.Model;
+ using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using ILog = Services.Logging.Interfaces.ILog;
 
 public static class LogManager
 {
+ private static ILog generalAppLogger;
+
 public static void Init()
 {
- ILog log = IoC.Get<ILog>();
+ generalAppLogger = IoC.Get<ILog>();
 string logDir = DirectoryUtilities.GetLogDirectory();
- string logFile = Path.Combine(logDir, string.Format("activity_log{0}.txt", GeneralUtilities.ProcessId));
- log.ConfigureLogging(new LogHandlerConfig(true, logFile, true, GeneralUtilities.CreateLogHeader().ToString()));
+ string filename = string.Format("activity_log_main.{0}.txt", GeneralUtilities.ProcessId);
+ string logFile = Path.Combine(logDir, filename);
+ generalAppLogger.ConfigureLogging(filename, logFile);
+
+ IoC.Get<ILogInstanceManager>().Register(filename, generalAppLogger, true);
+ 
+ HandBrakeUtils.MessageLogged += HandBrakeUtils_MessageLogged;
+ HandBrakeUtils.ErrorLogged += HandBrakeUtils_ErrorLogged;
+ }
+
+ private static void HandBrakeUtils_ErrorLogged(object sender, MessageLoggedEventArgs e)
+ {
+ if (e == null || string.IsNullOrEmpty(e.Message))
+ {
+ return;
+ }
+
+ generalAppLogger?.LogMessage(e.Message);
+ }
+
+ private static void HandBrakeUtils_MessageLogged(object sender, MessageLoggedEventArgs e)
+ {
+ if (e == null || string.IsNullOrEmpty(e.Message))
+ {
+ return;
+ }
+
+ generalAppLogger?.LogMessage(e.Message);
 }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Helpers/QueueRecoveryHelper.cs Changed

@@ -14,18 +14,18 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+ using System.Text.Json;
 using System.Text.RegularExpressions;
 using System.Windows;
 
+ using HandBrake.Interop.Interop;
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Queue.Model;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
-
- using IQueueService = HandBrakeWPF.Services.Queue.Interfaces.IQueueService;
+ using IQueueService = Services.Queue.Interfaces.IQueueService;
 
 public class QueueRecoveryHelper
 {
@@ -50,7 +50,7 @@
 RecoverFromBackupFailure();
 
 // Now check for all available recovery files. (There may be more than 1 for multi-instance support)
- string tempPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string tempPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DirectoryInfo info = new DirectoryInfo(tempPath);
 IEnumerable<FileInfo> foundFiles = info.GetFiles("*.json").Where(f => f.Name.StartsWith(QueueFileName));
 var queueFiles = GetFilesExcludingActiveProcesses(foundFiles, filterQueueFiles);
@@ -63,14 +63,13 @@
 List<string> removeFiles = new List<string>();
 List<string> acceptedFiles = new List<string>();
 
-
 foreach (string file in queueFiles)
 {
 try
 {
 using (StreamReader stream = new StreamReader(file))
 {
- List<QueueTask> list = list = JsonConvert.DeserializeObject<List<QueueTask>>(stream.ReadToEnd());
+ List<QueueTask> list = list = JsonSerializer.Deserialize<List<QueueTask>>(stream.ReadToEnd(), JsonSettings.Options);
 if (list != null && list.Count == 0)
 {
 removeFiles.Add(file);
@@ -127,7 +126,7 @@
 /// </returns>
 public static bool RecoverQueue(IQueueService encodeQueue, IErrorService errorService, bool silentRecovery, List<string> queueFilter)
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 List<string> queueFiles = CheckQueueRecovery(queueFilter);
 MessageBoxResult result = MessageBoxResult.None;
 if (!silentRecovery)
@@ -178,7 +177,7 @@
 
 public static bool ArchivesExist()
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DirectoryInfo info = new DirectoryInfo(appDataPath);
 IEnumerable<FileInfo> foundFiles = info.GetFiles("*.archive").Where(f => f.Name.StartsWith(QueueFileName));
 
@@ -187,7 +186,7 @@
 
 private static void RecoverFromBackupFailure()
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DirectoryInfo info = new DirectoryInfo(appDataPath);
 IEnumerable<FileInfo> foundFiles = info.GetFiles("*.last");
 
@@ -207,7 +206,7 @@
 {
 List<string> queueFiles = new List<string>();
 
- // Remove any files where we have an active instnace.
+ // Remove any files where we have an active instance.
 foreach (FileInfo file in foundFiles)
 {
 string fileProcessId = file.Name.Replace(QueueFileName, string.Empty).Replace(".json", string.Empty);
@@ -236,7 +235,7 @@
 
 private static void CleanupFiles(List<string> removeFiles, bool archive)
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 
 // Cleanup old/unused queue files for now.
 foreach (string file in removeFiles)
@@ -272,7 +271,7 @@
 /// </summary>
 private static void TidyArchiveFiles()
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DirectoryInfo info = new DirectoryInfo(appDataPath);
 IEnumerable<FileInfo> foundFiles = info.GetFiles("*.archive").Where(f => f.Name.StartsWith(QueueFileName));
 
@@ -290,7 +289,7 @@
 
 public static void ResetArchives()
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DirectoryInfo info = new DirectoryInfo(appDataPath);
 IEnumerable<FileInfo> foundFiles = info.GetFiles("*.archive").Where(f => f.Name.StartsWith(QueueFileName));
 foreach (FileInfo file in foundFiles)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Helpers/VideoEncoderHelpers.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Installer/Installer64.nsi -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Installer/Installer64.nsi Changed

@@ -5,15 +5,12 @@
  	   It may be used under the terms of the GNU General Public License. */
 
 !define PRODUCT_NAME "HandBrake"
-!define PRODUCT_VERSION "1.4.0"
-!define PRODUCT_VERSION_NUMBER "1.4.0"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"
+!define PRODUCT_VERSION "1.5.1"
+!define PRODUCT_VERSION_NUMBER "1.5.1"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\HandBrake.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
-;Required .NET framework for 4.7.1
-!define MIN_FRAMEWORK_VER 461308
-
 SetCompressor lzma
 ManifestDPIAware true
 
@@ -21,10 +18,6 @@
 !include "MUI.nsh"
 !include WinVer.nsh
 
-; Required for Github Actions (or local builds were inetc is not part of the installed NSIS)
-; Extract inetc.zip to the HandBrake root directory into a folder called plugins.
-!addplugindir /x86-ansi "..\..\..\..\..\..\plugins\Plugins\x86-ansi"
-
 ; MUI Settings
 !define MUI_ABORTWARNING
 !define MUI_ICON "HandBrakepineapple.ico"
@@ -34,6 +27,10 @@
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."
 
 !define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"
+!define MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of HandBrake.$\r$\n$\r$\nIt is recommended you close any running instances of HandBrake before running setup.$\r$\n$\r$\nWARNING: Before updating, please make sure that there are no pending encodes in the Queue. Please make sure you have backed up any presets and made a note of your settings.$\r$\n$\r$\nHandBrake requires Microsoft .NET *Desktop* Runtime 6. If this is not installed, you will be prompted to install it when you first run the app."
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Create desktop shortcut (all users)"
+!define MUI_FINISHPAGE_RUN_FUNCTION "desktopShortcut"
 
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
@@ -56,7 +53,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-x86_64-Win_GUI.exe"
 
 !include WordFunc.nsh
 !insertmacro VersionCompare
@@ -68,8 +65,6 @@
 ShowInstDetails show
 ShowUnInstDetails show
 
-Var InstallDotNET
-
 Function .onInit
 
   ; For Silent Installs, Assume All Users
@@ -84,14 +79,14 @@
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
   Abort
 
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
-  ${IfNot} ${AtLeastWin7}
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
+  ; Detect if the installer is running on an unsupported version of windows.
+  ${IfNot} ${AtLeastBuild} 10240
+    MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
     Quit
   ${EndIf}
 
   ${IfNot} ${RunningX64}
-    MessageBox MB_OK "HandBrake requires a 64bit version of Windows 7 SP1 or later to install. Your system has a 32bit version of Windows."
+    MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
     Quit
   ${EndIf}
 
@@ -117,83 +112,25 @@
   done:
 FunctionEnd
 
-Section "HandBrake" SEC01
+Section "HandBrake" SectionApp
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
+  SectionIn RO ; Read only, always installed
 
-  ; Begin Check .NET version
-  StrCpy $InstallDotNET "No"
-  Call CheckFramework
-     StrCmp $0 "1" +3
-        StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.8 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
-     Pop $0
-
-  ; Get .NET if required
-  ${If} $InstallDotNET == "Yes"
-     SetDetailsView hide
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end
-     Pop $1
-
-     ${If} $1 != "OK"
-           Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework"
-     ${EndIf}
-
-     ExecWait "$INSTDIR\dotnetfx.exe"
-     Delete "$INSTDIR\dotnetfx.exe"
-
-     SetDetailsView show
-  ${EndIf}
-  
   ; Install Files
-  File "HandBrake.exe"
-  CreateDirectory "$SMPROGRAMS\HandBrake"
-  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
-  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
+  File "*.exe"
   File "*.dll"
   File "*.template"
-  File "*.config"
-  File "*.pdb"
-
- ; Copy the languages
-  SetOutPath "$INSTDIR\de"
-  SetOverwrite ifnewer
-  File "de\*.*"
-
-  SetOutPath "$INSTDIR\zh"
-  SetOverwrite ifnewer
-  File "zh\*.*"
-
-  SetOutPath "$INSTDIR\es"
-  SetOverwrite ifnewer
-  File "es\*.*"
-
-  SetOutPath "$INSTDIR\fr"
-  SetOverwrite ifnewer
-  File "fr\*.*"
-
-  SetOutPath "$INSTDIR\ko"
-  SetOverwrite ifnewer
-  File "ko\*.*"
-
-  SetOutPath "$INSTDIR\ru"
-  SetOverwrite ifnewer
-  File "ru\*.*"
-
-  SetOutPath "$INSTDIR\tr"
-  SetOverwrite ifnewer
-  File "tr\*.*"
-
-  SetOutPath "$INSTDIR\ja"
-  SetOverwrite ifnewer
-  File "ja\*.*"
 
   ; Copy the standard doc set into the doc folder
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
   
+  ; Start Menu Shortcut for All users.   
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\HandBrake"
+  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
 SectionEnd
 
 Section -AdditionalIcons
@@ -209,7 +146,6 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
 SectionEnd
 
-
 Function un.onUninstSuccess
   HideWindow
   MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
@@ -231,22 +167,6 @@
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   RMDir  "$INSTDIR\doc"
-  Delete "$INSTDIR\de\*.*"
-  RMDir  "$INSTDIR\de"
-  Delete "$INSTDIR\zh\*.*"
-  RMDir  "$INSTDIR\zh"
-  Delete "$INSTDIR\es\*.*"
-  RMDir  "$INSTDIR\es"
-  Delete "$INSTDIR\fr\*.*"
-  RMDir  "$INSTDIR\fr"
-  Delete "$INSTDIR\ko\*.*"
-  RMDir  "$INSTDIR\ko"
-  Delete "$INSTDIR\ru\*.*"
-  RMDir  "$INSTDIR\ru"
-  Delete "$INSTDIR\tr\*.*"
-  RMDir  "$INSTDIR\tr"
-  Delete "$INSTDIR\ja\*.*"
-  RMDir  "$INSTDIR\ja"
 
   RMDir  "$INSTDIR"
 
@@ -258,22 +178,17 @@
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
+  Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"
+  RMDir  "$SMPROGRAMS\HandBrake Nightly"
+  Delete "$DESKTOP\HandBrake Nightly.lnk"
+  
   SetAutoClose true
 SectionEnd
 
-;Check for .NET framework
-Function CheckFrameWork
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx
-    ClearErrors
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"
-
-    IfErrors NotDetected
-
-    ${If} $0 >= MIN_FRAMEWORK_VER
-        StrCpy $0 "1"
-    ${Else}
-		NotDetected:
-		  StrCpy $0 "2"
-    ${EndIf}
-
+Function "desktopShortcut"
+    SetShellVarContext all
+    CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"
 FunctionEnd

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi Changed

@@ -11,16 +11,9 @@
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
-;Required .NET framework for 4.7.1
-!define MIN_FRAMEWORK_VER 461308  
-
 SetCompressor lzma
 ManifestDPIAware true
 
-; Required for Github Actions (or local builds were inetc is not part of the installed NSIS)
-; Extract inetc.zip to the HandBrake root directory into a folder called plugins.
-!addplugindir /x86-ansi "..\..\..\..\..\..\plugins\Plugins\x86-ansi"
-
 ; MUI 1.67 compatible ------
 !include "MUI.nsh"
 !include WinVer.nsh
@@ -34,6 +27,10 @@
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."
 
 !define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"
+!define MUI_TEXT_WELCOME_INFO_TEXT "Setup will guide you through the installation of HandBrake.$\r$\n$\r$\nIt is recommended you close any running instances of HandBrake before running setup.$\r$\n$\r$\nWARNING: Before updating, please make sure that there are no pending encodes in the Queue. Please make sure you have backed up any presets and made a note of your settings.$\r$\n$\r$\nHandBrake requires Microsoft .NET *Desktop* Runtime 6. If this is not installed, you will be prompted to install it when you first run the app."
+!define MUI_FINISHPAGE_RUN
+!define MUI_FINISHPAGE_RUN_TEXT "Create desktop shortcut (all users)"
+!define MUI_FINISHPAGE_RUN_FUNCTION "desktopShortcut"
 
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
@@ -56,7 +53,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME}"
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_x86_64-Win_GUI.exe"
+OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-x86_64-Win_GUI.exe"
 
 !include WordFunc.nsh
 !insertmacro VersionCompare
@@ -68,8 +65,6 @@
 ShowInstDetails show
 ShowUnInstDetails show
 
-Var InstallDotNET
-
 Function .onInit
 
   IfSilent 0 +2
@@ -83,14 +78,14 @@
   MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
   Abort
 
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.
-  ${IfNot} ${AtLeastWin7}
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."
+  ; Detect if the installer is running on an unsupported version of windows.
+  ${IfNot} ${AtLeastBuild} 10240
+    MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
     Quit
   ${EndIf}
 
   ${IfNot} ${RunningX64}
-    MessageBox MB_OK "HandBrake requires a 64bit version of Windows 7 SP1 or later to install. Your system has a 32bit version of Windows."
+    MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
     Quit
   ${EndIf}
 
@@ -116,82 +111,25 @@
   done:
 FunctionEnd
 
-Section "HandBrake" SEC01
+Section "HandBrake" SectionApp
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
-
-  ; Begin Check .NET version
-  StrCpy $InstallDotNET "No"
-  Call CheckFramework
-     StrCmp $0 "1" +3
-        StrCpy $InstallDotNET "Yes"
-      MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.8 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK
-     Pop $0
-
-  ; Get .NET if required
-  ${If} $InstallDotNET == "Yes"
-     SetDetailsView hide
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end
-     Pop $1
-
-     ${If} $1 != "OK"
-           Delete "$INSTDIR\dotnetfx.exe"
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework"
-     ${EndIf}
-
-     ExecWait "$INSTDIR\dotnetfx.exe"
-     Delete "$INSTDIR\dotnetfx.exe"
-
-     SetDetailsView show
-  ${EndIf}
+  SectionIn RO ; Read only, always installed
   
   ; Install Files
   File "*.exe"
-  CreateDirectory "$SMPROGRAMS\HandBrake Nightly"
-  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
-  CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
   File "*.dll"
   File "*.template"
-  File "*.config"
-  File "HandBrake*.pdb"
-
- ; Copy the languages
-  SetOutPath "$INSTDIR\de"
-  SetOverwrite ifnewer
-  File "de\*.*"
-
-  SetOutPath "$INSTDIR\zh"
-  SetOverwrite ifnewer
-  File "zh\*.*"
-
-  SetOutPath "$INSTDIR\es"
-  SetOverwrite ifnewer
-  File "es\*.*"
-
-  SetOutPath "$INSTDIR\fr"
-  SetOverwrite ifnewer
-  File "fr\*.*"
-
-  SetOutPath "$INSTDIR\ko"
-  SetOverwrite ifnewer
-  File "ko\*.*"
-
-  SetOutPath "$INSTDIR\ru"
-  SetOverwrite ifnewer
-  File "ru\*.*"
-
-  SetOutPath "$INSTDIR\tr"
-  SetOverwrite ifnewer
-  File "tr\*.*"
-
-  SetOutPath "$INSTDIR\ja"
-  SetOverwrite ifnewer
-  File "ja\*.*"
 
   ; Copy the standard doc set into the doc folder
   SetOutPath "$INSTDIR\doc"
   SetOverwrite ifnewer
   File "doc\*.*"
+  
+  ; Start Menu Shortcut for All users.   
+  SetShellVarContext all
+  CreateDirectory "$SMPROGRAMS\HandBrake Nightly"
+  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
 SectionEnd
 
 Section -AdditionalIcons
@@ -207,7 +145,6 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
 SectionEnd
 
-
 Function un.onUninstSuccess
   HideWindow
   MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK
@@ -227,22 +164,6 @@
   Delete "$INSTDIR\*.*"
   Delete "$INSTDIR\doc\*.*"
   RMDir  "$INSTDIR\doc"
-  Delete "$INSTDIR\de\*.*"
-  RMDir  "$INSTDIR\de"
-  Delete "$INSTDIR\zh\*.*"
-  RMDir  "$INSTDIR\zh"
-  Delete "$INSTDIR\es\*.*"
-  RMDir  "$INSTDIR\es"
-  Delete "$INSTDIR\fr\*.*"
-  RMDir  "$INSTDIR\fr"
-  Delete "$INSTDIR\ko\*.*"
-  RMDir  "$INSTDIR\ko"
-  Delete "$INSTDIR\ru\*.*"
-  RMDir  "$INSTDIR\ru"
-  Delete "$INSTDIR\tr\*.*"
-  RMDir  "$INSTDIR\tr"
-  Delete "$INSTDIR\ja\*.*"
-  RMDir  "$INSTDIR\ja"
 
   RMDir  "$INSTDIR"
    
@@ -253,22 +174,19 @@
 
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+  
+  SetShellVarContext all
+  Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"
+  Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"
+  RMDir  "$SMPROGRAMS\HandBrake Nightly"
+  Delete "$DESKTOP\HandBrake Nightly.lnk"
+  
   SetAutoClose true
 SectionEnd
 
-;Check for .NET framework
-Function CheckFrameWork
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx
-    ClearErrors
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"
-
-    IfErrors NotDetected
+Function "desktopShortcut"
+    SetShellVarContext all
+    CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"
+FunctionEnd
 
-    ${If} $0 >= MIN_FRAMEWORK_VER
-        StrCpy $0 "1"
-    ${Else}
-		NotDetected:
-		  StrCpy $0 "2"
-    ${EndIf}
 
-FunctionEnd

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Instance/HandBrakeInstanceManager.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Instance/HandBrakeInstanceManager.cs Changed

@@ -10,13 +10,14 @@
 namespace HandBrakeWPF.Instance
 {
 using System;
- using System.Runtime.CompilerServices;
 
 using HandBrake.Interop.Interop;
 using HandBrake.Interop.Interop.Interfaces;
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model;
 
- using HandBrakeWPF.Factories;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.Interfaces;
+ using HandBrakeWPF.Utilities;
 
 /// <summary>
 /// The HandBrake Instance manager.
@@ -24,11 +25,12 @@
 /// </summary>
 public static class HandBrakeInstanceManager
 {
+ private static readonly object ProcessingLock = new object();
 private static IEncodeInstance encodeInstance;
 private static HandBrakeInstance scanInstance;
 private static HandBrakeInstance previewInstance;
 private static bool noHardware;
-
+ 
 public static void Init(bool noHardwareMode)
 {
 noHardware = noHardwareMode;
@@ -36,49 +38,39 @@
 HandBrakeUtils.EnsureGlobalInit(noHardwareMode);
 }
 
- /// <summary>
- /// The get encode instance.
- /// </summary>
- /// <param name="verbosity">
- /// The verbosity.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- /// <returns>
- /// The <see cref="IHandBrakeInstance"/>.
- /// </returns>
- public static IEncodeInstance GetEncodeInstance(int verbosity, HBConfiguration configuration)
+ public static IEncodeInstance GetEncodeInstance(int verbosity, HBConfiguration configuration, ILog logService, IUserSettingService userSettingService, IPortService portService)
 {
- if (!HandBrakeUtils.IsInitialised())
- {
- throw new Exception("Please call Init before Using!");
- }
-
- if (encodeInstance != null)
- {
- encodeInstance.Dispose();
- encodeInstance = null;
- }
-
- IEncodeInstance newInstance;
-
- if (configuration.RemoteServiceEnabled)
- {
- newInstance = new RemoteInstance(configuration.RemoteServicePort);
- }
- else
+ lock (ProcessingLock)
 {
- newInstance = new HandBrakeInstance();
+ if (!HandBrakeUtils.IsInitialised())
+ {
+ throw new Exception("Please call Init before Using!");
+ }
+
+ IEncodeInstance newInstance;
+
+ if (userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled)
+ && Portable.IsProcessIsolationEnabled())
+ {
+ newInstance = new RemoteInstance(logService, userSettingService, portService);
+ }
+ else
+ {
+ if (encodeInstance != null && !encodeInstance.IsRemoteInstance)
+ {
+ encodeInstance.Dispose();
+ encodeInstance = null;
+ }
+
+ newInstance = new HandBrakeInstance();
+ HandBrakeUtils.SetDvdNav(
+ !userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav));
+ encodeInstance = newInstance;
+ }
+
+ newInstance.Initialize(verbosity, noHardware);
+ return newInstance;
 }
-
- newInstance.Initialize(verbosity, noHardware);
-
- encodeInstance = newInstance;
-
- HandBrakeUtils.SetDvdNav(!configuration.IsDvdNavDisabled);
-
- return encodeInstance;
 }
 
 /// <summary>
@@ -87,13 +79,10 @@
 /// <param name="verbosity">
 /// The verbosity.
 /// </param>
- /// <param name="configuration">
- /// HandBrakes config
- /// </param>
 /// <returns>
 /// The <see cref="IHandBrakeInstance"/>.
 /// </returns>
- public static IHandBrakeInstance GetScanInstance(int verbosity, HBConfiguration configuration)
+ public static IHandBrakeInstance GetScanInstance(int verbosity)
 {
 if (!HandBrakeUtils.IsInitialised())
 {
@@ -119,13 +108,13 @@
 /// <param name="verbosity">
 /// The verbosity.
 /// </param>
- /// <param name="configuration">
- /// The configuration.
+ /// <param name="userSettingService">
+ /// The user Setting Service.
 /// </param>
 /// <returns>
 /// The <see cref="IHandBrakeInstance"/>.
 /// </returns>
- public static IHandBrakeInstance GetPreviewInstance(int verbosity, HBConfiguration configuration)
+ public static IHandBrakeInstance GetPreviewInstance(int verbosity, IUserSettingService userSettingService)
 {
 if (!HandBrakeUtils.IsInitialised())
 {
@@ -142,7 +131,7 @@
 newInstance.Initialize(verbosity, noHardware);
 previewInstance = newInstance;
 
- HandBrakeUtils.SetDvdNav(!configuration.IsDvdNavDisabled);
+ HandBrakeUtils.SetDvdNav(!userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav));
 
 return previewInstance;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Instance/RemoteInstance.cs Changed

@@ -11,78 +11,93 @@
 namespace HandBrakeWPF.Instance
 {
 using System;
- using System.Collections.Generic;
+ using System.ComponentModel;
 using System.Diagnostics;
- using System.Linq;
- using System.Net.Http;
- using System.Net.Http.Headers;
- using System.Runtime.CompilerServices;
+ using System.IO;
 using System.Text;
+ using System.Text.Json;
+ using System.Threading;
 using System.Threading.Tasks;
- using System.Timers;
 
- using HandBrake.Interop.Interop.EventArgs;
 using HandBrake.Interop.Interop.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
 using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.State;
+ using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Instance.Model;
+ using HandBrakeWPF.Model.Options;
+ using HandBrakeWPF.Model.Worker;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
-
- /*
- * TODO:
- * - Handle Worker Shutdown.
- * - Worker Registration Process
- * - Port in Use Handling
- * - Setting Configuration (libdvdnav)
- * - Setting No Hardware mode
- */
+ using Timer = System.Timers.Timer;
 
 public class RemoteInstance : HttpRequestBase, IEncodeInstance, IDisposable
 {
- private const double EncodePollIntervalMs = 1000;
+ private readonly ILog logService;
+ private readonly IUserSettingService userSettingService;
+ private readonly IPortService portService;
+
+ private const double EncodePollIntervalMs = 500;
 
 private Process workerProcess;
 private Timer encodePollTimer;
+ private int retryCount;
+ private bool encodeCompleteFired;
+ private bool serverStarted;
 
- public RemoteInstance(int port)
+ public RemoteInstance(ILog logService, IUserSettingService userSettingService, IPortService portService)
 {
- this.port = port;
- this.serverUrl = string.Format("http://127.0.0.1:{0}/", this.port);
+ this.logService = logService;
+ this.userSettingService = userSettingService;
+ this.portService = portService;
 }
 
 public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
 
 public event EventHandler<EncodeProgressEventArgs> EncodeProgress;
 
+ public bool IsRemoteInstance => true;
+
 public async void PauseEncode()
 {
- await this.MakeHttpGetRequest("PauseEncode");
- this.StopPollingProgress();
+ if (this.IsServerRunning())
+ {
+ await this.MakeHttpGetRequest("PauseEncode");
+ this.StopPollingProgress();
+ }
 }
 
 public async void ResumeEncode()
 {
- await this.MakeHttpGetRequest("ResumeEncode");
- this.MonitorEncodeProgress();
+ if (this.IsServerRunning())
+ {
+ await this.MakeHttpGetRequest("ResumeEncode");
+ this.MonitorEncodeProgress();
+ }
 }
 
- public async void StartEncode(JsonEncodeObject jobToStart)
+ public void StartEncode(JsonEncodeObject jobToStart)
 {
- JsonSerializerSettings settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
- string job = JsonConvert.SerializeObject(jobToStart, Formatting.None, settings);
-
- await this.MakeHttpJsonPostRequest("StartEncode", job);
-
- this.MonitorEncodeProgress();
+ if (this.IsServerRunning())
+ {
+ Thread thread1 = new Thread(() => RunEncodeInitProcess(jobToStart));
+ thread1.Start();
+ }
+ else
+ {
+ this.EncodeCompleted?.Invoke(sender: this, e: new EncodeCompletedEventArgs(-10));
+ }
 }
 
 public async void StopEncode()
 {
- await this.MakeHttpGetRequest("StopEncode");
- this.StopPollingProgress();
+ if (this.IsServerRunning())
+ {
+ await this.MakeHttpGetRequest("StopEncode");
+ }
 }
 
 public JsonState GetEncodeProgress()
@@ -97,38 +112,81 @@
 
 string statusJson = response.Result?.JsonResponse;
 
- JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+ JsonState state = JsonSerializer.Deserialize<JsonState>(statusJson, JsonSettings.Options);
 return state;
 }
 
 public void Initialize(int verbosityLvl, bool noHardwareMode)
 {
- this.StartServer(verbosityLvl, noHardwareMode);
+ try
+ {
+ if (this.workerProcess == null || this.workerProcess.HasExited)
+ {
+ var plainTextBytes = Encoding.UTF8.GetBytes(Guid.NewGuid().ToString());
+ this.base64Token = Convert.ToBase64String(plainTextBytes);
+ this.port = this.portService.GetOpenPort(userSettingService.GetUserSetting<int>(UserSettingConstants.ProcessIsolationPort));
+ this.serverUrl = string.Format("http://127.0.0.1:{0}/", this.port);
+
+ workerProcess = new Process
+ {
+ StartInfo =
+ {
+ FileName = "HandBrake.Worker.exe",
+ Arguments =
+ string.Format(" --port={0} --token={1}", port, this.base64Token),
+ UseShellExecute = false,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true,
+ CreateNoWindow = true
+ }
+ };
+ workerProcess.Exited += this.WorkerProcess_Exited;
+ workerProcess.OutputDataReceived += this.WorkerProcess_OutputDataReceived;
+ workerProcess.ErrorDataReceived += this.WorkerProcess_OutputDataReceived;
+
+ workerProcess.Start();
+ workerProcess.BeginOutputReadLine();
+ workerProcess.BeginErrorReadLine();
+
+ // Set Process Priority
+ switch ((ProcessPriority)this.userSettingService.GetUserSetting<int>(UserSettingConstants.ProcessPriorityInt))
+ {
+ case ProcessPriority.High:
+ workerProcess.PriorityClass = ProcessPriorityClass.High;
+ break;
+ case ProcessPriority.AboveNormal:
+ workerProcess.PriorityClass = ProcessPriorityClass.AboveNormal;
+ break;
+ case ProcessPriority.Normal:
+ workerProcess.PriorityClass = ProcessPriorityClass.Normal;
+ break;
+ case ProcessPriority.Low:
+ workerProcess.PriorityClass = ProcessPriorityClass.Idle;
+ break;
+ default:
+ workerProcess.PriorityClass = ProcessPriorityClass.BelowNormal;
+ break;
+ }
+
+ int maxAllowed = userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+ this.ServiceLogMessage(string.Format("Remote Process started with Process ID: {0} using port: {1}. Max Allowed Instances: {2}", this.workerProcess.Id, port, maxAllowed));
+ }
+ }
+ catch (Exception e)
+ {
+ this.ServiceLogMessage("Unable to start worker process.");
+ this.ServiceLogMessage(e.ToString());
+ }
 }
 
 public void Dispose()
 {
- this.client?.Dispose();
 this.workerProcess?.Dispose();
- this.StopEncode();
- this.StopServer();
 }
 
- private void StartServer(int verbosityLvl, bool noHardwareMode)
+ private void WorkerProcess_OutputDataReceived(object sender, DataReceivedEventArgs e)
 {
- if (this.workerProcess == null || this.workerProcess.HasExited)
- {
- this.workerProcess = new Process();
- this.workerProcess.StartInfo =
- new ProcessStartInfo("HandBrake.Worker.exe", string.Format("--port={0} --verbosity={1}", this.port, verbosityLvl))
- {
- WindowStyle = ProcessWindowStyle.Normal
- };
-
- this.workerProcess.Start();
- this.workerProcess.Exited += this.WorkerProcess_Exited;
- Debug.WriteLine("Worker Process Started. PID = {0}", this.workerProcess.Id);
- }
+ this.logService.LogMessage(e.Data);
 }
 
 private void MonitorEncodeProgress()
@@ -152,13 +210,21 @@
 
 private void StopPollingProgress()
 {
- this.PollEncodeProgress(); // Get the final progress state.
+ try
+ {
+ this.PollEncodeProgress(); // Get the last progress state.
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
+ 
 this.encodePollTimer?.Stop();
 }
 
 private void WorkerProcess_Exited(object sender, EventArgs e)
 {
- Debug.WriteLine("Worker Process has exited");
+ this.ServiceLogMessage("Worker process exited!");
 }
 
 private void StopServer()
@@ -171,31 +237,64 @@
 
 private async void PollEncodeProgress()
 {
+ if (encodeCompleteFired)
+ {
+ this.encodePollTimer?.Stop();
+ this.encodePollTimer?.Dispose();
+ return;
+ }
+
 ServerResponse response = null;
 try
 {
+ if (this.retryCount > 5)
+ {
+ encodeCompleteFired = true;
+ this.encodePollTimer?.Stop();
+
+ int exitcode = -11;
+ if (this.workerProcess != null && this.workerProcess.HasExited)
+ {
+ this.ServiceLogMessage("Worker process exit was not expected.");
+ exitcode = -12;
+ }
+ else
+ {
+ this.ServiceLogMessage("Worker process appears to be unresponsive. Terminating .... ");
+ }
+
+ this.EncodeCompleted?.Invoke(sender: this, e: new EncodeCompletedEventArgs(exitcode));
+ 
+ if (this.workerProcess != null && !this.workerProcess.HasExited)
+ {
+ this.workerProcess?.Kill();
+ }
+
+ return;
+ }
+
 response = await this.MakeHttpGetRequest("PollEncodeProgress");
 }
- catch (Exception e)
+ catch (Exception)
 {
- if (this.encodePollTimer != null)
- {
- this.encodePollTimer.Stop();
- }
+ retryCount = this.retryCount + 1;
 }
 
 if (response == null || !response.WasSuccessful)
 {
+ retryCount = this.retryCount + 1;
 return;
 }
 
+ this.retryCount = 0; // Reset
+
 string statusJson = response.JsonResponse;
 
- JsonState state = JsonConvert.DeserializeObject<JsonState>(statusJson);
+ JsonState state = JsonSerializer.Deserialize<JsonState>(statusJson, JsonSettings.Options);
 
 TaskState taskState = state != null ? TaskState.FromRepositoryValue(state.State) : null;
 
- if (taskState != null && (taskState == TaskState.Working || taskState == TaskState.Muxing || taskState == TaskState.Searching))
+ if (taskState != null && (taskState == TaskState.Working || taskState == TaskState.Searching))
 {
 if (this.EncodeProgress != null)
 {
@@ -215,9 +314,94 @@
 else if (taskState != null && taskState == TaskState.WorkDone)
 {
 this.encodePollTimer.Stop();
+ encodeCompleteFired = true;
+
+ if (this.workerProcess != null && !this.workerProcess.HasExited)
+ {
+ try
+ {
+ this.workerProcess?.Kill();
+ }
+ catch (Win32Exception e)
+ {
+ Debug.WriteLine(e);
+ }
+ }
+
+ this.EncodeCompleted?.Invoke(sender: this, e: new EncodeCompletedEventArgs(state.WorkDone.Error));
+ this.portService.FreePort(this.port);
+ }
+ }
+
+ private void RunEncodeInitProcess(JsonEncodeObject jobToStart)
+ {
+ if (this.IsServerRunning())
+ {
+ InitCommand initCommand = new InitCommand
+ {
+ EnableDiskLogging = false,
+ AllowDisconnectedWorker = false,
+ DisableLibDvdNav = !this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav),
+ EnableHardwareAcceleration = true,
+ LogDirectory = DirectoryUtilities.GetLogDirectory(),
+ LogVerbosity = this.userSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity)
+ };
+
+ initCommand.LogFile = Path.Combine(initCommand.LogDirectory, string.Format("activity_log.worker.{0}.txt", GeneralUtilities.ProcessId));
+
+ string job = JsonSerializer.Serialize(new EncodeCommand { InitialiseCommand = initCommand, EncodeJob = jobToStart }, JsonSettings.Options);
+
+ var task = Task.Run(async () => await this.MakeHttpJsonPostRequest("StartEncode", job));
+ task.Wait();
+ this.MonitorEncodeProgress();
+ }
+ }
 
- this.EncodeCompleted?.Invoke(sender: this, e: new EncodeCompletedEventArgs(state.WorkDone.Error != 0));
+ private bool IsServerRunning()
+ {
+ // Poll the server until it's started up. This allows us to prevent failures in upstream methods.
+ if (this.serverStarted)
+ {
+ return this.serverStarted; 
 }
+
+ int count = 0;
+ while (!this.serverStarted)
+ {
+ if (count > 10)
+ {
+ logService.LogMessage("Unable to connect to the HandBrake Worker instance after 10 attempts. Try disabling this option in Tools -> Preferences -> Advanced.");
+ return false;
+ }
+
+ try
+ {
+ var task = Task.Run(async () => await this.MakeHttpGetRequest("IsTokenSet"));
+ task.Wait(2000);
+
+ if (string.Equals(task.Result.JsonResponse, "True", StringComparison.CurrentCultureIgnoreCase))
+ {
+ this.serverStarted = true;
+ return true;
+ }
+ }
+ catch (Exception)
+ {
+ // Do nothing. We'll try again. The service isn't ready yet.
+ }
+ finally
+ {
+ count = count + 1;
+ }
+ }
+
+ return true;
+ }
+
+ private void ServiceLogMessage(string text)
+ {
+ string time = DateTime.Now.ToString("HH:mm:ss", System.Globalization.DateTimeFormatInfo.InvariantInfo);
+ logService.LogMessage(string.Format("{0} {1}", time, text));
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviourTrack.cs Changed

@@ -13,13 +13,13 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+ using System.Text.Json.Serialization;
 
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using Newtonsoft.Json;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+
 using Services.Encode.Model.Models;
 using Utilities;
 
@@ -40,11 +40,12 @@
 private AudioEncoderRateType encoderRateType;
 private double? quality;
 private IEnumerable<HBMixdown> mixdowns;
+ private AudioEncoder fallbackEncoder;
 
 /// <summary>
 /// Initializes a new instance of the <see cref="AudioBehaviourTrack"/> class. 
 /// </summary>
- public AudioBehaviourTrack()
+ public AudioBehaviourTrack(AudioEncoder fallback)
 {
 // Default Values
 this.Encoder = AudioEncoder.ffaac;
@@ -53,6 +54,7 @@
 this.Bitrate = 160;
 this.DRC = 0;
 this.EncoderRateType = AudioEncoderRateType.Bitrate;
+ this.fallbackEncoder = fallback;
 
 this.SetupLimits();
 }
@@ -74,6 +76,7 @@
 this.sampleRate = track.SampleRate;
 this.Quality = track.Quality;
 this.encoderRateType = track.EncoderRateType;
+ this.fallbackEncoder = track.fallbackEncoder;
 
 this.SetupLimits();
 }
@@ -341,7 +344,7 @@
 || this.Encoder == AudioEncoder.DtsHDPassthrough || this.Encoder == AudioEncoder.AacPassthru
 || this.Encoder == AudioEncoder.Mp3Passthru || this.Encoder == AudioEncoder.Passthrough ||
 this.Encoder == AudioEncoder.EAc3Passthrough || this.Encoder == AudioEncoder.TrueHDPassthrough
- || this.Encoder == AudioEncoder.FlacPassthru)
+ || this.Encoder == AudioEncoder.FlacPassthru || this.Encoder == AudioEncoder.Mp2Passthru)
 {
 return true;
 }
@@ -473,6 +476,12 @@
 get { return this; }
 }
 
+ public void SetFallbackEncoder(AudioEncoder fallbackEncoder)
+ {
+ this.fallbackEncoder = fallbackEncoder;
+ this.SetupLimits();
+ }
+
 #region Handler Methods
 
 /// <summary>
@@ -498,7 +507,7 @@
 int low = 32;
 
 // Based on the users settings, find the high and low bitrates.
- HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
+ HBAudioEncoder hbaenc = GetEncoderForLimits();
 HBRate rate = HandBrakeEncoderHelpers.AudioSampleRates.FirstOrDefault(t => t.Name == this.SampleRate.ToString(CultureInfo.InvariantCulture));
 HBMixdown mixdown = this.mixDown ?? HandBrakeEncoderHelpers.GetMixdown("dpl2");
 
@@ -526,7 +535,7 @@
 /// </summary>
 private void SetupQualityCompressionLimits()
 {
- HBAudioEncoder hbAudioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
+ HBAudioEncoder hbAudioEncoder = GetEncoderForLimits();
 if (hbAudioEncoder.SupportsQuality)
 {
 RangeLimits limits = null;
@@ -583,13 +592,13 @@
 }
 
 /// <summary>
- /// Restrict the available mixdowns to those that the enocder actually supports.
+ /// Restrict the available mixdowns to those that the encoder actually supports.
 /// </summary>
 private void SetupMixdowns()
 {
 this.mixdowns = new BindingList<HBMixdown>(HandBrakeEncoderHelpers.Mixdowns.ToList());
 
- HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
+ HBAudioEncoder audioEncoder = GetEncoderForLimits();
 
 BindingList<HBMixdown> mixdownList = new BindingList<HBMixdown>();
 foreach (HBMixdown mixdown in HandBrakeEncoderHelpers.Mixdowns)
@@ -636,6 +645,17 @@
 // }
 }
 
+ private HBAudioEncoder GetEncoderForLimits()
+ {
+ HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
+ if (hbaenc != null && hbaenc.IsPassthrough)
+ {
+ hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.fallbackEncoder));
+ }
+
+ return hbaenc;
+ }
+
 #endregion
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Audio/AudioBehaviours.cs Changed

@@ -14,43 +14,32 @@
 
 using Caliburn.Micro;
 
- /// <summary>
- /// Audio Behaviours
- /// </summary>
+ using HandBrakeWPF.Services.Encode.Model.Models;
+
 public class AudioBehaviours : PropertyChangedBase
 {
 private AudioBehaviourModes selectedBehaviour;
- private BindingList<string> selectedLangauges;
+ private BindingList<string> selectedLanguages;
 private AudioTrackDefaultsMode trackDefaultBehaviour;
-
- /// <summary>
- /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.
- /// </summary>
+ 
 public AudioBehaviours()
 {
 this.SelectedBehaviour = AudioBehaviourModes.None;
 this.SelectedTrackDefaultBehaviour = AudioTrackDefaultsMode.FirstTrack;
- this.SelectedLangauges = new BindingList<string>();
+ this.SelectedLanguages = new BindingList<string>();
 this.BehaviourTracks = new BindingList<AudioBehaviourTrack>();
+ this.AllowedPassthruOptions = new AllowedPassthru();
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AudioBehaviours"/> class.
- /// </summary>
- /// <param name="behaviours">
- /// The behaviours.
- /// </param>
 public AudioBehaviours(AudioBehaviours behaviours)
 {
 this.SelectedBehaviour = behaviours.SelectedBehaviour;
 this.SelectedTrackDefaultBehaviour = behaviours.SelectedTrackDefaultBehaviour;
- this.SelectedLangauges = new BindingList<string>(behaviours.selectedLangauges.ToList());
+ this.SelectedLanguages = new BindingList<string>(behaviours.selectedLanguages.ToList());
 this.BehaviourTracks = behaviours.BehaviourTracks;
+ this.AllowedPassthruOptions = new AllowedPassthru(behaviours.AllowedPassthruOptions);
 }
 
- /// <summary>
- /// Gets or sets the selected behaviour.
- /// </summary>
 public AudioBehaviourModes SelectedBehaviour
 {
 get
@@ -69,9 +58,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the track default behaviour.
- /// </summary>
 public AudioTrackDefaultsMode SelectedTrackDefaultBehaviour
 {
 get
@@ -89,53 +75,25 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the selected languages.
- /// </summary>
- public BindingList<string> SelectedLangauges
+ public BindingList<string> SelectedLanguages
 {
 get
 {
- return this.selectedLangauges;
+ return this.selectedLanguages;
 }
 set
 {
- if (Equals(value, this.selectedLangauges))
+ if (Equals(value, this.selectedLanguages))
 {
 return;
 }
- this.selectedLangauges = value;
- this.NotifyOfPropertyChange(() => this.SelectedLangauges);
+ this.selectedLanguages = value;
+ this.NotifyOfPropertyChange(() => this.SelectedLanguages);
 }
 }
 
- /// <summary>
- /// The list of track templates we are going to use to generate audio tracks for a source.
- /// </summary>
 public BindingList<AudioBehaviourTrack> BehaviourTracks { get; set; }
 
- /// <summary>
- /// Clone this object
- /// </summary>
- /// <returns>
- /// The <see cref="object"/>.
- /// </returns>
- public AudioBehaviours Clone()
- {
- AudioBehaviours cloned = new AudioBehaviours
- {
- SelectedBehaviour = this.selectedBehaviour,
- SelectedLangauges = new BindingList<string>(),
- SelectedTrackDefaultBehaviour = this.SelectedTrackDefaultBehaviour,
- BehaviourTracks = this.BehaviourTracks
- };
-
- foreach (var item in this.SelectedLangauges)
- {
- cloned.SelectedLangauges.Add(item);
- }
-
- return cloned;
- }
+ public AllowedPassthru AllowedPassthruOptions { get; set; }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/ChangedOption.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/DarkThemeMode.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/DriveInformation.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/DriveInformation.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/CombDetect.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/DeinterlaceFilter.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/Denoise.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/Detelecine.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/FilterPreset.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/FilterTune.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/PadColour.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/PaddingFilter.cs Added

@@ -0,0 +1,102 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PaddingFilter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PaddingFilter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Filters
+{
+ public class PaddingFilter
+ {
+ public PaddingFilter()
+ {
+ }
+
+ public PaddingFilter(PaddingFilter filter)
+ {
+ this.Enabled = filter.Enabled;
+ this.Color = filter.Color;
+ this.X = filter.X;
+ this.Y = filter.Y;
+ this.W = filter.W;
+ this.H = filter.H;
+ }
+
+ public bool Enabled { get; set; }
+
+ public string Color { get; set; }
+
+ public string Mode 
+ {
+ get
+ {
+ // TODO support "fillWidth" and "fillHeight"
+ return this.Enabled ? "custom" : "none";
+ }
+ }
+
+ /* (X,Y) position of the picture on the frame */
+
+ public int X { get; set; } // Left
+
+ public int Y { get; set; } // Top
+
+ /* The Width and Height of the padding */
+
+ public int W { get; set; } // L +R
+
+ public int H { get; set; } // T + B
+ 
+ /* Helper methods to work out the Bottom and Right real padding values.*/ 
+
+ public int Bottom
+ {
+ get
+ {
+ return this.H - this.Y;
+ }
+ }
+
+ public int Right
+ {
+ get
+ {
+ return this.W - this.X;
+ }
+ }
+
+ /* Set from imported preset*/
+
+ public void Set(int top, int bottom, int left, int right, string colour, string mode)
+ {
+ // Figure the X,Y coordinate 
+ this.X = left;
+ this.Y = top;
+
+ // Calculate the total padding
+ this.W = left + right;
+ this.H = top + bottom;
+
+ this.Color = colour;
+
+ switch (mode)
+ {
+ case "none":
+ this.Enabled = false;
+ break;
+ case "custom":
+ this.Enabled = true;
+ break;
+ case "fillWidth": // TODO, not supported yet
+ this.Enabled = true;
+ break;
+ case "fillHeight": // TODO, not supported yet
+ this.Enabled = true;
+ break;
+ }
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/PaddingMode.cs Added

@@ -0,0 +1,38 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PaddingMode.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PaddingMode type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Filters
+{
+ using HandBrake.Interop.Attributes;
+
+ using HandBrakeWPF.Properties;
+
+ public enum PaddingMode
+ {
+ DisplayName(typeof(Resources), "PaddingMode_None")
+ ShortName("none")
+ None = 0,
+
+ //DisplayName(typeof(Resources), "PaddingMode_Fill")
+ //ShortName("fill")
+ //FirstMatch,
+
+ //DisplayName(typeof(Resources), "PaddingMode_Width")
+ //ShortName("width")
+ //Width,
+
+ //DisplayName(typeof(Resources), "PaddingMode_Height")
+ //ShortName("height")
+ //Height,
+
+ DisplayName(typeof(Resources), "PaddingMode_Custom")
+ ShortName("custom")
+ Custom,
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Filters/Sharpen.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/InterfaceLanguage.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/InterfaceLanguage.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Options/PresetDisplayMode.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Options/RightToLeftMode.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/OptionsTab.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/OptionsTab.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Picture/ChangedPictureField.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Picture/FlipRotationCommand.cs Added

@@ -0,0 +1,27 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="FlipRotationCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the FlipRotationCommand type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Picture
+{
+ public class FlipRotationCommand
+ {
+ public FlipRotationCommand(ChangedPictureField changedField, int? previousRotation, int? previousHflip)
+ {
+ this.ChangedField = changedField;
+ this.PreviousRotation = previousRotation;
+ this.PreviousHflip = previousHflip;
+ }
+
+ public ChangedPictureField ChangedField { get; }
+
+ public int? PreviousRotation { get; }
+
+ public int? PreviousHflip { get; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Picture/PictureSettingsResLimitModes.cs Added

@@ -0,0 +1,45 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PictureSettingsResLimitModes.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Picture
+{
+ using HandBrake.Interop.Attributes;
+
+ using HandBrakeWPF.Properties;
+
+ public enum PictureSettingsResLimitModes
+ {
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_none")
+ None,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_8K")
+ ResLimit(7680, 4320)
+ Size8K,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_4K")
+ ResLimit(3840, 2160)
+ Size4K,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_1080p")
+ ResLimit(1920, 1080)
+ Size1080p,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_720p")
+ ResLimit(1280, 720)
+ Size720p,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_576p")
+ ResLimit(720, 576)
+ Size576p,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_480p")
+ ResLimit(720, 480)
+ Size480p,
+
+ DisplayName(typeof(Resources), "PictureSettingsResLimitModes_custom")
+ Custom,
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Picture/ResLimit.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Picture/Size.cs Added

@@ -0,0 +1,60 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Size.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Size type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Picture
+{
+ /// <summary>
+ /// The size.
+ /// </summary>
+ public class Size
+ {
+ /// <summary>
+ /// Initializes a new instance of the <see cref="Size"/> class.
+ /// </summary>
+ /// <param name="width">
+ /// The width.
+ /// </param>
+ /// <param name="height">
+ /// The height.
+ /// </param>
+ public Size(int width, int height)
+ {
+ this.Width = width;
+ this.Height = height;
+ }
+
+ /// <summary>
+ /// Gets the height.
+ /// </summary>
+ public int Height { get; private set; }
+
+ /// <summary>
+ /// Gets the width.
+ /// </summary>
+ public int Width { get; private set; }
+
+ /// <summary>
+ /// Gets a value indicating whether is empty.
+ /// </summary>
+ public bool IsEmpty 
+ {
+ get
+ {
+ if (this.Width <= 0 && this.Height <= 0)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Subtitles/SubtitleBehaviours.cs Changed

@@ -14,45 +14,30 @@
 
 using Caliburn.Micro;
 
- /// <summary>
- /// A class to track the behaviours of audio track selection
- /// </summary>
 public class SubtitleBehaviours : PropertyChangedBase
 {
 private SubtitleBehaviourModes selectedBehaviour;
- private BindingList<string> selectedLangauges;
+ private BindingList<string> selectedLanguages;
 private bool addForeignAudioScanTrack;
 private bool addClosedCaptions;
 private SubtitleBurnInBehaviourModes selectedBurnInBehaviour;
 
- /// <summary>
- /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.
- /// </summary>
 public SubtitleBehaviours()
 {
 this.SelectedBehaviour = SubtitleBehaviourModes.None;
 this.SelectedBurnInBehaviour = SubtitleBurnInBehaviourModes.None;
- this.SelectedLangauges = new BindingList<string>();
+ this.SelectedLanguages = new BindingList<string>();
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="SubtitleBehaviours"/> class.
- /// </summary>
- /// <param name="behaviours">
- /// The behaviours.
- /// </param>
 public SubtitleBehaviours(SubtitleBehaviours behaviours)
 {
 this.SelectedBehaviour = behaviours.selectedBehaviour;
 this.SelectedBurnInBehaviour = behaviours.selectedBurnInBehaviour;
- this.SelectedLangauges = new BindingList<string>(behaviours.SelectedLangauges.ToList());
+ this.SelectedLanguages = new BindingList<string>(behaviours.SelectedLanguages.ToList());
 this.AddClosedCaptions = behaviours.AddClosedCaptions;
 this.AddForeignAudioScanTrack = behaviours.AddForeignAudioScanTrack;
 }
 
- /// <summary>
- /// Gets or sets the selected behaviour.
- /// </summary>
 public SubtitleBehaviourModes SelectedBehaviour
 {
 get
@@ -70,9 +55,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the selected burn in behaviour.
- /// </summary>
 public SubtitleBurnInBehaviourModes SelectedBurnInBehaviour
 {
 get
@@ -90,29 +72,23 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the selected langages.
- /// </summary>
- public BindingList<string> SelectedLangauges
+ public BindingList<string> SelectedLanguages
 {
 get
 {
- return this.selectedLangauges;
+ return this.selectedLanguages;
 }
 set
 {
- if (Equals(value, this.selectedLangauges))
+ if (Equals(value, this.selectedLanguages))
 {
 return;
 }
- this.selectedLangauges = value;
- this.NotifyOfPropertyChange(() => this.SelectedLangauges);
+ this.selectedLanguages = value;
+ this.NotifyOfPropertyChange(() => this.SelectedLanguages);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether add foreign audio scan track.
- /// </summary>
 public bool AddForeignAudioScanTrack
 {
 get
@@ -130,9 +106,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether add closed captions.
- /// </summary>
 public bool AddClosedCaptions
 {
 get
@@ -149,30 +122,5 @@
 this.NotifyOfPropertyChange(() => this.AddClosedCaptions);
 }
 }
-
- /// <summary>
- /// Clone this object
- /// </summary>
- /// <returns>
- /// The <see cref="object"/>.
- /// </returns>
- public SubtitleBehaviours Clone()
- {
- SubtitleBehaviours cloned = new SubtitleBehaviours
- {
- SelectedBehaviour = this.selectedBehaviour, 
- SelectedBurnInBehaviour = this.selectedBurnInBehaviour, 
- SelectedLangauges = new BindingList<string>(), 
- AddClosedCaptions = this.addClosedCaptions, 
- AddForeignAudioScanTrack = this.addForeignAudioScanTrack, 
- };
-
- foreach (var item in this.SelectedLangauges)
- {
- cloned.SelectedLangauges.Add(item);
- }
-
- return cloned;
- }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/TabStatusEventType.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Model/UpdateCheckInformation.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/UpdateCheckInformation.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Video Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Video/VideoEncodeRateType.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Video/VideoEncoder.cs Added

@@ -0,0 +1,95 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="VideoEncoder.cs" company="HandBrake Project (https://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// The video encoder.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Video
+{
+ using HandBrake.Interop.Attributes;
+
+ /// <summary>
+ /// The video encoder.
+ /// </summary>
+ public enum VideoEncoder
+ {
+ DisplayName("H.264 (x264)")
+ ShortName("x264")
+ X264 = 0,
+
+ DisplayName("H.264 10-bit (x264)")
+ ShortName("x264_10bit")
+ X264_10,
+
+ DisplayName("H.264 (Intel QSV)")
+ ShortName("qsv_h264")
+ QuickSync,
+
+ DisplayName("H.264 (AMD VCE)")
+ ShortName("vce_h264")
+ VceH264,
+
+ DisplayName("H.264 (Nvidia NVEnc)")
+ ShortName("nvenc_h264")
+ NvencH264,
+
+ DisplayName("H.264 (MediaFoundation)")
+ ShortName("mf_h264")
+ MFH264,
+
+ DisplayName("MPEG-4")
+ ShortName("mpeg4")
+ FFMpeg,
+
+ DisplayName("MPEG-2")
+ ShortName("mpeg2")
+ FFMpeg2,
+
+ DisplayName("Theora")
+ ShortName("theora")
+ Theora,
+
+ DisplayName("H.265 (x265)")
+ ShortName("x265")
+ X265,
+
+ DisplayName("H.265 12-bit (x265)")
+ ShortName("x265_12bit")
+ X265_12,
+
+ DisplayName("H.265 10-bit (x265)")
+ ShortName("x265_10bit")
+ X265_10,
+
+ DisplayName("H.265 (Intel QSV)")
+ ShortName("qsv_h265")
+ QuickSyncH265,
+
+ DisplayName("H.265 10-bit (Intel QSV)")
+ ShortName("qsv_h265_10bit")
+ QuickSyncH26510b,
+
+ DisplayName("H.265 (AMD VCE)")
+ ShortName("vce_h265")
+ VceH265,
+
+ DisplayName("H.265 (Nvidia NVEnc)")
+ ShortName("nvenc_h265")
+ NvencH265,
+
+ DisplayName("H.265 (MediaFoundation)")
+ ShortName("mf_h265")
+ MFH265,
+
+ DisplayName("VP8")
+ ShortName("VP8")
+ VP8,
+
+ DisplayName("VP9")
+ ShortName("VP9")
+ VP9
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Video/VideoScaler.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Worker Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Worker/EncodeCommand.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Worker/InitCommand.cs Added

@@ -0,0 +1,28 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="InitCommand.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the InitCommand type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Model.Worker
+{
+ public class InitCommand
+ {
+ public int LogVerbosity { get; set; }
+
+ public string LogDirectory { get; set; }
+
+ public string LogFile { get; set; }
+
+ public bool EnableDiskLogging { get; set; }
+
+ public bool EnableHardwareAcceleration { get; set; }
+
+ public bool DisableLibDvdNav { get; set; }
+
+ public bool AllowDisconnectedWorker { get; set; }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Model/Worker/LogMessage.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/PublishProfiles Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/PublishProfiles/publish_arm64.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/PublishProfiles/publish_portable.pubxml Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/PublishProfiles/publish_x64.pubxml Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs Changed

@@ -19,7 +19,7 @@
 // class via a tool like ResGen or Visual Studio.
 // To add or remove a member, edit your .ResX file then rerun ResGen
 // with the /str option, or rebuild your VS project.
- global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")
+ global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")
 global::System.Diagnostics.DebuggerNonUserCodeAttribute()
 global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()
 public class Resources {
@@ -61,7 +61,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Copyright (C) 2003-2020 The HandBrake Team.
+ /// Looks up a localized string similar to Copyright (C) 2003-2022 The HandBrake Team.
 /// </summary>
 public static string About_Copyright {
 get {
@@ -158,6 +158,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Is Default:.
+ /// </summary>
+ public static string AddPresetView_IsDefault {
+ get {
+ return ResourceManager.GetString("AddPresetView_IsDefault", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Name:.
 /// </summary>
 public static string AddPresetView_Name {
@@ -302,7 +311,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Configure Automatic Audio Selections.
+ /// Looks up a localized string similar to Automatic Audio Selections.
 /// </summary>
 public static string AudioDefaultsView_PaneTitle {
 get {
@@ -491,7 +500,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Selection Behavior.
+ /// Looks up a localized string similar to Selection Behavior ....
 /// </summary>
 public static string AudioViewModel_ConfigureDefaults {
 get {
@@ -844,6 +853,33 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Use Dark.
+ /// </summary>
+ public static string DarkTheme_dark {
+ get {
+ return ResourceManager.GetString("DarkTheme_dark", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Use Light.
+ /// </summary>
+ public static string DarkTheme_light {
+ get {
+ return ResourceManager.GetString("DarkTheme_light", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Match System.
+ /// </summary>
+ public static string DarkTheme_system {
+ get {
+ return ResourceManager.GetString("DarkTheme_system", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Create Folder?.
 /// </summary>
 public static string DirectoryUtils_CreateFolder {
@@ -881,7 +917,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to If the problem presists, please try restarting HandBrake..
+ /// Looks up a localized string similar to If the problem persists, please try restarting HandBrake..
 /// </summary>
 public static string ErrorViewModel_IfTheProblemPersists {
 get {
@@ -935,6 +971,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Chroma Smooth:.
+ /// </summary>
+ public static string FiltersView_ChromaSmooth {
+ get {
+ return ResourceManager.GetString("FiltersView_ChromaSmooth", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Colourspace:.
+ /// </summary>
+ public static string FiltersView_ColourSpace {
+ get {
+ return ResourceManager.GetString("FiltersView_ColourSpace", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Custom:.
 /// </summary>
 public static string FiltersView_Custom {
@@ -944,7 +998,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Deblock.
+ /// Looks up a localized string similar to Deblock:.
 /// </summary>
 public static string FiltersView_Deblock {
 get {
@@ -1034,7 +1088,16 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Flip.
+ /// Looks up a localized string similar to Flip:.
+ /// </summary>
+ public static string FiltersView_Flip {
+ get {
+ return ResourceManager.GetString("FiltersView_Flip", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Horizontal.
 /// </summary>
 public static string FiltersView_FlipVideo {
 get {
@@ -1070,7 +1133,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Rotate:.
+ /// Looks up a localized string similar to Rotation:.
 /// </summary>
 public static string FiltersView_Rotate {
 get {
@@ -1079,7 +1142,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Sharpen.
+ /// Looks up a localized string similar to Sharpen:.
 /// </summary>
 public static string FiltersView_Sharpen {
 get {
@@ -1133,6 +1196,26 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Would you like to allow HandBrake to automatically check for updates?
+ ///
+ ///You can change your choice at any time by changing the options in Preferences -&gt; General -&gt; Check for Updates.
+ /// </summary>
+ public static string FirstRun_EnableUpdateCheck {
+ get {
+ return ResourceManager.GetString("FirstRun_EnableUpdateCheck", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Check for updates?.
+ /// </summary>
+ public static string FirstRun_EnableUpdateCheckHeader {
+ get {
+ return ResourceManager.GetString("FirstRun_EnableUpdateCheckHeader", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Add.
 /// </summary>
 public static string Generic_Add {
@@ -1268,31 +1351,29 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Log Viewer.
+ /// Looks up a localized string similar to Finished.
 /// </summary>
- public static string LogViewModel_Title {
+ public static string LogViewModel_Complete {
 get {
- return ResourceManager.GetString("LogViewModel_Title", resourceCulture);
+ return ResourceManager.GetString("LogViewModel_Complete", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to HandBrake is already encoding..
+ /// Looks up a localized string similar to Log Viewer.
 /// </summary>
- public static string Main_AlreadyEncoding {
+ public static string LogViewModel_Title {
 get {
- return ResourceManager.GetString("Main_AlreadyEncoding", resourceCulture);
+ return ResourceManager.GetString("LogViewModel_Title", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Warning: If you wish to have subtitles added to each item you are about to queue, please verify that you have the subtitle defaults setup correctly on the subtitles tab.
- /// 
- ///Do you wish to continue?.
+ /// Looks up a localized string similar to HandBrake is already encoding..
 /// </summary>
- public static string Main_AutoAdd_AudioAndSubWarning {
+ public static string Main_AlreadyEncoding {
 get {
- return ResourceManager.GetString("Main_AutoAdd_AudioAndSubWarning", resourceCulture);
+ return ResourceManager.GetString("Main_AlreadyEncoding", resourceCulture);
 }
 }
 
@@ -1324,7 +1405,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Pending Jobs {0}.
+ /// Looks up a localized string similar to Pending Jobs {0}.
 /// </summary>
 public static string Main_JobsPending_addon {
 get {
@@ -1333,7 +1414,11 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Your destination directory is low on diskspace. Please free up some disk space on your destination drive. Alternatively you can change the level at which this alert triggers in Options. .
+ /// Looks up a localized string similar to Your destination directory is low on diskspace. 
+ ///
+ ///You can configure the level at which this alert appears in preferences. 
+ ///
+ ///Do you wish to continue? .
 /// </summary>
 public static string Main_LowDiskspace {
 get {
@@ -1471,9 +1556,9 @@
 /// <summary>
 /// Looks up a localized string similar to Are you sure you wish to update the selected preset?.
 /// </summary>
- public static string Main_PresetUpdateConfrimation {
+ public static string Main_PresetUpdateConfirmation {
 get {
- return ResourceManager.GetString("Main_PresetUpdateConfrimation", resourceCulture);
+ return ResourceManager.GetString("Main_PresetUpdateConfirmation", resourceCulture);
 }
 }
 
@@ -1525,6 +1610,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to {0} jobs completed. {1}Working on {2} jobs with {3} waiting to be processed..
+ /// </summary>
+ public static string Main_QueueMultiJobStatus {
+ get {
+ return ResourceManager.GetString("Main_QueueMultiJobStatus", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to The file &apos;{0}&apos; already exists!
 ///Would you like to overwrite it?.
 /// </summary>
@@ -1571,20 +1665,20 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Scan failed: .
+ /// Looks up a localized string similar to Scan Failed... Please See Activity Log for details..
 /// </summary>
- public static string Main_ScanFailed_NoReason {
+ public static string Main_ScanFailed_CheckLog {
 get {
- return ResourceManager.GetString("Main_ScanFailed_NoReason", resourceCulture);
+ return ResourceManager.GetString("Main_ScanFailed_CheckLog", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Scan Failed... Please See Activity Log for details..
+ /// Looks up a localized string similar to Scan failed: .
 /// </summary>
- public static string Main_ScanFailled_CheckLog {
+ public static string Main_ScanFailed_NoReason {
 get {
- return ResourceManager.GetString("Main_ScanFailled_CheckLog", resourceCulture);
+ return ResourceManager.GetString("Main_ScanFailed_NoReason", resourceCulture);
 }
 }
 
@@ -1616,8 +1710,8 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode. 
- ///This could be due to one of the following reasons:
+ /// Looks up a localized string similar to HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode. This could be due to one of the following reasons:
+ ///
 ///- The duration of each source title is below the &quot;Minimum Title Duration&quot; threshold option in &apos;Preferences &gt; Advanced&apos;. 
 ///- The source file is not a valid video file or is in a format that HandBrake does not support.
 ///- The source may be copy protected or include DRM. Please note that HandBrake does not support the removal of copy protections rest of string was truncated&quot;;.
@@ -1845,6 +1939,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Regenerate (Autoname).
+ /// </summary>
+ public static string MainView_AutonameRegenerate {
+ get {
+ return ResourceManager.GetString("MainView_AutonameRegenerate", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Browse.
 /// </summary>
 public static string MainView_Browser {
@@ -2043,6 +2146,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Open this Directory.
+ /// </summary>
+ public static string MainView_OpenDirectory {
+ get {
+ return ResourceManager.GetString("MainView_OpenDirectory", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Options.
 /// </summary>
 public static string MainView_Options {
@@ -2088,7 +2200,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Rename Preset.
+ /// Looks up a localized string similar to Edit Preset.
 /// </summary>
 public static string MainView_PresetManage {
 get {
@@ -2223,11 +2335,11 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Selected Preset:.
+ /// Looks up a localized string similar to Preset:.
 /// </summary>
- public static string MainView_SelectedPreset {
+ public static string MainView_SelectedPresets {
 get {
- return ResourceManager.GetString("MainView_SelectedPreset", resourceCulture);
+ return ResourceManager.GetString("MainView_SelectedPresets", resourceCulture);
 }
 }
 
@@ -2457,7 +2569,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Update Selected Preset.
+ /// Looks up a localized string similar to Update Current Preset.
 /// </summary>
 public static string MainView_UpdateSelectedPreset {
 get {
@@ -2511,6 +2623,18 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to An error was detected in the File Browser Dialog. 
+ ///
+ ///- Please note, long file paths are not fully supported. Please keep file paths shorter than 255 characters. 
+ ///- The last used directory for this window, has been reset to prevent errors the next time you try to scan a file..
+ /// </summary>
+ public static string MainViewModel_FilePathSelectError {
+ get {
+ return ResourceManager.GetString("MainViewModel_FilePathSelectError", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Low Disk Space.
 /// </summary>
 public static string MainViewModel_LowDiskSpace {
@@ -2556,7 +2680,43 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Manage Preset.
+ /// Looks up a localized string similar to Delete Built-in Presets.
+ /// </summary>
+ public static string ManagePresetView_DeleteBuiltIn {
+ get {
+ return ResourceManager.GetString("ManagePresetView_DeleteBuiltIn", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Export selected preset.
+ /// </summary>
+ public static string ManagePresetView_Export {
+ get {
+ return ResourceManager.GetString("ManagePresetView_Export", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Export all user presets.
+ /// </summary>
+ public static string ManagePresetView_ExportUserPresets {
+ get {
+ return ResourceManager.GetString("ManagePresetView_ExportUserPresets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Import Preset(s) from file.
+ /// </summary>
+ public static string ManagePresetView_Import {
+ get {
+ return ResourceManager.GetString("ManagePresetView_Import", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Manage Presets.
 /// </summary>
 public static string ManagePresetView_ManagePreset {
 get {
@@ -2565,6 +2725,42 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to There is no preset selected..
+ /// </summary>
+ public static string ManagePresetView_NoPresetSelected {
+ get {
+ return ResourceManager.GetString("ManagePresetView_NoPresetSelected", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Preset Information:.
+ /// </summary>
+ public static string ManagePresetView_PresetInfo {
+ get {
+ return ResourceManager.GetString("ManagePresetView_PresetInfo", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Built in presets can not be modified..
+ /// </summary>
+ public static string ManagePresetView_RestrictedPreset {
+ get {
+ return ResourceManager.GetString("ManagePresetView_RestrictedPreset", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Set selected preset as default.
+ /// </summary>
+ public static string ManagePresetView_SetDefault {
+ get {
+ return ResourceManager.GetString("ManagePresetView_SetDefault", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Actors:.
 /// </summary>
 public static string MetadataView_Actors {
@@ -2646,17 +2842,6 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Encoding: Pass {0} of {1}, {2:00.00}%
- ///FPS: {3:000.0}, Avg FPS: {4:000.0}
- ///Time Remaining: {5}, Elapsed: {6:d\:hh\:mm\:ss}.
- /// </summary>
- public static string MiniViewModel_EncodeStatusChanged_StatusLabel {
- get {
- return ResourceManager.GetString("MiniViewModel_EncodeStatusChanged_StatusLabel", resourceCulture);
- }
- }
- 
- /// <summary>
 /// Looks up a localized string similar to Automatic.
 /// </summary>
 public static string Mp4Behaviour_Auto {
@@ -2684,6 +2869,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to No.
+ /// </summary>
+ public static string No {
+ get {
+ return ResourceManager.GetString("No", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to No Additional Information.
 /// </summary>
 public static string NoAdditionalInformation {
@@ -2702,32 +2896,38 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Clear Log files older than 30 days.
+ /// Looks up a localized string similar to Your HandBrake encode is done!.
 /// </summary>
- public static string Options_30DayLogClear {
+ public static string Notifications_EncodeDone {
 get {
- return ResourceManager.GetString("Options_30DayLogClear", resourceCulture);
+ return ResourceManager.GetString("Notifications_EncodeDone", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to About HandBrake.
+ /// Looks up a localized string similar to Your HandBrake queue is done!.
 /// </summary>
- public static string Options_About {
+ public static string Notifications_QueueDone {
 get {
- return ResourceManager.GetString("Options_About", resourceCulture);
+ return ResourceManager.GetString("Notifications_QueueDone", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.
- ///
- ///Live Update Options: {source} {title} {chapters} 
- ///Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters).
+ /// Looks up a localized string similar to Clear Log files older than 7 days.
 /// </summary>
- public static string Options_AdditionalFormatOptions {
+ public static string Options_7DayLogClear {
 get {
- return ResourceManager.GetString("Options_AdditionalFormatOptions", resourceCulture);
+ return ResourceManager.GetString("Options_7DayLogClear", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to About HandBrake.
+ /// </summary>
+ public static string Options_About {
+ get {
+ return ResourceManager.GetString("Options_About", resourceCulture);
 }
 }
 
@@ -2752,9 +2952,9 @@
 /// <summary>
 /// Looks up a localized string similar to Application Toolbar.
 /// </summary>
- public static string Options_ApplicaitonToolbar {
+ public static string Options_ApplicationToolbar {
 get {
- return ResourceManager.GetString("Options_ApplicaitonToolbar", resourceCulture);
+ return ResourceManager.GetString("Options_ApplicationToolbar", resourceCulture);
 }
 }
 
@@ -2786,6 +2986,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Built In Presets.
+ /// </summary>
+ public static string Options_BuiltInPresets {
+ get {
+ return ResourceManager.GetString("Options_BuiltInPresets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Check for Updates.
 /// </summary>
 public static string Options_CheckForUpdates {
@@ -2921,15 +3130,6 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Experimental.
- /// </summary>
- public static string Options_Experimental {
- get {
- return ResourceManager.GetString("Options_Experimental", resourceCulture);
- }
- }
- 
- /// <summary>
 /// Looks up a localized string similar to File Format:.
 /// </summary>
 public static string Options_Format {
@@ -2984,7 +3184,16 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Pause queue if disk space is lower than:.
+ /// Looks up a localized string similar to Level at which low disk space alerts show:.
+ /// </summary>
+ public static string Options_LowDiskspaceLevelText {
+ get {
+ return ResourceManager.GetString("Options_LowDiskspaceLevelText", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Pause queue if disk space is low.
 /// </summary>
 public static string Options_LowDiskspaceSize {
 get {
@@ -3029,7 +3238,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Notifications.
+ /// Looks up a localized string similar to Sound Notifications.
 /// </summary>
 public static string Options_Notifications {
 get {
@@ -3074,11 +3283,11 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Path to VLC Player.
+ /// Looks up a localized string similar to Path to Media Player.
 /// </summary>
- public static string Options_PathToVLC {
+ public static string Options_PathToMediaPlayer {
 get {
- return ResourceManager.GetString("Options_PathToVLC", resourceCulture);
+ return ResourceManager.GetString("Options_PathToMediaPlayer", resourceCulture);
 }
 }
 
@@ -3173,6 +3382,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Reset.
+ /// </summary>
+ public static string Options_Reset {
+ get {
+ return ResourceManager.GetString("Options_Reset", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Reset to &apos;Do nothing&apos; when the app is re-launched..
 /// </summary>
 public static string Options_ResetDoNothing {
@@ -3209,15 +3427,6 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Show the new experimental queue design..
- /// </summary>
- public static string Options_ShowExperimentalQueueDesign {
- get {
- return ResourceManager.GetString("Options_ShowExperimentalQueueDesign", resourceCulture);
- }
- }
- 
- /// <summary>
 /// Looks up a localized string similar to Show &apos;Add All to Queue&apos; on the toolbar.
 /// </summary>
 public static string Options_ShowToolbarAddAll {
@@ -3281,6 +3490,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to User Settings.
+ /// </summary>
+ public static string Options_UserSettings {
+ get {
+ return ResourceManager.GetString("Options_UserSettings", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Version:.
 /// </summary>
 public static string Options_Version {
@@ -3299,7 +3517,8 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to This path is used for the video preview feature only..
+ /// Looks up a localized string similar to This path is used for the video preview feature only.
+ ///VLC and MPC-HC are supported. Other players may also work but are not validated..
 /// </summary>
 public static string Options_VideoPreviewPath {
 get {
@@ -3416,6 +3635,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Theme:.
+ /// </summary>
+ public static string OptionsView_DarkThemeMode {
+ get {
+ return ResourceManager.GetString("OptionsView_DarkThemeMode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Downloading....
 /// </summary>
 public static string OptionsView_Downloading {
@@ -3443,6 +3671,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Enable Low Power QuickSync Hardware (where supported)..
+ /// </summary>
+ public static string OptionsView_EnableQuicksyncLowPower {
+ get {
+ return ResourceManager.GetString("OptionsView_EnableQuicksyncLowPower", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Allow use of the AMD VCE Encoders.
 /// </summary>
 public static string OptionsView_EnableVceEncoding {
@@ -3452,6 +3689,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Run each queued job in a separate worker process..
+ /// </summary>
+ public static string OptionsView_EnableWorkerProcesses {
+ get {
+ return ResourceManager.GetString("OptionsView_EnableWorkerProcesses", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Filename collision behaviour:.
 /// </summary>
 public static string OptionsView_FileCollisionBehaviour {
@@ -3470,8 +3716,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Live Update Options: {source} {title} {chapters} 
- ///Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters).
+ /// Looks up a localized string similar to Replacement Placeholders: {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}.
 /// </summary>
 public static string OptionsView_FormatOptions {
 get {
@@ -3480,7 +3725,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Hardware encoding support is currently disabled. Please make sure you are running up-to-date drivers for all graphics adaptors in this system.
+ /// Looks up a localized string similar to Hardware encoding support is currently disabled. If you did not start HandBrake with the &quot;--no-hardware&quot; option, please make sure you are running up-to-date drivers for all graphics adaptors in this system.
 ///
 ///This will not impact any of the software encoders..
 /// </summary>
@@ -3536,7 +3781,34 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Available Options: {source_path} {source_folder_name} {source}.
+ /// Looks up a localized string similar to This will also disable the show windows taskbar notifications options on the &apos;When Done&apos; tab. Re-enable these if you want to re-activate this feature..
+ /// </summary>
+ public static string OptionsView_NotificationRemovalSubText {
+ get {
+ return ResourceManager.GetString("OptionsView_NotificationRemovalSubText", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Remove HandBrake from the Windows notifications control panel..
+ /// </summary>
+ public static string OptionsView_NotificationRemovalText {
+ get {
+ return ResourceManager.GetString("OptionsView_NotificationRemovalText", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to (Not supported on this system).
+ /// </summary>
+ public static string OptionsView_NotSupported {
+ get {
+ return ResourceManager.GetString("OptionsView_NotSupported", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Replacement Placeholders: {source_path} {source_folder_name} {source}.
 /// </summary>
 public static string OptionsView_PathOptions {
 get {
@@ -3581,6 +3853,42 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Choose how presets are displayed in menus:.
+ /// </summary>
+ public static string OptionsView_PresetDisplayMode {
+ get {
+ return ResourceManager.GetString("OptionsView_PresetDisplayMode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Process Isolation.
+ /// </summary>
+ public static string OptionsView_ProcessIsolation {
+ get {
+ return ResourceManager.GetString("OptionsView_ProcessIsolation", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please note, using this feature will start an HTTP server bound to 127.0.0.1 on the port stated..
+ /// </summary>
+ public static string OptionsView_ProcessIsolation_Warning1 {
+ get {
+ return ResourceManager.GetString("OptionsView_ProcessIsolation_Warning1", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to If the set port is in use, it will find the first free port within +100 from the defined port..
+ /// </summary>
+ public static string OptionsView_ProcessIsolation_Warning2 {
+ get {
+ return ResourceManager.GetString("OptionsView_ProcessIsolation_Warning2", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Port range must be between 5000 and 32767.
 /// </summary>
 public static string OptionsView_RemotePortLimit {
@@ -3590,6 +3898,60 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to (Requires Restart).
+ /// </summary>
+ public static string OptionsView_RequiresRestart {
+ get {
+ return ResourceManager.GetString("OptionsView_RequiresRestart", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Reset all built-in presets to HandBrake defaults:.
+ /// </summary>
+ public static string OptionsView_ResetBuildInPresets {
+ get {
+ return ResourceManager.GetString("OptionsView_ResetBuildInPresets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to (User presets will not be reset).
+ /// </summary>
+ public static string OptionsView_ResetBuildInPresetsNotice {
+ get {
+ return ResourceManager.GetString("OptionsView_ResetBuildInPresetsNotice", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Reset all HandBrake settings back to defaults:.
+ /// </summary>
+ public static string OptionsView_ResetSettingsToDefaults {
+ get {
+ return ResourceManager.GetString("OptionsView_ResetSettingsToDefaults", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Right to Left display mode:.
+ /// </summary>
+ public static string OptionsView_RightToleftMode {
+ get {
+ return ResourceManager.GetString("OptionsView_RightToleftMode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Warning: Please note that this is a &quot;Safe Mode&quot; build of HandBrake that does not include support for hardware encoders. If you wish to use hardware encoder support, please download a non-&quot;Safe Mode&quot; build from the website..
+ /// </summary>
+ public static string OptionsView_SafeMode {
+ get {
+ return ResourceManager.GetString("OptionsView_SafeMode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Please select a folder..
 /// </summary>
 public static string OptionsView_SelectFolder {
@@ -3599,7 +3961,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Replacement Placeholders: {source} {destination}.
+ /// Looks up a localized string similar to Replacement Placeholders: {source} {destination} {exit_code}.
 /// </summary>
 public static string OptionsView_SendFileToArgPlaceholders {
 get {
@@ -3635,6 +3997,87 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Maximum number of simultaneous encodes:.
+ /// </summary>
+ public static string OptionsView_SimultaneousEncodes {
+ get {
+ return ResourceManager.GetString("OptionsView_SimultaneousEncodes", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Notice: This is the upper limit of simultaneous jobs. Hardware limitations may take effect which lowers the actual number of simultaneous jobs during encoding..
+ /// </summary>
+ public static string OptionsView_SimultaneousHardwareLimitNotice {
+ get {
+ return ResourceManager.GetString("OptionsView_SimultaneousHardwareLimitNotice", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Uninstalled.
+ /// </summary>
+ public static string OptionsView_UninstallMessageBoxHeader {
+ get {
+ return ResourceManager.GetString("OptionsView_UninstallMessageBoxHeader", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Notification settings have been removed..
+ /// </summary>
+ public static string OptionsView_UninstallMessageBoxText {
+ get {
+ return ResourceManager.GetString("OptionsView_UninstallMessageBoxText", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Clear &amp; Uninstall.
+ /// </summary>
+ public static string OptionsView_UninstallToast {
+ get {
+ return ResourceManager.GetString("OptionsView_UninstallToast", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to ( Windows 10 Only! ).
+ /// </summary>
+ public static string OptionsView_Win10Only {
+ get {
+ return ResourceManager.GetString("OptionsView_Win10Only", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Send a notification to the Windows Taskbar..
+ /// </summary>
+ public static string OptionsView_WindowsNotification {
+ get {
+ return ResourceManager.GetString("OptionsView_WindowsNotification", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Windows Notifications.
+ /// </summary>
+ public static string OptionsView_WindowsNotificationsBanner {
+ get {
+ return ResourceManager.GetString("OptionsView_WindowsNotificationsBanner", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Default network port for worker:.
+ /// </summary>
+ public static string OptionsView_WorkerDefaultPort {
+ get {
+ return ResourceManager.GetString("OptionsView_WorkerDefaultPort", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Your system supports the 64bit version of HandBrake! This offers performance and stability improvements over this 32bit version.
 /// Please check the website for release notes..
 /// </summary>
@@ -3654,6 +4097,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to The default auto name path was not valid. {0} must not be before {1}.
+ /// </summary>
+ public static string OptionsViewModel_InvalidAutonamePath {
+ get {
+ return ResourceManager.GetString("OptionsViewModel_InvalidAutonamePath", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to A New Update is Available! Please check the website for release notes..
 /// </summary>
 public static string OptionsViewModel_NewUpdate {
@@ -3672,6 +4124,33 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Reset Settings.
+ /// </summary>
+ public static string OptionsViewModel_ResetHandBrake {
+ get {
+ return ResourceManager.GetString("OptionsViewModel_ResetHandBrake", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Are you sure you wish to reset all built-in presets?.
+ /// </summary>
+ public static string OptionsViewModel_ResetHandBrakePresetsQuestion {
+ get {
+ return ResourceManager.GetString("OptionsViewModel_ResetHandBrakePresetsQuestion", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Are you sure you wish to reset HandBrake to default settings?.
+ /// </summary>
+ public static string OptionsViewModel_ResetHandBrakeQuestion {
+ get {
+ return ResourceManager.GetString("OptionsViewModel_ResetHandBrakeQuestion", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Update Downloaded.
 /// </summary>
 public static string OptionsViewModel_UpdateDownloaded {
@@ -3690,6 +4169,17 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Before Updating:
+ ///- Make sure there are no pending encodes in the queue. 
+ ///- Backup or make a note of any custom presets you have created as they may not be fully compatible with newer versions..
+ /// </summary>
+ public static string OptionsViewModel_UpdateNotice {
+ get {
+ return ResourceManager.GetString("OptionsViewModel_UpdateNotice", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Update Service Unavailable. You can try downloading the update from https://handbrake.fr.
 /// </summary>
 public static string OptionsViewModel_UpdateServiceUnavailable {
@@ -3699,7 +4189,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to HandBrake requires a 64bit version of Windows 7 or later to run..
+ /// Looks up a localized string similar to HandBrake requires a 64bit version of Windows 10 or later to run..
 /// </summary>
 public static string OsBitnessWarning {
 get {
@@ -3708,7 +4198,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions..
+ /// Looks up a localized string similar to HandBrake requires Windows 10 or later to run. Version 0.9.9 (XP), 0.10.5 (Vista), 1.3.3 (7 and 8.x) were the last versions to support these older operating systems..
 /// </summary>
 public static string OsVersionWarning {
 get {
@@ -3726,6 +4216,78 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Black.
+ /// </summary>
+ public static string PadColour_Black {
+ get {
+ return ResourceManager.GetString("PadColour_Black", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Custom.
+ /// </summary>
+ public static string PadColour_Custom {
+ get {
+ return ResourceManager.GetString("PadColour_Custom", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to White.
+ /// </summary>
+ public static string PadColour_White {
+ get {
+ return ResourceManager.GetString("PadColour_White", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Custom (Not Limited).
+ /// </summary>
+ public static string PaddingMode_Custom {
+ get {
+ return ResourceManager.GetString("PaddingMode_Custom", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Fill (Surround).
+ /// </summary>
+ public static string PaddingMode_Fill {
+ get {
+ return ResourceManager.GetString("PaddingMode_Fill", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Height (Pillarbox).
+ /// </summary>
+ public static string PaddingMode_Height {
+ get {
+ return ResourceManager.GetString("PaddingMode_Height", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to None.
+ /// </summary>
+ public static string PaddingMode_None {
+ get {
+ return ResourceManager.GetString("PaddingMode_None", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Width (Letterbox).
+ /// </summary>
+ public static string PaddingMode_Width {
+ get {
+ return ResourceManager.GetString("PaddingMode_Width", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Queue Paused. Warning, the drive you are encoding to is low on disk space. Please free up some space and press start to continue. You can also adjust the minimum space level in preferences..
 /// </summary>
 public static string PauseOnLowDiskspace {
@@ -3744,6 +4306,78 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to 1080p HD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_1080p {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_1080p", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to 480p NTSC SD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_480p {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_480p", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to 2160p 4K Ultra HD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_4K {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_4K", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to 576p PAL SD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_576p {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_576p", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to 720p HD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_720p {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_720p", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to 4320p 8K Ultra HD.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_8K {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_8K", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Custom.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_custom {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_custom", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to None.
+ /// </summary>
+ public static string PictureSettingsResLimitModes_none {
+ get {
+ return ResourceManager.GetString("PictureSettingsResLimitModes_none", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Anamorphic:.
 /// </summary>
 public static string PictureSettingsView_Anamorphic {
@@ -3762,6 +4396,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Borders:.
+ /// </summary>
+ public static string PictureSettingsView_Borders {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_Borders", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Bottom.
 /// </summary>
 public static string PictureSettingsView_Bottom {
@@ -3771,7 +4414,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Cropping.
+ /// Looks up a localized string similar to Cropping:.
 /// </summary>
 public static string PictureSettingsView_Cropping {
 get {
@@ -3789,11 +4432,11 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Display Width:.
+ /// Looks up a localized string similar to Display Size:.
 /// </summary>
- public static string PictureSettingsView_DisplayWitdh {
+ public static string PictureSettingsView_DisplayWidth {
 get {
- return ResourceManager.GetString("PictureSettingsView_DisplayWitdh", resourceCulture);
+ return ResourceManager.GetString("PictureSettingsView_DisplayWidth", resourceCulture);
 }
 }
 
@@ -3807,7 +4450,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Keep Aspect Ratio.
+ /// Looks up a localized string similar to Automatic.
 /// </summary>
 public static string PictureSettingsView_KeepAR {
 get {
@@ -3825,16 +4468,34 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Modulus:.
+ /// Looks up a localized string similar to Max Height:.
 /// </summary>
- public static string PictureSettingsView_Modulus {
+ public static string PictureSettingsView_MaxHeight {
 get {
- return ResourceManager.GetString("PictureSettingsView_Modulus", resourceCulture);
+ return ResourceManager.GetString("PictureSettingsView_MaxHeight", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Output.
+ /// Looks up a localized string similar to Maximum Size:.
+ /// </summary>
+ public static string PictureSettingsView_MaxSize {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_MaxSize", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Max Width:.
+ /// </summary>
+ public static string PictureSettingsView_MaxWidth {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_MaxWidth", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Final Dimensions:.
 /// </summary>
 public static string PictureSettingsView_Output {
 get {
@@ -3843,7 +4504,34 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to PAR:.
+ /// Looks up a localized string similar to Fill:.
+ /// </summary>
+ public static string PictureSettingsView_Padding {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_Padding", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Colour:.
+ /// </summary>
+ public static string PictureSettingsView_PaddingColour {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_PaddingColour", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to RGB Value:.
+ /// </summary>
+ public static string PictureSettingsView_PaddingCustomColour {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_PaddingCustomColour", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Pixel Aspect:.
 /// </summary>
 public static string PictureSettingsView_PAR {
 get {
@@ -3852,6 +4540,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Resolution and Scaling:.
+ /// </summary>
+ public static string PictureSettingsView_ResAndScaling {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_ResAndScaling", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Resolution Limit:.
+ /// </summary>
+ public static string PictureSettingsView_ResLimit {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_ResLimit", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Right.
 /// </summary>
 public static string PictureSettingsView_Right {
@@ -3861,6 +4567,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Orientation and Cropping:.
+ /// </summary>
+ public static string PictureSettingsView_RotateAndCrop {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_RotateAndCrop", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Open Preview.
+ /// </summary>
+ public static string PictureSettingsView_SeePreview {
+ get {
+ return ResourceManager.GetString("PictureSettingsView_SeePreview", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Size.
 /// </summary>
 public static string PictureSettingsView_Size {
@@ -3870,11 +4594,11 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Source:.
+ /// Looks up a localized string similar to Source Dimensions:.
 /// </summary>
- public static string PictureSettingsView_Source {
+ public static string PictureSettingsView_SourceDimensions {
 get {
- return ResourceManager.GetString("PictureSettingsView_Source", resourceCulture);
+ return ResourceManager.GetString("PictureSettingsView_SourceDimensions", resourceCulture);
 }
 }
 
@@ -3888,7 +4612,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Width:.
+ /// Looks up a localized string similar to Scaled Size:.
 /// </summary>
 public static string PictureSettingsView_Width {
 get {
@@ -3897,7 +4621,25 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Display Size: {0}x{1}, PAR {2}x{3}.
+ /// Looks up a localized string similar to Aspect Ratio: {0}.
+ /// </summary>
+ public static string PictureSettingsViewModel_AspectRatioLabel {
+ get {
+ return ResourceManager.GetString("PictureSettingsViewModel_AspectRatioLabel", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Storage Size: {0}x{1} Display Size: {2}x{3} Aspect Ratio: {4}.
+ /// </summary>
+ public static string PictureSettingsViewModel_SourceInfo {
+ get {
+ return ResourceManager.GetString("PictureSettingsViewModel_SourceInfo", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Storage Size: {0}x{1}.
 /// </summary>
 public static string PictureSettingsViewModel_StorageDisplayLabel {
 get {
@@ -3991,6 +4733,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to (Default).
+ /// </summary>
+ public static string Preset_Default {
+ get {
+ return ResourceManager.GetString("Preset_Default", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Export to file.
 /// </summary>
 public static string Preset_Export {
@@ -4009,6 +4760,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to (Not Available).
+ /// </summary>
+ public static string Preset_NotAvailable {
+ get {
+ return ResourceManager.GetString("Preset_NotAvailable", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Official.
 /// </summary>
 public static string Preset_Official {
@@ -4057,6 +4817,60 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Categories.
+ /// </summary>
+ public static string PresetDisplayMode_Category {
+ get {
+ return ResourceManager.GetString("PresetDisplayMode_Category", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Flat.
+ /// </summary>
+ public static string PresetDisplayMode_Flat {
+ get {
+ return ResourceManager.GetString("PresetDisplayMode_Flat", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Floating Treeview.
+ /// </summary>
+ public static string PresetDisplayMode_FloatingPanel {
+ get {
+ return ResourceManager.GetString("PresetDisplayMode_FloatingPanel", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Partially Flat.
+ /// </summary>
+ public static string PresetDisplayMode_Partial {
+ get {
+ return ResourceManager.GetString("PresetDisplayMode_Partial", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Delete Preset.
+ /// </summary>
+ public static string PresetManagerView_Delete {
+ get {
+ return ResourceManager.GetString("PresetManagerView_Delete", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Manage Presets.
+ /// </summary>
+ public static string PresetManger_Title {
+ get {
+ return ResourceManager.GetString("PresetManger_Title", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Custom.
 /// </summary>
 public static string PresetPictureSettingsMode_Custom {
@@ -4084,6 +4898,19 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to The preset you have selected is not available for use on this system.
+ ///
+ ///This is typically an indication that your system does not support the hardware required to utilise it.
+ ///
+ ///Please choose a different preset..
+ /// </summary>
+ public static string Presets_NotAvailableForUse {
+ get {
+ return ResourceManager.GetString("Presets_NotAvailableForUse", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to HandBrake is unable to upgrade your presets file to a new version format.
 ///Your preset file will be archived and new one created. You will need to re-create your own presets..
 /// </summary>
@@ -4121,6 +4948,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to The category name you entered already exists. Please choose a different name..
+ /// </summary>
+ public static string PresetService_CategoryAlreadyExists {
+ get {
+ return ResourceManager.GetString("PresetService_CategoryAlreadyExists", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The category name was empty. Please provide a name..
+ /// </summary>
+ public static string PresetService_CategoryNameEmpty {
+ get {
+ return ResourceManager.GetString("PresetService_CategoryNameEmpty", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Your presets file contained built-in presets. The import function does not support importing these. Please use &apos;Presets Menu -&gt; Reset Built In-Presets&apos; to restore the standard presets.
 ///
 ///Where supported, any user presets will have been imported..
@@ -4378,7 +5223,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Advanced:.
+ /// Looks up a localized string similar to Video Options:.
 /// </summary>
 public static string QueueView_Advanced {
 get {
@@ -4396,6 +5241,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Average Encoding Speed:.
+ /// </summary>
+ public static string QueueView_AverageEncodeSpeed {
+ get {
+ return ResourceManager.GetString("QueueView_AverageEncodeSpeed", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Clear All.
 /// </summary>
 public static string QueueView_ClearAll {
@@ -4468,7 +5322,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Encode Time:.
+ /// Looks up a localized string similar to Encode Duration:.
 /// </summary>
 public static string QueueView_Duration {
 get {
@@ -4513,7 +5367,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Filesize: .
+ /// Looks up a localized string similar to Output Filesize: .
 /// </summary>
 public static string QueueView_FileSize {
 get {
@@ -4522,6 +5376,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Filters:.
+ /// </summary>
+ public static string QueueView_FilterSettings {
+ get {
+ return ResourceManager.GetString("QueueView_FilterSettings", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Import Queue.
 /// </summary>
 public static string QueueView_Import {
@@ -4531,6 +5394,105 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Please select a single job to view summary information..
+ /// </summary>
+ public static string QueueView_JobInformationNotAvailable {
+ get {
+ return ResourceManager.GetString("QueueView_JobInformationNotAvailable", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Job Status:.
+ /// </summary>
+ public static string QueueView_JobStatus {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Cancelled.
+ /// </summary>
+ public static string QueueView_JobStatus_Cancelled {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_Cancelled", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Complete.
+ /// </summary>
+ public static string QueueView_JobStatus_Complete {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_Complete", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Invalid Settings. Check log for details..
+ /// </summary>
+ public static string QueueView_JobStatus_InitFailed {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_InitFailed", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Invalid Input. Check log for details..
+ /// </summary>
+ public static string QueueView_JobStatus_InvalidInput {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_InvalidInput", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Status Unknown. Check log for details..
+ /// </summary>
+ public static string QueueView_JobStatus_NoErrorCode {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_NoErrorCode", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Errors detected whist trying to read source..
+ /// </summary>
+ public static string QueueView_JobStatus_ReadError {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_ReadError", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Unknown failure. Check log for details..
+ /// </summary>
+ public static string QueueView_JobStatus_Unknown {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_Unknown", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Worker Crashed. Check log for details..
+ /// </summary>
+ public static string QueueView_JobStatus_WorkerCrash {
+ get {
+ return ResourceManager.GetString("QueueView_JobStatus_WorkerCrash", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Output Length:.
+ /// </summary>
+ public static string QueueView_Length {
+ get {
+ return ResourceManager.GetString("QueueView_Length", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to The log will be available after the encode completes..
 /// </summary>
 public static string QueueView_LogNotAvailableYet {
@@ -4540,6 +5502,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Move To Bottom.
+ /// </summary>
+ public static string QueueView_MoveToBottom {
+ get {
+ return ResourceManager.GetString("QueueView_MoveToBottom", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Move To Top.
+ /// </summary>
+ public static string QueueView_MoveToTop {
+ get {
+ return ResourceManager.GetString("QueueView_MoveToTop", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Not Available.
 /// </summary>
 public static string QueueView_NotAvailable {
@@ -4576,7 +5556,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Pause Queue.
+ /// Looks up a localized string similar to Pause.
 /// </summary>
 public static string QueueView_Pause {
 get {
@@ -4648,6 +5628,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Preset:.
+ /// </summary>
+ public static string QueueView_SelectedPresets {
+ get {
+ return ResourceManager.GetString("QueueView_SelectedPresets", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Source:.
 /// </summary>
 public static string QueueView_Source {
@@ -4657,6 +5646,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Source Length:.
+ /// </summary>
+ public static string QueueView_SourceLength {
+ get {
+ return ResourceManager.GetString("QueueView_SourceLength", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Start Queue.
 /// </summary>
 public static string QueueView_Start {
@@ -4693,6 +5691,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Stop.
+ /// </summary>
+ public static string QueueView_Stop {
+ get {
+ return ResourceManager.GetString("QueueView_Stop", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Subtitles:.
 /// </summary>
 public static string QueueView_Subtitles {
@@ -4720,6 +5727,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Output Bitrate:.
+ /// </summary>
+ public static string QueueView_VideoOutputBitrate {
+ get {
+ return ResourceManager.GetString("QueueView_VideoOutputBitrate", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to When Done:.
 /// </summary>
 public static string QueueView_WhenDone {
@@ -4731,9 +5747,9 @@
 /// <summary>
 /// Looks up a localized string similar to Are you sure you wish to clear the queue?.
 /// </summary>
- public static string QueueViewModel_ClearQueueConfrimation {
+ public static string QueueViewModel_ClearQueueConfirmation {
 get {
- return ResourceManager.GetString("QueueViewModel_ClearQueueConfrimation", resourceCulture);
+ return ResourceManager.GetString("QueueViewModel_ClearQueueConfirmation", resourceCulture);
 }
 }
 
@@ -4747,11 +5763,29 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to of source file.
+ /// </summary>
+ public static string QueueViewModel_DifferenceText {
+ get {
+ return ResourceManager.GetString("QueueViewModel_DifferenceText", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Are you sure you wish to edit this job? It will be removed from the queue and sent to the main window..
 /// </summary>
- public static string QueueViewModel_EditConfrimation {
+ public static string QueueViewModel_EditConfirmation {
+ get {
+ return ResourceManager.GetString("QueueViewModel_EditConfirmation", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Edit Job?.
+ /// </summary>
+ public static string QueueViewModel_EditJob {
 get {
- return ResourceManager.GetString("QueueViewModel_EditConfrimation", resourceCulture);
+ return ResourceManager.GetString("QueueViewModel_EditJob", resourceCulture);
 }
 }
 
@@ -4766,6 +5800,25 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Unable to read the queue file..
+ /// </summary>
+ public static string QueueViewModel_ImportFail {
+ get {
+ return ResourceManager.GetString("QueueViewModel_ImportFail", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to The file may be corrupted or from an earlier version of HandBrake. 
+ ///Only queue files from the current version are supported..
+ /// </summary>
+ public static string QueueViewModel_ImportFailSolution {
+ get {
+ return ResourceManager.GetString("QueueViewModel_ImportFailSolution", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to This encode is currently in progress. If you delete it, the encode will be stopped. Are you sure you wish to proceed?.
 /// </summary>
 public static string QueueViewModel_JobCurrentlyRunningWarning {
@@ -4820,6 +5873,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Not Available.
+ /// </summary>
+ public static string QueueViewModel_NotAvailable {
+ get {
+ return ResourceManager.GetString("QueueViewModel_NotAvailable", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Please make sure you have appropriate file associations setup in Windows to allow it to open this file with a supported video player.
+ /// </summary>
+ public static string QueueViewModel_PlayFileErrorSolution {
+ get {
+ return ResourceManager.GetString("QueueViewModel_PlayFileErrorSolution", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Queue.
 /// </summary>
 public static string QueueViewModel_Queue {
@@ -4856,15 +5927,6 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to The Queue has been paused. The currently running job will run to completion and no further jobs will start..
- /// </summary>
- public static string QueueViewModel_QueuePauseNotice {
- get {
- return ResourceManager.GetString("QueueViewModel_QueuePauseNotice", resourceCulture);
- }
- }
- 
- /// <summary>
 /// Looks up a localized string similar to Queue Paused.
 /// </summary>
 public static string QueueViewModel_QueuePending {
@@ -4901,6 +5963,33 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Off.
+ /// </summary>
+ public static string RightToLeft_Off {
+ get {
+ return ResourceManager.GetString("RightToLeft_Off", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Text Only.
+ /// </summary>
+ public static string RightToLeft_TextOnly {
+ get {
+ return ResourceManager.GetString("RightToLeft_TextOnly", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Entire User Interface.
+ /// </summary>
+ public static string RightToLeft_WholeInterface {
+ get {
+ return ResourceManager.GetString("RightToLeft_WholeInterface", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to An error occurred when trying to stop the scan. Please restart HandBrake..
 /// </summary>
 public static string ScanService_ScanStopFailed {
@@ -4946,7 +6035,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Add Track.
+ /// Looks up a localized string similar to Tracks.
 /// </summary>
 public static string Shared_AddTrack {
 get {
@@ -4975,9 +6064,18 @@
 /// <summary>
 /// Looks up a localized string similar to Selected Languages:.
 /// </summary>
- public static string Shared_ChosenLangages {
+ public static string Shared_ChosenLanguages {
 get {
- return ResourceManager.GetString("Shared_ChosenLangages", resourceCulture);
+ return ResourceManager.GetString("Shared_ChosenLanguages", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Collapse All.
+ /// </summary>
+ public static string Shared_CollapseAll {
+ get {
+ return ResourceManager.GetString("Shared_CollapseAll", resourceCulture);
 }
 }
 
@@ -4991,6 +6089,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Expand All.
+ /// </summary>
+ public static string Shared_ExpandAll {
+ get {
+ return ResourceManager.GetString("Shared_ExpandAll", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Reload.
 /// </summary>
 public static string Shared_ReloadDefaults {
@@ -5163,6 +6270,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Missing file &quot;hb.dll&quot;. Please re-install..
+ /// </summary>
+ public static string Startup_HbDllMissing {
+ get {
+ return ResourceManager.GetString("Startup_HbDllMissing", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to HandBrake&apos;s engine failed to initialise. This is often caused by out of date GPU drivers.\n Please update the GPU drivers for any onboard and discrete graphics your system has..
 /// </summary>
 public static string Startup_InitFailed {
@@ -5181,7 +6297,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Unable to delete previous preview file. You may need to restart the application..
+ /// Looks up a localized string similar to Unable to delete previous preview file. You may still have a preview open in your media player. Please close this..
 /// </summary>
 public static string StaticPreview_UnableToDeletePreview {
 get {
@@ -5190,6 +6306,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Cancel.
+ /// </summary>
+ public static string StaticPreviewView_CancelPreview {
+ get {
+ return ResourceManager.GetString("StaticPreviewView_CancelPreview", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Duration:.
 /// </summary>
 public static string StaticPreviewView_Duration {
@@ -5199,20 +6324,20 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Live Preview.
+ /// Looks up a localized string similar to Fine Tune Picture Settings.
 /// </summary>
- public static string StaticPreviewView_LivePreview {
+ public static string StaticPreviewView_FineTuning {
 get {
- return ResourceManager.GetString("StaticPreviewView_LivePreview", resourceCulture);
+ return ResourceManager.GetString("StaticPreviewView_FineTuning", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Preview Rotation and Flip.
+ /// Looks up a localized string similar to Live Preview.
 /// </summary>
- public static string StaticPreviewView_PreviewRotationFlip {
+ public static string StaticPreviewView_LivePreview {
 get {
- return ResourceManager.GetString("StaticPreviewView_PreviewRotationFlip", resourceCulture);
+ return ResourceManager.GetString("StaticPreviewView_LivePreview", resourceCulture);
 }
 }
 
@@ -5226,6 +6351,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Show crop adjustment controls..
+ /// </summary>
+ public static string StaticPreviewView_ShowPictureSettingsAdjustment {
+ get {
+ return ResourceManager.GetString("StaticPreviewView_ShowPictureSettingsAdjustment", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Preview ({0}% actual size).
 /// </summary>
 public static string StaticPreviewView_Title {
@@ -5235,7 +6369,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Use system default video player.
+ /// Looks up a localized string similar to Prefer system default video player.
 /// </summary>
 public static string StaticPreviewView_UseSystemDefault {
 get {
@@ -5271,21 +6405,20 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Unable to detect VLC Player. 
- ///Please make sure VLC is installed and the directory specified in HandBrake&apos;s options is correct. (See: &quot;Tools Menu &gt; Preferences &gt; General&quot;).
+ /// Looks up a localized string similar to Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details..
 /// </summary>
- public static string StaticPreviewViewModel_UnableToFindVLC {
+ public static string StaticPreviewViewModel_UnableToPlayFile {
 get {
- return ResourceManager.GetString("StaticPreviewViewModel_UnableToFindVLC", resourceCulture);
+ return ResourceManager.GetString("StaticPreviewViewModel_UnableToPlayFile", resourceCulture);
 }
 }
 
 /// <summary>
- /// Looks up a localized string similar to Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details..
+ /// Looks up a localized string similar to .
 /// </summary>
- public static string StaticPreviewViewModel_UnableToPlayFile {
+ public static string String1 {
 get {
- return ResourceManager.GetString("StaticPreviewViewModel_UnableToPlayFile", resourceCulture);
+ return ResourceManager.GetString("String1", resourceCulture);
 }
 }
 
@@ -5396,7 +6529,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Configure Automatic Subtitle Selections.
+ /// Looks up a localized string similar to Automatic Subtitle Selections.
 /// </summary>
 public static string SubtitlesDefaultsView_PaneTitle {
 get {
@@ -5477,7 +6610,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Selection Behavior.
+ /// Looks up a localized string similar to Selection Behavior ....
 /// </summary>
 public static string SubtitlesViewModel_ConfigureDefaults {
 get {
@@ -5585,6 +6718,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Colourspace.
+ /// </summary>
+ public static string SummaryView_Colourspace {
+ get {
+ return ResourceManager.GetString("SummaryView_Colourspace", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Deblock.
 /// </summary>
 public static string SummaryView_Deblock {
@@ -5594,6 +6736,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Default.
+ /// </summary>
+ public static string SummaryView_Default {
+ get {
+ return ResourceManager.GetString("SummaryView_Default", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Detelecine.
 /// </summary>
 public static string SummaryView_Detelecine {
@@ -5612,6 +6763,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Forced.
+ /// </summary>
+ public static string SummaryView_Forced {
+ get {
+ return ResourceManager.GetString("SummaryView_Forced", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Grayscale.
 /// </summary>
 public static string SummaryView_Grayscale {
@@ -5621,6 +6781,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Passthru Common Metadata.
+ /// </summary>
+ public static string SummaryView_MetadataPassthru {
+ get {
+ return ResourceManager.GetString("SummaryView_MetadataPassthru", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to No Audio Tracks.
 /// </summary>
 public static string SummaryView_NoAudioTracks {
@@ -5675,6 +6844,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to (padded).
+ /// </summary>
+ public static string SummaryView_Padded {
+ get {
+ return ResourceManager.GetString("SummaryView_Padded", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Preview {0} of {1}.
 /// </summary>
 public static string SummaryView_PreviewInfo {
@@ -5693,6 +6871,24 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Same as source.
+ /// </summary>
+ public static string SummaryView_SameAsSource {
+ get {
+ return ResourceManager.GetString("SummaryView_SameAsSource", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Source Preview:.
+ /// </summary>
+ public static string SummaryView_SourcePreview {
+ get {
+ return ResourceManager.GetString("SummaryView_SourcePreview", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to storage.
 /// </summary>
 public static string SummaryView_storage {
@@ -5748,6 +6944,15 @@
 }
 
 /// <summary>
+ /// Looks up a localized string similar to Enter a name: .
+ /// </summary>
+ public static string TextEntryView_EnterName {
+ get {
+ return ResourceManager.GetString("TextEntryView_EnterName", resourceCulture);
+ }
+ }
+ 
+ /// <summary>
 /// Looks up a localized string similar to Unknown Error.
 /// </summary>
 public static string UnknownError {
@@ -5786,9 +6991,9 @@
 /// <summary>
 /// Looks up a localized string similar to A problem occurred when trying to save your preferences..
 /// </summary>
- public static string UserSettings_AnErrorOccured {
+ public static string UserSettings_AnErrorOccurred {
 get {
- return ResourceManager.GetString("UserSettings_AnErrorOccured", resourceCulture);
+ return ResourceManager.GetString("UserSettings_AnErrorOccurred", resourceCulture);
 }
 }
 
@@ -5927,7 +7132,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Video Codec:.
+ /// Looks up a localized string similar to Video Encoder:.
 /// </summary>
 public static string VideoView_Codec {
 get {
@@ -6017,7 +7222,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Optimise Video:.
+ /// Looks up a localized string similar to Encoder Options: .
 /// </summary>
 public static string VideoView_OptimiseVideo {
 get {
@@ -6035,7 +7240,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Quality.
+ /// Looks up a localized string similar to Quality: .
 /// </summary>
 public static string VideoView_Quality {
 get {
@@ -6062,7 +7267,7 @@
 }
 
 /// <summary>
- /// Looks up a localized string similar to Video.
+ /// Looks up a localized string similar to Video: .
 /// </summary>
 public static string VideoView_Video {
 get {
@@ -6150,5 +7355,14 @@
 return ResourceManager.GetString("WindowTitleStatus", resourceCulture);
 }
 }
+ 
+ /// <summary>
+ /// Looks up a localized string similar to Yes.
+ /// </summary>
+ public static string Yes {
+ get {
+ return ResourceManager.GetString("Yes", resourceCulture);
+ }
+ }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.co.resx Added

@@ -0,0 +1,2568 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>A lista sana di i parametri di cudificatore : 
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>Riduce l’impiegu CPU di u discudificatore.
+
+Attivate st’ozzione s’è u vostru apparechju ùn leghje micca bè u schedariu d’esciuta. (i.e. perdita di fiure)</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>Fate casu : RF 0 vole dì senza perdita !</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>Un valore à 0 vole dì senza perdita è per què, u schedariu d’esciuta serà più maiò chì quellu di a fonte, for di s’è a fonte era dinù senza perdita. 
+
+E scale di x264 è x265 sò logaritmiche, è valori più chjuchi currispondenu à una qualità più maiò. 
+
+Dunque, chjuchi aumenti di valore aumentanu prugressivamente a dimensione di u schedariu d’esciuta.</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>Pudete eventualmente allucà preferenze di fiura cù sta prerigatura. Ci hè 3 modi :
+
+Alcunu : E preferenze di fiurà ùn sò micca allucate cù sta prerigatura. À u caricamentu d’una fonte, e preferenze steranu tale quale in i cunfini di a risuluzione di a fonte. fQuessa affetta dinù Anamorficu, mudullu, inquadratura, ecc.
+
+Persunalizatu : Pudete eventualmente definisce una larghezza è un’altezza massima. S’è vo fate què, a cudificazione serà inferiore o uguale à sti valori. L’ozzione « Cunservà e prupurzioni » serà autumaticamente attivata.
+
+Fonte massima : Cudificà sempre à a risuluzione di a fonte quand’ella hè pussibule.</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>Stu prugramma hè liberu ; pudete ridistribuiscellu è/o mudificallu
+dapervoi secondu i termini di a Licenza Publica Generale GNU tale
+chì publicata da a Free Software Foundation ; sia a versione 2 di
+a licenza, o s’è voi preferite, una versione più recente.
+
+Stu prugramma hè distribuitu cù a sperenza d’esse ghjuvevule, ma SENZA NISUNA ASSICURANZA ; senza manc’una assicuranza di CUMMERCIALISAZIONE o di CURRISPONDENZA À UN IMPIEGU PARTICULARE. Fighjate a licenza GNU General Public License per sapene di più.
+
+Duveriate avè ricevutu una copia di a licenza GNU General Public License
+cù stu prugramma ; osinnò, ci vole à scrive à : Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>Avertimentu : U numinà autumaticu di i schedarii ùn hè micca attivu. Ci vole à attivallu in l’ozzioni.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>Avertimentu : Ùn avete micca attivatu a cunfigurazione autumatica di a selezzione di e traccie audio è di i sottutituli. Pudete cunfigurà in l’ozzioni u cumpurtamentu predefinitu di a selezzione di e traccie.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>E prerigature integrate sò state rimesse d’origine.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>Reinizializazione compia</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Qualità alta |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Qualità debule</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Qualità placebo |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>Sbagliu</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>Ci vole à attivà u numinà autumaticu di i schedarii È sceglie un chjassu predefinitu in e preferenze nanzu di pudè aghjunghje à a fila d’attesa.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>Avertimentu</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>Site sicuru ?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake hè in corsu di cudificazione.</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>Ci sò travagli in a fila d’attesa cù u listessu chjassu di destinazione. Ci vole à sceglie un chjassu sfarente per stu travagliu.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value> {0} travagli in attesa</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>Nova prerigatura predefinita : {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>Un rinnovu recente hè dispunibule. Andate à u listinu Attrezzi &gt; Ozzioni per installalu</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>Alcuna prerigatura selezziunata.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>Ùn pudete micca mudificà e prerigature integrate. Ci vole à selezziunà una di e vostre proprie prerigature.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>Ci vole à selezziunà un cartulare.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>Approntu di a cudificazione…</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>Ùn pudete micca impurtà una prerigatura cù u listessu nome ch’una prerigatura integrata.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>A prerigatura « {0} » esiste dighjà. Vulete rimpiazzalla ?</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>Prerigature</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>Site sicuru di vulè mudificà a prerigatura selezziunata ?</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>A prerigatura hè stata mudificata cù e vostre preferenze attuale.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake hà determinatu chì e vostre prerigature integrate sò anticogne… Ste prerigature anu da esse rinnovate avà.
+E vostre prerigature persunalizate ùn sò micca state mudificate ; forse ci vulerà à ricrealle, sqassendule è re-aghjunghjendule. 
+U schedariu precedente user_presets.xml hè statu accantatu.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>Fila d’attesa compia</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>Analisa abbandunata.</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>Analisa compia</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>Fiascu di l’analisa : </value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>Fiascu di l’analisa… Ci vole à fighjà u ghjurnale d’attività per sapene di più.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>Analisa di a fonte, aspittate per piacè…</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>Analisa di u titulu {0} nant’à {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>Prima, ci vole à analizà una fonte è definisce u vostru travagliu nanzu di principià una cudificazione. Appughjate nant’à u buttone « Fonte » in a barre d’attrezzi per cuntinuà.</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>Assicuratevvi chì voi abbiate selezziunatu una di e vostre proprie prerigature. Ci vole à sapè chì ùn pudete micca espurtà e prerigature integrate.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>Ci vole à selezziunà una prerigatura à mudificà.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>Selezziunate « Apre a fonte » per cuntinuà</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} travagli in attesa</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>Avertimentu</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>Rimpiazzallu ?</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>Dumanda</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>Prontu</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>Mudificatu</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Versione di a prerigatura</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>A prerigatura chì vo circate à impurtà vene d’una versione sfarente d’HandBrake. 
+ Forse ùn serà micca pussibule d’impurtà tutti i valori di sta prerigatura. 
+
+Vulete cuntinuà ?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Impussibule d’impurtà a prerigatura !</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Impussibule d’impurtà a prerigatura chì pare esse alterata o vene d’una vechja versione d’HandBrake.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>Prima, ci vole à definisce u chjassu di destinazione di u schedariu d’esciuta nanzu d’aghjunghjelu à a fila d’attesa.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>U chjassu di destinazione pruvistu cuntene caratteri inaccettevule è ùn serà micca mudificatu.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>Fighjulata {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Fighjulata (à a scala)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>Esciuta : {0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>U furmatu di u schedariu d’esciuta. In più di i caratteri accettati da u sistema di schedariu, pudete impiegà i campi di sustituzione seguente chì seranu rimpiazzati quandu vo cambiate di titulu o analizate una fonte.
+
+Ozzioni mudificate direttamente : {source} {title} {chapters} 
+Ozzioni tramandate : {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Quesse cambianu solu quandu voi analizate una nova fonte, cambiate di titulu o di capitulu)</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>Ozzioni cumplementarie dispunibule : {source_path} o {source_folder_name} o {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>Ùn pudete micca cudificà ver di un schedariu cù u listessu chjassu è u listessu nome chì u schedariu di a fonte. Ci vole à mudificà u nome di schedariu di destinazione per ch’ellu ùn currispondi più à u schedariu di a fonte. </value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>U vostru sistema hà impeditu à HandBrake di lancià un navigatore web.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>Pudete sempre accede à e pagine d’aiutu direttamente da u situ web : https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>Impussibule d’impurtà a prerigatura selezziunata.</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>Forse a prerigatura hè alterata o vene d’una vechja versione d’HandBrake, ciò ch’ùn hè micca accettatu. 
+E prerigature chì venenu da vechje versioni devenu esse create torna in a versione attuale.</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>Parametri addiziunale d’espertu chì ponu esse trasmessi à u cudificatore video.</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>Alcunu - Solu e traccie per quelle u cuntenentu ùn accetta micca u furmatu seranu intarsiate.
+Traccia audio straniera - A traccia audio straniera serà intarsiata s’ella hè dispunibule. 
+Prima traccia - A prima traccia serà intarsiata.
+Audio straniera preferita, osinnò Prima traccia - A traccia audio straniera serà intarsiata s’ella esiste, osinnò a prima traccia serà scelta.</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>Cumpatibilità di sottutituli WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>WebM in HandBrake accetta solu i sottutituli intarsiati.
+
+Ci vuleria à cambià e vostre selezzione di sottutituli.
+
+S’è vo cuntinuate, i vostri sottutituli micca intarsiati seranu persi.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>Alcuna fonte o titulu ùn hè statu trovu.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake ùn puderà micca cudificà a fonte selezziunata perchè ùn hà micca trovu di fonte accettevule cù tituli à cudificà. E cagioni pussibule sò :
+- A durata d’ogni titulu di a fonte hè più corta chì l’ozzione di sogliu « Durata minima » in « Ozzioni &gt; Espertu ». 
+- U schedariu di fonte ùn hè micca un schedariu video accettevule o si trova in un furmatu scunnisciutu da HandBrake.
+- U schedariu di fonte pò esse prutettu contr’à a copia o cuntene un dirittu DRM. Ci vole à sapè ch’HandBrake ùn permette micca di squassà e prutezzioni contr’à a copia.
+
+U ghjurnale d’attività puderia cuntene infurmazioni addiziunale.</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>Fila d’attesa{0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>Principià a cudificazione</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>Principià a fila d’attesa</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>Ùn pudete micca squassà a prerigatura predefinita. Prima, ci vole à sceglie un’altra prerigatura predefinita.</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>Site sicuru di vulè squassà a prerigatura : </value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Cudificazione : Passu {0} nant’à {1}, {2:00.00}%, FPS : {3:000.0}, FPS mediana : {4:000.0}, Tempu rimanente : {5}, Trascorsu : {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>Una prerigatura deve avè un nome. Ci vole à riempie u campu di u nome di prerigatura.</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>Una prerigatura cù stu nome esiste dighjà. Vulete rimpiazzalla ?</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>Prima, ci vole à analizà una fonte per impiegà l’ozzione « Fonte massima ».</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>I campi persunalizati Larghezza o Altezza devenu esse riimpiuti per impiegà l’ozzione « Persunalizatu ».</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>Impussibule d’aghjunghje una prerigatura</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>Sbagliu scunnisciutu</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>Audio predefinitu</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>Traccie audio</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Selezzione di cumpurtamentu</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>Rivene à e traccie</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>Impussibule d’arregistrà u schedariu di marcatori di capitulu ! </value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>I nomi di marcatore di capitulu ùn seranu micca arregistrati in a vostra cudificazione.</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>L’azzione seguente « {0} » si farà in {1} seconde.</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>S’è u penseru cuntinueghja, pruvate di rilancià HandBrake.</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>Ùn ci hè mancu un’altra infurmazione di dispunibule per stu sbagliu.</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>Un sbagliu scunnisciutu hè accadutu.</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>Un rinnovu recente hè dispunibule ! Ci vole à cunsultà u situ web per fighjà e note di versione.</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>U vostru sistema accetta a versione 64bit d’HandBrake ! Sta versione permette perfurmenze è stabilità più belle chì a versione 32bit.
+ Ci vole à cunsultà u situ web per fighjà e note di versione.</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>À st’ora, ùn ci hè alcunu rinnovu recente.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>Rinnovu scaricatu</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>Serviziu di rinnovu micca dispunibule. Pudete pruvà di scaricà u rinnovu da u situ https://handbrake.fr</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>Rinnovu fiascu. Pudete pruvà di scaricà u rinnovu da u situ https://handbrake.fr</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>Dimensione d’allucamentu : {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>Aghjunghje à a fila d’attesa</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>Alcuna cudificazione in attesa</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>Ùn ci hè alcunu travagliu di cudificazione in corsu</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>Fila d’attesa</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>Site sicuru di vulè viutà a fila d’attesa ?</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>Cunfirmà</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} travagli in attesa</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>Fila d’attesa interrotta</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>Site sicuru di vulè squassà i travagli selezziunati ?</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>Sta cudificazione hè in corsu. S’è vo a squassate, a cudificazione serà piantata. Site sicuru di vulè fà què ?</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>Ùn ci hè alcunu travagliu in attesa.</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>Site sicuru di vulè mudificà stu travagliu ? Serà cacciatu da a fila d’attesa è mandatu ver di a finestra principale.</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>Fila d’attesa pronta</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>A fila d’attesa ùn hè micca in corsu d’esecuzione</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>Fila d’attesa compia</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>Ultimu travagliu in attesa compiu</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>Fila d’attesa principiata</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>Cudificazione : Passu {0} nant’à {1}, {2:00.00}%, FPS : {3:000.0}, FPS mediana : {4:000.0}, Tempu rimanente : {5}, Trascorsu : {6:g\:oo\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>Una cudificazione hè in corsu d’esecuzione. L’esce d’HandBrake pianterà sta cudificazione.
+Site sicuru di vulè esce d’HandBrake ?</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>Fighjulata di a fiura</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>Impussibule di squassà u schedariu di fighjulata precedente. Forse, avete un schedariu di fighjulata sempre apertu in u vostru lettore multimedia. Ci vole à chjodelu.</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>Da prima, ci vole à analizà una fonte è definisce a vostra cudificazione nanzu di creà una fighjulata.</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>Impussibule di truvà u schedariu di fighjulata. U schedariu hè statu squassatu o a cudificazione hè fiasca. Fighjate u ghjurnale d’attività per sapene di più.</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>Ci hè dighjà una cudificazione video in corsu ! HandBrake pò cudificà una sola video in una volta.</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>Sottutituli predefiniti</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>Traccie di sottutitulu</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>Rivene à e traccie</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Selezzione di cumpurtamentu</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>Schedariu archiviatu :</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>Impussibule di caricà e prerigature.</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake ùn hà micca pussutu caricà u schedariu di prerigature. Forse, hè statu creatu da una vechja versione oramai più accettata d’HandBrake o ancu alteratu. 
+
+U vostru vechju schedariu di prerigature hè statu archiviatu :</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> cù {0} sbaglii o abbandoni abbentati.</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>Spaziu discu debule</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>Avertimentu : ùn ci hè abbastanza spaziu di discu. HandBrake ùn puderà compie sta cudificazione s’ellu ùn ci hè abbastanza spaziu di discu. </value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>A linea {0} hè inaccetevule. Ùn ci serà nunda d’impurtatu.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>Impussibule d’impurtà u schedariu di capitulu</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>Tutte e linee d’un schedariu di capitulu devenu cuntene omancu 2 culonne di dati</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>A prima culonna d’un schedariu di capitulu deve cuntene solu un numeru interu superiore à zeru (0)</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>I schedarii di capitulu di tipu « {0} » ùn sò micca accettati à st’ora.</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>Tipu di schedariu di capitulu micca accettatu</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>Infurmazioni di capitulu inaccettevule in u media di fonte</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>U numeru di capituli nant’à u media di fonte
+è quellu in u schedariu d’entrata ùn currispondenu micca ({0} vs {1}).
+
+Vulete impurtà i nomi di capitulu quantunque ?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>U numeru di capituli nant’à u media di fonte
+è quellu in u schedariu d’entrata ùn currispondenu micca ({0} vs {1}).
+
+Vulete impurtà i nomi di capitulu quantunque ?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>U numeru di capituli ùn currisponde micca trà u schedariu di fonte è quellu d’entrata</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>A durata di i capituli nant’à u media di fonte
+è quella in u schedariu d’entrata sò assai sfarente.
+
+Ghjè sicuramente chì stu schedariu di capitulu fussi creatu da un media di fonte sfarente.
+
+Site sicuru di vulè impurtà i nomi di capitulu ?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>A durata di capitulu ùn currisponde micca trà u schedariu di fonte è quella d’entrata</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>Un sbagliu hè accadutu pruvendu di piantà l’analisa. Ci vole à rilancià HandBrake.</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake ùn pò micca attualizà u vostru schedariu di prerigature ver di u furmatu di a nova versione.
+U vostru schedariu di prerigatura hà da esse archiviatu è un novu hà da esse creatu. Duverete creà torna e vostre proprie prerigature.</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>Forse, tutte e preferenze chì vo avete cambiate duveranu esse rimesse d’origine à u prossimu lanciu d’HandBrake.</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>Un sbagliu hè accadutu pruvendu d’arregistrà e vostre preferenze.</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>Avertimentu : e vostre preferenze sò state rimesse d’origine !</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>U vostru schedariu di preferenze persunalizate era inaccessibile o alteratu. E preferenze sò state rimesse à i so valori d’origine.</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>Impussibule di caricà u schedariu di e preferenze persunalizate : {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>U vostru schedariu di preferenze persunalizate pare esse inaccessibile o alteratu. Forse, duverete squassà u schedariu è lascià HandBrake creane un novu.</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>U cartulare d’esciuta chì vo avete sceltu ùn esiste micca, o ùn avete micca u permessu di scriveci schedarii.</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>Creà u cartulare ?</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>U cartulare, in quellu circate à scrive, ùn esiste micca. Vulete chì HandBrake crei quellu cartulare ?
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>Impussibule di lancià u cartulare di destinazione.</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>Ci vole à verificà chì vo avete un cartulare di destinazione accettevule.</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>Passu di trattamentu {0} nant’à {1}, (Analisa di i sottutituli) {2:00.00}%, Tempu d’analisa rimanente : {3}, Trascorsu : {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>Alcuna infurmazione cumplementaria</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, Passu {2} nant’à {3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, Passu {2} nant’à {3}
+Tempu rimanente : {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>Fila d’attesa interrotta. Avertimentu : ùn ci hè abbastanza spaziu di discu nant’à u lettore per fà a cudificazione. Ci vole à liberà qualchì spaziu è appughjate nant’à Principià per cuntinuà. Pudete ancu adattà u livellu minimu di spaziu in e preferenze.</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>Fila d’attesa interrotta</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>Fila d’attesa interrotta</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>Ùn ci hè abbastanza spaziu di discu per u vostru cartulare di destinazione. 
+
+Pudete cunfigurà in e preferenze à chì livellu st’alerta deve accade. 
+
+Vulete cuntinuà ? </value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>Impussibule di reinizià u statu di u travagliu perchè ùn hè micca in un statu « Sbagliu » o « Compiu ».</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>Impussibule di risturà u schedariu di fila d’attesa.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>Forse u schedariu hè alteratu o vene d’una vechja versione incumpatibule d’HandBrake.</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>Ci hè dighjà una cudificazione di schedariu in corsu.</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>Ci vole à piantà a cudificazione attuale. S’è u penseru cuntinueghja, rilanciate HandBrake.</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>Fighjulata ({0}% di a dimensione attuale)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake richiede una versione 64bit di Windows 10 o ancu più recente per funziunà.</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake richiede Windows 10 o una versione più recente per funziunà. E versioni 0.9.9 (XP), 0.10.5 (Vista), 1.3.3 (7 è 8.x) eranu l’ultime versioni à piglià in carica sti sistemi.</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>Vulete cuntinuà pruvendu d’aghjunghje u restu ?</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>U schedariu « {0} » esiste dighjà !
+Vulete rimpiazzallu ?</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>U preme’papei di u sistema ùn hè micca dispunibule attualmente.</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>Forse ci hè un’altra appiecazione chì cuttighjeghja o ammarchjuneghja u preme’papei per u so propriu adopru. Ùn puderete micca impiegalu finch’ellu sia spalancatu?</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>Licenza : </value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>Versione : </value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- Aghjunghje una nova categuria --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>Aghjunghje una prerigatura</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>Categuria :</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>Discrizzione :</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>Nome :</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>Dimensioni :</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>Selezzione di a traccia di fonte</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>Permette u passthru di :</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>Cunfigurate cumu e traccie audio sò autumaticamente selezziunate è cunfigurate quandu vo selezziunate un novu titulu o una nova fonte video.</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>Cumpurtamentu di l’« Auto Passthru » :</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>Flussu binariu</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>Cudecu</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>Guadagnu</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>Piattà</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Mischiera</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>Cudificatore di sustituzione :</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>Ricaricà</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>Frequenza di campiunariu</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>Affissà</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>Nome di a traccia</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Cumpurtamentu di a selezzione di traccia :</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>Per e traccie addiziunale :</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>Quandu l’« Auto Passthru » hè selezziunatu cum’è cudecu audio.</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>Marcatori di capitulu</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>Nome di capitulu</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>Numeru di capitulu</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>Creà marcatori di capitulu</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>Durata</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>Espurtà</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>Impurtà</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>Espurtà i nomi</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>Impurtà i nomi</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>Reinizià i nomi di capitulu</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>Abbandunà l’azzione</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>Cuntinuà</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>Quandu l’azzione hè compia</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>Detaglii di sbagliu :</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>Persunalizatu :</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>Sblucchime :</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Dipettinera</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>Disintricciamentu :</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>Prerigatura :</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>Prerigatura di disintricciamentu</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>Riduzzione di trostu :</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>Prerigatura di riduzzione di trostu</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>Rigatura di riduzzione di trostu</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Detelesinema :</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>Filtri</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>Orizuntale</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>Scala di grisgiu</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>Abbentata di l’intricciamentu :</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>Prerigatura :</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>Rotazione :</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>Arrutà :</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>Prerigatura d’arrutata</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>Rigatura d’arrutata</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>Rigatura :</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>Aghjunghje</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>Abbandunà</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>Squassà</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>Chjode</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>Cupià ver di u preme’papei</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>Move à manca</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>Move à diritta</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>Arregistrà</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>Cupià ver di u preme’papei</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>Ghjurnale di cudificazione</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>Apre u cartulare di i ghjurnali</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>Analisa di u ghjurnale</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>Ghjurnale d’attività</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>Tuttu aghjunghje</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>Aghjunghje l’elementu attuale</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>Aghjunghje a selezzione</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>Aghjunghje à a fila d’attesa</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>Espertu</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Alineà u principiu di l’audio/video</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Angulu : </value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>Audio</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>Traccie audio</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>Navigà</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>Capituli</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>Cuntenentu</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Destinazione</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Durata : </value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>Arregistrà cù u nome :</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>Filtri</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>Furmatu :</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>Aiutu</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>Ghjestione di l’iPod 5G</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>Metadati</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(mudificatu)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>Mischiu multiple : Què pò piglià qualchì tempu…</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>Ozzioni</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>Preferenze d’esciuta</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>Pausa</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>Dimensioni</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>Rinuminà a prerigatura</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Listinu cuntestuale di l’ozzioni di prerigatura</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>Squassà a prerigatura</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Prerigature</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>Fighjulata</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>Cudificazione : {0}, {1:00.00}%, Tempu rimanente : {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Stesa :</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>Ricaricà</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>Caccià</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>Reinizià e prerigature integrate</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>Arregistrà a nova prerigatura</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>Ricerca di l’ora di principiu</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>Sceglie u valore predefinitu</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>Fighjulata</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>Fila d’attesa</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>Fonte :</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>Fonte aperta</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>Principià a cudificazione</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>Principià a fila d’attesa</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>Piantà</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>Piantà a cudificazione</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>Site sicuru di vulè piantà sta cudificazione ?</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>Ci vole à sceglie una fonte à cudificà nanzu di pruvà d’impurtà un schedariu di sottutitulu.</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>Sottutituli</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>Traccie di sottutitulu</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>Riassuntu</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Titulu : </value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>Mudificà a prerigatura attuale</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>Video</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>Megliuratu per u Web</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>Ghjestione di e prerigature</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>Metadati</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>Permette l’adopru di i cudificatori Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>Permette l’adopru di i cudificatori Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>Permette l’adopru di i cudificatori AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>U furmatu di schedariu pruvistu cuntene caratteri inaccettevule. Quelli sò stati cacciati. </value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>Sente un sonu quandu ogni cudificazione si compia</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>Sente un sonu quandu a fila d’attesa si compia</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>Affissà l’apprezzazioni nant’à l’unghjetta Riassuntu.</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>Affissà u statu di a cudificazione in a barra di titulu di l’appiecazione.</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Viutà i schedarii di ghjurnale di più di 7 ghjorni</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>Apprupositu d’HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>Espertu</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>Ozzioni d’espertu</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>Argumenti :</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>Numinà autumaticu di i schedarii</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>Numinà autumaticamente i schedarii d’esciuta</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>Circà e nove versioni</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>Sempre squassà l’elementi compii di a fila d’attesa dopu a cudificazione</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>Viutà a crunulogia di u ghjurnale</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>Piazzà una copia individuale di i ghjurnali di cudificazione in un locu specificu :</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>Piazzà una copia individuale di i ghjurnali di cudificazione in u listessu locu chì a video cudificata</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>Versione attuale</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>Discudificazione</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>Chjassu predefinitu :</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>Scaricà u rinnovu</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>Lettura di DVD</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>Disattivà LibDVDNav. (libdvdread serà impiegatu à a so piazza)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>Cudificazione</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>Furmatu di schedariu :</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>Generale</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>Arregistramentu di i messaghji</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>Livellu di verbusità di u ghjurnale :</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>Chjassu d’accessu à i ghjurnali :</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>Interrompe a fila d’attesa s’ella ùn basta u spaziu discu</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>Impuculì in lu spaziu di nutificazione di u sistema (Richiede un rilanciu)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>Durata minima in seconde di i tituli DVD è Blu-ray. I tituli più corti seranu tralasciati :</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>Estensione di schedariu MP4 :</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>À u lanciu</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>Schedarii d’esciuta</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>Chjassu d’accessu : </value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Chjassu ver di u lettore media</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>Impedisce u sistema di mettesi in veghja durante a cudificazione</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>Numeru d’apprezzazioni di fiure à analizà :</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>Livellu di priurità :</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>Preferisce l’adopru d’Intel QuickSync, quand’ellu hè dispunibule, per a discudificazione video. </value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>Impiegà dinù a discudificazione QSV quandu u cudificatore QuickSync ùn hè micca impiegatu. (i.e. x265) </value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>Caccià a puntuazione cumuna</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>Rimpiazzà i spazii sottulineati cù un spaziu</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>Reinizià cù « Ùn fà nunda » quandu l’appiecazione hè rilanciata.</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>Sceglie a scala :</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>Messa à a scala</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>Mandà u schedariu à :</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>Maiuscula Per Ogni Lettera Iniziale</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>Rinnovi</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>Interfaccia d’utilizatore</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>Versione :</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>Video</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>Stu chjassu hè impiegatu solu per a funzione di fighjulata di video.
+VLC è MPC-HC sò accettati. D’altri lettori ponu dinù funziunà ma ùn sò micca verificati.</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>Fighjà u cartulare di u ghjurnale</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>Quandu hè compiu</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>Preferenze x264/5</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>Granularità frazziunale di qualità custente :</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamorficu :</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>Autumaticu</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>Inghjò</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>Inquadratura :</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>Persunalizatu</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Dimensione d’affissera :</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Altezza :</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Autumaticu</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>Manca</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>Dimensioni finale :</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Aspettu di fiura (pixel) :</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>Diritta</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>Dimensione</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>Insù</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Dimensione à a scala :</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>Persunalizatu</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>Espurtà ver di un schedariu</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>Impurtà da un schedariu</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>Officiale</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>Sciglite i tituli :</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>Aghjunghje à a fila d’attesa</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>I tituli selezziunati seranu aghjunti impieghendu a prerigatura « {0} ».</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>Ozzioni video :</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>Audio :</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>Tuttu viutà</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>Viutatura compia</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>Viutà a fila d’attesa</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>Viutà a selezzione</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>Squassà</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>Destinazione :</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>Ùn fà nunda</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>Durata di a cudificazione :</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>Mudificà</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>Ora di fine :</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>Espurtà a fila d’attesa</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>Dimensione di u schedariu d’esciuta :</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>Veghja prulungata</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>Ammarchjunà u sistema</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>U ghjurnale serà dispunibule quandu a cudificazione serà compia.</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>Scunnettassi</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>Apre u cartulare di destinazione</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>Apre u cartulare di fonte</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>Ozzioni</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>Pausa</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>Durata di l’interruzzione :</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>Preferenze di fiura :</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>Piantà Handbrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>Rilancià tutti i travagli</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>Fiascu di u novu tentativu</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>Reinizià i travagli selezziunati</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>Reinizià</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>Spenghje l’urdinatore</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>Fonte :</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>Principià a fila d’attesa</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>Ora di principiu :</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>Statistiche</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>E statistiche seranu dispunibule quandu una cudificazione si compia.</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>Sottutituli :</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>Riassuntu</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>Veghja</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>Video :</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>Quandu hè compiu :</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>Aghjunghje tutte e lingue selezziunate chì fermanu</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>Aghjunghje tutte e traccie chì fermanu</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>Aghjunghje una nova traccia</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>Traccie</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>Lingue dispunibule :</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>Sceglie e lingue :</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Lingue selezziunate :</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>Sceglie i cumpurtamenti predefiniti</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>Ricaricà</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>Sceglie un discu à analizà</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>Sceglie un schedariu à analizà</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>Sceglie un cartulare à analizà</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>Sceglie eventualmente un titulu specificu : </value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>Tandu, sciglite a - o e - video qu’ellu ci vole à cudificà : </value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>Schedariu</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>Cartulare (Analisa da gruppu)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>Apre stu lettore DVD o Blu-ray</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>Apre un cartulare cù un o parechji schedarii.</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>Ricuperà i schedarii in fila d’attesa</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>Un archiviu precedente di fila d’attesa hè dispunibule. </value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>Apre un solu schedariu video.</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>Selezzione di a fonte</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>Durata :</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>Fighjulata istantanea</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>Selezziunà una fighjulata di fiura</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>Preferisce u lettore video predefinitu di u sistema</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>Aghjunghje e legende chjose (CC) s’elle sò dispunibule</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>Aghjunghje un « Analisa audio straniera »</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>Cumpurtamentu d’intarsiatura :</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>Impurtà un sottutitulu</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Cumpurtamentu di a selezzione di traccia :</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>Aghjunghje tutti i sottutituli intarsiati chì fermanu</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>Cunfigurate cumu e traccie di sottutitulu sò autumaticamente selezziunate è cunfigurate quandu vo selezziunate un novu titulu o una nova fonte video.</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>Traccie audio addiziunale</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>Traccie di sottutitulu addiziunale</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>Intarsiatu</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>Marcatori di capitulu</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>Sblucchime</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Detelesinema</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>affissera</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>Scala di grisgiu</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>Alcuna traccia audio</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>Alcunu marcatore di capitulu</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>Alcunu filtru</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>Alcuna fonte</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>Alcuna traccia di sottutitulu</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>Alcuna traccia</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>Fighjulata {0} nant’à {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>Rotazione</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>allucamentu</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>Cudificazione à 2 passi</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>Flussu medianu (kbps) :</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>Cudificatore video :</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>Frequenza di fiure custente</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>Qualità custente :</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>Livellu di u cudificatore :</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>Prerigatura di u cudificatore :</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>Prufilu di u cudificatore :</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>Rigatura di u cudificatore :</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>Ozzioni d’espertu :</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>Discudificazione rapida</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>Frequenza di fiure (FPS) :</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>Ozzioni di u cudificatore :</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>Frequenza di fiure di cresta</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>Qualità :</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Primu passu in modu Turbo</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>Frequenza di fiure variabile (VFR)</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>Video :</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>Lingua :</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>Impiegà a lingua di u sistema</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>Apprupositu d’HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>Osinnò depone un schedariu o un cartulare quì…</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>Aiutu</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>Preferenze</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>Aghjunghje una traccia</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>Preferenze di u cudificatore audio per ogni traccia scelta :</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>Squassà</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Intarsiatu</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>Predefinitu</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>Sfurzatu solu</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>_Apprupositu…</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>_Ghjurnale d’attività</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>_Circà e nove versioni</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>_Esce</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>_Espurtà ver di un schedariu</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>_Schedariu</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>_Documentazione HandBrake (HTTPS)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>Ai_utu</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>_Impurtà da un schedariu</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>_Preferenze</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>_Prerigature</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>_Fila d’attesa</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>_Reinizià e prerigature integrate</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>_Sceglie cum’è valore predefinitu</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>A_ffissà u pannellu di e prerigature</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>Affissà a _fila d’attesa</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>_Attrezzi</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>Cuntrollu di e nove versioni…</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>Site sicuru di vulè viutà u cartulare di i ghjurnali ?</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>Viutà i ghjurnali</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>Scaricamentu…</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>U cartulare di i ghjurnali hè statu viotu !</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>Avertimentu</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>Preparazione di a nova versione…</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>Ci vole à selezziunà un cartulare.</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>Sciglite « Navigà » per sceglie u locu predefinitu</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>Piattà</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>Affissà</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>« Tuttu aghjunghje » (à a fila d’attesa)</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>« Aghjunghje a selezzione » (à a fila d’attesa)</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>Sunà u schedariu</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>Barra d’attrezzi d’appiecazione</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>Affissà « Tuttu aghjunghje » (à a fila d’attesa) nant’à a barra d’attrezzi</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>Affissà « Aghjunghje a selezzione » (à a fila d’attesa) nant’à a barra d’attrezzi</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>L’adopru di a cudificazione materiale hè attualmente disattivatu. S’è ùn avete micca lanciatu HandBrake cù l’ozzione « --no-hardware », assicuratevvi chì voi impiegate l’ultimi piloti per tutte e carte grafiche di stu sistema.
+
+Què ùn affetterà micca i cudificatori d’appiecazione.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Ci vole à currege e vostre preferenze nanzu di cuntinuà. </value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>Affettà</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>Ripiglià a cudificazione</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>Azzioni</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>Impurtà una fila d’attesa</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Cudificazione : Passu {0} nant’à {1}, {2:00.00}%, FPS : {3:000.0}, FPS mediana : {4:000.0}
+Tempu rimanente : {5}, Trascorsu : {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>Squassà a selezzione</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>Modu purtabile : Impussibule di creà u cartulare timpurariu. Ci vole à verificà chì u chjassu hè currettu è accessibile in scrittura.
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>Modu purtabile : Impussibule di creà u cartulare d’allucamentu. Ci vole à verificà chì u chjassu hè currettu è accessibile in scrittura.
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>Modu purtabile : Impussibule di leghje portable.ini. Forse ci hè qualchì sbagliu in stu schedariu. Ci vole à pruvà torna impieghendu portable.ini.template cum’è esempiu.</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>U mutore d’HandBrake ùn hà micca pussutu inizziasi. Ghjè aspessu cagiunatu da piloti GPU troppu anziani.\nCi vole à rinnovà sti piloti per tutte e carte grafiche integrate è specificate di u vostru sistema.</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Ozzioni mudificate direttamente : {source} {title} {chapters} 
+Ozzioni tramandate : {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Quesse cambianu solu quandu voi analizate una nova fonte, cambiate di titulu o di capitulu)</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>Ozzioni dispunibule : {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>Dumandà per rimpiazzà u schedariu</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>Pruvà di rinuminà autumaticamente u schedariu</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>Rimpiazzà u schedariu</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>Cumpurtamentu di l’interfaccia d’utilizatore</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>Cosa fà in casu di rimpiazzamentu di schedariu :</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>Cudificazione compia</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>Nutificazioni</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>Fila d’attesa compia</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>Quandu hè compiu :</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>Cosa aghjunghje in casu di cunflittu di nome di schedariu :</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>Suffissu</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>Prefissu</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>Aghjunghje un numeru à a fine</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>VistaFiltri_PrerigaturaSblucchime</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>Rigatura di sblucchime</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>A scelta di u cudificatore serà dispunibule in l’unghjetta « Video ».</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake hà trovu parechji schedarii di fila d’attesa micca compii. Quelli venenu da parechje instanze d’HandBrake. Vulete ricuperà tutti sti travagli micca compii ?</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake hà trovu elementi micca compii in a fila d’attesa di l’ultima sessione di l’appiecazione. Vulete ricuperalli ?</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>Ricuperazione pussibule di fila d’attesa</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>U vostru schedariu di prerigature cuntinia prerigature integrate. A funzione d’impurtazione ùn e accetteghja micca. Ci vole à impiegà « Prerigature -&gt; Reinizià e prerigature integrate » per risturà e prerigature predefinite.
+
+Induve hè accettatu, tutte e prerigature persunalizate seranu state impurtate.</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>Effettuà st’azzione subitu subitu. (Què disattiverà u dialogu di cunfirmazione di 60 seconde)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>Navigà</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>Alcunu schedariu audio ùn hè statu definitu. Ci vole sceglie « Navigà » per selezziunà un schedariu wav o mp3 à sunà.</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>Sunà</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>Espurtà a fila d’attesa (CLI solu)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>Impiegà u tema scuru. (Richiede un rilanciu, solu cù Windows 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>Indispunibule</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>Go</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>Alimentazione settore abbentata. Ripigliu di a cudificazione… ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>Livellu d’energia di batteria criticu ! ({0} %)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>Livellu d’energia di batteria debule ! ({0} %). A vostra cudificazione hè stata interrotta.</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>A capacità d’allucamentu hè falata sottu {0} Go nant’à u lettore di destinazione. Interruzzione di a cudificazione…</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Selezzioni audio autumatiche</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Selezzioni di sottutituli autumatiche</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>Sistema</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Attori :</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Cummenti :</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>Discrizzione :</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Direttore :</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>Generu :</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Scenariu :</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>Data d’esciuta :</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>Titulu :</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>Fighjata di u ghjurnale</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>Furmatu :</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>Filtri :</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>Dimensione :</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>Traccie :</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>Generale</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>Sciglite « Circà e nove versioni » per sapè s’ella esiste una nova versione di l’appiecazione</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; Ritornu</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>Attualmente interrotta</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>Schedarii d’esciuta</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>Capituli</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>Fiure</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>Fighjulata</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>Seconde</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Tutte e lingue selezziunate chì currispondenu</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>Prima lingua selezziunata chì currisponde</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>Nisunu</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Prima traccia</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>Traccia audio straniera preferita, osinnò Prima traccia</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>Traccia audio straniera</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>Nisunu</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>Ricerca di traccia audio straniera</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>Analisa di traccia audio straniera</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Tutte e lingue selezziunate chì currispondenu</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>Impiegà tutte e traccie cum’è mudellu</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>Prima lingua selezziunata chì currisponde</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Impiegà a prima traccia cum’è mudellu</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>Nisunu audio</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>Capitulu {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>Autumaticu</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>Sempre impiegà M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>Sempre impiegà MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>Persunalizatu</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>Nisunu</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>Sempre impiegà a risuluzione di a video di a fonte</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>Più altu chì a nurmale</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>Più bassu chì a nurmale</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>Altu</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>Bassu</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>Nurmale</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>Misincu</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>Settimanale</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Sempre impiegà u chjassu predefinitu per ogni novu nome ingeneratu.</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>A stesa di porti deve esse scelta trà 5000 è 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>Campi di sustituzione : {source} {destination}</value>
+ <comment>Note: {source} and {destination} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>Una nova versione d’HandBrake hè dispunibule !</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>Diritti di copia (C) 2003-2022 The HandBrake Team</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Livellu di batteria debule :</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Interrompe tuttu travagliu in corsu quandu u livellu di batteria hè debule.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Aghjunghje tutti i sottutituli intarsiati chì fermanu</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Travagli in doppiu sò stati trovi in u schedariu di fila d’attesa chì voi pruvate d’impurtà. Vulete rimpiazzà l’arregistramenti chì esistenu ? 
+Què pianterà tuttu travagliu in corsu.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Duppioni trovi</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Attivà u QuickSync di bassa cunsumazione (quand’ellu hè accettatu).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Ci vole à selezziunà un travagliu solu per fighjà l’infurmazioni di sintesi.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Eseguisce ogni travagliu di a fila d’attesa in un trattamentu di travagliu distintu.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Portu di reta predefinitu per u trattamentu di travagliu :</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>A prerigatura selezziunata ùn hè micca dispunibule nant’à stu sistema.
+
+Da bona regula, vole si dì chì u vostru sistema ùn accetteghja micca u materiale richiestu per impiegalla.
+
+Ci vole à sceglie una prerigatura sfarente.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Isulamentu di i trattamenti</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Nota : L’adopru di sta funzione lancerà un servitore HTTP ligatu à l’indirizzu 127.0.0.1 nant’à u portu sceltu.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>S’è u portu definitu hè dighjà impiegatu, si truverà u primu portu liberu in un intervallu massimu di 100 à partesi di u portu definitu.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Numeru massimu di cudificazioni simultanei :</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Abbandunà</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Prerigatura :</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Listessa chì a fonte</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Reinizializazione di e preferenze</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Site sicuru di vulè reinizià e preferenze d’HandBrake à i so valori predefiniti ?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Persunalizatu (Micca ristrintu)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Riempie (Surround)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Altezza (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Nisunu</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Larghezza (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Riempiimentu :</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Culore :</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Bordi :</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Risuluzione è messa à a scala :</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientazione è inquadratura :</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Windows 10 solu ! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filtri :</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Predefinitu</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Sfurzatu</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Persunalizatu</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Dimensione massima :</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Cunfina di risuluzione :</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Nisunu</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Ghjestione di e prerigature</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Squassà e prerigature integrate</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Espurtà a prerigatura selezziunata</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Impurtà a/e prerigatura(e) da un schedariu</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Infurmazione nant’à a prerigatura :</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>E prerigature integrate ùn ponu micca esse mudificate.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Sceglie a prerigatura selezziunata cum’è predefinita</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Squassà a prerigatura</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Micca accettatu nant’à stu sistema)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Piantà</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>U nome di categuria scrittu esiste dighjà. Ci vole à sceglie un nome sfarente.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>U nome di categuria era viotu. Ci vole à pruvede un nome.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Scrivite un nome : </value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>Ùn ci hè alcuna prerigatura selezziunata.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Espurtà tutte e prerigature persunalizate</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Livellu quandu l’alerte nant’à u spaziu discu debule s’affissenu :</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Nota : Ghjè a limitazione alta di i travagli simultanei. Certe limitazioni materiale ponu fà diminuisce u numeru attuale di travagli simultanei durante a cudificazione.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Micca dispunibule)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Hè predefinitu :</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>Innò</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Iè</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Preferenze di rigatura fina di a fiura</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Affissà e cumande di rigatura di l’inquadratura.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Impiegà u scuru</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Impiegà u chjaru</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Quellu di u sistema</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Tema :</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Richiede un rilanciu)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Allisciata cromatica :</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Spaziu di culore :</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Spaziu di culore</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Apre a fighjulata</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Fighjulata di a fonte :</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Statu di u travagliu :</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Abbandunatu</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Compiu</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Preferenze inaccettevule. Verificate u ghjurnale per sapene di più.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Intrata inaccettevule. Verificate u ghjurnale per sapene di più.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Statu scunnisciutu. Verificate u ghjurnale per sapene di più.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Sbaglii scuperti pruvendu di leghje a fonte.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Prublema scunnisciutu. Verificate u ghjurnale per sapene di più.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>U trattamentu di travagliu s’hè lampatu. Verificate u ghjurnale per sapene di più.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>U schedariu « hb.dll » hè assente. Ci vole à intallà torna.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Avertimentu : Fate casu chì sta versione in « Modu assicuratu » d’HandBrake ùn cuntene micca l’accessu à i cudificatori materiale. S’è vò vulete impiegà i cudificatori materiale, ci vole à scaricà da u situ web una versione altra chì quella in « Modu assicuratu ».</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>Fate casu chì HandBrake ùn hè più accettatu nant’à tutte e versioni di Windows 7 o Windows 8.
+
+Bench’ella fussi pussibule di cuntinuà à impiegà l’appiecazione à u vostru risicu, sapete chì certe funzioni ùn funziuneghjanu più è chì d’altri penseri ponu accade. Ùn ci hè micca assistenza quandu sti penseri accadenu. 
+
+L’impiegu nant’à Windows 7 è 8 hè statu disprezzatu in e versioni 1.3. Vole si dì ch’ella ùn ci serà più mudificazioni per currege i penseri nant’à sti sistemi. 
+
+St’avertimentu serà affissatu solu duie volte.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Neru</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Persunalizatu</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Biancu</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Valore RGB :</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(imburratu)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Rivultamentu :</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Dimensioni di a fonte :</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Dimensione d’allucamentu : {0}x{1} Dimensione d’affissera : {2}x{3} Prupurzioni :{4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Un sbagliu hè statu scupertu in u dialogu di navigazione di schedariu.
+
+- Sapete chì i chjassi longhi di schedariu ùn sò micca accettati. I chjassi di schedariu devenu esse più corti chì 255 caratteri.
+- L’ultimu cartulare impiegatu per sta finestra hè statu reiniziatu per impedisce i sbaglii a prossima volta chì vo pruverete d’analizà un schedariu.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Altezza massima :</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Larghezza massima :</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Prupurzioni : {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Cunservazione di i metadati cummuni</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>U chjassu predefinitu di nome autumaticu ùn era micca accetevule. {0} ùn deve micca stà nanzu à {1}</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>Vulete permette à HandBrake di cuntrollà autumaticamente s’ella ci hè una nova versione ?
+
+Pudete cambià a vostra scelta à ogni mumentu cambiendu l’ozzioni in Preferenze -&gt; Generale -&gt; Circà e nove versioni</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>Circà e nove versioni ?</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>Nanzu di rinnovà :
+- Assicuratevvi ch’ella ùn ci hè micca di cudificazione in a fila d’attesa
+- Arregistrate o pigliate nota di tutta prerigatura persunalizata chì voi averiate creata perchè si puderia qu’ella ùn fussi micca accettata da e nove versioni</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>(Predefinitu)</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>Categurie</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>Pianu</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>Pianu in parte</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>Sceglie cumu e prerigature sò affissate nant’à i listini :</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Prerigatura :</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>Compiu</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>Mudificà u travagliu ?</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>Longhezza d’esciuta :</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>Dispiazzà à a fine</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>Dispiazzà à u principiu</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>Flussu binariu d’esciuta :</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>Vitezza mediana di cudificazione :</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value> di u schedariu di fonte</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>Indispunibule</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>Longhezza di a fonte :</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>Reinizià</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>Site sicuru di vulè reinizià tutte e prerigature integrate ?</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>Reinizià tutte e prerigature integrate à e predefinizioni d’HandBrake :</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>(E prerigature d’utilizatore ùn seranu micca reiniziate)</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>Reinizià tutte e prerigature HandBrake à e so predefinizioni d’origine :</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>Prerigature integrate</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>Preferenze d’utilizatore</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>Arburiscenza undighjante</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>Please make sure you have appropriate file associations setup in Windows to allow it to open this file with a supported video player</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.de.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.de.resx Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.es.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.es.resx Changed

@@ -59,46 +59,46 @@
 : using a System.ComponentModel.TypeConverter
 : and then encoded with base64 encoding.
 -->
- <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
 <xsd:element name="root" msdata:IsDataSet="true">
 <xsd:complexType>
 <xsd:choice maxOccurs="unbounded">
 <xsd:element name="metadata">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
 </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="assembly">
 <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="data">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="resheader">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
 </xsd:complexType>
 </xsd:element>
 </xsd:choice>
@@ -112,36 +112,39 @@
 <value>2.0</value>
 </resheader>
 <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <data name="Video_EncoderExtraArgs" xml:space="preserve">
 <value>Lista completa de parámetros del codificador: 
-{0} </value>
+{0}</value>
 </data>
 <data name="Video_x264FastDecode" xml:space="preserve">
 <value>Reducir el uso de CPU del decodificador.
 
-Activelo si a su dispositivo le cuesta reproducir la salida. (Por Ej: pierde cuadros)</value>
+Actívelo si a su dispositivo le cuesta reproducir la salida. (Por ej.: pierde cuadros)</value>
 </data>
 <data name="Video_LosslessWarning" xml:space="preserve">
- <value>Advertencia: RF 0 no tiene perdida</value>
+ <value>Advertencia: RF 0 es sin pérdida</value>
 </data>
 <data name="Video_LosslessWarningTooltip" xml:space="preserve">
- <value>Un valor de 0 significa sin perdida y resultará en un tamaño de archivo mas grande que el original,
-a menos que la fuente también sea sin perdida.
+ <value>Un valor de 0 significa sin pérdida y resultará en un tamaño de archivo más grande que el original,
+a menos que el origen también sea sin pérdida.
 
-La escala de x264 y x265 es logarítmica y valor mas bajos corresponden a mayor calidad.
+La escala de x264 y x265 es logarítmica y valores más bajos corresponden a mayor calidad.
 
-Entonces pequeños incrementos en valor resultarán en incrementos progresivamente mas grandes del tamaño de archivo.</value>
+Pequeños incrementos en valor resultarán en incrementos progresivamente más grandes del tamaño de archivo.</value>
 </data>
 <data name="AddPreset_PictureSizeMode" xml:space="preserve">
- <value>Opcionalmente, puede guardar una configuracion de imagen con este ajuste preestablecido. Hay 3 modos de hacerlo:
-Ninguna: La configuracion de la imagen no se guarda en este ajuste preestablecido. Al leer una fuente, permanecera tal como está dentro de los limites de resolucion de dicha fuente. Esto tambien afecta a Anamorficos, modulos, recortes, etc.
-Personalizada: Opcionalmente puede establecer un Ancho y Alto maximo. Al hacer esto la codificacion se realizara con valores iguales o inferiores a estos. Mantener Relacion de Aspecto se activara automaticamente.
-Fuente Maxima: Siempre codifica con la resolucion de la fuente si es posible.</value>
+ <value>Opcionalmente, puede guardar una configuración de imagen con este ajuste preestablecido. Hay 3 modos de hacerlo:
+
+Ninguno: La configuración de la imagen no se guarda en este ajuste preestablecido. Al leer un origen, permanecerá tal como está dentro de los límites de resolución del mismo. Esto también afecta a Anamórficos, módulos, recortes, etc.
+
+Personalizado: Opcionalmente puede establecer un Ancho y Alto máximo. Al hacer esto la codificación se realizará con valores iguales o inferiores a estos. Mantener Relación de Aspecto se activará automáticamente.
+
+Origen Máximo: Siempre que sea posible, codificar con la resolución original.</value>
 </data>
 <data name="About_GPL" xml:space="preserve">
 <value>Este programa es software libre; puedes redistribuirlo y/o
@@ -165,7 +168,7 @@
 <value>Advertencia: No tiene la selección automática de pistas de audio y subtitulo activada. Puede configurar las pistas por defecto en las opciones.</value>
 </data>
 <data name="Presets_ResetComplete" xml:space="preserve">
- <value>Los ajustes preestablecidos han sido restablecidos</value>
+ <value>Los preajustes integrados han sido restablecidos.</value>
 </data>
 <data name="Presets_ResetHeader" xml:space="preserve">
 <value>Restablecimiento completo</value>
@@ -177,75 +180,70 @@
 <value>| Menor calidad</value>
 </data>
 <data name="Video_PlaceboQuality" xml:space="preserve">
- <value>Calidad placebo</value>
+ <value>Calidad placebo |</value>
 </data>
 <data name="Error" xml:space="preserve">
 <value>Error</value>
 </data>
- <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
- <value>Advertencia: Si desea agregar subtítulos a todos lo que está por ser puesto en cola, por favor verifique si los ajustes son correctos en la pestaña de subtítulos.
-
-¿Desea continuar?</value>
- </data>
 <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
- <value>Debe activar el nombrado automático de archivos Y establecer un directorio por defecto en los ajustes antes de poder agregar a la cola.</value>
+ <value>Debe activar el nombrado automático de archivos Y TAMBIÉN establecer un directorio por defecto en los ajustes antes de poder agregar a la cola.</value>
 </data>
 <data name="Warning" xml:space="preserve">
 <value>Advertencia</value>
 </data>
 <data name="AreYouSure" xml:space="preserve">
- <value>¿Esta seguro?</value>
+ <value>¿Está seguro?</value>
 </data>
 <data name="HandBrake_Title" xml:space="preserve">
 <value>HandBrake</value>
 </data>
 <data name="Main_AlreadyEncoding" xml:space="preserve">
- <value>HandBrake ya esta codificando.</value>
+ <value>HandBrake ya está codificando.</value>
 </data>
 <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
- <value>Hay trabajos en la cola el mismo directorio de destino. Por favor elija un directorio distinto para este trabajo.</value>
+ <value>Hay trabajos en la cola el mismo directorio de destino. Por favor, elija un directorio distinto para este trabajo.</value>
 </data>
 <data name="Main_JobsPending_addon" xml:space="preserve">
 <value>Trabajos pendientes {0}</value>
 </data>
 <data name="Main_NewDefaultPreset" xml:space="preserve">
- <value>Nuevo ajuste por defecto: {0}</value>
+ <value>Nuevo conjunto de preajustes por defecto: {0}</value>
 </data>
 <data name="Main_NewUpdate" xml:space="preserve">
 <value>Una nueva actualización esta disponible. Puede instalarla desde
 Barra de herramientas &gt; Opciones</value>
 </data>
 <data name="Main_NoPresetSelected" xml:space="preserve">
- <value>No hay ajustes seleccionados.</value>
+ <value>No hay preajustes seleccionados.</value>
 </data>
 <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
- <value>No puede modificar los ajustes integrados. Por favor seleccione uno de sus propios ajustes.</value>
+ <value>No puede modificar los preajustes integrados. Por favor, seleccione uno de sus propios preajustes.</value>
 </data>
 <data name="Main_PleaseSelectFolder" xml:space="preserve">
- <value>Por favor seleccione una carpeta</value>
+ <value>Por favor, seleccione una carpeta.</value>
 </data>
 <data name="Main_PreparingToEncode" xml:space="preserve">
 <value>Preparando para codificar ...</value>
 </data>
 <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
- <value>No puede importar un ajuste con el mismo nombre que uno integrado</value>
+ <value>No puede importar un preajuste con el mismo nombre que un preajuste integrado.</value>
 </data>
 <data name="Main_PresetOverwriteWarning" xml:space="preserve">
- <value>El ajuste "{0}" ya existe. ¿Desea sobrescribirlo?</value>
+ <value>El preajuste "{0}" ya existe. ¿Desea sobrescribirlo?</value>
 </data>
 <data name="Main_Presets" xml:space="preserve">
- <value>Ajustes</value>
+ <value>Preajustes</value>
 </data>
- <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
- <value>¿Está seguro que desea actualizar el ajuste seleccionado?</value>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>¿Seguro que desea actualizar el preajuste seleccionado?</value>
 </data>
 <data name="Main_PresetUpdated" xml:space="preserve">
- <value>El ajuste ha sido actualizado con su configuración actual.</value>
+ <value>El preajuste ha sido actualizado con su configuración actual.</value>
 </data>
 <data name="Main_PresetUpdateNotification" xml:space="preserve">
- <value>HandBrake ha determinado que sus ajustes preestablecidos están desactualizados... Estos ajustes preestablecidos ahora se actualizarán. 
- Los ajustes preestablecidos personalizados no se han actualizado, por lo que es posible que tenga que volver a crearlos eliminándolos y reagregándolos. 
- Se realizó una copia de seguridad del archivo user_presets.xml anterior.</value>
+ <value>HandBrake ha determinado que sus preajustes están desactualizados... Estos preajuste se actualizarán.
+Sus preajustes personalizados no se han actualizado, por lo que es posible que tenga que volver a crearlos, eliminándolos y agregándolos de nuevo.
+Se ha realizado una copia de seguridad del archivo user_presets.xml anterior.</value>
 </data>
 <data name="Main_QueueFinished" xml:space="preserve">
 <value>Cola finalizada</value>
@@ -259,27 +257,26 @@
 <data name="Main_ScanFailed_NoReason" xml:space="preserve">
 <value>Búsqueda fallida</value>
 </data>
- <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
- <value>Búsqueda fallida... Por favor mire el registro de actividad para mas detalles</value>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>Búsqueda fallida... Por favor, revise el registro de actividad para más detalles</value>
 </data>
 <data name="Main_ScanningPleaseWait" xml:space="preserve">
- <value>Escaneando fuente, por favor espere...</value>
+ <value>Escaneando origen, por favor espere...</value>
 </data>
 <data name="Main_ScanningTitleXOfY" xml:space="preserve">
 <value>Escaneando título {0} de {1}({2}%)</value>
 </data>
 <data name="Main_ScanSource" xml:space="preserve">
- <value>Primero debe escanear una fuente y configurar su trabajo antes de codificar. Pulse el botón 'Fuente' en la barra de herramientas para continuar</value>
+ <value>Primero debe escanear un origen y configurar su trabajo antes de codificar. Pulse el botón 'Origen' en la barra de herramientas para continuar</value>
 </data>
 <data name="Main_SelectPreset" xml:space="preserve">
- <value>Por favor asegurese de haber seleccionado uno de sus propios ajustes. 
-No puede exportar los ajustes integrados</value>
+ <value>Por favor asegúrese de haber seleccionado uno de sus propios preajustes. Tenga en cuenta que no puede exportar preajustes integrados.</value>
 </data>
 <data name="Main_SelectPresetForUpdate" xml:space="preserve">
- <value>Por favor seleccione un ajuste a actualizar</value>
+ <value>Por favor, seleccione un preajuste a actualizar</value>
 </data>
 <data name="Main_SelectSource" xml:space="preserve">
- <value>Seleccione 'Fuente' para continuar</value>
+ <value>Seleccione 'Origen' para continuar</value>
 </data>
 <data name="Main_XEncodesPending" xml:space="preserve">
 <value>{0} Trabajos pendientes</value>
@@ -300,25 +297,26 @@
 <value>Actualizado</value>
 </data>
 <data name="Preset_OldVersion_Header" xml:space="preserve">
- <value>Versión de ajuste</value>
+ <value>Versión de preajuste</value>
 </data>
 <data name="Preset_OldVersion_Message" xml:space="preserve">
- <value>El ajuste que desea importar es de una versión diferente de HandBrake.
+ <value>El preajuste que desea importar es de una versión diferente de HandBrake.
+
 Puede no ser posible el importar todos los valores de este ajuste.
 
 ¿Desea continuar?</value>
 </data>
 <data name="Preset_UnableToImport_Header" xml:space="preserve">
- <value>No se pudo importar el ajuste</value>
+ <value>¡No se ha podido importar el preajuste!</value>
 </data>
 <data name="Preset_UnableToImport_Message" xml:space="preserve">
- <value>No se pudo importar el ajuste porque parece corrupto o de una versión mas antigua de HandBrake</value>
+ <value>No se pudo importar el preajuste porque parece corrupto o es de una versión más antigua de HandBrake.</value>
 </data>
 <data name="Main_SetDestination" xml:space="preserve">
 <value>Primero debe seleccionar la ubicación destino del archivo antes de agregarlo a la cola</value>
 </data>
 <data name="Main_InvalidDestination" xml:space="preserve">
- <value>La ubicación de destino solicitada contiene caracteres ilegales y no sera actualizada</value>
+ <value>La ruta de destino introducida contenía caracteres no permitidos y no se actualizará.</value>
 </data>
 <data name="Preview" xml:space="preserve">
 <value>Previsualizar {0}</value>
@@ -333,7 +331,7 @@
 <value>El formato del archivo de salida. Además de cualquier carácter de sistema de archivos compatible, puede utilizar los siguientes marcadores de posición que se reemplazarán al cambiar el título o escanear un origen.
 
 Opciones de actualización en vivo: {source} {title} {chapters} 
-	 Opciones no en vivo: {date} {time} {creation-date} {creation-time} {quality} {bitrate} ( Estos solo cambiaran si escanea una nueva fuente, cambia el título o los capítulos) </value>
+	 Opciones no en vivo: {date} {time} {creation-date} {creation-time} {quality} {bitrate} ( Estos solo cambiarán si escanea un nuevo origen, cambia el título o los capítulos) </value>
 </data>
 <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
 <value>Opciones adicionales disponibles: {source_path} o {source_folder_name} o {source}</value>
@@ -345,14 +343,14 @@
 <value>Su sistema evitó que HandBrake abra el navegador</value>
 </data>
 <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
- <value>Puede acceder a las paginas de ayuda visitando la web directamente: https://handbrake.fr</value>
+ <value>Puede acceder a las páginas de ayuda visitando la web directamente: https://handbrake.fr</value>
 </data>
 <data name="Main_PresetImportFailed" xml:space="preserve">
 <value>No se puede importar el preajuste seleccionado.</value>
 </data>
 <data name="Main_PresetImportFailedSolution" xml:space="preserve">
- <value>El preajuste puede estar dañado o desde una versión anterior de HandBrake que no es compatible. 
- Los preajustes de versiones anteriores deben volver a crearse en la versión actual.</value>
+ <value>El preajuste puede estar corrupto o venir de una versión anterior de HandBrake que no es compatible.
+Los preajustes de versiones anteriores deben volver a crearse en la versión actual.</value>
 </data>
 <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
 <value>Argumentos avanzados adicionales que se pueden pasar al codificador de vídeo. </value>
@@ -377,7 +375,7 @@
 <value>No se han encontrado fuentes o títulos validos.</value>
 </data>
 <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
- <value>HandBrake no podrá codificar la fuente seleccionada, ya que no encontró una fuente válida con títulos para codificar. 
+ <value>HandBrake no podrá codificar el origen seleccionado, ya que no encontró una fuente válida con títulos para codificar. 
 Esto podría deberse a una de las siguientes razones:
 - La duración de cada título de origen está por debajo de la opción de umbral "Duración mínima del título" en 'Preferencias &gt; Avanzadas'. 
 - El archivo de origen no es un archivo de vídeo válido o está en un formato que HandBrake no admite.
@@ -395,28 +393,28 @@
 <value>Iniciar Cola</value>
 </data>
 <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
- <value>No puede eliminar el preajuste por defecto. Primero establezca otro preajuste como predeterminado . </value>
+ <value>No puede eliminar el preajuste por defecto. Antes establezca otro preajuste como predeterminado.</value>
 </data>
 <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
- <value>¿Está seguro de que desea eliminar el preajuste: </value>
+ <value>¿Seguro que desea eliminar el preajuste: </value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Codificando: Pasada {0} de {1}, {2:00.00}%, FPS: {3:000.0}, FPS Promedio : {4:000.0}, Tiempo Restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss} {7}</value>
+ <value>Codificación: Paso {0}de {1}, {2: 00.00}%, FPS: {3: 000.0}, Promedio de FPS: {4: 000.0}, Tiempo restante: {5}, Transcurrido: {6} {7}</value>
 </data>
 <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
- <value>Un ajuste preestablecido debe tener un nombre. Rellene el campo Nombre preestablecido. </value>
+ <value>El preajuste debe tener un nombre. Rellene el campo Nombre. </value>
 </data>
 <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
- <value>Ya existe un ajuste preestablecido con este nombre. ¿Le gustaría sobrescribirlo? </value>
+ <value>Ya existe un preajuste con este nombre. ¿Quiere sobrescribirlo? </value>
 </data>
 <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
 <value>Primero debe escanear un origen para utilizar la opción 'Source Maximum'. </value>
 </data>
 <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
- <value>Los campos Anchura o Altura personalizada deben rellenarse para la opción "Personalizado". </value>
+ <value>Los campos Anchura o Altura personalizada deben rellenarse para la opción "Personalizado". </value>
 </data>
 <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
- <value>No se puede añadir el ajuste preestablecido </value>
+ <value>No se puede añadir el preajuste</value>
 </data>
 <data name="UnknownError" xml:space="preserve">
 <value>Error desconocido</value>
@@ -443,7 +441,7 @@
 <value>La siguiente accion '{0}' acurrira en {1} segundos.</value>
 </data>
 <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
- <value>Si el problema persiste, intente reiniciar HandBrake.</value>
+ <value>Si el problema persiste, por favor, intente reiniciar HandBrake.</value>
 </data>
 <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
 <value>No hay mas informacion disponible sobre este error.</value>
@@ -471,7 +469,7 @@
 <value>Falló la actualización. Puede intentar descargar la actualización directamente de https://handbrake.fr</value>
 </data>
 <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
- <value>Mostrar Tamaño: {0}x{1}, PAR {2}x{3}</value>
+ <value>Tamaño de Almacenamiento: {0}x{1}</value>
 </data>
 <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
 <value>Agregar a la cola</value>
@@ -485,7 +483,7 @@
 <data name="QueueViewModel_Queue" xml:space="preserve">
 <value>Cola</value>
 </data>
- <data name="QueueViewModel_ClearQueueConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
 <value>¿Está seguro que desea limpiar la cola?</value>
 </data>
 <data name="Confirm" xml:space="preserve">
@@ -497,9 +495,6 @@
 <data name="QueueViewModel_QueuePending" xml:space="preserve">
 <value>Cola pausada</value>
 </data>
- <data name="QueueViewModel_QueuePauseNotice" xml:space="preserve">
- <value>La cola ha sido pausada. El trabajo activo terminará pero no se iniciaran nuevos.</value>
- </data>
 <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
 <value>¿Está seguro que desea borrar los trabajos seleccionados?</value>
 </data>
@@ -509,7 +504,7 @@
 <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
 <value>No hay trabajos pendientes.</value>
 </data>
- <data name="QueueViewModel_EditConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
 <value>¿Está seguro que desea editar este trabajo? Será quitado de la lista y enviado a la ventana principal.</value>
 </data>
 <data name="QueueViewModel_QueueReady" xml:space="preserve">
@@ -537,15 +532,11 @@
 <value>Vista previa de la imagen </value>
 </data>
 <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
- <value>No se puede eliminar el archivo de vista previa anterior. Es posible que deba reiniciar la aplicación.</value>
+ <value>No se puede eliminar el archivo de vista previa anterior. Es posible que aún tenga una vista previa abierta en su reproductor multimedia. Cierra esta.</value>
 </data>
 <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
 <value>Primero debe escanear un origen y configurar su codificación antes de crear una vista previa.</value>
 </data>
- <data name="StaticPreviewViewModel_UnableToFindVLC" xml:space="preserve">
- <value>No se puede detectar el reproductor VLC. 
- Asegúrese de que VLC está instalado y el directorio especificado en las opciones de HandBrake es correcto. (Véase: "Menú Herramientas &gt; Preferencias &gt; General")</value>
- </data>
 <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
 <value>No se puede encontrar el archivo de vista previa. Se eliminó el archivo o se produjo un error en la codificación. Compruebe el registro de actividad para obtener más información.</value>
 </data>
@@ -568,12 +559,12 @@
 <value>Archivo Guardado:</value>
 </data>
 <data name="PresetService_UnableToLoad" xml:space="preserve">
- <value>No se pueden cargar ajustes preestablecidos.</value>
+ <value>No se pueden cargar los preajustes.</value>
 </data>
 <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
- <value>HandBrake no pudo cargar el archivo de ajustes preestablecidos. Puede ser debido a una versión antigua no compatible de HandBrake o que el archivo este corrupto. 
+ <value>HandBrake no pudo cargar su archivo de preajustes. Puede ser debido a una versión antigua no compatible de HandBrake o que el archivo este corrupto. 
 
- Su antiguo archivo de ajustes preestablecidos fue archivado en:</value>
+ Su antiguo archivo de preajustes fue archivado en:</value>
 </data>
 <data name="Main_QueueFinishedErrors" xml:space="preserve">
 <value>con {0} errores o cancelaciones detectadas.</value>
@@ -621,26 +612,26 @@
 <value>El número de capítulos no coincide entre el archivo de origen y el archivo de entrada</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
- <value> La duración obtenida de los capítulos del medio fuente y la duración de los capítulos en el archivo de entrada difiere mucho.
+ <value> La duración obtenida de los capítulos del medio original y la duración de los capítulos en el archivo de entrada difiere mucho.
 
 Es muy probable que este archivo de capítulo se haya producido a partir de un medio de origen diferente. 
 
 Está seguro de que desea importar los nombres de capítulo?</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
- <value>La duración del capitulo no coincide entre la fuente y el archivo de entrada</value>
+ <value>La duración del capitulo no coincide entre el original y el archivo de entrada</value>
 </data>
 <data name="ScanService_ScanStopFailed" xml:space="preserve">
 <value>Se ha producido un error al intentar detener el análisis. Reinicie HandBrake.</value>
 </data>
 <data name="Presets_PresetForceReset" xml:space="preserve">
- <value>HandBrake no puede actualizar el archivo de ajustes preestablecidos a un nuevo formato de versión. 
-El archivo predefinido se archivará y se creará uno nuevo. Tendrá que volver a crear sus propios ajustes preestablecidos. </value>
+ <value>HandBrake no puede actualizar su archivo de preajustes al formato de la nueva versión.
+Su archivo de preajuste se archivará y se creará uno nuevo. Tendrá que volver a crear sus propios preajustes. </value>
 </data>
 <data name="SettingService_SaveErrorReset" xml:space="preserve">
 <value>Es posible que deba restablecerse cualquier configuración que haya cambiado.</value>
 </data>
- <data name="UserSettings_AnErrorOccured" xml:space="preserve">
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
 <value>Se ha producido un problema al intentar guardar sus preferencias.</value>
 </data>
 <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
@@ -672,7 +663,7 @@
 <value>Compruebe que tiene un directorio de destino válido.</value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
- <value>Procesando Pase {0} de {1}, (Escaneo de subtítulos) {2:00.00}%, Tiempo de escaneo restante: {3}, Transcurrido: {4:d\:hh\:mm\:ss}</value>
+ <value>Paso de procesamiento {0}de {1}, (Escaneo de subtítulos) {2: 00.00}%, Tiempo restante de escaneo: {3}, Transcurrido: {4}</value>
 </data>
 <data name="NoAdditionalInformation" xml:space="preserve">
 <value>Sin Informacion Adicional</value>
@@ -694,7 +685,11 @@
 <value>Cola pausada</value>
 </data>
 <data name="Main_LowDiskspace" xml:space="preserve">
- <value>Hay poco espacio en el disco en el disco. Libere espacio en disco en su unidad de destino. Como alternativa, puede cambiar el nivel en el que se activa esta alerta en Opciones. </value>
+ <value>Su directorio de destino tiene poco espacio en disco.
+
+Puede configurar el nivel en el que aparece esta alerta en las preferencias.
+
+¿Desea continuar?</value>
 </data>
 <data name="Queue_UnableToResetJob" xml:space="preserve">
 <value>No se puede restablecer el estado del trabajo, ya que no está en estado de Error o Completado</value>
@@ -711,11 +706,6 @@
 <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
 <value>Por favor detenga la codificación actual. Si el problema persiste, por favor reinicie HandBrake.</value>
 </data>
- <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Codificando: Pasada {0} de {1}, {2:00.00}%
-FPS: {3:000.0}, Avg FPS: {4:000.0}
-Tiempo restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss}</value>
- </data>
 <data name="StaticPreviewView_Title" xml:space="preserve">
 <value>Vista previa ({0}% tamaño actual)</value>
 </data>
@@ -748,7 +738,7 @@
 <value>-- Añadir Nueva Categoria--</value>
 </data>
 <data name="AddPresetView_AddPreset" xml:space="preserve">
- <value>Añadir Ajuste Preestablecido</value>
+ <value>Añadir preajuste</value>
 </data>
 <data name="AddPresetView_Category" xml:space="preserve">
 <value>Categoria:</value>
@@ -862,7 +852,7 @@
 <value>Personalizar:</value>
 </data>
 <data name="FiltersView_Deblock" xml:space="preserve">
- <value>Desbloquear</value>
+ <value>Desbloquear:</value>
 </data>
 <data name="FiltersView_Decomb" xml:space="preserve">
 <value>Decomb</value>
@@ -871,16 +861,16 @@
 <value>Desentrelazar:</value>
 </data>
 <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
- <value>Ajuste Preestablecido:</value>
+ <value>Preajuste:</value>
 </data>
 <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
- <value>Desentrelazado Preestablecido</value>
+ <value>Desentrelazado</value>
 </data>
 <data name="FiltersView_Denoise" xml:space="preserve">
 <value>Denoise:</value>
 </data>
 <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
- <value>Denoise Preset</value>
+ <value>Eliminación de ruido</value>
 </data>
 <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
 <value>Denoise Tune</value>
@@ -892,7 +882,7 @@
 <value>Filtros</value>
 </data>
 <data name="FiltersView_FlipVideo" xml:space="preserve">
- <value>Dar la vuelta</value>
+ <value>Horizontal</value>
 </data>
 <data name="FiltersView_Grayscale" xml:space="preserve">
 <value>Escala de grises</value>
@@ -901,16 +891,16 @@
 <value>Detección de entrelazado:</value>
 </data>
 <data name="FiltersView_Preset" xml:space="preserve">
- <value>Ajuste Preestablecido:</value>
+ <value>Preajuste:</value>
 </data>
 <data name="FiltersView_Rotate" xml:space="preserve">
- <value>Rotar:</value>
+ <value>Rotación:</value>
 </data>
 <data name="FiltersView_Sharpen" xml:space="preserve">
- <value>Agudeza</value>
+ <value>Enfocar:</value>
 </data>
 <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
- <value>Agudeza preestablecidat</value>
+ <value>Agudeza</value>
 </data>
 <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
 <value>Afinar Agudeza</value>
@@ -976,7 +966,7 @@
 <value>Alinear Inicio A/V</value>
 </data>
 <data name="MainView_Angle" xml:space="preserve">
- <value>Angulo: </value>
+ <value>Ángulo: </value>
 </data>
 <data name="MainView_AudioTab" xml:space="preserve">
 <value>Audio</value>
@@ -997,7 +987,7 @@
 <value>Destino</value>
 </data>
 <data name="MainView_Duration" xml:space="preserve">
- <value>Duracion: </value>
+ <value>Duración: </value>
 </data>
 <data name="MainView_File" xml:space="preserve">
 <value>Guardar Como:</value>
@@ -1012,7 +1002,7 @@
 <value>Ayuda</value>
 </data>
 <data name="MainView_iPod5G" xml:space="preserve">
- <value>iPod 5G Support</value>
+ <value>Compatibilidad con iPod 5G</value>
 </data>
 <data name="MainView_MetaDataTab" xml:space="preserve">
 <value>Metadatos</value>
@@ -1036,16 +1026,16 @@
 <value>Dimensiones</value>
 </data>
 <data name="MainView_PresetManage" xml:space="preserve">
- <value>Renombrar ajuste preestablecido</value>
+ <value>Renombrar preajuste</value>
 </data>
 <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
 <value>Opciones predefinidas del Menú contextual</value>
 </data>
 <data name="MainView_PresetRemove" xml:space="preserve">
- <value>Borrar Oopciones Preestablecidas</value>
+ <value>Eliminar preajuste</value>
 </data>
 <data name="MainView_Presets" xml:space="preserve">
- <value>Ajustes</value>
+ <value>Preajustes</value>
 </data>
 <data name="MainView_Preview" xml:space="preserve">
 <value>Previsualizar</value>
@@ -1063,17 +1053,14 @@
 <value>Eliminar</value>
 </data>
 <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
- <value>Restablecer ajustes integrados</value>
+ <value>Restablecer preajustes integrados</value>
 </data>
 <data name="MainView_SaveNewPreset" xml:space="preserve">
- <value>Guardar nuevo ajuste preestablecido</value>
+ <value>Guardar nuevo preajuste</value>
 </data>
 <data name="MainView_Searching" xml:space="preserve">
 <value>Buscando la hora de inicio</value>
 </data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Ajuste preestablecido seleccionado:</value>
- </data>
 <data name="MainView_SetDefault" xml:space="preserve">
 <value>Establecer predeterminado</value>
 </data>
@@ -1087,7 +1074,7 @@
 <value>Fuente:</value>
 </data>
 <data name="MainView_SourceOpen" xml:space="preserve">
- <value>Código Abierto</value>
+ <value>Abrir origen</value>
 </data>
 <data name="MainView_StartEncode" xml:space="preserve">
 <value>Iniciar Codificación</value>
@@ -1102,10 +1089,10 @@
 <value>Detener Codificación</value>
 </data>
 <data name="MainView_StopEncodeConfirm" xml:space="preserve">
- <value>Esta seguro que desea detener esta codificación?</value>
+ <value>¿Seguro que desea detener esta codificación?</value>
 </data>
 <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
- <value>Elija una fuente para codificar antes de intentar importar un archivo de subtítulos.</value>
+ <value>Elija un origen para codificar antes de intentar importar un archivo de subtítulos.</value>
 </data>
 <data name="MainView_SubtitlesTab" xml:space="preserve">
 <value>Subtitulos</value>
@@ -1123,16 +1110,16 @@
 <value>Titulo: </value>
 </data>
 <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
- <value>Actualizar ajuste preestablecido seleccionado</value>
+ <value>Actualizar el preajuste seleccionado</value>
 </data>
 <data name="MainView_VideoTab" xml:space="preserve">
 <value>Video</value>
 </data>
 <data name="MainView_WebOptimized" xml:space="preserve">
- <value>Optimizado para Web</value>
+ <value>Optimizar para Web</value>
 </data>
 <data name="ManagePresetView_ManagePreset" xml:space="preserve">
- <value>Administrar ajuste preestablecido</value>
+ <value>Administrar preajustes</value>
 </data>
 <data name="MetaDataView_Title" xml:space="preserve">
 <value>Metadatos</value>
@@ -1161,8 +1148,8 @@
 <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
 <value>Mostrar el estado de codificación en la barra de título de la aplicación.</value>
 </data>
- <data name="Options_30DayLogClear" xml:space="preserve">
- <value>Borrar archivos de registro de más de 30 días</value>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Borrar archivos de registro de más de 7 días</value>
 </data>
 <data name="Options_About" xml:space="preserve">
 <value>Acerca de HandBrake</value>
@@ -1171,16 +1158,16 @@
 <value>Avanzado</value>
 </data>
 <data name="Options_AdvancedOptions" xml:space="preserve">
- <value>Optiones Avanzadas</value>
+ <value>Opciones avanzadas</value>
 </data>
 <data name="Options_Arguments" xml:space="preserve">
 <value>Argumentos:</value>
 </data>
 <data name="Options_AutomaticFileNaming" xml:space="preserve">
- <value>Nombrado de Archivos Automatico</value>
+ <value>Nombramiento automático de archivos</value>
 </data>
 <data name="Options_AutoNameOutput" xml:space="preserve">
- <value>Nombra archivos de salida automáticamente</value>
+ <value>Nombrar automáticamente los archivos de salida</value>
 </data>
 <data name="Options_CheckForUpdates" xml:space="preserve">
 <value>Buscar actualizaciones</value>
@@ -1198,22 +1185,22 @@
 <value>Coloque una copia de los registros de codificación individuales en la misma ubicación que el vídeo codificado</value>
 </data>
 <data name="Options_CurVersion" xml:space="preserve">
- <value>Version Actual</value>
+ <value>Versión actual</value>
 </data>
 <data name="Options_Decoding" xml:space="preserve">
- <value>Decodificar</value>
+ <value>Decodificando</value>
 </data>
 <data name="Options_DefaultPath" xml:space="preserve">
 <value>Ruta predeterminada:</value>
 </data>
 <data name="Options_DownloadUpdates" xml:space="preserve">
- <value>Descargar Actualización</value>
+ <value>Descargar actualización</value>
 </data>
 <data name="Options_DVD" xml:space="preserve">
 <value>Leyendo DVD</value>
 </data>
 <data name="Options_DvdRead" xml:space="preserve">
- <value>Dishabilitar LibDVDNav. (libdvdread se utilizará en su lugar)</value>
+ <value>Deshabilitar LibDVDNav. (libdvdread se utilizará en su lugar)</value>
 </data>
 <data name="Options_Encoding" xml:space="preserve">
 <value>Codificando</value>
@@ -1228,13 +1215,13 @@
 <value>Registro</value>
 </data>
 <data name="Options_LogLevel" xml:space="preserve">
- <value>Log Verbosity Level:</value>
+ <value>Nivel de detalle en registro:</value>
 </data>
 <data name="Options_LogPath" xml:space="preserve">
 <value>Ruta de registro:</value>
 </data>
 <data name="Options_LowDiskspaceSize" xml:space="preserve">
- <value>Pausar la cola si el espacio en disco es inferior a:</value>
+ <value>Pausar la cola si hay poco espacio en disco</value>
 </data>
 <data name="Options_MinimiseTray" xml:space="preserve">
 <value>Minimizar en la bandeja del sistema (requiere reiniciar)</value>
@@ -1254,8 +1241,8 @@
 <data name="Options_Path" xml:space="preserve">
 <value>Directorio:</value>
 </data>
- <data name="Options_PathToVLC" xml:space="preserve">
- <value>Directorio a VLC</value>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Ruta del reproductor de medios</value>
 </data>
 <data name="Options_PreventSleep" xml:space="preserve">
 <value>Evitar que el sistema hiberne mientras se codifica</value>
@@ -1276,7 +1263,7 @@
 <value>Quitar puntuación común</value>
 </data>
 <data name="Options_ReplaceUnderscores" xml:space="preserve">
- <value>Remplazar guiones bajos con un espacio</value>
+ <value>Reemplazar guiones bajos por espacios</value>
 </data>
 <data name="Options_ResetDoNothing" xml:space="preserve">
 <value>Restablecer a 'No hacer nada' cuando la aplicación es vuelta a abrir.</value>
@@ -1290,9 +1277,6 @@
 <data name="Options_SendFileTo" xml:space="preserve">
 <value>Enviar archivo a:</value>
 </data>
- <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
- <value>Mostrar el nuevo diseño experimental de la cola.</value>
- </data>
 <data name="Options_TitleCase" xml:space="preserve">
 <value>Cambiar mayúsculas a Estilo Titulo</value>
 </data>
@@ -1309,7 +1293,8 @@
 <value>Video</value>
 </data>
 <data name="Options_VideoPreviewPath" xml:space="preserve">
- <value>Esta ubicación es usada solo para la previsualización de video</value>
+ <value>Esta ruta es usada solo para la funcionalidad de previsualización del video.
+VLC y MPC-HC son soportados. Otros reproductores pueden funcionar, aunque no han sido validados.</value>
 </data>
 <data name="Options_ViewLogDirectory" xml:space="preserve">
 <value>Ver carpeta de registro</value>
@@ -1333,31 +1318,28 @@
 <value>Abajo</value>
 </data>
 <data name="PictureSettingsView_Cropping" xml:space="preserve">
- <value>Recorte</value>
+ <value>Cortando:</value>
 </data>
 <data name="PictureSettingsView_Custom" xml:space="preserve">
 <value>Personalizado</value>
 </data>
- <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
- <value>Ancho de pantalla:</value>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Tamaño de visualización:</value>
 </data>
 <data name="PictureSettingsView_Height" xml:space="preserve">
 <value>Altura:</value>
 </data>
 <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>Mantener relación de aspecto</value>
+ <value>Automático</value>
 </data>
 <data name="PictureSettingsView_Left" xml:space="preserve">
 <value>Izquierda</value>
 </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>Modulo:</value>
- </data>
 <data name="PictureSettingsView_Output" xml:space="preserve">
- <value>Salida</value>
+ <value>Dimensiones finales:</value>
 </data>
 <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>PAR:</value>
+ <value>Aspecto de Pixel:</value>
 </data>
 <data name="PictureSettingsView_Right" xml:space="preserve">
 <value>Derecha</value>
@@ -1365,20 +1347,17 @@
 <data name="PictureSettingsView_Size" xml:space="preserve">
 <value>Tamaño</value>
 </data>
- <data name="PictureSettingsView_Source" xml:space="preserve">
- <value>Fuente:</value>
- </data>
 <data name="PictureSettingsView_Top" xml:space="preserve">
 <value>Arriba</value>
 </data>
 <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>Ancho:</value>
+ <value>Tamaño escalado:</value>
 </data>
 <data name="Preset_Custom" xml:space="preserve">
 <value>Personalizado</value>
 </data>
 <data name="Preset_Export" xml:space="preserve">
- <value>Importar a archivo</value>
+ <value>Exportar a archivo</value>
 </data>
 <data name="Preset_Import" xml:space="preserve">
 <value>Importar desde archivo</value>
@@ -1393,10 +1372,10 @@
 <value>Agregar a la cola</value>
 </data>
 <data name="QueueSelection_UsingPreset" xml:space="preserve">
- <value>Los títulos seleccionados serán agregados usando el ajuste "{0}"</value>
+ <value>Los títulos seleccionados serán agregados usando el preajuste "{0}".</value>
 </data>
 <data name="QueueView_Advanced" xml:space="preserve">
- <value>Avanzado:</value>
+ <value>Opciones de vídeo:</value>
 </data>
 <data name="QueueView_Audio" xml:space="preserve">
 <value>Audio:</value>
@@ -1414,7 +1393,7 @@
 <value>Limpiar seleccionados</value>
 </data>
 <data name="QueueView_Delete" xml:space="preserve">
- <value>Borrar</value>
+ <value>Eliminar</value>
 </data>
 <data name="QueueView_Destination" xml:space="preserve">
 <value>Destino:</value>
@@ -1432,7 +1411,7 @@
 <value>Tiempo de finalización:</value>
 </data>
 <data name="QueueView_Export" xml:space="preserve">
- <value>Exportar Cola</value>
+ <value>Exportar cola</value>
 </data>
 <data name="QueueView_FileSize" xml:space="preserve">
 <value>Tamaño:</value>
@@ -1453,13 +1432,13 @@
 <value>Abrir carpeta de destino</value>
 </data>
 <data name="QueueView_OpenSourceDir" xml:space="preserve">
- <value>Abrir carpeta fuente</value>
+ <value>Abrir carpeta de origen</value>
 </data>
 <data name="QueueView_Options" xml:space="preserve">
 <value>Opciones</value>
 </data>
 <data name="QueueView_Pause" xml:space="preserve">
- <value>Pausar Cola</value>
+ <value>Pausa</value>
 </data>
 <data name="QueueView_PausedDuration" xml:space="preserve">
 <value>Duración de pausa:</value>
@@ -1477,19 +1456,19 @@
 <value>Reintento fallido</value>
 </data>
 <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
- <value>Restablecer trabajos seleccionados</value>
+ <value>Reiniciar los trabajos seleccionados</value>
 </data>
 <data name="QueueView_Reset" xml:space="preserve">
- <value>Restablecer</value>
+ <value>Reiniciar</value>
 </data>
 <data name="WhenDone_Shutdown" xml:space="preserve">
 <value>Apagar</value>
 </data>
 <data name="QueueView_Source" xml:space="preserve">
- <value>Fuente:</value>
+ <value>Origen:</value>
 </data>
 <data name="QueueView_Start" xml:space="preserve">
- <value>Iniciar Cola</value>
+ <value>Iniciar cola</value>
 </data>
 <data name="QueueView_StartTime" xml:space="preserve">
 <value>Tiempo de inicio:</value>
@@ -1522,19 +1501,19 @@
 <value>Agregar todos las pistas restantes</value>
 </data>
 <data name="Shared_AddNewTrack" xml:space="preserve">
- <value>Agregar pista nueva</value>
+ <value>Agregar nueva pista</value>
 </data>
 <data name="Shared_AddTrack" xml:space="preserve">
- <value>Agregar pista</value>
+ <value>Pistas</value>
 </data>
 <data name="Shared_AvailableLanguages" xml:space="preserve">
 <value>Idiomas disponibles:</value>
 </data>
 <data name="Shared_ChooseLanguages" xml:space="preserve">
- <value>Seleccione idiomas:</value>
+ <value>Seleccionar idiomas:</value>
 </data>
- <data name="Shared_ChosenLangages" xml:space="preserve">
- <value>Seleccione Idiomas:</value>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Idiomas seleccionados:</value>
 </data>
 <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
 <value>Configurar comportamientos por defecto</value>
@@ -1552,10 +1531,10 @@
 <value>Seleccione una carpeta para escanear</value>
 </data>
 <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
- <value>Opcionalmente seleccione un título específico:</value>
+ <value>Opcionalmente, elija un título específico:</value>
 </data>
 <data name="SourceSelection_ChooseVideo" xml:space="preserve">
- <value>Seleccione el o los videos que le gustaría codificar:</value>
+ <value>Seleccione los videos que desea codificar:</value>
 </data>
 <data name="SourceSelection_File" xml:space="preserve">
 <value>Archivo</value>
@@ -1567,7 +1546,7 @@
 <value>Abrir este DVD o Bluray</value>
 </data>
 <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
- <value>Abrir una carpeta con uno o mas archivos.</value>
+ <value>Abrir una carpeta con uno o más archivos.</value>
 </data>
 <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
 <value>Recuperar archivos de cola</value>
@@ -1579,7 +1558,7 @@
 <value>Abrir un solo archivo de video.</value>
 </data>
 <data name="SourceSelection_SourceSelection" xml:space="preserve">
- <value>Selección de fuente</value>
+ <value>Selección de origen</value>
 </data>
 <data name="StaticPreviewView_Duration" xml:space="preserve">
 <value>Duración:</value>
@@ -1591,7 +1570,7 @@
 <value>Seleccione una imagen de previzualización</value>
 </data>
 <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
- <value>Usar el reproductor de video por defecto del sistema</value>
+ <value>Preferir el reproductor por defecto del sistema</value>
 </data>
 <data name="SubtitlesView_AddCC" xml:space="preserve">
 <value>Añadir subtítulos cuando estén disponibles</value>
@@ -1603,7 +1582,7 @@
 <value>Comportamiento de quemado:</value>
 </data>
 <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
- <value>Importar subtitulo</value>
+ <value>Importar subtitulos</value>
 </data>
 <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
 <value>Comportamiento de selección de pistas:</value>
@@ -1612,7 +1591,7 @@
 <value> Añadir todos los subtítulos restantes </value>
 </data>
 <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
- <value>Configure como las pistas de subtítulos son seleccionadas automáticamente y configuradas cuando selecciona un nuevo titulo o video fuente.</value>
+ <value>Configure como las pistas de subtítulos son seleccionadas automáticamente y configuradas cuando selecciona un nuevo titulo o video origen.</value>
 </data>
 <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
 <value>Pistas de audio adicionales</value>
@@ -1648,7 +1627,7 @@
 <value>Sin filtros</value>
 </data>
 <data name="SummaryView_NoSource" xml:space="preserve">
- <value>Sin fuente</value>
+ <value>Sin origen</value>
 </data>
 <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
 <value>Sin pistas de subtítulos</value>
@@ -1672,28 +1651,28 @@
 <value>Bitrate promedio (kbps):</value>
 </data>
 <data name="VideoView_Codec" xml:space="preserve">
- <value>Codec de video:</value>
+ <value>Codificador de vídeo:</value>
 </data>
 <data name="VideoView_ConstantFramerate" xml:space="preserve">
 <value>Velocidad de fotogramas constante</value>
 </data>
 <data name="VideoView_ConstantQuality" xml:space="preserve">
- <value>Calidad constante</value>
+ <value>Calidad constante:</value>
 </data>
 <data name="VideoView_EncoderLevel" xml:space="preserve">
 <value>Nivel de codificación:</value>
 </data>
 <data name="VideoView_EncoderPreset" xml:space="preserve">
- <value>Codificador preestablecido:</value>
+ <value>Preajuste de codificador:</value>
 </data>
 <data name="VideoView_EncoderProfile" xml:space="preserve">
 <value>Perfil del Codificador:</value>
 </data>
 <data name="VideoView_EncodeTune" xml:space="preserve">
- <value>Sintonizar Codificador:</value>
+ <value>Optimizar Codificador:</value>
 </data>
 <data name="VideoView_ExtraOptions" xml:space="preserve">
- <value>Opciones Avanzadas:</value>
+ <value>Opciones avanzadas:</value>
 </data>
 <data name="VideoView_FastDecode" xml:space="preserve">
 <value>Decodificación rápida</value>
@@ -1702,22 +1681,22 @@
 <value>Fotogramas (FPS):</value>
 </data>
 <data name="VideoView_OptimiseVideo" xml:space="preserve">
- <value>Optimizar video:</value>
+ <value>Opciones de codificador:</value>
 </data>
 <data name="VideoView_PeakFramerate" xml:space="preserve">
 <value> Velocidad máxima de fotogramas</value>
 </data>
 <data name="VideoView_Quality" xml:space="preserve">
- <value>Calidad</value>
+ <value>Calidad:</value>
 </data>
 <data name="VideoView_TurboFirstPass" xml:space="preserve">
 <value>Primera pasada turbo</value>
 </data>
 <data name="VideoView_VariableFramerate" xml:space="preserve">
- <value>Fotograma Variable</value>
+ <value>Tasa de fotogramas variable</value>
 </data>
 <data name="VideoView_Video" xml:space="preserve">
- <value>Video</value>
+ <value>Vídeo:</value>
 </data>
 <data name="OptionsView_Language" xml:space="preserve">
 <value>Idioma:</value>
@@ -1735,7 +1714,7 @@
 <value>Ayuda</value>
 </data>
 <data name="Preferences" xml:space="preserve">
- <value>Opciones</value>
+ <value>Preferencias</value>
 </data>
 <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
 <value>Agregar pista</value>
@@ -1774,43 +1753,43 @@
 <value>_Archivo</value>
 </data>
 <data name="MainView_HandBrakeDocs" xml:space="preserve">
- <value>Documentación de _HandBrake (HTTPS)</value>
+ <value>_Documentación de HandBrake (HTTPS)</value>
 </data>
 <data name="MainView_HelpMenu" xml:space="preserve">
- <value>A_yuda</value>
+ <value>_Ayuda</value>
 </data>
 <data name="MainView_ImportFromFile" xml:space="preserve">
- <value>_importar desde archivo</value>
+ <value>_Importar desde archivo</value>
 </data>
 <data name="MainView_PreferencesMenu" xml:space="preserve">
 <value>_Preferencias</value>
 </data>
 <data name="MainView_PresetsMenu" xml:space="preserve">
- <value>_Ajustes</value>
+ <value>_Preajustes</value>
 </data>
 <data name="MainView_QueueMenu" xml:space="preserve">
 <value>_Cola</value>
 </data>
 <data name="MainView_ResetPresets" xml:space="preserve">
- <value>_Restablecer ajustes integrados</value>
+ <value>_Restablecer preajustes integrados</value>
 </data>
 <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
- <value>E_stablecer actual como por defecto</value>
+ <value>_Establecer actual como por defecto</value>
 </data>
 <data name="MainView_ShowPresetPanel" xml:space="preserve">
- <value>_Mostrar panel de ajustes</value>
+ <value>_Mostrar panel de preajustes</value>
 </data>
 <data name="MainView_ShowQueueMenu" xml:space="preserve">
- <value>Mo_strar cola</value>
+ <value>_Mostrar cola</value>
 </data>
 <data name="MainView_ToolsMenu" xml:space="preserve">
- <value>Herramien_tas</value>
+ <value>_Herramientas</value>
 </data>
 <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
 <value>Buscando actualizaciones ...</value>
 </data>
 <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
- <value>¿Está seguro de que desea borrar el directorio del archivo de registro?</value>
+ <value>¿Está seguro de que desea limpiar el directorio de archivos de registro?</value>
 </data>
 <data name="OptionsView_ClearLogs" xml:space="preserve">
 <value>Limpiar registros</value>
@@ -1819,7 +1798,7 @@
 <value>Descargando...</value>
 </data>
 <data name="OptionsView_LogsCleared" xml:space="preserve">
- <value>¡El directorio de archivos de registro de HandBrake ha sido borrado!</value>
+ <value>¡El directorio de archivos de registro de HandBrake ha sido limpiado!</value>
 </data>
 <data name="OptionsView_Notice" xml:space="preserve">
 <value>Atención</value>
@@ -1828,7 +1807,7 @@
 <value>Preparando para actualizar ...</value>
 </data>
 <data name="OptionsView_SelectFolder" xml:space="preserve">
- <value>Por favor seleccione una carpeta</value>
+ <value>Por favor, seleccione una carpeta.</value>
 </data>
 <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
 <value>Pulse 'Examinar' para establecer la ubicación por defecto</value>
@@ -1848,7 +1827,7 @@
 <data name="QueueView_PlayMediaFile" xml:space="preserve">
 <value>Reproducir archivo</value>
 </data>
- <data name="Options_ApplicaitonToolbar" xml:space="preserve">
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
 <value>Barra de herramientas</value>
 </data>
 <data name="Options_ShowToolbarAddAll" xml:space="preserve">
@@ -1858,7 +1837,7 @@
 <value>Mostrar 'Agregar selección a la cola' en la barra de herramientas</value>
 </data>
 <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
- <value>La compatibilidad con la codificación de hardware está deshabilitada actualmente. Asegúrese de que está ejecutando controladores actualizados para todos los adaptadores de gráficos de este sistema. 
+ <value>El soporte de codificación por hardware está actualmente desactivado. Si no ha iniciado HandBrake con la opción "--no-hardware", asegúrese de que está ejecutando controladores actualizados para todos los adaptadores gráficos de este sistema.
 
 Esto no afectará a ninguno de los codificadores de software.</value>
 </data>
@@ -1869,7 +1848,7 @@
 <value>Aplicar</value>
 </data>
 <data name="Main_ResumeEncode" xml:space="preserve">
- <value>Resume Encode</value>
+ <value>Continuar codificación</value>
 </data>
 <data name="QueueView_Actions" xml:space="preserve">
 <value>Acciones</value>
@@ -1878,8 +1857,8 @@
 <value>Importar Cola</value>
 </data>
 <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Codificación: Pase {0} de {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}
-Tiempo Restante: {5}, Transcurrido: {6:d\:hh\:mm\:ss} {7}</value>
+ <value>Codificacion: Paso {0} de {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}
+Tiempo restante: {5}, Transcurrido: {6} {7} </value>
 </data>
 <data name="QueueView_DeleteSelected" xml:space="preserve">
 <value> Eliminar seleccionado</value>
@@ -1898,27 +1877,26 @@
 <value>Modo portátil: No se puede leer portable.ini. Puede haber un error en este archivo. Vuelva a intentar usar portable.ini.template como guía.</value>
 </data>
 <data name="Startup_InitFailed" xml:space="preserve">
- <value>El motor de HandBrake falló al inicializarse. Esto a menudo se debe a controladores de GPU obsoletos. 
-Actualice los controladores de GPU para cualquier gráfico integrado y discreto que tenga su sistema. </value>
+ <value>El motor de HandBrake falló al inicializarse. Esto a menudo se debe a controladores de GPU obsoletos.\n Actualice los controladores de la GPU para cualquier gráfico integrado y/o discreto que tenga su sistema. </value>
 </data>
 <data name="OptionsView_FormatOptions" xml:space="preserve">
 <value>Opciones de actualización en vivo: {source} {title} {chapters} 
-Opciones no en vivo: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Estos solo cambian si escanea una nueva fuente, cambia el título o los capítulos)</value>
+Opciones no en vivo: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Estos solo cambian si escanea un nuevo origen, cambia el título o los capítulos)</value>
 </data>
 <data name="OptionsView_PathOptions" xml:space="preserve">
 <value>Opciones disponibles: {source_path} {source_folder_name} {source}</value>
 </data>
 <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
- <value>Preguntar si se sobreescribe el archivo</value>
+ <value>Preguntar si se sobrescribe el archivo</value>
 </data>
 <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
- <value>Intentar renombrar el archivo automaticamente</value>
+ <value>Intentar renombrar el archivo automáticamente</value>
 </data>
 <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
- <value>Sobreescribir el archivo</value>
+ <value>Sobrescribir el archivo</value>
 </data>
 <data name="Options_UIBehaviour" xml:space="preserve">
- <value>User Interface Behaviour</value>
+ <value>Comportamiento de la Interfaz de Usuario</value>
 </data>
 <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
 <value>Comportamiento de sobrescritura de archivos:</value>
@@ -1945,38 +1923,37 @@
 <value>Prefijo</value>
 </data>
 <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
- <value>Añadir Numero</value>
+ <value>Añadir Número</value>
 </data>
 <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
 <value>FiltersView_DeblockPreset</value>
 </data>
 <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
- <value>Deblock Tune</value>
+ <value>Ajuste de Deblock</value>
 </data>
 <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
 <value>La elección del codificador estará disponible en la pestaña "Vídeo".</value>
 </data>
 <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
- <value> HandBrake ha detectado varios archivos de cola inacabados. Estos serán de varias instancias de HandBrake en ejecución. 
+ <value>HandBrake ha detectado varios archivos de cola inacabados. Estos son de varias instancias de HandBrake en ejecución. 
 ¿Le gustaría recuperar todos los trabajos pendientes?</value>
 </data>
 <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
- <value>HandBrake ha detectado elementos inacabados en la cola desde la última vez que se inició la aplicación. ¿Te gustaría recuperarlos?</value>
+ <value>HandBrake ha detectado elementos inacabados en la cola desde la última vez que se inició la aplicación. ¿Le gustaría recuperarlos?</value>
 </data>
 <data name="Queue_RecoveryPossible" xml:space="preserve">
 <value>Recuperación de cola posible</value>
 </data>
 <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
- <value>El archivo de ajustes preestablecidos contenía ajustes preestablecidos integrados. La función de importación no admite la importación de estos.
-Utilice 'Menú de ajustes preestablecidos -&gt; Restablecer ajustes preestablecidos incorporados' para restaurar los ajustes preestablecidos estándar. 
+ <value>Su archivo de preajustes contiene preajustes integrados. La función de importación no admite la importación de estos. Use 'Menú de preajustes -&gt; Restablecer preajustes integrados' para restaurar los preajustes estándar. 
 
-Cuando se admita, se habrán importado los ajustes preestablecidos de usuario.</value>
+Cuando se admita, se habrán importado los preajustes de usuario.</value>
 </data>
 <data name="Options_PromptBeforeAction" xml:space="preserve">
 <value>Realizar la acción inmediatamente. (Esto desactivará el cuadro de diálogo de confirmación de 60 segundos)</value>
 </data>
 <data name="Browse" xml:space="preserve">
- <value>Navegar</value>
+ <value>Examinar</value>
 </data>
 <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
 <value>No se ha establecido ningún archivo de audio. Por favor, haga clic en 'Examinar' para seleccionar un archivo wav o mp3 para la reproducción.</value>
@@ -1985,10 +1962,10 @@
 <value>Reproducir</value>
 </data>
 <data name="QueueView_ExportCLI" xml:space="preserve">
- <value>Exportar Cola (CLI Solo)</value>
+ <value>Exportar cola (solo CLI)</value>
 </data>
 <data name="Options_DarkTheme" xml:space="preserve">
- <value>Usar el Tema Oscuro. (Requiere Reinicio. Solo Windows 10)</value>
+ <value>Usar el tema oscuro. (Requiere reiniciar, solo Windows 10)</value>
 </data>
 <data name="QueueView_NotAvailable" xml:space="preserve">
 <value>No disponible</value>
@@ -1997,19 +1974,19 @@
 <value>GB</value>
 </data>
 <data name="SystemService_ACMains" xml:space="preserve">
- <value>Alimentación de red de AC detectada. Reanudando la codificación... (-0- %) </value>
+ <value>Alimentación de red detectada. Reanudando codificación... ({0} %) </value>
 </data>
 <data name="SystemService_CriticalBattery" xml:space="preserve">
- <value>¡La batería del sistema es crítica! ({0} %)</value>
+ <value>¡El nivel de batería del sistema es crítico! ({0} %)</value>
 </data>
 <data name="SystemService_LowBatteryLog" xml:space="preserve">
- <value>¡Batería del sistema baja! ({0} %). Su codificación se ha detenido para proteger el sistema. ¡La hibernación del sistema se ha establecido a permitido! </value>
+ <value>¡Batería del sistema baja! ({0}%). Su codificación ha sido pausada.</value>
 </data>
 <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
 <value> El almacenamiento de la unidad restante ha caído por debajo de {0} GB en la unidad de destino. Deteniendo la codificación...</value>
 </data>
 <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
- <value>Configurar Selecciones de Audio Automaticas</value>
+ <value>Configurar Selecciones de Audio Automáticas</value>
 </data>
 <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
 <value>Configurar Selecciones de Subtitulo Automaticas</value>
@@ -2024,7 +2001,7 @@
 <value>Comentarios:</value>
 </data>
 <data name="MetadataView_Description" xml:space="preserve">
- <value>Descripcion:</value>
+ <value>Descripción:</value>
 </data>
 <data name="MetadataView_Director" xml:space="preserve">
 <value>Director:</value>
@@ -2039,10 +2016,7 @@
 <value>Fecha de publicación:</value>
 </data>
 <data name="MetadataView_TitleTag" xml:space="preserve">
- <value>Titulo:</value>
- </data>
- <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
- <value>Previsualizar Rotación y Voltear</value>
+ <value>Título:</value>
 </data>
 <data name="LogViewModel_Title" xml:space="preserve">
 <value>Visor de Registro</value>
@@ -2054,7 +2028,7 @@
 <value>Filtros:</value>
 </data>
 <data name="MainView_Size" xml:space="preserve">
- <value>Ramaño:</value>
+ <value>Tamaño:</value>
 </data>
 <data name="MainView_Tracks" xml:space="preserve">
 <value>Pistas:</value>
@@ -2066,7 +2040,7 @@
 <value>Clic en 'Buscar actualizaciones' para buscar nuevas versiones</value>
 </data>
 <data name="OptionsView_BackButton" xml:space="preserve">
- <value>&lt; Atras</value>
+ <value>&lt; Atrás</value>
 </data>
 <data name="QueueView_CurrentlyPaused" xml:space="preserve">
 <value>Actualmente Pausado</value>
@@ -2075,10 +2049,10 @@
 <value>Archivos de salida</value>
 </data>
 <data name="PointToPointMode_Chapters" xml:space="preserve">
- <value>Capitulos</value>
+ <value>Capítulos</value>
 </data>
 <data name="PointToPointMode_Frames" xml:space="preserve">
- <value>Fotograma</value>
+ <value>Fotogramas</value>
 </data>
 <data name="PointToPointMode_Preview" xml:space="preserve">
 <value>Previsualizar</value>
@@ -2087,7 +2061,7 @@
 <value>Segundos</value>
 </data>
 <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
- <value>Todos los idiomas seleccionados coinciden</value>
+ <value>Todos los idiomas seleccionados que coinciden</value>
 </data>
 <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
 <value>Primer idioma seleccionado que coincide</value>
@@ -2114,7 +2088,7 @@
 <value>Escanear audio extranjero</value>
 </data>
 <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
- <value>Todos los idiomas seleccionados coinciden</value>
+ <value>Todos los idiomas seleccionados que coinciden</value>
 </data>
 <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
 <value>Usar todas las pistas como plantillas</value>
@@ -2129,7 +2103,7 @@
 <value>Sin audio</value>
 </data>
 <data name="ChapterViewModel_Chapter" xml:space="preserve">
- <value>Capitulo {0}</value>
+ <value>Capítulo {0}</value>
 </data>
 <data name="Mp4Behaviour_Auto" xml:space="preserve">
 <value>Automático</value>
@@ -2165,20 +2139,17 @@
 <value>Normal</value>
 </data>
 <data name="UpdateCheck_Monthly" xml:space="preserve">
- <value>Mensual</value>
+ <value>Mensualmente</value>
 </data>
 <data name="UpdateCheck_Weekly" xml:space="preserve">
- <value>Semanal</value>
+ <value>Semanalmente</value>
 </data>
 <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
- <value>Use siempre la ruta por defecto para cada nuevo nombre generado.</value>
+ <value>Usar siempre la ruta por defecto para cada nuevo nombre generado.</value>
 </data>
 <data name="OptionsView_RemotePortLimit" xml:space="preserve">
 <value>El rango de puertos debe estar entre 5000 y 32767</value>
 </data>
- <data name="Options_Experimental" xml:space="preserve">
- <value>Experimental</value>
- </data>
 <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
 <value>Marcadores de reemplazo: {source} {destination}</value>
 <comment>Note: {source} and {destination} are not translatable. </comment>
@@ -2187,6 +2158,332 @@
 <value>¡Una nueva versión de HandBrake está disponible!</value>
 </data>
 <data name="About_Copyright" xml:space="preserve">
- <value>Copyright (C) 2003-2020 The HandBrake Team</value>
+ <value>Copyright (C) 2003-2022 El equipo de HandBrake</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Nivel de batería bajo:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Pausa cualquier trabajo en ejecución cuando la batería esté baja.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value> Añadir todos los subtítulos restantes </value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Se detectaron trabajos duplicados en el archivo de cola que está intentando importar. ¿Desea sobrescribir los registros existentes?
+Esto también detendrá cualquier trabajo en ejecución existente.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Duplicados detectados</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Habilitar el hardware QuickSync de bajo consumo (cuando sea soportado).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Seleccione un solo trabajo para ver información resumida.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Ejecutar cada trabajo en cola en un proceso de trabajo separado.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Puerto de red predeterminado para el trabajador:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>El preajuste que ha seleccionado no está disponible para su uso en este sistema.
+
+Esto suele ser una indicación de que su sistema no es compatible con el hardware necesario para utilizarlo.
+
+Por favor, elija un preajuste diferente.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Aislamiento de procesos</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Tenga en cuenta que esta función iniciará un servidor HTTP en 127.0.0.1 en el puerto indicado.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>Si el puerto está en uso, se usará el primer puerto libre hasta un rango +100 del puerto configurado.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Número máximo de codificaciones simultáneas:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Cancelar</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Preajuste:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Igual al original</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Restablecer la configuración</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>¿Seguro que quiere restablecer la configuración de HandBrake a valores por defecto?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Personalizado (sin límite)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Rellenar (Envolvente)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Alto (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Ninguno</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Ancho (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Rellenar:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Color:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Bordes:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Resolución y Escalado:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientación y Recorte:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( ¡Solo en Windows 10! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filtros:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Por defecto</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forzado</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Tamaño Máximo:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Límite de resolución:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Ninguno</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Administrar preajustes</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Eliminar preajustes integrados</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Exportar preajuste seleccionado</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Importar preajuste(s) desde archivo</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Información de preajuste:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>Los preajustes incorporados no se pueden modificar.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Establecer el preajuste seleccionado como predeterminado</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Eliminar preajuste</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(No soportado en este sistema)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Detener</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>El nombre que ingresaste para la categoría ya existe. Por favor, elige un nombre diferente.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>El nombre de la categoría esta vacío, por favor llene el nombre.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Ingresa un nombre:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>No se ha seleccionado un preajuste.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Exportar todos los preajustes del usuario.</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Alertar de falta de espacio en disco a partir de:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Aviso: Este es el límite superior de trabajos simultáneos. Es posible que se apliquen limitaciones de hardware que reduzcan el número real de trabajos simultáneos durante la codificación.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(No disponible)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Es por Defecto:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>No</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Sí</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Ajustes Precisos de Imagen</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Mostrar los controles de ajuste de recorte.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Usar Oscuro</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Usar Claro</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Coincidir con el Sistema</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Tema:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Requiere Reiniciar)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Suavizado:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Espacio de Color:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Espacio de Color</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Abrir Vista Previa</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Previsualizar Origen:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Estado del Trabajo:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Cancelado</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Completado</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Configuración inválida. Compruebe el registro para ver los detalles.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Entrada inválida. Compruebe el registro para ver los detalles.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Estado desconocido. Compruebe el registro para ver los detalles.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Errores detectados al intentar leer la fuente.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Fallo desconocido. Compruebe el registro para ver los detalles.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>El trabajo falló. Compruebe el registro para ver los detalles.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>Falta el archivo "hb.dll". Por favor, reinstale.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Advertencia: Por favor, tenga en cuenta que esta es una versión en "Modo Seguro" de HandBrake que no incluye soporte para codificadores de hardware. Si desea utilizar el soporte para codificadores de hardware, por favor descargue una compilación que no sea de "Modo Seguro" desde el sitio web.</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>Por favor, tenga en cuenta que HandBrake ya no es compatible con ninguna versión de Windows 7 o Windows 8.
+
+Aunque puede seguir utilizando la aplicación bajo su propia responsabilidad, tenga en cuenta que algunas características no son funcionales y que puede haber otros problemas desconocidos. No habrá soporte disponible cuando se produzcan estos problemas. 
+
+La compatibilidad con Windows 7 y 8 se eliminó en la serie 1.3. Esto significa que no habrá más actualizaciones para corregir problemas en estas plataformas. 
+
+Esta advertencia sólo se mostrará dos veces.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Negro</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Blanco</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Valor RGB:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(con relleno)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Voltear:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Dimensiones del Origen:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Tamaño de almacenamiento: {0}x{1} Tamaño de visualización: {2}x{3} Relación de aspecto: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Se ha detectado un error en el diálogo del explorador de archivos. 
+
+- Por favor, tenga en cuenta que las rutas de archivo largas no son totalmente compatibles. Por favor, mantenga las rutas de los archivos con menos de 255 caracteres. 
+- El último directorio utilizado para esta ventana, se ha restablecido para evitar errores la próxima vez que intente escanear un archivo.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Altura máxima:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Ancho máximo:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Relación de Aspecto: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Metadatos Comunes de Passthru</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>La ruta del nombrado automático por defecto no fue válida. {0} no debe estar antes de {1}</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Preajuste:</value>
 </data>
 </root>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.fa-IR.resx Added

@@ -0,0 +1,2485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>فهرست کامل متغیر‌های فشرده‌ساز:
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>استفاده از پردازنده را در بازسازی کاهش بده.
+
+اگر دستگاه شما برای پخش خروجی مشکل دارد (مثلا تصویر گیر می‌کند)، این را بزنید.</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>هشدار: اگر RF برابر 0 باشد، بدون کاهش است!</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>مقدار 0 به معنای بی اتلاف است و در نتیجه اندازه پرونده، بزرگ‌تر از منبع اصلی خواهد شد؛
+مگر اینکه منبع نیز بی اتلاف باشد.
+
+مقیاس x264 و x265 لگاریتمی است و مقادیر پایین‌تر معادل کیفیت بالاتر است.
+
+بنابراین اندکی کاهش مقدار (افزایش کیفیت) منجر به افزایش تصاعدی اندازه‌ی پرونده‌ی حاصله می‌شود.</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>You can optionally store a picture settings with this preset. There are 3 modes:
+
+None: Picture settings are not stored in the preset. When loading a source, they will remain as-is within the bounds of the source resolution. This also affects Anamorphic, modulus, cropping etc.
+
+Custom: You can optionally set a Maximum width and Height. When doing this an encode will be less than or equal to these values. Keep Aspect Ratio will be automatically turned on.
+
+Source Maximum: Always encode at the sources resolution where possible.</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>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.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>هشدار: نام‌دهی خودکار پرونده روشن نیست. لطفاً آن را از گزینه‌ها فعال کنید.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>WARNING: You do not currently have automatic audio and subtitle track selection setup. You can setup the default track selection behaviour in options.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>پیش‌نشانده‌ها‌ی داخلی بازنشانده شده‌است.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>بازنشانی کامل شد</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>کیفیت بالاتر |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| کیفیت پایین‌تر</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>کیفیت خارق‌العاده |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>خطا</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>قبل از افزودن به صف، باید «نام‌دهی خودکار پرونده» را فعال کنید و یک مسیر پیش‌فرض در «ترجیحات» مقرر کنید.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>هشدار</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>آیا مطمئن هستید؟</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>Handbrake در حال فشرده‌سازی است.</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>کار در انتظار {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>New Default Preset Set: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>یک بروزرسانی جدید در دسترس است. برای نصب به فهرست ابزار &gt; گزینه‌ها بروید</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>هیچ پیش‌نشانده‌ای انتخاب نشده.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>شما نمی‌توانید پیش‌نشانده‌ها‌ی داخلی را تغییر دهید. لطفاً یکی از پیش‌نشانده‌ها‌ی خودتان را انتخاب کنید.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>لطفا یک پوشه را انتخاب کنید.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>در حال مهیا شدن برای فشرده‌سازی ...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>شما نمی‌توانید پیش‌نشانده‌ای هم‌نام پیش‌نشانده‌ی داخلی را وارد کنید.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>پیشنهاده‌ای با نام «{0}» از قبل وجود دارد. آیا می‌خواهید آن را جای‌نویسی کنید؟</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>پیش‌نشانده‌ها</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>آیا مطمئن هستید که می‌خواهید پیش‌نشانده‌ی انتخاب شده را بروزرسانی کنید؟</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>The Preset has now been updated with your current settings.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake تشخیص داده است که پیش‌نشانده‌ها‌ی داخلی شما قدیمی است... این پیش‌نشانده‌ها هم‌اکنون بروز می‌شوند.
+پیش‌نشانده‌ها دلخواه شما بروز نشده است بنابراین ممکن است مجبور شوید با حذف و افزودن مجدد، آنها را از نو ایجاد کنید.
+از پرونده‌ی user_presets.xml قبلی پشتیبان‌گیری شد.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>صف به پایان رسید</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>وارسی لغو شد.</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>وارسی کامل شد</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>وارسی ناموفق بود:</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>وارسی شکست خورد... لطفا برای مشاهده‌ی جزئیاتَ، گزارش فعالیت را ببینید.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>درحال وارسی منبع، لطفا صبر کنید...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>درحال وارسی عنوان {0} از {1} (%{2})</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>قبل از شروع فشرده‌سازی شما ابتدا باید یک منبع را اسکن کرده و کار خود را تنظیم کنید. برای ادامه روی دکمه «منبع» در نوار ابزار بزنید</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>لطفا مطمئن شوید که یکی از پیش‌نشانده‌ها‌ی خود را انتخاب کرده‌اید. لطفاً توجه داشته باشید که نمی‌توانید پیش‌نشانده‌ها‌ی داخلی را صادر کنید.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>لطفا یک پیش‌نشانده را برای بروزرسانی انتخاب کنید.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>برای ادامه دادن، «منبعی» را انتخاب کنید</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} کار در انتظار</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>توجه</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>جای‌نویسی شود؟</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>سوال</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>آماده</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>بروزرسانی شده</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>نسخه‌ی پیش‌نشانده</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>پیش‌نشانده‌هایی که شما تلاش می‌کنید وارد کنید مربوط به نسخه‌ای متفاوت از HandBrake است. 
+شاید امکان وارد کردن همه‌ی مقادیر از این پیش‌نشانده وجود نداشته باشد.
+
+آیا می‌خواهید ادامه دهید؟</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>نتوانست پیش‌نشانده را وارد کند!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>نتوانست پیش‌نشانده را وارد کند زیرا به نظر می‌رسد خراب شده یا از یک نسخه‌ی قدیمی‌تر HandBrake باشد.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>شما باید اول مسیر مقصد را برای پرونده‌ی خروجی تنظیم کنید سپس آن را در صف قرار دهید.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>The entered destination path contained illegal characters and will not be updated.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>پیش‌نمایش {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Preview (Scaled)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>خروجی: {0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.
+
+Live Update Options: {source} {title} {chapters} 
+Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>گزینه‌های اضافی موجود: {source_path} (مسیر منبع) یا {source_folder_name} (نام پوشه‌ی منبع) یا {source} (نام منبع)</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>مسیر و نام پرونده‌ای که در فرآیند فشرده‌سازی ایجاد می‌شود نباید عین پرونده‌ی منبع باشد. لطفاً نام پرونده‌ی مقصد را تغییر دهید تا مطابق پرونده‌ی منبع نباشد.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>دستگاه شما از راه اندازی مرورگر وب توسط HandBrake جلوگیری کرد.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>شما همچنان قادرید صفحه‌ی کمک را با مراجعه‌ی مستقیم به وبگاه https://handbrake.fr مشاهده کنید.</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>نتوانست پیش‌نشانده‌ی انتخاب‌شده را وارد کند!</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>این پیش‌نشانده ممکن است خراب شده یا از یک نسخه‌ی قدیمی‌تر HandBrake باشد که پشتیبانی نمی‌شود.
+پیش‌نشانده‌ها‌ی نسخه‌های قدیمی‌تر باید باید در همین نسخه از نو ساخته شوند.</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>شناسه‌های پیشرفته‌ی اضافی که می توانند به فشرده‌ساز ویدیو منتقل شوند.</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>None - Only tracks where the container does not support the format will be burned in.
+Foreign Audio Track - The Foreign Audio track will be burned in if available. 
+First Track - The first track will be burned in.
+Foreign Audio Preferred, else First - If the foreign audio track exists, it will be burned in, otherwise the first track will be chosen.</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>پشتیبانی از زیرنویس WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>WebM در HandBrake فقط از زیرنویس‌های چسبیده پشتیبانی می کند.
+
+شما باید انتخاب‌های زیرنویس خود را تغییر دهید.
+
+اگر ادامه دهید، زیرنویس‌های غیرچسبیده‌ی شما از بین می‌روند.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>هیچ منبع یا عنوان سالمی پیدا نشد.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake نمی‌تواند منبع انتخاب شده را فشرده کند زیرا هیچ منبع معتبری را برای فشرده‌سازی پیدا نکرد.
+این می‌تواند به یکی از دلایل زیر باشد:
+- مدت زمان تمام منبع کمتر از «حداقل مدت عنوان» است که در ترجیحات &gt; پیشرفته &gt; گزینه‌ها قابل تنظیم است.
+- پرونده‌ی منبع یک پرونده‌ی ویدیویی معتبر نیست یا در قالبی است که HandBrake از آن پشتیبانی نمی‌کند.
+- منبع ممکن است از محافظت شده از رونوشت باشد یا شامل DRM باشد. لطفا توجه داشته باشید که HandBrake از حذف محافظت از رونوشت پشتیبانی نمی‌کند.
+
+گزارش فعالیت ممکن است اطلاعات بیشتری داشته باشد.</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>صف{0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>شروع فشرده‌سازی</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>شروع صف</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>شما نمی‌توانید پیش‌نشانده‌ی پیش‌فرض را حذف کنید. لطفا اول یک پیش‌نشانده‌ی دیگر را به عنوان پیش‌فرض تنظیم کنید.</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>آیا مطمئن هستیدید می‌خواهید این پیش‌نشانده را حذف کنید؟</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>یک پیش‌نشانده باید نام داشته باشد. لطفا قسمت نام پیش‌نشانده را پر کنید.</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>پیش‌نشانده‌ای با همین نام از قبل موجود است. دوست دارید جای‌نویسی کنید؟</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>You must first scan a source to use the 'Source Maximum' Option.</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>The Custom Width or Height fields must be filled in for the 'Custom' option.</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>نتواست پیش‌نشانده را اضافه کند</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>خطای ناشناخته</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>پیش‌فرض‌های صدا</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>خط‌های صدا</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Selection Behavior</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>Switch Back To Tracks</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>نتوانست پرونده‌ی بخش‌نشان‌ها را ذخیره کند!</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>نام بخش‌نشان در پرونده‌ی فشرده‌ی شما ذخیره نخواهد شد.</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>عملیات « {0} » در {1} ثانیه‌ی دیگر اتفاق خواهد افتاد.</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>If the problem persists, please try restarting HandBrake.</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>در مورد این خطا اطلاعات بیشتری در دسترس نیست.</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>یک خطای ناشناخته رخ داده است.</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>آپدیت جدیدی در دسترس است! لطفاً وبگاه را برای نکات انتشار بررسی کنید.</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>دستگاه شما از نسخه‌ی 64بیتی HandBrake پشتیبانی می‌کند! آن نسخه عملکرد بهتر و ثبات بیشتری نسبت به نسخه‌ی 32بیتی دارد.
+لطفاً وب سایت را برای مشاهده‌ی نکات انتشار بررسی کنید.</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>فعلاً بروزرسانی جدیدی موجود نیست.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>بروزرسانی بارگیری شد.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>بروزرسانی در دسترس نیست. شما می‌توانید برای بارگیری بروزرسانی از https://handbrake.fr تلاش کنید.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>بروزرسانی ناموفق بود. شما می‌توانید برای بارگیری بروزرسانی از https://handbrake.fr تلاش کنید.</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>Storage Size: {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>افزودن به صف</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>هیچ فشرده‌سازیی در انتظار نیست</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>در حال حاضر کاری برای فشرده‌سازی نیست</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>صف</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>آیا مطمئن هستید می‌خواهید این صف را پاک کنید؟</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>تأیید</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} کار در انتظار</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>صف نگه داشته شد</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>آیا مطمئن هستید می‌خواهید کارهای انتخاب شده را حذف کنید؟</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>این فشرده‌سازی در حال انجام است. اگر آن را حذف کنید، فشرده‌سازی متوقف می‌شود. آیا مطمئن هستید می‌خواهید ادامه دهید؟</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>هیچ کاری در انتظاری نیست.</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>آیا مطمئن هستید می‌خواهید این کار را ویرایش کنید؟ در این صورت از صف حذف شده و به پنجره‌ی اصلی انتقال می‌یابد.</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>صف آماده است</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>صف در حال اجرا نیست</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>صف تکمیل شد</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>کارهای سف تمام شد</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>صف آغاز شد</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>یک فشرده‌سازی الآن در حال اجرا است. با خروج از HandBrake این فشرده‌سازی متوقف می‌شود.
+آیا مطمئن هستید می‌خواهید از ‌HandBrake خارج شوید؟</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>پیش‌نمایش تصویر</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>نتوانست پرونده‌ی پیش‌نمایش قبلی را حذف کند. ممکن است هنوز یک پیش‌نمایش در پخش‌کننده‌ی رسانه‌ی شما باز باشد. لطفاً آن را ببندید.</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>You must first scan a source and setup your encode before creating a preview.</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>هم‌اکنون HandBrake درحال فشرده‌سازی است! در هر زمان فقط یک پرونده می‌تواند فشرده‌سازی شود.</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>پیش‌فرض‌های زیرنویس</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>خط‌های زیرنویس</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>Switch Back To Tracks</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Selection Behavior</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>پرونده‌ی بایگانی شده</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>Unable to load presets.</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake نتوانست پرونده‌ی پیش‌نشانده‌ها‌ی شما را باز کند. ممکن است این پرونده از نسخه‌ی قدیمی پشتیبانی نشده‌ی HandBrake باشد یا خراب شده باشد.
+
+پرونده‌ی پیش‌نشانده‌ها‌ی قدیمی در اینجا بایگانی شدند:</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value>با {0} خطا یا لغو شناسایی شد.</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>حافظه کم است</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>هشدار، فضای دیسک شما کم است. اگر فضای دیسک کم باشد HandBrake نخواهد توانست این فشرده‌سازی را کامل کند.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>Line {0} is invalid. Nothing will be imported.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>نتوانست پرونده‌ی بخش‌بندی را وارد کند.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>تمام خطوط موجود در پرونده‌ی بخش‌بندی باید حاوی حداقل 2 ستون «داده» باشند</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>ستون اول در پرونده‌ی بخش‌بندی باید فقط حاوی اعداد صحیح بالاتر از صفر (0) باشد </value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>پرونده‌ی بخش‌بندی ار نوع «{0}» در حال حاضر پشتیبانی نمی‌شود.</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>نوع پرونده‌ی بخش‌بندی پشتیبانی نشده</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>اطلاعات بخش‌بندی نامعتبر برای رسانه‌ی منبع</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>تعداد فصل‌ها در رسانه‌ی منبع
+و تعداد فصل‌ها در پرونده‌ی ورودی مطابقت ندارند ({0} دربرابر {1}).
+
+آیا هنوز می‌خواهید نام فصل‌ها را وارد کنید؟</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>تعداد فصل‌ها در رسانه‌ی منبع
+و تعداد فصل‌ها در پرونده‌ی ورودی مطابقت ندارند ({0} دربرابر {1}).
+
+آیا هنوز می‌خواهید نام فصل‌ها را وارد کنید؟</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>شمار بخش بین پرونده‌ی منبع و ورودی تطابق ندارد</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>آنچه از مدت بخش‌‌ها در رسانه‌ی منبع گزارش شده
+با مدت بخش‌ها در پرونده‌ی ورودی بسیار متفاوت است.
+
+به احتمال بسیار بالا، این پرونده‌ی بخش‌بندی بر اساس منبع دیگری تولید شده.
+
+آیا مطمئن هستید که می خواهید نام بخش‌ها را وارد کنید؟</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>مدت بخش بین پرونده‌ی منبع و ورودی تطابق ندارد</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>An error occurred when trying to stop the scan. Please restart HandBrake.</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake is unable to upgrade your presets file to a new version format.
+Your preset file will be archived and new one created. You will need to re-create your own presets.</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>Any settings you changed may need to be reset the next time HandBrake launches.</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>در هنگام تلاش برای دخیره‌ی ترجیحات مشکلی پیش آمد.</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>هشدار، تنظیمات شما بازنشانی شده‌است!</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>Your user settings file was corrupted or inaccessible. Settings have been reset to defaults.</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>Unable to load user settings file: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>Your user settings file appears to be inaccessible or corrupted. You may have to delete the file and let HandBrake generate a new one.</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>پوشه‌ی خروجیی که انتخاب کردید وجود ندارد یا اجازه ذخیره‌ی پرونده‌ها در آن را ندارید.</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>پوشه‌ای ایجاد کند؟</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>پوشه‌ای که می‌خواهید در آن ذخیره شود وجود ندارد. آیا مایلید HandBrake این پوشه را بسازد؟
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>نتواست پوشه‌ی مقصد را باز کند.</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>لطفاً بررسی کنید پوشه‌ی مقصد شما معتبر باشد.</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>Processing Pass {0} of {1}, (Subtitle Scan) {2:00.00}%, Scan Time Remaining: {3}, Elapsed: {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>بدون اطلاعات اضافی</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - (٪{1}، مرحله‌ی {2} از{3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, Pass {2} of {3}
+Remaining Time: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>صف نگه داشته شد. هشدار، فضای رانه‌ای (درایوی) که شما در آن فشرده‌سازی می‌کنید، کم است. لطفاً مقداری از فضا را آزاد کرده و برای ادامه «شروع» را بزنید. همچنین می‌توانید در «ترجیحات» حداقل مقدار فضا را تنظیم کنید.</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>صف نگه داشته شد</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>صف نگه داشته شد</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>حافظه‌ی پوشه‌ی مقصد شما کم است.
+
+شما می‌توانید سطحی که این هشدار نمایش داده می‌شود را در ترجیحات تنظیم کنید.
+
+آیا مایل هستید ادامه دهید؟</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>Unable to reset job status as it is not in an Error or Completed state</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>Unable to restore queue file.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>این پرونده ممکن است خراب باشد یا از نسخه‌ی قدیمی و ناسازگاز HandBrake باشد</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake در حال فشرده‌سازی یک پرونده است.</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>لطفاً فشرده‌سازی فعلی را متوقف کنید. اگر مشکل همچنان ادامه داشت، لطفاً HandBrake را دوباره راه‌اندازی کنید.</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>پیش‌نمایش (٪{0} سایز واقعی)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake برای اجرا شدن نیازمند ویندوز 64بیتی و 7 به بالاست.</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake برای اجرا شدن نیازمند ویندوز 7 یا بالاتر است. نسخه‌ی 0.9.9 (XP) و 0.10.5 (Vista)، آخرین نسخه‌هایی بود که از این سیستم‌عامل‌ها پشتیبانی می‌کرد.</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>Do you wish to proceed trying to add the rest?</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>پرونده‌ی «{0}» از قبل وجود دارد. آیا می‌خواهید آن را جای‌نویسی کنید؟</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>The system clipboard is currently unavailable.</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>This may be due to another application monitoring or locking the clipboard for its own use. You will not be able to use the clipboard until it is unlocked.</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>مجوز:</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>نسخه:</value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- افزودن دسته‌ی جدید --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>افزودن پیش‌نشانده</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>دسته:</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>شرح:</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>نام:</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>ابعاد:</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>Source Track Selection</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>Allow passthru of:</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>Configure how the Audio Tracks are automatically selected and configured when you select a new title or source video.</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>'Auto Passthru' Behaviour:</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>بیت بر ثانیه</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>نوع فشرده‌سازی</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>فشرده‌سازی با دامنه‌ی پویا DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>Gain</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>مخفی کردن</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Mixdown</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>Fallback encoder:</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>بارگذاری مجدد</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>Samplerate</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>نمایاندن</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>نام خط</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Track Selection Behaviour:</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>برای خط‌های اضافی</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>When 'Auto Passthru' is selected as the audio codec.</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>بخش‌نشان‌ها</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>نام بخش</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>شماره‌ی بخش</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>ایجاد بخش‌نشان</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>مدت</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>صادر کردن</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>وارد کردن</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>صادر کردن نام‌ها</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>وارد کردن نام‌ها</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>بازنشانی نام بخش‌ها</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>لغو عملیات</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>ادامه دادن</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>عملکرد زمانی که انجام شد </value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>جزئیات خطا:</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>Custom:</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>هموارسازی:</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Decomb</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>Deinterlace:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>پیش‌نشانده:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>Deinterlace Preset</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>نویز زدایی:</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>پیش‌نشانده‌ی کاهش نویز</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>میزان نویز زدایی</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Detelecine:</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>پالایه‌ها</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>Horizontal</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>سیاه و سفید</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>Interlace Detection:</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>پیش‌نشانده:</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>Rotation:</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>واضح کردن:</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>پیش‌نشانده‌ی واضح کردن </value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>میزان واضح کردن</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>میزان</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>افزودن</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>لغو</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>پاک کردن</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>بستن</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>رونوشت به بریده‌دان</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>انتقال به چپ</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>انتقال به راست</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>ذخیره کردن</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>رونوشت به بریده‌دان</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>گزارش فشرده‌سازی</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>باز کردن پوشه‌ی گزارش</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>گزارش وارسی</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>گزارش فعالیت</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>افزودن همه</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>Add Current</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>Add Selection</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>افزودن به صف</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>پیشرفته</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>تراز کردن صدا/تصویر در شروع</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>زاویه:</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>صدا</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>خط‌های صدا</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>مرور</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>بخش‌ها</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>Container</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>مقصد</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>مدت:</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>ذخیره با نام:</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>پالایه‌ها</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>فرمت:</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>کمک</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>پشتیبانی از iPod نسل 5</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>فراداده</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(اصلاح شده)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>Muxing: This may take a while...</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>گزینه‌ها</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>تنظیمات خروجی</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>نگه‌داشتن</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>ابعاد</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>تغییر نام پیش‌نشانده</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Preset Options Context Menu</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>حذف پیش‌نشانده</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>پیش‌نشانده‌ها</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>پیش‌نمایش</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>Encoding: {0}, {1:00.00}%, Time Remaining: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Range:</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>بازیابی</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>حذف</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>بازنشانی پیش‌نشانده‌ها‌ی داخلی</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>ذخیره‌ی پیش‌نشانده‌ی جدید</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>Searching for start time</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>پیش‌فرض قرار دادن</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>پیش‌نمایش</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>صف</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>منبع:</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>باز کردن منبع</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>شروع فشرده‌سازی</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>شروع صف</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>توقف</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>توقف فشرده‌سازی</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>آیا مطمئن هستید که می‌خواهید این فشرده‌سازی را لغو کنید؟</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>لطفاً قبل از تلاش برای وارد کردن پرونده‌ی زیرنویس، یک منبع برای فشرده‌سازی انتخاب کنید.</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>زیرنویس‌ها</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>خط‌های زیرنویس</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>خلاصه</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>عنوان:</value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>بروزرسانی پیش‌نشانده‌ی انتخاب شده</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>ویدیو</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>بهینه برای وب</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>مدیریت پیش‌نشانده‌ها:</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>فراداده</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>اجازه دادن به استفاده از فشرده‌ساز Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>اجازه دادن به استفاده از فشرده‌ساز Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>اجازه دادن به استفاده از فشرده‌ساز AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>The file format entered contained invalid characters. These have been removed. </value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>بعد از اینکه هر فشرده‌سازی تکمیل شد یک صدا پخش کن.</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>بعد از اینکه صف تکمیل شد یک صدا پخش کن.</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>پیش‌نمایش‌هایی را در صفحه‌ی خلاصه نشان بده.</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>وضعیت فشرده‌سازی را در نوار عنوان برنامه نشان بده.</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>پرونده‌های گزارشی که بیش از 7 روز از ایجاد آن‌ها می‌گذرد را پاک کن</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>درباره‌ی HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>پیشرفته</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>گزینه‌های پیشرفته</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>Arguments:</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>نام‌دهی خودکار</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>پروند‌ه‌های خروجی را به صورت خودکار نام‌دهی کن</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>بررسی بروزرسانی‌ها</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>همیشه موارد صف را پس از فشرده‌سازی از صف پاک کن</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>پاک‌کردن تاریخچه‌یگزارش</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>یک رونوشت از گزارش‌های فشرده‌سازی جداگانه را در این مکان قرار بده:</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>یک نسخه از گزارش‌های فشرده‌سازی جداگانه را در مکان ویدیوی فشرده شده قرار بده</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>نسخه‌ی فعلی</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>بازسازی</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>مسیر پیش‌فرض:</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>بارگیری بروزرسانی</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>DVD Reading</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>Disable LibDVDNav. (libdvdread will be used instead)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>فشرده‌سازی</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>قالب فایل:</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>عمومی</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>گزارش نگاری</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>Log Verbosity Level:</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>مسیر گزارش:</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>اگر حافظه کم بود، صف را نگه دار</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>کوچک کردن در سینی (system tray) (نیازمند راه‌اندازی مجدد)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>Minimum DVD and Blu-ray title duration in seconds. Shorter titles will be skipped:</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>پسوند فایل MP4:</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>موقع شروع</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>پرونده‌های خروجی</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>مسیر:</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>مسیر پخش‌کننده‌ی رسانه:</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>Prevent the system from sleeping while encoding</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>Number of picture previews to scan:</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>میزان اولویت:</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>Prefer use of Intel QuickSync for decoding video when available. </value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>Also Use QSV Decoding when not using a QuickSync encoder. (i.e. x265) </value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>Remove common punctuation</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>Replace underscores with a space</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>دفعه‌ی بعد که برنامه باز شد، روی «هیچ کاری نکن» برگردد.</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>Choose Scaler:</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>Scaling</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>ارسال فایل به:</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>Change case to Title Case</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>بروز‌رسانی‌ها</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>رابط کاربری</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>نسخه:</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>ویدیو</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>این مسیر فقط برای قابلیت پیش‌نمایش ویدیو استفاده می‌شود.
+VLC و MPC-HC پشتیبانی می‌شوند. پخش‌کننده‌های دیگر نیز ممکن است کار کنند اما معتبر نیستند.</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>مشاهده‌ی پوشه‌ی گزارش</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>وقتی</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>تنظیمات x264/5</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>Constant quality fractional granularity:</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamorphic:</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>خودکار</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>پایین</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>برش:</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>دلخواه</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Display Size:</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>ارتفاع:</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>خودکار</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>چپ</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>Final Dimensions:</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Pixel Aspect:</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>راست</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>اندازه</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>بالا</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Scaled Size:</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>دلخواه</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>صادر کردن به پرونده</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>وارد کردن از پرونده</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>رسمی</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>انتخاب عناوین</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>افزودن به صف</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>The selected titles will be added using the "{0}" preset.</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>تظیمات ویدیو:</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>صدا:</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>پاک کردن همه</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>پاک کردن کامل شد</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>پاک کردن صف</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>Clear Selected</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>حذف</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>مقصد:</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>هیچ کاری نکن</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>Encode Time:</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>ویرایش</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>زمان پایان:</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>صادرکردن صف</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>اندازه پرونده:</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>Hibernate</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>Lock System</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>گزارش پس از تکمیل فشرده‌سازی در دسترس خواهد بود.</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>Log off</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>باز کردن پوشه‌ی مقصد</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>باز کردن پوشه‌ی منبع</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>گزینه‌ها</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>نگه‌داشتن</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>Paused Duration:</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>Picture Settings:</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>خروج از HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>Retry All Jobs</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>Retry Failed</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>Reset Selected Jobs</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>بازنشانی</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>Shutdown</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>منبع:</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>شروع صف</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>زمان شروع:</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>آمار</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>آمار پس از اتمام یک فشرده‌سازی در دسترس خواهد بود.</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>زیرنویس‌ها:</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>خلاصه</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>Sleep</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>ویدیو:</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>وقتی انجام شد</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>Add All Remaining Selected Languages</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>همه‌ی خط‌های باقی‌مانده را اضافه کند</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>افزودن خط جدید</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>خط‌ها</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>زبان‌های موجود:</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>انتخاب زبان:</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Selected Languages:</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>Configure Default Behaviours</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>بازیابی</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>انتخاب یک دیسک برای وارسی</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>انتخاب یک پرونده برای وارسی</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>پوشه‌ای را برای وارسی انتخاب کنید</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>Optionally choose a specific title: </value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>پس ویدیو(هایی) که می‌خواهید فشرده شود را انتخاب کنید:</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>پرونده</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>پوشه (وارسی دسته‌ای)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>Open this DVD or Bluray Drive</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>یک پوشه با یک یا چند پرونده را باز کنید</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>Recover Queue Files</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>A previous queue archive is available. </value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>بازکردن یک پرونده‌ی ویدیویی</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>Source Selection</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>مدت:</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>پیش‌نمایش زنده</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>Select a preview image</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>پخش‌کننده‌ی پیش‌فرض دستگاه را ترجیح بده</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>Add Closed Captions when available</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>Add 'Foreign Audio Scan'</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>Burn-In Behaviour:</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>وارد کردن زیرنویس</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Track Selection Behaviour:</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>Add All Remaining Closed Captions</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>Configure how the Subtitle Tracks are automatically selected and configured when you select a new title or source video.</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>خط‌های صدای اضافی</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>خط‌های زیرنویس فرعی</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>Burned</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>بخش‌نشان‌ها</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>هموارسازی</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Detelecine</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>صفحه‌نمایش</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>سیاه و سفید</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>بدون خط صدا</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>هیچ بخش‌نشانی نیست</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>بدون پالایه</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>بدون منبع</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>بدون خط زیرنویس</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>بدون خط</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>پیش‌نمایش {0} از {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>چرخش</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>حافظه</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>فشرده‌سازی 2 مرحله‌ای</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>Avg Bitrate (kbps):</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>فشرده‌ساز ویدیو:</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>فریم بر ثانیه‌ی ثابت</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>کیفیت ثابت:</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>تراز فشردگی</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>پیش‌نشانده‌ی فشردگی</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>Encoder Profile:</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>میزان فشرده‌سازی</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>گزینه‌های پیشرفته:</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>بازسازی سریع</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>فریم بر ثانیه (FPS):</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>گزینه‌های فشرده‌سازی:</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>بیشنه‌ی فریم بر ثانیه</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>کیفیت:</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Turbo first pass</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>فریم بر ثانیه‌ی تغییرپذیر</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>ویدیو:</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>زبان:</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>استفاده از زبان دستگاه</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>درباره‌ی HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>یا یک پرونده یا پوشه را اینجا رها کنید ...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>کمک</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>ترجیحات</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>افزودن خط</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>تنظیمات فشردگی صدا برای هر کدام از خط‌های انتخاب شده</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>پاک کردن</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Burn In</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>پیش‌فرض</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>Forced Only</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>_درباره‌ی...</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>_گزارش فعالیت</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>_بررسی بروزرسانی‌ها</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>_خروج</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>_صادر کردن به پرونده</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>_پرونده</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>_مستندات HandBrake</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>_کمک</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>_وارد کردن از پرونده</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>_ترجیحات</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>_پیش‌نشانده‌ها</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>_صف</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>_بازنشانی پیش‌نشانده‌ها‌ی داخلی</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>_تنظیم تنظیمان فعلی به عنوان پیش‌فرض</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>S_how Preset Panel</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>_نمایش صف</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>_ابزارها</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>بررسی بروزرسانی‌ها</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>آیا مطمئن هستید که می‌خواهید پوشه‌ی پرونده‌های گزارش HandBrake را پاک کنید؟</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>پاک کردن گزارش‌ها</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>در حال بارگیری</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>پوشه‌ی پرونده‌های گزارش HandBrake پاک شد!</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>توجه</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>آماده‌سازی برای بروزرسانی</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>لطفا یک پوشه را انتخاب کنید.</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>برای تنظیم محل پیش‌فرض بر روی «مرور» بزنید</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>مخفی کردن</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>نمایاندن</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>«افزودن همه» به صف</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>«افزودن انتخاب‌ها» به صف</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>پخش پرونده</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>نوار ابزار برنامه</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>نمایش «افزودن همه به صف» در نوار ابزار</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>نمایش «افزودن انتخاب‌ها به صف» در نوار ابزار</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>پشتیبانی از فشرده‌سازی سخت‌افزاری در حال حاضر غیرفعال است. اگر HandBrake را با گزینه "no-hardware--" شروع نکردید، لطفاً از بروز بودن رانه‌های تمام سازوارگرهای گرافیکی موجود در این دستگاه اطمینان حاصل کنید.
+
+این مورد بر فشرده‌سازی‌های نرم افزاری اثر نمی‌گذارد.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Please correct your subtitle settings before continuing. </value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>اعمال کردن</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>از سرگیری فشرده‌سازی</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>Actions</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>Import Queue</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}
+Time Remaining: {5}, Elapsed: {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>Delete Selected</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>حالت قابل حمل: نتوانست پوشه‌ی موقتی را ایجاد کند. لطفا مجددا بررسی کنید آیا مسیر صحیح و قابل نوشتن است؟
+
+{0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>حالت قابل حمل: نتوانست پوشه‌ی ذخیره‌سازی را ایجاد کند. لطفا مجددا بررسی کنید آیا مسیر صحیح و قابل نوشتن است؟
+
+{0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>Portable Mode: Unable to read portable.ini. There may be an error in this file. Please retry using portable.ini.template as a guide.</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>موتور HandBrake در مقداردهی اولیه ناموفق بود. این معمولا ناشی از رانه‌های (درایور‌های) GPU‌های قدیمی است.
+لطفاً رانه‌های تمام GPUهای خود را ، اعم از گرافیک‌های داخلی و مجزای دستگاهتان، بروزرسانی کنید.</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Live Update Options: {source} {title} {chapters} 
+Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>گزینه‌های اضافی موجود: {source_path} (مسیر منبع)، {source_folder_name} (نام پوشه‌ی منبع)، {source} (منبع)</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>درخواست جای‌نویسی پرونده</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>Try to automatically rename file</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>جای‌نویسی پرونده</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>User Interface Behaviour</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>File overwrite behaviour:</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>فشرده‌سازی کامل شد</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>اعلانات</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>صف تکمیل شد</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>وقتی انجام شد</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>Filename collision behaviour:</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>Postfix</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>Prefix</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>Append Number</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>نمایش‌پالایه_پالایه‌ی‌هموارسازی</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>میزان هموارسازی</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>انتخاب کردن فشرده‌سازها باعث می‌شود در زبانه‌ی «ویدیو» در دسترس باشند.</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake has detected multiple unfinished queue files. These will be from multiple instances of HandBrake running. Would you like to recover all unfinished jobs?</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake has detected unfinished items on the queue from the last time the application was launched. Would you like to recover these?</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>Queue Recovery Possible</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>Your presets file contained built-in presets. The import function does not support importing these. Please use 'Presets Menu -&gt; Reset Built In-Presets' to restore the standard presets.
+
+Where supported, any user presets will have been imported.</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>بلافاصله اقدام شود. (این گزینه پیام تأیید 60 ثانیه‌ای را غیرفعال می کند)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>مرور</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>هیچ صدایی انتخاب نشده است. لطفا روی «مرور» بزنید و یک فایل mp3 یا wav را برای پخش انتخاب کنید.</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>پخش</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>صادرکردن صف (فقط رابط خط فرمان)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>استفاده از پی‌رنگ تیره (نیازمند راه‌اندازی مجدد، فقط ویندوز 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>موجود نیست</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>گیگابایت</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>AC Mains power detected. Resuming encode... ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>وضع باتری دستگاه وخیم است! (٪{0})</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>System Battery Low! ({0} %). Your encode has been paused.</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>حافظه‌ی باقی مانده‌ی رانه‌ی (درایو) مقصد به کمتر از {0}گیگابایت رسید. در حال نگه‌داشتن فشرده‌سازی</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Configure Automatic Audio Selections</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Configure Automatic Subtitle Selections</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>دستگاه</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Actors:</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Comments:</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>شرح:</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Director:</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>گونه:</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Plot:</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>تاریخ انتشار:</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>عنوان:</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>نمایشگر گزارش</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>ابعاد</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>پالایه‌ها</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>اندازه</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>خط‌ها:</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>عمومی</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>برای «بررسی بروزرسانی‌ها» بزنید تا نسخه‌های جدید بررسی شود</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; عقب</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>Currently Paused</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>پرونده‌های خروجی</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>بخش‌ها</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>قاب‌ها</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>پیش‌نمایش</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>Seconds</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>All Matching Selected Languages</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>First Matching Selected Language</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>هیچ کدام</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>اولین خط</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>Foreign Audio Preferred, else First</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>خط صدای خارجی</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>هیچ کدام</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>جستجوی صدا‌ی خارجی</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>بررسی صدا‌ی خارجی</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>All Matching Selected Languages</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>از همه‌ی خط‌ها به عنوان الگو استفاده کن</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>First Matching Selected Language</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>از خط اول به عنوان الگو استفاده کن</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>بدون صدا</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>بخش {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>خودکار</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>همیشه از M4V استفاده کن</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>همیشه از MP4 استفاده کن</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>دلخواه</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>هیچ کدام</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>Always use Source Resolution</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>Above Normal</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>Below Normal</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>بالا</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>پایین</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>معمولی</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>ماهانه</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>هفتگی</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Always use the default path for each new name generated.</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>Port range must be between 5000 and 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>Replacement Placeholders: {source} {destination}</value>
+ <comment>Note: {source} and {destination} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>نسخه‌ی جدید HandBrake در دسترس است!</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>حق نشر(C) 2003-2022 برای گروه HandBrake محفوظ است</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Low battery level:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Pause any running jobs when the battery gets low.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Add All Remaining Closed Captions</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Duplicate jobs were detected in the queue file that you are trying to import. Do you wish to overwrite the existing records? 
+This will also stop any existing running jobs.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Duplicates Detected</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>فعال کردن سخت افزار QuickSync کم مصرف (اگر پشتیبانی شود).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>لطفاً یک کار را برای مشاهده‌ی خلاصه اصلاعات انتخاب کنید.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Run each queued job in a separate worker process.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Default network port for worker:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>The preset you have selected is not available for use on this system.
+
+This is typically an indication that your system does not support the hardware required to utilise it.
+
+Please choose a different preset.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Process Isolation</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Please note, using this feature will start an HTTP server bound to 127.0.0.1 on the port stated.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>If the set port is in use, it will find the first free port within +100 from the defined port.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>بیشینه‌ی تعداد فشرده‌سازی همزمان:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>لغو</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>پیش‌نشانده:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>عین منبع باشد</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>بازنشانی تنظیمات</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>آیا مطمئن هستید می‌خواهید تنطیمات HandBrake را به پیش‌فرض باز نشانید؟</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Custom (Not Limited)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Fill (Surround)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Height (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>هیچ کدام</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Width (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Fill:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Colour:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Borders:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>تفکیک‌پذیری و مقیاس‌گذاری:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientation and Cropping:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>(فقط ویندوز 10!)</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>پالایه‌ها</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>پیش‌فرض</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forced</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080پیکسل HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480پیکسل NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160پیکسل 4K UHD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576پیکسل PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720پیکسل HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320پیکسل 8K UHD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>دلخواه</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Maximum Size:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Resolution Limit:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>هیچ کدام</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>مدیریت پیش‌نشانده‌ها:</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>حذف پیش‌نشانده‌ها‌ی داخلی</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>صادر کردن پیش‌نشانده‌ی انتخاب شده</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>وارد کردن پیش‌نشانده(ها) از پرونده</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>اطلاعات پیش‌نشانده:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>پیش‌نشانده‌ها‌ی داخلی نمی‌توانند تغییر کنند.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>تنظیم پیش‌نشانده فعلی در حالت پیش‌فرض</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>حذف پیش‌نشانده</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(بر روی این دستگاه پشتیبانی نمی‌شود)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>توقف</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>نام دسته‌ای که وارد کردید از قبل وجود دارد. لطفاً یک نام دیگر را وارد کنید.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>نام دسته خالی بود. لطفاً یک نام وارد کنید.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>یک نام وارد کنید:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>هیچ پیش‌نشانده‌ای انتخاب نشده.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>صادر کردن پیش‌نشانده‌ها‌ی همه‌ی کاربران</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>سطحی که هشدارهای «فضای دیسک کم است» را نشان می‌دهد:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>توجه: این حد بالای کارهای همزمان است. محدودیت‌های سخت‌افزاری ممکن است تأثیرگذار باشد که باعث کاهش تعداد کارهای فشرده‌سازی همزمان در عمل شود.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(موجود نیست)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Is Default:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>خیر</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>بله </value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Fine Tune Picture Settings</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Show crop adjustment controls.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>استفاده از تیره</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>لستفاده از روشن</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>تطابق دستگاه</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>سبک:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(نیازمند شروع مجدد)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>نرمی خلوص رنگ:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>فضای رنگ:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>فضای رنگ</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>باز کردن پیش‌نمایش</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>پیش‌نمایش منبع:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>وضعیت کار:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>لغو شد</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>تکمیل</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>تنظیمات نامعتبر. برای جزئیات گزارش را بررسی کنید.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>ورودی نامعتبر. برای جزئیات گزارش را بررسی کنید.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>وضعیت ناشناخته. برای جزئیات گزارش را بررسی کنید.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>هنگام تلاش برای خواندن منبع خطاهایی شناسایی شد.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>خطای ناشناخته. برای جزئیات گزارش را بررسی کنید.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Worker Crashed. Check log for details.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>پرونده‌ی "hb.dll" گم شده. لطفا از نو نصب کنید.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>هشدار: لطفاً توجه داشته باشید که این ساخت HandBrake «حالت ایمن» است که پشتیبانی از فشرده‌سازی‌های سخت‌افزاری را شامل نمی‌شود. اگر می‌خواهید از فشرده‌ساز سخت‌افزاری استفاده کنید، لطفاً ساختی غیر «حالت ایمن» را از وبگاه بارگیری کنید.</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>Please be aware that HandBrake is no longer supported on any version of Windows 7 or Windows 8.
+
+While you can continue using the application at your own risk, please be aware that certain features are non-functional and there may be other unknown issues. There is no support available when these issues occur. 
+
+Support for Windows 7 and 8 was deprecated in the 1.3 series. This means there will be no further updates to correct issues on these platforms. 
+
+This warning will display only twice.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Black</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>دلخواه</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>White</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>RGB Value:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(padded)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Flip:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Source Dimensions:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Storage Size: {0}x{1} Display Size: {2}x{3} Aspect Ratio: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>An error was detected in the File Browser Dialog. 
+
+- Please note, long file paths are not fully supported. Please keep file paths shorter than 255 characters. 
+- The last used directory for this window, has been reset to prevent errors the next time you try to scan a file.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>بیشینه‌ی ارتفاع:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>بیشینه‌ی عرض</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Aspect Ratio: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru Common Metadata</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>پیش‌نشانده:</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.fr.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.fr.resx Changed

@@ -59,46 +59,46 @@
 : using a System.ComponentModel.TypeConverter
 : and then encoded with base64 encoding.
 -->
- <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
 <xsd:element name="root" msdata:IsDataSet="true">
 <xsd:complexType>
 <xsd:choice maxOccurs="unbounded">
 <xsd:element name="metadata">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
 </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="assembly">
 <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="data">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="resheader">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
 </xsd:complexType>
 </xsd:element>
 </xsd:choice>
@@ -112,10 +112,10 @@
 <value>2.0</value>
 </resheader>
 <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <data name="Video_EncoderExtraArgs" xml:space="preserve">
 <value>La liste complète des paramètres de l'encodeur :
@@ -185,11 +185,6 @@
 <data name="Error" xml:space="preserve">
 <value>Erreur</value>
 </data>
- <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
- <value>Attention : Si vous souhaitez que des sous-titres soient ajoutés à chaque élément que vous êtes sur le point de mettre en file d'attente, vérifiez que les paramètres par défaut des sous-titres soient correctement configurés dans l'onglet Sous-titres.
-
-Souhaitez-vous continuer ?</value>
- </data>
 <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
 <value>Vous devez activer le nommage automatique des fichiers ET définir un chemin par défaut dans les préférences avant de pouvoir ajouter à la file.</value>
 </data>
@@ -206,10 +201,10 @@
 <value>HandBrake est déjà en train d'encoder.</value>
 </data>
 <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
- <value>Il y a des travaux dans la file avec le même chemin de destination. Veuillez choisir un chemin différent pour ce travail.</value>
+ <value>Il y a des tâches dans la file d'attente avec le même chemin de destination. Veuillez choisir un chemin différent pour cette tâche.</value>
 </data>
 <data name="Main_JobsPending_addon" xml:space="preserve">
- <value>{0}Travaux en attente</value>
+ <value>Travaux en attente {0}</value>
 </data>
 <data name="Main_NewDefaultPreset" xml:space="preserve">
 <value>Nouveau préréglage par défaut : {0}</value>
@@ -238,7 +233,7 @@
 <data name="Main_Presets" xml:space="preserve">
 <value>Préréglages</value>
 </data>
- <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
 <value>Êtes-vous sûr de vouloir mettre à jour le préréglage sélectionné ?</value>
 </data>
 <data name="Main_PresetUpdated" xml:space="preserve">
@@ -261,7 +256,7 @@
 <data name="Main_ScanFailed_NoReason" xml:space="preserve">
 <value>Echec de l'analyse :</value>
 </data>
- <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
 <value>Échec de l'analyse... Veuillez consulter le journal d'activité pour plus de détails.</value>
 </data>
 <data name="Main_ScanningPleaseWait" xml:space="preserve">
@@ -271,7 +266,7 @@
 <value>Analyse du titre {0} sur {1} ({2}%)</value>
 </data>
 <data name="Main_ScanSource" xml:space="preserve">
- <value>Vous devez d'abord analyser une source et configurer votre travail avant de démarrer un encodage. Cliquez sur le bouton "Source" dans la barre d'outils pour continuer.</value>
+ <value>Vous devez d'abord analyser une source et configurer votre tâche avant de démarrer un encodage. Cliquez sur le bouton "Source" dans la barre d'outils pour continuer.</value>
 </data>
 <data name="Main_SelectPreset" xml:space="preserve">
 <value>Assurez-vous d'avoir sélectionné l'un de vos propres préréglages. Veuillez noter que vous ne pouvez pas exporter les préréglages intégrés.</value>
@@ -283,7 +278,7 @@
 <value>Sélectionnez "Ouvrir source" pour continuer</value>
 </data>
 <data name="Main_XEncodesPending" xml:space="preserve">
- <value>{0} Travaux en attente </value>
+ <value>{0} tâche·s en attente </value>
 </data>
 <data name="Notice" xml:space="preserve">
 <value>Remarque</value>
@@ -330,12 +325,6 @@
 <data name="PictureSettings_OutputResolution" xml:space="preserve">
 <value>Sortie : {0}</value>
 </data>
- <data name="Options_AdditionalFormatOptions" xml:space="preserve">
- <value>Format du fichier de sortie. En plus des caractères pris en charge par le système de fichier, vous pouvez utiliser les champs de substitution suivants qui seront remplacés lorsque vous changez de titre ou scannez une source.
-
-Options mises à jour en direct : {source} {title} {chapters}
-Options en différé : {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Ceux-ci changent uniquement quand vous scannez une nouvelle source, changez de titre ou de chapitres)</value>
- </data>
 <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
 <value>Options supplémentaires disponibles : {source_path} or {source_folder_name} or {source}</value>
 </data>
@@ -402,7 +391,7 @@
 <value>Êtes-vous sûr de vouloir supprimer le préréglage :</value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Encodage : Passage {0} sur {1}, {2:00.00}%, IPS : {3:000.0}, Moy IPS : {4:000.0}, Temps Restant : {5}, Écoulé : {6:j\:hh\:mm\:ss} {7}</value>
+ <value>Encodage : Passage {0} sur {1}, {2:00.00}%, IPS : {3:000.0}, Moy IPS : {4:000.0}, Temps restant : {5}, Écoulé : {6} {7}</value>
 </data>
 <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
 <value>Un préréglage doit avoir un nom. Veuillez remplir le champ nom du préréglage.</value>
@@ -429,7 +418,7 @@
 <value>Pistes audio</value>
 </data>
 <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
- <value>Sélectionner comportement</value>
+ <value>Comportement de la sélection...</value>
 </data>
 <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
 <value>Revenir aux pistes</value>
@@ -472,7 +461,7 @@
 <value>Échec de la mise à jour. Vous pouvez essayer de télécharger la mise à jour depuis https://handbrake.fr</value>
 </data>
 <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
- <value>Taille de l'écran : {0}x{1}, par {2}x{3}</value>
+ <value>Taille de stockage : {0}x{1}</value>
 </data>
 <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
 <value>Ajouter à la file</value>
@@ -481,37 +470,34 @@
 <value>Aucun encodage en attente</value>
 </data>
 <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
- <value>Aucun travail d'encodage en cours</value>
+ <value>Aucune tâche d'encodage en cours</value>
 </data>
 <data name="QueueViewModel_Queue" xml:space="preserve">
 <value>File d'attente</value>
 </data>
- <data name="QueueViewModel_ClearQueueConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
 <value>Êtes-vous sûr de vouloir nettoyer la file ?</value>
 </data>
 <data name="Confirm" xml:space="preserve">
 <value>Confirmer</value>
 </data>
 <data name="QueueViewModel_JobsPending" xml:space="preserve">
- <value>{0} travaux en attente </value>
+ <value>{0} tâche·s en attente </value>
 </data>
 <data name="QueueViewModel_QueuePending" xml:space="preserve">
 <value>File mise en pause</value>
 </data>
- <data name="QueueViewModel_QueuePauseNotice" xml:space="preserve">
- <value>La file a été mise en pause. Le travail en cours sera exécuté en totalité et aucun autre travail ne commencera.</value>
- </data>
 <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
- <value>Êtes-vous sûr de vouloir supprimer les travaux sélectionnés ?</value>
+ <value>Êtes-vous sûr de vouloir supprimer les tâches sélectionnées ?</value>
 </data>
 <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
 <value>Cet encodage est en cours. Si vous le supprimez, l'encodage sera arrêté. Êtes-vous sûr de vouloir continuer ?</value>
 </data>
 <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
- <value>Il n'y a pas de travail en attente.</value>
+ <value>Il n'y a aucune tâche en attente.</value>
 </data>
- <data name="QueueViewModel_EditConfrimation" xml:space="preserve">
- <value>Êtes-vous sûr de vouloir modifier ce travail ? Il sera retiré de la file et envoyé à la fenêtre principale.</value>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>Êtes-vous sûr de vouloir modifier cette tâche ? Elle sera retirée de la file d'attente et envoyée à la fenêtre principale.</value>
 </data>
 <data name="QueueViewModel_QueueReady" xml:space="preserve">
 <value>File prête</value>
@@ -523,13 +509,13 @@
 <value>File terminée</value>
 </data>
 <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
- <value>Dernier travail en attente terminé</value>
+ <value>Dernière tâche en attente terminée</value>
 </data>
 <data name="QueueViewModel_QueueStarted" xml:space="preserve">
 <value>File démarrée</value>
 </data>
 <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
- <value>Encodage : Passage {0} sur {1}, {2:00.00}%, IPS : {3:000.0}, Moy IPS : {4:000.0}, Temps Restant : {5}, Écoulé : {6:j\:hh\:mm\:ss}</value>
+ <value>Encodage : Passage {0} sur {1}, {2:00.00}%, IPS : {3:000.0}, Moy IPS : {4:000.0}, Temps restant : {5}, Écoulé : {6:j\:hh\:mm\:ss}</value>
 </data>
 <data name="ShellViewModel_CanClose" xml:space="preserve">
 <value>Un encodage est en cours d'exécution. La fermeture d'HandBrake arrêtera cet encodage.
@@ -539,15 +525,11 @@
 <value>Aperçu de l'image</value>
 </data>
 <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
- <value>Impossible de supprimer le fichier de prévisualisation précédent. Vous devrez peut-être redémarrer l'application.</value>
+ <value>Impossible d'effacer le fichier de prévisualisation précédent. Vous avez peut-être une prévisualisation ouverte dans un lecteur multimédia. Veuillez le fermer.</value>
 </data>
 <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
 <value>Vous devez d'abord analyser une source et configurer votre encodage avant de créer un aperçu.</value>
 </data>
- <data name="StaticPreviewViewModel_UnableToFindVLC" xml:space="preserve">
- <value>Impossible de détecter le lecteur VLC.
-Assurez-vous que VLC est installé et que le répertoire spécifié dans les options d'HandBrake est correct. (Voir menu "Outils &gt; Préférences &gt; Général")</value>
- </data>
 <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
 <value>Impossible de trouver le fichier de prévisualisation. Le fichier a été supprimé ou l'encodage a échoué. Consultez le journal d'activité pour plus de détails.</value>
 </data>
@@ -564,7 +546,7 @@
 <value>Revenir aux pistes</value>
 </data>
 <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
- <value>Sélectionner Comportement</value>
+ <value>Comportement de la sélection...</value>
 </data>
 <data name="PresetService_ArchiveFile" xml:space="preserve">
 <value>Fichier archivé :</value>
@@ -578,7 +560,7 @@
 Votre ancien fichier de préréglages a été archivé:</value>
 </data>
 <data name="Main_QueueFinishedErrors" xml:space="preserve">
- <value>avec {0} erreur·s ou annulation·s détectée·s.</value>
+ <value> avec {0} erreur·s ou annulation·s détectée·s.</value>
 </data>
 <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
 <value>Espace disque faible</value>
@@ -643,7 +625,7 @@
 <data name="SettingService_SaveErrorReset" xml:space="preserve">
 <value>Tous les paramètres que vous avez modifiés devront peut-être être réinitialisés lors du prochain lancement d'HandBrake.</value>
 </data>
- <data name="UserSettings_AnErrorOccured" xml:space="preserve">
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
 <value>Un problème est survenu lors de la sauvegarde de vos préférences.</value>
 </data>
 <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
@@ -675,7 +657,7 @@
 <value>Veuillez vérifier que vous avez un répertoire de destination valide.</value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
- <value>Opération {0} sur {1}, (Analyse des sous-titres) {2:00.00}%, Durée d'analyse restante : {3}, Écoulé : {4:j\:hh\:mm\:ss}</value>
+ <value>Opération {0} sur {1}, (Analyse des sous-titres) {2:00.00}%, Temps d'analyse restant : {3}, Écoulé : {4}</value>
 </data>
 <data name="NoAdditionalInformation" xml:space="preserve">
 <value>Aucune information supplémentaire</value>
@@ -697,10 +679,14 @@
 <value>File mise en Pause</value>
 </data>
 <data name="Main_LowDiskspace" xml:space="preserve">
- <value>Votre répertoire de destination manque d’espace disque. Veuillez libérer de l’espace sur votre lecteur de destination. Vous pouvez également modifier le niveau auquel cette alerte est déclenchée dans Options.</value>
+ <value>Votre répertoire de destination manque d'espace disque. 
+
+Vous pouvez configurer le niveau auquel cette alerte apparaît dans les préférences. 
+
+Souhaitez-vous continuer ?</value>
 </data>
 <data name="Queue_UnableToResetJob" xml:space="preserve">
- <value>Impossible de réinitialiser l'état du travail car il ne s'agit pas d'un état "Erreur" ou "Terminé"</value>
+ <value>Impossible de réinitialiser l'état de la tâche car il ne s'agit pas d'un état "Erreur" ou "Terminé"</value>
 </data>
 <data name="Queue_UnableToRestoreFile" xml:space="preserve">
 <value>Impossible de restaurer le fichier de file d'attente.</value>
@@ -714,19 +700,14 @@
 <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
 <value>Veuillez arrêter l'encodage en cours. Si le problème persiste, redémarrez HandBrake.</value>
 </data>
- <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Encodage : Passage {0} sur {1}, {2:00.00}%
-IPS : {3:000.0}, Moy IPS : {4:000.0}
-Temps Restant : {5}, Écoulé : {6:j\:hh\:mm\:ss}</value>
- </data>
 <data name="StaticPreviewView_Title" xml:space="preserve">
 <value>Aperçu ({0}% de la taille réelle)</value>
 </data>
 <data name="OsBitnessWarning" xml:space="preserve">
- <value>HandBrake nécessite une version 64 bits de Windows 7 ou ultérieure pour fonctionner.</value>
+ <value>Handbrake requiert une version 64 bits de Windows 10 ou supérieur pour fonctionner.</value>
 </data>
 <data name="OsVersionWarning" xml:space="preserve">
- <value>HandBrake nécessite Windows 7 ou une version ultérieure pour fonctionner. Les versions 0.9.9 (XP) et 0.10.5 (Vista) sont les dernières versions à prendre en charge ces systèmes.</value>
+ <value>HandBrake requiert Windows 10 ou ultérieur pour fonctionner. Les versions 0.9.9 (XP), 0.10.5 (Vista), 1.3.3 (7 et 8.x) sont les dernières versions à prendre en charge ces systèmes d'exploitation.</value>
 </data>
 <data name="Main_ContinueAddingToQueue" xml:space="preserve">
 <value>Souhaitez-vous continuer en essayant d'ajouter le reste ?</value>
@@ -865,10 +846,10 @@
 <value>Personnalisé :</value>
 </data>
 <data name="FiltersView_Deblock" xml:space="preserve">
- <value>Deblock</value>
+ <value>Anti-blocs :</value>
 </data>
 <data name="FiltersView_Decomb" xml:space="preserve">
- <value>Decomb</value>
+ <value>Désentrelacement variable</value>
 </data>
 <data name="FiltersView_Deinterlace" xml:space="preserve">
 <value>Désentrelacement :</value>
@@ -889,13 +870,13 @@
 <value>Réglage du débruitage</value>
 </data>
 <data name="FiltersView_Detelecine" xml:space="preserve">
- <value>Détélécinéma :</value>
+ <value>Détélécinement :</value>
 </data>
 <data name="FiltersView_Filters" xml:space="preserve">
 <value>Filtres</value>
 </data>
 <data name="FiltersView_FlipVideo" xml:space="preserve">
- <value>Retourner</value>
+ <value>Horizontal</value>
 </data>
 <data name="FiltersView_Grayscale" xml:space="preserve">
 <value>Niveaux de gris</value>
@@ -907,10 +888,10 @@
 <value>Préréglage :</value>
 </data>
 <data name="FiltersView_Rotate" xml:space="preserve">
- <value>Pivoter :</value>
+ <value>Rotation :</value>
 </data>
 <data name="FiltersView_Sharpen" xml:space="preserve">
- <value>Netteté</value>
+ <value>Netteté :</value>
 </data>
 <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
 <value>Préréglage de netteté</value>
@@ -1039,7 +1020,7 @@
 <value>Dimensions</value>
 </data>
 <data name="MainView_PresetManage" xml:space="preserve">
- <value>Renommer le préréglage</value>
+ <value>Éditer le préréglage</value>
 </data>
 <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
 <value>Menu contextuel des options de préréglage</value>
@@ -1072,10 +1053,7 @@
 <value>Enregistrer le nouveau préréglage</value>
 </data>
 <data name="MainView_Searching" xml:space="preserve">
- <value>Recherche de l'heure de démarage</value>
- </data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Pré-réglage sélectionné :</value>
+ <value>Recherche de l'heure de démarrage</value>
 </data>
 <data name="MainView_SetDefault" xml:space="preserve">
 <value>Définir la valeur par défaut</value>
@@ -1126,7 +1104,7 @@
 <value>Titre :</value>
 </data>
 <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
- <value>Mettre à jour le préréglage sélectionné</value>
+ <value>Éditer le préréglage courant</value>
 </data>
 <data name="MainView_VideoTab" xml:space="preserve">
 <value>Vidéo</value>
@@ -1162,10 +1140,10 @@
 <value>Afficher les aperçus sur l'onglet Résumé.</value>
 </data>
 <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
- <value>Afficher l'état de l'encodage dans la bar de titre du l'application.</value>
+ <value>Afficher l'état de l'encodage dans la barre de titre de l'application.</value>
 </data>
- <data name="Options_30DayLogClear" xml:space="preserve">
- <value>Effacer les fichiers du journal de plus de 30 jours</value>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Effacer les fichiers du journal de plus de 7 jours</value>
 </data>
 <data name="Options_About" xml:space="preserve">
 <value>À propos d'Handbrake</value>
@@ -1237,7 +1215,7 @@
 <value>Chemin d'accès des journaux :</value>
 </data>
 <data name="Options_LowDiskspaceSize" xml:space="preserve">
- <value>Suspendre la file d'attente si l'espace disque est inférieur à :</value>
+ <value>Suspendre la file d'attente si l'espace disque est faible</value>
 </data>
 <data name="Options_MinimiseTray" xml:space="preserve">
 <value>Réduire dans la barre d'état système (redémarrage requis)</value>
@@ -1257,8 +1235,8 @@
 <data name="Options_Path" xml:space="preserve">
 <value>Chemin d'accès :</value>
 </data>
- <data name="Options_PathToVLC" xml:space="preserve">
- <value>Chemin vers le lecteur VLC</value>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Chemin d'accès au lecteur multimédia</value>
 </data>
 <data name="Options_PreventSleep" xml:space="preserve">
 <value>Empêcher le système de se mettre en veille pendant l'encodage</value>
@@ -1293,9 +1271,6 @@
 <data name="Options_SendFileTo" xml:space="preserve">
 <value>Envoyer le fichier à :</value>
 </data>
- <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
- <value>Afficher le nouveau modèle de file d'attente expérimental.</value>
- </data>
 <data name="Options_TitleCase" xml:space="preserve">
 <value>Changer la casse en majuscule</value>
 </data>
@@ -1312,7 +1287,8 @@
 <value>Vidéo</value>
 </data>
 <data name="Options_VideoPreviewPath" xml:space="preserve">
- <value>Ce chemin est utilisé pour la fonctionnalité de prévisualisation vidéo uniquement.</value>
+ <value>Ce chemin est utilisé uniquement pour la fonction de prévisualisation de la vidéo.
+VLC et MPC-HC sont pris en charge. D'autres lecteurs peuvent également fonctionner mais sans certitude.</value>
 </data>
 <data name="Options_ViewLogDirectory" xml:space="preserve">
 <value>Voir le répertoire du journal</value>
@@ -1336,31 +1312,28 @@
 <value>Bas</value>
 </data>
 <data name="PictureSettingsView_Cropping" xml:space="preserve">
- <value>Recadrage</value>
+ <value>Recadrage :</value>
 </data>
 <data name="PictureSettingsView_Custom" xml:space="preserve">
 <value>Personnalisé</value>
 </data>
- <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
- <value>Largeur d'affichage :</value>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Taille d'affichage :</value>
 </data>
 <data name="PictureSettingsView_Height" xml:space="preserve">
 <value>Hauteur :</value>
 </data>
 <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>Conserver les proportions</value>
+ <value>Automatique</value>
 </data>
 <data name="PictureSettingsView_Left" xml:space="preserve">
 <value>Gauche</value>
 </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>Module :</value>
- </data>
 <data name="PictureSettingsView_Output" xml:space="preserve">
- <value>Sortie</value>
+ <value>Dimensions finales :</value>
 </data>
 <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>PAR :</value>
+ <value>Format des pixels :</value>
 </data>
 <data name="PictureSettingsView_Right" xml:space="preserve">
 <value>Droite</value>
@@ -1368,14 +1341,11 @@
 <data name="PictureSettingsView_Size" xml:space="preserve">
 <value>Taille</value>
 </data>
- <data name="PictureSettingsView_Source" xml:space="preserve">
- <value>Source :</value>
- </data>
 <data name="PictureSettingsView_Top" xml:space="preserve">
 <value>Haut</value>
 </data>
 <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>Largeur :</value>
+ <value>Taille à l'échelle :</value>
 </data>
 <data name="Preset_Custom" xml:space="preserve">
 <value>Personnalisé</value>
@@ -1399,7 +1369,7 @@
 <value>Les titres sélectionnés seront ajoutés en utilisant le préréglage "{0}"</value>
 </data>
 <data name="QueueView_Advanced" xml:space="preserve">
- <value>Avancé :</value>
+ <value>Options vidéo :</value>
 </data>
 <data name="QueueView_Audio" xml:space="preserve">
 <value>Audio :</value>
@@ -1426,7 +1396,7 @@
 <value>Ne rien faire</value>
 </data>
 <data name="QueueView_Duration" xml:space="preserve">
- <value>Temps d'encodage :</value>
+ <value>Durée de l'encodage :</value>
 </data>
 <data name="QueueView_Edit" xml:space="preserve">
 <value>Editer</value>
@@ -1438,7 +1408,7 @@
 <value>Exporter la file d'attente</value>
 </data>
 <data name="QueueView_FileSize" xml:space="preserve">
- <value>Taille du fichier :</value>
+ <value>Taille du fichier de sortie :</value>
 </data>
 <data name="WhenDone_Hibernate" xml:space="preserve">
 <value>Veille prolongée</value>
@@ -1462,7 +1432,7 @@
 <value>Options</value>
 </data>
 <data name="QueueView_Pause" xml:space="preserve">
- <value>Mettre la liste d'attente en pause</value>
+ <value>Pause</value>
 </data>
 <data name="QueueView_PausedDuration" xml:space="preserve">
 <value>Durée de pause :</value>
@@ -1474,13 +1444,13 @@
 <value>Fermer HandBrake</value>
 </data>
 <data name="QueueView_ResetAllJobs" xml:space="preserve">
- <value>Relancer tous les travaux</value>
+ <value>Relancer tous les tâches</value>
 </data>
 <data name="QueueView_ResetFailed" xml:space="preserve">
 <value>Échec de la nouvelle tentative</value>
 </data>
 <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
- <value>Réinitialiser les travaux sélectionnés</value>
+ <value>Réinitialiser les tâches sélectionnées</value>
 </data>
 <data name="QueueView_Reset" xml:space="preserve">
 <value>Réinitialiser</value>
@@ -1528,7 +1498,7 @@
 <value>Ajouter une nouvelle piste</value>
 </data>
 <data name="Shared_AddTrack" xml:space="preserve">
- <value>Ajouter une piste</value>
+ <value>Pistes</value>
 </data>
 <data name="Shared_AvailableLanguages" xml:space="preserve">
 <value>Langues disponibles :</value>
@@ -1536,7 +1506,7 @@
 <data name="Shared_ChooseLanguages" xml:space="preserve">
 <value>Choisir les langues :</value>
 </data>
- <data name="Shared_ChosenLangages" xml:space="preserve">
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
 <value>Langues sélectionnées :</value>
 </data>
 <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
@@ -1594,7 +1564,7 @@
 <value>Sélectionner un aperçu d'image</value>
 </data>
 <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
- <value>Utiliser le lecteur vidéo par défaut du système</value>
+ <value>Préférer le lecteur vidéo par défaut du système</value>
 </data>
 <data name="SubtitlesView_AddCC" xml:space="preserve">
 <value>Ajouter les sous-titres si disponnibles</value>
@@ -1630,10 +1600,10 @@
 <value>Marqueurs de chapitre</value>
 </data>
 <data name="SummaryView_Deblock" xml:space="preserve">
- <value>Deblock</value>
+ <value>Anti-blocs</value>
 </data>
 <data name="SummaryView_Detelecine" xml:space="preserve">
- <value>Détélécinéma</value>
+ <value>Détélécinement</value>
 </data>
 <data name="SummaryView_display" xml:space="preserve">
 <value>affichage</value>
@@ -1675,7 +1645,7 @@
 <value>Débit moyen (kbps) :</value>
 </data>
 <data name="VideoView_Codec" xml:space="preserve">
- <value>Codec Vidéo : </value>
+ <value>Encodeur vidéo :</value>
 </data>
 <data name="VideoView_ConstantFramerate" xml:space="preserve">
 <value>Framerate constant</value>
@@ -1705,13 +1675,13 @@
 <value>Framerate (IPS)</value>
 </data>
 <data name="VideoView_OptimiseVideo" xml:space="preserve">
- <value>Optimiser la Vidéo :</value>
+ <value>Options de l'encodeur : </value>
 </data>
 <data name="VideoView_PeakFramerate" xml:space="preserve">
 <value>Framerate de pointe</value>
 </data>
 <data name="VideoView_Quality" xml:space="preserve">
- <value>Qualité</value>
+ <value>Qualité :</value>
 </data>
 <data name="VideoView_TurboFirstPass" xml:space="preserve">
 <value>Première passe en mode turbo</value>
@@ -1720,13 +1690,13 @@
 <value>Framerate variable</value>
 </data>
 <data name="VideoView_Video" xml:space="preserve">
- <value>Vidéo</value>
+ <value>Vidéo :</value>
 </data>
 <data name="OptionsView_Language" xml:space="preserve">
 <value>Langue : </value>
 </data>
 <data name="Language_UseSystem" xml:space="preserve">
- <value>Utiliser la Langue Système</value>
+ <value>Utiliser la langue système</value>
 </data>
 <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
 <value>À propos d'Handbrake</value>
@@ -1851,7 +1821,7 @@
 <data name="QueueView_PlayMediaFile" xml:space="preserve">
 <value>Lire le fichier</value>
 </data>
- <data name="Options_ApplicaitonToolbar" xml:space="preserve">
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
 <value>Barre d'outils application</value>
 </data>
 <data name="Options_ShowToolbarAddAll" xml:space="preserve">
@@ -1861,9 +1831,9 @@
 <value>Afficher 'Ajouter la sélection à la file' dans la barre d'outils</value>
 </data>
 <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
- <value>La prise en charge de l'encodage matériel est actuellement désactivée. Assurez-vous que vous utilisez des pilotes à jour pour toutes les cartes graphiques de ce système.
+ <value>Le support de l'encodage matériel est actuellement désactivé. Si vous n'avez pas démarré HandBrake avec l'option "--no-hardware", veuillez vous assurer que vous utilisez des pilotes à jour pour toutes les cartes graphiques de votre système.
 
-Cela n'aura aucun impact sur les encodeurs logiciels.</value>
+Ceci n'aura aucun impact sur les encodeurs logiciels.</value>
 </data>
 <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
 <value>Veuillez corriger vos paramètres de sous-titres avant de continuer.</value>
@@ -1881,8 +1851,8 @@
 <value>Importer une file d'attente</value>
 </data>
 <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Encodage : Passage {0} sur {1}, {2:00.00}%, FPS : {3:000.0}, FPS Moy : {4:000.0}
-Temps Restant : {5:hh\:mm\:ss}, Écoulé : {6:hh\:mm\:ss} {7}</value>
+ <value>Encodage : Passage {0} sur {1}, {2:00.00}%, IPS : {3:000.0}, Moy IPS : {4:000.0}
+Temps restant : {5}, Écoulé : {6} {7}</value>
 </data>
 <data name="QueueView_DeleteSelected" xml:space="preserve">
 <value>Supprimer la sélection</value>
@@ -1904,11 +1874,10 @@
 <value>Le moteur d'HandBrake n'a pas pu s'initialiser. Cela est souvent dû à des pilotes GPU obsolètes.\n Veuillez mettre à jour les pilotes GPU de toutes les cartes graphiques intégrés et dédiées de votre système.</value>
 </data>
 <data name="OptionsView_FormatOptions" xml:space="preserve">
- <value>Options mises à jour en direct : {source} {titre} {chapitres}
-Options en différé : {date} {heure} {date-de-création} {heure-de-création} {qualité} {débit} (Ceux-ci changent uniquement quand vous scannez une nouvelle source, changez de titre ou de chapitres)</value>
+ <value>Caractères de substitution : {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
 </data>
 <data name="OptionsView_PathOptions" xml:space="preserve">
- <value>Options disponibles : {source_path} {source_folder_name} {source}</value>
+ <value>Caractères de substitution: {source_path} {source_folder_name} {source}</value>
 </data>
 <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
 <value>Demander pour écraser le fichier</value>
@@ -1929,7 +1898,7 @@
 <value>Encodage terminé</value>
 </data>
 <data name="Options_Notifications" xml:space="preserve">
- <value>Notifications</value>
+ <value>Notifications sonors</value>
 </data>
 <data name="Options_QueueCompleted" xml:space="preserve">
 <value>File terminée</value>
@@ -1947,19 +1916,19 @@
 <value>Préfixe</value>
 </data>
 <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
- <value>Apposer un numéro</value>
+ <value>Ajouter un numéro</value>
 </data>
 <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
 <value>FiltersView_DeblockPreset</value>
 </data>
 <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
- <value>Réglage de deblock</value>
+ <value>Réglage de l'anti-blocs</value>
 </data>
 <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
 <value>Le choix de l'encodeur sera disponible dans l'onglet 'Vidéo'.</value>
 </data>
 <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
- <value>HandBrake a détecté plusieurs fichiers de file d'attente inachevés. Celles-ci proviennent de plusieurs instances d'HandBrake. Souhaitez-vous récupérer tous les travaux inachevés ?</value>
+ <value>HandBrake a détecté plusieurs fichiers de file d'attente inachevés. Ceux-ci proviennent de plusieurs instances d'HandBrake. Souhaitez-vous récupérer tous les tâches inachevées ?</value>
 </data>
 <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
 <value>HandBrake a détecté des éléments inachevés dans la file d'attente de la dernière session de l'application. Voulez-vous les récupérer ?</value>
@@ -2003,16 +1972,16 @@
 <value>Niveau de batterie critique ! ({0} %)</value>
 </data>
 <data name="SystemService_LowBatteryLog" xml:space="preserve">
- <value>Niveau de batterie faible ! ({0} %). Votre encodage a été mis en pause pour protéger le système. La mise en veille du système est autorisée !</value>
+ <value>Niveau de batterie faible ! ({0} %). Votre encodage a été mis en pause.</value>
 </data>
 <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
 <value>La capacité de stockage restante est tombée sous les {0} GB sur le disque de destination. Interruption de l'encodage...</value>
 </data>
 <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
- <value>Configurer les sélections audio automatiques</value>
+ <value>Sélections audio automatique</value>
 </data>
 <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
- <value>Configurer les sélections de sous-titres automatiques</value>
+ <value>Sélections des sous-titres automatique</value>
 </data>
 <data name="Options_SystemOptions" xml:space="preserve">
 <value>Système</value>
@@ -2041,9 +2010,6 @@
 <data name="MetadataView_TitleTag" xml:space="preserve">
 <value>Titre : </value>
 </data>
- <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
- <value>Aperçu de la rotation et du retournement</value>
- </data>
 <data name="LogViewModel_Title" xml:space="preserve">
 <value>Visionneuse de journal</value>
 </data>
@@ -2176,17 +2142,465 @@
 <data name="OptionsView_RemotePortLimit" xml:space="preserve">
 <value>La plage de ports doit être comprise entre 5000 et 32767</value>
 </data>
- <data name="Options_Experimental" xml:space="preserve">
- <value>Expérimental</value>
- </data>
 <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
- <value>Champs de substitution : {source} {destination}</value>
- <comment>Note: {source} and {destination} are not translatable. </comment>
+ <value>Caractères de substitution: {source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
 </data>
 <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
 <value>Une nouvelle version d'HandBrake est disponible !</value>
 </data>
 <data name="About_Copyright" xml:space="preserve">
- <value>Copyright (C) 2003-2020 The HandBrake Team</value>
+ <value>Copyright (C) 2003-2022 The HandBrake Team</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Niveau de batterie faible :</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Suspendre toute tâche en cours lorsque la batterie est faible.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Ajouter tous les sous-titres restants</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Des doublons ont été détectés dans la file d'attente que vous essayez d'importer. Souhaitez-vous écraser les fichiers existants ?
+Cela mettra également fin à toute tâche en cours.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Doublons détectés</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Activer le QuickSync basse consommation (si supporté).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Veuillez sélectionner une seule tâche pour voir le récapitulatif.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Exécutez chaque tâche en file d'attente dans un processus de travail distinct.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Port réseau par défaut pour le travailleur :</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>Le préréglage que vous avez sélectionné n'est pas disponible sur ce système.
+
+Cela indique généralement que votre système ne prend pas en charge le hardware nécessaire pour l'utiliser.
+
+Veuillez choisir un autre préréglage.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Isolement des processus</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Veuillez noter que l'utilisation de cette fonctionnalité démarrera un serveur HTTP lié à 127.0.0.1 sur le port indiqué.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>Si le port défini est utilisé, il trouvera le premier port libre dans un intervalle maximum de 100 à partir du port défini.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Nombre maximum d'encodages simultanés :</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Annuler</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Préréglage :</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Identique à la source</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Réinitialisation des paramètres</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Êtes-vous sûr de vouloir réinitialiser HandBrake à ses paramètres par défaut ?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Personnalisé (Non limité)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Remplissage (Périphérie)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Hauteur (encadrement horizontal)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Aucun</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Largeur (encadrement vertical)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Remplir :</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Couleur :</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Bordures :</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Résolution et mise à l'échelle :</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientation et recadrage :</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Windows 10 uniquement ! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filtres :</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Défaut</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forcé</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Personnalisé</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Taille maximale :</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Limite de résolution :</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Aucun</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Gérer les préréglages</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Supprimer les préréglages intégrés</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Exporter le préréglage sélectionné</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Importer des préréglages à partir d'un fichier</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Information sur le préréglage :</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>Les préréglages intégrés ne peuvent pas être modifiés.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Définir le préréglage sélectionné comme valeur par défaut</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Supprimer le préréglage</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Non supporté par ce système)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Arrêter</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>Le nom de catégorie que vous avez saisi existe déjà. Veuillez choisir un autre nom.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>Le nom de la catégorie est vide. Veuillez fournir un nom.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Entrer un nom :</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>Il n'y a pas de préréglage sélectionné.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Exporter toutes les préréglages utilisateur</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Niveau auquel les alertes de faible espace disque s'affichent :</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Attention : Il s'agit de la limite maximale de tâches simultanées. Des limitations matérielles peuvent entrer en compte, ce qui diminuerait le nombre de tâches simultanées pendant l'encodage.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Non disponible)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Est par défaut :</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>Non</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Oui</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Réglages fins de l'image</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Afficher les commandes de réglage du recadrage.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Sombre</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Claire</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Correspondre au thème du système</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Thème :</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Nécessite un redémarrage)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Lissage chromatique :</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Espace colorimétrique :</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Espace colorimétrique</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Ouvrir l'aperçu</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Aperçu de la source :</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Statut de la tâche :</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Annulé</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Terminé</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Paramètres invalides. Vérifiez le journal pour plus de détails.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Entrée invalide. Vérifiez le journal pour plus de détails.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Statut inconnu. Vérifiez le journal pour plus de détails.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Erreurs détectées lors de la lecture de la source.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Erreur inconnue. Vérifiez le journal pour plus de détails.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Le processus de travail a cessé de fonctionner. Vérifiez le journal pour plus de détails.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>Fichier "hb.dll" manquant. Veuillez réinstaller.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Avertissement : Veuillez noter qu'il s'agit d'une version "Sans Échec" d'HandBrake qui ne prend pas en charge les encodeurs matériels. Si vous souhaitez utiliser la prise en charge des encodeurs matériels, veuillez télécharger une version qui ne soit pas "Sans Échec" sur le site Web.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Noir</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Personnalisé</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Blanc</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Valeur RGB :</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(rempli)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Retourner :</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Dimensions de la source :</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Taille de stockage : {0}x{1} Taille d'affichage : {2}x{3} Proportions : {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Une erreur a été détectée dans la boîte de dialogue du navigateur de fichiers. 
+
+- Veuillez noter que les longs chemins de fichier ne sont pas entièrement pris en charge. Les chemins d'accès aux fichiers doivent être inférieurs à 255 caractères. 
+- Le dernier répertoire utilisé pour cette fenêtre a été réinitialisé afin d'éviter les erreurs la prochaine fois que vous essaierez d'analyser un fichier.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Hauteur maximale :</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Largeur maximale :</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Proportions : {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru Métadonnées communes</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>Le nom par défaut du chemin d'accès n'était pas valide. {0} ne doit pas être avant {1}</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>Souhaitez-vous autoriser HandBrake à vérifier automatiquement les mises à jour ?
+
+Vous pouvez revenir sur ce choix à tout moment en modifiant l'option dans Préférences -&gt; Général -&gt; Vérifier les mises à jour</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>Vérifier les mises à jour ?</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>Avant de mettre à jour :
+- Assurez vous qu'il n'y ait aucun travail d'encodage en attente dans la file d'attente.
+- Sauvegardez ou notez tout les préréglages personnalisés que vous avez créés, ceux-ci pourrait ne pas être entièrement compatibles avec les nouvelles versions.</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>(Par défaut)</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>Catégories</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>Plat</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>Partiellement plat</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>Choisissez comment les préréglages sont affichés dans les menus :</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Préréglage :</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>Terminé</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>Modifier les travaux ?</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>Longueur de la sortie :</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>Déplacer en bas</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>Déplacer en haut</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>Débit de sortie :</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>Vitesse d'encodage moyenne :</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value>du fichier source</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>Indisponible</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>Longueur de la source :</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>Réinitialiser</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>Êtes vous sûr de vouloir réinitialiser tout les préréglages natifs ?</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>Réinitialiser tout les préréglages natifs aux valeurs par défaut de HandBrake :</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>(Les préréglages utilisateurs ne seront par réinitialisés)</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>Réinitialiser tout les paramètres de HandBrake à leur valeur par défaut :</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>Préréglages natifs</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>Paramètres utilisateur</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>Vue arborescente flottante</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>Assurez vous d'avoir les associations de fichiers correctement configurées dans Windows pour permettre au système d'ouvrir ce fichier avec un lecteur compatible</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>Impossible de lire le fichier de la file d'attente.</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>Le fichier peut être est corrompu ou date d'une version précédente de HandBrake.
+Seul les fichier de file d'attente de la version actuelle sont supportés.</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>Votre encodage HandBrake est terminé !</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>Votre file d'attente HandBrake est complétée !</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>Cela désactivera également les options d'affichage des notifications de la barre des tâches Windows dans l'onglet "Lorsque Terminé". Réactivez-les si vous souhaitez réactiver cette fonctionnalité.</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>Supprimer HandBrake du panneau de configuration des notifications Windows.</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>Désinstallé</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>Les paramètres de notification ont étés supprimés.</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>Effacer et désinstaller</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>Envoyer une notification à la barre des tâches Windows.</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>Notifications Windows</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>{0}travaux effectués. {1}Travail sur {2} tâches avec {3} tâches en attente.</value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>Re-générer (Autoname)</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>Ouvrir ce dossier</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>Tout replier</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>Tout déplier</value>
 </data>
-</root>
\ No newline at end of file
+</root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.it.resx Added

@@ -0,0 +1,2618 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>L'elenco completo dei parametri del codificatore:
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>Riduce l'utilizzo della CPU da parte del decodificatore.
+
+Impostalo se il dispositivo non riesce a riprodurre l'output. (es. Perdita di fotogrammi)</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>Avviso: RF 0 è senza perdita!</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>Un valore pari a 0 significa senza perdita di dati e avrà come risultato una dimensione del file maggiore della sorgente originale,
+a meno che la fonte fosse già senza perdite.
+
+Per x264 e x265 la scala è logaritmica quindi a valori più bassi si avrà una qualità superiore.
+
+Quindi piccoli aumenti di valore comporteranno aumenti progressivamente maggiori nella dimensione del file finale.</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>Opzionalmente si può memorizzare l'impostazione delle immagini con questa preimpostazione. Ci sono 3 modalità:
+
+Nessuno: Le Impostazioni immagine non vengono memorizzate nella preimpostazione. Quando si carica una sorgente, rimarranno così come sono entro i limiti della risoluzione sorgente. Questo riguarda anche l'anamorfico, il modulo, il ritaglio, ecc.
+
+Personalizzato: puoi facoltativamente impostare Larghezza e Altezza massime. Quando lo fai, una codifica sarà inferiore o uguale a questi valori. 'Mantenere proporzioni' verrà automaticamente attivato.
+
+Sorgente massima: codifica sempre alla risoluzione delle fonti, laddove possibile.</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>Questo programma è software libero; può essere redistribuito e/o
+modificato sotto i termini della licenza GNU General Public License, così come
+viene pubblicata dalla Free Software Foundation; sia nella versione 2 di tale 
+licenza che, alternativamente, in qualsiasi versione ad essa successiva.
+
+Questo programma viene distribuito con la speranza che possa risultare 
+in qualche modo utile, ma SENZA ALCUNA GARANZIA; neanche con 
+l'implicita garanzia di COMMERCIABILITÀ o di IDONEITÀ PER UN 
+QUALSIASI SCOPO. Consultare la licenza GNU General Public License per
+ulteriori informazioni. Una copia della licenza GNU General Public License
+dovrebbe essere distribuita assieme a questo programma; se così non fosse,
+rivolgersi alla Free SoftwareFoundation, Inc., 51 Franklin Street, Fifth Floor, 
+Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>ATTENZIONE: non hai la creazione automatica del nome del file attivata. Puoi abilitarla nelle impostazioni.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>ATTENZIONE: al momento non disponi dell'impostazioni di selezione automatica della traccia audio e dei sottotitoli. È possibile impostare il comportamento predefinito di selezione traccia nelle impostazioni.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>Le preimpostazioni originali sono state ripristinate.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>Ripristino completato</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Alta qualità |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Bassa qualità</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Qualità di controllo |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>Errore</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>È necessario attivare la creazione automatica del nome E impostare un percorso predefinito nelle preferenze, prima di poter aggiungere file alla coda.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>Attenzione</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>Sei sicuro?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake sta già convertendo.</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>Ci sono già processi in coda con lo stesso percorso di destinazione. Si prega di scegliere un percorso diverso per questo processo.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>Processi in corso {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>Nuova preimpostazione predefinita impostata: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>Un nuovo aggiornamento è disponibile. Vai al menu Strumenti &gt; Opzioni per l'installazione</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>Nessuna preimpostazione selezionata.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>Non è possibile modificare le preimpostazioni predefinite. Seleziona una delle tue preimpostazioni.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>Si prega di selezionare una cartella.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>Preparazione per la codifica...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>Non è possibile importare una preimpostazione con lo stesso nome di una preimpostazione di base.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>La preimpostazione "{0}" esiste già. Vuoi sovrascriverla?</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>Preimpostazioni</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>Sei sicuro di voler aggiornare la preimpostazione selezionata?</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>La preimpostazione è stata aggiornata con le impostazioni correnti.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake ha determinato che le preimpostazioni integrate non sono aggiornate... Queste preimpostazioni ora saranno aggiornate.
+Le preimpostazioni personalizzate non sono state aggiornate, quindi potresti doverle ricreare eliminandole e aggiungendole di nuovo.
+È stato eseguito il backup del precedente file user_presets.xml.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>Coda terminata</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>Scansione annullata.</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>Scansione completata</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>Scansione non riuscita:</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>Scansione non riuscita... Puoi controllare il registro delle attività per i dettagli.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>Scansione sorgente, attendi...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>Scansione titoli {0} di {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>È necessario prima eseguire la scansione di una fonte e configurare il processo prima di iniziare una codifica. Fai clic sul pulsante "Sorgente" sulla barra degli strumenti per continuare.</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>Assicurati di aver selezionato una delle tue preimpostazioni. Ricorda che non puoi esportare preimpostazioni predefinite.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>Seleziona una preimpostazione da aggiornare.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>Seleziona 'Sorgente' per continuare</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} operazioni in corso</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>Avviso</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>Vuoi sovrascrivere?</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>Domanda</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>Pronto</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>Aggiornato</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Versione preimpostazione</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>La preimpostazione che stai tentando di importare proviene da una versione diversa di HandBrake.
+Potrebbe non essere possibile importare tutti i valori.
+
+Vuoi procedere?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Impossibile importare la preimpostazione!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Impossibile importare la preimpostazione in quanto sembra danneggiata o proviene da una versione precedente di HandBrake.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>È necessario innanzitutto impostare il percorso di destinazione per il file di output prima di aggiungerlo alla coda.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>Il percorso di destinazione inserito contiene caratteri non validi e perciò non verrà aggiornato.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>Anteprima {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Anteprima (Ridimensionata)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>Output: {0}</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>Opzioni aggiuntive disponibili: {source_path} o {source_folder_name} o {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>Il file di destinazione non può avere lo stesso percorso e nome file del file sorgente. Aggiorna il nome del file di destinazione in modo che non corrisponda al file di origine.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>Il tuo sistema ha impedito a HandBrake di avviare il browser.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>È comunque possibile accedere alla guida visitando il sito Web all'indirizzo: https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>Impossibile importare la preimpostazione selezionata.</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>La preimpostazione potrebbe essere danneggiata o proveniente da una versione precedente di HandBrake che non è supportata.
+Le preimpostazioni di versioni precedenti devono essere ricreate nella versione corrente.</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>Ulteriori argomenti avanzati che possono essere passati al codificatore video.</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>Nessuno - Vengono masterizzate solo le tracce che hanno un formato che il contenitore non supporta.
+Traccia audio lingua straniera - Verrà masterizzata la traccia audio in lingua straniera, se disponibile.
+Prima traccia: verrà masterizzata la prima traccia.
+Preferisci traccia lingua straiera, altrimenti usa la Prima - Se la traccia audio in lingua straniera esiste, verrà masterizzata, altrimenti verrà selezionata la prima traccia.</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>Compatibilità sottotitoli WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>Il WebM su HandBrake supporta solo sottotitoli in sovraimpressione.
+
+Dovresti cambiare la selezione dei sottotitoli.
+
+Altrimenti, i sottotitoli non in sovraimpressione andranno perduti.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>Nessuna sorgente o titoli validi trovati.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake non è in grado di codificare la sorgente selezionata in quanto non ha rilevato una sorgente valida con dei titoli codificabili. Ciò potrebbe essere stato causato da una delle seguenti ragioni:
+
+- La durata di ciascun titolo della sorgente potrebbe essere al di sotto della soglia di "Durata Minima del Titolo" indicata nella relativa opzione in 'Preferenze &gt; Avanzate'.
+- Il file sorgente non è un file video valido oppure non è in un formato supportato da HandBrake.
+- La sorgente potrebbe essere protetta da copia oppure contenere DRM. Si ricorda che HandBrake non supporta la rimozione di sistemi di protezione copia.
+
+Il Registro delle Attività potrebbe fornire ulteriori informazioni.</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>Coda {0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>Avvia codifica</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>Avvia coda</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>Non è possibile eliminare la preimpostazione predefinita. Come prima cosa, imposta un'altra preimpostazione come predefinita.</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>Sei sicuro di voler eliminare la preimpostazione:</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Conversione: Passaggio {0} di {1}, {2:00.00}%, FPS: {3:000.0}, FPS medio: {4:000.0}, Tempo rimanente: {5}, Trascorso: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>Una preimpostazione deve avere un nome. Compila il campo Nome preimpostazione.</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>Una preimpostazione con questo nome esiste già. Vuoi sovrascriverla?</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>È necessario prima eseguire la scansione di una sorgente per utilizzare l'opzione 'Massimo della Sorgente'.</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>I campi di Larghezza o di Altezza Personalizzata devono essere riempiti per l'opzione 'Personalizzato'.</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>Impossibile aggiungere la preimpostazione</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>Errore sconosciuto</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>Valori audio predefiniti</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>Tracce audio</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Comportamento selezione ...</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>Torna alle tracce</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>Impossibile salvare file dei Marcatori dei Capitoli!</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>I nomi dei marcatori dei capitoli NON saranno salvati durante la codifica</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>La seguente azione '{0}' avverrà in {1} secondi.</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>Se il problema persiste, prova a riavviare HandBrake.</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>Non ci sono ulteriori informazioni su questo errore.</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>Si è verificato un Errore Sconosciuto.</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>È disponibile una nuova versione! Controlla il sito web per le note di rilascio.</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>Il sistema supporta la versione a 64 bit di HandBrake! Quest'ultima offre migliori prestazioni e stabilità rispetto alla versione a 32 bit.
+Controlla il sito web per le note di rilascio.</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>Non ci sono nuovi aggiornamenti in questo momento.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>Aggiornamento scaricato</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>Servizio di Aggiornamento non disponibile. Puoi provare a scaricare l'aggiornamento dal sito web https://handbrake.fr</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>Aggiornamento non riuscito. Puoi provare a scaricare l'aggiornamento dal sito web https://handbrake.fr</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>Dim. di Archiviazione: {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>Aggiungi alla coda</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>Nessuna conversione in sospeso</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>Nessuna operazione di codifica in corso</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>Coda</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>Sei sicuro di voler pulire la coda?</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>Conferma</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} operazioni in esecuzione</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>Coda in pausa</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>Sei sicuro di voler eliminare le operazioni selezionate?</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>Questa codifica è attualmente in corso. Se la cancelli, la codifica verrà interrotta. Sei sicuro di voler procedere?</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>Non ci sono operazioni da eseguire.</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>Sei sicuro di voler modificare questo processo? Verrà rimosso dalla coda e messo nella schermata principale.</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>Coda pronta</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>Coda non in Lavorazione</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>Coda completata</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>Ultimo Processo in Coda Terminato</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>Coda avviata</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>Conversione: Passaggio {0} di {1}, {2:00.00}%, FPS: {3:000.0}, FPS medio: {4:000.0}, Tempo rimanente: {5}, Trascorso: {6:d\:hh\:mm\:ss} </value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>Una Codifica è attualmente in corso. Chiudere HandBrake interromperà questa codifica.
+Sei sicuro di voler chiudere HandBrake?</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>Anteprima immagine</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>Impossibile eliminare il file di anteprima precedente. Potresti avere ancora un'anteprima aperta nel riproduttore multimediale. Chiudilo prima di continuare.</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>È necessario eseguire la scansione di una sorgente ed impostare la codifica prima di creare un'anteprima.</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>Impossibile trovare il file di anteprima. O il file è stato cancellato o la codifica non è riuscita. Controllare il registro delle attività per i dettagli.</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake sta già codificando un video! È possibile codificare solo un video alla volta.</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>Valori predefiniti sottotitoli</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>Tracce sottotitoli</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>Torna alle tracce</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Comportamento selezione ...</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>File archiviato:</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>Impossibile caricare le preimpostazioni.</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>Impossibile caricare il file delle preimpostazioni. Tale file potrebbe provenire da una vecchia versione di HandBrake non più supportata o potrebbe essersi corrotto.
+
+Il vecchio file delle preimpostazioni è stato salvato in:</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value>con {0} errori o annullamenti rilevati.</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>Spazio insufficiente</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>Attenzione, lo spazio su disco si sta esaurendo. HandBrake non potrà completare la codifica se lo spazio è insufficiente.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>La riga {0} non è valida. Non verrà importato nulla.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>Impossibile caricare il file dei capitoli</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>Tutte le righe nel file dei capitoli devono avere almeno 2 colonne di dati</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>La prima colonna nel file dei capitoli deve contenere esclusivamente un numero intero di valore superiore a zero (0)</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>I file dei capitoli di tipo '{0}' non sono al momento supportati.</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>Tipo di file dei capitoli non supportato</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>Informazioni sui capitoli della sorgente non valide.</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>Il numero di capitoli della sorgente
+ed il numero di capitoli del file di ingresso non corrispondono ({0} contro {1}).
+
+Vuoi comunque importare i nomi dei capitoli?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>Il numero di capitoli della sorgente
+ed il numero di capitoli del file di ingresso non corrispondono ({0} contro {1}).
+
+Vuoi comunque importare i nomi dei capitoli?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>Il numero di capitoli non corrisponde tra la sorgente ed il file di ingresso</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>La durata indicata dai capitoli della sorgente
+e la durata dei capitoli del file di ingresso sono molto diverse.
+
+È possibile che il file dei capitoli sia stato generato da una sorgente differente.
+
+Voui ugualmente importare i nomi dei capitoli?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>La durata dei capitoli tra la sorgente ed il file di ingresso non corrisponde.</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>Si è verificato un errore durante il tentativo di fermare la scansione. Si prega di riavviare HandBrake.</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake non è riuscito ad aggiornare il file delle preimpostazioni al nuovo formato.
+Il file delle preimpostazioni corrente verrà archiviato e ne verrà creato uno nuovo. Sarà necessario ricreare le proprie preimpostazioni.</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>Qualsiasi impostazione modificata dall'utente potrebbe essere ripristinata al prossimo avvio di HandBrake.</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>Si è verificato un errore nel tentativo di salvare le preferenze.</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>Attenzione! Le opzioni sono state ripristinate!</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>Il file delle impostazioni utente è corrotto o inaccessibile. Le impostazioni sono state quindi ripristinate.</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>Impossibile caricare il file delle impostazioni utente: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>Il file di configurazione utente potrebbe essere non accessibile o corrotto. Potrebbe essere necessario cancellarlo e lasciare che HandBrake ne generi uno nuovo.</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>Il percorso di uscita scelto non esiste, oppure non hai i permessi di scriverci dentro dei file.</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>Vuoi creare la cartella?</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>La cartella in cui si cerca di scrivere non esiste. Vuoi che HandBrake crei questa cartella?
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>Impossibile aprire la cartella di destinazione.</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>Controlla di avere un percorso di destinazione valido.</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>Passaggio {0} di {1}, (Scansione Sottotitoli) {2:00.00}%, Tempo Restante Scansione: {3}, Trascorso: {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>Nessuna informazione aggiuntiva</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, Passaggio {2} di {3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, Passaggio {2} di {3}
+Tempo rimanente: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>Coda in Pausa. Attenzione, il disco scelto per la codifica sta esaurendo lo spazio. Si prega di liberare spazio e premere avvia per continuare. È possibile modificare il livello di spazio minimo necessario nelle preferenze.</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>Coda in pausa</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>Coda in pausa</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>La cartella di destinazione non dispone di spazio sufficiente.
+
+Puoi modificare il livello in cui appare questo avviso nelle preferenze.
+
+Continuare?</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>Impossibile ripristinare lo stato del processo, poichè non è in errore o terminato</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>Impossibile ripristinare il file della coda.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>Il file potrebbe essere corrotto o provenire da una vecchia versione di HandBrake non più compatibile</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake sta già codificando un file.</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>Si prega di interrompere la codifica in corso. Se il problema persiste, riavviare HandBrake</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>Anteprima ({0}% dimensione effettiva)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake richiede una versione a 64bit di Windows 10 o successiva.</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake richiede Windows 10 o successivo. Le versioni 0.9.9 (XP), 0.10.5 (Vista) e 1.3.3 (7, 8 e 8.1) sono le ultime a supportare questi sistemi.</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>Vuoi procedere provando ad aggiungere i rimanenti?</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>Il file '{0}' esiste già!
+Vuoi sovrascriverlo?</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>Gli appunti di sistema non sono al momento disponibili.</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>Ciò potrebbe essere causato da un altro programma che monitora o blocca gli appunti di sistema. Non è possibile usare gli appunti di sistema finchè questi non vengono sbloccati.</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>Licenza:</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>Versione:</value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- Aggiungi nuova categoria --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>Aggiungi preimpostazione</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>Categoria:</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>Descrizione:</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>Nome:</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>Dimensioni:</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>Selezione Traccia Sorgente</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>Permetti passthru di:</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>Configura il modo in cui le Tracce Audio sono selezionate e configurate automaticamente quando viene selezionato un nuovo titolo o sorgente video.</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>Comportamento 'Passthru Automatico':</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>Bitrate</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>Codificatore</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>Guadagno</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>Nascondi</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Mixdown</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>Codificatore di ripiego:</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>Ricarica</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>Frequenza di campionamento</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>Vedi</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>Nome traccia</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Comportamento Selezione Tracce:</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>Per le Tracce Aggiuntive:</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>Se 'Passthru Automatico' è selezionato come codificatore audio.</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>Marcatori di capitolo</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>Nome del capitolo</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>Numero del capitolo</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>Crea marcatori capitoli</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>Durata</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>Esporta</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>Importa</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>Esporta nomi</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>Importa nomi</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>Ripristina nomi dei capitoli</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>Annulla azione</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>Procedi</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>Azione Al Completamento</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>Dettagli errore:</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>Personalizzato:</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>Deblock:</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Decomb</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>Deinterlacciamento:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>Preimpostazione:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>Preimpostazione Deinterlacciamento</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>Riduzione del rumore:</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>Preimpostazione Riduzione del Rumore:</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>Regolazione della riduzione del rumore</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Detelecine:</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>Filtri</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>Orizzontale</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>Scala di grigi</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>Rilevamento interlacciamento:</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>Preimpostazione:</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>Rotazione:</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>Nitidezza:</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>Preimpostazione Nitidezza</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>Regolazione Nitidezza</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>Regolazione:</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>Aggiungi</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>Annulla</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>Pulisci</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>Chiudi</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>Copia negli appunti</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>Sposta a sinistra</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>Sposta a destra</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>Salva</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>Copia negli appunti</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>Registro di codifica</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>Apri cartella Log</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>Scansiona Log</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>Registro delle attività</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>Aggiungi tutti</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>Aggiungi corrente</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>Aggiungi selezione</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>Aggiungi alla coda</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>Avanzate</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Allinea Avvio A/V</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Angolo:</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>Audio</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>Tracce audio</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>Sfoglia</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>Capitoli</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>Contenitore</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Destinazione</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Durata:</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>Salva come:</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>Filtri</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>Formato:</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>Aiuto</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>Supporto iPod 5G</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>Metadati</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(Modificato)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>Multiplando: Potrebbe volerci un po' di tempo...</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>Opzioni</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>Impostazioni output</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>Pausa</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>Dimensioni</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>Modifica Preimpostazione</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Menù Contestuale Opzioni delle Preimpostazioni</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>Elimina preimpostazione</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Preimpostazioni</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>Anteprima</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>Conversione in corso: {0}, {1:00.00}%, Tempo rimanente: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Intervallo:</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>Ricarica</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>Rimuovi</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>Ripristina Preimpostazioni Predefinite</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>Salva Nuova Preimpostazione</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>Cercando il tempo di inizio</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>Imposta predefinito</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>Anteprima</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>Coda</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>Sorgente:</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>Apri sorgente</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>Avvia conversione</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>Avvia coda</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>Ferma</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>Ferma conversione</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>Sei sicuro di voler fermare la conversione?</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>Scegli una sorgente da convertire prima di provare a importare un file di sottotitoli.</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>Sottotitoli</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>Tracce sottotitoli</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>Sommario</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value>-</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Titolo:</value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>Aggiorna Preimpostazione Corrente</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>Video</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>Ottimizzato per il web</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>Gestisci Preimpostazioni</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>Metadati</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>Permetti l'uso del codificatore Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>Permetti l'uso del codificatore Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>Permetti l'uso del codificatore AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>Il formato del file inserito contieneva caratteri non validi che sono stati rimossi.</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>Riproduci un suono al termine di ogni codifica</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>Riproduci un suono al termine della coda</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>Mostra le preview nella scheda di riepilogo.</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>Mostra lo stato della codifica nella barra del titolo.</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Pulisci i registri più vecchi di 7 giorni</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>Riguardo HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>Avanzate</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>Opzioni avanzate</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>Argomenti:</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>Creazione automatica del nome</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>Crea automaticamente il nome dei file di output</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>Cerca Aggiornamenti</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>Rimuovi sempre gli elementi completati dalla coda dopo la fine di una codifica.</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>Pulisci registro</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>Metti una copia del registro di ogni codifica in una posizione specifica:</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>Metti una copia del registro di ogni codifica nella stessa posizione del video codificato</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>Versione attuale</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>Decodifica</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>Percorso predefinito:</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>Scarica aggiornamento</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>Lettura DVD</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>Disabilita LibDVDNav. (Al suo posto verrà usato libdvdread)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>Codifica</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>Formato file:</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>Generale</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>Scrittura del Registro</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>Livello verbosità del registro:</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>Percorso registro:</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>Metti in pausa la coda se non c'è spazio su disco</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>Minimizza nella barra delle applicazioni (Richiede Riavvio)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>Durata minima in secondi dei titoli DVD e Blu-ray. Titoli più brevi verranno ignorati</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>Estensione MP4:</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>All'avvio</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>File di Output</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>Percorso:</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Percorso del Riproduttore Video</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>Impedisci la sospensione del sistema durante la codifica</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>Num. di immagini di anteprima da scansione:</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>Livello priorità:</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>Preferisci l'uso di Intel QuickSync per la decodifica video, se disponibile.</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>Usa la Decodifica QSV se non è in uso il Codificatore QuickSync (es. x265)</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>Rimuovi la punteggiatura comune </value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>Sostituisci i trattini bassi con uno spazio</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>Reimposta su "Non fare nulla" quando l'applicazione viene riavviata.</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>Scegli Adattatore:</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>Ridimensionamento:</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>Invia file a:</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>Cambia minuscole/maiuscole in Tutte Iniziali Maiuscole </value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>Aggiornamenti</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>Interfaccia utente</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>Versione:</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>Video</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>Questo percorso viene utilizzato solamente per la funzione di anteprima video.
+Sono supportati VLC e MPC-HC. Altri riproduttori multimediali potrebbero funzionare, ma non è garantito.</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>Apri Cartella del Registro</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>Al completamento</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>Impostazioni x264/5</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>Granularità frazionaria di qualità costante:</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamorfico:</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>Automatico</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>Sotto</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>Ritaglio:</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>Personalizzata</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Dim. di visualizzazione: </value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Altezza:</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Automatico</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>Sinistra</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>Dimensioni al termine:</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Rapporto Pixel:</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>Destra</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>Dimensione</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>Sopra</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Ridimensionato: </value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>Personalizzata</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>Esporta in un file</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>Importa da un file</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>Ufficiale</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>Scegli titoli:</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>Aggiungi alla coda</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>I titoli selezionati verranno aggiunti usando la preimpostazione "{0}"</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>Opzioni Video:</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>Audio:</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>Pulisci tutto</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>Pulisci completati</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>Pulisci coda</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>Pulisci selezionati</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>Elimina</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>Destinazione:</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>Non fare niente</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>Durata Codifica:</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>Modifica</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>Tempo finale:</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>Esporta coda</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>Dim. File Output:</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>Iberna</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>Blocca sistema</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>Il registro sarà disponibile al termine della conversione.</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>Disconnetti</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>Apri cartella di destinazione</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>Apri cartella della sorgente</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>Opzioni</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>Pausa</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>Durata in pausa:</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>Impostazioni immagine:</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>Chiudi HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>Riprova tutte le conversioni</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>Riprova le conversioni fallite</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>Ripristina operazioni selezionate</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>Ripristina</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>Spegni</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>Sorgente:</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>Avvia coda</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>Avvia tempo:</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>Statistiche</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>Le statistiche saranno disponibili al termine della conversione.</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>Sottotitoli</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>Sommario</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>Sospendi</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>Video:</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>Al Completamento:</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>Aggiungi Tutte le Lingue Selezionate Restanti</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>Aggiungi Tutte le Tracce Restanti</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>Aggiungi nuova traccia</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>Tracce</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>Lingue disponibili:</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>Scegli lingue:</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Lingue selezionate:</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>Configura funzioni predefinite</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>Ricarica</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>Scegli disco da leggere</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>Scegli file da leggere</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>Scegli cartella da leggere</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>Scegli un titolo specifico (Opzionale):</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>Quindi scegli i video che desideri convertire:</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>File</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>Cartella (Scansione gruppo di file)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>Apri questo DVD o BlueRay</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>Apri una cartella con uno o più file.</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>Ripristina coda da file</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>È disponibile il salvataggio di una coda precedente.</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>Apri un singolo file video.</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>Seleziona sorgente</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>Durata:</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>Anteprima Live</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>Seleziona un'immagine di anteprima</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>Preferisci il riproduttore video predefinito del sistema</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>Aggiungi Sottotitoli se disponibili</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>Aggiungi 'Scansione Audio in Lingua Straniera'</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>Comportamento della Sovraimpressione:</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>Importa sottotitolo</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Comportamento Selezione Tracce:</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>Aggiungi tutti i Sottotitoli Restanti</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>Configura il modo in cui le tracce dei Sottotitoli vengono automaticamente selezionate e configurate quando selezioni un nuovo titolo o sorgente video.</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>Tracce Audio Aggiuntive</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>Tracce dei Sottotitoli Aggiuntive</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>Sovraimpresso</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>Marcatori di capitolo</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>Deblock</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Detelecine</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>schermo</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>Scala di grigi</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>Nessuna Traccia audio</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>Nessun Marcatore di Capitolo</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>Nessun filtro</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>Nessuna Sorgente</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>Nessuna Traccia Sottotitolo</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>Nessuna Traccia</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>Anteprima {0} di {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>Rotazione</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>spazio</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>Codifica a 2 passaggi</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>Bitrate Medio (kbps):</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>Codificatore Video:</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>Frequenza Fotogrammi Costante</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>Qualità Costante:</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>Livello Codificatore:</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>Preimpostazione codificatore:</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>Profilo Encoder:</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>Regolazione Codificatore:</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>Opzioni avanzate:</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>Codifica Veloce</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>Frequenza Fotogrammi (FPS):</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>Opzioni Codificatore:</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>Framerate di Picco:</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>Qualità:</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Primo passaggio turbo </value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>Frequenza Fotogrammi Variabile</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>Video:</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>Lingua:</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>Usa Lingua di sistema</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>Riguardo HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>Oppure trascina un file o una cartella qui ...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>Aiuto</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>Preferenze</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>Aggiungi traccia</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>Impostazioni del codificatore audio per ogni traccia data:</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>Pulisci</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Masterizza</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>Predefinito</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>Solo forzato</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>_Riguardo...</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>_Log delle Attività</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>_Cerca Aggiornamenti</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>_Esci</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>_Esporta in un file</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>_File</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>_Documentazione HandBrake (HTTPS)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>_Aiuto</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>_Importa da un file</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>_Preferenze</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>_Preimpostazioni</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>_Coda</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>_Ripristina Preimpostazioni Predefinite</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>_Imposta Attuale come Predefinito</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>M_ostra Pannello Predefiniti</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>_Vedi Coda</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>_Strumenti</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>Sto cercando aggiornamenti...</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>Sei sicuro di voler cancellare la directory dei file di registro?</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>Pulisci Log</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>Scaricamento...</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>La directory del file di registro di HandBrake è stata cancellata!</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>Avviso</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>Preparando per l'aggiornamento</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>Si prega di selezionare una cartella.</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>Fare clic su 'Sfoglia' per impostare la posizione predefinita</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>Nascondi</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>Mostra</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>'Aggiungi tutti' alla coda</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>'Aggiungi selezione' alla coda</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>Avvia File</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>Barra degli strumenti dell'applicazione</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>Mostra 'Aggiungi tutto alla coda' sulla barra degli strumenti</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>Mostra 'Aggiungi selezione alla coda' sulla barra degli strumenti</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>Il supporto alla codifica hardware è attualmente disabilitato. Se non hai avviato HandBrake con il parametro "-no-hardware", accertati di aver installato gli ultimi driver disponibili per le schede grafiche del tuo sistema.
+
+Ciò non avrà alcun impatto sui codificatori software.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Correggi le impostazioni dei sottotitoli prima di continuare.</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>Applica</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>Riprendi codifica</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>Azioni</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>Importa coda</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Conversione: Passaggio {0} di {1}, {2:00.00}%, FPS: {3:000.0}, FPS medio: {4:000.0}
+Tempo rimanente: {5}, Trascorso: {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>Elimina selezionati</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>Modalità Portatile: Impossibile creare la cartella TMP. Controllare che il percorso sia corretto e si abbiano i permessi di scrittura.
+
+{0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>Modalità Portatile: Impossibile creare la cartella di Archiviazione. Controllare che il percorso sia corretto e si abbiano i permessi di scrittura.
+
+{0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>Modalità Portatile: Impossibile leggere il file portable.ini. Potrebbe esserci un errore in questo file. Riprova usando portable.ini.template come riferimento.</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>Inizializzazione motore di HandBrake fallita. Ciò è spesso causato da driver GPU obsoleti.\n Si prega di aggiornare i driver di ogni GPU integrata o dedicata del sistema</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Segnaposto da Sostituire: {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>Segnaposto da Sostituire: {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>Chiedi prima di sovrascrivere</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>Prova a rinominare automaticamente il file</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>Sovrascrivi il file</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>Comportamento interfaccia utente</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>Comportamento sovrascrittura file:</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>Codifica completata</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>Suono per le Notifiche</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>Coda completata</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>Al Completamento:</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>Comportamento per file omonimi:</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>Suffisso</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>Prefisso</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>Aggiungi numero</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>VistaFiltri_PreimpostazioneDeblock</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>Regolazione Deblock</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>La scelta del codificatore sarà disponibile nella sezione 'Video'</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake ha rilevato multipli file di code non terminate. Questi dovrebbero essere stati formati da multiple istanze di HandBrake avviate. Vuoi riprendere i processi non terminati?</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake ha rilevato elementi non finiti in coda dall'ultima volta che il programma è stato avviato. Vuoi ripristinarli?</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>Ripristino Coda Disponibile</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>Il file delle preimpostazioni contiene delle preimpostazioni predefinite, che non possono essere processate dalla funzione di importazione. Usare 'Menu Preset -&gt; Ripristina Preimpostazioni Predefinite' per reimpostare le preimpostazioni predefinite.
+
+Se supportata, ogni preimpostazione dell'utente verrà importata.</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>Esegui azione immediatamente. (Ciò disabiliterà la finestra di dialogo da 60 secondi)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>Sfoglia</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>Nessun file audio impostato. Premi 'Sfoglia' per selezionare un file wav o mp3 per la riproduzione.</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>Riproduci</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>Esporta coda (solo CLI)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>Usa Tema Scuro. (Richiede il riavvio, solo Windows 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>Non disponibile</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>GB</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>Alimentazione connessa. Ripresa della codifica.. ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>Livello Batteria di Sistema Critico! ({0} %)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>Livello Batteria Basso! ({0} %). La codifica è stata messa in pausa.</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>Lo spazio rimanente sul disco di destinazione è sceso sotto a {0} GB. Codifica in pausa...</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Selezione Audio Automatica</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Selezione dei Sottotitoli Automatica</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>Sistema</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Attori:</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Commenti:</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>Descrizione:</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Regista:</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>Genere:</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Trama:</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>Data di Uscita:</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>Titolo:</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>Visualizzatore Registro</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>Aspetto:</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>Filtri:</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>Dimensione:</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>Tracce:</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>Generale</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>Premi 'Cerca Aggiornamenti' per verificare la presenza di una nuova versione</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; Indietro</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>Attualmente in Pausa</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>File di Output</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>Capitoli</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>Fotogrammi</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>Anteprima</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>Secondi</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Tutte le Lingue Corrispondenti Selezionate</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>La Prima Lingua Corrispondente Selezionata</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>Nessuna</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Prima traccia</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>Preferisci Audio in Lingua Straniera, altrimenti la Prima</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>Traccia Audio in Lingua Straniera</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>Nessuna</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>Ricerca Audio in Lingua Straniera</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>Scansione Audio in Lingua Straniera</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Tutte le Lingue Corrispondenti Selezionate</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>Usa Tutte le Tracce come modelli</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>La Prima Lingua Corrispondente Selezionata</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Usa la Prima Traccia come modello</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>Senza audio</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>Capitolo {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>Automatico</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>Utilizza sempre M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>Sempre MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>Personalizzata</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>Nessuna</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>Usa Sempre la Risoluzione della Sorgente</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>Più di Normale</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>Meno di Normale</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>Alta</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>Bassa</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>Normale</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>Mensile</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>Settimanale</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Usa sempre il percorso predefinito per ogni nuovo nome generato.</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>L'intervallo di porte deve essere tra 5000 e 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>Segnaposto da Sostituire: {source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>È disponibile una nuova versione di HandBrake!</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>Copyright (C) 2003-2022 The HandBrake Team</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Livello batteria basso:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Metti in pausa tutte le operazioni correnti se il livello della batteria è troppo basso.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Aggiungi tutti i Sottotitoli Restanti</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Sono stati rilevati dei processi duplicati nel file di coda da importare. Vuoi sovrascrivere le voci esistenti?
+Ciò interromperà qualsiasi processo in corso.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Rilevati dei Duplicati</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Abilita Hardware QuickSync a Bassi Consumi (se supportato).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Seleziona un processo per visualizzarne una breve descrizione.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Avvia ogni elemento in coda in un processo di lavoro separato.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Porta di rete predefinita del processatore:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>La preimpostazione selezionata non è disponibile per questo sistema.
+
+Di solito è un'indicazione che il sistema non dispone dell'hardware richiesto per utilizzarla.
+
+Scegliere una preimpostazione differente.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Isolamento del Processo</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Attenzione, usando questa funzione partirà un server HTTP in 127.0.0.1 sulla porta scelta.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>Se la porta scelta è gia in uso, prenderà la prima porta libera in un range di +100 dalla tale porta.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Numero massimo di codifiche simultanee:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Annulla</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Preimpostazione:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Uguale alla sorgente</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Ripristina Impostazioni</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Sei sicuro di voler ripristinare le impostazioni di HandBrake a quelle predefinite?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Personalizzata (Non Limitata)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Riempimento (Intorno)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Altezza (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Nessuna</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Larghezza (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Riempi:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Colore:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Bordi:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Risoluzione e Ridimensionamento:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientamento e Ritaglio:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Solo per Windows 10! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filtri:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Predefinito</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forzato</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Personalizzata</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Dimensione Massima:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Limite della Risoluzione:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Nessuna</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Gestisci Preimpostazioni</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Elimina Preimpostazioni Predefinite</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Esporta preimpostazioni selezionate</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Importa Preimpostazioni da file</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Informazioni sulla Preimpostazione:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>Le Preimpostazioni predefinite non possono essere modificate.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Imposta Preimpostazione selezionata come predefinita</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Elimina preimpostazione</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Non supportato su questo sistema)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Ferma</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>Il nome della categoria è gia esistente. Inserirne uno diverso.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>Il nome della categoria è vuoto. Inserire un nome.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Inserisci un nome:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>Nessuna preimpostazione selezionata.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Esporta tutte le preimpostazioni dell'utente</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Livello al quale viene mostrato l'avviso di spazio su disco in esaurimento:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Nota: questo è il numero massimo di processi simultanei. Limitazioni hardware potrebbero ridurre il numero effettivo di processi simultanei durante la codifica.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Non Disponibile)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>È Predefinito:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>No</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Sì</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Impostazioni di Regolazione Fine dell'Immagine</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Mostra controlli di modifica del ritaglio.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Usa Scuro</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Usa Chiaro</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Uguale al Sistema</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Tema:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Richiede Riavvio)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Spazio Colore:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Spazio Colore</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Apri Anteprima</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Anteprima della Sorgente:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Stato del Processo:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Annullato</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Completato</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Impostazioni non valide. Controlla il registro per ulteriori dettagli.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Ingresso non valido. Controlla il registro per ulteriori dettagli.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Stato Sconosciuto. Controlla il registro per ulteriori dettagli.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Errori riscontrati durante la lettura della sorgente.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Errore sconosciuto. Controlla il registro per ulteriori dettagli.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Il processatore è andato in crash. Controlla il registro per ulteriori dettagli.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>File "hb.dll" mancante. Si prega di reinstallare.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Attenzione: questa è una build in "Modalità Sicura" di HandBrake che non include supporto ai codificatori hardware. Se si desidera utilizzare un codificatore hardware, si prega di scaricare una build non in "Modalità Sicura" dal sito.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Nero</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Personalizzata</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Bianco</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Valore RGB:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(riempito)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Capovolgi:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Dimensioni della Sorgente:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Dim. di Archiviazione: {0}x{1} Dim. di Visualizzazione: {2}x{3} Rapp. d'Aspetto: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Si è verificato un errore nella Finestra Sfoglia File.
+
+- Attenzione, i percorsi file troppo lunghi non sono supportati. La lunghezza del percorso file deve essere inferiore a 255 caratteri.
+- L'ultimo percorso usato in questa finestra è stato reimpostato per evitare errori nella prossima scansione file.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Altezza Massima:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Larghezza Massima:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Rapporto d'Aspetto: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru Metadati Comuni</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>Il percorso preimpostato di assegnazione automatica dei nomi non è valido. {0} non deve trovarsi prima di {1}</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>Desideri che HandBrake cerchi automaticamente gli aggiornamenti?
+
+Puoi cambiare la tua scelta in qualsiasi momento andando in Preferenze -&gt; Generale -&gt; Controlla Aggiornamenti</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>Cercare aggiornamenti?</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>Prima di Aggiornare:
+-Assicurati che non ci siano codifiche in corso o in coda.
+- Esegui un backup o prendi nota di tutte le preimpostazioni personalizzate create in precedenza, in quanto potrebbero non essere pienamente compatibili con le nuove versioni.</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>(Predefinito)</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>Categorie</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>Piana</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>In Parte Piana</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>Scegli come le preimpostazioni sono mostrate nei menù:</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Preimpostazione:</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>Finito</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>Modificare Processo?</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>Durata Output:</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>Sposta In Fondo</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>Sposta In Cima</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>Bitrate dell'Output:</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>Velocità Media di Codifica:</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value>del file sorgente</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>Non disponibile</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>Durata della Sorgente:</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>Ripristina</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>Sei sicuro di voler ripristinare le preimpostazioni predefinite?</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>Ripristina tutte le preimpostazioni predefinite ai valori di default:</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>(Le preimpostazioni dell'utente non saranno ripristinate)</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>Ripristina le impostazioni di HandBrake a quelle di default:</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>Preimpostazioni Predefinite</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>Impostazioni dell'Utente</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>Vista ad Albero Flottante</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>Assicurati di aver impostato la corretta associazione file su Windows, cosicché possa aprire questo file con un riproduttore video compatibile</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>Impossibile leggere il file della coda.</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>Il file potrebbe essere corrotto o provenire da una versione precedente di HandBrake.
+Sono supportati solo file della coda della versione corrente.</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>HandBrake ha completato la codifica!</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>HandBrake ha completato la coda!</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>Ciò disabiliterà anche le opzioni per mostrare le notifiche nella barra di Windows all'interno della scheda 'Al Completamento'. Riabilitalo se vuoi che vengano riattivate tali funzionalità.</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>Rimuovi HandBrake dal pannello delle notifiche di Windows.</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>Disinstallato</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>Le impostazioni delle notifiche sono state rimosse.</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>Disinstallazione pulita</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>Mostra una notifica nella barra di Windows.</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>Notifiche di Windows</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>{0} processi completati. {1} Completando {2} processi con {3} in attesa. </value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>Rigenera (Nome Automatico)</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>Apri questo Percorso</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>Riduci Tutto</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>Espandi Tutto</value>
+ </data>
+ <data name="OptionsView_RightToleftMode" xml:space="preserve">
+ <value>Scrittura da Destra a Sinistra:</value>
+ </data>
+ <data name="RightToLeft_Off" xml:space="preserve">
+ <value>No</value>
+ </data>
+ <data name="RightToLeft_TextOnly" xml:space="preserve">
+ <value>Solo Testo</value>
+ </data>
+ <data name="RightToLeft_WholeInterface" xml:space="preserve">
+ <value>Interfaccia Utente Completa</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ja.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ja.resx Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ko.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ko.resx Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
 
- <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
 <xsd:element name="root" msdata:IsDataSet="true">
 <xsd:complexType>
 <xsd:choice maxOccurs="unbounded">
 <xsd:element name="metadata">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
 </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="assembly">
 <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="data">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="resheader">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
 </xsd:complexType>
 </xsd:element>
 </xsd:choice>
@@ -112,10 +112,10 @@
 <value>2.0</value>
 </resheader>
 <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <data name="Video_EncoderExtraArgs" xml:space="preserve">
 <value>인코더 파라미터의 전체 목록: 
@@ -138,26 +138,27 @@
 그래서 작은 값의 증가들은 결과 파일 크기를 점진적으로 더 크게 증가하도록 초래할 것입니다.</value>
 </data>
 <data name="AddPreset_PictureSizeMode" xml:space="preserve">
- <value>환경 설정된 사진 설정 값들로 마음대로 저장할 수 있습니다. 3가지 모드들이 있습니다:
+ <value>프리셋된 사진 설정 값들로 마음대로 저장할 수 있습니다. 3가지 모드들이 있습니다:
 
-없음: 사진 설정 값들이 환경 설정에 저장되어 있지 않습니다. 원본을 불러올 때, 사진 설정들은 원본 해상도의 범위 안에 그대로 남아있을 것입니다. 이것은 또한 Anamorphic, 계수, 자르기 등에 영향을 미칩니다.
+없음: 사진 설정 값들이 프리셋에 저장되어 있지 않습니다. 원본을 불러올 때, 사진 설정들은 원본 해상도의 범위 안에 그대로 남아있을 것입니다. 이것은 또한 Anamorphic, 계수, 자르기 등에 영향을 미칩니다.
 
 사용자 설정: 사용자가 마음껏 최대 너비와 높이를 설정할 수 있습니다. 이 작업을 수행할 때 인코딩은 이러한 값들보다 작거나 같을 것입니다. Keep Aspect Ratio가 자동적으로 켜질 것입니다.
 
 Source Maximum: 가능한 경우 항상 원본 해상도로 인코딩하십시오.</value>
 </data>
 <data name="About_GPL" xml:space="preserve">
- <value>Copyright (C) 2003-2019 The HandBrake Team
-
-이 프로그램은 자유 소프트웨어입니다; FSF에 의해 출시된 GNU GPL, GPLv2, 그 이후의 버전(사용자 옵션에 따라)에 따라서 재배포와 변경이 가능합니다.
+ <value>이 프로그램은 자유 소프트웨어입니다; FSF에 의해 출시된
+GNU GPL, GPLv2, 그 이후의 버전(사용자 옵션에 따라)에
+따라서 재배포와 변경이 가능합니다.
 
 이 프로그램은 사용자의 유용성을 위해 배포되었지만,
-어떠한 보증 또는 묵시적인 보증 없이
-특정한 목적에 대한 프로그램 사용 적합성에 대해서 재배포할 수 없습니다. 
+어떠한 보증 또는 묵시적인 보증 없이 특정한 목적에 대한
+프로그램 사용 적합성에 대해서 재배포할 수 없습니다.
 GNU GPL을 자세히 살펴보십시오.
 
-이 프로그램과 함께 GNU GPL의 복사본을 받게 될 것입니다; 그렇지 않았다면, Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA 라고 적으시오.</value>
+이 프로그램과 함께 GNU GPL의 복사본을 받게 될 것입니다;
+그러지 않았다면, Free Software Foundation,
+Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA라고 적으십시오.</value>
 </data>
 <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
 <value>경고: 자동 파일 이름 설정이 켜져있지 않습니다. 옵션에서 해당 설정을 가능하게 해주십시오.</value>
@@ -166,7 +167,7 @@
 <value>경고: 현재 자동 오디오 및 자막 트랙 선택 설정이 없습니다. 옵션에서 기본 트랙 선택 방식을 설정할 수 있습니다.</value>
 </data>
 <data name="Presets_ResetComplete" xml:space="preserve">
- <value>내장된 환경 설정들이 재설정되었습니다.</value>
+ <value>내장된 프리셋들이 재설정되었습니다.</value>
 </data>
 <data name="Presets_ResetHeader" xml:space="preserve">
 <value>재설정 완료</value>
@@ -183,13 +184,8 @@
 <data name="Error" xml:space="preserve">
 <value>에러</value>
 </data>
- <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
- <value>경고: 대기열에 있는 각각의 항목에 자막을 추가하고 싶다면 자막 탭에서 자막 기본 값이 올바르게 설정되었는지 확인하십시오.
-
-계속하시겠습니까?</value>
- </data>
 <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
- <value>대기열에 추가하려면 우선적으로 자동 파일 이름 설정을 켜고 기본 경로를 설정해야만 합니다.</value>
+ <value>대기열에 추가하기 전에 자동 파일 이름 지정을 켜고 기본 설정에서 기본 경로를 설정해야 합니다.</value>
 </data>
 <data name="Warning" xml:space="preserve">
 <value>경고</value>
@@ -204,22 +200,22 @@
 <value>HandBrake는 이미 인코딩 중 입니다.</value>
 </data>
 <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
- <value>대기열에 같은 저장 경로로 설정된 작업들이 있습니다. 해당 작업에 대해 다른 경로를 선택해주십시오.</value>
+ <value>동일한 대상 경로를 가진 작업이 대기열에 있습니다. 이 작업에 대해 다른 경로를 선택하십시오.</value>
 </data>
 <data name="Main_JobsPending_addon" xml:space="preserve">
- <value>보류 중인 작업들{0}</value>
+ <value>보류된 작업 {0}</value>
 </data>
 <data name="Main_NewDefaultPreset" xml:space="preserve">
- <value>새로운 기본 환경 설정 세트: {0}</value>
+ <value>새로운 기본 프리셋 세트: {0}</value>
 </data>
 <data name="Main_NewUpdate" xml:space="preserve">
 <value>새로운 업데이트가 가능합니다. Tools Menu &gt; Options to Install로 이동하십시오</value>
 </data>
 <data name="Main_NoPresetSelected" xml:space="preserve">
- <value>환경 설정이 설정되지 않았습니다.</value>
+ <value>프리셋이 설정되지 않았습니다.</value>
 </data>
 <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
- <value>내장된 환경 설정을 변경할 수 없습니다. 자신만의 환경 설정 중 하나를 선택하십시오.</value>
+ <value>내장된 프리셋을 변경할 수 없습니다. 자신만의 프리셋 중 하나를 선택하십시오.</value>
 </data>
 <data name="Main_PleaseSelectFolder" xml:space="preserve">
 <value>폴더를 선택하십시오.</value>
@@ -228,27 +224,27 @@
 <value>인코딩을 준비 중입니다 ...</value>
 </data>
 <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
- <value>내장된 환경 설정과 같은 이름을 가진 환경 설정을 추가할 수 없습니다.</value>
+ <value>내장된 프리셋과 같은 이름을 가진 프리셋을 추가할 수 없습니다.</value>
 </data>
 <data name="Main_PresetOverwriteWarning" xml:space="preserve">
- <value>환경 설정 "{0}" 이 이미 존재합니다. 덮어쓰시겠습니까?</value>
+ <value>프리셋 "{0}" 이 이미 존재합니다. 덮어쓰시겠습니까?</value>
 </data>
 <data name="Main_Presets" xml:space="preserve">
- <value>환경 설정</value>
+ <value>프리셋</value>
 </data>
- <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
- <value>선택된 환경 설정으로 업데이트하려는 것이 확실합니까?</value>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>선택한 프리셋을 업데이트하시겠습니까?</value>
 </data>
 <data name="Main_PresetUpdated" xml:space="preserve">
- <value>해당 환경 설정이 현재 설정들에 업데이트되었습니다.</value>
+ <value>해당 프리셋이 현재 설정들에 업데이트되었습니다.</value>
 </data>
 <data name="Main_PresetUpdateNotification" xml:space="preserve">
- <value>사용자의 내장 환경 설정이 오래되었습니다. 이러한 환경 설정들은 지금 업데이트되어야 합니다.
-사용자의 내장 환경 설정이 오래되었습니다. 이러한 환경 설정들은 지금 업데이트되어야 합니다.사용자 지정 환경 설정들은 업데이트되지 않았으므로 사용자가 환경 설정을 삭제하고 다시 추가하여 환경 설정을 다시 만들어야 합니다.
+ <value>사용자의 내장 프리셋이 오래되었습니다. 이러한 프리셋들은 지금 업데이트되어야 합니다.
+사용자의 내장 프리셋이 오래되었습니다. 이러한 프리셋들은 지금 업데이트되어야 합니다.사용자 지정 프리셋들은 업데이트되지 않았으므로 사용자가 프리셋을 삭제하고 다시 추가하여 프리셋을 다시 만들어야 합니다.
 이전 user_presets.xml 파일은 백업됩니다.</value>
 </data>
 <data name="Main_QueueFinished" xml:space="preserve">
- <value>대기열이 종료되었습니다.</value>
+ <value>대기열 종료됨</value>
 </data>
 <data name="Main_ScanCancelled" xml:space="preserve">
 <value>스캔이 취소되었습니다.</value>
@@ -259,7 +255,7 @@
 <data name="Main_ScanFailed_NoReason" xml:space="preserve">
 <value>스캔 실패:</value>
 </data>
- <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
 <value>스캔에 실패하였습니다... 자세한 내용은 Activity Log를 참고하십시오.</value>
 </data>
 <data name="Main_ScanningPleaseWait" xml:space="preserve">
@@ -269,19 +265,19 @@
 <value>{1}개 중 {0}개 스캔 중 ({2}%)</value>
 </data>
 <data name="Main_ScanSource" xml:space="preserve">
- <value>인코딩을 시작하기 전에, 먼저 파일을 스캔하고 작업을 설정하십시오. 계속하기 위해서 툴바에 있는 '파일' 버튼을 클릭하십시오.</value>
+ <value>인코딩을 시작하기 전에, 먼저 파일을 스캔하고 작업을 설정하십시오. 계속하기 위해서 도구모음에 있는 '파일' 버튼을 클릭하십시오.</value>
 </data>
 <data name="Main_SelectPreset" xml:space="preserve">
- <value>자신의 환경 설정 중 하나를 선택했는지 확인하십시오. 내장된 환경 설정을 내보낼 수 없다는 것에 유의하십시오.</value>
+ <value>자신의 프리셋 중 하나를 선택했는지 확인하십시오. 내장된 프리셋을 내보낼 수 없다는 것에 유의하십시오.</value>
 </data>
 <data name="Main_SelectPresetForUpdate" xml:space="preserve">
- <value>업데이트를 위해 환경 설정을 선택하십시오.</value>
+ <value>업데이트를 위해 프리셋을 선택하십시오.</value>
 </data>
 <data name="Main_SelectSource" xml:space="preserve">
 <value>계속하기 위해서 '파일'을 선택하십시오.</value>
 </data>
 <data name="Main_XEncodesPending" xml:space="preserve">
- <value>{0}인코딩 보류 중</value>
+ <value>{0}보류된 작업</value>
 </data>
 <data name="Notice" xml:space="preserve">
 <value>알림</value>
@@ -299,19 +295,19 @@
 <value>업데이트가 완료되었습니다.</value>
 </data>
 <data name="Preset_OldVersion_Header" xml:space="preserve">
- <value>환경 설정 버전</value>
+ <value>프리셋 버전</value>
 </data>
 <data name="Preset_OldVersion_Message" xml:space="preserve">
- <value>가지고 오려고 하는 환경 설정은 현재 HandBrake와는 다른 버전입니다.
-해당 환경 설정에서 모든 값들을 가지고 오는 것은 불가능할 것입니다.
+ <value>가지고 오려고 하는 프리셋은 현재 HandBrake와는 다른 버전입니다.
+해당 프리셋에서 모든 값들을 가지고 오는 것은 불가능할 것입니다.
 
 계속 진행하시겠습니까?</value>
 </data>
 <data name="Preset_UnableToImport_Header" xml:space="preserve">
- <value>환경 설정을 가지고 올 수 없습니다!</value>
+ <value>프리셋을 가지고 올 수 없습니다!</value>
 </data>
 <data name="Preset_UnableToImport_Message" xml:space="preserve">
- <value>환경 설정에 문제가 있거나 HandBrake와 상이한 버전이기 떄문에 해당 환경 설정을 가지고 올 수 없습니다.</value>
+ <value>프리셋에 문제가 있거나 HandBrake와 상이한 버전이기 떄문에 해당 프리셋을 가지고 올 수 없습니다.</value>
 </data>
 <data name="Main_SetDestination" xml:space="preserve">
 <value>대기열에 추가하기 전에 출력 결과 파일에 대한 저장 경로를 설정하십시오.</value>
@@ -328,17 +324,11 @@
 <data name="PictureSettings_OutputResolution" xml:space="preserve">
 <value>출력 결과: {0}</value>
 </data>
- <data name="Options_AdditionalFormatOptions" xml:space="preserve">
- <value>출력 결과 파일의 형식. 지원되는 파일 시스템 형식 이외에, 제목을 수정하거나 파일을 스캔할 때는 기존의 형식을 대체할 수 있는 아래의 자리 표시자를 사용할 수 있습니다.
-
-Live 업데이트 옵션: {source} {title} {chapters}
-Non-Live 옵션: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (이것들은 새로운 파일을 스캔하거나, 제목이나 챕터를 수정할 때만 변경할 수 있습니다.)</value>
- </data>
 <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
 <value>이용 가능한 추가 옵션: {source_path} 또는 {source_folder_name} 또는 {source}</value>
 </data>
 <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
- <value>인코딩할 파일과 원본 파일이 같은 주소와 파일 이름을 가질 수 없습니다. 원본 파일과 같지 않도록 저장할 파일 이름을 바꿔 주십시오.</value>
+ <value>원본 파일과 경로 및 파일 이름이 같은 파일에는 인코딩할 수 없습니다. 원본 파일과 일치하지 않도록 대상 파일 이름을 업데이트하십시오.</value>
 </data>
 <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
 <value>시스템이 HandBrake의 웹 브라우저 실행을 막고 있습니다.</value>
@@ -347,11 +337,11 @@
 <value>여전히 웹사이트 https://handbrake.fr 에 직접 방문하여 도움말 페이지에 접속할 수 있습니다.</value>
 </data>
 <data name="Main_PresetImportFailed" xml:space="preserve">
- <value>선택된 환경 설정으로 설정할 수 없습니다.</value>
+ <value>선택된 프리셋으로 설정할 수 없습니다.</value>
 </data>
 <data name="Main_PresetImportFailedSolution" xml:space="preserve">
- <value>환경 설정이 잘못되었거나 HandBrake가 지원하지 않는 오래된 버전입니다.
-오래된 환경 설정은 반드시 현재 버전으로 다시 만들어져야 합니다.</value>
+ <value>프리셋이 잘못되었거나 HandBrake가 지원하지 않는 오래된 버전입니다.
+오래된 프리셋은 반드시 현재 버전으로 다시 만들어져야 합니다.</value>
 </data>
 <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
 <value>비디오 인코더에 전달될 수 있는 추가적인 고급 인자.</value>
@@ -373,16 +363,16 @@
 변경하지 않을 경우, 굽지 않은 자막들은 없어질 것입니다.</value>
 </data>
 <data name="Main_ScanNoTitlesFound" xml:space="preserve">
- <value>유효한 파일 또는 타이틀을 찾을 수 없습니다.</value>
+ <value>올바른 원본 또는 제목을 찾을 수 없습니다.</value>
 </data>
 <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
- <value>HandBrake는 인코딩할 제목의 유효한 파일을 찾지 못하였으므로 선택된 파일을 인코딩할 수 없습니다.
-아래와 같은 이유들 중 하나로 인코딩할 수 없습니다.
-- 각 파일 제목의 지속 시간이 '설정 &gt; 고급'의 "최소 제목 지속 시간" 임계값 조건보다 낮습니다.
-- 원본 파일이 유효한 비디오 파일이 아니거나 HandBrake가 지원하는 파일 형식이 아닙니다.
-- 원본 파일은 복사 방지가 되거나 DRM을 포함해야 합니다. HandBrake가 복사 방지 제거를 지원하지 않다는 것에 유의하십시오.
+ <value>HandBrake는 인코딩할 제목이 있는 유효한 소스를 찾지 못했기 때문에 선택한 소스를 인코딩할 수 없습니다. 다음 이유 중 하나로 인해 발생할 수 있습니다.
+
+- 각 소스 제목의 재생 시간은 '기본 설정 &gt; 고급'의 "최소 제목 재생 시간" 임계값 옵션보다 낮습니다.
+- 소스 파일이 유효한 비디오 파일이 아니거나 HandBrake가 지원하지 않는 형식입니다.
+- 소스는 복사 방지되거나 DRM을 포함할 수 있습니다. HandBrake는 복사 방지 제거를 지원하지 않습니다.
 
-Activity log에 추가 정보가 있습니다.</value>
+활동 로그에 추가 정보가 있을 수 있습니다.</value>
 </data>
 <data name="Main_QueueLabel" xml:space="preserve">
 <value>대기열{0}</value>
@@ -391,22 +381,22 @@
 <value>인코딩 시작</value>
 </data>
 <data name="Main_StartQueue" xml:space="preserve">
- <value>대기열 실행</value>
+ <value>대기열 시작</value>
 </data>
 <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
- <value>기본 환경 설정을 삭제할 수 없습니다. 먼저 다른 환경 설정을 기본 값으로 설정하십시오.</value>
+ <value>기본 프리셋을 삭제할 수 없습니다. 먼저 다른 프리셋을 기본 값으로 설정하십시오.</value>
 </data>
 <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
- <value>환경 설정을 삭제하시겠습니까:</value>
+ <value>프리셋을 삭제하시겠습니까:</value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>인코딩: {1}개 중 {0}개 완료, {2:00.00}%. FPS: {3:000.0}, 평균 FPS: {4:000.0}, 남은 시간: {5}, 경과 시간: {6:d\:hh\:mm\:ss} {7}</value>
+ <value>인코딩: {1}개 중 {0}개 완료, {2:00.00}%, FPS: {3:000.0}, 평균 FPS: {4:000.0}, 남은 시간: {5}, 경과 시간: {6}{7}</value>
 </data>
 <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
- <value>환경 설정은 이름이 필요합니다. 환경 설정 이름 칸을 채워주십시오.</value>
+ <value>프리셋은 이름이 필요합니다. 프리셋 이름 칸을 채워주십시오.</value>
 </data>
 <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
- <value>같은 이름의 환경 설정이 이미 존재합니다. 덮어쓰시겠습니까?</value>
+ <value>같은 이름의 프리셋이 이미 존재합니다. 덮어쓰시겠습니까?</value>
 </data>
 <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
 <value>'파일 최댓값' 옵션을 이용하려면 먼저 원본 파일을 스캔해야 합니다.</value>
@@ -415,7 +405,7 @@
 <value>사용자 정의 너비 또는 높이는 '사용자 정의' 옵션에 입력해야 합니다.</value>
 </data>
 <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
- <value>환경 설정을 추가할 수 없습니다.</value>
+ <value>프리셋을 추가할 수 없습니다.</value>
 </data>
 <data name="UnknownError" xml:space="preserve">
 <value>알 수 없는 오류</value>
@@ -427,7 +417,7 @@
 <value>오디오 트랙</value>
 </data>
 <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
- <value>선택 동작</value>
+ <value>동작 선택 ...</value>
 </data>
 <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
 <value>트랙으로 되돌아가기</value>
@@ -442,7 +432,7 @@
 <value>{0}을 수행할 시에, {1}가 실행됩니다.</value>
 </data>
 <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
- <value>문제가 지속될 경우, HandBrake를 다시 실행하십시오.</value>
+ <value>문제가 지속되면 HandBrake를 다시 시작해 보십시오.</value>
 </data>
 <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
 <value>해당 오류에 대한 추가 정보가 없습니다.</value>
@@ -470,7 +460,7 @@
 <value>업데이트에 실패하였습니다. https://handbrake.fr 에서 업데이트를 다운로드 할 수 있습니다.</value>
 </data>
 <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
- <value>화면 크기 : {0}x{1}, 측정 크기 {2}x{3}</value>
+ <value>저장 크기: {0}x{1}</value>
 </data>
 <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
 <value>대기열에 추가</value>
@@ -484,20 +474,17 @@
 <data name="QueueViewModel_Queue" xml:space="preserve">
 <value>대기열</value>
 </data>
- <data name="QueueViewModel_ClearQueueConfrimation" xml:space="preserve">
- <value>대기열을 비우시겠습니까?</value>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>대기열을 지우시겠습니까?</value>
 </data>
 <data name="Confirm" xml:space="preserve">
 <value>확인</value>
 </data>
 <data name="QueueViewModel_JobsPending" xml:space="preserve">
- <value>{0} 보류중인 작업</value>
+ <value>{0}보류된 작업</value>
 </data>
 <data name="QueueViewModel_QueuePending" xml:space="preserve">
- <value>대기열 일시 중지</value>
- </data>
- <data name="QueueViewModel_QueuePauseNotice" xml:space="preserve">
- <value>대기열이 일시 중지되었습니다. 현재 실행 중인 작업은 완료될 때까지 실행되며 추가 작업은 실행되지 않습니다.</value>
+ <value>대기열 일시중지됨</value>
 </data>
 <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
 <value>선택된 작업을 삭제하시겠습니까?</value>
@@ -506,13 +493,13 @@
 <value>해당 인코딩은 현재 진행 중입니다. 만약 삭제할 경우, 인코딩은 중단될 것입니다. 계속하시겠습니까?</value>
 </data>
 <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
- <value>보류 중인 작업이 없습니다.</value>
+ <value>보류된 작업이 없습니다.</value>
 </data>
- <data name="QueueViewModel_EditConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
 <value>해당 작업을 수정하시겠습니까? 해당 작업이 대기열에서 제거될 것이며 메인 화면으로 전송될 것입니다.</value>
 </data>
 <data name="QueueViewModel_QueueReady" xml:space="preserve">
- <value>대기열 준비</value>
+ <value>대기열 준비됨</value>
 </data>
 <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
 <value>대기열 실행 안 함</value>
@@ -521,7 +508,7 @@
 <value>대기열 완료</value>
 </data>
 <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
- <value>마지막 대기 작업 완료</value>
+ <value>마지막으로 대기 중인 작업 완료</value>
 </data>
 <data name="QueueViewModel_QueueStarted" xml:space="preserve">
 <value>대기열 시작</value>
@@ -537,15 +524,11 @@
 <value>사진 미리보기</value>
 </data>
 <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
- <value>이전 미리보기 파일 삭제가 불가능합니다. 프로그램을 다시 시작해야 할 수 있습니다.</value>
+ <value>이전 미리보기 파일을 삭제할 수 없습니다. 미디어 플레이어에서 여전히 미리보기가 열려 있을 수 있습니다. 닫아주세요.</value>
 </data>
 <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
 <value>미리보기를 만들기 전에 먼저 파일을 스캔하고 인코딩을 설정하십시오.</value>
 </data>
- <data name="StaticPreviewViewModel_UnableToFindVLC" xml:space="preserve">
- <value>VLC 플레이어를 발견할 수 없습니다.
-VLC가 설치되었는지 확인하고 HandBrake의 옵션에 지정된 폴더가 올바른 지 확인하십시오. (보기: "도구 메뉴 &gt; 설정 &gt; 일반")</value>
- </data>
 <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
 <value>미리보기 파일을 찾을 수 없습니다. 파일이 삭제되었거나 인코딩에 실패하였습니다. 자세한 내용은 액티비티 로그를 확인하십시오.</value>
 </data>
@@ -562,18 +545,18 @@
 <value>트랙으로 되돌아가기</value>
 </data>
 <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
- <value>동작 선택</value>
+ <value>동작 선택 ...</value>
 </data>
 <data name="PresetService_ArchiveFile" xml:space="preserve">
 <value>보관 파일:</value>
 </data>
 <data name="PresetService_UnableToLoad" xml:space="preserve">
- <value>환경 설정을 불러올 수 없습니다.</value>
+ <value>프리셋을 불러올 수 없습니다.</value>
 </data>
 <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
- <value>HandBrake는 환경 설정 파일을 불러올 수 없습니다. 해당 파일이 HandBrake가 지원하지 않는 오래된 버전의 파일이거나 손상되었을 가능성이 높습니다.
+ <value>HandBrake는 프리셋 파일을 불러올 수 없습니다. 해당 파일이 HandBrake가 지원하지 않는 오래된 버전의 파일이거나 손상되었을 가능성이 높습니다.
 
-해당 환경 설정 파일은 다음 경로에 보관되어 있습니다:</value>
+해당 프리셋 파일은 다음 경로에 보관되어 있습니다:</value>
 </data>
 <data name="Main_QueueFinishedErrors" xml:space="preserve">
 <value>{0} 오류 또는 취소가 감지된 경우</value>
@@ -585,7 +568,7 @@
 <value>경고, 디스크 공간이 부족합니다. 디스크 공간 부족한 경우, HandBrake는 인코딩을 완료할 수 없습니다.</value>
 </data>
 <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
- <value>라인 {0}은 유효하지 않습니다. 아무 것도 불러올 수 없습니다.</value>
+ <value> {0} 라인이 잘못되었습니다. 가져올 항목이 없습니다.</value>
 </data>
 <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
 <value>챕터 파일을 가지고 올 수 없습니다</value>
@@ -606,19 +589,19 @@
 <value>원본 미디어에 대한 유효하지 않은 챕터 정보</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
- <value>원본 미디어의 챕터 수
-와 입력 파일의 챕터 수가 일치하지 않습니다({0} vs {1}).
+ <value>원본 미디어의 챕터 수와
+입력 파일의 챕터 수가 일치하지 않습니다. ({0} vs {1})
 
 챕터 이름을 계속 가져오시겠습니까?</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
- <value>원본 미디어의 챕터 수
-와 입력 파일의 챕터 수가 일치하지 않습니다({0} vs {1}).
+ <value>원본 미디어의 챕터 수와
+입력 파일의 챕터 수가 일치하지 않습니다. ({0} vs {1})
 
 챕터 이름을 계속 가져오시겠습니까?</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
- <value>원본 파일과 입력 파일 간 챕터 장수가 맞지 않습니다.</value>
+ <value>원본 파일과 입력 파일 간에 챕터 수가 맞지 않습니다.</value>
 </data>
 <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
 <value>원본 미디어에 대한 챕터의 보고된 지속 시간
@@ -635,13 +618,13 @@
 <value>스캔을 중지하여 오류가 발생하였습니다. HandBrake를 다시 시작하십시오.</value>
 </data>
 <data name="Presets_PresetForceReset" xml:space="preserve">
- <value>HandBrake는 새로운 버전 형식으로 사용자 환경 설정 파일을 업그레이드 할 수 없습니다.
-환경 설정 파일은 보관될 것이며 새 파일이 생성될 것입니다. 사용자만의 환경 설정 파일을 다시 생성해야 합니다.</value>
+ <value>HandBrake는 새로운 버전 형식으로 사용자 프리셋 파일을 업그레이드 할 수 없습니다.
+프리셋 파일은 보관될 것이며 새 파일이 생성될 것입니다. 사용자만의 프리셋 파일을 다시 생성해야 합니다.</value>
 </data>
 <data name="SettingService_SaveErrorReset" xml:space="preserve">
 <value>변경한 모든 설정은 다음 HandBrake를 시작할 때 재설정해야 적용할 수 있습니다.</value>
 </data>
- <data name="UserSettings_AnErrorOccured" xml:space="preserve">
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
 <value>설정을 저장하려고 할 때 문제가 발생하였습니다.</value>
 </data>
 <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
@@ -670,10 +653,10 @@
 <value>대상 디렉토리를 시작할 수 없습니다.</value>
 </data>
 <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
- <value>유효한 대상 디렉토리인지 확인하십시오.</value>
+ <value>올바른 대상 디렉토리가 있는지 확인하십시오.</value>
 </data>
 <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
- <value>{1}의 {0} 통과를 진행 중, (자막 스캔) {2:00.00}%, 남은 스캔 시간: {3}, 경과 시간: {4:d\:hh\:mm\:ss}</value>
+ <value>{1}의 {0} 통과를 진행 중, (자막 스캔) {2:00.00}%, 남은 스캔 시간: {3}, 경과 시간: {4}</value>
 </data>
 <data name="NoAdditionalInformation" xml:space="preserve">
 <value>추가적인 정보 없음</value>
@@ -686,16 +669,20 @@
 남은 시간: {4}</value>
 </data>
 <data name="PauseOnLowDiskspace" xml:space="preserve">
- <value>대기열 중지. 경고, 인코딩을 진행하는 드라이브의 디스크 공간이 부족합니다. 공간을 확보하고 시작을 눌러 계속하십시오. 설정에서 최소 공간 수준을 조정할 수도 있습니다.</value>
+ <value>대기열이 일시중지되었습니다. 경고, 인코딩하는 드라이브의 디스크 공간이 부족합니다. 여유 공간을 확보한 후 시작을 눌러 계속하십시오. 또한 기본 설정에서 최소 공간 수준을 조정할 수 있습니다.</value>
 </data>
 <data name="Main_QueuePaused" xml:space="preserve">
- <value>대기열 중지</value>
+ <value>대기열 일시중지됨</value>
 </data>
 <data name="QueueViewModel_QueuePaused" xml:space="preserve">
- <value>대기열 중지</value>
+ <value>대기열 일시중지됨</value>
 </data>
 <data name="Main_LowDiskspace" xml:space="preserve">
- <value>경로 디렉토리의 디스크 공간이 부족합니다. 경로 드라이브의 디스크 공간을 확보해주십시오. 또는 옵션에서 이 경고가 발생하게 되는 수준을 변경할 수 있습니다. </value>
+ <value>경로 디렉토리의 디스크 공간이 부족합니다.
+
+이 경고가 기본설정에 표시되는 수준을 구성할 수 있습니다.
+
+계속하시겠습니까?</value>
 </data>
 <data name="Queue_UnableToResetJob" xml:space="preserve">
 <value>오류나 완료 상태가 아니므로 작업 상태를 재설정할 수 없습니다</value>
@@ -712,22 +699,17 @@
 <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
 <value>현재 진행 중인 인코딩을 멈추십시오. 문제가 계속되는 경우, HandBrake를 다시 시작하십시오.</value>
 </data>
- <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>인코딩: {1}의 {0} 통과, {2:00.00}%
-FPS: {3:000.0}, 평균 FPS: {4:000.0}
-남은 시간: {5}, 경과 시간: {6:d\:hh\:mm\:ss}</value>
- </data>
 <data name="StaticPreviewView_Title" xml:space="preserve">
 <value>미리보기 (실제 사이즈 {0}%)</value>
 </data>
 <data name="OsBitnessWarning" xml:space="preserve">
- <value>HandBrake를 실행시키기 위해서는 Windows 7 이상 64 비트 버전이 필요합니다.</value>
+ <value>HandBrake를 실행하려면 64비트 버전의 Windows 10 이상이 필요합니다.</value>
 </data>
 <data name="OsVersionWarning" xml:space="preserve">
- <value>HandBrake를 실행시키기 위해서는 Windows 7 이상 버전이 필요합니다. 0.9.9 버전 (XP)와 0.10.5 (Vista) 버전은 이러한 버전을 지원하는 마지막 버전입니다.</value>
+ <value>HandBrake를 실행하려면 Windows 10 이상이 필요합니다. 버전 0.9.9(XP), 0.10.5(Vista), 1.3.3(7 및 8.x)은 이러한 이전 운영 체제를 지원하는 마지막 버전입니다.</value>
 </data>
 <data name="Main_ContinueAddingToQueue" xml:space="preserve">
- <value>나머지를 추가하시겠습니까?</value>
+ <value>나머지를 추가하려고 계속하시겠습니까?</value>
 </data>
 <data name="Main_QueueOverwritePrompt" xml:space="preserve">
 <value>'{0}' 파일은 이미 존재합니다!
@@ -746,13 +728,13 @@
 <value>버전:</value>
 </data>
 <data name="AddPresetView_AddNewCategory" xml:space="preserve">
- <value>-- 새 카테고리 추가 --</value>
+ <value>-- 새 범주 추가 --</value>
 </data>
 <data name="AddPresetView_AddPreset" xml:space="preserve">
- <value>환경 설정 추가</value>
+ <value>프리셋 추가</value>
 </data>
 <data name="AddPresetView_Category" xml:space="preserve">
- <value>카테고리:</value>
+ <value>범주:</value>
 </data>
 <data name="AddPresetView_Description" xml:space="preserve">
 <value>설명:</value>
@@ -770,7 +752,7 @@
 <value>다음 경로 경유 허용:</value>
 </data>
 <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
- <value>새로운 타이틀이나 원본 파일 비디오를 선택할 시에 오디오 트랙을 자동으로 선택하고 설정하는 방법을 설정하십시오.</value>
+ <value>새 제목 또는 원본 비디오를 선택할 때 오디오 트랙을 자동으로 선택하고 구성하는 방법을 설정합니다.</value>
 </data>
 <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
 <value>'자동 경유' 동작:</value>
@@ -785,7 +767,7 @@
 <value>DRC</value>
 </data>
 <data name="AudioView_Gain" xml:space="preserve">
- <value>얻기</value>
+ <value>게인</value>
 </data>
 <data name="AudioView_Hide" xml:space="preserve">
 <value>숨기기</value>
@@ -803,7 +785,7 @@
 <value>견본 비율</value>
 </data>
 <data name="AudioView_Show" xml:space="preserve">
- <value>보여주기</value>
+ <value>표시</value>
 </data>
 <data name="AudioView_TrackName" xml:space="preserve">
 <value>트랙 이름</value>
@@ -839,10 +821,10 @@
 <value>가져오기</value>
 </data>
 <data name="ChapterView_ExportNames" xml:space="preserve">
- <value>내보낼 파일명</value>
+ <value>이름 내보내기</value>
 </data>
 <data name="ChapterView_ImportNames" xml:space="preserve">
- <value>가져올 파일명</value>
+ <value>이름 가져오기</value>
 </data>
 <data name="ChapterView_ResetChapterNames" xml:space="preserve">
 <value>챕터 이름 재설정</value>
@@ -863,55 +845,55 @@
 <value>사용자 설정:</value>
 </data>
 <data name="FiltersView_Deblock" xml:space="preserve">
- <value>Deblock</value>
+ <value>블록 제거</value>
 </data>
 <data name="FiltersView_Decomb" xml:space="preserve">
 <value>Decomb</value>
 </data>
 <data name="FiltersView_Deinterlace" xml:space="preserve">
- <value>Deinterlace</value>
+ <value>인터레이스 해제</value>
 </data>
 <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
- <value>환경 설정:</value>
+ <value>프리셋:</value>
 </data>
 <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
- <value>Deinterlace 환경 설정</value>
+ <value>인터레이스 해제 프리셋</value>
 </data>
 <data name="FiltersView_Denoise" xml:space="preserve">
- <value>잡음 제거:</value>
+ <value>노이즈 제거:</value>
 </data>
 <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
- <value>잡음 제거 환경 설정</value>
+ <value>노이즈 제거 프리셋</value>
 </data>
 <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
- <value>잡음 제거</value>
+ <value>노이즈 제거</value>
 </data>
 <data name="FiltersView_Detelecine" xml:space="preserve">
- <value>Detelecine:</value>
+ <value>텔레시네 해제:</value>
 </data>
 <data name="FiltersView_Filters" xml:space="preserve">
 <value>필터</value>
 </data>
 <data name="FiltersView_FlipVideo" xml:space="preserve">
- <value>뒤집기</value>
+ <value>가로 방향</value>
 </data>
 <data name="FiltersView_Grayscale" xml:space="preserve">
- <value>흑백</value>
+ <value>그레이스케일</value>
 </data>
 <data name="FiltersView_InterlaceDetection" xml:space="preserve">
 <value>Interlace 감지:</value>
 </data>
 <data name="FiltersView_Preset" xml:space="preserve">
- <value>환경 설정:</value>
+ <value>프리셋:</value>
 </data>
 <data name="FiltersView_Rotate" xml:space="preserve">
 <value>회전:</value>
 </data>
 <data name="FiltersView_Sharpen" xml:space="preserve">
- <value>선명도</value>
+ <value>선명도:</value>
 </data>
 <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
- <value>선명도 환경 설정</value>
+ <value>선명도 프리셋</value>
 </data>
 <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
 <value>선명도 조정</value>
@@ -1019,7 +1001,7 @@
 <value>메타데이터</value>
 </data>
 <data name="MainView_ModifiedPreset" xml:space="preserve">
- <value>(수정)</value>
+ <value>(수정됨)</value>
 </data>
 <data name="MainView_Muxing" xml:space="preserve">
 <value>다중화: 시간이 다소 소요될 수 있습니다...</value>
@@ -1037,16 +1019,16 @@
 <value>면적</value>
 </data>
 <data name="MainView_PresetManage" xml:space="preserve">
- <value>환경 설정 이름 바꾸기</value>
+ <value>사전 설정 편집</value>
 </data>
 <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
- <value>환경 설정 옵션 컨텍스트 메뉴</value>
+ <value>프리셋 옵션 컨텍스트 메뉴</value>
 </data>
 <data name="MainView_PresetRemove" xml:space="preserve">
- <value>환경 설정 삭제</value>
+ <value>프리셋 삭제</value>
 </data>
 <data name="MainView_Presets" xml:space="preserve">
- <value>환경 설정</value>
+ <value>프리셋</value>
 </data>
 <data name="MainView_Preview" xml:space="preserve">
 <value>미리보기</value>
@@ -1061,20 +1043,17 @@
 <value>다시 불러오기</value>
 </data>
 <data name="MainView_Remove" xml:space="preserve">
- <value>삭제</value>
+ <value>제거</value>
 </data>
 <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
- <value>내장된 환경 설정 재설정</value>
+ <value>내장된 프리셋 재설정</value>
 </data>
 <data name="MainView_SaveNewPreset" xml:space="preserve">
- <value>새로운 환경 설정 저장</value>
+ <value>새로운 프리셋 저장</value>
 </data>
 <data name="MainView_Searching" xml:space="preserve">
 <value>시작 시간 검색</value>
 </data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>선택된 환경 설정:</value>
- </data>
 <data name="MainView_SetDefault" xml:space="preserve">
 <value>기본값 설정</value>
 </data>
@@ -1094,7 +1073,7 @@
 <value>인코딩을 시작합니다.</value>
 </data>
 <data name="MainView_StartQueue" xml:space="preserve">
- <value>Queue를 시작합니다.</value>
+ <value>대기열 시작</value>
 </data>
 <data name="MainView_Stop" xml:space="preserve">
 <value>멈춤</value>
@@ -1124,7 +1103,7 @@
 <value>제목:</value>
 </data>
 <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
- <value>선택한 환경 설정으로 변경</value>
+ <value>현재 프리셋 업데이트</value>
 </data>
 <data name="MainView_VideoTab" xml:space="preserve">
 <value>비디오</value>
@@ -1133,7 +1112,7 @@
 <value>웹 최적화</value>
 </data>
 <data name="ManagePresetView_ManagePreset" xml:space="preserve">
- <value>환경 설정 관리</value>
+ <value>프리셋 관리</value>
 </data>
 <data name="MetaDataView_Title" xml:space="preserve">
 <value>메타데이터</value>
@@ -1148,22 +1127,22 @@
 <value>AMD VCE 인코더 사용 가능</value>
 </data>
 <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
- <value>입력된 파일 형식은 유효하지 못한 문자를 포함하고 있습니다. 이를 삭제하십시오.</value>
+ <value>입력한 파일 형식에 잘못된 문자가 포함되어 있습니다. 제거되었습니다.</value>
 </data>
 <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
 <value>인코딩을 완료할 때마다 소리 내기</value>
 </data>
 <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
- <value>큐를 완료할 때마다 소리 내기</value>
+ <value>대기열이 완료되면 소리 재생</value>
 </data>
 <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
- <value>summary 탭에 미리보기 보여주기</value>
+ <value>개요 탭에 미리보기를 표시합니다.</value>
 </data>
 <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
- <value>프로그램 제목 바에 인코딩 상태 보여주기</value>
+ <value>응용프로그램 제목 표시줄에 인코딩 상태를 표시합니다.</value>
 </data>
- <data name="Options_30DayLogClear" xml:space="preserve">
- <value>30일이 지난 로그 파일들 제거</value>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>7일보다 오래된 로그 파일 지우기</value>
 </data>
 <data name="Options_About" xml:space="preserve">
 <value>HandBrake에 대해서</value>
@@ -1187,10 +1166,10 @@
 <value>업데이트 확인</value>
 </data>
 <data name="Options_ClearCompleted" xml:space="preserve">
- <value>인코딩 완료 후 항상 완료된 대기열 지우기</value>
+ <value>인코딩이 완료된 후 완료된 대기열 항목 항상 지우기</value>
 </data>
 <data name="Options_ClearLogs" xml:space="preserve">
- <value>로그 히스트리 지우기</value>
+ <value>로그 기록 지우기</value>
 </data>
 <data name="Options_CopyLogToDir" xml:space="preserve">
 <value>특정 위치에 각각의 인코딩 로그 복사본 배치:</value>
@@ -1235,7 +1214,7 @@
 <value>로그 경로: </value>
 </data>
 <data name="Options_LowDiskspaceSize" xml:space="preserve">
- <value>디스크 공간이 해당 공간보다 작다면 대기열 정지:</value>
+ <value>디스크 공간이 부족한 경우 대기열 일시중지</value>
 </data>
 <data name="Options_MinimiseTray" xml:space="preserve">
 <value>시스템 트레이 최소화 (재시작 필요)</value>
@@ -1255,8 +1234,8 @@
 <data name="Options_Path" xml:space="preserve">
 <value>경로: </value>
 </data>
- <data name="Options_PathToVLC" xml:space="preserve">
- <value>VLC 플레이어 경로</value>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>미디어 플레이어 경로</value>
 </data>
 <data name="Options_PreventSleep" xml:space="preserve">
 <value>인코딩 중 시스템 절전 방지</value>
@@ -1286,14 +1265,11 @@
 <value>스케일러 선택:</value>
 </data>
 <data name="Options_Scaling" xml:space="preserve">
- <value>화면 크기 조정</value>
+ <value>크기 조정</value>
 </data>
 <data name="Options_SendFileTo" xml:space="preserve">
 <value>다음 경로로 파일 전송:</value>
 </data>
- <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
- <value>새 실험적 대기열 디자인을 보여줍니다.</value>
- </data>
 <data name="Options_TitleCase" xml:space="preserve">
 <value>케이스를 제목 케이스로 변경</value>
 </data>
@@ -1310,7 +1286,8 @@
 <value>비디오</value>
 </data>
 <data name="Options_VideoPreviewPath" xml:space="preserve">
- <value>해당 경로는 비디오 미리보기 기능을 위해서만 사용됩니다.</value>
+ <value>이 경로는 비디오 미리보기 기능에만 사용됩니다.
+VLC 및 MPC-HC가 지원됩니다. 다른 재생기들도 작업을 할 수 있지만 검증되지 않았습니다.</value>
 </data>
 <data name="Options_ViewLogDirectory" xml:space="preserve">
 <value>로그 디렉토리 보기</value>
@@ -1334,31 +1311,28 @@
 <value>맨 아래</value>
 </data>
 <data name="PictureSettingsView_Cropping" xml:space="preserve">
- <value>자르기</value>
+ <value>자르기:</value>
 </data>
 <data name="PictureSettingsView_Custom" xml:space="preserve">
 <value>사용자 설정</value>
 </data>
- <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
- <value>화면 너비:</value>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>화면 크기:</value>
 </data>
 <data name="PictureSettingsView_Height" xml:space="preserve">
 <value>높이:</value>
 </data>
 <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>가로세로 비율 유지</value>
+ <value>자동</value>
 </data>
 <data name="PictureSettingsView_Left" xml:space="preserve">
 <value>왼쪽</value>
 </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>기준:</value>
- </data>
 <data name="PictureSettingsView_Output" xml:space="preserve">
- <value>출력</value>
+ <value>최종 치수:</value>
 </data>
 <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>측정 크기:</value>
+ <value>가로세로 픽셀:</value>
 </data>
 <data name="PictureSettingsView_Right" xml:space="preserve">
 <value>오른쪽</value>
@@ -1366,14 +1340,11 @@
 <data name="PictureSettingsView_Size" xml:space="preserve">
 <value>크기</value>
 </data>
- <data name="PictureSettingsView_Source" xml:space="preserve">
- <value>원본 파일:</value>
- </data>
 <data name="PictureSettingsView_Top" xml:space="preserve">
 <value>위</value>
 </data>
 <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>너비:</value>
+ <value>스케일링된 크기:</value>
 </data>
 <data name="Preset_Custom" xml:space="preserve">
 <value>사용자 설정</value>
@@ -1391,28 +1362,28 @@
 <value>제목 선택:</value>
 </data>
 <data name="QueueSelectionView_Title" xml:space="preserve">
- <value>대기열에 추가하기</value>
+ <value>대기열에 추가</value>
 </data>
 <data name="QueueSelection_UsingPreset" xml:space="preserve">
- <value>"{0}" 환경 설정을 이용해서 선택된 제목을 추가합니다.</value>
+ <value>"{0}" 프리셋을 이용해서 선택된 제목을 추가합니다.</value>
 </data>
 <data name="QueueView_Advanced" xml:space="preserve">
- <value>고급:</value>
+ <value>비디오 옵션:</value>
 </data>
 <data name="QueueView_Audio" xml:space="preserve">
 <value>오디오:</value>
 </data>
 <data name="QueueView_ClearAll" xml:space="preserve">
- <value>모두 제거</value>
+ <value>모두 지우기</value>
 </data>
 <data name="QueueView_ClearCompleted" xml:space="preserve">
- <value>제거 완료</value>
+ <value>지우기 완료됨</value>
 </data>
 <data name="QueueView_ClearQueue" xml:space="preserve">
- <value>대기열 제거</value>
+ <value>대기열 지우기</value>
 </data>
 <data name="QueueView_ClearSelected" xml:space="preserve">
- <value>선택 항목 제거</value>
+ <value>선택 항목 지우기</value>
 </data>
 <data name="QueueView_Delete" xml:space="preserve">
 <value>삭제</value>
@@ -1424,7 +1395,7 @@
 <value>아무것도 안 함</value>
 </data>
 <data name="QueueView_Duration" xml:space="preserve">
- <value>인코딩 시간:</value>
+ <value>인코딩 지속시간:</value>
 </data>
 <data name="QueueView_Edit" xml:space="preserve">
 <value>수정</value>
@@ -1436,10 +1407,10 @@
 <value>대기열로 내보내기</value>
 </data>
 <data name="QueueView_FileSize" xml:space="preserve">
- <value>파일 사이즈:</value>
+ <value>출력 파일크기:</value>
 </data>
 <data name="WhenDone_Hibernate" xml:space="preserve">
- <value>절전 모드</value>
+ <value>최대 절전 모드</value>
 </data>
 <data name="WhenDone_LockSystem" xml:space="preserve">
 <value>시스템 잠금</value>
@@ -1460,7 +1431,7 @@
 <value>옵션</value>
 </data>
 <data name="QueueView_Pause" xml:space="preserve">
- <value>대기열 중지</value>
+ <value>중단</value>
 </data>
 <data name="QueueView_PausedDuration" xml:space="preserve">
 <value>중단 지속 시간:</value>
@@ -1484,13 +1455,13 @@
 <value>재설정</value>
 </data>
 <data name="WhenDone_Shutdown" xml:space="preserve">
- <value>멈춤</value>
+ <value>컴퓨터 종료</value>
 </data>
 <data name="QueueView_Source" xml:space="preserve">
 <value>원본 파일:</value>
 </data>
 <data name="QueueView_Start" xml:space="preserve">
- <value>대기열 실행</value>
+ <value>대기열 시작</value>
 </data>
 <data name="QueueView_StartTime" xml:space="preserve">
 <value>시작 시간:</value>
@@ -1505,7 +1476,7 @@
 <value>자막:</value>
 </data>
 <data name="QueueView_Summary" xml:space="preserve">
- <value>요약</value>
+ <value>개요</value>
 </data>
 <data name="WhenDone_Suspend" xml:space="preserve">
 <value>절전</value>
@@ -1526,7 +1497,7 @@
 <value>새로운 트랙 추가</value>
 </data>
 <data name="Shared_AddTrack" xml:space="preserve">
- <value>트랙 추가</value>
+ <value>트랙</value>
 </data>
 <data name="Shared_AvailableLanguages" xml:space="preserve">
 <value>이용가능한 언어</value>
@@ -1534,11 +1505,11 @@
 <data name="Shared_ChooseLanguages" xml:space="preserve">
 <value>언어 선택</value>
 </data>
- <data name="Shared_ChosenLangages" xml:space="preserve">
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
 <value>선택한 언어</value>
 </data>
 <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
- <value>기본 동작 설정</value>
+ <value>기본 동작 구성하기</value>
 </data>
 <data name="Shared_ReloadDefaults" xml:space="preserve">
 <value>다시 불러오기</value>
@@ -1574,7 +1545,7 @@
 <value>대기열에 있는 파일들 복구</value>
 </data>
 <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
- <value>이전 대기열 보관이 가능합니다.</value>
+ <value>이전 대기열 보관 파일을 사용할 수 있습니다.</value>
 </data>
 <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
 <value>단일 비디오 파일을 엽니다.</value>
@@ -1592,7 +1563,7 @@
 <value>미리보기 이미지 선택</value>
 </data>
 <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
- <value>시스템 기본 비디오 플레이어 사용</value>
+ <value>시스템 기본 비디오 재생기 사용</value>
 </data>
 <data name="SubtitlesView_AddCC" xml:space="preserve">
 <value>사용 가능할 경우 내장 자막 추가</value>
@@ -1613,7 +1584,7 @@
 <value>모든 남아있는 내장 자막 추가</value>
 </data>
 <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
- <value>새 제목 또는 원본 비디오를 선택할 시에 자막 트랙이 자동으로 선택되고 구성되는 방법을 설정하십시오.</value>
+ <value>새 제목 또는 원본 비디오를 선택할 때 자막 트랙이 자동으로 선택 및 구성되는 방법을 설정합니다.</value>
 </data>
 <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
 <value>추가 오디오 트랙</value>
@@ -1631,13 +1602,13 @@
 <value>블록 분리</value>
 </data>
 <data name="SummaryView_Detelecine" xml:space="preserve">
- <value>Detelecine</value>
+ <value>텔레시네 해제</value>
 </data>
 <data name="SummaryView_display" xml:space="preserve">
 <value>디스플레이</value>
 </data>
 <data name="SummaryView_Grayscale" xml:space="preserve">
- <value>흑백</value>
+ <value>그레이스케일</value>
 </data>
 <data name="SummaryView_NoAudioTracks" xml:space="preserve">
 <value>오디오 트랙 없음</value>
@@ -1673,7 +1644,7 @@
 <value>평균 비트 전송 속도 (kbps):</value>
 </data>
 <data name="VideoView_Codec" xml:space="preserve">
- <value>비디오 코덱:</value>
+ <value>비디오 인코더:</value>
 </data>
 <data name="VideoView_ConstantFramerate" xml:space="preserve">
 <value>일정한 프레임률</value>
@@ -1685,7 +1656,7 @@
 <value>인코더 수준:</value>
 </data>
 <data name="VideoView_EncoderPreset" xml:space="preserve">
- <value>인코더 환경 설정:</value>
+ <value>인코더 프리셋:</value>
 </data>
 <data name="VideoView_EncoderProfile" xml:space="preserve">
 <value>인코더 프로필:</value>
@@ -1703,13 +1674,13 @@
 <value>프레임률 (FPS):</value>
 </data>
 <data name="VideoView_OptimiseVideo" xml:space="preserve">
- <value>비디오 최적화:</value>
+ <value>인코더 옵션:</value>
 </data>
 <data name="VideoView_PeakFramerate" xml:space="preserve">
 <value>최고 프레임률</value>
 </data>
 <data name="VideoView_Quality" xml:space="preserve">
- <value>화질</value>
+ <value>화질: </value>
 </data>
 <data name="VideoView_TurboFirstPass" xml:space="preserve">
 <value>터보 우선 통과</value>
@@ -1718,7 +1689,7 @@
 <value>변화하는 프레임률</value>
 </data>
 <data name="VideoView_Video" xml:space="preserve">
- <value>비디오</value>
+ <value>비디오: </value>
 </data>
 <data name="OptionsView_Language" xml:space="preserve">
 <value>언어:</value>
@@ -1736,7 +1707,7 @@
 <value>도움말</value>
 </data>
 <data name="Preferences" xml:space="preserve">
- <value>환경 설정</value>
+ <value>기본 설정</value>
 </data>
 <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
 <value>트랙 추가</value>
@@ -1745,7 +1716,7 @@
 <value>선택된 트랙에 대한 오디오 인코더 설정:</value>
 </data>
 <data name="AudioDefaultsView_Clear" xml:space="preserve">
- <value>완료</value>
+ <value>지우기</value>
 </data>
 <data name="SubtitlesView_BurnIn" xml:space="preserve">
 <value>굽기</value>
@@ -1757,70 +1728,70 @@
 <value>강제로</value>
 </data>
 <data name="MainView_About" xml:space="preserve">
- <value>_관하여...</value>
+ <value>소개(_A)...</value>
 </data>
 <data name="MainView_ActivityLogMenu" xml:space="preserve">
- <value>_액티비티 로그</value>
+ <value>작업 로그(_A)</value>
 </data>
 <data name="MainView_CheckForUpdates" xml:space="preserve">
- <value>_업데이트 확인</value>
+ <value>업데이트 확인(_C)</value>
 </data>
 <data name="MainView_Exit" xml:space="preserve">
- <value>_종료</value>
+ <value>종료(_E)</value>
 </data>
 <data name="MainView_ExportToFile" xml:space="preserve">
- <value>_파일 내보내기</value>
+ <value>파일로 내보내기(_E)</value>
 </data>
 <data name="MainView_FileMenu" xml:space="preserve">
- <value>_파일</value>
+ <value>파일(_F)</value>
 </data>
 <data name="MainView_HandBrakeDocs" xml:space="preserve">
 <value>_HandBrake 문서 (HTTPS)</value>
 </data>
 <data name="MainView_HelpMenu" xml:space="preserve">
- <value>_도움말</value>
+ <value>도움말(_H)</value>
 </data>
 <data name="MainView_ImportFromFile" xml:space="preserve">
- <value>_파일에서 가져오기</value>
+ <value>파일에서 가져오기(_I)</value>
 </data>
 <data name="MainView_PreferencesMenu" xml:space="preserve">
- <value>_설정</value>
+ <value>기본 설정(_P)</value>
 </data>
 <data name="MainView_PresetsMenu" xml:space="preserve">
- <value>_환경 설정</value>
+ <value>프리셋(_P)</value>
 </data>
 <data name="MainView_QueueMenu" xml:space="preserve">
- <value>_대기열</value>
+ <value>대기열(_Q)</value>
 </data>
 <data name="MainView_ResetPresets" xml:space="preserve">
- <value>_내장된 환경 설정 재설정</value>
+ <value>기본 제공된 프리셋 초기화(_R)</value>
 </data>
 <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
- <value>_현재 값을 기본값으로 설정</value>
+ <value>현재값을 기본값으로 설정(_S)</value>
 </data>
 <data name="MainView_ShowPresetPanel" xml:space="preserve">
- <value>S_환경 설정 패널 방식</value>
+ <value>프리셋 패널 표시(_H)</value>
 </data>
 <data name="MainView_ShowQueueMenu" xml:space="preserve">
- <value>_대기열 보이기</value>
+ <value>대기열 표시(_S)</value>
 </data>
 <data name="MainView_ToolsMenu" xml:space="preserve">
- <value>_도구</value>
+ <value>도구(_T)</value>
 </data>
 <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
 <value>업데이트 확인 ...</value>
 </data>
 <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
- <value>로그 파일 디렉터리를 제거하시겠습니까?</value>
+ <value>로그 파일 디렉토리를 지우시겠습니까?</value>
 </data>
 <data name="OptionsView_ClearLogs" xml:space="preserve">
- <value>로그 제거</value>
+ <value>로그 지우기</value>
 </data>
 <data name="OptionsView_Downloading" xml:space="preserve">
 <value>다운로드 중...</value>
 </data>
 <data name="OptionsView_LogsCleared" xml:space="preserve">
- <value>HandBrake의 로그 파일 디렉터리가 제거되었습니다!</value>
+ <value>HandBrake의 로그 파일 디렉터리가 지워졌습니다!</value>
 </data>
 <data name="OptionsView_Notice" xml:space="preserve">
 <value>알림</value>
@@ -1838,10 +1809,10 @@
 <value>숨기기</value>
 </data>
 <data name="MainView_Show" xml:space="preserve">
- <value>보여주기</value>
+ <value>표시</value>
 </data>
 <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
- <value>대기열에 '전체 추가'</value>
+ <value>대기열에 '모두 추가'</value>
 </data>
 <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
 <value>대기열에 '선택 추가'</value>
@@ -1849,19 +1820,19 @@
 <data name="QueueView_PlayMediaFile" xml:space="preserve">
 <value>파일 재생</value>
 </data>
- <data name="Options_ApplicaitonToolbar" xml:space="preserve">
- <value>프로그램 툴바</value>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>응용프로그램 도구모음</value>
 </data>
 <data name="Options_ShowToolbarAddAll" xml:space="preserve">
- <value>툴바에 '대기열에 전체 추가' 보이기</value>
+ <value>도구모음에 '대기열에 모두 추가' 표시</value>
 </data>
 <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
- <value>툴바에 '대기열에 선택 추가' 보이기</value>
+ <value>도구모음에 '대기열에 선택 추가' 표시</value>
 </data>
 <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
- <value>하드웨어 인코딩 지원이 현재 사용할 수 없습니다. 이 시스템에 있는 모든 그래픽 어댑터가 최신 드라이버를 실행하고 있는지 확인하십시오.
+ <value>하드웨어 인코딩 지원이 현재 비활성화되어 있습니다. "--no-hardware" 옵션을 사용하여 HandBrake를 시작하지 않은 경우 이 시스템의 모든 그래픽 어댑터에 대해 최신 드라이버를 실행하고 있는지 확인하십시오.
 
-이것은 어떤 소프트웨어 인코더에도 영향을 미치지 않을 것입니다.</value>
+이 문제는 소프트웨어 인코더에 영향을 미치지 않습니다.</value>
 </data>
 <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
 <value>계속하기 전에 자막 설정을 수정하십시오.</value>
@@ -1880,7 +1851,7 @@
 </data>
 <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
 <value>인코딩: {1}개 중 {0}개 완료, {2:00.00}%, FPS: {3:000.0}, 평균 FPS: {4:000.0}
-남은 시간: {5:hh\:mm\:ss}, 경과 시간: {6:hh\:mm\:ss} {7}</value>
+남은 시간: {5}, 경과 시간: {6}{7}</value>
 </data>
 <data name="QueueView_DeleteSelected" xml:space="preserve">
 <value>선택한 항목 삭제</value>
@@ -1902,11 +1873,10 @@
 <value>HandBrake 엔진이 초기화하는데 실패하였습니다. GPU 드라이버들이 오래되었을 경우 종종 발생하는 문제입니다.\n 시스템에 탑재된 개별 그래픽에 대한 GPU 드라이버들을 업데이트하십시오.</value>
 </data>
 <data name="OptionsView_FormatOptions" xml:space="preserve">
- <value>Live 업데이트 옵션: {source} {title} {chapters} 
-Non-Live 옵션: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (이것들은 새로운 파일을 스캔하거나, 제목이나 챕터를 수정할 때만 변경할 수 있습니다.)</value>
+ <value>대체 자리표시자: {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
 </data>
 <data name="OptionsView_PathOptions" xml:space="preserve">
- <value>사용 가능한 옵션: {source_path} {source_folder_name} {source}</value>
+ <value>대체 자리표시자: {source_path} {source_folder_name} {source}</value>
 </data>
 <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
 <value>파일 덮어쓰기 요청</value>
@@ -1927,10 +1897,10 @@
 <value>인코딩 완료</value>
 </data>
 <data name="Options_Notifications" xml:space="preserve">
- <value>공지</value>
+ <value>소리 알림</value>
 </data>
 <data name="Options_QueueCompleted" xml:space="preserve">
- <value>대기열 완료</value>
+ <value>대기열 완료됨</value>
 </data>
 <data name="Options_WhenDoneColon" xml:space="preserve">
 <value>완료 시:</value>
@@ -1948,7 +1918,7 @@
 <value>숫자 첨부</value>
 </data>
 <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
- <value>필터 보기_Deblock 환경 설정</value>
+ <value>FiltersView_DeblockPreset</value>
 </data>
 <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
 <value>Deblock 조정</value>
@@ -1966,9 +1936,9 @@
 <value>대기열 복구 가능</value>
 </data>
 <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
- <value>사용자 환경 설정 파일은 내장된 환경 설정을 포함합니다. 가져오기 기능은 환경 설정 가져오기를 지원하고 있지 않습니다. '환경 설정 메뉴 -&gt; 내장된 환경 설정 재설정' 을 이용해서 기본 환경 설정을 복원하십시오.
+ <value>사용자 프리셋 파일은 내장된 프리셋을 포함합니다. 가져오기 기능은 프리셋 가져오기를 지원하고 있지 않습니다. '프리셋 메뉴 -&gt; 내장된 프리셋 재설정' 을 이용해서 기본 프리셋을 복원하십시오.
 
-지원되는 경우, 모든 사용자 환경 사전 설정을 가져옵니다.</value>
+지원되는 경우, 모든 사용자 환경 프리셋을 가져옵니다.</value>
 </data>
 <data name="Options_PromptBeforeAction" xml:space="preserve">
 <value>작업을 즉시 수행합니다. (이 경우 60초 확인 다이얼로그가 비활성화됩니다.)</value>
@@ -1983,7 +1953,7 @@
 <value>재생하기</value>
 </data>
 <data name="QueueView_ExportCLI" xml:space="preserve">
- <value>대기열로 내보내기 (CLI Only)</value>
+ <value>대기열 내보내기 (CLI 전용)</value>
 </data>
 <data name="Options_DarkTheme" xml:space="preserve">
 <value>다크 테마를 사용하십시오. (Windows 10일 경우 재시작하십시오)</value>
@@ -2001,16 +1971,16 @@
 <value>시스템 배터리가 부족합니다! ({0} %)</value>
 </data>
 <data name="SystemService_LowBatteryLog" xml:space="preserve">
- <value>시스템 배터리가 부족합니다! ({0} %). 시스템 보호를 위해 인코딩이 중단됩니다. 시스템 절전모드가 허용됩니다!</value>
+ <value>시스템 배터리가 부족합니다! ({0} %). 인코딩이 중단됩니다.</value>
 </data>
 <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
 <value>대상 드라이브의 남은 디스크 크기가 {0} GB로 떨어졌습니다. 인코딩 중단 중...</value>
 </data>
 <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
- <value>자동 오디오 선택 설정</value>
+ <value>자동 오디오 선택</value>
 </data>
 <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
- <value>자동 자막 선택 설정</value>
+ <value>자동 자막 선택</value>
 </data>
 <data name="Options_SystemOptions" xml:space="preserve">
 <value>시스템</value>
@@ -2039,9 +2009,6 @@
 <data name="MetadataView_TitleTag" xml:space="preserve">
 <value>제목: </value>
 </data>
- <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
- <value>회전 및 뒤집기 미리보기</value>
- </data>
 <data name="LogViewModel_Title" xml:space="preserve">
 <value>로그 뷰어</value>
 </data>
@@ -2085,10 +2052,10 @@
 <value>초</value>
 </data>
 <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
- <value>선택한 언어와 모두 매칭</value>
+ <value>일치하는 모든 선택된 언어</value>
 </data>
 <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
- <value>선택한 언어와 첫 번째 매칭</value>
+ <value>일치하는 첫 번째 선택된 언어</value>
 </data>
 <data name="SubtitleBehaviourModes_None" xml:space="preserve">
 <value>없음</value>
@@ -2112,13 +2079,13 @@
 <value>외부 오디오 스캔</value>
 </data>
 <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
- <value>선택한 언어와 모두 매칭</value>
+ <value>일치하는 모든 선택된 언어</value>
 </data>
 <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
 <value>모든 트랙을 템플릿으로 사용</value>
 </data>
 <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
- <value>선택한 언어와 첫 번째 매칭</value>
+ <value>일치하는 첫 번째 선택된 언어</value>
 </data>
 <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
 <value>템플릿으로 첫 번째 트랙 사용</value>
@@ -2171,4 +2138,468 @@
 <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
 <value>각 생성된 새로운 이름에 항상 기본 경로를 사용합니다.</value>
 </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>포트 범위는 5000에서 32767 사이만 허용됩니다.</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>대체 자리표시자: {source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>새로운 버전의 HandBrake를 이용하실 수 있습니다!</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>Copyright (C) 2003-2022 HandBrake 팀</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>저전력 단계:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>배터리가 부족할 경우 진행 중인 작업을 중지하시오.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>모든 남아있는 내장 자막 추가</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>가져오려고 하는 대기열 파일에서 중복된 작업이 있습니다. 기존 작업 기록을 덮어쓰기 하시겠습니까?
+이는 또한 기존의 모든 실행 중인 작업을 중단시키게 됩니다.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>중복 감지</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>저전력 QuickSync 하드웨어를 활성화합니다(지원되는 경우).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>개요 정보를 보려면 단일 작업을 선택하십시오.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>대기 중인 각 작업을 별도의 작업자 프로세스에서 실행합니다.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>작업자를 위한 기본 네트워크 포트:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>선택한 프리셋은 이 시스템에서 사용할 수 없습니다.
+
+이것은 일반적으로 시스템이 이 하드웨어를 사용하는 데 필요한 하드웨어를 지원하지 않음을 나타냅니다.
+
+다른 프리셋을 선택하십시오.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>프로세스 격리</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>이 기능을 사용하면 명시된 포트에서 127.0.0.1로 바인딩된 HTTP 서버가 시작됩니다.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>설정된 포트가 사용 중이면 정의된 포트에서 +100 이내의 첫 번째 빈 포트를 찾습니다.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>최대 동시 인코딩 수:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>취소</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>프리셋:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>원본과 동일</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>설정 초기화</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>HandBrake를 기본 설정으로 초기화하시겠습니까?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>사용자 지정 (제한되지 않음)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>채우기 (서라운드)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>높이 (필러박스)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>없음</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>너비 (레터박스)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>채우기:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>색상:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>테두리:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>해상도 및 크기 조정:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>방향 및 자르기:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>(Windows 10 전용!)</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>필터:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>기본값</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>강제 표시</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>사용자 설정</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>최대 크기:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>해상도 제한:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>없음</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>프리셋 관리</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>기본 제공된 프리셋 삭제</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>선택한 프리셋 내보내기</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>파일에서 프리셋 가져오기</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>프리셋 정보:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>기본 제공된 프리셋은 수정할 수 없습니다.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>선택한 프리셋을 기본값으로 지정</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>프리셋 삭제</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(이 시스템에서는 지원되지 않음)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>멈춤</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>입력한 범주 이름이 이미 있습니다. 다른 이름을 선택하십시오.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>범주 이름이 비어 있습니다. 이름을 입력하십시오.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>이름 입력:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>프리셋이 선택되지 않았습니다.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>모든 사용자 프리셋 내보내기</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>디스크 공간 부족 경고가 표시하는 수준:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>참고: 이것은 동시 작업의 상한입니다. 하드웨어 제한이 적용되어 인코딩 중에 실제 동시 작업 수가 감소할 수 있습니다.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(사용할 수 없음)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>기본값:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>아니오</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>예</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>미세 조정 사진 설정</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>자르기 조정 컨트롤을 표시합니다.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>어둡게 사용</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>밝게 사용</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>시스템 일치</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>테마:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(다시 시작 필요)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Colourspace:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Colourspace</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>미리보기 열기</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>원본 미리보기:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>작업 상태:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>취소됨</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>완료</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>잘못된 설정입니다. 자세한 내용은 로그를 확인하십시오.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>잘못된 입력입니다. 자세한 내용은 로그를 확인하십시오.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>상태를 알 수 없습니다. 자세한 내용은 로그를 확인하십시오.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>원본을 읽는 동안 오류가 발생했습니다.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>알 수 없는 오류입니다. 자세한 내용은 로그를 확인하십시오.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>작업자가 충돌했습니다. 자세한 내용은 로그를 확인하십시오.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>"hb.dll" 파일이 없습니다. 다시 설치하십시오.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>경고: 이 모드는 하드웨어 인코더에 대한 지원이 포함되지 않은 HandBrake의 "안전 모드" 빌드입니다. 하드웨어 인코더 지원을 사용하려면 웹 사이트에서 "안전 모드"가 아닌 빌드를 다운로드하십시오.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>검은색</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>사용자 설정</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>흰색</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>RGB 값:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(채워짐)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>뒤집기:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>원본 치수:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>저장 크기: {0}x{1} 화면 크기: {2}x{3} 종횡비: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>파일 검색기 대화 상자에서 오류가 감지되었습니다.
+
+- 긴 파일 경로는 완전히 지원되지 않습니다. 파일 경로를 255자 미만으로 유지하십시오.
+- 다음에 파일을 검색하려고 할 때 오류가 발생하지 않도록 이 창에 마지막으로 사용된 디렉토리가 재설정되었습니다.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>최대 높이:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>최대 너비:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>종횡비: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru 공통 메타데이터</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>기본 자동 이름 경로가 잘못되었습니다. {0}은(는) {1} 앞에 있으면 안됩니다</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>HandBrake가 업데이트를 자동으로 확인하도록 하시겠습니까?
+
+기본 설정 -&gt; 일반 -&gt; 업데이트 확인에서 옵션을 변경하여 언제든지 선택 사항을 변경할 수 있습니다.</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>업데이트를 확인하시겠습니까?</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>업데이트 전:
+- 대기열에 보류 중인 인코딩이 없는지 확인하십시오.
+- 최신 버전과 완전히 호환되지 않을 수 있으므로 생성한 사용자 지정 프리셋을 백업하거나 기록해 두십시오.</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>(기본값)</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>범주</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>플랫</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>부분적으로 플랫</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>메뉴에 프리셋이 표시되는 방식을 선택합니다:</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>프리셋:</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>완료됨</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>작업을 편집하시겠습니까?</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>출력 길이:</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>맨 아래로 이동</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>맨 위로 이동</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>출력 비트레이트:</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>평균 인코딩 속도:</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value>(소스 파일)</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>이용 불가</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>원본 길이:</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>재설정</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>모든 기본 제공 프리셋을 재설정하시겠습니까?</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>모든 기본 제공 프리셋을 HandBrake 기본값으로 재설정:</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>(사용자 프리셋은 재설정되지 않습니다)</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>모든 HandBrake 설정을 기본값으로 재설정:</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>기본 제공 프리셋</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>사용자 설정</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>플로팅 트리보기</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>지원되는 비디오 재생기로 이 파일을 열 수 있도록 Windows에 적절한 파일 연결 설정이 있는지 확인하십시오.</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>대기열 파일을 읽을 수 없습니다.</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>파일이 손상되었거나 이전 버전의 HandBrake에서 가져온 것일 수 있습니다.
+현재 버전의 대기열 파일만 지원됩니다.</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>HandBrake 인코딩이 완료되었습니다!</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>HandBrake 작업 대기열이 완료되었습니다! </value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>이렇게 하면 '완료 시' 탭에서 창 표시 작업 표시줄 알림 옵션도 비활성화됩니다. 이 기능을 다시 활성화하려면 다시 활성화하십시오.</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>Windows 알림 제어 창에서 HandBrake 제거하기</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>미설치</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>알림 설정이 제거되었습니다.</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>삭제 &amp; 제거</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>Windows 작업 표시줄에 알림을 보냅니다.</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>윈도우 알림</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>{0} 작업이 완료되었습니다. {1}처리 대기 중인 {3}로 {2} 작업에 대해 작업 중입니다.</value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>다시 만들기 (자동 이름 생성)</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>해당 디렉토리 열기</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>모두 닫기</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>모두 펼치기</value>
+ </data>
 </root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.pt-BR.resx Added

@@ -0,0 +1,2487 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>Lista completa dos parâmetros do codificador:
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>Reduzir uso da CPU pelo decodificador.
+
+Ative caso seu dispositivo tenha dificuldades para reproduzir a saída. (ou seja, quadros perdidos)</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>Atenção: RF 0 significa "Sem perdas"!</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>O valor 0 significa "sem perdas" e resultará em um arquivo maior que o original, a menos
+que o arquivo original também seja "sem perdas".
+
+A escala do x264 e x265 é logarítmica e valores mais baixos correspondem a qualidades superiores.
+
+Portanto, pequenas reduções no valor irão resultar em aumentos cada vez maiores no tamanho do arquivo convertido.</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>Se preferir, você pode salvar as configurações de imagem no perfil. Há 3 modos:
+
+Nenhum: As configurações de imagem não serão salvas no perfil. Ao adicionar um arquivo, elas continuam como estão, nos limites da resolução de origem. Também afeta o Anamórfico, módulo, corte, etc.
+
+Personalizado: Você pode definir a largura e a altura máximas. Ao selecionar este, a saída de codificação será menor ou igual a esses valores. "Manter Taxa de Aspecto" será ativado automaticamente.
+
+Máximo do Arquivo: Sempre codifica na resolução de origem, sempre que possível.</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>Este aplicativo é um software livre; você pode redistribuí-lo
+e/ ou modificá-lo sob os termos da Licença Pública Geral GNU
+como publicada pela Free Software Foundation; na versão 2 da
+Licença, ou (a seu critério) qualquer versão posterior.
+
+Este programa é distribuído na espera de que seja útil, mas SEM
+QUALQUER GARANTIA; nem mesmo uma garantia implícita de
+COMERCIABILIDADE ou de ADEQUAÇÃO A UMA APLICAÇÃO EM
+PARTICULAR. Veja a Licença Pública Geral GNU para mais detalhes.
+
+Você deve ter recebido uma cópia da Licença Pública Geral
+GNU, junto com este programa; se não, escreva para a Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>AVISO: Você não ativou a renomeação automática de arquivos. Por favor, altere nas opções.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>AVISO: Você não configurou a seleção automática da trilha de áudio e de legenda. É possível configurar o comportamento de seleção da trilha padrão nas opções.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>Os perfis embutidos foram redefinidos.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>Redefinição Concluída</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Maior Qualidade |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Menor Qualidade</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Qualidade Placebo |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>Erro</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>Você deve ativar a renomeação automática de arquivos E definir um caminho padrão nas preferências antes de poder adicionar à fila.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>Aviso</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>Tem certeza?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake já está convertendo.</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>Há outras tarefas na fila com o mesmo caminho de destino. Por favor, escolha um caminho diferente para esta tarefa.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>Tarefas Pendentes {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>Definir Novo Perfil Padrão: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>Nova Atualização Disponível.
+Vá para o menu "Ferramentas" &gt; "Opções" para instalá-la.</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>Sem Perfil selecionado.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>Você não pode alterar perfis embutidos. Por favor, selecione ou crie um perfil personalizado.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>Por favor, selecione uma pasta.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>Preparando para converter ...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>Não é possível importar um perfil com o mesmo nome de um perfil embutido.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>O perfil "{0}" já existe. Você gostaria de substituí-lo?</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>Perfis</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>Tem certeza que quer atualizar o perfil selecionado?</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>O Perfil foi atualizado com suas configurações atuais.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>O HandBrake verificou que os perfis embutidos estão antigos... Eles serão atualizados agora.
+Seus perfis personalizados não foram atualizados, e talvez você tenha que recriá-los, deletando e re-adicionando eles.
+O backup do arquivo 'user_presets.xml' anterior foi salvo.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>Fila Concluída</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>Análise Cancelada.</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>Análise Concluída.</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>Falha ao Analisar:</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>Falha ao Analisar... Por favor, verifique o Log de Atividades para mais detalhes.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>Analisando o arquivo, por favor aguarde...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>Analisando Título {0} de {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>Você deve primeiro analisar um arquivo e configurar sua tarefa antes de iniciar a conversão. Clique no botão 'Origem' na barra de ferramentas para continuar.</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>Por favor, certifique-se de ter selecionado uma dos perfis personalizados. Note que você não pode exportar perfis embutidos.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>Por favor, selecione o perfil a atualizar.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>Selecione "Origem" para continuar</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} Trabalhos Pendentes</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>Aviso</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>Substituir?</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>Pergunta</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>Pronto</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>Atualizado</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Versão do Perfil</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>O perfil que você está tentando importar é de uma versão do HandBrake diferente da atual.
+ Pode não ser possível importar todos os valores deste perfil. 
+
+Você deseja continuar?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Não foi possível importar o perfil!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Não foi possível importar o perfil, pois parece estar corrompido ou veio de uma versão anterior do HandBrake.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>Você deve primeiro definir o caminho de destino para o arquivo de saída antes de adicionar à fila.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>O caminho de destino inserido continha caracteres inválidos e não será atualizado.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>Visualizar {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Prévia (redimensionada)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>Saída: {0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>Formato do arquivo de saída. Além de qualquer caractere suportado pelo sistema, você pode usar os seguintes espaços reservados, que serão substituídos quando você alterar um título ou analisar um arquivo.
+
+Atualizados em tempo real: {source} {title} {chapters}
+Atualizáveis: {date} {time} {creation-date} {creation-time} {quality} {bitrate} 
+(Estes mudam apenas ao analisar um novo arquivo, alterar títulos ou capítulos)</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>Opções adicionais disponíveis: {source_path} or {source_folder_name} or {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>O arquivo de destino recodificado não pode ter o mesmo caminho e nome do arquivo original. Por favor, altere para um nome diferente do arquivo de origem.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>Seu sistema impediu o HandBrake de iniciar um navegador de internet.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>Você ainda pode acessar a página de ajuda no navegador, visitando o site em: https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>Não foi possível importar o perfil selecionado.</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>O perfil pode estar corrompido ou vem de uma versão anterior do HandBrake não-suportada.
+Perfis de versões anteriores precisam ser recriados usando a versão atual.</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>Argumentos avançados adicionais que podem ser informados ao codificador de vídeo.</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>Nenhum - Serão fixadas no vídeo somente as legendas com formatos não suportados pelo contêiner.
+Trilha de Áudio Estrangeiro - A trilha de Áudio Estrangeiro será fixada, se disponível.
+Primeira Trilha - A primeira trilha será fixada.
+Preferir Áudio Estrangeiro, senão a Primeira - Fixa a trilha correspondente ao áudio estrangeiro, se existir, caso contrário a primeira trilha será fixada.</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>Compatibilidade de legenda WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>No HandBrake, o WebM suporta somente legendas fixadas.
+
+Você precisa alterar suas opções de legenda.
+
+Se continuar, suas legendas não-fixadas serão perdidas.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>Nenhuma origem ou títulos válidos foram encontrados.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>O HandBrake não poderá converter o arquivo selecionado, porque não encontrou uma origem com títulos válidos para converter.
+Isto pode acontecer pelas razões a seguir:
+- A duração dos títulos da origem está abaixo da opção de limite "Duração Mínima de Título" em 'Preferências &gt; Avançado'.
+- O arquivo de origem não é um arquivo de vídeo válido ou está em um formato não-suportado pelo HandBrake.
+- A origem pode estar protegida contra cópia ou contém DRM. Por favor, note que o HandBrake não suporta remoção de proteções contra cópia.
+
+O Log de Atividades pode conter mais informações.</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>Fila {0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>Iniciar Conversão</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>Iniciar Fila</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>Você não pode excluir o perfil padrão. Por favor, primeiro defina outro perfil como padrão.</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>Tem certeza que quer excluir o perfil: </value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Convertendo: Passagem {0} de {1}, {2:00.00}%, FPS: {3:000.0}, Méd FPS: {4:000.0}, Tempo Restante: {5}, Decorrido: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>O Perfil precisa ter um nome. Por favor, preencha o campo 'Nome do Perfil'.</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>Já existe um perfil com esse nome. Gostaria de substituir por este perfil?</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>Você precisa analisar um arquivo antes de usar a opção 'Máximo do Arquivo'.</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>Para usar a opção 'Personalizado', preencha os campos de Largura ou Altura Personalizada.</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>Não foi possível adicionar o perfil.</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>Erro Desconhecido</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>Padrões de Áudio</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>Trilhas de Áudio</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Comportamento de Seleção</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>Retornar para Trilhas</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>Não foi possível salvar o arquivo de Marcadores de Capítulo!</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>Os nomes dos marcadores de capítulo NÃO serão salvos no arquivo convertido.</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>A ação a seguir '{0}' será executada em {1} segundos.</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>Por favor, se o problema persistir, tente reiniciar o HandBrake.</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>Não há mais informações disponíveis sobre este erro.</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>Ocorreu um Erro Desconhecido.</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>Uma Nova Atualização está disponível! Por favor, verifique as Notas da Versão no site.</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>Seu sistema suporta a versão de 64-bits do HandBrake! Ela oferece melhor performance e estabilidade que a versão de 32-bits.
+Por favor, verifique as Notas de Versão no site.</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>Não há novas atualizações disponíveis.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>Atualização baixada</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>Serviço de atualização indisponível. Você pode tentar baixar a atualização em https://handbrake.fr</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>A Atualização falhou. Você pode tentar baixar a atualização em https://handbrake.fr</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>Tamanho do armazenamento: {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>Adicionar à Fila</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>Sem conversões pendentes</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>Não há tarefas de conversão em andamento</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>Fila</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>Tem certeza que você quer esvaziar a fila?</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>Confirmar</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} tarefas pendentes </value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>Fila Pausada</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>Tem certeza que quer excluir as tarefas selecionadas?</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>Esta conversão está em andamento. Se você deletar, ela será interrompida. Tem certeza que quer continuar?</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>Não há tarefas pendentes.</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>Tem certeza que quer editar esta tarefa? Ela será removida da fila e enviada de volta para a janela principal.</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>Fila Pronta</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>Fila Parada</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>Fila Concluída</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>Última Tarefa da Fila foi concluída.</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>Fila Iniciada</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>Convertendo: Passagem {0} de {1}, {2:00.00}%, FPS: {3:000.0}, Méd FPS: {4:000.0}, Tempo Restante: {5}, Decorrido: {6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>Há uma conversão em andamento. Sair do HandBrake irá interromper a codificação. Tem certeza que quer fechar o HandBrake?</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>Pré-visualização da Imagem</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>Não foi possível excluir o arquivo anterior de pré-visualização. Você ainda pode ter uma pré-visualização aberta no seu reprodutor de mídia. Se for o caso, feche-o.</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>Você deve primeiro analisar uma origem e configurar a codificação antes de pré-visualizar.</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>Não foi possível encontrar o arquivo de pré-visualização. O arquivo foi excluído ou a conversão falhou. Verifique os detalhes no Log de Atividades.</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>O HandBrake já está convertendo um vídeo! Pode ser convertido somente um arquivo de cada vez.</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>Padrões de Legendas</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>Trilhas de Legendas</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>Retornar para Trilhas</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Comportamento de Seleção</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>Arquivo Salvo:</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>Não foi possível carregar os perfis.</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>O HandBrake não conseguiu carregar o arquivo de perfis. Ele veio de uma versão anterior do HandBrake não-suportada ou pode estar corrompido.
+
+Seu arquivo de perfis antigo foi salvo em:</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> com {0} erros ou cancelamentos detectados.</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>Pouco Espaço em Disco</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>Aviso, você está executando com pouco espaço em disco. O HandBrake não concluirá a conversão se não houver espaço suficiente.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>A Linha {0} está inválida. Nada será importado.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>Não foi possível importar o arquivo de capítulo</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>Todas as linhas nos capítulos precisam ter, ao menos, 2 colunas de dados.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>A primeira coluna nos capítulos precisa conter somente um número inteiro maior que zero (0)</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>Arquivos de capítulo do tipo '{0}' não são suportados no momento.</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>Tipo não-suportado para arquivo de capítulo.</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>Informação de capítulo inválida para a mídia de origem.</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>O número de capítulos na mídia de origem e no arquivo de entrada não são iguais ({0} versus {1}).
+
+Você ainda quer importar os nomes dos capítulos?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>O número de capítulos na mídia de origem e no arquivo de entrada não são iguais ({0} versus {1}).
+
+Você ainda quer importar os nomes dos capítulos?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>Contagem de capítulos da origem e do arquivo de entrada não corresponde.</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>A duração informada dos capítulos na mídia de origem e dos
+capítulos no arquivo de entrada são muito diferentes.
+
+É provável que este arquivo de capítulo tenha sido produzido a partir de outra mídia de origem.
+
+Você tem certeza que quer importar os nomes dos capítulos?
+</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>Duração dos capítulos da origem e dos capítulos do arquivo de entrada não corresponde.</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>Um erro ocorreu ao interromper a análise. Por favor, reinicie o HandBrake.</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>O HandBrake não pode atualizar seu arquivo de perfis para o formato da nova versão.
+Seu arquivo de perfis será salvo e criado um novo arquivo. Será necessário recriar seus perfis personalizados.</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>Pode ser que as configurações alteradas precisem ser redefinidas na próxima inicialização do HandBrake.</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>Um problema ocorreu ao tentar salvar suas configurações.</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>AVISO, suas configurações foram redefinidas!</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>Seu arquivo de configurações do usuário estava corrompido ou inacessível. As configurações foram redefinidas para os padrões.</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>Não foi possível carregar o arquivo de configurações do usuário: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>Parece que seu arquivo de configurações do usuário está corrompido ou inacessível. Talvez seja necessário excluir o atual e permitir que o HandBrake crie um novo arquivo.</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>A pasta de saída que você escolheu não existe, ou você não tem permissão de gravar arquivos nela.</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>Criar Pasta?</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>Você tentou salvar em uma pasta que não existe. Você quer que o HandBrake crie a pasta a seguir?
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>Não foi possível abrir a pasta de destino.</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>Por favor, certifique-se de que a pasta de destino é válida.</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>Processando Passagem {0} de {1}, (Procurando Legenda) {2:00.00}%, Tempo de Procura Restante: {3}, Decorrido: {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>Sem Informações Adicionais</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, Passagem {2} de {3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, Passagem {2} de {3}
+Tempo Restante: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>Fila Pausada. Aviso: a unidade de destino da codificação está com pouco espaço em disco. Por favor, libere espaço suficiente e clique em Iniciar para continuar. Você também pode ajustar o espaço mínimo nas preferências.</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>Fila Pausada</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>Fila Pausada</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>Seu diretório de destino está com pouco espaço em disco.
+
+Você pode configurar o nível em que esse alerta aparece nas preferências.
+
+Você deseja continuar?</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>Não foi possível redefinir o status da tarefa, pois ela não está Concluída ou com Erro.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>Não foi possível restaurar o arquivo de fila.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>O arquivo pode estar corrompido ou veio de uma versão anterior incompatível do HandBrake. </value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>O HandBrake já está convertendo um arquivo.</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>Por favor, pare a conversão atual. Se o problema persistir, reinicie o HandBrake.</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>Prévia ({0}% do tamanho real)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>Para executar, o HandBrake requer uma versão de 64-bits do Windows 7 ou posterior.</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>Para executar, o HandBrake requer o Windows 7 ou posterior. As versões 0.9.9 (XP) e 0.10.5 (Vista) foram as últimas a suportar esses sistemas.</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>Você deseja continuar tentando e adicionar o restante?</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>O arquivo '{0}' já existe!
+Você gostaria de substituí-lo?</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>A área de transferência está indisponível no momento.</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>Isso pode ocorrer quando outro aplicativo está monitorando ou bloqueando a Área de Transferência para uso próprio. Não será possível usar a Área de Transferência até que seja desbloqueada.</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>Licença: </value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>Versão: </value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- Adicionar Nova Categoria --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>Adicionar Perfil</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>Categoria: </value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>Descrição: </value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>Nome: </value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>Dimensões: </value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>Seleção de Faixa de Origem</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>Permitir 'passthru' de: </value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>Configure como ocorre a seleção e configuração automática das trilhas de áudio, quando você seleciona um novo título ou arquivo de vídeo.</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>Modo de 'Passthru Automático':</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>Taxa de bits</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>Codec</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>Ganho</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>Ocultar</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Mixagem</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>Codificador em caso de falha:</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>Recarregar</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>Taxa de amostragem</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>Exibir</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>Nome da Trilha</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Comportamento de Seleção de Trilha:</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>Para Trilhas Adicionais:</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>Quando 'Passthru Automático' está selecionado como codec de áudio.</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>Marcadores de Capítulo</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>Nome do Capítulo</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>Número do Capítulo</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>Criar marcadores de capítulos</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>Duração</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>Exportar</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>Importar</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>Exportar Nomes</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>Importar Nomes</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>Redefinir Nomes de Capítulos</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>Cancelar Ação</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>Continuar</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>Quando Concluir a Ação</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>Detalhes do Erro:</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>Personalizado:</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>Redutor de blocos</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Decomb</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>Desentrelaçar:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>Perfil:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>Perfil de Desentrelaçamento</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>Denoise:</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>Perfil de Denoise</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>Ajuste do Denoise</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Detelecine:</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>Filtros</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>Horizontal</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>Escala de Cinza</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>Detecção de Entrelaçamento:</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>Perfil:</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>Rotação</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>Nitidez</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>Perfil de Nitidez</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>Ajuste de Nitidez</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>Ajuste:</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>Adicionar</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>Cancelar</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>Limpar</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>Fechar</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>Copiar para a Área de Transferência</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>Mover para Esquerda</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>Mover para Direita</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>Salvar</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>Copiar para a área de transferência</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>Log de Conversões</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>Abrir Pasta do Log</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>Log de Análises</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>Log de Atividades</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>Adicionar Tudo</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>Adicionar Atual</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>Adicionar Seleção</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>Adicionar à Fila</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>Avançado</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Iniciar Sincronia de A/V</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Ângulo:</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>Áudio</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>Trilhas de Áudio</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>Explorar</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>Capítulos</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>Contêiner</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Destino</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Duração:</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>Salvar Como:</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>Filtros</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>Formato:</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>Ajuda</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>Suporte ao iPod 5G</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>Metadados</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(Modificado)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>Muxando: Isso pode demorar um pouco...</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>Opções</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>Configurações de Saída</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>Pausar</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>Dimensões</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>Renomear Perfil</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Menu de Contexto das Opções de Perfil</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>Excluir Perfil</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Perfis</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>Pré-visualização</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>Convertendo: {0}, {1:00.00}%, Tempo Restante: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Intervalo:</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>Recarregar</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>Remover</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>Redefinir Perfis Embutidos</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>Salvar Novo Perfil</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>Procurando o tempo inicial</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>Definir Padrão</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>Pré-visualizar</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>Fila</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>Origem:</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>Abrir Arquivo de Origem</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>Iniciar Conversão</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>Iniciar Fila</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>Parar</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>Parar Conversão</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>Tem certeza que quer parar a conversão?</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>Selecione um arquivo para converter antes de importar um arquivo de legenda.</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>Legendas</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>Trilhas de Legendas</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>Resumo</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Título: </value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>Atualizar Perfil Selecionado</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>Vídeo</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>Otimizado para a Web</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>Gerenciar Pré-configuracões</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>Metadados</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>Permitir uso de codificadores Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>Permitir uso de codificadores Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>Permitir uso de codificadores AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>O formato de arquivo inserido continha caracteres inválidos. Eles foram removidos.</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>Reproduzir som quando cada conversão for concluída</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>Reproduzir som quando a fila for concluída</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>Exibir pré-visualizações na guia Resumo.</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>Exibir o status da conversão na barra de título da janela.</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Limpar arquivos de log com mais de 7 dias</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>Sobre o HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>Avançado</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>Opções Avançadas</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>Argumentos:</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>Auto-Renomear Arquivos</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>Auto-renomear arquivos de saída</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>Verificar Atualizações</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>Sempre remover da fila itens completos após uma conversão ser concluída</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>Limpar Histórico de Logs</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>Salvar cópia do Log de cada conversão na pasta definida:</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>Salvar cópia do Log de cada conversão na mesma pasta do arquivo convertido</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>Versão Atual</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>Decodificação</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>Caminho Padrão:</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>Baixar Atualização</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>Leitura de DVD</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>Desabilitar LibDVDNav. (será usado libdvdread)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>Codificação</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>Formato de Arquivo:</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>Geral</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>Registro de Log</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>Nível de Detalhes do Log:</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>Caminho do Log:</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>Pausar a fila se houve pouco espaço em disco</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>Minimizar para a bandeja do sistema (Requer Reinicialização)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>Duração mínima de títulos de DVD e Blu-ray, em segundos. Títulos mais curtos serão ignorados: </value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>Extensão de Arquivo MP4:</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>Na Inicialização</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>Arquivos de Saída</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>Caminho:</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Caminho para o reprodutor de mídia</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>Evitar que o sistema entre em modo de espera durante a conversão</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>Total de prévias de imagem a analisar:</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>Nível de Prioridade:</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>Preferir o Intel QuickSync para decodificar vídeo, quando disponível.</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>Usar Decodificação QSV, mesmo quando não usar um codificador QuickSync (ou seja, x265)</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>Remover pontuação comum</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>Trocar underline (_) por espaço em branco</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>Redefinir para 'Não fazer nada' quando o aplicativo for reaberto.</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>Escolher Scaler:</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>Redimensionar</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>Enviar arquivo para:</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>Mudar minúsculas para Iniciais Maiúsculas</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>Atualizações</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>Interface de Usuário</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>Versão:</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>Vídeo</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>Este caminho é usado apenas para o recurso de pré-visualização do vídeo.
+O VLC e o MPC-HC também são compatíveis. Outros reprodutores de mídia também podem funcionar mas não foram testados.</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>Abrir Pasta de Log</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>Quando Concluir</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>Configurações x264/5</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>Granularidade fracionária de qualidade constante:</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamórfico:</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>Automático</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>Inferior</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>Cortando:</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Tamanho da tela:</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Altura:</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Automático</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>Esquerda</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>Dimensões finais:</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Aspecto do pixel:</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>Direita</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>Tamanho</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>Superior</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Tamanho da escala:</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>Exportar para arquivo</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>Importar do arquivo</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>Oficiais</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>Escolher títulos:</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>Adicionar à Fila</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>Os títulos selecionados serão adicionados usando o perfil "{0}".</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>Opções de Vídeo:</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>Áudio</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>Limpar Tudo</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>Limpeza Concluída</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>Limpar Fila</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>Remover Selecionados</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>Excluir</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>Destino:</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>Não fazer nada</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>Tempo de Conversão:</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>Editar</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>Hora de Conclusão:</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>Exportar Fila</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>Tamanho do arquivo:</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>Hibernar</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>Bloquear o Sistema</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>O Log estará disponível após a conversão terminar.</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>Fazer Logoff</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>Abrir Pasta de Destino</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>Abrir Pasta da Origem</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>Opções</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>Pausar</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>Duração da Pausa:</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>Configurações de Imagem:</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>Sair do HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>Recomeçar Todas as Tarefas</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>Falha ao Recomeçar</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>Recomeçar Tarefas Selecionadas</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>Recomeçar</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>Desligar</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>Origem:</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>Iniciar Fila</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>Hora de Início:</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>Estatísticas</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>Estatísticas estarão disponíveis quando uma conversão terminar.</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>Legendas:</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>Resumo</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>Modo de espera</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>Vídeo:</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>Quando Terminar:</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>Adicionar Todos os Idiomas Restantes Selecionados</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>Adicionar Todas as Trilhas Restantes</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>Adicionar Nova Trilha</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>Trilhas</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>Idiomas Disponíveis:</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>Escolher Idiomas:</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Idiomas Selecionados:</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>Configurar Comportamentos Padrões</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>Recarregar</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>Escolha um Disco para Analisar</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>Escolha um Arquivo para Analisar</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>Escolha uma Pasta para Analisar</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>Se preferir, escolha um título específico:</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>Em seguida, selecione o(s) vídeo(s) que você quer converter:</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>Arquivo</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>Pasta (Análise em Lote)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>Abrir esta Unidade de DVD ou Bluray</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>Abrir pasta com um ou mais arquivos.</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>Restaurar Arquivos de Fila</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>Um arquivo de fila anterior está disponível.</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>Abrir um arquivo de vídeo.</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>Seleção de Origem</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>Duração:</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>Visualização ao Vivo</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>Selecione uma imagem de pré-visualização</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>Prefira o reprodutor de vídeo padrão do sistema</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>Adicionar Closed Captions quando disponível</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>Adicionar 'Análise de Áudio Estrangeiro'</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>Ação Padrão das Legendas Fixadas:</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>Importar Legendas</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Comportamento de Seleção de Trilha: </value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>Adicionar Todas as Legendas Ocultas Restantes</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>Configure como as trilhas de legenda são selecionadas e configuradas automaticamente quando você seleciona um novo título ou vídeo de origem.</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>Faixas de Áudio Adicionais</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>Legendas Adicionais</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>Gravado</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>Marcadores de Capítulo</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>Deblock</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Detelecine</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>exibição</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>Escala de Cinza</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>Sem Faixas de Áudio</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>Sem Marcador de Capítulo</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>Sem Filtros</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>Sem Fonte</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>Sem Faixas de Legenda</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>Sem Faixas</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>Pré-visualização {0} de{1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>Rotação</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>armazenamento</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>Codificação de 2 passos</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>Taxa de Bits Média (kbps):</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>Codificador de vídeo:</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>Taxa de Quadros Constante</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>Qualidade Constante:</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>Nível do Conversor:</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>Predefinição do Conversor:</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>Perfil do Conversor:</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>Ajuste do Conversor:</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>Opções Avançadas:</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>Conversão Rápida</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>Taxa de Quadros (FPS):</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>Opções do codificador</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>Taxa de Quaros de Pico</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>Qualidade:</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Primeiro passe turbo</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>Taxa de Quadros Variável:</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>Vídeo:</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>Idioma:</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>Usar Idioma do Sistema</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>Sobre o HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>Ou solte um arquivo ou pasta aqui...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>Ajuda</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>Preferências</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>Adicionar trilha</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>Configurações do conversor de áudio para cada faixa escolhida:</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>Limpar</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Gravar</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>Padrão</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>Somente forçado</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>Sobre...</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>Registro de atividade</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>Verificar atualizações</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>Sair</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>Exportar para arquivo</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>Arquivo</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>Documentação do HandBrake (HTTPS)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>Ajuda</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>Importar do arquivo</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>Preferências</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>Predefinições</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>Fila</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>Redefinir configurações de fábrica</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>Definir configuração atual como padrão</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>Exibir Painel de Predefinições</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>Exibir Fila</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>Ferramentas</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>Pesquisando atualizações...</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>Tem certeza de que deseja limpar o diretório com o arquivo de registro?</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>Limpar registros</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>Baixando...</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>O diretório com o arquivo de registro do HandBrake foi limpo!</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>Aviso</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>Preparando para atualizar...</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>Por favor, selecione uma pasta.</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>Clique em "Procurar" para definir o local padrão</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>Ocultar</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>Exibir</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>"Adicionar tudo" a Fila</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>"Adicionar seleção" a Fila</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>Reproduzir arquivo</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>Barra de Ferramentas</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>Exibir "Adicionar tudo a Fila" na barra de ferramentas</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>Exibir "Adicionar seleção a Fila" na barra de ferramentas</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>O suporte à conversão por hardware no momento está desativado. Caso não tenha iniciado o HandBrake com a opção "--no-hardware", verifique se os drivers estão atualizados para todos os adaptadores gráficos neste sistema.
+
+Isso não afetará qualquer um dos codificadores via software.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Por favor, corrija as configurações das legendas antes de continuar.</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>Aplicar</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>Retomar Conversão</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>Ações</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>Importar Fila</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Convertendo: Passagem {0} de {1}, {2:00.00}%, FPS: {3:000.0}, Méd FPS: {4:000.0}
+Tempo Restante: {5}, Decorrido: {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>Apagar Selecionados</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>Modo Portátil: Não foi possível criar o diretório TMP. Verifique se o caminho está correto e é gravável.
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>Modo Portátil: Não foi possível criar o diretório TMP. Verifique se o caminho está correto e é gravável.
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>Modo Portátil: Não foi possível ler 'portable.ini'. Pode existir um erro no arquivo. Por favor, tente novamente 'portable.ini.template' como modelo.</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>O mecanismo do HandBrake falhou ao inicializar. Isso geralmente é causado por drivers de GPU desatualizados.\n Por favor, atualize os drivers de GPU para quaisquer gráficos integrados e discretos que seu sistema possua.</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Opções de Atualização Ao Vivo: {source} {title} {chapters} 
+Opções Não Ativas: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (Elas só mudam se você procurar uma nova fonte, alterar o título ou capítulos)</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>Opções Disponíveis: {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>Pedir para substituir o arquivo</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>Tentar renomear o arquivo automaticamente</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>Sobrescrever o arquivo</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>Comportamento da Interface do Usuário</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>Comportamento de substituição de arquivo:</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>Conversão Concluída</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>Notificações</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>Fila Concluída</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>Quando Terminar:</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>Comportamento de conflito de nome de arquivo:</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>Postfix</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>Prefixo</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>Anexar Número</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>FiltersView_DeblockPreset</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>Ajuste Deblock</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>A escolha do codificador será disponibilizada na guia 'Vídeo'.</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>O HandBrake detectou vários arquivos de fila inacabados. Eles são de várias instâncias do HandBrake em execução. Deseja recuperar todos os trabalhos inacabados?</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>O HandBrake detectou itens inacabados na fila desde a última vez em que o aplicativo foi iniciado. Deseja recuperá-los?</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>Possível Recuperação de Fila</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>Seu arquivo de predefinições continha predefinições internas. A função de importação não suporta a importação deles. Por favor, use o 'Menu Predefinições -&gt; Redefinir predefinições incorporadas' para restaurar as predefinições padrão.
+
+Onde suportado, quaisquer predefinições de usuário serão importadas.</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>Execute a ação imediatamente. (Isso desativará o diálogo de confirmação de 60 segundos)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>Explorar</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>Nenhum arquivo de áudio foi definido. Clique em 'Procurar' para selecionar um arquivo wav ou mp3 para reprodução.</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>Play</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>Fila de Exportação (somente CLI)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>Use o Tema Escuro. (Requer Reinício, apenas Windows 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>Não Disponível</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>GB</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>Energia da rede elétrica detectada. Continuando a conversão... ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>Bateria do Sistema Crítica! ({0} %)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>Bateria do Sistema Baixa! ({0} %). Sua conversão foi pausada.</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>O armazenamento restante da unidade chegou abaixo de {0} GB na unidade de destino. Pausando conversão...</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Configurar Seleções Automáticas de Áudio</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Configurar Seleções Automáticas de Legenda</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>Sistema</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Atores:</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Comentários:</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>Descrição: </value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Diretor:</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>Gênero:</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Enredo:</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>Data de Lançamento:</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>Título:</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>Visualizar Registro</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>Aspecto:</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>Filtros:</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>Tamanho:</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>Faixas:</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>Geral</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>Clique em 'Verificar Atualizações' para verificar novas versões</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; Voltar</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>Pausado Atualmente</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>Arquivos de Saída</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>Capítulos</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>Quadros</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>Pré-visualizar</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>Segundos</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Todos os Idiomas Selecionados Correspondentes</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>Primeiro Idioma Selecionado Correspondente</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>Nenhum</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Primeira Faixa</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>Áudio Estrangeiro Preferido, senão Primeiro</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>Faixa de Áudio Estrangeira</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>Nenhum</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>Áudio Estrageiro</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>Procurar Áudio Estrangeiro</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Todos os Idiomas Selecionados Correspondentes</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>Use Todas as Faixas Como Modelos</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>Primeiro Idioma Selecionado Correspondente</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Use a Primeira Faixa como modelo</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>Sem Áudio</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>Capítulo {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>Automático</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>Sempre use M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>Sempre use MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>Nenhum</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>Sempre use a Resolução de Origem</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>Acima do Normal</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>Abaixo do Normal</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>Alto</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>Baixo</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>Normal</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>Mensalmente</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>Semanalmente</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Sempre use o caminho padrão para cada novo nome gerado.</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>O intervalo de portas deve estar entre 5000 e 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>Espaços Reservados de Substituição: {source} {destination}</value>
+ <comment>Note: {source} and {destination} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>Uma nova versão do HandBrake está disponível!</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>Direitos Autorais (C) 2003-2022 A Equipe HandBrake</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Baixo nível de bateria:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Pause todos os trabalhos em execução quando a bateria estiver fraca.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Adicionar Todas as Legendas Ocultas Restantes</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Trabalhos duplicados foram detectados no arquivo de fila que você está entanto importar. Deseja sobrescrever os registros existentes?
+Isso também interromperá os trabalhos em execução existentes.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Duplicados Detectados</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Ative o hardware QuickSync de baixo consumo (quando for suportado).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Selecione um único trabalho para visualizar as informações resumidas.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Execute cada trabalho na fila de espera num processo separado.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Porta de rede padrão para o trabalhador:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>A predefinição que você selecionou não está disponível para uso neste sistema.
+Isso geralmente é uma indicação de que seu sistema não suporta o hardware necessário para utilizá-lo.
+
+Por favor, escolha uma predefinição diferente.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Isolamento do Processo</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Observe que o uso desse recurso iniciará um servidor HTTP 127.0.0.1 na porta indicada.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>Se a porta definida estiver em uso, ela encontrará a primeira porta livre dentre de +100 à partir da porta definida.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Quantidade máxima de conversões simultâneas:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Cancelar</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Perfil:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Igual a fonte</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Redefinir as Configurações</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Tem certeza de que deseja redefinir o HandBrake para as configurações originais?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Customizado (Não Limitado)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Preencha (Ao redor)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Altura (Barra preta)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Nenhum</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Largura (Barra preta)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Preencha:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Cor:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Bordas:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Resolução e dimensionamento:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientação e Corte:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Apenas Windows 10! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filtros:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Padrão</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forçado</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Tamanho máximo:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Limite de Resolução:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Nenhum</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Gerenciar Pré-configuracões</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Apagar Pré-configurações Padrão</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Exportar pré-configuração selecionada</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Importar pré-configuração(ões) de arquivo</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Informação de pré-configuração:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>As predefinições embutidas não podem ser modificadas.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Definir pré-configuração selecionada como padrão</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Excluir Perfil</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Não compatível neste sistema)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Parar</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>O nome da categoria que você inseriu já existe. Escolha um nome diferente.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>O nome da categoria estava vazia. Insira um nome.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Insira um nome:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>Nenhuma predefinição foi selecionada.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Exporte todas as predefinições do usuário</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>O nível onde os alertas de pouco espaço em disco serão mostrados:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Aviso: Este é o teto máximo de trabalhos simultâneos. As limitações de hardware tem o efeito de reduzir a quantidade real dos trabalhos simultâneos durante a codificação.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Não está Disponível)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>É o padrão:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>Não</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Sim</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Ajuste findo das configurações da imagem</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Mostre os controles de ajuste do corte</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Use escuro</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Use claro</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Sistema combinado</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Tema:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(É preciso reiniciar)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Suavização do chroma</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Espaço de cores:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Espaço de cores</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Abra a pré-visualização</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Pré-visualização da origem</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Condição do trabalho:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Cancelado</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Concluído</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Configurações inválidas. Verifique o log para obter mais detalhes.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Entrada inválida. Verifique o log para obter mais detalhes.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Condição geral desconhecida. Verifique o log para obter mais detalhes.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Erros foram detectados durante a tentativa da leitura da origem.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Falha desconhecida. Verifique o log para obter mais detalhes.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>O trabalhador parou. Verifique o log para obter mais detalhes.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>Falta o arquivo "hb.dll". Reinstale.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Atenção: Observe que esta é uma compilação "Safe Mode" (Modo Seguro) do HandBrake que não inclui suporte para codificação via hardware. Caso queira usar o suporte aos codificadores via hardware, faça o download do site da compilação não "Safe Mode".</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>Esteja ciente de que o HandBrake não é mais compatível em qualquer versão do Windows 7 ou do Windows 8.
+
+Embora você possa continuar usando o aplicativo por sua própria conta e risco, esteja ciente de que certas características não funcionam mais e que pode haver outros problemas desconhecidos. Não há suporte disponível quando estes problemas ocorrem.
+
+O suporte para Windows 7 e 8 foi descontinuado na versão 1.3. Isto significa que não haverá mais atualizações para corrigir os problemas nestas plataformas.
+
+Este aviso será exibido apenas duas vezes.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Preto</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Personalizado</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Branco</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Valor do RGB:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(preenchido)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Inverter:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Dimensões da origem:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Tamanho do armazenamento: {0}x{1} Tamanho da tela: {2}x{3} Proporção do aspecto: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Um erro foi detectado no diálogo do navegador de arquivos. 
+
+- Observe que caminhos de arquivo longos não são totalmente compatíveis. Mantenha os caminhos do arquivo com menos de 255 caracteres.
+- O último diretório usado para esta janela foi reinicializada para evitar erros na próxima vez que você tentar escanear um arquivo.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Altura Máxima:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Largura Máxima:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Proporção de aspecto: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Cópia direta dos metadados comuns</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>O caminho padrão nomeado automaticamente não estava válido. {0} não deve ser antes de {1}</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Perfil:</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.resx Changed

@@ -112,10 +112,10 @@
 <value>2.0</value>
 </resheader>
 <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <data name="Video_EncoderExtraArgs" xml:space="preserve">
 <value>The full list of encoder parameters: 
@@ -185,11 +185,6 @@
 <data name="Error" xml:space="preserve">
 <value>Error</value>
 </data>
- <data name="Main_AutoAdd_AudioAndSubWarning" xml:space="preserve">
- <value>Warning: If you wish to have subtitles added to each item you are about to queue, please verify that you have the subtitle defaults setup correctly on the subtitles tab.
- 
-Do you wish to continue?</value>
- </data>
 <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
 <value>You must turn on automatic file naming AND set a default path in preferences before you can add to the queue.</value>
 </data>
@@ -209,7 +204,7 @@
 <value>There are jobs on the queue with the same destination path. Please choose a different path for this job.</value>
 </data>
 <data name="Main_JobsPending_addon" xml:space="preserve">
- <value> Pending Jobs {0}</value>
+ <value>Pending Jobs {0}</value>
 </data>
 <data name="Main_NewDefaultPreset" xml:space="preserve">
 <value>New Default Preset Set: {0}</value>
@@ -238,7 +233,7 @@
 <data name="Main_Presets" xml:space="preserve">
 <value>Presets</value>
 </data>
- <data name="Main_PresetUpdateConfrimation" xml:space="preserve">
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
 <value>Are you sure you wish to update the selected preset?</value>
 </data>
 <data name="Main_PresetUpdated" xml:space="preserve">
@@ -261,7 +256,7 @@
 <data name="Main_ScanFailed_NoReason" xml:space="preserve">
 <value>Scan failed: </value>
 </data>
- <data name="Main_ScanFailled_CheckLog" xml:space="preserve">
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
 <value>Scan Failed... Please See Activity Log for details.</value>
 </data>
 <data name="Main_ScanningPleaseWait" xml:space="preserve">
@@ -330,12 +325,6 @@
 <data name="PictureSettings_OutputResolution" xml:space="preserve">
 <value>Output: {0}</value>
 </data>
- <data name="Options_AdditionalFormatOptions" xml:space="preserve">
- <value>The format of the output file. In addition to any supported file system character, you can use the following placeholders that will be replaced when you change title or scan a source.
-
-Live Update Options: {source} {title} {chapters} 
-Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>
- </data>
 <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
 <value>Available additional Options: {source_path} or {source_folder_name} or {source}</value>
 </data>
@@ -378,8 +367,8 @@
 <value>No valid source or titles found.</value>
 </data>
 <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
- <value>HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode. 
-This could be due to one of the following reasons:
+ <value>HandBrake will not be able to encode the selected source as it did not find a valid source with titles to encode. This could be due to one of the following reasons:
+
 - The duration of each source title is below the "Minimum Title Duration" threshold option in 'Preferences &gt; Advanced'. 
 - The source file is not a valid video file or is in a format that HandBrake does not support.
 - The source may be copy protected or include DRM. Please note that HandBrake does not support the removal of copy protections.
@@ -429,7 +418,7 @@
 <value>Audio Tracks</value>
 </data>
 <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
- <value>Selection Behavior</value>
+ <value>Selection Behavior ...</value>
 </data>
 <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
 <value>Switch Back To Tracks</value>
@@ -444,7 +433,7 @@
 <value>The following action '{0}' will occur in {1} seconds.</value>
 </data>
 <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
- <value>If the problem presists, please try restarting HandBrake.</value>
+ <value>If the problem persists, please try restarting HandBrake.</value>
 </data>
 <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
 <value>There is no further information available about this error.</value>
@@ -472,7 +461,7 @@
 <value>Update Failed. You can try downloading the update from https://handbrake.fr</value>
 </data>
 <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
- <value>Display Size: {0}x{1}, PAR {2}x{3}</value>
+ <value>Storage Size: {0}x{1}</value>
 </data>
 <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
 <value>Add to Queue</value>
@@ -486,7 +475,7 @@
 <data name="QueueViewModel_Queue" xml:space="preserve">
 <value>Queue</value>
 </data>
- <data name="QueueViewModel_ClearQueueConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
 <value>Are you sure you wish to clear the queue?</value>
 </data>
 <data name="Confirm" xml:space="preserve">
@@ -498,9 +487,6 @@
 <data name="QueueViewModel_QueuePending" xml:space="preserve">
 <value>Queue Paused</value>
 </data>
- <data name="QueueViewModel_QueuePauseNotice" xml:space="preserve">
- <value>The Queue has been paused. The currently running job will run to completion and no further jobs will start.</value>
- </data>
 <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
 <value>Are you sure you want to delete the selected jobs?</value>
 </data>
@@ -510,7 +496,7 @@
 <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
 <value>There are no pending jobs.</value>
 </data>
- <data name="QueueViewModel_EditConfrimation" xml:space="preserve">
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
 <value>Are you sure you wish to edit this job? It will be removed from the queue and sent to the main window.</value>
 </data>
 <data name="QueueViewModel_QueueReady" xml:space="preserve">
@@ -539,15 +525,11 @@
 <value>Picture Preview</value>
 </data>
 <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
- <value>Unable to delete previous preview file. You may need to restart the application.</value>
+ <value>Unable to delete previous preview file. You may still have a preview open in your media player. Please close this.</value>
 </data>
 <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
 <value>You must first scan a source and setup your encode before creating a preview.</value>
 </data>
- <data name="StaticPreviewViewModel_UnableToFindVLC" xml:space="preserve">
- <value>Unable to detect VLC Player. 
-Please make sure VLC is installed and the directory specified in HandBrake's options is correct. (See: "Tools Menu &gt; Preferences &gt; General")</value>
- </data>
 <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
 <value>Unable to find the preview file. Either the file was deleted or the encode failed. Check the activity log for details.</value>
 </data>
@@ -564,7 +546,7 @@
 <value>Switch Back To Tracks</value>
 </data>
 <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
- <value>Selection Behavior</value>
+ <value>Selection Behavior ...</value>
 </data>
 <data name="PresetService_ArchiveFile" xml:space="preserve">
 <value>Archived File:</value>
@@ -643,7 +625,7 @@
 <data name="SettingService_SaveErrorReset" xml:space="preserve">
 <value>Any settings you changed may need to be reset the next time HandBrake launches.</value>
 </data>
- <data name="UserSettings_AnErrorOccured" xml:space="preserve">
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
 <value>A problem occurred when trying to save your preferences.</value>
 </data>
 <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
@@ -697,7 +679,11 @@
 <value>Queue Paused</value>
 </data>
 <data name="Main_LowDiskspace" xml:space="preserve">
- <value>Your destination directory is low on diskspace. Please free up some disk space on your destination drive. Alternatively you can change the level at which this alert triggers in Options. </value>
+ <value>Your destination directory is low on diskspace. 
+
+You can configure the level at which this alert appears in preferences. 
+
+Do you wish to continue? </value>
 </data>
 <data name="Queue_UnableToResetJob" xml:space="preserve">
 <value>Unable to reset job status as it is not in an Error or Completed state</value>
@@ -714,19 +700,14 @@
 <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
 <value>Please stop the current encode. If the problem persists, please restart HandBrake.</value>
 </data>
- <data name="MiniViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
- <value>Encoding: Pass {0} of {1}, {2:00.00}%
-FPS: {3:000.0}, Avg FPS: {4:000.0}
-Time Remaining: {5}, Elapsed: {6:d\:hh\:mm\:ss}</value>
- </data>
 <data name="StaticPreviewView_Title" xml:space="preserve">
 <value>Preview ({0}% actual size)</value>
 </data>
 <data name="OsBitnessWarning" xml:space="preserve">
- <value>HandBrake requires a 64bit version of Windows 7 or later to run.</value>
+ <value>HandBrake requires a 64bit version of Windows 10 or later to run.</value>
 </data>
 <data name="OsVersionWarning" xml:space="preserve">
- <value>HandBrake requires Windows 7 or later to run. Version 0.9.9 (XP) and 0.10.5 (Vista) was the last version to support these versions.</value>
+ <value>HandBrake requires Windows 10 or later to run. Version 0.9.9 (XP), 0.10.5 (Vista), 1.3.3 (7 and 8.x) were the last versions to support these older operating systems.</value>
 </data>
 <data name="Main_ContinueAddingToQueue" xml:space="preserve">
 <value>Do you wish to proceed trying to add the rest?</value>
@@ -865,7 +846,7 @@
 <value>Custom:</value>
 </data>
 <data name="FiltersView_Deblock" xml:space="preserve">
- <value>Deblock</value>
+ <value>Deblock:</value>
 </data>
 <data name="FiltersView_Decomb" xml:space="preserve">
 <value>Decomb</value>
@@ -895,7 +876,7 @@
 <value>Filters</value>
 </data>
 <data name="FiltersView_FlipVideo" xml:space="preserve">
- <value>Flip</value>
+ <value>Horizontal</value>
 </data>
 <data name="FiltersView_Grayscale" xml:space="preserve">
 <value>Grayscale</value>
@@ -907,10 +888,10 @@
 <value>Preset:</value>
 </data>
 <data name="FiltersView_Rotate" xml:space="preserve">
- <value>Rotate:</value>
+ <value>Rotation:</value>
 </data>
 <data name="FiltersView_Sharpen" xml:space="preserve">
- <value>Sharpen</value>
+ <value>Sharpen:</value>
 </data>
 <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
 <value>Sharpen Preset</value>
@@ -1039,7 +1020,7 @@
 <value>Dimensions</value>
 </data>
 <data name="MainView_PresetManage" xml:space="preserve">
- <value>Rename Preset</value>
+ <value>Edit Preset</value>
 </data>
 <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
 <value>Preset Options Context Menu</value>
@@ -1074,9 +1055,6 @@
 <data name="MainView_Searching" xml:space="preserve">
 <value>Searching for start time</value>
 </data>
- <data name="MainView_SelectedPreset" xml:space="preserve">
- <value>Selected Preset:</value>
- </data>
 <data name="MainView_SetDefault" xml:space="preserve">
 <value>Set Default</value>
 </data>
@@ -1126,7 +1104,7 @@
 <value>Title: </value>
 </data>
 <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
- <value>Update Selected Preset</value>
+ <value>Update Current Preset</value>
 </data>
 <data name="MainView_VideoTab" xml:space="preserve">
 <value>Video</value>
@@ -1135,7 +1113,7 @@
 <value>Web Optimized</value>
 </data>
 <data name="ManagePresetView_ManagePreset" xml:space="preserve">
- <value>Manage Preset</value>
+ <value>Manage Presets</value>
 </data>
 <data name="MetaDataView_Title" xml:space="preserve">
 <value>Metadata</value>
@@ -1164,8 +1142,8 @@
 <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
 <value>Show the encode status in the application title bar.</value>
 </data>
- <data name="Options_30DayLogClear" xml:space="preserve">
- <value>Clear Log files older than 30 days</value>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Clear Log files older than 7 days</value>
 </data>
 <data name="Options_About" xml:space="preserve">
 <value>About HandBrake</value>
@@ -1237,7 +1215,7 @@
 <value>Log Path:</value>
 </data>
 <data name="Options_LowDiskspaceSize" xml:space="preserve">
- <value>Pause queue if disk space is lower than:</value>
+ <value>Pause queue if disk space is low</value>
 </data>
 <data name="Options_MinimiseTray" xml:space="preserve">
 <value>Minimize to system tray (Requires Restart)</value>
@@ -1257,8 +1235,8 @@
 <data name="Options_Path" xml:space="preserve">
 <value>Path: </value>
 </data>
- <data name="Options_PathToVLC" xml:space="preserve">
- <value>Path to VLC Player</value>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Path to Media Player</value>
 </data>
 <data name="Options_PreventSleep" xml:space="preserve">
 <value>Prevent the system from sleeping while encoding</value>
@@ -1293,9 +1271,6 @@
 <data name="Options_SendFileTo" xml:space="preserve">
 <value>Send file to:</value>
 </data>
- <data name="Options_ShowExperimentalQueueDesign" xml:space="preserve">
- <value>Show the new experimental queue design.</value>
- </data>
 <data name="Options_TitleCase" xml:space="preserve">
 <value>Change case to Title Case</value>
 </data>
@@ -1312,7 +1287,8 @@
 <value>Video</value>
 </data>
 <data name="Options_VideoPreviewPath" xml:space="preserve">
- <value>This path is used for the video preview feature only.</value>
+ <value>This path is used for the video preview feature only.
+VLC and MPC-HC are supported. Other players may also work but are not validated.</value>
 </data>
 <data name="Options_ViewLogDirectory" xml:space="preserve">
 <value>View Log Directory</value>
@@ -1336,31 +1312,28 @@
 <value>Bottom</value>
 </data>
 <data name="PictureSettingsView_Cropping" xml:space="preserve">
- <value>Cropping</value>
+ <value>Cropping:</value>
 </data>
 <data name="PictureSettingsView_Custom" xml:space="preserve">
 <value>Custom</value>
 </data>
- <data name="PictureSettingsView_DisplayWitdh" xml:space="preserve">
- <value>Display Width:</value>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Display Size:</value>
 </data>
 <data name="PictureSettingsView_Height" xml:space="preserve">
 <value>Height:</value>
 </data>
 <data name="PictureSettingsView_KeepAR" xml:space="preserve">
- <value>Keep Aspect Ratio</value>
+ <value>Automatic</value>
 </data>
 <data name="PictureSettingsView_Left" xml:space="preserve">
 <value>Left</value>
 </data>
- <data name="PictureSettingsView_Modulus" xml:space="preserve">
- <value>Modulus:</value>
- </data>
 <data name="PictureSettingsView_Output" xml:space="preserve">
- <value>Output</value>
+ <value>Final Dimensions:</value>
 </data>
 <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>PAR:</value>
+ <value>Pixel Aspect:</value>
 </data>
 <data name="PictureSettingsView_Right" xml:space="preserve">
 <value>Right</value>
@@ -1368,14 +1341,11 @@
 <data name="PictureSettingsView_Size" xml:space="preserve">
 <value>Size</value>
 </data>
- <data name="PictureSettingsView_Source" xml:space="preserve">
- <value>Source:</value>
- </data>
 <data name="PictureSettingsView_Top" xml:space="preserve">
 <value>Top</value>
 </data>
 <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>Width:</value>
+ <value>Scaled Size:</value>
 </data>
 <data name="Preset_Custom" xml:space="preserve">
 <value>Custom</value>
@@ -1399,7 +1369,7 @@
 <value>The selected titles will be added using the "{0}" preset.</value>
 </data>
 <data name="QueueView_Advanced" xml:space="preserve">
- <value>Advanced:</value>
+ <value>Video Options:</value>
 </data>
 <data name="QueueView_Audio" xml:space="preserve">
 <value>Audio:</value>
@@ -1426,7 +1396,7 @@
 <value>Do nothing</value>
 </data>
 <data name="QueueView_Duration" xml:space="preserve">
- <value>Encode Time:</value>
+ <value>Encode Duration:</value>
 </data>
 <data name="QueueView_Edit" xml:space="preserve">
 <value>Edit</value>
@@ -1438,7 +1408,7 @@
 <value>Export Queue</value>
 </data>
 <data name="QueueView_FileSize" xml:space="preserve">
- <value>Filesize: </value>
+ <value>Output Filesize: </value>
 </data>
 <data name="WhenDone_Hibernate" xml:space="preserve">
 <value>Hibernate</value>
@@ -1462,7 +1432,7 @@
 <value>Options</value>
 </data>
 <data name="QueueView_Pause" xml:space="preserve">
- <value>Pause Queue</value>
+ <value>Pause</value>
 </data>
 <data name="QueueView_PausedDuration" xml:space="preserve">
 <value>Paused Duration:</value>
@@ -1528,7 +1498,7 @@
 <value>Add New Track</value>
 </data>
 <data name="Shared_AddTrack" xml:space="preserve">
- <value>Add Track</value>
+ <value>Tracks</value>
 </data>
 <data name="Shared_AvailableLanguages" xml:space="preserve">
 <value>Available Languages:</value>
@@ -1536,7 +1506,7 @@
 <data name="Shared_ChooseLanguages" xml:space="preserve">
 <value>Choose Languages:</value>
 </data>
- <data name="Shared_ChosenLangages" xml:space="preserve">
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
 <value>Selected Languages:</value>
 </data>
 <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
@@ -1594,7 +1564,7 @@
 <value>Select a preview image</value>
 </data>
 <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
- <value>Use system default video player</value>
+ <value>Prefer system default video player</value>
 </data>
 <data name="SubtitlesView_AddCC" xml:space="preserve">
 <value>Add Closed Captions when available</value>
@@ -1675,7 +1645,7 @@
 <value>Avg Bitrate (kbps):</value>
 </data>
 <data name="VideoView_Codec" xml:space="preserve">
- <value>Video Codec:</value>
+ <value>Video Encoder:</value>
 </data>
 <data name="VideoView_ConstantFramerate" xml:space="preserve">
 <value>Constant Framerate</value>
@@ -1705,13 +1675,13 @@
 <value>Framerate (FPS):</value>
 </data>
 <data name="VideoView_OptimiseVideo" xml:space="preserve">
- <value>Optimise Video:</value>
+ <value>Encoder Options: </value>
 </data>
 <data name="VideoView_PeakFramerate" xml:space="preserve">
 <value>Peak Framerate</value>
 </data>
 <data name="VideoView_Quality" xml:space="preserve">
- <value>Quality</value>
+ <value>Quality: </value>
 </data>
 <data name="VideoView_TurboFirstPass" xml:space="preserve">
 <value>Turbo first pass</value>
@@ -1720,7 +1690,7 @@
 <value>Variable Framerate</value>
 </data>
 <data name="VideoView_Video" xml:space="preserve">
- <value>Video</value>
+ <value>Video: </value>
 </data>
 <data name="OptionsView_Language" xml:space="preserve">
 <value>Language:</value>
@@ -1851,7 +1821,7 @@
 <data name="QueueView_PlayMediaFile" xml:space="preserve">
 <value>Play File</value>
 </data>
- <data name="Options_ApplicaitonToolbar" xml:space="preserve">
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
 <value>Application Toolbar</value>
 </data>
 <data name="Options_ShowToolbarAddAll" xml:space="preserve">
@@ -1861,7 +1831,7 @@
 <value>Show 'Add Selection to Queue' on the toolbar</value>
 </data>
 <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
- <value>Hardware encoding support is currently disabled. Please make sure you are running up-to-date drivers for all graphics adaptors in this system.
+ <value>Hardware encoding support is currently disabled. If you did not start HandBrake with the "--no-hardware" option, please make sure you are running up-to-date drivers for all graphics adaptors in this system.
 
 This will not impact any of the software encoders.</value>
 </data>
@@ -1904,11 +1874,10 @@
 <value>HandBrake's engine failed to initialise. This is often caused by out of date GPU drivers.\n Please update the GPU drivers for any onboard and discrete graphics your system has.</value>
 </data>
 <data name="OptionsView_FormatOptions" xml:space="preserve">
- <value>Live Update Options: {source} {title} {chapters} 
-Non-Live Options: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (These only change if you scan a new source, change title or chapters)</value>
+ <value>Replacement Placeholders: {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
 </data>
 <data name="OptionsView_PathOptions" xml:space="preserve">
- <value>Available Options: {source_path} {source_folder_name} {source}</value>
+ <value>Replacement Placeholders: {source_path} {source_folder_name} {source}</value>
 </data>
 <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
 <value>Ask to overwrite file</value>
@@ -1929,7 +1898,7 @@
 <value>Encode Completed</value>
 </data>
 <data name="Options_Notifications" xml:space="preserve">
- <value>Notifications</value>
+ <value>Sound Notifications</value>
 </data>
 <data name="Options_QueueCompleted" xml:space="preserve">
 <value>Queue Completed</value>
@@ -2009,10 +1978,10 @@
 <value>Remaining drive storage has dropped below {0} GB on the destination drive. Pausing encode...</value>
 </data>
 <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
- <value>Configure Automatic Audio Selections</value>
+ <value>Automatic Audio Selections</value>
 </data>
 <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
- <value>Configure Automatic Subtitle Selections</value>
+ <value>Automatic Subtitle Selections</value>
 </data>
 <data name="Options_SystemOptions" xml:space="preserve">
 <value>System</value>
@@ -2041,9 +2010,6 @@
 <data name="MetadataView_TitleTag" xml:space="preserve">
 <value>Title:</value>
 </data>
- <data name="StaticPreviewView_PreviewRotationFlip" xml:space="preserve">
- <value>Preview Rotation and Flip</value>
- </data>
 <data name="LogViewModel_Title" xml:space="preserve">
 <value>Log Viewer</value>
 </data>
@@ -2176,18 +2142,15 @@
 <data name="OptionsView_RemotePortLimit" xml:space="preserve">
 <value>Port range must be between 5000 and 32767</value>
 </data>
- <data name="Options_Experimental" xml:space="preserve">
- <value>Experimental</value>
- </data>
 <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
- <value>Replacement Placeholders: {source} {destination}</value>
- <comment>Note: {source} and {destination} are not translatable. </comment>
+ <value>Replacement Placeholders: {source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
 </data>
 <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
 <value>A new version of HandBrake is available!</value>
 </data>
 <data name="About_Copyright" xml:space="preserve">
- <value>Copyright (C) 2003-2020 The HandBrake Team</value>
+ <value>Copyright (C) 2003-2022 The HandBrake Team</value>
 </data>
 <data name="Options_LowBatteryLevel" xml:space="preserve">
 <value>Low battery level:</value>
@@ -2205,4 +2168,451 @@
 <data name="QueueService_DuplicatesTitle" xml:space="preserve">
 <value>Duplicates Detected</value>
 </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Enable Low Power QuickSync Hardware (where supported).</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Please select a single job to view summary information.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Run each queued job in a separate worker process.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Default network port for worker:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>The preset you have selected is not available for use on this system.
+
+This is typically an indication that your system does not support the hardware required to utilise it.
+
+Please choose a different preset.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Process Isolation</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Please note, using this feature will start an HTTP server bound to 127.0.0.1 on the port stated.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>If the set port is in use, it will find the first free port within +100 from the defined port.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Maximum number of simultaneous encodes:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Cancel</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Preset:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Same as source</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Reset Settings</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Are you sure you wish to reset HandBrake to default settings?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Custom (Not Limited)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Fill (Surround)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Height (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>None</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Width (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Fill:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Colour:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Borders:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Resolution and Scaling:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientation and Cropping:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Windows 10 Only! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Filters:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Default</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Forced</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Custom</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Maximum Size:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Resolution Limit:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>None</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Manage Presets</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Delete Built-in Presets</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Export selected preset</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Import Preset(s) from file</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Preset Information:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>Built in presets can not be modified.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Set selected preset as default</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Delete Preset</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Not supported on this system)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Stop</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>The category name you entered already exists. Please choose a different name.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>The category name was empty. Please provide a name.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Enter a name: </value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>There is no preset selected.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Export all user presets</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Level at which low disk space alerts show:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Notice: This is the upper limit of simultaneous jobs. Hardware limitations may take effect which lowers the actual number of simultaneous jobs during encoding.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Not Available)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Is Default:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>No</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Yes</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Fine Tune Picture Settings</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Show crop adjustment controls.</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Use Dark</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Use Light</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Match System</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Theme:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Requires Restart)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Colourspace:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Colourspace</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Open Preview</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Source Preview:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Job Status:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Cancelled</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Complete</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Invalid Settings. Check log for details.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Invalid Input. Check log for details.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Status Unknown. Check log for details.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Errors detected whist trying to read source.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Unknown failure. Check log for details.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Worker Crashed. Check log for details.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>Missing file "hb.dll". Please re-install.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Warning: Please note that this is a "Safe Mode" build of HandBrake that does not include support for hardware encoders. If you wish to use hardware encoder support, please download a non-"Safe Mode" build from the website.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Black</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Custom</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>White</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>RGB Value:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(padded)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Flip:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Source Dimensions:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Storage Size: {0}x{1} Display Size: {2}x{3} Aspect Ratio: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>An error was detected in the File Browser Dialog. 
+
+- Please note, long file paths are not fully supported. Please keep file paths shorter than 255 characters. 
+- The last used directory for this window, has been reset to prevent errors the next time you try to scan a file.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Max Height:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Max Width:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Aspect Ratio: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru Common Metadata</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>The default auto name path was not valid. {0} must not be before {1}</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>Would you like to allow HandBrake to automatically check for updates?
+
+You can change your choice at any time by changing the options in Preferences -&gt; General -&gt; Check for Updates</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>Check for updates?</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>Before Updating:
+- Make sure there are no pending encodes in the queue. 
+- Backup or make a note of any custom presets you have created as they may not be fully compatible with newer versions.</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>(Default)</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>Categories</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>Flat</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>Partially Flat</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>Choose how presets are displayed in menus:</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Preset:</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>Finished</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>Edit Job?</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>Output Length:</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>Move To Bottom</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>Move To Top</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>Output Bitrate:</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>Average Encoding Speed:</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value> of source file</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>Not Available</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>Source Length:</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>Reset</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>Are you sure you wish to reset all built-in presets?</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>Reset all built-in presets to HandBrake defaults:</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>(User presets will not be reset)</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>Reset all HandBrake settings back to defaults:</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>Built In Presets</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>User Settings</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>Floating Treeview</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>Please make sure you have appropriate file associations setup in Windows to allow it to open this file with a supported video player</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>Unable to read the queue file.</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>The file may be corrupted or from an earlier version of HandBrake. 
+Only queue files from the current version are supported.</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>Your HandBrake encode is done!</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>Your HandBrake queue is done!</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>This will also disable the show windows taskbar notifications options on the 'When Done' tab. Re-enable these if you want to re-activate this feature.</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>Remove HandBrake from the Windows notifications control panel.</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>Uninstalled</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>Notification settings have been removed.</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>Clear &amp; Uninstall</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>Send a notification to the Windows Taskbar.</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>Windows Notifications</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>{0} jobs completed. {1}Working on {2} jobs with {3} waiting to be processed.</value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>Regenerate (Autoname)</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>Open this Directory</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>Collapse All</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>Expand All</value>
+ </data>
+ <data name="OptionsView_RightToleftMode" xml:space="preserve">
+ <value>Right to Left display mode:</value>
+ </data>
+ <data name="RightToLeft_Off" xml:space="preserve">
+ <value>Off</value>
+ </data>
+ <data name="RightToLeft_TextOnly" xml:space="preserve">
+ <value>Text Only</value>
+ </data>
+ <data name="RightToLeft_WholeInterface" xml:space="preserve">
+ <value>Entire User Interface</value>
+ </data>
 </root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ru.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.ru.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.th.resx Added

@@ -0,0 +1,2485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>รายการพารามิเตอร์ตัวเข้ารหัสที่สมบูรณ์ทั้งหมด: 
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>ลดการใช้ตัวถอดรหัสบน CPU
+
+เลือกตัวเลือกนี้เมื่ออุปกรณ์ของคุณไม่สามารถเล่นส่งออกได้อย่างราบรื่น (เช่น เฟรมหลุด)</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>คำเตือน: RF 0 ไม่มีการสูญเสีย!</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>A value of 0 means lossless and will result in a file size that is larger than the original source, 
+เว้นแต่ไฟล์ต้นทางของไฟล์จะไม่สูญเสียไปด้วย
+
+อัตราส่วนเป็นแบบลอการิทึมเมื่อใช้ x264 และ x265 และค่าที่ต่ำกว่าจะสัมพันธ์กับคุณภาพที่สูงขึ้น
+
+ดังนั้นแม้ค่าที่ลดลงเพียงเล็กน้อยจะทำให้ขนาดไฟล์ค่อยๆ เพิ่มขึ้น</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>คุณสามารถเลือกใช้พรีเซ็ตนี้เพื่อจัดเก็บการตั้งค่าภาพที่มี 3 โหมด:
+
+None: การตั้งค่าภาพจะไม่ถูกเก็บไว้ในพรีเซ็ต เมื่อโหลดไฟล์ต้นทางของไฟล์แล้ว ไฟล์ต้นทางของไฟล์จะยังอยู่ในช่วงความละเอียดของไฟล์ต้นทาง สิ่งนี้จะส่งผลต่อการเสียรูป โมดูลัส การตัด ฯลฯ
+
+Custom: คุณสามารถเลือกกำหนดความกว้างและความสูงสูงสุดได้ เมื่อทำเช่นนั้น ความกว้างและความสูงของวิดีโอที่ส่งออกจะไม่เกินค่าที่ตั้งไว้ รักษาอัตราส่วนภาพจะเปิดขึ้นโดยอัตโนมัติ
+
+Source Maximum: เข้ารหัสที่ความละเอียดของไฟล์ต้นทางเสมอหากเป็นไปได้</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>โปรแกรมนี้เป็นซอฟต์แวร์ฟรี คุณสามารถแจกจ่ายซ้ำและ/หรือ
+แก้ไขภายใต้เงื่อนไขของสัญญาอนุญาตสาธารณะทั่วไปของกนู
+ตามที่เผยแพร่โดยมูลนิธิซอฟต์แวร์เสรี ทั้งรุ่น2
+ของใบอนุญาตหรือ (ตามที่คุณเลือก) เวอร์ชันที่ใหม่กว่า
+
+โปรแกรมนี้เผยแพร่โดยหวังว่าจะเป็นประโยชน์
+แต่ไม่มีการรับประกันใดๆ โดยไม่มีการรับประกันโดยนัยของ
+ความสามารถในการขายหรือความเหมาะสมสำหรับวัตถุประสงค์เฉพาะ ดู
+GNU General Public License สำหรับรายละเอียดเพิ่มเติม
+
+คุณควรได้รับสำเนาใบอนุญาตสาธารณะทั่วไป (GNU_ แล้ว
+ร่วมกับโปรแกรมนี้ ถ้าไม่เขียนถึงซอฟต์แวร์เสรี
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>คำเตือน: ไม่ได้เปิดตัวเลือกการตั้งชื่อไฟล์อัตโนมัติ กรุณาเปิดใช้งานในการตั้งค่า</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>คำเตือน: ขณะนี้คุณไม่มีการตั้งค่าสำหรับการเลือกแทร็กเสียงและคำบรรยายโดยอัตโนมัติ คุณสามารถตั้งค่าพฤติกรรมนี้โดยเลือกแทร็กเริ่มต้นได้ในตัวเลือก</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>ค่าพรีเซ็ตในโปรแกรมได้รับการรีเซ็ตแล้ว</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>รีเซ็ตเสร็จสมบูรณ์</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>คุณภาพสูง |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| คุณภาพต่ำ</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>คุณภาพสูงสุด |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>ผิดพลาด</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>คุณต้องเปิดการตั้งชื่อไฟล์อัตโนมัติและตั้งค่าพาธเริ่มต้นในการกำหนดลักษณะก่อนจึงจะสามารถเพิ่มลงในคิวได้</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>คำเตือน</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>คุณแน่ใจใช่ไหม?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake กำลังดำเนินการเข้ารหัสอยู่แล้วตอนนี้</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>มีงานในคิวที่มีเส้นทางปลายทางเหมือนกัน โปรดเลือกเส้นทางอื่นดำเนินการงานนี้</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value> รอทำงาน {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>ค่าที่ตั้งไว้เริ่มต้นใหม่: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>มีการอัพเดทใหม่ ไปที่เมนู "เครื่องมือ" &gt; เลือกตัวเลือก การติดตั้ง</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>ไม่ได้เลือกพรีเซ็ต</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>คุณไม่สามารถแก้ไขค่าที่ตั้งล่วงหน้าในโปรแกรมได้ โปรดเลือกพรีเซ็ตของคุณเอง</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>โปรดเลือกโฟลเดอร์</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>กำลังเตรียมเข้ารหัส...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>คุณไม่สามารถนำเข้าพรีเซ็ตที่มีชื่อเดียวกับพรีเซ็ตในนี้ได้</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>พรีเซ็ต "{0}" มีอยู่แล้ว คุณต้องการเขียนทับหรือไม่</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>พรีเซ็ต</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการอัปเดตพรีเซ็ตที่เลือก</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>ค่าที่ตั้งล่วงหน้าได้รับการอัปเดตด้วยการตั้งค่าปัจจุบันของคุณแล้ว</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake ได้รับการยืนยันแล้วว่าพรีเซ็ตในโปรแกรมของคุณหมดอายุแล้ว... ค่าที่ตั้งล่วงหน้าเหล่านี้จะได้รับการอัปเดต
+ค่าที่ตั้งล่วงหน้าที่กำหนดเองของคุณยังไม่ได้รับการอัปเดต ดังนั้นคุณอาจต้องลบและเพิ่มใหม่เพื่อสร้างใหม่
+สำรองข้อมูลไฟล์ user_presets.xml ก่อนหน้านี้แล้ว</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>คิวเสร็จสมบูรณ์</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>การสแกนถูกยกเลิก</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>สแกนเสร็จ</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>การสแกนล้มเหลว：</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>การสแกนล้มเหลว... ดูบันทึกกิจกรรมสำหรับรายละเอียด</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>กำลังสแกนไฟล์ต้นทางของไฟล์ โปรดรอสักครู่...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>กำลังสแกนส่วนหัว {0}/{1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>ก่อนเริ่มการเข้ารหัส คุณต้องสแกนไฟล์ต้นทางก่อนเพื่อตั้งค่างาน คลิกปุ่ม "เพิ่มไฟล์ต้นทาง" บนแถบเครื่องมือเพื่อดำเนินการต่อ</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>ตรวจสอบให้แน่ใจว่าคุณได้เลือกพรีเซ็ตของคุณเอง โปรดทราบว่าคุณไม่สามารถส่งออกพรีเซ็ตได้</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>โปรดเลือกพรีเซ็ตที่จะอัปเดต</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>เลือก "ไฟล์ต้นทาง" เพื่อดำเนินการต่อ</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} งานที่รอดำเนินการ</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>บันทึก</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>เขียนทับหรือไม่</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>คำถาม</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>พร้อมแล้ว</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>อัพเดท</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>เวอร์ชันเริ่มต้น</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>พรีเซ็ตที่คุณพยายามนำเข้ามาจาก HandBrake เวอร์ชันอื่น
+อาจไม่สามารถนำเข้าค่าทั้งหมดจากพรีเซ็ตนี้
+
+คุณต้องการดำเนินการต่อหรือไม่</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>ไม่สามารถนำเข้าพรีเซ็ตได้</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>ไม่สามารถนำเข้าค่าที่ตั้งล่วงหน้าได้เนื่องจากดูเหมือนว่าไฟล์จะเสียหายหรือเพราะ HandBrake เป็นเวอร์ชันเก่า</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>ก่อนเพิ่มลงในคิว คุณต้องตั้งค่าพาธปลายทางสำหรับไฟล์ส่งออกก่อน</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>เส้นทางเป้าหมายที่ป้อนมีอักขระที่ไม่ถูกต้อง และจะไม่ได้รับการอัปเดต</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>ดูตัวอย่าง{0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>ดูตัวอย่าง (ซูม)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>ส่งออก：{0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>รูปแบบของไฟล์ที่ส่งออก นอกจากอักขระระบบไฟล์ที่รองรับแล้ว คุณยังสามารถใช้ตัวยึดตำแหน่งต่อไปนี้ ซึ่งจะถูกแทนที่เมื่อคุณเปลี่ยนชื่อหรือไฟล์ต้นทางของการสแกน
+
+ตัวเลือกการอัปเดตตามเวลาจริง：{source} {title} {chapters} 
+ตัวเลือกที่ไม่ใช่เรียลไทม์：{date} {time} {creation-date} {creation-time} {quality} {bitrate} （เปลี่ยนเฉพาะเมื่อสแกนแหล่งใหม่ เปลี่ยนชื่อหรือเรื่อง）</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>มีตัวเลือกเพิ่มเติม: {source_path} หรือ {source_folder_name} หรือ {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>คุณไม่สามารถเข้ารหัสไฟล์ที่มีเส้นทางและชื่อไฟล์เดียวกันกับไฟล์ต้นฉบับ โปรดอัปเดตชื่อไฟล์เป้าหมายเพื่อไม่ให้ตรงกับไฟล์ต้นฉบับ</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>ระบบของคุณถูกบล็อกจาก HandBrake เริ่มต้นเว็บเบราว์เซอร์</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>คุณยังคงสามารถเข้าถึงหน้าช่วยเหลือของเว็บไซต์ได้โดยตรงที่：https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>ไม่สามารถนำเข้าพรีเซ็ตที่เลือกได้</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>ค่าพรีเซ็ตอาจเสียหายหรือเพราะ HandBrake รุ่นเก่าที่ไม่รองรับ
+ต้องสร้างพรีเซ็ตเวอร์ชันเก่าในเวอร์ชันปัจจุบัน</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>พารามิเตอร์ขั้นสูงอื่นๆ ที่สามารถส่งผ่านไปยังตัวเข้ารหัสวิดีโอได้</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>None - เฉพาะแทร็กที่คอนเทนเนอร์ไม่รองรับรูปแบบจะถูกเบิร์นเข้าไป
+Foreign Audio Track - หากมีแทร็กภาษาต่างประเทศจะถูกเบิร์นเข้าไป
+First Track - แทร็กแรกจะถูกเผา
+Foreign Audio Preferred, else First - หากมีแทร็กภาษาต่างประเทศ แทร็กนั้นจะถูกเบิร์นมิฉะนั้นแทร็กแรกจะถูกเลือก</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>ความเข้ากันได้ของคำบรรยาย WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>รูปแบบ WebM ใน HandBrake รองรับเฉพาะคำบรรยายแบบฝังเท่านั้น
+
+คุณควรเปลี่ยนการเลือกคำบรรยาย
+
+หากคุณดำเนินการต่อ คำบรรยายที่ไม่ได้บันทึกของคุณจะหายไป</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>ไม่พบไฟล์ต้นทางหรือชื่อที่ถูกต้อง</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake ไม่สามารถเข้ารหัสไฟล์ต้นทางที่เลือกได้ เนื่องจากไม่พบแหล่งที่ถูกต้องที่สามารถเข้ารหัสได้
+อาจเกิดจากสาเหตุใดสาเหตุหนึ่งดังต่อไปนี้：
+- ระยะเวลาของชื่อไฟล์ต้นทางแต่ละรายการจะต่ำกว่า "ค่ากำหนด&gt;ตัวเลือกเกณฑ์ "ระยะเวลาชื่อเรื่องขั้นต่ำ" ในขั้นสูง
+- ไฟล์ต้นฉบับไม่ใช่ไฟล์วิดีโอที่ถูกต้อง หรืออยู่ในรูปแบบที่ HandBrake ไม่รองรับ
+- ไฟล์ต้นทางสามารถป้องกันการคัดลอกหรือรวม DRM โปรดทราบว่า HandBrake ไม่สนับสนุนการลบการป้องกันการคัดลอก
+
+บันทึกกิจกรรมอาจมีข้อมูลเพิ่มเติม</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>คิว{0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>เริ่มการเข้ารหัส</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>เริ่มคิว</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>ไม่สามารถลบค่าพรีเซ็ตเริ่มต้นได้ โปรดตั้งค่าล่วงหน้าอื่นเป็นค่าเริ่มต้นก่อน</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>คุณแน่ใจหรือว่าต้องการลบพรีเซ็ต：</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Encoding: Pass {0} of {1}, {2:00.00}%, FPS: {3:000.0}, Avg FPS: {4:000.0}, Time Remaining: {5}, Elapsed: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>ค่าที่ตั้งล่วงหน้าต้องมีชื่อ กรุณากรอกข้อมูลในช่องชื่อพรีเซ็ต</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>มีพรีเซ็ตที่มีชื่อนี้อยู่แล้ว คุณต้องการที่จะเขียนทับหรือไม่</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>ต้องสแกนต้นทางก่อนจึงจะสามารถใช้ตัวเลือก "ไฟล์ต้นทางสูงสุด" ได้</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>ต้องกรอกข้อมูลในฟิลด์ความกว้างหรือความสูงที่กำหนดเองสำหรับตัวเลือก "กำหนดเอง"</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>ไม่สามารถเพิ่มค่าพรีเซ็ต</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>ความผิดพลาดที่ไม่ทราบสาเหตุ</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>ค่าเริ่มต้นของเสียง</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>แทร็กเสียง</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>เลือกพฤติกรรม</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>สลับกลับไปที่แทร็ก</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>ไม่สามารถบันทึกไฟล์ตัวทำเครื่องหมายเรื่องได้!</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>ชื่อตัวทำเครื่องหมายเรื่องจะไม่ถูกบันทึกในรหัสของคุณ</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>การดำเนินการต่อไปนี้ "{0}" จะเกิดขึ้นภายใน {1} วินาที</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>หากปัญหายังคงอยู่ โปรดลองรีสตาร์ท HandBrake</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>ไม่มีข้อมูลเพิ่มเติมเกี่ยวกับข้อผิดพลาดนี้</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>เกิดข้อผิดพลาดที่ไม่รู้จัก</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>มีการปรับปรุงใหม่! โปรดตรวจสอบบันทึกประจำรุ่นในเว็บไซต์</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>ระบบของคุณรองรับ HandBrake รุ่น 64 บิต! เมื่อเทียบกับรุ่น 32 บิต จะเพิ่มประสิทธิภาพและความเสถียร
+ โปรดตรวจสอบบันทึกประจำรุ่นในเว็บไซต์</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>ขณะนี้ไม่มีการปรับปรุงใหม่</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>อัปเดต ดาวน์โหลด</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>บริการอัปเดตไม่พร้อมใช้งาน คุณสามารถลองดาวน์โหลดการอัพเดทจาก https://handbrake.fr</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>การอัปเดตล้มเหลว คุณสามารถลองดาวน์โหลดการอัพเดทจาก https://handbrake.fr</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>ขนาดการจัดเก็บ: {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>เพิ่มในคิว</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>ไม่ต้องรอเข้ารหัส</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>ยังไม่มีงานในการเข้ารหัส</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>คิว</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการล้างคิว</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>ยืนยัน</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} รอรับงาน</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>คิวถูกระงับ</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการลบงานที่เลือก</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>การเข้ารหัสนี้อยู่ในระหว่างดำเนินการ หากคุณลบออก การเข้ารหัสจะหยุดลง คุณแน่ใจหรือไม่ว่าต้องการดำเนินการต่อ</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>ไม่มีงานที่ค้างอยู่</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการแก้ไขงานนี้ จะถูกลบออกจากคิวและส่งไปที่หน้าต่างหลัก</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>คิวพร้อมแล้ว</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>คิวไม่ทำงาน</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>คิวเสร็จสมบูรณ์</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>งานสุดท้ายในคิวเสร็จเรียบร้อย</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>คิวเริ่มแล้ว</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>การเข้ารหัส：Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均FPS: {4:000.0}, เวลาที่เหลือ：{5}, เวลาที่ผ่านไป：{6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>การเข้ารหัสกำลังทำงานอยู่ การออกจาก HandBrake จะหยุดการเข้ารหัสนี้
+คุณแน่ใจหรือไม่ว่าต้องการออกจาก HandBrake</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>ภาพตัวอย่างภาพ</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>ไม่สามารถลบไฟล์แสดงตัวอย่างก่อนหน้า คุณอาจยังคงเปิดการแสดงตัวอย่างในโปรแกรมเล่นสื่อของคุณ โปรดปิดสิ่งนี้</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>ก่อนสร้างตัวอย่าง คุณต้องสแกนไฟล์ต้นทางและตั้งค่าการเข้ารหัส</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>ไม่พบไฟล์แสดงตัวอย่าง ไฟล์ถูกลบหรือการเข้ารหัสล้มเหลว ตรวจสอบบันทึกกิจกรรมเพื่อดูรายละเอียด</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>Handbrake วิดีโอถูกเข้ารหัสแล้ว! สามารถเข้ารหัสได้ครั้งละหนึ่งไฟล์เท่านั้น</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>ค่าเริ่มต้นของคำบรรยาย</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>แทร็กคำบรรยาย</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>สลับกลับไปที่แทร็ก</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>เลือกพฤติกรรม</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>ไฟล์ที่เก็บถาวร：</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>ไม่สามารถโหลดพรีเซ็ตได้</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake ไม่สามารถโหลดไฟล์พรีเซ็ตของคุณ อาจมาจาก HandBrake เวอร์ชันเก่าที่ไม่รองรับหรืออาจเสียหาย
+
+ไฟล์พรีเซ็ตเก่าของคุณถูกเก็บถาวรเป็น：</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> มี{0} เกิดข้อผิดพลาดหรือยกเลิกการทดสอบ</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>พื้นที่ดิสก์ไม่เพียงพอ</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>คำเตือน คุณมีพื้นที่ดิสก์ไม่เพียงพอ หากมีพื้นที่ไม่เพียงพอ HandBrake จะไม่สามารถเข้ารหัสนี้ให้เสร็จสิ้นได้</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>ก่อน{0}บรรทัดไม่ถูกต้อง ไม่มีอะไรจะนำเข้า</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>ไม่สามารถนำเข้าไฟล์เรื่องได้</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>บรรทัดทั้งหมดในไฟล์เรื่องต้องมีข้อมูลอย่างน้อย 2 คอลัมน์</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>คอลัมน์แรกในไฟล์บทต้องมีเฉพาะค่าตัวเลขจำนวนเต็มที่มากกว่าศูนย์ (0)</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>ประเภทที่ไม่รองรับในปัจจุบันคือ '{0}' ไฟล์เรื่อง</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>ประเภทไฟล์เรื่องไม่รองรับ</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>ข้อมูลเรื่องของไฟล์ต้นทางไม่ถูกต้อง</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>จำนวนเรื่องในแหล่งไฟล์ไม่ตรงกับจำนวนเรื่องในไฟล์อินพุต( {0} vs {1})
+
+คุณยังต้องการนำเข้าชื่อเรื่องหรือไม่</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>จำนวนเรื่องในแหล่งไฟล์ไม่ตรงกับจำนวนเรื่องในไฟล์อินพุต( {0} vs {1}).
+
+คุณยังต้องการนำเข้าชื่อเรื่องหรือไม่</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>จำนวนเรื่องในไฟล์ต้นฉบับและไฟล์อินพุตไม่ตรงกัน</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>ระยะเวลาของแต่ละเรื่องในสื่อต้นทางแตกต่างกันอย่างมากจากระยะเวลาของแต่ละเรื่องในไฟล์อินพุต
+
+ไฟล์เรื่องนี้น่าจะสร้างจากสื่อต้นทางอื่นๆ
+
+คุณแน่ใจหรือไม่ว่าต้องการนำเข้าชื่อเรื่องนี้</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>ความยาวเรื่องของไฟล์ต้นฉบับและไฟล์อินพุตไม่ตรงกัน</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>เกิดข้อผิดพลาดขณะพยายามหยุดการสแกน โปรดรีสตาร์ท HandBrake</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake ไม่สามารถอัพเกรดไฟล์พรีเซ็ตเป็นรูปแบบเวอร์ชันใหม่
+ไฟล์พรีเซ็ตของคุณจะถูกเก็บถาวร คุณต้องสร้างพรีเซ็ตของคุณเอง</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>การตั้งค่าใดๆ ที่คุณเปลี่ยนแปลงอาจถูกรีเซ็ตในครั้งถัดไปที่ HandBrake เริ่มทำงาน</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>เกิดปัญหาขณะพยายามบันทึกค่ากำหนดเองของคุณ</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>คำเตือน การตั้งค่าของคุณถูกรีเซ็ตแล้ว!</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>ไฟล์การตั้งค่าผู้ใช้ของคุณเสียหายหรือไม่สามารถเข้าถึงได้ คืนค่าการตั้งค่าเป็นค่าเริ่มต้นแล้ว</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>ไม่สามารถโหลดไฟล์การตั้งค่าผู้ใช้: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>ไฟล์การตั้งค่าผู้ใช้ของคุณไม่สามารถเข้าถึงได้หรือเสียหาย คุณอาจต้องลบและปล่อยให้ HandBrake สร้างใหม่</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>ไดเร็กทอรีส่งออกที่คุณเลือกไม่มีอยู่หรือไม่ได้รับอนุญาตให้เขียนไฟล์</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>สร้างโฟลเดอร์หรือไม่</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>โฟลเดอร์ที่จะเขียนไม่มีอยู่ คุณต้องการให้ HandBrake สร้างโฟลเดอร์นี้หรือไม่
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>ไม่สามารถเริ่มไดเร็กทอรีเป้าหมายได้</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>โปรดตรวจสอบว่าไดเร็กทอรีเป้าหมายถูกต้องหรือไม่</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>ผ่านการประมวลผล {0} จาก {1}, (สแกนคำบรรยาย) {2:00.00}%, เวลาสแกนที่เหลืออยู่: {3}, ผ่านไป: {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>ไม่มีข้อมูลเพิ่มเติม</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, เสร็จแล้ว {2} /{3} )</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, เสร็จแล้ว {2} / {3}
+เวลาที่เหลือ: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>คิวถูกระงับ คำเตือน มีพื้นที่ดิสก์ไม่เพียงพอบนไดรฟ์ที่คุณกำลังเข้ารหัส โปรดเพิ่มพื้นที่ว่างและกดเริ่มเพื่อดำเนินการต่อ คุณยังสามารถปรับระดับพื้นที่ขั้นต่ำในการตั้งค่าได้อีกด้วย</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>คิวถูกระงับ</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>คิวถูกระงับ</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>ไดเร็กทอรีปลายทางของคุณมีพื้นที่ดิสก์เหลือน้อย
+
+คุณสามารถกำหนดค่าระดับที่การแจ้งเตือนนี้จะปรากฏในการตั้งค่า
+
+คุณต้องการดำเนินการต่อหรือไม่ </value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>ไม่สามารถรีเซ็ตสถานะงานได้เนื่องจากไม่อยู่ในข้อผิดพลาดหรือสถานะเสร็จสมบูรณ์</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>ไม่สามารถกู้คืนไฟล์คิวได้</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>ไฟล์อาจเสียหายหรือจาก HandBrake เวอร์ชันเก่าที่เข้ากันไม่ได้</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake อยู่ในไฟล์ที่เข้ารหัสแล้ว</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>โปรดหยุดการเข้ารหัสปัจจุบัน หากปัญหายังคงอยู่ โปรดรีสตาร์ท HandBrake</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>ดูตัวอย่าง ({0}% ขนาดที่แท้จริง)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake ต้องทำงานบน 64 บิต Windows 7 หรือสูงกว่า</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake ต้องใช้ Windows 7 หรือสูงกว่าจึงจะทำงานได้ เวอร์ชัน 0.9.9 (XP) และเวอร์ชัน 0.10.5 (Vista) เป็นเวอร์ชันสุดท้ายที่สนับสนุนเวอร์ชันเหล่านี้</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>คุณต้องการเพิ่มส่วนที่เหลือต่อไปหรือไม่</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>ไฟล์ '{0}' มีอยู่แล้ว!
+คุณต้องการที่จะเขียนทับมันหรือไม่</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>คลิปบอร์ดของระบบไม่สามารถใช้งานได้ในขณะนี้</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>อาจเป็นเพราะการตรวจสอบแอปพลิเคชันอื่นหรือการล็อกคลิปบอร์ด คุณสามารถใช้คลิปบอร์ดต่อไปได้เมื่อปลดล็อกเท่านั้น</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>ใบอนุญาต：</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>รุ่น：</value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- เพิ่มหมวดหมู่ใหม่ --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>เพิ่มพรีเซ็ต</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>ประเภท：</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>คำอธิบาย：</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>ชื่อ：</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>ขนาด：</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>ติดตามการเลือกไฟล์ต้นทาง</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>อนุญาตให้ผ่าน：</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>กำหนดค่าวิธีการเลือกและกำหนดค่าแทร็กเสียงโดยอัตโนมัติเมื่อเลือกชื่อใหม่หรือวิดีโอต้นทาง</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>“ผ่านอัตโนมัติ" พฤติกรรม：</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>อัตราบิต</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>การเข้ารหัส</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>อัตราขยาย</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>ซ่อน</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>ผสม</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>ตัวเข้ารหัสสำรอง：</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>โหลดซ้ำ</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>อัตราการสุ่มตัวอย่าง</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>แสดง</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>ชื่อแทร็ก</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>ติดตามเลือกพฤติกรรม：</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>แทร็กพิเศษ：</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>เลือก“Auto Passthru”เป็นตัวแปลงสัญญาณเสียง</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>เครื่องหมายเรื่อง</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>ชื่อเรื่อง</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>หมายเลขเรื่อง</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>สร้างเครื่องหมายเรื่อง</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>ระยะเวลา</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>ส่งออก</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>นำเข้า</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>ส่งออกชื่อ</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>นำเข้าชื่อ</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>รีเซ็ตชื่อเรื่อง</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>ยกเลิกการดำเนินการ</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>ทำต่อไป</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>เมื่อดำเนินการเสร็จสิ้น</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>รายละเอียดข้อผิดพลาด：</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>ปรับแต่ง：</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>ปลดบล็อค:</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>ถอดรหัส</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>ไม่สอดแทรก：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>ลดเสียงรบกวน：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>พรีเซ็ตไม่สอดแทรก</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>ลดเสียงรบกวน：</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>พรีเซ็ตลดเสียงรบกวน</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>การปรับลดเสียงรบกวน</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>ตัวกรอง：</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>กรอง</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>แนวนอน</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>โทนสีเทา</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>การตรวจจับอินเทอร์เลซ：</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>พรีเซ็ต：</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>การหมุน:</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>ความคม:</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>พรีเซ็ตความคม</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>ปรับปรุงความคม</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>ปรับ：</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>เพิ่ม</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>ยกเลิก</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>ล้าง</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>ปิด</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>คัดลอกไปที่คลิปบอร์ด</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>เลื่อนไปทางซ้าย</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>เลื่อนไปทางขวา</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>บันทึก</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>คัดลอกไปที่คลิปบอร์ด</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>บันทึกรหัส</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>เปิดไดเรกทอรีที่บันทึก</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>บันทึกการสแกน</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>บันทึกกิจกรรม</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>เพิ่มทั้งหมด</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>เพิ่มตอนนี้</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>เพิ่มรายการที่เลือก</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>เพิ่มไปในคิว</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>ขั้นสูง</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>การจัดตำแหน่งเริ่มต้นเสียงและวิดีโอ</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>มุม</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>เสียง</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>แทร็กเสียง</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>เรียกดู</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>เรื่อง</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>คอนเทนเนอร์</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>เส้นทางเป้าหมาย</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>ระยะเวลา：</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>บันทึกเป็น：</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>กรอง</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>รูปแบบ：</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>ตัวช่วย</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>iPod 5 สนับสนุน</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>ข้อมูลอภิพันธ์</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(ดัดแปลง)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>เริ่มการรวม: อาจใช้เวลาสักครู่…</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>ตัวเลือก</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>การตั้งค่าส่งออก</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>หมดเวลา</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>ขนาด</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>เปลี่ยนชื่อพรีเซ็ต</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>เมนูบริบทตัวเลือกพรีเซ็ต</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>ลบพรีเซ็ต</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>พรีเซ็ต</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>ดูตัวอย่าง</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>การเข้ารหัส: {0}, {1:00.00}%, เวลาที่เหลือ: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>พิสัย：</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>โหลดซ้ำ</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>ลบ</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>รีเซ็ตพรีเซ็ตในโปรแกรม</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>บันทึกพรีเซ็ตใหม่</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>กำลังหาเวลาเริ่มต้น</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>ตั้งเป็นค่าเริ่มต้น</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>ดูตัวอย่าง</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>คิว</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>ไฟล์ต้นทาง：</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>เปิดไฟล์ต้นทาง</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>เริ่มการเข้ารหัส</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>เริ่มคิว</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>หยุด</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>หยุดเข้ารหัส</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการหยุดการเข้ารหัสนี้</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>โปรดเลือกไฟล์ต้นทางที่จะเข้ารหัสก่อนนำเข้าไฟล์คำบรรยาย</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>คำบรรยาย</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>แทร็กคำบรรยาย</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>สรุป</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>หัวข้อ：</value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>อัปเดตค่าที่ตั้งไว้ล่วงหน้าที่เลือก</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>วีดีโอ</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>เพิ่มประสิทธิภาพ Web</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>จัดการพรีเซ็ต</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>ข้อมูลอภิพันธ์</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>อนุญาตให้ใช้ตัวเข้ารหัส Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>อนุญาตให้ใช้ตัวเข้ารหัส Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>อนุญาตให้ใช้ตัวเข้ารหัส AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>รูปแบบไฟล์รับเข้ามีอักขระที่ไม่ถูกต้อง อักขระเหล่านี้ถูกลบออกแล้ว</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>เสียงบี๊บจะดังขึ้นเมื่อการเข้ารหัสแต่ละครั้งเสร็จสิ้น</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>ส่งเสียงบี๊บเมื่อคิวเสร็จสิ้น</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>แสดงตัวอย่างในแถบสรุป</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>แสดงความคืบหน้าในการเข้ารหัสในแถบชื่อแอปพลิเคชัน</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>ล้างไฟล์บันทึกที่เก่ากว่า 7 วัน</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>เกี่ยวกับ HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>ขั้นสูง</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>ตัวเลือกขั้นสูง</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>พารามิเตอร์：</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>การตั้งชื่อไฟล์อัตโนมัติ</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>ตั้งชื่อไฟล์ที่ส่งออกโดยอัตโนมัติ</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>ตรวจสอบสำหรับการอัพเดต</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>ล้างงานคิวที่เสร็จสิ้นทุกครั้งเมื่อการเข้ารหัสเสร็จสิ้น</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>ล้างประวัติบันทึก</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>คัดลอกไฟล์บันทึกโค้ดไปยังตำแหน่งที่ระบุ：</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>คัดลอกไฟล์บันทึกการเข้ารหัสไปยังตำแหน่งของวิดีโอที่เข้ารหัส</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>เวอร์ชั่นปัจจุบัน</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>ถอดรหัส</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>เส้นทางเริ่มต้น：</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>ดาวน์โหลดอัปเดต</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>DVD กำลังอ่าน</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>ปิดการใช้งาน LibDVDNav。(จะใช้ livdvdread)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>การเข้ารหัส</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>รูปแบบไฟล์：</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>ทั่วไป</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>การบันทึก</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>บันทึกระดับการใช้คำฟุ่มเฟือย：</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>เส้นทางไฟล์บันทึก：</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>หยุดคิวชั่วคราวหากพื้นที่ดิสก์เหลือน้อย</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>ย่อเล็กสุดไปที่ถาดระบบ (ต้องรีสตาร์ท)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>DVDและระยะเวลาที่สั้นที่สุดของชื่อ Blu-ray "วินาที" หัวข้อที่สั้นกว่าจะถูกข้าม：</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>MP4 นามสกุลไฟล์：</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>เมื่อเริ่มต้น</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>ไฟล์ส่งออก</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>เส้นทาง：</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>เส้นทาง Media Player</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>ป้องกันไม่ให้ระบบเข้าสู่โหมดสลีปขณะเข้ารหัส</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>จำนวนภาพตัวอย่างที่จะสแกน：</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>ลำดับความสำคัญ：</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>หากมี ให้ใช้ Intel QuickSync เพื่อถอดรหัสวิดีโอก่อน</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>ใช้ตัวถอดรหัส QSV เมื่อไม่ได้ใช้ตัวเข้ารหัส QuickSync (เช่น x265)</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>ลบเครื่องหมายวรรคตอนทั่วไป</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>แทนที่ขีดล่างด้วยช่องว่าง</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>รีเซ็ตเป็น "ไม่ดำเนินการ" เมื่อรีสตาร์ทแอป</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>เลือก Scaler：</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>ซูม</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>ส่งไฟล์ไปที่：</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>เปลี่ยนรูปแบบการใช้อักษรตัวพิมพ์ใหญ่เป็นอักษรตัวแรกของคำ</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>อัพเดท</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>หน้าจอผู้ใช้</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>รุ่น：</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>วีดีโอ</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>เส้นทางนี้ใช้สำหรับคุณลักษณะการแสดงตัวอย่างวิดีโอเท่านั้น
+รองรับ VLC และ MPC-HC ผู้เล่นรายอื่นอาจใช้งานได้ แต่ไม่ผ่านการตรวจสอบ</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>ดูไดเรกทอรีบันทึก</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>เมื่อทำเสร็จแล้ว</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>x264/5 ติดตั้ง</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>สเกลขั้นต่ำสำหรับโหมดคุณภาพคงที่：</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>อะนามอร์ฟิค：</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>อัตโนมัติ</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>ด้านล่าง</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>การครอบตัด:</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>ปรับแต่ง</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>ขนาดจอแสดงผล:</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>ความสูง：</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>อัตโนมัติ</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>ซ้าย</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>มิติสุดท้าย:</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>ลักษณะพิเซล:</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>ขวา</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>ขนาด：</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>บน</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>ขนาดที่ปรับขนาด:</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>ปรับแต่ง</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>ส่งออกไฟล์</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>นำเข้าไฟล์</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>ทางการ</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>เลือกชื่อเรื่อง：</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>เพิ่มในคิว</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>ชื่อที่เลือกจะถูกใช้ "{0}" พรีเซ็ต</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>ตัวเลือกวิดีโอ:</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>เสียง：</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>ลบทั้งหมด</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>ล้างเรียบร้อย</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>ล้างคิว</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>ล้างรายการที่เลือก</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>ลบ</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>เส้นทางเป้าหมาย：</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>ไม่มีการตอบสนอง</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>ระยะเวลาเข้ารหัส：</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>แก้ไข</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>เวลาที่สิ้นสุด：</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>ส่งออกคิว</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>ขนาดไฟล์：</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>อยู่เฉยๆ</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>ล็อคระบบ</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>บันทึกจะพร้อมใช้งานหลังจากการเข้ารหัสเสร็จสิ้น</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>ออกจากระบบ</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>เปิดไดเรกทอรีเป้าหมาย</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>เปิดไดเร็กทอรีไฟล์ต้นทาง</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>ตัวเลือก</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>หมดเวลา</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>ระยะเวลาหยุดชั่วคราว：</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>การตั้งค่ารูปภาพ：</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>ออกจาก HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>ลองงานทั้งหมดอีกครั้ง</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>ลองใหม่ไม่สำเร็จ</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>รีเซ็ตงานที่เลือก</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>รีเซ็ต</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>ปิดตัว</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>ไฟล์ต้นทาง：</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>เริ่มคิว</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>เวลาเริ่มต้น：</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>ข้อมูลสถิติ</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>สถิติจะพร้อมใช้งานหลังจากการเข้ารหัสเสร็จสิ้น</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>คำบรรยาย：</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>ภาพรวม</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>สลีป</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>วีดีโอ：</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>เมื่อทำเสร็จแล้ว：</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>เพิ่มภาษาที่เลือกที่เหลือทั้งหมด</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>เพิ่มแทร็กที่เหลือทั้งหมด</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>เพิ่มแทร็กใหม่</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>แทร็ก</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>ภาษาที่ใช้ได้：</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>เลือกภาษา：</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>เลือกภาษา：</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>กำหนดค่าพฤติกรรมเริ่มต้น</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>โหลดซ้ำ</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>เลือกแผ่นดิสก์ที่จะสแกน</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>เลือกไฟล์ที่จะสแกน</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>เลือกโฟลเดอร์ที่จะสแกน</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>เลือกหัวข้อเฉพาะที่ต้องการ：</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>จากนั้นเลือกวิดีโอที่คุณต้องการเข้ารหัส：</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>ไฟล์</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>โฟลเดอร์ (สแกนแบทช์)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>เปิด DVD หรือไดรฟ์ Blu-ray</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>เปิดโฟลเดอร์ที่มีไฟล์ตั้งแต่หนึ่งไฟล์ขึ้นไป</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>กู้คืนไฟล์คิว</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>ไฟล์เก็บถาวรคิวก่อนหน้าจะพร้อมใช้งาน</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>เปิดไฟล์วิดีโอเดียว</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>เลือกไฟล์ต้นทาง</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>ระยะเวลา:</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>แสดงตัวอย่างแบบเรียลไทม์</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>เลือกภาพตัวอย่าง</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>ต้องการเครื่องเล่นวิดีโอเริ่มต้นของระบบ</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>เพิ่มคำบรรยาย (ถ้ามี)</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>เพิ่ม "การสแกนเสียงภายนอก"</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>พฤติกรรมเบิร์น：</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>นำเข้าคำบรรยาย</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>ติดตามการเลือกพฤติกรรม：</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>เพิ่มคำบรรยายที่เหลือทั้งหมด</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>วิธีเลือกและกำหนดค่าแทร็กคำบรรยายโดยอัตโนมัติเมื่อเลือกชื่อใหม่หรือวิดีโอต้นทาง</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>แทร็กเสียงเพิ่มเติม</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>แทร็กคำบรรยายเพิ่มเติม</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>เบิร์น</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>เครื่องหมายเรื่อง</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>ปลดบล็อค</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>ฟิล์มถอยหลัง</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>แสดง</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>โทนสีเทา</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>ไม่มีแทร็กเสียง</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>ไม่มีเครื่องหมายเรื่อง</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>ไม่มีตัวกรอง</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>ไม่มีไฟล์ต้นทาง</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>ไม่มีคำบรรยาย</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>ไม่มีแทร็ก</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>ดูตัวอย่าง {0} / {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>หมุน</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>การจัดเก็บ</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>การเข้ารหัสรอง</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>อัตราบิตเฉลี่ย(kbps)：</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>ตัวเข้ารหัสวิดีโอ:</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>อัตราเฟรมคงที่</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>คุณภาพคงที่：</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>ระดับตัวเข้ารหัส：</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>พรีเซ็ตตัวเข้ารหัส：</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>โปรไฟล์ตัวเข้ารหัส：</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>ปรับตัวเข้ารหัส：</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>ตัวเลือกขั้นสูง：</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>ถอดรหัสเร็ว</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>อัตราเฟรม (FPS):</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>ตัวเลือกตัวเข้ารหัส: </value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>อัตราเฟรมสูงสุด</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>คุณภาพ: </value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Turbo 一ผ่าน</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>อัตราเฟรมตัวแปร</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>วีดีโอ: </value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>ภาษา：</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>ใช้ภาษาของระบบ</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>เกี่ยวกับ HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>หรือลากและวางไฟล์หรือโฟลเดอร์ที่นี่...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>ตัวช่วย</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>ตัวเลือก</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>เพิ่มแทร็ก</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>ตั้งค่าตัวเข้ารหัสเสียงสำหรับแต่ละแทร็ก：</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>ล้าง</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>เบิร์นเข้า</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>ค่าเริ่มต้น</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>บังคับเท่านั้น</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>_เกี่ยวกับ...</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>_บันทึกกิจกรรม</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>_ตรวจสอบสำหรับการอัพเดต</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>_ออก</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>_ส่งออกเป็นไฟล์</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>_ไฟล์</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>_HandBrake เอกสาร (HTTPS)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>_ตัวช่วย</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>_นำเข้าจากไฟล์</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>_ตัวเลือก</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>_พรีเซ็ต</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>_คิว</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>_รีเซ็ตพรีเซ็ตในโปรแกรม</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>_ตั้งปัจจุบันเป็นค่าเริ่มต้น</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>_แสดงแผงพรีเซ็ต</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>_แสดงคิว</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>_เครื่องมือ</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>ตรวจสอบสำหรับการอัพเดต ...</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>คุณแน่ใจหรือว่าต้องการล้างไดเร็กทอรีล็อกไฟล์นี้</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>ล้างบันทึก</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>กำลังดาวน์โหลด...</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>HandBrake ไดเร็กทอรีล็อกไฟล์ถูกล้างแล้ว</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>บันทึก</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>พร้อมอัพเดทแล้ว...</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>โปรดเลือกโฟลเดอร์</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>คลิก "เรียกดู" เพื่อตั้งค่าตำแหน่งเริ่มต้น</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>ซ่อน</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>แสดง</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>"เพิ่มทั้งหมด" ในคิว</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>"เพิ่มรายการที่เลือก" ลงในคิว</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>เล่นไฟล์</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>แถบเครื่องมือแอปพลิเคชัน</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>แสดง "เพิ่มทั้งหมดลงในคิว" ในแถบเครื่องมือ</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>แสดง "เพิ่มรายการที่เลือกในคิว" ในแถบเครื่องมือ</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>Hardware encoding support is currently disabled. If you did not start HandBrake with the "--no-hardware" option, please make sure you are running up-to-date drivers for all graphics adaptors in this system.
+
+This will not impact any of the software encoders.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>โปรดแก้ไขการตั้งค่าคำบรรยายของคุณก่อนดำเนินการต่อ</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>ใช้งาน</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>เข้ารหัสต่อไป</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>กิจกรรม</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>นำเข้าคิว</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>การเข้ารหัส: ผ่านไปแล้ว {0} จาก {1}, {2:00.00}%, FPS: {3:000.0}, เฉลี่ย FPS: {4:000.0}
+เวลาที่เหลืออยู่: {5}, ผ่านไปแล้ว: {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>ลบรายการที่เลือก</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>โหมดพกพา：ไม่สามารถสร้างไดเร็กทอรี TMP โปรดตรวจสอบว่าเส้นทางถูกต้องและเขียนได้
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>โหมดพกพา: ไม่สามารถสร้างไดเร็กทอรีที่เก็บข้อมูลได้ โปรดตรวจสอบว่าเส้นทางถูกต้องและเขียนได้
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>โหมดพกพา: ไม่สามารถอ่าน portable.ini อาจมีข้อผิดพลาดในไฟล์นี้ กรุณาใช้ portable.ini.template ลองอีกครั้งเป็นเทมเพลต</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>HandBrake ไม่สามารถเริ่มต้น engine ได้ ซึ่งมักเกิดจากไดรเวอร์ GPU ที่ล้าสมัย\n โปรดอัปเดตไดรเวอร์การ์ดแสดงผล</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>ตัวเลือกการอัปเดตตามเวลาจริง：{source} {title} {chapters} 
+ตัวเลือกการอัปเดตตามเวลาจริง：{date} {time} {creation-date} {creation-time} {quality} {bitrate} （เปลี่ยนแปลงเฉพาะเมื่อสแกนแหล่งใหม่ เปลี่ยนชื่อหรือบท）</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>มีตัวเลือกเพิ่มเติม: {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>ถามว่าจะเขียนทับไฟล์หรือไม่</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>เปลี่ยนชื่อไฟล์โดยอัตโนมัติ</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>เขียนทับไฟล์</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>การทำงานของส่วนต่อประสานผู้ใช้</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>การดำเนินการเขียนทับไฟล์</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>การเข้ารหัสเสร็จสมบูรณ์</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>ประกาศ</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>คิวเสร็จสมบูรณ์</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>เมื่อทำเสร็จแล้ว：</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>การดำเนินชื่อไฟล์ขัดแย้ง</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>คำต่อท้าย</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>คำนำหน้า</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>เพิ่มหมายเลข</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>กรองมุมมอง-ปลดบล็อคตัวกรองพรีเซ็ต</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>การปรับปลดบล็อคตัวกรอง</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>ตัวเลือกของตัวเข้ารหัสจะมีอยู่ในแท็บ "วิดีโอ"</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake ตรวจพบไฟล์คิวที่ยังไม่เสร็จหลายไฟล์ การกู้คืนไฟล์เหล่านี้จะทำให้ HandBrake เรียกใช้หลายอินสแตนซ์ คุณต้องการกู้คืนงานที่ยังไม่เสร็จทั้งหมดหรือไม่</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake ตรวจพบว่ามีรายการที่ยังไม่เสร็จในคิวเมื่อเริ่มต้นครั้งล่าสุด คุณต้องการกู้คืนรายการเหล่านี้หรือไม่</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>คิวที่กู้คืนได้</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>ไฟล์พรีเซ็ตของคุณมีพรีเซ็ตในตัว แต่ฟังก์ชันนำเข้าไม่รองรับการนำเข้าพรีเซ็ตในตัว โปรดใช้ เมนูพรีเซ็ต -&gt; รีเซ็ตพรีเซ็ตในโปรแกรม" เพื่อคืนค่าพรีเซ็ตมาตรฐาน
+
+พรีเซ็ตผู้ใช้ที่รองรับทั้งหมดจะถูกนำเข้า</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>ดำเนินการทันที (การดำเนินการนี้จะปิดใช้งานกล่องโต้ตอบการยืนยัน 60 วินาที)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>เรียกดู</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>ไม่ได้ตั้งค่าไฟล์เสียง กรุณาคลิก "เรียกดู" เพื่อเลือกไฟล์ wav หรือ mp3 ที่จะเล่น</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>เล่น</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>ส่งออกคิว (อินเทอร์เฟซบรรทัดคำสั่งเท่านั้น)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>ใช้ธีมสีเข้ม (จำเป็นต้องรีสตาร์ทซอฟต์แวร์ รองรับเฉพาะ Windows 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>ไม่พร้อมใช้งาน</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>GB</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>ตรวจพบไฟ AC กำลังดำเนินการเข้ารหัสต่อ... ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>ระบบต่ำมาก! ({0} %)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>ระบบแบตเตอรี่เหลือน้อย! ({0} %). การเข้ารหัสของคุณถูกหยุดชั่วคราว</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>ความจุที่เหลือของดิสก์เป้าหมายน้อยกว่า {0} GB。กำลังหยุดการเข้ารหัส...</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>กำหนดค่าการเลือกเสียงอัตโนมัติ</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>กำหนดค่าการเลือกคำบรรยายอัตโนมัติ</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>ระบบ</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>ผู้กระทำ：</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>ความคิดเห็น：</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>คำอธิบาย：</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>ผู้กำกับ：</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>ชนิด：</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>โครงเรื่อง：</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>วันที่ออก：</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>หัวข้อ：</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>ดูบันทึกโปรแกรม</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>รายละเอียด：</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>กรอง：</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>ขนาด：</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>ติดตาม：</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>ทั่วไป</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>คลิก "ตรวจสอบการอัปเดต" เพื่อตรวจสอบเวอร์ชันใหม่</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; กลับ</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>ถูกระงับชั่วคราว</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>ไฟล์ส่งออก</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>บท</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>จำนวนเฟรม</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>ดูตัวอย่าง</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>วินาที</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>ภาษาที่เลือกที่ตรงกันทั้งหมด</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>คำบรรยาแรกให้ตรงกับภาษาที่เลือก</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>ไม่มี</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>แทร็กเสียงแรก</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>เสียงภายนอกมีความสำคัญ มิฉะนั้น เสียงแรกจะมีความสำคัญกว่า</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>แทร็กเสียงภายนอก</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>ไม่มี</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>การค้นหาเสียงภายนอก</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>การสแกนเสียงภายนอก</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>ภาษาที่เลือกที่ตรงกันทั้งหมด</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>ใช้แทร็กทั้งหมดเป็นเทมเพลต</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>เสียงแรกให้ตรงกับภาษาที่เลือก</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>ใช้แทร็กแรกเป็นเทมเพลต</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>ไม่มีเสียง</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>เรื่อง {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>อัตโนมัติ</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>ใช้ M4V ตลอด</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>ใช้ MP4 ตลอด</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>ปรับแต่ง</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>ไม่มี</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>ใช้ความละเอียดของไฟล์ต้นทางเสมอ</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>เหนือมาตรฐาน</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>ต่ำกว่ามาตรฐาน</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>สูง</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>ต่ำ</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>มาตรฐาน</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>รายเดือน</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>รายสัปดาห์</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>ใช้เส้นทางเริ่มต้นสำหรับชื่อใหม่ที่สร้างขึ้นทุกครั้ง</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>ช่วงพอร์ตต้องอยู่ระหว่าง 5000 ถึง 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>แทนที่ตัวยึดตำแหน่ง: {source} {destination}</value>
+ <comment>Note: {source} and {destination} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>มีรุ่นใหม่ HandBrake พร้อมใช้งานแล้ว</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>ลิขสิทธิ์t (C) 2003-2022 ทีม HandBrake </value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>ระดับแบตเตอรี่ต่ำ:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>หยุดงานที่กำลังทำงานอยู่ชั่วคราวเมื่อแบตเตอรี่เหลือน้อย</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>เพิ่มคำบรรยายที่เหลือทั้งหมด</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>ตรวจพบงานที่ซ้ำกันในไฟล์คิวที่คุณกำลังพยายามนำเข้า คุณต้องการเขียนทับระเบียนที่มีอยู่หรือไม่
+การดำเนินการนี้จะหยุดงานที่กำลังทำงานอยู่</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>ตรวจพบรายการซ้ำ</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>เปิดใช้งานพลังงานต่ำกับฮาร์ดแวร์ QuickSync (ที่รองรับ)</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>โปรดเลือกงานเดียวเพื่อดูข้อมูลสรุป</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>เรียกใช้งานที่อยู่ในคิวแต่ละงานในกระบวนการของผู้ปฏิบัติงานที่แยกจากกัน</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>พอร์ตเครือข่ายเริ่มต้นสำหรับผู้ปฏิบัติงาน:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>พรีเซ็ตที่คุณเลือกไม่สามารถใช้กับระบบนี้ได้
+
+โดยทั่วไปจะเป็นการบ่งชี้ว่าระบบของคุณไม่รองรับฮาร์ดแวร์ที่จำเป็นต่อการใช้งาน
+
+โปรดเลือกพรีเซ็ตอื่น</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>การแยกกระบวนการ</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>โปรดทราบว่าการใช้คุณสมบัตินี้จะเริ่มต้นเซิร์ฟเวอร์ HTTP ที่ผูกกับ 127.0.0.1 บนพอร์ตที่ระบุ</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>หากใช้พอร์ตที่กำหนดไว้ จะพบพอร์ตว่างแรกภายใน +100 จากพอร์ตที่กำหนด</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>จำนวนการเข้ารหัสพร้อมกันสูงสุด:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>ยกเลิก</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>พรีเซ็ต：</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>เหมือนกับไฟล์ต้นทาง</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>คืนค่าการตั้งค่า</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>คุณแน่ใจหรือไม่ว่าต้องการรีเซ็ต HandBrake เป็นการตั้งค่าเริ่มต้น</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>กำหนดเอง (ไม่จำกัด)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>เติม (Surround)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>ความสูง (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>ไม่มี</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>ความกว้าง (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>เติม:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>สี:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>ขอบ:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>ความละเอียดและมาตราส่วน:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>การวางแนวและการครอบตัด:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Windows 10 เท่านั้น! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>ตัง้ค่าตัวกรอง：</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>ค่าเริ่มต้น</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>บังคับ</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K ที่สุด HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K ที่สุด HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>ปรับแต่ง</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>ขนาดสูงสุด:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>ขีดจำกัดความละเอียด:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>ไม่มี</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>จัดการพรีเซ็ต</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>ลบพรีเซ็ตในโปรแกรม</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>ส่งออกค่าพรีเซ็ตที่เลือก</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>นำเข้าพรีเซ็ต(s) จากไฟล์</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>ข้อมูลพรีเซ็ต:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>พรีเซ็ตในโปรแกรมไม่สามารถแก้ไขได้</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>ตั้งค่าพรีเซ็ตที่เลือกเป็นค่าเริ่มต้น</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>ลบที่พรีเซ็ต</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(ไม่รองรับระบบนี้)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>หยุด</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>ชื่อหมวดหมู่ที่คุณป้อนมีอยู่แล้ว โปรดเลือกชื่ออื่น</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>ชื่อหมวดหมู่ว่างเปล่า กรุณาระบุชื่อ</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>ใส่ชื่อ: </value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>ไม่ได้เลือกพรีเซ็ต</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>ส่งออกพรีเซ็ตของผู้ใช้ทั้งหมด</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>ระดับที่จะแสดงการแจ้งเตือนพื้นที่ดิสก์เหลือน้อย:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>หมายเหตุ: นี่คือขีดจำกัดสูงสุดของงานพร้อมกัน ข้อจำกัดของฮาร์ดแวร์อาจมีผลซึ่งจะลดจำนวนงานที่เกิดขึ้นจริงพร้อมกันระหว่างการเข้ารหัส</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(ไม่ว่าง)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>เป็นค่าเริ่มต้น:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>ไม่</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>ใช่</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>ปรับแต่งการตั้งค่าภาพอย่างละเอียด</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>แสดงการควบคุมการปรับการตัด</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>ใช้โหมดมืด</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>ใช้โหมดสว่าง</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>จับคู่จากระบบ</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>ธีม:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(ต้องรีสตาร์ท)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>ปรับสีให้เรียบ:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>ปริภูมิสี:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>ปริภูมิสี</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>เปิดดูตัวอย่าง</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>ดูตัวอย่างไฟล์ต้นทาง:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>สถานะงาน:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>ยกเลิก</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>เสร็จสมบูรณ์</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>การตั้งค่าไม่ถูกต้อง ตรวจสอบบันทึกสำหรับรายละเอียด</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>อินพุตไม่ถูกต้อง ตรวจสอบบันทึกสำหรับรายละเอียด</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>ไม่ทราบสถานะ ตรวจสอบบันทึกสำหรับรายละเอียด</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>ตรวจพบข้อผิดพลาดขณะพยายามอ่านไฟล์ต้นทาง</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>กระบวนการล้มเหลวที่ไม่รู้จัก ตรวจสอบบันทึกสำหรับรายละเอียด</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>จำนวนงานเสีย ตรวจสอบบันทึกสำหรับรายละเอียด</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>ไฟล์ "hb.dll" หายไป กรุณาติดตั้งใหม่</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>คำเตือน: โปรดทราบว่านี่เป็นรุ่น "โหมดปลอดภัย" ของ HandBrake ที่ไม่รองรับตัวเข้ารหัสฮาร์ดแวร์ หากคุณต้องการใช้การสนับสนุนตัวเข้ารหัสฮาร์ดแวร์ โปรดดาวน์โหลดรุ่นที่ไม่ใช่ "โหมดปลอดภัย" จากเว็บไซต์</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>โปรดทราบว่า HandBrake ไม่รองรับ Windows 7 หรือ Windows 8 เวอร์ชันใดๆ อีกต่อไป
+
+แม้ว่าคุณจะสามารถใช้แอปพลิเคชันต่อไปได้โดยยอมรับความเสี่ยงเอง แต่โปรดทราบว่าคุณลักษณะบางอย่างไม่ทำงานและอาจมีปัญหาอื่นๆ ที่ไม่ทราบสาเหตุ ไม่มีการสนับสนุนเมื่อเกิดปัญหาเหล่านี้
+
+การสนับสนุนสำหรับ Windows 7 และ 8 เลิกใช้แล้วในซีรีส์ 1.3 ซึ่งหมายความว่าจะไม่มีการอัปเดตเพิ่มเติมเพื่อแก้ไขปัญหาบนแพลตฟอร์มเหล่านี้ 
+
+คำเตือนนี้จะแสดงเพียงสองครั้งเท่านั้น</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>สีดำ</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>ปรับแต่งเอง</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>ขาว</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>ค่า RGB:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(ขยาย)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>พลิก:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>ขนาดไฟล์ต้นทาง:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>ขนาดการจัดเก็บ: {0}x{1} ขนาดจอแสดงผล: {2}x{3} อัตราส่วนภาพ: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>ตรวจพบข้อผิดพลาดในกล่องโต้ตอบไฟล์เบราว์เซอร์
+
+- โปรดทราบว่าเส้นทางของไฟล์ที่ยาวไม่ได้รับการสนับสนุนอย่างสมบูรณ์ โปรดเก็บเส้นทางของไฟล์ให้สั้นกว่า 255 อักขระ
+- ไดเร็กทอรีที่ใช้ล่าสุดสำหรับหน้าต่างนี้ ได้รับการรีเซ็ตเพื่อป้องกันข้อผิดพลาดในครั้งต่อไปที่คุณพยายามสแกนไฟล์</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>ความสูงสูงสุด:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>ความกว้างสูงสุด:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>อัตราส่วนภาพ: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>ข้อมูลเมตาทั่วไปของ Passthru</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>เส้นทางชื่ออัตโนมัติเริ่มต้นไม่ถูกต้อง {0} ต้องไม่มาก่อน {1}</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>พรีเซ็ต：</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.tr.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.tr.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.uk.resx Added

@@ -0,0 +1,2485 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>Повний список параметрів кодувальника: 
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>Знижує навантаження декодера на процесор.
+
+Встановіть, якщо ваш пристрій не може впоратись з відтворенням кінцевого файлу (наприклад, випадання кадрів)</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>Попередження: RF 0 — стиснення без втрат!</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>Значення 0 означає якість без втрат і призведе до того, що розмір файлу перевищуватиме розмір джерела, 
+хіба що джерело також було без втрат. 
+
+Шкала x264 та x265 є логарифмічною, а нижчі значення відповідають вищій якості. 
+
+Таким чином, невелике збільшення значення призведе до значного збільшення розміру кінцевого файлу.</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>Ви можете додатково зберігати налаштування зображення за допомогою цього набору. Існує 3 режими:
+
+None: налаштування зображення не зберігаються в наборі. Під час завантаження джерела вони залишатимуться як є, в межах роздільної здатності джерела. Це також впливає на анаморфування, модуль, обрізання тощо.
+
+Custom: ви можете додатково встановити максимальну ширину та висоту. При цьому кодування буде відбуватись з меншими або рівними цьому значеннями. Зберігання пропорцій також буде автоматично увімкнено.
+
+Source Maximum: завжди кодує з роздільною здатністю джерела, де це можливо.</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>Ця програма є вільним програмним забезпеченням; ви можете розповсюджувати його та/або
+змінювати його відповідно до умов GNU General Public License
+опублікованої Free Software Foundation; версії 2
+або (за вашим бажанням) будь-якої пізнішої версії.
+
+Ця програма поширюється з надією, що вона принесе користь,
+але БЕЗ БУДЬ-ЯКИХ ГАРАНТІЙ; навіть не маючи на увазі гарантії
+ТОВАРНОЇ ПРИДАТНОСТІ чи ПРИДАТНОСТІ ДЛЯ БУДЬ-ЯКОЇ ІНШОЇ МЕТИ.
+Детальнішу інформацію дивись у GNU General Public License.
+
+Ви мали отримати копію GNU General Public License
+разом з цією програмою; якщо ні – пишіть до Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>УВАГА: у вас не увімкнуто автоматичне іменування файлів. Увімкніть його в налаштуваннях.</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>УВАГА: зараз у вас не налаштовано автоматичний вибір звукової доріжки та субтитрів. Ви можете налаштувати стандартну поведінку вибору доріжки у параметрах.</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>Вбудовані набори було скинуто.</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>Скидання завершено</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>Вища якість |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| Нижча якість</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>Якість плацебо |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>Помилка</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>Ви повинні увімкнути у налаштуваннях автоматичне іменування файлів ТА встановити стандартний шлях, перш ніж зможете додати в чергу.</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>Попередження</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>Ви впевнені?</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake вже кодує.</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>У черзі вже є завдання з таким шляхом призначення. Виберіть інший шлях для цього завдання.</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value> Завдань очікує {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>Встановлено новий набір за замовчуванням: {0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>Доступне оновлення. Перейдіть до меню Інструменти &gt; Параметри для встановлення</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>Не вибрано набір.</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>Ви не можете змінювати вбудовані набори. Виберіть один зі своїх власних наборів.</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>Виберіть папку.</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>Підготовка до кодування…</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>Ви не можете імпортувати набір з таким самим іменем, як і у вбудованого набору.</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>Набір "{0}" вже існує. Ви хочете його перезаписати?</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>Набори</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>Ви дійсно хочете оновити вибраний набір?</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>Набір оновлено згідно з вашими поточними налаштуваннями.</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake визначив, що ваші вбудовані набори застаріли… Ці набори будуть оновлені.
+Ваші користувацькі набори залишились без змін, тому вам, можливо, доведеться перестворити їх, видаливши та повторно додавши їх. 
+Створено резервну копію попередньої версії файлу user_presets.xml.</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>Чергу виконано</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>Сканування скасовано</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>Сканування виконано</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>Помилка сканування:</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>Помилка сканування… За додатковою інформацією зверніться в журнал активності.</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>Сканування джерела, зачекайте…</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>Сканування заголовка {0} з {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>Перш ніж запускати кодування, потрібно просканувати джерело та налаштувати завдання. Щоб продовжити – натисніть кнопку «Джерело» на панелі інструментів.</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>Переконайтесь, що ви вибрали один зі своїх власних наборів. Зверніть увагу, що ви не можете експортувати вбудовані набори.</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>Виберіть набір для оновлення.</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>Виберіть «Джерело», щоб продовжити</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} завдань очікують</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>Повідомлення</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>Переписати?</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>Питання</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>Готовий</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>Оновлено</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>Версія набору</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>Ви намагаєтеся імпортувати набір з іншої версії HandBrake. 
+Можливо не вдасться імпортувати усі значення з цього набору. 
+
+Хочете продовжити?</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>Неможливо імпортувати набір!</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>Неможливо імпортувати набір, схоже він пошкоджений, або зі старішої версії HandBrake.</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>Перш ніж додати до черги, необхідно встановити шлях призначення для вихідного файлу.</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>Введений шлях призначення містив недопустимі символи та не буде оновлений.</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>Попередній перегляд {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>Попередній перегляд (масштабований)</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>Вихід: {0}</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>Формат вихідного файлу. На додаток до будь-якого підтримуваного символу файлової системи, ви можете використовувати наступні покажчики місця заповнення, що будуть замінені під час зміни заголовка чи сканування джерела.
+
+Динамічні опції оновлення: {source} {title} {chapters} 
+Нединамічні опції: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (вони змінюються, лише при скануванні нового джерела, зміни назви чи глав)</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>Доступні додаткові параметри: {source_path} чи {source_folder_name} чи {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>Ви не можете кодувати в файл, що має той самий шлях та ім'я файлу, що і вихідний файл. Оновіть ім'я файлу призначення, щоб воно не збігалось з вихідним файлом.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>Ваша система не дозволила HandBrake запустити браузер.</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>Ви все ще можете отримати доступ до сторінок довідки, безпосередньо відвідавши вебсайт за адресою: https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>Неможливо імпортувати вибраний набір.</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>Набір може бути пошкоджений, або зі старішої версії HandBrake, а це не підтримується.
+Набори зі старіших версій необхідно створити заново в поточній версії.</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>Додаткові розширені аргументи, що можна передати кодувальнику відео.</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>Немає – вбудовуються лише доріжки, де контейнер не підтримує формат.
+Іншомовна звукова доріжка – буде вбудована іншомовна звукова доріжка, при наявності.
+Перша доріжка – буде вбудована перша доріжка.
+Бажано іншомовне аудіо, інакше перше – якщо іншомовна звукова доріжка існує – вона буде вбудована, інакше буде обрана перша доріжка.</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>Сумісність з субтитрами WebM</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>WebM в HandBrake підтримує лише вбудовані субтитри.
+
+Ви повинні змінити свій вибір субтитрів.
+
+Якщо продовжите – ваші не вбудовані субтитри буде втрачено.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>Не знайдено дійсного джерела чи заголовків.</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake не зможе кодувати вибране джерело, оскільки не знайшов дійсного джерело із заголовками для кодування. 
+Причини можуть бути наступні:
+- Тривалість кожного заголовка джерела нижча за граничне значення «Мінімальна тривалість заголовка» в «Параметри &gt; Додатково». 
+- Вихідний файл не є дійсним відеофайлом, або формату що не підтримує HandBrake.
+- Джерело може бути захищено від копіювання або містити DRM. Зауважте, що HandBrake не підтримує зняття захисту від копіювання.
+
+У журналі активності може міститись додаткова інформація.</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>Черга {0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>Почати кодування</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>Запустити чергу</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>Ви не можете видалити набір за замовчуванням. Спершу встановіть за замовчуванням інший набір.</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>Дійсно хочете видалити набір:</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Кодування: прохід {0} з {1}, {2:00.00}%, FPS: {3:000.0}, середній FPS: {4:000.0}, залишилося часу: {5}, пройшло: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>Набір повинен мати назву. Заповніть назву набору.</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>Набір з цим іменем вже існує. Хочете його перезаписати?</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>Щоб використовувати параметр «Максимум джерела» потрібно спочатку просканувати джерело.</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>Для параметра «Власне» потрібно заповнити користувацькі поля ширини чи висоти.</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>Неможливо додати набір</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>Невідома помилка</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>Стандартні параметри аудіо</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>Звукові доріжки</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Поведінка вибору</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>Перемикнутися назад до доріжок</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>Не вдається зберегти файл маркерів глав!</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>Назви маркерів глав НЕ будуть збережені у вашому кодувальнику.</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>Наступна дія '{0}' відбудеться через {1} секунди.</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>If the problem persists, please try restarting HandBrake.</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>Додаткової інформації про цю помилку немає.</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>Сталася невідома помилка.</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>Доступне нове оновлення! Нотатки про випуск доступні на вебсайті.</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>Ваша система підтримує 64-бітну версію HandBrake! Це покращить продуктивність та стабільність в порівнянні з 32-бітною версією.
+Нотатки про випуск доступні на вебсайті.</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>Наразі немає оновлень.</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>Оновлення завантажено</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>Служба оновлення недоступна. Можете спробувати завантажити оновлення з https://handbrake.fr</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>Помилка оновлення. Можете спробувати завантажити оновлення з https://handbrake.fr</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>Storage Size: {0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>Додати до черги</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>В очікуванні немає кодувань</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>Зараз немає завдань в процесі кодування</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>Черга</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>Дійсно хочете очистити чергу?</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>Підтвердження</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} завдань очікують</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>Черга призупинена</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>Дійсно хочете видалити вибрані завдання?</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>Наразі це кодування триває. Якщо його видалити – кодування буде зупинено. Дійсно хочете продовжити?</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>В очікуванні немає завдань</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>Дійсно змінити це завдання? Воно буде вилучене з черги та відправлене у головне вікно.</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>Черга готова</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>Черга не запущена</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>Черга завершена</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>Завершено останнє завдання в черзі</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>Черга запущена</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>Кодування: прохід {0} з {1}, {2:00.00}%, FPS: {3:000.0}, середній FPS: {4:000.0}, залишилося часу: {5}, пройшло: {6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>Триває кодування. Вихід з HandBrake зупинить це кодування.
+Дійсно хочете вийти з HandBrake?</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>Попередній перегляд зображення</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>Не вдалося видалити останній файл попереднього перегляду. Можливо, він відкритий у вашому програвачі медіа. Будь ласка, закрийте його.</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>Перед створенням файлу попереднього перегляду слід просканувати джерело та налаштувати параметри кодування.</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>Не вдається знайти файл попереднього перегляду. Файл або видалений, або кодування не вдалося. За додатковою інформацією зверніться в журнал активності.</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>Handbrake уже кодує відео! Одночасно можна кодувати лише один файл.</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>Стандартні параметри субтитрів</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>Доріжки субтитрів</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>Перемикнутися назад до доріжок</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>Поведінка вибору</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>Файлу архіву:</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>Не вдалося завантажити набори.</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake не вдалося завантажити файл наборів. Можливо, він зі старішої непідтримуваної версії HandBrake, або пошкоджений. 
+
+Ваш старий файл наборів заархівовано у:</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> помилок чи скасувань зафіксовано: {0}.</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>Бракує місця на диску</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>Попередження, у вас мало місця на диску. HandBrake не зможе завершити це кодування, якщо у вас не вистачить місця.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>Недійсний рядок {0}. Нічого не буде імпортовано.</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>Не вдається імпортувати файл глав</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>Усі рядки у файлі глав повинні мати не менше 2 стовпців даних</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>Перший стовпець у файлі глав повинен містити лише ціле число, більше за нуль (0)</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>Файли глав типу '{0}' наразі не підтримуються.</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>Непідтримуваний тип файлу глав</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>Недійсна інформація глави для джерела мультимедійного вмісту</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>Кількість глав у джерелі мультимедійного вмісту
+та кількість глав у вхідному файлі не збігаються ({0} проти {1}).
+
+Все ще хочете імпортувати назви глав?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>Кількість глав у джерелі мультимедійного вмісту
+та кількість глав у вхідному файлі не збігаються ({0} проти {1}).
+
+Все ще хочете імпортувати назви глав?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>Кількість глав не збігається у джерела та вхідного файлу</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>Тривалість глав на джерелі мультимедійного вмісту 
+та тривалість глав у вхідному файлі сильно відрізняються.
+
+З великою ймовірністю цей файл глав створений з іншого джерела мультимедійного вмісту.
+
+Дійсно імпортувати назви глав?</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>Тривалість глав не збігається у джерела та вхідного файлу</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>Під час спроби зупинити сканування сталася помилка. Перезапустіть HandBrake.</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake не в змозі оновити файл наборів до формату нової версії.
+Ваш файл наборів буде заархівовано та створено новий. Вам потрібно буде заново створити власні набори.</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>Будь-які ваші зміни в налаштуваннях можуть бути скинути при наступних запусках HandBrake.</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>Виникла проблема при спробі зберегти налаштування.</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>Увага, ваші налаштування скинуто!</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>Файл налаштувань користувача пошкоджений або недоступний. Налаштування скинуто до стандартних значень.</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>Не вдається завантажити файл налаштувань користувача: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>Здається, файл налаштувань користувача недоступний чи пошкоджений. Можливо, вам доведеться видалити цей файл, щоб HandBrake зміг створити новий.</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>Вибраний каталог для виводу не існує, або у вас немає дозволу на запис файлів в нього.</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>Створити папку?</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>Не існує папки в яку ви намагаєтеся записати. Хочете, щоб HandBrake створив її?
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>Не вдається запустити каталог призначення.</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>Перевірте, чи каталог призначення дійсний.</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>Прохід обробки {0} з {1}, (сканування субтитрів) {2:00.00}%, залишилося часу сканування: {3}, пройшло: {4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>Немає додаткової інформації</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, прохід {2} з {3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, прохід {2} з {3}
+Залишилося часу: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>Черга призупинена. Попередження: бракує місця на накопичувачі, який ви використовуєте для призначення кодування. Щоб продовжити, звільніть місце і натисніть почати. Також можете задати значення мінімальної кількості вільного місця в налаштуваннях.</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>Черга призупинена</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>Черга призупинена</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>У каталозі призначення мало вільного дискового простору. 
+
+У налаштуваннях можете задати рівень, при якому з’являється це попередження. 
+
+Хочете продовжити?</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>Неможливо скинути статус завдання, оскільки воно не знаходиться в стані «помилка» чи «завершено»</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>Не вдається відновити файл черги.</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>Файл може бути пошкодженим або зі старішої, несумісної версії HandBrake</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake вже кодує файл.</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>Будь ласка, зупиніть поточне кодування. Якщо проблема не зникає – перезапустіть HandBrake.</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>Попередній перегляд ({0}% фактичного розміру)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>Для запуску HandBrake потрібна 64-розрядна версія Windows 7 або пізніша версія.</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>Для запуску HandBrake потрібна Windows 7 або пізніша версія. Версія 0.9.9 (XP) та 0.10.5 (Vista) були останніми версіями, що підтримували ці ОС.</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>Хочете спробувати додати решту?</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>Файл '{0}' вже існує!
+Ви хочете його перезаписати?</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>На цю мить системний буфер обміну недоступний.</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>Це може бути пов’язано з іншим додатком, що відстежує чи блокує буфер обміну для власного користування. Ви не зможете використовувати буфер обміну, поки він не буде розблокований.</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>Ліцензія:</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>Версія: </value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- Додати нову категорію --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>Додати набір</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>Категорія:</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>Опис:</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>Назва:</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>Розміри:</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>Вибір доріжки джерела</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>Дозволити передачу:</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>Налаштуйте спосіб автоматичного вибору та налаштування звукових доріжок під час вибору нового заголовка чи джерела відео.</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>Поведінка «Автопередачі»:</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>Бітрейт</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>Кодек</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>Підсилення</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>Приховати</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Мікшування</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>Резервний кодувальник:</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>Перезавантажити</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>Частота дискретизації</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>Показати</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>Назва доріжки</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Поведінка вибору доріжки:</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>Для додаткових доріжок:</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>Коли як аудіокодек вибрано «Автопередача» (Auto Passthru).</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>Маркери глав</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>Назва глави</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>Номер глави</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>Створити маркери глав</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>Тривалість</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>Експорт</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>Імпорт</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>Експортувати назви</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>Імпортувати назви</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>Скинути назви глав</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>Скасувати дію</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>Продовжити</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>Дія після завершення</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>Відомості про помилку:</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>Власне:</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>Deblock:</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Видалення «гребінки»</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>Деінтерлейсинг:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>Набір:</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>Набір деінтерлейсингу</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>Усунення шумів:</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>Набір усунення шумів</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>Настроювання усунення шумів</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Видалення «гребінки»:</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>Фільтри</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>Horizontal</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>Відтінки сірого</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>Виявлення інтерлейсингу:</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>Набір:</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>Rotation:</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>Sharpen:</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>Набір різкості</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>Настроювання різкості</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>Настроювання:</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>Додати</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>Скасувати</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>Очистити</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>Закрити</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>Копіювати до буфера обміну</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>Ліворуч</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>Праворуч</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>Зберегти</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>Копіювати до буфера обміну</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>Журнал кодування</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>Відкрити каталог журналів</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>Журнал сканування</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>Журнал активності</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>Додати все</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>Додати поточний</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>Додати вибране</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>Додати до черги</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>Додатково</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Вирівняти початок A/V</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Ракурс: </value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>Аудіо</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>Звукові доріжки</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>Огляд</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>Глави</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>Контейнер</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Шлях призначення</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Тривалість: </value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>Зберегти як:</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>Фільтри</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>Формат:</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>Довідка</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>Підтримка iPod 5G</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>Метадані</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(Змінено)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>Мультиплексування: це може тривати певний час…</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>Параметри</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>Параметри виводу</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>Призупинити</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>Розміри</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>Перейменувати набір</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Контекстне меню опцій наборів</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>Видалити набір</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Набори</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>Попередній перегляд</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>Кодування: {0}, {1:00.00}%, Залишилося часу: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Діапазон:</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>Перезавантажити</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>Вилучити</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>Скинути вбудовані набори</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>Зберегти новий набір</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>Пошук часу початку</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>Зробити стандартним</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>Попередній перегляд</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>Черга</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>Джерело:</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>Відкрити джерело</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>Почати кодування</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>Запустити чергу</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>Перервати</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>Зупинити кодування</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>Дійсно хочете зупинити це кодування?</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>Перед спробою імпорту файлу субтитрів слід вибрати джерело для кодування.</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>Субтитри</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>Доріжки субтитрів</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>Відомості</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Заголовок: </value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>Оновити вибраний набір</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>Відео</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>Оптимізований для веб-перегляду</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>Управління наборами</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>Метадані</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>Дозволити використання кодувальників Nvidia NVENC</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>Дозволити використання кодувальників Intel QuickSync</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>Дозволити використання кодувальників AMD VCE</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>Введений формат файлу містив недійсні символи. Вони були видалені.</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>Відтворювати звук після завершення кожного кодування</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>Відтворювати звук після завершення черги</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>Показувати попередній перегляд на вкладці «Відомості»</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>Показувати стан кодування в рядку заголовка програми</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>Очищувати файли журналу старші за 7 днів</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>Про HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>Додатково</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>Розширені опції</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>Аргументи:</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>Автоматичне іменування файлів</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>Автоматично іменувати вихідні файли</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>Шукати оновлення</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>Завжди очищати завершені елементи черги після закінчення кодування</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>Очистити журнали</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>Класти копію особистих журналів кодування у вказане місце:</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>Класти копію особистих журналів кодування в те ж місце, що і кодоване відео</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>Поточна версія</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>Декодування</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>Стандартний шлях:</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>Завантажити оновлення</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>Читання DVD</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>Вимкнути LibDVDNav (натомість буде використовуватися libdvdread)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>Кодування</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>Формат файлу:</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>Загальні</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>Журналювання</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>Рівень детальності журналу:</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>Шлях журналу:</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>Призупиняти чергу при браку дискового простору</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>Мінімізовувати в системний трей (потрібен перезапуск)</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>Мінімальна тривалість заголовка DVD та Blu-ray у секундах. Коротші заголовки будуть пропущені:</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>Розширення файлу MP4:</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>При запуску</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>Вихідні файли</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>Шлях: </value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>Шлях до програвача</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>Вимикати системний режим сну під час кодування</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>Сканувати зображень попереднього перегляду:</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>Пріоритет процесу:</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>Віддавати перевагу використанню Intel QuickSync для декодування відео, якщо доступно</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>Також використовувати декодування QSV, коли не використовується кодувальник QuickSync (тобто x265)</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>Видаляти поширені розділові знаки</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>Замінювати символи підкреслення пробілом</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>Скидати до «Нічого не робити», коли додаток перезапущено</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>Choose Scaler:</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>Масштабування</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>Надіслати файл в:</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>Замінювати регістр на Капіталізацію</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>Оновлення</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>Інтерфейс користувача</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>Версія:</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>Відео</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>Цей шлях використовується лише для функції попереднього перегляду відео.
+Підтримуються програвачі VLC та MPC-HC. Інші програвачі також можуть працювати, але їх перевірка не здійснювалась.</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>Переглянути каталог журналів</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>Після завершення</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>Налаштування x264/5</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>Дробовий крок для постійної якості:</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Анаморфування:</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>Автоматично</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>Знизу</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>Обрізання:</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>Власне</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>Display Size:</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Висота:</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Автоматично</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>Зліва</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>Final Dimensions:</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Pixel Aspect:</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>Справа</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>Розмір</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>Зверху</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Scaled Size:</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>Власне</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>Експортувати до файлу</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>Імпортувати з файлу</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>Офіційний</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>Виберіть заголовки:</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>Додати до черги</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>Вибрані заголовки будуть додані за допомогою набору «{0}».</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>Параметри відео:</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>Аудіо:</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>Очистити все</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>Очистити завершені</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>Очистити чергу</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>Очистити вибране</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>Видалити</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>Шлях призначення:</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>Нічого не робити</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>Час кодування:</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>Змінити</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>Час завершення:</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>Експортувати чергу</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>Розмір файлу:</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>Режим глибокого сну</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>Заблокувати систему</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>Журнал буде доступний після завершення кодування.</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>Вийти із системи</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>Відкрити каталог призначення</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>Відкрити каталог джерела</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>Параметри</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>Призупинити</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>Тривалість паузи:</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>Параметри зображення:</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>Закрити HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>Повторіть усі завдання</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>Повторити невдалі</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>Скинути вибрані завдання</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>Скинути</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>Вимкнути живлення</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>Джерело:</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>Запустити чергу</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>Час початку:</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>Статистика</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>Статистика буде доступна після завершення кодування.</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>Субтитри:</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>Відомості</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>Режим сну</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>Відео:</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>Після завершення:</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>Додати всі вибрані мови, що залишились</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>Додати всі доріжки, що залишилися</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>Додати нову доріжку</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>Доріжки</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>Доступні мови:</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>Виберіть мови:</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>Вибрані мови:</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>Налаштувати стандартну поведінку</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>Перезавантажити</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>Виберіть диск для сканування</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>Виберіть файл для сканування</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>Виберіть папку для сканування</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>За бажанням можете вибрати конкретний заголовок:</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>Потім виберіть відео, яке ви хочете кодувати:</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>Файл</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>Папка (пакетне сканування)</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>Відкрийте цей DVD або Blu-ray диск</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>Відкрийте папку з одним або кількома файлами.</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>Відновити файли черги</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>Доступний архів попередньої черги.</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>Відкрийте один відеофайл.</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>Вибір джерела</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>Тривалість:</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>Перегляд наживо</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>Виберіть зображення для попереднього перегляду</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>Надавати перевагу стандартному відеопрогравачу</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>Додавати приховані субтитри, при наявності</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>Додавати «Сканування іншомовного аудіо»</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>Поведінка вбудовування:</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>Імпортувати субтитри</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>Поведінка вибору доріжки:</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>Додати всі приховані субтитри, що залишилися</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>Налаштуйте спосіб автоматичного вибору та налаштування доріжок субтитрів під час вибору нового заголовка чи джерела відео.</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>Додаткові звукові доріжки</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>Додаткові доріжки субтитрів</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>Вбудована</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>Маркери глав</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>Deblock</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Видалення «гребінки»</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>вивід</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>Відтінки сірого</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>Немає звукових доріжок</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>Немає маркерів глав</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>Немає фільтрів</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>Немає джерела</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>Немає доріжок субтитрів</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>Немає доріжок</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>Попередній перегляд {0} з {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>Поворот</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>зберігання</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>2-прохідне кодування</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>Середній бітрейт (кбіт/с):</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>Кодувальник відео:</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>Постійна частота кадрів</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>Постійна якість:</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>Рівень кодувальника:</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>Набір кодувальника:</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>Профіль кодувальника:</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>Налаштування кодувальника:</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>Розширені опції:</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>Швидке декодування</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>Частота кадрів:</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>Параметри кодувальника: </value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>Пікова частота кадрів</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>Якість: </value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Швидкий перший прохід</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>Змінна частота кадрів</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>Відео: </value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>Мова:</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>Системна мова</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>Про HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>Або перетягніть сюди файл чи папку…</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>Довідка</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>Налаштування</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>Додати доріжку</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>Налаштування кодувальника аудіо для кожної вибраної доріжки:</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>Очистити</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Вбудовані</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>Стандартно</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>Тільки примусово</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>_Про програму…</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>_Журнал активності</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>Перевірити наявність _оновлень</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>_Вийти</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>_Експортувати у файл</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>_Файл</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>_Документація HandBrake (HTTPS)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>_Довідка</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>_Імпортувати з файлу</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>_Параметри</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>_Набори</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>_Черга</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>_Скинути вбудовані набори</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>_Встановити поточний за замовчуванням</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>_Показати панель наборів</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>Показати _чергу</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>_Інструменти</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>Пошук оновлень…</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>Дійсно хочете очистити каталог файлів журналу?</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>Очистити журнали</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>Завантаження…</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>Каталог файлів журналу HandBrake очищений!</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>Повідомлення</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>Підготовка до оновлення…</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>Виберіть папку.</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>Клацніть «Огляд», щоб встановити стандартне розташування</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>Приховати</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>Показати</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>«Додати все» до черги</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>«Додати вибране» до черги</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>Відтворити файл</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>Панель інструментів програми</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>Показувати «Додати усе до черги» на панелі інструментів</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>Показувати «Додати вибране до черги» на панелі інструментів</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>Підтримка апаратного кодування відключена. Якщо ви не запускали HandBrake з опцією "--no-hardware", будь ласка, переконайтесь, що ви використовуєте оновлені драйвери для всіх графічних адаптерів у цій системі.
+
+Це не вплине на жоден із програмних кодувальників.</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Перш ніж продовжувати, виправте налаштування субтитрів.</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>Застосувати</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>Продовжити кодування</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>Дії</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>Імпортувати чергу</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>Кодування: прохід {0} з {1}, {2:00.00}%, FPS: {3:000.0}, середній FPS: {4:000.0}
+Залишилося часу: {5}, пройшло: {6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>Видалити вибране</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>Портативний режим: неможливо створити каталог TMP. Перевірте правильність шляху та права запису.
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>Портативний режим: неможливо каталог для зберігання. Перевірте правильність шляху та права запису.
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>Портативний режим: не вдається прочитати portable.ini. Можливо, виникла помилка у цьому файлі. Повторіть спробу, використовуючи portable.ini.template як основу.</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>Не вдалося ініціалізувати рушій HandBrake. Це часто викликано через застарілі драйвери GPU.\n Оновіть драйвери GPU для будь-якої вбудованої та дискретної графіки, що містить ваша система.</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Динамічні опції оновлення: {source} {title} {chapters} 
+Нединамічні опції: {date} {time} {creation-date} {creation-time} {quality} {bitrate} (вони змінюються, лише при скануванні нового джерела, зміни назви чи глав)</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>Доступні опції: {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>Питати про перезапис файлу</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>Пробувати автоматично перейменовувати файл</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>Перезаписувати файл</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>Поведінка інтерфейсу користувача</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>Поведінка перезапису файлів:</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>Кодування завершено</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>Сповіщення</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>Черга завершена</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>Після завершення:</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>Поведінка при конфлікті імен файлів:</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>Постфікс</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>Префікс</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>Додавати номер</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>FiltersView_DeblockPreset</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>Настроювання Deblock</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>Вибір кодувальника буде доступний на вкладці «Відео».</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake виявив декілька незавершених файлів черги. Вони з декількох запущених екземплярів HandBrake. Хочете відновити всі незакінчені завдання?</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake виявив незавершені елементи в черзі з останнього запуску програми. Хочете їх відновити?</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>Можливе відновлення черги</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>Ваш файл наборів містив вбудовані набори. Функція імпорту не підтримує імпорт такого типу. Будь ласка, використайте «меню Набори -&gt; Скинути вбудовані набори», щоб відновити стандартні набори.
+
+Будь-які набори користувача будуть імпортовані, якщо вони підтримуються.</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>Виконувати дію негайно (це вимкне 60 секундне діалогове вікно підтвердження)</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>Огляд</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>Не встановлено жодного аудіофайлу. Клацніть «Огляд», щоб вибрати WAV або mp3 файл для відтворення.</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>Відтворити</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>Експортувати чергу (тільки для CLI)</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>Використовувати темну тему (потрібен перезапуск, лише для Windows 10)</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>Недоступно</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>ГБ</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>Виявлено живлення від мережі. Відновлення кодування… ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>Критичний заряд акумулятора! ({0} %)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>Низький заряд акумулятора! ({0} %). Кодування призупинено.</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>Обсяг вільного дискового простору на диску, на якому розташований каталог призначення, зменшився нижче {0} ГБ. Призупиняємо кодування…</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Налаштування автоматичного вибору аудіо</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>Налаштування автоматичного вибору субтитрів</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>Система</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>Виконавці:</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>Коментарі:</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>Опис:</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>Режисер:</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>Жанр:</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>Сюжет:</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>Дата виходу:</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>Заголовок:</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>Переглядач журналу</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>Співвідношення сторін:</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>Фільтри:</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>Розмір:</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>Доріжки:</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>Загальні</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>Клацніть «Шукати оновлення», щоб перевірити наявність нових версій</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; Назад</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>В даний час призупинено</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>Вихідні файли</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>Глави</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>Кадри</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>Попередній перегляд</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>Секунди</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Усі збіги вибраним мовам</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>Перший збіг вибраним мовам</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>Немає</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Перша доріжка</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>Бажано іншомовне аудіо, інакше перше</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>Іншомовна звукова доріжка</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>Немає</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>Пошук іншомовного аудіо</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>Сканування іншомовного аудіо</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>Усі збіги вибраним мовам</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>Використовувати усі доріжки як шаблони</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>Перша відповідність вибраній мові</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>Використовувати першу доріжку як шаблон</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>Без звуку</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>Глава {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>Автоматично</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>Завжди використовувати M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>Завжди використовувати MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>Власне</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>Немає</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>Завжди використовувати роздільність джерела</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>Вище середнього</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>Нижче середнього</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>Високий</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>Низький</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>Середній</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>Щомісяця</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>Щотижня</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Завжди використовувати стандартний шлях для кожного створеного нового імені</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>Діапазон порту повинна бути від 5000 до 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>Заміна покажчиків місця заповнення: {source} {destination}</value>
+ <comment>Note: {source} and {destination} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>Доступна нова версія HandBrake!</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>Copyright (C) 2003-2022 The HandBrake Team</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>Низький рівень заряду акумулятора:</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>Призупиняти будь-які запущені завдання, коли акумулятор розрядиться.</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>Додати всі приховані субтитри, що залишилися</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>Ви намагаєтеся імпортувати файл черги, у якому виявлено дубльовані завдання. Хочете перезаписати наявні записи? 
+Також, це зупинить будь-які наявні запущені завдання.</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>Виявлені дублікати</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>Увімкнути енергозбереження для апаратного забезпечення QuickSync (якщо підтримується)</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>Щоб переглянути відомості виберіть якесь завдання.</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>Запускати кожне завдання в черзі як окремий процес.</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Стандартний мережевий порт для процесу:</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>Вибраний набір недоступний для використання у цій системі.
+
+Зазвичай це свідчить про те, що ваша система не підтримує обладнання, необхідне для використання цього набору.
+
+Будь ласка, оберіть інший набір.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>Ізоляція процесів</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>Зауважте, використання цієї функції запустить HTTP сервер, що буде прив’язаний до адреси 127.0.0.1 на вказаному порту.</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>Якщо порт вже використовується, програма знайде перший вільний порт у межі +100 від вказаного порту.</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>Максимальна кількість одночасних кодувань:</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>Скасувати</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>Набір:</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>Так само, як в джерелі</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>Скинути налаштування</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>Дійсно хочете скинути налаштування HandBrake до стандартних?</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>Спеціальне (без обмежень)</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>Fill (Surround)</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>Height (Pillarbox)</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>Немає</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>Width (Letterbox)</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>Fill:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>Колір:</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>Межі:</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>Роздільна здатність та масштабування:</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>Orientation and Cropping:</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>( Тільки Windows 10! )</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>Фільтри:</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>Стандартно</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>Форсована</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>Власне</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>Maximum Size:</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>Межа роздільності:</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>Немає</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>Управління наборами</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>Видалити вбудовані набори</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>Експортувати вибраний набір</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>Імпортувати набори з файлу</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>Інформація про набір:</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>Неможливо змінювати вбудовані набори.</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>Встановити вибраний набір стандартним</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>Видалити набір</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>(Не підтримується в цій системі)</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>Перервати</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value />
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>Введена назва категорії вже існує. Виберіть іншу назву.</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>Назва категорії порожня. Будь ласка, вкажіть назву.</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>Введіть назву:</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>Не вибрано жодного набору.</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>Експортувати всі набори користувача</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>Значення, коли показуються сповіщення про брак дискового простору:</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>Примітка: це максимальна кількість одночасних завдань. Апаратні обмеження можуть знизити фактичну кількість одночасних завдань під час кодування.</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>(Недоступно)</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>Стандартний:</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>Ні</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>Так</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>Тонке налаштування зображення</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>Показувати меню для обрізування</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>Темна</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>Світла</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>Як у системі</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>Тема:</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>(Потрібен перезапуск)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth:</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Колірний простір:</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>Колірний простір</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>Відкрити попередній перегляд</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>Попередній перегляд джерела:</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>Статус завдання:</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>Скасовано</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>Завершено</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>Недійсні налаштування. Погляньте в журнал для отримання детальнішої інформації.</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>Недійсний ввід. Погляньте в журнал для отримання детальнішої інформації.</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>Невідомий статус. Погляньте в журнал для отримання детальнішої інформації.</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>Помилка при спробі прочитати джерело.</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>Невідома помилка. Погляньте в журнал для отримання детальнішої інформації.</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Процес завершився аварійно. Погляньте в журнал для отримання детальнішої інформації.</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>Відсутній файл "hb.dll". Будь ласка, перевстановіть програму.</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>Попередження: зверніть увагу, що це збірка HandBrake у "Безпечному режимі", яка не включає підтримку апаратних кодувальників. Якщо ви хочете скористатися підтримкою апаратного кодувальника, завантажте з вебсайту звичайну збірку.</value>
+ </data>
+ <data name="OldOperatingSystem" xml:space="preserve">
+ <value>Зверніть увагу, що HandBrake більше не підтримується в жодній версії Windows 7 або Windows 8.
+
+Незважаючи на це ви можете продовжувати використовувати програму на свій страх і ризик, але майте на увазі, що деякі функції можуть не працювати, та виникнути інші невідомі проблеми. Під час виникнення цих проблем підтримка недоступна. 
+
+Підтримка Windows 7 і 8 вилучена у версіях 1.3. Це означає, що подальших оновлень для виправлення проблем на цих платформах не буде. 
+
+Це попередження показуватиметься лише двічі.</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>Чорний</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>Власне</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>Білий</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>Значення RGB:</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>(padded)</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>Flip:</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>Source Dimensions:</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>Storage Size: {0}x{1} Display Size: {2}x{3} Aspect Ratio: {4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>Виявлено помилку в діалоговому вікні файлового провідника. 
+
+- Зверніть увагу, довгі шляхи до файлів повністю не підтримуються. Будь ласка, зберігайте шляхи до файлів меншими за 255 символів. 
+- Останній використаний каталог для цього вікна було скинуто для запобігання помилок під час наступної спроби сканувати файл.</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>Максимальна висота:</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>Максимальна ширина:</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>Aspect Ratio: {0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>Passthru Common Metadata</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>Набір:</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.zh-Hans.resx Added

@@ -0,0 +1,2598 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>完整的编码器参数列表：
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>减少解码器对CPU的占用。
+
+当您的设备无法流畅播放输出时选择此选项。（例如：丢帧）</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>警告： RF 0 表示无损！</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>值为“0”表示无损，将导致文件大小大于原始源，除非源文件也是无损的。
+
+使用x264和x265时比例是对数的，较低的值对应于较高的质量。
+
+因此，即使值的小幅减少也会导致文件大小逐渐增大。</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>您可以选择使用此预设存储图像设置。有 3 种模式：
+None：图像设置不存储在预设中。加载源时，它们将保持在源分辨率的范围内。这也会影响变形、模量、裁剪等。
+
+Custom：您可以选择设置最大宽度和高度。这样做时，输出视频的宽度和高度不会超过设定值。保持宽高比将自动打开。
+Source Maximum：始终在源分辨率下进行编码。</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>本程序是自由软件；您可以根据自由软件基金会发布的
+GNU 通用公共许可证的条款重新发布它和/或修改它；
+该许可证的第 2 版，或（您选择）任何更高的版本。
+
+本程序的分发是希望它能起到作用。但没有任何保证；
+甚至没有隐含的适销性或特定用途的保证。
+更多细节请参见 GNU 通用公共许可证。
+
+您应该已经随本程序收到了一份 GNU 通用公共许可证的副本；
+如果没有，请写信给自由软件基金会，地址是
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA。</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>警告：自动文件命名选项未打开。请在设置中开启。</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>警告：您当前没有自动选择音频和字幕轨道的设置。您可以在选项中设置默认轨道选择行为。</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>内置的预设已被重置。</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>重置完成</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>高质量 |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| 低质量</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>最高质量 |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>错误</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>在添加到队列之前，必须启用自动文件命名并在首选项中设置默认路径。</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>警告</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>您确定吗？</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake 已在进行编码。</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>队列中的作业具有相同的目标路径。请为此作业选择不同的路径。</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>挂起的任务 {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>新的默认预设集：{0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>有新的更新可用。转到“工具”菜单 &gt; “选项”安装</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>未选择预设。</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>您无法修改内置预设。请选择一个您自己的预设。</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>请选择一个文件夹。</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>正在准备编码…</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>您无法导入与内置预设同名的预设。</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>预设 "{0}" 已经存在。您想覆盖它吗？</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>预设</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>您确定要更新所选预设吗？</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>预设现在已使用您当前的设置进行更新。</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake 已确认您的内置预设已过期... 现在将更新这些预设。
+您的自定义预设尚未更新，因此您可能需要通过删除和重新添加来重新创建这些预设。
+以前的 user_presets.xml 文件已备份。</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>队列完成</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>扫描取消。</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>扫描完成</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>扫描失败：</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>扫描失败...有关详细信息，请参阅活动日志。</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>正在扫描源，请稍候…</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>正在扫描标题 {0}/{1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>在开始编码之前，必须首先扫描源并设置作业。单击工具栏上的“添加源”按钮继续。</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>请确保您已选择自己的预设。请注意，您无法导出内置预设。</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>请选择要更新的预设。</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>选择“源”以继续</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0} 等待作业</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>注意</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>是否覆盖？</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>问题</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>准备就绪</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>更新</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>预设版本</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>您尝试导入的预设来自不同版本的 HandBrake。
+可能无法从此预设中导入所有值。
+
+您要继续吗？</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>无法导入预设！</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>无法导入预设，因为它似乎已损坏或来自旧版本的 HandBrake。</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>在添加到队列之前，必须先为输出文件设置目标路径。</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>输入的目标路径包含非法字符，将不会更新。</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>预览{0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>预览（缩放）</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>输出：{0}</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>可用的附加选项: {source_path} 或 {source_folder_name} 或 {source}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>您不能编码到与源文件具有相同路径和文件名的文件。请更新目标文件名，使其与源文件不匹配。</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>您的系统阻止了 HandBrake 启动网页浏览器。</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>您仍然可以直接访问网站的帮助页面：https://handbrake.fr</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>无法导入所选预设。</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>预设可能已损坏，或者来自不受支持的旧版 HandBrake。
+必须在当前版本中重新创建旧版本的预设。</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>可以传递给视频编码器的其他高级参数。</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>None：只有容器不支持的轨道才会被烧入。
+Foreign Audio Track：如果可用，外语轨道将被烧入。
+First Track：第一条轨道会被烧入。
+Foreign Audio Preferred, else First：如果存在外语轨道，则会将其烧入，否则将选择第一条轨道。</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>WebM 字幕兼容性</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>HandBrake 中的 WebM 格式仅支持内嵌字幕。
+
+您应该更改字幕选择。
+
+如果继续，您未烧录的字幕将丢失。</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>找不到有效的源或标题。</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake 不能对选定的来源进行编码，因为它没有找到一个可以编码的有效来源。这可能是由于以下原因之一：
+
+- 每个源标题的时长低于“首选项&gt;高级”中的“最小标题时长”阈值选项。
+- 源文件不是有效的视频文件，或者是 HandBrake 不支持的格式。
+- 源可以是受复制保护的或包括 DRM。请注意，HandBrake 不支持删除复制保护。
+
+活动日志可能包含更多信息。</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>队列{0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>开始编码</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>启动队列</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>不能删除默认预设。请先将另一个预设设置为默认值。</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>您确定要删除预设：</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>编码中：Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均FPS: {4:000.0}, 剩余时间：{5}, 已用时间：{6}{7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>预设必须有名称。请填写预设名称字段。</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>已存在具有此名称的预设。 您想覆盖它吗？</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>必须先扫描源才能使用“源最大值”选项。</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>必须为“自定义”选项填写自定义宽度或高度字段。</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>无法添加预设</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>未知错误</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>音频默认值</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>音轨</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>选择行为…</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>切换回轨道</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>无法保存章节标记文件！</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>章节标记名称不会保存在您的编码中。</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value>以下操作 “{0}”将在{1}内发生。</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>如果问题仍然存在，请尝试重新启动 HandBrake。</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>没有关于此错误的更多信息。</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>出现未知错误。</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>有一个新的更新！请查看网站上的发行说明。</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>您的系统支持64位版本的 HandBrake！ 与32位版本相比，提供了性能和稳定性改进。
+ 请查看网站上的发行说明。</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>目前没有新的更新。</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>更新已下载</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>更新服务不可用。您可以尝试从 https://handbrake.fr 下载更新</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>更新失败。您可以尝试从 https://handbrake.fr 下载更新</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>存储大小：{0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>添加到队列中</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>没有在等待的编码</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>当前没有编码作业</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>队列</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>您确定要清除队列吗？</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>确认</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0} 等待作业</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>列队已暂停</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>您确定要删除所选作业吗？</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>此编码目前正在进行中。如果删除它，编码将停止。您确定要继续吗？</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>没有待处理的作业。</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>是否确实要编辑此作业？它将从队列中删除并发送到主窗口。</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>队列已就绪</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>队列未运行</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>队列已完成</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>上次列队的作业已完成</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>列队已开始</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>编码中：Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均FPS: {4:000.0}, 剩余时间：{5}, 已用时间：{6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>当前正在运行编码。退出 HandBrake 将停止此编码。
+您确定要退出 HandBrake 吗？</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>图片预览</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>无法删除以前的预览文件。您可能仍然在媒体播放器中打开了一个预览。请关闭这个。</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>在创建预览之前，必须先扫描源并设置编码。</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>无法找到预览文件。文件已删除或编码失败。检查活动日志以获取详细信息。</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>Handbrake 已经在编码视频了！ 一次只能编码一个文件。</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>字幕默认值</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>字幕轨道</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>切换回轨道</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>选择行为…</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>存档的文件：</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>无法加载预设。</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake 无法加载您的预设文件。它可能来自较旧的不受支持的 HandBrake 版本或已损坏。
+
+您的旧预设文件已归档为：</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value> 有{0} 个错误或取消检测。</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>磁盘空间不足</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>警告，您的磁盘空间不足。如果空间不足，HandBrake 将无法完成此编码。</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>第{0}行无效。不会导入任何内容。</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>无法导入章节文件</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>章节文件中的所有行必须至少有2列数据</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>章节文件中的第一列只能包含大于零（0）的整数值</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>目前不支持类型为 '{0}' 的章节文件。</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>不支持的章节文件类型</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>源媒体的章节信息无效</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>媒体源的章节数和输入文件的章节数不匹配( {0} vs {1}).
+
+您依然要导入章节名吗？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>媒体源的章节数和输入文件的章节数不匹配( {0} vs {1}).
+
+您依然要导入章节名吗？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>源文件和输入文件的章节数不匹配</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>源媒体上各章的时长和输入文件中各章的时长相差很大。
+
+本章节文件很可能是从其他源媒体生成的。
+
+确实要导入章节名称吗？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>源文件和输入文件的章节时长不匹配</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>尝试停止扫描时发生了错误。请重启HandBrake。</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake 无法将预设文件升级为新版本格式。
+您的预设文件将被存档。您需要重新创建自己的预设。</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>您所更改的任何设置可能会在下次 HandBrake 启动时被重置。</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>尝试保存您的偏好设置时出现了问题。</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>警告，您的设置已被重置！</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>您的用户设置文件已损坏或不可访问。设置已经被恢复为默认。</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>无法加载用户设置文件: {0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>您的用户设置文件似乎无法访问或已损坏。您可能需要删除它并让 HandBrake 生成一份新的。</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>您选择的输出目录不存在或者没有写入文件的权限。</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>创建文件夹？</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>要写入的文件夹并不存在。您希望 HandBrake 创建该文件夹吗？
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>无法启动目标目录。</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>请检查目标目录是否有效。</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>正在处理：步骤 {0}/{1}，（扫描字幕）{2:00.00}%，扫描剩余时间：{3}已用时间：{4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>没有附加信息</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, 已完成 {2} /{3} )</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, 已完成 {2} / {3}
+剩余时间: {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>队列已暂停。警告，您编码的驱动器磁盘空间不足。请释放一些空间，然后按开始继续。您还可以调整首选项中的最小空间级别。</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>列队已暂停</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>列队已暂停</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>您的目标目录的磁盘可用空间不足。
+
+您可以在首选项中配置显示警报的级别。
+
+您确定要继续吗？</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>无法重置作业状态，因为它未处于错误或已完成状态</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>无法恢复队列文件。</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>文件可能损坏或是来自旧的不兼容版本的HandBrake</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake已经在编码文件中。</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>请停止当前编码。如果问题依然存在，请重启HandBrake。</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>预览 ({0}% 实际大小)</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake 需要在 64 位版本的 Windows 10 或更高版本来运行。</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake 需要 Windows 10 或更高版本才能运行。版本0.9.9 (XP) 、版本0.10.5 (Vista) 、版本1.3.3 (7和8.x) 是支持这些旧操作系统的最后版本。</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>你希望继续尝试添加剩下的吗？</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>文件 '{0}' 已存在!
+你想要覆盖它吗?</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>系统剪贴板目前无法使用。</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>这可能是由于另外的应用程序正监视或锁定了剪贴板。当剪贴板解锁后您才能继续使用它。</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>许可：</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>版本：</value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>-- 添加新分类 --</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>添加预设</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>分类：</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>描述：</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>名字：</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>尺寸：</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>轨道源选择</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>允许直通：</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>配置在选择新标题或源视频时如何自动选择和配置音频轨道。</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>“自动直通” 行为：</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>比特率</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>编码</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>增益</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>隐藏</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>混音</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>后备编码器：</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>重新加载</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>采样率</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>显示</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>轨道名称</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>轨道选择行为：</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>额外的轨道：</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>选择“Auto Passthru”作为音频编解码器时。</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>章节标记</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>章节名称</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>章节编号</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>创建章节标记</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>时长</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>导出</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>导入</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>导出名称</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>导入名称</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>重置章节名称</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>取消操作</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>继续</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>完成操作时</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>错误详情：</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>自定义：</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>去块滤波：</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Decomb</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>反交错：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>预设：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>反交错预设</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>降噪：</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>降噪预设</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>降噪调优</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>反胶卷过带：</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>滤镜</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>水平</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>灰度</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>隔行扫描：</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>预设：</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>旋转：</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>锐化：</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>锐化预设</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>锐化调优</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>调优：</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>添加</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>取消</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>清除</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>关闭</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>复制到剪贴板</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>左移</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>右移</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>保存</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>复制到剪贴板</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>编码日志</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>打开日志目录</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>扫描日志</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>活动日志</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>全部添加</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>添加当前</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>添加选中</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>添加到队列中</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>高级</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>音视频起始对齐</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>角度</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>音频</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>音轨</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>浏览</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>章节</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>容器</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>目标路径</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>时长：</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>保存为：</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>滤镜</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>格式：</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>帮助</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>iPod 5代 支持</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>元数据</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>(修改的)</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>开始合并：这可能需要一段时间…</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>选项</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>输出设置</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>暂停</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>尺寸</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>编辑预设</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>预设选项上下文菜单</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>删除预设</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>预设</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>预览</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>编码中: {0}, {1:00.00}%, 剩余时间: {2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>范围：</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>重新加载</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>移除</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>重置内置预设</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>保存新预设</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>正在寻找开始时间</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>设置为默认</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>预览</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>队列</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>源：</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>打开源</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>开始编码</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>启动队列</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>停止</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>停止编码</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>您确定要停止此编码吗？</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>请在导入字幕文件前选择一个要编码的源</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>字幕</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>字幕轨道</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>摘要</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value> - </value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>标题：</value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>更新当前预设</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>视频</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>网页优化</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>管理预设</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>元数据</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>允许使用 Nvidia NVENC 编码器</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>允许使用 Intel QuickSync 编码器</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>允许使用 AMD VCE 编码器</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>输入的文件格式包含无效的字符。这些字符已被移除。</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>每个编码完成时都发出提示音</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>队列完成时发出提示音</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>在摘要栏中显示预览。</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>在应用程序标题栏中显示编码进度。</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>清理7天前的日志文件</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>关于 HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>高级</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>高级选项</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>参数：</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>自动文件命名</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>自动命名输出文件</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>检查更新</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>每当编码完成时总是清除已完成的队列任务</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>清理日志历史</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>复制编码日志文件到指定位置：</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>复制编码日志文件到编码视频所在位置</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>当前版本</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>解码中</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>默认路径：</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>下载更新</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>DVD 读取中</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>禁止LibDVDNav。(将会使用livdvdread)</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>编码中</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>文件格式：</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>常规</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>日志记录</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>日志详细级别：</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>日志文件路径：</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>硬盘空间低时暂停队列</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>最小化到系统托盘（需要重启）</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>DVD 和蓝光标题的最短时长（秒）。将跳过较短的标题：</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>MP4 文件扩展名：</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>启动时</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>输出文件</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>路径：</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>媒体播放器路径</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>在编码时防止系统进入睡眠状态</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>要扫描的预览图片数：</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>优先级：</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>如果可用，优先使用 Intel QuickSync 解码视频。</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>在没有使用QuickSync 编码器时使用QSV 解码器。(如 x265)</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>移除常见的标点符号</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>用空格替换下划线</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>当应用重启时重置为“无操作”。</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>选择缩放器：</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>缩放</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>发送文件至：</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>更改大写格式为词首字母大写</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>更新</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>用户界面</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>版本：</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>视频</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>此路径仅用于视频预览功能。
+支持 VLC 和 MPC-HC。 其他播放器也可能工作，但未经验证。</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>查看日志目录</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>当完成时</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>x264/5 设置</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>固定质量模式的最小刻度：</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>变形：</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>自动</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>下</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>裁剪</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>自定义</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>显示尺寸：</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>高度：</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>自动</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>左</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>最终尺寸：</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>像素宽高比：</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>右</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>大小：</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>上</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>缩放大小：</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>自定义</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>导出文件</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>导入文件</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>官方的</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>选择标题：</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>添加到队列中</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>选中的标题将会使用 "{0}" 预设添加</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>视频选项：</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>音频：</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>清除全部</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>清除已完成的</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>清除队列</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>清除选中的</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>删除</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>目标路径：</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>无操作</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>编码时长：</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>编辑</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>结束时间：</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>导出队列</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>导出文件大小：</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>休眠</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>锁定系统</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>日志将在编码完成后可用。</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>登出</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>打开目标目录</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>打开源目录</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>选项</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>暂停</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>暂停时长：</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>图像设置：</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>退出HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>重试所有任务</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>重试失败的</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>重置选中的任务</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>重置</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>关机</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>源：</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>启动队列</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>开始时间：</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>统计数据</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>统计数据将在编码完成后可用。</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>字幕：</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>概要</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>睡眠</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>视频：</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>当完成时：</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>添加所有剩余选中的语言</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>添加所有剩余的轨道</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>添加新轨道</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>轨道</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>可用的语言：</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>选择语言：</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>选择语言：</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>配置默认行为</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>重新加载</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>选择要扫描的光盘</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>选择要扫描的文件</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>选择要扫描的文件夹</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>视需要选择一个具体的标题：</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>然后选择您想编码的视频：</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>文件</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>文件夹（批量扫描）</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>打开DVD或蓝光驱动器</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>打开有一个或多个文件的文件夹。</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>恢复队列文件</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>以前的队列存档可用。</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>打开单个视频文件。</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>选择源</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>时长：</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>实时预览</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>选择预览图片</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>优先选择系统默认的视频播放器</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>添加隐藏式字幕（可用时）</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>添加“外部音频扫描”</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>烧录行为：</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>导入字幕</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>轨道选择行为：</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>添加所有剩余的隐藏式字幕</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>选择新标题或源视频时自动选择和配置字幕轨道的方式。</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>额外的音频轨道</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>额外的字幕轨道</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>已烧录</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>章节标记</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>去块滤波</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>反胶卷过带</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>显示</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>灰度</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>没有音频轨道</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>没有章节标记</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>无滤镜</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>没有源</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>没有字幕轨</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>无轨道</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>预览 {0} / {1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>旋转</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>存储空间</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>二次编码</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>平均码率(kbps)：</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>视频编码器：</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>固定帧率</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>固定质量：</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>编码器级别：</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>编码器预设：</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>编码器配置文件：</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>编码器调优：</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>高级选项：</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>快速解码</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>帧率 (FPS):</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>编码器选项：</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>峰值帧率</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>质量：</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>Turbo 一次通过</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>可变帧率</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>视频：</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>语言：</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>使用系统语言</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>关于 HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>或者将文件或文件夹拖放到这里...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>帮助</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>首选项</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>添加轨道</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>为每个轨道设置音频编码器：</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>清除</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>烧入</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>默认</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>仅限强制</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>关于(_A)...</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>活动日志(_A)</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>检查更新(_C)</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>退出(_E)</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>导出到文件(_E)</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>文件(_F)</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>HandBrake 文档 (HTTPS)(_H)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>帮助(_H)</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>从文件导入(_I)</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>首选项(_P)</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>预设(_P)</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>队列(_Q)</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>重置内置预设(_R)</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>将当前设置为默认值(_S)</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>显示预设面板(_H)</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>显示队列(_S)</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>工具(_T)</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>检查更新 ...</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>您确定要清除日志文件目录吗？</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>清除日志</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>正在下载...</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>HandBrake 的日志文件目录已被清除！</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>注意</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>准备更新...</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>请选择一个文件夹。</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>单击“浏览”以设置默认位置</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>隐藏</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>显示</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>“添加所有”至队列</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>“添加选中”至队列</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>播放文件</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>应用程序工具栏</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>在工具栏中显示“添加所有至队列”</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>在工具栏中显示“添加选中至队列”</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>硬件编码支持当前禁用。如果您未用 "--no-hardware" 选项启动HandBrake，请确保您系统中的所有显示适配器正在使用最新的驱动程序。
+
+这不会影响软件编码器。</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>请更正您的字幕设置然后再继续。</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>应用</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>继续编码</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>活动</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>导入列队</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>编码：Pass {0}/{1}，{2:00.00}%，帧率：{3:000.0}，平均帧率：{4:000.0}
+剩余时间：{5}，已用时间：{6} {7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>删除所选</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>便携模式：无法创建TMP目录。请检查路径是否正确且可写。
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>便携模式：无法创建存储目录。请检查路径是否正确且可写。
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>便携模式：无法读取 portable.ini。此文件可能存在错误。请使用 portable.ini.template 作为模版重试。</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>HandBrake 无法初始化引擎。这通常是由过时的GPU驱动程序引起的。\n 请更新显卡驱动程序。</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>替换占位符：{source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>替换占位符：{source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>询问是否覆盖文件</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>自动重命名文件</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>覆盖文件</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>用户界面操作</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>文件覆盖操作</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>编码完成</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>音效通知</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>队列已完成</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>当完成时：</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>文件名冲突操作</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>后缀</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>前缀</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>添加编号</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>过滤器视图——去块效应滤波器预设</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>去块效应调优</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>编码器的选择将在“视频”选项卡上提供。</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake 检测到多个未完成的队列文件。恢复这些文件将使 HandBrake 运行多个实例。 您想恢复所有未完成的工作吗？</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake 检测到上次启动时队列中尚有未完成的项目。您想恢复这些项目吗？</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>有可恢复的队列</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>您的预设文件包含内置预设，但导入功能不支持导入内置预设。请使用“预设菜单 -&gt; 重置内置预设”来恢复标准预设。
+
+将导入所有支持的用户预设。</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>立即执行操作。（这将禁用60秒确认对话框）</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>浏览</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>没有设置音频文件。请单击“浏览”以选择要播放的wav或mp3文件。</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>播放</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>导出列队（仅限命令行界面）</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>使用深色主题。（需要重启软件，仅支持 Windows 10）</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>不可用</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>GB</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>已检测到交流电源。正在恢复编码... ({0} %)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>系统电量严重不足！（{0} %）</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>系统电量不足！（{0}%）。已暂停编码。</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>目标磁盘剩余存储容量少于 {0} GB。正在暂停编码...</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>自动匹配选择的音频</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>自动匹配选择的字幕</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>系统</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>演员：</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>评论：</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>描述：</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>导演：</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>类型：</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>剧情：</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>发行日期：</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>标题：</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>日志查看器</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>详情：</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>滤镜：</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>大小：</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>轨道：</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>常规</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>点击“检查更新”检查新版本</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; 返回</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>目前已暂停</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>输出文件</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>章节</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>帧数</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>预览</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>秒</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>所有匹配选中的语言</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>第一个匹配选中的语言</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>无</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>第一个轨道</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>外部音频优先，否则第一个优先</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>外部音轨</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>无</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>外部音频搜索</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>外部音频扫描</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>所有匹配选中的语言</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>使用所有轨道作为模板</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>第一个匹配选中的语言</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>使用首轨作为模板</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>无音频</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>章节 {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>自动</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>始终使用 M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>始终使用 MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>自定义</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>无</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>始终使用源分辨率</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>高于标准</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>低于标准</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>高</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>低</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>标准</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>每月</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>每周</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>始终为生成的每个新名称使用默认路径。</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>端口范围必须在5000到32767之间</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>替换占位符：{source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>有新版本的 HandBrake 可供使用！</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>版权所有 (C) 2003-2022 HandBrake 团队</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>电量不足：</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>当电量不足时，暂停任何正在运行的工作。</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>添加所有剩余的隐藏式字幕</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>在您尝试导入的队列文件中检测到重复的任务。您是否希望覆盖现有的记录？
+这也将停止任何现有的运行任务。</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>检测到的重复内容</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>启用低功耗 QuickSync 硬件（如果支持）。</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>请选择一个任务以查看摘要信息。</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>在单独的工作进程中运行每个队列任务。</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>Worker 的默认网络端口：</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>您所选择的预设不能在这个系统上使用。
+
+这通常说明您的系统不支持使用它所需的硬件。
+
+请选择一个不同的预设。</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>进程隔离</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>请注意，使用此功能将启动一个绑定在 127.0.0.1 上指定端口的 HTTP 服务器。</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>如果设定的端口正在使用中，它将找到距离定义的端口 +100 以内的第一个空闲端口。</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>同时编码的最大数量：</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>取消</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>预设：</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>与源视频相同</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>重置设置</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>您确定要将 HandBrake 重置为默认设置吗？</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>自定义（不限制）</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>填充（环绕）</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>高度（左右黑边）</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>无</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>宽度（上下黑边）</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>填充：</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>颜色：</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>边框：</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>分辨率和缩放：</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>方向和裁剪：</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>（仅限 Windows 10！）</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>滤镜：</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>默认</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>强制</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p 高清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC 标清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K 超高清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL 标清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p 高清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K 超高清</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>自定义</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>最大大小：</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>分辨率限制：</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>无</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>管理预设</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>删除内置预设</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>导出所选预设</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>从文件导入预设</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>预设信息：</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>内置预设不可修改。</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>将所选预设设置为默认值</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>删除预设</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>（此系统不支持）</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>停止</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>您输入的分类名称已经存在。请选择一个不同的名称。</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>分类名称是空的。请提供一个名称。</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>输入名称：</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>没有选择预设。</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>导出所有用户预设</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>显示磁盘空间不足警报的级别。</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>注意。这是同时进行的工作的上限。在编码过程中，硬件限制可能会影响到实际的同时任务数。</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>（不可用）</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>是默认：</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>否</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>是</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>微调图像设置</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>显示裁剪调整控制。</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>使用深色</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>使用浅色</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>匹配系统设置</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>主题：</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>（需要重新启动）</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>色度平滑</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>色彩空间：</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>色彩空间</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>打开预览</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>源预览：</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>任务状态：</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>已取消</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>完成</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>无效的设置。检查日志以了解详情。</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>无效的输入。检查日志以了解详情。</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>状态未知。检查日志以了解详情。</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>尝试读取源时检测到错误。</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>未知故障。检查日志以了解详情。</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>Worker 崩溃了。检查日志以了解详情。</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>缺少 “hb.dll” 文件。请重新安装。</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>警告。请注意，这是一个 HandBrake 的 "安全模式" 版本，不包括对硬件编码器的支持。如果您想使用硬件编码器支持，请从网站上下载一个非 "安全模式" 的版本。</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>黑色</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>自定义</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>白色</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>RGB 值：</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>（内边距）</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>翻转：</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>源尺寸</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>存储大小：{0}x{1} 显示大小：{2}x{3} 宽高比：{4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>在文件浏览器对话框中检测到一个错误。
+
+- 请注意，长的文件路径不被完全支持。请保持文件路径短于255个字符。
+- 本窗口最后使用的目录已被重置，以防止在你下次尝试扫描文件时出现错误。</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>最大高度：</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>最大宽度：</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>宽高比：{0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>保留常见元数据</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>默认的自动名称路径是无效的。{0} 不能在 {1} 前面</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>您想让HandBrake自动检查更新吗？
+
+您可以在 首选项 -&gt; 常规 -&gt; 检查更新 中更改设置。</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>检查更新？</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>在更新之前：
+- 确保队列中没有待处理的编码。
+- 备份或记下你所创建的任何自定义预设，因为它们可能与较新的版本不完全兼容。</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>（默认）</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>按分类</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>平铺</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>部分平铺</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>选择预设在菜单中的显示方式。</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>预设：</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>已完成</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>编辑任务？</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>输出长度：</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>移到底部</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>移到顶部</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>输出比特率：</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>平均编码速度：</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value>的源文件</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>不可用</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>源长度：</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>重置</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>您确定您想重置所有的内置预设吗？</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>将所有内置预设重置为 HandBrake 的默认值。</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>（用户预设不会被重置）</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>将所有 HandBrake 设置重置为默认值：</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>内置预设</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>用户设置</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>浮动树状视图</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>请确保您在 Windows 中设置了适当的文件关联，以便用支持的视频播放器打开此文件。</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>无法读取队列文件</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>该文件可能被损坏或来自 HandBrake 的早期版本。
+只有当前版本的队列文件才被支持。</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>HandBrake 编码已完成！</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>HandBrake 队列已完成！</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>这也将禁用 "完成时" 标签上的显示窗口任务栏通知选项。如果你想重新激活这个功能，请重新启用这些选项。</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>从 Windows 通知控制面板中移除 HandBrake。</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>已解除安裝</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>通知设置已移除。</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>清理 &amp; 卸载</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>向 Windows 任务栏发送通知。</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>Windows 通知</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>{0} 个任务已完成。{1}正在处理 {2} 个任务，还有 {3} 个待处理。</value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>重新生成（自动命名）</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>打开此目录</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>全部收起</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>全部展开</value>
+ </data>
+</root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/Resources.zh-Hant.resx Added

@@ -0,0 +1,2608 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="Video_EncoderExtraArgs" xml:space="preserve">
+ <value>編碼器參數的完整清單：
+{0}</value>
+ </data>
+ <data name="Video_x264FastDecode" xml:space="preserve">
+ <value>減少解碼器的 CPU 使用率。
+
+若您的裝置在播放輸出檔時遇到困難（如：丟失影格）請選此選項。</value>
+ </data>
+ <data name="Video_LosslessWarning" xml:space="preserve">
+ <value>警告：RF 0 值是非破壞性壓縮！</value>
+ </data>
+ <data name="Video_LosslessWarningTooltip" xml:space="preserve">
+ <value>數值 0 表示非破壞性壓縮，且可能導致最終檔案大小大於原始檔，
+除非來源檔亦為非破壞性壓縮品質。
+
+x264 及 x265 的尺度是對數級的，且數值越低表示更佳品質。
+
+因此，即使數值微幅增加，檔案大小也會逐步增大。</value>
+ </data>
+ <data name="AddPreset_PictureSizeMode" xml:space="preserve">
+ <value>可儲存影像設定於設定檔，有三種模式：
+
+無：不儲存影像設定至預設檔。當載入來源檔時，遵照其解析度。此模式亦影響鏡頭形變（anamorphic）、modulus、裁切……等設定。
+
+自訂：您可以選填最大寬度及高度。該編碼作業將不大於這些數值，自動保持原始長寬比。
+
+來源最大值：總是盡可能按原始解析度處理。</value>
+ </data>
+ <data name="About_GPL" xml:space="preserve">
+ <value>本程式是自由軟體，您可以遵照自由軟體基金會 (Free Software Foundation) 出版的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈這一程式，或者自由選擇使用任何更新的版本。
+發佈這一程式的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的擔保。更詳細的情況請參閱 GNU 通用公共許可證。
+您應該已經和程式一起收到一份 GNU 通用公共許可證的副本。如果還沒有，寫信給：
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</value>
+ </data>
+ <data name="QueueSelection_AutoNameWarning" xml:space="preserve">
+ <value>警告：您未開啟檔案自動命名功能。請在選項中打開它。</value>
+ </data>
+ <data name="QueueSelection_AutoTrackSelectionWarning" xml:space="preserve">
+ <value>警告：尚未配置自動選擇音軌、字幕軌設定。您可在選項中設定選擇行為。</value>
+ </data>
+ <data name="Presets_ResetComplete" xml:space="preserve">
+ <value>已重設內建的設定檔。</value>
+ </data>
+ <data name="Presets_ResetHeader" xml:space="preserve">
+ <value>重設完畢</value>
+ </data>
+ <data name="Video_HigherQuality" xml:space="preserve">
+ <value>較高品質 |</value>
+ </data>
+ <data name="Video_LowQuality" xml:space="preserve">
+ <value>| 較低品質</value>
+ </data>
+ <data name="Video_PlaceboQuality" xml:space="preserve">
+ <value>破壞較少 |</value>
+ </data>
+ <data name="Error" xml:space="preserve">
+ <value>錯誤</value>
+ </data>
+ <data name="Main_TurnOnAutoFileNaming" xml:space="preserve">
+ <value>您必須開啟檔案自動命名功能，且在偏好設定中指定預設路徑，才能加入佇列。</value>
+ </data>
+ <data name="Warning" xml:space="preserve">
+ <value>警告</value>
+ </data>
+ <data name="AreYouSure" xml:space="preserve">
+ <value>您確定嗎？</value>
+ </data>
+ <data name="HandBrake_Title" xml:space="preserve">
+ <value>HandBrake</value>
+ </data>
+ <data name="Main_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake 已經在編碼。</value>
+ </data>
+ <data name="Main_DuplicateDestinationOnQueue" xml:space="preserve">
+ <value>佇列中已有相同目的地路徑的工作，請為該工作選擇不同的路徑。</value>
+ </data>
+ <data name="Main_JobsPending_addon" xml:space="preserve">
+ <value>待處理工作 {0}</value>
+ </data>
+ <data name="Main_NewDefaultPreset" xml:space="preserve">
+ <value>HandBrake 設定檔已改為：{0}</value>
+ </data>
+ <data name="Main_NewUpdate" xml:space="preserve">
+ <value>已有可用更新。 前往 工具 &gt; 選項 來安裝</value>
+ </data>
+ <data name="Main_NoPresetSelected" xml:space="preserve">
+ <value>未選擇設定檔。</value>
+ </data>
+ <data name="Main_NoUpdateOfBuiltInPresets" xml:space="preserve">
+ <value>不可修改內建設定檔。請選擇自訂的設定檔。</value>
+ </data>
+ <data name="Main_PleaseSelectFolder" xml:space="preserve">
+ <value>請選擇一個資料夾。</value>
+ </data>
+ <data name="Main_PreparingToEncode" xml:space="preserve">
+ <value>準備編碼...</value>
+ </data>
+ <data name="Main_PresetErrorBuiltInName" xml:space="preserve">
+ <value>不可匯入與內建同名的設定檔。</value>
+ </data>
+ <data name="Main_PresetOverwriteWarning" xml:space="preserve">
+ <value>已存在設定檔「{0} 」。要覆寫它嗎？</value>
+ </data>
+ <data name="Main_Presets" xml:space="preserve">
+ <value>設定檔</value>
+ </data>
+ <data name="Main_PresetUpdateConfirmation" xml:space="preserve">
+ <value>確定要更新選取的設定檔嗎？</value>
+ </data>
+ <data name="Main_PresetUpdated" xml:space="preserve">
+ <value>此設定檔已更新為您目前的設定。</value>
+ </data>
+ <data name="Main_PresetUpdateNotification" xml:space="preserve">
+ <value>HandBrake 認為您的內建設定檔已經過時... 將更新這些設定檔。
+您的自訂設定檔不會被更新，因此您需要刪除並再次新增的以重新建立它們。
+已備份先前的 user_presets.xml 檔案。</value>
+ </data>
+ <data name="Main_QueueFinished" xml:space="preserve">
+ <value>已完成佇列</value>
+ </data>
+ <data name="Main_ScanCancelled" xml:space="preserve">
+ <value>已取消掃描。</value>
+ </data>
+ <data name="Main_ScanCompleted" xml:space="preserve">
+ <value>已完成掃描</value>
+ </data>
+ <data name="Main_ScanFailed_NoReason" xml:space="preserve">
+ <value>掃描失敗：</value>
+ </data>
+ <data name="Main_ScanFailed_CheckLog" xml:space="preserve">
+ <value>掃描失敗... 請查閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="Main_ScanningPleaseWait" xml:space="preserve">
+ <value>掃描來源中，請稍候...</value>
+ </data>
+ <data name="Main_ScanningTitleXOfY" xml:space="preserve">
+ <value>正在掃描標題 {0}，共 {1} ({2}%)</value>
+ </data>
+ <data name="Main_ScanSource" xml:space="preserve">
+ <value>在開始編碼前，必須先掃描來源並設定編碼方式。按一下工具列上的 開啟來源檔 按鈕以繼續。</value>
+ </data>
+ <data name="Main_SelectPreset" xml:space="preserve">
+ <value>請選擇自訂的設定檔。內建的設定檔不可匯出。</value>
+ </data>
+ <data name="Main_SelectPresetForUpdate" xml:space="preserve">
+ <value>請選擇要更新的設定檔</value>
+ </data>
+ <data name="Main_SelectSource" xml:space="preserve">
+ <value>選擇「來源」以繼續</value>
+ </data>
+ <data name="Main_XEncodesPending" xml:space="preserve">
+ <value>{0}個等待中的工作</value>
+ </data>
+ <data name="Notice" xml:space="preserve">
+ <value>通知</value>
+ </data>
+ <data name="Overwrite" xml:space="preserve">
+ <value>覆寫？</value>
+ </data>
+ <data name="Question" xml:space="preserve">
+ <value>問題</value>
+ </data>
+ <data name="State_Ready" xml:space="preserve">
+ <value>準備</value>
+ </data>
+ <data name="Updated" xml:space="preserve">
+ <value>更新</value>
+ </data>
+ <data name="Preset_OldVersion_Header" xml:space="preserve">
+ <value>設定檔版本</value>
+ </data>
+ <data name="Preset_OldVersion_Message" xml:space="preserve">
+ <value>您正試著要匯入的設定檔是來自其他版本的 HandBrake。
+因此可能不會匯入該設定檔中的所有設定值。
+
+確定要繼續嗎？</value>
+ </data>
+ <data name="Preset_UnableToImport_Header" xml:space="preserve">
+ <value>無法匯入設定檔！</value>
+ </data>
+ <data name="Preset_UnableToImport_Message" xml:space="preserve">
+ <value>因為您的設定檔似乎已毀損或來自較舊的 HandBrake，所以無法匯入。</value>
+ </data>
+ <data name="Main_SetDestination" xml:space="preserve">
+ <value>在加入佇列前，您必須先指定輸出檔案的目的地路徑。</value>
+ </data>
+ <data name="Main_InvalidDestination" xml:space="preserve">
+ <value>您輸入的目的地路徑含有非法字元，因此不會被採用。</value>
+ </data>
+ <data name="Preview" xml:space="preserve">
+ <value>預覽 {0}</value>
+ </data>
+ <data name="Preview_Scaled" xml:space="preserve">
+ <value>預覽（縮放）</value>
+ </data>
+ <data name="PictureSettings_OutputResolution" xml:space="preserve">
+ <value>輸出：{0}</value>
+ </data>
+ <data name="Options_DefaultPathAdditionalParams" xml:space="preserve">
+ <value>可用的額外選項：{來源路徑}、 {來源資料夾名稱} 或 {來源檔}</value>
+ </data>
+ <data name="Main_MatchingFileOverwriteWarning" xml:space="preserve">
+ <value>您不可編碼一個與來源檔案相同路徑及名稱的檔案。請調整目的地及檔名以免覆寫來源檔案。</value>
+ </data>
+ <data name="Main_UnableToLoadHelpMessage" xml:space="preserve">
+ <value>您的系統阻止 HandBrake 打開網頁瀏覽器。</value>
+ </data>
+ <data name="Main_UnableToLoadHelpSolution" xml:space="preserve">
+ <value>您仍然可以直接到 https://handbrake.fr 檢視協助頁面</value>
+ </data>
+ <data name="Main_PresetImportFailed" xml:space="preserve">
+ <value>無法匯入選取的設定檔。</value>
+ </data>
+ <data name="Main_PresetImportFailedSolution" xml:space="preserve">
+ <value>該設定檔可能已毀損或來自較舊、停止支援的 HandBrake。
+
+您必須在目前的版本中重建原本的設定檔。</value>
+ </data>
+ <data name="Video_EncoderExtraArgsTooltip" xml:space="preserve">
+ <value>可對影片編碼器輸入額外的進階參數。</value>
+ </data>
+ <data name="Subtitles_BurnInBehaviourModes" xml:space="preserve">
+ <value>無——僅壓印其容器不支援的軌道。
+外語音軌——當可用時，壓印外語音軌。
+首軌——壓印第一軌。
+首選外語音軌，首軌其次——當存在外語音軌時將其壓印，否則選用第一軌。</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityHeader" xml:space="preserve">
+ <value>WebM 字幕相容性</value>
+ </data>
+ <data name="Subtitles_WebmSubtitleIncompatibilityError" xml:space="preserve">
+ <value>HandBrake 中的 WebM 格式僅支援壓印字幕。
+
+您需要更改字幕選擇。
+
+若繼續，未壓印的字幕將會遺失。</value>
+ </data>
+ <data name="Main_ScanNoTitlesFound" xml:space="preserve">
+ <value>未發現有效的來源或標題。</value>
+ </data>
+ <data name="Main_ScanNoTitlesFoundMessage" xml:space="preserve">
+ <value>HandBrake 無法對選取的來源檔進行編碼，因為無法找到可編碼的有效來源。這可能歸因於：
+- 來源檔的長度低於「最低標題長度」，此設定位於「偏好設定 -&gt; 進階」。
+- 來源檔不是有效的視訊檔案，或是 HandBrake 不支援的格式。
+- 來源檔可能包含 DRM 或具有防拷機制。HandBrake 不支援移除此類機制。
+
+檢閱活動紀錄以了解詳情。</value>
+ </data>
+ <data name="Main_QueueLabel" xml:space="preserve">
+ <value>佇列{0}</value>
+ </data>
+ <data name="Main_Start" xml:space="preserve">
+ <value>開始編碼</value>
+ </data>
+ <data name="Main_StartQueue" xml:space="preserve">
+ <value>開始佇列</value>
+ </data>
+ <data name="MainViewModel_CanNotDeleteDefaultPreset" xml:space="preserve">
+ <value>您無法刪除預設的設定檔。請先將其他設定檔指定為預設值。</value>
+ </data>
+ <data name="MainViewModel_PresetRemove_AreYouSure" xml:space="preserve">
+ <value>確定刪除設定檔：</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>正在編碼: Pass {0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均 FPS: {4:000.0}, 剩餘時間: {5}, 已經過: {6} {7}</value>
+ </data>
+ <data name="AddPresetViewModel_PresetMustProvideName" xml:space="preserve">
+ <value>必須為設定檔取名。請填寫其名稱欄位。</value>
+ </data>
+ <data name="AddPresetViewModel_PresetWithSameNameOverwriteWarning" xml:space="preserve">
+ <value>已存在同名的設定檔，確定要覆寫它嗎？</value>
+ </data>
+ <data name="AddPresetViewModel_YouMustFirstScanSource" xml:space="preserve">
+ <value>必須先掃描來源，才能使用「來源最大值」選項。</value>
+ </data>
+ <data name="AddPresetViewModel_CustomWidthHeightFieldsRequired" xml:space="preserve">
+ <value>使用「自訂」選項時，須填寫自訂寬度或高度欄位。</value>
+ </data>
+ <data name="AddPresetViewModel_UnableToAddPreset" xml:space="preserve">
+ <value>無法新增設定檔</value>
+ </data>
+ <data name="UnknownError" xml:space="preserve">
+ <value>未知的錯誤</value>
+ </data>
+ <data name="AudioViewModel_AudioDefaults" xml:space="preserve">
+ <value>音訊預設值</value>
+ </data>
+ <data name="AudioViewModel_AudioTracks" xml:space="preserve">
+ <value>音軌</value>
+ </data>
+ <data name="AudioViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>選擇行為…</value>
+ </data>
+ <data name="AudioViewModel_SwitchBackToTracks" xml:space="preserve">
+ <value>切換回軌道</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersWarning" xml:space="preserve">
+ <value>無法儲存章節紀錄點檔案！</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToExportChaptersMsg" xml:space="preserve">
+ <value>無法將章節標記名稱儲存於本次編碼。</value>
+ </data>
+ <data name="CountdownAlertViewModel_NoticeMessage" xml:space="preserve">
+ <value> {1} 秒後將執行「{0}」。</value>
+ </data>
+ <data name="ErrorViewModel_IfTheProblemPersists" xml:space="preserve">
+ <value>若此問題持續發生，請嘗試重開 HandBrake。</value>
+ </data>
+ <data name="ErrorViewModel_NoFurtherInformation" xml:space="preserve">
+ <value>目前未有更多關於此錯誤的資訊。</value>
+ </data>
+ <data name="ErrorViewModel_UnknownError" xml:space="preserve">
+ <value>發生了未知的錯誤。</value>
+ </data>
+ <data name="OptionsViewModel_NewUpdate" xml:space="preserve">
+ <value>已有可用更新！欲查閱發行公告，請至網站。</value>
+ </data>
+ <data name="OptionsViewModel_64bitAvailable" xml:space="preserve">
+ <value>您的系統支援 64 位元版本的 HandBrake！相比目前的 32 位元版本，64 位元版的性能及穩定性更好。
+請到網站查詢發行公告。</value>
+ </data>
+ <data name="OptionsViewModel_NoNewUpdates" xml:space="preserve">
+ <value>目前尚無更新。</value>
+ </data>
+ <data name="OptionsViewModel_UpdateDownloaded" xml:space="preserve">
+ <value>已下載更新</value>
+ </data>
+ <data name="OptionsViewModel_UpdateServiceUnavailable" xml:space="preserve">
+ <value>無法使用更新服務。您可試著至 https://handbrake.fr 下載更新。</value>
+ </data>
+ <data name="OptionsViewModel_UpdateFailed" xml:space="preserve">
+ <value>更新失敗。您可試著至 https://handbrake.fr 下載更新。</value>
+ </data>
+ <data name="PictureSettingsViewModel_StorageDisplayLabel" xml:space="preserve">
+ <value>儲存尺寸：{0}x{1}</value>
+ </data>
+ <data name="QueueSelectionViewModel_AddToQueue" xml:space="preserve">
+ <value>新增至佇列</value>
+ </data>
+ <data name="QueueViewModel_NoEncodesPending" xml:space="preserve">
+ <value>無等待中的編碼</value>
+ </data>
+ <data name="QueueViewModel_NoJobsPending" xml:space="preserve">
+ <value>無編碼中的工作</value>
+ </data>
+ <data name="QueueViewModel_Queue" xml:space="preserve">
+ <value>佇列</value>
+ </data>
+ <data name="QueueViewModel_ClearQueueConfirmation" xml:space="preserve">
+ <value>您確定要清除佇列嗎？</value>
+ </data>
+ <data name="Confirm" xml:space="preserve">
+ <value>確認</value>
+ </data>
+ <data name="QueueViewModel_JobsPending" xml:space="preserve">
+ <value>{0}個等待中的工作</value>
+ </data>
+ <data name="QueueViewModel_QueuePending" xml:space="preserve">
+ <value>已暫停佇列</value>
+ </data>
+ <data name="QueueViewModel_DelSelectedJobConfirmation" xml:space="preserve">
+ <value>您確定要刪除已選的工作嗎？</value>
+ </data>
+ <data name="QueueViewModel_JobCurrentlyRunningWarning" xml:space="preserve">
+ <value>此編碼工作正在進行中。若您刪除它，編碼也將停止。您確定要進行嗎？</value>
+ </data>
+ <data name="QueueViewModel_NoPendingJobs" xml:space="preserve">
+ <value>尚無等待中的工作。</value>
+ </data>
+ <data name="QueueViewModel_EditConfirmation" xml:space="preserve">
+ <value>您確定要編輯此工作嗎？這將會從佇列中移除並傳送至主視窗。</value>
+ </data>
+ <data name="QueueViewModel_QueueReady" xml:space="preserve">
+ <value>佇列已待命</value>
+ </data>
+ <data name="QueueViewModel_QueueNotRunning" xml:space="preserve">
+ <value>佇列未在執行中</value>
+ </data>
+ <data name="QueueViewModel_QueueCompleted" xml:space="preserve">
+ <value>已完成佇列</value>
+ </data>
+ <data name="QueueViewModel_LastJobFinished" xml:space="preserve">
+ <value>已完成佇列的最後工作</value>
+ </data>
+ <data name="QueueViewModel_QueueStarted" xml:space="preserve">
+ <value>已開始佇列</value>
+ </data>
+ <data name="QueueViewModel_QueueStatusDisplay" xml:space="preserve">
+ <value>正在編碼: Pass{0}/{1}, {2:00.00}%, FPS: {3:000.0}, 平均 FPS: {4:000.0}, 剩餘時間:{5}, 已經過: {6:d\:hh\:mm\:ss}</value>
+ </data>
+ <data name="ShellViewModel_CanClose" xml:space="preserve">
+ <value>有執行中的編碼工作。退出 HandBrake 亦將停止此編碼工作。
+您確定要離開 HandBrake 嗎？</value>
+ </data>
+ <data name="StaticPreviewViewModel_Title" xml:space="preserve">
+ <value>圖像預覽</value>
+ </data>
+ <data name="StaticPreview_UnableToDeletePreview" xml:space="preserve">
+ <value>無法刪除先前的預覽檔案。影片播放器可能正在使用它，請將其關閉。</value>
+ </data>
+ <data name="StaticPreviewViewModel_ScanFirst" xml:space="preserve">
+ <value>建立預覽之前，須先掃描來源並設定編碼方式。</value>
+ </data>
+ <data name="StaticPreviewViewModel_UnableToPlayFile" xml:space="preserve">
+ <value>無法找到預覽檔案。該檔案可能已被刪除，或編碼失敗。檢閱活動紀錄以了解詳情。</value>
+ </data>
+ <data name="StaticPreviewViewModel_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake 正在進行編碼作業！同時僅能編碼單個檔案。</value>
+ </data>
+ <data name="SubtitlesViewModel_SubDefaults" xml:space="preserve">
+ <value>字幕預設選項</value>
+ </data>
+ <data name="SubtitlesViewModel_SubTracks" xml:space="preserve">
+ <value>字幕軌</value>
+ </data>
+ <data name="SubtitlesViewModel_SwitchToTracks" xml:space="preserve">
+ <value>切換回軌道</value>
+ </data>
+ <data name="SubtitlesViewModel_ConfigureDefaults" xml:space="preserve">
+ <value>選擇行為…</value>
+ </data>
+ <data name="PresetService_ArchiveFile" xml:space="preserve">
+ <value>被封存的檔案：</value>
+ </data>
+ <data name="PresetService_UnableToLoad" xml:space="preserve">
+ <value>無法載入設定檔。</value>
+ </data>
+ <data name="PresetService_UnableToLoadPresets" xml:space="preserve">
+ <value>HandBrake 無法載入您的設定檔。這可能是因為它已損毀，或來自舊版的 HandBrake。
+
+舊的預設檔已被封存在：</value>
+ </data>
+ <data name="Main_QueueFinishedErrors" xml:space="preserve">
+ <value>偵測到 {0} 個錯誤或取消</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpace" xml:space="preserve">
+ <value>磁碟容量不足</value>
+ </data>
+ <data name="MainViewModel_LowDiskSpaceWarning" xml:space="preserve">
+ <value>警告，您的磁碟空間不足。若耗盡空間，HandBrake 將無法完成此次編碼。</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersMalformedLineMsg" xml:space="preserve">
+ <value>第{0}行是無效的，因此不會匯入任何東西。</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersWarning" xml:space="preserve">
+ <value>無法匯入章節檔案</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersLineDoesNotHaveAtLeastTwoColumns" xml:space="preserve">
+ <value>章節檔案中每列須包含至少兩欄資料</value>
+ </data>
+ <data name="ChaptersViewModel_UnableToImportChaptersFirstColumnMustContainOnlyIntegerNumber" xml:space="preserve">
+ <value>章節檔案的首欄須為大於零之正整數</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatMsg" xml:space="preserve">
+ <value>尚未支援「{0}」格式的章節檔。</value>
+ </data>
+ <data name="ChaptersViewModel_UnsupportedFileFormatWarning" xml:space="preserve">
+ <value>不支援的章節檔案格式</value>
+ </data>
+ <data name="ChaptersViewModel_ValidationFailedWarning" xml:space="preserve">
+ <value>來源媒體的章節資訊無效</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatch" xml:space="preserve">
+ <value>來源媒體與輸入檔案的章節數目不一致（{0}, {1}）。
+
+仍然要匯入章節名稱嗎？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchMsg" xml:space="preserve">
+ <value>來源媒體與輸入檔案的章節數目不一致（{0}, {1}）。
+
+仍然要匯入章節名稱嗎？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterCountMismatchWarning" xml:space="preserve">
+ <value>來源檔及輸入檔的章節數不吻合</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg" xml:space="preserve">
+ <value>來源媒體回報的章節長度
+與匯入的檔案所提供的存在明顯差異。
+
+這很可能是因為此章節檔是由其他來源媒體製作的。
+
+您確定要匯入章節名稱嗎？</value>
+ </data>
+ <data name="ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning" xml:space="preserve">
+ <value>來源檔及輸入檔的章節長度不吻合</value>
+ </data>
+ <data name="ScanService_ScanStopFailed" xml:space="preserve">
+ <value>在嘗試停止掃描時發生錯誤。請重開 HandBrake。</value>
+ </data>
+ <data name="Presets_PresetForceReset" xml:space="preserve">
+ <value>HandBrake 無法將您的設定檔更新為新版格式。
+原有的預設檔已被封存，您需要重新建立自訂的設定檔。</value>
+ </data>
+ <data name="SettingService_SaveErrorReset" xml:space="preserve">
+ <value>您更動過的任何設定可能需要在下次 HandBrake 啟動後重設。</value>
+ </data>
+ <data name="UserSettings_AnErrorOccurred" xml:space="preserve">
+ <value>在嘗試儲存您的偏好設定時，發生了錯誤</value>
+ </data>
+ <data name="UserSettings_YourSettingsHaveBeenReset" xml:space="preserve">
+ <value>警告，您的設定將被重置！</value>
+ </data>
+ <data name="UserSettings_YourSettingsAreCorrupt" xml:space="preserve">
+ <value>您的使用者設定檔已毀損或無法存取。設定值已被重置為預設值。</value>
+ </data>
+ <data name="UserSettings_UnableToLoad" xml:space="preserve">
+ <value>未能載入使用者設定檔：{0}</value>
+ </data>
+ <data name="UserSettings_UnableToLoadSolution" xml:space="preserve">
+ <value>您的使用者設定檔似乎已毀損或無法存取。您可能需要刪除該檔案，並讓 HandBrake 產生一個新的。</value>
+ </data>
+ <data name="Main_NoPermissionsOrMissingDirectory" xml:space="preserve">
+ <value>您選擇的輸出目錄不存在，或您不具有寫入它的權限。</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolder" xml:space="preserve">
+ <value>要建立資料夾嗎？</value>
+ </data>
+ <data name="DirectoryUtils_CreateFolderMsg" xml:space="preserve">
+ <value>您試圖寫入的資料夾並不存在。您想要 HandBrake 建立以下資料夾嗎？
+{0}</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDir" xml:space="preserve">
+ <value>無法打開目的地目錄。</value>
+ </data>
+ <data name="MainViewModel_UnableToLaunchDestDirSolution" xml:space="preserve">
+ <value>請檢查您使用的是有效的目的地目錄。</value>
+ </data>
+ <data name="MainViewModel_EncodeStatusChanged_SubScan_StatusLabel" xml:space="preserve">
+ <value>正在處理 Pass {0}/{1}, (字幕掃描) {2:00.00}%, 剩餘掃描時間：{3}, 已持續了：{4}</value>
+ </data>
+ <data name="NoAdditionalInformation" xml:space="preserve">
+ <value>沒有額外的資訊</value>
+ </data>
+ <data name="WindowTitleStatus" xml:space="preserve">
+ <value>{0} - ({1}%, Pass {2} / {3})</value>
+ </data>
+ <data name="TaskTrayStatusTitle" xml:space="preserve">
+ <value>{1}%, Pass {2} / {3}
+剩餘時間： {4}</value>
+ </data>
+ <data name="PauseOnLowDiskspace" xml:space="preserve">
+ <value>已暫停佇列。警告！您要存放的磁碟空間不足。請清出更多空間後再按下開始以繼續。您亦可在偏好設定中調整最低空間水準。</value>
+ </data>
+ <data name="Main_QueuePaused" xml:space="preserve">
+ <value>已暫停佇列</value>
+ </data>
+ <data name="QueueViewModel_QueuePaused" xml:space="preserve">
+ <value>已暫停佇列</value>
+ </data>
+ <data name="Main_LowDiskspace" xml:space="preserve">
+ <value>您的目的地目錄磁碟空間不足。
+
+您可在偏好設定中調整何時應跳出此警示。
+
+您確定要繼續嗎？</value>
+ </data>
+ <data name="Queue_UnableToResetJob" xml:space="preserve">
+ <value>無法重設工作狀態，因為其並不處於「錯誤」或「已完成」狀態</value>
+ </data>
+ <data name="Queue_UnableToRestoreFile" xml:space="preserve">
+ <value>無法還原佇列檔案。</value>
+ </data>
+ <data name="Queue_UnableToRestoreFileExtended" xml:space="preserve">
+ <value>檔案可能已毀損或來自較舊的 HandBrake。</value>
+ </data>
+ <data name="Queue_AlreadyEncoding" xml:space="preserve">
+ <value>HandBrake 已在編碼檔案。</value>
+ </data>
+ <data name="Queue_AlreadyEncodingSolution" xml:space="preserve">
+ <value>請停止目前的編碼工作。若此問題持續發生，請重開 HandBrake。</value>
+ </data>
+ <data name="StaticPreviewView_Title" xml:space="preserve">
+ <value>預覽（實際大小的{0}%）</value>
+ </data>
+ <data name="OsBitnessWarning" xml:space="preserve">
+ <value>HandBrake 需要在 64 位元的 Windows 10 或更新的作業系統上執行。</value>
+ </data>
+ <data name="OsVersionWarning" xml:space="preserve">
+ <value>HandBrake 需要在 Windows 10 或更新的作業系統上執行。0.9.9 版（XP）、0.10.5 版（Vista）、1.3.3 版（7 及 8.x）是這些較舊的作業系統最後支援的版本。</value>
+ </data>
+ <data name="Main_ContinueAddingToQueue" xml:space="preserve">
+ <value>您確定要繼續嘗試新增剩餘項目嗎？</value>
+ </data>
+ <data name="Main_QueueOverwritePrompt" xml:space="preserve">
+ <value>檔案「{0}」已經存在！
+您確定要覆寫它嗎？</value>
+ </data>
+ <data name="Clipboard_Unavailable" xml:space="preserve">
+ <value>目前無法使用系統的剪貼簿。</value>
+ </data>
+ <data name="Clipboard_Unavailable_Solution" xml:space="preserve">
+ <value>這可能是由於其他程式正在監控或鎖定剪貼簿。剪貼簿解鎖後，您才能繼續使用它。
+</value>
+ </data>
+ <data name="AboutView_License" xml:space="preserve">
+ <value>授權：</value>
+ </data>
+ <data name="AboutView_Version" xml:space="preserve">
+ <value>版本：</value>
+ </data>
+ <data name="AddPresetView_AddNewCategory" xml:space="preserve">
+ <value>— 新增類別 —</value>
+ </data>
+ <data name="AddPresetView_AddPreset" xml:space="preserve">
+ <value>新增設定檔</value>
+ </data>
+ <data name="AddPresetView_Category" xml:space="preserve">
+ <value>類別：</value>
+ </data>
+ <data name="AddPresetView_Description" xml:space="preserve">
+ <value>敘述：</value>
+ </data>
+ <data name="AddPresetView_Name" xml:space="preserve">
+ <value>名稱：</value>
+ </data>
+ <data name="AddPresetView_SavePictureSize" xml:space="preserve">
+ <value>尺寸：</value>
+ </data>
+ <data name="AudioDefaultView_Behaviours" xml:space="preserve">
+ <value>選擇來源軌道</value>
+ </data>
+ <data name="AudioView_AllowPassThruOf" xml:space="preserve">
+ <value>允許傳遞：</value>
+ </data>
+ <data name="AudioView_AudioDefaultsDescription" xml:space="preserve">
+ <value>設定選擇新標題或來源視訊時，自動選擇音軌的方式。</value>
+ </data>
+ <data name="AudioView_AutoPassthruBehaviour" xml:space="preserve">
+ <value>自動傳遞行為：</value>
+ </data>
+ <data name="AudioView_Bitrate" xml:space="preserve">
+ <value>位元速率</value>
+ </data>
+ <data name="AudioView_Codec" xml:space="preserve">
+ <value>編解碼器</value>
+ </data>
+ <data name="AudioView_DRC" xml:space="preserve">
+ <value>DRC</value>
+ </data>
+ <data name="AudioView_Gain" xml:space="preserve">
+ <value>增益</value>
+ </data>
+ <data name="AudioView_Hide" xml:space="preserve">
+ <value>隱藏</value>
+ </data>
+ <data name="AudioView_Mixdown" xml:space="preserve">
+ <value>Mixdown</value>
+ </data>
+ <data name="AudioView_OtherwiseFallbackEncoder" xml:space="preserve">
+ <value>備選編碼器：</value>
+ </data>
+ <data name="AudioView_ReloadDefaults" xml:space="preserve">
+ <value>重新載入</value>
+ </data>
+ <data name="AudioView_Samplerate" xml:space="preserve">
+ <value>取樣率</value>
+ </data>
+ <data name="AudioView_Show" xml:space="preserve">
+ <value>顯示</value>
+ </data>
+ <data name="AudioView_TrackName" xml:space="preserve">
+ <value>軌道名稱</value>
+ </data>
+ <data name="AudioView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>軌道選擇行為：</value>
+ </data>
+ <data name="AudioView_TrackSettingDefaultBehaviour" xml:space="preserve">
+ <value>對於其他音軌：</value>
+ </data>
+ <data name="AudioView_WhenAutoPassthru" xml:space="preserve">
+ <value>當選擇「自動傳遞」為音訊編碼器。</value>
+ </data>
+ <data name="ChaptersView_ChapterMarkers" xml:space="preserve">
+ <value>章節標記點</value>
+ </data>
+ <data name="ChaptersView_ChapterName" xml:space="preserve">
+ <value>章節名稱</value>
+ </data>
+ <data name="ChaptersView_ChapterNumber" xml:space="preserve">
+ <value>章節序</value>
+ </data>
+ <data name="ChaptersView_CreateChapterMarkers" xml:space="preserve">
+ <value>建立章節標記點</value>
+ </data>
+ <data name="ChaptersView_Duration" xml:space="preserve">
+ <value>長度：</value>
+ </data>
+ <data name="ChaptersView_Export" xml:space="preserve">
+ <value>匯出</value>
+ </data>
+ <data name="ChaptersView_Import" xml:space="preserve">
+ <value>匯入</value>
+ </data>
+ <data name="ChapterView_ExportNames" xml:space="preserve">
+ <value>匯出名稱</value>
+ </data>
+ <data name="ChapterView_ImportNames" xml:space="preserve">
+ <value>匯入名稱</value>
+ </data>
+ <data name="ChapterView_ResetChapterNames" xml:space="preserve">
+ <value>重設章節名稱</value>
+ </data>
+ <data name="CountdownAlterView_CancelAction" xml:space="preserve">
+ <value>取消動作</value>
+ </data>
+ <data name="CountdownAlterView_Proceed" xml:space="preserve">
+ <value>進行</value>
+ </data>
+ <data name="CountdownAlterView_WhenDoneAction" xml:space="preserve">
+ <value>完成時的動作</value>
+ </data>
+ <data name="ErrorView_ErrorDetails" xml:space="preserve">
+ <value>錯誤細節：</value>
+ </data>
+ <data name="FiltersView_Custom" xml:space="preserve">
+ <value>自訂：</value>
+ </data>
+ <data name="FiltersView_Deblock" xml:space="preserve">
+ <value>Deblock：</value>
+ </data>
+ <data name="FiltersView_Decomb" xml:space="preserve">
+ <value>Decomb：</value>
+ </data>
+ <data name="FiltersView_Deinterlace" xml:space="preserve">
+ <value>去交錯：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePreset" xml:space="preserve">
+ <value>設定檔：</value>
+ </data>
+ <data name="FiltersView_DeinterlacePresetAuto" xml:space="preserve">
+ <value>去交錯設定檔</value>
+ </data>
+ <data name="FiltersView_Denoise" xml:space="preserve">
+ <value>降噪：</value>
+ </data>
+ <data name="FiltersView_DenoisePresetAuto" xml:space="preserve">
+ <value>降噪設定檔</value>
+ </data>
+ <data name="FiltersView_DenoiseTuneAuto" xml:space="preserve">
+ <value>調整降噪</value>
+ </data>
+ <data name="FiltersView_Detelecine" xml:space="preserve">
+ <value>Detelecine：</value>
+ </data>
+ <data name="FiltersView_Filters" xml:space="preserve">
+ <value>濾鏡</value>
+ </data>
+ <data name="FiltersView_FlipVideo" xml:space="preserve">
+ <value>水平</value>
+ </data>
+ <data name="FiltersView_Grayscale" xml:space="preserve">
+ <value>灰階</value>
+ </data>
+ <data name="FiltersView_InterlaceDetection" xml:space="preserve">
+ <value>偵測交錯：</value>
+ </data>
+ <data name="FiltersView_Preset" xml:space="preserve">
+ <value>設定檔：</value>
+ </data>
+ <data name="FiltersView_Rotate" xml:space="preserve">
+ <value>旋轉：</value>
+ </data>
+ <data name="FiltersView_Sharpen" xml:space="preserve">
+ <value>銳利化：</value>
+ </data>
+ <data name="FiltersView_SharpenPresetAuto" xml:space="preserve">
+ <value>銳利化設定檔</value>
+ </data>
+ <data name="FiltersView_SharpenTuneAuto" xml:space="preserve">
+ <value>調整銳利化</value>
+ </data>
+ <data name="FiltersView_Tune" xml:space="preserve">
+ <value>調整：</value>
+ </data>
+ <data name="Generic_Add" xml:space="preserve">
+ <value>新增</value>
+ </data>
+ <data name="Generic_Cancel" xml:space="preserve">
+ <value>取消</value>
+ </data>
+ <data name="Generic_Clear" xml:space="preserve">
+ <value>清除</value>
+ </data>
+ <data name="Generic_Close" xml:space="preserve">
+ <value>關閉</value>
+ </data>
+ <data name="Generic_CopyToClipboard" xml:space="preserve">
+ <value>複製到剪貼簿</value>
+ </data>
+ <data name="Generic_MoveLeft" xml:space="preserve">
+ <value>移到左邊</value>
+ </data>
+ <data name="Generic_MoveRight" xml:space="preserve">
+ <value>移到右邊</value>
+ </data>
+ <data name="Generic_Save" xml:space="preserve">
+ <value>儲存</value>
+ </data>
+ <data name="LogView_CopyClipboard" xml:space="preserve">
+ <value>複製到剪貼簿</value>
+ </data>
+ <data name="LogView_EncodeLog" xml:space="preserve">
+ <value>編碼紀錄檔</value>
+ </data>
+ <data name="LogView_OpenLogDir" xml:space="preserve">
+ <value>打開紀錄檔目錄</value>
+ </data>
+ <data name="LogView_ScanLog" xml:space="preserve">
+ <value>掃描紀錄</value>
+ </data>
+ <data name="MainView_ActivityLog" xml:space="preserve">
+ <value>活動紀錄</value>
+ </data>
+ <data name="MainView_AddAll" xml:space="preserve">
+ <value>新增全部</value>
+ </data>
+ <data name="MainView_AddCurrent" xml:space="preserve">
+ <value>新增目前的</value>
+ </data>
+ <data name="MainView_AddSelection" xml:space="preserve">
+ <value>新增選取的</value>
+ </data>
+ <data name="MainView_AddToQueue" xml:space="preserve">
+ <value>新增至佇列</value>
+ </data>
+ <data name="MainView_AdvancedTab" xml:space="preserve">
+ <value>進階</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>對齊 A/V 開頭</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>角度：</value>
+ </data>
+ <data name="MainView_AudioTab" xml:space="preserve">
+ <value>音訊</value>
+ </data>
+ <data name="MainView_AudioTrackCount" xml:space="preserve">
+ <value>音軌</value>
+ </data>
+ <data name="MainView_Browser" xml:space="preserve">
+ <value>瀏覽</value>
+ </data>
+ <data name="MainView_ChaptersTab" xml:space="preserve">
+ <value>章節</value>
+ </data>
+ <data name="MainView_Container" xml:space="preserve">
+ <value>容器</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>目的地</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>長度：</value>
+ </data>
+ <data name="MainView_File" xml:space="preserve">
+ <value>另存為：</value>
+ </data>
+ <data name="MainView_FiltersTab" xml:space="preserve">
+ <value>濾鏡</value>
+ </data>
+ <data name="MainView_Format" xml:space="preserve">
+ <value>格式：</value>
+ </data>
+ <data name="MainView_Help" xml:space="preserve">
+ <value>協助</value>
+ </data>
+ <data name="MainView_iPod5G" xml:space="preserve">
+ <value>iPod 5G 支援</value>
+ </data>
+ <data name="MainView_MetaDataTab" xml:space="preserve">
+ <value>中繼資料</value>
+ </data>
+ <data name="MainView_ModifiedPreset" xml:space="preserve">
+ <value>（已修改）</value>
+ </data>
+ <data name="MainView_Muxing" xml:space="preserve">
+ <value>合成中：需要一些時間…</value>
+ </data>
+ <data name="MainView_Options" xml:space="preserve">
+ <value>選項</value>
+ </data>
+ <data name="MainView_OutputSettings" xml:space="preserve">
+ <value>輸出設定</value>
+ </data>
+ <data name="MainView_Pause" xml:space="preserve">
+ <value>暫停</value>
+ </data>
+ <data name="MainView_PictureTab" xml:space="preserve">
+ <value>外觀尺寸</value>
+ </data>
+ <data name="MainView_PresetManage" xml:space="preserve">
+ <value>編輯設定檔</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>設定檔選項內容選單</value>
+ </data>
+ <data name="MainView_PresetRemove" xml:space="preserve">
+ <value>刪除設定檔</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>設定檔</value>
+ </data>
+ <data name="MainView_Preview" xml:space="preserve">
+ <value>預覽</value>
+ </data>
+ <data name="MainView_ProgressStatusWithTask" xml:space="preserve">
+ <value>編碼中：{0}, {1:00.00}%，剩餘時間：{2}, {3}</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>範圍：</value>
+ </data>
+ <data name="MainView_Reload" xml:space="preserve">
+ <value>重新載入</value>
+ </data>
+ <data name="MainView_Remove" xml:space="preserve">
+ <value>移除</value>
+ </data>
+ <data name="MainView_ResetBuiltInPresets" xml:space="preserve">
+ <value>重設內建的設定檔</value>
+ </data>
+ <data name="MainView_SaveNewPreset" xml:space="preserve">
+ <value>儲存新設定檔</value>
+ </data>
+ <data name="MainView_Searching" xml:space="preserve">
+ <value>搜尋開始時間中</value>
+ </data>
+ <data name="MainView_SetDefault" xml:space="preserve">
+ <value>設為預設</value>
+ </data>
+ <data name="MainView_ShowPreview" xml:space="preserve">
+ <value>預覽</value>
+ </data>
+ <data name="MainView_ShowQueue" xml:space="preserve">
+ <value>佇列</value>
+ </data>
+ <data name="MainView_Source" xml:space="preserve">
+ <value>來源：</value>
+ </data>
+ <data name="MainView_SourceOpen" xml:space="preserve">
+ <value>開啟來源檔</value>
+ </data>
+ <data name="MainView_StartEncode" xml:space="preserve">
+ <value>開始編碼</value>
+ </data>
+ <data name="MainView_StartQueue" xml:space="preserve">
+ <value>開始佇列</value>
+ </data>
+ <data name="MainView_Stop" xml:space="preserve">
+ <value>停止</value>
+ </data>
+ <data name="MainView_StopEncode" xml:space="preserve">
+ <value>停止編碼</value>
+ </data>
+ <data name="MainView_StopEncodeConfirm" xml:space="preserve">
+ <value>確定要停止本編碼工作嗎？</value>
+ </data>
+ <data name="MainView_SubtitleBeforeScanError" xml:space="preserve">
+ <value>在匯入字幕檔前，請選擇要編碼的來源。</value>
+ </data>
+ <data name="MainView_SubtitlesTab" xml:space="preserve">
+ <value>字幕</value>
+ </data>
+ <data name="MainView_SubtitleTracksCount" xml:space="preserve">
+ <value>字幕軌</value>
+ </data>
+ <data name="MainView_SummaryTab" xml:space="preserve">
+ <value>摘要</value>
+ </data>
+ <data name="MainView_through" xml:space="preserve">
+ <value>-</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>標題：</value>
+ </data>
+ <data name="MainView_UpdateSelectedPreset" xml:space="preserve">
+ <value>更新目前的設定檔</value>
+ </data>
+ <data name="MainView_VideoTab" xml:space="preserve">
+ <value>視訊</value>
+ </data>
+ <data name="MainView_WebOptimized" xml:space="preserve">
+ <value>針對網頁最佳化</value>
+ </data>
+ <data name="ManagePresetView_ManagePreset" xml:space="preserve">
+ <value>管理設定檔</value>
+ </data>
+ <data name="MetaDataView_Title" xml:space="preserve">
+ <value>中繼資料</value>
+ </data>
+ <data name="OptionsView_EnableNvencEncoding" xml:space="preserve">
+ <value>允許使用 Nvidia NVENC 編碼器</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncEncoding" xml:space="preserve">
+ <value>允許使用 Intel QuickSync 編碼器</value>
+ </data>
+ <data name="OptionsView_EnableVceEncoding" xml:space="preserve">
+ <value>允許使用 AMD VCE 編碼器</value>
+ </data>
+ <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">
+ <value>輸入的檔案格式包含無效字元。這些字元已被移除。</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenDone" xml:space="preserve">
+ <value>在每次編碼完成時發出提示音效</value>
+ </data>
+ <data name="OptionsView_PlaySoundWhenQueueDone" xml:space="preserve">
+ <value>在佇列完成時發出提示音效</value>
+ </data>
+ <data name="OptionsView_ShowPreviewOnSummaryTab" xml:space="preserve">
+ <value>在「摘要」分頁顯示預覽</value>
+ </data>
+ <data name="OptionsView_ShowStatusInTitleBar" xml:space="preserve">
+ <value>在應用程式標題列中顯示編碼狀態</value>
+ </data>
+ <data name="Options_7DayLogClear" xml:space="preserve">
+ <value>清除久於 7 天前的紀錄檔</value>
+ </data>
+ <data name="Options_About" xml:space="preserve">
+ <value>關於 HandBrake</value>
+ </data>
+ <data name="Options_Advanced" xml:space="preserve">
+ <value>進階</value>
+ </data>
+ <data name="Options_AdvancedOptions" xml:space="preserve">
+ <value>進階選項</value>
+ </data>
+ <data name="Options_Arguments" xml:space="preserve">
+ <value>參數：</value>
+ </data>
+ <data name="Options_AutomaticFileNaming" xml:space="preserve">
+ <value>自動命名檔案</value>
+ </data>
+ <data name="Options_AutoNameOutput" xml:space="preserve">
+ <value>自動命名輸出檔案</value>
+ </data>
+ <data name="Options_CheckForUpdates" xml:space="preserve">
+ <value>檢查更新</value>
+ </data>
+ <data name="Options_ClearCompleted" xml:space="preserve">
+ <value>總是在編碼完畢後清除佇列項目</value>
+ </data>
+ <data name="Options_ClearLogs" xml:space="preserve">
+ <value>清除紀錄檔的紀錄</value>
+ </data>
+ <data name="Options_CopyLogToDir" xml:space="preserve">
+ <value>在指定位置儲存編碼紀錄檔副本：</value>
+ </data>
+ <data name="Options_CopyLogToEncDir" xml:space="preserve">
+ <value>在輸出視訊的相同位置附上編碼紀錄檔副本</value>
+ </data>
+ <data name="Options_CurVersion" xml:space="preserve">
+ <value>目前版本</value>
+ </data>
+ <data name="Options_Decoding" xml:space="preserve">
+ <value>解碼</value>
+ </data>
+ <data name="Options_DefaultPath" xml:space="preserve">
+ <value>預設路徑：</value>
+ </data>
+ <data name="Options_DownloadUpdates" xml:space="preserve">
+ <value>下載更新</value>
+ </data>
+ <data name="Options_DVD" xml:space="preserve">
+ <value>讀取 DVD</value>
+ </data>
+ <data name="Options_DvdRead" xml:space="preserve">
+ <value>停用 LibDVDNav。（將以 libdvdread 替代）</value>
+ </data>
+ <data name="Options_Encoding" xml:space="preserve">
+ <value>編碼</value>
+ </data>
+ <data name="Options_Format" xml:space="preserve">
+ <value>檔案格式：</value>
+ </data>
+ <data name="Options_General" xml:space="preserve">
+ <value>一般</value>
+ </data>
+ <data name="Options_Logging" xml:space="preserve">
+ <value>記錄</value>
+ </data>
+ <data name="Options_LogLevel" xml:space="preserve">
+ <value>紀錄檔詳盡度：</value>
+ </data>
+ <data name="Options_LogPath" xml:space="preserve">
+ <value>紀錄檔路徑：</value>
+ </data>
+ <data name="Options_LowDiskspaceSize" xml:space="preserve">
+ <value>若磁碟空間不足，暫停佇列</value>
+ </data>
+ <data name="Options_MinimiseTray" xml:space="preserve">
+ <value>縮小至系統匣（需要重開程式）</value>
+ </data>
+ <data name="Options_MinTitleScanLength" xml:space="preserve">
+ <value>DVD 及藍光標題的最短長度（秒）。將跳過較短的標題：</value>
+ </data>
+ <data name="Options_MP4FileExtension" xml:space="preserve">
+ <value>MP4 副檔名：</value>
+ </data>
+ <data name="Options_OnStartup" xml:space="preserve">
+ <value>在電腦啟動時</value>
+ </data>
+ <data name="Options_Output" xml:space="preserve">
+ <value>輸出檔案</value>
+ </data>
+ <data name="Options_Path" xml:space="preserve">
+ <value>路徑：</value>
+ </data>
+ <data name="Options_PathToMediaPlayer" xml:space="preserve">
+ <value>媒體播放器路徑</value>
+ </data>
+ <data name="Options_PreventSleep" xml:space="preserve">
+ <value>在編碼時防止系統睡眠</value>
+ </data>
+ <data name="Options_PreviewScanCount" xml:space="preserve">
+ <value>欲掃描的預覽圖片數：</value>
+ </data>
+ <data name="Options_PriorityLevel" xml:space="preserve">
+ <value>優先權：</value>
+ </data>
+ <data name="Options_QsvDecode" xml:space="preserve">
+ <value>可以時，優先使用 Intel QuickSync 解碼影片。</value>
+ </data>
+ <data name="Options_QsvDecodeForNonFullPath" xml:space="preserve">
+ <value>在不使用 QuickSync 編碼器時改用 QSV 解碼器。（如：x265）</value>
+ </data>
+ <data name="Options_RemovePunctuation" xml:space="preserve">
+ <value>移除常見的標點符號</value>
+ </data>
+ <data name="Options_ReplaceUnderscores" xml:space="preserve">
+ <value>以空格替換底線</value>
+ </data>
+ <data name="Options_ResetDoNothing" xml:space="preserve">
+ <value>當本程式重新啟動時，重設為「無動作」。</value>
+ </data>
+ <data name="Options_Scaler" xml:space="preserve">
+ <value>選擇定標器：</value>
+ </data>
+ <data name="Options_Scaling" xml:space="preserve">
+ <value>縮放</value>
+ </data>
+ <data name="Options_SendFileTo" xml:space="preserve">
+ <value>將檔案寄送給：</value>
+ </data>
+ <data name="Options_TitleCase" xml:space="preserve">
+ <value>變更為首字母大寫</value>
+ </data>
+ <data name="Options_Updates" xml:space="preserve">
+ <value>更新</value>
+ </data>
+ <data name="Options_UserInterface" xml:space="preserve">
+ <value>使用者介面</value>
+ </data>
+ <data name="Options_Version" xml:space="preserve">
+ <value>版本：</value>
+ </data>
+ <data name="Options_Video" xml:space="preserve">
+ <value>視訊</value>
+ </data>
+ <data name="Options_VideoPreviewPath" xml:space="preserve">
+ <value>此路徑僅用於視訊預覽功能。
+支援 VLC 及 MPC-HC。其他播放器或許也可運作，但未經驗證。</value>
+ </data>
+ <data name="Options_ViewLogDirectory" xml:space="preserve">
+ <value>檢視記錄檔目錄</value>
+ </data>
+ <data name="Options_WhenDone" xml:space="preserve">
+ <value>在完成時</value>
+ </data>
+ <data name="Options_x264" xml:space="preserve">
+ <value>x264/5 設定</value>
+ </data>
+ <data name="Options_x264Granularity" xml:space="preserve">
+ <value>恆定品質模式的最小級距：</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>寬螢幕變形：</value>
+ </data>
+ <data name="PictureSettingsView_Automatic" xml:space="preserve">
+ <value>自動</value>
+ </data>
+ <data name="PictureSettingsView_Bottom" xml:space="preserve">
+ <value>底部</value>
+ </data>
+ <data name="PictureSettingsView_Cropping" xml:space="preserve">
+ <value>裁切：</value>
+ </data>
+ <data name="PictureSettingsView_Custom" xml:space="preserve">
+ <value>自訂</value>
+ </data>
+ <data name="PictureSettingsView_DisplayWidth" xml:space="preserve">
+ <value>顯示尺寸：</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>高度：</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>自動</value>
+ </data>
+ <data name="PictureSettingsView_Left" xml:space="preserve">
+ <value>左側</value>
+ </data>
+ <data name="PictureSettingsView_Output" xml:space="preserve">
+ <value>成品尺寸：</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>長寬比：</value>
+ </data>
+ <data name="PictureSettingsView_Right" xml:space="preserve">
+ <value>右側</value>
+ </data>
+ <data name="PictureSettingsView_Size" xml:space="preserve">
+ <value>尺寸</value>
+ </data>
+ <data name="PictureSettingsView_Top" xml:space="preserve">
+ <value>頂部</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>縮放大小：</value>
+ </data>
+ <data name="Preset_Custom" xml:space="preserve">
+ <value>自訂</value>
+ </data>
+ <data name="Preset_Export" xml:space="preserve">
+ <value>匯出為檔案</value>
+ </data>
+ <data name="Preset_Import" xml:space="preserve">
+ <value>自檔案匯入</value>
+ </data>
+ <data name="Preset_Official" xml:space="preserve">
+ <value>官方的</value>
+ </data>
+ <data name="QueueSelectionView_ChooseTitles" xml:space="preserve">
+ <value>選擇標題：</value>
+ </data>
+ <data name="QueueSelectionView_Title" xml:space="preserve">
+ <value>新增至佇列</value>
+ </data>
+ <data name="QueueSelection_UsingPreset" xml:space="preserve">
+ <value>將以設定檔「{0}」新增選取的標題。</value>
+ </data>
+ <data name="QueueView_Advanced" xml:space="preserve">
+ <value>視訊選項：</value>
+ </data>
+ <data name="QueueView_Audio" xml:space="preserve">
+ <value>音訊：</value>
+ </data>
+ <data name="QueueView_ClearAll" xml:space="preserve">
+ <value>清除全部</value>
+ </data>
+ <data name="QueueView_ClearCompleted" xml:space="preserve">
+ <value>清除已完成的</value>
+ </data>
+ <data name="QueueView_ClearQueue" xml:space="preserve">
+ <value>清除佇列</value>
+ </data>
+ <data name="QueueView_ClearSelected" xml:space="preserve">
+ <value>清除已選的</value>
+ </data>
+ <data name="QueueView_Delete" xml:space="preserve">
+ <value>刪除</value>
+ </data>
+ <data name="QueueView_Destination" xml:space="preserve">
+ <value>目的地：</value>
+ </data>
+ <data name="WhenDone_DoNothing" xml:space="preserve">
+ <value>不動作</value>
+ </data>
+ <data name="QueueView_Duration" xml:space="preserve">
+ <value>編碼歷時：</value>
+ </data>
+ <data name="QueueView_Edit" xml:space="preserve">
+ <value>編輯</value>
+ </data>
+ <data name="QueueView_EndTime" xml:space="preserve">
+ <value>結束時間：</value>
+ </data>
+ <data name="QueueView_Export" xml:space="preserve">
+ <value>匯出佇列</value>
+ </data>
+ <data name="QueueView_FileSize" xml:space="preserve">
+ <value>輸出檔案大小：</value>
+ </data>
+ <data name="WhenDone_Hibernate" xml:space="preserve">
+ <value>休眠</value>
+ </data>
+ <data name="WhenDone_LockSystem" xml:space="preserve">
+ <value>鎖定系統</value>
+ </data>
+ <data name="QueueView_LogNotAvailableYet" xml:space="preserve">
+ <value>紀錄檔將在編碼完成後提供使用。</value>
+ </data>
+ <data name="WhenDone_Logoff" xml:space="preserve">
+ <value>登出</value>
+ </data>
+ <data name="QueueView_OpenDestDir" xml:space="preserve">
+ <value>打開目的地目錄</value>
+ </data>
+ <data name="QueueView_OpenSourceDir" xml:space="preserve">
+ <value>開啟來源目錄</value>
+ </data>
+ <data name="QueueView_Options" xml:space="preserve">
+ <value>選項</value>
+ </data>
+ <data name="QueueView_Pause" xml:space="preserve">
+ <value>暫停</value>
+ </data>
+ <data name="QueueView_PausedDuration" xml:space="preserve">
+ <value>暫停時間：</value>
+ </data>
+ <data name="QueueView_PictureSettings" xml:space="preserve">
+ <value>影像設定：</value>
+ </data>
+ <data name="WhenDone_QuitHandBrake" xml:space="preserve">
+ <value>離開 HandBrake</value>
+ </data>
+ <data name="QueueView_ResetAllJobs" xml:space="preserve">
+ <value>重試所有工作</value>
+ </data>
+ <data name="QueueView_ResetFailed" xml:space="preserve">
+ <value>重試失敗</value>
+ </data>
+ <data name="QueueView_ResetSelectedJobs" xml:space="preserve">
+ <value>重試選取的工作</value>
+ </data>
+ <data name="QueueView_Reset" xml:space="preserve">
+ <value>重設</value>
+ </data>
+ <data name="WhenDone_Shutdown" xml:space="preserve">
+ <value>關機</value>
+ </data>
+ <data name="QueueView_Source" xml:space="preserve">
+ <value>來源：</value>
+ </data>
+ <data name="QueueView_Start" xml:space="preserve">
+ <value>開始佇列</value>
+ </data>
+ <data name="QueueView_StartTime" xml:space="preserve">
+ <value>開始時間：</value>
+ </data>
+ <data name="QueueView_Statistics" xml:space="preserve">
+ <value>統計資訊</value>
+ </data>
+ <data name="QueueView_StatsNotAvailableYet" xml:space="preserve">
+ <value>統計資訊在作業完成後才能使用。</value>
+ </data>
+ <data name="QueueView_Subtitles" xml:space="preserve">
+ <value>字幕：</value>
+ </data>
+ <data name="QueueView_Summary" xml:space="preserve">
+ <value>摘要</value>
+ </data>
+ <data name="WhenDone_Suspend" xml:space="preserve">
+ <value>睡眠</value>
+ </data>
+ <data name="QueueView_Video" xml:space="preserve">
+ <value>視訊：</value>
+ </data>
+ <data name="QueueView_WhenDone" xml:space="preserve">
+ <value>當完成後：</value>
+ </data>
+ <data name="Shared_AddAllForSelected" xml:space="preserve">
+ <value>新增所有剩餘已選的語言</value>
+ </data>
+ <data name="Shared_AddAllRemaining" xml:space="preserve">
+ <value>新增所有剩餘的軌道</value>
+ </data>
+ <data name="Shared_AddNewTrack" xml:space="preserve">
+ <value>新增軌道</value>
+ </data>
+ <data name="Shared_AddTrack" xml:space="preserve">
+ <value>軌道：</value>
+ </data>
+ <data name="Shared_AvailableLanguages" xml:space="preserve">
+ <value>可用的語言：</value>
+ </data>
+ <data name="Shared_ChooseLanguages" xml:space="preserve">
+ <value>選擇語言：</value>
+ </data>
+ <data name="Shared_ChosenLanguages" xml:space="preserve">
+ <value>已選的語言：</value>
+ </data>
+ <data name="Shared_ConfigureDefaultBehaviours" xml:space="preserve">
+ <value>配置預設行為</value>
+ </data>
+ <data name="Shared_ReloadDefaults" xml:space="preserve">
+ <value>重新載入</value>
+ </data>
+ <data name="SourceSelection_ChooseDisc" xml:space="preserve">
+ <value>選擇要掃描的碟片</value>
+ </data>
+ <data name="SourceSelection_ChooseFile" xml:space="preserve">
+ <value>選擇要掃描的檔案</value>
+ </data>
+ <data name="SourceSelection_ChooseFolder" xml:space="preserve">
+ <value>選擇要掃描的資料夾</value>
+ </data>
+ <data name="SourceSelection_ChooseSpecificTitle" xml:space="preserve">
+ <value>指定標題（選填）：</value>
+ </data>
+ <data name="SourceSelection_ChooseVideo" xml:space="preserve">
+ <value>接著選擇要編碼的視訊：</value>
+ </data>
+ <data name="SourceSelection_File" xml:space="preserve">
+ <value>檔案</value>
+ </data>
+ <data name="SourceSelection_FolderBatchScan" xml:space="preserve">
+ <value>資料夾（批次掃描）</value>
+ </data>
+ <data name="SourceSelection_OpenDVDBluray" xml:space="preserve">
+ <value>開啟此 DVD 或藍光光碟機</value>
+ </data>
+ <data name="SourceSelection_OpenFolderWIth" xml:space="preserve">
+ <value>打開有一或多個檔案的資料夾</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecovery" xml:space="preserve">
+ <value>復原佇列檔案</value>
+ </data>
+ <data name="SourceSelection_QueueArchiveRecoveryDesc" xml:space="preserve">
+ <value>先前的佇列封存可供使用。</value>
+ </data>
+ <data name="SourceSelection_SingleVideoFile" xml:space="preserve">
+ <value>打開單個影片檔。</value>
+ </data>
+ <data name="SourceSelection_SourceSelection" xml:space="preserve">
+ <value>來源選擇</value>
+ </data>
+ <data name="StaticPreviewView_Duration" xml:space="preserve">
+ <value>時間：</value>
+ </data>
+ <data name="StaticPreviewView_LivePreview" xml:space="preserve">
+ <value>即時預覽</value>
+ </data>
+ <data name="StaticPreviewView_SelectPreviewImage" xml:space="preserve">
+ <value>選擇一張預覽影像</value>
+ </data>
+ <data name="StaticPreviewView_UseSystemDefault" xml:space="preserve">
+ <value>優先使用系統預設的影片播放器</value>
+ </data>
+ <data name="SubtitlesView_AddCC" xml:space="preserve">
+ <value>當可用時，增加 CC 字幕</value>
+ </data>
+ <data name="SubtitlesView_AddForeignAudioSearch" xml:space="preserve">
+ <value>新增「外語音訊掃描」</value>
+ </data>
+ <data name="SubtitlesView_BurnInBehaviour" xml:space="preserve">
+ <value>壓印行為：</value>
+ </data>
+ <data name="SubtitlesView_ImportSubtitle" xml:space="preserve">
+ <value>匯入字幕</value>
+ </data>
+ <data name="SubtitlesView_TrackSelectionBehaviour" xml:space="preserve">
+ <value>軌道選擇行為：</value>
+ </data>
+ <data name="SubtitleView_AddAllCC" xml:space="preserve">
+ <value>新增所有剩餘的 CC 字幕</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">
+ <value>設定選擇新標題或來源視訊時，自動選擇字幕軌的方式。</value>
+ </data>
+ <data name="SummaryView_AdditionalAudioTracks" xml:space="preserve">
+ <value>額外音軌</value>
+ </data>
+ <data name="SummaryView_AdditionalSubtitleTracks" xml:space="preserve">
+ <value>額外字幕軌</value>
+ </data>
+ <data name="SummaryView_Burned" xml:space="preserve">
+ <value>壓印字幕</value>
+ </data>
+ <data name="SummaryView_Chapters" xml:space="preserve">
+ <value>章節標記點</value>
+ </data>
+ <data name="SummaryView_Deblock" xml:space="preserve">
+ <value>Deblock</value>
+ </data>
+ <data name="SummaryView_Detelecine" xml:space="preserve">
+ <value>Detelecine</value>
+ </data>
+ <data name="SummaryView_display" xml:space="preserve">
+ <value>顯示</value>
+ </data>
+ <data name="SummaryView_Grayscale" xml:space="preserve">
+ <value>灰階</value>
+ </data>
+ <data name="SummaryView_NoAudioTracks" xml:space="preserve">
+ <value>無音軌</value>
+ </data>
+ <data name="SummaryView_NoChapters" xml:space="preserve">
+ <value>無章節標記點</value>
+ </data>
+ <data name="SummaryView_NoFilters" xml:space="preserve">
+ <value>無濾鏡</value>
+ </data>
+ <data name="SummaryView_NoSource" xml:space="preserve">
+ <value>無來源</value>
+ </data>
+ <data name="SummaryView_NoSubtitleTracks" xml:space="preserve">
+ <value>無字幕軌</value>
+ </data>
+ <data name="SummaryView_NoTracks" xml:space="preserve">
+ <value>無軌道</value>
+ </data>
+ <data name="SummaryView_PreviewInfo" xml:space="preserve">
+ <value>預覽 {0}/{1}</value>
+ </data>
+ <data name="SummaryView_Rotation" xml:space="preserve">
+ <value>旋轉</value>
+ </data>
+ <data name="SummaryView_storage" xml:space="preserve">
+ <value>儲存空間</value>
+ </data>
+ <data name="VideoView_2Pass" xml:space="preserve">
+ <value>2-Pass 編碼</value>
+ </data>
+ <data name="VideoView_AverageBitrate" xml:space="preserve">
+ <value>平均位元速率 (kbps)：</value>
+ </data>
+ <data name="VideoView_Codec" xml:space="preserve">
+ <value>視訊編碼器：</value>
+ </data>
+ <data name="VideoView_ConstantFramerate" xml:space="preserve">
+ <value>恆定影格率</value>
+ </data>
+ <data name="VideoView_ConstantQuality" xml:space="preserve">
+ <value>恆定品質：</value>
+ </data>
+ <data name="VideoView_EncoderLevel" xml:space="preserve">
+ <value>編碼器等級：</value>
+ </data>
+ <data name="VideoView_EncoderPreset" xml:space="preserve">
+ <value>編碼器設定檔：</value>
+ </data>
+ <data name="VideoView_EncoderProfile" xml:space="preserve">
+ <value>編碼器預設檔：</value>
+ </data>
+ <data name="VideoView_EncodeTune" xml:space="preserve">
+ <value>調整編碼器：</value>
+ </data>
+ <data name="VideoView_ExtraOptions" xml:space="preserve">
+ <value>進階選項：</value>
+ </data>
+ <data name="VideoView_FastDecode" xml:space="preserve">
+ <value>快速解碼</value>
+ </data>
+ <data name="VideoView_Framerate" xml:space="preserve">
+ <value>影格率 (FPS)：</value>
+ </data>
+ <data name="VideoView_OptimiseVideo" xml:space="preserve">
+ <value>編碼器選項：</value>
+ </data>
+ <data name="VideoView_PeakFramerate" xml:space="preserve">
+ <value>峰值影格率</value>
+ </data>
+ <data name="VideoView_Quality" xml:space="preserve">
+ <value>品質：</value>
+ </data>
+ <data name="VideoView_TurboFirstPass" xml:space="preserve">
+ <value>加速首次編碼</value>
+ </data>
+ <data name="VideoView_VariableFramerate" xml:space="preserve">
+ <value>動態影格率</value>
+ </data>
+ <data name="VideoView_Video" xml:space="preserve">
+ <value>視訊：</value>
+ </data>
+ <data name="OptionsView_Language" xml:space="preserve">
+ <value>語言：</value>
+ </data>
+ <data name="Language_UseSystem" xml:space="preserve">
+ <value>使用系統語言</value>
+ </data>
+ <data name="SourceSelection_AboutHandBrake" xml:space="preserve">
+ <value>關於 HandBrake</value>
+ </data>
+ <data name="SourceSelection_DropFileHere" xml:space="preserve">
+ <value>或者拖動一個檔案、資料夾到這裡...</value>
+ </data>
+ <data name="SourceSelection_Help" xml:space="preserve">
+ <value>協助</value>
+ </data>
+ <data name="Preferences" xml:space="preserve">
+ <value>偏好設定</value>
+ </data>
+ <data name="AudioDefaultsView_AddTrack" xml:space="preserve">
+ <value>新增軌道</value>
+ </data>
+ <data name="AudioDefaultsView_AutoAddTracks" xml:space="preserve">
+ <value>設定各音軌的編碼器：</value>
+ </data>
+ <data name="AudioDefaultsView_Clear" xml:space="preserve">
+ <value>清除</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>壓印</value>
+ </data>
+ <data name="SubtitlesView_Default" xml:space="preserve">
+ <value>預設</value>
+ </data>
+ <data name="SubtitlesView_ForcedOnly" xml:space="preserve">
+ <value>僅限強制的</value>
+ </data>
+ <data name="MainView_About" xml:space="preserve">
+ <value>關於... (_A)</value>
+ </data>
+ <data name="MainView_ActivityLogMenu" xml:space="preserve">
+ <value>動作紀錄 (_A)</value>
+ </data>
+ <data name="MainView_CheckForUpdates" xml:space="preserve">
+ <value>檢查更新 (_C)</value>
+ </data>
+ <data name="MainView_Exit" xml:space="preserve">
+ <value>離開 (_E)</value>
+ </data>
+ <data name="MainView_ExportToFile" xml:space="preserve">
+ <value>匯出為檔案 (_E)</value>
+ </data>
+ <data name="MainView_FileMenu" xml:space="preserve">
+ <value>檔案 (_F)</value>
+ </data>
+ <data name="MainView_HandBrakeDocs" xml:space="preserve">
+ <value>HandBrake 文件 (HTTPS) (_H)</value>
+ </data>
+ <data name="MainView_HelpMenu" xml:space="preserve">
+ <value>說明 (_H)</value>
+ </data>
+ <data name="MainView_ImportFromFile" xml:space="preserve">
+ <value>自檔案匯入 (_U)</value>
+ </data>
+ <data name="MainView_PreferencesMenu" xml:space="preserve">
+ <value>偏好設定 (_P)</value>
+ </data>
+ <data name="MainView_PresetsMenu" xml:space="preserve">
+ <value>設定檔 (_P)</value>
+ </data>
+ <data name="MainView_QueueMenu" xml:space="preserve">
+ <value>佇列 (_Q)</value>
+ </data>
+ <data name="MainView_ResetPresets" xml:space="preserve">
+ <value>重設內建的設定檔 (_R)</value>
+ </data>
+ <data name="MainView_SetCurrentAsDefault" xml:space="preserve">
+ <value>將目前的設為預設 (_S)</value>
+ </data>
+ <data name="MainView_ShowPresetPanel" xml:space="preserve">
+ <value>顯示設定檔面板 (_H)</value>
+ </data>
+ <data name="MainView_ShowQueueMenu" xml:space="preserve">
+ <value>顯示佇列 (_S)</value>
+ </data>
+ <data name="MainView_ToolsMenu" xml:space="preserve">
+ <value>工具 (_T)</value>
+ </data>
+ <data name="OptionsView_CheckingForUpdates" xml:space="preserve">
+ <value>檢查更新中...</value>
+ </data>
+ <data name="OptionsView_ClearLogDirConfirm" xml:space="preserve">
+ <value>您確定要清除紀錄檔的目錄嗎？</value>
+ </data>
+ <data name="OptionsView_ClearLogs" xml:space="preserve">
+ <value>清除紀錄檔</value>
+ </data>
+ <data name="OptionsView_Downloading" xml:space="preserve">
+ <value>下載中...</value>
+ </data>
+ <data name="OptionsView_LogsCleared" xml:space="preserve">
+ <value>已清除 HandBrake 的紀錄檔目錄！</value>
+ </data>
+ <data name="OptionsView_Notice" xml:space="preserve">
+ <value>通知</value>
+ </data>
+ <data name="OptionsView_PreparingUpdate" xml:space="preserve">
+ <value>準備更新中...</value>
+ </data>
+ <data name="OptionsView_SelectFolder" xml:space="preserve">
+ <value>請選擇一個資料夾。</value>
+ </data>
+ <data name="OptionsView_SetDefaultLocationOutputFIle" xml:space="preserve">
+ <value>按一下「瀏覽」來設定預設位置</value>
+ </data>
+ <data name="MainView_Hide" xml:space="preserve">
+ <value>隱藏</value>
+ </data>
+ <data name="MainView_Show" xml:space="preserve">
+ <value>顯示</value>
+ </data>
+ <data name="MainView_ShowAddAllToQueue" xml:space="preserve">
+ <value>「新增所有項目」至佇列</value>
+ </data>
+ <data name="MainView_ShowAddSelectionToQueue" xml:space="preserve">
+ <value>「新增已選的項目」至佇列</value>
+ </data>
+ <data name="QueueView_PlayMediaFile" xml:space="preserve">
+ <value>播放檔案</value>
+ </data>
+ <data name="Options_ApplicationToolbar" xml:space="preserve">
+ <value>應用程式工具列</value>
+ </data>
+ <data name="Options_ShowToolbarAddAll" xml:space="preserve">
+ <value>在工具列顯示「新增所有項目至佇列」</value>
+ </data>
+ <data name="Options_ShowToolbarAddSelection" xml:space="preserve">
+ <value>在工具列顯示「新增已選的項目」至佇列</value>
+ </data>
+ <data name="OptionsView_HardwareDetectFailed" xml:space="preserve">
+ <value>已停用硬體編碼支援。若您沒有以 "--no-hardware" 選項開啟 HandBrake，請確保系統中所有的顯示卡都使用最新的驅動程式。
+
+這不會影響軟體編碼器。</value>
+ </data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>在繼續前，請更正您的字幕設定。</value>
+ </data>
+ <data name="Generic_Apply" xml:space="preserve">
+ <value>套用</value>
+ </data>
+ <data name="Main_ResumeEncode" xml:space="preserve">
+ <value>繼續編碼</value>
+ </data>
+ <data name="QueueView_Actions" xml:space="preserve">
+ <value>動作</value>
+ </data>
+ <data name="QueueView_Import" xml:space="preserve">
+ <value>匯入佇列</value>
+ </data>
+ <data name="QueueViewModel_EncodeStatusChanged_StatusLabel" xml:space="preserve">
+ <value>編碼中：Pass {0}/{1}，{2:00.00}%，FPS: {3:000.0}，平均 FPS: {4:000.0}
+剩餘時間：{5}，已持續了：{6}{7}</value>
+ </data>
+ <data name="QueueView_DeleteSelected" xml:space="preserve">
+ <value>刪除已選項目</value>
+ </data>
+ <data name="Portable_TmpNotWritable" xml:space="preserve">
+ <value>免安裝模式：無法建立 TMP 目錄。請確認該路徑是正確且可寫入的。
+
+ {0}</value>
+ </data>
+ <data name="Portable_StorageNotWritable" xml:space="preserve">
+ <value>免安裝模式：無法建立儲存目錄。請確認該路徑是正確且可寫入的。
+
+ {0}</value>
+ </data>
+ <data name="Portable_IniFileError" xml:space="preserve">
+ <value>免安裝模式：無法讀取 portable.ini，該檔案可能有錯誤。請使用 portable.ini.template 作為範本重試。</value>
+ </data>
+ <data name="Startup_InitFailed" xml:space="preserve">
+ <value>HandBrake 無法初始化引擎。這常因為 GPU 驅動程式太舊。\n 請更新您電腦中所有內顯、獨顯的驅動程式。</value>
+ </data>
+ <data name="OptionsView_FormatOptions" xml:space="preserve">
+ <value>Replacement Placeholders: {source} {title} {chapters} {creation-date} {creation-time} {date} {time} {quality_bitrate}</value>
+ </data>
+ <data name="OptionsView_PathOptions" xml:space="preserve">
+ <value>Replacement Placeholders: {source_path} {source_folder_name} {source}</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Ask" xml:space="preserve">
+ <value>詢問是否覆寫檔案</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Autoname" xml:space="preserve">
+ <value>嘗試自動重新命名檔案</value>
+ </data>
+ <data name="FileOverwriteBehaviours_Overwrite" xml:space="preserve">
+ <value>覆寫檔案</value>
+ </data>
+ <data name="Options_UIBehaviour" xml:space="preserve">
+ <value>使用者介面行為</value>
+ </data>
+ <data name="OptionsView_FileOverwriteBehaviour" xml:space="preserve">
+ <value>檔案覆寫行為：</value>
+ </data>
+ <data name="Options_EncodeCompleted" xml:space="preserve">
+ <value>編碼完成</value>
+ </data>
+ <data name="Options_Notifications" xml:space="preserve">
+ <value>音效通知</value>
+ </data>
+ <data name="Options_QueueCompleted" xml:space="preserve">
+ <value>已完成佇列</value>
+ </data>
+ <data name="Options_WhenDoneColon" xml:space="preserve">
+ <value>當完成後：</value>
+ </data>
+ <data name="OptionsView_FileCollisionBehaviour" xml:space="preserve">
+ <value>檔名衝突行為：</value>
+ </data>
+ <data name="CollisionBehaviour_Post" xml:space="preserve">
+ <value>後置詞</value>
+ </data>
+ <data name="CollisionBehaviour_Pre" xml:space="preserve">
+ <value>前置詞</value>
+ </data>
+ <data name="CollisionBehaviour_AppendNumber" xml:space="preserve">
+ <value>加上編號</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockPreset" xml:space="preserve">
+ <value>FiltersView_DeblockPreset</value>
+ </data>
+ <data name="FiltersViewAuto_DeblockTune" xml:space="preserve">
+ <value>調整去區塊濾波器</value>
+ </data>
+ <data name="OptionsView_ChoiceOfEncoderHint" xml:space="preserve">
+ <value>將可在「視訊」索引標籤內選擇編碼器。</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionPlural" xml:space="preserve">
+ <value>HandBrake 偵測到多個未完成的佇列檔。復原它們會需要執行多個 HandBrake 個體。要復原所有未完成的工作嗎？</value>
+ </data>
+ <data name="Queue_RecoverQueueQuestionSingular" xml:space="preserve">
+ <value>HandBrake 偵測到自上次本應用程式啟動的未完成佇列。您想要復原它們嗎？</value>
+ </data>
+ <data name="Queue_RecoveryPossible" xml:space="preserve">
+ <value>有可復原的佇列</value>
+ </data>
+ <data name="PresetService_ImportingBuiltInWarning" xml:space="preserve">
+ <value>檔案包含內建的設定檔，因此無法匯入。請使用「設定檔功能表 -&gt; 重設內建設定檔」來還原標準的設定檔。
+
+已匯入其他支援的使用者設定檔。</value>
+ </data>
+ <data name="Options_PromptBeforeAction" xml:space="preserve">
+ <value>立即執行動作。（這將停用 60 秒的確認對話窗）</value>
+ </data>
+ <data name="Browse" xml:space="preserve">
+ <value>瀏覽</value>
+ </data>
+ <data name="OptionsView_MediaFileNotSet" xml:space="preserve">
+ <value>未設定音訊檔案。請點擊「瀏覽」來選擇一個播放用的 wav 或 mp3 檔。</value>
+ </data>
+ <data name="OptionsView_Play" xml:space="preserve">
+ <value>播放</value>
+ </data>
+ <data name="QueueView_ExportCLI" xml:space="preserve">
+ <value>匯出佇列（僅限命令列介面）</value>
+ </data>
+ <data name="Options_DarkTheme" xml:space="preserve">
+ <value>使用深色佈景主題。（需要重開程式，僅支援 Windows 10）</value>
+ </data>
+ <data name="QueueView_NotAvailable" xml:space="preserve">
+ <value>尚不可用</value>
+ </data>
+ <data name="Options_LowDiskspaceSizeGB" xml:space="preserve">
+ <value>GB</value>
+ </data>
+ <data name="SystemService_ACMains" xml:space="preserve">
+ <value>已偵測 AC 電源，繼續編碼... ({0}%)</value>
+ </data>
+ <data name="SystemService_CriticalBattery" xml:space="preserve">
+ <value>系統電池即將耗盡！({0}%)</value>
+ </data>
+ <data name="SystemService_LowBatteryLog" xml:space="preserve">
+ <value>系統低電量！（{0} %）已暫停編碼工作。</value>
+ </data>
+ <data name="SystemService_LowDiskSpaceLog" xml:space="preserve">
+ <value>目的地磁碟的容量已低於 {0} GB。正在暫停編碼...</value>
+ </data>
+ <data name="AudioDefaultsView_PaneTitle" xml:space="preserve">
+ <value>自動選擇音訊</value>
+ </data>
+ <data name="SubtitlesDefaultsView_PaneTitle" xml:space="preserve">
+ <value>自動選擇字幕</value>
+ </data>
+ <data name="Options_SystemOptions" xml:space="preserve">
+ <value>系統</value>
+ </data>
+ <data name="MetadataView_Actors" xml:space="preserve">
+ <value>演員：</value>
+ </data>
+ <data name="MetadataView_Comments" xml:space="preserve">
+ <value>評註：</value>
+ </data>
+ <data name="MetadataView_Description" xml:space="preserve">
+ <value>敘述：</value>
+ </data>
+ <data name="MetadataView_Director" xml:space="preserve">
+ <value>導演：</value>
+ </data>
+ <data name="MetadataView_Genre" xml:space="preserve">
+ <value>類型：</value>
+ </data>
+ <data name="MetadataView_Plot" xml:space="preserve">
+ <value>劇本：</value>
+ </data>
+ <data name="MetadataView_ReleaseDate" xml:space="preserve">
+ <value>釋出日期：</value>
+ </data>
+ <data name="MetadataView_TitleTag" xml:space="preserve">
+ <value>標題：</value>
+ </data>
+ <data name="LogViewModel_Title" xml:space="preserve">
+ <value>紀錄檔檢視器</value>
+ </data>
+ <data name="MainView_Aspect" xml:space="preserve">
+ <value>長寬比：</value>
+ </data>
+ <data name="MainView_Filters" xml:space="preserve">
+ <value>濾鏡：</value>
+ </data>
+ <data name="MainView_Size" xml:space="preserve">
+ <value>大小：</value>
+ </data>
+ <data name="MainView_Tracks" xml:space="preserve">
+ <value>軌道：</value>
+ </data>
+ <data name="OptionsTab_General" xml:space="preserve">
+ <value>一般</value>
+ </data>
+ <data name="OptionsViewModel_CheckForUpdatesMsg" xml:space="preserve">
+ <value>點擊「檢查更新」來檢查是否有新版</value>
+ </data>
+ <data name="OptionsView_BackButton" xml:space="preserve">
+ <value>&lt; 返回</value>
+ </data>
+ <data name="QueueView_CurrentlyPaused" xml:space="preserve">
+ <value>目前暫停</value>
+ </data>
+ <data name="Options_OutputFiles" xml:space="preserve">
+ <value>輸出檔案</value>
+ </data>
+ <data name="PointToPointMode_Chapters" xml:space="preserve">
+ <value>章節</value>
+ </data>
+ <data name="PointToPointMode_Frames" xml:space="preserve">
+ <value>影格</value>
+ </data>
+ <data name="PointToPointMode_Preview" xml:space="preserve">
+ <value>預覽</value>
+ </data>
+ <data name="PointToPointMode_Seconds" xml:space="preserve">
+ <value>秒</value>
+ </data>
+ <data name="SubtitleBehaviourModes_AllMatching" xml:space="preserve">
+ <value>所有符合的已選語言</value>
+ </data>
+ <data name="SubtitleBehaviourModes_FirstMatching" xml:space="preserve">
+ <value>首個符合的已選語言</value>
+ </data>
+ <data name="SubtitleBehaviourModes_None" xml:space="preserve">
+ <value>無</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>首軌</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioPreferredElseFirst" xml:space="preserve">
+ <value>首選外語音軌，首軌其次</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_ForeignAudioTrack" xml:space="preserve">
+ <value>外語音軌</value>
+ </data>
+ <data name="SubtitleBurnInBehaviourModes_None" xml:space="preserve">
+ <value>無</value>
+ </data>
+ <data name="SubtitleViewModel_ForeignAudioSearch" xml:space="preserve">
+ <value>搜尋外語音軌</value>
+ </data>
+ <data name="Subtitle_ForeignAudioScan" xml:space="preserve">
+ <value>外語音訊掃描</value>
+ </data>
+ <data name="AudioBehaviourModes_AllMatching" xml:space="preserve">
+ <value>所有符合的已選語言</value>
+ </data>
+ <data name="AudioBehaviourModes_AllTracks" xml:space="preserve">
+ <value>使用所有軌道為樣板</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstMatch" xml:space="preserve">
+ <value>首個符合的已選語言</value>
+ </data>
+ <data name="AudioBehaviourModes_FirstTrack" xml:space="preserve">
+ <value>以第一軌為樣板</value>
+ </data>
+ <data name="AudioBehaviourModes_None" xml:space="preserve">
+ <value>無音訊</value>
+ </data>
+ <data name="ChapterViewModel_Chapter" xml:space="preserve">
+ <value>章節 {0}</value>
+ </data>
+ <data name="Mp4Behaviour_Auto" xml:space="preserve">
+ <value>自動</value>
+ </data>
+ <data name="Mp4Behaviour_UseM4v" xml:space="preserve">
+ <value>總是使用 M4V</value>
+ </data>
+ <data name="Mp4Behaviour_UseMp4" xml:space="preserve">
+ <value>總是使用 MP4</value>
+ </data>
+ <data name="PresetPictureSettingsMode_Custom" xml:space="preserve">
+ <value>自訂</value>
+ </data>
+ <data name="PresetPictureSettingsMode_None" xml:space="preserve">
+ <value>無</value>
+ </data>
+ <data name="PresetPictureSettingsMode_SourceMaximum" xml:space="preserve">
+ <value>總是使用來源解析度</value>
+ </data>
+ <data name="ProcessPriority_AboveNormal" xml:space="preserve">
+ <value>高於正常值</value>
+ </data>
+ <data name="ProcessPriority_BelowNormal" xml:space="preserve">
+ <value>低於正常值</value>
+ </data>
+ <data name="ProcessPriority_High" xml:space="preserve">
+ <value>高</value>
+ </data>
+ <data name="ProcessPriority_Low" xml:space="preserve">
+ <value>低</value>
+ </data>
+ <data name="ProcessPriority_Normal" xml:space="preserve">
+ <value>正常</value>
+ </data>
+ <data name="UpdateCheck_Monthly" xml:space="preserve">
+ <value>每月</value>
+ </data>
+ <data name="UpdateCheck_Weekly" xml:space="preserve">
+ <value>每週</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>總是為產生的新名稱使用預設路徑。</value>
+ </data>
+ <data name="OptionsView_RemotePortLimit" xml:space="preserve">
+ <value>通訊埠號必須介於 5000 及 32767</value>
+ </data>
+ <data name="OptionsView_SendFileToArgPlaceholders" xml:space="preserve">
+ <value>替代預留位置：{source} {destination} {exit_code}</value>
+ <comment>Note: {source}, {destination} and {exit_code} are not translatable. </comment>
+ </data>
+ <data name="SourceSelection_UpdateAvailable" xml:space="preserve">
+ <value>新版的 HandBrake 已供使用！</value>
+ </data>
+ <data name="About_Copyright" xml:space="preserve">
+ <value>版權所有 ©️ 2003-2022 HandBrake 團隊</value>
+ </data>
+ <data name="Options_LowBatteryLevel" xml:space="preserve">
+ <value>低電量：</value>
+ </data>
+ <data name="Options_PauseOnLowBattery" xml:space="preserve">
+ <value>當低電量時，暫停任何進行中的工作。</value>
+ </data>
+ <data name="SubtitleView_AddRemainingCC" xml:space="preserve">
+ <value>新增全部的剩餘 CC 字幕</value>
+ </data>
+ <data name="QueueService_DuplicatesQuestion" xml:space="preserve">
+ <value>在您試著匯入的佇列檔案中偵測到重複的工作。您確定要覆寫目前已有的紀錄嗎？
+此動作亦將停止目前執行中的工作。</value>
+ </data>
+ <data name="QueueService_DuplicatesTitle" xml:space="preserve">
+ <value>偵測到複本</value>
+ </data>
+ <data name="OptionsView_EnableQuicksyncLowPower" xml:space="preserve">
+ <value>如果支援，啟用 Low Power QuickSync。</value>
+ </data>
+ <data name="QueueView_JobInformationNotAvailable" xml:space="preserve">
+ <value>請選擇單個工作來檢視總結報告。</value>
+ </data>
+ <data name="OptionsView_EnableWorkerProcesses" xml:space="preserve">
+ <value>在分開的背景工作處理序中進行佇列工作。</value>
+ </data>
+ <data name="OptionsView_WorkerDefaultPort" xml:space="preserve">
+ <value>背景工作程式的預設連接埠：</value>
+ </data>
+ <data name="Presets_NotAvailableForUse" xml:space="preserve">
+ <value>您選擇的設定檔無法在此系統使用。
+
+這通常表示系統不支援必須的硬體。
+
+請選擇其他預設檔。</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation" xml:space="preserve">
+ <value>隔離處理序</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning1" xml:space="preserve">
+ <value>使用此功能會啟動一個在 127.0.0.1 指定通訊埠上的伺服器。</value>
+ </data>
+ <data name="OptionsView_ProcessIsolation_Warning2" xml:space="preserve">
+ <value>若設定的通訊埠已被使用，它會自動使用在其數值 +100 範圍內的首個可用連接埠。</value>
+ </data>
+ <data name="OptionsView_SimultaneousEncodes" xml:space="preserve">
+ <value>同時作業的最大數量：</value>
+ </data>
+ <data name="StaticPreviewView_CancelPreview" xml:space="preserve">
+ <value>取消</value>
+ </data>
+ <data name="MainView_SelectedPresets" xml:space="preserve">
+ <value>設定檔：</value>
+ </data>
+ <data name="SummaryView_SameAsSource" xml:space="preserve">
+ <value>和來源一樣</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrake" xml:space="preserve">
+ <value>重置設定</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakeQuestion" xml:space="preserve">
+ <value>您確定要重設 HandBrake 至預設設定值嗎？</value>
+ </data>
+ <data name="PaddingMode_Custom" xml:space="preserve">
+ <value>自訂（不限制）</value>
+ </data>
+ <data name="PaddingMode_Fill" xml:space="preserve">
+ <value>填充（環繞）</value>
+ </data>
+ <data name="PaddingMode_Height" xml:space="preserve">
+ <value>按高度（左右黑邊）</value>
+ </data>
+ <data name="PaddingMode_None" xml:space="preserve">
+ <value>無</value>
+ </data>
+ <data name="PaddingMode_Width" xml:space="preserve">
+ <value>按寬度（上下黑邊）</value>
+ </data>
+ <data name="PictureSettingsView_Padding" xml:space="preserve">
+ <value>填充：</value>
+ </data>
+ <data name="PictureSettingsView_PaddingColour" xml:space="preserve">
+ <value>顏色：</value>
+ </data>
+ <data name="PictureSettingsView_Borders" xml:space="preserve">
+ <value>邊框：</value>
+ </data>
+ <data name="PictureSettingsView_ResAndScaling" xml:space="preserve">
+ <value>解析度及縮放比例：</value>
+ </data>
+ <data name="PictureSettingsView_RotateAndCrop" xml:space="preserve">
+ <value>方向及裁剪：</value>
+ </data>
+ <data name="OptionsView_Win10Only" xml:space="preserve">
+ <value>（僅限 Windows 10！）</value>
+ </data>
+ <data name="QueueView_FilterSettings" xml:space="preserve">
+ <value>濾鏡：</value>
+ </data>
+ <data name="SummaryView_Default" xml:space="preserve">
+ <value>預設</value>
+ </data>
+ <data name="SummaryView_Forced" xml:space="preserve">
+ <value>強制的</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_1080p" xml:space="preserve">
+ <value>1080p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_480p" xml:space="preserve">
+ <value>480p NTSC SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_4K" xml:space="preserve">
+ <value>2160p 4K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_576p" xml:space="preserve">
+ <value>576p PAL SD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_720p" xml:space="preserve">
+ <value>720p HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_8K" xml:space="preserve">
+ <value>4320p 8K Ultra HD</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_custom" xml:space="preserve">
+ <value>自訂</value>
+ </data>
+ <data name="PictureSettingsView_MaxSize" xml:space="preserve">
+ <value>最大尺寸：</value>
+ </data>
+ <data name="PictureSettingsView_ResLimit" xml:space="preserve">
+ <value>解析度限制：</value>
+ </data>
+ <data name="PictureSettingsResLimitModes_none" xml:space="preserve">
+ <value>無</value>
+ </data>
+ <data name="PresetManger_Title" xml:space="preserve">
+ <value>管理設定檔</value>
+ </data>
+ <data name="ManagePresetView_DeleteBuiltIn" xml:space="preserve">
+ <value>刪除內建的設定檔</value>
+ </data>
+ <data name="ManagePresetView_Export" xml:space="preserve">
+ <value>匯出選取的設定檔</value>
+ </data>
+ <data name="ManagePresetView_Import" xml:space="preserve">
+ <value>從檔案匯入設定檔</value>
+ </data>
+ <data name="ManagePresetView_PresetInfo" xml:space="preserve">
+ <value>預設檔資訊：</value>
+ </data>
+ <data name="ManagePresetView_RestrictedPreset" xml:space="preserve">
+ <value>內建設定檔不可修改。</value>
+ </data>
+ <data name="ManagePresetView_SetDefault" xml:space="preserve">
+ <value>以選取的設定檔為預設值</value>
+ </data>
+ <data name="PresetManagerView_Delete" xml:space="preserve">
+ <value>刪除設定檔</value>
+ </data>
+ <data name="OptionsView_NotSupported" xml:space="preserve">
+ <value>（不支援此系統）</value>
+ </data>
+ <data name="QueueView_Stop" xml:space="preserve">
+ <value>停止</value>
+ </data>
+ <data name="String1" xml:space="preserve">
+ <value/>
+ </data>
+ <data name="PresetService_CategoryAlreadyExists" xml:space="preserve">
+ <value>您輸入的分類名稱已存在，請換個名稱。</value>
+ </data>
+ <data name="PresetService_CategoryNameEmpty" xml:space="preserve">
+ <value>分類名稱空白，請輸入名稱。</value>
+ </data>
+ <data name="TextEntryView_EnterName" xml:space="preserve">
+ <value>輸入名稱：</value>
+ </data>
+ <data name="ManagePresetView_NoPresetSelected" xml:space="preserve">
+ <value>未選取設定檔。</value>
+ </data>
+ <data name="ManagePresetView_ExportUserPresets" xml:space="preserve">
+ <value>匯出所有的使用者設定檔</value>
+ </data>
+ <data name="Options_LowDiskspaceLevelText" xml:space="preserve">
+ <value>顯示磁碟空間不足警示的程度：</value>
+ </data>
+ <data name="OptionsView_SimultaneousHardwareLimitNotice" xml:space="preserve">
+ <value>此為可同時進行的工作數量上限。實際進行編碼時，仍以硬體條件而定。</value>
+ </data>
+ <data name="Preset_NotAvailable" xml:space="preserve">
+ <value>（不可用）</value>
+ </data>
+ <data name="AddPresetView_IsDefault" xml:space="preserve">
+ <value>為預設值：</value>
+ </data>
+ <data name="No" xml:space="preserve">
+ <value>否</value>
+ </data>
+ <data name="Yes" xml:space="preserve">
+ <value>是</value>
+ </data>
+ <data name="StaticPreviewView_FineTuning" xml:space="preserve">
+ <value>影像細調設定</value>
+ </data>
+ <data name="StaticPreviewView_ShowPictureSettingsAdjustment" xml:space="preserve">
+ <value>顯示裁切控制細項。</value>
+ </data>
+ <data name="DarkTheme_dark" xml:space="preserve">
+ <value>深色</value>
+ </data>
+ <data name="DarkTheme_light" xml:space="preserve">
+ <value>淺色</value>
+ </data>
+ <data name="DarkTheme_system" xml:space="preserve">
+ <value>符合系統設定</value>
+ </data>
+ <data name="OptionsView_DarkThemeMode" xml:space="preserve">
+ <value>佈景主題：</value>
+ </data>
+ <data name="OptionsView_RequiresRestart" xml:space="preserve">
+ <value>（需要重開程式）</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>彩度平滑：</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>色彩空間：</value>
+ </data>
+ <data name="SummaryView_Colourspace" xml:space="preserve">
+ <value>色彩空間：</value>
+ </data>
+ <data name="PictureSettingsView_SeePreview" xml:space="preserve">
+ <value>開啟預覽：</value>
+ </data>
+ <data name="SummaryView_SourcePreview" xml:space="preserve">
+ <value>來源預覽：</value>
+ </data>
+ <data name="QueueView_JobStatus" xml:space="preserve">
+ <value>作業狀態：</value>
+ </data>
+ <data name="QueueView_JobStatus_Cancelled" xml:space="preserve">
+ <value>已取消</value>
+ </data>
+ <data name="QueueView_JobStatus_Complete" xml:space="preserve">
+ <value>已完成</value>
+ </data>
+ <data name="QueueView_JobStatus_InitFailed" xml:space="preserve">
+ <value>無效的設定值。檢閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="QueueView_JobStatus_InvalidInput" xml:space="preserve">
+ <value>無效的輸入。檢閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="QueueView_JobStatus_NoErrorCode" xml:space="preserve">
+ <value>未知的狀態。檢閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="QueueView_JobStatus_ReadError" xml:space="preserve">
+ <value>嘗試讀取來源時偵測到錯誤。</value>
+ </data>
+ <data name="QueueView_JobStatus_Unknown" xml:space="preserve">
+ <value>未知的故障。檢閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="QueueView_JobStatus_WorkerCrash" xml:space="preserve">
+ <value>背景工作程式當機了。檢閱紀錄檔以了解詳情。</value>
+ </data>
+ <data name="Startup_HbDllMissing" xml:space="preserve">
+ <value>缺少檔案 hb.dll，請重新安裝。</value>
+ </data>
+ <data name="OptionsView_SafeMode" xml:space="preserve">
+ <value>警告：此為「安全模式」的 HandBrake 組建，不包括對於硬體編碼器的支援。若您想使用該功能，請從網站上下載非安全模式的組建。</value>
+ </data>
+ <data name="PadColour_Black" xml:space="preserve">
+ <value>黑色</value>
+ </data>
+ <data name="PadColour_Custom" xml:space="preserve">
+ <value>自訂</value>
+ </data>
+ <data name="PadColour_White" xml:space="preserve">
+ <value>白色</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColour" xml:space="preserve">
+ <value>RGB 數值：</value>
+ </data>
+ <data name="SummaryView_Padded" xml:space="preserve">
+ <value>（含邊距）</value>
+ </data>
+ <data name="FiltersView_Flip" xml:space="preserve">
+ <value>翻轉：</value>
+ </data>
+ <data name="PictureSettingsView_SourceDimensions" xml:space="preserve">
+ <value>來源尺寸：</value>
+ </data>
+ <data name="PictureSettingsViewModel_SourceInfo" xml:space="preserve">
+ <value>儲存尺寸：{0}x{1} 顯示尺寸：{2}x{3} 長寬比：{4}</value>
+ </data>
+ <data name="MainViewModel_FilePathSelectError" xml:space="preserve">
+ <value>在檔案選擇器偵測到錯誤。
+
+- 長檔案路徑的支援尚未完善。請保持檔案路徑少於 255 字元。
+- 已重設此視窗最後使用的目錄，以防止下次掃描檔案時發生錯誤。</value>
+ </data>
+ <data name="PictureSettingsView_MaxHeight" xml:space="preserve">
+ <value>最大高度：</value>
+ </data>
+ <data name="PictureSettingsView_MaxWidth" xml:space="preserve">
+ <value>最大寬度：</value>
+ </data>
+ <data name="PictureSettingsViewModel_AspectRatioLabel" xml:space="preserve">
+ <value>長寬比：{0}</value>
+ </data>
+ <data name="SummaryView_MetadataPassthru" xml:space="preserve">
+ <value>保留常見中繼資料</value>
+ </data>
+ <data name="OptionsViewModel_InvalidAutonamePath" xml:space="preserve">
+ <value>預設的自動名稱路徑無效。{0} 不可於 {1} 之前</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheck" xml:space="preserve">
+ <value>是否允許 HandBrake 自動檢查更新？
+
+您可以在 偏好設定 -&gt; 一般 -&gt; 檢查更新 更改此設定。</value>
+ </data>
+ <data name="FirstRun_EnableUpdateCheckHeader" xml:space="preserve">
+ <value>自動檢查更新？</value>
+ </data>
+ <data name="OptionsViewModel_UpdateNotice" xml:space="preserve">
+ <value>在更新之前：
+- 確認佇列中無待處理的編碼作業。
+- 備份或記錄自訂設定檔，因為它們可能無法與新版完全相容。</value>
+ </data>
+ <data name="Preset_Default" xml:space="preserve">
+ <value>（預設）</value>
+ </data>
+ <data name="PresetDisplayMode_Category" xml:space="preserve">
+ <value>分類</value>
+ </data>
+ <data name="PresetDisplayMode_Flat" xml:space="preserve">
+ <value>完全展開</value>
+ </data>
+ <data name="PresetDisplayMode_Partial" xml:space="preserve">
+ <value>部分展開</value>
+ </data>
+ <data name="OptionsView_PresetDisplayMode" xml:space="preserve">
+ <value>選擇設定檔在功能表的呈現方式：</value>
+ </data>
+ <data name="QueueView_SelectedPresets" xml:space="preserve">
+ <value>設定檔：</value>
+ </data>
+ <data name="LogViewModel_Complete" xml:space="preserve">
+ <value>已完成</value>
+ </data>
+ <data name="QueueViewModel_EditJob" xml:space="preserve">
+ <value>編輯工作？</value>
+ </data>
+ <data name="QueueView_Length" xml:space="preserve">
+ <value>輸出長度：</value>
+ </data>
+ <data name="QueueView_MoveToBottom" xml:space="preserve">
+ <value>移到底部</value>
+ </data>
+ <data name="QueueView_MoveToTop" xml:space="preserve">
+ <value>移到頂部</value>
+ </data>
+ <data name="QueueView_VideoOutputBitrate" xml:space="preserve">
+ <value>輸出位元率：</value>
+ </data>
+ <data name="QueueView_AverageEncodeSpeed" xml:space="preserve">
+ <value>平均編碼速度：</value>
+ </data>
+ <data name="QueueViewModel_DifferenceText" xml:space="preserve">
+ <value>來源檔案的</value>
+ </data>
+ <data name="QueueViewModel_NotAvailable" xml:space="preserve">
+ <value>尚不可用</value>
+ </data>
+ <data name="QueueView_SourceLength" xml:space="preserve">
+ <value>來源長度：</value>
+ </data>
+ <data name="Options_Reset" xml:space="preserve">
+ <value>重設</value>
+ </data>
+ <data name="OptionsViewModel_ResetHandBrakePresetsQuestion" xml:space="preserve">
+ <value>確定要重設所有內建設定檔？</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresets" xml:space="preserve">
+ <value>將所有內建設定檔重設為 HandBrake 預設值：</value>
+ </data>
+ <data name="OptionsView_ResetBuildInPresetsNotice" xml:space="preserve">
+ <value>（不會重設使用者的設定檔）</value>
+ </data>
+ <data name="OptionsView_ResetSettingsToDefaults" xml:space="preserve">
+ <value>將所有 HandBrake 設定重設為預設值：</value>
+ </data>
+ <data name="Options_BuiltInPresets" xml:space="preserve">
+ <value>內建設定檔</value>
+ </data>
+ <data name="Options_UserSettings" xml:space="preserve">
+ <value>使用者預設檔</value>
+ </data>
+ <data name="PresetDisplayMode_FloatingPanel" xml:space="preserve">
+ <value>懸浮樹狀顯示</value>
+ </data>
+ <data name="QueueViewModel_PlayFileErrorSolution" xml:space="preserve">
+ <value>請確保 Windows 設定中選擇了適當的預設應用程式，以便使用支援的影片播放器開啟此檔案。</value>
+ </data>
+ <data name="QueueViewModel_ImportFail" xml:space="preserve">
+ <value>無法讀取佇列檔案。</value>
+ </data>
+ <data name="QueueViewModel_ImportFailSolution" xml:space="preserve">
+ <value>該檔案可能已毀損，或來自較舊版的 HandBrake。
+僅支援目前版本的佇列檔案。</value>
+ </data>
+ <data name="Notifications_EncodeDone" xml:space="preserve">
+ <value>HandBrake 編碼已完成！</value>
+ </data>
+ <data name="Notifications_QueueDone" xml:space="preserve">
+ <value>HandBrake 佇列作業已完成！</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalSubText" xml:space="preserve">
+ <value>這也會隱藏「當完成時」分頁的 Windows 工作列通知選項。若要使用，須再啟動此功能。</value>
+ </data>
+ <data name="OptionsView_NotificationRemovalText" xml:space="preserve">
+ <value>從 Windows 通知控制中心移除 HandBrake。</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxHeader" xml:space="preserve">
+ <value>已解除安裝</value>
+ </data>
+ <data name="OptionsView_UninstallMessageBoxText" xml:space="preserve">
+ <value>已移除通知設定。</value>
+ </data>
+ <data name="OptionsView_UninstallToast" xml:space="preserve">
+ <value>清除並解除安裝</value>
+ </data>
+ <data name="OptionsView_WindowsNotification" xml:space="preserve">
+ <value>在 Windows 工作列發送通知</value>
+ </data>
+ <data name="OptionsView_WindowsNotificationsBanner" xml:space="preserve">
+ <value>Windows 通知</value>
+ </data>
+ <data name="Main_QueueMultiJobStatus" xml:space="preserve">
+ <value>完成 {0} 項工作。{1} 處理了 {2} 項工作，仍有 {3} 待處理。</value>
+ </data>
+ <data name="MainView_AutonameRegenerate" xml:space="preserve">
+ <value>重新產生（自動命名）</value>
+ </data>
+ <data name="MainView_OpenDirectory" xml:space="preserve">
+ <value>開啟此目錄</value>
+ </data>
+ <data name="Shared_CollapseAll" xml:space="preserve">
+ <value>收合全部</value>
+ </data>
+ <data name="Shared_ExpandAll" xml:space="preserve">
+ <value>展開全部</value>
+ </data>
+ <data name="OptionsView_RightToleftMode" xml:space="preserve">
+ <value>由右至左顯示模式：</value>
+ </data>
+ <data name="RightToLeft_Off" xml:space="preserve">
+ <value>關閉</value>
+ </data>
+ <data name="RightToLeft_TextOnly" xml:space="preserve">
+ <value>僅有文字</value>
+ </data>
+ <data name="RightToLeft_WholeInterface" xml:space="preserve">
+ <value>整體使用者介面</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.co.resx Added

@@ -0,0 +1,491 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>U filtru di sblucchime riduce l’effetti parassiti cagiunati da una cumpressione video di bassa qualità.Dumandà per rimpiazzà u schedariu.</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>Sciglite l’ozzioni di filtru dipettinera o disintricciamentu.
+
+U filtru di dipettinera discioglie solu e fiure chì parenu intricciate.
+Què preserverà a qualità di e fiure chì ùn sò micca intricciate.
+
+U filtru classicu di disintricciamentu hè appiecatu à tutte e fiure.
+Quelle chì ùn sò micca intricciate averanu una perdita di qualità.</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>U filtru di riduzzione di trostu riduce o caccia l’aspettu di rumore è di granellu d’un filmu. Què pò megliurà u rendimentu di a cumpressione è creà una video di più bella qualità cù schedarii più chjuchi. 
+E preferenze troppu forte di riduzzione di trostu ponu dannighjà a qualità di a fiura scartendu i detaglii.
+ 
+- « NLMeans » hè un filtru di riduzzione di trostu d’alta qualità chì fà dinù cresce a vitezza di a cudificazione. Impiegatelu quandu a qualità hè più impurtante chè a vitezza.
+ 
+- « HQDN3D » hè un filtru passu-bassu adattevule, più prestu chè NLMeans ma menu efficiente per preservà i detaglii i più fini.</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>U filtru « detelesinema » caccia l’effetti parassiti chì sò cagiunati da u telesinema, un trattamentu chì cunvertisce e frequenze di fiure d’un filmu ver di frequenze di fiure di a televisiò.</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>« Scala di grisgiu » caccia u cumpunente culore di a video. Di solitu, hè chjamata video di neru è biancu.</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Chjassu di destinazione, inchjudendu u cartulare è u schedariu Ghjè induve a video serà creata è cumu serà chjamata.</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>Aghjunghje un marcatore apposta per permette a lettura nant’à l’iPod di 5a generazione circa 2006. D’altre preferenze ponu affettà a cumpatibilità.</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>Furmatu di u cuntenentu. E traccie video, audio è altre sò addunite in un schedariu unicu di stu tipu. Què affetta a cumpatibilità.</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>Perfezziunà u MP4 per u scaricamentu prugressivu. Dopu a cudificazione, i dati sò riorganizati è riscritti per permette una lettura istantanea nant’à una reta, senza avè à scaricà u schedariu sanu.</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Selezzione di a stesa di fonte. Senza precisà, tutti i capituli sò selezziunati è a fonte hè cudificata sana sana.</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Titulu o video à cudificà.
+I dischi di fonte Blu-ray è DVD anu aspessu parechji tituli ; da bona regula, u più longu hè l’elementu principale</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>« Anamorficu » permette dimensioni arbitrarie d’allucamentu tuttu preservendu l’aspettu d’origine durante a ripruduzzione.
+
+- « None » disattiveghja « Anamorficu ». E dimensioni d’allucamentu di a video è quelle di l’affissera seranu uguale. Solu ghjuvevule per a cumpatibilità cù certi apparechji anziani.
+
+- « Automatic » megliureghja a risuluzione d’allucamentu tuttu preservendu e prupurzioni d’affissera d’origine. Ricumandatu.
+
+- « Loose » hè simile à « Automatic » ma prova di preservà e prupurzioni d’allucamentu. Què pò cagiunà una chjuca perdita di risuluzione d’allucamentu in pettu à « Automatic ».
+
+- « Custom » permette di definisce dapervoi tutte e preferenze. Ghjuvevule per currege un aspettu incurrettu d’affissera di a fonte è per i prufessiunali chì anu bisognu d’un cuntrollu espertu in post-pruduzzione.</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>Runzicà autumaticamente i bordi neri intornu à a video.</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>Runzicà a video da u bassu.</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>Runzicà a video da manu manca.</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>Runzicà a video da manu diritta.</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>Runzicà a video da l’altu.</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Ghjè l’altezza impiegata per l’allucamentu di a video.
+E vere dimensioni d’affisera seranu sfarente s’è u raportu larghezza/altezza ùn hè micca 1:1.</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>Runzicà a video manualmente.</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>Alineà e dimensioni d’allucamentu nant’à multipli di stu valore.
+
+Sta preferenza hè di primura per a cumpatibilità cù certi apparechji.
+Duveriate impiegà 2 quandu ùn avete micca prublemi di cumpatibilità.</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>U furmatu pixel definisce a forma, a larghezza è l’altezza di i punti elementarii d’una fiura (pixel).
+Un raportu 1:1 definisce un pixel quadratu. D’altri valori definiscenu forme rettangulare.
+I lettori cambieranu e dimensioni di a fiura per currisponde à l’aspettu specificatu.</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Ghjè a larghezza cù quella a video serà arregistrata.
+E vere dimensioni d’affisera seranu sfarente s’è u raportu larghezza/altezza ùn hè micca 1:1.</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>Squassà u travagliu da a fila d’attesa.</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>Reinizià u statu di u travagliu à « In attesa ».</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>Mandà u travagliu torna ver di a finestra principale per mudificalu.</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>Definisce u flussu medianu.
+
+U flussu istantaneu pò esse assai più altu o assai più bassu à ogni stonda.
+Ma a mediana, nant’à una longa durata, serà u valore definitu quì. S’ella hè bisognu
+di limità u flussu istantaneu, fighjate e preferenze vbv-bufsize è vbv-maxrate di u x264.</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>Attiveghja una frequenza di fiure custente in esciuta.</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>Cudificatori video dispunibule.</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>Preferenze di rigatura per megliurà i scenarii classichi.
+
+Què pò megliurà a faccindaghjine di certe caratteristiche di a fonte
+o di e caratteristiche definite di u schedariu d’esciuta. I cambiamenti
+seranu appiecati dopu a prerigatura ma nanzu tutti l’altre preferenze.</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>Preferenze addiziunale di u cudificatore.
+
+Lista d’ozzioni di u cudificatore staccate da dui punti.</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>Riduce l’impiegu CPU di u discudificatore.
+
+Attivate st’ozzione s’è u vostru apparechju ùn leghje micca bè u schedariu d’esciuta (perdita di fiure).</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>Frequenza di fiure d’esciuta.
+
+« Listessa chì a fonte » hè ricumandatu. S’è a vostra video di fonte hà una frequenza di fiure variabile, st’ozzione a preserverà.</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>Definisce è assicureghja a cunfurmità cù u livellu specificatu.
+
+Supraneghja tutte l’altre preferenze.</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>Attiveghja una frequenza di fiure d’esciuta variabile cù una frequenza di cresta determinata da a preferenza di a frequenza di fiure.</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>Adatteghja e preferenze di u cudificatore per bilancià trà a faccindaghjine di a cumpressione è a vitezza di cudificazione.
+
+Què definisce e vostre preferenze predefinite di cudificatore.
+Rigature, prufili, livelli è ozzioni d’espertu seranu appiecati à st’operazione.
+Di regula, duveriate definisce st’ozzione à u valore u più lentu chì
+vo siate capace d’accettà, perchè preferenze più lente vi danu una
+più bella qualità o schedarii più chjuchi.</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>Definisce è assicureghja a cunfurmità cù u prufilu specificatu.
+
+Supraneghja tutte l’altre preferenze.</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Definisce u fattore di qualità pregatu.
+U cudificatore sibuleghja una certa qualità.
+A scala impiegata da ogni cudificatore hè sfarenta.
+
+A scala di x264 hè logaritmica, è valori più chjuchi currispondenu à una
+qualità più maiò.
+Dunque, chjuchi aumenti di valore aumentanu prugressi-
+vamente a dimensione di u schedariu d’esciuta. Un valore à 0 vole dì
+senza perdita è per què, u schedariu d’esciuta serà più maiò chì quellu
+di a fonte, for di s’è a fonte era dinù senza perdita.
+I valori suggerite sò : 18 à 20 per fonti à definizione classica è 20 à 23 per quelle à alta definizione.
+
+A scala di FFMpeg è Theora hè più lineare.
+Sti cudificatori ùn anu micca di modu senza perdita.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>Durante u primu passu d’una cudificazione à 2 passi, impiegate preferenze chì acceleranu u trattamentu.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Face una cudificazione à 2 passi.
+
+L’ozzione « Flussu » hè prerichiesta. Durante u primu passu, e statistiche
+sò cullettate. Dopu, à u secondu passu, ste statistiche sò impiegate per fà
+a scelta di l’allucamentu di u flussu.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Attiveghja una frequenza di fiure variabile in esciuta.
+
+VFR ùn hè micca cumpatibile cù certi lettori.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>Quandu a fila d’attesa o a cudificazione currente hè compia, HandBrake effettuerà st’azzione.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Navigà per selezziunà un novu chjassu di destinazione è un novu nome di schedariu per a vostra cudificazione.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Angulu di video à cudificà. Cuncerne solu i dischi DVD è Blu-ray multi-anguli.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>Aghjunghje una nova prerigatura.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Ozzioni addiziunale di prerigatura.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>E prerigature sò gruppi di preferenze di cudificazione custruiti per scenarii specifichi. Selezziunate quella chì currisponde u più à u vostru bisognu.
+ 
+ Rimpiazzeghja tutte e preferenze di cudificazione. E preferenze ponu esse addattate dopu a selezzione di a prerigatura.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>Caccià a prerigatura selezziunata.</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Analizà solu u titulu specificatu invece di tutti i tituli.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Parametri persunalizati di riduzzione di trostu.
+ 
+Sintassa NLMeans : y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+Predefinizioni NLMeans : y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+Sintassa HQDN3D : y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+Predefinizioni HQDN3D : y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Prerigatura di u filtru di riduzzione di trostu. Definisce a forza di u filtru.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Rigatura di riduzzione di trostu. Adattazioni addiziunale di a prerigatura di riduzzione di trostu per megliurà e preferenze per scenarii specifichi.
+ 
+- « None » (Alcuna) impiegheghja e preferenze di prerigatura predefinite.
+ 
+- « Film » (Filmu) affineghja e preferenze per un adopru cù a maiò parte di i cuntenuti d’azzione.
+ 
+- « Grain » (Granellu) tratta solu i canali di culore. Ghjuvevule per preservà l’aspettu cinematograficu di u granellu di luminanza, tuttu riducendu o cacciendu u rumore di culore.
+
+- « High Motion » (Mossa presta) riduce u sparghjimentu di i culori in e scene rapide impediscendu u trattamentu tempurale di i canali di culore. Ghjuvevule per e video di sport è d’azzione.
+
+- « Animation » (Animazione) hè ghjuvevule per l’animazione in celluloide, cum’è a fiura mossa.
+
+- « Tape » (Scagninu) hè ghjuvevule per e video nant’à un frisgiu magneticu analogicu di bassa qualità, cum’è e VHS, quandu « Filmu » ùn produce micca u risultatu aspettatu.
+
+- « Sprite » (Spiritibugliettu) hè ghjuvevule per i ghjochi 2D in 1, 4, 8 o 16 bit. Ùn hè micca previstu per e video di alta definizione.</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>U filtru di disintricciamentu caccia l’effetti parassiti da a fiura.
+
+- « Yadif » hè un filtru di disintricciamentu populare è rapidu.
+
+- « Dipettinera » bilanceghja trà parechje cudificazioni d’interpolazione per favurisce a vitezza è a qualità.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Parametri di disintricciamentu persunalizati.
+ 
+ Sintassa Yadif : mode=m:parity=p
+ 
+ Predefinizioni Yadif : mode=3
+ 
+ Sintassa di dipettinera : mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Predefinizioni di dipettinera : mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Prerigatura di u filtru di disintricciamentu.
+
+A prerigatura predefinita hè ben equilibrata trà vitezza è a qualità.
+
+Ignurà a verificazione spaciale permette à Yadif d’ignurà a currezzione di certi effetti parassiti pudendu esse impediti per un legeru aumentu di a vitezza.
+
+EEDI2 impiegheghja una cudificazione d’interpolazione più lenta è di più bella qualità per a dipettinera. Ghjuvevule per e fonti e più difficiule.
+
+Bob pruva di preservà megliu a mossa per una chjuca penalità à a risuluzione percepita.</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>Invertisce a fiura (cum’è un spechju) secondu à l’asse orizuntale.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>L’abbentata d’intricciamentu, quandu l’ozzione hè attiva, permette à u filtru di disintricciamentu di trattà solu e fiure video chì sò intricciate.</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Parametri d’abbentata d’intricciamentu persunalizati.
+ 
+ Sintassa : mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+ Predefinizioni : mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Girà a fiura di 90 gradi in u sensu di e sfiere d’arilogiu.</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Durata di a stesa di fonte selezziunata in Ore:Minuti:Seconde</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>L’ozzione « Cunservà e prupurzioni » mantene e prupurzioni d’affissera originale di a fonte. Disattivà st’ozzione pò cagiunà una fiura stinzata o ristrinta.</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>Parametri d’arrutata persunalizati.
+
+Sintassa Unsharp : y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Predefinizioni Unsharp : y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Sintassa Lapsharp : y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Predefinizioni Lapsharp : y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>L’arrutata amendeghja l’aspettu di i detaglii, sopratuttu di i bordi. E preferenze troppu forte d’arrutata ponu dannighjà a qualità di a fiura creendu effetti parassiti è aumentendu u rumore, ciò chì pò riduce a faccindaghjine di a cumpressione.
+
+- « Unsharp » hè un filtru di maschera floscia à usu generale. Funziuneghja imbrugliendu, è dopu calculendu a sfarenza trà a fiura imbrugliata è a fiura d’origine.
+
+- « Lapsharp » arruteghja impieghendu nocciuli di convuluzione s’avvicinendu di i filtri di bordu Laplacian, pruducendu ognitantu risultati di più bella qualità chì a maschera floscia.</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>Prerigatura di u filtru d’arrutata. Definisce a forza di u filtru.</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>Rigatura d’arrutata. Adattazioni addiziunale di a prerigatura d’arrutata per megliurà e preferenze per scenarii specifichi.
+
+« None » (Nisuna) impiegheghja e preferenze di prerigatura predefinite.
+
+- « Unsharp » pò esse rigatu per un’arrutata Ultrafina, Fina, Mediana, Roza, o Assai roza. Selezziunate una rigatura secondu à a risuluzione di a fiura aspettata è a finezza di detaglii à amendà.
+
+A rigatura « Lapsharp's Film » (Filmu) affineghja e preferenze per un adopru cù a maiò parte di i cuntenuti d’azzione. Impiegheghja un nocciulu Laplacianu isotropicu per rende più netti tutti i bordi d’una manera simile, è l’infurmazioni di luminanza (lucidezza) sò più arrutate chè quelle di u culore.
+
+A rigatura « Lapsharp's Grain » (Granellu) hè simile à Film, ma impiegheghja un Laplacianu isotropicu à nocciulu Gaussianu per riduce l’zffetti nant’à u rumore è granellu. Ghjuvevule per preservà u granellu è cum’è alternativa à Film.
+
+A rigatura « Lapsharp's Animation » (Animazione) hè ghjuvevule per l’animazione in celluloide, cum’è a fiura mossa. Hè uguale à Film, ma a forza di u trattamentu hè ridutta per impedisce di creà effetti parassiti.
+
+A rigatura « Lapsharp's Sprite » (Spiritibugliettu) hè ghjuvevule per i ghjochi 2D in 1, 4, 8 o 16 bit. Impiegheghja un nocciulu Laplacianu à 4 vicini chì amendeghja i cuntorni verticale è orizuntale più chì i cuntorni diagunale.</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Alineeghja e stampiglie iniziale di tutti i flussi audio è video framittendu fiure viote o squassendu fiure. Què pò megliurà a sincrunizazione audio/video per i lettori disfunziunendu chì ùn rispettanu micca e liste di mudificazioni MP4.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Ozzioni per cuntrollà e prerigature.</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>U puntu finale di sta stesa.</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>U puntu iniziale di sta stesa.</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Quandu st’ozzione hè attivata, u sistema di nome autumaticu impiegherà sempre u chjassu predefinitu. 
+Quand’ella hè disattivata, impiegherà u chjassu scrittu in a scatula di dialogu di a finestra principale, s’ellu hè indicatu ; osinnò impiegherà sempre u chjassu predefinitu.</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Filtru di spaziu di culore.</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Filtru d’allisciata cromatica</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>Stu campu pò accettà valori RGB cum’è « 0xFF0000 » o nomi di culore cum’è "red". Per ottene una lista cumpleta di i culori, fighjate a ducumentazione nant’à i filtri d’imburrera. </value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Intarsià sottutituli in u flussu video.
+
+Nota : st’ozzione serà selezziunata autumaticamente s’è u furmatu di traccia di sottutitulu d’origine ùn hè micca accettatu da u tipu di schedariu d’esciuta.
+
+Per indettu, i sottutituli PGS ùn sò micca accettati da MP4</value>
+ </data>
+ <data name="OptionsView_PresetDisplayModes" xml:space="preserve">
+ <value>Pianu - E prerigature sò affissate cum’è una lista piana.
+Pianu in parte - L’8 ultime prerigature persunalizate sò affissate cum’è una lista piana, seguitata da tutte e prerigature affissate da lista di categuria.
+Categurie - Tutte e prerigature sò affissate cù un sottu-listinu à a categuria.</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.de.resx Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.es.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.es.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.fa-IR.resx Added

@@ -0,0 +1,477 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>هموارسازی اثرات شطرنجی فیلم با کیفیت پایین را کاهش می‌دهد.</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>Choose decomb or deinterlace filter options.
+
+The decomb filter selectively deinterlaces frames that appear to be interlaced.
+This will preserve quality in frames that are not interlaced.
+
+The classic deinterlace filter is applied to all frames.
+Frames that are not interlaced will suffer some quality degradation.</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>Denoise reduces or removes the appearance of noise and grain. This can improve compression efficiency and create higher quality video at smaller file sizes. 
+Overly strong Denoise settings may damage picture quality by discarding detail.
+ 
+NLMeans is a high quality denoise filter with a cost to speed. Use where quality is more important than speed.
+ 
+HQDN3D is an adaptive low-pass filter, faster than NLMeans but less effective at preserving fine detail.</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>Detelecine removes comb artifacts that are the result of telecine, a process for converting film frame rates to television frame rates.</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>«سیاه و سفید» رنگ ویدیو را حذف می‌کند.</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Destination path, including directory and file name. This is where your new video will be created, and what it will be named.</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility.</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>Container format. Video, audio, and other tracks are combined into a single file of this type. Affects compatibility.</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file.</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Source range selection. By default, all chapters are selected and the entire source is encoded.</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Title, or video clip, to encode.
+Blu-ray and DVD sources often have multiple titles, the longest of which is typically the main feature</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamorphic allows arbitrary storage dimensions while preserving the original aspect during playback.
+
+None disables anamorphic. Video storage dimensions and display dimensions will be identical. Only useful for compatibility with certain legacy devices.
+
+Automatic maximizes storage resolution while preserving the original display aspect ratio. Recommended.
+
+Loose is similar to Auto, but attempts to preserve the storage aspect ratio. This can result in a slight storage resolution loss compared to Auto.
+
+Custom allows manually setting all parameters. Useful for correcting an incorrect source display aspect and for professionals needing advanced control in post-production.</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>حاشیه‌های سیاه در لبه‌ی ویدیو را به صورت خودکار برش بده.</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>بریدن ویدیو از پایین</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>بریدن ویدیو از چپ</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>بریدن ویدیو از راست</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>بریدن ویدیو از بالا</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>This is the height that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>بریدن دستی ویدیو</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>Align storage dimensions to multiples of this value.
+
+This setting is only necessary for compatibility with some devices.
+You should use 2 unless you experience compatibility issues.</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Pixel aspect defines the shape of the pixels.
+A 1:1 ratio defines a square pixel. Other values define rectangular shapes.
+Players will scale the image in order to achieve the specified aspect.</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>This is the width that the video will be stored at.
+The actual display dimensions will differ if the pixel aspect ratio is not 1:1.</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>حذف این کار از صف.</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>Reset job status to Waiting.</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>Send the job back to the main window for editing.</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>Set the average bitrate.
+
+The instantaneous bitrate can be much higher or lower at any point in time.
+But the average over a long duration will be the value set here. If you need
+to limit instantaneous bitrate, look into x264's vbv-bufsize and vbv-maxrate settings.</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>Enables constant framerate output.</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>Available video encoders.</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>Tune settings to optimize for common scenarios.
+
+This can improve efficiency for particular source characteristics or set
+characteristics of the output file. Changes will be applied after the
+preset but before all other parameters.</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>Additional encoder settings.
+
+Colon separated list of encoder options.</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>استفاده از پردازنده را در بازسازی کاهش بده.
+
+اگر دستگاه شما برای پخش خروجی مشکل دارد (تصویر گیر می‌کند)، این را بزنید.</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>Output framerate.
+
+'Same as source' is recommended. If your source video has a variable framerate, 'Same as source' will preserve it.</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>Sets and ensures compliance with the specified level.
+
+Overrides all other settings.</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>Enables variable framerate output with a peak rate determined by the framerate setting.</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>Adjusts encoder settings to trade off compression efficiency against encoding speed.
+
+This establishes your default encoder settings.
+Tunes, profiles, levels and advanced option string will be applied to this.
+You should generally set this option to the slowest you can bear since slower
+settings will result in better quality or smaller files.</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>Sets and ensures compliance with the specified profile.
+
+Overrides all other settings.</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Set the desired quality factor.
+The encoder targets a certain quality.
+The scale used by each video encoder is different.
+
+x264's scale is logarithmic and lower values correspond to higher quality.
+So small decreases in value will result in progressively larger increases
+in the resulting file size. A value of 0 means lossless and will result
+in a file size that is larger than the original source, unless the source
+was also lossless.
+Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources.
+
+FFMpeg's and Theora's scale is more linear.
+These encoders do not have a lossless mode.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>During the 1st pass of a 2 pass encode, use settings that speed things along.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Perform 2 Pass Encoding.
+
+The 'Bitrate' option is prerequisite. During the 1st pass, statistics about
+the video are collected. Then in the second pass, those statistics are used
+to make bitrate allocation decisions.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Enables variable framerate output.
+
+VFR is not compatible with some players.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>When HandBrake has finished the current queue or encode it will perform this action.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Browse to select a new destination path and file name for your encode.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Video angle to encode. Only applicable to multi-angle DVD and Blu-ray.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>افزودن یک پیش‌نهاده‌ی جدید.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Additional Preset Options.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.
+ 
+ Overrides all encode settings. Settings may be further adjusted after selecting a preset.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>حذف پیش‌نهاده‌های انتخاب شده</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Scan only the specified title instead of all titles.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Custom Denoise parameters.
+ 
+NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+NLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+HQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Denoise filter preset. Sets the strength of the filter.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.
+ 
+- None uses the default preset settings.
+ 
+- Film refines settings for use with most live action content.
+ 
+- Grain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.
+
+- High Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.
+
+- Animation is useful for cel animation such as anime and cartoons.
+
+- Tape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.
+
+- Sprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video.</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>Deinterlace removes comb artifacts from the picture.
+
+Yadif is a popular and fast deinterlacer.
+
+Decomb switches between multiple interpolation algorithms for speed and quality.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Custom Deinterlace parameters.
+ 
+ Yadif syntax: mode=m:parity=p
+ 
+ Yadif default: mode=3
+ 
+ Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Decomb default: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Deinterlace filter preset.
+
+Default is well balanced for speed and quality.
+
+Skip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.
+
+EEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.
+
+Bob attempts to better preserve motion for a slight penalty to perceived resolution.</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>وارنه کردن (آیینه کردن) تصویر بر محور افقی.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames.</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Custom Interlace Detection parameters.
+ 
+ Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+ Default: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Rotate the picture clockwise in 90 degree increments.</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Duration of the selected source range in Hours:Minutes:Seconds</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Keep Aspect Ratio maintains the original display aspect of the source. Disabling this may result in a stretched or squeezed picture.</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>Custom Sharpen parameters.
+
+Unsharp syntax: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Unsharp default: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Lapsharp syntax: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Lapsharp default: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>Sharpening enhances the appearance of detail, especially edges. Overly strong Sharpen settings may damage picture quality by creating ringing artifacts and enhancing noise, which can reduce compression efficiency.
+
+Unsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.
+
+Lapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unsharp masking.</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>پیش‌نهاده‌ی پالایه‌ی تیزی. قدرت پالایه را تنظیم کنید.</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.
+
+None uses the default preset settings.
+
+Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.
+
+Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.
+
+Lapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.
+
+Lapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.
+
+Lapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges.</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Options to control presets.</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>The end point for this range.</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>The start point for this range.</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>When enabled the auto name system will always use the default path. 
+When disabled, it will use the path in the destination box on the main window if populated, otherwise it will use the default path.</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>پالایه‌ی فضای رنگ.</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>پالایه‌ی نرم خلوص رنگ</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>This field can accept RGB values such as: "0xFF0000" or colour names such as "red". For a full list of named colours, see the padding filter documentation. </value>
+ </data>
+</root>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.fr.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.fr.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.it.resx Added

@@ -0,0 +1,520 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value> Il Deblock riduce gli artefatti a blocchi causati dalla compressione video di bassa qualità.</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>Scegli un'opzione di filtraggio tra decomb e deinterlacciamento.
+
+Il filtro di decomb deinterlaccia selettivamente i fotogrammi interlacciati.
+Ciò preserverà la qualità dei fotogrammi che non sono interlacciati.
+
+Il normale filtro di deinterlacciamento viene applicato a tutti i fotogrammi.
+I fotogrammi che non sono interlacciati subiranno una lieve perdita di qualità.</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>La Riduzione del Rumore limita o rimuove l'aspetto di rumore e grana. Ciò può migliorare l'efficienza della compressione e creare video di qualità più elevata con file di dimensioni più ridotte. Impostazioni di Riduzione del Rumore troppo forti possono danneggiare la qualità dell'immagine riducendone il dettaglio.
+
+NLMeans è un filtro di Riduzione del Rumore di alta qualità, ma non molto veloce. Utilizzare se la qualità è più importante della velocità.
+
+HQDN3D è un filtro passa-basso adattivo, più veloce di NLMeans ma meno efficace nel preservare i minimi dettagli. </value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>Il Detelecine rimuove gli artefatti che sono il risultato del telecine, un processo per convertire la frequenza dei fotogrammi da film nella frequenza dei fotogrammi televisiva.</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>Scala di Grigi rimuove le componenti colore del video. È l'effetto bianco e nero.</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Il percorso di destinazione, inclusa la cartella ed il nome file. Qui è scritto dove verrà creato il video e quale sarà il suo nome.</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>Aggiunge uno speciale marcatore MP4 per consentire la riproduzione sui dispositivi iPod di 5a generazione vintage circa del 2006. Altre impostazioni potrebbero influire sulla compatibilità.</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>Formato contenitore. Video, audio ed altre tracce sono combinate in un singolo file di questo tipo. Influisce sulla compatibilità.</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>Ottimizza MP4 per il download progressivo. Dopo la codifica, i dati vengono riorganizzati e riscritti per consentire la riproduzione immediata in rete, senza la necessità di scaricare l'intero file.</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Selezione dell'intervallo della sorgente. Di default, tutti i capitoli sono selezionati e la sorgente è convertita per tutta la sua durata.</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Titolo, o clip video, da convertire.
+Sorgenti Blu-ray e DVD hanno di solito titoli multipli, il più lungo dei quali è tipicamente il contenuto principale.</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Il formato Anamorfico consente dimensioni di archiviazione arbitrarie preservando l'aspetto originale durante la riproduzione.
+
+Off disabilita l'anamorfico. Le dimensioni di archiviazione video e le dimensioni di visualizzazione saranno identiche. Utile solo per la compatibilità con determinati dispositivi legacy.
+
+Auto ottimizza la risoluzione di archiviazione preservando le proporzioni originali dello schermo. Raccomandato.
+
+Loose è simile a Auto, ma tenta di preservare le proporzioni di archiviazione. Ciò può comportare una leggera perdita di risoluzione di archiviazione rispetto a Auto.
+Custom consente di impostare manualmente tutti i parametri. Utile per correggere un aspetto di visualizzazione sorgente errato e per i professionisti che necessitano di controllo avanzato in fase di post-produzione.</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>Ritaglia automaticamente i bordi neri dal video.</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>Ritaglia il video dal basso.</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>Ritaglia il video a sinistra.</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>Ritaglia il video a destra.</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>Ritaglia il video dall'alto.</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Questa è l'altezza nella quale verrà salvato il video.
+Le dimensioni reali saranno diverse se il rapporto d'aspetto dei pixel non è 1:1.</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>Ritaglia manualmente il video.</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>Allinea le dimensioni di archiviazione a multipli di questo valore.
+
+Questa opzione è necessaria solo per compatibilità con alcuni dispositivi.
+Usare 2 è raccomandato a meno che non vi siano problemi di compatibilità.</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Il rapporto d'aspetto dei pixel definisce la loro forma.
+Un rapporto di 1:1 significa che sono quadrati, mentre per tutti gli altri valori sono rettangolari.
+I dispositivi di riproduzione scaleranno l'immagine per ottenere l'aspetto desiderato.</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Questa è la larghezza in cui verrà salvato il video.
+Le dimensioni reali saranno diverse se il rapporto d'aspetto dei pixel non è 1:1.</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>Elimina processo dalla coda.</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>Ripristina stato del processo a In Attesa.</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>Riporta il processo alla finestra principale per applicare modifiche.</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>Imposta frequenza dei bit media.
+
+La frequenza di bit istantanea può essere più alta o più bassa in un dato momento, ma la media nel lungo periodo sarà pari al valore qui impostato. Se hai la necessità di limitare la frequenza di bit istantanea, cerca vbv-bufsize e vbv-maxrate tra le opzioni x264.</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>Abilita frequenza fotogrammi costante in uscita.</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>Codificatori video disponibili.</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>Regola le impostazioni da ottimizzare negli scenari più comuni.
+
+Può migliorare l'efficienza di sorgenti o file di output con caratteristiche
+ particolari. Le modifiche verranno applicate dopo la preimpostazione, ma 
+prima di tutti gli altri parametri.</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>Impostazioni aggiuntive del codificatore.
+
+Lista di opzioni del codificatore separate da due punti.</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>Riduce l'utilizzo della CPU da parte del decodificatore.
+
+Utilizzare nel caso in cui il dispositivo abbia difficoltà a riprodurre il file di uscita (fotogrammi persi).</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>Frequenza fotogrammi in uscita.
+
+Consigliato 'Uguale alla Sorgente'. Se la sorgente ha una frequenza fotogrammi variabile, 'Uguale alla Sorgente' la preserverà.</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>Imposta ed assicura conformità con il livello specificato.
+
+Sovrascrive tutte le altre opzioni.</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>Abilita l'uscita a frequenza dei fotogrammi variabile. La frequenza di picco è determinata dalle impostazioni della frequenza dei fotogrammi.</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>Modifica le opzioni del codificatore per migliorare l'efficienza della compressione a scapito della velocità di codifica.
+
+Definisce le opzioni predefinite del codificatore.
+Regolazioni, profili, livelli ed altre opzioni avanzate verranno applicate su questa base.
+In genere questa opzione andrebbe regolata sulla più lenta possibile in quanto i settaggi
+più lenti risulteranno in miglior qualità o file più contenuti.</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>Imposta ed assicura conformità con il profilo specificato.
+
+Sovrascrive tutte le altre opzioni.</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Imposta il fattore di qualità desiderato.
+Il codificatore punterà quindi verso una certa qualità.
+La scala usata da ogni codificatore video è differente.
+
+La scala di x264 è logaritmica: a valori più bassi corrisponde miglior qualità.
+Perciò piccoli incrementi nel valore risulteranno in aumenti progressivamente più
+grandi nelle dimensioni finali del file. Un valore pari a 0 significa compressione senza
+perdita e risulterà in un file più grande della sorgente originale, a meno che anche questa 
+non fosse senza perdita.
+I valori suggeriti sono: da 18 a 20 per sorgenti in definizione standard e da 20 a 23 per sorgenti ad alta definizione.
+
+Le scale dell'FFMpeg e del Theora sono più lineari.
+Questi codificatori non dispongono di una modalità senza perdita.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>Durante il 1^ passaggio di una codifica a 2 passaggi, usa delle opzioni per velocizzare il processo.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Esegue una Codifica a 2 passaggi.
+
+L'opzione 'Bitrate' è necessaria. Durante il 1^ passaggio, sono raccolte alcune
+statistiche sul video. Nel secondo passaggio queste statistiche sono usate
+per decidere come allocare la frequenza dei bit.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Abilita l'uscita a frequenza dei fotogrammi variabile (VFR).
+
+Il VFR non è compatibile con tutti i riproduttori video.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>Al completamento della coda Handbrake eseguirà la seguente azione.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Premi sfoglia per selezionare un nuovo percorso di destinazione ed il nome del file della codifica.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Angolazione video da codificare. Disponibile solo con DVD e Blu-ray con multiple angolazioni.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>Aggiungi una nuova preimpostazione.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Opzioni Aggiuntive della Preimpostazione.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Le Preimpostazioni sono un insieme di impostazioni della codifica adatte a scenari specifici. Selezionare la più vicina alle proprie esigenze.
+
+Sovrascrivono tutte le opzioni di codifica. Le opzioni possono comunque essere modificate manualmente dopo aver selezionato una preimpostazione.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>Rimuove la preimpostazione selezionata.</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Alcune Sorgenti potrebbero contenere più di una clip video, oppure una collana di Titoli. Fonti da DVD o Blu-Ray spesso sono composte da vari Titoli.
+
+Se desideri codificare un Titolo specifico puoi inserirlo qui: HandBrake scansionerà solo quel Titolo invece di tutto il file sorgente. Altrimenti, lasciare lo spazio vuoto.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Parametri Personalizzati di Riduzione del Rumore.
+ 
+Sintassi di NLMeans: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+Predefiniti per NLMeans: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+Sintassi di HQDN3D: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+Predefiniti per HQDN3D: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Preimpostazione filtro di Riduzione del Rumore. Imposta la potenza del filtro.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Regolazioni di riduzione del rumore. Si tratta di ulteriori regolazioni della preimpostazione di 
+Riduzione del Rumore specifiche per determinati scenari.
+
+- Nessuno usa le preimpostazioni predefinite.
+
+- Film usa delle impostazioni adatte alla maggior parte dei film in presa diretta.
+
+-High Motion riduce le scie di colore nelle scene movimentate evitando l'elaborazione temporale per i canali dei colori. Utile nei video sportivi o con scene d'azione.
+
+- Animation è adatto per l'animazione tradizionale, come anime o cartoni animati.
+
+- Tape è adatto a nastri analogici di bassa qualità cone le VHS, ove Film non restituisce l'effetto desiderato.
+
+- Sprite è adatto ai videogiochi bidimensionali a 1-/4-/8-/16-bit. Sprite non è adatto per i video ad alta definizione</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>Il Deinterlacciamento rimuove gli artefatti a "righe" dall'immagine.
+
+Yadif è un deinterlacciatore rapido molto usato.
+
+Decomb sfrutta vari algoritmi di interpolazione per ottenere velocità e qualità.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Parametri Deinterlacciamento personalizzati.
+ 
+ Sintassi Yadif: mode=m:parity=p
+ 
+ Predefinito Yadif: mode=3
+ 
+ Sintassi Decomb: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Predefinito Decomb: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Preimpostazione filtro di Deinterlacciamento.
+
+Default è ben bilanciato tra velocità e qualità.
+
+Skip Spatial Check lascia che lo Yadif ignori alcuni artefatti evitabili per un leggero aumento di velocità.
+
+EEDI2 utilizza un algoritmo di interpolazione più lento e di qualità superiore per il Deinterlacciamento. Utile per le sorgenti più difficili.
+
+Bob tenta di preservare meglio il movimento a scapito di una leggera penalità alla risoluzione percepita.
+ </value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>Ribalta (specchia) l'immagine sull'asse orizzontale.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>Rilevamento interlacciato, quando abilitato, consente dal filtro di deinterlacciamento di elaborare solo i fotogrammi video interlacciati. </value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Parametri Rilevamento Interlacciato Personalizzati.
+ 
+Sintassi: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+Predefinito: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Ruota l'immagine in senso orario a incrementi di 90 gradi. </value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Durata della selezione di sorgenti in Ore:Minuti:Secondi</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Keep Aspect Ratio mantiene il Rapporto d'Aspetto originale della sorgente. Disabilitandolo l'iimagine potrebbe risultare schiacciata o deformata.</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>Paramentri Nitidezza personalizzati.
+
+Sintassi Unsharp: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Predefinito Unsharp: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Sintassi Lapsharp: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Predefinito Lapsharp: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>La Nitidezza migliora l'aspetto dei dettagli, in particolare i bordi. Impostazioni di Nitidezza eccessivamente forti possono danneggiare la qualità delle immagini creando artefatti a corona ed aumentando il rumore, il che può ridurre l'efficienza di compressione.
+
+Unsharp è un filtro di mascheramento a sfocatura generico. Aumenta la nitidezza prima sfocando, poi calcolando la differenza tra l'immagine sfocata e l'originale.
+
+Lapsharp aumenta la nitidezza usando matrici di convoluzione, approssimando filtri di bordo laplaciani. Solitamente si ottengono risultati di qualità superiore rispetto al mascheramento a sfocatura.</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>Preimpostazione filtro nitidezza. Imposta la potenza del filtro.</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>Regolazioni Nitidezza. Regola ulteriormente la preimpostazione di Nitidezza per ottimizzare le impostazioni per scenari specifici.
+
+Nessuno usa le impostazioni del preset predefinite.
+
+Unsharp può essere regolato per la nitidezza Ultrafine, Fine, Medium, Coarse, o Very Coarse. Selezionane uno basato sulla risoluzione dell'immagine in uscita e sulla finezza dei dettagli da migliorare.
+
+Lapsharp Film perfeziona le impostazioni per l'utilizzo con la maggior parte dei contenuti in presa diretta. Film usa un kernel islottico laplaciano per smussare tutti i bordi in modo simile, e le informazioni della luminanza (luminosità) vengono rese più nitide delle informazioni sulla crominanza (colore).
+
+Lapsharp Grain è simile a Film, ma utilizza un Laplaciano isotropico di kernel gaussiano per ridurre l'effetto su rumore e grana. Utile per preservare la grana e come alternativa generale alla regolazione Film.
+
+Lapsharp Animation è utile per l'animazione tradizionale come anime e cartoni animati. Animation è identica a Film, ma la forza complessiva è ridotta per evitare la creazione di artefatti.
+
+Lapsharp Sprite è utile per i giochi bidimensionali a 1-/4-/8-/16-bit. Sprite usa un kernel di Laplace a 4 contigui che migliora i bordi verticali e orizzontali più che i bordi diagonali. </value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Allinea i marcatori temporali iniziali di tutti i flussi video e audio, inserendo dei fotogrammi vuoti o eliminandone qualcuno. Potrebbe migliorare la sincronizzazione audio/video su riproduttori non conformi che non rispettano gli elenchi di modiche MP4.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Opzioni per regolare le preimpostazioni.</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>La fine dell'intervallo</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>L'inizio dell'intervallo.</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Se abilitato l'assegnazione automatica dei nomi userà sempre il percorso predefinito.
+Se disabilitato, userà il percorso di destinazione nella casella della finestra principale, se inserito, altrimenti userà quello predefinito.</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Filtro Spazio Colore:</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Filtro Chroma Smooth:</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>Questo campo accetta valori RGB tipo "0xFF0000" oppure nomi di colori, in inglese, come "red". Per un elenco completo dei colori consultare la documentazione relativa al filtro di riempimento.</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Metti in sovraimpressione i sottotitoli nel flusso video.
+
+Attenzione, verrà abilitato automaticamente se il formato della traccia dei sottotitoli nella sorgente non è supportato dal file di uscita.
+
+Ad esempio, i sottotitoli in formato PGS non sono supportati dall'MP4</value>
+ </data>
+ <data name="OptionsView_PresetDisplayModes" xml:space="preserve">
+ <value>Semplice - Le preimpostazioni sono mostrate in una lista semplice.
+Parzialmente Semplice - Le ultime 8 preimpostazioni dell'utente sono mostrate in una lista semplice, seguite da tutte le altre preimpostazioni in una lista divisa per categoria.
+Per Categoria - Tutte le preimpostazioni sono nel sottomenù della rispettiva categoria.</value>
+ </data>
+ <data name="AudioView_AudioDefaults" xml:space="preserve">
+ <value>Comportamento preparativo che decide come questa scheda debba aggiungere tracce audio quando si seleziona una nuova sorgente od un nuovo Titolo.</value>
+ </data>
+ <data name="BehavioursReload" xml:space="preserve">
+ <value>Ricarica la lista sottostante secondo comportamento configurato.</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaults" xml:space="preserve">
+ <value>Comportamento preparativo che decide come questa scheda debba aggiungere tracce dei sottotitoli quando si seleziona una nuova sorgente od un nuovo Titolo.</value>
+ </data>
+ <data name="OptionsView_SendFileToArguments" xml:space="preserve">
+ <value>Le seguenti variabili d'ambiente sono sempre impostate:
+HB_SOURCE
+HB_DESTINATION
+HB_EXIT_CODE
+
+Possibili codici di errore possono essere:
+0 : Terminato con Successo
+2 : Errore Argomenti Ingresso
+3 : Inizializzazione Impossibile 
+4 : Errore Sconosciuto
+5 : Errore lettura file sorgente.
+
+Nota Bene: i codici di errore sono supposizioni e potrebbero quindi non essere corretti.
+È raccomandabile di validare i file di uscita prima di compiere azioni su di essi.</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>Il formato del nome del file di uscita. Oltre a tutti i caratteri supportati dal file system, è possibile usare un qualsiasi segnaposto che verrà poi sostituito al cambio di Titolo, alla scansione di una sorgente od al cambio di determinate impostazioni.</value>
+ </data>
+ <data name="OptionsView_RightToleftMode" xml:space="preserve">
+ <value>Per le lingue che si leggono da destra a sinistra, è possibile abilitare una di queste due modalità: "Solo Testo" scriverà esclusivamente i testi da destra a sinistra, "Interfaccia Utente Completa" mostrerà così anche gli altri elementi grafici.
+
+Usando una di queste modalità, potrebbero esserci dei problemi nella visualizzazione dell'interfaccia. A secoda della lingua, potrebbe essere necessario provare quale delle due funziona meglio.</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ja.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ja.resx Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ko.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ko.resx Changed

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
 
 <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
 <xsd:element name="root" msdata:IsDataSet="true">
 <xsd:complexType>
 <xsd:choice maxOccurs="unbounded">
 <xsd:element name="metadata">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
 </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string"/>
- <xsd:attribute name="type" type="xsd:string"/>
- <xsd:attribute name="mimetype" type="xsd:string"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="assembly">
 <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string"/>
- <xsd:attribute name="name" type="xsd:string"/>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="data">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
- <xsd:attribute ref="xml:space"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
 </xsd:complexType>
 </xsd:element>
 <xsd:element name="resheader">
 <xsd:complexType>
 <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
 </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
 </xsd:complexType>
 </xsd:element>
 </xsd:choice>
@@ -112,16 +112,16 @@
 <value>2.0</value>
 </resheader>
 <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
 </resheader>
 <data name="FilterView_Deblock" xml:space="preserve">
- <value>Deblock은 품질이 낮은 비디오 압축으로 인해 발생하는 고르지 않은 아티팩트를 줄입니다.</value>
+ <value>블록 제거는 낮은 품질의 비디오 압축으로 인해 발생하는 블록 아티팩트를 줄여줍니다.</value>
 </data>
 <data name="FilterView_DecombDeinterlace" xml:space="preserve">
- <value>decomb 또는 deinterlace 필터 옵션을 선택하십시오.
+ <value>decomb 또는 인터레이스 해제 필터 옵션을 선택하십시오.
 
 decomb 필터는 선택적으로 인터레이스된 프레임을 비인터레이스로 바꾸어줍니다. 
 이것은 인터레이스 되지 않은 프레임의 품질을 보존합니다.
@@ -130,7 +130,7 @@
 인터레이스 되지 않은 프레임은 품질 저하가 일어날 것입니다.</value>
 </data>
 <data name="FilterView_Denoise" xml:space="preserve">
- <value>Denoise는 잡음과 잡티가 나타나는 것을 줄이거나 제거합니다. 이것은 압축을 효율적으로 해주고 높은 품질의 비디오를 작은 사이즈의 파일로 만들어줍니다.
+ <value>노이즈 제거는 잡음과 잡티가 나타나는 것을 줄이거나 제거합니다. 이것은 압축을 효율적으로 해주고 높은 품질의 비디오를 작은 사이즈의 파일로 만들어줍니다.
 지나치게 강한 잡음 제거 설정은 디테일을 제거함으로써 그림 화질을 손상시킬 수 있습니다.
 
 NLMeans는 비용이 많이 드는 높은 품질의 잡음 제거 필터입니다. 실행 속도보다 품질이 중요한 경우 사용됩니다.
@@ -138,10 +138,10 @@
 HQDN3D는 적응형 low-pass 필터로 NLMeans보다 빠르지만 세부 사항을 유지하는데 덜 효과적입니다.</value>
 </data>
 <data name="FilterView_Detelecine" xml:space="preserve">
- <value>Detelecine은 영화 프레임률을 TV 프레임률로 바꿔주는 과정인 telecine의 결과물인 comb artifact를 제거합니다. </value>
+ <value>텔레시네 해제는 영화 프레임률을 TV 프레임률로 바꿔주는 과정인 텔레시네의 결과물인 comb 아티팩트를 제거합니다. </value>
 </data>
 <data name="FilterView_Grayscale" xml:space="preserve">
- <value>Grayscale은 비디오의 색상 구성 요소를 제거합니다. 보통Black&amp;amp; White 비디오라고 불립니다.</value>
+ <value>그레이스케일은 비디오의 색상 구성 요소를 제거합니다. 흔히 흑백 동영상이라고 합니다.</value>
 </data>
 <data name="MainView_Destination" xml:space="preserve">
 <value>디렉토리 및 파일 이름을 포함한 대상 경로. 이곳에서 새로운 비디오가 생성되고 이름이 지정됩니다.</value>
@@ -163,36 +163,37 @@
 Blu-ray와 DVD 자료는 대개 여러 개의 제목을 가지고 있으며, 그 중 가장 긴 것은 일반적으로 주요 기능이다.</value>
 </data>
 <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
- <value>Anamorphic은 재생하는 동안 원래의 가로 세로를 보존하면서 임의의 저장 공간을 허용합니다.
+ <value>아나모픽은 재생하는 동안 원래의 화면을 유지하면서 임의의 저장 치수를 허용합니다.
 
-Off는 anamorphic을 비활성화합니다. 비디오 저장 공간과 화면의 크기는 동일할 것입니다. 특정한 오래된 기기들과의 호환성에만 유용합니다.
+없음은 아나모픽을 비활성화합니다. 비디오 저장 치수와 화면 치수는 동일합니다. 특정한 기존 장치들과의 호환성에만 유용합니다.
 
-Auto는 원본 화면의 가로 세로 비율을 유지하면서 저장물의 해상도를 최대로 높입니다. 추천합니다.
+자동은 원래 화면 종횡비를 유지하면서 저장 해상도를 최대화합니다. 추천합니다.
 
-Loose는 Auto와 유사하지만 저장물의 가로 세로 비율을 유지하려 합니다. 이것은 Auto에 비해 저장물의 해상도가 약간 떨어질 수 있습니다.
+루스는 자동과 비슷하지만 저장 종횡비를 유지하려고 합니다. 이로 인해 자동에 비해 약간의 저장 해상도 손실이 발생할 수 있습니다.
 
-Custom은 모든 파라미터들을 수동으로 설정할 수 있습니다. 잘못된 원본 화면의 가로 세로를 수정하고 후반 작업에서 고급 컨트롤을 필요로 하는 전문가들에게 유용합니다.</value>
+사용자 지정은 모든 매개 변수를 수동으로 설정할 수 있습니다. 잘못된 원본 디스플레이 화면을 수정하고 포스트 프로덕션에서 고급 제어가 필요한 전문가에게 유용합니다.</value>
 </data>
 <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
 <value>비디오 가장자리 주위에 검은 색 테두리를 자동으로 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_CropBottom" xml:space="preserve">
- <value>아래에서부터 비디오 자르기</value>
+ <value>아래에서부터 비디오를 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_CropLeft" xml:space="preserve">
- <value>왼쪽에서부터 비디오 자르기</value>
+ <value>왼쪽에서부터 비디오를 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_CropRight" xml:space="preserve">
- <value>오른쪽에서부터 비디오 자르기</value>
+ <value>오른쪽에서부터 비디오를 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_CropTop" xml:space="preserve">
- <value>위에서부터 비디오 자르기</value>
+ <value>위에서부터 비디오를 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_Height" xml:space="preserve">
- <value>비디오가 저장 될 높이입니다. 픽셀 종횡비가 1:1이 아닌 경우 실제 디스플레이 크기가 달라집니다.</value>
+ <value>이 높이가 비디오를 저장할 높이입니다.
+픽셀 종횡비가 1:1이 아닌 경우 실제 화면 치수가 다릅니다.</value>
 </data>
 <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
- <value>수동으로 비디오 자르기</value>
+ <value>수동으로 비디오를 자릅니다.</value>
 </data>
 <data name="PictureSettingsView_Modulus" xml:space="preserve">
 <value>스토리지 차원을 이 값의 배수로 정렬하십시오. 
@@ -201,15 +202,16 @@
 호환성 문제가 발생하지 않는 한 2를 사용해야합니다.</value>
 </data>
 <data name="PictureSettingsView_PAR" xml:space="preserve">
- <value>픽셀 가로 세로는 픽셀들의 모양을 결정합니다.
-1:1 비율은 정사각형 픽셀을 정의합니다. 다른 값들은 직사각형 모양을 정의합니다.
-사용자들은 특정 가로 세로를 얻기 위해 이미지 크기를 조정할 것입니다.</value>
+ <value>가로세로 픽셀은 픽셀들의 모양을 결정합니다.
+1:1 비율은 정사각형 픽셀을 정의합니다. 다른 값은 직사각형 모양을 정의합니다.
+재생기들은 지정된 화면을 얻기 위해 이미지 크기를 조정할 것입니다.</value>
 </data>
 <data name="PictureSettingsView_Width" xml:space="preserve">
- <value>비디오가 저장 될 너비입니다. 픽셀 종횡비가 1:1이 아닌 경우 실제 디스플레이 크기가 달라집니다.</value>
+ <value>이 너비는 비디오를 저장할 너비입니다.
+픽셀 종횡비가 1:1이 아닌 경우 실제 화면 치수가 다릅니다.</value>
 </data>
 <data name="QueueView_DeleteJob" xml:space="preserve">
- <value>queue에서 job 삭제합니다.</value>
+ <value>대기열에서 작업을 삭제합니다.</value>
 </data>
 <data name="QueueView_ResetJobStatus" xml:space="preserve">
 <value>작업 상태를 대기로 재설정합니다.</value>
@@ -234,7 +236,7 @@
 <value>일반적인 시나리오에 최적화되도록 설정하십시오.
 
 이는 특정 소스 특성의 효율성을 향상시커거나 출력 파일의 특성을 
-설정할 수 있습니다. 변경 사항은 환경 설정 후 다른 모든 파라미터보다 
+설정할 수 있습니다. 변경 사항은 프리셋 후 다른 모든 파라미터보다 
 먼저 적용됩니다.</value>
 </data>
 <data name="Video_ExtraOpts" xml:space="preserve">
@@ -253,7 +255,7 @@
 <data name="Video_Level" xml:space="preserve">
 <value>지정된 레벨을 준수하도록 설정하고 보장합니다.
 
-다른 모든 설정을 무시하십시오.</value>
+다른 모든 설정을 재정의합니다.</value>
 </data>
 <data name="Video_PeakFramerate" xml:space="preserve">
 <value>프레임 속도 설정에 의해 결정된 최고 속도로 가변 프레임 속도 출력을 활성화합니다.</value>
@@ -267,9 +269,9 @@
 이 옵션을 가장 느리게 설정해야 합니다.</value>
 </data>
 <data name="Video_Profile" xml:space="preserve">
- <value>지정된 프로파일을 준수하고 설정합니다.
+ <value>지정된 프로필을 준수하도록 설정하고 보장합니다.
 
-다른 모든 설정을 무시합니다.</value>
+다른 모든 설정을 재정의합니다.</value>
 </data>
 <data name="Video_Quality" xml:space="preserve">
 <value>원하는 품질 요소을 설정하십시오.
@@ -296,7 +298,7 @@
 통계가 수집됩니다. 그러면 두 번째 pass 동안, 전송 속도 할당이 결정되는 데 수집한 통계가 사용됩니다.</value>
 </data>
 <data name="Video_VariableFramerate" xml:space="preserve">
- <value>가변 프레임 속도 출력을 활성화합니다. VFR은 일부 플레이어와 호환되지 않습니다.</value>
+ <value>가변 프레임 속도 출력을 활성화합니다. VFR은 일부 재생기와 호환되지 않습니다.</value>
 </data>
 <data name="MainView_WhenDone" xml:space="preserve">
 <value>HandBrake가 현재 대기열이나 인코딩을 완료하면 해당 작업을 수행합니다.</value>
@@ -308,24 +310,26 @@
 <value>인코딩할 비디오 각도. 다양한 각도의 DVD와 Blu-rau만 적용 가능합니다.</value>
 </data>
 <data name="MainView_AddPreset" xml:space="preserve">
- <value>새로운 환경 설정을 추가하십시오.</value>
+ <value>새로운 프리셋을 추가하십시오.</value>
 </data>
 <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
- <value>추가적인 환경 설정 옵션.</value>
+ <value>추가적인 프리셋 옵션.</value>
 </data>
 <data name="MainView_Presets" xml:space="preserve">
- <value>환경 설정은 특정 시나리오에 맞게 조정된 인코딩 설정 그룹입니다. 당신의 의도에 가장 가까운 설정을 선택하십시오.
+ <value>프리셋은 특정 시나리오에 맞게 조정된 인코딩 설정 그룹입니다. 당신의 의도에 가장 가까운 설정을 선택하십시오.
 
-모든 인코딩 설정을 무시합니다. 환경 설정을 선택한 후 설정을 추가로 조정할 수 있습니다.</value>
+모든 인코딩 설정을 재정의합니다. 프리셋을 선택한 후 설정을 추가로 조정할 수 있습니다.</value>
 </data>
 <data name="MainView_RemovePreset" xml:space="preserve">
- <value>선택된 환경 설정을 제거하십시오.</value>
+ <value>선택된 프리셋을 제거하십시오.</value>
 </data>
 <data name="SourceSelection_TitleSpecific" xml:space="preserve">
- <value>모든 제목 대신 특정 제목만 스캔하십시오.</value>
+ <value>일부 소스에는 둘 이상의 비디오 클립 또는 제목 모음이 포함될 수 있습니다. Blu-ray 및 DVD 소스에는 종종 여러 개의 타이틀이 있습니다.
+
+인코딩하려는 특정 제목을 알고 있는 경우 여기에 입력하면 HandBrake가 소스 파일의 모든 제목이 아닌 해당 제목만 스캔합니다. 그렇지 않으면 필드를 비워 둡니다.</value>
 </data>
 <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
- <value>사용자 설정 Denoise 파라미터.
+ <value>사용자 설정 노이즈 제거 매개변수.
 
 NLMeans 구문: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
 
@@ -336,12 +340,12 @@
 HQDN3D 기본값: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
 </data>
 <data name="FilterView_DenoisePreset" xml:space="preserve">
- <value>Denoise 필터 환경 설정. 필터의 강도를 설정합니다.</value>
+ <value>노이즈 제거 필터 프리셋. 필터의 강도를 설정합니다.</value>
 </data>
 <data name="FilterView_DenoiseTune" xml:space="preserve">
- <value>Denoise 설정. Denoise 환경 설정을 추가로 조정하여 특정한 상황에 대한 설정을 최적화합니다.
+ <value>노이즈 제거 조정. 노이즈 제거 프리셋을 추가로 조정하여 특정한 상황에 대한 설정을 최적화합니다.
 
-- 없음은 기본 환경 설정을 사용합니다.
+- 없음은 기본 프리셋을 사용합니다.
 
 - Film은 대부분 라이브 액션 콘텐츠와 함께 사용하기 위한 설정을 개선합니다.
 
@@ -356,14 +360,14 @@
 - Sprite는 1-/4-/8-/16-비트의 2-차원 게임에 대해 유용합니다. Sprite는 고화질 비디오용으로 설계되지 않았습니다.</value>
 </data>
 <data name="FilterView_Deinterlace" xml:space="preserve">
- <value>Deinterlace는 comb 아티팩트를 그림에서 제거합니다.
+ <value>인터레이스 해제는 comb 아티팩트를 그림에서 제거합니다.
 
-Yadif는 유명하고 빠른 deinterlacer 입니다.
+Yadif는 유명하고 빠른 인터레이스 해제 도구 입니다.
 
-Decomb은 속도와 품질을 위해 복수의 interpolation 알고리즘을 전환합니다.</value>
+Decomb은 속도와 품질을 위해 복수의 보간 알고리즘을 전환합니다.</value>
 </data>
 <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
- <value>사용자 설정 비인터레이스 파라미터.
+ <value>사용자 설정 인터레이스 해제 매개 변수.
 
 Yadif 구문: mode=m:parity=p
 
@@ -374,7 +378,7 @@
 Decomb 기본값: mode=7</value>
 </data>
 <data name="FilterView_DeinterlacePreset" xml:space="preserve">
- <value>Deinterlace 필터 환경 설정.
+ <value>디인터레이스 필터 프리셋.
 
 기본값은 속도와 품질의 균형을 맞춥니다.
 
@@ -385,10 +389,10 @@
 Bob는 문제가 있다고 인지된 해상도에 대한 모션을 더욱 잘 보존하도록 합니다.</value>
 </data>
 <data name="FilterView_Flip" xml:space="preserve">
- <value>가로축에서 그림을 뒤집습니다.</value>
+ <value>가로축으로 영상을 뒤집습니다(미러).</value>
 </data>
 <data name="FilterView_InterlaceDetection" xml:space="preserve">
- <value>Interlace Detection이 활성화된 경우 Deinterlace filter가 interlace된 비디오 프레임만 처리 할 수 있도록 합니다. </value>
+ <value>인터레이스 감지가 활성화된 경우 인터레이스 해제 필터가 인터레이스된 비디오 프레임만 처리 할 수 있도록 합니다. </value>
 </data>
 <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
 <value>사용자 설정 인터레이스 검출 파라미터.
@@ -425,12 +429,12 @@
 Lapsharp은 Laplacian edge 필터를 근사하게 하는 콘벌루션 커널을 사용하여 선명하게 하며, 때때로 unsharp masking보다 더욱 높은 품질의 결과물을 생산하기도 합니다.</value>
 </data>
 <data name="FilterView_SharpenPreset" xml:space="preserve">
- <value>선명도 필터 환경 설정. 필터의 강도를 설정합니다. </value>
+ <value>선명도 필터 프리셋. 필터의 강도를 설정합니다. </value>
 </data>
 <data name="FilterView_SharpenTune" xml:space="preserve">
- <value>선명도 설정. 선명도 환경 설정을 추가로 조정하여 특정한 상황에 대한 설정을 최적화합니다.
+ <value>선명도 설정. 선명도 프리셋을 추가로 조정하여 특정한 상황에 대한 설정을 최적화합니다.
 
-없음은 기본 환경 설정을 사용합니다.
+없음은 기본 프리셋을 사용합니다.
 
 Unsharp은 Ultrafine, Fine, Medium, Coarse, Very Coarse 선명화를 설정할 수 있습니다. 출력 화면 해상도 및 세부 정보에 기반해서 하나를 선택하십시오.
 
@@ -443,10 +447,10 @@
 Lapsharp's Sprite 설정은 1-/4-/8-/16-비트의 2-차원 게임에 대해 유용합니다. Sprite는 대각선 모서리보다 수평과 수직 모서리를 향상시키는 4개의 주변 Laplacian 커널을 사용합니다. </value>
 </data>
 <data name="MainView_AlignAVStart" xml:space="preserve">
- <value>빈 프레임을 삽입하거나 프레임을 삭제하여 모든 오디오 및 비디오 스트림의 초기 타임 스탬프를 정렬합니다. MP4 편집 목록을 준수하지 않는 손상된 플레이어의 오디오/비디오 동기화를 향상시킬 수 있습니다.</value>
+ <value>빈 프레임을 삽입하거나 프레임을 삭제하여 모든 오디오 및 비디오 스트림의 초기 타임 스탬프를 정렬합니다. MP4 편집 목록을 준수하지 않는 손상된 재생기의 오디오/비디오 동기화를 향상시킬 수 있습니다.</value>
 </data>
 <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
- <value>환경 설정을 제어하는 옵션.</value>
+ <value>프리셋을 제어하는 옵션.</value>
 </data>
 <data name="MainView_EndPoint" xml:space="preserve">
 <value>이 범위의 종점.</value>
@@ -458,4 +462,53 @@
 <value>자동 이름 완성 기능을 활성화 시, 기본 저장 경로를 사용할 것입니다. 
 비활성화 시, 이름을 입력하였다면, 기본 윈도우의 대상 경로를 사용하게 되며, 입력하지 않았다면, 기본 경로를 사용하게 됩니다.</value>
 </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Colourspace 필터.</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth 필터</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>이 필드는 다음과 같은 RGB 값을 사용할 수 있습니다: "0xFF0000" 또는 "빨간색"과 같은 색상 이름입니다. 이름이 지정된 색상의 전체 목록은 패딩 필터 문서를 참조하십시오.</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>비디오 스트림에 자막을 추가합니다.
+
+출력 파일 형식에서 원본 자막 트랙 형식이 지원되지 않을 경우, 이 옵션이 자동으로 선택됩니다.
+
+예를 들어, PGS 자막은 MP4에서 지원되지 않습니다.</value>
+ </data>
+ <data name="OptionsView_PresetDisplayModes" xml:space="preserve">
+ <value>플랫 - 프리셋이 플랫 목록으로 표시됩니다.
+부분적으로 플랫 - 마지막 8개의 사용자 프리셋이 일반 목록으로 표시되고 모든 프리셋이 범주 목록에 표시됩니다.
+범주 - 모든 프리셋은 범주별 하위 메뉴 아래에 표시됩니다.</value>
+ </data>
+ <data name="AudioView_AudioDefaults" xml:space="preserve">
+ <value>새 소스 또는 제목을 선택할 때 이 탭이 자동으로 오디오 트랙을 추가하는 방법을 지시하는 동작을 설정합니다.</value>
+ </data>
+ <data name="BehavioursReload" xml:space="preserve">
+ <value>구성된 동작을 기반으로 아래 목록을 새로 고칩니다.</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaults" xml:space="preserve">
+ <value>새 소스 또는 제목을 선택할 때 이 탭에서 자막 트랙을 자동으로 추가하는 방법을 지정하는 동작을 설정합니다.</value>
+ </data>
+ <data name="OptionsView_SendFileToArguments" xml:space="preserve">
+ <value>다음 환경 변수는 항상 지정됩니다:
+HB_SOURCE
+HB_DESTINATION
+HB_EXIT_CODE
+
+가능한 종료 코드는 다음과 같습니다:
+0 : 성공
+2 : 인수 입력 오류
+3 : 초기화 실패
+4 : 알 수 없는 오류
+5 : 소스 파일을 읽는 중 오류.
+
+오류 코드는 최선의 노력이며 항상 정확하지 않을 수 있습니다.
+작업을 수행하기 전에 출력 파일의 유효성을 검사하는 것이 좋습니다.</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>출력 파일의 형식입니다. 지원되는 파일 시스템 문자 외에도 제목을 변경하거나 소스를 스캔하거나 특정 설정을 업데이트할 때 대체될 자리 표시자를 사용할 수 있습니다.</value>
+ </data>
 </root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.pt-BR.resx Added

@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>O desbloqueio reduz artefatos em blocos causados pela compactação de vídeo de baixa qualidade.</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>Escolha as opções de filtro de decomposição ou desentrelaçamento.
+
+O filtro de descompactação desentrelaça seletivamente os quadros que parecem estar entrelaçados.
+Isso preservará a qualidade nos quadros que não estão entrelaçados.
+
+O filtro de desentrelaçamento clássico é aplicado a todos os quadros.
+Os quadros que não estão entrelaçados sofrerão alguma degradação da qualidade.</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>Denoise reduz ou remove a aparência de ruído e granulação. Isso pode melhorar a eficiência da compactação e criar vídeos de maior qualidade em arquivos menores. 
+Configurações Denoise excessivamente fortes podem danificar a qualidade da imagem ao descartar detalhes.
+ 
+O NLMeans é um filtro denoise de alta qualidade com um custo para velocidade. Use onde a qualidade é mais importante que a velocidade.
+ 
+O HQDN3D é um filtro passagem-baixa adaptável, mais rápido que o NLMeans, porém menos eficaz na preservação de detalhes finos.</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>O Detelecine remove os artefatos de pente resultantes do telecine, um processo para converter taxas de quadros de filmes em taxas de quadros de televisão.</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>A escala de cinza remove o componente de cor do vídeo. Muitas vezes referico como vídeo Preto &amp;amp; Branco.</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Caminho de destino, incluindo o diretório e o nome do arquivo. É aqui que seu novo vídeo será criado e como será chamado.</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>Adicione um marcador MP4 especial para permitir a reprodução em dispositivos antigos do iPod 5ª Geração por volta de 2006. Outras configurações podem afetar a compatibilidade.</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>Formato de contêiner. Vídeo, áudio e outras faixas são combinadas em um único arquivo desse tipo. Afeta a compatibilidade.</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>Otimize o MP4 para download progressivo. Após a codificação, os dados são reorganizados e reescritos para permitir a reprodução imediata em uma rede, sem a necessidade de baixar o arquivo inteiro.</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Seleção do intervalo da fonte. Por padrão, todos os capítulos são selecionados e a fonte inteira é codificada.</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Título, ou videoclipe, para conversão.
+As fontes de Blu-ray e DVD geralmente têm vários títulos, o maior dos quais é geralmente o principal recurso</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>O anamórfico permite o armazenamento das dimensões arbitrárias enquanto preserva o aspecto original durante a reprodução.
+
+Nenhum desativa o anamórfico. As dimensões serão idênticas para o armazenamento do vídeo e para a exibição . Útil apenas para a compatibilidade com certos dispositivos legados.
+
+Automático Maximiza a resolução de armazenamento enquanto preserva a proporção do aspecto original da tela. Recomendado.
+
+Solto é similar ao Auto, porém tenta preservar a relação de aspecto de armazenamento. Isso pode resultar em uma leve perda de resolução de armazenamento em comparação com o Auto.
+
+Personalizado permite o ajuste manual de todos os parâmetros. Útil para corrigir um aspecto incorreto da origem e para profissionais que precisam de um controle mais avançado na pós-produção.</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>Corte automaticamente bordas pretas em torno das bordas do vídeo.</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>Cortar o vídeo da parte inferior.</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>Cortar o vídeo do lado esquerdo.</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>Cortar o vídeo do lado direito.</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>Cortar o vídeo do topo.</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Essa é a altura em que o vídeo será armazenado. As dimensões reais da tela diferem se a proporção de pixel não for 1:1.</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>Cortar manualmente o vídeo.</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>Alinhar dimensões de armazenamento a múltiplos desse valor.
+
+Essa configuração é necessária apenas para compatibilidade com alguns dispositivos.
+Você deve usar 2, a menos que tenha problemas de compatibilidade.</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>O aspecto de pixel define a forma dos pixels.
+Uma proporção de 1:1 define um pixel quadrado. Outros valores definem formas retangulares.
+Os tocadores escalarão a imagem para alcançar o aspecto especificado.</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Essa é a largura em que o vídeo será armazenado.
+As dimensões reais da tela diferem se a proporção de pixel não for 1:1.</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>Exclua o trabalho da fila.</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>Redefine o status do trabalho para Aguardando.</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>Envia o trabalho de volta para a janela principal para edição.</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>Define a taxa de bits média.
+
+A taxa de bits instantânea pode ser muito maior ou menor a qualquer momento.
+Mas a média por uma longa duração será o valor definido aqui. Se você precisar
+limitar a taxa de bits instantânea, consulte as configurações vbv-bufsize e vbv-maxrate do x264.</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>Permite a saída de taxa de quadros constante.</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>Codificadores de vídeo disponíveis.</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>Ajuste as configurações para otimizar cenários comuns.
+
+Isso pode melhorar a eficiência de determinadas características da fonte ou definir
+características do arquivo de saída. As alterações serão aplicadas após o
+predefinido, mas antes de todos os outros parâmetros.</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>Configurações adicionais do codificador.
+
+Lista separada por dois pontos de opções do codificador.</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>Reduz o uso da CPU pelo decodificador.
+
+Defina isso se o seu dispositivo estiver com dificuldades para reproduzir a saída (quadros perdidos).</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>Taxa de quadros de saída.
+
+É recomendado 'o mesmo que a origem'. Se o vídeo de origem tiver uma taxa de quadros variável, 'igual à origem' o preservará.</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>Define e garante a conformidade com o nível especificado.
+
+Substitui todas as outras configurações.</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>Permite saída de taxa de quadros com uma taxa de pico determinada pela configuração da taxa de quadros.</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>Ajusta as configurações do codificador para compensar a eficiência da compactação contra a velocidade da codificação.
+
+Isso estabelece as configurações padrão do codificador.
+Músicas, perfis, níveis e sequência de opções avançadas serão aplicados à isso.
+Geralmente, você deve definir essa opção para o mais lento possível, pois
+configuração mais lenta resultarão em melhor qualidade ou em arquivos menores.</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>Define e garante a conformidade com o perfil especificado.
+
+Substitui todas as outras configurações.</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Defina o fator de qualidade desejado.
+O codificador tem como um alvo uma certa qualidade.
+A escala usada por cada codificador de vídeo é diferente.
+
+A escala do x264 é logarítmica e os valores mais baixos correspondem a uma qualidade mais alta.
+Pequenas diminuições de valor resultarão em aumentos progressivamente maiores
+no tamanaho do arquivo resultante. Um valor 0 significa sem perdas e resultará em
+em um tamanho de arquivo maior que a fonte original, a menos que a fonte
+Também foi sem perdas.
+Os valores sugeridos são: 18 a 20 para fontes de definição padrão e 20 a 23 para fontes de alta definição.
+
+A escala de FFMpeg e Theora é mais linear.
+Esses codificadores não possuem um modo sem perdas.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>Durante a 1ª passagem de uma conversão de 2 passagens, use configurações que acelerem as coisas.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Execute a codificação de 2 passagens.
+
+A opção 'Taxa de bits' é um pré-requisito. Durante a 1ª passagem, estatísticas sobre
+o vídeo são coletadas. Em seguida, na segunda passagem, essas estatísticas são usadas
+para tomar decisões de alocação de taxa de bits.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Permite saída de taxa de quadros variável.
+
+O VFR não é compatível com alguns players.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>Quando o HandBrake terminar a fila ou codificação atual, ele executará esta opção.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Navegue para selecionar um novo caminho de destino e nome de arquivo para sua conversão.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Ângulo de vídeo a converter. Aplicável apenas a DVD e Blu-ray multi-ângulo.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>Adicione uma nova predefinição.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Opções predefinidas adicionais.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Predefinições são grupos de configurações de conversão personalizadas para cenários específicos. Selecione o mais próximo da sua intenção.
+ 
+ Substitui todas as configurações de conversão. As configurações podem ser ajustadas após a seleção de uma predefinição.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>Remove a predefinição selecionada.</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Procure apenas o título especificado em vez de todos os títulos.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Parâmetros personalizados de Denoise.
+ 
+Sintaxe do NLMeans: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+Padrão do NLMeans: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+Sintaxe do HQDN3D: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+Padrão do HQDN3D: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Filtro Denoise predefinido. Define a força do filtro.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Ajuste do Denoise. Ajusta ainda mais a predefinição de Denoise para otimizar configurações em cenários específicos.
+ 
+- None usa as configurações predefinidas padrão.
+ 
+- Film refina as configurações para uso com a maioria dos conteúdos de ação ao vivo.
+ 
+- Grain processa apenas canais de cores. Útil para preservar a aparência de filme da granulação de luminância, reduzindo ou removendo o ruído da cor.
+
+- High Motion reduz a mancha de cores em cenas de alto movimento, evitando o processamento temporal dos canais de cores. Útil para vídeos de esportes e ação.
+
+- Animation é útil para animação de cel, como anime e desenhos animados.
+
+- Tape é útil para fontes de fita analógica de baixo detalhe, como VHS, em que o filme não produz um resultado desejável.
+
+- Sprite é útil para jogos bidimensionais de 1-/4-/8-/16-bits. O Sprite não foi projetado para vídeo de alta definição.</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>O desentrelaçamento remove os artefatos do pente da imagem .
+
+Yadif é um desentrelaçador popular e rápido.
+
+Decomb alterna entre vários algoritmos de interpolação para velocidade e qualidade.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Parâmetros personalizados de desentrelaçamento.
+ 
+ Sintaxe do Yadif: mode=m:parity=p
+ 
+Padrão do Yadif: mode=3
+ 
+ Sintaxe do Decomb: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Padrão do Decomb: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Desentrelaçar o filtro predefinido.
+
+O padrão é bem equilibrado em termos de velocidade e qualidade.
+
+Ignorar Spatial Check permite que o Yadif pule a correção de certos artefatos evitáveis para um leve aumento de velocidade.
+
+EEDI2 usa um algoritmo de interpolação mais lento e de maior qualidade para o Decomb. Útil para as fontes mais difíceis.
+
+Bob tenta preservar melhor o movimento com uma pequena penalidade na resolução percebida.</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>Inverte (espelha) a imagem no eixo horizontal.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>Interlace Detection, quando ativada, permite que o filtro Deinterlace processe apenas quadros de vídeo entrelaçados.</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Parâmetros de detecção de entrelaçamento personalizados.
+ 
+ Sintaxe: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+ Padrão: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Gire a imagem no sentido horário em incrementos de 90 graus.</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Duração do intervalo de fonte selecionado em Horas:Minutos:Segundos.</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Keep Aspect Ratio mantêm o aspecto de exibição original da fonte. Desativar isso pode resultar em uma imagem esticada ou espremida.</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>Parâmetros de nitidez personalizados.
+
+Sintaxe do Unsharp: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Padrão do Unsharp: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Sintaxe do Lapsharp: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Padrão do Lapsharp: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>Sharpening aprimora a aparência dos detalhes, especialmente as arestas. Configurações de nitidez muito fortes podem danificar a qualidade da imagem criando artefatos de toque e aumentando o ruído, o que pode reduzir a eficiência da compactação.
+
+Unsharp é um filtro de máscara de nitidez de uso geral. A nitidez é desfocada e calcula a diferença entre imagem desfocada e a original.
+
+Lapsharp aguça núcleos de convolução próximos aos filtros de borda do Laplaciano, às vezes, produzindo resultados de melhor qualidade do que o mascaramento sem nitidez.</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>Nitidez do filtro predefinido. Define a força do filtro.</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>Ajuste de Sharpen. Ajusta ainda mais a predefinição de nitidez para otimizar as configurações de cenários específicos.
+
+None usa as configurações padrão.
+
+Unsharp pode ser ajustada para nitidez ultrafina, fina, média, grossa ou muito grossa. Selecione um com base na resolução da imagem de saída e na finura dos detalhes para aprimorar.
+
+O ajuste Lapsharp's Film refina as configurações para uso com a maioria dos conteúdos de ação ao vivo. O filme utiliza um núcleo isotrópico Laplacian para deixar nítido todas as arestas da mesma forma, e as informações de luminância (brilho) são mais nítidas do que as informações de crominância (cores).
+
+O ajuste Lapsharp's Grain é similar ao Film, mas usa um laço isotrópico do kernel gaussiano para reduzir o efeito no ruído e na granulação. Útil para preservar granulação e é como uma alternativa geral para o ajuste Film.
+
+O ajuste Lapsharp's Animation é útil para animações de celular, como anime e desenhos. Animation é idêntico ao Film, porém a força geral é reduzida para evitar a criação de artefatos.
+
+O ajuste Lapsharp's Sprite é útil para jogos bidimensionais 1-/4-/8-/16-bits. Sprite usa um kernel Laplacian 4-neighbor que aprimora as arestas verticais e horizontais mais do que as arestas diagonais.</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Alinha os carimbos de data e hora iniciais de todos os fluxos de áudio e vídeo inserindo quadros em branco ou soltando quadros. Pode melhorar a sincronização de áudio/vídeo para tocadores quebrados que não respeitam as listas de edição MP4.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Opções para controlar predefinições.</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>O ponto final para esse intervalo.</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>O ponto de partida para esse intervalo.</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Quando ativado, o sistema de nome automático sempre usará o caminho padrão.. 
+Quando desativado, ele usará o caminho na caixa de destino na janela principal, se preenchido, caso contrário, o caminho padrão.</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Filtro do espaço de cores.</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Filtro de suavização do chroma</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>Este campo pode aceitar valores RGB como: "0xFF0000" ou os nomes das cores como "vermelho". Para uma lista completa dos nomes das cores, consulte a documentação do filtro de "padding".</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>Queime as legendas no fluxo de vídeo.
+
+Nota, isto será automaticamente selecionado caso o formato da faixa de legenda da origem não seja compatível no tipo de arquivo gerado.
+
+Por exemplo, as legendas PGS não são compatíveis com o formato MP4.</value>
+ </data>
+</root>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.resx Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ru.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.ru.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.th.resx Added

@@ -0,0 +1,484 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>ปลดบล็อค ช่วยลดสิ่งแปลกปลอมที่เกิดจากการบีบอัดวิดีโอคุณภาพต่ำ</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>เลือกตัวเลือกตัวกรองแยกหรือการแปลงวิดีโอแบบอินเทอร์เลซ
+
+ตัวกรองการถอดรหัสจะกรองเฟรมที่ดูเหมือนอินเทอร์เลซโดยเลือก
+สิ่งนี้จะรักษาคุณภาพในเฟรมที่ไม่อินเทอร์เลซ
+
+กรองดีอินเทอร์เลซแบบคลาสสิกใช้ได้กับทุกเฟรม
+เฟรมที่ไม่อินเทอร์เลซจะได้รับผลกระทบด้านคุณภาพลดลง</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>ลบการรบกวน ช่วยลดหรือขจัดสัญญาณรบกวนและเกรน สิ่งนี้สามารถปรับปรุงประสิทธิภาพการบีบอัดและสร้างวิดีโอคุณภาพสูงขึ้นในขนาดไฟล์ที่เล็กลง
+การตั้งค่า ลบการรบกวน ที่แรงเกินไปอาจทำให้คุณภาพของภาพเสียหายได้จากการละทิ้งรายละเอียด
+ 
+NLMeans เป็นตัวกรอง denoise คุณภาพสูงพร้อมต้นทุนความเร็ว ใช้เมื่อคุณภาพสำคัญกว่าความเร็ว
+ 
+HQDN3D เป็นฟิลเตอร์กรองความถี่ต่ำแบบปรับได้ เร็วกว่า NLMeans แต่มีประสิทธิภาพน้อยกว่าในการรักษารายละเอียด</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>ดีเทเลซีน ลบสิ่งประดิษฐ์จากหวีซึ่งเป็นผลมาจากเทเลซีน ซึ่งเป็นกระบวนการในการแปลงอัตราเฟรมของภาพยนตร์เป็นอัตราเฟรมของโทรทัศน์</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>โทนสีเทาจะลบองค์ประกอบสีของวิดีโอ มักเรียกกันว่า Black &amp; วิดีโอสีขาว</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>เส้นทางปลายทาง รวมทั้งไดเร็กทอรีและชื่อไฟล์ นี่คือที่ที่วิดีโอใหม่ของคุณจะถูกสร้างขึ้น และจะตั้งชื่อว่าอะไร</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>เพิ่มเครื่องหมาย MP4 พิเศษเพื่อให้สามารถเล่นบนอุปกรณ์ iPod รุ่นที่ 5 รุ่นเก่าได้ประมาณปี 2006 การตั้งค่าอื่นๆ อาจส่งผลต่อความเข้ากันได้</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>รูปแบบคอนเทนเนอร์ วิดีโอ เสียง และแทร็กอื่นๆ รวมกันเป็นไฟล์ประเภทนี้ ส่งผลต่อความเข้ากันได้</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>ปรับ MP4 ให้เหมาะสมสำหรับการดาวน์โหลดแบบโปรเกรสซีฟ หลังจากเข้ารหัสแล้ว ข้อมูลจะถูกจัดระเบียบใหม่และเขียนใหม่เพื่อให้สามารถเล่นผ่านเครือข่ายได้ทันที โดยไม่ต้องดาวน์โหลดไฟล์ทั้งหมด</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>การเลือกช่วงแหล่งที่มา ตามค่าเริ่มต้น ทุกบทจะถูกเลือกและแหล่งที่มาทั้งหมดจะถูกเข้ารหัส</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>ชื่อหรือคลิปวิดีโอเพื่อเข้ารหัส
+แหล่ง Blu-ray และ DVD มักมีหลายชื่อ ซึ่งยาวที่สุดมักจะเป็นคุณสมบัติหลัก</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>อะนามอร์ฟิค ให้มิติการจัดเก็บโดยพลการในขณะที่รักษาลักษณะเดิมไว้ในระหว่างการเล่น
+
+ไม่มีปิดการใช้งาน anamorphic ขนาดการจัดเก็บวิดีโอและขนาดการแสดงผลจะเหมือนกัน มีประโยชน์สำหรับความเข้ากันได้กับอุปกรณ์รุ่นเก่าบางรุ่นเท่านั้น
+
+อัตโนมัติเพิ่มความละเอียดในการจัดเก็บสูงสุดในขณะที่รักษาอัตราส่วนการแสดงผลเดิม แนะนำ.
+
+คลายออกนั้นคล้ายกับอัตโนมัติ แต่พยายามรักษาอัตราส่วนพื้นที่จัดเก็บ ซึ่งอาจส่งผลให้สูญเสียความละเอียดในการจัดเก็บเล็กน้อยเมื่อเทียบกับอัตโนมัติ
+
+กำหนดเองช่วยให้ตั้งค่าพารามิเตอร์ทั้งหมดด้วยตนเอง มีประโยชน์สำหรับการแก้ไขด้านการแสดงผลที่มาที่ไม่ถูกต้อง และสำหรับมืออาชีพที่ต้องการการควบคุมขั้นสูงในขั้นตอนหลังการผลิต</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>ครอบตัดขอบสีดำรอบขอบของวิดีโอโดยอัตโนมัติ</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>ตัดวิดีโอจากด้านล่าง</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>ตัดวิดีโอจากด้านซ้าย</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>ตัดวิดีโอจากด้านขวา</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>ตัดวิดีโอจากด้านบน</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>นี่คือความสูงที่จะจัดเก็บวิดีโอ
+ขนาดการแสดงผลจริงจะแตกต่างกันหากอัตราส่วนกว้างยาวพิกเซลไม่ใช่ 1:1</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>ตัดวิดีโอด้วยตนเอง</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>จัดมิติการจัดเก็บให้เป็นทวีคูณของค่านี้
+
+การตั้งค่านี้จำเป็นสำหรับการใช้งานร่วมกับอุปกรณ์บางอย่างเท่านั้น
+คุณควรใช้ 2 เว้นแต่คุณจะประสบปัญหาความเข้ากันได้</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>ด้านพิกเซลกำหนดรูปร่างของพิกเซล
+อัตราส่วน 1:1 กำหนดพิกเซลสี่เหลี่ยม ค่าอื่นๆ กำหนดรูปร่างสี่เหลี่ยม
+ผู้เล่นจะปรับขนาดภาพเพื่อให้ได้ตามลักษณะที่กำหนด</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>นี่คือความกว้างที่จะจัดเก็บวิดีโอ
+ขนาดการแสดงผลจริงจะแตกต่างกันหากอัตราส่วนกว้างยาวพิกเซลไม่ใช่ 1:1</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>ลบงานออกจากคิว</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>รีเซ็ตสถานะงานที่รออยู่</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>ส่งงานกลับไปที่หน้าต่างหลักเพื่อทำการแก้ไข</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>ตั้งค่าบิตเรตเฉลี่ย
+
+อัตราบิตในทันทีอาจสูงหรือต่ำลงมาก ณ เวลาใดก็ได้
+แต่ค่าเฉลี่ยในระยะเวลานานจะเป็นค่าที่ตั้งไว้ที่นี่ ถ้าคุณต้องการ
+เพื่อจำกัดบิตเรตทันที ให้ดูการตั้งค่า vbv-bufsize และ vbv-maxrate ของ x264</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>เปิดใช้งานเอาต์พุตอัตราเฟรมคงที่</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>ตัวเข้ารหัสวิดีโอที่มีจำหน่าย</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>ปรับการตั้งค่าเพื่อปรับให้เหมาะสมสำหรับสถานการณ์ทั่วไป
+
+สามารถปรับปรุงประสิทธิภาพสำหรับคุณลักษณะแหล่งเฉพาะหรือ เซ็ท
+ลักษณะของไฟล์ที่ส่งออก การเปลี่ยนแปลงจะมีผลหลังจาก
+ที่ตั้งไว้ล่วงหน้าแต่ก่อนพารามิเตอร์อื่น ๆ ทั้งหมด</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>การตั้งค่าตัวเข้ารหัสเพิ่มเติม
+
+รายการตัวเลือกตัวเข้ารหัสที่คั่นด้วยเครื่องหมายโคลอน</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>ลดการใช้ CPU ตัวถอดรหัส
+
+ตั้งค่านี้หากอุปกรณ์ของคุณไม่สามารถเล่นเอาต์พุตได้ (เฟรมหลุด)</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>อัตราเฟรมเอาต์พุต
+
+ขอแนะนำให้ใช้ 'เหมือนกับแหล่งที่มา' หากวิดีโอต้นทางของคุณมีอัตราเฟรมที่เปลี่ยนแปลงได้ 'เหมือนกับแหล่งที่มา' จะคงไว้</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>ตั้งค่าและรับรองการปฏิบัติตามระดับที่ระบุ
+
+แทนที่การตั้งค่าอื่นๆ ทั้งหมด</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>เปิดใช้งานเอาต์พุตอัตราเฟรมแบบแปรผันด้วยอัตราสูงสุดที่กำหนดโดยการตั้งค่าอัตราเฟรม</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>ปรับการตั้งค่าตัวเข้ารหัสเพื่อแลกประสิทธิภาพการบีบอัดกับความเร็วในการเข้ารหัส
+
+สิ่งนี้กำหนดการตั้งค่าตัวเข้ารหัสเริ่มต้นของคุณ
+การปรับแต่ง โปรไฟล์ ระดับ และสตริงตัวเลือกขั้นสูงจะถูกนำไปใช้กับสิ่งนี้
+โดยทั่วไปคุณควรตั้งค่าตัวเลือกนี้ให้ช้าที่สุดที่คุณสามารถทนได้ตั้งแต่ช้ากว่า
+การตั้งค่าจะส่งผลให้ไฟล์มีคุณภาพดีขึ้นหรือมีขนาดเล็กลง</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>ตั้งค่าและรับรองการปฏิบัติตามโปรไฟล์ที่ระบุ
+
+แทนที่การตั้งค่าอื่นๆ ทั้งหมด</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Set the desired quality factor.
+The encoder targets a certain quality.
+The scale used by each video encoder is different.
+
+x264's scale is logarithmic and lower values correspond to higher quality.
+So small decreases in value will result in progressively larger increases
+in the resulting file size. A value of 0 means lossless and will result
+in a file size that is larger than the original source, unless the source
+was also lossless.
+Suggested values are: 18 to 20 for standard definition sources and 20 to 23 for high definition sources.
+
+FFMpeg's and Theora's scale is more linear.
+These encoders do not have a lossless mode.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>During the 1st pass of a 2 pass encode, use settings that speed things along.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Perform 2 Pass Encoding.
+
+The 'Bitrate' option is prerequisite. During the 1st pass, statistics about
+the video are collected. Then in the second pass, those statistics are used
+to make bitrate allocation decisions.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Enables variable framerate output.
+
+VFR is not compatible with some players.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>When HandBrake has finished the current queue or encode it will perform this action.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Browse to select a new destination path and file name for your encode.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Video angle to encode. Only applicable to multi-angle DVD and Blu-ray.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>Add a new preset.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Additional Preset Options.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Presets are groups of encode settings tailored for specific scenarios. Select the one closest matching your intent.
+ 
+ Overrides all encode settings. Settings may be further adjusted after selecting a preset.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>Remove the selected preset.</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Scan only the specified title instead of all titles.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Custom Denoise parameters.
+ 
+NLMeans syntax: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+NLMeans default: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+HQDN3D syntax: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+HQDN3D default: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Denoise filter preset. Sets the strength of the filter.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Denoise tune. Further adjusts the Denoise preset to optimize settings for specific scenarios.
+ 
+- None uses the default preset settings.
+ 
+- Film refines settings for use with most live action content.
+ 
+- Grain only processes color channels. Useful for preserving the film-like look of luminance grain while reducing or removing color noise.
+
+- High Motion reduces color smearing in high motion scenes by avoiding temporal processing for color channels. Useful for sports and action videos.
+
+- Animation is useful for cel animation such as anime and cartoons.
+
+- Tape is useful for low-detail analog tape sources such as VHS, where Film does not produce a desirable result.
+
+- Sprite is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite is not designed for high definition video.</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>Deinterlace removes comb artifacts from the picture.
+
+Yadif is a popular and fast deinterlacer.
+
+Decomb switches between multiple interpolation algorithms for speed and quality.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Custom Deinterlace parameters.
+ 
+ Yadif syntax: mode=m:parity=p
+ 
+ Yadif default: mode=3
+ 
+ Decomb syntax: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Decomb default: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Deinterlace filter preset.
+
+Default is well balanced for speed and quality.
+
+Skip Spatial Check lets Yadif skip correcting certain avoidable artifacts for a slight speed boost.
+
+EEDI2 uses a slower, higher quality interpolation algorithm for Decomb. Useful for the most difficult sources.
+
+Bob attempts to better preserve motion for a slight penalty to perceived resolution.</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>Flips (mirrors) the picture on the horizontal axis.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>Interlace Detection, when enabled, allows the Deinterlace filter to only process interlaced video frames.</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Custom Interlace Detection parameters.
+ 
+ Syntax: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+ Default: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Rotate the picture clockwise in 90 degree increments.</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>ระยะเวลาของช่วงแหล่งที่มาที่เลือกเป็น Hours:Minutes:Seconds</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>รักษาอัตราส่วนภาพ รักษาลักษณะการแสดงผลดั้งเดิมของแหล่งที่มา การปิดใช้งานนี้อาจส่งผลให้ภาพยืดหรือบีบได้</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>พารามิเตอร์ความคมกำหนดเอง
+
+ไวยากรณ์ Unsharp: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+ค่าเริ่มต้น Unsharp: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+ไวยากรณ์ Lapsharp: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+ค่าเริ่มต้น Lapsharp: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>ความคม ช่วยเพิ่มลักษณะที่ปรากฏของรายละเอียดโดยเฉพาะขอบ การตั้งค่า Sharpen ที่แรงเกินไปอาจทำให้คุณภาพของภาพเสียหายโดยการสร้างเสียงเรียกเข้าและเพิ่มนอยส์ ซึ่งสามารถลดประสิทธิภาพการบีบอัดได้
+
+Unsharp เป็นฟิลเตอร์ปิดบังไม่ชัดเอนกประสงค์ ภาพจะคมชัดขึ้นด้วยการเบลอ จากนั้นจึงคำนวณความแตกต่างระหว่างภาพเบลอกับภาพต้นฉบับ
+
+Lapsharp ลับคมโดยใช้เมล็ดแบบ Convolution ที่ใกล้เคียงกับตัวกรองขอบ Laplacian ซึ่งบางครั้งให้ผลลัพธ์คุณภาพสูงกว่าการมาส์กที่ไม่คมชัด</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>ปรับความคมชัดของตัวกรองที่ตั้งไว้ล่วงหน้า ตั้งค่าความแรงของตัวกรอง</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>ปรับจูนให้คมขึ้น ปรับค่าที่ตั้งไว้ของ Sharpen เพิ่มเติมเพื่อปรับการตั้งค่าให้เหมาะสมสำหรับสถานการณ์เฉพาะ
+
+ไม่มีใช้การตั้งค่าที่ตั้งไว้ล่วงหน้าเริ่มต้น
+
+สามารถปรับ Unsharp สำหรับการลับคมแบบ Ultrafine, Fine, Medium, Coarse หรือ Very Coarse เลือกหนึ่งรายการตามความละเอียดของภาพที่ส่งออกและความละเอียดของรายละเอียดเพื่อปรับปรุง
+
+การปรับแต่งฟิล์มของ Lapsharp จะปรับแต่งการตั้งค่าสำหรับใช้กับเนื้อหาไลฟ์แอ็กชันส่วนใหญ่ ฟิล์มใช้เคอร์เนล Laplacian แบบไอโซโทรปิกเพื่อทำให้ขอบทั้งหมดคมขึ้นในลักษณะเดียวกัน และข้อมูลความสว่าง (ความสว่าง) จะถูกทำให้คมชัดมากกว่าข้อมูลของสี (สี)
+
+การปรับแต่ง Grain ของ Lapsharp นั้นคล้ายกับ Film แต่ใช้ Laplacian แบบไอโซโทรปิกของเคอร์เนล Gaussian เพื่อลดผลกระทบต่อสัญญาณรบกวนและเกรน มีประโยชน์สำหรับถนอมเมล็ดพืชและเป็นทางเลือกทั่วไปสำหรับการปรับแต่งฟิล์ม
+
+การปรับแต่งแอนิเมชั่นของ Lapsharp มีประโยชน์สำหรับแอนิเมชั่นเซล เช่น อนิเมะและการ์ตูน แอนิเมชั่นเหมือนกับฟิล์ม แต่ความแข็งแกร่งโดยรวมลดลงเพื่อหลีกเลี่ยงการสร้างสิ่งประดิษฐ์
+
+การปรับแต่ง Sprite ของ Lapsharp มีประโยชน์สำหรับเกม 2 มิติแบบ 1-/4-/8-/16-บิต เทพดาใช้เคอร์เนล Laplacian 4 เพื่อนบ้านที่ปรับปรุงขอบแนวตั้งและแนวนอนมากกว่าขอบแนวทแยง</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>ปรับการประทับเวลาเริ่มต้นของสตรีมเสียงและวิดีโอทั้งหมดโดยแทรกเฟรมว่างหรือวางเฟรม อาจปรับปรุงการซิงค์เสียง/วิดีโอสำหรับเครื่องเล่นที่ใช้งานไม่ได้ซึ่งไม่ปฏิบัติตามรายการแก้ไข MP4.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>ตัวเลือกในการควบคุมที่ตั้งไว้ล่วงหน้า</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>จุดสิ้นสุดของช่วงนี้</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>จุดเริ่มต้นสำหรับช่วงนี้</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>เมื่อเปิดใช้งานระบบชื่ออัตโนมัติจะใช้เส้นทางเริ่มต้นเสมอ
+เมื่อปิดการใช้งาน มันจะใช้เส้นทางในกล่องปลายทางบนหน้าต่างหลักถ้ามีการเติม มิฉะนั้น จะใช้เส้นทางเริ่มต้น</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>ตัวกรองปริภูมิสี</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>ตัวกรองปรับสีให้เรียบ</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>ฟิลด์นี้สามารถรับค่า RGB เช่น: "0xFF0000" หรือชื่อสีเช่น "red" สำหรับรายการสีที่มีชื่อทั้งหมด โปรดดูเอกสารประกอบตัวกรองการเติม</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>เขียนคำบรรยายลงในสตรีมวิดีโอ
+
+หมายเหตุ สิ่งนี้จะถูกเลือกโดยอัตโนมัติหากรูปแบบไฟล์ที่ส่งออกไม่รองรับรูปแบบคำบรรยายต้นฉบับ
+
+ตัวอย่างเช่น ไม่รองรับคำบรรยาย PGS ใน MP4</value>
+ </data>
+</root>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.tr.resx -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.tr.resx Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.uk.resx Added

@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="type" type="xsd:string"/>
+ <xsd:attribute name="mimetype" type="xsd:string"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>Deblock зменшує кількість блокових артефактів, спричинених низькою якістю стиснення відео.</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>Виберіть фільтри видалення «гребінки» (decomb) чи деінтерлейсингу (deinterlace).
+
+Фільтр видалення «гребінки» вибирає для обробки тільки ті кадри, на яких помітний інтерлейсинг.
+Це дозволить зберегти якість решти кадрів.
+
+Класичний фільтр деінтерлейсингу застосовується до усіх кадрів.
+Кадри які не зазнали впливу інтерлейсингу трохи втратять якість.</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>Усунення шумів (denoise), зменшує або усуває появу шуму та зернистості. Це може підвищити ефективність стиснення даних та створити відео вищої якості при менших розмірах файлів. 
+Завеликі налаштування усунення шумів можуть погіршити якість зображення, знехтувавши деталізацією.
+ 
+NLMeans – це високоякісний фільтр усунення шумів, але не швидкий. Використовуйте там, де якість важливіша, ніж швидкість.
+ 
+HQDN3D – адаптивний низькочастотний фільтр. Він швидший, ніж NLMeans, але менш ефективний при збереженні дрібних деталей.</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>Зворотна телекінопроекція (detelecine) видаляє ефекти «гребінки», які є результатом кінопроекції, процесу перетворення частоти кадрів фільму в частоту кадрів телебачення.</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>Відтінки сірого видаляє кольоровий складову відео. Часто його називають чорно-білим відео.</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>Шлях призначення, включаючи назву каталогу та файлу. Тут буде створено ваше нове відео з вказаною назвою.</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>Додає спеціальний маркер MP4, що дозволяє відтворення на старовинних пристроях iPod 5-го покоління близько 2006 року випуску. Інші налаштування можуть впливати на сумісність.</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>Формат контейнера. Відео, аудіо та інші доріжки об'єднуються в єдиний файл цього типу. Впливає на сумісність.</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>Оптимізує MP4 для послідовного завантаження (progressive download). Після кодування дані реорганізуються та переписуються, щоб дозволити негайне відтворення через мережу, не потребуючи завантаження всього файлу.</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>Вибір діапазону джерела. За замовчуванням вибираються всі глави та кодується все джерело.</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>Заголовок, чи відеокліп для кодування.
+У джерелах Blu-ray та DVD часто є кілька заголовків, найдовший з яких, як правило, є основною частиною</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Анаморфування (Anamorphic) дозволяє вказувати довільні розміри зберігання(storage dimensions), зберігаючи початкове співвідношення сторін під час відтворення.
+
+None (Немає) — вимикає анаморфування. Розміри зберігання та розміри показу(display dimensions) будуть однаковими. Корисна лише для сумісності з деякими застарілими пристроями.
+
+Automatic (Автоматично) максимально збільшує роздільну знатність зберігання, зберігаючи співвідношення сторін показу. Рекомендовано.
+
+Loose (Вільно) схоже на Auto (Автоматично), але намагається зберегти співвідношення сторін зберігання. Це може спричинити невелику втрату роздільної здатності зберігання в порівнянні з Auto.
+
+Custom (Власне) дозволяє вручну встановлювати всі параметри. Корисно для виправлення неправильного співвідношення сторін джерела, та для професіоналів, які потребують розширеного контролю в постпродукції.</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>Автоматично обрізає чорні рамки по краях відео.</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>Обрізати відео знизу.</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>Обрізати відео з лівого боку.</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>Обрізати відео з правого боку.</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>Обрізати відео зверху.</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>Це висота, з якою буде збережено відео.
+Фактичні розміри відображення будуть відрізнятися, якщо співвідношення сторін пікселів не буде 1:1.</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>Обрізання відео вручну.</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>Вирівнює розміри збереження кратних до цього значення.
+
+Цей параметр необхідний лише для сумісності з деякими пристроями.
+Ви повинні використовувати 2, доки у вас не виникнуть проблеми з сумісністю.</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>Співвідношення сторін пікселя визначає їх форму.
+Співвідношення 1:1 відповідає квадратному пікселю. Інші значення відповідають прямокутним фігурам.
+Програвачі будуть масштабувати зображення для досягнення заданого співвідношення сторін.</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>Це ширина, з якою буде збережено відео.
+Фактичні розміри відображення будуть відрізнятися, якщо співвідношення сторін пікселів не буде 1:1.</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>Видаляє завдання з черги.</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>Скидає статус завдання на «Очікування».</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>Відправляє завдання для редагування назад у головне вікно.</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>Встановлює середній бітрейт.
+
+Миттєвий бітрейт в певний момент часу може бути набагато вищим або нижчим.
+Але середній бітрейт протягом всієї тривалості буде значенням, встановленим тут.
+Якщо вам потрібно обмежити миттєвий бітрейт, погляньте на параметри x264 vbv-bufsize та vbv-maxrate.</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>Вмикає постійну частоту кадрів (constant framerate) для виводу.</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>Доступні кодувальники відео.</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>Налаштовує параметри оптимізації для загальних сценаріїв.
+
+Це може підвищити ефективність для окремих характеристик джерела,
+або встановити характеристики вихідного файлу. Зміни будуть застосовані
+після набору, але перед усіма іншими параметрами.</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>Додаткові налаштування кодувальника.
+
+Список опцій кодувальника розділяти двокрапкою.</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>Зменшує використання ЦП декодувальником.
+
+Встановіть цей параметр, якщо ваш пристрій має проблеми з відтворенням виводу (випадання кадрів).</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>Частота кадрів виводу (FPS, або кадри в секунду).
+
+Рекомендується вибирати «Same as source» (Так само, як в джерелі). Якщо у джерела відео змінна частота кадрів – «Same as source» збереже її.</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>Встановлює та забезпечує відповідність заданому рівню.
+
+Перекриває всі інші налаштування.</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>Вмикає змінну частоту кадрів (variable framerate) для виводу, з піковим значенням, що визначається налаштуванням частоти кадрів.</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>Налаштовує параметри кодувальника, щоб встановити компроміс між ефективністю стиснення та швидкістю кодування.
+
+Цей параметр встановлює ваші параметри кодувальника за замовчуванням.
+Інші налаштування, профілі, рівні та рядок розширених опцій будуть застосовані до цих налаштувань.
+Як правило, варто встановити цю опцію в найповільніше значення, яке ви можете витримати,
+оскільки повільніші значення призводять до кращої якості або меншого розміру файлів.</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>Встановлює та забезпечує відповідність заданому профілю.
+
+Перекриває всі інші налаштування.</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>Встановіть бажаний коефіцієнт якості.
+Кодувальник намагатиметься досягнути вказаної якості.
+У кожного кодувальника своя шкала якості.
+
+Шкала для x264 є логарифмічною, а нижчі значення відповідають вищій якості.
+Невелике зменшення значення призведе до значного збільшення
+розміру вихідного файлу. Значення 0 означає якість без втрат і призведе
+до того, що розмір файлу перевищуватиме розмір джерела, хіба що
+джерело також без втрат.
+Пропоновані значення: від 18 до 20 для джерел стандартної якості, та від 20 до 23 джерел високої якості.
+
+Шкала FFMpeg і Theora є більш лінійною.
+Ці кодувальники не мають режиму без втрат.</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>Під час 1-го проходу 2-прохідного кодування використовувати параметри, які прискорюють роботу.</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>Виконує 2 проходи кодування.
+
+Необхідна опція «бітрейт». Під час 1-го проходу збирається статистика про відео.
+У другому проході ця статистика використовується для прийняття рішень щодо розподілу бітрейту.</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>Вмикає змінну частоту кадрів (variable framerate, VFR) для виводу.
+
+VFR не сумісний з деякими програвачами.</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>Коли HandBrake закінчить поточну чергу чи кодування – виконається ця дія.</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>Натисніть кнопку «Огляд», щоб вибрати для кодування новий шлях призначення та назву файлу.</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>Ракурс відео для кодування. Застосовується лише для багаторакурсних DVD та Blu-ray.</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>Додайте новий набір.</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>Додаткові параметри набору.</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>Набори – це групи наперед визначених параметрів кодування, пристосовані до конкретних сценаріїв. Виберіть найближчий до ваших намірів.
+ 
+Перевизначає усі параметри кодування. Налаштування можуть бути додатково відрегульовані після вибору набору.</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>Вилучити вибраний набір.</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>Сканує лише вказаний заголовок замість усіх заголовків.</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>Власні параметри усунення шумів.
+ 
+Синтаксис NLMeans: y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+Стандартні NLMeans: y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+Синтаксис HQDN3D: y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+Стандартні HQDN3D: y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>Попередньо встановлений фільтр усунення шумів. Встановлює потужність фільтра.</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>Настроювання усунення шумів. Додатково коригує набір усунення шумів для оптимізації налаштувань під конкретні сценарії.
+ 
+- None використовує стандартні налаштування набору.
+ 
+- Film (фільм) удосконалює налаштування для використання з більшістю кіноконтенту.
+ 
+- Grain (зерно) обробляє лише колірні канали. Корисно для збереження плівкового вигляду зі світіннями зерна при зменшенні або видаленні колірного шуму.
+
+- High Motion (висока швидкість руху) зменшує розмазування кольорів у сценах з високою швидкістю руху, уникаючи тимчасової обробки колірних каналів. Корисно для спортивних відео та бойовиків.
+
+- Animation (анімація) корисний для мальованої анімації, такої як аніме та мультфільми.
+
+- Tape (стрічка) корисний для джерел як аналогові стрічки з низькою деталізацією, таких як VHS, де Film (фільм) не дає бажаного результату.
+
+- Sprite (спрайт) корисний для 1-/4-/8-/16-бітних 2D-ігор. Sprite не призначений для відео високої чіткості.</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>Деінтерлейсинг (deinterlace) видаляє із зображення артефакти «гребінки».
+
+Yadif – популярний і швидкий деінтерлейсер.
+
+Decomb перемикається між кількома алгоритмами інтерполяції для кращої швидкості та якості.</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>Власні параметри деінтерлейсингу.
+ 
+Синтаксис Yadif: mode=m:parity=p
+ 
+Стандартні Yadif: mode=3
+ 
+Синтаксис Decomb: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+Стандартні Decomb: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>Набір фільтрів деінтерлейсингу.
+
+Стандартний (Default) добре збалансований за швидкістю та якістю.
+
+Пропуск перевірки простору (Skip Spatial Check) дозволяє Yadif пропустити виправлення певних артефактів, для невеликого збільшення швидкості.
+
+EEDI2 використовує повільніший, якісніший алгоритм інтерполяції для Decomb. Корисно для найскладніших джерел.
+
+Bob намагається краще зберегти рух, в обмін на незначне погіршення роздільної здатності.</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>Перевертає (дзеркально відображає) зображення по горизонтальній осі.</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>Виявлення інтерлейсингу (interlace detection), коли увімкнено – дозволяє фільтру деінтерлейсингу обробляти лише відеокадри з інтерлейсингом.</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>Власні параметри виявлення інтерлейсингу.
+ 
+Синтаксис: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+Стандартні: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>Обертає зображення за годинниковою стрілкою з кроком 90 градусів.</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>Тривалість діапазону вибраного джерела в години:хвилини:секунди</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>Зберігати пропорції (Keep Aspect Ratio) підтримує початкове співвідношення сторін джерела. Відключення цього налаштування може призвести до розтягування або стискання зображення.</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>Власні параметри різкості.
+
+Синтаксис Unsharp: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Стандартні Unsharp: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Синтаксис Lapsharp: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Стандартні Lapsharp: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>Збільшення різкості (sharpening) покращує зовнішній вигляд деталей, особливо по краях. Надто сильні налаштування різкості можуть погіршити якість зображення створюючи кільцеві артефакти та посилюючи шуми, це може знизити ефективність стиснення.
+
+Unsharp – це нерізкий маскувальний фільтр загального призначення. Він збільшує різкість за допомогою розмиття, розраховуючи різницю між розмитим зображенням та оригіналом.
+
+Lapsharp збільшує різкість за допомогою ядер згортки, апроксимуючи крайові фільтри Лапласа (Laplacian edge filters), іноді показує результати вищої якості, ніж Unsharp.</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>Попередньо встановлений фільтр збільшення різкості. Встановлює потужність фільтра.</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>Sharpen tune. Further adjusts the Sharpen preset to optimize settings for specific scenarios.
+
+None uses the default preset settings.
+
+Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance.
+
+Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened more than chrominance (color) information.
+
+Lapsharp's Grain tune is similar to Film, but uses an isotropic Laplacian of Gaussian kernel to reduce the effect on noise and grain. Useful for preserving grain and as a general alternative to the Film tune.
+
+Lapsharp's Animation tune is useful for cel animation such as anime and cartoons. Animation is identical to Film, but overall strength is reduced to avoid creating artifacts.
+
+Lapsharp's Sprite tune is useful for 1-/4-/8-/16-bit 2-dimensional games. Sprite uses a 4-neighbor Laplacian kernel that enhances vertical and horizontal edges more than diagonal edges.</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>Вирівнює початкові часові позначки всіх аудіо та відеопотоків, вставляючи порожні або пропускаючи кадри. Може покращити синхронізацію аудіо/відео для зламаних плеєрів, які не шанують списки редагування MP4.</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>Опції для управління наборами.</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>Кінцева точка для цього діапазону.</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>Початкова точка для цього діапазону.</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>Якщо ввімкнено, система автоматичного іменування завжди використовуватиме стандартний шлях. 
+Якщо вимкнено – буде використовувати шлях у вікні призначення у головному вікні, якщо він вказаний, інакше використовуватиме стандартний шлях.</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>Фільтр колірного простору (colourspace)</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>Chroma Smooth Filter</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>Це поле може приймати значення RGB, такі як: "0xFF0000" або назви кольорів, такі як "red" (червоний). Повний перелік назв кольорів дивіться у документації фільтру.</value>
+ </data>
+</root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.zh-Hans.resx Added

@@ -0,0 +1,516 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>去块滤波减少了由低质量视频压缩引起的块效应。</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>选择 Decomb 滤镜或反交错滤镜选项。
+
+Decomb 滤镜选择性的对出现交错扫描的单个帧进行去交错处理。
+这将保持非交错帧的质量。
+
+传统的反交错滤镜会对所有帧进行去交错处理。
+非交错的帧将遭受一些质量下降。</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>降噪可以减少或消除图像的噪点。这可以提高压缩效率，以较小的文件创建更高质量的视频。
+过强的降噪设置可能会由于丢弃细节而损坏图像质量。
+
+NLMEans 是一种高质量的降噪滤镜，速度快。在质量比速度更重要的地方使用。
+
+HQDN3D 是一种自适应的低通滤镜，比 NLMEans 更快，但在保持细节方面效果较差。</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>反交错消除经过胶卷过带处理产生的梳状横纹，胶卷过带是将胶片帧率转换为电视帧率的过程。</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>灰度消除了视频的颜色分量。通常被称为黑白视频。</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>目标路径，包括目录和文件名。这就是将创建新视频的位置，以及它的名称。</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>添加一个特殊的 MP4 标记，允许在大约 2006 年的老式 iPod 5 代设备上播放。其他设置可能会影响兼容性。</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>容器格式。视频，音频和其他轨道组合成这种类型的单个文件。 影响兼容性。</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>优化 MP4 以进行渐进式下载。编码之后，数据被重新组织和重写，以允许在网络上即时回放，而不需要下载整个文件。</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>源范围选择。 默认情况下，会选择所有章节并对整个源进行编码。</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>要编码的标题或视频剪辑。
+蓝光和DVD源通常有多个标题，通常时间最长的是正片。</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>变形允许任意存储尺寸，同时在回放期间保留原始高宽。
+
+None：禁用变形。视频存储尺寸和显示尺寸将相同。仅对与某些传统设备兼容有用。
+
+Automatic：最大化存储分辨率，同时保留原始显示宽高比。（推荐）
+
+Loose：与Auto类似，但尝试保留存储宽高比。与 Auto 相比，这可能导致轻微的存储分辨率损失。
+
+Custom：允许手动设置所有参数。 用于纠正不正确的源显示高宽以及在后期制作中需要高级控制的专业人员。</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>自动裁切视频周围的黑边。</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>从底部裁剪该视频。</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>从左侧裁剪该视频。</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>从右侧裁剪该视频。</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>从顶部裁剪该视频。</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>这是视频将会被保存的高度。
+如果像素宽高比不为1:1则实际显示尺寸将有不同。</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>手动裁剪该视频。</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>将存储尺寸与此值的倍数对齐。
+
+只有与某些设备兼容时才需要此设置。
+除非遇到兼容性问题，否则应使用2。</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>定义像素的形状。
+1:1 的比例定义正方形像素。其他值定义矩形形状。
+播放时将缩放图像以达到指定的效果。</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>这是视频将会被保存的宽度。
+如果像素宽高比不为1:1则实际显示尺寸将有不同。</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>从队列中删除该任务。</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>将任务状态重置为等待。</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>把任务发送回主界面以编辑。</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>设置平均比码率。
+
+瞬时码率在任何时间点都可以更高或更低。
+但是长时间内的平均值将是此处设定的值。
+如果您需要限制瞬时码率，请查看 x264 的 vbv-bufsize 和 vbv-maxrate 设置。</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>启用恒定帧速率输出。</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>可用的视频编码器。</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>调整设置以优化常见方案。
+
+这可以提高特定源特性或设置输出文件特性的效率。
+更改将在预设之后但在所有其他参数之前应用。</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>附加编码器设置。
+
+编码器选项列表以冒号分隔。</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>减少解码器对 CPU 的占用。
+
+当您的设备无法流畅播放输出时选择此选项（例如： 丢帧）。</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>输出帧率。
+
+建议使用“与源视频相同”。如果源视频的帧速率可变，“与源视频相同”将保留它。</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>设置并确保符合指定的级别。
+
+覆盖所有其他设置。</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>启用可变帧速率输出，峰值速率由帧速率设置决定。</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>调整编码器设置以权衡压缩效率与编码速度。
+
+这将建立默认编码器设置。
+Tunes, profiles, levels 和高级选项字符串将应用于此。
+您通常应该将此选项设置为可以承受的最慢速度，
+因为较慢的设置将导致更好的质量或更小的文件。</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>设置并确保符合指定的配置文件。
+
+覆盖所有其他设置。</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>设置所需的品质因子。
+编码器以固定的质量为目标。
+每个视频编码器使用的比例是不同的。
+
+x264 的比例是对数的，较低的值对应于较高的质量。
+因此，即使值的小幅下降也会导致文件大小逐渐增大。
+值为“0”表示无损，并且将导致文件大小大于原始源，除非源文件也是无损的。
+建议值为：标准清晰度源为 18 至 20，高清源为 20 至 23。
+
+FFMpeg 和 Theora 的比例更加线性。
+这些编码器没有无损模式。</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>会加快 2 Pass 编码的第一遍的速度，而对画质的降低非常小。</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>执行 2 Pass 编码。
+
+'Bitrate' 选项是先决条件。这种方式可以精确的得到想要的平均码率。
+2pass代表需要做2次编码，第一遍编码先分析全片，得到一个stats文件和一个mbtree文件。
+第二遍编码以这两个文件作参考分配合理的码率。</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>允许可变帧率输出。
+
+某些播放器不兼容可变帧率。</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>当 HandBrake 完成当前队列或编码时，它将执行此操作。</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>浏览来为编码文件选择一个新的目标路径和文件名称。</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>要编码的视频角度。仅适用于多角度DVD和蓝光。</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>添加新预设。</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>添加额外的预设选项。</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>预设是针对特定场景定制的一组编码设置。选择最符合您意图的一个。
+
+覆盖所有编码设置。在选择预置后，可以进一步调整设置。</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>移除选中的预设。</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>一些源可能包含一个以上的视频剪辑，或一个标题的集合。蓝光和 DVD 资源通常有多个 Titles。
+
+如果你知道你想编码的具体标题，你可以在这里输入，HandBrake 将只扫描该标题，而不是源文件中的每个标题。否则，请将该字段留空。</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>自定义降噪参数。
+ 
+NLMeans 语法：y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+NLMeans 默认值：y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+HQDN3D 语法：y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+HQDN3D 默认值：y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>降噪滤镜预设。 设置滤镜的强度。</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>降噪调优。进一步调整降噪预设以优化特定场景的设置。
+ 
+- None：使用默认预设设置。
+ 
+- Film：优化设置以用于大多数真人类型电影。
+ 
+- Grain：只处理颜色通道。有助于减少或消除颜色噪点。
+
+- High Motion：通过避免对色彩通道进行时间处理来减少高运动场景中的颜色模糊。适用于体育和动作视频。
+
+- Animation：适用于CEL动画，如动画和卡通。
+
+- Tape：对于低细节模拟磁带源非常有用，例如VHS。其中Film不会产生理想的结果。
+
+- Sprite：适用于1-/4-/8-/16-bit的2D游戏。Sprite 不是为高清视频设计的。</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>反交错从图像中删除梳状横纹。
+
+Yadif 是一种流行且快速的去交错算法。
+
+Decomb 在多种插值算法之间切换，以提高速度和质量。</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>自定义反交错参数。
+ 
+ Yadif 语法: mode=m:parity=p
+ 
+ Yadif 默认值: mode=3
+ 
+ Decomb 语法: mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Decomb 默认值: mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>反交错滤镜预设。
+
+Default 在速度和质量上都很好地平衡。
+
+Skip Spatial Check 让 Yadif 跳过纠正某些可避免的拉丝，以获得轻微的速度提升。
+
+EEDI2 为 Decomb 使用更慢、更高质量的插值算法。对于最难处理的来源很有用。
+
+Bob 运动物体边缘有锯齿，另外画面有闪烁、抖动感，文字、较细线条部分能明显感觉出来。</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>水平翻转（镜像）图像。</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>隔行扫描检测，当启用时，允许解交错滤镜仅处理逐行扫描的帧。</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>自定义交错扫描检测参数。
+ 
+ 语法: mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+ 
+ 默认值: mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>将图像顺时针旋转90度。</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>所选源范围的持续时间（小时：分钟：秒）</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>保持宽高比，保持源视频的显示比例。 禁用此功能可能会导致图片拉伸或压缩。</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>自定义锐化参数。
+
+Unsharp 语法: y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Unsharp 默认值: y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Lapsharp 语法: y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Lapsharp 默认值: y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>锐化增强图像中某一部的位细节，尤其是轮廓。过强的锐化设置可能会产生振铃效应和更多的噪点从而损害图像质量降低压缩效率。
+
+Unsharp 是一种通用的反锐化掩模滤镜。它通过将原图像进行模糊预处理，然后计算模糊图片和原始图像之间的差异来锐化。
+
+Lapsharp 使用近似拉普拉斯边缘滤镜的卷积核锐化，有时比反锐化掩模产生更高质量的效果。</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>锐化滤镜预设。 设置滤镜的强度。</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>锐化调优。进一步调整锐化预设以优化特定场景的设置。
+
+None 使用默认预设设置。
+
+Unsharp 预设可用 Ultrafine, Fine, Medium, Coarse, 或 Very Coarse 等优化方案对锐化进行调整。根据输出图像的分辨率和细节的精细度来选择。
+
+Lapsharp 预设 Film 优化设置以用于大多数实时动作内容。Film 使用各向同性拉普拉斯内核来锐化所有边缘，并且亮度（亮度）信息比色度（颜色）信息更尖锐。
+
+Lapsharp 预设 Grain 优化类似 Film，但使用高斯各向同性拉普拉斯算子来减少对噪点和纹理的影响。
+
+Lapsharp 预设 Animation 优化适用于动画和卡通片等CEL动画。Animation与Film相同，但整体强度降低，以避免产生伪影。
+
+Lapsharp 预设 Sprite 优化适用于 1-/4-/8-/16-bit 2D游戏。Sprite使用4邻域拉普拉斯算子内核，比边缘检测算子更能增强垂直和水平边缘。</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>通过插入空白帧或删除帧来对齐所有音频和视频流的初始时间戳。可以改善MP4音画不同步的问题。</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>预设控制选项。</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>此范围的终点。</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>此范围的起点。</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>启用时，自动名称系统将始终使用默认路径。
+禁用时，如果已填充，它将使用主窗口上“目标”框中的路径，否则将使用默认路径。</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>色彩空间滤镜：</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>色度平滑滤镜</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>这个字段可以接受 RGB 值，如："0xFF0000" 或颜色名称，如 "red"。关于命名颜色的完整列表，请参见 padding filter 文档。</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>将字幕烧入到视频流中。
+
+注意，如果输出文件类型中不支持源字幕轨道格式，这将被自动选择。
+
+例如，MP4 中不支持 PGS 字幕。</value>
+ </data>
+ <data name="OptionsView_PresetDisplayModes" xml:space="preserve">
+ <value>扁平 - 预置显示为一个平坦的列表。
+部分扁平 - 最后 8 个用户的预设被显示为扁平的列表，然后所有预设被显示在分类列表中。
+分类 - 所有预设都显示在每个分类的子菜单下。</value>
+ </data>
+ <data name="AudioView_AudioDefaults" xml:space="preserve">
+ <value>设置行为，决定此标签在选择新的音源或标题时如何自动添加音轨。</value>
+ </data>
+ <data name="BehavioursReload" xml:space="preserve">
+ <value>根据配置的行为刷新下面的列表。</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaults" xml:space="preserve">
+ <value>设置行为，决定此标签在选择新来源或标题时如何自动添加字幕轨道。</value>
+ </data>
+ <data name="OptionsView_SendFileToArguments" xml:space="preserve">
+ <value>以下环境变量总是被设置：
+HB_SOURCE
+HB_DESTINATION
+HB_EXIT_CODE
+
+可能的退出代码如下：
+0 : 成功
+2 : 输入参数错误
+3 : 初始化失败 
+4 : 未知错误
+5 : 读取源文件错误。
+
+请注意，错误代码是尽力而为，不一定准确。
+建议在对输出文件进行操作之前对其进行验证。</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>输出文件的格式。除了任何支持的文件系统字符外，你还可以使用任何一个占位符，当你改变标题或扫描一个源或更新某些设置时，这些占位符将被替换。</value>
+ </data>
+</root>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.zh-Hant.resx Added

@@ -0,0 +1,515 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+ 
+ <xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string"/>
+ <xsd:attribute name="type" type="xsd:string"/>
+ <xsd:attribute name="mimetype" type="xsd:string"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string"/>
+ <xsd:attribute name="name" type="xsd:string"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
+ <xsd:attribute ref="xml:space"/>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="FilterView_Deblock" xml:space="preserve">
+ <value>Deblock 可減少低品質視訊壓縮造成的塊狀瑕疵。</value>
+ </data>
+ <data name="FilterView_DecombDeinterlace" xml:space="preserve">
+ <value>選擇 Decomb 或去交錯濾鏡的選項。
+
+Decomb 濾鏡僅處理出現交錯掃描的影格。
+這可維持其他影格的畫面品質。
+
+傳統的去交錯濾鏡則一致處理所有影格。
+因此非交錯影格的品質會減損。</value>
+ </data>
+ <data name="FilterView_Denoise" xml:space="preserve">
+ <value>降噪可以減少或移除噪訊或顆粒，並有效提升壓縮效率並在更小的檔案中建立更高品質的影片。
+過強的降噪設定可能因丟棄細節而損害畫面品質。
+
+NLMeans 是個以速度為代價的高品質降噪濾鏡。僅在畫面品質比速度更重要時再使用它。
+
+HQDN3D 是個適應性的低通濾鏡，速度較 NLMeans 快，但保留精細畫質效果較差。</value>
+ </data>
+ <data name="FilterView_Detelecine" xml:space="preserve">
+ <value>Detelecine 能去除膠卷過帶（膠卷轉換為電視影格率）造成的橫紋。</value>
+ </data>
+ <data name="FilterView_Grayscale" xml:space="preserve">
+ <value>灰階會移除視訊的色彩部分，通常稱作黑白影片。</value>
+ </data>
+ <data name="MainView_Destination" xml:space="preserve">
+ <value>目的地路徑，包含目錄及檔案名稱。這是您新的影片將被建立的位置及賦予的名稱。</value>
+ </data>
+ <data name="MainView_IpodAtom" xml:space="preserve">
+ <value>加入特殊的 MP4 標記，以便相容於 2006 年左右的舊式 iPod 5 上播放。其他設定可能會影響相容性。</value>
+ </data>
+ <data name="MainView_Mux" xml:space="preserve">
+ <value>容器格式。可裝載視訊、音訊及其他軌道於單一檔案。此設定會影響相容性。</value>
+ </data>
+ <data name="MainView_Optimise" xml:space="preserve">
+ <value>將 MP4 為漸進下載最佳化。編碼後，資料會被重新編排，以允許透過網路播放，而無須先下載完整檔案。</value>
+ </data>
+ <data name="MainView_Range" xml:space="preserve">
+ <value>來源範圍選擇。預設情況下，會選擇全部章節並對整份來源進行編碼。</value>
+ </data>
+ <data name="MainView_Title" xml:space="preserve">
+ <value>要進行編碼的標題或影片片段。
+藍光及 DVD 來源通常具有多個標題，一般時間最長的是正片。</value>
+ </data>
+ <data name="PictureSettingsView_Anamorphic" xml:space="preserve">
+ <value>Anamorphic 允許任意的儲存尺寸，同時在播放時保留原始長寬比。
+
+None：停用 Anamorphic。影片的儲存尺寸與顯示尺寸相同，可保持與某些傳統裝置的相容性。
+
+Automatic：建議使用。在保留原始顯示長寬比時，最大化儲存解析度。
+
+Loose：與 Auto 相似，但會試圖保留儲存長寬比。與 Auto 相比，可能會稍微損失儲存解析度。
+
+Custom：允許手動設定所有參數。適用於矯正錯誤的顯示長寬比，以及需要進行進階後製的專業人士。</value>
+ </data>
+ <data name="PictureSettingsView_AutoCrop" xml:space="preserve">
+ <value>自動裁切影片周圍的黑邊。</value>
+ </data>
+ <data name="PictureSettingsView_CropBottom" xml:space="preserve">
+ <value>自底部裁切影片。</value>
+ </data>
+ <data name="PictureSettingsView_CropLeft" xml:space="preserve">
+ <value>自左側裁切影片。</value>
+ </data>
+ <data name="PictureSettingsView_CropRight" xml:space="preserve">
+ <value>自右側裁切影片。</value>
+ </data>
+ <data name="PictureSettingsView_CropTop" xml:space="preserve">
+ <value>自頂部裁切影片。</value>
+ </data>
+ <data name="PictureSettingsView_Height" xml:space="preserve">
+ <value>此為視訊將被儲存的高度。
+若像素並非正方形，則實際顯示尺寸會有差異。</value>
+ </data>
+ <data name="PictureSettingsView_ManualCrop" xml:space="preserve">
+ <value>手動裁切影片。</value>
+ </data>
+ <data name="PictureSettingsView_Modulus" xml:space="preserve">
+ <value>將儲存尺寸對齊為此數值的倍數。
+
+僅對於某些裝置的相容性考量才必要。
+若非有相容性問題，否則應使用 2。</value>
+ </data>
+ <data name="PictureSettingsView_PAR" xml:space="preserve">
+ <value>定義像素形狀長寬比。
+1:1 表示像素為正方形，其他數值為長方形。
+播放器將縮放影像，以達到指定的長寬比。</value>
+ </data>
+ <data name="PictureSettingsView_Width" xml:space="preserve">
+ <value>此為視訊將被儲存的寬度。
+若像素並非正方形，則實際顯示尺寸會有差異。</value>
+ </data>
+ <data name="QueueView_DeleteJob" xml:space="preserve">
+ <value>自佇列中刪除工作。</value>
+ </data>
+ <data name="QueueView_ResetJobStatus" xml:space="preserve">
+ <value>將工作狀態重設為等待中。</value>
+ </data>
+ <data name="QueueView_SendJobBack" xml:space="preserve">
+ <value>回到主畫面編輯該作業。</value>
+ </data>
+ <data name="Video_AvgBitrate" xml:space="preserve">
+ <value>設定位元速率平均值。
+
+瞬時位元速率可能遠低於或高於此數值。
+然而長時間的平均值可由此處決定。
+若需要限制瞬時位元速率，可使用 x264 的 vbv-bufsize 及 vbv-maxrate 設定。</value>
+ </data>
+ <data name="Video_ConstantFramerate" xml:space="preserve">
+ <value>啟用恆定影格率輸出。</value>
+ </data>
+ <data name="Video_Encoders" xml:space="preserve">
+ <value>可用的影片編碼器。</value>
+ </data>
+ <data name="Video_EncoderTune" xml:space="preserve">
+ <value>調整設定值以針對常見的場景最佳化。
+
+這可以提升對某些特性的來源，或設定輸出檔案特性的效率。將套用於設定檔之上，可被其他參數影響。</value>
+ </data>
+ <data name="Video_ExtraOpts" xml:space="preserve">
+ <value>額外的編碼器設定。
+
+以半形冒號區隔編碼器選項。</value>
+ </data>
+ <data name="Video_FastDecode" xml:space="preserve">
+ <value>減少解碼器的 CPU 使用率。
+
+若您的裝置在播放輸出檔時有困難（如：丟失影格）請選此項。</value>
+ </data>
+ <data name="Video_Framerate" xml:space="preserve">
+ <value>輸出的影格率。
+
+推薦「和來源相同」。若來源影片具有可變影格率，「和來源相同」將保留它。</value>
+ </data>
+ <data name="Video_Level" xml:space="preserve">
+ <value>設定並確保符合指定的等級。
+
+會覆寫所有其他設定。</value>
+ </data>
+ <data name="Video_PeakFramerate" xml:space="preserve">
+ <value>啟用可變影格率輸出，其峰值影格率由影格率設定決定。</value>
+ </data>
+ <data name="Video_Presets" xml:space="preserve">
+ <value>調整編碼器設定以權衡壓縮效率與編碼速度。
+
+以此建立預設編碼器設定。
+Tunes、profiles、levels 及其他進階選項字串亦套用於此。
+一般而言，在可允許的程度內愈慢愈好，
+因為較慢的設定會產出較高品質或較小的檔案。</value>
+ </data>
+ <data name="Video_Profile" xml:space="preserve">
+ <value>設定並確保符合指定的設定值。
+
+會覆寫所有其他設定。</value>
+ </data>
+ <data name="Video_Quality" xml:space="preserve">
+ <value>設定品質因數。
+編碼器將依此為目標品質，每種編碼器的尺度不同。
+
+x264 的尺度是對數級的，且數值越低表示更佳品質。
+因此，即使數值微幅增加，檔案大小也會逐步增大。
+數值 0 表示非破壞性壓縮，且可能導致最終檔案大小大於原始檔，
+除非來源檔亦為非破壞性壓縮品質。
+建議數值：標準畫質 18～20；高畫質 20～23。
+
+FFMpeg 及 Theora 的尺度較線性，且沒有非破壞性壓縮模式。</value>
+ </data>
+ <data name="Video_TurboFirstPass" xml:space="preserve">
+ <value>在 2 Pass 編碼的首輪，使用處理速度更快的設定值。</value>
+ </data>
+ <data name="Video_TwoPass" xml:space="preserve">
+ <value>進行 2 Pass 編碼。
+
+需使用「位元速率」選項。
+此方式將進行 2 輪編碼。
+將於首輪收集分析資料，並作為第二輪分配位元速率時的參考資料。</value>
+ </data>
+ <data name="Video_VariableFramerate" xml:space="preserve">
+ <value>啟用可變影格率輸出。
+
+某些播放器可能無法支援。</value>
+ </data>
+ <data name="MainView_WhenDone" xml:space="preserve">
+ <value>當 HandBrake 完成目前的佇列或編碼，將執行此動作。</value>
+ </data>
+ <data name="MainView_Browse" xml:space="preserve">
+ <value>瀏覽並選取輸出檔案的路徑及檔名。</value>
+ </data>
+ <data name="MainView_Angle" xml:space="preserve">
+ <value>欲編碼的影片視角。僅適用多視角 DVD 及藍光。</value>
+ </data>
+ <data name="MainView_AddPreset" xml:space="preserve">
+ <value>新增一個設定檔。</value>
+ </data>
+ <data name="MainView_PresetAdditionalOptions" xml:space="preserve">
+ <value>額外的設定檔選項。</value>
+ </data>
+ <data name="MainView_Presets" xml:space="preserve">
+ <value>設定檔是一組針對特定情況配置的編碼設定值。選擇最符合您意圖的一個。
+
+將覆寫所有編碼設定。選擇設定檔後，仍可進一步調整設定。</value>
+ </data>
+ <data name="MainView_RemovePreset" xml:space="preserve">
+ <value>移除選取的設定檔。</value>
+ </data>
+ <data name="SourceSelection_TitleSpecific" xml:space="preserve">
+ <value>有些來源可能包含多個影片片段或標題。藍光及 DVD 來源常有多個標題。
+
+您可以指定欲掃描的標題名稱。此欄位為空時 HandBrake 才會掃描來源檔中的所有標題。</value>
+ </data>
+ <data name="FilterView_CustomDenoiseParams" xml:space="preserve">
+ <value>自訂的降噪參數。
+NLMeans 語法：y-strength=y:y-origin-tune=y:y-patch-size=y:y-range=y:y-frame-count=y:y-prefilter=y:cb-strength=c:cb-origin-tune=c:cb-patch-size=c:cb-range=c:cb-frame-count=c:cb-prefilter=c:cr-strength=c:cr-origin-tune=c:cr-patch-size=c:cr-range=c:cr-frame-count=c:cr-prefilter=c:threads=t
+
+NLMeans 預設值：y-strength=6:y-origin-tune=1:y-patch-size=7:y-range=3:y-frame-count=2:y-prefilter=0:cb-strength=6:cb-origin-tune=1:cb-patch-size=7:cb-range=3:cb-frame-count=2:cb-prefilter=0
+
+HQDN3D 語法：y-spatial=y:cb-spatial=c:cr-spatial=c:y-temporal=y:cb-temporal=c:cr-temporal=c
+
+HQDN3D 預設值：y-spatial=3:cb-spatial=2:cr-spatial=2:y-temporal=2:cb-temporal=3:cr-temporal=3</value>
+ </data>
+ <data name="FilterView_DenoisePreset" xml:space="preserve">
+ <value>降噪濾鏡設定檔。設定濾鏡的強度。</value>
+ </data>
+ <data name="FilterView_DenoiseTune" xml:space="preserve">
+ <value>降噪微調。進一步調整降噪設定檔以針對特別場景最佳化。
+
+- 無：使用預設設定值。
+
+- Film：對於動作片效果更好。
+
+- Grain：僅處理彩色通道。有助於保留電影感的顆粒，同時減少彩色噪點。
+
+- Animation：適合 CEL 動畫，如動漫及卡通。
+
+- Tape：適用於 VHS 這類攝影機的磁帶來源，Film 模式對其效果不理想。
+
+- Sprite：適用於像素風格的 2D 遊戲，此模式並非設計給高畫質影片使用。</value>
+ </data>
+ <data name="FilterView_Deinterlace" xml:space="preserve">
+ <value>去交錯濾鏡可去除畫面中的橫紋。
+
+Yadif 是流行且快速的去交錯演算法。
+
+Decomb 會在多種插值演算法間切換，以提升速度及品質。</value>
+ </data>
+ <data name="FilterView_DeinterlaceCustom" xml:space="preserve">
+ <value>自訂去交錯參數。
+ 
+ Yadif 語法：mode=m:parity=p
+ 
+ Yadif 預設值：mode=3
+ 
+ Decomb 語法：mode=m:magnitude-thresh=m:variance-thresh=v:laplacian-thresh=l:dilation-thresh=d:erosion-thresh=e:noise-thresh=n:search-distance=s:postproc=p:parity=p
+ 
+ Decomb 預設值：mode=7</value>
+ </data>
+ <data name="FilterView_DeinterlacePreset" xml:space="preserve">
+ <value>去交錯濾鏡設定檔。
+
+Default 妥善平衡了處理速度及品質。
+
+Skip Spatial Check 會使 Yadif 不矯正某些可避免的瑕疵，以換取稍微快的處理速度。
+
+EEDI2 讓 Decomb 使用速度更慢，但品質更好的插值演算法。適用於很難處理的來源。
+
+Bob 會試圖保留畫面動態，然而鋸齒、抖動較明顯。</value>
+ </data>
+ <data name="FilterView_Flip" xml:space="preserve">
+ <value>水平翻轉影像（鏡像）。</value>
+ </data>
+ <data name="FilterView_InterlaceDetection" xml:space="preserve">
+ <value>當啟用交錯偵測時，去交錯濾鏡僅作用於發生畫面交錯的影格。</value>
+ </data>
+ <data name="FilterView_InterlaceDetectionCustom" xml:space="preserve">
+ <value>自訂交錯偵測參數。
+
+語法：mode=m:spatial-metric=s:motion-thresh=m:spatial-thresh=s:filter-mode=f:block-thresh=b:block-width=b:block-height=b:disable=d
+
+預設值：mode=3:spatial-metric=2:motion-thresh=1:spatial-thresh=1:filter-mode=2:block-thresh=40:block-width=16:block-height=16</value>
+ </data>
+ <data name="FilterView_Rotate" xml:space="preserve">
+ <value>對影像順時針旋轉90度。</value>
+ </data>
+ <data name="MainView_Duration" xml:space="preserve">
+ <value>來源選取範圍的時間長度（時：分：秒）</value>
+ </data>
+ <data name="PictureSettingsView_KeepAR" xml:space="preserve">
+ <value>維持長寬比與來源檔相同。關閉此功能可能導致影像被拉伸或壓扁。</value>
+ </data>
+ <data name="FilterView_CustomSharpenParams" xml:space="preserve">
+ <value>自訂銳利化參數。
+
+Unsharp 語法：y-strength=y:y-size=y:cb-strength=c:cb-size=c:cr-strength=c:cr-size=c
+
+Unsharp 預設值：y-strength=0.25:y-size=7:cb-strength=0.25:cb-size=7
+
+Lapsharp 語法：y-strength=y:y-kernel=y:cb-strength=c:cb-kernel=c:cr-strength=c:cr-kernel=c
+
+Lapsharp 預設值：y-strength=0.2:y-kernel=isolap:cb-strength=0.2:cb-kernel=isolap</value>
+ </data>
+ <data name="FilterView_Sharpen" xml:space="preserve">
+ <value>銳利化可以強化畫面中的細節，特別是邊緣輪廓。然而過度銳利化會強化噪點、造成振鈴效應，進而破壞影像品質並降低壓縮效率。
+
+Unsharp 是種通用的去銳利化遮罩濾鏡。它透過模糊畫面，並比對與原始畫面的差異來進行銳利化。
+
+Lapsharp 藉由近似拉普拉斯邊緣濾鏡的卷積核銳利化，有時能產出較 unsharp 更好的結果。</value>
+ </data>
+ <data name="FilterView_SharpenPreset" xml:space="preserve">
+ <value>銳利化濾鏡設定檔。設定濾鏡的強度。</value>
+ </data>
+ <data name="FilterView_SharpenTune" xml:space="preserve">
+ <value>銳利化微調。進一步調整銳利化設定檔以針對特別場景最佳化。
+
+無：使用預設設定值。
+
+Unsharp 可用 Ultrafine、Fine、Medium、Coarse、Very Coarse 等多種方式調整銳利化。依輸出影像的解析度、畫面精細度來選擇。
+
+Lapsharp's Film 適用大部分動作畫面。Film 使用各項同性的拉普拉斯核心來銳利化所有邊緣，並使亮度資訊比色度更為銳利。
+
+Lapsharp's Grain 與 Film 相似，惟 Grain 使用各項同性的 Laplacian of Gaussian 核心以減少噪訊及顆粒，適用於想保留畫面顆粒時。
+
+Lapsharp's Animation 適用於動漫、卡通等 CEL 動畫。Animation 與 Film 相同，僅減少強度以避免造成瑕疵。
+
+Lapsharp's Sprite 適用於像素風格的 2D 遊戲。Sprite 使用四鄰域拉普拉斯核心，比起對角邊緣，更加強化垂直與水平的邊緣。</value>
+ </data>
+ <data name="MainView_AlignAVStart" xml:space="preserve">
+ <value>藉由插入空影格或捨去影格，來對齊視訊、音訊流的初始時間戳記。可改善聲畫不同步的問題。</value>
+ </data>
+ <data name="MainView_PresetOptionsContextMenu" xml:space="preserve">
+ <value>控制設定檔的選項。</value>
+ </data>
+ <data name="MainView_EndPoint" xml:space="preserve">
+ <value>此範圍的終點。</value>
+ </data>
+ <data name="MainView_StartPoint" xml:space="preserve">
+ <value>此範圍的起始點。</value>
+ </data>
+ <data name="OptionsView_AlwaysUseDefaultPath" xml:space="preserve">
+ <value>啟用時，自動命名系統將總是使用預設路徑。
+停用時，若主視窗的目的地路徑未填寫，才會使用預設路徑。</value>
+ </data>
+ <data name="FiltersView_ColourSpace" xml:space="preserve">
+ <value>色彩空間濾鏡。</value>
+ </data>
+ <data name="FiltersView_ChromaSmooth" xml:space="preserve">
+ <value>彩度平滑濾鏡</value>
+ </data>
+ <data name="PictureSettingsView_PaddingCustomColourTooltip" xml:space="preserve">
+ <value>此欄位可允許 RGB 數值如「0xFF0000」或色彩名稱如「red」。關於色彩名稱的完整清單，請參見填充濾鏡的說明文件。</value>
+ </data>
+ <data name="SubtitlesView_BurnIn" xml:space="preserve">
+ <value>壓印字幕至視訊。
+
+注意，若輸出檔格式不支援來源字幕軌格式，此項會被自動勾選。
+例如 MP4 就無法支援 PGS 字幕。</value>
+ </data>
+ <data name="OptionsView_PresetDisplayModes" xml:space="preserve">
+ <value>完全展開：以完全展開的清單列出設定檔。
+部分展開：列出至多 8 組使用者的設定檔，其它按分類列出。
+分類：所有設定檔都收合於其分類的子選單中。</value>
+ </data>
+ <data name="AudioView_AudioDefaults" xml:space="preserve">
+ <value>設定行為以決定在選擇新來源或標題時，此分頁如何自動新增音軌。</value>
+ </data>
+ <data name="BehavioursReload" xml:space="preserve">
+ <value>依配置的行為重新整理下方清單。</value>
+ </data>
+ <data name="SubtitleView_SubtitleDefaults" xml:space="preserve">
+ <value>設定行為以決定在選擇新來源或標題時，此分頁如何自動新增字幕軌。</value>
+ </data>
+ <data name="OptionsView_SendFileToArguments" xml:space="preserve">
+ <value>總是設定下列的環境變數：
+HB_SOURCE
+HB_DESTINATION
+HB_EXIT_CODE
+
+可能的傳回值如下所示：
+0：正常退出
+2：輸入引數錯誤
+3：初始化失敗
+4：未知的錯誤
+5：讀取來源檔時發生錯誤
+
+注意，錯誤代碼可能不完全正確。
+建議校驗輸出檔案是否完好後再對其操作。</value>
+ </data>
+ <data name="Options_AdditionalFormatOptions" xml:space="preserve">
+ <value>輸出的檔案格式。除了檔案系統支援的字元外，亦可使用預留文字，將在變更標題、掃描來源或更新某些設定時自動將其替換。</value>
+ </data>
+ <data name="OptionsView_RightToleftMode" xml:space="preserve">
+ <value>對於由右至左的語言，可以從兩種模式中擇一使用。「僅有文字」只會將文字由右至左呈現；「整體使用者介面」則將所有控制項由右至左呈現。
+
+請留意，使用這些模式時使用者介面版面可能會有問題。依據不同語言，可嘗試何者效果最佳。</value>
+ </data>
+</root>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/EventArgs/EncodeCompletedEventArgs.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/EventArgs/EncodeCompletedEventArgs.cs Changed

@@ -10,15 +10,17 @@
 namespace HandBrakeWPF.Services.Encode.EventArgs
 {
 using System;
+ using System.Collections.Generic;
 
 /// <summary>
 /// Encode Progress Event Args
 /// </summary>
 public class EncodeCompletedEventArgs : EventArgs
 {
- public EncodeCompletedEventArgs(bool sucessful, Exception exception, string errorInformation, string sourceFileName, string filename, string logPath, long finalSizeInBytes)
+ public EncodeCompletedEventArgs(bool successful, Exception exception, string errorInformation, string sourceFileName, string filename, string logPath, long finalSizeInBytes, int errorCode)
 {
- this.Successful = sucessful;
+ this.Successful = successful;
+ this.ErrorCode = errorCode;
 this.Exception = exception;
 this.ErrorInformation = errorInformation;
 this.SourceFileName = sourceFileName;
@@ -27,6 +29,8 @@
 this.FinalFilesizeInBytes = finalSizeInBytes;
 }
 
+ public int ErrorCode { get; private set; }
+
 public string FileName { get; private set; }
 
 public bool Successful { get; private set; }
@@ -40,5 +44,7 @@
 public string ActivityLogPath { get; private set; }
 
 public long FinalFilesizeInBytes { get; private set; }
+
+ public List<string> OutputTracks { get; private set; }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/EncodeTaskFactory.cs Changed

@@ -9,25 +9,23 @@
 
 namespace HandBrakeWPF.Services.Encode.Factories
 {
- using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
- using System.Runtime.InteropServices;
+ using System.Text.Json;
 
 using HandBrake.Interop.Interop;
 using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.Shared;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Model;
 
 using HandBrakeWPF.Helpers;
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json.Linq;
-
 using AudioEncoder = Model.Models.AudioEncoder;
 using AudioEncoderRateType = Model.Models.AudioEncoderRateType;
 using AudioTrack = Model.Models.AudioTrack;
@@ -38,8 +36,9 @@
 using PointToPointMode = Model.Models.PointToPointMode;
 using Subtitle = HandBrake.Interop.Interop.Json.Encode.Subtitles;
 using SubtitleTrack = Model.Models.SubtitleTrack;
- using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
 using Validate = Helpers.Validate;
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+ using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 
 /// <summary>
 /// This factory takes the internal EncodeJob object and turns it into a set of JSON models
@@ -47,57 +46,32 @@
 /// </summary>
 internal class EncodeTaskFactory
 {
- // TODO make this non-static
- private static IHbFunctions hbFunctions;
-
- /// <summary>
- /// The create.
- /// </summary>
- /// <param name="job">
- /// The encode job.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- /// <param name="hbFunctionsWrapper">
- /// An instance of IHbFunctions
- /// </param>
- /// <returns>
- /// The <see cref="JsonEncodeObject"/>.
- /// </returns>
- internal static JsonEncodeObject Create(EncodeTask job, HBConfiguration configuration, IHbFunctions hbFunctionsWrapper)
+ private readonly IUserSettingService userSettingService;
+
+ public EncodeTaskFactory(IUserSettingService userSettingService)
 {
- hbFunctions = hbFunctionsWrapper;
+ this.userSettingService = userSettingService;
+ }
 
+ internal JsonEncodeObject Create(EncodeTask job, HBConfiguration configuration)
+ {
 JsonEncodeObject encode = new JsonEncodeObject
- {
- SequenceID = 0,
- Audio = CreateAudio(job),
- Destination = CreateDestination(job),
- Filters = CreateFilters(job),
- PAR = CreatePAR(job),
- Metadata = CreateMetadata(job),
- Source = CreateSource(job, configuration),
- Subtitle = CreateSubtitle(job),
- Video = CreateVideo(job, configuration)
- };
+ {
+ SequenceID = 0,
+ Audio = CreateAudio(job),
+ Destination = CreateDestination(job),
+ Filters = CreateFilters(job),
+ PAR = CreatePAR(job),
+ Metadata = CreateMetadata(job),
+ Source = CreateSource(job, configuration),
+ Subtitle = CreateSubtitle(job),
+ Video = CreateVideo(job, configuration)
+ };
 
 return encode;
 }
 
- /// <summary>
- /// The create source.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- /// <returns>
- /// The <see cref="Source"/>.
- /// </returns>
- private static Source CreateSource(EncodeTask job, HBConfiguration configuration)
+ private Source CreateSource(EncodeTask job, HBConfiguration configuration)
 {
 Range range = new Range();
 switch (job.PointToPointMode)
@@ -134,17 +108,8 @@
 };
 return source;
 }
-
- /// <summary>
- /// The create destination.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <returns>
- /// The <see cref="Destination"/>.
- /// </returns>
- private static Destination CreateDestination(EncodeTask job)
+ 
+ private Destination CreateDestination(EncodeTask job)
 {
 Destination destination = new Destination
 {
@@ -172,30 +137,12 @@
 return destination;
 }
 
- /// <summary>
- /// Create the PAR object
- /// </summary>
- /// <param name="job">
- /// The Job
- /// </param>
- /// <returns>
- /// The produced PAR object.
- /// </returns>
- private static PAR CreatePAR(EncodeTask job)
+ private PAR CreatePAR(EncodeTask job)
 {
 return new PAR { Num = job.PixelAspectX, Den = job.PixelAspectY };
 }
 
- /// <summary>
- /// The create subtitle.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <returns>
- /// The <see cref="HandBrake.Interop.Interop.Json.Encode.Subtitles"/>.
- /// </returns>
- private static Subtitle CreateSubtitle(EncodeTask job)
+ private Subtitle CreateSubtitle(EncodeTask job)
 {
 Subtitles subtitle = new Subtitles
 {
@@ -263,19 +210,7 @@
 return subtitle;
 }
 
- /// <summary>
- /// The create video.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
- /// <returns>
- /// The <see cref="Video"/>.
- /// </returns>
- private static Video CreateVideo(EncodeTask job, HBConfiguration configuration)
+ private Video CreateVideo(EncodeTask job, HBConfiguration configuration)
 {
 Video video = new Video();
 
@@ -287,7 +222,6 @@
 }
 
 video.Level = job.VideoLevel?.ShortName;
- video.Options = job.ExtraAdvancedArguments;
 video.Preset = job.VideoPreset?.ShortName;
 video.Profile = job.VideoProfile?.ShortName;
 
@@ -301,7 +235,7 @@
 
 if (job.VideoEncodeRateType == VideoEncodeRateType.ConstantQuality)
 {
- video.Quality = job.Quality;
+ video.Quality = (decimal?)job.Quality;
 }
 
 if (job.VideoEncodeRateType == VideoEncodeRateType.AverageBitrate)
@@ -311,43 +245,52 @@
 video.Turbo = job.TurboFirstPass;
 }
 
- video.QSV.Decode = SystemInfo.IsQsvAvailable && configuration.EnableQuickSyncDecoding;
+ video.QSV.Decode = HandBrakeHardwareEncoderHelper.IsQsvAvailable && configuration.EnableQuickSyncDecoding;
 
 // The use of the QSV decoder is configurable for non QSV encoders.
 if (video.QSV.Decode && job.VideoEncoder != VideoEncoder.QuickSync && job.VideoEncoder != VideoEncoder.QuickSyncH265 && job.VideoEncoder != VideoEncoder.QuickSyncH26510b)
 {
 video.QSV.Decode = configuration.UseQSVDecodeForNonQSVEnc;
 }
+ 
+ video.Options = job.ExtraAdvancedArguments;
+
+ if (HandBrakeHardwareEncoderHelper.IsQsvAvailable && (HandBrakeHardwareEncoderHelper.QsvHardwareGeneration > 6) && (job.VideoEncoder == VideoEncoder.QuickSync || job.VideoEncoder == VideoEncoder.QuickSyncH265 || job.VideoEncoder == VideoEncoder.QuickSyncH26510b))
+ {
+ if (configuration.EnableQsvLowPower && !video.Options.Contains("lowpower"))
+ {
+ video.Options = string.IsNullOrEmpty(video.Options) ? "lowpower=1" : string.Concat(video.Options, ":lowpower=1");
+ }
+ else if(!configuration.EnableQsvLowPower && !video.Options.Contains("lowpower"))
+ {
+ video.Options = string.IsNullOrEmpty(video.Options) ? "lowpower=0" : string.Concat(video.Options, ":lowpower=0");
+ }
+ }
 
 return video;
 }
 
- /// <summary>
- /// The create audio.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <returns>
- /// The <see cref="Audio"/>.
- /// </returns>
- private static Audio CreateAudio(EncodeTask job)
+ private Audio CreateAudio(EncodeTask job)
 {
 Audio audio = new Audio();
 
 List<string> copyMaskList = new List<string>();
- if (job.AllowedPassthruOptions.AudioAllowAACPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.AacPassthru));
- if (job.AllowedPassthruOptions.AudioAllowAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Ac3Passthrough));
- if (job.AllowedPassthruOptions.AudioAllowDTSHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsHDPassthrough));
- if (job.AllowedPassthruOptions.AudioAllowDTSPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsPassthrough));
- if (job.AllowedPassthruOptions.AudioAllowEAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.EAc3Passthrough));
- if (job.AllowedPassthruOptions.AudioAllowFlacPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.FlacPassthru));
- if (job.AllowedPassthruOptions.AudioAllowMP3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Mp3Passthru));
- if (job.AllowedPassthruOptions.AudioAllowTrueHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.TrueHDPassthrough));
+ if (job.AudioPassthruOptions.AudioAllowAACPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.AacPassthru));
+ if (job.AudioPassthruOptions.AudioAllowAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Ac3Passthrough));
+ if (job.AudioPassthruOptions.AudioAllowDTSHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsHDPassthrough));
+ if (job.AudioPassthruOptions.AudioAllowDTSPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.DtsPassthrough));
+ if (job.AudioPassthruOptions.AudioAllowEAC3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.EAc3Passthrough));
+ if (job.AudioPassthruOptions.AudioAllowFlacPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.FlacPassthru));
+ if (job.AudioPassthruOptions.AudioAllowMP3Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Mp3Passthru));
+ if (job.AudioPassthruOptions.AudioAllowTrueHDPass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.TrueHDPassthrough));
+ if (job.AudioPassthruOptions.AudioAllowMP2Pass) copyMaskList.Add(EnumHelper<AudioEncoder>.GetShortName(AudioEncoder.Mp2Passthru));
+
 audio.CopyMask = copyMaskList.ToArray();
 
- HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AllowedPassthruOptions.AudioEncoderFallback));
- audio.FallbackEncoder = audioEncoder.ShortName;
+ HBAudioEncoder audioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AudioPassthruOptions.AudioEncoderFallback));
+ audio.FallbackEncoder = audioEncoder?.ShortName;
+
+ Validate.NotNull(audio.FallbackEncoder, string.Format("Unrecognized audio encoder: {0} \n", job.AudioPassthruOptions.AudioEncoderFallback));
 
 audio.AudioList = new List<HandBrake.Interop.Interop.Json.Encode.AudioTrack>();
 foreach (AudioTrack item in job.AudioTracks)
@@ -358,7 +301,7 @@
 if (item.IsPassthru && (item.ScannedTrack.Codec & encoder.Id) == 0)
 {
 // We have an unsupported passthru. Rather than let libhb drop the track, switch it to the fallback.
- encoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AllowedPassthruOptions.AudioEncoderFallback));
+ encoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(job.AudioPassthruOptions.AudioEncoderFallback));
 }
 
 HBMixdown mixdown = HandBrakeEncoderHelpers.GetMixdown(item.MixDown);
@@ -396,16 +339,7 @@
 return audio;
 }
 
- /// <summary>
- /// The create filter.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <returns>
- /// The <see cref="Filters"/>.
- /// </returns>
- private static Filters CreateFilters(EncodeTask job)
+ private Filters CreateFilters(EncodeTask job)
 {
 Filters filter = new Filters
 {
@@ -417,11 +351,10 @@
 // Detelecine
 if (job.Detelecine != Detelecine.Off)
 {
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_DETELECINE, null, null, job.CustomDetelecine);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_DETELECINE, null, null, job.CustomDetelecine);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DETELECINE, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -431,11 +364,10 @@
 // Deinterlace
 if (job.DeinterlaceFilter == DeinterlaceFilter.Yadif)
 {
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_DEINTERLACE, job.DeinterlacePreset?.ShortName, null, job.CustomDeinterlaceSettings);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_DEINTERLACE, job.DeinterlacePreset?.ShortName, null, job.CustomDeinterlaceSettings);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken root = JObject.Parse(unparsedJson);
+ JsonDocument root = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DEINTERLACE, Settings = root };
 filter.FilterList.Add(filterItem);
@@ -445,11 +377,10 @@
 // Decomb
 if (job.DeinterlaceFilter == DeinterlaceFilter.Decomb)
 {
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_DECOMB, job.DeinterlacePreset?.ShortName, null, job.CustomDeinterlaceSettings);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_DECOMB, job.DeinterlacePreset?.ShortName, null, job.CustomDeinterlaceSettings);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DECOMB, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -460,11 +391,10 @@
 {
 if (job.CombDetect != CombDetect.Off)
 {
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_COMB_DETECT, EnumHelper<CombDetect>.GetShortName(job.CombDetect), null, job.CustomCombDetect);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_COMB_DETECT, EnumHelper<CombDetect>.GetShortName(job.CombDetect), null, job.CustomCombDetect);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter
 {
@@ -483,12 +413,11 @@
 ? hb_filter_ids.HB_FILTER_HQDN3D
 : hb_filter_ids.HB_FILTER_NLMEANS;
 
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)id, job.DenoisePreset.ToString().ToLower().Replace(" ", string.Empty), job.DenoiseTune.ToString().ToLower().Replace(" ", string.Empty), job.CustomDenoise);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)id, job.DenoisePreset.ToString().ToLower().Replace(" ", string.Empty), job.DenoiseTune.ToString().ToLower().Replace(" ", string.Empty), job.CustomDenoise);
 
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)id, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -502,12 +431,11 @@
 ? hb_filter_ids.HB_FILTER_LAPSHARP
 : hb_filter_ids.HB_FILTER_UNSHARP;
 
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)id, job.SharpenPreset.Key, job.SharpenTune.Key, job.SharpenCustom);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)id, job.SharpenPreset.Key, job.SharpenTune.Key, job.SharpenCustom);
 
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)id, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -517,11 +445,10 @@
 // Deblock
 if (job.DeblockPreset != null && job.DeblockPreset.Key != "off")
 {
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_DEBLOCK, job.DeblockPreset.Key, job.DeblockTune.Key, job.CustomDeblock);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_DEBLOCK, job.DeblockPreset.Key, job.DeblockTune.Key, job.CustomDeblock);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_DEBLOCK, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -530,11 +457,10 @@
 
 // CropScale Filter
 string cropSettings = string.Format("width={0}:height={1}:crop-top={2}:crop-bottom={3}:crop-left={4}:crop-right={5}", job.Width, job.Height, job.Cropping.Top, job.Cropping.Bottom, job.Cropping.Left, job.Cropping.Right);
- IntPtr cropSettingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_CROP_SCALE, null, null, cropSettings);
- string unparsedCropSettingsJson = Marshal.PtrToStringAnsi(cropSettingsPtr);
+ string unparsedCropSettingsJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_CROP_SCALE, null, null, cropSettings);
 if (!string.IsNullOrEmpty(unparsedCropSettingsJson))
 {
- JToken cropSettingsJson = JObject.Parse(unparsedCropSettingsJson);
+ JsonDocument cropSettingsJson = JsonDocument.Parse(unparsedCropSettingsJson);
 
 Filter cropScale = new Filter
 {
@@ -544,6 +470,60 @@
 filter.FilterList.Add(cropScale);
 }
 
+ // Padding Filter
+ if (job.Padding.Enabled)
+ {
+ // Calculate the new Width / Height
+ int? width = job.Width;
+ int? height = job.Height;
+ if (job.Padding.Enabled)
+ {
+ width = width + job.Padding.W;
+ height = height + job.Padding.H;
+ }
+
+ // Setup the filter.
+ string padSettings = string.Format("width={0}:height={1}:color={2}:x={3}:y={4}", width, height, job.Padding.Color, job.Padding.X, job.Padding.Y);
+ string unparsedPadSettingsJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_PAD, null, null, padSettings);
+ if (!string.IsNullOrEmpty(unparsedPadSettingsJson))
+ {
+ JsonDocument PadSettingsJson = JsonDocument.Parse(unparsedPadSettingsJson);
+
+ Filter padding = new Filter
+ {
+ ID = (int)hb_filter_ids.HB_FILTER_PAD,
+ Settings = PadSettingsJson
+ };
+ filter.FilterList.Add(padding);
+ }
+ }
+
+ // Colourspace
+ if (job.Colourspace != null && job.Colourspace.Key != "off")
+ {
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_COLORSPACE, job.Colourspace.Key, null, job.CustomColourspace);
+ if (!string.IsNullOrEmpty(unparsedJson))
+ {
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
+
+ Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_COLORSPACE, Settings = settings };
+ filter.FilterList.Add(filterItem);
+ }
+ }
+
+ if (job.ChromaSmooth != null && job.ChromaSmooth.Key != "off")
+ {
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH, job.ChromaSmooth.Key, job.ChromaSmoothTune?.Key, job.CustomChromaSmooth);
+ if (!string.IsNullOrEmpty(unparsedJson))
+ {
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
+
+ Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH, Settings = settings };
+ filter.FilterList.Add(filterItem);
+ }
+ }
+
+
 // Grayscale
 if (job.Grayscale)
 {
@@ -555,11 +535,10 @@
 if (job.Rotation != 0 || job.FlipVideo)
 {
 string rotateSettings = string.Format("angle={0}:hflip={1}", job.Rotation, job.FlipVideo ? "1" : "0");
- IntPtr settingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_ROTATE, null, null, rotateSettings);
- string unparsedJson = Marshal.PtrToStringAnsi(settingsPtr);
+ string unparsedJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_ROTATE, null, null, rotateSettings);
 if (!string.IsNullOrEmpty(unparsedJson))
 {
- JToken settings = JObject.Parse(unparsedJson);
+ JsonDocument settings = JsonDocument.Parse(unparsedJson);
 
 Filter filterItem = new Filter { ID = (int)hb_filter_ids.HB_FILTER_ROTATE, Settings = settings };
 filter.FilterList.Add(filterItem);
@@ -571,8 +550,7 @@
 int? num = null, den = null;
 if (job.Framerate != null)
 {
- IntPtr frameratePrt = Marshal.StringToHGlobalAnsi(job.Framerate.Value.ToString(CultureInfo.InvariantCulture));
- int vrate = hbFunctions.hb_video_framerate_get_from_name(frameratePrt);
+ int vrate = HandBrakeUnitConversionHelpers.GetFramerateFromName(job.Framerate.Value.ToString(CultureInfo.InvariantCulture));
 
 if (vrate > 0)
 {
@@ -582,11 +560,10 @@
 }
 
 string framerateString = num.HasValue ? string.Format("mode={0}:rate={1}/{2}", fm, num, den) : string.Format("mode={0}", fm); // filter_cfr, filter_vrate.num, filter_vrate.den
- IntPtr framerateSettingsPtr = hbFunctions.hb_generate_filter_settings_json((int)hb_filter_ids.HB_FILTER_VFR, null, null, framerateString);
- string unparsedFramerateJson = Marshal.PtrToStringAnsi(framerateSettingsPtr);
+ string unparsedFramerateJson = HandBrakeFilterHelpers.GenerateFilterSettingJson((int)hb_filter_ids.HB_FILTER_VFR, null, null, framerateString);
 if (!string.IsNullOrEmpty(unparsedFramerateJson))
 {
- JToken framerateSettings = JObject.Parse(unparsedFramerateJson);
+ JsonDocument framerateSettings = JsonDocument.Parse(unparsedFramerateJson);
 
 Filter framerateShaper = new Filter
 {
@@ -599,34 +576,27 @@
 return filter;
 }
 
- /// <summary>
- /// The create meta data.
- /// </summary>
- /// <param name="job">
- /// The job.
- /// </param>
- /// <returns>
- /// The <see cref="Metadata"/>.
- /// </returns>
- private static Metadata CreateMetadata(EncodeTask job)
+ private Metadata CreateMetadata(EncodeTask job)
 {
- Metadata metaData = new Metadata();
-
- if (job.MetaData != null)
+ if (job.MetaData != null && job.MetaData.PassthruMetadataEnabled)
 {
- metaData.Artist = job.MetaData.Artist;
- metaData.Album = job.MetaData.Album;
- metaData.AlbumArtist = job.MetaData.AlbumArtist;
- metaData.Comment = job.MetaData.Comment;
- metaData.Composer = job.MetaData.Composer;
- metaData.Description = job.MetaData.Description;
- metaData.Genre = job.MetaData.Genre;
- metaData.LongDescription = job.MetaData.LongDescription;
- metaData.Name = job.MetaData.Name;
- metaData.ReleaseDate = job.MetaData.ReleaseDate;
+ Metadata metaData = new Metadata
+ {
+ Artist = job.MetaData.Artist,
+ Album = job.MetaData.Album,
+ AlbumArtist = job.MetaData.AlbumArtist,
+ Comment = job.MetaData.Comment,
+ Composer = job.MetaData.Composer,
+ Description = job.MetaData.Description,
+ Genre = job.MetaData.Genre,
+ LongDescription = job.MetaData.LongDescription,
+ Name = job.MetaData.Name,
+ ReleaseDate = job.MetaData.ReleaseDate
+ };
+ return metaData;
 }
 
- return metaData;
+ return new Metadata(); // Empty Metadata will not pass through to the destination. 
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/VideoPresetFactory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Factories/VideoPresetFactory.cs Changed

@@ -70,32 +70,22 @@
         {
             switch (shortName)
             {
-                case "losslesshp":
-                    return "High Performance Lossless";
-                case "lossless":
-                    return "Lossless";
-                case "llhp":
-                    return "High Performance Low Latency";
-                case "llhq":
-                    return "High Quality Low Latency";
-                case "ll":
-                    return "Low Latency";
-                case "bd":
-                    return "Bluray Disk";
-                case "hq":
-                    return "High Quality";
-                case "hp":
-                    return "High Performance";
+                case "fastest":
+                    return "Fastest";
+                case "faster":
+                    return "Faster";
                 case "fast":
                     return "Fast";
                 case "medium":
                     return "Medium";
                 case "slow":
                     return "Slow";
-                case "default":
-                    return "Default";
+                case "slower":
+                    return "Slower";
+                case "slowest":
+                    return "Slowest";
                 case null:
-                    return "Automatic";
+                    return "Medium";
             }
 
             return shortName;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Interfaces/IEncode.cs Changed

@@ -11,7 +11,7 @@
 {
 using System;
 
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model;
 
 using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
 using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
@@ -26,7 +26,7 @@
 /// <param name="e">
 /// The EncodeProgressEventArgs.
 /// </param>
- public delegate void EncodeProgessStatus(object sender, EncodeProgressEventArgs e);
+ public delegate void EncodeProgressStatus(object sender, EncodeProgressEventArgs e);
 
 /// <summary>
 /// Encode Progress Status
@@ -57,7 +57,7 @@
 /// <summary>
 /// Encode process has progressed
 /// </summary>
- event EncodeProgessStatus EncodeStatusChanged;
+ event EncodeProgressStatus EncodeStatusChanged;
 
 /// <summary>
 /// Gets a value indicating whether IsEncoding.
@@ -65,9 +65,9 @@
 bool IsEncoding { get; }
 
 /// <summary>
- /// Gets a value indicating whether is pasued.
+ /// Gets a value indicating whether is paused.
 /// </summary>
- bool IsPasued { get; }
+ bool IsPaused { get; }
 
 /// <summary>
 /// Start with a LibHb EncodeJob Object

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/LibEncode.cs Changed

@@ -11,62 +11,64 @@
 {
 using System;
 using System.Diagnostics;
+ using System.Globalization;
 using System.IO;
 
- using HandBrake.Interop.Interop.EventArgs;
 using HandBrake.Interop.Interop.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.EventArgs;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.State;
- using HandBrake.Interop.Interop.Providers.Interfaces;
- using HandBrake.Interop.Model;
 
 using HandBrakeWPF.Exceptions;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Encode.Factories;
+ using HandBrakeWPF.Services.Encode.Interfaces;
 using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.Interfaces;
+ using HandBrakeWPF.Utilities;
 
 using EncodeTask = Model.EncodeTask;
 using HandBrakeInstanceManager = Instance.HandBrakeInstanceManager;
 using IEncode = Interfaces.IEncode;
- using ILog = Logging.Interfaces.ILog;
 using LogService = Logging.LogService;
 
- /// <summary>
- /// LibHB Implementation of IEncode
- /// </summary>
- public class LibEncode : EncodeBase, IEncode
+ public class LibEncode : IEncode
 {
- #region Private Variables
+ private readonly IUserSettingService userSettingService;
+ private readonly ILogInstanceManager logInstanceManager;
+ private readonly IPortService portService;
+ private readonly object portLock = new object();
+ private readonly EncodeTaskFactory encodeTaskFactory;
+ private ILog encodeLogService;
 
- private readonly ILog log;
- private readonly IHbFunctionsProvider hbFunctionsProvider;
 private IEncodeInstance instance;
 private DateTime startTime;
 private EncodeTask currentTask;
- private HBConfiguration currentConfiguration;
 private bool isPreviewInstance;
-
- #endregion
-
- public LibEncode(IHbFunctionsProvider hbFunctionsProvider, ILog logService) : base(logService)
+ private bool isLoggingInitialised;
+ private bool isEncodeComplete;
+ private int encodeCounter;
+ 
+ public LibEncode(IUserSettingService userSettingService, ILogInstanceManager logInstanceManager, int encodeCounter, IPortService portService)
 {
- this.log = logService;
- this.hbFunctionsProvider = hbFunctionsProvider;
+ this.userSettingService = userSettingService;
+ this.logInstanceManager = logInstanceManager;
+ this.encodeCounter = encodeCounter;
+ this.portService = portService;
+ this.encodeTaskFactory = new EncodeTaskFactory(this.userSettingService);
 }
 
- /// <summary>
- /// Gets a value indicating whether is pasued.
- /// </summary>
- public bool IsPasued { get; private set; }
-
- /// <summary>
- /// Start with a LibHb EncodeJob Object
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
+ public event EventHandler EncodeStarted;
+
+ public event EncodeCompletedStatus EncodeCompleted;
+
+ public event EncodeProgressStatus EncodeStatusChanged;
+
+ public bool IsPaused { get; private set; }
+
+ public bool IsEncoding { get; protected set; }
+
 public void Start(EncodeTask task, HBConfiguration configuration, string basePresetName)
 {
 try
@@ -80,12 +82,18 @@
 // Setup
 this.startTime = DateTime.Now;
 this.currentTask = task;
- this.currentConfiguration = configuration;
-
- // Create a new HandBrake instance
- // Setup the HandBrake Instance
- this.log.Reset(); // Reset so we have a clean log for the start of the encode.
+ this.isPreviewInstance = task.IsPreviewEncode;
 
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled))
+ {
+ this.InitLogging(task.Destination);
+ }
+ else
+ {
+ this.encodeLogService = this.logInstanceManager.ApplicationLogInstance;
+ this.encodeLogService.Reset();
+ }
+ 
 if (this.instance != null)
 {
 // Cleanup
@@ -108,19 +116,26 @@
 this.TimedLogMessage(string.Format("base preset: {0}", basePresetName));
 }
 
- this.instance = task.IsPreviewEncode ? HandBrakeInstanceManager.GetPreviewInstance(configuration.Verbosity, configuration) : HandBrakeInstanceManager.GetEncodeInstance(configuration.Verbosity, configuration);
- 
- this.instance.EncodeCompleted += this.InstanceEncodeCompleted;
- this.instance.EncodeProgress += this.InstanceEncodeProgress;
+ int verbosity = this.userSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity);
 
- this.IsEncoding = true;
- this.isPreviewInstance = task.IsPreviewEncode;
+ // Prevent port stealing if multiple jobs start at the same time.
+ lock (this.portLock) 
+ {
+ this.instance = task.IsPreviewEncode ? HandBrakeInstanceManager.GetPreviewInstance(verbosity, this.userSettingService) : HandBrakeInstanceManager.GetEncodeInstance(verbosity, configuration, this.encodeLogService, this.userSettingService, this.portService);
+
+ this.instance.EncodeCompleted += this.InstanceEncodeCompleted;
+ this.instance.EncodeProgress += this.InstanceEncodeProgress;
 
- // Verify the Destination Path Exists, and if not, create it.
- this.VerifyEncodeDestinationPath(task);
+ this.IsEncoding = true;
 
- // Get an EncodeJob object for the Interop Library
- this.instance.StartEncode(EncodeTaskFactory.Create(task, configuration, hbFunctionsProvider.GetHbFunctionsWrapper()));
+ // Verify the Destination Path Exists, and if not, create it.
+ this.VerifyEncodeDestinationPath(task);
+
+ // Get an EncodeJob object for the Interop Library
+ JsonEncodeObject work = this.encodeTaskFactory.Create(task, configuration);
+
+ this.instance.StartEncode(work);
+ }
 
 // Fire the Encode Started Event
 this.InvokeEncodeStarted(System.EventArgs.Empty);
@@ -130,39 +145,30 @@
 this.IsEncoding = false;
 
 this.ServiceLogMessage("Failed to start encoding ..." + Environment.NewLine + exc);
- this.InvokeEncodeCompleted(new EventArgs.EncodeCompletedEventArgs(false, exc, "Unable to start encoding", this.currentTask.Source, this.currentTask.Destination, null, 0));
+ this.InvokeEncodeCompleted(new EventArgs.EncodeCompletedEventArgs(false, exc, "Unable to start encoding", this.currentTask.Source, this.currentTask.Destination, null, 0, 3));
 }
 }
 
- /// <summary>
- /// Pause the currently running encode.
- /// </summary>
 public void Pause()
 {
 if (this.instance != null)
 {
 this.instance.PauseEncode();
 this.ServiceLogMessage("Encode Paused");
- this.IsPasued = true;
+ this.IsPaused = true;
 }
 }
 
- /// <summary>
- /// Resume the currently running encode.
- /// </summary>
 public void Resume()
 {
 if (this.instance != null)
 {
 this.instance.ResumeEncode();
 this.ServiceLogMessage("Encode Resumed");
- this.IsPasued = false;
+ this.IsPaused = false;
 }
 }
 
- /// <summary>
- /// Kill the process
- /// </summary>
 public void Stop()
 {
 try
@@ -184,38 +190,41 @@
 {
 if (this.currentTask != null)
 {
- EncodeTask task = new EncodeTask(this.currentTask); // Decouple our current copy.
+ EncodeTask task = new EncodeTask(this.currentTask); // Shallow copy our current instance.
 return task;
 }
 
 return null;
 }
 
- #region HandBrakeInstance Event Handlers.
-
- /// <summary>
- /// Service Log Message.
- /// </summary>
- /// <param name="message">Log message content</param>
 protected void ServiceLogMessage(string message)
 {
- this.log.LogMessage(string.Format("{0}# {1}{0}", Environment.NewLine, message));
+ this.encodeLogService.LogMessage(string.Format("{1} # {0}{1}", message, Environment.NewLine));
 }
 
 protected void TimedLogMessage(string message)
 {
- this.log.LogMessage(string.Format("{0} {1}", DateTime.Now.ToString("hh:mm:ss"), message));
+ this.encodeLogService.LogMessage(string.Format("{0} {1}", DateTime.Now.ToString("HH:mm:ss"), message));
+ }
+
+ private void InvokeEncodeStatusChanged(EventArgs.EncodeProgressEventArgs e)
+ {
+ EncodeProgressStatus handler = this.EncodeStatusChanged;
+ handler?.Invoke(this, e);
+ }
+
+ private void InvokeEncodeCompleted(EventArgs.EncodeCompletedEventArgs e)
+ {
+ EncodeCompletedStatus handler = this.EncodeCompleted;
+ handler?.Invoke(this, e);
+ }
+
+ private void InvokeEncodeStarted(System.EventArgs e)
+ {
+ EventHandler handler = this.EncodeStarted;
+ handler?.Invoke(this, e);
 }
 
- /// <summary>
- /// Encode Progress Event Handler
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The Interop.EncodeProgressEventArgs.
- /// </param>
 private void InstanceEncodeProgress(object sender, EncodeProgressEventArgs e)
 {
 EventArgs.EncodeProgressEventArgs args = new EventArgs.EncodeProgressEventArgs
@@ -234,30 +243,50 @@
 
 this.InvokeEncodeStatusChanged(args);
 }
-
- /// <summary>
- /// Encode Completed Event Handler
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
+ 
 private void InstanceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
 {
 this.IsEncoding = false;
- this.ServiceLogMessage("Encode Completed ...");
- 
+
+ if (this.isEncodeComplete)
+ {
+ return; // Prevent phantom events bubbling up the stack. 
+ }
+
+ this.isEncodeComplete = true;
+
+ string completeMessage = "Job Completed!";
+ switch (e.Error)
+ {
+ case 0:
+ break;
+ case 1:
+ completeMessage = "Job Cancelled!";
+ break;
+ case 2:
+ completeMessage = string.Format("Job Failed. Check log and input settings ({0})", e.Error);
+ break;
+ case 3:
+ completeMessage = string.Format("Job Failed to Initialise. Check log and input settings ({0})", e.Error);
+ break;
+ default:
+ completeMessage = string.Format("Job Failed ({0})", e.Error);
+ break;
+ }
+ 
+ this.ServiceLogMessage(completeMessage);
+
 // Handling Log Data 
- string hbLog = this.ProcessLogs(this.currentTask.Destination, this.isPreviewInstance, this.currentConfiguration);
+ string hbLog = this.ProcessLogs(this.currentTask.Destination);
 long filesize = this.GetFilesize(this.currentTask.Destination);
 
 // Raise the Encode Completed Event.
 this.InvokeEncodeCompleted(
- e.Error
- ? new EventArgs.EncodeCompletedEventArgs(false, null, string.Empty, this.currentTask.Source, this.currentTask.Destination, hbLog, filesize)
- : new EventArgs.EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Source, this.currentTask.Destination, hbLog, filesize));
+ e.Error != 0
+ ? new EventArgs.EncodeCompletedEventArgs(false, null, e.Error.ToString(), this.currentTask.Source, this.currentTask.Destination, hbLog, filesize, e.Error)
+ : new EventArgs.EncodeCompletedEventArgs(true, null, string.Empty, this.currentTask.Source, this.currentTask.Destination, hbLog, filesize, e.Error));
+
+ this.logInstanceManager.Deregister(Path.GetFileName(hbLog));
 }
 
 private long GetFilesize(string destination)
@@ -280,6 +309,101 @@
 return 0;
 }
 
- #endregion
+ private void InitLogging(string destination)
+ {
+ if (!this.isLoggingInitialised)
+ {
+ string logType = this.isPreviewInstance ? "preview" : "encode";
+ string destinationFile = Path.GetFileNameWithoutExtension(destination);
+ string logFileName = string.Format("{0}_{1}_{2}.txt", destinationFile, logType, DateTime.Now.ToString(CultureInfo.InvariantCulture).Replace("/", ".").Replace(":", "-"));
+ string fullLogPath = Path.Combine(DirectoryUtilities.GetLogDirectory(), logFileName);
+
+ this.encodeLogService = new LogService();
+ this.encodeLogService.ConfigureLogging(logFileName, fullLogPath);
+ this.encodeLogService.SetId(this.encodeCounter);
+ this.logInstanceManager.Register(logFileName, this.encodeLogService, false);
+ this.isLoggingInitialised = true;
+ }
+ }
+
+ private string ProcessLogs(string destination)
+ {
+ try
+ {
+ string logDir = DirectoryUtilities.GetLogDirectory();
+ string filename = this.encodeLogService.FileName;
+ string logContent = this.encodeLogService.GetFullLog();
+
+ // Make sure the log directory exists.
+ if (!Directory.Exists(logDir))
+ {
+ Directory.CreateDirectory(logDir);
+ }
+
+ // Copy the Log to HandBrakes log folder in the users application data folder.
+ // Only needed for process isolation mode. Worker will handle it's own logging.
+ if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled))
+ {
+ string logType = this.isPreviewInstance ? "preview" : "encode";
+ string destinationFile = Path.GetFileNameWithoutExtension(destination);
+ string logFileName = string.Format("{0}_{1}_{2}.txt", destinationFile, logType, DateTime.Now.ToString(CultureInfo.InvariantCulture).Replace("/", ".").Replace(":", "-"));
+ this.WriteFile(logContent, Path.Combine(logDir, logFileName));
+ filename = logFileName;
+ }
+
+ // Save a copy of the log file in the same location as the encode.
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo))
+ {
+ this.WriteFile(logContent, Path.Combine(Path.GetDirectoryName(destination), filename));
+ }
+
+ // Save a copy of the log file to a user specified location
+ if (Directory.Exists(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory)) && this.userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory))
+ {
+ this.WriteFile(logContent, Path.Combine(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory), filename));
+ }
+
+ return Path.Combine(logDir, filename);
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc); // This exception doesn't warrant user interaction, but it should be logged
+ }
+
+ return null;
+ }
+
+ private void VerifyEncodeDestinationPath(EncodeTask task)
+ {
+ // Make sure the path exists, attempt to create it if it doesn't
+ try
+ {
+ string path = Directory.GetParent(task.Destination).ToString();
+ if (!Directory.Exists(path))
+ {
+ Directory.CreateDirectory(path);
+ }
+ }
+ catch (Exception exc)
+ {
+ throw new GeneralApplicationException(
+ "Unable to create directory for the encoded output.", "Please verify that you have a valid path.", exc);
+ }
+ }
+
+ private void WriteFile(string content, string fileName)
+ {
+ try
+ {
+ using (StreamWriter fileWriter = new StreamWriter(fileName) { AutoFlush = true })
+ {
+ fileWriter.Write(content);
+ }
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/EncodeTask.cs Changed

@@ -11,15 +11,14 @@
 {
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+ using System.Threading;
 
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
 using HandBrakeWPF.Model.Filters;
 using HandBrakeWPF.Services.Encode.Model.Models;
 
- using Newtonsoft.Json;
-
 using AllowedPassthru = Models.AllowedPassthru;
 using AudioTrack = Models.AudioTrack;
 using ChapterMarker = Models.ChapterMarker;
@@ -29,6 +28,8 @@
 using OutputFormat = Models.OutputFormat;
 using PointToPointMode = Models.PointToPointMode;
 using SubtitleTrack = Models.SubtitleTrack;
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+ using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
 using VideoLevel = Models.Video.VideoLevel;
 using VideoPreset = Models.Video.VideoPreset;
 using VideoProfile = Models.Video.VideoProfile;
@@ -42,41 +43,48 @@
 this.AudioTracks = new ObservableCollection<AudioTrack>();
 this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
 this.ChapterNames = new ObservableCollection<ChapterMarker>();
- this.AllowedPassthruOptions = new AllowedPassthru();
- this.Modulus = 16;
+ this.AudioPassthruOptions = new AllowedPassthru();
 this.MetaData = new MetaData();
-
+ this.Padding = new PaddingFilter();
 this.VideoTunes = new List<VideoTune>();
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="EncodeTask"/> class. 
- /// Copy Constructor
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
 public EncodeTask(EncodeTask task)
 {
- this.AllowedPassthruOptions = new AllowedPassthru(task.AllowedPassthruOptions);
- this.Anamorphic = task.Anamorphic;
+ /* Source */
+ this.Source = task.Source;
+ this.StartPoint = task.StartPoint;
+ this.Title = task.Title;
 this.Angle = task.Angle;
+ this.EndPoint = task.EndPoint;
+ this.PointToPointMode = task.PointToPointMode;
 
+ /* Audio */
+ this.AudioPassthruOptions = new AllowedPassthru(task.AudioPassthruOptions);
 this.AudioTracks = new ObservableCollection<AudioTrack>();
 foreach (AudioTrack track in task.AudioTracks)
 {
 this.AudioTracks.Add(new AudioTrack(track, true));
 }
 
+ /* Chapters */
 this.ChapterNames = new ObservableCollection<ChapterMarker>();
 foreach (ChapterMarker track in task.ChapterNames)
 {
 this.ChapterNames.Add(new ChapterMarker(track));
 }
 
- this.AlignAVStart = task.AlignAVStart;
+ this.IncludeChapterMarkers = task.IncludeChapterMarkers;
 this.ChapterMarkersFilePath = task.ChapterMarkersFilePath;
- this.Cropping = new Cropping(task.Cropping);
+
+ /* Subtitles */
+ this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
+ foreach (SubtitleTrack subtitleTrack in task.SubtitleTracks)
+ {
+ this.SubtitleTracks.Add(new SubtitleTrack(subtitleTrack));
+ }
+
+ /* Filter Settings */
 this.CustomDeinterlaceSettings = task.CustomDeinterlaceSettings;
 this.CustomDenoise = task.CustomDenoise;
 this.CustomDetelecine = task.CustomDetelecine;
@@ -92,405 +100,230 @@
 this.DenoiseTune = task.DenoiseTune;
 this.Destination = task.Destination;
 this.Detelecine = task.Detelecine;
- this.FlipVideo = task.FlipVideo;
- this.Rotation = task.Rotation;
 this.Sharpen = task.Sharpen;
 this.SharpenPreset = task.SharpenPreset;
 this.SharpenTune = task.SharpenTune;
 this.SharpenCustom = task.SharpenCustom;
+ this.Colourspace = task.Colourspace;
+ this.CustomColourspace = task.CustomColourspace;
+ this.ChromaSmooth = task.ChromaSmooth;
+ this.ChromaSmoothTune = task.ChromaSmoothTune;
+ this.CustomChromaSmooth = task.CustomChromaSmooth;
+ this.Grayscale = task.Grayscale;
 
+ /* Picture Settings*/
 this.DisplayWidth = task.DisplayWidth;
- this.EndPoint = task.EndPoint;
- this.Framerate = task.Framerate;
- this.FramerateMode = task.FramerateMode;
- this.Grayscale = task.Grayscale;
- this.HasCropping = task.HasCropping;
- this.Height = task.Height;
- this.IncludeChapterMarkers = task.IncludeChapterMarkers;
- this.IPod5GSupport = task.IPod5GSupport;
- this.KeepDisplayAspect = task.KeepDisplayAspect;
 this.MaxHeight = task.MaxHeight;
 this.MaxWidth = task.MaxWidth;
- this.Modulus = task.Modulus;
- this.OptimizeMP4 = task.OptimizeMP4;
- this.OutputFormat = task.OutputFormat;
+ this.Width = task.Width;
+ this.Height = task.Height;
+ this.AllowUpscaling = task.AllowUpscaling;
+ this.OptimalSize = task.OptimalSize;
+ this.HasCropping = task.HasCropping;
 this.PixelAspectX = task.PixelAspectX;
 this.PixelAspectY = task.PixelAspectY;
- this.PointToPointMode = task.PointToPointMode;
- this.Quality = task.Quality;
- this.Source = task.Source;
- this.StartPoint = task.StartPoint;
-
- this.SubtitleTracks = new ObservableCollection<SubtitleTrack>();
- foreach (SubtitleTrack subtitleTrack in task.SubtitleTracks)
- {
- this.SubtitleTracks.Add(new SubtitleTrack(subtitleTrack));
- }
+ this.Cropping = new Cropping(task.Cropping);
+ this.Padding = new PaddingFilter(task.Padding);
+ this.FlipVideo = task.FlipVideo;
+ this.Rotation = task.Rotation;
+ this.Anamorphic = task.Anamorphic;
+ this.KeepDisplayAspect = task.KeepDisplayAspect;
 
- this.Title = task.Title;
+ /* Video */
+ this.Quality = task.Quality;
+ this.Framerate = task.Framerate;
+ this.FramerateMode = task.FramerateMode;
 this.TurboFirstPass = task.TurboFirstPass;
 this.TwoPass = task.TwoPass;
 this.VideoBitrate = task.VideoBitrate;
 this.VideoEncoder = task.VideoEncoder;
 this.VideoEncodeRateType = task.VideoEncodeRateType;
- this.Width = task.Width;
-
 this.VideoLevel = task.VideoLevel;
 this.VideoProfile = task.VideoProfile;
 this.VideoPreset = task.VideoPreset;
 this.VideoTunes = new List<VideoTune>(task.VideoTunes);
 this.ExtraAdvancedArguments = task.ExtraAdvancedArguments;
 
+ /* Container */
+ this.IPod5GSupport = task.IPod5GSupport;
+ this.OutputFormat = task.OutputFormat;
+ this.OptimizeMP4 = task.OptimizeMP4;
+ this.AlignAVStart = task.AlignAVStart;
+
+ /* Other */
 this.MetaData = new MetaData(task.MetaData);
 }
 
- #region Source
+ /* Source */
 
- /// <summary>
- /// Gets or sets Source.
- /// </summary>
 public string Source { get; set; }
 
- /// <summary>
- /// Gets or sets Title.
- /// </summary>
 public int Title { get; set; }
 
- /// <summary>
- /// Gets or sets the Angle
- /// </summary>
 public int Angle { get; set; }
 
- /// <summary>
- /// Gets or sets PointToPointMode.
- /// </summary>
 public PointToPointMode PointToPointMode { get; set; }
 
- /// <summary>
- /// Gets or sets StartPoint.
- /// </summary>
 public long StartPoint { get; set; }
 
- /// <summary>
- /// Gets or sets EndPoint.
- /// </summary>
 public long EndPoint { get; set; }
 
- #endregion
-
- #region Destination
+ /* Destination */
 
- /// <summary>
- /// Gets or sets Destination.
- /// </summary>
 public string Destination { get; set; }
 
- #endregion
+ /* Output Settings */
 
- #region Output Settings
-
- /// <summary>
- /// Gets or sets OutputFormat.
- /// </summary>
 public OutputFormat OutputFormat { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether Optimize.
- /// </summary>
 public bool OptimizeMP4 { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether IPod5GSupport.
- /// </summary>
 public bool IPod5GSupport { get; set; }
 
 public bool AlignAVStart { get; set; }
+ 
+ /* Picture Settings */
 
- #endregion
-
- #region Picture
-
- /// <summary>
- /// Gets or sets Width.
- /// </summary>
 public int? Width { get; set; }
 
- /// <summary>
- /// Gets or sets Height.
- /// </summary>
 public int? Height { get; set; }
 
- /// <summary>
- /// Gets or sets MaxWidth.
- /// </summary>
 public int? MaxWidth { get; set; }
 
- /// <summary>
- /// Gets or sets MaxHeight.
- /// </summary>
 public int? MaxHeight { get; set; }
 
- /// <summary>
- /// Gets or sets Cropping.
- /// </summary>
 public Cropping Cropping { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether HasCropping.
- /// </summary>
 public bool HasCropping { get; set; }
 
- /// <summary>
- /// Gets or sets Anamorphic.
- /// </summary>
 public Anamorphic Anamorphic { get; set; }
 
- /// <summary>
- /// Gets or sets DisplayWidth.
- /// </summary>
 public double? DisplayWidth { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether KeepDisplayAspect.
- /// </summary>
 public bool KeepDisplayAspect { get; set; }
 
- /// <summary>
- /// Gets or sets PixelAspectX.
- /// </summary>
 public int PixelAspectX { get; set; }
 
- /// <summary>
- /// Gets or sets PixelAspectY.
- /// </summary>
 public int PixelAspectY { get; set; }
+ 
+ public bool AllowUpscaling { get; set; }
 
- /// <summary>
- /// Gets or sets Modulus.
- /// </summary>
- public int? Modulus { get; set; }
+ public bool OptimalSize { get; set; }
 
- #endregion
+ /* Filters */
 
- #region Filters
-
- /// <summary>
- /// Gets or sets Deinterlace Filter Mode
- /// </summary>
 public DeinterlaceFilter DeinterlaceFilter { get; set; }
 
- /// <summary>
- /// Gets or sets Deinterlace.
- /// </summary>
 public HBPresetTune DeinterlacePreset { get; set; }
 
- /// <summary>
- /// Gets or sets the comb detect.
- /// </summary>
 public CombDetect CombDetect { get; set; }
 
- /// <summary>
- /// Gets or sets CustomDecomb.
- /// </summary>
 public string CustomDeinterlaceSettings { get; set; }
 
- /// <summary>
- /// Gets or sets the custom comb detect.
- /// </summary>
 public string CustomCombDetect { get; set; }
 
- /// <summary>
- /// Gets or sets Detelecine.
- /// </summary>
 public Detelecine Detelecine { get; set; }
 
- /// <summary>
- /// Gets or sets CustomDetelecine.
- /// </summary>
 public string CustomDetelecine { get; set; }
 
- /// <summary>
- /// Gets or sets Denoise.
- /// </summary>
 public Denoise Denoise { get; set; }
 
- /// <summary>
- /// Gets or sets the denoise preset.
- /// </summary>
 public DenoisePreset DenoisePreset { get; set; }
 
- /// <summary>
- /// Gets or sets the denoise tune.
- /// </summary>
 public DenoiseTune DenoiseTune { get; set; }
 
- /// <summary>
- /// Gets or sets CustomDenoise.
- /// </summary>
 public string CustomDenoise { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether Grayscale.
- /// </summary>
 public bool Grayscale { get; set; }
 
- /// <summary>
- /// Rotate the Video by x Degrees
- /// </summary>
 public int Rotation { get; set; }
 
- /// <summary>
- /// Flip the video.
- /// </summary>
 public bool FlipVideo { get; set; }
 
 public Sharpen Sharpen { get; set; }
+
 public FilterPreset SharpenPreset { get; set; }
+
 public FilterTune SharpenTune { get; set; }
+
 public string SharpenCustom { get; set; }
 
 public FilterPreset DeblockPreset { get; set; }
+
 public FilterTune DeblockTune { get; set; }
+
 public string CustomDeblock { get; set; }
- #endregion
 
- #region Video
+ public PaddingFilter Padding { get; set; }
+
+ public FilterPreset Colourspace { get; set; }
+
+ public string CustomColourspace { get; set; }
+
+ public FilterPreset ChromaSmooth { get; set; }
+
+ public FilterTune ChromaSmoothTune { get; set; }
+
+ public string CustomChromaSmooth { get; set; }
+
+ /* Video */
 
- /// <summary>
- /// Gets or sets VideoEncodeRateType.
- /// </summary>
 public VideoEncodeRateType VideoEncodeRateType { get; set; }
 
- /// <summary>
- /// Gets or sets the VideoEncoder
- /// </summary>
 public VideoEncoder VideoEncoder { get; set; }
 
- /// <summary>
- /// Gets or sets the video profile.
- /// </summary>
 public VideoProfile VideoProfile { get; set; }
 
- /// <summary>
- /// Gets or sets the video level.
- /// </summary>
 public VideoLevel VideoLevel { get; set; }
 
- /// <summary>
- /// Gets or sets the video preset.
- /// </summary>
 public VideoPreset VideoPreset { get; set; }
 
- /// <summary>
- /// Gets or sets the video tunes.
- /// </summary>
 public List<VideoTune> VideoTunes { get; set; }
 
- /// <summary>
- /// Gets or sets Extra Advanced Arguments for the Video Tab.
- /// </summary>
 public string ExtraAdvancedArguments { get; set; }
 
- /// <summary>
- /// Gets or sets the Video Encode Mode
- /// </summary>
 public FramerateMode FramerateMode { get; set; }
 
- /// <summary>
- /// Gets or sets Quality.
- /// </summary>
 public double? Quality { get; set; }
 
- /// <summary>
- /// Gets or sets VideoBitrate.
- /// </summary>
 public int? VideoBitrate { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether TwoPass.
- /// </summary>
 public bool TwoPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether TurboFirstPass.
- /// </summary>
 public bool TurboFirstPass { get; set; }
 
- /// <summary>
- /// Gets or sets Framerate.
- /// Null = Same as Source
- /// </summary>
 public double? Framerate { get; set; }
 
- #endregion
 
- #region Audio
+ /* Audio */
 
- /// <summary>
- /// Gets or sets AudioEncodings.
- /// </summary>
 public ObservableCollection<AudioTrack> AudioTracks { get; set; }
 
- /// <summary>
- /// Gets or sets AllowedPassthruOptions.
- /// </summary>
- public AllowedPassthru AllowedPassthruOptions { get; set; }
+ public AllowedPassthru AudioPassthruOptions { get; set; }
 
- #endregion
+ /* Subtitles */
 
- #region Subtitles
-
- /// <summary>
- /// Gets or sets SubtitleTracks.
- /// </summary>
 public ObservableCollection<SubtitleTrack> SubtitleTracks { get; set; }
+ 
+ /* Chapters */
 
- #endregion
-
- #region Chapters
-
- /// <summary>
- /// Gets or sets a value indicating whether IncludeChapterMarkers.
- /// </summary>
 public bool IncludeChapterMarkers { get; set; }
 
- /// <summary>
- /// Gets or sets ChapterMarkersFilePath.
- /// </summary>
 public string ChapterMarkersFilePath { get; set; }
 
- /// <summary>
- /// Gets or sets ChapterNames.
- /// </summary>
 public ObservableCollection<ChapterMarker> ChapterNames { get; set; }
 
- #endregion
 
- #region MetaData
-
- /// <summary>
- /// Gets or sets the meta data.
- /// </summary>
+ /* Metadata */
+ 
 public MetaData MetaData { get; set; }
- #endregion
 
- #region Preview
+ /* Previews */
 
- /// <summary>
- /// Gets or sets a value indicating whether IsPreviewEncode.
- /// </summary>
 public bool IsPreviewEncode { get; set; }
 
- /// <summary>
- /// Gets or sets PreviewEncodeDuration.
- /// </summary>
 public int? PreviewEncodeDuration { get; set; }
 
- /// <summary>
- /// Gets or sets PreviewEncodeStartAt.
- /// </summary>
 public int? PreviewEncodeStartAt { get; set; }
-
- #endregion
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AllowedPassthru.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AllowedPassthru.cs Changed

@@ -11,16 +11,8 @@
 {
 using System.Collections.Generic;
 
- /// <summary>
- /// Allowed Passthru Options
- /// </summary>
 public class AllowedPassthru
 {
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="AllowedPassthru"/> class. 
- /// </summary>
 public AllowedPassthru()
 {
 this.AudioAllowAACPass = true;
@@ -31,15 +23,11 @@
 this.AudioAllowEAC3Pass = true;
 this.AudioAllowTrueHDPass = true;
 this.AudioAllowFlacPass = true;
+ this.AudioAllowMP2Pass = true;
+
 this.AudioEncoderFallback = AudioEncoder.Ac3;
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AllowedPassthru"/> class. 
- /// </summary>
- /// <param name="initialValue">
- /// The initial Value.
- /// </param>
 public AllowedPassthru(bool initialValue)
 {
 this.AudioAllowAACPass = initialValue;
@@ -50,16 +38,12 @@
 this.AudioAllowEAC3Pass = initialValue;
 this.AudioAllowTrueHDPass = initialValue;
 this.AudioAllowFlacPass = initialValue;
+ this.AudioAllowMP2Pass = initialValue;
+
 this.AudioEncoderFallback = AudioEncoder.Ac3;
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AllowedPassthru"/> class.
- /// Copy Constructor
- /// </summary>
- /// <param name="initialValue">
- /// The initial value.
- /// </param>
+
 public AllowedPassthru(AllowedPassthru initialValue)
 {
 this.AudioAllowAACPass = initialValue.AudioAllowAACPass;
@@ -70,61 +54,32 @@
 this.AudioAllowEAC3Pass = initialValue.AudioAllowEAC3Pass;
 this.AudioAllowTrueHDPass = initialValue.AudioAllowTrueHDPass;
 this.AudioAllowFlacPass = initialValue.AudioAllowFlacPass;
+ this.AudioAllowMP2Pass = initialValue.AudioAllowMP2Pass;
+
 this.AudioEncoderFallback = initialValue.AudioEncoderFallback;
 }
 
- #endregion
 
- #region Properties
-
- /// <summary>
- /// Gets or sets a value indicating whether AudioAllowAACPass.
- /// </summary>
 public bool AudioAllowAACPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether AudioAllowAC3Pass.
- /// </summary>
 public bool AudioAllowAC3Pass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether AudioAllowDTSHDPass.
- /// </summary>
 public bool AudioAllowDTSHDPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether AudioAllowDTSPass.
- /// </summary>
 public bool AudioAllowDTSPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether AudioAllowMP3Pass.
- /// </summary>
 public bool AudioAllowMP3Pass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether audio allow true hd pass.
- /// </summary>
 public bool AudioAllowTrueHDPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether audio allow flac pass.
- /// </summary>
 public bool AudioAllowFlacPass { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether audio allow ea c 3 pass.
- /// </summary>
 public bool AudioAllowEAC3Pass { get; set; }
 
- /// <summary>
- /// Gets or sets AudioEncoderFallback.
- /// </summary>
+ public bool AudioAllowMP2Pass { get; set; }
+
 public AudioEncoder AudioEncoderFallback { get; set; }
 
- /// <summary>
- /// Gets the allowed passthru options.
- /// </summary>
 public IEnumerable<AudioEncoder> AllowedPassthruOptions
 {
 get
@@ -162,14 +117,15 @@
 {
 audioEncoders.Add(AudioEncoder.EAc3Passthrough);
 }
+ if (this.AudioAllowMP2Pass)
+ {
+ audioEncoders.Add(AudioEncoder.Mp2Passthru);
+ }
 
 return audioEncoders;
 }
 }
 
- /// <summary>
- /// Disable the passthru options.
- /// </summary>
 public void SetFalse()
 {
 this.AudioAllowAACPass = false;
@@ -180,8 +136,7 @@
 this.AudioAllowEAC3Pass = false;
 this.AudioAllowTrueHDPass = false;
 this.AudioAllowFlacPass = false;
+ this.AudioAllowMP2Pass = false;
 }
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioEncoder.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs Changed

@@ -14,25 +14,22 @@
 using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
+ using System.Text.Json.Serialization;
 
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
 using HandBrakeWPF.Model.Audio;
 using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
-
- JsonObject(MemberSerialization.OptOut)
 public class AudioTrack : PropertyChangedBase
 {
 private int bitrate;
 private double drc;
- private HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder encoder;
+ private AudioEncoder encoder;
 private int gain;
 private string mixDown;
 private double sampleRate;
@@ -46,9 +43,8 @@
 private double? quality;
 private string trackName;
 
- /// <summary>
- /// Initializes a new instance of the <see cref = "AudioTrack" /> class.
- /// </summary>
+ private bool isExpandedTrackView;
+
 public AudioTrack()
 {
 // Default Values
@@ -66,20 +62,10 @@
 }
 
 // Setup Backing Properties
- this.EncoderRateType = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Bitrate;
+ this.EncoderRateType = AudioEncoderRateType.Bitrate;
 this.SetupLimits();
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AudioTrack"/> class.
- /// Copy Constructor
- /// </summary>
- /// <param name="track">
- /// The track.
- /// </param>
- /// <param name="setScannedTrack">
- /// The set Scanned Track.
- /// </param>
 public AudioTrack(AudioTrack track, bool setScannedTrack)
 {
 this.bitrate = track.Bitrate;
@@ -110,19 +96,6 @@
 this.SetupLimits();
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AudioTrack"/> class. 
- /// Create a track from a behaviour track.
- /// </summary>
- /// <param name="track">
- /// The Behavior track
- /// </param>
- /// <param name="sourceTrack">
- /// The source track we are dealing with.
- /// </param>
- /// <param name="fallback">
- /// An encoder to fall back to.
- /// </param>
 public AudioTrack(AudioBehaviourTrack track, Audio sourceTrack, AllowedPassthru fallback, OutputFormat container)
 {
 AudioEncoder chosenEncoder = track.Encoder;
@@ -140,6 +113,7 @@
 {
 int format = HandBrakeEncoderHelpers.GetContainer(EnumHelper<OutputFormat>.GetShortName(container)).Id;
 int copyMask = checked((int)HandBrakeEncoderHelpers.BuildCopyMask(
+ fallback.AudioAllowMP2Pass,
 fallback.AudioAllowMP3Pass,
 fallback.AudioAllowAACPass,
 fallback.AudioAllowAC3Pass,
@@ -186,11 +160,8 @@
 this.SetupLimits();
 }
 
- #region Track Properties
+ /* Audio Track Properties */
 
- /// <summary>
- /// Gets or sets Dynamic Range Compression
- /// </summary>
 public double DRC
 {
 get
@@ -208,9 +179,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the Gain for the audio track
- /// </summary>
 public int Gain
 {
 get
@@ -228,9 +196,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Audio Mixdown (ShortName)
- /// </summary>
 public string MixDown
 {
 get
@@ -249,9 +214,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Audio Encoder
- /// </summary>
 public AudioEncoder Encoder
 {
 get
@@ -280,14 +242,11 @@
 this.NotifyOfPropertyChange(() => this.AudioEncoderRateTypes);
 if (!this.AudioEncoderRateTypes.Contains(this.EncoderRateType))
 {
- this.EncoderRateType = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Bitrate; // Default to bitrate.
+ this.EncoderRateType = AudioEncoderRateType.Bitrate; // Default to bitrate.
 }
 }
 }
 
- /// <summary>
- /// Gets or sets Audio SampleRate
- /// </summary>
 public double SampleRate
 {
 get
@@ -303,9 +262,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the encoder rate type.
- /// </summary>
 public AudioEncoderRateType EncoderRateType
 {
 get
@@ -323,15 +279,12 @@
 
 if (!this.Quality.HasValue)
 {
- HBAudioEncoder hbAudioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder>.GetShortName(this.Encoder));
+ HBAudioEncoder hbAudioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
 this.Quality = HandBrakeEncoderHelpers.GetDefaultQuality(hbAudioEncoder);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets Audio Bitrate
- /// </summary>
 public int Bitrate
 {
 get
@@ -346,9 +299,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Audio quality
- /// </summary>
 public double? Quality
 {
 get
@@ -363,9 +313,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the track name.
- /// </summary>
 public string TrackName
 {
 get => this.trackName;
@@ -377,30 +324,24 @@
 }
 }
 
- #endregion
+ /* UI Only Properties */ 
 
- /// <summary>
- /// Gets AudioEncoderDisplayValue.
- /// </summary>
 JsonIgnore
 public string AudioEncoderDisplayValue
 {
 get
 {
- return EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder>.GetDisplay(this.Encoder);
+ return EnumHelper<AudioEncoder>.GetDisplay(this.Encoder);
 }
 }
 
- /// <summary>
- /// Gets the The UI display value for bit rate
- /// </summary>
 JsonIgnore
 public string BitRateDisplayValue
 {
 get
 {
- if (this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.Ac3Passthrough || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.DtsPassthrough
- || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.DtsHDPassthrough)
+ if (this.Encoder == AudioEncoder.Ac3Passthrough || this.Encoder == AudioEncoder.DtsPassthrough
+ || this.Encoder == AudioEncoder.DtsHDPassthrough)
 {
 return "Auto";
 }
@@ -409,10 +350,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether is default.
- /// TODO - Can this be removed? May have been added as a quick fix for a styling quirk.
- /// </summary>
 JsonIgnore
 public bool IsDefault
 {
@@ -426,9 +363,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the The UI display value for sample rate
- /// </summary>
 JsonIgnore
 public string SampleRateDisplayValue
 {
@@ -451,9 +385,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the Scanned Audio Tracks
- /// </summary>
 DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)
 public Audio ScannedTrack
 {
@@ -474,9 +405,6 @@
 }
 }
 
- /// <summary>
- /// Gets the Audio Track Name
- /// </summary>
 JsonIgnore
 public int? Track
 {
@@ -491,19 +419,16 @@
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether IsPassthru.
- /// </summary>
 JsonIgnore
 public bool IsPassthru
 {
 get
 {
- if (this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.Ac3Passthrough || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.DtsPassthrough
- || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.DtsHDPassthrough || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.AacPassthru
- || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.Mp3Passthru || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.Passthrough ||
- this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.EAc3Passthrough || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.TrueHDPassthrough
- || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.FlacPassthru)
+ if (this.Encoder == AudioEncoder.Ac3Passthrough || this.Encoder == AudioEncoder.DtsPassthrough
+ || this.Encoder == AudioEncoder.DtsHDPassthrough || this.Encoder == AudioEncoder.AacPassthru
+ || this.Encoder == AudioEncoder.Mp3Passthru || this.Encoder == AudioEncoder.Passthrough ||
+ this.Encoder == AudioEncoder.EAc3Passthrough || this.Encoder == AudioEncoder.TrueHDPassthrough
+ || this.Encoder == AudioEncoder.FlacPassthru || this.Encoder == AudioEncoder.Mp2Passthru)
 {
 return true;
 }
@@ -511,9 +436,6 @@
 }
 }
 
- /// <summary>
- /// Gets the bitrates.
- /// </summary>
 JsonIgnore
 public IEnumerable<int> Bitrates
 {
@@ -523,9 +445,6 @@
 }
 }
 
- /// <summary>
- /// Gets the quality compression values.
- /// </summary>
 JsonIgnore
 public IEnumerable<double> EncoderQualityValues
 {
@@ -535,68 +454,56 @@
 }
 }
 
- /// <summary>
- /// Gets the audio encoder rate types.
- /// </summary>
 JsonIgnore
 public IEnumerable<AudioEncoderRateType> AudioEncoderRateTypes
 {
 get
 {
- IList<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType> types = EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType>.GetEnumList().ToList();
- HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder>.GetShortName(this.Encoder));
+ IList<AudioEncoderRateType> types = EnumHelper<AudioEncoderRateType>.GetEnumList().ToList();
+ HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
 if (hbaenc == null || !hbaenc.SupportsQuality)
 {
- types.Remove(HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Quality);
+ types.Remove(AudioEncoderRateType.Quality);
 }
 
 return types;
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether can set bitrate.
- /// </summary>
 JsonIgnore
 public bool IsBitrateVisible
 {
 get
 {
- if (this.IsPassthru || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac24)
+ if (this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24)
 {
 return false;
 }
 
- return Equals(this.EncoderRateType, HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Bitrate);
+ return Equals(this.EncoderRateType, AudioEncoderRateType.Bitrate);
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether is quality visible.
- /// </summary>
 JsonIgnore
 public bool IsQualityVisible
 {
 get
 {
- if (this.IsPassthru || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac24)
+ if (this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24)
 {
 return false;
 }
 
- return Equals(this.EncoderRateType, HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Quality);
+ return Equals(this.EncoderRateType, AudioEncoderRateType.Quality);
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether is rate type visible.
- /// </summary>
 JsonIgnore
 public bool IsRateTypeVisible
 {
 get
 {
- if (this.IsPassthru || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac24)
+ if (this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24)
 {
 return false;
 }
@@ -605,32 +512,35 @@
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether IsLossless.
- /// </summary>
 JsonIgnore
 public bool IsLossless
 {
 get
 {
- return this.IsPassthru || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac || this.Encoder == HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder.ffflac24;
+ return this.IsPassthru || this.Encoder == AudioEncoder.ffflac || this.Encoder == AudioEncoder.ffflac24;
 }
 }
 
- /// <summary>
- /// Gets TrackReference.
- /// </summary>
 JsonIgnore
 public AudioTrack TrackReference
 {
 get { return this; }
 }
 
- #region Handler Methods
+ JsonIgnore
+ public bool IsExpandedTrackView
+ {
+ get => this.isExpandedTrackView;
+ set
+ {
+ if (value == this.isExpandedTrackView) return;
+ this.isExpandedTrackView = value;
+ this.NotifyOfPropertyChange(() => this.IsExpandedTrackView);
+ }
+ }
+
+ /* Helper Methods */
 
- /// <summary>
- /// The setup limits.
- /// </summary>
 private void SetupLimits()
 {
 this.SetupBitrateLimits();
@@ -638,9 +548,6 @@
 this.GetDefaultMixdownIfNull();
 }
 
- /// <summary>
- /// The calculate bitrate limits.
- /// </summary>
 private void SetupBitrateLimits()
 {
 // Base set of bitrates available.
@@ -651,15 +558,18 @@
 int low = 32;
 
 // Based on the users settings, find the high and low bitrates.
- HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder>.GetShortName(this.Encoder));
+ HBAudioEncoder hbaenc = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
 HBRate rate = HandBrakeEncoderHelpers.AudioSampleRates.FirstOrDefault(t => t.Name == this.SampleRate.ToString(CultureInfo.InvariantCulture));
 HBMixdown mixdown = this.mixDown != null ? HandBrakeEncoderHelpers.GetMixdown(this.mixDown) : HandBrakeEncoderHelpers.GetMixdown("dpl2");
 
- BitrateLimits limits = HandBrakeEncoderHelpers.GetBitrateLimits(hbaenc, rate != null ? rate.Rate : 48000, mixdown);
- if (limits != null)
+ if (hbaenc != null)
 {
- max = limits.High;
- low = limits.Low;
+ BitrateLimits limits = HandBrakeEncoderHelpers.GetBitrateLimits(hbaenc, rate != null ? rate.Rate : 48000, mixdown);
+ if (limits != null)
+ {
+ max = limits.High;
+ low = limits.Low;
+ }
 }
 
 // Return the subset of available bitrates.
@@ -674,13 +584,10 @@
 }
 }
 
- /// <summary>
- /// The setup quality compression limits.
- /// </summary>
 private void SetupQualityCompressionLimits()
 {
- HBAudioEncoder hbAudioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder>.GetShortName(this.Encoder));
- if (hbAudioEncoder.SupportsQuality)
+ HBAudioEncoder hbAudioEncoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.Encoder));
+ if (hbAudioEncoder != null && hbAudioEncoder.SupportsQuality)
 {
 RangeLimits limits = null;
 
@@ -724,7 +631,7 @@
 }
 
 // Default the audio quality value if it's out of range.
- if (Equals(this.EncoderRateType, HandBrakeWPF.Services.Encode.Model.Models.AudioEncoderRateType.Quality))
+ if (Equals(this.EncoderRateType, AudioEncoderRateType.Quality))
 {
 if (this.Quality.HasValue && !this.encoderQualityValues.Contains(this.Quality.Value))
 {
@@ -735,9 +642,6 @@
 this.NotifyOfPropertyChange(() => this.EncoderQualityValues);
 }
 
- /// <summary>
- /// Set the default mixdown when the mixdown is null or "none"
- /// </summary>
 private void GetDefaultMixdownIfNull()
 {
 if (this.ScannedTrack == null)
@@ -748,11 +652,15 @@
 HBAudioEncoder aencoder = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(this.encoder));
 HBMixdown currentMixdown = HandBrakeEncoderHelpers.GetMixdown(this.mixDown);
 HBMixdown sanitisedMixdown = HandBrakeEncoderHelpers.SanitizeMixdown(currentMixdown, aencoder, (uint)this.ScannedTrack.ChannelLayout);
- HBMixdown defaultMixdown = HandBrakeEncoderHelpers.GetDefaultMixdown(aencoder, (uint)this.ScannedTrack.ChannelLayout);
-
+ HBMixdown defaultMixdown = sanitisedMixdown;
+ if (aencoder != null)
+ {
+ defaultMixdown = HandBrakeEncoderHelpers.GetDefaultMixdown(aencoder, (uint)this.ScannedTrack.ChannelLayout);
+ }
+ 
 if (this.mixDown == null || this.mixDown == "none")
 {
- this.MixDown = defaultMixdown.ShortName;
+ this.MixDown = defaultMixdown?.ShortName;
 }
 else if (sanitisedMixdown != null)
 {
@@ -760,8 +668,6 @@
 }
 }
 
- #endregion
-
 public override string ToString()
 {
 return string.Format("Audio Track: Title {0}", this.ScannedTrack.ToString());

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/ChapterMarker.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/MetaData.cs Changed

@@ -11,24 +11,12 @@
 {
 using HandBrakeWPF.Services.Scan.Model;
 
- /// <summary>
- /// The meta data.
- /// </summary>
 public class MetaData
 {
- /// <summary>
- /// Initializes a new instance of the <see cref="MetaData"/> class. 
- /// </summary>
 public MetaData()
 {
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="MetaData"/> class. 
- /// </summary>
- /// <param name="metadata">
- /// The metadata.
- /// </param>
 public MetaData(MetaData metadata)
 {
 if (metadata != null)
@@ -43,11 +31,14 @@
 this.LongDescription = metadata.LongDescription;
 this.Name = metadata.Name;
 this.ReleaseDate = metadata.ReleaseDate;
+ this.PassthruMetadataEnabled = metadata.PassthruMetadataEnabled;
 }
 }
 
- public MetaData(Metadata metadata)
+ public MetaData(Metadata metadata, bool metadataEnabled)
 {
+ this.PassthruMetadataEnabled = metadataEnabled;
+
 if (metadata != null)
 {
 this.AlbumArtist = metadata.AlbumArtist;
@@ -63,54 +54,42 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the album artist.
- /// </summary>
+ public bool PassthruMetadataEnabled { get; set; }
+
 public string AlbumArtist { get; set; }
 
- /// <summary>
- /// Gets or sets the album.
- /// </summary>
 public string Album { get; set; }
 
- /// <summary>
- /// Gets or sets the artist.
- /// </summary>
 public string Artist { get; set; }
 
- /// <summary>
- /// Gets or sets the comment.
- /// </summary>
 public string Comment { get; set; }
 
- /// <summary>
- /// Gets or sets the composer.
- /// </summary>
 public string Composer { get; set; }
 
- /// <summary>
- /// Gets or sets the description.
- /// </summary>
 public string Description { get; set; }
 
- /// <summary>
- /// Gets or sets the genre.
- /// </summary>
 public string Genre { get; set; }
 
- /// <summary>
- /// Gets or sets the long description.
- /// </summary>
 public string LongDescription { get; set; }
 
- /// <summary>
- /// Gets or sets the name.
- /// </summary>
 public string Name { get; set; }
 
- /// <summary>
- /// Gets or sets the release date.
- /// </summary>
 public string ReleaseDate { get; set; }
+
+ public bool IsMetadataSet
+ {
+ get
+ {
+ return !string.IsNullOrEmpty(AlbumArtist) || !string.IsNullOrEmpty(Album)
+ || !string.IsNullOrEmpty(Artist)
+ || !string.IsNullOrEmpty(Comment)
+ || !string.IsNullOrEmpty(Composer)
+ || !string.IsNullOrEmpty(Description)
+ || !string.IsNullOrEmpty(Genre)
+ || !string.IsNullOrEmpty(LongDescription)
+ || !string.IsNullOrEmpty(Name)
+ || !string.IsNullOrEmpty(ReleaseDate);
+ }
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleTrack.cs Changed

@@ -9,17 +9,12 @@
 
 namespace HandBrakeWPF.Services.Encode.Model.Models
 {
-    using System;
-
     using Caliburn.Micro;
 
     using HandBrake.Interop.Utilities;
 
     using HandBrakeWPF.Services.Scan.Model;
 
-    using Newtonsoft.Json;
-
-    JsonObject(MemberSerialization.OptOut)
     public class SubtitleTrack : PropertyChangedBase
     {
         #region Constants and Fields
@@ -278,7 +273,7 @@
             {
                 if (this.SourceTrack != null)
                 {
-                    return this.SourceTrack.CanForce || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;
+                    return this.SourceTrack.CanForce || this.SourceTrack.IsFakeForeignAudioScanTrack;
                 }
 
                 return false;
@@ -294,10 +289,15 @@
             {    
                 if (this.SourceTrack != null)
                 {
-                    return this.SourceTrack.CanBurnIn || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SubtitleType == SubtitleType.SRT;
+                    return this.SourceTrack.CanBurnIn || this.SourceTrack.IsFakeForeignAudioScanTrack;
+                }
+
+                if (this.SubtitleType == SubtitleType.IMPORTSRT)
+                {
+                    return true;
                 }
 
-                if (this.SubtitleType == SubtitleType.SRT)
+                if (this.SubtitleType == SubtitleType.IMPORTSSA)
                 {
                     return true;
                 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleType.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Encode/Model/Models/SubtitleType.cs Changed

@@ -12,27 +12,35 @@
 using System.ComponentModel;
 
 /// <summary>
- /// Subtitle Type. 
+ /// Note this must be kept up to date with HandBrake.Interop.Interop.HbLib.hb_subtitle_s_subsource
 /// </summary>
 public enum SubtitleType
 {
- Description("SSA")
- SSA,
- Description("SRT")
- SRT,
 Description("VobSub")
 VobSub,
- Description("CC")
- CC,
+
+ Description("CC608SUB")
+ CC608,
+
+ Description("CC708SUB")
+ CC708,
+
 Description("UTF8")
 UTF8Sub,
+
 Description("TX3G")
 TX3G,
+
+ Description("SSA")
+ SSA,
+
 Description("PGS")
 PGS,
- Description("Unknown")
- Unknown,
- Description("Foreign Audio Search")
- ForeignAudioSearch, // Special Type for Foreign Audio Search
+
+ Description("IMPORTED SRT")
+ IMPORTSRT,
+
+ Description("IMPORTED SSA")
+ IMPORTSSA,
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/ErrorService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/ErrorService.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/INotificationService.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/INotifyIconService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/INotifyIconService.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/IPortService.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/IUserSettingService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Interfaces/IUserSettingService.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogEventArgs.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/EventArgs/LogFileEventArgs.cs Added

@@ -0,0 +1,31 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogFileEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the LogEventArgs type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.EventArgs
+{
+ using System;
+
+ using HandBrakeWPF.Services.Logging.Interfaces;
+
+ public class LogFileEventArgs : EventArgs
+ {
+ public LogFileEventArgs(string fileName, ILog logInstance, bool isNew)
+ {
+ this.FileName = fileName;
+ this.LogInstance = logInstance;
+ this.IsNew = isNew;
+ }
+
+ public string FileName { get; }
+
+ public ILog LogInstance { get; }
+
+ public bool IsNew { get; }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILog.cs Changed

@@ -12,17 +12,11 @@
 using System;
 using System.Collections.Generic;
 
- using HandBrake.Worker.Logging.Interfaces;
- using HandBrake.Worker.Logging.Models;
+ using HandBrakeWPF.Model.Logging;
 
- using HandBrakeWPF.Services.Logging.Model;
+ using LogEventArgs = EventArgs.LogEventArgs;
 
- using LogEventArgs = HandBrakeWPF.Services.Logging.EventArgs.LogEventArgs;
-
- /// <summary>
- /// The Log interface.
- /// </summary>
- public interface ILog : ILogHandler
+ public interface ILog : IDisposable
 {
 /// <summary>
 /// The message logged.
@@ -35,15 +29,28 @@
 event EventHandler LogReset;
 
 /// <summary>
+ /// An ID that allows this instance to be associated with an encode service implementation. 
+ /// </summary>
+ int LogId { get; }
+
+ /// <summary>
+ /// The filename this log service is outputting to.
+ /// </summary>
+ string FileName { get; }
+
+ /// <summary>
 /// Enable logging for this worker process.
 /// </summary>
- /// <param name="config">
- /// Configuration for the logger.
+ /// <param name="filename">
+ /// The filename.
+ /// </param>
+ /// <param name="fullLogPath">
+ /// The full Log Path.
 /// </param>
 /// <remarks>
 /// If this is not called, all log messages from libhb will be ignored.
 /// </remarks>
- void ConfigureLogging(LogHandlerConfig config);
+ void ConfigureLogging(string filename, string fullLogPath);
 
 /// <summary>
 /// Log a message.
@@ -52,5 +59,20 @@
 /// The content of the log message,
 /// </param>
 void LogMessage(string content);
+
+ string GetFullLog();
+
+ List<LogMessage> GetLogMessages();
+
+ /// <summary>
+ /// Empty the log cache and reset the log handler to defaults.
+ /// </summary>
+ void Reset();
+
+ /// <summary>
+ /// Add a Marker to this log service to make it easier to associate with an encode instance.
+ /// </summary>
+ /// <param name="id">An ID number from the underlying service.</param>
+ void SetId(int id);
 }
 }
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/Interfaces/ILogInstanceManager.cs Added

@@ -0,0 +1,61 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ILogInstanceManager.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ILogInstanceManager type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.Interfaces
+{
+ using System;
+ using System.Collections.Generic;
+
+ using HandBrakeWPF.Services.Logging.EventArgs;
+
+ public interface ILogInstanceManager
+ {
+ event EventHandler<LogFileEventArgs> LogInstancesChanged;
+ 
+ ILog ApplicationLogInstance { get; }
+
+ /// <summary>
+ /// Register an ILog instance.
+ /// </summary>
+ /// <param name="filename">
+ /// This is the key associated with the log instance.
+ /// </param>
+ /// <param name="log">
+ /// The ILog instance
+ /// </param>
+ /// <param name="isMaster">
+ /// True indicates it's the log instance for the parent handbrake process.
+ /// </param>
+ void Register(string filename, ILog log, bool isMaster);
+
+ /// <summary>
+ /// Remove a log file when we are done with it.
+ /// </summary>
+ /// <param name="filename">The filename of the log to remove.</param>
+ void Deregister(string filename);
+
+ /// <summary>
+ /// Reset the application log file.
+ /// </summary>
+ void ResetApplicationLog();
+
+ /// <summary>
+ /// Gets a list of files without their associated ILog instances.
+ /// </summary>
+ /// <returns>List of filenames being logged</returns>
+ List<string> GetLogFiles();
+
+ /// <summary>
+ /// Get the ILog instance for a given filename key
+ /// </summary>
+ /// <param name="filename">The key of the log instance</param>
+ /// <returns>An ILog instance or null if invalid key</returns>
+ ILog GetLogInstance(string filename);
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/LogInstanceManager.cs Added

@@ -0,0 +1,107 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogInstanceManager.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging
+{
+ using System;
+ using System.Collections.Generic;
+ using System.IO;
+ using System.Linq;
+
+ using HandBrakeWPF.Services.Logging.EventArgs;
+ using HandBrakeWPF.Services.Logging.Interfaces;
+
+ public class LogInstanceManager : ILogInstanceManager
+ {
+ private readonly object instanceLock = new object();
+ private Dictionary<string, ILog> logInstances = new Dictionary<string, ILog>();
+ 
+ public event EventHandler<LogFileEventArgs> LogInstancesChanged;
+
+ public ILog ApplicationLogInstance { get; private set; }
+
+ public void Register(string filename, ILog log, bool isMaster)
+ {
+ lock (this.instanceLock)
+ {
+ this.logInstances.Add(filename, log);
+
+ if (isMaster)
+ {
+ this.ApplicationLogInstance = log;
+ }
+ }
+
+ this.OnLogInstancesChanged(new LogFileEventArgs(filename, log, true));
+ }
+
+ public void Deregister(string filename)
+ {
+ lock (this.instanceLock)
+ {
+ if (this.logInstances.ContainsKey(filename))
+ {
+ ILog logInstance = this.logInstancesfilename;
+ logInstance.Dispose();
+
+ this.logInstances.Remove(filename);
+ }
+ }
+
+ this.OnLogInstancesChanged(new LogFileEventArgs(filename, null, false));
+ }
+
+ public void ResetApplicationLog()
+ {
+ this.ApplicationLogInstance.Reset();
+ this.OnLogInstancesChanged(new LogFileEventArgs(this.ApplicationLogInstance.FileName, this.ApplicationLogInstance, true));
+ }
+
+ public List<string> GetLogFiles()
+ {
+ lock (this.instanceLock)
+ {
+ List<string> encodeLogs = this.logInstances.Keys.Where(s => !s.Contains("main")).OrderBy(s => s).ToList();
+
+ List<string> finalList = new List<string>();
+ if (this.ApplicationLogInstance != null)
+ {
+ finalList.Add(Path.GetFileName(this.ApplicationLogInstance.FileName));
+ }
+
+ finalList.AddRange(encodeLogs);
+
+ return finalList;
+ }
+ }
+
+ public ILog GetLogInstance(string filename)
+ {
+ lock (this.instanceLock)
+ {
+ if (string.IsNullOrEmpty(filename))
+ {
+ return null;
+ }
+
+ ILog logger;
+ if (this.logInstances.TryGetValue(filename, out logger))
+ {
+ return logger;
+ }
+ }
+
+ return null;
+ }
+
+ protected virtual void OnLogInstancesChanged(LogFileEventArgs e)
+ {
+ this.LogInstancesChanged?.Invoke(this, e);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Logging/LogService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/LogService.cs Changed

@@ -18,57 +18,30 @@
 using System.IO;
 using System.Linq;
 using System.Text;
- using System.Timers;
 
- using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.EventArgs;
- using HandBrake.Worker.Logging.Models;
-
- using HandBrakeWPF.Instance.Model;
- using HandBrakeWPF.Services.Interfaces;
- using HandBrakeWPF.Services.Logging.Model;
+ using HandBrakeWPF.Model.Logging;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
-
 using ILog = Interfaces.ILog;
 using LogEventArgs = EventArgs.LogEventArgs;
 
- public class LogService : HttpRequestBase, ILog
+ public class LogService : ILog, IDisposable
 {
- // TODO List.
- // Maybe make the event weak?
- // Make this class Thread Safe.
- private static ILog loggerInstance;
 private readonly object lockObject = new object();
 private readonly object fileWriterLock = new object();
 private readonly StringBuilder logBuilder = new StringBuilder();
- 
+ private readonly List<LogMessage> logMessages = new List<LogMessage>();
+
 private bool isLoggingEnabled;
- private List<LogMessage> logMessages = new List<LogMessage>(); 
 private int messageIndex;
 private string diskLogPath;
- private bool deleteLogFirst;
 private bool isDiskLoggingEnabled;
 private StreamWriter fileWriter;
 private string logHeader;
- private Timer remoteLogPollTimer;
- private int remoteIndex = 0;
- private bool isRemotePollingEnabled = false;
 
- public LogService(IUserSettingService userSettingService)
+ public LogService()
 {
- HandBrakeUtils.MessageLogged += this.HandBrakeUtils_MessageLogged;
- HandBrakeUtils.ErrorLogged += this.HandBrakeUtils_ErrorLogged;
-
- if (userSettingService.GetUserSetting<bool>(UserSettingConstants.RemoteServiceEnabled))
- {
- this.ActivateRemoteLogPolling();
- this.isRemotePollingEnabled = true;
-
- this.port = userSettingService.GetUserSetting<int>(UserSettingConstants.RemoteServicePort);
- this.serverUrl = string.Format("http://127.0.0.1:{0}/", this.port);
- }
+ this.LogId = -1; // Unset
 }
 
 public event EventHandler<LogEventArgs> MessageLogged;
@@ -86,6 +59,12 @@
 }
 }
 
+ public int LogId { get; private set; }
+
+ public string FileName { get; private set; }
+
+ public string FullLogPath { get; private set; }
+
 public void LogMessage(string content)
 {
 if (!this.isLoggingEnabled)
@@ -96,7 +75,7 @@
 LogMessage msg = new LogMessage(content, this.messageIndex);
 lock (this.lockObject)
 {
- this.messageIndex = this.messageIndex + 1; 
+ this.messageIndex = this.messageIndex + 1;
 this.logMessages.Add(msg);
 this.logBuilder.AppendLine(msg.Content);
 this.LogMessageToDisk(msg);
@@ -116,22 +95,21 @@
 this.OnMessageLogged(msg); // Must be outside lock to be thread safe. 
 }
 
- public void ConfigureLogging(LogHandlerConfig config)
+ public void ConfigureLogging(string filename, string fullLogPath)
 {
 this.isLoggingEnabled = true;
+ this.FileName = filename;
+ this.FullLogPath = fullLogPath;
 
- if (config.EnableDiskLogging)
+ if (!string.IsNullOrEmpty(fullLogPath) && !Directory.Exists(Path.GetDirectoryName(fullLogPath)))
 {
- if (!string.IsNullOrEmpty(config.LogFile) && !Directory.Exists(Path.GetDirectoryName(config.LogFile)))
- {
- Directory.CreateDirectory(Path.GetDirectoryName(config.LogFile));
- }
-
- this.EnableLoggingToDisk(config.LogFile, config.DeleteCurrentLogFirst);
+ Directory.CreateDirectory(Path.GetDirectoryName(fullLogPath));
 }
 
- this.logHeader = config.Header;
- this.LogMessage(config.Header);
+ this.EnableLoggingToDisk(fullLogPath);
+
+ this.logHeader = GeneralUtilities.CreateLogHeader().ToString();
+ this.LogMessage(logHeader);
 }
 
 public string GetFullLog()
@@ -165,60 +143,20 @@
 return log;
 }
 
- public long GetLatestLogIndex()
- {
- lock (this.lockObject)
- {
- return this.messageIndex;
- }
- }
- 
- public async void Reset()
+ public void Reset()
 {
- //if (this.isRemotePollingEnabled)
- //{
- // try
- // {
- // await this.MakeHttpGetRequest("ResetLogging");
- // }
- // catch (Exception e)
- // {
- // if (this.remoteLogPollTimer != null)
- // {
- // this.remoteLogPollTimer.Stop();
- // }
- // }
- //}
-
 lock (this.lockObject)
 {
 this.logMessages.Clear();
 this.logBuilder.Clear();
 this.messageIndex = 0;
- 
- try
- {
- lock (this.fileWriterLock)
- {
- if (this.fileWriter != null)
- {
- this.fileWriter.Flush();
- this.fileWriter.Close();
- this.fileWriter.Dispose();
- }
-
- this.fileWriter = null;
- }
- }
- catch (Exception exc)
- {
- Debug.WriteLine(exc);
- }
+
+ this.ShutdownFileWriter();
 
 if (this.fileWriter == null)
 {
 this.isDiskLoggingEnabled = false;
- this.EnableLoggingToDisk(this.diskLogPath, this.deleteLogFirst);
+ this.EnableLoggingToDisk(this.diskLogPath);
 }
 
 if (!string.IsNullOrEmpty(this.logHeader))
@@ -230,16 +168,23 @@
 }
 }
 
+ public void SetId(int id)
+ {
+ this.LogId = id;
+ }
+
+ public void Dispose()
+ {
+ this.ShutdownFileWriter();
+ }
+
 protected virtual void OnMessageLogged(LogMessage msg)
 {
 var onMessageLogged = this.MessageLogged;
- if (onMessageLogged != null)
- {
- onMessageLogged.Invoke(this, new LogEventArgs(msg));
- }
+ onMessageLogged?.Invoke(this, new LogEventArgs(msg));
 }
 
- protected void ShutdownFileWriter()
+ private void ShutdownFileWriter()
 {
 try
 {
@@ -266,7 +211,7 @@
 this.LogReset?.Invoke(this, System.EventArgs.Empty);
 }
 
- private void EnableLoggingToDisk(string logFile, bool deleteCurrentLogFirst)
+ private void EnableLoggingToDisk(string logFile)
 {
 if (this.isDiskLoggingEnabled)
 {
@@ -280,14 +225,13 @@
 throw new Exception("Log Directory does not exist. This service will not create it for you!");
 }
 
- if (deleteCurrentLogFirst && File.Exists(logFile))
+ if (File.Exists(logFile))
 {
 File.Delete(logFile);
 }
 
 this.diskLogPath = logFile;
 this.isDiskLoggingEnabled = true;
- this.deleteLogFirst = deleteCurrentLogFirst;
 
 lock (this.fileWriterLock)
 {
@@ -338,82 +282,5 @@
 Debug.WriteLine(exc); // This exception doesn't warrant user interaction, but it should be logged
 }
 }
-
- private void HandBrakeUtils_ErrorLogged(object sender, MessageLoggedEventArgs e)
- {
- if (e == null || string.IsNullOrEmpty(e.Message))
- {
- return;
- }
-
- this.LogMessage(e.Message);
- }
-
- private void HandBrakeUtils_MessageLogged(object sender, MessageLoggedEventArgs e)
- {
- if (e == null || string.IsNullOrEmpty(e.Message))
- {
- return;
- }
-
- this.LogMessage(e.Message);
- }
-
- private void ActivateRemoteLogPolling()
- {
- this.remoteLogPollTimer = new Timer();
- this.remoteLogPollTimer.Interval = 1000;
-
- this.remoteLogPollTimer.Elapsed += (o, e) =>
- {
- try
- {
- this.PollRemoteLog();
- }
- catch (Exception exc)
- {
- Debug.WriteLine(exc);
- }
- };
- this.remoteLogPollTimer.Start();
- }
-
- private async void PollRemoteLog()
- {
- ServerResponse response = null;
- try
- {
- int nextIndex = this.remoteIndex + 1;
- string json = JsonConvert.SerializeObject(nextIndex, Formatting.Indented, this.jsonNetSettings);
-
- response = await this.MakeHttpJsonPostRequest("GetLogMessagesFromIndex", json);
- }
- catch (Exception e)
- {
- Debug.WriteLine("No Endpoint");
- }
-
- if (response == null || !response.WasSuccessful)
- {
- return;
- }
-
- string statusJson = response.JsonResponse;
-
- List<LogMessage> messages = null;
- if (!string.IsNullOrEmpty(statusJson))
- {
- messages = JsonConvert.DeserializeObject<List<LogMessage>>(statusJson, this.jsonNetSettings);
- }
-
- if (messages != null)
- {
- foreach (var item in messages)
- {
- this.LogMessage(item.Content);
- this.remoteIndex = item.MessageIndex;
- }
- }
- }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Logging/Model/LogFile.cs Added

@@ -0,0 +1,68 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="LogFile.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Logging.Model
+{
+ using System;
+
+ using HandBrakeWPF.Properties;
+
+ public class LogFile
+ {
+ public LogFile(string logFileName, bool isComplete)
+ {
+ this.LogFileName = logFileName;
+ this.IsComplete = isComplete;
+ }
+
+ public string LogFileName { get; private set; }
+
+ public bool IsComplete { get; private set; }
+
+ public string FileDisplayName
+ {
+ get
+ {
+ if (this.IsComplete)
+ {
+ return string.Format("{0} {1}", Resources.LogViewModel_Complete, this.LogFileName);
+ }
+
+ return this.LogFileName;
+ }
+ }
+
+ protected bool Equals(LogFile other)
+ {
+ return this.LogFileName == other.LogFileName && this.IsComplete == other.IsComplete;
+ }
+
+ public override bool Equals(object obj)
+ {
+ if (ReferenceEquals(null, obj))
+ {
+ return false;
+ }
+
+ if (ReferenceEquals(this, obj))
+ {
+ return true;
+ }
+
+ if (obj.GetType() != this.GetType())
+ {
+ return false;
+ }
+
+ return Equals((LogFile)obj);
+ }
+
+ public override int GetHashCode()
+ {
+ return HashCode.Combine(this.LogFileName, this.IsComplete);
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/NotificationService.cs Added

@@ -0,0 +1,143 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NotificationService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+ using System;
+ using System.Diagnostics;
+ using System.Linq;
+ using System.Windows;
+
+ using Windows.UI.Notifications;
+
+ using HandBrakeWPF.Services.Interfaces;
+
+ using Microsoft.Toolkit.Uwp.Notifications;
+
+ /// <summary>
+ /// Docs: https://docs.microsoft.com/en-us/windows/apps/design/shell/tiles-and-notifications/send-local-toast?tabs=desktop
+ /// </summary>
+ public class NotificationService : INotificationService
+ {
+ private readonly IUserSettingService userSettingService;
+ private ToastNotifierCompat notifier;
+ private bool isInitialised;
+ private int id;
+
+ public NotificationService(IUserSettingService userSettingService)
+ {
+ userSettingService.SettingChanged += this.UserSettingService_SettingChanged;
+ this.userSettingService = userSettingService;
+ this.Setup();
+ }
+
+ private void UserSettingService_SettingChanged(object sender, HandBrakeWPF.EventArgs.SettingChangedEventArgs e)
+ {
+ if (e.Key == UserSettingConstants.NotifyOnEncodeDone || e.Key == UserSettingConstants.NotifyOnQueueDone)
+ {
+ this.Setup();
+ }
+ }
+
+ public void SendNotification(string header, string content)
+ {
+ this.id += 1;
+ ToastContentBuilder toast = new ToastContentBuilder().AddArgument("tag", this.id.ToString()).AddText(header);
+
+ if (!string.IsNullOrEmpty(content))
+ {
+ toast.AddText(content);
+ }
+
+ ToastNotification notification = new ToastNotification(toast.GetXml());
+ notification.ExpirationTime = DateTime.Now.AddDays(1);
+ notification.Group = "HandBrake";
+ notification.Tag = this.id.ToString();
+
+ if (this.notifier != null)
+ {
+ notifier.Show(notification);
+ }
+ }
+
+ public void Shutdown()
+ {
+ try
+ {
+ // Clear the history when HandBrake Closes. This information is not likely to be useful anymore.
+ ToastNotificationManagerCompat.History.Clear();
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
+ }
+
+ public void Uninstall()
+ {
+ try
+ {
+ // Useful utility to allow users to remove HandBrake from Windows Settings.
+ this.notifier = null;
+ ToastNotificationManagerCompat.Uninstall();
+ isInitialised = false;
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
+ }
+
+ private void Setup()
+ {
+ bool encode = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnEncodeDone);
+ bool queue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnQueueDone);
+
+ if (encode || queue)
+ {
+ if (isInitialised)
+ {
+ return;
+ }
+
+ this.notifier = ToastNotificationManagerCompat.CreateToastNotifier();
+
+ isInitialised = true;
+
+ ToastNotificationManagerCompat.OnActivated += toastArgs =>
+ {
+ // Obtain the arguments from the notification
+ ToastArguments args = ToastArguments.Parse(toastArgs.Argument);
+
+ // Remove any notifications that are clicked
+ System.Collections.Generic.KeyValuePair<string, string> tag = args.FirstOrDefault();
+ if (!string.IsNullOrEmpty(tag.Value))
+ {
+ try
+ {
+ ToastNotificationManagerCompat.History.Remove(tag.Value);
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
+ }
+
+ // Need to dispatch to UI thread if performing UI operations
+ Application.Current.Dispatcher.Invoke(delegate
+ {
+ Window w = Application.Current.MainWindow;
+ if (w != null)
+ {
+ w.WindowState = WindowState.Normal;
+ w.BringIntoView();
+ }
+ });
+ };
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/NotifyIconService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/NotifyIconService.cs Changed

@@ -4,17 +4,23 @@
 
 namespace HandBrakeWPF.Services
 {
+    using System;
+    using System.Drawing;
     using System.Windows.Forms;
 
     using HandBrakeWPF.Services.Interfaces;
 
     public class NotifyIconService : INotifyIconService
     {
+        private Action actionCallback;
         private NotifyIcon notifyIcon;
 
-        public void RegisterNotifyIcon(NotifyIcon ni)
+        public void Setup(Icon icon)
         {
-            this.notifyIcon = ni;
+            this.notifyIcon = new NotifyIcon();
+            this.notifyIcon.Icon = icon;
+
+            this.notifyIcon.Click += this.NotifyIcon_Click;
         }
 
         public void SetTooltip(string text)
@@ -24,5 +30,23 @@
                 this.notifyIcon.Text = text;
             }
         }
+
+        public void SetVisibility(bool isVisible)
+        {
+            this.notifyIcon.Visible = isVisible;
+        }
+
+        public void SetClickCallback(Action callback)
+        {
+            this.actionCallback = callback;
+        }
+
+        private void NotifyIcon_Click(object sender, System.EventArgs e)
+        {
+            if (this.actionCallback != null)
+            {
+                this.actionCallback();
+            }
+        }
     }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/PortService.cs Added

@@ -0,0 +1,76 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PortService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PortService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services
+{
+ using System.Collections.Generic;
+ using System.Linq;
+ using System.Net;
+ using System.Net.NetworkInformation;
+
+ using HandBrakeWPF.Services.Interfaces;
+
+ public class PortService : IPortService
+ {
+ private readonly object lockObject = new object();
+ private List<int> usedPorts = new List<int>();
+
+ public PortService()
+ {
+ }
+
+ public void FreePort(int port)
+ {
+ lock (this.lockObject)
+ {
+ this.usedPorts.Remove(port);
+ }
+ }
+
+ public int GetOpenPort(int startPort)
+ {
+ lock (this.lockObject)
+ {
+ int foundPort = FindUnusedPort(startPort);
+
+ // If we find a port that's free on the system, but we've already allocated, try find another.
+ while (this.usedPorts.Contains(foundPort))
+ {
+ int nextPort = foundPort + 1;
+ foundPort = FindUnusedPort(nextPort);
+ }
+
+ // Record we've used this port.
+ this.usedPorts.Add(foundPort);
+
+ return foundPort;
+ }
+ }
+
+ private int FindUnusedPort(int startPort)
+ {
+ if (startPort == 0)
+ {
+ startPort = 8037;
+ }
+
+ int portStartIndex = startPort;
+
+ IPGlobalProperties properties = IPGlobalProperties.GetIPGlobalProperties();
+ IPEndPoint tcpEndPoints = properties.GetActiveTcpListeners();
+
+ List<int> usedPorts = tcpEndPoints.Select(p => p.Port).ToList<int>();
+ int unusedPort = 0;
+
+ unusedPort = Enumerable.Range(portStartIndex, 99).FirstOrDefault(p => !usedPorts.Contains(p));
+
+ return unusedPort;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/PowerService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/PowerService.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/PrePostActionService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/PrePostActionService.cs Changed

@@ -12,21 +12,21 @@
 using System;
 using System.Diagnostics;
 using System.IO;
- using System.Windows.Forms;
 using System.Windows.Media;
 
 using Caliburn.Micro;
 
 using HandBrakeWPF.EventArgs;
 using HandBrakeWPF.Model.Options;
+ using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Queue.Interfaces;
 using HandBrakeWPF.Services.Scan.Interfaces;
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
- using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using EncodeCompletedEventArgs = Encode.EventArgs.EncodeCompletedEventArgs;
+ using ILog = Logging.Interfaces.ILog;
 
 /// <summary>
 /// The when done service.
@@ -34,22 +34,35 @@
 public class PrePostActionService : IPrePostActionService
 {
 private readonly ILog log;
- private readonly IQueueService queueProcessor;
+ private readonly INotificationService notificationService;
 private readonly IUserSettingService userSettingService;
 private readonly IWindowManager windowManager;
 private readonly IScan scanService;
 
- public PrePostActionService(IQueueService queueProcessor, IUserSettingService userSettingService, IWindowManager windowManager, IScan scanService, ILog logService)
+ public PrePostActionService(IQueueService queueProcessor, IUserSettingService userSettingService, IWindowManager windowManager, IScan scanService, ILog logService, INotificationService notificationService)
 {
 this.log = logService;
- this.queueProcessor = queueProcessor;
+ this.notificationService = notificationService;
 this.userSettingService = userSettingService;
 this.windowManager = windowManager;
 this.scanService = scanService;
 
- this.queueProcessor.QueueCompleted += this.QueueProcessorQueueCompleted;
- this.queueProcessor.EncodeService.EncodeCompleted += this.EncodeService_EncodeCompleted;
- this.queueProcessor.EncodeService.EncodeStarted += this.EncodeService_EncodeStarted;
+ queueProcessor.QueueCompleted += this.QueueProcessorQueueCompleted;
+ queueProcessor.QueuePaused += this.QueueProcessor_QueuePaused;
+ queueProcessor.EncodeCompleted += this.EncodeService_EncodeCompleted;
+ queueProcessor.JobProcessingStarted += this.EncodeService_EncodeStarted;
+ }
+
+ private void QueueProcessor_QueuePaused(object sender, EventArgs e)
+ {
+ // Allow the system to sleep again.
+ Execute.OnUIThread(() =>
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep))
+ {
+ Win32.AllowSleep();
+ }
+ });
 }
 
 /// <summary>
@@ -83,7 +96,7 @@
 // Send the file to the users requested application
 if (e.Successful)
 {
- this.SendToApplication(e.SourceFileName, e.FileName);
+ this.SendToApplication(e.SourceFileName, e.FileName, e.ErrorCode);
 }
 
 if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PlaySoundWhenDone))
@@ -91,14 +104,11 @@
 this.PlayWhenDoneSound();
 }
 
- // Allow the system to sleep again.
- Execute.OnUIThread(() =>
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnEncodeDone))
 {
- if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep))
- {
- Win32.AllowSleep();
- }
- });
+ string filename = Path.GetFileName(e.FileName);
+ this.notificationService.SendNotification(Resources.Notifications_EncodeDone, filename);
+ }
 }
 
 /// <summary>
@@ -122,6 +132,22 @@
 this.PlayWhenDoneSound();
 }
 
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnQueueDone))
+ {
+ this.notificationService.SendNotification(Resources.Notifications_QueueDone, null);
+ }
+
+ // Allow the system to sleep again.
+ Execute.OnUIThread(() =>
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PreventSleep))
+ {
+ Win32.AllowSleep();
+ }
+ });
+
+ // ---------------------------------------------------------
+
 if (this.userSettingService.GetUserSetting<int>(UserSettingConstants.WhenCompleteAction) == (int)WhenDone.DoNothing)
 {
 return;
@@ -136,7 +162,7 @@
 () =>
 {
 titleSpecificView.SetAction((WhenDone)this.userSettingService.GetUserSetting<int>(UserSettingConstants.WhenCompleteAction));
- this.windowManager.ShowDialog(titleSpecificView);
+ this.windowManager.ShowDialogAsync(titleSpecificView);
 isCancelled = titleSpecificView.IsCancelled;
 });
 }
@@ -159,10 +185,10 @@
 Win32.ExitWindowsEx(0, 0);
 break;
 case WhenDone.Sleep:
- Application.SetSuspendState(PowerState.Suspend, true, true);
+ Win32.SetSuspendState(false, false, false);
 break;
 case WhenDone.Hibernate:
- Application.SetSuspendState(PowerState.Hibernate, true, true);
+ Win32.SetSuspendState(true, false, false);
 break;
 case WhenDone.LockSystem:
 Win32.LockWorkStation();
@@ -174,7 +200,7 @@
 }
 }
 
- private void SendToApplication(string source, string destination)
+ private void SendToApplication(string source, string destination, int exitCode)
 {
 if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.SendFile) &&
 !string.IsNullOrEmpty(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo)))
@@ -183,12 +209,23 @@
 
 arguments = arguments.Replace("{source}", string.Format("\"{0}\"", source));
 arguments = arguments.Replace("{destination}", string.Format("\"{0}\"", destination));
+ arguments = arguments.Replace("{exit_code}", string.Format("{0}", exitCode));
 
 var process = new ProcessStartInfo(this.userSettingService.GetUserSetting<string>(UserSettingConstants.SendFileTo), arguments);
+ process.EnvironmentVariables.Add("HB_SOURCE", source);
+ process.EnvironmentVariables.Add("HB_DESTINATION", destination);
+ process.EnvironmentVariables.Add("HB_EXIT_CODE", exitCode.ToString());
 
- this.ServiceLogMessage(string.Format("Sending output file to: {0}, with arguments: {1} ", destination, arguments));
+ this.ServiceLogMessage(string.Format("Sending output file to: {0}, with arguments: {1} ", process.FileName, arguments));
 
- Process.Start(process);
+ try
+ {
+ Process.Start(process);
+ }
+ catch (Exception ex)
+ {
+ this.ServiceLogMessage(string.Format("Send file to failed to execute: {0}", ex));
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Factories/JsonPresetFactory.cs Changed

@@ -9,7 +9,6 @@
 
 namespace HandBrakeWPF.Services.Presets.Factories
 {
- using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
@@ -17,46 +16,37 @@
 
 using HandBrake.Interop.Interop;
 using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+ using HandBrake.Interop.Interop.Interfaces.Model.Presets;
 using HandBrake.Interop.Interop.Json.Presets;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Model;
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Model.Audio;
 using HandBrakeWPF.Model.Filters;
- using HandBrakeWPF.Model.Picture;
 using HandBrakeWPF.Model.Subtitles;
+ using HandBrakeWPF.Model.Video;
 using HandBrakeWPF.Services.Encode.Model.Models;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Utilities;
 
- using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
- using AudioTrack = HandBrakeWPF.Services.Encode.Model.Models.AudioTrack;
- using DenoisePreset = HandBrakeWPF.Services.Encode.Model.Models.DenoisePreset;
- using DenoiseTune = HandBrakeWPF.Services.Encode.Model.Models.DenoiseTune;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using FramerateMode = HandBrakeWPF.Services.Encode.Model.Models.FramerateMode;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using VideoLevel = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoLevel;
- using VideoPreset = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoPreset;
- using VideoProfile = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoProfile;
- using VideoTune = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoTune;
-
- /// <summary>
- /// The json preset factory.
- /// </summary>
+ using AudioEncoder = Encode.Model.Models.AudioEncoder;
+ using AudioTrack = Encode.Model.Models.AudioTrack;
+ using DenoisePreset = Encode.Model.Models.DenoisePreset;
+ using DenoiseTune = Encode.Model.Models.DenoiseTune;
+ using EncodeTask = Encode.Model.EncodeTask;
+ using FramerateMode = Encode.Model.Models.FramerateMode;
+ using OutputFormat = Encode.Model.Models.OutputFormat;
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+ using VideoEncodeRateType = HandBrakeWPF.Model.Video.VideoEncodeRateType;
+ using VideoLevel = Encode.Model.Models.Video.VideoLevel;
+ using VideoPreset = Encode.Model.Models.Video.VideoPreset;
+ using VideoProfile = Encode.Model.Models.Video.VideoProfile;
+ using VideoTune = Encode.Model.Models.Video.VideoTune;
+
 public class JsonPresetFactory
 {
- /// <summary>
- /// The create preset.
- /// </summary>
- /// <param name="importedPreset">
- /// The preset.
- /// </param>
- /// <returns>
- /// The <see cref="Preset"/>.
- /// </returns>
 public static Preset ImportPreset(HBPreset importedPreset)
 {
 Preset preset = new Preset();
@@ -71,28 +61,30 @@
 /* Output Settings */
 preset.Task.OptimizeMP4 = importedPreset.Mp4HttpOptimize;
 preset.Task.IPod5GSupport = importedPreset.Mp4iPodCompatible;
- preset.Task.OutputFormat = GetFileFormat(importedPreset.FileFormat.Replace("file", string.Empty).Trim()); // TOOD null check.
+ preset.Task.OutputFormat = GetFileFormat(importedPreset.FileFormat.Replace("file", string.Empty).Trim());
 preset.Task.AlignAVStart = importedPreset.AlignAVStart;
+ preset.Task.MetaData.PassthruMetadataEnabled = importedPreset.MetadataPassthrough;
 
 /* Picture Settings */
- preset.PictureSettingsMode = (PresetPictureSettingsMode)importedPreset.UsesPictureSettings;
 preset.Task.MaxWidth = importedPreset.PictureWidth.HasValue && importedPreset.PictureWidth.Value > 0 ? importedPreset.PictureWidth.Value : (int?)null;
 preset.Task.MaxHeight = importedPreset.PictureHeight.HasValue && importedPreset.PictureHeight.Value > 0 ? importedPreset.PictureHeight.Value : (int?)null;
 preset.Task.Cropping = new Cropping(importedPreset.PictureTopCrop, importedPreset.PictureBottomCrop, importedPreset.PictureLeftCrop, importedPreset.PictureRightCrop);
 preset.Task.HasCropping = !importedPreset.PictureAutoCrop;
- preset.Task.Modulus = importedPreset.PictureModulus;
 preset.Task.KeepDisplayAspect = importedPreset.PictureKeepRatio;
+ preset.Task.AllowUpscaling = importedPreset.PictureAllowUpscaling;
+ preset.Task.OptimalSize = importedPreset.PictureUseMaximumSize;
 
+ preset.Task.Padding = new PaddingFilter();
+ preset.Task.Padding.Set(importedPreset.PicturePadTop, importedPreset.PicturePadBottom, importedPreset.PicturePadLeft, importedPreset.PicturePadRight, importedPreset.PicturePadColor, importedPreset.PicturePadMode);
+ 
 switch (importedPreset.PicturePAR)
 {
 case "custom":
 preset.Task.Anamorphic = Anamorphic.Custom;
 preset.Task.DisplayWidth = importedPreset.PictureDARWidth;
 break;
- case "loose":
- preset.Task.Anamorphic = Anamorphic.Loose;
- break;
 case "auto":
+ case "loose":
 preset.Task.Anamorphic = Anamorphic.Automatic;
 break;
 default:
@@ -103,6 +95,27 @@
 /* Filter Settings */
 preset.Task.Grayscale = importedPreset.VideoGrayScale;
 
+ if (!string.IsNullOrEmpty(importedPreset.PictureColorspacePreset))
+ {
+ preset.Task.Colourspace = new FilterPreset(HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_COLORSPACE).FirstOrDefault(s => s.ShortName == importedPreset.PictureColorspacePreset));
+ preset.Task.CustomColourspace = importedPreset.PictureColorspaceCustom;
+ }
+ else
+ {
+ preset.Task.Colourspace = new FilterPreset("Off", "off");
+ }
+ 
+ if (!string.IsNullOrEmpty(importedPreset.PictureChromaSmoothPreset))
+ {
+ preset.Task.ChromaSmooth = new FilterPreset(HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH).FirstOrDefault(s => s.ShortName == importedPreset.PictureChromaSmoothPreset));
+ preset.Task.ChromaSmoothTune = new FilterTune(HandBrakeFilterHelpers.GetFilterTunes((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH).FirstOrDefault(s => s.ShortName == importedPreset.PictureChromaSmoothTune));
+ preset.Task.CustomChromaSmooth = importedPreset.PictureChromaSmoothCustom;
+ }
+ else
+ {
+ preset.Task.ChromaSmooth = new FilterPreset("Off", "off");
+ }
+
 if (!string.IsNullOrEmpty(importedPreset.PictureDeblockPreset))
 {
 preset.Task.DeblockPreset = new FilterPreset(HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_DEBLOCK).FirstOrDefault(s => s.ShortName == importedPreset.PictureDeblockPreset));
@@ -316,7 +329,7 @@
 string split = importedPreset.VideoTune.Split(',');
 foreach (var item in split)
 {
- preset.Task.VideoTunes.Add(new VideoTune(item, item));
+ preset.Task.VideoTunes.Add(new VideoTune(item?.Trim(), item?.Trim()));
 }
 }
 
@@ -349,7 +362,7 @@
 
 /* Audio Settings */
 preset.AudioTrackBehaviours = new AudioBehaviours();
- preset.Task.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(importedPreset.AudioEncoderFallback);
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetValue(importedPreset.AudioEncoderFallback);
 preset.AudioTrackBehaviours.SelectedBehaviour = importedPreset.AudioTrackSelectionBehavior == "all"
 ? AudioBehaviourModes.AllMatching
 : AudioBehaviourModes.FirstMatch;
@@ -358,35 +371,38 @@
 
 if (importedPreset.AudioCopyMask != null)
 {
- preset.Task.AllowedPassthruOptions.SetFalse();
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.SetFalse();
 foreach (var item in importedPreset.AudioCopyMask)
 {
 AudioEncoder encoder = EnumHelper<AudioEncoder>.GetValue(item);
 switch (encoder)
 {
 case AudioEncoder.AacPassthru:
- preset.Task.AllowedPassthruOptions.AudioAllowAACPass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowAACPass = true;
 break;
 case AudioEncoder.Ac3Passthrough:
- preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowAC3Pass = true;
 break;
 case AudioEncoder.EAc3Passthrough:
- preset.Task.AllowedPassthruOptions.AudioAllowEAC3Pass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowEAC3Pass = true;
 break;
 case AudioEncoder.DtsHDPassthrough:
- preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowDTSHDPass = true;
 break;
 case AudioEncoder.DtsPassthrough:
- preset.Task.AllowedPassthruOptions.AudioAllowDTSPass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowDTSPass = true;
 break;
 case AudioEncoder.FlacPassthru:
- preset.Task.AllowedPassthruOptions.AudioAllowFlacPass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowFlacPass = true;
+ break;
+ case AudioEncoder.Mp2Passthru:
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowMP2Pass = true;
 break;
 case AudioEncoder.Mp3Passthru:
- preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowMP3Pass = true;
 break;
 case AudioEncoder.TrueHDPassthrough:
- preset.Task.AllowedPassthruOptions.AudioAllowTrueHDPass = true;
+ preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowTrueHDPass = true;
 break;
 }
 }
@@ -397,7 +413,7 @@
 IList<string> names = LanguageUtilities.GetLanguageNames(importedPreset.AudioLanguageList);
 foreach (var name in names)
 {
- preset.AudioTrackBehaviours.SelectedLangauges.Add(name);
+ preset.AudioTrackBehaviours.SelectedLanguages.Add(name);
 }
 }
 
@@ -407,7 +423,7 @@
 {
 foreach (var audioTrack in importedPreset.AudioList)
 {
- AudioBehaviourTrack track = new AudioBehaviourTrack();
+ AudioBehaviourTrack track = new AudioBehaviourTrack(EnumHelper<AudioEncoder>.GetValue(importedPreset.AudioEncoderFallback));
 
 // track.CompressionLevel = audioTrack.AudioCompressionLevel;
 // track.AudioDitherMethod = audioTrack.AudioDitherMethod;
@@ -456,7 +472,7 @@
 IList<string> names = LanguageUtilities.GetLanguageNames(importedPreset.SubtitleLanguageList);
 foreach (var name in names)
 {
- preset.SubtitleTrackBehaviours.SelectedLangauges.Add(name);
+ preset.SubtitleTrackBehaviours.SelectedLanguages.Add(name);
 }
 }
 
@@ -478,25 +494,11 @@
 // public int PictureForceHeight { get; set; }
 // public int PictureForceWidth { get; set; }
 // public List<object> ChildrenArray { get; set; }
- // public bool Folder { get; set; }
- // public bool FolderOpen { get; set; }
 // public int Type { get; set; }
 
 return preset;
 }
 
- /// <summary>
- /// The export preset.
- /// </summary>
- /// <param name="export">
- /// The export.
- /// </param>
- /// <param name="config">
- /// HandBrakes configuration options.
- /// </param>
- /// <returns>
- /// The <see cref="Preset"/>.
- /// </returns>
 public static PresetTransportContainer ExportPreset(Preset export, HBConfiguration config)
 {
 PresetVersion presetVersion = HandBrakePresetService.GetCurrentPresetVersion();
@@ -507,12 +509,6 @@
 return container;
 }
 
- /// <summary>
- /// Export a list of Presets.
- /// </summary>
- /// <param name="exportList">A list of presets to export</param>
- /// <param name="config">HB's configuration</param>
- /// <returns>A list of JSON object presets.</returns>
 public static PresetTransportContainer ExportPresets(IEnumerable<Preset> exportList, HBConfiguration config)
 {
 PresetVersion presetVersion = HandBrakePresetService.GetCurrentPresetVersion();
@@ -526,16 +522,38 @@
 return container;
 }
 
- /// <summary>
- /// The create hb preset.
- /// </summary>
- /// <param name="export">
- /// The export.
- /// </param>
- /// <param name="config">HandBrakes current configuration</param>
- /// <returns>
- /// The <see cref="HBPreset"/>.
- /// </returns>
+ public static PresetTransportContainer ExportPresetCategories(IList<PresetDisplayCategory> categories, HBConfiguration config)
+ {
+ PresetVersion presetVersion = HandBrakePresetService.GetCurrentPresetVersion();
+ PresetTransportContainer container = new PresetTransportContainer(presetVersion.Major, presetVersion.Minor, presetVersion.Micro);
+
+ List<object> presets = new List<object>();
+ foreach (var category in categories)
+ {
+ presets.Add(CreatePresetCategory(category, config));
+ }
+
+ container.PresetList = presets;
+
+ return container;
+ }
+
+ public static HBPresetCategory CreatePresetCategory(PresetDisplayCategory category, HBConfiguration config)
+ {
+ HBPresetCategory preset = new HBPresetCategory();
+ preset.Folder = true;
+ preset.PresetName = category.Category;
+ preset.PresetDescription = string.Empty;
+ preset.ChildrenArray = new List<HBPreset>();
+
+ foreach (Preset singlePreset in category.Presets)
+ {
+ preset.ChildrenArray.Add(CreateHbPreset(singlePreset, config));
+ }
+
+ return preset;
+ }
+
 public static HBPreset CreateHbPreset(Preset export, HBConfiguration config)
 {
 HBPreset preset = new HBPreset();
@@ -544,13 +562,12 @@
 preset.PresetDescription = export.Description;
 preset.PresetName = export.Name;
 preset.Type = export.IsBuildIn ? 0 : 1;
- preset.UsesPictureSettings = (int)export.PictureSettingsMode;
 preset.Default = export.IsDefault;
 
 // Audio
- preset.AudioCopyMask = export.Task.AllowedPassthruOptions.AllowedPassthruOptions.Select(EnumHelper<AudioEncoder>.GetShortName).ToList();
- preset.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetShortName(export.Task.AllowedPassthruOptions.AudioEncoderFallback);
- preset.AudioLanguageList = LanguageUtilities.GetLanguageCodes(export.AudioTrackBehaviours.SelectedLangauges);
+ preset.AudioCopyMask = export.AudioTrackBehaviours.AllowedPassthruOptions.AllowedPassthruOptions.Select(EnumHelper<AudioEncoder>.GetShortName).ToList();
+ preset.AudioEncoderFallback = EnumHelper<AudioEncoder>.GetShortName(export.AudioTrackBehaviours.AllowedPassthruOptions.AudioEncoderFallback);
+ preset.AudioLanguageList = LanguageUtilities.GetLanguageCodes(export.AudioTrackBehaviours.SelectedLanguages);
 preset.AudioTrackSelectionBehavior = EnumHelper<AudioBehaviourModes>.GetShortName(export.AudioTrackBehaviours.SelectedBehaviour);
 preset.AudioSecondaryEncoderMode = export.AudioTrackBehaviours.SelectedTrackDefaultBehaviour == AudioTrackDefaultsMode.FirstTrack; // 1 = First Track, 0 = All
 preset.AudioList = new List<AudioList>();
@@ -580,7 +597,7 @@
 preset.SubtitleBurnBDSub = false; // TODO not supported yet.
 preset.SubtitleBurnDVDSub = false; // TODO not supported yet.
 preset.SubtitleBurnBehavior = EnumHelper<SubtitleBurnInBehaviourModes>.GetShortName(export.SubtitleTrackBehaviours.SelectedBurnInBehaviour);
- preset.SubtitleLanguageList = LanguageUtilities.GetLanguageCodes(export.SubtitleTrackBehaviours.SelectedLangauges);
+ preset.SubtitleLanguageList = LanguageUtilities.GetLanguageCodes(export.SubtitleTrackBehaviours.SelectedLanguages);
 preset.SubtitleTrackSelectionBehavior = EnumHelper<SubtitleBehaviourModes>.GetShortName(export.SubtitleTrackBehaviours.SelectedBehaviour);
 
 // Chapters
@@ -591,34 +608,42 @@
 preset.Mp4HttpOptimize = export.Task.OptimizeMP4;
 preset.Mp4iPodCompatible = export.Task.IPod5GSupport;
 preset.AlignAVStart = export.Task.AlignAVStart;
+ preset.MetadataPassthrough = export.Task.MetaData?.PassthruMetadataEnabled ?? false;
 
 // Picture Settings
 preset.PictureForceHeight = 0; // TODO
 preset.PictureForceWidth = 0; // TODO
- preset.PictureHeight = preset.UsesPictureSettings >= 1 ? export.Task.MaxHeight : 0; // TODO; // TODO
+ preset.PictureHeight = export.Task.MaxHeight;
 preset.PictureItuPAR = false; // TODO Not supported Yet
 preset.PictureKeepRatio = export.Task.KeepDisplayAspect;
 preset.PictureLeftCrop = export.Task.Cropping.Left;
 preset.PictureLooseCrop = false; // TODO Not Supported Yet
- preset.PictureModulus = export.Task.Modulus ?? 16;
 preset.PicturePAR = EnumHelper<Anamorphic>.GetShortName(export.Task.Anamorphic);
 preset.PicturePARHeight = export.Task.PixelAspectY;
 preset.PicturePARWidth = export.Task.PixelAspectX;
 preset.PictureRightCrop = export.Task.Cropping.Right;
 
+ preset.PicturePadMode = export.Task.Padding.Mode;
+ preset.PicturePadTop = export.Task.Padding.Y;
+ preset.PicturePadBottom = export.Task.Padding.Bottom;
+ preset.PicturePadLeft = export.Task.Padding.X;
+ preset.PicturePadRight = export.Task.Padding.Right;
+ preset.PicturePadColor = export.Task.Padding.Color;
+ preset.PictureUseMaximumSize = export.Task.OptimalSize;
+ preset.PictureAllowUpscaling = export.Task.AllowUpscaling;
+
 if (export.Task.Rotation != 0 || export.Task.FlipVideo)
 {
 preset.PictureRotate = string.Format("{0}:{1}", export.Task.Rotation, export.Task.FlipVideo ? "1" : "0");
 }
 
 preset.PictureTopCrop = export.Task.Cropping.Top;
- preset.PictureWidth = preset.UsesPictureSettings >= 1 ? export.Task.MaxWidth : 0; // TODO
+ preset.PictureWidth = export.Task.MaxWidth;
 preset.PictureDARWidth = export.Task.DisplayWidth.HasValue ? (int)export.Task.DisplayWidth.Value : 0;
 preset.PictureAutoCrop = !export.Task.HasCropping;
 preset.PictureBottomCrop = export.Task.Cropping.Bottom;
 
 // Filters
- preset.UsesPictureFilters = true;
 preset.PictureDeblockPreset = export.Task.DeblockPreset?.Key;
 preset.PictureDeblockTune = export.Task.DeblockTune?.Key;
 preset.PictureDeblockCustom = export.Task.CustomDeblock;
@@ -645,6 +670,13 @@
 preset.PictureSharpenTune = export.Task.SharpenTune != null ? export.Task.SharpenTune.Key : string.Empty;
 preset.PictureSharpenCustom = export.Task.SharpenCustom;
 
+ preset.PictureColorspacePreset = export.Task.Colourspace?.Key;
+ preset.PictureColorspaceCustom = export.Task.CustomColourspace;
+
+ preset.PictureChromaSmoothPreset = export.Task.ChromaSmooth?.Key;
+ preset.PictureChromaSmoothTune = export.Task.ChromaSmoothTune?.Key;
+ preset.PictureChromaSmoothCustom = export.Task.CustomChromaSmooth;
+ 
 // Video
 preset.VideoEncoder = EnumHelper<VideoEncoder>.GetShortName(export.Task.VideoEncoder);
 preset.VideoFramerate = export.Task.Framerate.HasValue ? export.Task.Framerate.ToString() : null;
@@ -654,34 +686,24 @@
 preset.VideoOptionExtra = export.Task.ExtraAdvancedArguments;
 preset.VideoPreset = export.Task.VideoPreset != null ? export.Task.VideoPreset.ShortName : null;
 preset.VideoProfile = export.Task.VideoProfile != null ? export.Task.VideoProfile.ShortName : null;
- preset.VideoQSVAsyncDepth = 4; // Defaulted to 4 for now.
 preset.VideoQSVDecode = config.EnableQuickSyncDecoding;
 preset.VideoQualitySlider = export.Task.Quality.HasValue ? export.Task.Quality.Value : 0;
 preset.VideoQualityType = (int)export.Task.VideoEncodeRateType;
- preset.VideoScaler = EnumHelper<VideoScaler>.GetShortName(config.ScalingMode);
- preset.VideoTune = export.Task.VideoTunes.Aggregate(string.Empty, (current, item) => !string.IsNullOrEmpty(current) ? string.Format("{0}, {1}", current, item.ShortName) : item.ShortName);
+ preset.VideoScaler = EnumHelper<VideoScaler>.GetShortName(VideoScaler.Lanczos);
+ preset.VideoTune = export.Task.VideoTunes.Aggregate(string.Empty, (current, item) => !string.IsNullOrEmpty(current) ? string.Format("{0},{1}", current, item.ShortName) : item.ShortName);
 preset.VideoAvgBitrate = export.Task.VideoBitrate ?? 0;
 preset.VideoColorMatrixCode = 0; // TODO not supported.
 preset.VideoTurboTwoPass = export.Task.TurboFirstPass;
 preset.VideoTwoPass = export.Task.TwoPass;
 
 // Unknown
- preset.ChildrenArray = new List<object>(); // We don't support nested presets.
- preset.Folder = false; // TODO
- preset.FolderOpen = false; // TODO
+ preset.ChildrenArray = new List<object>(); 
+ preset.Folder = false;
+ preset.FolderOpen = false;
 
 return preset;
 }
 
- /// <summary>
- /// Get the OutputFormat Enum for a given string
- /// </summary>
- /// <param name="format">
- /// OutputFormat as a string
- /// </param>
- /// <returns>
- /// An OutputFormat Enum
- /// </returns> 
 private static OutputFormat GetFileFormat(string format)
 {
 switch (format.ToLower())
@@ -695,6 +717,9 @@
 case "mkv":
 case "av_mkv":
 return OutputFormat.Mkv;
+ case "webm":
+ case "av_webm":
+ return OutputFormat.WebM;
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetObject.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetObject.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Interfaces/IPresetService.cs Changed

@@ -9,10 +9,11 @@
 
 namespace HandBrakeWPF.Services.Presets.Interfaces
 {
+ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model;
 
 using HandBrakeWPF.Services.Presets.Model;
 
@@ -22,10 +23,17 @@
 public interface IPresetService
 {
 /// <summary>
+ /// Subscribe to get notifications when a preset is added.
+ /// </summary>
+ event EventHandler PresetCollectionChanged;
+
+ /// <summary>
 /// Gets a Collection of presets.
 /// </summary>
 ObservableCollection<IPresetObject> Presets { get; }
 
+ List<Preset> FlatPresetList { get; }
+
 /// <summary>
 /// Gets DefaultPreset.
 /// </summary>
@@ -37,7 +45,12 @@
 void Load();
 
 /// <summary>
- /// Save the state of the Preset Treview
+ /// Force save updates to the preset files. Rarely should need to be called. Only used by the preset manager.
+ /// </summary>
+ void Save();
+
+ /// <summary>
+ /// Save the state of the Preset Treeview
 /// </summary>
 void SaveCategoryStates();
 
@@ -49,6 +62,9 @@
 /// <summary>
 /// Get a list of preset categories.
 /// </summary>
+ /// <param name="userCategoriesOnly">
+ /// The user Categories Only.
+ /// </param>
 /// <returns>
 /// String list.
 /// </returns>
@@ -88,6 +104,8 @@
 /// </param>
 void Export(string filename, Preset preset, HBConfiguration configuration);
 
+ void ExportCategories(string filename, IList<PresetDisplayCategory> categories, HBConfiguration configuration);
+
 /// <summary>
 /// Update a preset
 /// </summary>
@@ -183,5 +201,10 @@
 /// </summary>
 /// <param name="selectedPreset">The preset we want to select.</param>
 void SetSelected(Preset selectedPreset);
+
+ /// <summary>
+ /// Change the category to which a preset belongs.
+ /// </summary>
+ void ChangePresetCategory(Preset preset, string categoryName);
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs Changed

@@ -16,97 +16,57 @@
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Presets.Interfaces;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;
+ using EncodeTask = Encode.Model.EncodeTask;
 
- /// <summary>
- /// A Preset for encoding with.
- /// </summary>
- public class Preset : PropertyChangedBase, IPresetObject // Delibery not 
+ public class Preset : PropertyChangedBase, IPresetObject
 {
- #region Constants and Fields
-
- /// <summary>
- /// The is default.
- /// </summary>
 private bool isDefault;
 
 private bool isSelected;
 
- #endregion
-
- /// <summary>
- /// Initializes a new instance of the <see cref="Preset"/> class. 
- /// </summary>
 public Preset()
 {
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="Preset"/> class. 
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
 public Preset(Preset preset)
 {
 this.Category = preset.Category;
 this.Description = preset.Description;
 this.IsBuildIn = preset.IsBuildIn;
 this.Name = preset.Name;
- this.PictureSettingsMode = preset.PictureSettingsMode;
 this.Task = new EncodeTask(preset.Task);
 this.AudioTrackBehaviours = new AudioBehaviours(preset.AudioTrackBehaviours);
 this.SubtitleTrackBehaviours = new SubtitleBehaviours(preset.SubtitleTrackBehaviours);
 }
 
- #region Properties
-
- /// <summary>
- /// Gets or sets the category which the preset resides under
- /// </summary>
 public string Category { get; set; }
 
- /// <summary>
- /// Gets or sets the Description for the preset
- /// </summary>
 public string Description { get; set; }
 
- /// <summary>
- /// Reflects the visual state of this preset.
- /// </summary>
 public bool IsExpanded { get; set; }
 
 public string DisplayValue
 {
 get
 {
- string globalCateogry = this.IsBuildIn ? Resources.Preset_Official : Resources.Preset_Custom;
+ string globalCategory = this.IsBuildIn ? Resources.Preset_Official : Resources.Preset_Custom;
 return string.Format("{0}", this.Name);
 }
 }
 
 public bool IsSelected
 {
- get
- {
- return this.isSelected;
- }
+ get => this.isSelected;
 set
 {
+ if (value == this.isSelected) return;
 this.isSelected = value;
 this.NotifyOfPropertyChange(() => this.IsSelected);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether this is a built in preset
- /// </summary>
 public bool IsBuildIn { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether IsDefault.
- /// </summary>
 public bool IsDefault
 {
 get
@@ -120,126 +80,26 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the preset name
- /// </summary>
 public string Name { get; set; }
 
- /// <summary>
- /// Gets or sets PictureSettingsMode.
- /// Source Maximum, Custom or None
- /// </summary>
- public PresetPictureSettingsMode PictureSettingsMode { get; set; }
-
- /// <summary>
- /// Gets or sets task.
- /// </summary>
 public EncodeTask Task { get; set; }
 
- /// <summary>
- /// Gets or sets the audio track behaviours.
- /// </summary>
 public AudioBehaviours AudioTrackBehaviours { get; set; }
 
- /// <summary>
- /// Gets or sets the subtitle track behaviours.
- /// </summary>
 public SubtitleBehaviours SubtitleTrackBehaviours { get; set; }
 
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// Update this preset.
- /// The given parameters should be copy-constructed.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- /// <param name="audioBehaviours">
- /// The audio behaviours.
- /// </param>
- /// <param name="subtitleBehaviours">
- /// The subtitle behaviours.
- /// </param>
+ public bool IsPresetDisabled { get; set; }
+
 public void Update(EncodeTask task, AudioBehaviours audioBehaviours, SubtitleBehaviours subtitleBehaviours)
 {
- // Copy over Max Width / Height for the following picture settings modes.
- if (this.PictureSettingsMode == PresetPictureSettingsMode.Custom
- || this.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- task.MaxWidth = this.Task.MaxWidth;
- task.MaxHeight = this.Task.MaxHeight;
- }
-
 this.Task = task;
 this.AudioTrackBehaviours = new AudioBehaviours(audioBehaviours);
 this.SubtitleTrackBehaviours = new SubtitleBehaviours(subtitleBehaviours);
 }
 
- /// <summary>
- /// Override the ToString Method
- /// </summary>
- /// <returns>
- /// The Preset Name
- /// </returns>
 public override string ToString()
 {
 return this.Name;
 }
-
- #endregion
-
- /// <summary>
- /// The equals.
- /// </summary>
- /// <param name="obj">
- /// The obj.
- /// </param>
- /// <returns>
- /// The <see cref="bool"/>.
- /// </returns>
- public override bool Equals(object obj)
- {
- if (ReferenceEquals(null, obj))
- {
- return false;
- }
- if (ReferenceEquals(this, obj))
- {
- return true;
- }
- if (obj.GetType() != this.GetType())
- {
- return false;
- }
- return Equals((Preset)obj);
- }
-
- /// <summary>
- /// The get hash code.
- /// </summary>
- /// <returns>
- /// The <see cref="int"/>.
- /// </returns>
- public override int GetHashCode()
- {
- return (this.Name != null ? this.Name.GetHashCode() : 0);
- }
-
- /// <summary>
- /// The equals.
- /// </summary>
- /// <param name="other">
- /// The other.
- /// </param>
- /// <returns>
- /// The <see cref="bool"/>.
- /// </returns>
- protected bool Equals(Preset other)
- {
- return string.Equals(this.Name, other.Name);
- }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Model/PresetDisplayCategory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/Model/PresetDisplayCategory.cs Changed

@@ -26,30 +26,34 @@
 }
 
 public string Category { get; private set; }
+
 public BindingList<Preset> Presets { get; private set; }
+
 public string Description => this.Category;
+
 public bool IsBuiltIn { get; }
 
 public bool IsExpanded
 {
- get
- {
- return this.isExpanded;
- }
+ get => this.isExpanded;
 set
 {
- if (value == this.isExpanded) return;
+ if (value == this.isExpanded)
+ {
+ return;
+ }
+
 this.isExpanded = value;
 this.NotifyOfPropertyChange(() => this.IsExpanded);
 }
 }
 
+ public bool IsPresetDisabled => false;
+
 public bool IsSelected
 {
- get
- {
- return this.isSelected;
- }
+ get => this.isSelected;
+
 set
 {
 if (value == this.isSelected) return;
@@ -68,7 +72,7 @@
 
 public override int GetHashCode()
 {
- return (this.Category != null ? this.Category.GetHashCode() : 0);
+ return this.Category != null ? this.Category.GetHashCode() : 0;
 }
 
 protected bool Equals(PresetDisplayCategory other)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Presets/PresetService.cs Changed

@@ -12,50 +12,42 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
- using System.Collections.Specialized;
 using System.ComponentModel;
- using System.Diagnostics;
 using System.IO;
 using System.Linq;
+ using System.Runtime.InteropServices;
+ using System.Text.Json;
 using System.Windows;
- using System.Windows.Documents;
 
 using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Presets;
 using HandBrake.Interop.Interop.Json.Presets;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Model;
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Factories;
- using HandBrakeWPF.Model.Picture;
 using HandBrakeWPF.Properties;
- using HandBrakeWPF.Services.Encode.Model.Models;
 using HandBrakeWPF.Services.Interfaces;
- using HandBrakeWPF.Services.Logging;
 using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Services.Presets.Factories;
 using HandBrakeWPF.Services.Presets.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
+ using GeneralApplicationException = Exceptions.GeneralApplicationException;
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
 
- using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
-
- /// <summary>
- /// The preset service manages HandBrake's presets
- /// </summary>
 public class PresetService : IPresetService
 {
 public const int ForcePresetReset = 3;
- public static string UserPresetCatgoryName = "Custom Presets";
- private readonly string presetFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly()), "presets.json");
+ public static string UserPresetCategoryName = "Custom Presets";
+ private readonly string presetFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly()), "presets.json");
 private readonly ObservableCollection<IPresetObject> presets = new ObservableCollection<IPresetObject>(); // Can store Presets and PresetDisplayCategory objects.
 private readonly Dictionary<string, Preset> flatPresetDict = new Dictionary<string, Preset>();
 private readonly List<Preset> flatPresetList = new List<Preset>();
 private readonly IErrorService errorService;
 private readonly IUserSettingService userSettingService;
- private ILog log = null;
+ private ILog log;
 
 public PresetService(IErrorService errorService, IUserSettingService userSettingService, ILog logService)
 {
@@ -64,9 +56,8 @@
 this.userSettingService = userSettingService;
 }
 
- /// <summary>
- /// Gets a Collection of presets.
- /// </summary>
+ public event EventHandler PresetCollectionChanged;
+
 public ObservableCollection<IPresetObject> Presets
 {
 get
@@ -75,9 +66,8 @@
 }
 }
 
- /// <summary>
- /// Gets the DefaultPreset.
- /// </summary>
+ public List<Preset> FlatPresetList => this.flatPresetList.ToList();
+
 public Preset DefaultPreset
 {
 get
@@ -86,9 +76,6 @@
 }
 }
 
- /// <summary>
- /// The load.
- /// </summary>
 public void Load()
 {
 // Load the presets from file
@@ -100,20 +87,6 @@
 return this.Add(preset, false);
 }
 
- /// <summary>
- /// Add a new preset to the system.
- /// Performs an Update if it already exists
- /// </summary>
- /// <param name="preset">
- /// A Preset to add
- /// </param>
- /// <param name="isLoading">
- /// Prevents Saving of presets.
- /// </param>
- /// <returns>
- /// True if added,
- /// False if name already exists
- /// </returns>
 public bool Add(Preset preset, bool isLoading)
 {
 if (!this.CheckIfPresetExists(preset.Name))
@@ -142,6 +115,7 @@
 if (!isLoading)
 {
 this.SavePresetFiles();
+ this.OnPresetCollectionChanged();
 }
 
 return true;
@@ -149,21 +123,16 @@
 else
 {
 this.Update(preset);
+ this.OnPresetCollectionChanged();
 return true;
 }
 }
 
- /// <summary>
- /// The import.
- /// </summary>
- /// <param name="filename">
- /// The filename.
- /// </param>
 public void Import(string filename)
 {
 if (!string.IsNullOrEmpty(filename))
 {
- PresetTransportContainer container = null;
+ PresetTransportContainer container;
 try
 {
 container = HandBrakePresetService.GetPresetsFromFile(filename);
@@ -186,13 +155,15 @@
 bool containsBuildInPreset = false;
 foreach (var objectPreset in container.PresetList)
 {
- PresetCategory category = JsonConvert.DeserializeObject<PresetCategory>(objectPreset.ToString());
+ HBPresetCategory category = JsonSerializer.Deserialize<HBPresetCategory>(objectPreset.ToString(), JsonSettings.Options);
 if (category != null && category.ChildrenArray != null && category.ChildrenArray.Count > 0)
 {
 foreach (HBPreset hbPreset in category.ChildrenArray)
 {
- Preset preset = this.ConvertHbPreset(hbPreset);
- if (preset != null && !preset.IsBuildIn)
+ Preset preset = this.ConvertHbPreset(hbPreset, category.PresetName);
+ preset.IsPresetDisabled = this.IsPresetDisabled(preset);
+ preset.IsDefault = false; // When importing, force the user to reset default manually. This prevents conflicts.
+ if (!preset.IsBuildIn)
 {
 this.AddOrUpdateImportedPreset(preset);
 }
@@ -204,11 +175,13 @@
 }
 else
 {
- HBPreset hbPreset = JsonConvert.DeserializeObject<HBPreset>(objectPreset.ToString());
+ HBPreset hbPreset = JsonSerializer.Deserialize<HBPreset>(objectPreset.ToString(), JsonSettings.Options);
 if (hbPreset != null)
 {
- Preset preset = this.ConvertHbPreset(hbPreset);
- if (preset != null && !preset.IsBuildIn)
+ Preset preset = this.ConvertHbPreset(hbPreset, null);
+ preset.IsDefault = false; // When importing, force the user to reset default manually. This prevents conflicts.
+ preset.IsPresetDisabled = this.IsPresetDisabled(preset);
+ if (!preset.IsBuildIn)
 {
 this.AddOrUpdateImportedPreset(preset);
 }
@@ -232,38 +205,24 @@
 }
 }
 
- /// <summary>
- /// The export.
- /// </summary>
- /// <param name="filename">
- /// The filename.
- /// </param>
- /// <param name="preset">
- /// The preset.
- /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
 public void Export(string filename, Preset preset, HBConfiguration configuration)
 {
- // TODO Add support for multiple export
 PresetTransportContainer container = JsonPresetFactory.ExportPreset(preset, configuration);
 HandBrakePresetService.ExportPreset(filename, container);
 }
 
- /// <summary>
- /// Update a preset
- /// </summary>
- /// <param name="update">
- /// The updated preset
- /// </param>
+ public void ExportCategories(string filename, IList<PresetDisplayCategory> categories, HBConfiguration configuration)
+ {
+ PresetTransportContainer container = JsonPresetFactory.ExportPresetCategories(categories, configuration);
+ HandBrakePresetService.ExportPreset(filename, container);
+ }
+
 public void Update(Preset update)
 {
 Preset preset;
 if (this.flatPresetDict.TryGetValue(update.Name, out preset))
 {
 preset.Task = update.Task;
- preset.PictureSettingsMode = update.PictureSettingsMode;
 preset.Category = update.Category;
 preset.Description = update.Description;
 preset.AudioTrackBehaviours = update.AudioTrackBehaviours;
@@ -274,45 +233,40 @@
 }
 }
 
- /// <summary>
- /// Replace an existing preset with a modified one.
- /// </summary>
- /// <param name="existing">
- /// The existing.
- /// </param>
- /// <param name="replacement">
- /// The replacement.
- /// </param>
 public void Replace(Preset existing, Preset replacement)
 {
- this.Remove(existing);
+ this.Remove(existing, true, true);
 this.Add(replacement, false);
+ this.OnPresetCollectionChanged();
 }
 
- /// <summary>
- /// Remove a preset with a given name from either the built in or user preset list.
- /// </summary>
- /// <param name="preset">
- /// The Preset to remove
- /// </param>
- /// <returns>True if successfully removed, false otherwise.</returns>
 public bool Remove(Preset preset)
 {
- if (preset == null || preset.IsDefault)
+ return this.Remove(preset, false, false);
+ }
+
+ public bool Remove(Preset preset, bool overrideDefaultCheck, bool skipCategoryRemoval)
+ {
+ if (preset == null)
 {
 return false;
 }
 
- PresetDisplayCategory cateogry = this.presets.FirstOrDefault(p => p.Category == preset.Category) as PresetDisplayCategory;
- if (cateogry != null)
+ if (preset.IsDefault && !overrideDefaultCheck)
+ {
+ return false;
+ }
+ 
+ PresetDisplayCategory category = this.presets.FirstOrDefault(p => p.Category == preset.Category) as PresetDisplayCategory;
+ if (category != null)
 {
 // Remove the preset, and cleanup the category if it's not got any presets in it.
- cateogry.Presets.Remove(preset);
+ category.Presets.Remove(preset);
 this.flatPresetList.Remove(preset);
 this.flatPresetDict.Remove(preset.Name);
- if (cateogry.Presets.Count == 0)
+ if (category.Presets.Count == 0 && !skipCategoryRemoval)
 {
- this.presets.Remove(cateogry);
+ this.presets.Remove(category);
 }
 }
 else
@@ -323,16 +277,41 @@
 }
 
 this.SavePresetFiles();
+ this.OnPresetCollectionChanged();
 
 return true;
 }
 
- /// <summary>
- /// Remove a group of presets by category
- /// </summary>
- /// <param name="categoryName">
- /// The Category to remove
- /// </param>
+ public void AddCategory(string categoryName)
+ {
+ if (string.IsNullOrEmpty(categoryName))
+ {
+ this.errorService.ShowMessageBox(
+ Resources.PresetService_CategoryNameEmpty,
+ Resources.Error,
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ }
+
+ PresetDisplayCategory category = this.presets.FirstOrDefault(a => a.Category == categoryName) as PresetDisplayCategory;
+ if (category != null)
+ {
+ this.errorService.ShowMessageBox(
+ Resources.PresetService_CategoryAlreadyExists,
+ Resources.Error,
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+
+ return;
+ }
+
+ // Otherwise, if we have category but it doesn't exist, create it.
+ this.presets.Add(new PresetDisplayCategory(categoryName, false, new BindingList<Preset>()));
+
+ // Update the presets file
+ this.SavePresetFiles();
+ }
+
 public void RemoveGroup(string categoryName)
 {
 PresetDisplayCategory category = this.presets.FirstOrDefault(p => p.Category == categoryName) as PresetDisplayCategory;
@@ -361,12 +340,6 @@
 }
 }
 
- /// <summary>
- /// Set Default Preset
- /// </summary>
- /// <param name="preset">
- /// The name.
- /// </param>
 public void SetDefault(Preset preset)
 {
 // Set IsDefault false for everything.
@@ -381,15 +354,6 @@
 this.SavePresetFiles();
 }
 
- /// <summary>
- /// Get a Preset
- /// </summary>
- /// <param name="name">
- /// The name of the preset to get
- /// </param>
- /// <returns>
- /// A Preset or null object
- /// </returns>
 public Preset GetPreset(string name)
 {
 Preset preset;
@@ -401,9 +365,6 @@
 return null;
 }
 
- /// <summary>
- /// Clear Built-in Presets
- /// </summary>
 public void ClearBuiltIn()
 {
 List<IPresetObject> topLevel = new List<IPresetObject>();
@@ -459,24 +420,20 @@
 }
 }
 
- /// <summary>
- /// Clear all presets
- /// </summary>
 public void ClearAll()
 {
 this.presets.Clear();
 this.flatPresetList.Clear();
 }
 
- /// <summary>
- /// Reads the CLI's CLI output format and load's them into the preset List Preset
- /// </summary>
 public void UpdateBuiltInPresets()
 {
 // Clear the current built in Presets and now parse the temporary Presets file.
 this.ClearBuiltIn();
 
- IList<PresetCategory> presetCategories = HandBrakePresetService.GetBuiltInPresets();
+ bool hasUserDefault = this.flatPresetDict.Values.FirstOrDefault(f => f.IsDefault) != null;
+
+ IList<HBPresetCategory> presetCategories = HandBrakePresetService.GetBuiltInPresets();
 
 foreach (var category in presetCategories)
 {
@@ -485,7 +442,12 @@
 Preset preset = JsonPresetFactory.ImportPreset(hbpreset);
 preset.IsBuildIn = true;
 preset.Category = category.PresetName;
- preset.Task.AllowedPassthruOptions = new AllowedPassthru(true); // We don't want to override the built-in preset
+ preset.IsPresetDisabled = this.IsPresetDisabled(preset) || hbpreset.PresetDisabled;
+
+ if (hbpreset.Default && hasUserDefault)
+ {
+ preset.IsDefault = false;
+ }
 
 this.Add(preset, true);
 }
@@ -502,15 +464,6 @@
 this.SavePresetFiles();
 }
 
- /// <summary>
- /// Check if the preset "name" exists in either Presets or UserPresets lists.
- /// </summary>
- /// <param name="name">
- /// Name of the preset
- /// </param>
- /// <returns>
- /// True if found
- /// </returns>
 public bool CheckIfPresetExists(string name)
 {
 if (this.flatPresetDict.ContainsKey(name))
@@ -521,15 +474,6 @@
 return false;
 }
 
- /// <summary>
- /// Returns a value if the preset can be updated / resaved
- /// </summary>
- /// <param name="name">
- /// The name.
- /// </param>
- /// <returns>
- /// True if it's not a built-in preset, false otherwise.
- /// </returns>
 public bool CanUpdatePreset(string name)
 {
 Preset preset;
@@ -541,10 +485,6 @@
 return true;
 }
 
- /// <summary>
- /// Set the selected preset
- /// </summary>
- /// <param name="selectedPreset">The preset we want to select.</param>
 public void SetSelected(Preset selectedPreset)
 {
 foreach (var item in this.flatPresetList)
@@ -553,11 +493,36 @@
 }
 
 selectedPreset.IsSelected = true;
+
+ IPresetObject category = this.Presets.FirstOrDefault(p => p.Category == selectedPreset.Category);
+ if (category != null)
+ {
+ category.IsExpanded = true;
+ }
+ }
+
+ public void ChangePresetCategory(Preset preset, string categoryName)
+ {
+ if (string.IsNullOrEmpty(categoryName))
+ {
+ return;
+ }
+
+ if (preset != null)
+ {
+ preset.Category = categoryName;
+ }
+
+ this.Save();
+ this.ClearPresetService();
+ this.Load();
+ this.LoadCategoryStates();
+ this.OnPresetCollectionChanged();
 }
 
 public void SaveCategoryStates()
 {
- StringCollection expandedPresets = new StringCollection();
+ List<string> expandedPresets = new List<string>();
 foreach (IPresetObject presetObject in this.presets)
 {
 PresetDisplayCategory category = presetObject as PresetDisplayCategory;
@@ -572,7 +537,7 @@
 
 public void LoadCategoryStates()
 {
- StringCollection expandedPresets = this.userSettingService.GetUserSetting<StringCollection>(UserSettingConstants.PresetExpandedStateList);
+ List<string> expandedPresets = this.userSettingService.GetUserSetting<List<string>>(UserSettingConstants.PresetExpandedStateList);
 if (expandedPresets == null || expandedPresets.Count == 0)
 {
 return;
@@ -609,18 +574,11 @@
 return categoriesList;
 }
 
- /// <summary>
- /// Archive the presets file without deleting it.
- /// </summary>
- /// <param name="file">
- /// The filename to archive
- /// </param>
- /// <param name="delete">
- /// True will delete the current presets file.
- /// </param>
- /// <returns>
- /// The archived filename
- /// </returns>
+ public void Save()
+ {
+ this.SavePresetFiles();
+ }
+ 
 private string ArchivePresetFile(string file, bool delete)
 {
 try
@@ -656,9 +614,6 @@
 return "Sorry, the archiving failed.";
 }
 
- /// <summary>
- /// Load in the Built-in and User presets into the collection
- /// </summary>
 private void LoadPresets()
 {
 // First clear the Presets arraylists
@@ -685,7 +640,7 @@
 this.ServiceLogMessage("Corrupted Presets File Detected: " + Environment.NewLine + exc);
 }
 
- // Sanity Check. Did the container deserialise.
+ // Sanity Check. Did the container deserialize.
 if (container?.PresetList == null)
 {
 this.ServiceLogMessage("Attempting Preset Recovery ...");
@@ -724,6 +679,8 @@
 {
 this.UpdateBuiltInPresets();
 }
+
+ CheckAndSetDefault(); // Make a preset default if one we have none.
 }
 catch (Exception ex)
 {
@@ -738,10 +695,10 @@
 // The presets file loaded was OK, so process it.
 foreach (var item in container.PresetList)
 {
- object deserialisedItem = JsonConvert.DeserializeObject<PresetCategory>(item.ToString());
+ object deserializedItem = JsonSerializer.Deserialize<HBPresetCategory>(item.ToString(), JsonSettings.Options);
 
 // Handle Categorised Presets.
- PresetCategory category = deserialisedItem as PresetCategory;
+ HBPresetCategory category = deserializedItem as HBPresetCategory;
 if (category != null && category.Folder)
 {
 foreach (HBPreset hbpreset in category.ChildrenArray)
@@ -749,44 +706,29 @@
 Preset preset = JsonPresetFactory.ImportPreset(hbpreset);
 
 // Migration
- preset.Category = category.PresetName == "User Presets" ? UserPresetCatgoryName : category.PresetName;
+ preset.Category = category.PresetName == "User Presets" ? UserPresetCategoryName : category.PresetName;
 preset.IsBuildIn = hbpreset.Type == 0;
-
- // IF we are using Source Max, Set the Max Width / Height values.
- if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- preset.Task.MaxWidth = preset.Task.Height;
- preset.Task.MaxHeight = preset.Task.Width;
- }
+ preset.IsPresetDisabled = this.IsPresetDisabled(preset);
 
 this.Add(preset, true);
 }
 }
 
 // Uncategorised Presets
- deserialisedItem = JsonConvert.DeserializeObject<HBPreset>(item.ToString());
- HBPreset hbPreset = deserialisedItem as HBPreset;
+ deserializedItem = JsonSerializer.Deserialize<HBPreset>(item.ToString(), JsonSettings.Options);
+ HBPreset hbPreset = deserializedItem as HBPreset;
 if (hbPreset != null && !hbPreset.Folder)
 {
 Preset preset = JsonPresetFactory.ImportPreset(hbPreset);
- preset.Category = UserPresetCatgoryName;
- preset.IsBuildIn = hbPreset.Type == 1;
-
- // IF we are using Source Max, Set the Max Width / Height values.
- if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- preset.Task.MaxWidth = preset.Task.Height;
- preset.Task.MaxHeight = preset.Task.Width;
- }
+ preset.Category = UserPresetCategoryName;
+ preset.IsBuildIn = hbPreset.Type == 0;
+ preset.IsPresetDisabled = this.IsPresetDisabled(preset);
 
 this.Add(preset, true);
 }
 }
 }
 
- /// <summary>
- /// Update the preset files
- /// </summary>
 private void SavePresetFiles()
 {
 try
@@ -799,7 +741,7 @@
 }
 
 // Organise the Presets list into Json Equivalent objects.
- Dictionary<string, PresetCategory> presetCategories = new Dictionary<string, PresetCategory>();
+ Dictionary<string, HBPresetCategory> presetCategories = new Dictionary<string, HBPresetCategory>();
 List<HBPreset> uncategorisedPresets = new List<HBPreset>();
 
 // Handle User Presets.
@@ -809,8 +751,6 @@
 this.HandlePresetListsForSave(this.flatPresetList.Where(o => o.IsBuildIn).ToList(), presetCategories, uncategorisedPresets);
 
 // Wrap the categories in a container. 
- JsonSerializerSettings settings = new JsonSerializerSettings { MissingMemberHandling = MissingMemberHandling.Ignore };
-
 PresetVersion presetVersion = HandBrakePresetService.GetCurrentPresetVersion();
 PresetTransportContainer container = new PresetTransportContainer(presetVersion.Major, presetVersion.Minor, presetVersion.Micro) { PresetList = new List<object>() };
 container.PresetList.AddRange(presetCategories.Values);
@@ -819,7 +759,7 @@
 // Write the preset container out to file.
 using (FileStream strm = new FileStream(this.presetFile, FileMode.Create, FileAccess.Write))
 {
- string presetsJson = JsonConvert.SerializeObject(container, Formatting.Indented, settings);
+ string presetsJson = JsonSerializer.Serialize(container, JsonSettings.Options);
 using (StreamWriter writer = new StreamWriter(strm))
 {
 writer.WriteLine(presetsJson);
@@ -832,7 +772,14 @@
 }
 }
 
- private void HandlePresetListsForSave(List<Preset> processList, Dictionary<string, PresetCategory> presetCategories, List<HBPreset> uncategorisedPresets)
+ private void ClearPresetService()
+ {
+ this.flatPresetDict.Clear();
+ this.flatPresetList.Clear();
+ this.presets.Clear();
+ }
+
+ private void HandlePresetListsForSave(List<Preset> processList, Dictionary<string, HBPresetCategory> presetCategories, List<HBPreset> uncategorisedPresets)
 {
 foreach (Preset item in processList)
 {
@@ -849,8 +796,8 @@
 }
 else
 {
- presetCategoriesitem.Category = new PresetCategory
- {
+ presetCategoriesitem.Category = new HBPresetCategory
+ {
 ChildrenArray = new List<HBPreset> { preset },
 Folder = true,
 PresetName = item.Category,
@@ -861,19 +808,10 @@
 }
 }
 
- private Preset ConvertHbPreset(HBPreset hbPreset)
+ private Preset ConvertHbPreset(HBPreset hbPreset, string categoryName)
 {
- Preset preset = null;
-
- preset = JsonPresetFactory.ImportPreset(hbPreset);
- preset.Category = UserPresetCatgoryName; // TODO can we get this from the preset?
-
- // IF we are using Source Max, Set the Max Width / Height values.
- if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- preset.Task.MaxWidth = preset.Task.Height;
- preset.Task.MaxHeight = preset.Task.Width;
- }
+ Preset preset = JsonPresetFactory.ImportPreset(hbPreset);
+ preset.Category = !string.IsNullOrEmpty(categoryName) ? categoryName : UserPresetCategoryName;
 
 return preset;
 }
@@ -906,6 +844,74 @@
 }
 }
 
+ private bool IsPresetDisabled(Preset preset)
+ {
+ bool isQsvEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncEncoding);
+ bool isNvencEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableNvencEncoder);
+ bool isVcnEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableVceEncoder);
+
+ if (preset.Task.VideoEncoder == VideoEncoder.QuickSync && (!HandBrakeHardwareEncoderHelper.IsQsvAvailable || !isQsvEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.QuickSyncH265 && (!HandBrakeHardwareEncoderHelper.IsQsvAvailableH265 || !isQsvEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.QuickSyncH26510b && (!HandBrakeHardwareEncoderHelper.IsQsvAvailableH265 || !isQsvEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.VceH264 && (!HandBrakeHardwareEncoderHelper.IsVceH264Available || !isVcnEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.VceH265 && (!HandBrakeHardwareEncoderHelper.IsVceH265Available || !isVcnEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.NvencH264 && (!HandBrakeHardwareEncoderHelper.IsNVEncH264Available || !isNvencEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.NvencH265 && (!HandBrakeHardwareEncoderHelper.IsNVEncH265Available || !isNvencEnabled))
+ {
+ return true;
+ }
+
+ if (preset.Task.VideoEncoder == VideoEncoder.MFH264 || preset.Task.VideoEncoder == VideoEncoder.MFH265)
+ {
+ if (RuntimeInformation.ProcessArchitecture != Architecture.Arm64)
+ {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ private void OnPresetCollectionChanged()
+ {
+ this.PresetCollectionChanged?.Invoke(this, EventArgs.Empty);
+ }
+
+ private void CheckAndSetDefault()
+ {
+ if (this.DefaultPreset == null)
+ {
+ Preset p = this.flatPresetList.FirstOrDefault();
+ p.IsDefault = true;
+
+ this.Save();
+ }
+ }
+
 protected void ServiceLogMessage(string message)
 {
 this.log.LogMessage(string.Format("Preset Service: {0}{1}{0}", Environment.NewLine, message));

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/ActiveJob.cs Added

@@ -0,0 +1,127 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ActiveJob.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ActiveJob type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Queue
+{
+ using System;
+
+ using HandBrakeWPF.Services.Encode.EventArgs;
+ using HandBrakeWPF.Services.Encode.Interfaces;
+ using HandBrakeWPF.Services.Queue.JobEventArgs;
+ using HandBrakeWPF.Services.Queue.Model;
+
+ public class ActiveJob : IDisposable
+ {
+ private readonly QueueTask job;
+ private readonly IEncode encodeService;
+
+ public ActiveJob(QueueTask task, IEncode encodeService)
+ {
+ this.job = task;
+ this.encodeService = encodeService;
+ }
+
+ public event EventHandler<ActiveJobCompletedEventArgs> JobFinished;
+
+ public event EventHandler<EncodeProgressEventArgs> JobStatusUpdated;
+
+ public QueueTask Job => this.job;
+
+ public bool IsPaused { get; private set; }
+
+ public bool IsEncoding { get; set; }
+ 
+ public void Start()
+ {
+ this.IsPaused = false;
+ this.IsEncoding = true;
+
+ if (this.encodeService.IsPaused)
+ {
+ this.encodeService.Resume();
+ this.job.Statistics.SetPaused(false);
+ this.job.Status = QueueItemStatus.InProgress;
+ }
+ else if (!this.encodeService.IsEncoding)
+ {
+ this.job.Status = QueueItemStatus.InProgress;
+ this.job.Statistics.StartTime = DateTime.Now;
+
+ this.encodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+ this.encodeService.EncodeStatusChanged += this.EncodeStatusChanged;
+ 
+ this.encodeService.Start(this.job.Task, this.job.Configuration, this.job.SelectedPresetKey);
+ }
+ }
+
+ public void Pause()
+ {
+ if (this.encodeService.IsEncoding && !this.encodeService.IsPaused)
+ {
+ this.IsPaused = true;
+ this.encodeService.Pause();
+ this.job.Statistics.SetPaused(true);
+ this.job.Status = QueueItemStatus.Paused;
+ this.IsEncoding = false;
+ }
+ }
+
+ public void Stop()
+ {
+ if (this.encodeService.IsEncoding)
+ {
+ this.encodeService.Stop();
+ }
+
+ this.IsEncoding = false;
+ this.IsPaused = false;
+ this.encodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
+ }
+
+ public void Dispose()
+ {
+ this.encodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
+ this.encodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
+ }
+
+ private void EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
+ {
+ this.job?.JobProgress.Update(e);
+ this.OnJobStatusUpdated(e);
+ }
+
+ private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
+ {
+ this.IsEncoding = false;
+ this.IsPaused = false;
+
+ this.job.Status = !e.Successful ? QueueItemStatus.Error : QueueItemStatus.Completed;
+ this.job?.JobProgress.Update(e);
+ 
+ this.job.Statistics.UpdateStats(e, this.job);
+ 
+ this.job.JobProgress.ClearStatusDisplay();
+ 
+ this.encodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
+ this.encodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
+
+ this.OnJobFinished(e);
+ }
+
+ private void OnJobFinished(EncodeCompletedEventArgs e)
+ {
+ this.JobFinished?.Invoke(this, new ActiveJobCompletedEventArgs(this, e));
+ }
+
+ private void OnJobStatusUpdated(EncodeProgressEventArgs e)
+ {
+ this.JobStatusUpdated?.Invoke(this, e);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Interfaces/IQueueService.cs Changed

@@ -10,24 +10,25 @@
 namespace HandBrakeWPF.Services.Queue.Interfaces
 {
 using System;
+ using System.Collections.Generic;
 using System.Collections.ObjectModel;
- using System.ComponentModel;
 
- using HandBrakeWPF.Services.Queue.Model;
 
- using IEncode = Encode.Interfaces.IEncode;
+ using HandBrakeWPF.EventArgs;
+ using HandBrakeWPF.Services.Encode.EventArgs;
+ using HandBrakeWPF.Services.Queue.Model;
 
- /// <summary>
- /// The Queue Processor
- /// </summary>
 public interface IQueueService
 {
- #region Events
-
 /// <summary>
 /// Fires when the Queue has started
 /// </summary>
- event QueueService.QueueProgressStatus JobProcessingStarted;
+ event EventHandler<QueueProgressEventArgs> JobProcessingStarted;
+
+ /// <summary>
+ /// Fires when the status of any running job changes on the queue. Including progress.
+ /// </summary>
+ event EventHandler QueueJobStatusChanged;
 
 /// <summary>
 /// Fires when a job is Added, Removed or Re-Ordered.
@@ -38,16 +39,14 @@
 /// <summary>
 /// Fires when the entire encode queue has completed.
 /// </summary>
- event QueueService.QueueCompletedEventDelegate QueueCompleted;
+ event EventHandler<QueueCompletedEventArgs> QueueCompleted;
 
 /// <summary>
 /// Fires when a pause to the encode queue has been requested.
 /// </summary>
 event EventHandler QueuePaused;
 
- #endregion
-
- #region Properties
+ event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
 
 /// <summary>
 /// Gets the number of jobs in the queue
@@ -60,30 +59,24 @@
 int ErrorCount { get; }
 
 /// <summary>
- /// Gets the IEncodeService instance.
+ /// Gets the number of completed jobs.
 /// </summary>
- IEncode EncodeService { get; }
+ int CompletedCount { get; }
 
 /// <summary>
 /// Gets a value indicating whether IsProcessing.
 /// </summary>
 bool IsProcessing { get; }
 
- /// <summary>
- /// Gets or sets Last Processed Job.
- /// This is set when the job is poped of the queue by GetNextJobForProcessing();
- /// </summary>
- QueueTask LastProcessedJob { get; set; }
+ bool IsEncoding { get; }
+
+ bool IsPaused { get; }
 
 /// <summary>
 /// Gets The current queue.
 /// </summary>
 ObservableCollection<QueueTask> Queue { get; }
 
- #endregion
-
- #region Public Methods
-
 /// <summary>
 /// Add a job to the Queue. 
 /// This method is Thread Safe.
@@ -156,6 +149,12 @@
 void ClearCompleted();
 
 /// <summary>
+ /// Get the log file paths for jobs still on the queue. (Including completed) 
+ /// </summary>
+ /// <returns>List of filepaths</returns>
+ List<string> GetLogFilePaths();
+
+ /// <summary>
 /// Get the first job on the queue for processing.
 /// This also removes the job from the Queue and sets the LastProcessedJob
 /// </summary>
@@ -165,20 +164,14 @@
 QueueTask GetNextJobForProcessing();
 
 /// <summary>
- /// Moves an item down one position in the queue.
+ /// Moves items in the queue list
 /// </summary>
- /// <param name="index">
- /// The zero-based location of the job in the queue.
- /// </param>
- void MoveDown(int index);
+ void MoveToBottom(IList<QueueTask> moveItems);
 
 /// <summary>
- /// Moves an item up one position in the queue.
+ /// Moves items in the queue list
 /// </summary>
- /// <param name="index">
- /// The zero-based location of the job in the queue.
- /// </param>
- void MoveUp(int index);
+ void MoveToTop(IList<QueueTask> moveItems);
 
 /// <summary>
 /// Remove a job from the Queue.
@@ -209,26 +202,38 @@
 /// Starts encoding the first job in the queue and continues encoding until all jobs
 /// have been encoded.
 /// </summary>
- /// <param name="clearCompleted">
- /// The clear Completed.
- /// </param>
- void Start(bool clearCompleted);
+ void Start();
 
 /// <summary>
 /// Stop the current encode and pause the queue.
 /// </summary>
- void Stop();
+ /// <param name="stopExistingJobs">
+ /// Set to false to allow existing jobs to complete.
+ /// </param>
+ void Stop(bool stopExistingJobs);
 
 /// <summary>
 /// Pause the queue but allow the current encode to complete.
 /// </summary>
- void Pause();
+ /// <param name="pauseJobs">
+ /// Also pause the active jobs
+ /// </param>
+ void Pause(bool pauseJobs);
 
 /// <summary>
- /// Pause and Encode and the Queue.
+ /// Get the status of all running queue jobs.
 /// </summary>
- void PauseEncode();
+ /// <returns>
+ /// A list of QueueProgressStatus items
+ /// </returns>
+ List<QueueProgressStatus> GetQueueProgressStatus();
+
+ List<string> GetActiveJobDestinationDirectories();
 
- #endregion
+
+ /// <summary>
+ /// Queue up a breakpoint task type.
+ /// </summary>
+ void AddBreakPoint();
 }
 }
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/JobEventArgs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/JobEventArgs/ActiveJobCompletedEventArgs.cs Added

@@ -0,0 +1,25 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ActiveJobCompletedEventArgs.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Queue.JobEventArgs
+{
+ using System;
+
+ using HandBrakeWPF.Services.Encode.EventArgs;
+
+ public class ActiveJobCompletedEventArgs : EventArgs
+ {
+ public ActiveJobCompletedEventArgs(ActiveJob job, EncodeCompletedEventArgs encodeCompletedEventArgs)
+ {
+ this.EncodeEventArgs = encodeCompletedEventArgs;
+ this.Job = job;
+ }
+
+ public ActiveJob Job { get; private set; }
+
+ public EncodeCompletedEventArgs EncodeEventArgs { get; private set; }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueItemStatus.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueProgressStatus.cs Added

@@ -0,0 +1,186 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueProgressStatus.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the QueueProgressStatus type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Queue.Model
+{
+ using System;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Encode.EventArgs;
+
+ public class QueueProgressStatus : PropertyChangedBase
+ {
+ private readonly object lockObj = new object();
+
+ private string jobStatus;
+ private bool intermediateProgress;
+ private double progressValue;
+
+ private EncodeProgressEventArgs progressEventArgs;
+
+ public QueueProgressStatus()
+ {
+ this.JobStatus = "Waiting";
+ }
+
+ public string JobStatus
+ {
+ get
+ {
+ return this.jobStatus;
+ }
+
+ set
+ {
+ this.jobStatus = value;
+ this.NotifyOfPropertyChange(() => this.JobStatus);
+ }
+ }
+
+ public bool IntermediateProgress
+ {
+ get => this.intermediateProgress;
+ set
+ {
+ if (value == this.intermediateProgress)
+ {
+ return;
+ }
+
+ this.intermediateProgress = value;
+ this.NotifyOfPropertyChange(() => this.IntermediateProgress);
+ }
+ }
+
+ public double ProgressValue
+ {
+ get => this.progressValue;
+ set
+ {
+ if (value == this.progressValue)
+ {
+ return;
+ }
+
+ this.progressValue = value;
+ this.NotifyOfPropertyChange(() => this.ProgressValue);
+ }
+ }
+
+ public int? Task => this.progressEventArgs?.Task ?? 0;
+
+ public int? TaskCount => this.progressEventArgs?.TaskCount ?? 0;
+
+ public TimeSpan? EstimatedTimeLeft => this.progressEventArgs?.EstimatedTimeLeft ?? null;
+
+ public double AverageFrameRate { get; private set; }
+ 
+ public void Update(EncodeProgressEventArgs e)
+ {
+ lock (lockObj) 
+ { 
+ progressEventArgs = e;
+ this.IntermediateProgress = false;
+
+ string totalHrsLeft = e.EstimatedTimeLeft.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.EstimatedTimeLeft) : string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);
+ string elapsedTimeHrs = e.ElapsedTime.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.ElapsedTime) : string.Format(@"{0:hh\:mm\:ss}", e.ElapsedTime);
+
+ if (e.IsSubtitleScan)
+ {
+ this.JobStatus = string.Format(Resources.MainViewModel_EncodeStatusChanged_SubScan_StatusLabel,
+ e.Task,
+ e.TaskCount,
+ e.PercentComplete,
+ totalHrsLeft,
+ elapsedTimeHrs,
+ null);
+
+ this.ProgressValue = e.PercentComplete;
+ }
+ else if (e.IsMuxing)
+ {
+ this.JobStatus = Resources.MainView_Muxing;
+ this.IntermediateProgress = true;
+ }
+ else if (e.IsSearching)
+ {
+ this.JobStatus = string.Format(Resources.MainView_ProgressStatusWithTask, Resources.MainView_Searching, e.PercentComplete, e.EstimatedTimeLeft, null);
+ this.ProgressValue = e.PercentComplete;
+ }
+ else
+ {
+ this.JobStatus =
+ string.Format(Resources.QueueViewModel_EncodeStatusChanged_StatusLabel,
+ e.Task,
+ e.TaskCount,
+ e.PercentComplete,
+ e.CurrentFrameRate,
+ e.AverageFrameRate,
+ totalHrsLeft,
+ elapsedTimeHrs,
+ null);
+ this.ProgressValue = e.PercentComplete;
+ this.AverageFrameRate = e.AverageFrameRate;
+ }
+ }
+ }
+
+ public void Update(EncodeCompletedEventArgs e)
+ {
+ lock (lockObj)
+ {
+ if (e.Successful)
+ {
+ this.JobStatus = Resources.QueueView_JobStatus_Complete;
+ }
+ else
+ {
+ switch (e.ErrorInformation)
+ {
+ case "1": // HB_ERROR_CANCELED
+ this.JobStatus = Resources.QueueView_JobStatus_Cancelled;
+ break;
+ case "2": // HB_ERROR_WRONG_INPUT
+ this.JobStatus = Resources.QueueView_JobStatus_InvalidInput;
+ break;
+ case "3": // HB_ERROR_INIT
+ this.JobStatus = Resources.QueueView_JobStatus_InitFailed;
+ break;
+ case "4": // HB_ERROR_UNKNOWN
+ this.JobStatus = Resources.QueueView_JobStatus_Unknown;
+ break;
+ case "5": // HB_ERROR_READ
+ this.JobStatus = Resources.QueueView_JobStatus_ReadError;
+ break;
+ case "-11": // Worker Crash
+ this.JobStatus = Resources.QueueView_JobStatus_WorkerCrash;
+ break;
+ default:
+ this.JobStatus = Resources.QueueView_JobStatus_NoErrorCode;
+ break;
+ }
+ }
+ }
+ }
+ 
+ public void SetPaused()
+ {
+ this.ClearStatusDisplay();
+ this.JobStatus = Resources.QueueViewModel_QueuePaused;
+ }
+
+ public void ClearStatusDisplay()
+ {
+ this.ProgressValue = 0;
+ this.IntermediateProgress = false;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueStats.cs Changed

@@ -10,15 +10,15 @@
 namespace HandBrakeWPF.Services.Queue.Model
 {
     using System;
-    using System.Runtime.CompilerServices;
+    using System.IO;
 
     using Caliburn.Micro;
 
     using HandBrakeWPF.Properties;
+    using HandBrakeWPF.Services.Encode.EventArgs;
+    using HandBrakeWPF.Services.Encode.Model.Models;
+    using HandBrakeWPF.Services.Scan.Model;
 
-    using Newtonsoft.Json;
-
-    JsonObject(MemberSerialization.OptOut)
     public class QueueStats : PropertyChangedBase
     {
         private DateTime startTime;
@@ -126,7 +126,7 @@
                     return string.Empty;
                 }
 
-                return PausedDuration.ToString("hh\\:mm\\:ss");
+                return this.PausedDuration.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", this.PausedDuration) : string.Format(@"{0:hh\:mm\:ss}", this.PausedDuration);
             }
         }
 
@@ -152,11 +152,17 @@
                     return string.Empty;
                 }
 
-                return this.Duration.ToString("hh\\:mm\\:ss");
+                return this.Duration.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", this.Duration) : string.Format(@"{0:hh\:mm\:ss}", this.Duration);
             }
         }
 
-        public long? FinalFileSize
+        public long? SourceFileSizeInBytes
+        {
+            get;
+            set;
+        }
+
+        public long? FinalFileSizeBytes
         {
             get
             {
@@ -171,7 +177,7 @@
                 }
 
                 this.finalFileSize = value;
-                this.NotifyOfPropertyChange(() => this.FinalFileSize);
+                this.NotifyOfPropertyChange(() => this.FinalFileSizeBytes);
                 this.NotifyOfPropertyChange(() => this.FinalFileSizeInMegaBytes);
                 this.NotifyOfPropertyChange(() => this.FileSizeDisplay);
             }
@@ -194,17 +200,44 @@
         {
             get
             {
-                if (FinalFileSizeInMegaBytes == 0)
+                if (!FinalFileSizeInMegaBytes.HasValue || FinalFileSizeInMegaBytes == 0)
                 {
                     return string.Empty;
                 }
 
-                return string.Format("{0:##.###} MB", FinalFileSizeInMegaBytes);
+                // Work out the size difference
+                string percentage = string.Empty;
+                if (SourceFileSizeInBytes != null && SourceFileSizeInBytes != 0 && FinalFileSizeBytes.HasValue)
+                {
+                    decimal difference = (decimal) 100 / SourceFileSizeInBytes.Value * FinalFileSizeBytes.Value;
+                    percentage = string.Format(" ({0} %{1})", Math.Round(difference, 1), Resources.QueueViewModel_DifferenceText);
+                }
+
+                return string.Format("{0:##.###} MB{1}", FinalFileSizeInMegaBytes, percentage);
             }
         }
 
         public string CompletedActivityLogPath { get; set; }
 
+        public double EncodingSpeed { get; set; }
+
+        public string EncodingSpeedDisplay
+        {
+            get
+            {
+                if (EncodingSpeed != 0)
+                {
+                    return string.Format("{0} fps", Math.Round(EncodingSpeed, 2));
+                }
+
+                return string.Empty;
+            }
+        }
+
+        public string ContentLength { get; set; }
+
+        public string SourceLength { get; set; }
+
         public void SetPaused(bool isPaused)
         {
             this.isPaused = isPaused;
@@ -221,6 +254,31 @@
             this.NotifyOfPropertyChange(() => this.PausedDisplay);
         }
 
+        public void UpdateStats(EncodeCompletedEventArgs e, QueueTask job)
+        {
+            EndTime = DateTime.Now;
+            CompletedActivityLogPath = e.ActivityLogPath;
+            FinalFileSizeBytes = e.FinalFilesizeInBytes;
+
+            if (File.Exists(job.Task.Source))
+            {
+                FileInfo file = new FileInfo(job.Task.Source);
+                SourceFileSizeInBytes = file.Length;
+            }
+
+            EncodingSpeed = job.JobProgress.AverageFrameRate;
+            ContentLength = this.DurationCalculation(job);
+            SourceLength = GetSourceDuration(job);
+
+
+            this.NotifyOfPropertyChange(() => this.EndTime);
+            this.NotifyOfPropertyChange(() => this.CompletedActivityLogPath);
+            this.NotifyOfPropertyChange(() => this.FileSizeDisplay);
+            this.NotifyOfPropertyChange(() => this.EncodingSpeedDisplay);
+            this.NotifyOfPropertyChange(() => this.ContentLength);
+            this.NotifyOfPropertyChange(() => this.SourceLength);
+        }
+
         public void Reset()
         {
             this.isPaused = false;
@@ -228,11 +286,57 @@
             this.pausedStartPoint = DateTime.MinValue;
             this.StartTime = DateTime.MinValue;
             this.EndTime = DateTime.MinValue;
-            this.FinalFileSize = 0;
+            this.FinalFileSizeBytes = 0;
             this.CompletedActivityLogPath = null;
+            this.EncodingSpeed = 0;
+            this.SourceFileSizeInBytes = 0;
+            this.ContentLength = string.Empty;
+            this.SourceLength = string.Empty;
 
             this.NotifyOfPropertyChange(() => this.PausedDuration);
             this.NotifyOfPropertyChange(() => this.PausedDisplay);
+            this.NotifyOfPropertyChange(() => this.EncodingSpeedDisplay);
+            this.NotifyOfPropertyChange(() => this.ContentLength);
+            this.NotifyOfPropertyChange(() => this.SourceLength);
+        }
+
+        private string GetSourceDuration(QueueTask job)
+        {
+            if (job.SourceTitleInfo == null)
+            {
+                return Resources.QueueViewModel_NotAvailable;
+            }
+
+            TimeSpan duration = job.SourceTitleInfo.Duration;
+
+            return string.Format("{0:00}:{1:00}:{2:00}", duration.Hours, duration.Minutes, duration.Seconds);
+        }
+
+        private string DurationCalculation(QueueTask job)
+        {
+            if (job.SourceTitleInfo == null)
+            {
+                return Resources.QueueViewModel_NotAvailable;
+            }
+
+            double startEndDuration = job.Task.EndPoint - job.Task.StartPoint;
+            TimeSpan output;
+
+            switch (job.Task.PointToPointMode)
+            {
+                case PointToPointMode.Chapters:
+                    output = job.SourceTitleInfo.CalculateDuration(job.Task.StartPoint, job.Task.EndPoint);
+                    return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
+                case PointToPointMode.Seconds:
+                    output = TimeSpan.FromSeconds(startEndDuration);
+                    return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
+                case PointToPointMode.Frames:
+                    startEndDuration = startEndDuration / job.SourceTitleInfo.Fps;
+                    output = TimeSpan.FromSeconds(Math.Round(startEndDuration, 2));
+                    return string.Format("{0:00}:{1:00}:{2:00}", output.Hours, output.Minutes, output.Seconds);
+            }
+
+            return Resources.QueueViewModel_NotAvailable;
         }
     }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTask.cs Changed

@@ -10,18 +10,17 @@
 namespace HandBrakeWPF.Services.Queue.Model
 {
     using System;
-    using System.Runtime.CompilerServices;
+    using System.Text.Json.Serialization;
 
     using Caliburn.Micro;
 
-    using HandBrake.Interop.Model;
+    using HandBrake.Interop.Interop.Interfaces.Model;
 
     using HandBrakeWPF.Services.Presets.Model;
+    using HandBrakeWPF.Services.Scan.Model;
     using HandBrakeWPF.Utilities;
 
-    using Newtonsoft.Json;
-
-    using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
+    using EncodeTask = Encode.Model.EncodeTask;
 
     public class QueueTask : PropertyChangedBase
     {
@@ -35,10 +34,20 @@
             id = id + 1;
             this.Id = string.Format("{0}.{1}", GeneralUtilities.ProcessId, id);
             this.Statistics = new QueueStats();
+            this.JobProgress = new QueueProgressStatus();
         }
 
-        public QueueTask(EncodeTask task, HBConfiguration configuration, string scannedSourcePath, Preset currentPreset, bool isPresetModified)
+        public QueueTask(QueueTaskType type)
         {
+            this.TaskType = type;
+            id = id + 1;
+            this.Id = string.Format("{0}.{1}", GeneralUtilities.ProcessId, id);
+            this.NotifyOfPropertyChange(() => this.IsBreakpointTask);
+        }
+
+        public QueueTask(EncodeTask task, HBConfiguration configuration, string scannedSourcePath, Preset currentPreset, bool isPresetModified, Title selectedTitle)
+        {
+            this.SourceTitleInfo = selectedTitle;
             this.Task = task;
             this.Configuration = configuration;
             this.Status = QueueItemStatus.Waiting;
@@ -51,59 +60,68 @@
                     this.presetKey = this.presetKey + " (Modified)";
                 }
             }
-
             id = id + 1;
             this.Id = string.Format("{0}.{1}", GeneralUtilities.ProcessId, id);
+            this.SelectedPresetKey = this.presetKey;
 
             this.Statistics = new QueueStats();
             this.TaskId = Guid.NewGuid().ToString();
+            this.JobProgress = new QueueProgressStatus();
+            this.TaskType = QueueTaskType.EncodeTask;
         }
+        
+        JsonIgnore
+        public string Id { get; }
 
-        JsonProperty
         public string TaskId { get; set; }
 
-        JsonIgnore
-        public string Id { get; }
+        public QueueTaskType TaskType { get; set; }
+
+        /* Breakpoint Task */
+
+        public bool IsBreakpointTask => TaskType == QueueTaskType.Breakpoint;
+
+        /* Encode Task*/
 
-        JsonProperty
         public string ScannedSourcePath { get; set; }
 
-        JsonProperty
+        JsonIgnore
+        public Guid? TaskToken { get; set; }
+
+        public Title SourceTitleInfo { get; }
+
         public QueueItemStatus Status
         {
-            get
-            {
-                return this.status;
-            }
+            get => this.status;
 
             set
             {
                 this.status = value;
                 this.NotifyOfPropertyChange(() => this.Status);
                 this.NotifyOfPropertyChange(() => this.ShowEncodeProgress);
+                this.NotifyOfPropertyChange(() => this.IsJobStatusVisible);
             }
         }
 
-        JsonProperty
         public EncodeTask Task { get; set; }
 
-        JsonProperty
         public HBConfiguration Configuration { get; set; }
 
-        JsonProperty
         public QueueStats Statistics { get; set; }
 
+        public string SelectedPresetKey { get; set; }
+
         JsonIgnore
-        public string SelectedPresetKey
-        {
-            get
-            {
-                return this.presetKey;
-            }
-        }
+        public QueueProgressStatus JobProgress { get; set; }
 
         JsonIgnore
-        public bool ShowEncodeProgress => this.Status == QueueItemStatus.InProgress && SystemInfo.IsWindows10();
+        public bool IsJobStatusVisible => this.Status == QueueItemStatus.InProgress;
+        
+        JsonIgnore
+        public bool ShowEncodeProgress => this.Status == QueueItemStatus.InProgress;
+
+
+        /* Overrides */
 
         public override bool Equals(object obj)
         {
@@ -120,7 +138,7 @@
 
         public override string ToString()
         {
-            return string.Format("Encode Task.  Title: {0}, Source: {1}, Destination: {2}", this.Task.Title, this.Task.Source, this.Task.Destination);
+            return string.Format("Encode Task.  Title: {0}, Source: {1}, Destination: {2}", this.Task?.Title, this.Task?.Source, this.Task?.Destination);
         }
 
         protected bool Equals(QueueTask other)

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/Model/QueueTaskType.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/QueueResourceService.cs Added

@@ -0,0 +1,292 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="QueueResourceService.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the QueueResourceService type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Services.Queue
+{
+ using System;
+ using System.Collections.Generic;
+
+ using HandBrake.Interop.Interop;
+
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Interfaces;
+
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
+ public class QueueResourceService
+ {
+ private readonly IUserSettingService userSettingService;
+
+ private readonly object lockObj = new object();
+
+ private readonly HashSet<Guid> qsvInstances = new HashSet<Guid>();
+ private readonly HashSet<Guid> nvencInstances = new HashSet<Guid>();
+ private readonly HashSet<Guid> vceInstances = new HashSet<Guid>();
+ private readonly HashSet<Guid> mfInstances = new HashSet<Guid>();
+ private readonly HashSet<Guid> totalInstances = new HashSet<Guid>();
+
+ private List<int> qsvGpus = new List<int>();
+ private int intelGpuCounter = -1; // Always default to the first card when allocating. 
+
+ private int maxAllowedInstances;
+ private int totalQsvInstances;
+ private int totalVceInstances;
+ private int totalNvidiaInstances;
+ private int totalMfInstances; 
+
+ public QueueResourceService(IUserSettingService userSettingService)
+ {
+ this.userSettingService = userSettingService;
+ this.userSettingService.SettingChanged += this.UserSettingService_SettingChanged;
+ }
+
+ private void UserSettingService_SettingChanged(object sender, HandBrakeWPF.EventArgs.SettingChangedEventArgs e)
+ {
+ if (e.Key == UserSettingConstants.SimultaneousEncodes)
+ {
+ this.maxAllowedInstances = this.userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+ if (this.maxAllowedInstances > Utilities.SystemInfo.MaximumSimultaneousInstancesSupported)
+ {
+ this.maxAllowedInstances = Utilities.SystemInfo.MaximumSimultaneousInstancesSupported;
+ }
+ }
+ }
+
+ public int TotalActiveInstances
+ {
+ get
+ {
+ lock (this.lockObj)
+ {
+ return this.totalInstances.Count;
+ }
+ }
+ }
+
+ public void Init()
+ {
+ this.maxAllowedInstances = this.userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+
+ // Allow QSV adapter scaling. 
+ this.qsvGpus = HandBrakeEncoderHelpers.GetQsvAdaptorList();
+ this.totalQsvInstances = this.qsvGpus.Count * 2; // Allow two instances per GPU
+
+ // Most Nvidia cards support 3 instances.
+ this.totalNvidiaInstances = 3;
+
+ // VCE Support still TBD
+ this.totalVceInstances = 3;
+
+ this.totalMfInstances = 1;
+
+ // Whether using hardware or not, some CPU is needed so don't allow more jobs than CPU.
+ if (this.maxAllowedInstances > Utilities.SystemInfo.MaximumSimultaneousInstancesSupported)
+ {
+ this.maxAllowedInstances = Utilities.SystemInfo.MaximumSimultaneousInstancesSupported;
+ }
+ }
+
+ public Guid? GetToken(EncodeTask task)
+ {
+ lock (this.lockObj)
+ {
+ switch (task.VideoEncoder)
+ {
+ case VideoEncoder.QuickSync:
+ case VideoEncoder.QuickSyncH265:
+ case VideoEncoder.QuickSyncH26510b:
+ if (this.qsvInstances.Count < this.totalQsvInstances && this.TotalActiveInstances <= this.maxAllowedInstances)
+ {
+ this.AllocateIntelGPU(task);
+
+ Guid guid = Guid.NewGuid();
+ this.qsvInstances.Add(guid);
+ this.totalInstances.Add(guid);
+ return guid;
+ }
+ else
+ {
+ return Guid.Empty; // Busy
+ }
+
+ case VideoEncoder.NvencH264:
+ case VideoEncoder.NvencH265:
+ if (this.nvencInstances.Count < this.totalNvidiaInstances && this.TotalActiveInstances <= this.maxAllowedInstances)
+ {
+ Guid guid = Guid.NewGuid();
+ this.nvencInstances.Add(guid);
+ this.totalInstances.Add(guid);
+ return guid;
+ }
+ else
+ {
+ return Guid.Empty; // Busy
+ }
+
+ case VideoEncoder.VceH264:
+ case VideoEncoder.VceH265:
+ if (this.vceInstances.Count < this.totalVceInstances && this.TotalActiveInstances <= this.maxAllowedInstances)
+ {
+ Guid guid = Guid.NewGuid();
+ this.vceInstances.Add(guid);
+ this.totalInstances.Add(guid);
+ return guid;
+ }
+ else
+ {
+ return Guid.Empty; // Busy
+ }
+
+ case VideoEncoder.MFH264:
+ case VideoEncoder.MFH265:
+ if (this.mfInstances.Count < this.totalMfInstances && this.TotalActiveInstances <= this.maxAllowedInstances)
+ {
+ Guid guid = Guid.NewGuid();
+ this.mfInstances.Add(guid);
+ this.totalInstances.Add(guid);
+ return guid;
+ }
+ else
+ {
+ return Guid.Empty; // Busy
+ }
+
+
+ default:
+ if (this.TotalActiveInstances <= this.maxAllowedInstances)
+ {
+ Guid guid = Guid.NewGuid();
+ this.totalInstances.Add(guid);
+ return guid;
+ }
+ else
+ {
+ return Guid.Empty; // Busy
+ }
+ }
+ }
+ }
+
+ public void ClearTokens()
+ {
+ lock (this.lockObj)
+ {
+ qsvInstances.Clear();
+ nvencInstances.Clear();
+ vceInstances.Clear();
+ mfInstances.Clear();
+ this.totalInstances.Clear();
+ }
+ }
+
+ public void ReleaseToken(VideoEncoder encoder, Guid? unlockKey)
+ {
+ if (unlockKey == null)
+ {
+ return;
+ }
+
+ lock (this.lockObj)
+ {
+ if (this.totalInstances.Contains(unlockKey.Value))
+ {
+ this.totalInstances.Remove(unlockKey.Value);
+ }
+
+ switch (encoder)
+ {
+ case VideoEncoder.QuickSync:
+ case VideoEncoder.QuickSyncH265:
+ case VideoEncoder.QuickSyncH26510b:
+ if (this.qsvInstances.Contains(unlockKey.Value))
+ {
+ this.qsvInstances.Remove(unlockKey.Value);
+ }
+
+ break;
+ case VideoEncoder.NvencH264:
+ case VideoEncoder.NvencH265:
+ if (this.nvencInstances.Contains(unlockKey.Value))
+ {
+ this.nvencInstances.Remove(unlockKey.Value);
+ }
+
+ break;
+ case VideoEncoder.VceH264:
+ case VideoEncoder.VceH265:
+ if (this.vceInstances.Contains(unlockKey.Value))
+ {
+ this.vceInstances.Remove(unlockKey.Value);
+ }
+
+ break;
+ case VideoEncoder.MFH264:
+ case VideoEncoder.MFH265:
+ if (this.mfInstances.Contains(unlockKey.Value))
+ {
+ this.mfInstances.Remove(unlockKey.Value);
+ }
+
+ break;
+ }
+ }
+ }
+
+ private void AllocateIntelGPU(EncodeTask task)
+ {
+ if (this.qsvGpus.Count <= 1)
+ {
+ return; // Not a multi-Intel-GPU system.
+ }
+
+ if (task.ExtraAdvancedArguments.Contains("gpu"))
+ {
+ return; // Users choice
+ }
+
+ if (!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled))
+ {
+ return; // Multi-Process encoding is disabled.
+ }
+
+ if (this.userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes) <= 1)
+ {
+ return; // Multi-Process encoding is disabled.
+ }
+
+ if (this.qsvInstances.Count == 0)
+ {
+ // Reset to -1 if we have no encoders currently in use.
+ this.intelGpuCounter = -1; 
+ }
+ 
+ this.intelGpuCounter = this.intelGpuCounter + 1;
+ int modulus = this.intelGpuCounter % 2;
+
+ // For now, it's not expected we'll see users with more than 2 Intel GPUs. Typically 1 CPU, 1 Discrete will likely be the norm.
+ // Use the modulus of the above counter to flip between the 2 Intel encoders. 
+ // We set GPU for the jobs 1, 3, 5, 7, 9 to index 0
+ // We set the GPU for jobs 2, 4, 5, 8, 10 to index 1 
+ if (modulus == 1)
+ {
+ // GPU List 1
+ task.ExtraAdvancedArguments = string.IsNullOrEmpty(task.ExtraAdvancedArguments)
+ ? string.Format("gpu={0}", this.qsvGpus1)
+ : string.Format("{0}:gpu={1}", task.ExtraAdvancedArguments, this.qsvGpus1);
+ }
+ else
+ {
+ // GPU List 0
+ task.ExtraAdvancedArguments = string.IsNullOrEmpty(task.ExtraAdvancedArguments)
+ ? string.Format("gpu={0}", this.qsvGpus0)
+ : string.Format("{0}:gpu={1}", task.ExtraAdvancedArguments, this.qsvGpus0);
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Queue/QueueService.cs Changed

@@ -12,71 +12,98 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
- using System.ComponentModel;
- using System.Diagnostics;
 using System.IO;
 using System.Linq;
+ using System.Text.Json;
+ using System.Timers;
 using System.Windows;
- using System.Windows.Media.Imaging;
 
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.Model;
 using HandBrake.Interop.Interop.Json.Queue;
- using HandBrake.Interop.Model;
 using HandBrake.Interop.Utilities;
 
+ using HandBrakeWPF.Extensions;
 using HandBrakeWPF.Factories;
 using HandBrakeWPF.Helpers;
 using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Encode;
 using HandBrakeWPF.Services.Encode.Factories;
+ using HandBrakeWPF.Services.Encode.Interfaces;
 using HandBrakeWPF.Services.Encode.Model;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Logging.Interfaces;
+ using HandBrakeWPF.Services.Queue.Interfaces;
+ using HandBrakeWPF.Services.Queue.JobEventArgs;
 using HandBrakeWPF.Services.Queue.Model;
 using HandBrakeWPF.Utilities;
-
- using Newtonsoft.Json;
-
- using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
+ 
+ using EncodeCompletedEventArgs = Encode.EventArgs.EncodeCompletedEventArgs;
 using Execute = Caliburn.Micro.Execute;
- using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
- using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;
- using LogService = HandBrakeWPF.Services.Logging.LogService;
- using QueueCompletedEventArgs = HandBrakeWPF.EventArgs.QueueCompletedEventArgs;
- using QueueProgressEventArgs = HandBrakeWPF.EventArgs.QueueProgressEventArgs;
+ using GeneralApplicationException = Exceptions.GeneralApplicationException;
+ using ILog = Logging.Interfaces.ILog;
+ using QueueCompletedEventArgs = EventArgs.QueueCompletedEventArgs;
+ using QueueProgressEventArgs = EventArgs.QueueProgressEventArgs;
 
- public class QueueService : Interfaces.IQueueService
+ public class QueueService : IQueueService
 {
 private static readonly object QueueLock = new object();
+
+ private readonly List<ActiveJob> activeJobs = new List<ActiveJob>();
 private readonly IUserSettingService userSettingService;
 private readonly ILog logService;
 private readonly IErrorService errorService;
+ private readonly ILogInstanceManager logInstanceManager;
+ private readonly DelayedActionProcessor delayedQueueBackupProcessor = new DelayedActionProcessor();
+
+ private readonly IPortService portService;
 
 private readonly ObservableCollection<QueueTask> queue = new ObservableCollection<QueueTask>();
 private readonly string queueFile;
- private bool clearCompleted;
+ private readonly object queueFileLock = new object();
+
+ private readonly QueueResourceService hardwareResourceManager;
+
+ private int allowedInstances;
+ private int jobIdCounter = 0;
+ private bool processIsolationEnabled;
+
+ private EncodeTaskFactory encodeTaskFactory;
+
+ private Timer queueTaskPoller;
 
- public QueueService(IEncode encodeService, IUserSettingService userSettingService, ILog logService, IErrorService errorService)
+ public QueueService(IUserSettingService userSettingService, ILog logService, IErrorService errorService, ILogInstanceManager logInstanceManager, IPortService portService)
 {
 this.userSettingService = userSettingService;
+ this.hardwareResourceManager = new QueueResourceService(userSettingService);
 this.logService = logService;
 this.errorService = errorService;
- this.EncodeService = encodeService;
+ this.logInstanceManager = logInstanceManager;
+ this.portService = portService;
 
 // If this is the first instance, just use the main queue file, otherwise add the instance id to the filename.
 this.queueFile = string.Format("{0}{1}.json", QueueRecoveryHelper.QueueFileName, GeneralUtilities.ProcessId);
- }
 
- public delegate void QueueProgressStatus(object sender, QueueProgressEventArgs e);
+ this.allowedInstances = this.userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+ this.processIsolationEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled);
+
+ this.encodeTaskFactory = new EncodeTaskFactory(this.userSettingService);
 
- public delegate void QueueCompletedEventDelegate(object sender, QueueCompletedEventArgs e);
+ this.hardwareResourceManager.Init();
+ }
 
- public event QueueProgressStatus JobProcessingStarted;
+ public event EventHandler<QueueProgressEventArgs> JobProcessingStarted;
 
 public event EventHandler QueueChanged;
 
- public event QueueCompletedEventDelegate QueueCompleted;
+ public event EventHandler<QueueCompletedEventArgs> QueueCompleted;
 
 public event EventHandler QueuePaused;
 
+ public event EventHandler QueueJobStatusChanged;
+
+ public event EventHandler<EncodeCompletedEventArgs> EncodeCompleted;
+
 public int Count
 {
 get
@@ -93,59 +120,74 @@
 }
 }
 
- public IEncode EncodeService { get; private set; }
+ public int CompletedCount => this.queue.Count(item => item.Status == QueueItemStatus.Completed);
+
+ public bool IsPaused { get; private set; }
 
 public bool IsProcessing { get; private set; }
 
- public QueueTask LastProcessedJob { get; set; }
+ public bool IsEncoding => this.activeJobs.Any(service => service.IsEncoding);
 
- public ObservableCollection<QueueTask> Queue
+ public ObservableCollection<QueueTask> Queue => this.queue;
+ 
+ public void Add(QueueTask job)
 {
- get
+ lock (QueueLock)
 {
- return this.queue;
+ this.queue.Add(job);
+ this.InvokeQueueChanged(EventArgs.Empty);
 }
 }
 
-
- public void Add(QueueTask job)
+ public void Add(List<QueueTask> tasks)
 {
 lock (QueueLock)
 {
- this.queue.Add(job);
+ foreach (var job in tasks)
+ {
+ this.queue.Add(job);
+ }
+ 
 this.InvokeQueueChanged(EventArgs.Empty);
 }
 }
 
 public void BackupQueue(string exportPath)
 {
- Stopwatch watch = Stopwatch.StartNew();
+ lock (this.queueFileLock)
+ {
+ try
+ {
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
+ string tempPath = !string.IsNullOrEmpty(exportPath)
+ ? exportPath
+ : Path.Combine(appDataPath, string.Format(this.queueFile, string.Empty));
 
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
- string tempPath = !string.IsNullOrEmpty(exportPath)
- ? exportPath
- : Path.Combine(appDataPath, string.Format(this.queueFile, string.Empty));
+ // Make a copy of the file before we replace it. This way, if we crash we can recover.
+ if (File.Exists(tempPath))
+ {
+ File.Copy(tempPath, tempPath + ".last", true);
+ }
 
- // Make a copy of the file before we replace it. This way, if we crash we can recover.
- if (File.Exists(tempPath))
- {
- File.Copy(tempPath, tempPath + ".last");
- }
+ using (StreamWriter writer = new StreamWriter(tempPath))
+ {
+ List<QueueTask> tasks = this.queue.Where(item => item.Status != QueueItemStatus.Completed)
+ .ToList();
 
- using (StreamWriter writer = new StreamWriter(tempPath))
- {
- List<QueueTask> tasks = this.queue.Where(item => item.Status != QueueItemStatus.Completed).ToList();
- string queueJson = JsonConvert.SerializeObject(tasks, Formatting.Indented);
- writer.Write(queueJson);
- }
+ string queueJson = JsonSerializer.Serialize(tasks, JsonSettings.Options);
+ writer.Write(queueJson);
+ }
 
- if (File.Exists(tempPath + ".last"))
- {
- File.Delete(tempPath + ".last");
+ if (File.Exists(tempPath + ".last"))
+ {
+ File.Delete(tempPath + ".last");
+ }
+ }
+ catch (Exception exc)
+ {
+ this.logService.LogMessage(string.Format("{1} # {0}{1} {2}{1}", "Queue Backup Failed!", Environment.NewLine, exc));
+ }
 }
-
- watch.Stop();
- Debug.WriteLine("Queue Save (ms): " + watch.ElapsedMilliseconds);
 }
 
 public void ExportCliJson(string exportPath)
@@ -154,7 +196,7 @@
 List<EncodeTask> workUnits = jobs.Select(job => job.Task).ToList();
 HBConfiguration config = HBConfigurationFactory.Create(); // Default to current settings for now. These will hopefully go away in the future.
 
- string json = QueueFactory.GetQueueJson(workUnits, config);
+ string json = this.GetQueueJson(workUnits, config);
 
 using (var strm = new StreamWriter(exportPath, false))
 {
@@ -168,9 +210,7 @@
 {
 List<QueueTask> jobs = this.queue.Where(item => item.Status != QueueItemStatus.Completed).ToList();
 
- JsonSerializerSettings settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
-
- string json = JsonConvert.SerializeObject(jobs, Formatting.Indented, settings);
+ string json = JsonSerializer.Serialize(jobs, JsonSettings.Options);
 
 using (var strm = new StreamWriter(exportPath, false))
 {
@@ -190,7 +230,7 @@
 return;
 }
 
- List<QueueTask> reloadedQueue = JsonConvert.DeserializeObject<List<QueueTask>>(fileContent);
+ List<QueueTask> reloadedQueue = JsonSerializer.Deserialize<List<QueueTask>>(fileContent);
 
 if (reloadedQueue == null)
 {
@@ -209,12 +249,10 @@
 
 if (result == MessageBoxResult.Yes)
 {
+ this.Stop(true);
+
 foreach (QueueTask task in duplicates)
 {
- if (task.Status == QueueItemStatus.InProgress)
- {
- this.Stop();
- }
 this.queue.Remove(task);
 }
 
@@ -224,11 +262,20 @@
 
 foreach (QueueTask task in reloadedQueue)
 {
+ // Reset the imported jobs that were running in a previous session.
+ if (task.Status == QueueItemStatus.InProgress || task.Status == QueueItemStatus.Paused)
+ {
+ task.Status = QueueItemStatus.Waiting;
+ task.Statistics.Reset();
+ }
+
+ // Ignore jobs if the user has chosen not to replace them.
 if (!replaceDuplicates && this.queue.Any(s => s.TaskId == task.TaskId))
 {
 continue;
- } 
- 
+ }
+
+ // If the above conditions are not met, add it back in.
 this.queue.Add(task);
 }
 
@@ -238,8 +285,7 @@
 }
 }
 }
-
-
+ 
 public bool CheckForDestinationPathDuplicates(string destination)
 {
 foreach (QueueTask job in this.queue)
@@ -298,39 +344,48 @@
 });
 }
 
- public QueueTask GetNextJobForProcessing()
+ public List<string> GetLogFilePaths()
 {
- if (this.queue.Count > 0)
+ List<string> logPaths = new List<string>();
+ lock (QueueLock)
 {
- return this.queue.FirstOrDefault(q => q.Status == QueueItemStatus.Waiting);
+ foreach (QueueTask task in this.Queue)
+ {
+ if (!string.IsNullOrEmpty(task.Statistics.CompletedActivityLogPath))
+ {
+ logPaths.Add(task.Statistics.CompletedActivityLogPath);
+ }
+ }
 }
 
- return null;
+ return logPaths;
 }
-
- public void MoveDown(int index)
+ 
+ public QueueTask GetNextJobForProcessing()
 {
- if (index < this.queue.Count - 1)
+ if (this.queue.Count > 0)
 {
- QueueTask item = this.queueindex;
+ QueueTask task = this.queue.FirstOrDefault(q => q.Status == QueueItemStatus.Waiting);
+ if (task != null && task.TaskType == QueueTaskType.EncodeTask)
+ {
+ task.TaskToken = this.hardwareResourceManager.GetToken(task.Task);
+ }
 
- this.queue.RemoveAt(index);
- this.queue.Insert((index + 1), item);
+ return task;
 }
 
- this.InvokeQueueChanged(EventArgs.Empty);
+ return null;
 }
 
- public void MoveUp(int index)
+ public void MoveToBottom(IList<QueueTask> moveItems)
 {
- if (index > 0)
- {
- QueueTask item = this.queueindex;
-
- this.queue.RemoveAt(index);
- this.queue.Insert((index - 1), item);
- }
+ this.queue.MoveToBottom(moveItems);
+ this.InvokeQueueChanged(EventArgs.Empty);
+ }
 
+ public void MoveToTop(IList<QueueTask> moveItems)
+ {
+ this.queue.MoveToTop(moveItems);
 this.InvokeQueueChanged(EventArgs.Empty);
 }
 
@@ -338,6 +393,21 @@
 {
 lock (QueueLock)
 {
+ ActiveJob activeJob = null;
+ foreach (ActiveJob ajob in this.activeJobs)
+ {
+ if (Equals(ajob.Job, job))
+ {
+ activeJob = ajob;
+ ajob.Stop();
+ }
+ }
+
+ if (activeJob != null)
+ {
+ this.activeJobs.Remove(activeJob);
+ }
+
 this.queue.Remove(job);
 this.InvokeQueueChanged(EventArgs.Empty);
 }
@@ -356,7 +426,7 @@
 
 public void RestoreQueue(string importPath)
 {
- string appDataPath = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataPath = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 string tempPath = !string.IsNullOrEmpty(importPath)
 ? importPath
 : (appDataPath + string.Format(this.queueFile, string.Empty));
@@ -371,7 +441,7 @@
 
 try
 {
- list = JsonConvert.DeserializeObject<List<QueueTask>>(queueJson);
+ list = JsonSerializer.Deserialize<List<QueueTask>>(queueJson);
 }
 catch (Exception exc)
 {
@@ -382,10 +452,10 @@
 {
 foreach (QueueTask item in list)
 {
- if (item.Status != QueueItemStatus.Completed)
+ if (item.Status != QueueItemStatus.Completed && item.TaskType != QueueTaskType.Breakpoint)
 {
 // Reset InProgress/Error to Waiting so it can be processed
- if (item.Status == QueueItemStatus.InProgress)
+ if (item.Status == QueueItemStatus.InProgress || item.Status == QueueItemStatus.Paused)
 {
 item.Status = QueueItemStatus.Error;
 }
@@ -405,116 +475,139 @@
 }
 }
 
- public void Pause()
+ public void Pause(bool pauseJobs)
 {
- this.IsProcessing = false;
- this.InvokeQueuePaused(EventArgs.Empty);
- }
-
- public void PauseEncode()
- {
- if (this.EncodeService.IsEncoding && !this.EncodeService.IsPasued)
+ if (pauseJobs)
 {
- this.EncodeService.Pause();
- this.LastProcessedJob.Statistics.SetPaused(true);
+ foreach (ActiveJob job in this.activeJobs)
+ {
+ if (job.IsEncoding && !job.IsPaused)
+ {
+ job.Pause();
+ }
+ }
 }
+ 
+ this.IsProcessing = false;
+ this.IsPaused = true;
 
- this.Pause();
+ this.StopJobPolling();
+
+ this.InvokeQueuePaused(EventArgs.Empty);
 }
 
- public void Start(bool isClearCompleted)
+ public void Start()
 {
 if (this.IsProcessing)
 {
 return;
 }
 
- this.clearCompleted = isClearCompleted;
+ this.IsPaused = false;
 
- this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
- this.EncodeService.EncodeCompleted += this.EncodeServiceEncodeCompleted;
+ this.allowedInstances = this.userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+ this.processIsolationEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled);
 
- if (this.EncodeService.IsPasued)
+ // Unpause all active jobs.
+ foreach (ActiveJob job in this.activeJobs)
 {
- this.EncodeService.Resume();
- this.IsProcessing = true;
- this.InvokeJobProcessingStarted(new QueueProgressEventArgs(this.LastProcessedJob));
- this.LastProcessedJob.Statistics.SetPaused(false);
+ job.Start();
+ this.InvokeJobProcessingStarted(new QueueProgressEventArgs(job.Job));
 }
 
- if (!this.EncodeService.IsEncoding)
+ this.ProcessNextJob();
+ this.IsProcessing = true;
+ }
+
+ public void Stop(bool stopExistingJobs)
+ {
+ if (stopExistingJobs)
 {
- this.ProcessNextJob();
+ foreach (ActiveJob job in this.activeJobs)
+ {
+ if (job.IsEncoding || job.IsPaused)
+ {
+ job.Stop();
+ }
+ }
+
+ this.IsProcessing = false;
+ this.IsPaused = false;
+
+ this.StopJobPolling();
+ this.RemoveBreakPoints();
+
+ if (this.activeJobs.Count == 0)
+ {
+ this.InvokeQueueChanged(EventArgs.Empty);
+ }
+
+ this.InvokeQueueCompleted(new QueueCompletedEventArgs(true));
+ }
+ else
+ {
+ if (!this.QueueContainsStop())
+ {
+ this.AddBreakPoint();
+ }
 }
 }
 
- public void Stop()
+ public List<QueueProgressStatus> GetQueueProgressStatus()
 {
- if (this.EncodeService.IsEncoding)
+ // TODO make thread safe. 
+ List<QueueProgressStatus> statuses = new List<QueueProgressStatus>();
+ foreach (ActiveJob job in this.activeJobs)
 {
- this.EncodeService.Stop();
+ statuses.Add(job.Job.JobProgress);
 }
 
- this.IsProcessing = false;
- this.InvokeQueuePaused(EventArgs.Empty);
+ return statuses;
 }
 
- protected virtual void OnQueueCompleted(QueueCompletedEventArgs e)
+ public List<string> GetActiveJobDestinationDirectories()
 {
- QueueCompletedEventDelegate handler = this.QueueCompleted;
- if (handler != null)
+ // TODO need to make thread safe.
+ List<string> directories = new List<string>();
+ foreach (ActiveJob job in this.activeJobs)
 {
- handler(this, e);
+ directories.Add(job.Job.Task.Destination);
 }
 
- this.IsProcessing = false;
+ return directories;
 }
 
- private void EncodeServiceEncodeCompleted(object sender, EncodeCompletedEventArgs e)
+ public void AddBreakPoint()
 {
- this.LastProcessedJob.Status = QueueItemStatus.Completed;
- this.LastProcessedJob.Statistics.EndTime = DateTime.Now;
- this.LastProcessedJob.Statistics.CompletedActivityLogPath = e.ActivityLogPath;
- this.LastProcessedJob.Statistics.FinalFileSize = e.FinalFilesizeInBytes;
-
- // Clear the completed item of the queue if the setting is set.
- if (this.clearCompleted)
+ lock (QueueLock)
 {
- this.ClearCompleted();
- }
+ int foundIndex = -1;
 
- if (!e.Successful)
- {
- this.LastProcessedJob.Status = QueueItemStatus.Error;
- }
+ QueueTask firstWaitingJob = this.queue.FirstOrDefault(t => t.Status == QueueItemStatus.Waiting);
+ if (firstWaitingJob != null)
+ {
+ foundIndex = this.queue.IndexOf(firstWaitingJob);
+ }
 
- // Move onto the next job.
- if (this.IsProcessing)
- {
- this.ProcessNextJob();
- }
- else
- {
- this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
- this.BackupQueue(string.Empty);
- this.OnQueueCompleted(new QueueCompletedEventArgs(true));
+ if (foundIndex != -1)
+ {
+ this.queue.Insert(foundIndex, new QueueTask(QueueTaskType.Breakpoint));
+ }
+
+ this.IsProcessing = false;
 }
 }
 
 private void InvokeJobProcessingStarted(QueueProgressEventArgs e)
 {
- QueueProgressStatus handler = this.JobProcessingStarted;
- if (handler != null)
- {
- handler(this, e);
- }
+ this.JobProcessingStarted?.Invoke(this, e);
 }
 
 private void InvokeQueueChanged(EventArgs e)
 {
 try
 {
- this.BackupQueue(string.Empty);
+ delayedQueueBackupProcessor.PerformTask(() => this.BackupQueue(string.Empty), 200);
 }
 catch (Exception)
 {
@@ -528,58 +621,197 @@
 }
 }
 
- private void InvokeQueuePaused(EventArgs e)
+ private void ProcessNextJob()
 {
- this.IsProcessing = false;
+ this.StopJobPolling();
+ this.CheckAndHandleWork(); // Kick the first job off right away.
+
+ // Reset the timer.
+ this.queueTaskPoller = new Timer();
+ this.queueTaskPoller.Interval = this.allowedInstances > 1 ? 2000 : 1000;
+ this.queueTaskPoller.Elapsed += (o, e) => { CheckAndHandleWork(); };
+ this.queueTaskPoller.Start();
+ }
 
- EventHandler handler = this.QueuePaused;
- if (handler != null)
+ private void StopJobPolling()
+ {
+ if (this.queueTaskPoller != null)
 {
- handler(this, e);
+ this.queueTaskPoller.Stop();
+ this.queueTaskPoller = null;
 }
 }
-
- private void ProcessNextJob()
+ 
+ private void CheckAndHandleWork()
 {
+ if (!this.processIsolationEnabled)
+ {
+ this.allowedInstances = 1;
+ }
+
+ if (this.activeJobs.Count >= this.allowedInstances)
+ {
+ return;
+ }
+
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue))
+ {
+ this.ClearCompleted();
+ }
+
 QueueTask job = this.GetNextJobForProcessing();
 if (job != null)
 {
- if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PauseOnLowDiskspace) && !DriveUtilities.HasMinimumDiskSpace(job.Task.Destination, this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
+ if (job.IsBreakpointTask)
+ {
+ this.HandleBreakPoint(job);
+ return;
+ }
+ 
+ // Hardware encoders can typically only have 1 or two instances running at any given time. As such, we must have a HardwareResourceToken to continue.
+ if (job.TaskToken == Guid.Empty)
+ {
+ return; // Hardware is busy, we'll try again later when another job completes.
+ }
+
+ if (CheckDiskSpace(job))
 {
- this.logService.LogMessage(Resources.PauseOnLowDiskspace);
- job.Status = QueueItemStatus.Waiting;
- this.Pause();
- this.BackupQueue(string.Empty);
 return; // Don't start the next job.
 }
 
- job.Status = QueueItemStatus.InProgress;
- job.Statistics.StartTime = DateTime.Now;
- this.LastProcessedJob = job;
- this.IsProcessing = true;
- this.InvokeQueueChanged(EventArgs.Empty);
- this.InvokeJobProcessingStarted(new QueueProgressEventArgs(job));
+ this.jobIdCounter = this.jobIdCounter + 1;
+ IEncode libEncode = new LibEncode(this.userSettingService, this.logInstanceManager, this.jobIdCounter, this.portService);
+ ActiveJob activeJob = new ActiveJob(job, libEncode);
+ activeJob.JobFinished += this.ActiveJob_JobFinished;
+ activeJob.JobStatusUpdated += this.ActiveJob_JobStatusUpdated;
+ this.activeJobs.Add(activeJob);
+ 
+ activeJob.Start();
 
- if (!Directory.Exists(Path.GetDirectoryName(job.Task.Destination)))
+ if (!this.QueueContainsStop())
 {
- this.EncodeServiceEncodeCompleted(null, new EncodeCompletedEventArgs(false, null, "Destination Directory Missing", null, null, null, 0));
- this.BackupQueue(string.Empty);
- return;
+ this.IsProcessing = true;
 }
 
- this.EncodeService.Start(job.Task, job.Configuration, job.SelectedPresetKey);
+ this.InvokeQueueChanged(EventArgs.Empty);
+ this.InvokeJobProcessingStarted(new QueueProgressEventArgs(job));
 this.BackupQueue(string.Empty);
 }
 else
 {
- // No more jobs to process, so unsubscribe the event
- this.EncodeService.EncodeCompleted -= this.EncodeServiceEncodeCompleted;
+ this.BackupQueue(string.Empty);
+
+ if (!this.activeJobs.Any(a => a.IsEncoding))
+ {
+ this.StopJobPolling();
+
+ // Fire the event to tell connected services.
+ this.InvokeQueueCompleted(new QueueCompletedEventArgs(false));
+ }
+ }
+ }
+
+ private void ActiveJob_JobStatusUpdated(object sender, Encode.EventArgs.EncodeProgressEventArgs e)
+ {
+ this.OnQueueJobStatusChanged();
+ }
+
+ private void ActiveJob_JobFinished(object sender, ActiveJobCompletedEventArgs e)
+ {
+ this.hardwareResourceManager.ReleaseToken(e.Job.Job.Task.VideoEncoder, e.Job.Job.TaskToken);
+
+ this.activeJobs.Remove(e.Job);
+ this.OnEncodeCompleted(e.EncodeEventArgs);
+
+ this.InvokeQueueChanged(EventArgs.Empty);
+ }
+
+ private void InvokeQueueCompleted(QueueCompletedEventArgs e)
+ {
+ this.hardwareResourceManager.ClearTokens();
+ this.IsProcessing = false;
+ this.QueueCompleted?.Invoke(this, e);
+ }
+
+ private void OnQueueJobStatusChanged()
+ {
+ // TODO add support for delayed notifications here to avoid overloading the UI when we run multiple encodes. 
+ this.QueueJobStatusChanged?.Invoke(this, EventArgs.Empty);
+ }
+
+ private void OnEncodeCompleted(EncodeCompletedEventArgs e)
+ {
+ this.EncodeCompleted?.Invoke(this, e);
+ }
+
+ private void InvokeQueuePaused(EventArgs e)
+ {
+ this.IsProcessing = false;
+ 
+ EventHandler handler = this.QueuePaused;
+ handler?.Invoke(this, e);
+ }
+
+ private string GetQueueJson(List<EncodeTask> tasks, HBConfiguration configuration)
+ {
+ List<Task> queueJobs = new List<Task>();
+ foreach (var item in tasks)
+ {
+ Task task = new Task { Job = this.encodeTaskFactory.Create(item, configuration) };
+ queueJobs.Add(task);
+ }
 
+ return JsonSerializer.Serialize(queueJobs, JsonSettings.Options);
+ }
+
+ private bool CheckDiskSpace(QueueTask job)
+ {
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PauseOnLowDiskspace) && !DriveUtilities.HasMinimumDiskSpace(job.Task.Destination, this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
+ {
+ this.logService.LogMessage(Resources.PauseOnLowDiskspace);
+ job.Status = QueueItemStatus.Waiting;
+ this.Pause(true);
 this.BackupQueue(string.Empty);
+ return true; // Don't start the next job.
+ }
+
+ return false;
+ }
 
- // Fire the event to tell connected services.
- this.OnQueueCompleted(new QueueCompletedEventArgs(false));
+ private void HandleBreakPoint(QueueTask task)
+ {
+ lock (QueueLock)
+ {
+ if (this.activeJobs.Count != 0)
+ {
+ return; // Wait for jobs to finish!
+ }
+
+ this.StopJobPolling();
+
+ // Remove the Breakpoint
+ Execute.OnUIThread(() => this.queue.Remove(task));
+
+ this.IsProcessing = false;
+ this.IsPaused = false;
+
+ // Setting the flag will allow or prevent the when done actions to be processed. 
+ this.InvokeQueueCompleted(new QueueCompletedEventArgs(false)); 
+ }
+ }
+
+ private void RemoveBreakPoints()
+ {
+ List<QueueTask> tasks = this.queue.Where(t => t.IsBreakpointTask).ToList();
+ foreach (var task in tasks)
+ {
+ this.queue.Remove(task);
 }
 }
+
+ private bool QueueContainsStop()
+ {
+ return this.queue.Any(t => t.TaskType == QueueTaskType.Breakpoint);
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Factories/TitleFactory.cs Changed

@@ -11,18 +11,15 @@
 {
 using System;
 
- using Caliburn.Micro;
-
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.HbLib.Wrappers.Interfaces;
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 using HandBrake.Interop.Interop.Json.Scan;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Providers.Interfaces;
 
 using HandBrakeWPF.Services.Encode.Model.Models;
- using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Scan.Model;
 
+ using Size = HandBrakeWPF.Model.Picture.Size;
+
 public class TitleFactory
 {
 public Title CreateTitle(SourceTitle title, int mainFeature)
@@ -68,41 +65,12 @@
 int currentSubtitleTrack = 1;
 foreach (SourceSubtitleTrack track in title.SubtitleList)
 {
- SubtitleType convertedType = new SubtitleType();
-
- switch (track.Source)
- {
- case (int)hb_subtitle_s_subsource.VOBSUB:
- convertedType = SubtitleType.VobSub;
- break;
- case (int)hb_subtitle_s_subsource.CC608SUB:
- case (int)hb_subtitle_s_subsource.CC708SUB:
- convertedType = SubtitleType.CC;
- break;
- case (int)hb_subtitle_s_subsource.IMPORTSRT:
- convertedType = SubtitleType.SRT;
- break;
- case (int)hb_subtitle_s_subsource.UTF8SUB:
- convertedType = SubtitleType.UTF8Sub;
- break;
- case (int)hb_subtitle_s_subsource.TX3GSUB:
- convertedType = SubtitleType.TX3G;
- break;
- case (int)hb_subtitle_s_subsource.SSASUB:
- convertedType = SubtitleType.SSA;
- break;
- case (int)hb_subtitle_s_subsource.PGSSUB:
- convertedType = SubtitleType.PGS;
- break;
- }
-
- IHbFunctionsProvider provider = IoC.Get<IHbFunctionsProvider>(); // TODO remove IoC call
- IHbFunctions hbFunctions = provider.GetHbFunctionsWrapper();
-
- bool canBurn = hbFunctions.hb_subtitle_can_burn(track.Source) > 0;
- bool canSetForcedOnly = hbFunctions.hb_subtitle_can_force(track.Source) > 0;
+ SubtitleType convertedType = (SubtitleType)track.Source;
+ 
+ bool canBurn = HandBrakeSubtitleHelpers.CheckCanBurnSubtitle(track.Source) > 0;
+ bool canSetForcedOnly = HandBrakeSubtitleHelpers.CheckCanForceSubtitle(track.Source) > 0;
 
- converted.Subtitles.Add(new Subtitle(track.Source, currentSubtitleTrack, track.Language, track.LanguageCode, convertedType, canBurn, canSetForcedOnly, track.Name));
+ converted.Subtitles.Add(new Subtitle(track.Source, currentSubtitleTrack, track.Language, track.LanguageCode, convertedType, canBurn, canSetForcedOnly, track.Name, false));
 currentSubtitleTrack++;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Interfaces/IScan.cs Changed

@@ -12,8 +12,6 @@
 using System;
 using System.Windows.Media.Imaging;
 
- using HandBrake.Interop.Model;
-
 using HandBrakeWPF.Services.Encode.Model;
 using HandBrakeWPF.Services.Scan.EventArgs;
 using HandBrakeWPF.Services.Scan.Model;
@@ -27,7 +25,7 @@
 /// <param name="e">
 /// The EncodeProgressEventArgs.
 /// </param>
- public delegate void ScanProgessStatus(object sender, ScanProgressEventArgs e);
+ public delegate void ScanProgressStatus(object sender, ScanProgressEventArgs e);
 
 /// <summary>
 /// Encode Progress Status
@@ -58,7 +56,7 @@
 /// <summary>
 /// Scan process has changed to a new title
 /// </summary>
- event ScanProgessStatus ScanStatusChanged;
+ event ScanProgressStatus ScanStatusChanged;
 
 /// <summary>
 /// Gets a value indicating whether IsScanning.
@@ -78,10 +76,7 @@
 /// <param name="postAction">
 /// The post Action.
 /// </param>
- /// <param name="configuration">
- /// The configuraiton.
- /// </param>
- void Scan(string sourcePath, int title, Action<bool, Source> postAction, HBConfiguration configuration);
+ void Scan(string sourcePath, int title, Action<bool, Source> postAction);
 
 /// <summary>
 /// Cancel the current scan.
@@ -97,13 +92,10 @@
 /// <param name="preview">
 /// The preview.
 /// </param>
- /// <param name="configuration">
- /// The configuration.
- /// </param>
 /// <returns>
 /// The <see cref="BitmapImage"/>.
 /// </returns>
- BitmapImage GetPreview(EncodeTask task, int preview, HBConfiguration configuration);
+ BitmapImage GetPreview(EncodeTask task, int preview);
 
 /// <summary>
 /// Kill the scan

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs Changed

@@ -16,77 +16,54 @@
 
 using HandBrake.Interop.Interop;
 using HandBrake.Interop.Interop.Interfaces;
+ using HandBrake.Interop.Interop.Interfaces.Model.Preview;
+ using HandBrake.Interop.Interop.Json.Encode;
 using HandBrake.Interop.Interop.Json.Scan;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Model.Preview;
- using HandBrake.Interop.Model;
 
+ using HandBrakeWPF.Factories;
 using HandBrakeWPF.Instance;
+ using HandBrakeWPF.Services.Encode.Factories;
 using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Services.Scan.EventArgs;
 using HandBrakeWPF.Services.Scan.Factories;
 using HandBrakeWPF.Services.Scan.Interfaces;
- using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.Utilities;
 
 using ILog = Logging.Interfaces.ILog;
- using LogService = Logging.LogService;
- using ScanProgressEventArgs = HandBrake.Interop.Interop.EventArgs.ScanProgressEventArgs;
+ using ScanProgressEventArgs = HandBrake.Interop.Interop.Interfaces.EventArgs.ScanProgressEventArgs;
+ using Source = HandBrakeWPF.Services.Scan.Model.Source;
 using Title = Model.Title;
 
- /// <summary>
- /// Scan a Source
- /// </summary>
 public class LibScan : IScan, IDisposable
 {
- #region Private Variables
-
 private readonly ILog log = null;
+ private readonly IUserSettingService userSettingService;
+ private readonly ILogInstanceManager logInstanceManager;
+
 private TitleFactory titleFactory = new TitleFactory();
 private string currentSourceScanPath;
 private IHandBrakeInstance instance;
 private Action<bool, Source> postScanOperation;
 private bool isCancelled = false;
 
- #endregion
-
- public LibScan(ILog logService)
+ public LibScan(ILog logService, IUserSettingService userSettingService, ILogInstanceManager logInstanceManager)
 {
 this.log = logService;
+ this.userSettingService = userSettingService;
+ this.logInstanceManager = logInstanceManager;
 this.IsScanning = false;
 }
-
- #region Events
-
- /// <summary>
- /// Scan has Started
- /// </summary>
+ 
 public event EventHandler ScanStarted;
 
- /// <summary>
- /// Scan has completed
- /// </summary>
 public event ScanCompletedStatus ScanCompleted;
 
- /// <summary>
- /// Encode process has progressed
- /// </summary>
- public event ScanProgessStatus ScanStatusChanged;
+ public event ScanProgressStatus ScanStatusChanged;
 
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets a value indicating whether IsScanning.
- /// </summary>
 public bool IsScanning { get; private set; }
 
- #endregion
-
- #region Public Methods
-
 /// <summary>
 /// Scan a Source Path.
 /// Title 0: scan all
@@ -100,11 +77,13 @@
 /// <param name="postAction">
 /// The post Action.
 /// </param>
- /// <param name="configuraiton">
- /// The configuraiton.
- /// </param>
- public void Scan(string sourcePath, int title, Action<bool, Source> postAction, HBConfiguration configuraiton)
+ public void Scan(string sourcePath, int title, Action<bool, Source> postAction)
 {
+ if (this.IsScanning)
+ {
+ return;
+ }
+
 // Try to cleanup any previous scan instances.
 if (this.instance != null)
 {
@@ -120,16 +99,19 @@
 
 this.isCancelled = false;
 
+ // Reset the log
+ this.logInstanceManager.ResetApplicationLog();
+
 // Handle the post scan operation.
 this.postScanOperation = postAction;
 
 // Create a new HandBrake Instance.
- this.instance = HandBrakeInstanceManager.GetScanInstance(configuraiton.Verbosity, configuraiton);
+ this.instance = HandBrakeInstanceManager.GetScanInstance(this.userSettingService.GetUserSetting<int>(UserSettingConstants.Verbosity));
 this.instance.ScanProgress += this.InstanceScanProgress;
 this.instance.ScanCompleted += this.InstanceScanCompleted;
 
 // Start the scan on a back
- this.ScanSource(sourcePath, title, configuraiton.PreviewScanCount, configuraiton);
+ this.ScanSource(sourcePath, title, this.userSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount));
 }
 
 /// <summary>
@@ -182,13 +164,10 @@
 /// <param name="preview">
 /// The preview.
 /// </param>
- /// <param name="configuraiton">
- /// The configuraiton.
- /// </param>
 /// <returns>
 /// The <see cref="BitmapImage"/>.
 /// </returns>
- public BitmapImage GetPreview(EncodeTask job, int preview, HBConfiguration configuraiton)
+ public BitmapImage GetPreview(EncodeTask job, int preview)
 {
 if (this.instance == null)
 {
@@ -198,22 +177,9 @@
 BitmapImage bitmapImage = null;
 try
 {
- PreviewSettings settings = new PreviewSettings
- {
- Cropping = new Cropping(job.Cropping),
- MaxWidth = job.MaxWidth ?? 0,
- MaxHeight = job.MaxHeight ?? 0,
- KeepDisplayAspect = job.KeepDisplayAspect,
- TitleNumber = job.Title,
- Anamorphic = job.Anamorphic,
- Modulus = job.Modulus,
- Width = job.Width ?? 0,
- Height = job.Height ?? 0,
- PixelAspectX = job.PixelAspectX,
- PixelAspectY = job.PixelAspectY
- };
-
- RawPreviewData bitmapData = this.instance.GetPreview(settings, preview, job.DeinterlaceFilter != DeinterlaceFilter.Off);
+ EncodeTaskFactory factory = new EncodeTaskFactory(this.userSettingService);
+ JsonEncodeObject jobDict = factory.Create(job, HBConfigurationFactory.Create());
+ RawPreviewData bitmapData = this.instance.GetPreview(jobDict, preview);
 bitmapImage = BitmapUtilities.ConvertToBitmapImage(BitmapUtilities.ConvertByteArrayToBitmap(bitmapData));
 }
 catch (AccessViolationException e)
@@ -224,10 +190,6 @@
 return bitmapImage;
 }
 
- #endregion
-
- #region Private Methods
-
 /// <summary>
 /// The service log message.
 /// </summary>
@@ -236,7 +198,7 @@
 /// </param>
 protected void ServiceLogMessage(string message)
 {
- this.log.LogMessage(string.Format("{0} # {1}{0}", Environment.NewLine, message));
+ this.log.LogMessage(string.Format("{1} # {0}{1}", message, Environment.NewLine));
 }
 
 /// <summary>
@@ -251,10 +213,7 @@
 /// <param name="previewCount">
 /// The preview Count.
 /// </param>
- /// <param name="configuraiton">
- /// The configuration.
- /// </param>
- private void ScanSource(object sourcePath, int title, int previewCount, HBConfiguration configuraiton)
+ private void ScanSource(object sourcePath, int title, int previewCount)
 {
 try
 {
@@ -264,9 +223,9 @@
 
 this.IsScanning = true;
 
- TimeSpan minDuration = TimeSpan.FromSeconds(configuraiton.MinScanDuration);
+ TimeSpan minDuration = TimeSpan.FromSeconds(this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration));
 
- HandBrakeUtils.SetDvdNav(!configuraiton.IsDvdNavDisabled);
+ HandBrakeUtils.SetDvdNav(!this.userSettingService.GetUserSetting<bool>(UserSettingConstants.DisableLibDvdNav));
 
 this.ServiceLogMessage("Starting Scan ...");
 this.instance.StartScan(sourcePath.ToString(), previewCount, minDuration, title != 0 ? title : 0);
@@ -279,10 +238,6 @@
 this.Stop();
 }
 }
-
- #endregion
-
- #region HandBrakeInstance Event Handlers
 
 /// <summary>
 /// Scan Completed Event Handler
@@ -297,7 +252,6 @@
 {
 try
 {
- this.ServiceLogMessage("Processing Scan Information ...");
 bool cancelled = this.isCancelled;
 this.isCancelled = false;
 
@@ -312,7 +266,7 @@
 Source sourceData = null;
 if (this.instance?.Titles != null)
 {
- sourceData = new Source { Titles = this.ConvertTitles(this.instance.Titles), ScanPath = path };
+ sourceData = new Source(path, this.ConvertTitles(this.instance.Titles), null);
 }
 
 this.IsScanning = false;
@@ -341,6 +295,7 @@
 }
 finally
 {
+ this.IsScanning = false;
 var handBrakeInstance = this.instance;
 if (handBrakeInstance != null)
 {
@@ -395,7 +350,6 @@
 
 return titleList;
 }
- #endregion
 
 public void Dispose()
 {

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Audio.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Chapter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Chapter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Source.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Source.cs Changed

@@ -10,8 +10,12 @@
 namespace HandBrakeWPF.Services.Scan.Model
 {
 using System.Collections.Generic;
+ using System.IO;
 using System.Xml.Serialization;
 
+ using HandBrakeWPF.Model;
+ using HandBrakeWPF.Utilities;
+
 /// <summary>
 /// An object representing a scanned DVD
 /// </summary>
@@ -26,28 +30,57 @@
 this.Titles = new List<Title>();
 }
 
+ public Source(Source scannedSource) : this(scannedSource.ScanPath, scannedSource.Titles, scannedSource.SourceName)
+ { 
+ }
+
+ public Source(string scanPath, List<Title> titles, string sourceName)
+ {
+ this.ScanPath = scanPath;
+ this.Titles = titles;
+ this.SourceName = sourceName;
+
+ if (string.IsNullOrEmpty(sourceName))
+ {
+ // Scan Path is a File.
+ if (File.Exists(this.ScanPath))
+ {
+ this.SourceName = Path.GetFileNameWithoutExtension(this.ScanPath);
+ }
+
+ // Scan Path is a folder.
+ if (Directory.Exists(this.ScanPath))
+ {
+ // Check to see if it's a Drive. If yes, use the volume label.
+ foreach (DriveInformation item in DriveUtilities.GetDrives())
+ {
+ if (item.RootDirectory.Contains(this.ScanPath.Replace("\\\\", "\\")))
+ {
+ this.SourceName = item.VolumeLabel;
+ }
+ }
+
+ // Otherwise, it may be a path of files.
+ if (string.IsNullOrEmpty(this.SourceName))
+ {
+ this.SourceName = Path.GetFileName(this.ScanPath);
+ }
+ }
+ }
+ }
+
 /// <summary>
 /// Gets or sets ScanPath.
 /// The Path used by the Scan Service.
 /// </summary>
- public string ScanPath { get; set; }
+ public string ScanPath { get; }
 
 /// <summary>
 /// Gets or sets Titles. A list of titles from the source
 /// </summary>
 XmlIgnore
- public List<Title> Titles { get; set; }
+ public List<Title> Titles { get; }
 
- /// <summary>
- /// Copy this Source to another Source Model
- /// </summary>
- /// <param name="source">
- /// The source.
- /// </param>
- public void CopyTo(Source source)
- {
- source.Titles = this.Titles;
- source.ScanPath = this.ScanPath;
- }
+ public string SourceName { get; }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Subtitle.cs Changed

@@ -23,9 +23,6 @@
 /// </summary>
 public class Subtitle
 {
- /// <summary>
- /// Initializes a new instance of the <see cref="Subtitle"/> class.
- /// </summary>
 public Subtitle()
 {
 }
@@ -35,10 +32,7 @@
 this.SourceId = sourceId;
 }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="Subtitle"/> class.
- /// </summary>
- public Subtitle(int sourceId, int trackNumber, string language, string languageCode, SubtitleType subtitleType, bool canBurn, bool canForce, string name)
+ public Subtitle(int sourceId, int trackNumber, string language, string languageCode, SubtitleType subtitleType, bool canBurn, bool canForce, string name, bool isFakeForeignAudioScanTrack)
 {
 this.SourceId = sourceId;
 this.TrackNumber = trackNumber;
@@ -48,32 +42,17 @@
 this.CanBurnIn = canBurn;
 this.CanForce = canForce;
 this.Name = name;
+ this.IsFakeForeignAudioScanTrack = isFakeForeignAudioScanTrack;
 }
 
- /// <summary>
- /// Gets or sets the source id.
- /// </summary>
 public int SourceId { get; set; }
 
- /// <summary>
- /// Gets or sets the track number of this Subtitle
- /// </summary>
 public int TrackNumber { get; set; }
 
- /// <summary>
- /// Gets or sets the The language (if detected) of this Subtitle
- /// </summary>
 public string Language { get; set; }
 
- /// <summary>
- /// Gets or sets the Language Code
- /// </summary>
 public string LanguageCode { get; set; }
 
- /// <summary>
- /// Gets the language code clean.
- /// TODO Remove this after fixing language code.
- /// </summary>
 public string LanguageCodeClean
 {
 get
@@ -87,28 +66,16 @@
 }
 }
 
- /// <summary>
- /// Gets a value indicating whether can burn in.
- /// </summary>
- XmlIgnore
 public bool CanBurnIn { get; private set; }
 
- /// <summary>
- /// Gets a value indicating whether can force.
- /// </summary>
- XmlIgnore
 public bool CanForce { get; private set; }
 
- /// <summary>
- /// Gets or sets the Subtitle Type
- /// </summary>
 public SubtitleType SubtitleType { get; set; }
 
 public string Name { get; set; }
 
- /// <summary>
- /// Gets Subtitle Type
- /// </summary>
+ public bool IsFakeForeignAudioScanTrack { get; set; }
+
 public string TypeString
 {
 get
@@ -117,44 +84,26 @@
 }
 }
 
- /// <summary>
- /// Override of the ToString method to make this object easier to use in the UI
- /// </summary>
- /// <returns>A string formatted as: {track #} {language}</returns>
 public override string ToString()
 {
- return this.SubtitleType == SubtitleType.ForeignAudioSearch ? Resources.Subtitle_ForeignAudioScan : string.Format("{0} {1}", this.TrackNumber, this.Language);
+ return this.IsFakeForeignAudioScanTrack ? Resources.Subtitle_ForeignAudioScan : string.Format("{0} {1}", this.TrackNumber, this.Language);
 }
 
- /// <summary>
- /// The equals.
- /// </summary>
- /// <param name="other">
- /// The other.
- /// </param>
- /// <returns>
- /// The System.Boolean.
- /// </returns>
 public bool Equals(Subtitle other)
 {
 if (ReferenceEquals(null, other))
 {
 return false;
 }
+
 if (ReferenceEquals(this, other))
 {
 return true;
 }
+
 return other.TrackNumber == this.TrackNumber && object.Equals(other.Language, this.Language) && object.Equals(other.LanguageCode, this.LanguageCode) && object.Equals(other.SubtitleType, this.SubtitleType);
 }
 
- /// <summary>
- /// Determines whether the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>.
- /// </summary>
- /// <returns>
- /// true if the specified <see cref="T:System.Object"/> is equal to the current <see cref="T:System.Object"/>; otherwise, false.
- /// </returns>
- /// <param name="obj">The <see cref="T:System.Object"/> to compare with the current <see cref="T:System.Object"/>. </param><filterpriority>2</filterpriority>
 public override bool Equals(object obj)
 {
 if (ReferenceEquals(null, obj))
@@ -175,13 +124,6 @@
 return this.Equals((Subtitle)obj);
 }
 
- /// <summary>
- /// Serves as a hash function for a particular type. 
- /// </summary>
- /// <returns>
- /// A hash code for the current <see cref="T:System.Object"/>.
- /// </returns>
- /// <filterpriority>2</filterpriority>
 public override int GetHashCode()
 {
 unchecked

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/Scan/Model/Title.cs Changed

@@ -14,7 +14,9 @@
 using System.IO;
 using System.Linq;
 
- using HandBrake.Interop.Interop.Model;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+ using Size = HandBrakeWPF.Model.Picture.Size;
 
 /// <summary>
 /// An object that represents a single Title of a DVD
@@ -78,11 +80,6 @@
 public Size Resolution { get; set; }
 
 /// <summary>
- /// Gets or sets the aspect ratio of this Title
- /// </summary>
- public decimal AspectRatio { get; set; }
-
- /// <summary>
 /// Gets or sets AngleCount.
 /// </summary>
 public int AngleCount { get; set; }
@@ -127,6 +124,19 @@
 /// </summary>
 public string SourceName { get; set; }
 
+ public string DisplaySourceName
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(this.SourceName))
+ {
+ return Path.GetFileNameWithoutExtension(this.SourceName);
+ }
+
+ return null;
+ }
+ }
+
 public string SourceDisplayName
 {
 get
@@ -149,7 +159,7 @@
 get
 {
 return string.Format(
- "{0}{1} ({2:00}:{3:00}:{4:00}) {5}",
+ "{0} {1} ({2:00}:{3:00}:{4:00}) {5}",
 this.TitleNumber,
 this.Playlist,
 this.Duration.Hours,
@@ -164,7 +174,7 @@
 get
 {
 return string.Format(
- "{0}{1} ({2:00}:{3:00}:{4:00})",
+ "{0} {1} ({2:00}:{3:00}:{4:00})",
 this.TitleNumber,
 this.Playlist,
 this.Duration.Hours,
@@ -176,18 +186,18 @@
 #endregion
 
 /// <summary>
- /// Calcuate the Duration
+ /// Calculate the Duration
 /// </summary>
 /// <param name="startPoint">The Start Point (Chapters)</param>
 /// <param name="endPoint">The End Point (Chapters)</param>
 /// <returns>A Timespan</returns>
 public TimeSpan CalculateDuration(long startPoint, long endPoint)
 {
- IEnumerable<Chapter> chapers =
+ IEnumerable<Chapter> chapters =
 this.Chapters.Where(c => c.ChapterNumber >= startPoint && c.ChapterNumber <= endPoint);
 
 TimeSpan duration = TimeSpan.FromSeconds(0.0);
- duration = chapers.Aggregate(duration, (current, chapter) => current + chapter.Duration);
+ duration = chapters.Aggregate(duration, (current, chapter) => current + chapter.Duration);
 
 return duration;
 }
@@ -203,7 +213,7 @@
 this.Playlist = string.Format(" {0}", this.Playlist);
 }
 
- return string.Format("{0}{1} ({2:00}:{3:00}:{4:00})", this.TitleNumber, this.Playlist, this.Duration.Hours, this.Duration.Minutes, this.Duration.Seconds);
+ return string.Format("{0} {1} ({2:00}:{3:00}:{4:00})", this.TitleNumber, this.Playlist, this.Duration.Hours, this.Duration.Minutes, this.Duration.Seconds);
 }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/SystemService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/SystemService.cs Changed

@@ -13,7 +13,6 @@
 using System.Timers;
 
 using HandBrakeWPF.Properties;
- using HandBrakeWPF.Services.Encode.Interfaces;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Services.Queue.Interfaces;
@@ -22,23 +21,20 @@
 public class SystemService : ISystemService
 {
 private readonly IUserSettingService userSettingService;
- private readonly IEncode encodeService;
- private readonly ILog log = null;
 private readonly IQueueService queueService;
+ private readonly ILog log;
 
 private Timer pollTimer;
 
- private bool criticalStateHit = false;
 private bool lowStateHit = false;
 private bool lowPowerPause = false;
 private bool storageLowPause = false;
 
- public SystemService(IUserSettingService userSettingService, IEncode encodeService, ILog logService, IQueueService queueService)
+ public SystemService(IUserSettingService userSettingService, ILog logService, IQueueService queueService)
 {
 this.log = logService;
 this.queueService = queueService;
 this.userSettingService = userSettingService;
- this.encodeService = encodeService;
 }
 
 public void Start()
@@ -64,17 +60,24 @@
 
 private void StorageCheck()
 {
- string directory = this.encodeService.GetActiveJob()?.Destination;
- if (!string.IsNullOrEmpty(directory) && this.encodeService.IsEncoding)
+ foreach (string directory in this.queueService.GetActiveJobDestinationDirectories())
 {
- long lowLevel = this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseEncodeOnLowDiskspaceLevel);
+ this.CheckDiskSpaceForDirectory(directory);
+ }
+ }
+
+ private void CheckDiskSpaceForDirectory(string directory)
+ {
+ if (!string.IsNullOrEmpty(directory) && this.queueService.IsEncoding)
+ {
+ long lowLevel = this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel);
 if (!this.storageLowPause && this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PauseOnLowDiskspace) && !DriveUtilities.HasMinimumDiskSpace(directory, lowLevel))
 {
 this.log.LogMessage(
 string.Format(
 Resources.SystemService_LowDiskSpaceLog,
 lowLevel / 1000 / 1000 / 1000));
- this.queueService.Pause();
+ this.queueService.Pause(true);
 this.storageLowPause = true;
 }
 }
@@ -98,10 +101,10 @@
 
 if (state.ACLineStatus == Win32.ACLineStatus.Offline && state.BatteryLifePercent <= lowBatteryLevel && !this.lowStateHit)
 {
- if (this.encodeService.IsEncoding && !this.encodeService.IsPasued)
+ if (this.queueService.IsEncoding && !this.queueService.IsPaused)
 {
 this.lowPowerPause = true;
- this.queueService.Pause();
+ this.queueService.Pause(true);
 }
 
 Win32.AllowSleep();
@@ -113,14 +116,13 @@
 // Reset the flags when we start charging. 
 if (state.ACLineStatus == Win32.ACLineStatus.Online)
 {
- if (this.lowPowerPause && this.encodeService.IsPasued)
+ if (this.lowPowerPause && this.queueService.IsPaused)
 {
- this.queueService.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
+ this.queueService.Start();
 this.ServiceLogMessage(string.Format(Resources.SystemService_ACMains, state.BatteryLifePercent));
 }
 
 this.lowPowerPause = false;
- this.criticalStateHit = false;
 this.lowStateHit = false;
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/UpdateService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/UpdateService.cs Changed

@@ -17,12 +17,11 @@
 using System.Security.Cryptography;
 using System.Threading;
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Utilities;
 using HandBrakeWPF.Model;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using AppcastReader = HandBrakeWPF.Utilities.AppcastReader;
+ using AppcastReader = Utilities.AppcastReader;
 
 /// <summary>
 /// The Update Service
@@ -63,11 +62,6 @@
 /// </param>
 public void PerformStartupUpdateCheck(Action<UpdateCheckInformation> callback)
 {
- if (UwpDetect.IsUWP())
- {
- return; // Disable Update checker if we are in a UWP container.
- }
-
 if (Portable.IsPortable() && !Portable.IsUpdateCheckEnabled())
 {
 return; // Disable Update Check for Portable Mode.
@@ -102,19 +96,19 @@
 try
 {
 // Figure out which appcast we want to read.
- string url = Constants.Appcast64;
+ string url = SystemInfo.IsArmDevice ? Constants.Appcast64Arm : Constants.Appcast64;
 
- if (VersionHelper.IsNightly())
+ if (HandBrakeVersionHelper.IsNightly())
 {
- url = Constants.AppcastUnstable64;
+ url = SystemInfo.IsArmDevice ? Constants.AppcastUnstable64Arm : Constants.AppcastUnstable64;
 }
 
- var currentBuild = VersionHelper.Build;
+ var currentBuild = HandBrakeVersionHelper.Build;
 
 // Fetch the Appcast from our server.
 HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
 request.AllowAutoRedirect = false; // We will never do this.
- request.UserAgent = string.Format("HandBrake Win Upd {0}", VersionHelper.GetVersionShort());
+ request.UserAgent = string.Format("HandBrake Win Upd {0}", HandBrakeVersionHelper.GetVersionShort());
 WebResponse response = request.GetResponse();
 
 // Parse the data with the AppcastReader
@@ -129,9 +123,10 @@
 // Security Check
 // Verify the download URL is for handbrake.fr and served over https.
 // This prevents a compromised appcast download tricking the GUI into downloading a file, or accessing another website or local network resource.
+ // The download itself will also be checked against a signature later. 
 Uri uriResult;
 bool result = Uri.TryCreate(reader.DownloadFile, UriKind.Absolute, out uriResult) && uriResult.Scheme == Uri.UriSchemeHttps;
- if (!result || (uriResult.Host != "handbrake.fr" && uriResult.Host != "download.handbrake.fr"))
+ if (!result || (uriResult.Host != "handbrake.fr" && uriResult.Host != "download.handbrake.fr" && uriResult.Host != "github.com"))
 {
 callback(new UpdateCheckInformation { NewVersionAvailable = false, Error = new Exception("The HandBrake update service is currently unavailable.") });
 return;
@@ -187,23 +182,23 @@
 
 HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url);
 webRequest.Credentials = CredentialCache.DefaultCredentials;
- webRequest.UserAgent = string.Format("HandBrake Win Upd {0}", VersionHelper.GetVersionShort());
+ webRequest.UserAgent = string.Format("HandBrake Win Upd {0}", HandBrakeVersionHelper.GetVersionShort());
 HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse();
 long fileSize = webResponse.ContentLength;
 
- Stream responceStream = wcDownload.OpenRead(url);
+ Stream responseStream = wcDownload.OpenRead(url);
 Stream localStream = new FileStream(tempPath, FileMode.Create, FileAccess.Write, FileShare.None);
 
 int bytesSize;
 byte downBuffer = new byte2048;
 
- while ((bytesSize = responceStream.Read(downBuffer, 0, downBuffer.Length)) > 0)
+ while ((bytesSize = responseStream.Read(downBuffer, 0, downBuffer.Length)) > 0)
 {
 localStream.Write(downBuffer, 0, bytesSize);
 progress(new DownloadStatus { BytesRead = localStream.Length, TotalBytes = fileSize });
 }
 
- responceStream.Close();
+ responseStream.Close();
 localStream.Close();
 
 completed(
@@ -260,10 +255,10 @@
 try
 {
 byte file = File.ReadAllBytes(updateFile);
- using (RSACryptoServiceProvider verifyProfider = new RSACryptoServiceProvider())
+ using (RSACryptoServiceProvider verifyProvider = new RSACryptoServiceProvider())
 {
- verifyProfider.FromXmlString(publicKey);
- return verifyProfider.VerifyData(file, "SHA256", Convert.FromBase64String(signature));
+ verifyProvider.FromXmlString(publicKey);
+ return verifyProvider.VerifyData(file, "SHA256", Convert.FromBase64String(signature));
 }
 }
 catch (Exception e)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Services/UserSettingService.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Services/UserSettingService.cs Changed

@@ -11,40 +11,42 @@
 {
 using System;
 using System.Collections.Generic;
- using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
+ using System.Text.Json;
 
- using HandBrake.Interop.Model;
+ using HandBrake.Interop.Interop;
 using HandBrake.Interop.Utilities;
 
- using HandBrakeWPF.Extensions;
+ using HandBrakeWPF.Model;
+ using HandBrakeWPF.Model.Video;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Utilities;
 
- using Newtonsoft.Json;
- using Newtonsoft.Json.Linq;
-
 using GeneralApplicationException = Exceptions.GeneralApplicationException;
 using SettingChangedEventArgs = EventArgs.SettingChangedEventArgs;
+ using SystemInfo = Utilities.SystemInfo;
 
 /// <summary>
 /// The User Setting Service
 /// </summary>
 public class UserSettingService : IUserSettingService
 {
- private readonly string settingsFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly()), "settings.json");
+ private readonly ILog logService;
+
+ private readonly string settingsFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly()), "settings.json");
 private readonly string releaseSettingsFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(false), "settings.json");
 private readonly string nightlySettingsFile = Path.Combine(DirectoryUtilities.GetUserStoragePath(true), "settings.json");
- private readonly JsonSerializerSettings settings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
 private Dictionary<string, object> userSettings;
 
 /// <summary>
 /// Initializes a new instance of the <see cref="UserSettingService"/> class.
 /// </summary>
- public UserSettingService()
+ public UserSettingService(ILog logService)
 {
+ this.logService = logService;
 this.Load();
 }
 
@@ -84,35 +86,45 @@
 /// </returns>
 public T GetUserSetting<T>(string name)
 {
- if (this.userSettings.ContainsKey(name))
+ try
 {
- if (typeof(T) == typeof(int))
- {
- object storedValue = this.userSettingsname;
- object converted = storedValue?.ToString().ToInt();
- return (T)converted;
- }
-
- // Treat String Arrays as StringCollections. TODO refactor upstream code to more traditional string arrays.
- object settingValue = this.userSettingsname;
- if (settingValue != null && settingValue.GetType() == typeof(JArray))
+ if (this.userSettings.ContainsKey(name))
 {
- string stringArr = ((JArray)settingValue).ToObject<string>();
- StringCollection stringCollection = new StringCollection();
- foreach (var item in stringArr)
+ object settingValue = this.userSettingsname;
+ if (settingValue is JsonElement)
 {
- stringCollection.Add(item);
+ T rawValue = JsonSerializer.Deserialize<T>(
+ ((JsonElement)settingValue).GetRawText(),
+ JsonSettings.Options);
+ return rawValue;
 }
 
- settingValue = stringCollection;
+ T objectElement = (T)this.userSettingsname;
+ return objectElement;
 }
-
- return (T)settingValue;
+ }
+ catch (Exception e)
+ {
+ this.logService.LogMessage("Unable to fetch user setting: " + name + " - " + e);
+ return GetDefaultValue<T>(name);
 }
 
 return default(T);
 }
 
+ public void ResetSettingsToDefaults()
+ {
+ this.userSettings.Clear();
+
+ // Set Defaults
+ Dictionary<string, object> defaults = this.GetDefaults();
+ foreach (var item in defaults.Where(item => !this.userSettings.Keys.Contains(item.Key)))
+ {
+ this.userSettings.Add(item.Key, item.Value);
+ this.Save();
+ }
+ }
+
 /// <summary>
 /// The on setting changed.
 /// </summary>
@@ -143,14 +155,14 @@
 
 using (StreamWriter file = new StreamWriter(new FileStream(this.settingsFile, FileMode.Create, FileAccess.Write)))
 {
- string appSettings = JsonConvert.SerializeObject(this.userSettings, Formatting.Indented, this.settings);
+ string appSettings = JsonSerializer.Serialize(this.userSettings, JsonSettings.Options);
 file.Write(appSettings);
 }
 }
 catch (Exception exc)
 {
 throw new GeneralApplicationException(
- Resources.UserSettings_AnErrorOccured,
+ Resources.UserSettings_AnErrorOccurred,
 Resources.SettingService_SaveErrorReset,
 exc);
 }
@@ -169,12 +181,12 @@
 using (StreamReader reader = new StreamReader(this.settingsFile))
 {
 string appSettings = reader.ReadToEnd();
- Dictionary<string, object> deserialisedSettings = JsonConvert.DeserializeObject<Dictionary<string, object>>(appSettings);
+ Dictionary<string, object> deserializedSettings = JsonSerializer.Deserialize<Dictionary<string, object>>(appSettings, JsonSettings.Options);
 
- this.userSettings = deserialisedSettings;
+ this.userSettings = deserializedSettings;
 }
 }
- else if (VersionHelper.IsNightly() && File.Exists(this.releaseSettingsFile))
+ else if (HandBrakeVersionHelper.IsNightly() && File.Exists(this.releaseSettingsFile))
 {
 // Port the release versions config to the nightly.
 if (!Directory.Exists(DirectoryUtilities.GetUserStoragePath(true)))
@@ -187,8 +199,8 @@
 using (StreamReader reader = new StreamReader(this.settingsFile))
 {
 string appSettings = reader.ReadToEnd();
- Dictionary<string, object> deserialisedSettings = JsonConvert.DeserializeObject<Dictionary<string, object>>(appSettings);
- this.userSettings = deserialisedSettings;
+ Dictionary<string, object> deserializedSettings = JsonSerializer.Deserialize<Dictionary<string, object>>(appSettings, JsonSettings.Options);
+ this.userSettings = deserializedSettings;
 }
 }
 else
@@ -204,8 +216,7 @@
 this.Save();
 }
 
- // Legacy Settings forced Reset.
- this.userSettingsUserSettingConstants.ScalingMode = VideoScaler.Lanczos;
+ this.ResetUnsupportedSettings();
 }
 catch (Exception exc)
 {
@@ -228,6 +239,29 @@
 }
 }
 
+ private void ResetUnsupportedSettings()
+ {
+ // Legacy Settings forced Reset.
+ this.userSettingsUserSettingConstants.ScalingMode = VideoScaler.Lanczos;
+
+ if (SystemInfo.MaximumSimultaneousInstancesSupported < 2)
+ {
+ this.userSettingsUserSettingConstants.ProcessIsolationEnabled = false;
+ this.userSettingsUserSettingConstants.SimultaneousEncodes = 1;
+ }
+
+ // Handle change of language code zh to zh-CN
+ object language;
+ if (this.userSettings.TryGetValue(UserSettingConstants.UiLanguage, out language))
+ {
+ if (language is string and "zh")
+ {
+ // Reset to use system language if we have the old zh stored in settings.
+ this.userSettingsUserSettingConstants.UiLanguage = InterfaceLanguageUtilities.UseSystemLanguage;
+ }
+ }
+ }
+ 
 /// <summary>
 /// Load Default Settings
 /// </summary>
@@ -241,22 +275,24 @@
 defaults.Add(UserSettingConstants.Verbosity, 1);
 
 // General
- defaults.Add(UserSettingConstants.UpdateStatus, true);
+ defaults.Add(UserSettingConstants.UpdateStatus, false);
 defaults.Add(UserSettingConstants.LastUpdateCheckDate, DateTime.Now.Date.AddDays(-30));
 defaults.Add(UserSettingConstants.DaysBetweenUpdateCheck, 1);
- defaults.Add(UserSettingConstants.UseDarkTheme, false);
+ defaults.Add(UserSettingConstants.DarkThemeMode, DarkThemeMode.Light);
 defaults.Add(UserSettingConstants.ShowPreviewOnSummaryTab, true);
 defaults.Add(UserSettingConstants.MainWindowMinimize, false);
 defaults.Add(UserSettingConstants.ClearCompletedFromQueue, false);
 defaults.Add(UserSettingConstants.ShowStatusInTitleBar, false);
 defaults.Add(UserSettingConstants.ShowAddAllToQueue, false);
 defaults.Add(UserSettingConstants.ShowAddSelectionToQueue, false);
- defaults.Add(UserSettingConstants.VLCPath, @"C:\Program Files\VideoLAN\vlc\vlc.exe");
-
+ defaults.Add(UserSettingConstants.MediaPlayerPath, @"C:\Program Files\VideoLAN\vlc\vlc.exe");
+ defaults.Add(UserSettingConstants.PresetMenuDisplayMode, 0);
+ defaults.Add(UserSettingConstants.RightToLeftUi, 0); 
+ 
 // Output Files
 defaults.Add(UserSettingConstants.AutoNaming, true);
 defaults.Add(UserSettingConstants.AutoNamePath, string.Empty);
- defaults.Add(UserSettingConstants.AutoNameFormat, "{source}-{title}");
+ defaults.Add(UserSettingConstants.AutoNameFormat, "{source}");
 defaults.Add(UserSettingConstants.AutonameFilePrePostString, "output_");
 defaults.Add(UserSettingConstants.AutoNameTitleCase, true);
 defaults.Add(UserSettingConstants.AutoNameRemoveUnderscore, true);
@@ -280,7 +316,8 @@
 defaults.Add(UserSettingConstants.UseQSVDecodeForNonQSVEnc, false);
 defaults.Add(UserSettingConstants.EnableVceEncoder, true);
 defaults.Add(UserSettingConstants.EnableNvencEncoder, true);
-
+ defaults.Add(UserSettingConstants.EnableQuickSyncLowPower, true);
+ 
 // Advanced
 defaults.Add(UserSettingConstants.PreventSleep, true);
 defaults.Add(UserSettingConstants.PauseEncodingOnLowBattery, true);
@@ -289,30 +326,51 @@
 defaults.Add(UserSettingConstants.DisableLibDvdNav, false);
 defaults.Add(UserSettingConstants.PauseOnLowDiskspace, true);
 defaults.Add(UserSettingConstants.PauseQueueOnLowDiskspaceLevel, 2000000000L);
- defaults.Add(UserSettingConstants.PauseEncodeOnLowDiskspaceLevel, 2000000000L);
 defaults.Add(UserSettingConstants.PreviewScanCount, 10);
 defaults.Add(UserSettingConstants.MinScanDuration, 10);
- defaults.Add(UserSettingConstants.ProcessPriorityInt, 3);
+ defaults.Add(UserSettingConstants.ProcessPriorityInt, 2);
 defaults.Add(UserSettingConstants.X264Step, 0.5);
 defaults.Add(UserSettingConstants.SaveLogToCopyDirectory, false);
 defaults.Add(UserSettingConstants.SaveLogWithVideo, false);
 defaults.Add(UserSettingConstants.ClearOldLogs, true);
 
 // Preview
- defaults.Add(UserSettingConstants.PreviewRotationFlip, false);
 defaults.Add(UserSettingConstants.LastPreviewDuration, 30);
 defaults.Add(UserSettingConstants.DefaultPlayer, false);
 
 // Experimental
- defaults.Add(UserSettingConstants.RemoteServiceEnabled, false);
- defaults.Add(UserSettingConstants.RemoteServicePort, true);
+ defaults.Add(UserSettingConstants.ProcessIsolationEnabled, true);
+ defaults.Add(UserSettingConstants.ProcessIsolationPort, 8037);
+ defaults.Add(UserSettingConstants.SimultaneousEncodes, 1);
 
 // Misc
- defaults.Add(UserSettingConstants.ShowPresetPanel, false);
 defaults.Add(UserSettingConstants.ScalingMode, 0);
 defaults.Add(UserSettingConstants.ForcePresetReset, 3);
+ defaults.Add(UserSettingConstants.PreviewShowPictureSettingsOverlay, false);
+ defaults.Add(UserSettingConstants.RunCounter, 0);
+ defaults.Add(UserSettingConstants.ForceSoftwareRendering, false);
 
 return defaults;
 }
+
+ private T GetDefaultValue<T>(string name)
+ {
+ try
+ {
+ // If the current setting is corrupt, return the default and log it.
+ Dictionary<string, object> defaults = this.GetDefaults();
+ if (defaults.ContainsKey(name))
+ {
+ return (T)this.userSettingsname;
+ }
+ }
+ catch (Exception e)
+ {
+ this.logService.LogMessage("Unable to fetch default setting: " + name + " - " + e);
+ return default(T);
+ }
+
+ return default(T);
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Settings.StyleCop -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Settings.StyleCop Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Startup/AppBootstrapper.cs Changed

@@ -14,12 +14,10 @@
 
 using Caliburn.Micro;
 
- using HandBrake.Interop.Interop.Providers;
- using HandBrake.Interop.Interop.Providers.Interfaces;
-
 using HandBrakeWPF.Services;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Logging;
+ using HandBrakeWPF.Services.Logging.Interfaces;
 using HandBrakeWPF.Services.Presets;
 using HandBrakeWPF.Services.Presets.Interfaces;
 using HandBrakeWPF.Services.Queue;
@@ -29,8 +27,8 @@
 using HandBrakeWPF.ViewModels;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;
- using LibEncode = HandBrakeWPF.Services.Encode.LibEncode;
+ using IEncode = Services.Encode.Interfaces.IEncode;
+ using LibEncode = Services.Encode.LibEncode;
 
 /// <summary>
 /// The Castle Bootstrapper
@@ -65,7 +63,7 @@
 this.container.Singleton<IUserSettingService, UserSettingService>();
 this.container.Singleton<IPresetService, PresetService>();
 this.container.Singleton<IQueueService, QueueService>();
- this.container.Singleton<HandBrakeWPF.Services.Logging.Interfaces.ILog, LogService>();
+ this.container.Singleton<Services.Logging.Interfaces.ILog, LogService>();
 
 // Commands
 
@@ -82,10 +80,11 @@
 this.container.Singleton<ITitleSpecificViewModel, TitleSpecificViewModel>();
 this.container.Singleton<IQueueSelectionViewModel, QueueSelectionViewModel>();
 this.container.Singleton<ICountdownAlertViewModel, CountdownAlertViewModel>();
- this.container.Singleton<IMiniViewModel, MiniViewModel>();
 this.container.Singleton<IStaticPreviewViewModel, StaticPreviewViewModel>();
 this.container.Singleton<ISystemService, SystemService>();
- this.container.Singleton<IHbFunctionsProvider, HbFunctionsProvider>();
+ this.container.Singleton<ILogInstanceManager, LogInstanceManager>();
+ this.container.Singleton<IPortService, PortService>();
+ this.container.Singleton<INotificationService, NotificationService>();
 
 // Tab Components
 this.container.Singleton<IAudioViewModel, AudioViewModel>();
@@ -96,7 +95,8 @@
 this.container.Singleton<IVideoViewModel, VideoViewModel>();
 this.container.Singleton<IMetaDataViewModel, MetaDataViewModel>();
 this.container.Singleton<ISummaryViewModel, SummaryViewModel>();
-
+ this.container.Singleton<IPresetManagerViewModel, PresetManagerViewModel>();
+ 
 // Shell
 this.container.Singleton<IShellViewModel, ShellViewModel>();
 this.container.Singleton<INotifyIconService, NotifyIconService>();

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Startup/StartupOptions.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Startup/StartupOptions.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ContextMenuDark.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ContextMenuDark.xaml Changed

@@ -23,6 +23,89 @@
 <SolidColorBrush x:Key="MenuItem.Highlight.Disabled.Border" Color="#21000000" />
 
 
+ <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
+
+ <Geometry x:Key="DownArrow">M 0,0 L 3.5,4 L 7,0 Z</Geometry>
+ <Geometry x:Key="UpArrow">M 0,4 L 3.5,0 L 7,4 Z</Geometry>
+ <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
+
+ <Geometry x:Key="Checkmark">F1 M 10.0,1.2 L 4.7,9.1 L 4.5,9.1 L 0,5.2 L 1.3,3.5 L 4.3,6.1L 8.3,0 L 10.0,1.2 Z</Geometry>
+
+
+ <Style x:Key="MenuScrollButton" BasedOn="{x:Null}" TargetType="{x:Type RepeatButton}">
+ <Setter Property="ClickMode" Value="Hover"/>
+ <Setter Property="MinWidth" Value="0"/>
+ <Setter Property="MinHeight" Value="0"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type RepeatButton}">
+ <DockPanel Background="Transparent" SnapsToDevicePixels="true">
+ <Rectangle x:Name="R1" DockPanel.Dock="Right" Fill="Transparent" Width="1"/>
+ <Rectangle x:Name="B1" DockPanel.Dock="Bottom" Fill="Transparent" Height="1"/>
+ <Rectangle x:Name="L1" DockPanel.Dock="Left" Fill="Transparent" Width="1"/>
+ <Rectangle x:Name="T1" DockPanel.Dock="Top" Fill="Transparent" Height="1"/>
+ <ContentPresenter x:Name="ContentContainer" HorizontalAlignment="Center" Margin="2,2,2,2" VerticalAlignment="Center"/>
+ </DockPanel>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsPressed" Value="true">
+ <Setter Property="Fill" TargetName="R1" Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"/>
+ <Setter Property="Fill" TargetName="B1" Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"/>
+ <Setter Property="Fill" TargetName="L1" Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+ <Setter Property="Fill" TargetName="T1" Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+ <Setter Property="Margin" TargetName="ContentContainer" Value="3,3,1,1"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="MenuScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{x:Null}">
+ <Setter Property="HorizontalScrollBarVisibility" Value="Hidden" />
+ <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ScrollViewer}">
+ <Grid SnapsToDevicePixels="True">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <Border Grid.Row="1" Grid.Column="0">
+ <ScrollContentPresenter Margin="{TemplateBinding Padding}" />
+ </Border>
+ <RepeatButton Style="{StaticResource MenuScrollButton}" Grid.Row="0" Grid.Column="0" Command="{x:Static ScrollBar.LineUpCommand}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Focusable="False">
+ <RepeatButton.Visibility>
+ <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+ </MultiBinding>
+ </RepeatButton.Visibility>
+ <Path Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" Data="{StaticResource UpArrow}" />
+ </RepeatButton>
+ <RepeatButton Style="{StaticResource MenuScrollButton}" Grid.Row="2" Grid.Column="0" Command="{x:Static ScrollBar.LineDownCommand}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Focusable="False">
+ <RepeatButton.Visibility>
+ <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" /> </MultiBinding>
+ </RepeatButton.Visibility>
+ <Path Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" Data="{StaticResource DownArrow}" />
+ </RepeatButton>
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+
 <Style x:Key="{x:Type ContextMenu}" TargetType="{x:Type ContextMenu}">
 <Setter Property="Background" Value="{DynamicResource Ui.Mid}"/>
 <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>
@@ -45,8 +128,7 @@
 <Border Name="ContextMenuBorder" Background="{TemplateBinding Background}"
 BorderBrush="{TemplateBinding BorderBrush}"
 BorderThickness="{TemplateBinding BorderThickness}">
- <ScrollViewer Name="ContextMenuScrollViewer" Grid.ColumnSpan="2" Margin="1,0" 
- Style="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=MenuScrollViewer}}">
+ <ScrollViewer Name="ContextMenuScrollViewer" Grid.ColumnSpan="2" Margin="1,0" Style="{StaticResource MenuScrollViewer}">
 <Grid RenderOptions.ClearTypeHint="Enabled">
 <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
 <Rectangle Name="OpaqueRect"
@@ -105,11 +187,6 @@
 </Setter>
 </Style>
 
- <Geometry x:Key="DownArrow">M 0,0 L 3.5,4 L 7,0 Z</Geometry>
- <Geometry x:Key="UpArrow">M 0,4 L 3.5,0 L 7,4 Z</Geometry>
- <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
-
- <Geometry x:Key="Checkmark">F1 M 10.0,1.2 L 4.7,9.1 L 4.5,9.1 L 0,5.2 L 1.3,3.5 L 4.3,6.1L 8.3,0 L 10.0,1.2 Z</Geometry>
 
 <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=SubmenuContent}" TargetType="{x:Type ContentControl}">
 <Border
@@ -142,8 +219,10 @@
 </Style>
 
 <Style TargetType="{x:Type MenuItem}">
- <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
- <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+ 
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
+ <Setter Property="VerticalContentAlignment" Value="Center" />
 <Setter Property="Background" Value="Transparent" />
 <Setter Property="BorderBrush" Value="Transparent" />
 <Setter Property="BorderThickness" Value="1" />
@@ -324,14 +403,14 @@
 PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"
 Placement="Right"
 HorizontalOffset="-2"
- VerticalOffset="-3">
+ VerticalOffset="-3"> 
 <Border x:Name="SubMenuBorder"
 Background="{StaticResource Menu.Static.Background}"
 BorderBrush="{StaticResource Menu.Static.Border}"
 BorderThickness="1"
 Padding="2">
- <ScrollViewer x:Name="SubMenuScrollViewer"
- Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
+ <ScrollViewer x:Name="SubMenuScrollViewer" MaxHeight="600" 
+ Style="{StaticResource MenuScrollViewer}">
 <Grid RenderOptions.ClearTypeHint="Enabled">
 <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
 <Rectangle
@@ -488,7 +567,7 @@
 BorderThickness="1"
 Padding="2">
 <ScrollViewer x:Name="SubMenuScrollViewer"
- Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer, TypeInTargetAssembly={x:Type FrameworkElement}}}">
+ Style="{StaticResource MenuScrollViewer}">
 <Grid RenderOptions.ClearTypeHint="Enabled">
 <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
 <Rectangle

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ContextMenuLight.xaml Added

@@ -0,0 +1,623 @@
+<ResourceDictionary
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+
+ 
+ <SolidColorBrush x:Key="Menu.Static.Background" Color="#FFF0F0F0" />
+ <SolidColorBrush x:Key="Menu.Static.Border" Color="#FF999999" />
+ <SolidColorBrush x:Key="Menu.Static.Foreground" Color="#FF212121" />
+
+ <SolidColorBrush x:Key="Menu.Static.Separator" Color="#FFD7D7D7" />
+
+ <SolidColorBrush x:Key="Menu.Disabled.Background" Color="#3DDADADA" />
+ <SolidColorBrush x:Key="Menu.Disabled.Border" Color="#FFDADADA" />
+ <SolidColorBrush x:Key="Menu.Disabled.Foreground" Color="#FF707070" />
+
+ <SolidColorBrush x:Key="MenuItem.Selected.Background" Color="#3D26A0DA" />
+ <SolidColorBrush x:Key="MenuItem.Selected.Border" Color="#FF26A0DA" />
+
+ <SolidColorBrush x:Key="MenuItem.Highlight.Background" Color="#3D26A0DA" />
+ <SolidColorBrush x:Key="MenuItem.Highlight.Border" Color="#FF26A0DA" />
+
+ <SolidColorBrush x:Key="MenuItem.Highlight.Disabled.Background" Color="#0A000000" />
+ <SolidColorBrush x:Key="MenuItem.Highlight.Disabled.Border" Color="#21000000" />
+
+
+ <MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter" />
+
+ <Geometry x:Key="DownArrow">M 0,0 L 3.5,4 L 7,0 Z</Geometry>
+ <Geometry x:Key="UpArrow">M 0,4 L 3.5,0 L 7,4 Z</Geometry>
+ <Geometry x:Key="RightArrow">M 0,0 L 4,3.5 L 0,7 Z</Geometry>
+
+ <Geometry x:Key="Checkmark">F1 M 10.0,1.2 L 4.7,9.1 L 4.5,9.1 L 0,5.2 L 1.3,3.5 L 4.3,6.1L 8.3,0 L 10.0,1.2 Z</Geometry>
+
+
+ <Style x:Key="MenuScrollButton" BasedOn="{x:Null}" TargetType="{x:Type RepeatButton}">
+ <Setter Property="ClickMode" Value="Hover"/>
+ <Setter Property="MinWidth" Value="0"/>
+ <Setter Property="MinHeight" Value="0"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type RepeatButton}">
+ <DockPanel Background="Transparent" SnapsToDevicePixels="true">
+ <Rectangle x:Name="R1" DockPanel.Dock="Right" Fill="Transparent" Width="1"/>
+ <Rectangle x:Name="B1" DockPanel.Dock="Bottom" Fill="Transparent" Height="1"/>
+ <Rectangle x:Name="L1" DockPanel.Dock="Left" Fill="Transparent" Width="1"/>
+ <Rectangle x:Name="T1" DockPanel.Dock="Top" Fill="Transparent" Height="1"/>
+ <ContentPresenter x:Name="ContentContainer" HorizontalAlignment="Center" Margin="2,2,2,2" VerticalAlignment="Center"/>
+ </DockPanel>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsPressed" Value="true">
+ <Setter Property="Fill" TargetName="R1" Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"/>
+ <Setter Property="Fill" TargetName="B1" Value="{DynamicResource {x:Static SystemColors.ControlLightLightBrushKey}}"/>
+ <Setter Property="Fill" TargetName="L1" Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+ <Setter Property="Fill" TargetName="T1" Value="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+ <Setter Property="Margin" TargetName="ContentContainer" Value="3,3,1,1"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="MenuScrollViewer" TargetType="{x:Type ScrollViewer}" BasedOn="{x:Null}">
+ <Setter Property="HorizontalScrollBarVisibility" Value="Hidden" />
+ <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ScrollViewer}">
+ <Grid SnapsToDevicePixels="True">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ <Border Grid.Row="1" Grid.Column="0">
+ <ScrollContentPresenter Margin="{TemplateBinding Padding}" />
+ </Border>
+ <RepeatButton Style="{StaticResource MenuScrollButton}" Grid.Row="0" Grid.Column="0" Command="{x:Static ScrollBar.LineUpCommand}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Focusable="False">
+ <RepeatButton.Visibility>
+ <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="0">
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+ </MultiBinding>
+ </RepeatButton.Visibility>
+ <Path Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" Data="{StaticResource UpArrow}" />
+ </RepeatButton>
+ <RepeatButton Style="{StaticResource MenuScrollButton}" Grid.Row="2" Grid.Column="0" Command="{x:Static ScrollBar.LineDownCommand}" CommandTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}" Focusable="False">
+ <RepeatButton.Visibility>
+ <MultiBinding FallbackValue="Visibility.Collapsed" Converter="{StaticResource MenuScrollingVisibilityConverter}" ConverterParameter="100">
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ComputedVerticalScrollBarVisibility" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="VerticalOffset" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ExtentHeight" />
+ <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ViewportHeight" />
+ </MultiBinding>
+ </RepeatButton.Visibility>
+ <Path Fill="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}" Data="{StaticResource DownArrow}" />
+ </RepeatButton>
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+
+ <Style x:Key="{x:Type ContextMenu}" TargetType="{x:Type ContextMenu}">
+ <Setter Property="Background" Value="{DynamicResource Ui.Mid}"/>
+ <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>
+ <Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.MenuFontSizeKey}}"/>
+ <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"/>
+ <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}"/>
+ <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}"/>
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
+ <Setter Property="BorderThickness" Value="1"/>
+ <Setter Property="BorderBrush" Value="{DynamicResource Ui.ContrastLight}"/>
+ <Setter Property="Padding" Value="2"/>
+ <Setter Property="Grid.IsSharedSizeScope" Value="true"/>
+ <Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}"/>
+ <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+ <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ContextMenu}">
+ <themes:SystemDropShadowChrome Name="Shdw" Color="Transparent" SnapsToDevicePixels="true">
+ <Border Name="ContextMenuBorder" Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}">
+ <ScrollViewer Name="ContextMenuScrollViewer" Grid.ColumnSpan="2" Margin="1,0" Style="{StaticResource MenuScrollViewer}">
+ <Grid RenderOptions.ClearTypeHint="Enabled">
+ <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+ <Rectangle Name="OpaqueRect"
+ Height="{Binding ElementName=ContextMenuBorder,Path=ActualHeight}"
+ Width="{Binding ElementName=ContextMenuBorder,Path=ActualWidth}"
+ Fill="{Binding ElementName=ContextMenuBorder,Path=Background}" />
+ </Canvas>
+ <Rectangle Fill="{DynamicResource Ui.Mid}" HorizontalAlignment="Left" Width="28" Margin="1,2" RadiusX="2" RadiusY="2"/>
+ <Rectangle HorizontalAlignment="Left" Width="1" Margin="29,2,0,2" Fill="{StaticResource Menu.Static.Separator}"/>
+ 
+ <ItemsPresenter Name="ItemsPresenter" Margin="{TemplateBinding Padding}"
+ KeyboardNavigation.DirectionalNavigation="Cycle"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+ </Grid>
+ </ScrollViewer>
+ </Border>
+ </themes:SystemDropShadowChrome>
+ <ControlTemplate.Triggers>
+ <Trigger Property="HasDropShadow" Value="true">
+ <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5"/>
+ <Setter TargetName="Shdw" Property="Color" Value="#71000000"/>
+ </Trigger>
+ <Trigger SourceName="ContextMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+ <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding ElementName=ContextMenuScrollViewer, Path=VerticalOffset}" />
+ <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=ContextMenuScrollViewer, Path=HorizontalOffset}" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+
+ <Style TargetType="{x:Type Menu}">
+ <Setter Property="Background" Value="{StaticResource Menu.Static.Background}" />
+ <Setter Property="FontFamily" Value="{DynamicResource {x:Static SystemFonts.MenuFontFamilyKey}}"/>
+ <Setter Property="FontSize" Value="{DynamicResource {x:Static SystemFonts.MenuFontSizeKey}}"/>
+ <Setter Property="FontStyle" Value="{DynamicResource {x:Static SystemFonts.MenuFontStyleKey}}"/>
+ <Setter Property="FontWeight" Value="{DynamicResource {x:Static SystemFonts.MenuFontWeightKey}}"/>
+ <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.MenuTextBrushKey}}"/>
+ <Setter Property="VerticalContentAlignment" Value="Center"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type Menu}">
+ <Border 
+ Background="{TemplateBinding Background}" 
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Padding="{TemplateBinding Padding}" 
+ SnapsToDevicePixels="true">
+ <ItemsPresenter 
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+
+ <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type FrameworkElement}, ResourceId=SubmenuContent}" TargetType="{x:Type ContentControl}">
+ <Border
+ Background="{TemplateBinding Menu.Background}"
+ BorderBrush="{TemplateBinding Menu.BorderBrush}"
+ BorderThickness="1"
+ Padding="2">
+ <Border
+ Background="{StaticResource Menu.Static.Background}">
+ <ContentPresenter/>
+ </Border>
+ </Border>
+ </ControlTemplate>
+
+ <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}">
+ <Setter Property="Background" Value="{StaticResource Menu.Static.Separator}"/>
+ <Setter Property="BorderBrush" Value="{StaticResource Menu.Static.Separator}"/>
+ <Setter Property="MinHeight" Value="1"/>
+ <Setter Property="SnapsToDevicePixels" Value="true"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type Separator}">
+ <Border Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Margin="30,0,0,0"/>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style TargetType="{x:Type MenuItem}">
+ 
+ <Setter Property="HorizontalContentAlignment" Value="Left" />
+ <Setter Property="VerticalContentAlignment" Value="Center" />
+ <Setter Property="Background" Value="Transparent" />
+ <Setter Property="BorderBrush" Value="Transparent" />
+ <Setter Property="BorderThickness" Value="1" />
+ <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
+ <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
+ <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}}" />
+ <Style.Triggers>
+ <Trigger Property="Role" Value="TopLevelHeader">
+ <Setter Property="Background" Value="Transparent" />
+ <Setter Property="BorderBrush" Value="Transparent" />
+ <Setter Property="Foreground" Value="{StaticResource Menu.Static.Foreground}" />
+ <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}}" />
+ <Setter Property="Padding" Value="6,0"/>
+ </Trigger>
+ <Trigger Property="Role" Value="TopLevelItem">
+ <Setter Property="Background" Value="{StaticResource Menu.Static.Background}" />
+ <Setter Property="BorderBrush" Value="{StaticResource Menu.Static.Border}" />
+ <Setter Property="Foreground" Value="{StaticResource Menu.Static.Foreground}" />
+ <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}}" />
+ <Setter Property="Padding" Value="6,0"/>
+ </Trigger>
+ <Trigger Property="Role" Value="SubmenuHeader">
+ <Setter Property="Template" Value="{DynamicResource {ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}}" />
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+
+ <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuItemTemplateKey}" TargetType="{x:Type MenuItem}">
+ <Border x:Name="templateRoot"
+ SnapsToDevicePixels="true"
+ Height="22"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}">
+ <Grid Margin="-1">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition MinWidth="22" SharedSizeGroup="MenuItemIconColumnGroup" Width="Auto"/>
+ <ColumnDefinition Width="13"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="30"/>
+ <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
+ <ColumnDefinition Width="20"/>
+ </Grid.ColumnDefinitions>
+ <ContentPresenter x:Name="Icon"
+ ContentSource="Icon"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Width="16"
+ Height="16"
+ Margin="3"/>
+ <Border x:Name="GlyphPanel"
+ Visibility="Hidden"
+ Height="22"
+ Width="22"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Background="{StaticResource MenuItem.Selected.Background}"
+ BorderBrush="{StaticResource MenuItem.Selected.Border}"
+ BorderThickness="1"
+ ClipToBounds="False"
+ Margin="-1,0,0,0">
+ <Path x:Name="Glyph"
+ Data="{StaticResource Checkmark}"
+ FlowDirection="LeftToRight"
+ Height="11"
+ Width="10"
+ Fill="{StaticResource Menu.Static.Foreground}" />
+ </Border>
+ <ContentPresenter x:Name="menuHeaderContainer"
+ Grid.Column="2"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Center"
+ ContentSource="Header"
+ RecognizesAccessKey="True"
+ Margin="{TemplateBinding MenuItem.Padding}"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ <TextBlock x:Name="menuGestureText"
+ Grid.Column="4"
+ Text="{TemplateBinding InputGestureText}"
+ Margin="{TemplateBinding MenuItem.Padding}"
+ VerticalAlignment="Center"
+ Opacity="0.7" />
+ </Grid>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="Icon" Value="{x:Null}">
+ <Setter Property="Visibility" TargetName="Icon" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsHighlighted" Value="True">
+ <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource MenuItem.Highlight.Background}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Border}" />
+ </Trigger>
+ <Trigger Property="IsEnabled" Value="False">
+ <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{StaticResource Menu.Disabled.Foreground}" />
+ <Setter TargetName="Glyph" Property="Fill" Value="{StaticResource Menu.Disabled.Foreground}" />
+ </Trigger>
+ <MultiTrigger>
+ <MultiTrigger.Conditions>
+ <Condition Property="IsHighlighted" Value="True"/>
+ <Condition Property="IsEnabled" Value="False"/>
+ </MultiTrigger.Conditions>
+ <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource MenuItem.Highlight.Disabled.Background}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Disabled.Border}" />
+ </MultiTrigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+
+ <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=SubmenuHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+ <Border x:Name="templateRoot"
+ SnapsToDevicePixels="true"
+ Height="22"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}">
+ <Grid Margin="-1">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition MinWidth="22" SharedSizeGroup="MenuItemIconColumnGroup" Width="Auto"/>
+ <ColumnDefinition Width="13"/>
+ <ColumnDefinition Width="*"/>
+ <ColumnDefinition Width="30"/>
+ <ColumnDefinition SharedSizeGroup="MenuItemIGTColumnGroup" Width="Auto"/>
+ <ColumnDefinition Width="20"/>
+ </Grid.ColumnDefinitions>
+ <ContentPresenter x:Name="Icon"
+ ContentSource="Icon"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Width="16"
+ Height="16"
+ Margin="3"/>
+ <Border x:Name="GlyphPanel"
+ BorderThickness="1"
+ Height="22"
+ Width="22"
+ Visibility="Hidden"
+ VerticalAlignment="Center"
+ Margin="-1,0,0,0"
+ BorderBrush="{StaticResource MenuItem.Highlight.Border}"
+ Background="{StaticResource MenuItem.Highlight.Background}">
+ <Path x:Name="Glyph"
+ Data="{DynamicResource Checkmark}"
+ FlowDirection="LeftToRight"
+ Height="11"
+ Width="9"
+ Fill="{StaticResource Menu.Static.Foreground}" />
+ </Border>
+ <ContentPresenter
+ Grid.Column="2"
+ HorizontalAlignment="Left"
+ VerticalAlignment="Center"
+ ContentSource="Header"
+ RecognizesAccessKey="True"
+ Margin="{TemplateBinding MenuItem.Padding}"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ <TextBlock
+ Grid.Column="4"
+ Text="{TemplateBinding InputGestureText}"
+ VerticalAlignment="Center"
+ Margin="{TemplateBinding MenuItem.Padding}"
+ Opacity="0.7" />
+ <Path x:Name="RightArrow"
+ Grid.Column="5"
+ Data="{StaticResource RightArrow}"
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Left"
+ Fill="{StaticResource Menu.Static.Foreground}" />
+ <Popup x:Name="PART_Popup"
+ AllowsTransparency="true"
+ Focusable="false"
+ IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+ PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"
+ Placement="Right"
+ HorizontalOffset="-2"
+ VerticalOffset="-3">
+ 
+ <Border x:Name="SubMenuBorder"
+ Background="{StaticResource Menu.Static.Background}"
+ BorderBrush="{StaticResource Menu.Static.Border}"
+ BorderThickness="1"
+ Padding="2">
+ <ScrollViewer x:Name="SubMenuScrollViewer" MaxHeight="600" 
+ Style="{StaticResource MenuScrollViewer}">
+ <Grid RenderOptions.ClearTypeHint="Enabled">
+ <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+ <Rectangle
+ Name="OpaqueRect"
+ Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"
+ Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"
+ Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />
+ </Canvas>
+ <Rectangle HorizontalAlignment="Left"
+ Width="1"
+ Margin="29,2,0,2"
+ Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"/>
+ <ItemsPresenter x:Name="ItemsPresenter"
+ KeyboardNavigation.DirectionalNavigation="Cycle"
+ KeyboardNavigation.TabNavigation="Cycle"
+ Grid.IsSharedSizeScope="true"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ </Grid>
+ </ScrollViewer>
+ </Border>
+ </Popup>
+ </Grid>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+ <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>
+ </Trigger>
+ <Trigger Property="Icon" Value="{x:Null}">
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="True">
+ <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsHighlighted" Value="True">
+ <Setter TargetName="templateRoot" Property="Background" Value="Transparent" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Border}" />
+ </Trigger>
+ <Trigger Property="IsEnabled" Value="False">
+ <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{StaticResource Menu.Disabled.Foreground}" />
+ <Setter TargetName="Glyph" Property="Fill" Value="{StaticResource Menu.Disabled.Foreground}" />
+ <Setter TargetName="RightArrow" Property="Fill" Value="{StaticResource Menu.Disabled.Foreground}" />
+ </Trigger>
+ <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+ <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />
+ <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+
+ <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelItemTemplateKey}" TargetType="{x:Type MenuItem}">
+ <Border x:Name="templateRoot"
+ SnapsToDevicePixels="true"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}">
+ <Grid VerticalAlignment="Center">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <ContentPresenter x:Name="Icon"
+ ContentSource="Icon"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Width="16"
+ Height="16"
+ Margin="3" />
+ <Path x:Name="GlyphPanel"
+ Data="{StaticResource Checkmark}"
+ FlowDirection="LeftToRight"
+ Margin="3"
+ Visibility="Collapsed"
+ VerticalAlignment="Center"
+ Fill="{StaticResource Menu.Static.Foreground}" />
+ <ContentPresenter
+ Grid.Column="1"
+ ContentSource="Header"
+ RecognizesAccessKey="True"
+ Margin="{TemplateBinding Padding}"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ </Grid>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="Icon" Value="{x:Null}">
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="true">
+ <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsHighlighted" Value="True">
+ <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource MenuItem.Highlight.Background}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Border}" />
+ </Trigger>
+ <Trigger Property="IsEnabled" Value="False">
+ <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{StaticResource Menu.Disabled.Foreground}" />
+ <Setter TargetName="GlyphPanel" Property="Fill" Value="{StaticResource Menu.Disabled.Foreground}" />
+ </Trigger>
+ <MultiTrigger>
+ <MultiTrigger.Conditions>
+ <Condition Property="IsHighlighted" Value="True"/>
+ <Condition Property="IsEnabled" Value="False"/>
+ </MultiTrigger.Conditions>
+ <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource MenuItem.Highlight.Disabled.Background}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Disabled.Border}" />
+ </MultiTrigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+
+ <ControlTemplate x:Key="{ComponentResourceKey TypeInTargetAssembly={x:Type MenuItem}, ResourceId=TopLevelHeaderTemplateKey}" TargetType="{x:Type MenuItem}">
+ <Border x:Name="templateRoot"
+ SnapsToDevicePixels="true"
+ BorderThickness="{TemplateBinding BorderThickness}"
+ Background="{TemplateBinding Background}"
+ BorderBrush="{TemplateBinding BorderBrush}">
+ <Grid VerticalAlignment="Center">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto"/>
+ <ColumnDefinition Width="Auto"/>
+ </Grid.ColumnDefinitions>
+ <ContentPresenter x:Name="Icon"
+ ContentSource="Icon"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+ VerticalAlignment="Center"
+ HorizontalAlignment="Center"
+ Width="16"
+ Height="16"
+ Margin="3"/>
+ <Path x:Name="GlyphPanel"
+ Data="{StaticResource Checkmark}"
+ FlowDirection="LeftToRight"
+ Margin="3"
+ Visibility="Collapsed"
+ VerticalAlignment="Center"
+ Fill="{TemplateBinding Menu.Foreground}" />
+ <ContentPresenter
+ Grid.Column="1"
+ ContentSource="Header"
+ RecognizesAccessKey="True"
+ Margin="{TemplateBinding MenuItem.Padding}"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ <Popup x:Name="PART_Popup"
+ AllowsTransparency="true"
+ Focusable="false"
+ IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}"
+ PopupAnimation="{DynamicResource {x:Static SystemParameters.MenuPopupAnimationKey}}"
+ Placement="Bottom"
+ PlacementTarget="{Binding ElementName=templateRoot}" >
+ <Border x:Name="SubMenuBorder"
+ Background="{StaticResource Menu.Static.Background}"
+ BorderBrush="{StaticResource Menu.Static.Border}"
+ BorderThickness="1"
+ Padding="2">
+ <ScrollViewer x:Name="SubMenuScrollViewer"
+ Style="{StaticResource MenuScrollViewer}">
+ <Grid RenderOptions.ClearTypeHint="Enabled">
+ <Canvas Height="0" Width="0" HorizontalAlignment="Left" VerticalAlignment="Top">
+ <Rectangle
+ Name="OpaqueRect"
+ Height="{Binding ElementName=SubMenuBorder,Path=ActualHeight}"
+ Width="{Binding ElementName=SubMenuBorder,Path=ActualWidth}"
+ Fill="{Binding ElementName=SubMenuBorder,Path=Background}" />
+ </Canvas>
+ <Rectangle HorizontalAlignment="Left"
+ Width="1"
+ Margin="29,2,0,2"
+ Fill="{StaticResource Menu.Static.Separator}"/>
+ <ItemsPresenter x:Name="ItemsPresenter"
+ KeyboardNavigation.DirectionalNavigation="Cycle"
+ KeyboardNavigation.TabNavigation="Cycle"
+ Grid.IsSharedSizeScope="true"
+ SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+ </Grid>
+ </ScrollViewer>
+ </Border>
+ </Popup>
+ </Grid>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsSuspendingPopupAnimation" Value="true">
+ <Setter TargetName="PART_Popup" Property="PopupAnimation" Value="None"/>
+ </Trigger>
+ <Trigger Property="Icon" Value="{x:Null}">
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsChecked" Value="true">
+ <Setter TargetName="GlyphPanel" Property="Visibility" Value="Visible"/>
+ <Setter TargetName="Icon" Property="Visibility" Value="Collapsed"/>
+ </Trigger>
+ <Trigger Property="IsHighlighted" Value="True">
+ <Setter TargetName="templateRoot" Property="Background" Value="{StaticResource MenuItem.Highlight.Background}" />
+ <Setter TargetName="templateRoot" Property="BorderBrush" Value="{StaticResource MenuItem.Highlight.Border}" />
+ </Trigger>
+ <Trigger Property="IsEnabled" Value="False">
+ <Setter TargetName="templateRoot" Property="TextElement.Foreground" Value="{StaticResource Menu.Disabled.Foreground}" />
+ <Setter TargetName="GlyphPanel" Property="Fill" Value="{StaticResource Menu.Disabled.Foreground}" />
+ </Trigger>
+ <Trigger SourceName="SubMenuScrollViewer" Property="ScrollViewer.CanContentScroll" Value="false" >
+ <Setter TargetName="OpaqueRect" Property="Canvas.Top" Value="{Binding ElementName=SubMenuScrollViewer, Path=VerticalOffset}" />
+ <Setter TargetName="OpaqueRect" Property="Canvas.Left" Value="{Binding ElementName=SubMenuScrollViewer, Path=HorizontalOffset}" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+
+</ResourceDictionary>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ProgressBarBoth.xaml Added

@@ -0,0 +1,79 @@
+<ResourceDictionary
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+ 
+ <SolidColorBrush x:Key="ProgressBar.Progress" Color="#FF06B025" />
+ <SolidColorBrush x:Key="ProgressBar.Background" Color="#FFE6E6E6" />
+ <SolidColorBrush x:Key="ProgressBar.Border" Color="#FFBCBCBC" />
+
+ <Style TargetType="{x:Type ProgressBar}">
+ <Setter Property="Foreground" Value="{StaticResource ProgressBar.Progress}" />
+ <Setter Property="Background" Value="{StaticResource ProgressBar.Background}" />
+ <Setter Property="BorderBrush" Value="{StaticResource ProgressBar.Border}" />
+ <Setter Property="BorderThickness" Value="1" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ProgressBar}">
+ <Grid x:Name="TemplateRoot">
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup x:Name="CommonStates">
+ <VisualState x:Name="Determinate"/>
+ <VisualState x:Name="Indeterminate">
+ <Storyboard RepeatBehavior="Forever" Timeline.DesiredFrameRate="30"> 
+ <DoubleAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)0.(ScaleTransform.ScaleX)" Storyboard.TargetName="Animation">
+ <EasingDoubleKeyFrame KeyTime="0" Value="0.25"/>
+ <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.25"/>
+ <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.25"/>
+ </DoubleAnimationUsingKeyFrames>
+ <PointAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)" Storyboard.TargetName="Animation">
+ <EasingPointKeyFrame KeyTime="0" Value="-0.5,0.5"/>
+ <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5"/>
+ <EasingPointKeyFrame KeyTime="0:0:2" Value="1.5,0.5"/>
+ </PointAnimationUsingKeyFrames>
+ </Storyboard>
+ </VisualState>
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+ <Border 
+ BorderThickness="{TemplateBinding BorderThickness}" 
+ BorderBrush="{TemplateBinding BorderBrush}" 
+ Background="{TemplateBinding Background}" />
+ <Rectangle x:Name="PART_Track"/>
+ <Grid x:Name="PART_Indicator"
+ HorizontalAlignment="Left"
+ ClipToBounds="true">
+ <Rectangle x:Name="Indicator" 
+ Fill="{TemplateBinding Foreground}" />
+ <Rectangle x:Name="Animation" 
+ RenderTransformOrigin="0.5,0.5" 
+ Fill="{TemplateBinding Foreground}">
+ <Rectangle.RenderTransform>
+ <TransformGroup>
+ <ScaleTransform/>
+ <SkewTransform/>
+ <RotateTransform/>
+ <TranslateTransform/>
+ </TransformGroup>
+ </Rectangle.RenderTransform>
+ </Rectangle>
+ </Grid>
+ </Grid>
+ <ControlTemplate.Triggers>
+ <Trigger Property="Orientation" Value="Vertical">
+ <Setter Property="LayoutTransform" TargetName="TemplateRoot">
+ <Setter.Value>
+ <RotateTransform Angle="-90"/>
+ </Setter.Value>
+ </Setter>
+ </Trigger>
+ <Trigger Property="IsIndeterminate" Value="true">
+ <Setter Property="Visibility" TargetName="Indicator" Value="Collapsed"/>
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+</ResourceDictionary>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ToolbarDark.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ToolbarDark.xaml Changed

@@ -59,11 +59,11 @@
 <Setter Property="Template">
 <Setter.Value>
 <ControlTemplate TargetType="{x:Type ToolBar}">
- <Border x:Name="Border" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Ui.ConstrastLight}" Background="{DynamicResource Ui.Light}">
+ <Border x:Name="Border" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Ui.ContrastLight}" Background="{DynamicResource Ui.Light}">
 <DockPanel>
 <ToggleButton DockPanel.Dock="Right" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarOverflowButtonStyle}" ClickMode="Press" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
 <Popup x:Name="OverflowPopup" AllowsTransparency="true" Placement="Bottom" StaysOpen="false" Focusable="false" PopupAnimation="Slide" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}">
- <Border x:Name="DropDownBorder" BorderThickness="1" BorderBrush="{DynamicResource Ui.ConstrastLight}" Background="{DynamicResource Ui.Dark}">
+ <Border x:Name="DropDownBorder" BorderThickness="1" BorderBrush="{DynamicResource Ui.ContrastLight}" Background="{DynamicResource Ui.Dark}">
 <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" Margin="2" WrapWidth="200" Focusable="true" FocusVisualStyle="{x:Null}" KeyboardNavigation.TabNavigation="Cycle" KeyboardNavigation.DirectionalNavigation="Cycle" />
 </Border>
 </Popup>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/ToolbarLight.xaml Added

@@ -0,0 +1,88 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:HandBrakeWPF.Converters">
+
+ <converters:BooleanToVisibilityConverter x:Key="darkThemeVisConverter" />
+
+ <Style x:Key="ToolBarThumbStyle" TargetType="{x:Type Thumb}">
+ <Setter Property="OverridesDefaultStyle" Value="true" />
+ <Setter Property="Cursor" Value="SizeAll" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type Thumb}">
+ <Border Background="Transparent" SnapsToDevicePixels="True">
+ <Rectangle Margin="0,2">
+ <Rectangle.Fill>
+ <DrawingBrush Viewport="0,0,4,4" ViewportUnits="Absolute" Viewbox="0,0,8,8" ViewboxUnits="Absolute" TileMode="Tile">
+ <DrawingBrush.Drawing>
+ <DrawingGroup>
+ <GeometryDrawing Brush="#AAA" Geometry="M 4 4 L 4 8 L 8 8 L 8 4 z" />
+ </DrawingGroup>
+ </DrawingBrush.Drawing>
+ </DrawingBrush>
+ </Rectangle.Fill>
+ </Rectangle>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="ToolBarOverflowButtonStyle" TargetType="{x:Type ToggleButton}">
+ <Setter Property="OverridesDefaultStyle" Value="true" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ToggleButton}">
+ <Border x:Name="Border" SnapsToDevicePixels="true">
+ <Border.Style>
+ <Style>
+ <Setter Property="Border.Background" Value="{DynamicResource Ui.Light}"/>
+ <Style.Triggers>
+ <Trigger Property="Border.IsMouseOver" Value="True">
+ <Setter Property="Border.Background" Value="{DynamicResource Ui.ContrastLight}" />
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ <Grid Visibility="{Binding ElementName=Border, Path=IsEnabled, Converter={StaticResource darkThemeVisConverter}, ConverterParameter=false}">
+ <Path x:Name="Arrow" Fill="{DynamicResource Ui.Arrow}" VerticalAlignment="Bottom" Margin="2,3" Data="M -0.5 3 L 5.5 3 L 2.5 6 Z" HorizontalAlignment="Center" />
+ <ContentPresenter />
+ </Grid>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="{x:Type ToolBar}" TargetType="{x:Type ToolBar}">
+ <Setter Property="SnapsToDevicePixels" Value="true" />
+ <Setter Property="OverridesDefaultStyle" Value="true" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type ToolBar}">
+ <Border x:Name="Border" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Ui.ContrastLight}" Background="{DynamicResource Ui.Light}">
+ <DockPanel>
+ <ToggleButton DockPanel.Dock="Right" IsEnabled="{TemplateBinding HasOverflowItems}" Style="{StaticResource ToolBarOverflowButtonStyle}" ClickMode="Press" IsChecked="{Binding IsOverflowOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+ <Popup x:Name="OverflowPopup" AllowsTransparency="true" Placement="Bottom" StaysOpen="false" Focusable="false" PopupAnimation="Slide" IsOpen="{Binding IsOverflowOpen, RelativeSource={RelativeSource TemplatedParent}}">
+ <Border x:Name="DropDownBorder" BorderThickness="1" BorderBrush="{DynamicResource Ui.ContrastLight}" Background="{DynamicResource Ui.Dark}">
+ <ToolBarOverflowPanel x:Name="PART_ToolBarOverflowPanel" Margin="2" WrapWidth="200" Focusable="true" FocusVisualStyle="{x:Null}" KeyboardNavigation.TabNavigation="Cycle" KeyboardNavigation.DirectionalNavigation="Cycle" />
+ </Border>
+ </Popup>
+ </ToggleButton>
+
+ <Thumb x:Name="ToolBarThumb" Style="{StaticResource ToolBarThumbStyle}" Width="10" />
+ <ToolBarPanel x:Name="PART_ToolBarPanel" IsItemsHost="true" Margin="0,1,2,2" />
+ </DockPanel>
+ </Border>
+ <ControlTemplate.Triggers>
+ <Trigger Property="IsOverflowOpen" Value="true">
+ <Setter TargetName="ToolBarThumb" Property="IsEnabled" Value="false" />
+ </Trigger>
+ <Trigger Property="ToolBarTray.IsLocked" Value="true">
+ <Setter TargetName="ToolBarThumb" Property="Visibility" Value="Collapsed" />
+ </Trigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+</ResourceDictionary>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Controls/TreeviewDark.xaml Added

@@ -0,0 +1,172 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:HandBrakeWPF.Converters">
+
+ <Color x:Key="SelectedBackgroundColor">#363636</Color>
+ <Color x:Key="SelectedUnfocusedColor">#363636</Color>
+ <Color x:Key="GlyphColor">WhiteSmoke</Color>
+
+ <Style x:Key="{x:Type TreeView}" TargetType="TreeView">
+ <Setter Property="OverridesDefaultStyle" Value="True" />
+ <Setter Property="SnapsToDevicePixels" Value="True" />
+ <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+ <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="TreeView">
+ <Border Name="Border" CornerRadius="0" BorderThickness="1">
+ <Border.BorderBrush>
+ <SolidColorBrush Color="#606060" />
+ </Border.BorderBrush>
+ <Border.Background>
+ <SolidColorBrush Color="#606060" />
+ </Border.Background>
+ <ScrollViewer Focusable="False" CanContentScroll="False" Padding="0">
+ <ItemsPresenter />
+ </ScrollViewer>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="ExpandCollapseToggleStyle" TargetType="ToggleButton">
+ <Setter Property="Focusable" Value="False" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="ToggleButton">
+ <Grid Width="15" Height="13" Background="Transparent">
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup x:Name="CheckStates">
+ <VisualState x:Name="Checked">
+ <Storyboard>
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
+ Storyboard.TargetName="Collapsed">
+ <DiscreteObjectKeyFrame KeyTime="0"
+ Value="{x:Static Visibility.Hidden}" />
+ </ObjectAnimationUsingKeyFrames>
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)"
+ Storyboard.TargetName="Expanded">
+ <DiscreteObjectKeyFrame KeyTime="0"
+ Value="{x:Static Visibility.Visible}" />
+ </ObjectAnimationUsingKeyFrames>
+ </Storyboard>
+ </VisualState>
+ <VisualState x:Name="Unchecked" />
+ <VisualState x:Name="Indeterminate" />
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+ <Path x:Name="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="1,1,1,1" Data="M 4 0 L 8 4 L 4 8 Z">
+ <Path.Fill>
+ <SolidColorBrush Color="{DynamicResource GlyphColor}" />
+ </Path.Fill>
+ </Path>
+ <Path x:Name="Expanded" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="1,1,1,1" Data="M 0 4 L 8 4 L 4 8 Z" Visibility="Hidden">
+ <Path.Fill>
+ <SolidColorBrush Color="{DynamicResource GlyphColor}" />
+ </Path.Fill>
+ </Path>
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="TreeViewItemFocusVisual">
+ <Setter Property="Control.Template">
+ <Setter.Value>
+ <ControlTemplate>
+ <Border>
+ <Rectangle Margin="0,0,0,0"
+ StrokeThickness="5"
+ Stroke="Black"
+ StrokeDashArray="1 2"
+ Opacity="0" />
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+
+ <Style x:Key="{x:Type TreeViewItem}"
+ TargetType="{x:Type TreeViewItem}">
+ <Setter Property="Background"
+ Value="Transparent" />
+ <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+ <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+ <Setter Property="Padding" Value="1,0,0,0" />
+ <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+ <Setter Property="FocusVisualStyle" Value="{StaticResource TreeViewItemFocusVisual}" />
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type TreeViewItem}">
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition MinWidth="19"
+ Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition />
+ </Grid.RowDefinitions>
+ <VisualStateManager.VisualStateGroups>
+ <VisualStateGroup x:Name="SelectionStates">
+ <VisualState x:Name="Selected">
+ <Storyboard>
+ <ColorAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+ <EasingColorKeyFrame KeyTime="0" Value="{StaticResource SelectedBackgroundColor}" />
+ </ColorAnimationUsingKeyFrames>
+ </Storyboard>
+ </VisualState>
+ <VisualState x:Name="Unselected" />
+ <VisualState x:Name="SelectedInactive">
+ <Storyboard>
+ <ColorAnimationUsingKeyFrames Storyboard.TargetName="Bd" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)">
+ <EasingColorKeyFrame KeyTime="0" Value="{StaticResource SelectedUnfocusedColor}" />
+ </ColorAnimationUsingKeyFrames>
+ </Storyboard>
+ </VisualState>
+ </VisualStateGroup>
+ <VisualStateGroup x:Name="ExpansionStates">
+ <VisualState x:Name="Expanded">
+ <Storyboard>
+ <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="(UIElement.Visibility)" Storyboard.TargetName="ItemsHost">
+ <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+ </ObjectAnimationUsingKeyFrames>
+ </Storyboard>
+ </VisualState>
+ <VisualState x:Name="Collapsed" />
+ </VisualStateGroup>
+ </VisualStateManager.VisualStateGroups>
+ <ToggleButton x:Name="Expander" Style="{StaticResource ExpandCollapseToggleStyle}" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"/>
+ <Border x:Name="Bd" Grid.Column="1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" 
+ BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+ <ContentPresenter x:Name="PART_Header" ContentSource="Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+ </Border>
+ <ItemsPresenter x:Name="ItemsHost" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Visibility="Collapsed" />
+ </Grid>
+ <ControlTemplate.Triggers>
+ <Trigger Property="HasItems" Value="false">
+ <Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
+ </Trigger>
+ <MultiTrigger>
+ <MultiTrigger.Conditions>
+ <Condition Property="HasHeader" Value="false" />
+ <Condition Property="Width" Value="Auto" />
+ </MultiTrigger.Conditions>
+ <Setter TargetName="PART_Header" Property="MinWidth" Value="75" />
+ </MultiTrigger>
+ <MultiTrigger>
+ <MultiTrigger.Conditions>
+ <Condition Property="HasHeader" Value="false" />
+ <Condition Property="Height" Value="Auto" />
+ </MultiTrigger.Conditions>
+ <Setter TargetName="PART_Header" Property="MinHeight" Value="19" />
+ </MultiTrigger>
+ </ControlTemplate.Triggers>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ </Style>
+</ResourceDictionary>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Themes/Dark.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Dark.xaml Changed

@@ -45,6 +45,15 @@
 
 <Style TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
 <Setter Property="Background" Value="{DynamicResource Ui.Light}" />
+ <Setter Property="ContextMenu">
+ <Setter.Value>
+ <ContextMenu>
+ <MenuItem Command="ApplicationCommands.Copy" />
+ <MenuItem Command="ApplicationCommands.Cut" />
+ <MenuItem Command="ApplicationCommands.Paste" />
+ </ContextMenu>
+ </Setter.Value>
+ </Setter>
 </Style>
 
 <Style TargetType="{x:Type TextBlock}">
@@ -52,6 +61,11 @@
 <Setter Property="VerticalAlignment" Value="Center"/>
 </Style>
 
+ <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock">
+ <Setter Property="Foreground" Value="White"/>
+ <Setter Property="VerticalAlignment" Value="Center"/>
+ </Style>
+
 
 <Style TargetType="{x:Type TabControl}">
 <Setter Property="Background" Value="{DynamicResource Ui.Mid}"/>
@@ -88,6 +102,20 @@
 <Setter Property="BorderThickness" Value="0,1,0,1"/>
 </Style>
 
+ <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+ <Setter Property="MinHeight" Value="22" />
+ <Setter Property="BorderThickness" Value="0" />
+ <Setter Property="VerticalContentAlignment" Value="Center" />
+ <Style.Triggers>
+ <Trigger Property="IsSelected" Value="True">
+ <Setter Property="Foreground" Value="Black" />
+ </Trigger>
+ <Trigger Property="IsSelected" Value="False">
+ <Setter Property="Foreground" Value="White" />
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+
 
 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource ComboBoxBaseStyle}">
 <Setter Property="MinHeight" Value="22"/>
@@ -96,7 +124,7 @@
 </Style>
 
 
- <SolidColorBrush x:Key="GlyphBrush" Color="WhiteSmoke"/>
+ <SolidColorBrush x:Key="ButtonGlyphBrush" Color="WhiteSmoke"/>
 
 <ResourceDictionary.MergedDictionaries>
 <ResourceDictionary Source="Controls/ComboBoxDark.xaml" />
@@ -104,6 +132,8 @@
 <ResourceDictionary Source="Controls/ContextMenuDark.xaml" />
 <ResourceDictionary Source="Controls/ToolbarDark.xaml" />
 <ResourceDictionary Source="Controls/GroupBoxDark.xaml" />
+ <ResourceDictionary Source="Controls/TreeviewDark.xaml" />
+ <ResourceDictionary Source="Controls/ProgressBarBoth.xaml" />
 </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Themes/Light.xaml Added

@@ -0,0 +1,29 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+ <SolidColorBrush x:Key="Ui.Dark" Color="WhiteSmoke" />
+ <SolidColorBrush x:Key="Ui.Light" Color="WhiteSmoke" />
+ <SolidColorBrush x:Key="Ui.ContrastLight" Color="#C0C0C0" />
+ <SolidColorBrush x:Key="Ui.Arrow" Color="#252525" />
+
+ 
+ <Style TargetType="StatusBar">
+ <Setter Property="Background" Value="{DynamicResource Ui.Light}" />
+ </Style>
+
+ 
+ <Style x:Key="BaseTextBlockStyle" TargetType="TextBlock">
+ <Setter Property="VerticalAlignment" Value="Center"/>
+ </Style>
+
+
+ 
+ <SolidColorBrush x:Key="ButtonGlyphBrush" Color="#444"/>
+
+ <ResourceDictionary.MergedDictionaries>
+ <ResourceDictionary Source="Controls/ToolbarLight.xaml" />
+ <ResourceDictionary Source="Controls/ContextMenuLight.xaml" />
+ <ResourceDictionary Source="Controls/ProgressBarBoth.xaml" />
+ </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/UserSettingConstants.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/UserSettingConstants.cs Changed

@@ -26,7 +26,7 @@
         public const string MainWindowMinimize = "MainWindowMinimize";
         public const string UpdateStatus = "updateStatus";
         public const string UseM4v = "useM4v";
-        public const string VLCPath = "VLC_Path";
+        public const string MediaPlayerPath = "VLC_Path";
         public const string InstanceId = "InstanceId";
         public const string X264Step = "X264Step";
         public const string LastPreviewDuration = "LastPreviewDuration";
@@ -37,9 +37,7 @@
         public const string PreventSleep = "PreventSleep";
         public const string PauseOnLowDiskspace = "PauseOnLowDiskspace";
         public const string PauseQueueOnLowDiskspaceLevel = "LowDiskSpaceWarningLevelInBytes";
-        public const string PauseEncodeOnLowDiskspaceLevel = "LowDiskSpaceEncodePauseLevelInBytes";
         public const string RemovePunctuation = "RemovePunctuation";
-        public const string ShowPresetPanel = "ShowPresetPanelOption";
         public const string ResetWhenDoneAction = "ResetWhenDoneAction";
         public const string DisableLibDvdNav = "DisableLibDvdNav";
         public const string EnableQuickSyncDecoding = "EnableQuickSyncDecoding";
@@ -60,8 +58,8 @@
         public const string PlaySoundWhenDone = "PlaySoundWhenDone";
         public const string PlaySoundWhenQueueDone = "PlaySoundWhenQueueDone";
         public const string WhenDoneAudioFile = "WhenDoneAudioFile";
-        public const string RemoteServiceEnabled = "RemoteServiceEnabled";
-        public const string RemoteServicePort = "RemoteServicePort";
+        public const string ProcessIsolationEnabled = "ProcessIsolationEnabled";
+        public const string ProcessIsolationPort = "ProcessIsolationPort";
         public const string EnableQuickSyncEncoding = "EnableQuickSyncEncoding";
         public const string EnableVceEncoder = "EnableVceEncoder";
         public const string EnableNvencEncoder = "EnableNvencEncoder";
@@ -72,10 +70,18 @@
         public const string AutonameFileCollisionBehaviour = "AutonameFileCollisionBehaviour";
         public const string AutonameFilePrePostString = "AutonameFilePrePostString";
         public const string WhenDonePerformActionImmediately = "WhenDonePerformActionImmediately";
-        public const string UseDarkTheme = "UseDarkTheme";
-        public const string PreviewRotationFlip = "PreviewRotationFlip";
+        public const string DarkThemeMode = "DarkThemeMode";
         public const string AlwaysUseDefaultPath = "AlwaysUseDefaultPath";
         public const string PauseEncodingOnLowBattery = "PauseEncodingOnLowBattery";
         public const string LowBatteryLevel = "LowBatteryLevel";
+        public const string EnableQuickSyncLowPower = "EnableQuickSyncLowPower";
+        public const string SimultaneousEncodes = "SimultaneousEncodes";
+        public const string PreviewShowPictureSettingsOverlay = "PreviewShowPictureSettingsOverlay";
+        public const string RunCounter = "HandBrakeRunCounter";
+        public const string ForceSoftwareRendering = "ForceSoftwareRendering";
+        public const string PresetMenuDisplayMode = "PresetMenuDisplayMode";
+        public const string NotifyOnEncodeDone = "NotifyOnEncodeDone";
+        public const string NotifyOnQueueDone = "NotifyOnQueueDone";
+        public const string RightToLeftUi = "RightToLeftUi";
     }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/BitmapHelpers.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/BitmapHelpers.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/BitmapUtilities.cs Changed

@@ -17,7 +17,7 @@
 using System.Runtime.InteropServices;
 using System.Windows.Media.Imaging;
 
- using HandBrake.Interop.Interop.Model.Preview;
+ using HandBrake.Interop.Interop.Interfaces.Model.Preview;
 
 /// <summary>
 /// The bitmap utilities.
@@ -61,24 +61,24 @@
 public static Bitmap ConvertByteArrayToBitmap(RawPreviewData previewData)
 {
 var bitmap = new Bitmap(previewData.Width, previewData.Height);
-
+ 
 BitmapData bitmapData = bitmap.LockBits(new Rectangle(0, 0, previewData.Width, previewData.Height), ImageLockMode.WriteOnly, PixelFormat.Format32bppRgb);
 
- IntPtr ptr = bitmapData.Scan0; // Pointer to the first pixel.
- for (int i = 0; i < previewData.Height; i++)
+ IntPtr targetPtr = bitmapData.Scan0; // Pointer to the first pixel.
+ try
 {
- try
- {
- Marshal.Copy(previewData.RawBitmapData, i * previewData.StrideWidth, ptr, previewData.StrideWidth);
- ptr = IntPtr.Add(ptr, previewData.Width * 4);
- }
- catch (Exception exc)
+ for (int i = 0; i < previewData.Height; i++)
 {
- Debug.WriteLine(exc); // In theory, this will allow a partial image display if this happens. TODO add better logging of this.
+ Marshal.Copy(previewData.RawBitmapData, i * previewData.StrideWidth, targetPtr, previewData.Width * 4);
+ targetPtr = IntPtr.Add(targetPtr, previewData.Width * 4);
 }
- }
 
- bitmap.UnlockBits(bitmapData);
+ bitmap.UnlockBits(bitmapData);
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ }
 
 return bitmap;
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/DriveUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/DriveUtilities.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/GeneralUtilities.cs Changed

@@ -15,29 +15,16 @@
 using System.IO;
 using System.Linq;
 using System.Text;
- using System.Windows.Forms;
 
- using HandBrake.Interop.Utilities;
+ using HandBrake.Interop.Interop;
 
 /// <summary>
 /// A Set of Static Utilities
 /// </summary>
 public class GeneralUtilities
 {
- #region Constants and Fields
-
- /// <summary>
- /// The Default Log Directory
- /// </summary>
 private static readonly string LogDir = DirectoryUtilities.GetLogDirectory();
 
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets the number of HandBrake instances running.
- /// </summary>
 public static int ProcessId
 {
 get
@@ -46,10 +33,6 @@
 }
 }
 
- #endregion
-
- #region Public Methods
-
 /// <summary>
 /// Clear all the log files older than 30 Days
 /// </summary>
@@ -64,7 +47,7 @@
 var info = new DirectoryInfo(LogDir);
 FileInfo logFiles = info.GetFiles("*.txt");
 
- // Delete old and excessivly large files (> ~50MB).
+ // Delete old and excessively large files (> ~50MB).
 foreach (FileInfo file in logFiles)
 {
 try
@@ -107,17 +90,17 @@
 gpuBuilder.Append("GPU Information is unavailable");
 }
 
- logHeader.AppendLine(string.Format("HandBrake {0}", VersionHelper.GetVersion()));
+ logHeader.AppendLine(string.Format("HandBrake {0}", HandBrakeVersionHelper.GetVersion()));
 logHeader.AppendLine(string.Format("OS: {0}", Environment.OSVersion));
- logHeader.AppendLine(string.Format("CPU: {0}", SystemInfo.GetCpuCount));
+ logHeader.AppendLine(string.Format("CPU: {0}", SystemInfo.GetCpu));
 logHeader.AppendLine(string.Format("Ram: {0} MB, ", SystemInfo.TotalPhysicalMemory));
 logHeader.AppendLine(string.Format("GPU Information:{0}{1}", Environment.NewLine, gpuBuilder.ToString().TrimEnd()));
- logHeader.AppendLine(string.Format("Screen: {0}x{1}", SystemInfo.ScreenBounds.Bounds.Width, SystemInfo.ScreenBounds.Bounds.Height));
+ logHeader.AppendLine(string.Format("Screen: {0}", SystemInfo.ScreenBounds));
 logHeader.AppendLine(string.Format("Temp Dir: {0}", Path.GetTempPath()));
- logHeader.AppendLine(string.Format("Install Dir: {0}", Application.StartupPath));
- logHeader.AppendLine(string.Format("Data Dir: {0}\n", DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly())));
+ logHeader.AppendLine(string.Format("Install Dir: {0}", AppDomain.CurrentDomain.BaseDirectory));
+ logHeader.AppendLine(string.Format("Data Dir: {0}\n", DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly())));
 
- logHeader.AppendLine("-------------------------------------------");
+ logHeader.Append("-------------------------------------------");
 
 return logHeader;
 }
@@ -150,7 +133,5 @@
 List<int> ids = Process.GetProcessesByName("HandBrake").Select(process => process.Id).ToList();
 return ids.Contains(id);
 }
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/HandBrakeApp.cs Changed

@@ -14,6 +14,7 @@
 using System.IO;
 using System.Linq;
 
+ using HandBrake.Interop.Interop;
 using HandBrake.Interop.Utilities;
 
 /// <summary>
@@ -26,12 +27,12 @@
 /// </summary>
 public static void ResetToDefaults()
 {
- string appDataFolder = DirectoryUtilities.GetUserStoragePath(VersionHelper.IsNightly());
+ string appDataFolder = DirectoryUtilities.GetUserStoragePath(HandBrakeVersionHelper.IsNightly());
 DeleteFile(Path.Combine(appDataFolder, "presets.json"));
- DeleteFile(Path.Combine(appDataFolder, "settings.xml"));
+ DeleteFile(Path.Combine(appDataFolder, "settings.json"));
 
 DirectoryInfo info = new DirectoryInfo(appDataFolder);
- IEnumerable<FileInfo> logFiles = info.GetFiles("*.xml").Where(f => f.Name.StartsWith("hb_queue_recovery"));
+ IEnumerable<FileInfo> logFiles = info.GetFiles("*.json").Where(f => f.Name.StartsWith("hb_queue_recovery"));
 foreach (FileInfo file in logFiles)
 {
 DeleteFile(Path.Combine(appDataFolder, file.Name));

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/HttpRequestBase.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/HttpRequestBase.cs Changed

@@ -10,21 +10,21 @@
 namespace HandBrakeWPF.Utilities
 {
 using System;
+ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 
 using HandBrakeWPF.Instance.Model;
 
- using Newtonsoft.Json;
-
 public class HttpRequestBase
 {
- protected readonly JsonSerializerSettings jsonNetSettings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
- protected HttpClient client = new HttpClient();
 protected string serverUrl;
+
 protected int port;
 
+ protected string base64Token;
+
 public async Task<ServerResponse> MakeHttpJsonPostRequest(string urlPath, string json)
 {
 if (string.IsNullOrEmpty(json))
@@ -32,14 +32,26 @@
 throw new InvalidOperationException("No Post Values Found.");
 }
 
- StringContent content = new StringContent(json, Encoding.UTF8, "application/json");
- HttpResponseMessage response = await client.PostAsync(this.serverUrl + urlPath, content);
- if (response != null)
+ using (HttpClient client = new HttpClient())
 {
- string returnContent = await response.Content.ReadAsStringAsync();
- ServerResponse serverResponse = new ServerResponse(response.IsSuccessStatusCode, returnContent);
+ HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Post, this.serverUrl + urlPath);
+ if (!string.IsNullOrEmpty(this.base64Token))
+ {
+ requestMessage.Headers.Add("token", this.base64Token);
+ }
 
- return serverResponse;
+ requestMessage.Content = new StringContent(json, Encoding.UTF8, "application/json");
+
+ using (HttpResponseMessage response = await client.SendAsync(requestMessage))
+ {
+ if (response != null)
+ {
+ string returnContent = await response.Content.ReadAsStringAsync();
+ ServerResponse serverResponse = new ServerResponse(response.IsSuccessStatusCode, returnContent);
+
+ return serverResponse;
+ }
+ }
 }
 
 return null;
@@ -47,13 +59,25 @@
 
 public async Task<ServerResponse> MakeHttpGetRequest(string urlPath)
 {
- HttpResponseMessage response = await client.GetAsync(this.serverUrl + urlPath);
- if (response != null)
+ using (HttpClient client = new HttpClient())
 {
- string returnContent = await response.Content.ReadAsStringAsync();
- ServerResponse serverResponse = new ServerResponse(response.IsSuccessStatusCode, returnContent);
+ HttpRequestMessage requestMessage = new HttpRequestMessage(HttpMethod.Get, this.serverUrl + urlPath);
+ if (!string.IsNullOrEmpty(this.base64Token))
+ {
+ requestMessage.Headers.Add("token", this.base64Token);
+ }
+
+ using (HttpResponseMessage response = await client.SendAsync(requestMessage))
+ {
+ if (response != null)
+ {
+ string returnContent = await response.Content.ReadAsStringAsync();
+ ServerResponse serverResponse = null;
+ serverResponse = response.StatusCode == HttpStatusCode.Unauthorized ? new ServerResponse(false, returnContent) : new ServerResponse(response.IsSuccessStatusCode, returnContent);
 
- return serverResponse;
+ return serverResponse;
+ }
+ }
 }
 
 return null;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/InterfaceLanguageUtilities.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/InterfaceLanguageUtilities.cs Changed

@@ -17,26 +17,37 @@
 
 public class InterfaceLanguageUtilities
 {
- public static List<InterfaceLanguage> GetUserInterfaceLangauges()
+ public static InterfaceLanguage DefaultEnglishLanguage = new InterfaceLanguage("en", "English");
+
+ public static InterfaceLanguage UseSystemLanguage = new InterfaceLanguage(null, Resources.Language_UseSystem);
+
+ public static List<InterfaceLanguage> GetUserInterfaceLanguages()
 {
 return new List<InterfaceLanguage>
 {
- new InterfaceLanguage(null, Resources.Language_UseSystem),
- new InterfaceLanguage("en", "English"),
- new InterfaceLanguage("de", "German"),
- new InterfaceLanguage("zh", "Chinese"),
- new InterfaceLanguage("fr", "French"),
- new InterfaceLanguage("ru", "Russian"),
- new InterfaceLanguage("es", "Spanish"),
- new InterfaceLanguage("tr", "Turkish"),
- new InterfaceLanguage("ko", "Korean"),
- new InterfaceLanguage("ja", "Japanese"),
+ UseSystemLanguage,
+ new InterfaceLanguage("pt-BR", "Brazilian Portuguese (Português do Brasil)"),
+ new InterfaceLanguage("zh-CN", "Simplified Chinese (简体中文)"),
+ new InterfaceLanguage("zh-TW", "Traditional Chinese (正體中文)"),
+ new InterfaceLanguage("co", "Corsican (Corsu)"),
+ DefaultEnglishLanguage,
+ new InterfaceLanguage("fr", "French (Français)"),
+ new InterfaceLanguage("de", "German (Deutsch)"),
+ new InterfaceLanguage("it", "Italian (Italiano)"),
+ new InterfaceLanguage("ja", "Japanese (日本語 (にほんご))"),
+ new InterfaceLanguage("ko", "Korean (한국어)"),
+ new InterfaceLanguage("fa-IR", "Persian (Iran) (فارسی)"),
+ new InterfaceLanguage("ru", "Russian (Русский)"),
+ new InterfaceLanguage("es", "Spanish (Español)"),
+ new InterfaceLanguage("th", "Thai (ไทย)"),
+ new InterfaceLanguage("tr", "Turkish (Türkçe)"),
+ new InterfaceLanguage("uk", "Ukrainian (Українська)"),
 };
 }
 
 public static InterfaceLanguage FindInterfaceLanguage(string culture)
 {
- return GetUserInterfaceLangauges().FirstOrDefault(f => f.Culture == culture);
+ return GetUserInterfaceLanguages().FirstOrDefault(f => f.Culture == culture);
 }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/NumaInfo.cs Added

@@ -0,0 +1,124 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="NumaInfo.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Utilities
+{
+ using System;
+ using System.Diagnostics;
+ using System.Runtime.InteropServices;
+
+ public class NumaInfo
+ {
+ StructLayout(LayoutKind.Sequential)
+ public struct PROCESSORCORE
+ {
+ public byte Flags;
+ };
+
+ StructLayout(LayoutKind.Sequential)
+ public struct NUMANODE
+ {
+ public uint NodeNumber;
+ }
+
+ public enum PROCESSOR_CACHE_TYPE
+ {
+ CacheUnified,
+ CacheInstruction,
+ CacheData,
+ CacheTrace
+ }
+
+ StructLayout(LayoutKind.Sequential)
+ public struct CACHE_DESCRIPTOR
+ {
+ public byte Level;
+ public byte Associativity;
+ public ushort LineSize;
+ public uint Size;
+ public PROCESSOR_CACHE_TYPE Type;
+ }
+
+ StructLayout(LayoutKind.Explicit)
+ public struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION_UNION
+ {
+ FieldOffset(0)
+ public PROCESSORCORE ProcessorCore;
+ FieldOffset(0)
+ public NUMANODE NumaNode;
+ FieldOffset(0)
+ public CACHE_DESCRIPTOR Cache;
+ FieldOffset(0)
+ private UInt64 Reserved1;
+ FieldOffset(8)
+ private UInt64 Reserved2;
+ }
+
+ public enum LOGICAL_PROCESSOR_RELATIONSHIP
+ {
+ RelationProcessorCore,
+ RelationNumaNode,
+ RelationCache,
+ RelationProcessorPackage,
+ RelationGroup,
+ RelationAll = 0xffff
+ }
+
+ public struct SYSTEM_LOGICAL_PROCESSOR_INFORMATION
+ {
+ public UIntPtr ProcessorMask;
+ public LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
+ public SYSTEM_LOGICAL_PROCESSOR_INFORMATION_UNION ProcessorInformation;
+ }
+
+ DllImport(@"kernel32.dll", SetLastError = true)
+ public static extern bool GetLogicalProcessorInformation(IntPtr Buffer, ref uint ReturnLength);
+
+ public static int GetNumaNodes()
+ {
+ int numaNodes = 0;
+ uint returnLength = 0;
+
+ GetLogicalProcessorInformation(IntPtr.Zero, ref returnLength);
+
+ IntPtr Ptr = Marshal.AllocHGlobal((int)returnLength);
+ try
+ {
+ if (GetLogicalProcessorInformation(Ptr, ref returnLength))
+ {
+ int size = Marshal.SizeOf(typeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
+ int len = (int)returnLength / size;
+ IntPtr item = Ptr;
+ for (int i = 0; i < len; i++)
+ {
+ SYSTEM_LOGICAL_PROCESSOR_INFORMATION record =
+ (SYSTEM_LOGICAL_PROCESSOR_INFORMATION)Marshal.PtrToStructure(
+ item,
+ typeof(SYSTEM_LOGICAL_PROCESSOR_INFORMATION));
+ if (record.Relationship == LOGICAL_PROCESSOR_RELATIONSHIP.RelationNumaNode)
+ {
+ numaNodes += 1;
+ }
+
+ item += size;
+ }
+
+ return numaNodes;
+ }
+ }
+ catch (Exception ex)
+ {
+ Debug.WriteLine("Failed to find NUMA nodes: " + ex);
+ }
+ finally
+ {
+ Marshal.FreeHGlobal(Ptr);
+ }
+
+ return 0;
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/Output/CsvHelper.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/Output/CsvHelper.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/Portable.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/Portable.cs Changed

@@ -193,6 +193,38 @@
 return true; // Default to On.
 }
 
+ public static bool IsProcessIsolationEnabled()
+ {
+ if (keyPairs.ContainsKey("process.isolation.enabled"))
+ {
+ string enabled = keyPairs"process.isolation.enabled";
+ if (!string.IsNullOrEmpty(enabled) && enabled.Trim() == "true")
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ return true; // Default to On.
+ }
+ 
+ public static bool IsForcingSoftwareRendering()
+ {
+ if (keyPairs.ContainsKey("software.rendering"))
+ {
+ string enabled = keyPairs"software.rendering";
+ if (!string.IsNullOrEmpty(enabled) && enabled.Trim() == "true")
+ {
+ return true;
+ }
+
+ return false;
+ }
+
+ return false; // Default to Off.
+ }
+
 /// <summary>
 /// The get temp directory.
 /// </summary>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/SystemInfo.cs Changed

@@ -11,10 +11,9 @@
 {
 using System;
 using System.Collections.Generic;
+ using System.Globalization;
 using System.Management;
- using System.Windows.Forms;
-
- using HandBrake.Interop.Interop.HbLib;
+ using System.Runtime.InteropServices;
 
 using Microsoft.Win32;
 
@@ -23,10 +22,6 @@
 /// </summary>
 public class SystemInfo
 {
- /// <summary>
- /// Gets the total physical ram in a system
- /// </summary>
- /// <returns>The total memory in the system</returns>
 public static ulong TotalPhysicalMemory
 {
 get
@@ -39,11 +34,7 @@
 }
 }
 
- /// <summary>
- /// Gets the number of CPU Cores
- /// </summary>
- /// <returns>Object</returns>
- public static object GetCpuCount
+ public static object GetCpu
 {
 get
 {
@@ -53,28 +44,48 @@
 }
 }
 
- /// <summary>
- /// Gets the System screen size information.
- /// </summary>
- /// <returns>System.Windows.Forms.Scree</returns>
- public static Screen ScreenBounds
+ public static bool IsArmDevice => RuntimeInformation.ProcessArchitecture == Architecture.Arm64;
+
+ public static int GetCpuLogicalCount
+ {
+ get => Environment.ProcessorCount;
+ }
+
+ public static int MaximumSimultaneousInstancesSupported
+ {
+ get => Math.Min((int)Math.Round((decimal)SystemInfo.GetCpuLogicalCount / 2, 0), 8);
+ }
+
+ public static string ScreenBounds
 {
- get { return Screen.PrimaryScreen; }
+ get
+ {
+ string screenWidth = System.Windows.SystemParameters.PrimaryScreenWidth.ToString(CultureInfo.InvariantCulture);
+ string screenHeight = System.Windows.SystemParameters.PrimaryScreenHeight.ToString(CultureInfo.InvariantCulture);
+
+ return string.Format("{0}x{1}", screenWidth, screenHeight);
+ }
 }
 
- /// <summary>
- /// Gets the get gpu driver version.
- /// </summary>
 public static List<string> GetGPUInfo
 {
 get
 {
 List<string> gpuInfo = new List<string>();
 
+ if (IsArmDevice)
+ {
+ // We don't have .NET Framework on ARM64 devices so cannot use System.Management
+ // Default to ARM Chipset for now.
+ gpuInfo.Add("ARM Chipset");
+
+ return gpuInfo;
+ }
+
 try
 {
 ManagementObjectSearcher searcher =
- new ManagementObjectSearcher("select * from " + "Win32_VideoController");
+ new ManagementObjectSearcher("select DriverVersion, Name from " + "Win32_VideoController");
 
 foreach (ManagementObject share in searcher.Get())
 {
@@ -111,13 +122,26 @@
 }
 }
 
- public static bool IsWindows10()
+ public static bool IsWindows10OrLater()
 {
- var reg = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion");
+ OperatingSystem os = Environment.OSVersion;
+ if (os.Version.Major >= 10)
+ {
+ return true;
+ }
 
- string productName = (string)reg.GetValue("ProductName");
+ return false;
+ }
+
+ public static bool IsAppsUsingDarkTheme()
+ {
+ object value = Registry.GetValue("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize", "AppsUseLightTheme", null);
+ if (value != null)
+ {
+ return (int)value != 1;
+ }
 
- return productName.StartsWith("Windows 10");
+ return false;
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Utilities/Win32.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/Win32.cs Changed

@@ -93,41 +93,6 @@
 DllImport("kernel32.dll", SetLastError = true)
 public static extern bool GlobalMemoryStatusEx(ref MEMORYSTATUSEX lpBuffer);
 
- /// <summary>
- /// Generate a Console Ctrl Event
- /// </summary>
- /// <param name="sigevent">
- /// The sigevent.
- /// </param>
- /// <param name="dwProcessGroupId">
- /// The dw process group id.
- /// </param>
- /// <returns>
- /// Bool true is success
- /// </returns>
- DllImport("kernel32.dll", SetLastError = true)
- public static extern bool GenerateConsoleCtrlEvent(ConsoleCtrlEvent sigevent, int dwProcessGroupId);
-
- /// <summary>
- /// Console Ctrl Event
- /// </summary>
- public enum ConsoleCtrlEvent
- {
- /// <summary>
- /// Ctrl - C
- /// </summary>
- CTRL_C = 0,
-
- /// <summary>
- /// Ctrl - Break
- /// </summary>
- CTRL_BREAK = 1,
-
- /// <summary>
- /// Ctrl - Close
- /// </summary>
- CTRL_CLOSE = 2,
- }
 
 DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)
 private static extern EXECUTION_STATE SetThreadExecutionState(EXECUTION_STATE esFlags);
@@ -141,8 +106,6 @@
 ES_SYSTEM_REQUIRED = 0x00000001,
 
 ES_CONTINUOUS = 0x80000000,
-
- ES_AWAYMODE_REQUIRED = 0x00000040
 }
 
 /// <summary>
@@ -158,10 +121,7 @@
 /// </summary>
 public static void PreventSleep()
 {
- executor(
- () => SetThreadExecutionState(
- EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED
- | EXECUTION_STATE.ES_AWAYMODE_REQUIRED));
+ executor(() => SetThreadExecutionState(EXECUTION_STATE.ES_CONTINUOUS | EXECUTION_STATE.ES_SYSTEM_REQUIRED));
 }
 
 /// <summary>
@@ -237,6 +197,9 @@
 NoSystemBattery = 128,
 Unknown = 255
 }
+
+ DllImport("Powrprof.dll", CharSet = CharSet.Auto, ExactSpelling = true)
+ public static extern bool SetSuspendState(bool hiberate, bool forceCritical, bool disableWakeEvent);
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Utilities/WindowsTaskbar.cs Added

@@ -0,0 +1,44 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="Win7.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Utilities
+{
+ using System.Windows.Shell;
+ 
+ public class WindowsTaskbar
+ {
+ private static TaskbarItemInfo wintaskbar;
+
+ public WindowsTaskbar()
+ {
+ wintaskbar ??= new TaskbarItemInfo();
+ }
+
+ public static TaskbarItemInfo GetTaskBar()
+ {
+ return wintaskbar;
+ }
+ 
+ public void SetTaskBarProgress(int percentage)
+ {
+ // Update the taskbar progress indicator. The normal state shows a green progress bar.
+ Caliburn.Micro.Execute.OnUIThread(
+ () =>
+ {
+ wintaskbar.ProgressState = TaskbarItemProgressState.Normal;
+ wintaskbar.ProgressValue = (double)percentage / 100;
+ });
+ }
+
+ public void SetTaskBarProgressToNoProgress()
+ {
+ if (wintaskbar.ProgressState != TaskbarItemProgressState.None)
+ {
+ Caliburn.Micro.Execute.OnUIThread(() => wintaskbar.ProgressState = TaskbarItemProgressState.None);
+ }
+ }
+ }
+}
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/ChromaSmoothFilter.cs Added

@@ -0,0 +1,191 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ChromaSmoothFilter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the Chroma Smooth Filter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModelItems.Filters
+{
+ using System.ComponentModel;
+ using System.Linq;
+
+ using Caliburn.Micro;
+
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Services.Scan.Model;
+
+ using Action = System.Action;
+
+ public class ChromaSmoothFilter : PropertyChangedBase
+ {
+ public static readonly string Off = "off";
+ public static readonly string Custom = "custom";
+
+ private readonly Action triggerTabChanged;
+
+ public ChromaSmoothFilter(EncodeTask currentTask, Action triggerTabChanged)
+ {
+ this.triggerTabChanged = triggerTabChanged;
+ this.CurrentTask = currentTask;
+
+ this.SetPresets();
+ this.SetTunes();
+ }
+
+ public EncodeTask CurrentTask { get; private set; }
+
+ public BindingList<FilterPreset> Presets { get; set; }
+
+ public BindingList<FilterTune> Tunes { get; set; }
+
+ public bool ShowTune => this.SelectedPreset != null && this.SelectedPreset.Key != Off && this.SelectedPreset.Key != Custom;
+
+ public bool ShowCustom => this.SelectedPreset != null && this.SelectedPreset.Key == Custom;
+
+ public FilterPreset SelectedPreset
+ {
+ get => this.CurrentTask.ChromaSmooth;
+
+ set
+ {
+ if (Equals(value, this.CurrentTask.ChromaSmooth))
+ {
+ return;
+ }
+
+ this.CurrentTask.ChromaSmooth = value;
+
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ this.NotifyOfPropertyChange(() => this.ShowTune);
+ this.NotifyOfPropertyChange(() => this.ShowCustom);
+
+ if (this.SelectedTune == null)
+ {
+ this.SelectedTune = this.Tunes.FirstOrDefault();
+ }
+
+ this.triggerTabChanged();
+ }
+ }
+
+ public FilterTune SelectedTune
+ {
+ get => this.CurrentTask.ChromaSmoothTune;
+
+ set
+ {
+ if (Equals(value, this.CurrentTask.ChromaSmoothTune))
+ {
+ return;
+ }
+
+ this.CurrentTask.ChromaSmoothTune = value;
+
+ this.NotifyOfPropertyChange(() => this.SelectedTune);
+ this.triggerTabChanged();
+ }
+ }
+
+ public string CustomSettings
+ {
+ get => this.CurrentTask.CustomChromaSmooth;
+
+ set
+ {
+ if (value == this.CurrentTask.CustomChromaSmooth)
+ {
+ return;
+ }
+
+ this.CurrentTask.CustomChromaSmooth = value;
+ this.NotifyOfPropertyChange(() => this.CustomSettings);
+ }
+ }
+
+ public void SetPreset(Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+
+ if (preset == null)
+ {
+ this.SelectedPreset = new FilterPreset(HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH).FirstOrDefault(s => s.ShortName == "off"));
+ this.CustomSettings = string.Empty;
+ this.SelectedTune = null;
+ return;
+ }
+
+ this.SelectedPreset = preset.Task.ChromaSmooth;
+ this.SelectedTune = preset.Task.ChromaSmoothTune;
+ this.CustomSettings = preset.Task.CustomChromaSmooth;
+ }
+
+ public void UpdateTask(EncodeTask task)
+ {
+ this.CurrentTask = task;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ this.NotifyOfPropertyChange(() => this.SelectedTune);
+ this.NotifyOfPropertyChange(() => this.CustomSettings);
+
+ this.NotifyOfPropertyChange(() => this.ShowTune);
+ this.NotifyOfPropertyChange(() => this.ShowCustom);
+ }
+
+ public bool MatchesPreset(Preset preset)
+ {
+ if (this.SelectedPreset?.Key != preset.Task?.ChromaSmooth?.Key)
+ {
+ return false;
+ }
+
+ if (this.SelectedTune?.Key != preset?.Task?.ChromaSmoothTune?.Key)
+ {
+ return false;
+ }
+
+ if (this.CustomSettings != preset?.Task?.CustomChromaSmooth)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public void SetSource(Source source, Title title, Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+ }
+
+ private void SetPresets()
+ {
+ BindingList<FilterPreset> presets = new BindingList<FilterPreset>();
+ foreach (HBPresetTune tune in HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH))
+ {
+ presets.Add(new FilterPreset(tune));
+ }
+
+ this.Presets = presets;
+ this.NotifyOfPropertyChange(() => this.Presets);
+ }
+
+ private void SetTunes()
+ {
+ BindingList<FilterTune> tunes = new BindingList<FilterTune>();
+ foreach (HBPresetTune tune in HandBrakeFilterHelpers.GetFilterTunes((int)hb_filter_ids.HB_FILTER_CHROMA_SMOOTH))
+ {
+ tunes.Add(new FilterTune(tune));
+ }
+
+ this.Tunes = tunes;
+ this.NotifyOfPropertyChange(() => this.Tunes);
+ }
+ }
+}

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/ColourspaceFilter.cs Added

@@ -0,0 +1,141 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="ColourSpaceFilter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the ColourSpaceFilter type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModelItems.Filters
+{
+ using System.ComponentModel;
+ using System.Linq;
+
+ using Caliburn.Micro;
+
+ using HandBrake.Interop.Interop;
+ using HandBrake.Interop.Interop.HbLib;
+ using HandBrake.Interop.Interop.Interfaces.Model.Filters;
+
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Services.Scan.Model;
+
+ using Action = System.Action;
+
+ public class ColourSpaceFilter : PropertyChangedBase
+ {
+ public static readonly string Off = "off";
+ public static readonly string Custom = "custom";
+
+ private readonly Action triggerTabChanged;
+
+ public ColourSpaceFilter(EncodeTask currentTask, Action triggerTabChanged)
+ {
+ this.triggerTabChanged = triggerTabChanged;
+ this.CurrentTask = currentTask;
+
+ this.SetPresets();
+ }
+
+ public EncodeTask CurrentTask { get; private set; }
+
+ public object Presets { get; set; }
+
+ public bool ShowColourspaceCustom => this.SelectedPreset != null && this.SelectedPreset.Key == Custom;
+
+ public FilterPreset SelectedPreset
+ {
+ get => this.CurrentTask.Colourspace;
+
+ set
+ {
+ if (Equals(value, this.CurrentTask.Colourspace))
+ {
+ return;
+ }
+
+ this.CurrentTask.Colourspace = value;
+
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ this.NotifyOfPropertyChange(() => this.ShowColourspaceCustom);
+ this.NotifyOfPropertyChange(() => this.ShowColourspaceCustom);
+ this.triggerTabChanged();
+ }
+ }
+
+ public string CustomColourspace
+ {
+ get => this.CurrentTask.CustomColourspace;
+
+ set
+ {
+ if (value == this.CurrentTask.CustomColourspace)
+ {
+ return;
+ }
+
+ this.CurrentTask.CustomColourspace = value;
+ this.NotifyOfPropertyChange(() => this.CustomColourspace);
+ }
+ }
+
+ public void SetPreset(Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+
+ if (preset == null)
+ {
+ this.SelectedPreset = new FilterPreset(HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_COLORSPACE).FirstOrDefault(s => s.ShortName == "off"));
+ this.CustomColourspace = string.Empty;
+ return;
+ }
+
+ this.SelectedPreset = preset.Task.Colourspace;
+ this.CustomColourspace = preset.Task.CustomColourspace;
+ }
+
+ public void UpdateTask(EncodeTask task)
+ {
+ this.CurrentTask = task;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ this.NotifyOfPropertyChange(() => this.CustomColourspace);
+
+ this.NotifyOfPropertyChange(() => this.ShowColourspaceCustom);
+ }
+
+ public bool MatchesPreset(Preset preset)
+ {
+ if (this.SelectedPreset?.Key != preset.Task?.Colourspace?.Key)
+ {
+ return false;
+ }
+
+ if (this.CustomColourspace != preset?.Task?.CustomColourspace)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public void SetSource(Source source, Title title, Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+ }
+
+ private void SetPresets()
+ {
+ BindingList<FilterPreset> presets = new BindingList<FilterPreset>();
+ foreach (HBPresetTune tune in HandBrakeFilterHelpers.GetFilterPresets((int)hb_filter_ids.HB_FILTER_COLORSPACE))
+ {
+ presets.Add(new FilterPreset(tune));
+ }
+
+ this.Presets = presets;
+ this.NotifyOfPropertyChange(() => this.Presets);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeblockFilter.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DeinterlaceFilterItem.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DenoiseItem.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/DetelecineItem.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/GrayscaleFilter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/GrayscaleFilter.cs Changed

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/PadFilter.cs Added

@@ -0,0 +1,234 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PadFilter.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModelItems.Filters
+{
+ using System.Collections.Generic;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Services.Encode.Model;
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Services.Scan.Model;
+ using HandBrakeWPF.Utilities;
+
+ using Action = System.Action;
+
+ public class PadFilter : PropertyChangedBase
+ {
+ private readonly Action triggerTabChanged;
+ private int top, bottom, left, right;
+ private EncodeTask currentTask;
+ private PaddingMode mode;
+ private PadColour colour;
+
+ private string customColour;
+
+ public PadFilter(EncodeTask currentTask, Action triggerTabChanged)
+ {
+ this.triggerTabChanged = triggerTabChanged;
+ this.CurrentTask = currentTask;
+ }
+
+ public EncodeTask CurrentTask
+ {
+ get => this.currentTask;
+ private set => this.currentTask = value;
+ }
+
+ public IEnumerable<PaddingMode> PaddingModes => EnumHelper<PaddingMode>.GetEnumList();
+
+ public PaddingMode Mode
+ {
+ get => this.mode;
+ set
+ {
+ this.mode = value;
+ this.IsCustomPaddingEnabled = false;
+
+ switch (value)
+ {
+ case PaddingMode.Custom:
+ this.currentTask.Padding.Enabled = true;
+ IsCustomPaddingEnabled = true;
+ break;
+ case PaddingMode.None:
+ default:
+ this.currentTask.Padding.Enabled = false;
+ break;
+ }
+
+ this.NotifyOfPropertyChange(() => this.IsCustomPaddingEnabled);
+ this.NotifyOfPropertyChange(() => this.IsCustomColourVisible);
+ }
+ }
+
+ public bool IsCustomPaddingEnabled { get; set; }
+
+ public IEnumerable<PadColour> PaddingColours => EnumHelper<PadColour>.GetEnumList();
+
+ public PadColour Colour
+ {
+ get
+ {
+ return colour;
+ }
+
+ set
+ {
+ this.colour = value;
+ this.SetColour();
+ this.NotifyOfPropertyChange(() => this.Colour);
+ this.NotifyOfPropertyChange(() => this.IsCustomColourVisible);
+ this.triggerTabChanged();
+ }
+ }
+
+ public string CustomColour
+ {
+ get => this.customColour;
+ set
+ {
+ this.customColour = value;
+ this.SetColour();
+ this.NotifyOfPropertyChange(() => this.CustomColour);
+ this.triggerTabChanged();
+ }
+ }
+
+ public bool IsCustomColourVisible => this.IsCustomPaddingEnabled && this.Colour == PadColour.Custom;
+
+ public int Top
+ {
+ get => this.top;
+
+ set
+ {
+ this.top = value;
+ this.CalculatePosition();
+ this.NotifyOfPropertyChange(() => this.Top);
+ this.triggerTabChanged();
+ }
+ }
+
+ public int Bottom
+ {
+ get => this.bottom;
+
+ set
+ {
+ this.bottom = value;
+ this.CalculatePosition();
+ this.NotifyOfPropertyChange(() => this.Bottom);
+ this.triggerTabChanged();
+ }
+ }
+ 
+ public int Left
+ {
+ get => this.left;
+
+ set
+ {
+ this.left = value;
+ this.CalculatePosition();
+ this.NotifyOfPropertyChange(() => this.Left);
+ this.triggerTabChanged();
+ }
+ }
+ 
+ public int Right
+ {
+ get => this.right;
+
+ set
+ {
+ this.right = value;
+ this.CalculatePosition();
+ this.NotifyOfPropertyChange(() => this.Right);
+ this.triggerTabChanged();
+ }
+ }
+
+ public void SetRotationValues(int t, int b, int l, int r)
+ {
+ this.top = t;
+ this.bottom = b;
+ this.left = l;
+ this.right = r;
+
+ this.NotifyOfPropertyChange(() => this.Top);
+ this.NotifyOfPropertyChange(() => this.Bottom);
+ this.NotifyOfPropertyChange(() => this.Left);
+ this.NotifyOfPropertyChange(() => this.Right);
+
+ this.CalculatePosition();
+ }
+ 
+ private void CalculatePosition()
+ {
+ // Figure the X,Y coordinate 
+ this.CurrentTask.Padding.X = this.Left;
+ this.CurrentTask.Padding.Y = this.Top;
+ 
+ // Calculate the total padding
+ this.currentTask.Padding.W = this.Left + this.Right;
+ this.currentTask.Padding.H = this.Top + this.Bottom;
+ }
+
+ public void UpdateTask(EncodeTask task)
+ {
+ this.CurrentTask = task;
+ }
+
+ public bool MatchesPreset(Preset preset)
+ {
+ if (preset.Task.Padding.Enabled && Mode != PaddingMode.None)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ public void SetSource(Source source, Title title, Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+ }
+
+ private void SetColour()
+ {
+ switch (this.Colour)
+ {
+ case PadColour.Black:
+ this.CurrentTask.Padding.Color = "black";
+ break;
+ case PadColour.White:
+ this.CurrentTask.Padding.Color = "white";
+ break;
+ case PadColour.Custom:
+ this.CurrentTask.Padding.Color = CustomColour?.Trim().ToLower();
+ break;
+ default:
+ this.CurrentTask.Padding.Color = "black";
+ break;
+ }
+ }
+
+ public void SetPreset(Preset preset, EncodeTask task)
+ {
+ this.CurrentTask = task;
+
+ if (preset == null)
+ {
+ return;
+ }
+
+ this.NotifyOfPropertyChange(() => this.Colour);
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/RotateFlipFilter.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/RotateFlipFilter.cs Changed

@@ -9,25 +9,24 @@
 
 namespace HandBrakeWPF.ViewModelItems.Filters
 {
+ using System;
 using System.ComponentModel;
 
 using Caliburn.Micro;
 
+ using HandBrakeWPF.Model.Picture;
 using HandBrakeWPF.Services.Encode.Model;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Services.Scan.Model;
 
- using Action = System.Action;
-
 public class RotateFlipFilter : PropertyChangedBase
 {
- private readonly Action triggerTabChanged;
+ private readonly Action<FlipRotationCommand> triggerTabChanged;
 
- public RotateFlipFilter(EncodeTask currentTask, Action triggerTabChanged)
+ public RotateFlipFilter(EncodeTask currentTask, Action<FlipRotationCommand> triggerTabChanged)
 {
 this.triggerTabChanged = triggerTabChanged;
 this.CurrentTask = currentTask;
-
 }
 
 public EncodeTask CurrentTask { get; private set; }
@@ -43,9 +42,13 @@
 
 set
 {
+ int previousFlipValue = this.CurrentTask.FlipVideo ? 1 : 0;
+ int previousRotation = this.CurrentTask.Rotation;
 this.CurrentTask.Rotation = value;
 this.NotifyOfPropertyChange(() => this.SelectedRotation);
- this.triggerTabChanged();
+
+
+ this.triggerTabChanged(new FlipRotationCommand(ChangedPictureField.Rotate, previousRotation, previousFlipValue));
 }
 }
 
@@ -58,9 +61,11 @@
 
 set
 {
+ int previousFlipValue = this.CurrentTask.FlipVideo ? 1 : 0;
+ int previousRotation = this.CurrentTask.Rotation;
 this.CurrentTask.FlipVideo = value;
 this.NotifyOfPropertyChange(() => this.FlipVideo);
- this.triggerTabChanged();
+ this.triggerTabChanged(new FlipRotationCommand(ChangedPictureField.Flip, previousRotation, previousFlipValue));
 }
 }
 
@@ -77,7 +82,6 @@
 
 this.SelectedRotation = preset.Task.Rotation;
 this.FlipVideo = preset.Task.FlipVideo;
-
 }
 
 public void UpdateTask(EncodeTask task)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModelItems/Filters/SharpenItem.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/AboutViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/AddPresetViewModel.cs Changed

@@ -10,14 +10,15 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System.Collections.Generic;
+ using System.ComponentModel;
 using System.Linq;
+ using System.Runtime.CompilerServices;
 using System.Windows;
 
 using Caliburn.Micro;
 
- using HandBrake.Interop.Interop.Model.Encoding;
-
 using HandBrakeWPF.Model.Audio;
+ using HandBrakeWPF.Model.Picture;
 using HandBrakeWPF.Model.Subtitles;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
@@ -30,80 +31,43 @@
 using HandBrakeWPF.Views;
 
 using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;
 
- /// <summary>
- /// The Add Preset View Model
- /// </summary>
 public class AddPresetViewModel : ViewModelBase, IAddPresetViewModel
 {
 private readonly IPresetService presetService;
 private readonly IErrorService errorService;
 private readonly IWindowManager windowManager;
- private PresetPictureSettingsMode selectedPictureSettingMode;
- private bool showCustomInputs;
- private Title selectedTitle;
+ private readonly PresetDisplayCategory addNewCategory = new PresetDisplayCategory(Resources.AddPresetView_AddNewCategory, true, null);
 
+ private bool showCustomInputs;
 private IAudioDefaultsViewModel audioDefaultsViewModel;
 private ISubtitlesDefaultsViewModel subtitlesDefaultsViewModel;
-
 private PresetDisplayCategory selectedPresetCategory;
- private readonly PresetDisplayCategory addNewCategory = new PresetDisplayCategory(Resources.AddPresetView_AddNewCategory, true, null);
 private bool canAddNewPresetCategory;
 
- /// <summary>
- /// Initializes a new instance of the <see cref="AddPresetViewModel"/> class.
- /// </summary>
- /// <param name="presetService">
- /// The Preset Service
- /// </param>
- /// <param name="errorService">
- /// The Error Service
- /// </param>
- /// <param name="windowManager">
- /// The window Manager.
- /// </param>
+ private PictureSettingsResLimitModes selectedPictureSettingsResLimitMode;
+
 public AddPresetViewModel(IPresetService presetService, IErrorService errorService, IWindowManager windowManager)
 {
 this.presetService = presetService;
 this.errorService = errorService;
 this.windowManager = windowManager;
 this.Title = Resources.AddPresetView_AddPreset;
- this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName };
- this.PictureSettingsModes = EnumHelper<PresetPictureSettingsMode>.GetEnumList();
+ this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCategoryName };
 this.PresetCategories = presetService.GetPresetCategories(true).Union(new List<PresetDisplayCategory> { addNewCategory }).ToList();
- this.SelectedPresetCategory = this.PresetCategories.FirstOrDefault(n => n.Category == PresetService.UserPresetCatgoryName);
- }
+ this.SelectedPresetCategory = this.PresetCategories.FirstOrDefault(n => n.Category == PresetService.UserPresetCategoryName);
 
- /// <summary>
- /// Gets the Preset
- /// </summary>
- public Preset Preset { get; private set; }
-
- /// <summary>
- /// Gets or sets PictureSettingsModes.
- /// </summary>
- public IEnumerable<PresetPictureSettingsMode> PictureSettingsModes { get; set; }
+ this.CustomHeight = 0;
+ this.CustomWidth = 0;
+ }
 
- /// <summary>
- /// Gets or sets CustomWidth.
- /// </summary>
- public int? CustomWidth { get; set; }
+ public Preset Preset { get; }
 
- /// <summary>
- /// Gets or sets CustomHeight.
- /// </summary>
- public int? CustomHeight { get; set; }
+ public string PresetName => this.Preset.Name;
 
- /// <summary>
- /// Gets or sets a value indicating whether ShowCustomInputs.
- /// </summary>
 public bool ShowCustomInputs
 {
- get
- {
- return this.showCustomInputs;
- }
+ get => this.showCustomInputs;
 set
 {
 this.showCustomInputs = value;
@@ -115,10 +79,7 @@
 
 public PresetDisplayCategory SelectedPresetCategory
 {
- get
- {
- return this.selectedPresetCategory;
- }
+ get => this.selectedPresetCategory;
 set
 {
 this.selectedPresetCategory = value;
@@ -131,17 +92,14 @@
 }
 else
 {
- this.PresetCategory = PresetService.UserPresetCatgoryName;
+ this.PresetCategory = PresetService.UserPresetCategoryName;
 }
 }
 }
 
 public string PresetCategory
 {
- get
- {
- return this.Preset.Category;
- }
+ get => this.Preset.Category;
 set
 {
 this.Preset.Category = value;
@@ -151,82 +109,92 @@
 
 public bool CanAddNewPresetCategory
 {
- get
- {
- return this.canAddNewPresetCategory;
- }
+ get => this.canAddNewPresetCategory;
 set
 {
- if (value == this.canAddNewPresetCategory) return;
+ if (value == this.canAddNewPresetCategory)
+ {
+ return;
+ }
+
 this.canAddNewPresetCategory = value;
 this.NotifyOfPropertyChange();
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedPictureSettingMode.
- /// </summary>
- public PresetPictureSettingsMode SelectedPictureSettingMode
+ public BindingList<PictureSettingsResLimitModes> ResolutionLimitModes => new BindingList<PictureSettingsResLimitModes>
+ {
+ PictureSettingsResLimitModes.None,
+ PictureSettingsResLimitModes.Size8K,
+ PictureSettingsResLimitModes.Size4K,
+ PictureSettingsResLimitModes.Size1080p,
+ PictureSettingsResLimitModes.Size720p,
+ PictureSettingsResLimitModes.Size576p,
+ PictureSettingsResLimitModes.Size480p,
+ PictureSettingsResLimitModes.Custom,
+ };
+
+ public PictureSettingsResLimitModes SelectedPictureSettingsResLimitMode
 {
- get
- {
- return this.selectedPictureSettingMode;
- }
+ get => this.selectedPictureSettingsResLimitMode;
 set
 {
- this.selectedPictureSettingMode = value;
- this.ShowCustomInputs = value == PresetPictureSettingsMode.Custom;
+ if (value == this.selectedPictureSettingsResLimitMode)
+ {
+ return;
+ }
+
+ this.selectedPictureSettingsResLimitMode = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPictureSettingsResLimitMode);
+
+ this.IsCustomMaxRes = value == PictureSettingsResLimitModes.Custom;
+ this.NotifyOfPropertyChange(() => this.IsCustomMaxRes);
+
+ // Enforce the new limit
+ ResLimit limit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(value);
+ if (limit != null)
+ {
+ this.CustomWidth = limit.Width;
+ this.CustomHeight = limit.Height;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
+ }
+ 
+ if (value == PictureSettingsResLimitModes.None)
+ {
+ this.CustomWidth = null;
+ this.CustomHeight = null;
+ }
 }
 }
 
- /// <summary>
- /// Prepare the Preset window to create a Preset Object later.
- /// </summary>
- /// <param name="task">
- /// The Encode Task.
- /// </param>
- /// <param name="title">
- /// The title.
- /// </param>
- /// <param name="audioBehaviours">
- /// The audio Behaviours.
- /// </param>
- /// <param name="subtitleBehaviours">
- /// The subtitle Behaviours.
- /// </param>
+ public bool IsCustomMaxRes { get; private set; }
+
+ public int? CustomWidth { get; set; }
+
+ public int? CustomHeight { get; set; }
+
 public void Setup(EncodeTask task, Title title, AudioBehaviours audioBehaviours, SubtitleBehaviours subtitleBehaviours)
 {
 this.Preset.Task = new EncodeTask(task);
- this.Preset.AudioTrackBehaviours = audioBehaviours.Clone();
- this.Preset.SubtitleTrackBehaviours = subtitleBehaviours.Clone();
+ this.Preset.AudioTrackBehaviours = new AudioBehaviours(audioBehaviours); 
+ this.Preset.SubtitleTrackBehaviours = new SubtitleBehaviours(subtitleBehaviours);
 
- this.audioDefaultsViewModel = new AudioDefaultsViewModel(this.Preset.Task);
- this.audioDefaultsViewModel.Setup(this.Preset, this.Preset.Task);
+ this.audioDefaultsViewModel = new AudioDefaultsViewModel(this.windowManager);
+ this.audioDefaultsViewModel.Setup(audioBehaviours, task.OutputFormat);
 
- this.subtitlesDefaultsViewModel = new SubtitlesDefaultsViewModel();
- this.subtitlesDefaultsViewModel.SetupLanguages(subtitleBehaviours);
+ this.subtitlesDefaultsViewModel = new SubtitlesDefaultsViewModel(this.windowManager);
+ this.subtitlesDefaultsViewModel.SetupPreset(subtitleBehaviours);
 
- this.selectedTitle = title;
+ // Resolution Limits
+ this.CustomWidth = task.MaxWidth;
+ this.CustomHeight = task.MaxHeight;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
 
- switch (task.Anamorphic)
- {
- default:
- this.SelectedPictureSettingMode = PresetPictureSettingsMode.Custom;
- if (title != null && title.Resolution != null)
- {
- this.CustomWidth = title.Resolution.Width;
- this.CustomHeight = title.Resolution.Height;
- }
- break;
- case Anamorphic.Automatic:
- this.SelectedPictureSettingMode = PresetPictureSettingsMode.SourceMaximum;
- break;
- }
+ this.SetSelectedPictureSettingsResLimitMode();
 }
 
- /// <summary>
- /// Add a Preset
- /// </summary>
 public void Add()
 {
 if (string.IsNullOrEmpty(this.Preset.Name))
@@ -251,39 +219,17 @@
 }
 }
 
- if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum && this.selectedTitle == null)
- {
- this.errorService.ShowMessageBox(Resources.AddPresetViewModel_YouMustFirstScanSource, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
- return;
- }
-
- if (this.CustomWidth == null && this.CustomHeight == null && this.SelectedPictureSettingMode == PresetPictureSettingsMode.Custom)
- {
- this.errorService.ShowMessageBox(Resources.AddPresetViewModel_CustomWidthHeightFieldsRequired, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
- return;
- }
-
- this.Preset.PictureSettingsMode = this.SelectedPictureSettingMode;
-
- // Setting W, H, MW and MH
- if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.None)
- {
- this.Preset.Task.MaxHeight = null;
- this.Preset.Task.MaxWidth = null;
- }
-
- if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.Custom)
+ if (this.SelectedPictureSettingsResLimitMode != PictureSettingsResLimitModes.None)
 {
- this.Preset.Task.MaxWidth = this.CustomWidth;
- this.Preset.Task.MaxHeight = this.CustomHeight;
- this.Preset.Task.Width = null;
- this.Preset.Task.Height = null;
- }
+ if (this.CustomWidth != null)
+ {
+ this.Preset.Task.MaxWidth = this.CustomWidth;
+ }
 
- if (this.SelectedPictureSettingMode == PresetPictureSettingsMode.SourceMaximum)
- {
- this.Preset.Task.MaxHeight = null;
- this.Preset.Task.MaxWidth = null;
+ if (this.CustomHeight != null)
+ {
+ this.Preset.Task.MaxHeight = this.CustomHeight;
+ }
 }
 
 // Add the Preset
@@ -302,49 +248,60 @@
 }
 }
 
- /// <summary>
- /// The edit audio defaults.
- /// </summary>
 public void EditAudioDefaults()
 {
- this.audioDefaultsViewModel.ResetApplied();
- bool? result = this.windowManager.ShowDialog(this.audioDefaultsViewModel);
+ this.audioDefaultsViewModel.ShowWindow();
+
 if (audioDefaultsViewModel.IsApplied)
 {
- this.Preset.AudioTrackBehaviours = this.audioDefaultsViewModel.AudioBehaviours.Clone();
+ this.Preset.AudioTrackBehaviours = new AudioBehaviours(this.audioDefaultsViewModel.AudioBehaviours);
 }
 }
 
- /// <summary>
- /// The edit subtitle defaults.
- /// </summary>
 public void EditSubtitleDefaults()
 {
- this.subtitlesDefaultsViewModel.ResetApplied();
- SubtitlesDefaultsView view = new SubtitlesDefaultsView();
- view.DataContext = this.subtitlesDefaultsViewModel;
- view.ShowDialog();
+ this.subtitlesDefaultsViewModel.ShowWindow();
 
 if (subtitlesDefaultsViewModel.IsApplied)
 {
- this.Preset.SubtitleTrackBehaviours = this.subtitlesDefaultsViewModel.SubtitleBehaviours.Clone();
+ this.Preset.SubtitleTrackBehaviours = new SubtitleBehaviours(this.subtitlesDefaultsViewModel.SubtitleBehaviours);
 }
 }
 
- /// <summary>
- /// Cancel adding a preset
- /// </summary>
 public void Cancel()
 {
- this.Close();
+ this.TryCloseAsync(false);
+ }
+
+ private void Close()
+ {
+ this.TryCloseAsync(true);
 }
 
- /// <summary>
- /// Close this window.
- /// </summary>
- public void Close()
+ private void SetSelectedPictureSettingsResLimitMode()
 {
- this.TryClose();
+ // Look for a matching resolution.
+ foreach (PictureSettingsResLimitModes limit in EnumHelper<PictureSettingsResLimitModes>.GetEnumList())
+ {
+ ResLimit resLimit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(limit);
+ if (resLimit != null)
+ {
+ if (resLimit.Width == this.CustomWidth && resLimit.Height == this.CustomHeight)
+ {
+ this.SelectedPictureSettingsResLimitMode = limit;
+ return;
+ }
+ }
+ }
+
+ if (this.CustomWidth.HasValue || this.CustomHeight.HasValue)
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.Custom;
+ }
+ else
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.None;
+ }
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/AudioDefaultsViewModel.cs Changed

@@ -16,8 +16,9 @@
 using System.Linq;
 using System.Windows.Navigation;
 
+ using Caliburn.Micro;
+
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model.Encoding;
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Model.Audio;
@@ -38,23 +39,20 @@
 /// </remarks>
 public class AudioDefaultsViewModel : ViewModelBase, IAudioDefaultsViewModel
 {
+ private readonly IWindowManager windowManager;
+
 private BindingList<string> availableLanguages;
 private AudioBehaviours audioBehaviours;
- private EncodeTask task;
- #region Constructors and Destructors
 
 /// <summary>
 /// Initializes a new instance of the <see cref="AudioDefaultsViewModel"/> class.
 /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- public AudioDefaultsViewModel(EncodeTask task)
+ public AudioDefaultsViewModel(IWindowManager windowManager)
 {
- this.Task = task;
+ this.windowManager = windowManager;
 this.AudioBehaviours = new AudioBehaviours();
 this.SelectedAvailableToMove = new BindingList<string>();
- this.SelectedLangaugesToMove = new BindingList<string>();
+ this.SelectedLanguagesToMove = new BindingList<string>();
 this.AvailableLanguages = new BindingList<string>();
 this.AudioEncoders = EnumHelper<AudioEncoder>.GetEnumList();
 
@@ -64,34 +62,12 @@
 this.SampleRates.Add(item.Name);
 }
 
- this.Setup((Preset)null, task);
-
 this.Title = Resources.AudioViewModel_AudioDefaults;
 }
 
- #endregion
-
 #region Properties
 
- /// <summary>
- /// Gets or sets the task.
- /// </summary>
- public EncodeTask Task
- {
- get
- {
- return this.task;
- }
- set
- {
- if (Equals(value, this.task))
- {
- return;
- }
- this.task = value;
- this.NotifyOfPropertyChange(() => this.Task);
- }
- }
+ public OutputFormat OutputFormat { get; private set; }
 
 /// <summary>
 /// Gets or sets the list of audio tracks we will use as templates for generating tracks for a given source.
@@ -133,14 +109,28 @@
 public bool IsApplied { get; set; }
 
 /// <summary>
- /// Gets SelectedLangauges.
+ /// Gets SelectedLanguages.
 /// </summary>
 public BindingList<string> SelectedAvailableToMove { get; private set; }
 
 /// <summary>
- /// Gets SelectedLangauges.
+ /// Gets SelectedLanguages.
 /// </summary>
- public BindingList<string> SelectedLangaugesToMove { get; private set; }
+ public BindingList<string> SelectedLanguagesToMove { get; private set; }
+
+ public bool AudioAllowMP2Pass
+ {
+ get
+ {
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowMP2Pass;
+ }
+
+ set
+ {
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowMP2Pass = value;
+ this.NotifyOfPropertyChange(() => this.AudioAllowMP2Pass);
+ }
+ }
 
 /// <summary>
 /// Gets or sets a value indicating whether audio allow m p 3 pass.
@@ -149,12 +139,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowMP3Pass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowMP3Pass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowMP3Pass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowMP3Pass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowMP3Pass);
 }
 }
@@ -166,12 +156,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowAACPass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowAACPass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowAACPass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowAACPass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowAACPass);
 }
 }
@@ -183,12 +173,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowAC3Pass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowAC3Pass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowAC3Pass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowAC3Pass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowAC3Pass);
 }
 }
@@ -200,12 +190,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowEAC3Pass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowEAC3Pass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowEAC3Pass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowEAC3Pass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowEAC3Pass);
 }
 }
@@ -217,12 +207,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowDTSPass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowDTSPass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowDTSPass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowDTSPass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowDTSPass);
 }
 }
@@ -234,12 +224,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowDTSHDPass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowDTSHDPass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowDTSHDPass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowDTSHDPass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowDTSHDPass);
 }
 }
@@ -251,12 +241,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowTrueHDPass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowTrueHDPass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowTrueHDPass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowTrueHDPass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowTrueHDPass);
 }
 }
@@ -268,12 +258,12 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioAllowFlacPass;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioAllowFlacPass;
 }
 
 set
 {
- this.task.AllowedPassthruOptions.AudioAllowFlacPass = value;
+ this.audioBehaviours.AllowedPassthruOptions.AudioAllowFlacPass = value;
 this.NotifyOfPropertyChange(() => this.AudioAllowFlacPass);
 }
 }
@@ -285,15 +275,22 @@
 {
 get
 {
- return this.Task.AllowedPassthruOptions.AudioEncoderFallback;
+ return this.audioBehaviours.AllowedPassthruOptions.AudioEncoderFallback;
 }
+
 set
 {
- if (value == this.Task.AllowedPassthruOptions.AudioEncoderFallback)
+ if (value == this.audioBehaviours.AllowedPassthruOptions.AudioEncoderFallback)
 {
 return;
 }
- this.Task.AllowedPassthruOptions.AudioEncoderFallback = value;
+
+ foreach (var item in this.BehaviourTracks)
+ {
+ item.SetFallbackEncoder(value);
+ }
+
+ this.audioBehaviours.AllowedPassthruOptions.AudioEncoderFallback = value;
 this.NotifyOfPropertyChange(() => this.AudioEncoderFallback);
 }
 }
@@ -337,7 +334,7 @@
 private set
 {
 this.availableLanguages = value;
- this.NotifyOfPropertyChange("AvailableLanguages");
+ this.NotifyOfPropertyChange(() => this.AvailableLanguages);
 }
 }
 
@@ -360,7 +357,11 @@
 /// </summary>
 public void AddTrack()
 {
- this.BehaviourTracks.AddNew();
+ this.BehaviourTracks.Add(new AudioBehaviourTrack(this.AudioEncoderFallback));
+ foreach (var item in this.BehaviourTracks)
+ {
+ item.SetFallbackEncoder(this.AudioEncoderFallback);
+ }
 }
 
 /// <summary>
@@ -393,7 +394,7 @@
 foreach (string item in copiedList)
 {
 this.AvailableLanguages.Remove(item);
- this.AudioBehaviours.SelectedLangauges.Add(item);
+ this.AudioBehaviours.SelectedLanguages.Add(item);
 }
 
 this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
@@ -405,12 +406,12 @@
 /// </summary>
 public void LanguageMoveLeft()
 {
- if (this.SelectedLangaugesToMove.Count > 0)
+ if (this.SelectedLanguagesToMove.Count > 0)
 {
- List<string> copiedList = this.SelectedLangaugesToMove.ToList();
+ List<string> copiedList = this.SelectedLanguagesToMove.ToList();
 foreach (string item in copiedList)
 {
- this.AudioBehaviours.SelectedLangauges.Remove(item);
+ this.AudioBehaviours.SelectedLanguages.Remove(item);
 this.AvailableLanguages.Add(item);
 }
 }
@@ -423,42 +424,25 @@
 /// </summary>
 public void LanguageClearAll()
 {
- foreach (string item in this.AudioBehaviours.SelectedLangauges)
+ foreach (string item in this.AudioBehaviours.SelectedLanguages)
 {
 this.AvailableLanguages.Add(item);
 }
 this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
 
- this.AudioBehaviours.SelectedLangauges.Clear();
- }
-
- public void ResetApplied()
- {
- this.IsApplied = false;
+ this.AudioBehaviours.SelectedLanguages.Clear();
 }
 
 #endregion
 
 #region Methods
 
- /// <summary>
- /// The setup languages.
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
- /// <param name="task">
- /// The task.
- /// </param>
- public void Setup(Preset preset, EncodeTask task)
+ public void Setup(AudioBehaviours behaviours, OutputFormat outputFormat)
 {
 // Reset
 this.IsApplied = false;
 this.AudioBehaviours = new AudioBehaviours();
 
- // Setup for this Encode Task.
- this.Task = task;
-
 IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
 langList = (from entry in langList orderby entry.Key ascending select entry).ToDictionary(pair => pair.Key, pair => pair.Value);
 
@@ -468,34 +452,31 @@
 this.AvailableLanguages.Add(item);
 }
 
- // Handle the Preset, if it's not null.
- if (preset == null)
- {
- return;
- }
- 
- AudioBehaviours behaviours = preset.AudioTrackBehaviours.Clone();
+ this.OutputFormat = outputFormat;
+
 if (behaviours != null)
 {
 this.AudioBehaviours.SelectedBehaviour = behaviours.SelectedBehaviour;
 this.AudioBehaviours.SelectedTrackDefaultBehaviour = behaviours.SelectedTrackDefaultBehaviour;
-
- foreach (AudioBehaviourTrack item in preset.AudioTrackBehaviours.BehaviourTracks)
+ this.audioBehaviours.AllowedPassthruOptions = behaviours.AllowedPassthruOptions;
+ 
+ foreach (AudioBehaviourTrack item in behaviours.BehaviourTracks)
 {
 this.BehaviourTracks.Add(new AudioBehaviourTrack(item));
 }
 
 this.NotifyOfPropertyChange(() => this.BehaviourTracks);
- 
- foreach (string selectedItem in behaviours.SelectedLangauges)
+
+ foreach (string selectedItem in behaviours.SelectedLanguages)
 {
 this.AvailableLanguages.Remove(selectedItem);
- this.AudioBehaviours.SelectedLangauges.Add(selectedItem);
+ this.AudioBehaviours.SelectedLanguages.Add(selectedItem);
 }
 }
 
- this.task.AllowedPassthruOptions = new AllowedPassthru(preset.Task.AllowedPassthruOptions);
+ this.CorrectAudioEncoders(this.OutputFormat);
 
+ this.NotifyOfPropertyChange(() => this.AudioAllowMP2Pass);
 this.NotifyOfPropertyChange(() => this.AudioAllowMP3Pass);
 this.NotifyOfPropertyChange(() => this.AudioAllowAACPass);
 this.NotifyOfPropertyChange(() => this.AudioAllowAC3Pass);
@@ -510,22 +491,70 @@
 /// <summary>
 /// The refresh task.
 /// </summary>
- public void RefreshTask()
+ public void RefreshTask(OutputFormat outputFormat)
 {
- this.NotifyOfPropertyChange(() => this.Task);
-
- if (this.Task.OutputFormat == OutputFormat.Mp4 && 
- (this.AudioEncoderFallback == AudioEncoder.ffflac || this.AudioEncoderFallback == AudioEncoder.ffflac24 || this.AudioEncoderFallback == AudioEncoder.Vorbis))
- {
- this.AudioEncoderFallback = AudioEncoder.ffaac;
- }
+ this.OutputFormat = outputFormat;
+ this.NotifyOfPropertyChange(() => this.AudioEncoders);
+ this.NotifyOfPropertyChange(() => this.OutputFormat);
+ this.CorrectAudioEncoders(this.OutputFormat);
 }
 
 public void LaunchHelp()
 {
- Process.Start("https://handbrake.fr/docs/en/1.2.0/advanced/audio-subtitle-defaults.html");
+ Process.Start("explorer.exe", "https://handbrake.fr/docs/en/latest/advanced/audio-subtitle-defaults.html");
 }
- 
+
 #endregion
+
+ public bool ShowWindow()
+ {
+ this.IsApplied = false;
+ this.windowManager.ShowDialogAsync(this);
+
+ return this.IsApplied;
+ }
+
+ public void Cancel()
+ {
+ this.IsApplied = false;
+ }
+
+ public void Save()
+ {
+ this.IsApplied = true;
+ this.TryCloseAsync(false);
+ }
+
+
+ private void CorrectAudioEncoders(OutputFormat outputFormat)
+ {
+ if (outputFormat == OutputFormat.Mp4 &&
+ (this.AudioEncoderFallback == AudioEncoder.ffflac || this.AudioEncoderFallback == AudioEncoder.ffflac24 || this.AudioEncoderFallback == AudioEncoder.Vorbis || this.AudioEncoderFallback == AudioEncoder.Opus))
+ {
+ this.AudioEncoderFallback = AudioEncoder.ffaac;
+ }
+
+ if (outputFormat == OutputFormat.WebM &&
+ (this.AudioEncoderFallback != AudioEncoder.Opus && this.AudioEncoderFallback != AudioEncoder.Vorbis))
+ {
+ this.AudioEncoderFallback = AudioEncoder.Vorbis;
+ }
+
+ if (outputFormat == OutputFormat.Mp4)
+ {
+ foreach (AudioBehaviourTrack track in this.BehaviourTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.ffflac24 || track.Encoder == AudioEncoder.Opus || track.Encoder == AudioEncoder.Vorbis))
+ {
+ track.Encoder = AudioEncoder.ffaac;
+ }
+ }
+
+ if (outputFormat == OutputFormat.WebM)
+ {
+ foreach (AudioBehaviourTrack track in this.BehaviourTracks.Where(track => track.Encoder != AudioEncoder.Vorbis && track.Encoder != AudioEncoder.Opus))
+ {
+ track.Encoder = AudioEncoder.Vorbis;
+ }
+ }
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/AudioViewModel.cs Changed

@@ -12,38 +12,33 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
- using System.ComponentModel;
 using System.Linq;
 
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.EventArgs;
 using HandBrakeWPF.Model.Audio;
- using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
- using HandBrakeWPF.Views;
 
- using AudioEncoder = HandBrakeWPF.Services.Encode.Model.Models.AudioEncoder;
- using AudioTrack = HandBrakeWPF.Services.Encode.Model.Models.AudioTrack;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
+ using AudioEncoder = Services.Encode.Model.Models.AudioEncoder;
+ using AudioTrack = Services.Encode.Model.Models.AudioTrack;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
 
 /// <summary>
 /// The Audio View Model
 /// </summary>
 public class AudioViewModel : ViewModelBase, IAudioViewModel
 {
- private readonly IWindowManager windowManager;
 private IEnumerable<Audio> sourceTracks;
- private Preset currentPreset;
 
 #region Constructors and Destructors
 
@@ -58,9 +53,8 @@
 /// </param>
 public AudioViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
 {
- this.windowManager = windowManager;
 this.Task = new EncodeTask();
- this.AudioDefaultsViewModel = new AudioDefaultsViewModel(this.Task);
+ this.AudioDefaultsViewModel = new AudioDefaultsViewModel(windowManager);
 
 this.SampleRates = new ObservableCollection<string> { "Auto" };
 foreach (var item in HandBrakeEncoderHelpers.AudioSampleRates)
@@ -115,37 +109,9 @@
 public EncodeTask Task { get; set; }
 
 /// <summary>
- /// Gets the panel title.
- /// </summary>
- public string PanelTitle
- {
- get
- {
- return Resources.AudioViewModel_AudioTracks;
- }
- }
-
- /// <summary>
- /// Gets the switch display title.
- /// </summary>
- public string SwitchDisplayTitle
- {
- get
- {
- return Resources.AudioViewModel_ConfigureDefaults;
- }
- }
-
- /// <summary>
 /// Gets the default audio behaviours. 
 /// </summary>
- public AudioBehaviours AudioBehaviours
- {
- get
- {
- return this.AudioDefaultsViewModel.AudioBehaviours;
- }
- }
+ public AudioBehaviours AudioBehaviours { get; private set; }
 
 #endregion
 
@@ -198,11 +164,11 @@
 /// <summary>
 /// Trigger a Notify Property Changed on the Task to force various UI elements to update.
 /// </summary>
- public void RefreshTask()
+ public void RefreshTask(OutputFormat format)
 {
- this.NotifyOfPropertyChange(() => this.Task);
+ this.NotifyOfPropertyChange(() => this.Task); // Trigger UI Refresh
 
- if (this.Task.OutputFormat == OutputFormat.Mp4)
+ if (format == OutputFormat.Mp4)
 {
 foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder == AudioEncoder.ffflac || track.Encoder == AudioEncoder.Vorbis))
 {
@@ -210,7 +176,7 @@
 }
 }
 
- if (this.Task.OutputFormat == OutputFormat.WebM)
+ if (format == OutputFormat.WebM)
 {
 foreach (AudioTrack track in this.Task.AudioTracks.Where(track => track.Encoder != AudioEncoder.Vorbis && track.Encoder != AudioEncoder.Opus))
 {
@@ -218,7 +184,7 @@
 }
 }
 
- this.AudioDefaultsViewModel.RefreshTask();
+ this.AudioDefaultsViewModel.RefreshTask(format);
 }
 
 /// <summary>
@@ -226,12 +192,33 @@
 /// </summary>
 public void ShowAudioDefaults()
 {
- if (this.windowManager.ShowDialog(this.AudioDefaultsViewModel) == true)
+ this.AudioDefaultsViewModel.Setup(new AudioBehaviours(this.AudioBehaviours), this.Task.OutputFormat);
+
+ if (this.AudioDefaultsViewModel.ShowWindow())
 {
+ this.AudioBehaviours = new AudioBehaviours(this.AudioDefaultsViewModel.AudioBehaviours);
+ this.Task.AudioPassthruOptions = this.AudioBehaviours.AllowedPassthruOptions;
+
 this.OnTabStatusChanged(null);
 }
 }
 
+ public void ExpandAllTracks()
+ {
+ foreach (var track in this.Task.AudioTracks)
+ {
+ track.IsExpandedTrackView = true;
+ }
+ }
+
+ public void CollapseAllTracks()
+ {
+ foreach (var track in this.Task.AudioTracks)
+ {
+ track.IsExpandedTrackView = false;
+ }
+ }
+
 #endregion
 
 #region Implemented Interfaces
@@ -248,12 +235,12 @@
 public void SetPreset(Preset preset, EncodeTask task)
 {
 this.Task = task;
- this.currentPreset = preset;
 
 // Audio Behaviours
- this.AudioDefaultsViewModel.Setup(preset, task);
+ this.AudioDefaultsViewModel.Setup(preset.AudioTrackBehaviours, preset.Task.OutputFormat);
+ this.AudioBehaviours = new AudioBehaviours(preset.AudioTrackBehaviours);
 
- if (preset != null && preset.Task != null)
+ if (preset.Task != null)
 {
 this.SetupTracks();
 }
@@ -288,68 +275,73 @@
 return false;
 }
 
- foreach (var item in this.AudioBehaviours.SelectedLangauges)
+ foreach (var item in this.AudioBehaviours.SelectedLanguages)
 {
- if (!preset.AudioTrackBehaviours.SelectedLangauges.Contains(item))
+ if (!preset.AudioTrackBehaviours.SelectedLanguages.Contains(item))
 {
 return false;
 }
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowMP3Pass != this.Task.AllowedPassthruOptions.AudioAllowMP3Pass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowMP2Pass != this.Task.AudioPassthruOptions.AudioAllowMP2Pass)
+ {
+ return false;
+ }
+
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowMP3Pass != this.Task.AudioPassthruOptions.AudioAllowMP3Pass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowAACPass != this.Task.AllowedPassthruOptions.AudioAllowAACPass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowAACPass != this.Task.AudioPassthruOptions.AudioAllowAACPass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowAC3Pass != this.Task.AllowedPassthruOptions.AudioAllowAC3Pass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowAC3Pass != this.Task.AudioPassthruOptions.AudioAllowAC3Pass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowEAC3Pass != this.Task.AllowedPassthruOptions.AudioAllowEAC3Pass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowEAC3Pass != this.Task.AudioPassthruOptions.AudioAllowEAC3Pass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowDTSPass != this.Task.AllowedPassthruOptions.AudioAllowDTSPass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowDTSPass != this.Task.AudioPassthruOptions.AudioAllowDTSPass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowDTSHDPass != this.Task.AllowedPassthruOptions.AudioAllowDTSHDPass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowDTSHDPass != this.Task.AudioPassthruOptions.AudioAllowDTSHDPass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowTrueHDPass != this.Task.AllowedPassthruOptions.AudioAllowTrueHDPass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowTrueHDPass != this.Task.AudioPassthruOptions.AudioAllowTrueHDPass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioAllowFlacPass != this.Task.AllowedPassthruOptions.AudioAllowFlacPass)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioAllowFlacPass != this.Task.AudioPassthruOptions.AudioAllowFlacPass)
 {
 return false;
 }
 
- if (preset.Task.AllowedPassthruOptions.AudioEncoderFallback != this.Task.AllowedPassthruOptions.AudioEncoderFallback)
+ if (preset.AudioTrackBehaviours.AllowedPassthruOptions.AudioEncoderFallback != this.Task.AudioPassthruOptions.AudioEncoderFallback)
 {
 return false;
 }
 
- foreach (var language in preset.AudioTrackBehaviours.SelectedLangauges)
+ foreach (var language in preset.AudioTrackBehaviours.SelectedLanguages)
 {
- if (!this.AudioBehaviours.SelectedLangauges.Contains(language))
+ if (!this.AudioBehaviours.SelectedLanguages.Contains(language))
 {
 return false;
 }
 }
 
- if (preset.AudioTrackBehaviours.SelectedLangauges.Count != this.AudioBehaviours.SelectedLangauges.Count)
+ if (preset.AudioTrackBehaviours.SelectedLanguages.Count != this.AudioBehaviours.SelectedLanguages.Count)
 {
 return false;
 }
@@ -435,17 +427,17 @@
 {
 case AudioTrackDefaultsMode.FirstTrack:
 AudioBehaviourTrack template = this.AudioBehaviours.BehaviourTracks.FirstOrDefault();
- if (this.CanAddTrack(template, track, this.Task.AllowedPassthruOptions.AudioEncoderFallback))
+ if (this.CanAddTrack(template, track, this.AudioBehaviours.AllowedPassthruOptions.AudioEncoderFallback))
 {
- this.Task.AudioTracks.Add( template != null ? new AudioTrack(template, track, this.Task.AllowedPassthruOptions, this.Task.OutputFormat) : new AudioTrack { ScannedTrack = track });
+ this.Task.AudioTracks.Add( template != null ? new AudioTrack(template, track, this.AudioBehaviours.AllowedPassthruOptions, this.Task.OutputFormat) : new AudioTrack { ScannedTrack = track });
 }
 break;
 case AudioTrackDefaultsMode.AllTracks:
 foreach (AudioBehaviourTrack tmpl in this.AudioBehaviours.BehaviourTracks)
 {
- if (this.CanAddTrack(tmpl, track, this.Task.AllowedPassthruOptions.AudioEncoderFallback))
+ if (this.CanAddTrack(tmpl, track, this.AudioBehaviours.AllowedPassthruOptions.AudioEncoderFallback))
 {
- this.Task.AudioTracks.Add(tmpl != null ? new AudioTrack(tmpl, track, this.Task.AllowedPassthruOptions, this.Task.OutputFormat) : new AudioTrack { ScannedTrack = track });
+ this.Task.AudioTracks.Add(tmpl != null ? new AudioTrack(tmpl, track, this.AudioBehaviours.AllowedPassthruOptions, this.Task.OutputFormat) : new AudioTrack { ScannedTrack = track });
 }
 }
 
@@ -495,9 +487,9 @@
 foreach (AudioBehaviourTrack track in this.AudioBehaviours.BehaviourTracks)
 {
 Audio sourceTrack = this.GetPreferredAudioTrack();
- if (this.CanAddTrack(track, sourceTrack, this.Task.AllowedPassthruOptions.AudioEncoderFallback))
+ if (this.CanAddTrack(track, sourceTrack, this.AudioBehaviours.AllowedPassthruOptions.AudioEncoderFallback))
 {
- this.Task.AudioTracks.Add(new AudioTrack(track, sourceTrack, this.Task.AllowedPassthruOptions, this.Task.OutputFormat));
+ this.Task.AudioTracks.Add(new AudioTrack(track, sourceTrack, this.AudioBehaviours.AllowedPassthruOptions, this.Task.OutputFormat));
 }
 }
 
@@ -510,7 +502,7 @@
 case AudioBehaviourModes.FirstMatch: // Adding all remaining audio tracks
 this.AddFirstForSelectedLanguages();
 break;
- case AudioBehaviourModes.AllMatching: // Add Langauges tracks for the additional languages selected, in-order.
+ case AudioBehaviourModes.AllMatching: // Add Languages tracks for the additional languages selected, in-order.
 this.AddAllRemainingForSelectedLanguages();
 break;
 }
@@ -521,7 +513,7 @@
 /// </summary>
 private void AddFirstForSelectedLanguages()
 {
- bool anyLanguageSelected = this.AudioBehaviours.SelectedLangauges.Contains(Constants.Any);
+ bool anyLanguageSelected = this.AudioBehaviours.SelectedLanguages.Contains(Constants.Any);
 
 if (anyLanguageSelected && this.Task.AudioTracks.Count >= 1)
 {
@@ -566,7 +558,7 @@
 // For all the source audio tracks
 foreach (Audio sourceTrack in this.SourceTracks)
 {
- // Step 2: Check if the track list already contrains this track
+ // Step 2: Check if the track list already contains this track
 bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
 if (!found)
 {
@@ -584,7 +576,7 @@
 // Add them if they are not already added.
 foreach (Audio sourceTrack in this.GetSelectedLanguagesTracks())
 {
- // Step 2: Check if the track list already contrains this track
+ // Step 2: Check if the track list already contains this track
 bool found = this.Task.AudioTracks.Any(audioTrack => Equals(audioTrack.ScannedTrack, sourceTrack));
 if (!found)
 {
@@ -605,9 +597,9 @@
 // The first track in the selected languages list is considered the preferred language.
 // So, try match tracks on this.
 IEnumerable<Audio> preferredAudioTracks = new List<Audio>();
- if (this.AudioBehaviours.SelectedLangauges.Count > 0)
+ if (this.AudioBehaviours.SelectedLanguages.Count > 0)
 {
- string langName = this.AudioBehaviours.SelectedLangauges.FirstOrDefault(w => !w.Equals(Constants.Any));
+ string langName = this.AudioBehaviours.SelectedLanguages.FirstOrDefault(w => !w.Equals(Constants.Any));
 string langCode = LanguageUtilities.GetLanguageCode(langName);
 if (!string.IsNullOrEmpty(langCode))
 {
@@ -628,14 +620,14 @@
 {
 // Translate to Iso Codes
 List<string> iso6392Codes = new List<string>();
- if (this.AudioBehaviours.SelectedLangauges.Contains(Constants.Any))
+ if (this.AudioBehaviours.SelectedLanguages.Contains(Constants.Any))
 {
 iso6392Codes = LanguageUtilities.GetIsoCodes();
- iso6392Codes = LanguageUtilities.OrderIsoCodes(iso6392Codes, this.AudioBehaviours.SelectedLangauges);
+ iso6392Codes = LanguageUtilities.OrderIsoCodes(iso6392Codes, this.AudioBehaviours.SelectedLanguages);
 }
 else
 {
- iso6392Codes = LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLangauges.ToArray());
+ iso6392Codes = LanguageUtilities.GetLanguageCodes(this.AudioBehaviours.SelectedLanguages.ToArray());
 }
 
 List<Audio> orderedTracks = new List<Audio>();

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/ChaptersViewModel.cs Changed

@@ -15,7 +15,6 @@
 using System.IO;
 using System.Linq;
 using System.Windows;
- using System.Windows.Forms;
 
 using Caliburn.Micro;
 
@@ -28,40 +27,17 @@
 using HandBrakeWPF.Utilities.Output;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using ChapterMarker = HandBrakeWPF.Services.Encode.Model.Models.ChapterMarker;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using GeneralApplicationException = HandBrakeWPF.Exceptions.GeneralApplicationException;
+ using Microsoft.Win32;
+
+ using ChapterMarker = Services.Encode.Model.Models.ChapterMarker;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using GeneralApplicationException = Exceptions.GeneralApplicationException;
 
- /// <summary>
- /// The Chapters View Model
- /// </summary>
 public class ChaptersViewModel : ViewModelBase, IChaptersViewModel
 {
- #region Constants and Fields
-
 private readonly IErrorService errorService;
-
- /// <summary>
- /// The source chapters backing field
- /// </summary>
 private List<Chapter> sourceChaptersList;
 
- #endregion
-
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="ChaptersViewModel"/> class.
- /// </summary>
- /// <param name="windowManager">
- /// The window manager.
- /// </param>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- /// <param name="errorService">
- /// The Error Service 
- /// </param>
 public ChaptersViewModel(IWindowManager windowManager, IUserSettingService userSettingService, IErrorService errorService)
 {
 this.Task = new EncodeTask();
@@ -70,8 +46,6 @@
 
 public event EventHandler<TabStatusEventArgs> TabStatusChanged;
 
- #endregion
-
 #region Public Properties
 
 /// <summary>
@@ -131,26 +105,25 @@
 /// </exception>
 public void Export()
 {
- string fileName = null;
- using (var saveFileDialog = new SaveFileDialog()
- {
- Filter = "Csv File|*.csv",
- DefaultExt = "csv",
- CheckPathExists = true,
- OverwritePrompt = true
- })
+ var saveFileDialog = new SaveFileDialog()
+ {
+ Filter = "Csv File|*.csv",
+ DefaultExt = "csv",
+ CheckPathExists = true,
+ OverwritePrompt = true
+ };
+
+ var dialogResult = saveFileDialog.ShowDialog();
+ string filename = saveFileDialog.FileName;
+
+ if (dialogResult == false || string.IsNullOrEmpty(filename))
 {
- var dialogResult = saveFileDialog.ShowDialog();
- fileName = saveFileDialog.FileName;
-
- // Exit early if the user cancelled or the filename is invalid
- if (dialogResult != DialogResult.OK || string.IsNullOrWhiteSpace(fileName))
- return;
+ return;
 }
 
 try
 {
- using (var csv = new StreamWriter(fileName))
+ using (var csv = new StreamWriter(filename))
 {
 foreach (ChapterMarker row in this.Chapters)
 {
@@ -177,23 +150,29 @@
 {
 string filename = null;
 string fileExtension = null;
- using (var dialog = new OpenFileDialog()
- {
- Filter = string.Join("|", "All Supported Formats (*.csv;*.tsv,*.xml,*.txt)|*.csv;*.tsv;*.xml;*.txt", ChapterImporterCsv.FileFilter, ChapterImporterXml.FileFilter, ChapterImporterTxt.FileFilter),
- FilterIndex = 1, // 1 based, the index value of the first filter entry is 1
- CheckFileExists = true
- })
+ var dialog = new OpenFileDialog()
+ {
+ Filter = string.Join(
+ "|",
+ "All Supported Formats (*.csv;*.tsv,*.xml,*.txt)|*.csv;*.tsv;*.xml;*.txt",
+ ChapterImporterCsv.FileFilter,
+ ChapterImporterXml.FileFilter,
+ ChapterImporterTxt.FileFilter),
+ FilterIndex = 1, // 1 based, the index value of the first filter entry is 1
+ CheckFileExists = true
+ };
+
+ var dialogResult = dialog.ShowDialog();
+ filename = dialog.FileName;
+
+ if (dialogResult == false || string.IsNullOrEmpty(filename))
 {
- var dialogResult = dialog.ShowDialog();
- filename = dialog.FileName;
+ return;
+ }
 
- // Exit if the user didn't press the OK button or the file name is invalid
- if (dialogResult != DialogResult.OK || string.IsNullOrWhiteSpace(filename))
- return;
+ // Retrieve the file extension after we've confirmed that the user selected something to open
+ fileExtension = Path.GetExtension(filename)?.ToLowerInvariant();
 
- // Retrieve the file extension after we've confirmed that the user selected something to open
- fileExtension = Path.GetExtension(filename)?.ToLowerInvariant();
- }
 
 var importedChapters = new Dictionary<int, Tuple<string, TimeSpan>>();
 
@@ -215,14 +194,16 @@
 Resources.ChaptersViewModel_UnsupportedFileFormatWarning,
 string.Format(Resources.ChaptersViewModel_UnsupportedFileFormatMsg, fileExtension));
 }
- 
+
 // Exit early if no chapter information was extracted
 if (importedChapters == null || importedChapters.Count <= 0)
 return;
 
 // Validate the chaptermap against the current chapter list extracted from the source
+ bool hasTimestamps = importedChapters.Select(importedChapter => importedChapter.Value.Item2).Any(t => t != TimeSpan.Zero);
+
 string validationErrorMessage;
- if (!this.ValidateImportedChapters(importedChapters, out validationErrorMessage))
+ if (!this.ValidateImportedChapters(importedChapters, out validationErrorMessage, hasTimestamps))
 {
 if (!string.IsNullOrEmpty(validationErrorMessage))
 {
@@ -235,7 +216,7 @@
 return;
 }
 
- // Now iterate over each chatper we have, and set it's name
+ // Now iterate over each chapter we have, and set it's name
 foreach (ChapterMarker item in this.Chapters)
 {
 // If we don't have a chapter name for this chapter then 
@@ -373,7 +354,7 @@
 /// <param name="validationErrorMessage">In case of a validation error this variable will hold 
 /// a detailed message that can be presented to the user</param>
 /// <returns>True if there are no errors with imported chapters, false otherwise</returns>
- private bool ValidateImportedChapters(Dictionary<int, Tuple<string, TimeSpan>> importedChapters, out string validationErrorMessage)
+ private bool ValidateImportedChapters(Dictionary<int, Tuple<string, TimeSpan>> importedChapters, out string validationErrorMessage, bool hasTimestamps)
 {
 validationErrorMessage = null;
 
@@ -396,17 +377,31 @@
 // (I chose 15sec based on empirical evidence from testing a few DVDs and comparing to chapter-marker files I downloaded)
 // => This check will not be performed for the first and last chapter as they're very likely to differ significantly due to language and region
 // differences (e.g. longer title sequences and different distributor credits)
- var diffs = importedChapters.Zip(this.Chapters, (import, source) => source.Duration - import.Value.Item2);
- if (diffs.Count(diff => Math.Abs(diff.TotalSeconds) > 15) > 2)
+ if (hasTimestamps)
 {
- if (this.errorService.ShowMessageBox(
- Resources.ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg,
- Resources.ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning,
- MessageBoxButton.YesNo,
- MessageBoxImage.Question) !=
- MessageBoxResult.Yes)
+ List<TimeSpan> diffs = new List<TimeSpan>();
+ foreach (KeyValuePair<int, Tuple<string, TimeSpan>> import in importedChapters)
 {
- return false;
+ ChapterMarker sourceMarker = this.Chaptersimport.Key - 1;
+ TimeSpan source = sourceMarker.Duration;
+
+ TimeSpan diff = source - import.Value.Item2;
+ diffs.Add(diff);
+
+ }
+
+
+ // var diffs = importedChapters.Zip(this.Chapters, (import, source) => source.Duration - import.Value.Item2);
+ if (diffs.Count(diff => Math.Abs(diff.TotalSeconds) > 15) > 2)
+ {
+ if (this.errorService.ShowMessageBox(
+ Resources.ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchMsg,
+ Resources.ChaptersViewModel_ValidateImportedChapters_ChapterDurationMismatchWarning,
+ MessageBoxButton.YesNo,
+ MessageBoxImage.Question) != MessageBoxResult.Yes)
+ {
+ return false;
+ }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/CountdownAlertViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/ErrorViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/FiltersViewModel.cs Changed

@@ -10,44 +10,31 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System;
- using System.Collections.Generic;
- using System.ComponentModel;
- using System.Globalization;
- using System.Linq;
-
- using Caliburn.Micro;
-
- using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.HbLib;
- using HandBrake.Interop.Interop.Model.Encoding;
 
 using HandBrakeWPF.EventArgs;
- using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Model;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Services.Scan.Model;
- using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModelItems.Filters;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
 
- /// <summary>
- /// The Filters View Model
- /// </summary>
 public class FiltersViewModel : ViewModelBase, IFiltersViewModel
 {
- public FiltersViewModel(IWindowManager windowManager, IUserSettingService userSettingService)
+ public FiltersViewModel(IUserSettingService userSettingService)
 {
 this.CurrentTask = new EncodeTask();
 
- this.SharpenFilter = new SharpenItem(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.DenoiseFilter = new DenoiseItem(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.DetelecineFilter = new DetelecineItem(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.DeinterlaceFilter = new DeinterlaceFilterItem(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.DeblockFilter = new DeblockFilter(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.RotateFlipFilter = new RotateFlipFilter(this.CurrentTask, () => this.OnTabStatusChanged(null));
- this.GrayscaleFilter = new GrayscaleFilter(this.CurrentTask, () => this.OnTabStatusChanged(null));
+ this.SharpenFilter = new SharpenItem(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.DenoiseFilter = new DenoiseItem(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.DetelecineFilter = new DetelecineItem(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.DeinterlaceFilter = new DeinterlaceFilterItem(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.DeblockFilter = new DeblockFilter(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.GrayscaleFilter = new GrayscaleFilter(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.ColourSpaceFilter = new ColourSpaceFilter(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
+ this.ChromaSmoothFilter = new ChromaSmoothFilter(this.CurrentTask, () => this.OnTabStatusChanged(new TabStatusEventArgs(TabStatusEventType.FilterType)));
 }
 
 public event EventHandler<TabStatusEventArgs> TabStatusChanged;
@@ -64,9 +51,11 @@
 
 public DeblockFilter DeblockFilter { get; set; }
 
- public RotateFlipFilter RotateFlipFilter { get; set; }
+ public ColourSpaceFilter ColourSpaceFilter { get; set; }
 
 public GrayscaleFilter GrayscaleFilter { get; set; }
+
+ public ChromaSmoothFilter ChromaSmoothFilter { get; set; }
 
 public void SetPreset(Preset preset, EncodeTask task)
 {
@@ -77,7 +66,9 @@
 this.DetelecineFilter.SetPreset(preset, task);
 this.DeinterlaceFilter.SetPreset(preset, task);
 this.DeblockFilter.SetPreset(preset, task);
- this.RotateFlipFilter.SetPreset(preset, task);
+ this.ColourSpaceFilter.SetPreset(preset, task);
+ this.ChromaSmoothFilter.SetPreset(preset, task);
+ this.GrayscaleFilter.SetPreset(preset, task);
 }
 
 public void UpdateTask(EncodeTask task)
@@ -89,8 +80,9 @@
 this.DetelecineFilter.UpdateTask(task);
 this.DeinterlaceFilter.UpdateTask(task);
 this.DeblockFilter.UpdateTask(task);
- this.RotateFlipFilter.UpdateTask(task);
 this.GrayscaleFilter.UpdateTask(task);
+ this.ColourSpaceFilter.UpdateTask(task);
+ this.ChromaSmoothFilter.UpdateTask(task);
 }
 
 public bool MatchesPreset(Preset preset)
@@ -120,12 +112,17 @@
 return false;
 }
 
- if (!this.RotateFlipFilter.MatchesPreset(preset))
+ if (!this.GrayscaleFilter.MatchesPreset(preset))
 {
 return false;
 }
 
- if (!this.GrayscaleFilter.MatchesPreset(preset))
+ if (!this.ColourSpaceFilter.MatchesPreset(preset))
+ {
+ return false;
+ }
+
+ if (!this.ChromaSmoothFilter.MatchesPreset(preset))
 {
 return false;
 }
@@ -141,8 +138,9 @@
 this.DetelecineFilter.SetSource(source, title, preset, task);
 this.DeinterlaceFilter.SetSource(source, title, preset, task);
 this.DeblockFilter.SetSource(source, title, preset, task);
- this.RotateFlipFilter.SetSource(source, title, preset, task);
 this.GrayscaleFilter.SetSource(source, title, preset, task);
+ this.ColourSpaceFilter.SetSource(source, title, preset, task);
+ this.ChromaSmoothFilter.SetSource(source, title, preset, task);
 }
 
 protected virtual void OnTabStatusChanged(TabStatusEventArgs e)

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAddPresetViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioDefaultsViewModel.cs Changed

@@ -10,37 +10,18 @@
 namespace HandBrakeWPF.ViewModels.Interfaces
 {
 using HandBrakeWPF.Model.Audio;
- using HandBrakeWPF.Services.Encode.Model;
- using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Services.Encode.Model.Models;
 
- /// <summary>
- /// The Audio View Model Interface
- /// </summary>
 public interface IAudioDefaultsViewModel : IViewModelBase
 {
- /// <summary>
- /// Gets the audio behaviours.
- /// </summary>
 AudioBehaviours AudioBehaviours { get; }
 
 bool IsApplied { get; }
 
- /// <summary>
- /// The setup languages.
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
- /// <param name="task">
- /// The task.
- /// </param>
- void Setup(Preset preset, EncodeTask task);
+ void Setup(AudioBehaviours behaviours, OutputFormat outputformat);
 
- /// <summary>
- /// The refresh task.
- /// </summary>
- void RefreshTask();
+ void RefreshTask(OutputFormat outputFormat);
 
- void ResetApplied();
+ bool ShowWindow();
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IAudioViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IMainViewModel.cs Changed

@@ -14,20 +14,23 @@
 using HandBrakeWPF.Model;
 using HandBrakeWPF.Services.Queue.Model;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
-
 /// <summary>
 /// The Main Window View Model
 /// </summary>
 public interface IMainViewModel
 {
 /// <summary>
+ /// Add a new preset
+ /// </summary>
+ void PresetAdd();
+
+ /// <summary>
 /// The preset select.
 /// </summary>
 /// <param name="tag">
 /// The tag.
 /// </param>
- void PresetSelect(object tag);
+ bool PresetSelect(object tag);
 
 /// <summary>
 /// Shutdown the Application
@@ -50,11 +53,13 @@
 /// <returns>
 /// True if added, false if error
 /// </returns>
- AddQueueError AddToQueue();
+ AddQueueError AddToQueue(bool batch = false);
 void AddToQueueWithErrorHandling();
 void AddAllToQueue();
 void AddSelectionToQueue();
 
+ void OpenPresetWindow();
+
 /// <summary>
 /// The launch help.
 /// </summary>
@@ -81,6 +86,11 @@
 void StopEncode();
 
 /// <summary>
+ /// Pause any active encodes.
+ /// </summary>
+ void PauseEncode();
+
+ /// <summary>
 /// Start an Encode
 /// </summary>
 void StartEncode();

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IPresetManagerViewModel.cs Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IQueueSelectionViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/IStaticPreviewViewModel.cs Changed

@@ -13,32 +13,23 @@
 
 using HandBrakeWPF.Services.Scan.Model;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
 
 /// <summary>
 /// The Static Preview View Model Interface
 /// </summary>
 public interface IStaticPreviewViewModel
 {
- /// <summary>
- /// The preview frame.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- /// <param name="scannedSource">
- /// The scanned Source.
- /// </param>
- void UpdatePreviewFrame(EncodeTask task, Source scannedSource);
-
- /// <summary>
- /// Gets or sets a value indicating whether is open.
- /// </summary>
 bool IsOpen { get; set; }
 
 BitmapSource PreviewImage { get; }
 
+ void UpdatePreviewFrame(EncodeTask task, Source scannedSource);
+
 void PreviousPreview();
+
 void NextPreview();
+
+ void SetPictureSettingsInstance(IPictureSettingsViewModel pictureSettingsViewModel);
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesDefaultsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesDefaultsViewModel.cs Changed

@@ -13,33 +13,18 @@
 using HandBrakeWPF.Services.Presets.Model;
 
 /// <summary>
- /// The Subtiles View Model Interface
+ /// The Subtitles View Model Interface
 /// </summary>
 public interface ISubtitlesDefaultsViewModel : IViewModelBase
 {
- /// <summary>
- /// Gets the subtitle behaviours.
- /// </summary>
 SubtitleBehaviours SubtitleBehaviours { get; }
 
 bool IsApplied { get; }
 
- /// <summary>
- /// The setup languages.
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
- void SetupLanguages(Preset preset);
+ void SetupPreset(Preset preset);
 
- /// <summary>
- /// The setup languages.
- /// </summary>
- /// <param name="behaviours">
- /// The behaviours.
- /// </param>
- void SetupLanguages(SubtitleBehaviours behaviours);
+ void SetupPreset(SubtitleBehaviours behaviour);
 
- void ResetApplied();
+ bool ShowWindow();
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/Interfaces/ISubtitlesViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/LogViewModel.cs Changed

@@ -10,60 +10,79 @@
 namespace HandBrakeWPF.ViewModels
 {
 using System;
+ using System.ComponentModel;
 using System.Diagnostics;
+ using System.IO;
+ using System.Linq;
 using System.Text;
- using System.Windows;
+ using System.Threading;
+ using System.Threading.Tasks;
 
 using Caliburn.Micro;
 
- using HandBrake.Worker.Logging.Models;
-
+ using HandBrakeWPF.Model.Logging;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Logging.EventArgs;
+ using HandBrakeWPF.Services.Logging.Interfaces;
+ using HandBrakeWPF.Services.Logging.Model;
+ using HandBrakeWPF.Services.Queue.Interfaces;
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
- using LogEventArgs = HandBrakeWPF.Services.Logging.EventArgs.LogEventArgs;
- using LogService = HandBrakeWPF.Services.Logging.LogService;
+ using Clipboard = System.Windows.Clipboard;
+ using ILog = Services.Logging.Interfaces.ILog;
+ using LogEventArgs = Services.Logging.EventArgs.LogEventArgs;
 
- /// <summary>
- /// The Log View Model
- /// </summary>
 public class LogViewModel : ViewModelBase, ILogViewModel
 {
 private readonly IErrorService errorService;
+ private readonly ILogInstanceManager logInstanceManager;
+ private readonly IQueueService queueService;
+ private readonly object readLockObject = new object();
 
- private readonly ILog logService;
+ private ILog logService;
 private StringBuilder log = new StringBuilder();
 private long lastReadIndex;
+ private LogFile selectedLogFile;
+ private readonly object lockObject = new object();
 
- public LogViewModel(IErrorService errorService, ILog logService)
+ public LogViewModel(IErrorService errorService, ILogInstanceManager logInstanceManager, IQueueService queueService)
 {
 this.errorService = errorService;
- this.logService = logService;
+ this.logInstanceManager = logInstanceManager;
+ this.queueService = queueService;
 this.Title = Resources.LogViewModel_Title;
 }
 
- /// <summary>
- /// Gets Log.
- /// </summary>
- public string ActivityLog
+ public event EventHandler<LogEventArgs> LogMessageReceived;
+
+ public event EventHandler LogResetEvent;
+
+ public string ActivityLog => this.log.ToString();
+
+ public BindingList<LogFile> LogFiles { get; private set; }
+
+ public LogFile SelectedLogFile
 {
- get
+ get => this.selectedLogFile;
+ set
 {
- return this.log.ToString();
+ if (Equals(value, this.selectedLogFile))
+ {
+ return;
+ }
+ 
+ this.selectedLogFile = value;
+ this.NotifyOfPropertyChange(() => this.SelectedLogFile);
+
+ if (value != null)
+ {
+ this.ChangeLogFileView();
+ }
 }
 }
 
- /// <summary>
- /// The log message received.
- /// </summary>
- public event EventHandler<LogEventArgs> LogMessageReceived;
- 
- /// <summary>
- /// Open the Log file directory
- /// </summary>
 public void OpenLogDirectory()
 {
 string logDir = DirectoryUtilities.GetLogDirectory();
@@ -72,9 +91,6 @@
 prc.Start();
 }
 
- /// <summary>
- /// Copy the log file to the system clipboard
- /// </summary>
 public void CopyLog()
 {
 try
@@ -87,71 +103,108 @@
 }
 }
 
- /// <summary>
- /// Handle the OnActivate Caliburn Event
- /// </summary>
- protected override void OnActivate()
+ protected override Task OnActivateAsync(CancellationToken cancellationToken)
 {
- this.logService.MessageLogged += this.LogService_MessageLogged;
- this.logService.LogReset += LogService_LogReset;
+ this.logInstanceManager.LogInstancesChanged += this.LogInstanceManager_NewLogInstanceRegistered;
 
- // Refresh the Log Display
- this.log.Clear();
- foreach (LogMessage logMessage in this.logService.GetLogMessages())
- {
- this.log.AppendLine(logMessage.Content);
- this.lastReadIndex = logMessage.MessageIndex;
+ this.CollectLogFiles(null);
 
- if (this.lastReadIndex > logMessage.MessageIndex)
- {
- throw new Exception("Log Message Index Error");
- }
+ return base.OnActivateAsync(cancellationToken);
+ }
+ protected override Task OnDeactivateAsync(bool close, CancellationToken cancellationToken)
+ {
+ if (this.logService != null)
+ {
+ this.logService.MessageLogged -= this.LogService_MessageLogged;
+ this.logService.LogReset -= this.LogService_LogReset;
 }
 
- this.OnLogMessageReceived(null);
- this.NotifyOfPropertyChange(() => this.ActivityLog);
+ this.SelectedLogFile = null;
+ this.logInstanceManager.LogInstancesChanged -= this.LogInstanceManager_NewLogInstanceRegistered;
 
- base.OnActivate();
+ return base.OnDeactivateAsync(close, cancellationToken);
+ }
+
+ protected virtual void OnLogResetEvent()
+ {
+ this.LogResetEvent?.Invoke(this, EventArgs.Empty);
 }
 
- /// <summary>
- /// Trigger a faster / smoother way of updating the log window.
- /// </summary>
- /// <param name="e">
- /// The e.
- /// </param>
 protected virtual void OnLogMessageReceived(LogEventArgs e)
 {
 var onLogMessageReceived = this.LogMessageReceived;
- if (onLogMessageReceived != null)
- {
- onLogMessageReceived.Invoke(this, e);
- }
+ onLogMessageReceived?.Invoke(this, e);
 }
 
- /// <summary>
- /// Handle the OnDeactivate Caliburn Event
- /// </summary>
- /// <param name="close">
- /// The close.
- /// </param>
- protected override void OnDeactivate(bool close)
+ private void ChangeLogFileView()
 {
- this.logService.MessageLogged -= this.LogService_MessageLogged;
- this.logService.LogReset -= this.LogService_LogReset;
+ if (this.logService != null)
+ {
+ this.logService.MessageLogged -= this.LogService_MessageLogged;
+ this.logService.LogReset -= this.LogService_LogReset;
+ }
 
- base.OnDeactivate(close);
+ if (this.SelectedLogFile == null)
+ {
+ return;
+ }
+
+ this.logService = this.logInstanceManager.GetLogInstance(this.SelectedLogFile.LogFileName);
+ string logDir = DirectoryUtilities.GetLogDirectory();
+ string logFile = Path.Combine(logDir, this.selectedLogFile.LogFileName);
+
+ // This is not an active log, so read from disk.
+ if (this.logService == null)
+ {
+ try
+ {
+ if (File.Exists(logFile))
+ {
+ this.log.Clear();
+ using (StreamReader logReader = new StreamReader(logFile))
+ {
+ string logContent = logReader.ReadToEnd();
+ this.log.AppendLine(logContent);
+ }
+ } 
+ else
+ {
+ this.log.Clear();
+ this.log.AppendLine("Sorry, The log file was not found.");
+ }
+ }
+ catch (Exception exc)
+ {
+ Debug.WriteLine(exc);
+ this.log.AppendLine(exc.ToString());
+ }
+
+ this.OnLogResetEvent();
+ }
+
+ // Active in-progress log, read from the log service.
+ if (this.logService != null)
+ {
+ this.logService.MessageLogged += this.LogService_MessageLogged;
+ this.logService.LogReset += LogService_LogReset;
+
+ // Refresh the Log Display
+ this.log.Clear();
+ foreach (LogMessage logMessage in this.logService.GetLogMessages())
+ {
+ this.log.AppendLine(logMessage.Content);
+ this.lastReadIndex = logMessage.MessageIndex;
+
+ if (this.lastReadIndex > logMessage.MessageIndex)
+ {
+ throw new Exception("Log Message Index Error");
+ }
+ }
+
+ this.OnLogResetEvent();
+ }
 }
 
- /// <summary>
- /// The log service_ log reset.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void LogService_LogReset(object sender, EventArgs e)
 {
 this.log.Clear();
@@ -168,31 +221,61 @@
 }
 }
 
- this.NotifyOfPropertyChange(() => this.ActivityLog);
- this.OnLogMessageReceived(null);
+ this.OnLogResetEvent();
 }
 
- /// <summary>
- /// The log service_ message logged.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void LogService_MessageLogged(object sender, LogEventArgs e)
 {
 if (this.lastReadIndex < e.Log.MessageIndex)
 {
- Execute.OnUIThreadAsync(() =>
+ Execute.BeginOnUIThread(() =>
 {
 this.lastReadIndex = e.Log.MessageIndex;
 this.log.AppendLine(e.Log.Content);
 this.OnLogMessageReceived(e);
- this.NotifyOfPropertyChange(() => this.ActivityLog);
 });
 }
 }
+
+ private void LogInstanceManager_NewLogInstanceRegistered(object sender, LogFileEventArgs e)
+ {
+ this.CollectLogFiles(e.FileName);
+ }
+ 
+ private void CollectLogFiles(string filename)
+ {
+ lock (readLockObject)
+ {
+ BindingList<string> activeLogs = new BindingList<string>(this.logInstanceManager.GetLogFiles());
+ BindingList<LogFile> logfiles = new BindingList<LogFile>();
+
+ // Add Inactive Logs First.
+ foreach (string logFile in this.queueService.GetLogFilePaths())
+ {
+ logfiles.Add(new LogFile(Path.GetFileName(logFile), true));
+ }
+
+ // Add active logs second.
+ foreach (var log in activeLogs)
+ {
+ logfiles.Add(new LogFile(log, false));
+ }
+
+ this.LogFiles = logfiles;
+ this.NotifyOfPropertyChange(() => this.LogFiles);
+
+
+ if (!string.IsNullOrEmpty(filename))
+ {
+ this.SelectedLogFile = this.LogFiles.FirstOrDefault(c => c.LogFileName.Equals(filename, StringComparison.InvariantCultureIgnoreCase));
+ }
+ else
+ {
+ this.SelectedLogFile = this.LogFiles.LastOrDefault(c => !c.LogFileName.Contains("activity_log_main"));
+ }
+
+ this.SelectedLogFile ??= this.LogFiles.LastOrDefault();
+ }
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs Changed

@@ -16,8 +16,11 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+ using System.Text.Json;
 using System.Threading;
+ using System.Threading.Tasks;
 using System.Windows;
+ using System.Windows.Controls;
 using System.Windows.Input;
 
 using Caliburn.Micro;
@@ -35,7 +38,6 @@
 using HandBrakeWPF.Model.Options;
 using HandBrakeWPF.Model.Subtitles;
 using HandBrakeWPF.Properties;
- using HandBrakeWPF.Services.Encode.EventArgs;
 using HandBrakeWPF.Services.Encode.Model;
 using HandBrakeWPF.Services.Encode.Model.Models;
 using HandBrakeWPF.Services.Interfaces;
@@ -58,27 +60,25 @@
 using DataFormats = System.Windows.DataFormats;
 using DragEventArgs = System.Windows.DragEventArgs;
 using Execute = Caliburn.Micro.Execute;
- using HandBrakeInstanceManager = Instance.HandBrakeInstanceManager;
- using LogManager = Helpers.LogManager;
+ using ILog = Services.Logging.Interfaces.ILog;
 using OpenFileDialog = Microsoft.Win32.OpenFileDialog;
 using SaveFileDialog = Microsoft.Win32.SaveFileDialog;
 
- /// <summary>
- /// HandBrakes Main Window
- /// </summary>
 public class MainViewModel : ViewModelBase, IMainViewModel
 {
- #region Private Variables and Services
-
 private readonly IQueueService queueProcessor;
 private readonly IPresetService presetService;
 private readonly IErrorService errorService;
 private readonly IUpdateService updateService;
 private readonly IWindowManager windowManager;
 private readonly INotifyIconService notifyIconService;
+ private readonly ILog logService;
+ private readonly INotificationService notificationService;
 private readonly IUserSettingService userSettingService;
 private readonly IScan scanService;
- private readonly Win7 windowsSeven = new Win7();
+ private readonly WindowsTaskbar windowsTaskbar = new WindowsTaskbar();
+ private readonly DelayedActionProcessor delayedPreviewprocessor = new DelayedActionProcessor();
+
 private string windowName;
 private string sourceLabel;
 private string statusLabel;
@@ -86,31 +86,21 @@
 private Source scannedSource;
 private Title selectedTitle;
 private string duration;
- private bool isEncoding;
 private bool showStatusWindow;
 private Preset selectedPreset;
 private QueueTask queueEditTask;
 private int lastEncodePercentage;
- private bool isPresetPanelShowing;
 private bool showSourceSelection;
 private BindingList<SourceMenuItem> drives;
- private bool canPause;
 private bool showAlertWindow;
 private string alertWindowHeader;
 private string alertWindowText;
 private bool hasSource;
 private bool isSettingPreset;
- private IPresetObject selectedPresetCategory;
 private bool isModifiedPreset;
 private bool updateAvailable;
+ private bool isNavigationEnabled;
 
- #endregion
-
- /// <summary>
- /// Initializes a new instance of the <see cref="MainViewModel"/> class.
- /// The viewmodel for HandBrakes main window.
- /// </summary>
- /// <remarks>whenDoneService must be a serivce here!</remarks>
 public MainViewModel(
 IUserSettingService userSettingService,
 IScan scanService,
@@ -129,8 +119,11 @@
 IStaticPreviewViewModel staticPreviewViewModel,
 IQueueViewModel queueViewModel,
 IMetaDataViewModel metaDataViewModel,
+ IPresetManagerViewModel presetManagerViewModel,
 INotifyIconService notifyIconService,
- ISystemService systemService)
+ ISystemService systemService,
+ ILog logService,
+ INotificationService notificationService)
 : base(userSettingService)
 {
 this.scanService = scanService;
@@ -139,6 +132,8 @@
 this.updateService = updateService;
 this.windowManager = windowManager;
 this.notifyIconService = notifyIconService;
+ this.logService = logService;
+ this.notificationService = notificationService;
 this.QueueViewModel = queueViewModel;
 this.userSettingService = userSettingService;
 this.queueProcessor = IoC.Get<IQueueService>();
@@ -152,12 +147,14 @@
 this.SubtitleViewModel = subtitlesViewModel;
 this.ChaptersViewModel = chaptersViewModel;
 this.StaticPreviewViewModel = staticPreviewViewModel;
+ this.PresetManagerViewModel = presetManagerViewModel;
 
 // Setup Properties
 this.WindowTitle = Resources.HandBrake_Title;
 this.CurrentTask = new EncodeTask();
 this.ScannedSource = new Source();
 this.HasSource = false;
+ this.IsNavigationEnabled = true;
 
 // Setup Events
 this.scanService.ScanStarted += this.ScanStared;
@@ -167,7 +164,7 @@
 this.queueProcessor.QueueCompleted += this.QueueCompleted;
 this.queueProcessor.QueueChanged += this.QueueChanged;
 this.queueProcessor.QueuePaused += this.QueueProcessor_QueuePaused;
- this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeStatusChanged;
+ this.queueProcessor.QueueJobStatusChanged += this.QueueProcessor_QueueJobStatusChanged;
 this.userSettingService.SettingChanged += this.UserSettingServiceSettingChanged;
 
 this.PresetsCategories = new BindingList<IPresetObject>();
@@ -200,31 +197,39 @@
 systemService.Start();
 }
 
- #region View Model Properties
+
+ /* View Model Properties */
 
 public IPictureSettingsViewModel PictureSettingsViewModel { get; set; }
+
 public IAudioViewModel AudioViewModel { get; set; }
+
 public ISubtitlesViewModel SubtitleViewModel { get; set; }
+
 public IChaptersViewModel ChaptersViewModel { get; set; }
+
 public IVideoViewModel VideoViewModel { get; set; }
+
 public IFiltersViewModel FiltersViewModel { get; set; }
+
 public IQueueViewModel QueueViewModel { get; set; }
+
 public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }
+
 public IMetaDataViewModel MetaDataViewModel { get; set; }
+
 public ISummaryViewModel SummaryViewModel { get; set; }
 
+ public IPresetManagerViewModel PresetManagerViewModel { get; set; }
+
 public int SelectedTab { get; set; }
 
- #endregion
 
- #region Properties
+ /* Properties */
 
 public string WindowTitle
 {
- get
- {
- return this.windowName;
- }
+ get => this.windowName;
 
 set
 {
@@ -236,16 +241,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the Program Status Toolbar Label
- /// This indicates the status of HandBrake
- /// </summary>
 public string ProgramStatusLabel
 {
- get
- {
- return string.IsNullOrEmpty(this.programStatusLabel) ? Resources.State_Ready : this.programStatusLabel;
- }
+ get => string.IsNullOrEmpty(this.programStatusLabel) ? Resources.State_Ready : this.programStatusLabel;
 
 set
 {
@@ -257,16 +255,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the Program Status Toolbar Label
- /// This indicates the status of HandBrake
- /// </summary>
 public string StatusLabel
 {
- get
- {
- return string.IsNullOrEmpty(this.statusLabel) ? Resources.State_Ready : this.statusLabel;
- }
+ get => string.IsNullOrEmpty(this.statusLabel) ? Resources.State_Ready : this.statusLabel;
 
 set
 {
@@ -282,60 +273,27 @@
 
 public IEnumerable<IPresetObject> PresetsCategories { get; set; }
 
- public IPresetObject SelectedPresetCategory
- {
- get
- {
- return this.selectedPresetCategory;
- }
- set
- {
- if (!object.Equals(this.selectedPresetCategory, value))
- {
- this.selectedPresetCategory = value;
- this.NotifyOfPropertyChange(() => this.SelectedPresetCategory);
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
- }
- }
- }
-
- public IEnumerable<Preset> CategoryPresets
- {
- get
- {
- PresetDisplayCategory category = this.SelectedPresetCategory as PresetDisplayCategory;
- if (category != null && category.Presets != null)
- {
- if (!category.Presets.Contains(this.SelectedPreset))
- {
- this.SelectedPreset = category.Presets.FirstOrDefault();
- }
-
- return new BindingList<Preset>(category.Presets);
- }
-
- this.SelectedPreset = null;
- return new BindingList<Preset>();
- }
- }
-
 public Preset SelectedPreset
 {
- get
- {
- return this.selectedPreset;
- }
+ get => this.selectedPreset;
 
 set
 {
 if (!object.Equals(this.selectedPreset, value))
 {
- this.selectedPreset = value;
- this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ if (value == null)
+ {
+ this.errorService.ShowError("Null Preset", null, Environment.StackTrace.ToString());
+ }
 
 if (value != null)
 {
- this.PresetSelect(value);
+ bool result = this.PresetSelect(value);
+ if (result)
+ {
+ this.selectedPreset = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ }
 }
 }
 }
@@ -343,76 +301,39 @@
 
 public bool IsModifiedPreset
 {
- get
- {
- return this.isModifiedPreset;
- }
+ get => this.isModifiedPreset;
+
 set
 {
- if (value == this.isModifiedPreset) return;
+ if (value == this.isModifiedPreset)
+ {
+ return;
+ }
+
 this.isModifiedPreset = value;
 this.NotifyOfPropertyChange();
 }
 }
 
- /// <summary>
- /// Gets or sets The Current Encode Task that the user is building
- /// </summary>
 public EncodeTask CurrentTask { get; set; }
 
- /// <summary>
- /// Gets or sets the Last Scanned Source
- /// This object contains information about the scanned source.
- /// </summary>
 public Source ScannedSource
 {
- get
- {
- return this.scannedSource;
- }
+ get => this.scannedSource;
 
 set
 {
 this.scannedSource = value;
- this.NotifyOfPropertyChange(() => ScannedSource);
+ this.NotifyOfPropertyChange(() => this.ScannedSource);
+ this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);
 }
 }
 
- /// <summary>
- /// Gets or sets the title specific scan.
- /// </summary>
 public int TitleSpecificScan { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether the encode service supports pausing.
- /// </summary>
- public bool CanPause
- {
- get
- {
- return this.canPause;
- }
- set
- {
- if (value.Equals(this.canPause))
- {
- return;
- }
- this.canPause = value;
- this.NotifyOfPropertyChange(() => this.CanPause);
- }
- }
-
- /// <summary>
- /// Gets or sets the Source Label
- /// This indicates the status of scans.
- /// </summary>
 public string SourceLabel
 {
- get
- {
- return string.IsNullOrEmpty(this.sourceLabel) ? Resources.Main_SelectSource : this.sourceLabel;
- }
+ get => string.IsNullOrEmpty(this.sourceLabel) ? Resources.Main_SelectSource : this.sourceLabel;
 
 set
 {
@@ -424,83 +345,15 @@
 }
 }
 
- /// <summary>
- /// Gets SourceName.
- /// </summary>
- public string SourceName
- {
- get
- {
- // Sanity Check
- if (this.ScannedSource == null || this.ScannedSource.ScanPath == null || this.selectedTitle == null)
- {
- return string.Empty;
- }
-
- if (File.Exists(this.ScannedSource.ScanPath)) // Scan Path is a File.
- {
- return Path.GetFileNameWithoutExtension(this.ScannedSource.ScanPath);
- }
-
- if (Directory.Exists(this.ScannedSource.ScanPath)) // Scan Path is a folder.
- {
- // Check to see if it's a Drive. If yes, use the volume label.
- foreach (DriveInformation item in DriveUtilities.GetDrives())
- {
- if (item.RootDirectory.Contains(this.ScannedSource.ScanPath.Replace("\\\\", "\\")))
- {
- return item.VolumeLabel;
- }
- }
-
- // Otherwise, it may be a path of files.
- if (!string.IsNullOrEmpty(this.selectedTitle.SourceName) && File.Exists(this.selectedTitle.SourceName)) // Selected Title is a file
- {
- return Path.GetFileNameWithoutExtension(this.selectedTitle.SourceName);
- }
- else if (Directory.Exists(this.selectedTitle.SourceName)) // Selected Title is a structured source.
- {
- return Path.GetFileName(this.ScannedSource.ScanPath);
- }
- }
-
- return null;
- }
- }
-
- /// <summary>
- /// Gets RangeMode.
- /// </summary>
- public IEnumerable<PointToPointMode> RangeMode
- {
- get
- {
- return new List<PointToPointMode>
- {
- PointToPointMode.Chapters, PointToPointMode.Seconds, PointToPointMode.Frames
- };
- }
- }
+ public BindingList<PointToPointMode> RangeMode { get; } = new BindingList<PointToPointMode> { PointToPointMode.Chapters, PointToPointMode.Seconds, PointToPointMode.Frames };
 
- /// <summary>
- /// Gets a value indicating whether ShowTextEntryForPointToPointMode.
- /// </summary>
 public bool ShowTextEntryForPointToPointMode => this.SelectedPointToPoint != PointToPointMode.Chapters;
 
- /// <summary>
- /// Gets StartEndRangeItems.
- /// </summary>
 public IEnumerable<int> StartEndRangeItems
 {
- get
- {
- return this.SelectedTitle?.Chapters.Select(item => item.ChapterNumber).Select(dummy => dummy).ToList();
- }
+ get => this.SelectedTitle?.Chapters.Select(item => item.ChapterNumber).Select(dummy => dummy).ToList();
 }
 
- /// <summary>
- /// Gets Angles.
- /// </summary>
 public IEnumerable<int> Angles
 {
 get
@@ -515,19 +368,14 @@
 {
 items.Add(i);
 }
+
 return items;
 }
 }
 
- /// <summary>
- /// Gets or sets Duration.
- /// </summary>
 public string Duration
 {
- get
- {
- return string.IsNullOrEmpty(duration) ? "--:--:--" : duration;
- }
+ get => string.IsNullOrEmpty(duration) ? "--:--:--" : duration;
 set
 {
 duration = value;
@@ -535,57 +383,29 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether IsEncoding.
- /// </summary>
- public bool IsEncoding
- {
- get
- {
- return this.isEncoding;
- }
-
- set
- {
- this.isEncoding = value;
- this.CanPause = value;
- this.NotifyOfPropertyChange(() => this.IsEncoding);
- }
- }
+ public bool IsEncoding => this.queueProcessor.IsEncoding;
 
- /// <summary>
- /// Gets or sets a value indicating whether ShowStatusWindow.
- /// </summary>
 public bool ShowStatusWindow
 {
- get
- {
- return this.showStatusWindow;
- }
+ get => this.showStatusWindow;
 
 set
 {
 this.showStatusWindow = value;
+ this.IsNavigationEnabled = !this.showStatusWindow;
 this.NotifyOfPropertyChange(() => this.ShowStatusWindow);
 }
 }
 
- /// <summary>
- /// Gets RangeMode.
- /// </summary>
 public IEnumerable<OutputFormat> OutputFormats => new List<OutputFormat> { OutputFormat.Mp4, OutputFormat.Mkv, OutputFormat.WebM };
 
- /// <summary>
- /// Gets or sets Destination.
- /// </summary>
 public string Destination
 {
- get
- {
- return this.CurrentTask.Destination;
- }
+ get => this.CurrentTask.Destination;
 set
 {
+ value = value?.Replace("\"", string.Empty);
+
 if (!Equals(this.CurrentTask.Destination, value))
 {
 if (!string.IsNullOrEmpty(value))
@@ -639,15 +459,10 @@
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedTitle.
- /// </summary>
 public Title SelectedTitle
 {
- get
- {
- return this.selectedTitle;
- }
+ get => this.selectedTitle;
+
 set
 {
 if (!Equals(this.selectedTitle, value))
@@ -660,7 +475,7 @@
 }
 
 // Use the Path on the Title, or the Source Scan path if one doesn't exist.
- this.SourceLabel = this.SourceName;
+ this.SourceLabel = this.ScannedSource?.SourceName ?? this.SelectedTitle?.DisplaySourceName;
 this.CurrentTask.Source = !string.IsNullOrEmpty(this.selectedTitle.SourceName) ? this.selectedTitle.SourceName : this.ScannedSource.ScanPath;
 this.CurrentTask.Title = value.TitleNumber;
 this.NotifyOfPropertyChange(() => this.StartEndRangeItems);
@@ -682,7 +497,7 @@
 {
 if (this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null)
 {
- this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName, this.selectedPreset);
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SelectedTitle?.DisplaySourceName, this.ScannedSource?.SourceName, this.selectedPreset);
 }
 }
 
@@ -696,15 +511,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedAngle.
- /// </summary>
 public int SelectedAngle
 {
- get
- {
- return this.CurrentTask.Angle;
- }
+ get => this.CurrentTask.Angle;
 
 set
 {
@@ -713,20 +522,11 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether is timespan range.
- /// </summary>
 public bool IsTimespanRange { get; set; }
 
- /// <summary>
- /// Gets or sets SelectedStartPoint.
- /// </summary>
 public long SelectedStartPoint
 {
- get
- {
- return this.CurrentTask.StartPoint;
- }
+ get => this.CurrentTask.StartPoint;
 
 set
 {
@@ -739,7 +539,7 @@
 if (this.SelectedPointToPoint == PointToPointMode.Chapters && this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null &&
 this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat).Contains(Constants.Chapters))
 {
- this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName, this.selectedPreset);
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SelectedTitle?.DisplaySourceName, this.ScannedSource?.SourceName, this.selectedPreset);
 }
 }
 
@@ -750,15 +550,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedEndPoint.
- /// </summary>
 public long SelectedEndPoint
 {
- get
- {
- return this.CurrentTask.EndPoint;
- }
+ get => this.CurrentTask.EndPoint;
 
 set
 {
@@ -769,7 +563,7 @@
 if (this.SelectedPointToPoint == PointToPointMode.Chapters && this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat) != null &&
 this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat).Contains(Constants.Chapters))
 {
- this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SourceName, this.selectedPreset);
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SelectedTitle?.DisplaySourceName, this.ScannedSource?.SourceName, this.selectedPreset);
 }
 
 if (this.SelectedStartPoint > this.SelectedEndPoint && this.SelectedPointToPoint == PointToPointMode.Chapters)
@@ -779,15 +573,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedPointToPoint.
- /// </summary>
 public PointToPointMode SelectedPointToPoint
 {
- get
- {
- return this.CurrentTask.PointToPointMode;
- }
+ get => this.CurrentTask.PointToPointMode;
 set
 {
 this.CurrentTask.PointToPointMode = value;
@@ -845,45 +633,11 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether is preset panel showing.
- /// </summary>
- public bool IsPresetPanelShowing
- {
- get
- {
- return this.isPresetPanelShowing;
- }
- set
- {
- if (!Equals(this.isPresetPanelShowing, value))
- {
- this.isPresetPanelShowing = value;
- this.NotifyOfPropertyChange(() => this.IsPresetPanelShowing);
-
- // Save the setting if it has changed.
- if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPresetPanel) != value)
- {
- this.userSettingService.SetUserSetting(UserSettingConstants.ShowPresetPanel, value);
- }
- }
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating progress percentage.
- /// </summary>
 public int ProgressPercentage { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether show source selection.
- /// </summary>
 public bool ShowSourceSelection
 {
- get
- {
- return this.showSourceSelection;
- }
+ get => this.showSourceSelection;
 set
 {
 if (value.Equals(this.showSourceSelection))
@@ -893,6 +647,8 @@
 this.showSourceSelection = value;
 this.NotifyOfPropertyChange(() => this.ShowSourceSelection);
 
+ this.IsNavigationEnabled = !showSourceSelection;
+
 // Refresh the drives.
 if (this.showSourceSelection)
 {
@@ -916,15 +672,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the drives.
- /// </summary>
 public BindingList<SourceMenuItem> Drives
 {
- get
- {
- return this.drives;
- }
+ get => this.drives;
 set
 {
 if (Equals(value, this.drives))
@@ -937,25 +687,13 @@
 }
 }
 
- /// <summary>
- /// Gets the cancel action.
- /// </summary>
 public Action CancelAction => this.CancelScan;
 
- /// <summary>
- /// Action for the status window.
- /// </summary>
 public Action OpenLogWindowAction => this.OpenLogWindow;
 
- /// <summary>
- /// Gets or sets a value indicating whether show alert window.
- /// </summary>
 public bool ShowAlertWindow
 {
- get
- {
- return this.showAlertWindow;
- }
+ get => this.showAlertWindow;
 set
 {
 if (value.Equals(this.showAlertWindow))
@@ -963,68 +701,54 @@
 return;
 }
 this.showAlertWindow = value;
+ this.IsNavigationEnabled = !this.showAlertWindow;
 this.NotifyOfPropertyChange(() => this.ShowAlertWindow);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether alert window header.
- /// </summary>
 public string AlertWindowHeader
 {
- get
- {
- return this.alertWindowHeader;
- }
+ get => this.alertWindowHeader;
 set
 {
 if (value == this.alertWindowHeader)
 {
 return;
 }
+
 this.alertWindowHeader = value;
 this.NotifyOfPropertyChange(() => this.AlertWindowHeader);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether alert window text.
- /// </summary>
 public string AlertWindowText
 {
- get
- {
- return this.alertWindowText;
- }
+ get => this.alertWindowText;
 set
 {
 if (value == this.alertWindowText)
 {
 return;
 }
+
 this.alertWindowText = value;
 this.NotifyOfPropertyChange(() => this.AlertWindowText);
 }
 }
 
- /// <summary>
- /// Gets the alert window close.
- /// </summary>
 public Action AlertWindowClose => this.CloseAlertWindow;
 
- /// <summary>
- /// Gets the add to queue label.
- /// </summary>
- public string QueueLabel => string.Format(Resources.Main_QueueLabel, this.queueProcessor.Count > 0 ? string.Format(" ({0})", this.queueProcessor.Count) : string.Empty);
-
- /// <summary>
- /// Gets the start label.
- /// </summary>
+ public int QueueCount => this.queueProcessor.Count;
+
+ public bool IsQueueCountVisible => this.queueProcessor.Count > 0;
+
+ public string QueueLabel => string.Format(Resources.Main_QueueLabel, string.Empty);
+
 public string StartLabel
 {
 get
 {
- if (this.queueProcessor.EncodeService.IsPasued)
+ if (this.queueProcessor.IsPaused)
 {
 return Resources.Main_ResumeEncode;
 }
@@ -1033,15 +757,21 @@
 } 
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether has source.
- /// </summary>
- public bool HasSource
+ public bool IsNavigationEnabled
 {
- get
+ get => this.isNavigationEnabled;
+ set
 {
- return this.hasSource;
+ if (value == this.isNavigationEnabled) return;
+ this.isNavigationEnabled = value;
+ this.NotifyOfPropertyChange(() => this.IsNavigationEnabled);
+ this.NotifyOfPropertyChange(() => this.HasSource);
 }
+ }
+
+ public bool HasSource
+ {
+ get => this.hasSource && this.IsNavigationEnabled;
 
 set
 {
@@ -1055,13 +785,6 @@
 }
 }
 
- /// <summary>
- /// Flag to indicate if the queue is showing on the main view. (I.e inline queue display)
- /// </summary>
- public bool IsQueueShowingInLine { get; set; } = false;
-
- public bool IsUWP { get; } = UwpDetect.IsUWP();
-
 public string SourceInfo
 {
 get
@@ -1089,6 +812,7 @@
 }
 
 public bool ShowAddAllToQueue => this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddAllToQueue);
+
 public bool ShowAddSelectionToQueue => this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddSelectionToQueue);
 
 public string ShowAddAllMenuName =>
@@ -1102,36 +826,33 @@
 get => this.updateAvailable;
 set
 {
- if (value == this.updateAvailable) return;
+ if (value == this.updateAvailable)
+ {
+ return;
+ }
+
 this.updateAvailable = value;
 this.NotifyOfPropertyChange(() => this.UpdateAvailable);
 }
 }
 
- #endregion
+ public bool IsMultiProcess { get; set; }
 
- #region Commands 
+ public bool IsNightly => HandBrakeVersionHelper.IsNightly();
 
- /// <summary>
- /// Gets or sets the queue command.
- /// </summary>
- public ICommand QueueCommand { get; set; }
+ public bool IsPresetPaneDisplayed { get; set; }
 
- #endregion
+ /* Commands */
 
- #region Load and Shutdown Handling
+ public ICommand QueueCommand { get; set; }
 
- /// <summary>
- /// Initialise this view model.
- /// </summary>
+ /* Load and Shutdown Handling */
+ 
 public override void OnLoad()
 {
 // Perform an update check if required
 this.updateService.PerformStartupUpdateCheck(this.HandleUpdateCheckResults);
 
- // Show or Hide the Preset Panel.
- this.IsPresetPanelShowing = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPresetPanel);
-
 // Setup the presets.
 this.presetService.Load();
 this.PresetsCategories = this.presetService.Presets;
@@ -1158,7 +879,7 @@
 // If the user has enabled --auto-start-queue, start the queue.
 if (StartupOptions.AutoRestartQueue && !this.queueProcessor.IsProcessing && this.queueProcessor.Count > 0)
 {
- this.queueProcessor.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
+ this.queueProcessor.Start();
 }
 
 // Preset Selection
@@ -1173,7 +894,7 @@
 // Log Cleaning
 if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs))
 {
- Thread clearLog = new Thread(() => GeneralUtilities.ClearLogFiles(30));
+ Thread clearLog = new Thread(() => GeneralUtilities.ClearLogFiles(7));
 clearLog.Start();
 }
 
@@ -1187,22 +908,13 @@
 this.SummaryViewModel.TabStatusChanged += this.TabStatusChanged;
 }
 
- private void SummaryViewModel_OutputFormatChanged(object sender, OutputFormatChangedEventArgs e)
- {
- if (!string.IsNullOrEmpty(e.Extension))
- {
- this.Destination = Path.ChangeExtension(this.Destination, e.Extension);
- }
-
- this.VideoViewModel.RefreshTask();
- this.AudioViewModel.RefreshTask();
- this.SubtitleViewModel.RefreshTask();
- }
-
 public void Shutdown()
 {
+ // Notification Service
+ this.notificationService.Shutdown();
+
 // Shutdown Service
- this.queueProcessor.Stop();
+ this.queueProcessor.Stop(true);
 this.presetService.SaveCategoryStates();
 
 // Unsubscribe from Events.
@@ -1214,7 +926,6 @@
 this.queueProcessor.QueueChanged -= this.QueueChanged;
 
 this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
- this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeStatusChanged;
 this.userSettingService.SettingChanged -= this.UserSettingServiceSettingChanged;
 
 this.SummaryViewModel.OutputFormatChanged -= this.SummaryViewModel_OutputFormatChanged;
@@ -1230,31 +941,20 @@
 this.SummaryViewModel.TabStatusChanged -= this.TabStatusChanged;
 }
 
- #endregion
-
- #region Menu and Taskbar
+ /* Menu and Toolbar */
 
- /// <summary>
- /// Open the About Window
- /// </summary>
 public void OpenAboutApplication()
 {
 OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
 command.Execute(OptionsTab.About);
 }
 
- /// <summary>
- /// Open the Options Window
- /// </summary>
 public void OpenOptionsWindow()
 {
 OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
 command.Execute(null);
 }
 
- /// <summary>
- /// Open the Log Window
- /// </summary>
 public void OpenLogWindow()
 {
 Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(LogView));
@@ -1266,18 +966,12 @@
 else
 {
 ILogViewModel logvm = IoC.Get<ILogViewModel>();
- this.windowManager.ShowWindow(logvm);
+ this.windowManager.ShowWindowAsync(logvm);
 }
 }
 
- /// <summary>
- /// Open the Queue Window.
- /// </summary>
 public void OpenQueueWindow()
 {
- this.IsQueueShowingInLine = false;
- this.NotifyOfPropertyChange(() => this.IsQueueShowingInLine);
-
 Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueView));
 if (window != null)
 {
@@ -1290,20 +984,17 @@
 }
 else
 {
- this.windowManager.ShowWindow(IoC.Get<IQueueViewModel>());
+ this.windowManager.ShowWindowAsync(IoC.Get<IQueueViewModel>());
 }
 }
 
- /// <summary>
- /// Open the Queue Window.
- /// </summary>
 public void OpenPreviewWindow()
 {
 if (!string.IsNullOrEmpty(this.CurrentTask.Source) && !this.StaticPreviewViewModel.IsOpen)
 {
 this.StaticPreviewViewModel.IsOpen = true;
 this.StaticPreviewViewModel.UpdatePreviewFrame(this.CurrentTask, this.ScannedSource);
- this.windowManager.ShowWindow(this.StaticPreviewViewModel);
+ this.windowManager.ShowWindowAsync(this.StaticPreviewViewModel);
 }
 else if (this.StaticPreviewViewModel.IsOpen)
 {
@@ -1312,19 +1003,26 @@
 }
 }
 
- public void ShowPresetPane()
+ public void OpenPresetWindow()
 {
- this.IsPresetPanelShowing = !this.IsPresetPanelShowing;
+ if (!this.PresetManagerViewModel.IsOpen)
+ {
+ this.PresetManagerViewModel.IsOpen = true;
+ this.PresetManagerViewModel.SetupWindow(() => this.NotifyOfPropertyChange(() => this.PresetsCategories));
+ this.windowManager.ShowWindowAsync(this.PresetManagerViewModel);
+ }
+ else if (this.PresetManagerViewModel.IsOpen)
+ {
+ Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(PresetManagerView));
+ window?.Focus();
+ }
 }
-
- /// <summary>
- /// Launch the Help pages.
- /// </summary>
+ 
 public void LaunchHelp()
 {
 try
 {
- Process.Start("https://handbrake.fr/docs");
+ Process.Start("explorer.exe", "https://handbrake.fr/docs");
 }
 catch (Exception exc)
 {
@@ -1332,22 +1030,13 @@
 }
 }
 
- /// <summary>
- /// Check for Updates.
- /// </summary>
 public void CheckForUpdates()
 {
 OpenOptionsScreenCommand command = new OpenOptionsScreenCommand();
 command.Execute(OptionsTab.Updates);
 }
 
- /// <summary>
- /// Add the current task to the queue.
- /// </summary>
- /// <returns>
- /// True if added, false if error.
- /// </returns>
- public AddQueueError AddToQueue()
+ public AddQueueError AddToQueue(bool batch)
 {
 if (this.ScannedSource == null || string.IsNullOrEmpty(this.ScannedSource.ScanPath) || this.ScannedSource.Titles.Count == 0)
 {
@@ -1369,7 +1058,7 @@
 FileOverwriteBehaviour behaviour = (FileOverwriteBehaviour)this.userSettingService.GetUserSetting<int>(UserSettingConstants.FileOverwriteBehaviour);
 if (behaviour == FileOverwriteBehaviour.Ask)
 {
- MessageBoxResult result = this.errorService.ShowMessageBox(string.Format(Resources.Main_QueueOverwritePrompt, Path.GetFileName(this.CurrentTask.Destination)), Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ MessageBoxResult result = this.errorService.ShowMessageBox(string.Format(Resources.Main_QueueOverwritePrompt, Path.GetFileName(this.CurrentTask.Destination)), Resources.Question, MessageBoxButton.YesNo, MessageBoxImage.Warning);
 if (result == MessageBoxResult.No)
 {
 return null; // Handled by the above action.
@@ -1382,11 +1071,15 @@
 return new AddQueueError(Resources.Main_NoPermissionsOrMissingDirectory, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 }
 
- if (!DriveUtilities.HasMinimumDiskSpace(
+ if (!batch && !DriveUtilities.HasMinimumDiskSpace(
 this.Destination,
 this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
 {
- return new AddQueueError(Resources.Main_LowDiskspace, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_LowDiskspace, Resources.Warning, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ if (result == MessageBoxResult.No)
+ {
+ return null; // Handled by the above action.
+ }
 }
 
 // Sanity check the filename
@@ -1402,7 +1095,7 @@
 return new AddQueueError(Resources.Subtitles_WebmSubtitleIncompatibilityHeader, Resources.Main_PleaseFixSubtitleSettings, MessageBoxButton.OK, MessageBoxImage.Error);
 }
 
- QueueTask task = new QueueTask(new EncodeTask(this.CurrentTask), HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, this.SelectedPreset, this.IsModifiedPreset);
+ QueueTask task = new QueueTask(new EncodeTask(this.CurrentTask), HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, this.SelectedPreset, this.IsModifiedPreset, this.selectedTitle);
 
 if (!this.queueProcessor.CheckForDestinationPathDuplicates(task.Task.Destination))
 {
@@ -1423,16 +1116,13 @@
 
 public void AddToQueueWithErrorHandling()
 {
- var addError = this.AddToQueue();
+ var addError = this.AddToQueue(false);
 if (addError != null)
 {
 this.errorService.ShowMessageBox(addError.Message, addError.Header, addError.Buttons, addError.ErrorType);
 }
 }
 
- /// <summary>
- /// Add all Items to the queue
- /// </summary>
 public void AddAllToQueue()
 {
 if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
@@ -1447,28 +1137,19 @@
 return;
 }
 
- if (this.CurrentTask != null && this.CurrentTask.SubtitleTracks != null && this.CurrentTask.SubtitleTracks.Count > 0)
+ if (!DriveUtilities.HasMinimumDiskSpace(this.Destination, this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
 {
- if ((this.SubtitleViewModel.SubtitleBehaviours == null || this.SubtitleViewModel.SubtitleBehaviours.SelectedBehaviour == SubtitleBehaviourModes.None)
- && !(this.CurrentTask.SubtitleTracks.Count == 1 && this.CurrentTask.SubtitleTracks.First().SubtitleType == SubtitleType.ForeignAudioSearch))
+ MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_LowDiskspace, Resources.Warning, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ if (result == MessageBoxResult.No)
 {
- MessageBoxResult result = this.errorService.ShowMessageBox(
- Resources.Main_AutoAdd_AudioAndSubWarning,
- Resources.Warning,
- MessageBoxButton.YesNo,
- MessageBoxImage.Warning);
-
- if (result == MessageBoxResult.No)
- {
- return;
- }
+ return; // Handled by the above action.
 }
 }
 
 foreach (Title title in this.ScannedSource.Titles)
 {
 this.SelectedTitle = title;
- var addError = this.AddToQueue();
+ var addError = this.AddToQueue(true);
 if (addError != null)
 {
 MessageBoxResult result = this.errorService.ShowMessageBox(addError.Message + Environment.NewLine + Environment.NewLine + Resources.Main_ContinueAddingToQueue, addError.Header, MessageBoxButton.YesNo, addError.ErrorType);
@@ -1481,9 +1162,6 @@
 }
 }
 
- /// <summary>
- /// The add selection to queue.
- /// </summary>
 public void AddSelectionToQueue()
 {
 if (this.ScannedSource == null || this.ScannedSource.Titles == null || this.ScannedSource.Titles.Count == 0)
@@ -1498,26 +1176,52 @@
 return;
 }
 
- Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueSelectionViewModel));
- IQueueSelectionViewModel viewModel = IoC.Get<IQueueSelectionViewModel>();
-
- viewModel.Setup(this.ScannedSource, this.SourceName, (tasks) =>
+ if (!DriveUtilities.HasMinimumDiskSpace(this.Destination, this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
 {
- foreach (SelectionTitle title in tasks)
+ MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_LowDiskspace, Resources.Warning, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ if (result == MessageBoxResult.No)
 {
- this.SelectedTitle = title.Title;
- var addError = this.AddToQueue();
- if (addError != null)
- {
- MessageBoxResult result = this.errorService.ShowMessageBox(addError.Message + Environment.NewLine + Environment.NewLine + Resources.Main_ContinueAddingToQueue, addError.Header, MessageBoxButton.YesNo, addError.ErrorType);
+ return; // Handled by the above action.
+ }
+ }
+
+ // Always use the current settings when adding to the queue as best as possible.
+ Preset temporaryPreset = this.selectedPreset;
+ if (this.IsModifiedPreset)
+ {
+ temporaryPreset = new Preset(this.SelectedPreset);
+ temporaryPreset.Name = string.Format(
+ "{0} {1}",
+ temporaryPreset.Name,
+ Resources.MainView_ModifiedPreset);
+ temporaryPreset.Task = new EncodeTask(this.CurrentTask);
+ temporaryPreset.AudioTrackBehaviours = new AudioBehaviours(this.AudioViewModel.AudioBehaviours);
+ temporaryPreset.SubtitleTrackBehaviours = new SubtitleBehaviours(this.SubtitleViewModel.SubtitleBehaviours);
+ }
 
- if (result == MessageBoxResult.No)
+ Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(QueueSelectionViewModel));
+ IQueueSelectionViewModel viewModel = IoC.Get<IQueueSelectionViewModel>();
+
+ viewModel.Setup(
+ this.ScannedSource,
+ (tasks) =>
+ {
+ foreach (SelectionTitle title in tasks)
+ {
+ this.SelectedTitle = title.Title;
+ var addError = this.AddToQueue(true);
+ if (addError != null)
 {
- break;
+ MessageBoxResult result = this.errorService.ShowMessageBox(addError.Message + Environment.NewLine + Environment.NewLine + Resources.Main_ContinueAddingToQueue, addError.Header, MessageBoxButton.YesNo, addError.ErrorType);
+
+ if (result == MessageBoxResult.No)
+ {
+ break;
+ }
 }
 }
- }
- }, this.selectedPreset);
+ },
+ temporaryPreset);
 
 if (window != null)
 {
@@ -1525,13 +1229,10 @@
 }
 else
 {
- this.windowManager.ShowWindow(viewModel);
+ this.windowManager.ShowWindowAsync(viewModel);
 }
 }
 
- /// <summary>
- /// Folder Scan
- /// </summary>
 public void FolderScan()
 {
 VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = Resources.Main_PleaseSelectFolder, UseDescriptionForTitle = true };
@@ -1543,9 +1244,6 @@
 }
 }
 
- /// <summary>
- /// File Scan
- /// </summary>
 public void FileScan()
 {
 OpenFileDialog dialog = new OpenFileDialog { Filter = "All files (*.*)|*.*" };
@@ -1555,9 +1253,24 @@
 {
 dialog.InitialDirectory = mruDir;
 }
- 
- bool? dialogResult = dialog.ShowDialog();
 
+ bool? dialogResult = null;
+ try
+ {
+ dialogResult = dialog.ShowDialog();
+ }
+ catch (Exception e)
+ {
+ this.SetMru(Constants.FileScanMru, string.Empty); // RESET MRU in case it's the fault.
+ this.errorService.ShowMessageBox(
+ Resources.MainViewModel_FilePathSelectError,
+ Resources.Error,
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ this.logService.LogMessage("Attempted to recover from an error fro the File Scan FileDialog: " + e);
+ return;
+ }
+ 
 if (dialogResult.HasValue && dialogResult.Value)
 {
 this.SetMru(Constants.FileScanMru, Path.GetDirectoryName(dialog.FileName));
@@ -1566,35 +1279,25 @@
 }
 }
 
- /// <summary>
- /// Cancel a Scan
- /// </summary>
 public void CancelScan()
 {
 this.ShowStatusWindow = false;
 this.scanService.Cancel();
 }
 
- /// <summary>
- /// Start an Encode
- /// </summary>
 public void StartEncode()
 {
 if (this.queueProcessor.IsProcessing)
 {
- this.IsEncoding = true;
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
 return;
 }
 
 // Check if we already have jobs, and if we do, just start the queue.
- if (this.queueProcessor.Count != 0 || this.queueProcessor.EncodeService.IsPasued)
+ if (this.queueProcessor.Count != 0 || this.queueProcessor.IsPaused)
 {
- if (this.queueProcessor.EncodeService.IsPasued)
- {
- this.IsEncoding = true;
- }
-
- this.queueProcessor.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ this.queueProcessor.Start();
 return;
 }
 
@@ -1606,11 +1309,11 @@
 }
 
 // Create the Queue Task and Start Processing
- var addError = this.AddToQueue();
+ var addError = this.AddToQueue(false);
 if (addError == null)
 {
- this.IsEncoding = true;
- this.queueProcessor.Start(this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue)); 
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ this.queueProcessor.Start(); 
 }
 else
 {
@@ -1622,33 +1325,26 @@
 }
 }
 
- /// <summary>
- /// Edit a Queue Task
- /// </summary>
- /// <param name="queueTask">
- /// The task.
- /// </param>
 public void EditQueueJob(QueueTask queueTask)
 {
 // Rescan the source to make sure it's still valid
 EncodeTask task = queueTask.Task;
 
 this.queueEditTask = queueTask;
- this.scanService.Scan(task.Source, task.Title, QueueEditAction, HBConfigurationFactory.Create());
+ this.scanService.Scan(task.Source, task.Title, QueueEditAction);
 }
 
- /// <summary>
- /// Pause an Encode
- /// </summary>
 public void PauseEncode()
 {
- this.queueProcessor.PauseEncode();
- this.IsEncoding = false;
+ if (!this.queueProcessor.IsEncoding || this.queueProcessor.IsPaused)
+ {
+ return;
+ }
+
+ this.queueProcessor.Pause(true);
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
 }
 
- /// <summary>
- /// Stop an Encode.
- /// </summary>
 public void StopEncode()
 {
 MessageBoxResult result = this.errorService.ShowMessageBox(
@@ -1659,37 +1355,25 @@
 
 if (result == MessageBoxResult.Yes)
 {
- this.queueProcessor.Stop();
+ this.queueProcessor.Stop(true);
 }
 }
 
- /// <summary>
- /// Shutdown the Application
- /// </summary>
 public void ExitApplication()
 {
 Application.Current.Shutdown();
 }
 
- /// <summary>
- /// The select source window.
- /// </summary>
 public void SelectSourceWindow()
 {
 ShowSourceSelection = !ShowSourceSelection;
 }
 
- /// <summary>
- /// The close source selection.
- /// </summary>
 public void CloseSourceSelection()
 {
 this.ShowSourceSelection = false;
 }
 
- /// <summary>
- /// The close alert window.
- /// </summary>
 public void CloseAlertWindow()
 {
 this.ShowAlertWindow = false;
@@ -1697,25 +1381,70 @@
 this.AlertWindowHeader = string.Empty;
 }
 
- /// <summary>
- /// Pass on the "When Done" Action to the queue view model. 
- /// </summary>
- /// <param name="action">action</param>
 public void WhenDone(int action)
 {
 this.QueueViewModel?.WhenDone(action, true);
 }
 
- #endregion
+ public void ExportSourceData()
+ {
+ if (this.ScannedSource == null)
+ {
+ return; 
+ }
+
+ string json = JsonSerializer.Serialize(this.ScannedSource, JsonSettings.Options);
+
+ SaveFileDialog savefiledialog = new SaveFileDialog
+ {
+ Filter = "json|*.json",
+ CheckPathExists = true,
+ AddExtension = true,
+ DefaultExt = ".json",
+ OverwritePrompt = true,
+ FilterIndex = 0,
+ FileName = "debug.scan_output.json"
+ };
+
+ savefiledialog.ShowDialog();
+
+ if (!string.IsNullOrEmpty(savefiledialog.FileName))
+ {
+ using (StreamWriter writer = new StreamWriter(savefiledialog.FileName))
+ {
+ writer.Write(json);
+ }
+ }
+ }
+
+ public void ImportSourceData()
+ {
+ OpenFileDialog dialog = new OpenFileDialog { Filter = "Debug Files|*.json", CheckFileExists = true };
+ bool? dialogResult = dialog.ShowDialog();
+ if (dialogResult.HasValue && dialogResult.Value)
+ {
+ using (StreamReader reader = new StreamReader(dialog.FileName))
+ {
+ string json = reader.ReadToEnd();
+ if (!string.IsNullOrEmpty(json))
+ {
+ Source source = JsonSerializer.Deserialize<Source>(json, JsonSettings.Options);
+ this.ScannedSource = source;
+ this.HasSource = true;
+ this.SelectedTitle = this.ScannedSource.Titles.FirstOrDefault(t => t.MainTitle) ?? this.ScannedSource.Titles.FirstOrDefault();
+ }
+ }
+ }
+ }
+
+ public void TogglePresetPane()
+ {
+ this.IsPresetPaneDisplayed = !this.IsPresetPaneDisplayed;
+ this.NotifyOfPropertyChange(() => IsPresetPaneDisplayed);
+ }
 
- #region Main Window Public Methods
+ /* Main Window Public Methods*/
 
- /// <summary>
- /// Support dropping a file onto the main window to scan.
- /// </summary>
- /// <param name="e">
- /// The DragEventArgs.
- /// </param>
 public void FilesDroppedOnWindow(DragEventArgs e)
 {
 if (e.Data.GetDataPresent(DataFormats.FileDrop))
@@ -1759,9 +1488,6 @@
 this.NotifyOfPropertyChange(() => this.SelectedTab);
 }
 
- /// <summary>
- /// The Destination Path
- /// </summary>
 public void BrowseDestination()
 {
 SaveFileDialog saveFileDialog = new SaveFileDialog
@@ -1830,9 +1556,6 @@
 }
 }
 
- /// <summary>
- /// The open destination directory.
- /// </summary>
 public void OpenDestinationDirectory()
 {
 if (!string.IsNullOrEmpty(this.Destination))
@@ -1842,7 +1565,7 @@
 string directory = Path.GetDirectoryName(this.Destination);
 if (!string.IsNullOrEmpty(directory) && Directory.Exists(directory))
 {
- Process.Start(directory);
+ Process.Start("explorer.exe", directory);
 }
 else
 {
@@ -1855,7 +1578,7 @@
 if (result == MessageBoxResult.Yes)
 {
 Directory.CreateDirectory(directory);
- Process.Start(directory);
+ Process.Start("explorer.exe", directory);
 }
 }
 }
@@ -1866,22 +1589,19 @@
 }
 }
 
- /// <summary>
- /// Add a Preset
- /// </summary>
 public void PresetAdd()
 {
 IAddPresetViewModel presetViewModel = IoC.Get<IAddPresetViewModel>();
 presetViewModel.Setup(this.CurrentTask, this.SelectedTitle, this.AudioViewModel.AudioBehaviours, this.SubtitleViewModel.SubtitleBehaviours);
- this.windowManager.ShowDialog(presetViewModel);
+ Task<bool?> result = this.windowManager.ShowDialogAsync(presetViewModel);
 
- this.NotifyOfPropertyChange(() => this.PresetsCategories);
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
+ if (result.Result.HasValue && result.Result.Value)
+ {
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ this.SelectedPreset = this.presetService.GetPreset(presetViewModel.PresetName);
+ }
 }
 
- /// <summary>
- /// Update a selected preset.
- /// </summary>
 public void PresetUpdate()
 {
 if (this.SelectedPreset == null)
@@ -1899,7 +1619,7 @@
 return;
 }
 
- if (this.errorService.ShowMessageBox(Resources.Main_PresetUpdateConfrimation, Resources.AreYouSure, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
+ if (this.errorService.ShowMessageBox(Resources.Main_PresetUpdateConfirmation, Resources.AreYouSure, MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
 {
 this.selectedPreset.Update(new EncodeTask(this.CurrentTask), new AudioBehaviours(this.AudioViewModel.AudioBehaviours), new SubtitleBehaviours(this.SubtitleViewModel.SubtitleBehaviours));
 this.presetService.Update(this.selectedPreset);
@@ -1910,9 +1630,6 @@
 }
 }
 
- /// <summary>
- /// Manage the current Preset
- /// </summary>
 public void PresetManage()
 {
 if (this.SelectedPreset == null)
@@ -1923,31 +1640,27 @@
 return;
 }
 
- if (this.selectedPreset.IsBuildIn)
- {
- this.errorService.ShowMessageBox(
- Resources.Main_NoUpdateOfBuiltInPresets, Resources.Main_NoPresetSelected, MessageBoxButton.OK, MessageBoxImage.Warning);
- return;
- }
-
 IManagePresetViewModel presetViewModel = IoC.Get<IManagePresetViewModel>();
 presetViewModel.Setup(this.selectedPreset);
- this.windowManager.ShowDialog(presetViewModel);
+ this.windowManager.ShowDialogAsync(presetViewModel);
 Preset preset = presetViewModel.Preset;
 
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
 this.selectedPreset = preset; // Reselect the preset 
 this.NotifyOfPropertyChange(() => this.SelectedPreset);
 }
 
- /// <summary>
- /// Remove a Preset
- /// </summary>
 public void PresetRemove()
 {
- if (this.selectedPreset != null)
+ this.PresetRemove(this.SelectedPreset);
+ }
+
+ public void PresetRemove(object presetObj)
+ {
+ Preset preset = presetObj as Preset;
+ if (preset != null)
 {
- if (this.selectedPreset.IsDefault)
+ if (preset.IsDefault)
 {
 this.errorService.ShowMessageBox(
 Resources.MainViewModel_CanNotDeleteDefaultPreset, 
@@ -1960,7 +1673,7 @@
 
 MessageBoxResult result =
 this.errorService.ShowMessageBox(
- Resources.MainViewModel_PresetRemove_AreYouSure + this.selectedPreset.Name + " ?", 
+ Resources.MainViewModel_PresetRemove_AreYouSure + preset.Name + " ?", 
 Resources.Question, 
 MessageBoxButton.YesNo, 
 MessageBoxImage.Question);
@@ -1970,9 +1683,9 @@
 return;
 }
 
- this.presetService.Remove(this.selectedPreset);
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
- this.SelectedPreset = this.CategoryPresets.FirstOrDefault();
+ this.presetService.Remove(preset);
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ this.SelectedPreset = this.presetService.DefaultPreset;
 }
 else
 {
@@ -1980,9 +1693,6 @@
 }
 }
 
- /// <summary>
- /// Set a default preset
- /// </summary>
 public void PresetSetDefault()
 {
 if (this.selectedPreset != null)
@@ -1996,9 +1706,6 @@
 }
 }
 
- /// <summary>
- /// Import a Preset
- /// </summary>
 public void PresetImport()
 {
 OpenFileDialog dialog = new OpenFileDialog { Filter = "Preset Files|*.json;*.plist", CheckFileExists = true };
@@ -2006,13 +1713,10 @@
 if (dialogResult.HasValue && dialogResult.Value)
 {
 this.presetService.Import(dialog.FileName);
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
 }
 }
 
- /// <summary>
- /// Export a Preset
- /// </summary>
 public void PresetExport()
 {
 if (this.selectedPreset != null && !this.selectedPreset.IsBuildIn)
@@ -2041,40 +1745,60 @@
 }
 }
 
- /// <summary>
- /// Reset built-in presets
- /// </summary>
 public void PresetReset()
 {
 this.presetService.UpdateBuiltInPresets();
 
 this.NotifyOfPropertyChange(() => this.PresetsCategories);
- this.NotifyOfPropertyChange(() => this.CategoryPresets);
 
 this.SetDefaultPreset();
 
 this.errorService.ShowMessageBox(Resources.Presets_ResetComplete, Resources.Presets_ResetHeader, MessageBoxButton.OK, MessageBoxImage.Information);
 }
 
+ public void PresetDeleteBuildIn()
+ {
+ List<Preset> allPresets = this.presetService.FlatPresetList;
+ bool foundDefault = false;
+ foreach (Preset preset in allPresets)
+ {
+ if (preset.IsBuildIn)
+ {
+ if (preset.IsDefault)
+ {
+ foundDefault = true;
+ }
+
+ this.presetService.Remove(preset);
+ }
+ }
+
+ if (foundDefault)
+ {
+ Preset preset = this.presetService.FlatPresetList.FirstOrDefault();
+ if (preset != null)
+ {
+ this.presetService.SetDefault(preset);
+ this.SelectedPreset = preset;
+ }
+ }
+
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ }
+
 public void PresetSelect()
 {
 this.PresetSelect(this.SelectedPreset);
 }
 
- /// <summary>
- /// The preset select.
- /// </summary>
- /// <param name="tag">
- /// The tag.
- /// </param>
- public void PresetSelect(object tag)
+ public bool PresetSelect(object tag)
 {
 Preset preset = tag as Preset;
 if (preset != null)
 {
- if (this.SelectedPresetCategory == null || this.SelectedPresetCategory.Category != preset.Category)
+ if (preset.IsPresetDisabled)
 {
- this.SelectedPresetCategory = this.PresetsCategories.FirstOrDefault(c => c.Category == preset.Category);
+ return false;
 }
 
 this.selectedPreset = preset;
@@ -2098,34 +1822,22 @@
 this.SummaryViewModel.UpdateDisplayedInfo();
 
 this.isSettingPreset = false;
+ return true;
 }
 }
+
+ return false;
 }
 
- /// <summary>
- /// Start a Scan
- /// </summary>
- /// <param name="filename">
- /// The filename.
- /// </param>
- /// <param name="title">
- /// The title.
- /// </param>
 public void StartScan(string filename, int title)
 {
 if (!string.IsNullOrEmpty(filename))
 {
 ShowSourceSelection = false;
- this.scanService.Scan(filename, title, null, HBConfigurationFactory.Create());
+ this.scanService.Scan(filename, title, null);
 }
 }
 
- /// <summary>
- /// The process drive.
- /// </summary>
- /// <param name="item">
- /// The item.
- /// </param>
 public void ProcessDrive(object item)
 {
 if (item != null)
@@ -2164,27 +1876,30 @@
 {
 bool value = !this.ShowAddAllToQueue;
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddAllToQueue, value);
+
+ var optionsViewModel = IoC.Get<IOptionsViewModel>();
+ optionsViewModel.UpdateSettings();
 }
 
 public void FlipAddSelectionToQueue()
 {
 bool value = !this.ShowAddSelectionToQueue;
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddSelectionToQueue, value);
+
+ var optionsViewModel = IoC.Get<IOptionsViewModel>();
+ optionsViewModel.UpdateSettings();
 }
 
- #endregion
+ public void ReGenerateAutoName()
+ {
+ if (this.ScannedSource != null)
+ {
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SelectedTitle?.DisplaySourceName, this.ScannedSource?.SourceName, this.selectedPreset);
+ }
+ }
 
- #region Private Methods
+ /* Private Methods*/
 
- /// <summary>
- /// Update all the UI Components to allow the user to edit their previous settings.
- /// </summary>
- /// <param name="successful">
- /// The successful.
- /// </param>
- /// <param name="scannedSource">
- /// The scanned Source.
- /// </param>
 private void QueueEditAction(bool successful, Source scannedSource)
 {
 /* TODO Fix this. */
@@ -2201,9 +1916,7 @@
 }
 
 // Copy all the Scan data into the UI
- scannedSource.CopyTo(this.ScannedSource);
- this.NotifyOfPropertyChange(() => this.ScannedSource);
- this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);
+ this.ScannedSource = new Source(scannedSource);
 
 // Select the Users Title
 this.SelectedTitle = this.ScannedSource.Titles.FirstOrDefault();
@@ -2232,14 +1945,11 @@
 
 // Cleanup
 this.ShowStatusWindow = false;
- this.SourceLabel = this.SourceName;
+ this.SourceLabel = this.ScannedSource?.SourceName ?? this.SelectedTitle?.DisplaySourceName;
 this.StatusLabel = Resources.Main_ScanCompleted;
 });
 }
 
- /// <summary>
- /// Setup the UI tabs. Passes in any relevant models for setup.
- /// </summary>
 private void SetupTabs()
 {
 // Setup the Tabs
@@ -2265,6 +1975,13 @@
 return; // Don't process this when we are setting up.
 }
 
+ // Update Preview if needed
+ if (e != null && e.TabKey != null && e.TabKey.Equals(TabStatusEventType.FilterType) && this.StaticPreviewViewModel.IsOpen)
+ {
+ delayedPreviewprocessor.PerformTask(() => this.StaticPreviewViewModel.UpdatePreviewFrame(this.CurrentTask, this.ScannedSource), 1000);
+ }
+
+ // Preset Check
 bool matchesPreset = this.PictureSettingsViewModel.MatchesPreset(this.selectedPreset);
 
 if (!this.SummaryViewModel.MatchesPreset(this.selectedPreset))
@@ -2308,14 +2025,28 @@
 }
 
 this.IsModifiedPreset = !matchesPreset;
+
+ if (e != null)
+ {
+ this.TriggerAutonameChange(e.ChangedOption);
+ }
+ }
+
+ private void TriggerAutonameChange(ChangedOption option)
+ {
+ string autonameFormat = this.userSettingService.GetUserSetting<string>(UserSettingConstants.AutoNameFormat);
+
+ if (string.IsNullOrEmpty(autonameFormat))
+ {
+ return;
+ }
+
+ if (autonameFormat.Contains(Constants.QualityBitrate) && (option == ChangedOption.Bitrate || option == ChangedOption.Quality))
+ {
+ this.Destination = AutoNameHelper.AutoName(this.CurrentTask, this.SelectedTitle?.DisplaySourceName, this.ScannedSource?.SourceName, this.selectedPreset);
+ }
 }
 
- /// <summary>
- /// Calculate the duration between the end and start point
- /// </summary>
- /// <returns>
- /// The duration calculation.
- /// </returns>
 private string DurationCalculation()
 {
 if (this.selectedTitle == null)
@@ -2343,12 +2074,6 @@
 return "--:--:--";
 }
 
- /// <summary>
- /// Handle Update Check Results
- /// </summary>
- /// <param name="information">
- /// The information.
- /// </param>
 private void HandleUpdateCheckResults(UpdateCheckInformation information)
 {
 if (information.NewVersionAvailable)
@@ -2358,15 +2083,6 @@
 }
 }
 
- /// <summary>
- /// The open alert window.
- /// </summary>
- /// <param name="header">
- /// The header.
- /// </param>
- /// <param name="message">
- /// The message.
- /// </param>
 private void OpenAlertWindow(string header, string message)
 {
 this.ShowAlertWindow = true;
@@ -2383,50 +2099,25 @@
 (PresetDisplayCategory)this.PresetsCategories.FirstOrDefault(
 p => p.Category == this.presetService.DefaultPreset.Category);
 
- this.SelectedPresetCategory = category;
 this.SelectedPreset = this.presetService.DefaultPreset;
 }
 }
 
- #endregion
-
- #region Event Handlers
+ /* Event Handlers */
 
- /// <summary>
- /// Handle the Scan Status Changed Event.
- /// </summary>
- /// <param name="sender">
- /// The Sender
- /// </param>
- /// <param name="e">
- /// The EventArgs
- /// </param>
 private void ScanStatusChanged(object sender, ScanProgressEventArgs e)
 {
 this.SourceLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);
 this.StatusLabel = string.Format(Resources.Main_ScanningTitleXOfY, e.CurrentTitle, e.Titles, e.Percentage);
 }
 
- /// <summary>
- /// Handle the Scan Completed Event
- /// </summary>
- /// <param name="sender">
- /// The Sender
- /// </param>
- /// <param name="e">
- /// The EventArgs
- /// </param>
 private void ScanCompleted(object sender, ScanCompletedEventArgs e)
 {
 this.ShowStatusWindow = false;
 
 if (e.ScannedSource != null && !e.Cancelled)
 {
- if (this.ScannedSource == null)
- {
- this.ScannedSource = new Source();
- }
- e.ScannedSource.CopyTo(this.ScannedSource);
+ this.ScannedSource = new Source(e.ScannedSource);
 }
 else
 {
@@ -2449,7 +2140,7 @@
 
 if (e.Successful)
 {
- this.SourceLabel = this.SourceName;
+ this.SourceLabel = this.ScannedSource?.SourceName ?? this.SelectedTitle?.DisplaySourceName;
 this.StatusLabel = Resources.Main_ScanCompleted;
 }
 else if (e.Cancelled)
@@ -2459,21 +2150,12 @@
 }
 else
 {
- this.SourceLabel = Resources.Main_ScanFailled_CheckLog;
- this.StatusLabel = Resources.Main_ScanFailled_CheckLog;
+ this.SourceLabel = Resources.Main_ScanFailed_CheckLog;
+ this.StatusLabel = Resources.Main_ScanFailed_CheckLog;
 }
 });
 }
 
- /// <summary>
- /// Handle the Scan Started Event
- /// </summary>
- /// <param name="sender">
- /// The Sender
- /// </param>
- /// <param name="e">
- /// The EventArgs
- /// </param>
 private void ScanStared(object sender, EventArgs e)
 {
 Execute.OnUIThread(
@@ -2484,125 +2166,20 @@
 });
 }
 
- /// <summary>
- /// The Encode Status has changed Handler
- /// </summary>
- /// <param name="sender">
- /// The Sender
- /// </param>
- /// <param name="e">
- /// The Encode Progress Event Args
- /// </param>
- private void EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
- {
- int percent;
- int.TryParse(
- Math.Round(e.PercentComplete).ToString(CultureInfo.InvariantCulture), 
- out percent);
-
- Execute.OnUIThread(
- () =>
- {
- if (this.queueProcessor.EncodeService.IsEncoding)
- {
- string totalHrsLeft = e.EstimatedTimeLeft.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.EstimatedTimeLeft) : string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);
- string elapsedTimeHrs = e.ElapsedTime.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.ElapsedTime) : string.Format(@"{0:hh\:mm\:ss}", e.ElapsedTime);
- string jobsPending = string.Format(Resources.Main_JobsPending_addon, this.queueProcessor.Count);
-
- if (e.IsSubtitleScan)
- {
- this.ProgramStatusLabel = string.Format(
- Resources.MainViewModel_EncodeStatusChanged_SubScan_StatusLabel,
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- totalHrsLeft,
- elapsedTimeHrs,
- jobsPending);
- }
- else if (e.IsMuxing)
- {
- this.ProgramStatusLabel = Resources.MainView_Muxing;
- }
- else if (e.IsSearching)
- {
- this.ProgramStatusLabel = string.Format(Resources.MainView_ProgressStatusWithTask, Resources.MainView_Searching, e.PercentComplete, totalHrsLeft, jobsPending);
- }
- else
- {
- this.ProgramStatusLabel = string.Format(
- Resources.MainViewModel_EncodeStatusChanged_StatusLabel,
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- e.CurrentFrameRate,
- e.AverageFrameRate,
- totalHrsLeft,
- elapsedTimeHrs,
- jobsPending);
- }
-
- if (this.lastEncodePercentage != percent && this.windowsSeven.IsWindowsSeven)
- {
- this.windowsSeven.SetTaskBarProgress(percent);
- }
-
- this.lastEncodePercentage = percent;
- this.ProgressPercentage = percent;
- this.NotifyOfPropertyChange(() => this.ProgressPercentage);
-
- if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowStatusInTitleBar))
- {
- this.WindowTitle = string.Format(Resources.WindowTitleStatus, Resources.HandBrake_Title, this.ProgressPercentage, e.Task, e.TaskCount);
- this.notifyIconService.SetTooltip(string.Format(Resources.TaskTrayStatusTitle, Resources.HandBrake_Title, this.ProgressPercentage, e.Task, e.TaskCount, e.EstimatedTimeLeft));
- }
- }
- else
- {
- this.ProgramStatusLabel = Resources.Main_QueueFinished;
- this.IsEncoding = false;
- this.WindowTitle = Resources.HandBrake_Title;
- this.notifyIconService.SetTooltip(this.WindowTitle);
-
- if (this.windowsSeven.IsWindowsSeven)
- {
- this.windowsSeven.SetTaskBarProgressToNoProgress();
- }
- }
- });
- }
-
- /// <summary>
- /// Handle the Queue Starting Event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void QueueProcessorJobProcessingStarted(object sender, QueueProgressEventArgs e)
 {
 Execute.OnUIThread(
 () =>
 {
 this.ProgramStatusLabel = Resources.Main_PreparingToEncode;
- this.IsEncoding = true;
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
 });
 }
 
- /// <summary>
- /// The Queue has completed handler
- /// </summary>
- /// <param name="sender">
- /// The Sender
- /// </param>
- /// <param name="e">
- /// The EventArgs
- /// </param>
 private void QueueCompleted(object sender, EventArgs e)
 {
- this.IsEncoding = false;
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ this.NotifyOfPropertyChange(() => this.StartLabel);
 
 Execute.OnUIThread(
 () =>
@@ -2616,31 +2193,30 @@
 this.ProgramStatusLabel = Resources.Main_QueueFinished + errorDesc;
 this.WindowTitle = Resources.HandBrake_Title;
 this.notifyIconService.SetTooltip(this.WindowTitle);
-
- if (this.windowsSeven.IsWindowsSeven)
- {
- this.windowsSeven.SetTaskBarProgressToNoProgress();
- }
+ this.windowsTaskbar.SetTaskBarProgressToNoProgress();
 });
 }
 
- /// <summary>
- /// The queue changed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EventArgs.
- /// </param>
 private void QueueChanged(object sender, EventArgs e)
 {
 Execute.OnUIThread(
 () =>
 {
- this.ProgramStatusLabel = string.Format(Resources.Main_XEncodesPending, this.queueProcessor.Count);
- this.NotifyOfPropertyChange(() => this.QueueLabel);
+ if (!this.queueProcessor.IsEncoding)
+ {
+ this.ProgramStatusLabel = string.Format(Resources.Main_XEncodesPending, this.queueProcessor.Count);
+ }
+
+ this.NotifyOfPropertyChange(() => this.IsQueueCountVisible);
+ this.NotifyOfPropertyChange(() => this.QueueCount);
 this.NotifyOfPropertyChange(() => this.StartLabel);
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+
+ if (!this.queueProcessor.IsEncoding && this.IsMultiProcess)
+ {
+ this.IsMultiProcess = false;
+ this.NotifyOfPropertyChange(() => this.IsMultiProcess);
+ }
 });
 }
 
@@ -2650,20 +2226,73 @@
 () =>
 {
 this.ProgramStatusLabel = Resources.Main_QueuePaused;
- this.NotifyOfPropertyChange(() => this.QueueLabel);
+ this.NotifyOfPropertyChange(() => this.IsQueueCountVisible);
+ this.NotifyOfPropertyChange(() => this.QueueCount);
 this.NotifyOfPropertyChange(() => this.StartLabel);
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ });
+ }
+ 
+ private void QueueProcessor_QueueJobStatusChanged(object sender, EventArgs e)
+ {
+ List<QueueProgressStatus> queueJobStatuses = this.queueProcessor.GetQueueProgressStatus();
+ string jobsPending = " " + string.Format(Resources.Main_JobsPending_addon, this.queueProcessor.Count);
+
+ if (this.queueProcessor.IsPaused)
+ {
+ return;
+ }
+
+ Execute.OnUIThread(
+ () =>
+ {
+ if (queueJobStatuses.Count == 1)
+ {
+ QueueProgressStatus status = queueJobStatuses.First();
+ this.ProgramStatusLabel = status.JobStatus.Replace(Environment.NewLine, " ") + jobsPending;
+
+ int percent;
+ int.TryParse(Math.Round(status.ProgressValue).ToString(CultureInfo.InvariantCulture), out percent);
+
+ if (this.lastEncodePercentage != percent)
+ {
+ this.windowsTaskbar.SetTaskBarProgress(percent);
+ }
+
+ this.lastEncodePercentage = percent;
+ this.ProgressPercentage = percent;
+ this.NotifyOfPropertyChange(() => this.ProgressPercentage);
+
+ if (this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowStatusInTitleBar))
+ {
+ this.WindowTitle = string.Format(Resources.WindowTitleStatus, Resources.HandBrake_Title, this.ProgressPercentage, status.Task, status.TaskCount);
+ this.notifyIconService.SetTooltip(string.Format(Resources.TaskTrayStatusTitle, Resources.HandBrake_Title, this.ProgressPercentage, status.Task, status.TaskCount, status.EstimatedTimeLeft));
+ }
+
+ this.IsMultiProcess = false;
+ this.NotifyOfPropertyChange(() => this.IsMultiProcess);
+ }
+ else if (queueJobStatuses.Count > 1)
+ {
+ this.windowsTaskbar.SetTaskBarProgressToNoProgress();
+ this.ProgramStatusLabel = string.Format(Resources.Main_QueueMultiJobStatus, this.queueProcessor.CompletedCount, Environment.NewLine, queueJobStatuses.Count, this.queueProcessor.Count);
+ this.IsMultiProcess = true;
+ this.NotifyOfPropertyChange(() => this.IsMultiProcess);
+ }
+ else
+ {
+ this.ProgramStatusLabel = Resources.Main_QueueFinished;
+ this.NotifyOfPropertyChange(() => this.IsEncoding);
+ this.WindowTitle = Resources.HandBrake_Title;
+ this.notifyIconService.SetTooltip(this.WindowTitle);
+
+ this.IsMultiProcess = false;
+ this.NotifyOfPropertyChange(() => this.IsMultiProcess);
+ this.windowsTaskbar.SetTaskBarProgressToNoProgress();
+ }
 });
 }
 
- /// <summary>
- /// Allows the main window to respond to setting changes.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void UserSettingServiceSettingChanged(object sender, SettingChangedEventArgs e)
 {
 switch (e.Key)
@@ -2681,6 +2310,17 @@
 break;
 }
 }
- #endregion
+
+ private void SummaryViewModel_OutputFormatChanged(object sender, OutputFormatChangedEventArgs e)
+ {
+ if (!string.IsNullOrEmpty(e.Extension))
+ {
+ this.Destination = Path.ChangeExtension(this.Destination, e.Extension);
+ }
+
+ this.VideoViewModel.RefreshTask();
+ this.AudioViewModel.RefreshTask(this.CurrentTask.OutputFormat);
+ this.SubtitleViewModel.RefreshTask();
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/ManagePresetViewModel.cs Changed

@@ -2,120 +2,261 @@
 // <copyright file="ManagePresetViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
-// <summary>
-// The Add Preset View Model
-// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrakeWPF.ViewModels
 {
+ using System.Collections.Generic;
+ using System.ComponentModel;
+ using System.Linq;
 using System.Windows;
 
 using Caliburn.Micro;
 
+ using HandBrakeWPF.Model.Audio;
+ using HandBrakeWPF.Model.Picture;
+ using HandBrakeWPF.Model.Subtitles;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Presets;
 using HandBrakeWPF.Services.Presets.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- /// <summary>
- /// The Add Preset View Model
- /// </summary>
 public class ManagePresetViewModel : ViewModelBase, IManagePresetViewModel
 {
 private readonly IPresetService presetService;
 private readonly IErrorService errorService;
+
 private readonly IWindowManager windowManager;
 private Preset existingPreset;
+ private PictureSettingsResLimitModes selectedPictureSettingsResLimitMode;
+ private string originalPresetName;
 
- /// <summary>
- /// Initializes a new instance of the <see cref="ManagePresetViewModel"/> class.
- /// </summary>
- /// <param name="presetService">
- /// The Preset Service
- /// </param>
- /// <param name="errorService">
- /// The Error Service
- /// </param>
- /// <param name="windowManager">
- /// The window Manager.
- /// </param>
 public ManagePresetViewModel(IPresetService presetService, IErrorService errorService, IWindowManager windowManager)
 {
 this.presetService = presetService;
 this.errorService = errorService;
 this.windowManager = windowManager;
- this.Title = "Manage Preset";
- this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCatgoryName };
+ this.Title = Resources.MainView_PresetManage;
+ this.Preset = new Preset { IsBuildIn = false, IsDefault = false, Category = PresetService.UserPresetCategoryName };
 }
 
- /// <summary>
- /// Gets the Preset
- /// </summary>
 public Preset Preset { get; private set; }
 
- /// <summary>
- /// Prepare the Preset window to create a Preset Object later.
- /// </summary>
- /// <param name="presetToEdit">
- /// The preset To Edit.
- /// </param>
+ public IEnumerable<IPresetObject> PresetsCategories { get; set; }
+
+ public List<PresetDisplayCategory> UserPresetCategories { get; set; }
+
+ public PresetDisplayCategory SelectedUserPresetCategory
+ {
+ get
+ {
+ if (this.Preset != null && this.PresetsCategories != null)
+ {
+ return this.PresetsCategories.FirstOrDefault(s => s.Category == this.Preset.Category) as PresetDisplayCategory;
+ }
+
+ return null;
+ }
+
+ set
+ {
+ if (this.Preset != null && value != null && value.Category != this.Preset.Category)
+ {
+ this.Preset.Category = value.Category;
+ }
+ }
+ }
+
+ public BindingList<PictureSettingsResLimitModes> ResolutionLimitModes => new BindingList<PictureSettingsResLimitModes>
+ {
+ PictureSettingsResLimitModes.None,
+ PictureSettingsResLimitModes.Size8K,
+ PictureSettingsResLimitModes.Size4K,
+ PictureSettingsResLimitModes.Size1080p,
+ PictureSettingsResLimitModes.Size720p,
+ PictureSettingsResLimitModes.Size576p,
+ PictureSettingsResLimitModes.Size480p,
+ PictureSettingsResLimitModes.Custom,
+ };
+
+ public PictureSettingsResLimitModes SelectedPictureSettingsResLimitMode
+ {
+ get => this.selectedPictureSettingsResLimitMode;
+ set
+ {
+ if (value == this.selectedPictureSettingsResLimitMode)
+ {
+ return;
+ }
+
+ this.selectedPictureSettingsResLimitMode = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPictureSettingsResLimitMode);
+
+ this.IsCustomMaxRes = value == PictureSettingsResLimitModes.Custom;
+ this.NotifyOfPropertyChange(() => this.IsCustomMaxRes);
+
+ // Enforce the new limit
+ ResLimit limit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(value);
+ if (limit != null)
+ {
+ this.CustomWidth = limit.Width;
+ this.CustomHeight = limit.Height;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
+ }
+
+ if (value == PictureSettingsResLimitModes.None)
+ {
+ this.CustomWidth = null;
+ this.CustomHeight = null;
+ }
+ }
+ }
+
+ public int? CustomWidth
+ {
+ get => this.Preset?.Task.MaxWidth ?? null;
+ set
+ {
+ if (value == this.Preset.Task.MaxWidth)
+ {
+ return;
+ }
+
+ this.Preset.Task.MaxWidth = value;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ }
+ }
+
+ public int? CustomHeight
+ {
+ get => this.Preset?.Task.MaxHeight ?? null;
+ set
+ {
+ if (value == this.Preset.Task.MaxHeight)
+ {
+ return;
+ }
+
+ this.Preset.Task.MaxHeight = value;
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
+ }
+ }
+
+ public bool IsCustomMaxRes { get; private set; }
+
 public void Setup(Preset presetToEdit)
 {
- this.Preset = new Preset(presetToEdit); // Clone. We will not touch the existing object.
 this.existingPreset = presetToEdit;
+ this.originalPresetName = presetToEdit.Name;
+
+ this.Preset = new Preset(presetToEdit); // Clone. We will not touch the existing object.
+ 
+ 
+ this.UserPresetCategories = presetService.GetPresetCategories(true).ToList();
+ this.NotifyOfPropertyChange(() => this.UserPresetCategories);
+ this.PresetsCategories = this.presetService.Presets;
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+
+ this.SetSelectedPictureSettingsResLimitMode();
 }
 
- /// <summary>
- /// Add a Preset
- /// </summary>
- public void Save()
+ public void EditAudioDefaults()
+ {
+ IAudioDefaultsViewModel audioDefaultsViewModel = new AudioDefaultsViewModel(this.windowManager);
+ audioDefaultsViewModel.Setup(this.Preset.AudioTrackBehaviours, this.Preset.Task.OutputFormat);
+ audioDefaultsViewModel.ShowWindow();
+
+ if (audioDefaultsViewModel.IsApplied)
+ {
+ this.Preset.AudioTrackBehaviours = new AudioBehaviours(audioDefaultsViewModel.AudioBehaviours);
+ }
+ }
+
+ public void EditSubtitleDefaults()
 {
- if (string.IsNullOrEmpty(this.Preset.Name))
+ ISubtitlesDefaultsViewModel subtitlesDefaultsViewModel = new SubtitlesDefaultsViewModel(windowManager);
+ subtitlesDefaultsViewModel.SetupPreset(this.Preset);
+ subtitlesDefaultsViewModel.ShowWindow();
+
+ if (subtitlesDefaultsViewModel.IsApplied)
 {
- this.errorService.ShowMessageBox(
- Resources.AddPresetViewModel_PresetMustProvideName,
- Resources.Error,
- MessageBoxButton.OK,
- MessageBoxImage.Error);
- return;
+ this.Preset.SubtitleTrackBehaviours = new SubtitleBehaviours(subtitlesDefaultsViewModel.SubtitleBehaviours);
 }
+ }
 
- if (this.presetService.CheckIfPresetExists(this.Preset.Name))
+ public void Save()
+ {
+ if (!this.Preset.IsBuildIn)
 {
- MessageBoxResult result =
+ if (string.IsNullOrEmpty(this.Preset.Name))
+ {
 this.errorService.ShowMessageBox(
- Resources.AddPresetViewModel_PresetWithSameNameOverwriteWarning,
+ Resources.AddPresetViewModel_PresetMustProvideName,
 Resources.Error,
- MessageBoxButton.YesNo,
+ MessageBoxButton.OK,
 MessageBoxImage.Error);
- if (result == MessageBoxResult.No)
- {
 return;
 }
+
+ if (originalPresetName != this.Preset.Name && this.presetService.CheckIfPresetExists(this.Preset.Name))
+ {
+ MessageBoxResult result =
+ this.errorService.ShowMessageBox(
+ Resources.AddPresetViewModel_PresetWithSameNameOverwriteWarning,
+ Resources.Error,
+ MessageBoxButton.YesNo,
+ MessageBoxImage.Error);
+ if (result == MessageBoxResult.No)
+ {
+ return;
+ }
+ }
+
+ // Save the Preset
+ this.presetService.Replace(this.existingPreset, this.Preset);
 }
 
- // Save the Preset
- this.presetService.Replace(this.existingPreset, this.Preset);
 this.Close();
 }
 
- /// <summary>
- /// Cancel adding a preset
- /// </summary>
 public void Cancel()
 {
 this.Close();
 }
 
- /// <summary>
- /// Close this window.
- /// </summary>
 public void Close()
 {
- this.TryClose();
+ this.TryCloseAsync();
+ }
+
+ private void SetSelectedPictureSettingsResLimitMode()
+ {
+ // Look for a matching resolution.
+ foreach (PictureSettingsResLimitModes limit in EnumHelper<PictureSettingsResLimitModes>.GetEnumList())
+ {
+ ResLimit resLimit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(limit);
+ if (resLimit != null)
+ {
+ if (resLimit.Width == this.CustomWidth && resLimit.Height == this.CustomHeight)
+ {
+ this.SelectedPictureSettingsResLimitMode = limit;
+ return;
+ }
+ }
+ }
+
+ if (this.CustomWidth.HasValue || this.CustomHeight.HasValue)
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.Custom;
+ }
+ else
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.None;
+ }
 }
 }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/OptionsViewModel.cs Changed

@@ -15,20 +15,22 @@
 using System.Globalization;
 using System.IO;
 using System.Linq;
+ using System.Threading;
+ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Model;
- using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Model;
 using HandBrakeWPF.Model.Options;
+ using HandBrakeWPF.Model.Video;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services;
 using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Presets.Interfaces;
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
@@ -37,18 +39,15 @@
 using Ookii.Dialogs.Wpf;
 
 using Execute = Caliburn.Micro.Execute;
- using SystemInfo = HandBrake.Interop.Utilities.SystemInfo;
 
- /// <summary>
- /// The Options View Model
- /// </summary>
 public class OptionsViewModel : ViewModelBase, IOptionsViewModel
 {
- #region Constants and Fields
-
 private readonly IUserSettingService userSettingService;
 private readonly IUpdateService updateService;
 private readonly IErrorService errorService;
+ private readonly IPresetService presetService;
+
+ private readonly INotificationService notificationService;
 
 private string arguments;
 private string autoNameDefaultPath;
@@ -57,10 +56,10 @@
 private bool changeToTitleCase;
 private bool checkForUpdates;
 private UpdateCheck checkForUpdatesFrequency;
- private bool clearOldOlgs;
+ private bool clearOldLogs;
 private BindingList<string> constantQualityGranularity = new BindingList<string>();
 private bool copyLogToEncodeDirectory;
- private bool copyLogToSepcficedLocation;
+ private bool copyLogToSpecifiedLocation;
 private bool disableLibdvdNav;
 private string logDirectory;
 private BindingList<int> logVerbosityOptions = new BindingList<int>();
@@ -69,7 +68,7 @@
 private bool preventSleep;
 private BindingList<int> previewPicturesToScan = new BindingList<int>();
 private bool removeUnderscores;
- private string selectedGranulairty;
+ private string selectedGranularity;
 private Mp4Behaviour selectedMp4Extension;
 private int selectedPreviewCount;
 private ProcessPriority selectedPriority;
@@ -107,42 +106,25 @@
 private string prePostFilenameText;
 private bool showPrePostFilenameBox;
 private bool whenDonePerformActionImmediately;
- private bool useDarkTheme;
+ private DarkThemeMode darkThemeMode;
 private bool alwaysUseDefaultPath;
 private bool pauseOnLowBattery;
 private int lowBatteryLevel;
-
- // Experimental
+ private string whenDoneAudioFileFullPath;
+ private PresetDisplayMode selectedPresetDisplayMode;
 private int remoteServicePort;
 private bool remoteServiceEnabled;
+ private bool enableQuickSyncLowPower;
+ private int simultaneousEncodes;
 
-
-
- #endregion
-
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="OptionsViewModel"/> class.
- /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- /// <param name="updateService">
- /// The update Service.
- /// </param>
- /// <param name="aboutViewModel">
- /// The about View Model.
- /// </param>
- /// <param name="errorService">
- /// The error Service.
- /// </param>
- public OptionsViewModel(IUserSettingService userSettingService, IUpdateService updateService, IAboutViewModel aboutViewModel, IErrorService errorService)
+ public OptionsViewModel(IUserSettingService userSettingService, IUpdateService updateService, IAboutViewModel aboutViewModel, IErrorService errorService, IPresetService presetService, INotificationService notificationService)
 {
 this.Title = "Options";
 this.userSettingService = userSettingService;
 this.updateService = updateService;
 this.errorService = errorService;
+ this.presetService = presetService;
+ this.notificationService = notificationService;
 this.AboutViewModel = aboutViewModel;
 this.OnLoad();
 
@@ -150,19 +132,9 @@
 this.UpdateMessage = Resources.OptionsViewModel_CheckForUpdatesMsg;
 }
 
- #endregion
-
- #region Window Properties
-
- /// <summary>
- /// Gets or sets SelectedTab.
- /// </summary>
 public OptionsTab SelectedTab
 {
- get
- {
- return this.selectedTab;
- }
+ get => this.selectedTab;
 
 set
 {
@@ -171,44 +143,15 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the about view model.
- /// </summary>
 public IAboutViewModel AboutViewModel { get; set; }
 
- #endregion
-
- #region Properties
-
- public bool IsUWP
- {
- get
- {
- return UwpDetect.IsUWP();
- }
- }
-
- public bool IsNightly
- {
- get
- {
- return VersionHelper.IsNightly();
- }
- }
-
- public bool IsWindows10 => HandBrakeWPF.Utilities.SystemInfo.IsWindows10();
+ public bool IsNightly { get; } = HandBrakeVersionHelper.IsNightly();
 
 public bool HasSystemBattery => PowerService.HasBattery();
 
- #region General
+ /* General */
 
- public BindingList<InterfaceLanguage> InterfaceLanguages
- {
- get
- {
- return new BindingList<InterfaceLanguage>(InterfaceLanguageUtilities.GetUserInterfaceLangauges());
- }
- }
+ public BindingList<InterfaceLanguage> InterfaceLanguages { get; } = new BindingList<InterfaceLanguage>(InterfaceLanguageUtilities.GetUserInterfaceLanguages());
 
 public InterfaceLanguage SelectedLanguage
 {
@@ -221,60 +164,39 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether CheckForUpdates.
- /// </summary>
+ public BindingList<RightToLeftMode> RightToLeftModes { get; } = new BindingList<RightToLeftMode>(EnumHelper<RightToLeftMode>.GetEnumList().ToList());
+
+ public RightToLeftMode SelectedRightToLeftMode { get;set; }
+
 public bool CheckForUpdates
 {
- get
- {
- return this.checkForUpdates;
- }
+ get => this.checkForUpdates;
 
 set
 {
 this.checkForUpdates = value;
- this.NotifyOfPropertyChange("CheckForUpdates");
+ this.NotifyOfPropertyChange(() => this.CheckForUpdates);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether reset when done action.
- /// </summary>
+ public bool CheckForUpdatesAllowed { get; set; }
+
 public bool ResetWhenDoneAction
 {
- get
- {
- return this.resetWhenDoneAction;
- }
+ get => this.resetWhenDoneAction;
 
 set
 {
 this.resetWhenDoneAction = value;
- this.NotifyOfPropertyChange("ResetWhenDoneAction");
+ this.NotifyOfPropertyChange(() => this.ResetWhenDoneAction);
 }
 }
 
- /// <summary>
- /// Gets or sets CheckForUpdatesFrequencies.
- /// </summary>
- public BindingList<UpdateCheck> CheckForUpdatesFrequencies
- {
- get
- {
- return new BindingList<UpdateCheck>(EnumHelper<UpdateCheck>.GetEnumList().ToList());
- }
- }
+ public BindingList<UpdateCheck> CheckForUpdatesFrequencies { get; } = new BindingList<UpdateCheck>(EnumHelper<UpdateCheck>.GetEnumList().ToList());
 
- /// <summary>
- /// Gets or sets a value indicating whether CheckForUpdatesFrequency.
- /// </summary>
 public UpdateCheck CheckForUpdatesFrequency
 {
- get
- {
- return this.checkForUpdatesFrequency;
- }
+ get => this.checkForUpdatesFrequency;
 
 set
 {
@@ -283,178 +205,125 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Arguments.
- /// </summary>
- public string Arguments
+ public bool WhenDonePerformActionImmediately
 {
- get
- {
- return this.arguments;
- }
-
+ get => this.whenDonePerformActionImmediately;
 set
 {
- this.arguments = value;
- this.NotifyOfPropertyChange("Arguments");
+ if (value == this.whenDonePerformActionImmediately) return;
+ this.whenDonePerformActionImmediately = value;
+ this.NotifyOfPropertyChange(() => this.WhenDonePerformActionImmediately);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether SendFileAfterEncode.
- /// </summary>
- public bool SendFileAfterEncode
+ public bool ShowStatusInTitleBar
 {
- get
- {
- return this.sendFileAfterEncode;
- }
-
+ get => this.showStatusInTitleBar;
 set
 {
- this.sendFileAfterEncode = value;
- this.NotifyOfPropertyChange("SendFileAfterEncode");
+ if (value == this.showStatusInTitleBar) return;
+ this.showStatusInTitleBar = value;
+ this.NotifyOfPropertyChange(() => this.ShowStatusInTitleBar);
 }
 }
 
- /// <summary>
- /// Gets or sets SendFileTo.
- /// </summary>
- public string SendFileTo
+ public bool ShowPreviewOnSummaryTab
 {
- get
- {
- return this.sendFileTo;
- }
-
+ get => this.showPreviewOnSummaryTab;
 set
 {
- this.sendFileTo = value;
- this.NotifyOfPropertyChange("SendFileTo");
+ if (value == this.showPreviewOnSummaryTab) return;
+ this.showPreviewOnSummaryTab = value;
+ this.NotifyOfPropertyChange(() => this.ShowPreviewOnSummaryTab);
 }
 }
 
- /// <summary>
- /// Gets or sets SendFileToPath.
- /// </summary>
- public string SendFileToPath
+ public bool ShowAddSelectionToQueue
 {
- get
- {
- return this.sendFileToPath;
- }
-
+ get => this.showAddSelectionToQueue;
 set
 {
- this.sendFileToPath = value;
- this.NotifyOfPropertyChange("SendFileToPath");
+ if (value == this.showAddSelectionToQueue) return;
+ this.showAddSelectionToQueue = value;
+ this.NotifyOfPropertyChange(() => this.ShowAddSelectionToQueue);
 }
 }
 
- /// <summary>
- /// Gets or sets WhenDone.
- /// </summary>
- public WhenDone WhenDone
+ public bool ShowAddAllToQueue
 {
- get
- {
- return this.whenDone;
- }
-
+ get => this.showAddAllToQueue;
 set
 {
- this.whenDone = value;
- this.NotifyOfPropertyChange("WhenDone");
+ if (value == this.showAddAllToQueue) return;
+ this.showAddAllToQueue = value;
+ this.NotifyOfPropertyChange(() => this.ShowAddAllToQueue);
 }
 }
 
- /// <summary>
- /// Gets WhenDoneOptions.
- /// </summary>
- public BindingList<WhenDone> WhenDoneOptions
+ public BindingList<DarkThemeMode> DarkThemeModes { get; } = new BindingList<DarkThemeMode>(EnumHelper<DarkThemeMode>.GetEnumList().ToList());
+
+ public DarkThemeMode DarkThemeMode
 {
- get
+ get => this.darkThemeMode;
+ set
 {
- return new BindingList<WhenDone>(EnumHelper<WhenDone>.GetEnumList().ToList());
+ if (value == this.darkThemeMode) return;
+ this.darkThemeMode = value;
+ this.NotifyOfPropertyChange(() => this.DarkThemeMode);
 }
 }
 
- public bool WhenDonePerformActionImmediately
+ public BindingList<PresetDisplayMode> PresetDisplayModes { get; } = new BindingList<PresetDisplayMode>(EnumHelper<PresetDisplayMode>.GetEnumList().ToList());
+
+ public PresetDisplayMode SelectedPresetDisplayMode
 {
- get => this.whenDonePerformActionImmediately;
+ get => this.selectedPresetDisplayMode;
 set
 {
- if (value == this.whenDonePerformActionImmediately) return;
- this.whenDonePerformActionImmediately = value;
- this.NotifyOfPropertyChange(() => this.WhenDonePerformActionImmediately);
+ if (value == this.selectedPresetDisplayMode) return;
+ this.selectedPresetDisplayMode = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPresetDisplayMode);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether to show encode status in the tile bar.
- /// </summary>
- public bool ShowStatusInTitleBar
+ /* When Done */
+
+ public string SendFileTo
 {
- get
- {
- return this.showStatusInTitleBar;
- }
+ get => this.sendFileTo;
+
 set
 {
- if (value == this.showStatusInTitleBar) return;
- this.showStatusInTitleBar = value;
- this.NotifyOfPropertyChange(() => this.ShowStatusInTitleBar);
+ this.sendFileTo = value;
+ this.NotifyOfPropertyChange(() => this.SendFileTo);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether to show previews in the summary tab.
- /// </summary>
- public bool ShowPreviewOnSummaryTab
+ public string SendFileToPath
 {
- get
- {
- return this.showPreviewOnSummaryTab;
- }
+ get => this.sendFileToPath;
+
 set
 {
- if (value == this.showPreviewOnSummaryTab) return;
- this.showPreviewOnSummaryTab = value;
- this.NotifyOfPropertyChange(() => this.ShowPreviewOnSummaryTab);
+ this.sendFileToPath = value;
+ this.NotifyOfPropertyChange(() => this.SendFileToPath);
 }
 }
 
- /// <summary>
- /// When Done Audio File
- /// </summary>
- public string WhenDoneAudioFile
+ public string Arguments
 {
- get
- {
- return this.whenDoneAudioFile;
- }
+ get => this.arguments;
+
 set
 {
- if (value == this.whenDoneAudioFile) return;
- this.whenDoneAudioFile = value;
- this.NotifyOfPropertyChange(() => this.WhenDoneAudioFile);
+ this.arguments = value;
+ this.NotifyOfPropertyChange(() => this.Arguments);
 }
 }
 
- /// <summary>
- /// When Done Audio File - File Path
- /// </summary>
- public string WhenDoneAudioFileFullPath { get; set; }
-
- /// <summary>
- /// Play a sound when an encode or queue finishes.
- /// </summary>
 public bool PlaySoundWhenDone
 {
- get
- {
- return this.playSoundWhenDone;
- }
+ get => this.playSoundWhenDone;
 set
 {
 if (value == this.playSoundWhenDone) return;
@@ -465,10 +334,7 @@
 
 public bool PlaySoundWhenQueueDone
 {
- get
- {
- return this.playSoundWhenQueueDone;
- }
+ get => this.playSoundWhenQueueDone;
 set
 {
 if (value == this.playSoundWhenQueueDone) return;
@@ -477,86 +343,87 @@
 }
 }
 
- public bool ShowAddSelectionToQueue
+ public string WhenDoneAudioFile
 {
- get => this.showAddSelectionToQueue;
+ get => this.whenDoneAudioFile;
 set
 {
- if (value == this.showAddSelectionToQueue) return;
- this.showAddSelectionToQueue = value;
- this.NotifyOfPropertyChange(() => this.ShowAddSelectionToQueue);
+ if (value == this.whenDoneAudioFile) return;
+ this.whenDoneAudioFile = value;
+ this.NotifyOfPropertyChange(() => this.WhenDoneAudioFile);
 }
 }
 
- public bool ShowAddAllToQueue
+ public string WhenDoneAudioFileFullPath
 {
- get => this.showAddAllToQueue;
+ get => this.whenDoneAudioFileFullPath;
 set
 {
- if (value == this.showAddAllToQueue) return;
- this.showAddAllToQueue = value;
- this.NotifyOfPropertyChange(() => this.ShowAddAllToQueue);
+ if (value == this.whenDoneAudioFileFullPath) return;
+ this.whenDoneAudioFileFullPath = value;
+ this.NotifyOfPropertyChange(() => this.WhenDoneAudioFileFullPath);
 }
 }
 
- public bool UseDarkTheme
+ public bool SendFileAfterEncode
 {
- get => this.useDarkTheme;
+ get => this.sendFileAfterEncode;
+
 set
 {
- if (value == this.useDarkTheme) return;
- this.useDarkTheme = value;
- this.NotifyOfPropertyChange(() => this.UseDarkTheme);
+ this.sendFileAfterEncode = value;
+ this.NotifyOfPropertyChange(() => this.SendFileAfterEncode);
 }
 }
 
- #endregion
-
- #region Output Files
 
- /// <summary>
- /// Gets or sets AutoNameDefaultPath.
- /// </summary>
- public string AutoNameDefaultPath
+ public WhenDone WhenDone
 {
- get
+ get => this.whenDone;
+
+ set
 {
- return this.autoNameDefaultPath;
+ this.whenDone = value;
+ this.NotifyOfPropertyChange(() => this.WhenDone);
 }
+ }
+
+ public BindingList<WhenDone> WhenDoneOptions { get; } = new BindingList<WhenDone>(EnumHelper<WhenDone>.GetEnumList().ToList());
+
+ public bool SendSystemNotificationOnEncodeDone { get; set; }
+
+ public bool SendSystemNotificationOnQueueDone { get; set; }
+
+ /* Output Files */
+
+ public string AutoNameDefaultPath
+ {
+ get => this.autoNameDefaultPath;
 
 set
 {
- this.autoNameDefaultPath = value;
- this.NotifyOfPropertyChange("AutoNameDefaultPath");
+ if (this.IsAutonamePathValid(value))
+ {
+ this.autoNameDefaultPath = value;
+ this.NotifyOfPropertyChange(() => this.AutoNameDefaultPath);
+ }
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether AutomaticallyNameFiles.
- /// </summary>
 public bool AutomaticallyNameFiles
 {
- get
- {
- return this.automaticallyNameFiles;
- }
+ get => this.automaticallyNameFiles;
 
 set
 {
 this.automaticallyNameFiles = value;
- this.NotifyOfPropertyChange("AutomaticallyNameFiles");
+ this.NotifyOfPropertyChange(() => this.AutomaticallyNameFiles);
 }
 }
 
- /// <summary>
- /// Gets or sets AutonameFormat.
- /// </summary>
 public string AutonameFormat
 {
- get
- {
- return this.autonameFormat;
- }
+ get => this.autonameFormat;
 
 set
 {
@@ -565,61 +432,37 @@
 this.autonameFormat = value;
 }
 
- this.NotifyOfPropertyChange("AutonameFormat");
+ this.NotifyOfPropertyChange(() => this.AutonameFormat);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether ChangeToTitleCase.
- /// </summary>
 public bool ChangeToTitleCase
 {
- get
- {
- return this.changeToTitleCase;
- }
+ get => this.changeToTitleCase;
 
 set
 {
 this.changeToTitleCase = value;
- this.NotifyOfPropertyChange("ChangeToTitleCase");
+ this.NotifyOfPropertyChange(() => this.ChangeToTitleCase);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether RemoveUnderscores.
- /// </summary>
 public bool RemoveUnderscores
 {
- get
- {
- return this.removeUnderscores;
- }
+ get => this.removeUnderscores;
 
 set
 {
 this.removeUnderscores = value;
- this.NotifyOfPropertyChange("RemoveUnderscores");
+ this.NotifyOfPropertyChange(() => this.RemoveUnderscores);
 }
 }
 
- public BindingList<Mp4Behaviour> Mp4ExtensionOptions
- {
- get
- {
- return new BindingList<Mp4Behaviour>(EnumHelper<Mp4Behaviour>.GetEnumList().ToList());
- }
- }
+ public BindingList<Mp4Behaviour> Mp4ExtensionOptions { get; } = new BindingList<Mp4Behaviour>(EnumHelper<Mp4Behaviour>.GetEnumList().ToList());
 
- /// <summary>
- /// Gets or sets SelectedMp4Extension.
- /// </summary>
 public Mp4Behaviour SelectedMp4Extension
 {
- get
- {
- return this.selectedMp4Extension;
- }
+ get => this.selectedMp4Extension;
 
 set
 {
@@ -628,15 +471,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether remove punctuation.
- /// </summary>
 public bool RemovePunctuation
 {
- get
- {
- return this.removePunctuation;
- }
+ get => this.removePunctuation;
 set
 {
 this.removePunctuation = value;
@@ -715,125 +552,80 @@
 }
 }
 
- #endregion
-
- #region Preview
+ /* Preview */
 
- /// <summary>
- /// Gets or sets VLCPath.
- /// </summary>
 public string VLCPath
 {
- get
- {
- return this.vlcPath;
- }
+ get => this.vlcPath;
 
 set
 {
 this.vlcPath = value;
- this.NotifyOfPropertyChange("VLCPath");
+ this.NotifyOfPropertyChange(() => this.VLCPath);
 }
 }
 
- #endregion
 
- #region System and Logging
+ /* System and Logging */
 
- /// <summary>
- /// Gets or sets a value indicating whether CopyLogToEncodeDirectory.
- /// </summary>
 public bool CopyLogToEncodeDirectory
 {
- get
- {
- return this.copyLogToEncodeDirectory;
- }
+ get => this.copyLogToEncodeDirectory;
 
 set
 {
 this.copyLogToEncodeDirectory = value;
- this.NotifyOfPropertyChange("CopyLogToEncodeDirectory");
+ this.NotifyOfPropertyChange(() => this.CopyLogToEncodeDirectory);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether CopyLogToSepcficedLocation.
- /// </summary>
- public bool CopyLogToSepcficedLocation
+ public bool CopyLogToSpecifiedLocation
 {
- get
- {
- return this.copyLogToSepcficedLocation;
- }
+ get => this.copyLogToSpecifiedLocation;
 
 set
 {
- this.copyLogToSepcficedLocation = value;
- this.NotifyOfPropertyChange("CopyLogToSepcficedLocation");
+ this.copyLogToSpecifiedLocation = value;
+ this.NotifyOfPropertyChange(() => this.CopyLogToSpecifiedLocation);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether ClearOldOlgs.
- /// </summary>
- public bool ClearOldOlgs
+ public bool ClearOldLogs
 {
- get
- {
- return this.clearOldOlgs;
- }
+ get => this.clearOldLogs;
 
 set
 {
- this.clearOldOlgs = value;
- this.NotifyOfPropertyChange("ClearOldOlgs");
+ this.clearOldLogs = value;
+ this.NotifyOfPropertyChange(() => this.ClearOldLogs);
 }
 }
 
- /// <summary>
- /// Gets or sets LogDirectory.
- /// </summary>
 public string LogDirectory
 {
- get
- {
- return this.logDirectory;
- }
+ get => this.logDirectory;
 
 set
 {
 this.logDirectory = value;
- this.NotifyOfPropertyChange("LogDirectory");
+ this.NotifyOfPropertyChange(() => this.LogDirectory);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether PreventSleep.
- /// </summary>
 public bool PreventSleep
 {
- get
- {
- return this.preventSleep;
- }
+ get => this.preventSleep;
 
 set
 {
 this.preventSleep = value;
- this.NotifyOfPropertyChange("PreventSleep");
+ this.NotifyOfPropertyChange(() => this.PreventSleep);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether HandBrake should pause on low disk space.
- /// </summary>
 public bool PauseOnLowDiskspace
 {
- get
- {
- return this.pauseOnLowDiskspace;
- }
+ get => this.pauseOnLowDiskspace;
 
 set
 {
@@ -842,15 +634,9 @@
 }
 }
 
- /// <summary>
- /// Get or sets the value that HB warns about low disk space.
- /// </summary>
 public long PauseOnLowDiskspaceLevel
 {
- get
- {
- return this.pauseOnLowDiskspaceLevel;
- }
+ get => this.pauseOnLowDiskspaceLevel;
 
 set
 {
@@ -859,40 +645,22 @@
 }
 }
 
- public BindingList<ProcessPriority> PriorityLevelOptions
- {
- get
- {
- return new BindingList<ProcessPriority>(EnumHelper<ProcessPriority>.GetEnumList().ToList());
- }
- }
+ public BindingList<ProcessPriority> PriorityLevelOptions { get; } = new BindingList<ProcessPriority>(EnumHelper<ProcessPriority>.GetEnumList().ToList());
 
- /// <summary>
- /// Gets or sets a value indicating whether SelectedGranulairty.
- /// </summary>
- public string SelectedGranulairty
+ public string SelectedGranularity
 {
- get
- {
- return this.selectedGranulairty;
- }
+ get => this.selectedGranularity;
 
 set
 {
- this.selectedGranulairty = value;
- this.NotifyOfPropertyChange("SelectedGranulairty");
+ this.selectedGranularity = value;
+ this.NotifyOfPropertyChange(() => this.SelectedGranularity);
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedPriority.
- /// </summary>
 public ProcessPriority SelectedPriority
 {
- get
- {
- return this.selectedPriority;
- }
+ get => this.selectedPriority;
 
 set
 {
@@ -923,155 +691,100 @@
 }
 }
 }
- #endregion
 
- #region Advanced
+ /* Advanced */
 
- /// <summary>
- /// Gets or sets ConstantQualityGranularity.
- /// </summary>
 public BindingList<string> ConstantQualityGranularity
 {
- get
- {
- return this.constantQualityGranularity;
- }
+ get => this.constantQualityGranularity;
 
 set
 {
 this.constantQualityGranularity = value;
- this.NotifyOfPropertyChange("ConstantQualityGranularity");
+ this.NotifyOfPropertyChange(() => this.ConstantQualityGranularity);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether DisableLibdvdNav.
- /// </summary>
 public bool DisableLibdvdNav
 {
- get
- {
- return this.disableLibdvdNav;
- }
+ get => this.disableLibdvdNav;
 
 set
 {
 this.disableLibdvdNav = value;
- this.NotifyOfPropertyChange("DisableLibdvdNav");
+ this.NotifyOfPropertyChange(() => this.DisableLibdvdNav);
 }
 }
 
- /// <summary>
- /// Gets or sets LogVerbosityOptions.
- /// </summary>
 public BindingList<int> LogVerbosityOptions
 {
- get
- {
- return this.logVerbosityOptions;
- }
+ get => this.logVerbosityOptions;
 
 set
 {
 this.logVerbosityOptions = value;
- this.NotifyOfPropertyChange("LogVerbosityOptions");
+ this.NotifyOfPropertyChange(() => this.LogVerbosityOptions);
 }
 }
 
- /// <summary>
- /// Gets or sets MinLength.
- /// </summary>
 public long MinLength
 {
- get
- {
- return this.minLength;
- }
+ get => this.minLength;
 
 set
 {
 this.minLength = value;
- this.NotifyOfPropertyChange("MinLength");
+ this.NotifyOfPropertyChange(() => this.MinLength);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether MinimiseToTray.
- /// </summary>
 public bool MinimiseToTray
 {
- get
- {
- return this.minimiseToTray;
- }
+ get => this.minimiseToTray;
 
 set
 {
 this.minimiseToTray = value;
- this.NotifyOfPropertyChange("MinimiseToTray");
+ this.NotifyOfPropertyChange(() => this.MinimiseToTray);
 }
 }
 
- /// <summary>
- /// Gets or sets PreviewPicturesToScan.
- /// </summary>
 public BindingList<int> PreviewPicturesToScan
 {
- get
- {
- return this.previewPicturesToScan;
- }
+ get => this.previewPicturesToScan;
 
 set
 {
 this.previewPicturesToScan = value;
- this.NotifyOfPropertyChange("PreviewPicturesToScan");
+ this.NotifyOfPropertyChange(() => this.PreviewPicturesToScan);
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedPreviewCount.
- /// </summary>
 public int SelectedPreviewCount
 {
- get
- {
- return this.selectedPreviewCount;
- }
+ get => this.selectedPreviewCount;
 
 set
 {
 this.selectedPreviewCount = value;
- this.NotifyOfPropertyChange("SelectedPreviewCount");
+ this.NotifyOfPropertyChange(() => this.SelectedPreviewCount);
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedVerbosity.
- /// </summary>
 public int SelectedVerbosity
 {
- get
- {
- return this.selectedVerbosity;
- }
+ get => this.selectedVerbosity;
 
 set
 {
 this.selectedVerbosity = value;
- this.NotifyOfPropertyChange("SelectedVerbosity");
+ this.NotifyOfPropertyChange(() => this.SelectedVerbosity);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether ClearQueueOnEncodeCompleted.
- /// </summary>
 public bool ClearQueueOnEncodeCompleted
 {
- get
- {
- return this.clearQueueOnEncodeCompleted;
- }
+ get => this.clearQueueOnEncodeCompleted;
 set
 {
 this.clearQueueOnEncodeCompleted = value;
@@ -1101,10 +814,7 @@
 }
 }
 
- #endregion
-
- #region Video
-
+ /* Video */ 
 public bool EnableQuickSyncEncoding
 {
 get => this.enableQuickSyncEncoding && this.IsQuickSyncAvailable;
@@ -1152,10 +862,7 @@
 
 public bool EnableQuickSyncDecoding
 {
- get
- {
- return this.enableQuickSyncDecoding;
- }
+ get => this.enableQuickSyncDecoding;
 
 set
 {
@@ -1169,49 +876,37 @@
 }
 }
 
- public VideoScaler SelectedScalingMode { get; set; }
-
- public bool IsQuickSyncAvailable
+ public bool EnableQuickSyncLowPower
 {
- get
+ get => this.enableQuickSyncLowPower;
+ set
 {
- return SystemInfo.IsQsvAvailable;
- }
- }
+ if (value == this.enableQuickSyncLowPower)
+ {
+ return;
+ }
 
- public bool IsVceAvailable
- {
- get
- {
- return SystemInfo.IsVceH264Available;
+ this.enableQuickSyncLowPower = value;
+ this.NotifyOfPropertyChange(() => this.EnableQuickSyncLowPower);
 }
 }
 
- public bool IsNvencAvailable
- {
- get
- {
- return SystemInfo.IsNVEncH264Available;
- }
- }
+ public VideoScaler SelectedScalingMode { get; set; }
+
+ public bool IsQuickSyncAvailable { get; } = HandBrakeHardwareEncoderHelper.IsQsvAvailable;
+
+ public bool IsVceAvailable { get; } = HandBrakeHardwareEncoderHelper.IsVceH264Available;
+
+ public bool IsNvencAvailable { get; } = HandBrakeHardwareEncoderHelper.IsNVEncH264Available;
 
- /// <summary>
- /// Gets a value indicating whether is use qsv dec available.
- /// </summary>
 public bool IsUseQsvDecAvailable
 {
- get
- {
- return IsQuickSyncAvailable && this.EnableQuickSyncDecoding;
- }
+ get => this.IsQuickSyncAvailable && this.EnableQuickSyncDecoding;
 }
 
 public bool UseQSVDecodeForNonQSVEnc
 {
- get
- {
- return this.useQsvDecodeForNonQsvEnc;
- }
+ get => this.useQsvDecodeForNonQsvEnc;
 
 set
 {
@@ -1221,42 +916,22 @@
 }
 }
 
- public BindingList<VideoScaler> ScalingOptions
- {
- get
- {
- return new BindingList<VideoScaler>(EnumHelper<VideoScaler>.GetEnumList().ToList());
- }
- }
+ public BindingList<VideoScaler> ScalingOptions { get; } = new BindingList<VideoScaler>(EnumHelper<VideoScaler>.GetEnumList().ToList());
 
 public bool IsHardwareFallbackMode => HandBrakeUtils.IsInitNoHardware();
 
- #endregion
+ public bool IsSafeMode => HandBrakeHardwareEncoderHelper.IsSafeMode;
 
- #endregion
+ public bool IsHardwareOptionsVisible => !IsSafeMode && !IsHardwareFallbackMode;
 
- #region About HandBrake
 
- /// <summary>
- /// Gets Version.
- /// </summary>
- public string Version
- {
- get
- {
- return string.Format("{0}", VersionHelper.GetVersion());
- }
- }
+ /* About HandBrake */
+
+ public string Version { get; } = string.Format("{0}", HandBrakeVersionHelper.GetVersion());
 
- /// <summary>
- /// Gets or sets UpdateMessage.
- /// </summary>
 public string UpdateMessage
 {
- get
- {
- return this.updateMessage;
- }
+ get => this.updateMessage;
 set
 {
 this.updateMessage = value;
@@ -1264,15 +939,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether UpdateAvailable.
- /// </summary>
 public bool UpdateAvailable
 {
- get
- {
- return this.updateAvailable;
- }
+ get => this.updateAvailable;
 set
 {
 this.updateAvailable = value;
@@ -1280,15 +949,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets DownloadProgressPercentage.
- /// </summary>
 public int DownloadProgressPercentage
 {
- get
- {
- return this.downloadProgressPercentage;
- }
+ get => this.downloadProgressPercentage;
 set
 {
 this.downloadProgressPercentage = value;
@@ -1296,9 +959,7 @@
 }
 }
 
- #endregion
-
- // Experimental
+ /* Experimental */
 public bool RemoteServiceEnabled
 {
 get => this.remoteServiceEnabled;
@@ -1339,11 +1000,37 @@
 }
 }
 
+ public bool IsProcessIsolationAllowed { get; } = Portable.IsProcessIsolationEnabled();
+
+ public int SimultaneousEncodes
+ {
+ get => this.simultaneousEncodes;
+ set
+ {
+ if (value == this.simultaneousEncodes) return;
+ this.simultaneousEncodes = value;
+ this.NotifyOfPropertyChange(() => this.SimultaneousEncodes);
+ }
+ }
+
+ public BindingList<int> SimultaneousEncodesList
+ {
+ get
+ {
+ BindingList<int> list = new BindingList<int>();
+ for (int i = 1; i <= SystemInfo.MaximumSimultaneousInstancesSupported; i++)
+ {
+ list.Add(i);
+ }
+
+ return list;
+ }
+ }
+
+ public bool IsSimultaneousEncodesSupported => SystemInfo.MaximumSimultaneousInstancesSupported > 1;
+ 
 #region Public Methods
 
- /// <summary>
- /// Close this window.
- /// </summary>
 public void Close()
 {
 this.Save();
@@ -1352,9 +1039,6 @@
 shellViewModel.DisplayWindow(ShellWindow.MainWindow);
 }
 
- /// <summary>
- /// Browse - Send File To
- /// </summary>
 public void BrowseSendFileTo()
 {
 OpenFileDialog dialog = new OpenFileDialog { Filter = "All files (*.*)|*.*", FileName = this.sendFileToPath };
@@ -1366,9 +1050,6 @@
 }
 }
 
- /// <summary>
- /// Browse Auto Name Path
- /// </summary>
 public void BrowseAutoNamePath()
 {
 VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = Resources.OptionsView_SelectFolder, UseDescriptionForTitle = true, SelectedPath = this.AutoNameDefaultPath };
@@ -1379,9 +1060,6 @@
 }
 }
 
- /// <summary>
- /// Browse VLC Path
- /// </summary>
 public void BrowseVlcPath()
 {
 OpenFileDialog dialog = new OpenFileDialog { Filter = "All files (*.exe)|*.exe", FileName = this.VLCPath };
@@ -1392,9 +1070,6 @@
 }
 }
 
- /// <summary>
- /// Browse - Log Path
- /// </summary>
 public void BrowseLogPath()
 {
 VistaFolderBrowserDialog dialog = new VistaFolderBrowserDialog { Description = Resources.OptionsView_SelectFolder, UseDescriptionForTitle = true, SelectedPath = this.LogDirectory };
@@ -1405,9 +1080,6 @@
 }
 }
 
- /// <summary>
- /// View the Default Log Directory for HandBrake
- /// </summary>
 public void ViewLogDirectory()
 {
 string logDir = DirectoryUtilities.GetLogDirectory();
@@ -1416,9 +1088,6 @@
 prc.Start();
 }
 
- /// <summary>
- /// Clear HandBrakes log directory.
- /// </summary>
 public void ClearLogHistory()
 {
 MessageBoxResult result = this.errorService.ShowMessageBox(Resources.OptionsView_ClearLogDirConfirm, Resources.OptionsView_ClearLogs,
@@ -1430,27 +1099,18 @@
 }
 }
 
- /// <summary>
- /// Download an Update
- /// </summary>
 public void DownloadUpdate()
 {
 this.UpdateMessage = Resources.OptionsView_PreparingUpdate;
 this.updateService.DownloadFile(this.updateInfo.DownloadFile, this.updateInfo.Signature, this.DownloadComplete, this.DownloadProgress);
 }
 
- /// <summary>
- /// Check for updates
- /// </summary>
 public void PerformUpdateCheck()
 {
 this.UpdateMessage = Resources.OptionsView_CheckingForUpdates;
 this.updateService.CheckForUpdates(this.UpdateCheckComplete);
 }
 
- /// <summary>
- /// Browse - Send File To
- /// </summary>
 public void BrowseWhenDoneAudioFile()
 {
 OpenFileDialog dialog = new OpenFileDialog() { Filter = "All Files|*.wav;*.mp3", FileName = this.WhenDoneAudioFileFullPath };
@@ -1489,9 +1149,6 @@
 
 #endregion
 
- /// <summary>
- /// Load User Settings
- /// </summary>
 public override void OnLoad()
 {
 // #############################
@@ -1499,14 +1156,23 @@
 // #############################
 string culture = this.userSettingService.GetUserSetting<string>(UserSettingConstants.UiLanguage);
 this.SelectedLanguage = InterfaceLanguageUtilities.FindInterfaceLanguage(culture);
+ this.SelectedRightToLeftMode = (RightToLeftMode)this.userSettingService.GetUserSetting<int>(UserSettingConstants.RightToLeftUi);
 
+ this.CheckForUpdatesAllowed = true;
 this.CheckForUpdates = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UpdateStatus);
 this.CheckForUpdatesFrequency = (UpdateCheck)this.userSettingService.GetUserSetting<int>(UserSettingConstants.DaysBetweenUpdateCheck);
+ if (Portable.IsPortable() && !Portable.IsUpdateCheckEnabled())
+ {
+ this.CheckForUpdates = false;
+ this.CheckForUpdatesAllowed = false;
+ }
+
 this.ShowStatusInTitleBar = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowStatusInTitleBar);
 this.ShowPreviewOnSummaryTab = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowPreviewOnSummaryTab);
 this.ShowAddAllToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddAllToQueue);
 this.ShowAddSelectionToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddSelectionToQueue);
- this.UseDarkTheme = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseDarkTheme);
+ this.DarkThemeMode = (DarkThemeMode)this.userSettingService.GetUserSetting<int>(UserSettingConstants.DarkThemeMode);
+ this.SelectedPresetDisplayMode = (PresetDisplayMode)this.userSettingService.GetUserSetting<int>(UserSettingConstants.PresetMenuDisplayMode);
 
 // #############################
 // When Done
@@ -1528,6 +1194,8 @@
 this.WhenDoneAudioFileFullPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.WhenDoneAudioFile);
 this.PlaySoundWhenDone = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PlaySoundWhenDone);
 this.PlaySoundWhenQueueDone = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.PlaySoundWhenQueueDone);
+ this.SendSystemNotificationOnEncodeDone = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnEncodeDone);
+ this.SendSystemNotificationOnQueueDone = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.NotifyOnQueueDone);
 
 // #############################
 // Output Settings
@@ -1573,7 +1241,7 @@
 // #############################
 
 // VLC Path
- this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath) ?? string.Empty;
+ this.VLCPath = this.userSettingService.GetUserSetting<string>(UserSettingConstants.MediaPlayerPath) ?? string.Empty;
 
 // #############################
 // Video
@@ -1581,6 +1249,7 @@
 this.EnableQuickSyncDecoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncDecoding);
 this.SelectedScalingMode = this.userSettingService.GetUserSetting<VideoScaler>(UserSettingConstants.ScalingMode);
 this.UseQSVDecodeForNonQSVEnc = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.UseQSVDecodeForNonQSVEnc);
+ this.EnableQuickSyncLowPower = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncLowPower);
 
 this.EnableQuickSyncEncoding = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSyncEncoding);
 this.EnableVceEncoder = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableVceEncoder);
@@ -1604,12 +1273,12 @@
 
 // Logs
 this.CopyLogToEncodeDirectory = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogWithVideo);
- this.CopyLogToSepcficedLocation = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory);
+ this.CopyLogToSpecifiedLocation = userSettingService.GetUserSetting<bool>(UserSettingConstants.SaveLogToCopyDirectory);
 
 // The saved log path
 this.LogDirectory = userSettingService.GetUserSetting<string>(UserSettingConstants.SaveLogCopyDirectory) ?? string.Empty;
 
- this.ClearOldOlgs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
+ this.ClearOldLogs = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearOldLogs);
 
 // #############################
 // Advanced
@@ -1639,7 +1308,7 @@
 this.ConstantQualityGranularity.Add("1.00");
 this.ConstantQualityGranularity.Add("0.50");
 this.ConstantQualityGranularity.Add("0.25");
- this.SelectedGranulairty = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);
+ this.SelectedGranularity = userSettingService.GetUserSetting<double>(UserSettingConstants.X264Step).ToString("0.00", CultureInfo.InvariantCulture);
 
 // Min Title Length
 this.MinLength = this.userSettingService.GetUserSetting<int>(UserSettingConstants.MinScanDuration);
@@ -1653,41 +1322,76 @@
 // #############################
 // Experimental
 // #############################
- this.RemoteServiceEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.RemoteServiceEnabled);
- this.RemoteServicePort = userSettingService.GetUserSetting<int>(UserSettingConstants.RemoteServicePort);
+ this.RemoteServiceEnabled = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ProcessIsolationEnabled);
+ this.RemoteServicePort = userSettingService.GetUserSetting<int>(UserSettingConstants.ProcessIsolationPort);
+ this.SimultaneousEncodes = userSettingService.GetUserSetting<int>(UserSettingConstants.SimultaneousEncodes);
+ if (this.SimultaneousEncodes > 8)
+ {
+ this.SimultaneousEncodes = 8;
+ }
 }
 
- /// <summary>
- /// Some settings can be changed outside of this window. This will refresh their UI controls.
- /// </summary>
 public void UpdateSettings()
 {
 this.WhenDone = (WhenDone)this.userSettingService.GetUserSetting<int>(UserSettingConstants.WhenCompleteAction);
+ this.ShowAddAllToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddAllToQueue);
+ this.ShowAddSelectionToQueue = this.userSettingService.GetUserSetting<bool>(UserSettingConstants.ShowAddSelectionToQueue);
 }
 
- /// <summary>
- /// The goto tab.
- /// </summary>
- /// <param name="tab">
- /// The tab.
- /// </param>
 public void GotoTab(OptionsTab tab)
 {
 this.SelectedTab = tab;
 }
 
- /// <summary>
- /// Load / Update the user settings.
- /// </summary>
- protected override void OnActivate()
+ public void ResetHandBrake()
+ {
+ MessageBoxResult result = this.errorService.ShowMessageBox(
+ Resources.OptionsViewModel_ResetHandBrakeQuestion,
+ Resources.OptionsViewModel_ResetHandBrake,
+ MessageBoxButton.YesNo,
+ MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.Yes)
+ {
+ this.userSettingService.ResetSettingsToDefaults();
+ this.OnLoad();
+ }
+ }
+
+ public void ResetBuiltInPresets()
+ {
+ MessageBoxResult result = this.errorService.ShowMessageBox(
+ Resources.OptionsViewModel_ResetHandBrakePresetsQuestion,
+ Resources.OptionsViewModel_ResetHandBrake,
+ MessageBoxButton.YesNo,
+ MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.Yes)
+ {
+ this.presetService.UpdateBuiltInPresets();
+ this.errorService.ShowMessageBox(Resources.Presets_ResetComplete, Resources.Presets_ResetHeader, MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ }
+
+ public void UninstallNotifications()
+ {
+ this.SendSystemNotificationOnQueueDone = false;
+ this.SendSystemNotificationOnEncodeDone = false;
+
+ this.NotifyOfPropertyChange(() => SendSystemNotificationOnQueueDone);
+ this.NotifyOfPropertyChange(() => SendSystemNotificationOnEncodeDone);
+
+ this.notificationService.Uninstall();
+
+ this.errorService.ShowMessageBox(Resources.OptionsView_UninstallMessageBoxText, Resources.OptionsView_UninstallMessageBoxHeader, MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+
+ protected override Task OnActivateAsync(CancellationToken cancellationToken)
 {
 this.OnLoad();
- base.OnActivate();
+ return base.OnActivateAsync(cancellationToken);
 }
 
- /// <summary>
- /// Save the settings selected
- /// </summary>
 private void Save()
 {
 /* General */
@@ -1698,10 +1402,13 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.SendFileToArgs, this.Arguments);
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowStatusInTitleBar, this.ShowStatusInTitleBar);
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowPreviewOnSummaryTab, this.ShowPreviewOnSummaryTab);
- this.userSettingService.SetUserSetting(UserSettingConstants.UseDarkTheme, this.UseDarkTheme);
+ this.userSettingService.SetUserSetting(UserSettingConstants.DarkThemeMode, this.DarkThemeMode);
 this.userSettingService.SetUserSetting(UserSettingConstants.UiLanguage, this.SelectedLanguage?.Culture);
+ this.userSettingService.SetUserSetting(UserSettingConstants.RightToLeftUi, this.SelectedRightToLeftMode);
+
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddAllToQueue, this.ShowAddAllToQueue);
 this.userSettingService.SetUserSetting(UserSettingConstants.ShowAddSelectionToQueue, this.ShowAddSelectionToQueue);
+ this.userSettingService.SetUserSetting(UserSettingConstants.PresetMenuDisplayMode, this.SelectedPresetDisplayMode);
 
 /* When Done */
 this.userSettingService.SetUserSetting(UserSettingConstants.WhenCompleteAction, (int)this.WhenDone);
@@ -1710,6 +1417,8 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.PlaySoundWhenDone, this.PlaySoundWhenDone);
 this.userSettingService.SetUserSetting(UserSettingConstants.PlaySoundWhenQueueDone, this.PlaySoundWhenQueueDone);
 this.userSettingService.SetUserSetting(UserSettingConstants.WhenDoneAudioFile, this.WhenDoneAudioFileFullPath);
+ this.userSettingService.SetUserSetting(UserSettingConstants.NotifyOnEncodeDone, this.SendSystemNotificationOnEncodeDone);
+ this.userSettingService.SetUserSetting(UserSettingConstants.NotifyOnQueueDone, this.SendSystemNotificationOnQueueDone);
 
 /* Output Files */
 this.userSettingService.SetUserSetting(UserSettingConstants.AutoNaming, this.AutomaticallyNameFiles);
@@ -1725,7 +1434,7 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.AlwaysUseDefaultPath, this.AlwaysUseDefaultPath);
 
 /* Previews */
- this.userSettingService.SetUserSetting(UserSettingConstants.VLCPath, this.VLCPath);
+ this.userSettingService.SetUserSetting(UserSettingConstants.MediaPlayerPath, this.VLCPath);
 
 /* Video */
 this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSyncDecoding, this.EnableQuickSyncDecoding);
@@ -1735,23 +1444,24 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSyncEncoding, this.EnableQuickSyncEncoding);
 this.userSettingService.SetUserSetting(UserSettingConstants.EnableVceEncoder, this.EnableVceEncoder);
 this.userSettingService.SetUserSetting(UserSettingConstants.EnableNvencEncoder, this.EnableNvencEncoder);
+ this.userSettingService.SetUserSetting(UserSettingConstants.EnableQuickSyncLowPower, this.EnableQuickSyncLowPower);
 
 /* System and Logging */
- this.userSettingService.SetUserSetting(UserSettingConstants.ProcessPriorityInt, this.SelectedPriority);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ProcessPriorityInt, (int)this.SelectedPriority);
 this.userSettingService.SetUserSetting(UserSettingConstants.PreventSleep, this.PreventSleep);
 this.userSettingService.SetUserSetting(UserSettingConstants.PauseOnLowDiskspace, this.PauseOnLowDiskspace);
 this.userSettingService.SetUserSetting(UserSettingConstants.PauseQueueOnLowDiskspaceLevel, this.PauseOnLowDiskspaceLevel);
 this.userSettingService.SetUserSetting(UserSettingConstants.Verbosity, this.SelectedVerbosity);
 this.userSettingService.SetUserSetting(UserSettingConstants.SaveLogWithVideo, this.CopyLogToEncodeDirectory);
- this.userSettingService.SetUserSetting(UserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSepcficedLocation);
+ this.userSettingService.SetUserSetting(UserSettingConstants.SaveLogToCopyDirectory, this.CopyLogToSpecifiedLocation);
 this.userSettingService.SetUserSetting(UserSettingConstants.SaveLogCopyDirectory, this.LogDirectory);
- this.userSettingService.SetUserSetting(UserSettingConstants.ClearOldLogs, this.ClearOldOlgs);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ClearOldLogs, this.ClearOldLogs);
 
 /* Advanced */
 this.userSettingService.SetUserSetting(UserSettingConstants.MainWindowMinimize, this.MinimiseToTray);
 this.userSettingService.SetUserSetting(UserSettingConstants.ClearCompletedFromQueue, this.ClearQueueOnEncodeCompleted);
 this.userSettingService.SetUserSetting(UserSettingConstants.PreviewScanCount, this.SelectedPreviewCount);
- this.userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranulairty, CultureInfo.InvariantCulture));
+ this.userSettingService.SetUserSetting(UserSettingConstants.X264Step, double.Parse(this.SelectedGranularity, CultureInfo.InvariantCulture));
 
 int value;
 if (int.TryParse(this.MinLength.ToString(CultureInfo.InvariantCulture), out value))
@@ -1765,16 +1475,11 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.LowBatteryLevel, this.LowBatteryLevel);
 
 /* Experimental */
- this.userSettingService.SetUserSetting(UserSettingConstants.RemoteServiceEnabled, this.RemoteServiceEnabled);
- this.userSettingService.SetUserSetting(UserSettingConstants.RemoteServicePort, this.RemoteServicePort);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ProcessIsolationEnabled, this.RemoteServiceEnabled);
+ this.userSettingService.SetUserSetting(UserSettingConstants.ProcessIsolationPort, this.RemoteServicePort);
+ this.userSettingService.SetUserSetting(UserSettingConstants.SimultaneousEncodes, this.SimultaneousEncodes);
 }
 
- /// <summary>
- /// Update Check Complete
- /// </summary>
- /// <param name="info">
- /// The info.
- /// </param>
 private void UpdateCheckComplete(UpdateCheckInformation info)
 {
 this.updateInfo = info;
@@ -1795,12 +1500,6 @@
 }
 }
 
- /// <summary>
- /// Download Progress Action
- /// </summary>
- /// <param name="info">
- /// The info.
- /// </param>
 private void DownloadProgress(DownloadStatus info)
 {
 if (info.TotalBytes == 0 || info.BytesRead == 0)
@@ -1818,12 +1517,6 @@
 "{0} {1}% - {2}k of {3}k", Resources.OptionsView_Downloading, this.DownloadProgressPercentage, (info.BytesRead / 1024), (info.TotalBytes / 1024));
 }
 
- /// <summary>
- /// Download Complete Action
- /// </summary>
- /// <param name="info">
- /// The info.
- /// </param>
 private void DownloadComplete(DownloadStatus info)
 {
 this.UpdateAvailable = false;
@@ -1831,17 +1524,30 @@
 
 if (info.WasSuccessful)
 {
- Process.Start(Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"));
- Execute.OnUIThread(() => Application.Current.Shutdown());
+ try
+ {
+ // Elevation required to run the installer.
+ Process installer = new Process();
+ installer = new Process
+ {
+ StartInfo =
+ {
+ FileName = Path.Combine(Path.GetTempPath(), "handbrake-setup.exe"),
+ UseShellExecute = true,
+ Verb = "runas"
+ }
+ };
+
+ installer.Start();
+ Execute.OnUIThread(() => Application.Current.Shutdown());
+ }
+ catch (Exception exc)
+ {
+ Console.WriteLine(exc);
+ }
 }
 }
 
- /// <summary>
- /// Validate the Autoname Fileformat string
- /// </summary>
- /// <param name="input">The format string</param>
- /// <param name="isSilent">Don't show an error dialog if true.</param>
- /// <returns>True if valid</returns>
 private bool IsValidAutonameFormat(string input, bool isSilent)
 {
 if (string.IsNullOrEmpty(input))
@@ -1869,5 +1575,31 @@
 
 return true;
 }
+
+ private bool IsAutonamePathValid(string path)
+ {
+ if (string.IsNullOrEmpty(path))
+ {
+ return true;
+ }
+
+ if (path.Contains(Constants.SourcePath) && path.Contains(Constants.SourceFolderName))
+ {
+ int indexOfSourcePath = path.IndexOf(Constants.SourcePath, StringComparison.Ordinal);
+ int indexOfSourceFolderName = path.IndexOf(Constants.SourceFolderName, StringComparison.Ordinal);
+
+ if (indexOfSourceFolderName < indexOfSourcePath)
+ {
+ this.errorService.ShowMessageBox(
+ string.Format(Resources.OptionsViewModel_InvalidAutonamePath, Constants.SourceFolderName, Constants.SourcePath),
+ Resources.Error,
+ MessageBoxButton.OK,
+ MessageBoxImage.Error);
+ return false;
+ }
+ }
+ 
+ return true;
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/PictureSettingsViewModel.cs Changed

@@ -11,176 +11,76 @@
 {
 using System;
 using System.Collections.Generic;
+ using System.ComponentModel;
 using System.Globalization;
+ using System.Linq;
+ using System.Windows;
+
+ using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
 using HandBrakeWPF.EventArgs;
- using HandBrakeWPF.Helpers;
+ using HandBrakeWPF.Model.Filters;
+ using HandBrakeWPF.Model.Picture;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.Utilities;
+ using HandBrakeWPF.ViewModelItems.Filters;
 using HandBrakeWPF.ViewModels.Interfaces;
+ using HandBrakeWPF.Views;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using PresetPictureSettingsMode = HandBrakeWPF.Model.Picture.PresetPictureSettingsMode;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using Size = Model.Picture.Size;
 
- /// <summary>
- /// The Picture Settings View Model
- /// </summary>
 public class PictureSettingsViewModel : ViewModelBase, IPictureSettingsViewModel
 {
- /*
- * TODO:
- * - We are not handling cropping correctly within the UI.
- * - The Height is not correctly set when using no Anamorphic
- * - Maintain Aspect ratio needs corrected.
- * - Custom Anamorphic.
- * 
- */
- #region Constants and Fields
-
- /// <summary>
- /// The display size.
- /// </summary>
- private string displaySize;
-
- /// <summary>
- /// Backing field for for height control enabled
- /// </summary>
+ private readonly IWindowManager windowManager;
 private bool heightControlEnabled = true;
-
- /// <summary>
- /// Backing field for show custom anamorphic controls
- /// </summary>
- private bool showCustomAnamorphicControls;
-
- /// <summary>
- /// The source info.
- /// </summary>
 private string sourceInfo;
-
- /// <summary>
- /// Source Par Values
- /// </summary>
 private Size sourceParValues;
-
- /// <summary>
- /// Source Resolution
- /// </summary>
 private Size sourceResolution;
-
- /// <summary>
- /// Backing field for width control enabled.
- /// </summary>
 private bool widthControlEnabled = true;
-
- /// <summary>
- /// Backing field for the show modulus field
- /// </summary>
- private bool showModulus;
-
- /// <summary>
- /// Backing field for showing display size.
- /// </summary>
- private bool showDisplaySize;
-
- /// <summary>
- /// Backing field for max height
- /// </summary>
- private int maxHeight;
-
- /// <summary>
- /// Backing field for max width
- /// </summary>
- private int maxWidth;
-
- /// <summary>
- /// The show keep ar backing field.
- /// </summary>
- private bool showKeepAr = true;
-
- /// <summary>
- /// The delayed previewprocessor.
- /// </summary>
 private DelayedActionProcessor delayedPreviewprocessor = new DelayedActionProcessor();
-
- /// <summary>
- /// The current title.
- /// </summary>
 private Title currentTitle;
-
- /// <summary>
- /// The scanned source.
- /// </summary>
 private Source scannedSource;
+ private PictureSettingsResLimitModes selectedPictureSettingsResLimitMode;
 
- #endregion
-
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="HandBrakeWPF.ViewModels.PictureSettingsViewModel"/> class.
- /// </summary>
- public PictureSettingsViewModel(IStaticPreviewViewModel staticPreviewViewModel)
+ public PictureSettingsViewModel(IStaticPreviewViewModel staticPreviewViewModel, IWindowManager windowManager)
 {
+ this.windowManager = windowManager;
 this.StaticPreviewViewModel = staticPreviewViewModel;
+ this.StaticPreviewViewModel.SetPictureSettingsInstance(this);
 this.sourceResolution = new Size(0, 0);
 this.Task = new EncodeTask();
+ this.PaddingFilter = new PadFilter(this.Task, () => this.OnFilterChanged(null));
+ this.RotateFlipFilter = new RotateFlipFilter(this.Task, e => this.OnFlipRotateChanged(e));
 this.Init();
 }
 
- #endregion
+ /* Events */
 
 public event EventHandler<TabStatusEventArgs> TabStatusChanged;
 
- #region Properties
+ /* Properties */
 
- /// <summary>
- /// Gets or sets the static preview view model.
- /// </summary>
 public IStaticPreviewViewModel StaticPreviewViewModel { get; set; }
 
- /// <summary>
- /// Gets AnamorphicModes.
- /// </summary>
- public IEnumerable<Anamorphic> AnamorphicModes
- {
- get
- {
- return new List<Anamorphic> { Anamorphic.None, Anamorphic.Automatic, Anamorphic.Loose, Anamorphic.Custom };
- }
- }
+ public IEnumerable<Anamorphic> AnamorphicModes { get; } = new List<Anamorphic> { Anamorphic.None, Anamorphic.Automatic, Anamorphic.Custom };
 
- /// <summary>
- /// Gets or sets DisplaySize.
- /// </summary>
- public string DisplaySize
- {
- get
- {
- return this.displaySize;
- }
+ public PadFilter PaddingFilter { get; set; }
 
- set
- {
- this.displaySize = value;
- this.NotifyOfPropertyChange(() => this.DisplaySize);
- }
- }
+ public RotateFlipFilter RotateFlipFilter { get; set; }
+
+ public string DisplaySize { get; set; }
+
+ public string OutputAspect { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether HeightControlEnabled.
- /// </summary>
 public bool HeightControlEnabled
 {
- get
- {
- return this.heightControlEnabled;
- }
+ get => this.heightControlEnabled;
 
 set
 {
@@ -189,43 +89,9 @@
 }
 }
 
- /// <summary>
- /// Gets ModulusValues.
- /// </summary>
- public IEnumerable<int> ModulusValues
- {
- get
- {
- return new List<int> { 16, 8, 4, 2 };
- }
- }
-
- /// <summary>
- /// Gets or sets a value indicating whether ShowCustomAnamorphicControls.
- /// </summary>
- public bool ShowCustomAnamorphicControls
- {
- get
- {
- return this.showCustomAnamorphicControls;
- }
-
- set
- {
- this.showCustomAnamorphicControls = value;
- this.NotifyOfPropertyChange(() => this.ShowCustomAnamorphicControls);
- }
- }
-
- /// <summary>
- /// Gets or sets SourceInfo.
- /// </summary>
 public string SourceInfo
 {
- get
- {
- return this.sourceInfo;
- }
+ get => this.sourceInfo;
 
 set
 {
@@ -234,20 +100,11 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Task.
- /// </summary>
 public EncodeTask Task { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether WidthControlEnabled.
- /// </summary>
 public bool WidthControlEnabled
 {
- get
- {
- return this.widthControlEnabled;
- }
+ get => this.widthControlEnabled;
 
 set
 {
@@ -256,198 +113,222 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether ShowModulus.
- /// </summary>
- public bool ShowModulus
+ public int? MaxHeight
 {
- get
- {
- return this.showModulus;
- }
+ get => this.Task.MaxHeight;
 set
 {
- this.showModulus = value;
- this.NotifyOfPropertyChange(() => this.ShowModulus);
+ if (value != this.Task.MaxHeight)
+ {
+ this.Task.MaxHeight = value;
+ this.NotifyOfPropertyChange(() => this.MaxHeight);
+ this.OnTabStatusChanged(null);
+ }
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether ShowDisplaySize.
- /// </summary>
- public bool ShowDisplaySize
+ public int? MaxWidth
 {
- get
- {
- return this.showDisplaySize;
- }
+ get => this.Task.MaxWidth;
 set
 {
- this.showDisplaySize = value;
- this.NotifyOfPropertyChange(() => this.ShowDisplaySize);
+ if (value != this.Task.MaxWidth)
+ {
+ this.Task.MaxWidth = value;
+ this.NotifyOfPropertyChange(() => this.MaxWidth);
+ this.OnTabStatusChanged(null);
+ }
 }
 }
 
- /// <summary>
- /// Gets or sets MaxHeight.
- /// </summary>
- public int MaxHeight
+ public BindingList<PictureSettingsResLimitModes> ResolutionLimitModes => new BindingList<PictureSettingsResLimitModes>
+ {
+ PictureSettingsResLimitModes.Size8K,
+ PictureSettingsResLimitModes.Size4K,
+ PictureSettingsResLimitModes.Size1080p,
+ PictureSettingsResLimitModes.Size720p,
+ PictureSettingsResLimitModes.Size576p,
+ PictureSettingsResLimitModes.Size480p,
+ PictureSettingsResLimitModes.Custom,
+ };
+
+ public PictureSettingsResLimitModes SelectedPictureSettingsResLimitMode
 {
- get
- {
- return this.maxHeight;
- }
+ get => this.selectedPictureSettingsResLimitMode;
 set
 {
- this.maxHeight = value;
+ if (value == this.selectedPictureSettingsResLimitMode)
+ {
+ return;
+ }
+
+ this.selectedPictureSettingsResLimitMode = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPictureSettingsResLimitMode);
+
+ this.IsCustomMaxRes = value == PictureSettingsResLimitModes.Custom;
+ this.NotifyOfPropertyChange(() => this.IsCustomMaxRes);
+
+ // Enforce the new limit
+ ResLimit limit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(value);
+
+ if (value == PictureSettingsResLimitModes.Custom && this.Task.MaxWidth == null && this.Task.MaxHeight == null)
+ {
+ // Default to 4K if null!
+ limit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(PictureSettingsResLimitModes.Size4K);
+ }
+ 
+ if (limit != null)
+ {
+ this.Task.MaxWidth = limit.Width;
+ this.Task.MaxHeight = limit.Height;
+ }
+
+ if (value == PictureSettingsResLimitModes.None)
+ {
+ this.Task.MaxWidth = null;
+ this.Task.MaxHeight = null;
+ }
+
+ this.NotifyOfPropertyChange(() => this.MaxWidth);
 this.NotifyOfPropertyChange(() => this.MaxHeight);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.ResolutionLimit);
+
+ this.OnTabStatusChanged(null);
 }
 }
 
- /// <summary>
- /// Gets or sets MinHeight.
- /// </summary>
- public int MaxWidth
+ public bool IsCustomMaxRes { get; private set; }
+
+ public bool OptimalSize
 {
- get
- {
- return this.maxWidth;
- }
+ get => this.Task.OptimalSize;
 set
 {
- this.maxWidth = value;
- this.NotifyOfPropertyChange(() => this.MaxWidth);
+ this.Task.OptimalSize = value;
+ this.UpdateVisibleControls();
+ this.Task.Width = this.sourceResolution.Width;
+
+ this.NotifyOfPropertyChange(() => this.OptimalSize);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.OptimalSize);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether show keep ar.
- /// </summary>
- public bool ShowKeepAR
+ public bool AllowUpscaling
 {
- get
- {
- return this.showKeepAr;
- }
+ get => this.Task.AllowUpscaling;
 set
 {
- this.showKeepAr = value;
- this.NotifyOfPropertyChange(() => this.ShowKeepAR);
+ this.Task.AllowUpscaling = value;
+ this.UpdateVisibleControls();
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.AllowUpscale);
+ this.NotifyOfPropertyChange(() => this.AllowUpscaling);
 }
 }
 
- #endregion
-
- #region Task Properties
+ /* Task Properties */
 
- /// <summary>
- /// Gets or sets CropBottom.
- /// </summary>
 public int CropBottom
 {
- get
- {
- return this.Task.Cropping.Bottom;
- }
+ get => this.Task.Cropping.Bottom;
 
 set
 {
+ if (!ValidCropTB(value, this.CropTop))
+ {
+ return; // Don't accept user input.
+ }
+
 this.Task.Cropping.Bottom = value;
 this.NotifyOfPropertyChange(() => this.CropBottom);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
- /// <summary>
- /// Gets or sets CropLeft.
- /// </summary>
 public int CropLeft
 {
- get
- {
- return this.Task.Cropping.Left;
- }
+ get => this.Task.Cropping.Left;
 
 set
 {
+ if (!ValidCropLR(value, this.CropRight))
+ {
+ return; // Don't accept user input.
+ }
+
 this.Task.Cropping.Left = value;
 this.NotifyOfPropertyChange(() => this.CropLeft);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
- /// <summary>
- /// Gets or sets CropRight.
- /// </summary>
 public int CropRight
 {
- get
- {
- return this.Task.Cropping.Right;
- }
+ get => this.Task.Cropping.Right;
 
 set
 {
+ if (!ValidCropLR(value, this.CropLeft))
+ {
+ return; // Don't accept user input.
+ }
+
 this.Task.Cropping.Right = value;
 this.NotifyOfPropertyChange(() => this.CropRight);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
- /// <summary>
- /// Gets or sets CropTop.
- /// </summary>
 public int CropTop
 {
- get
- {
- return this.Task.Cropping.Top;
- }
+ get => this.Task.Cropping.Top;
 
 set
 {
+ if (!ValidCropTB(value, this.CropBottom))
+ {
+ return; // Don't accept user input.
+ }
+
 this.Task.Cropping.Top = value;
 this.NotifyOfPropertyChange(() => this.CropTop);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Crop);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether IsCustomCrop.
- /// </summary>
+ public int MaxCropLR => currentTitle?.Resolution.Width - 8 ?? 0;
+ 
+ public int MaxCropTB => currentTitle?.Resolution.Height - 8 ?? 0;
+ 
 public bool IsCustomCrop
 {
- get
- {
- return this.Task.HasCropping;
- }
+ get => this.Task.HasCropping;
 
 set
 {
 this.Task.HasCropping = value;
 this.NotifyOfPropertyChange(() => this.IsCustomCrop);
+ this.OnTabStatusChanged(null);
 
 if (!value && this.currentTitle != null)
 {
- this.CropTop = currentTitle.AutoCropDimensions.Top;
- this.CropBottom = currentTitle.AutoCropDimensions.Bottom;
- this.CropLeft = currentTitle.AutoCropDimensions.Left;
- this.CropRight = currentTitle.AutoCropDimensions.Right;
+ this.Task.Cropping.Top = currentTitle.AutoCropDimensions.Top;
+ this.Task.Cropping.Bottom = currentTitle.AutoCropDimensions.Bottom;
+ this.Task.Cropping.Left = currentTitle.AutoCropDimensions.Left;
+ this.Task.Cropping.Right = currentTitle.AutoCropDimensions.Right;
+
+ this.NotifyOfPropertyChange(() => this.CropLeft);
+ this.NotifyOfPropertyChange(() => this.CropRight);
+ this.NotifyOfPropertyChange(() => this.CropTop);
+ this.NotifyOfPropertyChange(() => this.CropBottom);
 }
+
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Crop);
 }
 }
 
- /// <summary>
- /// Gets or sets DisplayWidth.
- /// </summary>
- public long DisplayWidth
+ public int DisplayWidth
 {
- get
- {
- return this.Task.DisplayWidth.HasValue
- ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString(CultureInfo.InvariantCulture))
- : 0;
- }
+ get => this.Task.DisplayWidth.HasValue ? int.Parse(Math.Round(this.Task.DisplayWidth.Value, 0).ToString(CultureInfo.InvariantCulture)) : 0;
 
 set
 {
@@ -455,20 +336,16 @@
 {
 this.Task.DisplayWidth = value;
 this.NotifyOfPropertyChange(() => this.DisplayWidth);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.DisplayWidth);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.DisplayWidth);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets Width.
- /// </summary>
+ public int DisplayHeight { get; set; }
+
 public int Width
 {
- get
- {
- return this.Task.Width.HasValue ? this.Task.Width.Value : 0;
- }
+ get => this.Task.Width.HasValue ? this.Task.Width.Value : 0;
 
 set
 {
@@ -476,20 +353,14 @@
 {
 this.Task.Width = value;
 this.NotifyOfPropertyChange(() => this.Width);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Width);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets Height.
- /// </summary>
 public int Height
 {
- get
- {
- return this.Task.Height.HasValue ? this.Task.Height.Value : 0;
- }
+ get => this.Task.Height.HasValue ? this.Task.Height.Value : 0;
 
 set
 {
@@ -497,38 +368,26 @@
 {
 this.Task.Height = value;
 this.NotifyOfPropertyChange(() => this.Height);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Height);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Height);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether MaintainAspectRatio.
- /// </summary>
 public bool MaintainAspectRatio
 {
- get
- {
- return this.Task.KeepDisplayAspect;
- }
+ get => this.Task.KeepDisplayAspect;
 
 set
 {
 this.Task.KeepDisplayAspect = value;
 this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.MaintainAspectRatio);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.MaintainAspectRatio);
 }
 }
 
- /// <summary>
- /// Gets or sets ParHeight.
- /// </summary>
 public int ParHeight
 {
- get
- {
- return this.Task.PixelAspectY;
- }
+ get => this.Task.PixelAspectY;
 
 set
 {
@@ -536,20 +395,14 @@
 {
 this.Task.PixelAspectY = value;
 this.NotifyOfPropertyChange(() => this.ParHeight);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.ParH);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.ParH);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets ParWidth.
- /// </summary>
 public int ParWidth
 {
- get
- {
- return this.Task.PixelAspectX;
- }
+ get => this.Task.PixelAspectX;
 
 set
 {
@@ -557,20 +410,14 @@
 {
 this.Task.PixelAspectX = value;
 this.NotifyOfPropertyChange(() => this.ParWidth);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.ParW);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.ParW);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedAnamorphicMode.
- /// </summary>
 public Anamorphic SelectedAnamorphicMode
 {
- get
- {
- return this.Task.Anamorphic;
- }
+ get => this.Task.Anamorphic;
 
 set
 {
@@ -578,54 +425,22 @@
 {
 this.Task.Anamorphic = value;
 this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Anamorphic);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Anamorphic);
 this.OnTabStatusChanged(null);
+ this.IsPixelAspectSettable = value == Anamorphic.Custom;
+ this.NotifyOfPropertyChange(() => this.IsPixelAspectSettable);
 }
 }
 }
 
- /// <summary>
- /// Gets or sets SelectedModulus.
- /// </summary>
- public int? SelectedModulus
- {
- get
- {
- return this.Task.Modulus;
- }
-
- set
- {
- this.Task.Modulus = value;
- this.NotifyOfPropertyChange(() => this.SelectedModulus);
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Modulus);
- this.OnTabStatusChanged(null);
- }
- }
-
- #endregion
+ public bool IsPixelAspectSettable { get; set; }
 
- #region Public Methods
+ /* Public Tab API Implementation */
 
- /// <summary>
- /// Setup this tab for the specified preset.
- /// </summary>
- /// <param name="preset">
- /// The preset.
- /// </param>
- /// <param name="task">
- /// The task.
- /// </param>
 public void SetPreset(Preset preset, EncodeTask task)
 {
 this.Task = task;
 
- // Handle built-in presets.
- if (preset.IsBuildIn)
- {
- preset.PictureSettingsMode = PresetPictureSettingsMode.Custom;
- }
-
 // Cropping
 if (preset.Task.HasCropping)
 {
@@ -645,73 +460,38 @@
 this.IsCustomCrop = false;
 }
 
+ // Padding and Rotate Filters
+ this.PaddingFilter.SetPreset(preset, task);
+ this.RotateFlipFilter?.SetPreset(preset, task);
 
- // Setup the Picture Sizes
- switch (preset.PictureSettingsMode)
- {
- default:
- case PresetPictureSettingsMode.Custom:
- case PresetPictureSettingsMode.SourceMaximum:
-
- // Anamorphic Mode
- this.SelectedAnamorphicMode = preset.Task.Anamorphic;
-
- // Modulus
- if (preset.Task.Modulus.HasValue)
- {
- this.SelectedModulus = preset.Task.Modulus;
- }
-
- // Set the Maintain Aspect ratio.
- this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;
+ // Picture Sizes and Anamorphic
+ this.SelectedAnamorphicMode = preset.Task.Anamorphic;
+ this.OptimalSize = preset.Task.OptimalSize;
+ this.AllowUpscaling = preset.Task.AllowUpscaling;
 
- // Set the Maximum so libhb can correctly manage the size.
- if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- this.MaxWidth = this.sourceResolution.Width;
- this.MaxHeight = this.sourceResolution.Height;
- }
- else
- {
+ // Set the Maintain Aspect ratio.
+ this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;
 
- int presetWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
- int presetHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
+ // Setup the Maximum Width / Height
+ this.MaxWidth = preset.Task.MaxWidth;
+ this.MaxHeight = preset.Task.MaxHeight;
+ this.SetSelectedPictureSettingsResLimitMode();
 
- this.MaxWidth = presetWidth <= this.sourceResolution.Width ? presetWidth : this.sourceResolution.Width;
- this.MaxHeight = presetHeight <= this.sourceResolution.Height ? presetHeight : this.sourceResolution.Height; 
- } 
+ // Set the width, then check the height doesn't breach the max height and correct if necessary.
+ int width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), this.MaxWidth));
+ int height = this.GetModulusValue(this.GetRes((this.sourceResolution.Height - this.CropTop - this.CropBottom), this.MaxHeight));
 
- // Set the width, then check the height doesn't breach the max height and correct if necessary.
- int width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), this.MaxWidth));
- int height = this.GetModulusValue(this.GetRes((this.sourceResolution.Height - this.CropTop - this.CropBottom), this.MaxHeight));
+ // Set the backing fields to avoid triggering re-calculation until both are set.
+ this.Task.Width = width;
+ this.Task.Height = height;
 
- // Set the backing fields to avoid triggering recalulation until both are set.
- this.Task.Width = width;
- this.Task.Height = height;
-
- // Trigger a Recalc
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
-
- // Update the UI
- this.NotifyOfPropertyChange(() => this.Width);
- this.NotifyOfPropertyChange(() => this.Height);
-
- break;
- case PresetPictureSettingsMode.None:
- // Do Nothing except reset the Max Width/Height
- this.MaxWidth = this.sourceResolution.Width;
- this.MaxHeight = this.sourceResolution.Height;
- this.SelectedAnamorphicMode = preset.Task.Anamorphic;
+ // Trigger a calculation
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Width);
 
- if (this.Width > this.MaxWidth)
- {
- // Trigger a Recalc
- this.Task.Width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), this.MaxWidth));
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
- }
+ // Update the UI
+ this.NotifyOfPropertyChange(() => this.Width);
+ this.NotifyOfPropertyChange(() => this.Height);
 
- break;
- }
 
 // Custom Anamorphic
 if (preset.Task.Anamorphic == Anamorphic.Custom)
@@ -723,22 +503,20 @@
 
 this.NotifyOfPropertyChange(() => this.Task);
 
- this.UpdateVisibileControls();
+ this.UpdateVisibleControls();
 }
 
- /// <summary>
- /// Update all the UI controls based on the encode task passed in.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
 public void UpdateTask(EncodeTask task)
 {
 this.Task = task;
+ this.SetSelectedPictureSettingsResLimitMode();
+
+ this.PaddingFilter.UpdateTask(task);
+ this.RotateFlipFilter?.UpdateTask(task);
+
 this.NotifyOfPropertyChange(() => this.Width);
 this.NotifyOfPropertyChange(() => this.Height);
 this.NotifyOfPropertyChange(() => this.SelectedAnamorphicMode);
- this.NotifyOfPropertyChange(() => this.SelectedModulus);
 this.NotifyOfPropertyChange(() => this.CropTop);
 this.NotifyOfPropertyChange(() => this.CropBottom);
 this.NotifyOfPropertyChange(() => this.CropLeft);
@@ -748,29 +526,18 @@
 this.NotifyOfPropertyChange(() => this.DisplayWidth);
 this.NotifyOfPropertyChange(() => this.ParWidth);
 this.NotifyOfPropertyChange(() => this.ParHeight);
+ this.NotifyOfPropertyChange(() => this.MaxWidth);
+ this.NotifyOfPropertyChange(() => this.MaxHeight);
 
- this.UpdateVisibileControls();
+ this.UpdateVisibleControls();
 }
 
- /// <summary>
- /// Setup this window for a new source
- /// </summary>
- /// <param name="source">
- /// The source.
- /// </param>
- /// <param name="title">
- /// The title.
- /// </param>
- /// <param name="preset">
- /// The preset.
- /// </param>
- /// <param name="task">
- /// The task.
- /// </param>
 public void SetSource(Source source, Title title, Preset preset, EncodeTask task)
 {
 this.currentTitle = title;
 this.Task = task;
+ this.PaddingFilter.SetSource(source, title, preset, task);
+ this.RotateFlipFilter?.SetSource(source, title, preset, task);
 
 this.scannedSource = source;
 
@@ -780,16 +547,8 @@
 this.sourceParValues = title.ParVal;
 this.sourceResolution = title.Resolution;
 
- // Update the cropping values, preffering those in the presets.
- if (!preset.Task.HasCropping)
- {
- this.Task.Cropping.Top = title.AutoCropDimensions.Top;
- this.Task.Cropping.Bottom = title.AutoCropDimensions.Bottom;
- this.Task.Cropping.Left = title.AutoCropDimensions.Left;
- this.Task.Cropping.Right = title.AutoCropDimensions.Right;
- this.IsCustomCrop = false;
- }
- else
+ // Update the cropping values, preferring those in the presets.
+ if (preset.Task.HasCropping)
 {
 this.Task.Cropping.Left = preset.Task.Cropping.Left;
 this.Task.Cropping.Right = preset.Task.Cropping.Right;
@@ -797,55 +556,34 @@
 this.Task.Cropping.Bottom = preset.Task.Cropping.Bottom;
 this.IsCustomCrop = true;
 }
-
- // Set the Max Width / Height available to the user controls.
- // Preset Max is null for None / SourceMax
- this.MaxWidth = preset.Task.MaxWidth ?? this.sourceResolution.Width;
- if (this.sourceResolution.Width < this.MaxWidth)
- {
- this.MaxWidth = this.sourceResolution.Width;
- }
-
- this.MaxHeight = preset.Task.MaxHeight ?? this.sourceResolution.Height;
- if (this.sourceResolution.Height < this.MaxHeight)
+ else if (!this.IsCustomCrop) 
 {
- this.MaxHeight = this.sourceResolution.Height;
+ // Only set Auto-crop values if we are in Automatic mode. If it's custom, assume the user has taken control.
+ this.Task.Cropping.Top = title.AutoCropDimensions.Top;
+ this.Task.Cropping.Bottom = title.AutoCropDimensions.Bottom;
+ this.Task.Cropping.Left = title.AutoCropDimensions.Left;
+ this.Task.Cropping.Right = title.AutoCropDimensions.Right;
+ this.IsCustomCrop = false;
 }
-
+ 
 // Set the W/H
- if (preset.PictureSettingsMode == PresetPictureSettingsMode.None)
- {
- this.Task.Width = this.GetModulusValue(this.sourceResolution.Width - this.CropLeft - this.CropRight);
- this.Task.Height = this.GetModulusValue(this.sourceResolution.Height - this.CropTop - this.CropBottom);
- }
- else if (preset.PictureSettingsMode == PresetPictureSettingsMode.SourceMaximum)
- {
- this.Task.Width = this.GetModulusValue(this.sourceResolution.Width - this.CropLeft - this.CropRight);
- this.Task.Height = this.GetModulusValue(this.sourceResolution.Height - this.CropTop - this.CropBottom);
- this.MaintainAspectRatio = preset.Task.KeepDisplayAspect;
- }
- else 
- {
- // Custom
- // Set the Width, and Maintain Aspect ratio. That should calc the Height for us.
- this.Task.Width = this.GetModulusValue(this.sourceResolution.Width - this.CropLeft - this.CropRight);
- 
- if (this.SelectedAnamorphicMode != Anamorphic.Loose)
- {
- this.Task.Height = this.GetModulusValue(this.sourceResolution.Height - this.CropTop - this.CropBottom);
- }
- }
+ // Set the width, then check the height doesn't breach the max height and correct if necessary.
+ this.Task.Width = this.GetModulusValue(this.GetRes((this.sourceResolution.Width - this.CropLeft - this.CropRight), this.MaxWidth));
+ this.Task.Height = this.GetModulusValue(this.GetRes((this.sourceResolution.Height - this.CropTop - this.CropBottom), this.MaxHeight));
 
 // Set Screen Controls
+ // "Storage Size: {0}x{1} Display Size: {2}x{3} Aspect Ratio: {4}",
+ double sourceDisplayWidth = (double)title.Resolution.Width * title.ParVal.Width / title.ParVal.Height;
 this.SourceInfo = string.Format(
- "{0}x{1}, PAR: {2}/{3}",
+ Resources.PictureSettingsViewModel_SourceInfo,
 title.Resolution.Width,
 title.Resolution.Height,
- title.ParVal.Width,
- title.ParVal.Height);
+ sourceDisplayWidth,
+ title.Resolution.Height,
+ HandBrakePictureHelpers.GetNiceDisplayAspect(sourceDisplayWidth, title.Resolution.Height)); 
 
 // Force a re-calc. This will handle MaxWidth / Height corrections.
- this.RecaulcatePictureSettingsProperties(ChangedPictureField.Width);
+ this.RecalculatePictureSettingsProperties(ChangedPictureField.Width);
 }
 
 this.NotifyOfPropertyChange(() => this.Task);
@@ -858,7 +596,27 @@
 return false;
 }
 
- if (preset.Task.Modulus != this.SelectedModulus)
+ if (preset.Task.MaxHeight != this.MaxHeight)
+ {
+ return false;
+ }
+
+ if (preset.Task.MaxWidth != this.MaxWidth)
+ {
+ return false;
+ }
+
+ if (!preset.Task.HasCropping && this.IsCustomCrop)
+ {
+ return false;
+ }
+
+ if (!PaddingFilter.MatchesPreset(preset))
+ {
+ return false;
+ }
+
+ if (!RotateFlipFilter.MatchesPreset(preset))
 {
 return false;
 }
@@ -866,40 +624,56 @@
 return true;
 }
 
- #endregion
+ /* Protected and Private Methods */
 
- #region Methods
+ public void OpenPreviewWindow()
+ {
+ if (!string.IsNullOrEmpty(this.Task.Source) && !this.StaticPreviewViewModel.IsOpen)
+ {
+ this.StaticPreviewViewModel.IsOpen = true;
+ this.StaticPreviewViewModel.UpdatePreviewFrame(this.Task, this.scannedSource);
+ this.windowManager.ShowWindowAsync(this.StaticPreviewViewModel);
+ }
+ else if (this.StaticPreviewViewModel.IsOpen)
+ {
+ Window window = Application.Current.Windows.Cast<Window>().FirstOrDefault(x => x.GetType() == typeof(StaticPreviewView));
+ window?.Focus();
+ }
+ }
 
 protected virtual void OnTabStatusChanged(TabStatusEventArgs e)
 {
 this.TabStatusChanged?.Invoke(this, e);
 }
 
- /// <summary>
- /// The init.
- /// </summary>
+ protected virtual void OnFilterChanged(TabStatusEventArgs e)
+ {
+ RecalculatePictureSettingsProperties(ChangedPictureField.Padding);
+
+ this.TabStatusChanged?.Invoke(this, e);
+ }
+
+ protected virtual void OnFlipRotateChanged(FlipRotationCommand e)
+ {
+ this.HandleRotationFlipChange(e);
+ this.TabStatusChanged?.Invoke(this, new TabStatusEventArgs(null));
+ }
+
 private void Init()
 {
- this.Task.Modulus = 16;
 this.Task.KeepDisplayAspect = true;
 
- this.NotifyOfPropertyChange(() => this.SelectedModulus);
 this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
 
- // Default the Max Width / Height to 1080p format
- this.MaxHeight = 1080;
- this.MaxWidth = 1920;
+ // Default the Max Width / Height to 4K format
+ this.MaxHeight = 2160;
+ this.MaxWidth = 3480;
+ this.SetSelectedPictureSettingsResLimitMode();
 }
 
- /// <summary>
- /// The get picture title info.
- /// </summary>
- /// <returns>
- /// The <see cref="PictureSize.PictureSettingsTitle"/>.
- /// </returns>
- private PictureSize.PictureSettingsTitle GetPictureTitleInfo()
+ private PictureSettingsTitle GetPictureTitleInfo()
 {
- PictureSize.PictureSettingsTitle title = new PictureSize.PictureSettingsTitle
+ PictureSettingsTitle title = new PictureSettingsTitle
 {
 Width = this.sourceResolution.Width,
 Height = this.sourceResolution.Height,
@@ -910,27 +684,25 @@
 return title;
 }
 
- /// <summary>
- /// The get picture settings.
- /// </summary>
- /// <returns>
- /// The <see cref="PictureSize.PictureSettingsJob"/>.
- /// </returns>
- private PictureSize.PictureSettingsJob GetPictureSettings(ChangedPictureField changedField)
+ private PictureSettingsJob GetPictureSettings(ChangedPictureField changedField)
 {
- PictureSize.PictureSettingsJob job = new PictureSize.PictureSettingsJob
+ PictureSettingsJob job = new PictureSettingsJob
 {
 Width = this.Width,
 Height = this.Height,
 ItuPar = false,
- Modulus = this.SelectedModulus,
- ParW = this.ParWidth,
- ParH = this.ParHeight,
- MaxWidth = this.MaxWidth,
- MaxHeight = this.MaxHeight,
+ ParW = this.SelectedAnamorphicMode == Anamorphic.None ? 1 : this.ParWidth,
+ ParH = this.SelectedAnamorphicMode == Anamorphic.None ? 1 : this.ParHeight,
+ MaxWidth = this.MaxWidth.HasValue ? this.MaxWidth.Value : 0,
+ MaxHeight = this.MaxHeight.HasValue ? this.MaxHeight.Value : 0,
 KeepDisplayAspect = this.MaintainAspectRatio,
 AnamorphicMode = this.SelectedAnamorphicMode,
 Crop = new Cropping(this.CropTop, this.CropBottom, this.CropLeft, this.CropRight),
+ Pad = new Padding(this.PaddingFilter.Top, this.PaddingFilter.Bottom, this.PaddingFilter.Left, this.PaddingFilter.Right),
+ RotateAngle = this.RotateFlipFilter.SelectedRotation,
+ Hflip = this.RotateFlipFilter.FlipVideo ? 1 : 0,
+ DarWidth = this.DisplayWidth,
+ DarHeight = this.DisplayHeight
 };
 
 if (this.SelectedAnamorphicMode == Anamorphic.Custom)
@@ -938,7 +710,7 @@
 if (changedField == ChangedPictureField.DisplayWidth)
 {
 var displayWidth = this.DisplayWidth;
- job.ParW = (int)displayWidth; // num
+ job.ParW = (int)displayWidth; // num
 job.ParH = job.Width; // den
 }
 }
@@ -963,7 +735,7 @@
 /// <param name="changedField">
 /// The changed field.
 /// </param>
- private void RecaulcatePictureSettingsProperties(ChangedPictureField changedField)
+ private void RecalculatePictureSettingsProperties(ChangedPictureField changedField)
 {
 // Sanity Check
 if (this.currentTitle == null)
@@ -972,10 +744,10 @@
 }
 
 // Step 1, Update what controls are visible.
- this.UpdateVisibileControls();
+ this.UpdateVisibleControls();
 
 // Step 2, Set sensible defaults
- if (changedField == ChangedPictureField.Anamorphic && (this.SelectedAnamorphicMode == Anamorphic.None || this.SelectedAnamorphicMode == Anamorphic.Loose))
+ if (changedField == ChangedPictureField.Anamorphic && (this.SelectedAnamorphicMode == Anamorphic.None))
 {
 this.Task.Width = this.sourceResolution.Width > this.MaxWidth
 ? this.MaxWidth
@@ -984,33 +756,66 @@
 }
 
 // Choose which setting to keep.
- PictureSize.KeepSetting setting = PictureSize.KeepSetting.HB_KEEP_WIDTH;
+ HandBrakePictureHelpers.KeepSetting setting = 0;
 switch (changedField)
 {
 case ChangedPictureField.Width:
- setting = PictureSize.KeepSetting.HB_KEEP_WIDTH;
+ setting = HandBrakePictureHelpers.KeepSetting.HB_KEEP_WIDTH;
 break;
 case ChangedPictureField.Height:
- setting = PictureSize.KeepSetting.HB_KEEP_HEIGHT;
+ setting = HandBrakePictureHelpers.KeepSetting.HB_KEEP_HEIGHT;
+ break;
+ case ChangedPictureField.DisplayWidth:
+ setting = HandBrakePictureHelpers.KeepSetting.HB_KEEP_DISPLAY_WIDTH;
+ break;
+ case ChangedPictureField.ParW:
+ case ChangedPictureField.ParH:
+ setting = HandBrakePictureHelpers.KeepSetting.HB_KEEP_HEIGHT;
+ break;
+ case ChangedPictureField.Padding:
+ setting = HandBrakePictureHelpers.KeepSetting.HB_KEEP_PAD;
 break;
 }
 
+ if (this.MaintainAspectRatio)
+ {
+ setting |= HandBrakePictureHelpers.KeepSetting.HB_KEEP_DISPLAY_ASPECT;
+ }
+
 // Step 2, For the changed field, call hb_set_anamorphic_size and process the results.
- PictureSize.AnamorphicResult result = PictureSize.hb_set_anamorphic_size2(this.GetPictureSettings(changedField), this.GetPictureTitleInfo(), setting);
- double dispWidth = Math.Round((result.OutputWidth * result.OutputParWidth / result.OutputParHeight), 0);
+ HandBrakePictureHelpers.FlagsSetting flag = 0;
+ if (this.AllowUpscaling)
+ {
+ flag = HandBrakePictureHelpers.FlagsSetting.HB_GEO_SCALE_UP;
+ }
+
+ if (this.OptimalSize)
+ {
+ flag |= HandBrakePictureHelpers.FlagsSetting.HB_GEO_SCALE_BEST;
+ }
 
+ AnamorphicResult result = HandBrakePictureHelpers.GetAnamorphicSize(this.GetPictureSettings(changedField), this.GetPictureTitleInfo(), setting, flag);
+ 
 this.Task.Width = result.OutputWidth;
 this.Task.Height = result.OutputHeight;
- long x, y;
- HandBrakeUtils.Reduce((int)Math.Round(result.OutputParWidth, 0), (int)Math.Round(result.OutputParHeight, 0), out x, out y);
 this.Task.PixelAspectX = (int)Math.Round(result.OutputParWidth, 0);
 this.Task.PixelAspectY = (int)Math.Round(result.OutputParHeight, 0);
+
+ this.ApplyPad(this.PaddingFilter.Mode, result); // Update for display purposes. 
+ double dispWidth = Math.Round(result.OutputWidth * result.OutputParWidth / result.OutputParHeight, 0);
 this.Task.DisplayWidth = dispWidth;
+ this.DisplayHeight = result.OutputHeight;
+ 
 
 // Step 3, Set the display width label to indicate the output.
 this.DisplaySize = this.sourceResolution == null || this.sourceResolution.IsEmpty
 ? string.Empty
- : string.Format(Resources.PictureSettingsViewModel_StorageDisplayLabel, dispWidth, result.OutputHeight, this.ParWidth, this.ParHeight);
+ : string.Format(Resources.PictureSettingsViewModel_StorageDisplayLabel, result.OutputWidth, result.OutputHeight);
+ this.NotifyOfPropertyChange(() => this.DisplaySize);
+
+ this.OutputAspect = string.Format(Resources.PictureSettingsViewModel_AspectRatioLabel, HandBrakePictureHelpers.GetNiceDisplayAspect(dispWidth, result.OutputHeight));
+ this.NotifyOfPropertyChange(() => this.OutputAspect);
+
 
 // Step 4, Force an update on all the UI elements.
 this.NotifyOfPropertyChange(() => this.Width);
@@ -1022,7 +827,6 @@
 this.NotifyOfPropertyChange(() => this.CropBottom);
 this.NotifyOfPropertyChange(() => this.CropLeft);
 this.NotifyOfPropertyChange(() => this.CropRight);
- this.NotifyOfPropertyChange(() => this.SelectedModulus);
 this.NotifyOfPropertyChange(() => this.MaintainAspectRatio);
 
 // Step 5, Update the Preview
@@ -1032,114 +836,132 @@
 }
 }
 
- /// <summary>
- /// The update visible controls.
- /// </summary>
- private void UpdateVisibileControls()
+ private void ApplyPad(PaddingMode mode, AnamorphicResult result)
 {
- this.ShowDisplaySize = true;
- this.ShowKeepAR = true;
-
- switch (this.SelectedAnamorphicMode)
+ if (mode == PaddingMode.Custom)
 {
- case Anamorphic.None:
- this.WidthControlEnabled = true;
- this.HeightControlEnabled = true;
- this.ShowCustomAnamorphicControls = false;
- this.ShowModulus = true;
- this.ShowDisplaySize = true;
- this.ShowKeepAR = true;
- break;
- case Anamorphic.Automatic:
- this.WidthControlEnabled = true;
- this.HeightControlEnabled = true;
- this.ShowCustomAnamorphicControls = false;
- this.ShowModulus = true;
- this.ShowKeepAR = false;
- break;
-
- case Anamorphic.Loose:
- this.WidthControlEnabled = true;
- this.HeightControlEnabled = false;
- this.ShowCustomAnamorphicControls = false;
- this.ShowModulus = true;
- this.ShowKeepAR = false;
- break;
-
- case Anamorphic.Custom:
- this.WidthControlEnabled = true;
- this.HeightControlEnabled = true;
- this.ShowCustomAnamorphicControls = true;
- this.ShowModulus = true;
- this.ShowDisplaySize = true;
- this.ShowKeepAR = true;
- break;
+ result.OutputWidth = result.OutputWidth + this.PaddingFilter.Left + this.PaddingFilter.Right;
+ result.OutputHeight = result.OutputHeight + this.PaddingFilter.Top + this.PaddingFilter.Bottom;
 }
 }
 
- /// <summary>
- /// For a given value, correct so that it matches the users currently selected modulus value
- /// </summary>
- /// <param name="value">
- /// The value.
- /// </param>
- /// <returns>
- /// Value corrected so that value % selected modulus == 0
- /// </returns>
- private int GetModulusValue(double value)
+ private void UpdateVisibleControls()
 {
- if (this.SelectedModulus == null)
+ this.WidthControlEnabled = true;
+ this.HeightControlEnabled = true;
+
+ if (OptimalSize)
 {
- return 0;
+ this.WidthControlEnabled = false;
+ this.HeightControlEnabled = false;
 }
+ }
 
- double remainder = value % this.SelectedModulus.Value;
+ private int GetModulusValue(double value)
+ {
+ double remainder = value % 2;
 
 if (remainder.Equals(0.0d))
 {
 return (int)Math.Abs(value);
 }
 
- double result = remainder >= ((double)this.SelectedModulus.Value / 2)
- ? value + (this.SelectedModulus.Value - remainder)
+ double result = remainder >= 1
+ ? value + (2 - remainder)
 : value - remainder;
 
 return (int)Math.Abs(result);
 }
 
- /// <summary>
- /// The get res.
- /// </summary>
- /// <param name="value">
- /// The value.
- /// </param>
- /// <param name="max">
- /// The max.
- /// </param>
- /// <returns>
- /// The <see cref="int"/>.
- /// </returns>
 private int GetRes(int value, int? max)
 {
 return max.HasValue ? (value > max.Value ? max.Value : value) : value;
 }
 
- #endregion
- }
+ private void SetSelectedPictureSettingsResLimitMode()
+ {
+ if (this.MaxWidth == null && this.MaxHeight == null)
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.None;
+ return;
+ }
 
- /// <summary>
- /// The changed picture field.
- /// </summary>
- public enum ChangedPictureField
- {
- Width,
- Height,
- ParW,
- ParH,
- DisplayWidth,
- Crop,
- Anamorphic,
- MaintainAspectRatio,
- Modulus
+ // Look for a matching resolution.
+ foreach (PictureSettingsResLimitModes limit in EnumHelper<PictureSettingsResLimitModes>.GetEnumList())
+ {
+ ResLimit resLimit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(limit);
+ if (resLimit != null)
+ {
+ if (resLimit.Width == this.MaxWidth && resLimit.Height == this.MaxHeight)
+ {
+ this.SelectedPictureSettingsResLimitMode = limit;
+ return;
+ }
+ }
+ }
+
+ if (this.MaxWidth.HasValue || this.MaxHeight.HasValue)
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.Custom;
+ }
+ }
+
+ private bool ValidCropTB(int value, int value2)
+ {
+ int totalCrop = value + value2;
+ if (totalCrop >= this.currentTitle.Resolution.Height)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ private bool ValidCropLR(int value, int value2)
+ {
+ int totalCrop = value + value2;
+ if (totalCrop >= this.currentTitle.Resolution.Width)
+ {
+ return false;
+ }
+
+ return true;
+ }
+
+ private void HandleRotationFlipChange(FlipRotationCommand command)
+ {
+ if (this.currentTitle == null)
+ {
+ return;
+ }
+
+ PictureSettingsJob job = this.GetPictureSettings(command.ChangedField);
+ job.PreviousHflip = command.PreviousHflip;
+ job.PreviousRotation = command.PreviousRotation;
+ RotateResult result = HandBrakePictureHelpers.RotateGeometry(job);
+
+ this.Task.Cropping.Top = result.CropTop;
+ this.Task.Cropping.Bottom = result.CropBottom;
+ this.Task.Cropping.Left = result.CropLeft;
+ this.Task.Cropping.Right = result.CropRight;
+ this.NotifyOfPropertyChange(() => this.CropTop);
+ this.NotifyOfPropertyChange(() => this.CropBottom);
+ this.NotifyOfPropertyChange(() => this.CropLeft);
+ this.NotifyOfPropertyChange(() => this.CropRight);
+
+ this.PaddingFilter.SetRotationValues(result.PadTop, result.PadBottom, result.PadLeft, result.PadRight);
+
+ this.Task.Width = result.Width;
+ this.Task.Height = result.Height;
+ this.Task.PixelAspectX = result.ParNum;
+ this.Task.PixelAspectY = result.ParDen;
+
+ this.NotifyOfPropertyChange(() => this.Width);
+ this.NotifyOfPropertyChange(() => this.Height);
+ this.NotifyOfPropertyChange(() => this.ParWidth);
+ this.NotifyOfPropertyChange(() => this.ParHeight);
+
+ RecalculatePictureSettingsProperties(ChangedPictureField.Rotate);
+ }
 }
 }
\ No newline at end of file

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/PresetManagerViewModel.cs Added

@@ -0,0 +1,501 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetManagerViewModel.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Defines the PresetManagerViewModel type.
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.ViewModels
+{
+ using System.Collections.Generic;
+ using System.ComponentModel;
+ using System.Diagnostics;
+ using System.Linq;
+ using System.Windows;
+
+ using Caliburn.Micro;
+
+ using HandBrakeWPF.Factories;
+ using HandBrakeWPF.Model.Audio;
+ using HandBrakeWPF.Model.Picture;
+ using HandBrakeWPF.Model.Subtitles;
+ using HandBrakeWPF.Properties;
+ using HandBrakeWPF.Services.Interfaces;
+ using HandBrakeWPF.Services.Presets.Interfaces;
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.Utilities;
+ using HandBrakeWPF.ViewModels.Interfaces;
+ using HandBrakeWPF.Views;
+
+ using Microsoft.Win32;
+
+ using Action = System.Action;
+
+ public class PresetManagerViewModel : ViewModelBase, IPresetManagerViewModel
+ {
+ private readonly IPresetService presetService;
+ private readonly IErrorService errorService;
+ private readonly IWindowManager windowManager;
+ private readonly PresetDisplayCategory addNewCategory = new PresetDisplayCategory(Resources.AddPresetView_AddNewCategory, true, null);
+
+ private IPresetObject selectedPresetCategory;
+ private Preset selectedPreset;
+ private PictureSettingsResLimitModes selectedPictureSettingsResLimitMode;
+ private Action mainWindowCallback;
+
+ public PresetManagerViewModel(IPresetService presetService, IErrorService errorService, IWindowManager windowManager)
+ {
+ this.presetService = presetService;
+ this.errorService = errorService;
+ this.windowManager = windowManager;
+ this.Title = Resources.PresetManger_Title;
+ }
+
+ public bool IsOpen { get; set; }
+
+ public IEnumerable<IPresetObject> PresetsCategories { get; set; }
+
+ public List<PresetDisplayCategory> UserPresetCategories { get; set; }
+
+ public PresetDisplayCategory SelectedUserPresetCategory
+ {
+ get
+ {
+ if (this.selectedPreset != null && this.PresetsCategories != null)
+ {
+ return this.PresetsCategories.FirstOrDefault(s => s.Category == this.selectedPreset.Category) as PresetDisplayCategory;
+ }
+
+ return null;
+ }
+
+ set
+ {
+ if (this.selectedPreset != null && value != null && value.Category != this.selectedPreset.Category)
+ {
+ this.presetService.ChangePresetCategory(this.selectedPreset, value.Category);
+ }
+ }
+ }
+
+ public string SelectedItem { get; set; }
+
+ public IPresetObject SelectedPresetCategory
+ {
+ get => this.selectedPresetCategory;
+ set
+ {
+ if (!object.Equals(this.selectedPresetCategory, value))
+ {
+ this.selectedPresetCategory = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPresetCategory);
+
+ this.SelectedItem = value?.Category;
+ this.NotifyOfPropertyChange(() => this.SelectedItem);
+
+ this.selectedPreset = null;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+ }
+ }
+ }
+
+ public Preset SelectedPreset
+ {
+ get => this.selectedPreset;
+
+ set
+ {
+ if (!object.Equals(this.selectedPreset, value))
+ {
+ this.selectedPreset = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPreset);
+
+ if (value != null)
+ {
+ this.SelectedItem = value.Name;
+ this.NotifyOfPropertyChange(() => this.SelectedItem);
+
+ this.IsBuildIn = value.IsBuildIn;
+
+ this.CustomWidth = value.Task.MaxWidth;
+ this.CustomHeight = value.Task.MaxHeight;
+ this.SetSelectedPictureSettingsResLimitMode();
+ }
+ else
+ {
+ this.selectedPresetCategory = null;
+ this.NotifyOfPropertyChange(() => this.SelectedPresetCategory);
+ }
+ }
+
+ this.NotifyOfPropertyChange(() => this.IsBuildIn);
+ this.NotifyOfPropertyChange(() => this.SelectedUserPresetCategory);
+ this.NotifyOfPropertyChange(() => this.IsPresetSelected);
+ this.NotifyOfPropertyChange(() => this.UserPresetCategories);
+ }
+ }
+
+ public bool IsBuildIn { get; private set; }
+
+ public bool IsPresetSelected => this.SelectedPreset != null;
+
+ public BindingList<PictureSettingsResLimitModes> ResolutionLimitModes => new BindingList<PictureSettingsResLimitModes>
+ {
+ PictureSettingsResLimitModes.None,
+ PictureSettingsResLimitModes.Size8K,
+ PictureSettingsResLimitModes.Size4K,
+ PictureSettingsResLimitModes.Size1080p,
+ PictureSettingsResLimitModes.Size720p,
+ PictureSettingsResLimitModes.Size576p,
+ PictureSettingsResLimitModes.Size480p,
+ PictureSettingsResLimitModes.Custom,
+ };
+
+ public PictureSettingsResLimitModes SelectedPictureSettingsResLimitMode
+ {
+ get => this.selectedPictureSettingsResLimitMode;
+ set
+ {
+ if (value == this.selectedPictureSettingsResLimitMode)
+ {
+ return;
+ }
+
+ this.selectedPictureSettingsResLimitMode = value;
+ this.NotifyOfPropertyChange(() => this.SelectedPictureSettingsResLimitMode);
+
+ this.IsCustomMaxRes = value == PictureSettingsResLimitModes.Custom;
+ this.NotifyOfPropertyChange(() => this.IsCustomMaxRes);
+
+ // Enforce the new limit
+ ResLimit limit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(value);
+ if (limit != null)
+ {
+ this.CustomWidth = limit.Width;
+ this.CustomHeight = limit.Height;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
+ }
+
+ if (value == PictureSettingsResLimitModes.None)
+ {
+ this.CustomWidth = null;
+ this.CustomHeight = null;
+ }
+ }
+ }
+
+ public int? CustomWidth
+ {
+ get => this.selectedPreset?.Task.MaxWidth ?? null;
+ set
+ {
+ if (value == this.selectedPreset.Task.MaxWidth)
+ {
+ return;
+ }
+
+ this.selectedPreset.Task.MaxWidth = value;
+ this.NotifyOfPropertyChange(() => this.CustomWidth);
+ }
+ }
+
+ public int? CustomHeight
+ {
+ get => this.selectedPreset?.Task.MaxHeight ?? null;
+ set
+ {
+ if (value == this.selectedPreset.Task.MaxHeight)
+ {
+ return;
+ }
+
+ this.selectedPreset.Task.MaxHeight = value;
+ this.NotifyOfPropertyChange(() => this.CustomHeight);
+ }
+ }
+
+ public bool IsCustomMaxRes { get; private set; }
+
+ public void SetupWindow(Action mainwindowCallback)
+ {
+ this.mainWindowCallback = mainwindowCallback;
+ this.PresetsCategories = this.presetService.Presets;
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ this.presetService.LoadCategoryStates();
+ this.UserPresetCategories = presetService.GetPresetCategories(true).ToList(); // .Union(new List<PresetDisplayCategory> { addNewCategory }).ToList();
+ this.presetService.PresetCollectionChanged += this.PresetService_PresetCollectionChanged;
+ }
+
+ public void DeletePreset()
+ {
+ if (this.selectedPreset != null)
+ {
+ if (this.selectedPreset.IsDefault)
+ {
+ this.errorService.ShowMessageBox(
+ Resources.MainViewModel_CanNotDeleteDefaultPreset,
+ Resources.Warning,
+ MessageBoxButton.OK,
+ MessageBoxImage.Information);
+
+ return;
+ }
+
+ MessageBoxResult result =
+ this.errorService.ShowMessageBox(
+ Resources.MainViewModel_PresetRemove_AreYouSure + this.selectedPreset.Name + " ?",
+ Resources.Question,
+ MessageBoxButton.YesNo,
+ MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.No)
+ {
+ return;
+ }
+
+ this.presetService.Remove(this.selectedPreset);
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ this.SelectedPreset = this.presetService.DefaultPreset;
+ }
+ else
+ {
+ this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
+ }
+ }
+
+ public void SetDefault()
+ {
+ if (this.selectedPreset != null)
+ {
+ this.presetService.SetDefault(this.selectedPreset);
+ this.errorService.ShowMessageBox(string.Format(Resources.Main_NewDefaultPreset, this.selectedPreset.Name), Resources.Main_Presets, MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+ else
+ {
+ this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
+ }
+ }
+
+ public void Import()
+ {
+ OpenFileDialog dialog = new OpenFileDialog { Filter = "Preset Files|*.json;*.plist", CheckFileExists = true };
+ bool? dialogResult = dialog.ShowDialog();
+ if (dialogResult.HasValue && dialogResult.Value)
+ {
+ this.presetService.Import(dialog.FileName);
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ }
+ }
+
+ public void Export()
+ {
+ if (this.selectedPreset != null && !this.selectedPreset.IsBuildIn)
+ {
+ SaveFileDialog savefiledialog = new SaveFileDialog
+ {
+ Filter = "json|*.json",
+ CheckPathExists = true,
+ AddExtension = true,
+ DefaultExt = ".json",
+ OverwritePrompt = true,
+ FilterIndex = 0
+ };
+
+ savefiledialog.ShowDialog();
+ string filename = savefiledialog.FileName;
+
+ if (!string.IsNullOrEmpty(filename))
+ {
+ this.presetService.Export(savefiledialog.FileName, this.selectedPreset, HBConfigurationFactory.Create());
+ }
+ }
+ else
+ {
+ this.errorService.ShowMessageBox(Resources.Main_SelectPreset, Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
+ }
+ }
+
+ public void ExportUserPresets()
+ {
+ SaveFileDialog savefiledialog = new SaveFileDialog
+ {
+ Filter = "json|*.json",
+ CheckPathExists = true,
+ AddExtension = true,
+ DefaultExt = ".json",
+ OverwritePrompt = true,
+ FilterIndex = 0
+ };
+
+ savefiledialog.ShowDialog();
+ string filename = savefiledialog.FileName;
+
+ if (!string.IsNullOrEmpty(filename))
+ {
+ IList<PresetDisplayCategory> userPresets = this.presetService.GetPresetCategories(true);
+ this.presetService.ExportCategories(savefiledialog.FileName, userPresets, HBConfigurationFactory.Create());
+ }
+ }
+
+ public void DeleteBuiltInPresets()
+ {
+ List<Preset> allPresets = this.presetService.FlatPresetList;
+ bool foundDefault = false;
+ foreach (Preset preset in allPresets)
+ {
+ if (preset.IsBuildIn)
+ {
+ if (preset.IsDefault)
+ {
+ foundDefault = true;
+ }
+
+ this.presetService.Remove(preset);
+ }
+ }
+
+ if (foundDefault)
+ {
+ Preset preset = this.presetService.FlatPresetList.FirstOrDefault();
+ if (preset != null)
+ {
+ this.presetService.SetDefault(preset);
+ this.SelectedPreset = preset;
+ }
+ }
+
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ }
+
+ public void ResetBuiltInPresets()
+ {
+ this.presetService.UpdateBuiltInPresets();
+
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+
+ this.SetDefaultPreset();
+ 
+ this.errorService.ShowMessageBox(Resources.Presets_ResetComplete, Resources.Presets_ResetHeader, MessageBoxButton.OK, MessageBoxImage.Information);
+ }
+
+ public void EditAudioDefaults()
+ {
+ if (this.selectedPreset == null)
+ {
+ return;
+ }
+
+ IAudioDefaultsViewModel audioDefaultsViewModel = new AudioDefaultsViewModel(this.windowManager);
+ audioDefaultsViewModel.Setup(this.selectedPreset.AudioTrackBehaviours, this.selectedPreset.Task.OutputFormat);
+ audioDefaultsViewModel.ShowWindow();
+
+ if (audioDefaultsViewModel.IsApplied)
+ {
+ this.SelectedPreset.AudioTrackBehaviours = new AudioBehaviours(audioDefaultsViewModel.AudioBehaviours);
+ }
+ }
+
+ public void EditSubtitleDefaults()
+ {
+ if (this.selectedPreset == null)
+ {
+ return;
+ }
+
+ ISubtitlesDefaultsViewModel subtitlesDefaultsViewModel = new SubtitlesDefaultsViewModel(windowManager);
+ subtitlesDefaultsViewModel.SetupPreset(this.selectedPreset);
+ subtitlesDefaultsViewModel.ShowWindow();
+
+ if (subtitlesDefaultsViewModel.IsApplied)
+ {
+ this.SelectedPreset.SubtitleTrackBehaviours = new SubtitleBehaviours(subtitlesDefaultsViewModel.SubtitleBehaviours);
+ }
+ }
+
+ public void Close()
+ {
+ this.presetService.Save();
+ this.IsOpen = false;
+ this.presetService.PresetCollectionChanged -= this.PresetService_PresetCollectionChanged;
+
+ if (this.mainWindowCallback != null)
+ {
+ mainWindowCallback();
+ }
+ }
+
+ public void SetCurrentPresetAsDefault()
+ {
+ if (this.SelectedPreset != null)
+ {
+ this.presetService.SetDefault(this.SelectedPreset);
+ }
+ }
+
+ public void LaunchHelp()
+ {
+ Process.Start("explorer.exe", "https://handbrake.fr/docs/en/latest/advanced/custom-presets.html");
+ }
+
+ private void SetDefaultPreset()
+ {
+ // Preset Selection
+ if (this.presetService.DefaultPreset != null)
+ {
+ PresetDisplayCategory category =
+ (PresetDisplayCategory)this.PresetsCategories.FirstOrDefault(
+ p => p.Category == this.presetService.DefaultPreset.Category);
+
+ this.SelectedPresetCategory = category;
+ this.SelectedPreset = this.presetService.DefaultPreset;
+ }
+ }
+
+ private void SetSelectedPictureSettingsResLimitMode()
+ {
+ // Look for a matching resolution.
+ foreach (PictureSettingsResLimitModes limit in EnumHelper<PictureSettingsResLimitModes>.GetEnumList())
+ {
+ ResLimit resLimit = EnumHelper<PictureSettingsResLimitModes>.GetAttribute<ResLimit, PictureSettingsResLimitModes>(limit);
+ if (resLimit != null)
+ {
+ if (resLimit.Width == this.CustomWidth && resLimit.Height == this.CustomHeight)
+ {
+ this.SelectedPictureSettingsResLimitMode = limit;
+ return;
+ }
+ }
+ }
+
+ if (this.CustomWidth.HasValue || this.CustomHeight.HasValue)
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.Custom;
+ }
+ else
+ {
+ this.SelectedPictureSettingsResLimitMode = PictureSettingsResLimitModes.None;
+ }
+ }
+
+ private void PresetService_PresetCollectionChanged(object sender, System.EventArgs e)
+ {
+ string presetName = this.selectedPreset?.Name; // Recording such that we can re-select
+
+ this.PresetsCategories = this.presetService.Presets;
+ this.UserPresetCategories = presetService.GetPresetCategories(true).ToList(); // .Union(new List<PresetDisplayCategory> { addNewCategory }).ToList();
+
+ this.NotifyOfPropertyChange(() => this.PresetsCategories);
+ this.NotifyOfPropertyChange(() => this.UserPresetCategories);
+ this.NotifyOfPropertyChange(() => this.SelectedUserPresetCategory);
+
+ // Reselect the preset as the object has changed due to the reload that occurred.
+ if (!string.IsNullOrEmpty(presetName))
+ {
+ this.SelectedPreset = this.presetService.FlatPresetList.FirstOrDefault(s => s.Name == presetName);
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/QueueSelectionViewModel.cs Changed

@@ -226,7 +226,7 @@
 /// </summary>
 public void Close()
 {
- this.TryClose();
+ this.TryCloseAsync();
 }
 
 /// <summary>
@@ -235,16 +235,13 @@
 /// <param name="scannedSource">
 /// The scanned source.
 /// </param>
- /// <param name="srcName">
- /// The src Name.
- /// </param>
 /// <param name="addAction">
 /// The add Action.
 /// </param>
 /// <param name="preset">
 /// The preset.
 /// </param>
- public void Setup(Source scannedSource, string srcName, Action<IEnumerable<SelectionTitle>> addAction, Preset preset)
+ public void Setup(Source scannedSource, Action<IEnumerable<SelectionTitle>> addAction, Preset preset)
 {
 this.TitleList.Clear();
 this.addToQueue = addAction;
@@ -257,6 +254,7 @@
 
 foreach (Title item in titles)
 {
+ string srcName = scannedSource?.SourceName ?? item.DisplaySourceName;
 SelectionTitle title = new SelectionTitle(item, srcName) { IsSelected = true };
 TitleList.Add(title);
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/QueueViewModel.cs Changed

@@ -16,13 +16,15 @@
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
- using System.Runtime.CompilerServices;
+ using System.Runtime.Versioning;
+ using System.Threading;
+ using System.Threading.Tasks;
 using System.Windows;
 
 using Caliburn.Micro;
 
 using HandBrakeWPF.EventArgs;
- using HandBrakeWPF.Extensions;
+ using HandBrakeWPF.Exceptions;
 using HandBrakeWPF.Model.Options;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
@@ -33,44 +35,16 @@
 
 using Microsoft.Win32;
 
- using EncodeCompletedEventArgs = Services.Encode.EventArgs.EncodeCompletedEventArgs;
- using EncodeProgressEventArgs = Services.Encode.EventArgs.EncodeProgressEventArgs;
-
- /// <summary>
- /// The Preview View Model
- /// </summary>
 public class QueueViewModel : ViewModelBase, IQueueViewModel
 {
- #region Constants and Fields
-
 private readonly IErrorService errorService;
 private readonly IUserSettingService userSettingService;
 private readonly IQueueService queueProcessor;
- private string jobStatus;
 private string jobsPending;
 private WhenDone whenDoneAction;
 private QueueTask selectedTask;
 private bool isQueueRunning;
- private double progressValue;
- private bool intermediateProgress;
- private bool showEncodeProgress;
-
- #endregion
-
- #region Constructors and Destructors
-
- /// <summary>
- /// Initializes a new instance of the <see cref="QueueViewModel"/> class.
- /// </summary>
- /// <param name="userSettingService">
- /// The user Setting Service.
- /// </param>
- /// <param name="queueProcessor">
- /// The Queue Processor Service 
- /// </param>
- /// <param name="errorService">
- /// The Error Service 
- /// </param>
+
 public QueueViewModel(IUserSettingService userSettingService, IQueueService queueProcessor, IErrorService errorService)
 {
 this.userSettingService = userSettingService;
@@ -78,65 +52,34 @@
 this.errorService = errorService;
 this.Title = Resources.QueueViewModel_Queue;
 this.JobsPending = Resources.QueueViewModel_NoEncodesPending;
- this.JobStatus = string.Empty;
 this.SelectedItems = new BindingList<QueueTask>();
+ this.SelectedItems.ListChanged += this.SelectedItems_ListChanged;
 this.DisplayName = "Queue";
 this.IsQueueRunning = false;
+ this.SelectedTabIndex = 0;
 
 this.WhenDoneAction = (WhenDone)this.userSettingService.GetUserSetting<int>(UserSettingConstants.WhenCompleteAction);
 }
 
- #endregion
-
- #region Properties
-
- /// <summary>
- /// Gets or sets a value indicating whether the Queue is paused or not..
- /// </summary>
 public bool IsQueueRunning
 {
- get
- {
- return this.isQueueRunning;
- }
+ get => this.isQueueRunning;
 
 set
 {
- if (value == this.isQueueRunning) return;
+ if (value == this.isQueueRunning)
+ {
+ return;
+ }
+
 this.isQueueRunning = value;
 this.NotifyOfPropertyChange(() => this.IsQueueRunning);
 }
 }
 
- /// <summary>
- /// Gets or sets JobStatus.
- /// </summary>
- public string JobStatus
- {
- get
- {
- return this.jobStatus;
- }
-
- set
- {
- this.jobStatus = value;
- this.NotifyOfPropertyChange(() => this.JobStatus);
- this.NotifyOfPropertyChange(() => this.IsJobStatusVisible);
- }
- }
-
- public bool IsJobStatusVisible => !string.IsNullOrEmpty(this.JobStatus) && this.SelectedTask?.Status == QueueItemStatus.InProgress;
-
- /// <summary>
- /// Gets or sets JobsPending.
- /// </summary>
 public string JobsPending
 {
- get
- {
- return this.jobsPending;
- }
+ get => this.jobsPending;
 
 set
 {
@@ -145,15 +88,9 @@
 }
 }
 
- /// <summary>
- /// Gets or sets WhenDoneAction.
- /// </summary>
 public WhenDone WhenDoneAction
 {
- get
- {
- return this.whenDoneAction;
- }
+ get => this.whenDoneAction;
 
 set
 {
@@ -162,32 +99,21 @@
 }
 }
 
- /// <summary>
- /// Gets the queue tasks.
- /// </summary>
- public ObservableCollection<QueueTask> QueueTasks
- {
- get
- {
- return this.queueProcessor.Queue;
- }
- }
+ public ObservableCollection<QueueTask> QueueTasks => this.queueProcessor.Queue;
 
- /// <summary>
- /// Gets or sets the selected items.
- /// </summary>
- public BindingList<QueueTask> SelectedItems { get; set; }
+ public BindingList<QueueTask> SelectedItems { get; }
 
 public QueueTask SelectedTask
 {
- get
- {
- return this.selectedTask;
- }
+ get => this.selectedTask;
 
 set
 {
- if (Equals(value, this.selectedTask)) return;
+ if (Equals(value, this.selectedTask))
+ {
+ return;
+ }
+
 this.selectedTask = value;
 this.NotifyOfPropertyChange(() => this.SelectedTask);
 this.HandleLogData();
@@ -198,9 +124,14 @@
 this.NotifyOfPropertyChange(() => this.CanPerformActionOnSource);
 this.NotifyOfPropertyChange(() => this.CanPlayFile);
 this.NotifyOfPropertyChange(() => this.StatsVisible);
+ this.NotifyOfPropertyChange(() => this.JobInfoVisible);
 }
 }
 
+ public bool JobInfoVisible => SelectedItems.Count == 1 && this.SelectedTask != null && !this.SelectedTask.IsBreakpointTask;
+
+ public int SelectedTabIndex { get; set; }
+
 public string ActivityLog { get; private set; }
 
 public bool CanRetryJob => this.SelectedTask != null && this.SelectedTask.Status != QueueItemStatus.Waiting && this.SelectedTask.Status != QueueItemStatus.InProgress;
@@ -212,42 +143,9 @@
 public bool CanPerformActionOnSource => this.SelectedTask != null;
 
 public bool CanPlayFile =>
- this.SelectedTask != null && this.SelectedTask.Task.Destination != null && 
+ this.SelectedTask != null && this.SelectedTask.Task != null && this.SelectedTask.Task.Destination != null && 
 this.SelectedTask.Status == QueueItemStatus.Completed && File.Exists(this.SelectedTask.Task.Destination);
 
- public double ProgressValue
- {
- get => this.progressValue;
- set
- {
- if (value == this.progressValue) return;
- this.progressValue = value;
- this.NotifyOfPropertyChange(() => this.ProgressValue);
- }
- }
-
- public bool IntermediateProgress
- {
- get => this.intermediateProgress;
- set
- {
- if (value == this.intermediateProgress) return;
- this.intermediateProgress = value;
- this.NotifyOfPropertyChange(() => this.IntermediateProgress);
- }
- }
-
- public bool ShowEncodeProgress
- {
- get => this.showEncodeProgress;
- set
- {
- if (value == this.showEncodeProgress) return;
- this.showEncodeProgress = value;
- this.NotifyOfPropertyChange(() => this.ShowEncodeProgress);
- }
- }
-
 public bool StatsVisible
 {
 get
@@ -262,30 +160,11 @@
 }
 }
 
- #endregion
-
- #region Public Methods
-
- /// <summary>
- /// Update the When Done Setting
- /// </summary>
- /// <param name="action">
- /// The action.
- /// </param>
 public void WhenDone(int action)
 {
 this.WhenDone(action, true);
 }
 
- /// <summary>
- /// Update the When Done Setting
- /// </summary>
- /// <param name="action">
- /// The action.
- /// </param>
- /// <param name="saveChange">
- /// Save the change to the setting. Use false when updating UI.
- /// </param>
 public void WhenDone(int action, bool saveChange)
 {
 this.WhenDoneAction = (WhenDone)action;
@@ -299,87 +178,85 @@
 ovm.UpdateSettings();
 }
 
- /// <summary>
- /// Clear the Queue
- /// </summary>
 public void Clear()
 {
 MessageBoxResult result = this.errorService.ShowMessageBox(
- Resources.QueueViewModel_ClearQueueConfrimation, Resources.Confirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
+ Resources.QueueViewModel_ClearQueueConfirmation, Resources.Confirm, MessageBoxButton.YesNo, MessageBoxImage.Question);
 if (result == MessageBoxResult.Yes)
 {
 this.queueProcessor.Clear();
 }
 }
 
- /// <summary>
- /// Clear Completed Items
- /// </summary>
 public void ClearCompleted()
 {
 this.queueProcessor.ClearCompleted();
 }
 
- /// <summary>
- /// Close this window.
- /// </summary>
 public void Close()
 {
- this.TryClose();
+ this.TryCloseAsync();
 }
 
- /// <summary>
- /// Handle the On Window Load
- /// </summary>
 public override void OnLoad()
 {
 // Setup the window to the correct state.
- this.IsQueueRunning = this.queueProcessor.EncodeService.IsEncoding;
+ this.IsQueueRunning = this.queueProcessor.IsProcessing;
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
 
 base.OnLoad();
 }
 
- /// <summary>
- /// Can Pause the Queue.
- /// Used by Caliburn Micro to enable/disable the context menu item.
- /// </summary>
- /// <returns>
- /// True when we can pause the queue.
- /// </returns>
 public bool CanPauseQueue()
 {
 return this.IsQueueRunning;
 }
 
- /// <summary>
- /// Pause the Queue
- /// </summary>
 public void PauseQueue()
 {
- this.queueProcessor.Pause();
+ this.queueProcessor.Pause(true);
 
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
 this.IsQueueRunning = false;
-
- this.errorService.ShowMessageBox(Resources.QueueViewModel_QueuePauseNotice, Resources.QueueViewModel_Queue,
- MessageBoxButton.OK, MessageBoxImage.Information);
 }
 
- /// <summary>
- /// Pause the Queue
- /// </summary>
- /// <remarks>
- /// Prevents evaluation of CanPauseQueue
- /// </remarks>
 public void PauseQueueToolbar()
 {
 this.PauseQueue();
 }
 
- /// <summary>
- /// The remove selected jobs.
- /// </summary>
+ public void StopQueue()
+ {
+ if (this.queueProcessor.IsEncoding)
+ {
+ MessageBoxResult result = this.errorService.ShowMessageBox(
+ "There are currently jobs running. Would you like to complete the current jobs before stopping the queue?",
+ "Confirm",
+ MessageBoxButton.YesNoCancel,
+ MessageBoxImage.Question);
+
+ if (result == MessageBoxResult.Yes)
+ {
+ this.queueProcessor.Stop(false);
+ }
+ else if (result == MessageBoxResult.Cancel)
+ {
+ return;
+ }
+ else
+ {
+ this.queueProcessor.Stop(true);
+ }
+ }
+ else
+ {
+ this.queueProcessor.Stop(true);
+ }
+
+ this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
+ this.IsQueueRunning = false;
+ }
+
 public void RemoveSelectedJobs()
 {
 if (this.SelectedItems.Count == 0)
@@ -406,12 +283,6 @@
 }
 }
 
- /// <summary>
- /// Remove a Job from the queue
- /// </summary>
- /// <param name="queueTask">
- /// The Job to remove from the queue
- /// </param>
 public void RemoveJob(object queueTask)
 {
 QueueTask task = queueTask as QueueTask;
@@ -434,7 +305,6 @@
 
 if (result == MessageBoxResult.Yes)
 {
- this.queueProcessor.EncodeService.Stop();
 this.queueProcessor.Remove(task);
 removed = true;
 }
@@ -451,12 +321,6 @@
 }
 }
 
- /// <summary>
- /// Reset the job state to waiting.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
 public void RetryJob(QueueTask task)
 {
 this.queueProcessor.RetryJob(task);
@@ -464,30 +328,42 @@
 this.NotifyOfPropertyChange(() => this.CanRetryJob);
 }
 
- /// <summary>
- /// Start Encode
- /// </summary>
 public void StartQueue()
 {
- if (!this.QueueTasks.Any(a => a.Status == QueueItemStatus.Waiting || a.Status == QueueItemStatus.InProgress))
+ // Remove any old Stop Tasks.
+ if (this.QueueTasks.Any(t => t.TaskType == QueueTaskType.Breakpoint))
+ {
+ IEnumerable<QueueTask> stopTasks = this.QueueTasks.Where(t => t.TaskType == QueueTaskType.Breakpoint).ToList();
+ foreach (var item in stopTasks)
+ {
+ this.QueueTasks.Remove(item);
+ }
+ }
+
+ // Check for Pending Jobs
+ if (!this.QueueTasks.Any(a => a.Status == QueueItemStatus.Waiting || a.Status == QueueItemStatus.InProgress || a.Status == QueueItemStatus.Paused))
 {
 this.errorService.ShowMessageBox(
 Resources.QueueViewModel_NoPendingJobs, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
-
+ 
+ // Low disk space Check
 var firstOrDefault = this.QueueTasks.FirstOrDefault(s => s.Status == QueueItemStatus.Waiting);
 if (firstOrDefault != null && !DriveUtilities.HasMinimumDiskSpace(firstOrDefault.Task.Destination,
 this.userSettingService.GetUserSetting<long>(UserSettingConstants.PauseQueueOnLowDiskspaceLevel)))
 {
- this.errorService.ShowMessageBox(Resources.Main_LowDiskspace, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
- return;
+ MessageBoxResult result = this.errorService.ShowMessageBox(Resources.Main_LowDiskspace, Resources.Warning, MessageBoxButton.YesNo, MessageBoxImage.Warning);
+ if (result == MessageBoxResult.No)
+ {
+ return;
+ }
 }
 
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
 this.IsQueueRunning = true;
 
- this.queueProcessor.Start(userSettingService.GetUserSetting<bool>(UserSettingConstants.ClearCompletedFromQueue));
+ this.queueProcessor.Start();
 }
 
 public void ExportCli()
@@ -527,21 +403,22 @@
 OpenFileDialog dialog = new OpenFileDialog { Filter = "Json (*.json)|*.json", CheckFileExists = true };
 if (dialog.ShowDialog() == true)
 {
- this.queueProcessor.ImportJson(dialog.FileName);
+ try
+ {
+ this.queueProcessor.ImportJson(dialog.FileName);
+ }
+ catch (Exception exc)
+ {
+ this.errorService.ShowError(Resources.QueueViewModel_ImportFail, Resources.QueueViewModel_ImportFailSolution, exc);
+ }
 }
 }
 
- /// <summary>
- /// Edit this Job
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
 public void EditJob(QueueTask task)
 {
 MessageBoxResult result = this.errorService.ShowMessageBox(
- Resources.QueueViewModel_EditConfrimation,
- "Modify Job?",
+ Resources.QueueViewModel_EditConfirmation,
+ Resources.QueueViewModel_EditJob,
 MessageBoxButton.YesNo,
 MessageBoxImage.Question);
 
@@ -621,87 +498,62 @@
 {
 if (this.SelectedTask != null && this.SelectedTask.Task != null && File.Exists(this.SelectedTask.Task.Destination))
 {
- Process.Start(this.SelectedTask.Task.Destination);
+ try
+ {
+ Process.Start(this.SelectedTask.Task.Destination);
+ }
+ catch (Win32Exception exc)
+ {
+ throw new GeneralApplicationException(
+ exc.Message,
+ Resources.QueueViewModel_PlayFileErrorSolution, exc);
+ }
 }
 }
 
- public void MoveUp()
+ public void MoveToTop()
 {
- Dictionary<int, QueueTask> tasks = new Dictionary<int, QueueTask>();
- foreach (var item in this.SelectedItems)
- {
- tasks.Add(this.QueueTasks.IndexOf(item), item);
- }
-
- foreach (var item in tasks.OrderBy(s => s.Key))
- {
- this.QueueTasks.MoveUp(item.Value);
- }
+ this.queueProcessor.MoveToTop(this.SelectedItems);
 }
 
- public void MoveDown()
+ public void MoveToBottom()
 {
- Dictionary<int, QueueTask> tasks = new Dictionary<int, QueueTask>();
- foreach (var item in this.SelectedItems)
- {
- tasks.Add(this.QueueTasks.IndexOf(item), item);
- }
-
- foreach (var item in tasks.OrderByDescending(s => s.Key))
- {
- this.QueueTasks.MoveDown(item.Value);
- }
+ this.queueProcessor.MoveToBottom(this.SelectedItems);
 }
 
- #endregion
-
- #region Methods
-
 public void Activate()
 {
- this.OnActivate();
+ this.OnActivateAsync(CancellationToken.None);
 }
 
 public void Deactivate()
 {
- this.OnDeactivate(false);
+ this.OnDeactivateAsync(false, CancellationToken.None);
 }
 
- /// <summary>
- /// Override the OnActive to run the Screen Loading code in the view model base.
- /// </summary>
- protected override void OnActivate()
+ protected override Task OnActivateAsync(CancellationToken cancellationToken)
 {
 this.Load();
 
- this.queueProcessor.QueueCompleted += this.queueProcessor_QueueCompleted;
+ this.queueProcessor.QueueCompleted += this.QueueProcessor_QueueCompleted;
 this.queueProcessor.QueueChanged += this.QueueManager_QueueChanged;
- this.queueProcessor.EncodeService.EncodeStatusChanged += this.EncodeService_EncodeStatusChanged;
- this.queueProcessor.EncodeService.EncodeCompleted += this.EncodeService_EncodeCompleted;
 this.queueProcessor.JobProcessingStarted += this.QueueProcessorJobProcessingStarted;
 this.queueProcessor.QueuePaused += this.QueueProcessor_QueuePaused;
 
+ this.IsQueueRunning = this.queueProcessor.IsProcessing;
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
-
- base.OnActivate();
+ 
+ return base.OnActivateAsync(cancellationToken);
 }
 
- /// <summary>
- /// Override the Deactivate
- /// </summary>
- /// <param name="close">
- /// The close.
- /// </param>
- protected override void OnDeactivate(bool close)
+ protected override Task OnDeactivateAsync(bool close, CancellationToken cancellationToken)
 {
- this.queueProcessor.QueueCompleted -= this.queueProcessor_QueueCompleted;
+ this.queueProcessor.QueueCompleted -= this.QueueProcessor_QueueCompleted;
 this.queueProcessor.QueueChanged -= this.QueueManager_QueueChanged;
- this.queueProcessor.EncodeService.EncodeStatusChanged -= this.EncodeService_EncodeStatusChanged;
- this.queueProcessor.EncodeService.EncodeCompleted -= this.EncodeService_EncodeCompleted;
 this.queueProcessor.JobProcessingStarted -= this.QueueProcessorJobProcessingStarted;
 this.queueProcessor.QueuePaused -= this.QueueProcessor_QueuePaused;
 
- base.OnDeactivate(close);
+ return base.OnDeactivateAsync(close, cancellationToken);
 }
 
 private void OpenDirectory(string directory)
@@ -725,7 +577,7 @@
 directory = Path.GetDirectoryName(directory);
 if (directory != null && Directory.Exists(directory))
 {
- Process.Start(directory);
+ Process.Start("explorer.exe", directory);
 }
 }
 }
@@ -735,9 +587,6 @@
 }
 }
 
- /// <summary>
- /// Open the Log file directory
- /// </summary>
 public void OpenLogDirectory()
 {
 string logDir = DirectoryUtilities.GetLogDirectory();
@@ -746,9 +595,6 @@
 prc.Start();
 }
 
- /// <summary>
- /// Copy the log file to the system clipboard
- /// </summary>
 public void CopyLog()
 {
 try
@@ -796,72 +642,11 @@
 this.NotifyOfPropertyChange(() => this.ActivityLog);
 }
 
- /// <summary>
- /// Handle the Encode Status Changed Event.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EncodeProgressEventArgs.
- /// </param>
- private void EncodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
+ private void SelectedItems_ListChanged(object sender, ListChangedEventArgs e)
 {
- Execute.OnUIThread(() =>
- {
- this.IntermediateProgress = false;
-
- string totalHrsLeft = e.EstimatedTimeLeft.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.EstimatedTimeLeft) : string.Format(@"{0:hh\:mm\:ss}", e.EstimatedTimeLeft);
- string elapsedTimeHrs = e.ElapsedTime.Days >= 1 ? string.Format(@"{0:d\:hh\:mm\:ss}", e.ElapsedTime) : string.Format(@"{0:hh\:mm\:ss}", e.ElapsedTime);
-
- if (e.IsSubtitleScan)
- {
- this.JobStatus = string.Format(Resources.MainViewModel_EncodeStatusChanged_SubScan_StatusLabel,
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- totalHrsLeft,
- elapsedTimeHrs,
- null);
-
- this.ProgressValue = e.PercentComplete;
- }
- else if (e.IsMuxing)
- {
- this.JobStatus = Resources.MainView_Muxing;
- this.IntermediateProgress = true;
- }
- else if (e.IsSearching)
- {
- this.JobStatus = string.Format(Resources.MainView_ProgressStatusWithTask, Resources.MainView_Searching, e.PercentComplete, e.EstimatedTimeLeft, null);
- this.ProgressValue = e.PercentComplete;
- }
- else
- {
- this.JobStatus =
- string.Format(Resources.QueueViewModel_EncodeStatusChanged_StatusLabel,
- e.Task,
- e.TaskCount,
- e.PercentComplete,
- e.CurrentFrameRate,
- e.AverageFrameRate,
- totalHrsLeft,
- elapsedTimeHrs,
- null);
- this.ProgressValue = e.PercentComplete;
- }
- });
- }
-
- /// <summary>
- /// Handle the Queue Changed Event.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
+ this.NotifyOfPropertyChange(() => this.JobInfoVisible);
+ }
+ 
 private void QueueManager_QueueChanged(object sender, EventArgs e)
 {
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
@@ -877,69 +662,35 @@
 this.NotifyOfPropertyChange(() => this.CanPerformActionOnSource);
 this.NotifyOfPropertyChange(() => this.CanPlayFile);
 this.NotifyOfPropertyChange(() => this.StatsVisible);
+ this.NotifyOfPropertyChange(() => this.JobInfoVisible);
 this.HandleLogData();
+
+ if (this.SelectedTask == null)
+ {
+ this.SelectedTask = this.QueueTasks.FirstOrDefault();
+ }
 }
 
- /// <summary>
- /// Handle the Queue Completed Event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EventArgs.
- /// </param>
- private void queueProcessor_QueueCompleted(object sender, EventArgs e)
+ private void QueueProcessor_QueueCompleted(object sender, EventArgs e)
 {
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
 this.IsQueueRunning = false;
 this.NotifyOfPropertyChange(() => this.SelectedTask);
 this.NotifyOfPropertyChange(() => this.StatsVisible);
 this.NotifyOfPropertyChange(() => this.CanRetryJob);
-
- this.JobStatus = string.Empty;
- }
-
- /// <summary>
- /// The encode service_ encode completed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void EncodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)
- {
- if (!this.queueProcessor.IsProcessing)
- {
- this.JobStatus = string.Empty;
- }
+ this.NotifyOfPropertyChange(() => this.JobInfoVisible);
 }
 
- /// <summary>
- /// The queue processor job processing started.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The QueueProgressEventArgs.
- /// </param>
 private void QueueProcessorJobProcessingStarted(object sender, QueueProgressEventArgs e)
 {
- this.JobStatus = Resources.QueueViewModel_QueueStarted;
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
- this.IsQueueRunning = true;
+ this.IsQueueRunning = this.queueProcessor.IsProcessing;
 }
 
 private void QueueProcessor_QueuePaused(object sender, EventArgs e)
 {
- this.JobStatus = Resources.QueueViewModel_QueuePaused;
 this.JobsPending = string.Format(Resources.QueueViewModel_JobsPending, this.queueProcessor.Count);
 this.IsQueueRunning = false;
 }
-
- #endregion
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/ShellViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/StaticPreviewViewModel.cs Changed

@@ -11,18 +11,20 @@
 {
 using System;
 using System.Collections.Generic;
+ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
- using System.Linq;
 using System.Runtime.ExceptionServices;
 using System.Threading;
 using System.Windows;
 using System.Windows.Media.Imaging;
 
- using HandBrake.Interop.Interop.Model.Encoding;
- using HandBrake.Interop.Interop.Providers.Interfaces;
+ using Caliburn.Micro;
 
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
+
+ using HandBrakeWPF.Exceptions;
 using HandBrakeWPF.Factories;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Encode.Model.Models;
@@ -34,23 +36,25 @@
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
- using EncodeCompletedEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeCompletedEventArgs;
- using EncodeProgressEventArgs = HandBrakeWPF.Services.Encode.EventArgs.EncodeProgressEventArgs;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using IEncode = HandBrakeWPF.Services.Encode.Interfaces.IEncode;
- using LibEncode = HandBrakeWPF.Services.Encode.LibEncode;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using PointToPointMode = HandBrakeWPF.Services.Encode.Model.Models.PointToPointMode;
-
- /// <summary>
- /// The Static Preview View Model
- /// </summary>
+ using EncodeCompletedEventArgs = Services.Encode.EventArgs.EncodeCompletedEventArgs;
+ using EncodeProgressEventArgs = Services.Encode.EventArgs.EncodeProgressEventArgs;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using IEncode = Services.Encode.Interfaces.IEncode;
+ using ILog = HandBrakeWPF.Services.Logging.Interfaces.ILog;
+ using LibEncode = Services.Encode.LibEncode;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using PointToPointMode = Services.Encode.Model.Models.PointToPointMode;
+
 public class StaticPreviewViewModel : ViewModelBase, IStaticPreviewViewModel
 {
 private readonly IScan scanService;
- private readonly IEncode encodeService;
 private readonly IErrorService errorService;
+ private readonly ILog logService;
+ private readonly ILogInstanceManager logInstanceManager;
+ private readonly IPortService portService;
 private readonly IUserSettingService userSettingService;
+
+ private IEncode encodeService;
 private int height;
 private BitmapSource previewImage;
 private int selectedPreviewImage;
@@ -60,11 +64,9 @@
 private double percentageValue;
 private bool isEncoding;
 private bool useSystemDefaultPlayer;
- private bool previewRotateFlip;
+ private bool showPictureSettingControls;
 
- #region Constructors and Destructors
-
- public StaticPreviewViewModel(IScan scanService, IUserSettingService userSettingService, IErrorService errorService, IHbFunctionsProvider hbFunctionsProvider, ILog logService)
+ public StaticPreviewViewModel(IScan scanService, IUserSettingService userSettingService, IErrorService errorService, ILog logService, ILogInstanceManager logInstanceManager, IPortService portService)
 {
 this.scanService = scanService;
 this.selectedPreviewImage = 1;
@@ -74,7 +76,9 @@
 // Live Preview
 this.userSettingService = userSettingService;
 this.errorService = errorService;
- this.encodeService = new LibEncode(hbFunctionsProvider, logService); // Preview needs a separate instance rather than the shared singleton. This could maybe do with being refactored at some point
+ this.logService = logService;
+ this.logInstanceManager = logInstanceManager;
+ this.portService = portService;
 
 this.Title = "Preview";
 this.Percentage = "0.00%";
@@ -83,18 +87,12 @@
 this.CanPlay = true;
 
 this.useSystemDefaultPlayer = userSettingService.GetUserSetting<bool>(UserSettingConstants.DefaultPlayer);
+ this.showPictureSettingControls = userSettingService.GetUserSetting<bool>(UserSettingConstants.PreviewShowPictureSettingsOverlay);
 this.Duration = userSettingService.GetUserSetting<int>(UserSettingConstants.LastPreviewDuration);
- this.previewRotateFlip = userSettingService.GetUserSetting<bool>(UserSettingConstants.PreviewRotationFlip);
- this.NotifyOfPropertyChange(() => this.previewRotateFlip); // Don't want to trigger an Update, so setting the backing variable. 
 }
+ 
+ public IPictureSettingsViewModel PictureSettingsViewModel { get; private set; }
 
- #endregion
-
- #region Public Properties
-
- /// <summary>
- /// Gets or sets the height.
- /// </summary>
 public int Height
 {
 get
@@ -112,9 +110,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the preview image.
- /// </summary>
 public BitmapSource PreviewImage
 {
 get
@@ -133,9 +128,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the selected preview image.
- /// </summary>
 public int SelectedPreviewImage
 {
 get
@@ -155,37 +147,10 @@
 }
 }
 
- public bool PreviewRotateFlip
- {
- get => this.previewRotateFlip;
- set
- {
- if (value == this.previewRotateFlip)
- {
- return;
- }
-
- this.previewRotateFlip = value;
- this.NotifyOfPropertyChange(() => this.PreviewRotateFlip);
-
- this.UpdatePreviewFrame();
- this.userSettingService.SetUserSetting(UserSettingConstants.PreviewRotationFlip, value);
- }
- }
-
- /// <summary>
- /// Gets or sets the task.
- /// </summary>
 public EncodeTask Task { get; set; }
 
- /// <summary>
- /// Gets or sets the scanned source.
- /// </summary>
- public Source ScannedSource { get; set; } 
+ public Source ScannedSource { get; set; }
 
- /// <summary>
- /// Gets the total previews.
- /// </summary>
 public int TotalPreviews
 {
 get
@@ -194,9 +159,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the width.
- /// </summary>
 public int Width
 {
 get
@@ -214,9 +176,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether preview not available.
- /// </summary>
 public bool PreviewNotAvailable
 {
 get
@@ -234,13 +193,6 @@
 }
 }
 
- #endregion
-
- #region LivePreviewProperties
-
- /// <summary>
- /// Gets AvailableDurations.
- /// </summary>
 public IEnumerable<int> AvailableDurations
 {
 get
@@ -249,14 +201,8 @@
 }
 }
 
- /// <summary>
- /// Gets or sets Duration.
- /// </summary>
 public int Duration { get; set; }
 
- /// <summary>
- /// Gets or sets Percentage.
- /// </summary>
 public string Percentage
 {
 get
@@ -271,9 +217,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets PercentageValue.
- /// </summary>
 public double PercentageValue
 {
 get
@@ -288,9 +231,6 @@
 }
 }
 
- /// <summary>
- /// Gets StartPoints.
- /// </summary>
 public IEnumerable<int> StartPoints
 {
 get
@@ -307,9 +247,6 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether UseSystemDefaultPlayer.
- /// </summary>
 public bool UseSystemDefaultPlayer
 {
 get
@@ -324,15 +261,13 @@
 }
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether IsEncoding.
- /// </summary>
 public bool IsEncoding
 {
 get
 {
 return this.isEncoding;
 }
+
 set
 {
 this.isEncoding = value;
@@ -342,28 +277,23 @@
 }
 }
 
- /// <summary>
- /// Gets or sets the Currently Playing / Encoding Filename.
- /// </summary>
 public string CurrentlyPlaying { get; set; }
 
- /// <summary>
- /// Gets or sets a value indicating whether can play.
- /// </summary>
 public bool CanPlay { get; set; }
- #endregion
-
- #region Public Methods and Operators
-
- /// <summary>
- /// The update preview frame.
- /// </summary>
- /// <param name="task">
- /// The task.
- /// </param>
- /// <param name="scannedSource">
- /// The scanned Source.
- /// </param>
+
+ public bool IsOpen { get; set; }
+
+ public bool ShowPictureSettingControls
+ {
+ get => this.showPictureSettingControls;
+ set
+ {
+ this.showPictureSettingControls = value;
+ this.NotifyOfPropertyChange(() => this.ShowPictureSettingControls);
+ this.userSettingService.SetUserSetting(UserSettingConstants.PreviewShowPictureSettingsOverlay, value);
+ }
+ }
+
 public void UpdatePreviewFrame(EncodeTask task, Source scannedSource)
 {
 this.Task = task;
@@ -373,11 +303,6 @@
 this.ScannedSource = scannedSource;
 }
 
- /// <summary>
- /// Gets or sets a value indicating whether is open.
- /// </summary>
- public bool IsOpen { get; set; }
-
 public void NextPreview()
 {
 int maxPreview = this.userSettingService.GetUserSetting<int>(UserSettingConstants.PreviewScanCount);
@@ -399,20 +324,10 @@
 this.SelectedPreviewImage = this.SelectedPreviewImage - 1;
 }
 
- /// <summary>
- /// The update preview frame.
- /// </summary>
 HandleProcessCorruptedStateExceptions
 public void UpdatePreviewFrame()
 {
- // Don't preview for small images.
- if (this.Task.Anamorphic == Anamorphic.Loose && this.Task.Width < 32)
- {
- PreviewNotAvailable = true;
- return;
- }
-
- if ((this.Task.Anamorphic == Anamorphic.None || this.Task.Anamorphic == Anamorphic.Custom) && (this.Task.Width < 32 || this.Task.Height < 32))
+ if (this.Task.Width < 32 || this.Task.Height < 32)
 {
 PreviewNotAvailable = true;
 return;
@@ -421,7 +336,7 @@
 BitmapSource image = null;
 try
 {
- image = this.scanService.GetPreview(this.Task, this.SelectedPreviewImage, HBConfigurationFactory.Create());
+ image = this.scanService.GetPreview(this.Task, this.SelectedPreviewImage);
 }
 catch (Exception exc)
 {
@@ -431,11 +346,6 @@
 
 if (image != null)
 {
- if (previewRotateFlip)
- {
- image = BitmapHelpers.CreateTransformedBitmap(image, this.Task.Rotation, this.Task.FlipVideo);
- }
-
 PreviewNotAvailable = false;
 this.Width = (int)Math.Ceiling(image.Width);
 this.Height = (int)Math.Ceiling(image.Height);
@@ -443,12 +353,6 @@
 }
 }
 
- /// <summary>
- /// The preview size changed.
- /// </summary>
- /// <param name="ea">
- /// The ea.
- /// </param>
 public int FixWidth(int width)
 {
 Rect workArea = SystemParameters.WorkArea;
@@ -471,49 +375,40 @@
 return height;
 }
 
- #endregion
-
- #region Public Method - Live Preview 
-
- #region Public Methods
-
- /// <summary>
- /// Close this window.
- /// </summary>
 public void Close()
 {
 this.IsOpen = false;
 }
 
- /// <summary>
- /// Handle The Initialisation 
- /// </summary>
+ public void SetPictureSettingsInstance(IPictureSettingsViewModel pictureSettingsViewModel)
+ {
+ this.PictureSettingsViewModel = pictureSettingsViewModel;
+ }
+
 public override void OnLoad()
 {
 }
 
- /// <summary>
- /// Encode and play a sample
- /// </summary>
 public void Play()
 {
 try
 {
 this.IsEncoding = true;
 if (File.Exists(this.CurrentlyPlaying))
+ {
 File.Delete(this.CurrentlyPlaying);
+ }
 }
 catch (Exception)
 {
 this.IsEncoding = false;
- this.errorService.ShowMessageBox(Resources.StaticPreview_UnableToDeletePreview, 
- Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.StaticPreview_UnableToDeletePreview, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ return;
 }
 
 if (this.Task == null || string.IsNullOrEmpty(Task.Source))
 {
- this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_ScanFirst, 
- Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_ScanFirst, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
@@ -541,6 +436,7 @@
 formatExtension = "mkv";
 break;
 }
+
 string filename = Path.ChangeExtension(Path.GetTempFileName(), formatExtension);
 encodeTask.Destination = filename;
 this.CurrentlyPlaying = filename;
@@ -564,7 +460,7 @@
 SubtitleTrack scanTrack = null;
 foreach (var track in encodeTask.SubtitleTracks)
 {
- if (track.SourceTrack != null && track.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch)
+ if (track.SourceTrack != null && track.SourceTrack.IsFakeForeignAudioScanTrack)
 {
 scanTrack = track;
 break;
@@ -576,17 +472,18 @@
 encodeTask.SubtitleTracks.Remove(scanTrack);
 }
 
- QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, null, false);
+ QueueTask task = new QueueTask(encodeTask, HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, null, false, null);
 ThreadPool.QueueUserWorkItem(this.CreatePreview, task);
 }
 
- #endregion
-
- #region Private Methods
+ public void CancelEncode()
+ {
+ if (this.encodeService.IsEncoding)
+ {
+ this.encodeService.Stop();
+ }
+ }
 
- /// <summary>
- /// Play the Encoded file
- /// </summary>
 private void PlayFile()
 {
 // Launch VLC and Play video.
@@ -594,71 +491,62 @@
 {
 if (File.Exists(this.CurrentlyPlaying))
 {
+ string mediaPlayerPath = userSettingService.GetUserSetting<string>(UserSettingConstants.MediaPlayerPath);
 string args = "\"" + this.CurrentlyPlaying + "\"";
 
 if (this.UseSystemDefaultPlayer)
 {
- Process.Start(args);
+ this.logService.LogMessage(string.Format("# VideoPreview: Using system media player. ({0})", args));
+
+ try
+ {
+ Process.Start(args);
+ }
+ catch (Win32Exception exc)
+ {
+ Execute.OnUIThread(
+ () => this.errorService.ShowError(
+ exc.Message,
+ Resources.QueueViewModel_PlayFileErrorSolution,
+ exc));
+ }
 }
 else
 {
- if (!File.Exists(userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
+ if (File.Exists(mediaPlayerPath))
 {
- // Attempt to find VLC if it doesn't exist in the default set location.
- string vlcPath;
-
- if (IntPtr.Size == 8 || (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432"))))
- vlcPath = Environment.GetEnvironmentVariable("ProgramFiles(x86)");
- else
- vlcPath = Environment.GetEnvironmentVariable("ProgramFiles");
-
- if (!string.IsNullOrEmpty(vlcPath))
- {
- vlcPath = Path.Combine(vlcPath, "VideoLAN\\VLC\\vlc.exe");
- }
-
- if (File.Exists(vlcPath))
- {
- userSettingService.SetUserSetting(UserSettingConstants.VLCPath, vlcPath);
- }
- else
- {
- this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_UnableToFindVLC, 
- Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
- }
+ this.logService.LogMessage(string.Format("# Video Preview: Playing file using defined media player. ({0})", args));
+ this.logService.LogMessage(string.Format("# Video Preview: Media Player Path: {0}", mediaPlayerPath));
+ ProcessStartInfo process = new ProcessStartInfo(mediaPlayerPath, args);
+ Process.Start(process);
+ return;
 }
-
- if (File.Exists(userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath)))
+ else
 {
- ProcessStartInfo vlc = new ProcessStartInfo(userSettingService.GetUserSetting<string>(UserSettingConstants.VLCPath), args);
- Process.Start(vlc);
+ // Fallback to the System Default
+ this.logService.LogMessage(string.Format("# Video Preview: Falling back to system media player. ({0})", args));
+ Process.Start(args);
 }
 }
 }
 else
 {
- this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_UnableToPlayFile, 
- Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
+ this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_UnableToPlayFile, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Warning);
 }
 }
 }
 
- /// <summary>
- /// Create the Preview.
- /// </summary>
- /// <param name="state">
- /// The state.
- /// </param>
 private void CreatePreview(object state)
 {
 // Make sure we are not already encoding and if we are then display an error.
- if (encodeService.IsEncoding)
+ if (this.encodeService != null && encodeService.IsEncoding)
 {
- this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_AlreadyEncoding, 
- Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
+ this.errorService.ShowMessageBox(Resources.StaticPreviewViewModel_AlreadyEncoding, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
 return;
 }
 
+ this.encodeService = new LibEncode(userSettingService, logInstanceManager, 0, portService); // Preview needs a separate instance rather than the shared singleton. This could maybe do with being refactored at some point
+
 this.encodeService.EncodeCompleted += this.encodeService_EncodeCompleted;
 this.encodeService.EncodeStatusChanged += this.encodeService_EncodeStatusChanged;
 
@@ -666,34 +554,12 @@
 this.userSettingService.SetUserSetting(UserSettingConstants.LastPreviewDuration, this.Duration);
 }
 
- #endregion
-
- #region Event Handlers
-
- /// <summary>
- /// Handle Encode Progress Events
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EncodeProgressEventArgs.
- /// </param>
 private void encodeService_EncodeStatusChanged(object sender, EncodeProgressEventArgs e)
 {
 this.Percentage = string.Format("{0} %", Math.Round(e.PercentComplete, 2).ToString(CultureInfo.InvariantCulture));
 this.PercentageValue = e.PercentComplete;
 }
 
- /// <summary>
- /// Handle the Encode Completed Event
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The EncodeCompletedEventArgs.
- /// </param>
 private void encodeService_EncodeCompleted(object sender, EncodeCompletedEventArgs e)
 {
 this.Percentage = "0.00%";
@@ -703,9 +569,10 @@
 this.encodeService.EncodeCompleted -= this.encodeService_EncodeCompleted;
 this.encodeService.EncodeStatusChanged -= this.encodeService_EncodeStatusChanged;
 
- this.PlayFile();
+ if (e.ErrorInformation != "1")
+ {
+ this.PlayFile();
+ }
 }
- #endregion
- #endregion
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/SubtitlesDefaultsViewModel.cs Changed

@@ -14,6 +14,8 @@
 using System.Diagnostics;
 using System.Linq;
 
+ using Caliburn.Micro;
+
 using HandBrake.Interop.Utilities;
 
 using HandBrakeWPF.Model.Subtitles;
@@ -27,35 +29,28 @@
 /// </summary>
 public class SubtitlesDefaultsViewModel : ViewModelBase, ISubtitlesDefaultsViewModel
 {
- #region Constants and Fields
+ private readonly IWindowManager windowManager;
 
 private SubtitleBehaviours subtitleBehaviours;
 private BindingList<string> availableLanguages;
 
- #endregion
-
- #region Constructors and Destructors
-
 /// <summary>
 /// Initializes a new instance of the <see cref="SubtitlesDefaultsViewModel"/> class. 
 /// </summary>
- public SubtitlesDefaultsViewModel()
+ public SubtitlesDefaultsViewModel(IWindowManager windowManager)
 {
- this.Langauges = LanguageUtilities.MapLanguages().Keys;
+ this.windowManager = windowManager;
+ this.Languages = LanguageUtilities.MapLanguages().Keys;
 this.CharacterCodes = CharCodesUtilities.GetCharacterCodes();
 this.SubtitleBehaviours = new SubtitleBehaviours();
 this.SelectedAvailableToMove = new BindingList<string>();
- this.SelectedLangaugesToMove = new BindingList<string>();
+ this.SelectedLanguagesToMove = new BindingList<string>();
 this.availableLanguages = new BindingList<string>();
- this.SetupLanguages((Preset)null);
+ this.SetupPreset((Preset)null);
 
 this.Title = Resources.SubtitlesViewModel_SubDefaults;
 }
 
- #endregion
-
- #region Properties
-
 public bool IsApplied { get; set; }
 
 /// <summary>
@@ -64,9 +59,9 @@
 public IEnumerable<string> CharacterCodes { get; private set; }
 
 /// <summary>
- /// Gets Langauges.
+ /// Gets Languages.
 /// </summary>
- public IEnumerable<string> Langauges { get; private set; }
+ public IEnumerable<string> Languages { get; private set; }
 
 /// <summary>
 /// Gets or sets the subtitle behaviours.
@@ -90,7 +85,7 @@
 }
 
 /// <summary>
- /// Gets the sbutitle behaviour modes.
+ /// Gets the subtitle behaviour modes.
 /// </summary>
 public BindingList<SubtitleBehaviourModes> SubtitleBehaviourModeList
 {
@@ -129,19 +124,15 @@
 }
 
 /// <summary>
- /// Gets SelectedLangauges.
+ /// Gets SelectedLanguages.
 /// </summary>
 public BindingList<string> SelectedAvailableToMove { get; private set; }
 
 /// <summary>
- /// Gets SelectedLangauges.
+ /// Gets SelectedLanguages.
 /// </summary>
- public BindingList<string> SelectedLangaugesToMove { get; private set; }
-
- #endregion
-
- #region Public Methods
- 
+ public BindingList<string> SelectedLanguagesToMove { get; private set; }
+ 
 /// <summary>
 /// Audio List Move Left
 /// </summary>
@@ -153,7 +144,7 @@
 foreach (string item in copiedList)
 {
 this.AvailableLanguages.Remove(item);
- this.SubtitleBehaviours.SelectedLangauges.Add(item);
+ this.SubtitleBehaviours.SelectedLanguages.Add(item);
 }
 
 this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
@@ -165,12 +156,12 @@
 /// </summary>
 public void LanguageMoveLeft()
 {
- if (this.SelectedLangaugesToMove.Count > 0)
+ if (this.SelectedLanguagesToMove.Count > 0)
 {
- List<string> copiedList = SelectedLangaugesToMove.ToList();
+ List<string> copiedList = SelectedLanguagesToMove.ToList();
 foreach (string item in copiedList)
 {
- this.SubtitleBehaviours.SelectedLangauges.Remove(item);
+ this.SubtitleBehaviours.SelectedLanguages.Remove(item);
 this.AvailableLanguages.Add(item);
 }
 }
@@ -183,50 +174,41 @@
 /// </summary>
 public void LanguageClearAll()
 {
- foreach (string item in this.SubtitleBehaviours.SelectedLangauges)
+ foreach (string item in this.SubtitleBehaviours.SelectedLanguages)
 {
 this.AvailableLanguages.Add(item);
 }
 this.AvailableLanguages = new BindingList<string>(this.AvailableLanguages.OrderBy(o => o).ToList());
 
- this.SubtitleBehaviours.SelectedLangauges.Clear();
+ this.SubtitleBehaviours.SelectedLanguages.Clear();
 }
 
 public void LaunchHelp()
 {
- Process.Start("https://handbrake.fr/docs/en/1.2.0/advanced/audio-subtitle-defaults.html");
+ Process.Start("explorer.exe", "https://handbrake.fr/docs/en/latest/advanced/audio-subtitle-defaults.html");
 }
 
- #endregion
-
- #region Methods
-
 /// <summary>
 /// The setup languages.
 /// </summary>
 /// <param name="preset">
 /// The preset.
 /// </param>
- public void SetupLanguages(Preset preset)
+ public void SetupPreset(Preset preset)
 {
 if (preset != null)
 {
- this.SetupLanguages(preset.SubtitleTrackBehaviours);
+ this.SetupPreset(preset.SubtitleTrackBehaviours);
 }
 }
 
- public void ResetApplied()
- {
- this.IsApplied = false;
- }
-
 /// <summary>
 /// The setup languages.
 /// </summary>
 /// <param name="behaviours">
 /// The behaviours.
 /// </param>
- public void SetupLanguages(SubtitleBehaviours behaviours)
+ public void SetupPreset(SubtitleBehaviours behaviours)
 {
 // Reset
 this.IsApplied = false;
@@ -236,7 +218,7 @@
 this.SubtitleBehaviours.SelectedBurnInBehaviour = SubtitleBurnInBehaviourModes.None;
 this.SubtitleBehaviours.AddClosedCaptions = false;
 this.SubtitleBehaviours.AddForeignAudioScanTrack = false;
- this.SubtitleBehaviours.SelectedLangauges.Clear();
+ this.SubtitleBehaviours.SelectedLanguages.Clear();
 
 // Step 2, Get all the languages
 IDictionary<string, string> langList = LanguageUtilities.MapLanguages();
@@ -257,13 +239,31 @@
 this.SubtitleBehaviours.AddClosedCaptions = behaviours.AddClosedCaptions;
 this.SubtitleBehaviours.AddForeignAudioScanTrack = behaviours.AddForeignAudioScanTrack;
 
- foreach (string selectedItem in behaviours.SelectedLangauges)
+ foreach (string selectedItem in behaviours.SelectedLanguages)
 {
 this.AvailableLanguages.Remove(selectedItem);
- this.SubtitleBehaviours.SelectedLangauges.Add(selectedItem);
+ this.SubtitleBehaviours.SelectedLanguages.Add(selectedItem);
 }
 }
 }
- #endregion
+
+ public bool ShowWindow()
+ {
+ this.IsApplied = false;
+ this.windowManager.ShowDialogAsync(this);
+
+ return this.IsApplied;
+ }
+
+ public void Cancel()
+ {
+ this.IsApplied = false;
+ }
+
+ public void Save()
+ {
+ this.IsApplied = true;
+ this.TryCloseAsync(false);
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs Changed

@@ -13,7 +13,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
- using System.Runtime.CompilerServices;
 using System.Windows;
 
 using Caliburn.Micro;
@@ -27,14 +26,13 @@
 using HandBrakeWPF.Services.Presets.Model;
 using HandBrakeWPF.Services.Scan.Model;
 using HandBrakeWPF.ViewModels.Interfaces;
- using HandBrakeWPF.Views;
 
 using Microsoft.Win32;
 
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using SubtitleTrack = HandBrakeWPF.Services.Encode.Model.Models.SubtitleTrack;
- using SubtitleType = HandBrakeWPF.Services.Encode.Model.Models.SubtitleType;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using SubtitleTrack = Services.Encode.Model.Models.SubtitleTrack;
+ using SubtitleType = Services.Encode.Model.Models.SubtitleType;
 
 /// <summary>
 /// The Subtitles View Model
@@ -42,7 +40,6 @@
 public class SubtitlesViewModel : ViewModelBase, ISubtitlesViewModel
 {
 private readonly IErrorService errorService;
- private readonly IWindowManager windowManager;
 
 #region Constants and Fields
 
@@ -65,14 +62,14 @@
 public SubtitlesViewModel(IErrorService errorService, IWindowManager windowManager)
 {
 this.errorService = errorService;
- this.windowManager = windowManager;
- this.SubtitleDefaultsViewModel = new SubtitlesDefaultsViewModel();
+ this.SubtitleBehaviours = new SubtitleBehaviours();
+ this.SubtitleDefaultsViewModel = new SubtitlesDefaultsViewModel(windowManager);
 this.Task = new EncodeTask();
 
- this.Langauges = LanguageUtilities.MapLanguages().Keys;
+ this.Languages = LanguageUtilities.MapLanguages().Keys;
 this.CharacterCodes = CharCodesUtilities.GetCharacterCodes();
 
- this.foreignAudioSearchTrack = new Subtitle { SubtitleType = SubtitleType.ForeignAudioSearch, Language = Resources.SubtitleViewModel_ForeignAudioSearch };
+ this.foreignAudioSearchTrack = new Subtitle { IsFakeForeignAudioScanTrack = true, Language = Resources.SubtitleViewModel_ForeignAudioSearch };
 this.SourceTracks = new List<Subtitle> { this.foreignAudioSearchTrack };
 }
 
@@ -93,9 +90,9 @@
 public IEnumerable<string> CharacterCodes { get; set; }
 
 /// <summary>
- /// Gets or sets Langauges.
+ /// Gets or sets Languages.
 /// </summary>
- public IEnumerable<string> Langauges { get; set; }
+ public IEnumerable<string> Languages { get; set; }
 
 /// <summary>
 /// Gets or sets SourceTracks.
@@ -120,37 +117,9 @@
 public EncodeTask Task { get; set; }
 
 /// <summary>
- /// Gets the panel title.
- /// </summary>
- public string PanelTitle
- {
- get
- {
- return Resources.SubtitlesViewModel_SubTracks;
- }
- }
-
- /// <summary>
- /// Gets the switch display title.
- /// </summary>
- public string SwitchDisplayTitle
- {
- get
- {
- return Resources.SubtitlesViewModel_ConfigureDefaults;
- }
- }
-
- /// <summary>
 /// Gets the default audio behaviours. 
 /// </summary>
- public SubtitleBehaviours SubtitleBehaviours
- {
- get
- {
- return this.SubtitleDefaultsViewModel.SubtitleBehaviours;
- }
- }
+ public SubtitleBehaviours SubtitleBehaviours { get; private set; }
 
 public bool IsBurnableOnly
 {
@@ -177,7 +146,7 @@
 /// </summary>
 public void AddAllClosedCaptions()
 {
- foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC))
+ foreach (Subtitle subtitle in this.SourceTitlesSubset(null).Where(s => s.SubtitleType == SubtitleType.CC608 || s.SubtitleType == SubtitleType.CC708))
 {
 this.Add(subtitle);
 }
@@ -212,7 +181,7 @@
 /// </summary>
 public void AddFirstForSelectedLanguages()
 {
- bool anyLanguageSelected = this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any);
+ bool anyLanguageSelected = this.SubtitleBehaviours.SelectedLanguages.Contains(Constants.Any);
 foreach (Subtitle sourceTrack in this.GetSelectedLanguagesTracks())
 {
 // Step 2: Check if the track list already contains this track
@@ -362,7 +331,7 @@
 case SubtitleBehaviourModes.FirstMatch: // Adding all remaining tracks
 this.AddFirstForSelectedLanguages();
 break;
- case SubtitleBehaviourModes.AllMatching: // Add Langauges tracks for the additional languages selected, in-order.
+ case SubtitleBehaviourModes.AllMatching: // Add Languages tracks for the additional languages selected, in-order.
 this.AddAllRemainingForSelectedLanguages();
 break;
 }
@@ -376,7 +345,7 @@
 case SubtitleBurnInBehaviourModes.None:
 foreach (var track in this.Task.SubtitleTracks)
 {
- if (track.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch)
+ if (track.SourceTrack.IsFakeForeignAudioScanTrack)
 {
 track.Forced = true;
 break;
@@ -388,7 +357,7 @@
 foreach (var track in this.Task.SubtitleTracks)
 {
 // Set the Foreign Audio Track to burned-in
- if (track.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch)
+ if (track.SourceTrack.IsFakeForeignAudioScanTrack)
 {
 track.Burned = true;
 track.Forced = true;
@@ -402,7 +371,7 @@
 foreach (var track in this.Task.SubtitleTracks)
 {
 // Foreign Audio Search is always first in the list.
- if (track.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch) 
+ if (track.SourceTrack.IsFakeForeignAudioScanTrack) 
 {
 track.Forced = true;
 continue;
@@ -429,7 +398,7 @@
 }
 
 // But if there is a foreign audio track, prefer this to the first.
- if (track.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch)
+ if (track.SourceTrack.IsFakeForeignAudioScanTrack)
 {
 track.Burned = true;
 track.Forced = true;
@@ -454,11 +423,10 @@
 /// </summary>
 public void ShowSubtitleDefaultsPanel()
 {
- SubtitlesDefaultsView view = new SubtitlesDefaultsView();
- view.DataContext = this.SubtitleDefaultsViewModel;
-
- if (view.ShowDialog() == true)
+ this.SubtitleDefaultsViewModel.SetupPreset(this.SubtitleBehaviours);
+ if (this.SubtitleDefaultsViewModel.ShowWindow())
 {
+ this.SubtitleBehaviours = new SubtitleBehaviours(this.SubtitleDefaultsViewModel.SubtitleBehaviours);
 this.OnTabStatusChanged(null);
 }
 }
@@ -510,7 +478,9 @@
 this.Task = task;
 this.NotifyOfPropertyChange(() => this.Task);
 
- this.SubtitleDefaultsViewModel.SetupLanguages(preset);
+ this.SubtitleBehaviours = new SubtitleBehaviours(preset.SubtitleTrackBehaviours);
+
+ this.SubtitleDefaultsViewModel.SetupPreset(preset);
 this.AutomaticSubtitleSelection();
 }
 
@@ -550,9 +520,9 @@
 return false;
 }
 
- foreach (var item in this.SubtitleBehaviours.SelectedLangauges)
+ foreach (var item in this.SubtitleBehaviours.SelectedLanguages)
 {
- if (!preset.SubtitleTrackBehaviours.SelectedLangauges.Contains(item))
+ if (!preset.SubtitleTrackBehaviours.SelectedLanguages.Contains(item))
 {
 return false;
 }
@@ -640,7 +610,7 @@
 /// <summary>
 /// Add a subtitle track.
 /// The Source track is set based on the following order. If null, it will skip to the next option.
- /// 1. Passed in Subitle param
+ /// 1. Passed in Subtitle param
 /// 2. First preferred Subtitle from source
 /// 3. First subtitle from source.
 /// Will not add a subtitle if the source has none.
@@ -654,14 +624,20 @@
 ?? ((this.SourceTracks != null)
 ? (this.SourceTracks.FirstOrDefault(l => l.Language == this.GetPreferredSubtitleTrackLanguage())
 ?? this.SourceTracks.FirstOrDefault(
- s => s.SubtitleType != SubtitleType.ForeignAudioSearch))
+ s => !s.IsFakeForeignAudioScanTrack))
 : null);
 
 if (source == null)
 {
 source = foreignAudioSearchTrack;
+
+ if (this.Task.SubtitleTracks.Any(s => s.SourceTrack.Equals(this.foreignAudioSearchTrack)))
+ {
+ return; // Don't add more than one Foreign Audio Scan
+ }
 }
 
+
 SubtitleTrack track = new SubtitleTrack
 {
 SubtitleType = source.SubtitleType,
@@ -672,10 +648,18 @@
 if (this.SubtitleBehaviours.SelectedBurnInBehaviour == SubtitleBurnInBehaviourModes.ForeignAudio
 || this.SubtitleBehaviours.SelectedBurnInBehaviour == SubtitleBurnInBehaviourModes.ForeignAudioPreferred)
 {
- if (subtitle != null && subtitle.SubtitleType == SubtitleType.ForeignAudioSearch)
+ if (subtitle != null && subtitle.IsFakeForeignAudioScanTrack)
 {
- track.Burned = true;
- this.SetBurnedToFalseForAllExcept(track);
+ // Only set burned if it's an an available option.
+ if (this.Task.OutputFormat == OutputFormat.Mp4 && this.Task.SubtitleTracks.Any(s => s.Burned))
+ {
+ track.Burned = false;
+ }
+ else
+ {
+ track.Burned = true;
+ this.SetBurnedToFalseForAllExcept(track);
+ }
 }
 }
 
@@ -711,14 +695,14 @@
 {
 // Translate to Iso Codes
 List<string> iso6392Codes = new List<string>();
- if (this.SubtitleBehaviours.SelectedLangauges.Contains(Constants.Any))
+ if (this.SubtitleBehaviours.SelectedLanguages.Contains(Constants.Any))
 {
 iso6392Codes = LanguageUtilities.GetIsoCodes();
- iso6392Codes = LanguageUtilities.OrderIsoCodes(iso6392Codes, this.SubtitleBehaviours.SelectedLangauges);
+ iso6392Codes = LanguageUtilities.OrderIsoCodes(iso6392Codes, this.SubtitleBehaviours.SelectedLanguages);
 }
 else
 {
- iso6392Codes = LanguageUtilities.GetLanguageCodes(this.SubtitleBehaviours.SelectedLangauges.ToArray());
+ iso6392Codes = LanguageUtilities.GetLanguageCodes(this.SubtitleBehaviours.SelectedLanguages.ToArray());
 }
 
 
@@ -739,7 +723,7 @@
 /// </returns>
 private string GetPreferredSubtitleTrackLanguage()
 {
- string langName = this.SubtitleBehaviours.SelectedLangauges.FirstOrDefault(w => w != Constants.Any);
+ string langName = this.SubtitleBehaviours.SelectedLanguages.FirstOrDefault(w => w != Constants.Any);
 string langCode = LanguageUtilities.GetLanguageCode(langName);
 return langCode;
 }
@@ -775,7 +759,7 @@
 SrtOffset = 0,
 SrtCharCode = "UTF-8",
 SrtLang = "English",
- SubtitleType = SubtitleType.SRT,
+ SubtitleType = SubtitleType.IMPORTSRT,
 SrtPath = srtFile
 };
 this.Task.SubtitleTracks.Add(track);

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/SummaryViewModel.cs Changed

@@ -19,11 +19,13 @@
 using System.Windows.Media.Imaging;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
+ using HandBrake.Interop.Interop.Interfaces.Model.Picture;
 
 using HandBrakeWPF.EventArgs;
 using HandBrakeWPF.Factories;
 using HandBrakeWPF.Helpers;
+ using HandBrakeWPF.Model.Filters;
 using HandBrakeWPF.Model.Options;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Encode.Model;
@@ -36,6 +38,8 @@
 using HandBrakeWPF.ViewModelItems.Filters;
 using HandBrakeWPF.ViewModels.Interfaces;
 
+ using VideoEncoder = HandBrakeWPF.Model.Video.VideoEncoder;
+
 public class SummaryViewModel : ViewModelBase, ISummaryViewModel
 {
 private readonly IScan scanService;
@@ -52,6 +56,8 @@
 
 private bool showPreview;
 
+ private DelayedActionProcessor previewDelayProcessor = new DelayedActionProcessor();
+
 public SummaryViewModel(IScan scanService, IUserSettingService userSettingService)
 {
 this.scanService = scanService;
@@ -230,7 +236,7 @@
 this.NotifyOfPropertyChange(() => this.IsMkvOrWebm);
 this.NotifyOfPropertyChange(() => this.IsIpodAtomVisible);
 this.SetExtension(string.Format(".{0}", this.Task.OutputFormat.ToString().ToLower()));
- this.UpdateDisplayedInfo(); // output format may coreced to another due to container incompatibility
+ this.UpdateDisplayedInfo(); // output format may be coerced to another due to container incompatibility
 
 this.OnOutputFormatChanged(new OutputFormatChangedEventArgs(null));
 this.OnTabStatusChanged(null);
@@ -323,6 +329,16 @@
 }
 }
 
+ public bool MetadataPassthru
+ {
+ get => this.task?.MetaData.PassthruMetadataEnabled ?? false;
+ set
+ {
+ this.task.MetaData.PassthruMetadataEnabled = value;
+ this.NotifyOfPropertyChange(() => this.MetadataPassthru);
+ }
+ }
+
 #endregion
 
 public void SetSource(Source scannedSource, Title selectedTitle, Preset currentPreset, EncodeTask encodeTask)
@@ -330,6 +346,7 @@
 this.Source = scannedSource;
 this.CurrentTitle = selectedTitle;
 this.Task = encodeTask;
+ this.Task.MetaData = new MetaData(selectedTitle.Metadata, this.MetadataPassthru);
 this.UpdateDisplayedInfo();
 this.SetPreviewControlVisibility();
 }
@@ -354,6 +371,7 @@
 this.NotifyOfPropertyChange(() => this.OptimizeMP4);
 this.NotifyOfPropertyChange(() => this.IPod5GSupport);
 this.NotifyOfPropertyChange(() => this.AlignAVStart);
+ this.NotifyOfPropertyChange(() => this.MetadataPassthru);
 }
 
 public bool MatchesPreset(Preset preset)
@@ -390,7 +408,10 @@
 }
 
 this.PopulateSummaryTab();
- this.UpdatePreviewFrame();
+ if (this.ShowPreview)
+ {
+ this.previewDelayProcessor.PerformTask(this.UpdatePreviewFrame, 250);
+ }
 }
 
 public void SetContainer(OutputFormat container)
@@ -465,6 +486,7 @@
 this.OptimizeMP4 = selectedPreset.Task.OptimizeMP4;
 this.IPod5GSupport = selectedPreset.Task.IPod5GSupport;
 this.AlignAVStart = selectedPreset.Task.AlignAVStart;
+ this.MetadataPassthru = selectedPreset.Task?.MetaData.PassthruMetadataEnabled ?? false;
 }
 
 private void SetExtension(string newExtension)
@@ -521,7 +543,10 @@
 }
 
 // Dimension Section
- this.VideoTrackInfo = string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), this.Task.Framerate, this.Task.FramerateMode);
+ this.VideoTrackInfo = this.Task.Framerate == null 
+ ? string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), Resources.SummaryView_SameAsSource, this.Task.FramerateMode) 
+ : string.Format("{0}, {1} FPS {2}", EnumHelper<VideoEncoder>.GetDisplay(this.Task.VideoEncoder), this.Task.Framerate, this.Task.FramerateMode);
+ 
 this.NotifyOfPropertyChange(() => this.VideoTrackInfo);
 
 this.AudioTrackInfo = this.GetAudioDescription();
@@ -537,7 +562,17 @@
 this.NotifyOfPropertyChange(() => this.FiltersInfo);
 
 // Picture Section
- this.DimensionInfo = string.Format("{0}x{1} {2}, {3}x{4} {5}", this.Task.Width, this.Task.Height, Resources.SummaryView_storage, this.Task.DisplayWidth, this.Task.Height, Resources.SummaryView_display);
+ string storageDesc = Resources.SummaryView_storage;
+ int? width = this.task.Width;
+ int? height = this.task.Height;
+ if (this.task.Padding.Enabled)
+ {
+ storageDesc = string.Format("{0} {1}", Resources.SummaryView_storage, Resources.SummaryView_Padded);
+ width = this.task.Width + this.task.Padding.W;
+ height = this.task.Height + this.task.Padding.H;
+ }
+ 
+ this.DimensionInfo = string.Format("{0}x{1} {2}, {3}x{4} {5}", width, height, storageDesc, this.Task.DisplayWidth, this.Task.Height, Resources.SummaryView_display);
 this.NotifyOfPropertyChange(() => this.DimensionInfo);
 
 this.AspectInfo = string.Empty;
@@ -693,7 +728,7 @@
 private void UpdatePreviewFrame()
 {
 // Don't preview for small images.
- if (this.Task.Anamorphic == Anamorphic.Loose && this.Task.Width < 32)
+ if (this.Task.Width < 32)
 {
 this.PreviewNotAvailable = true;
 this.IsPreviewInfoVisible = false;
@@ -710,7 +745,7 @@
 BitmapSource image = null;
 try
 {
- image = this.scanService.GetPreview(this.Task, this.selectedPreview - 1, HBConfigurationFactory.Create()); 
+ image = this.scanService.GetPreview(this.Task, this.selectedPreview - 1); 
 }
 catch (Exception exc)
 {
@@ -720,8 +755,6 @@
 
 if (image != null)
 {
- image = BitmapHelpers.CreateTransformedBitmap(image, this.task.Rotation, this.task.FlipVideo);
-
 this.PreviewNotAvailable = false;
 this.PreviewImage = image;
 this.MaxWidth = (int)image.Width;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/TitleSpecificViewModel.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/ViewModels/VideoViewModel.cs Changed

@@ -19,9 +19,10 @@
 using Caliburn.Micro;
 
 using HandBrake.Interop.Interop;
- using HandBrake.Interop.Interop.Model.Encoding;
+ using HandBrake.Interop.Interop.Interfaces.Model.Encoders;
 
 using HandBrakeWPF.EventArgs;
+ using HandBrakeWPF.Model;
 using HandBrakeWPF.Properties;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Services.Presets.Model;
@@ -30,14 +31,16 @@
 using HandBrakeWPF.ViewModels.Interfaces;
 
 using Clipboard = System.Windows.Clipboard;
- using EncodeTask = HandBrakeWPF.Services.Encode.Model.EncodeTask;
- using FramerateMode = HandBrakeWPF.Services.Encode.Model.Models.FramerateMode;
- using OutputFormat = HandBrakeWPF.Services.Encode.Model.Models.OutputFormat;
- using SettingChangedEventArgs = HandBrakeWPF.EventArgs.SettingChangedEventArgs;
- using VideoLevel = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoLevel;
- using VideoPreset = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoPreset;
- using VideoProfile = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoProfile;
- using VideoTune = HandBrakeWPF.Services.Encode.Model.Models.Video.VideoTune;
+ using EncodeTask = Services.Encode.Model.EncodeTask;
+ using FramerateMode = Services.Encode.Model.Models.FramerateMode;
+ using OutputFormat = Services.Encode.Model.Models.OutputFormat;
+ using SettingChangedEventArgs = EventArgs.SettingChangedEventArgs;
+ using VideoEncoder = Model.Video.VideoEncoder;
+ using VideoEncodeRateType = Model.Video.VideoEncodeRateType;
+ using VideoLevel = Services.Encode.Model.Models.Video.VideoLevel;
+ using VideoPreset = Services.Encode.Model.Models.Video.VideoPreset;
+ using VideoProfile = Services.Encode.Model.Models.Video.VideoProfile;
+ using VideoTune = Services.Encode.Model.Models.Video.VideoTune;
 
 /// <summary>
 /// The Video View Model
@@ -191,7 +194,9 @@
 || this.SelectedVideoEncoder == VideoEncoder.VceH265
 || this.SelectedVideoEncoder == VideoEncoder.QuickSync
 || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265
- || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH26510b)
+ || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH26510b
+ || this.SelectedVideoEncoder == VideoEncoder.MFH264
+ || this.SelectedVideoEncoder == VideoEncoder.MFH265)
 {
 return false;
 }
@@ -335,6 +340,8 @@
 case VideoEncoder.VceH265:
 case VideoEncoder.NvencH264:
 case VideoEncoder.NvencH265:
+ case VideoEncoder.MFH264:
+ case VideoEncoder.MFH265:
 rfValue = 51.0 - value;
 rfValue = Math.Round(rfValue, 0);
 this.Task.Quality = rfValue;
@@ -352,7 +359,7 @@
 this.NotifyOfPropertyChange(() => this.RF);
 this.NotifyOfPropertyChange(() => this.DisplayRF);
 this.NotifyOfPropertyChange(() => this.IsLossless);
- this.OnTabStatusChanged(null);
+ this.OnTabStatusChanged(new TabStatusEventArgs("filters", ChangedOption.Quality));
 }
 }
 
@@ -373,7 +380,7 @@
 }
 this.Task.VideoBitrate = value;
 this.NotifyOfPropertyChange(() => this.VideoBitrate);
- this.OnTabStatusChanged(null);
+ this.OnTabStatusChanged(new TabStatusEventArgs("filters", ChangedOption.Bitrate));
 }
 }
 
@@ -440,7 +447,10 @@
 }
 
 if (this.SelectedVideoEncoder == VideoEncoder.NvencH264
- || this.SelectedVideoEncoder == VideoEncoder.NvencH265)
+ || this.SelectedVideoEncoder == VideoEncoder.NvencH265
+ || this.SelectedVideoEncoder == VideoEncoder.MFH264
+ || this.SelectedVideoEncoder == VideoEncoder.MFH265
+ )
 {
 return string.Empty;
 }
@@ -598,8 +608,9 @@
 && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH265
 && this.SelectedVideoEncoder != VideoEncoder.QuickSyncH26510b
 && this.SelectedVideoEncoder != VideoEncoder.NvencH264
- && this.SelectedVideoEncoder != VideoEncoder.NvencH265;
-
+ && this.SelectedVideoEncoder != VideoEncoder.NvencH265
+ && this.SelectedVideoEncoder != VideoEncoder.MFH264
+ && this.SelectedVideoEncoder != VideoEncoder.MFH265;
 }
 }
 
@@ -959,7 +970,8 @@
 || preset.Task.VideoEncoder == VideoEncoder.X265 || preset.Task.VideoEncoder == VideoEncoder.X265_10 || preset.Task.VideoEncoder == VideoEncoder.X265_12
 || preset.Task.VideoEncoder == VideoEncoder.QuickSync || preset.Task.VideoEncoder == VideoEncoder.QuickSyncH265 || preset.Task.VideoEncoder == VideoEncoder.QuickSyncH26510b
 || preset.Task.VideoEncoder == VideoEncoder.VceH264 || preset.Task.VideoEncoder == VideoEncoder.VceH265
- || preset.Task.VideoEncoder == VideoEncoder.NvencH264 || preset.Task.VideoEncoder == VideoEncoder.NvencH265)
+ || preset.Task.VideoEncoder == VideoEncoder.NvencH264 || preset.Task.VideoEncoder == VideoEncoder.NvencH265
+ || preset.Task.VideoEncoder == VideoEncoder.MFH264 || preset.Task.VideoEncoder == VideoEncoder.MFH265)
 {
 this.VideoLevel = preset.Task.VideoLevel != null ? preset.Task.VideoLevel.Clone() : this.VideoLevels.FirstOrDefault();
 this.VideoProfile = preset.Task.VideoProfile != null ? preset.Task.VideoProfile.Clone() : this.VideoProfiles.FirstOrDefault();
@@ -977,6 +989,10 @@
 ?? VideoTune.None;
 }
 }
+ else if (preset.Task.VideoEncoder == VideoEncoder.VP8 || preset.Task.VideoEncoder == VideoEncoder.VP9)
+ {
+ this.VideoPresetValue = preset.Task.VideoPreset != null ? this.VideoPresets.IndexOf(preset.Task.VideoPreset) : 0;
+ }
 }
 
 this.ExtraArguments = preset.Task.ExtraAdvancedArguments;
@@ -1081,7 +1097,8 @@
 || this.Task.VideoEncoder == VideoEncoder.X265_12 || this.Task.VideoEncoder == VideoEncoder.QuickSync
 || this.Task.VideoEncoder == VideoEncoder.QuickSyncH265 || this.Task.VideoEncoder == VideoEncoder.QuickSyncH26510b
 || this.Task.VideoEncoder == VideoEncoder.VceH264 || this.Task.VideoEncoder == VideoEncoder.VceH265
- || this.Task.VideoEncoder == VideoEncoder.NvencH264 || this.Task.VideoEncoder == VideoEncoder.NvencH265)
+ || this.Task.VideoEncoder == VideoEncoder.NvencH264 || this.Task.VideoEncoder == VideoEncoder.NvencH265
+ || this.Task.VideoEncoder == VideoEncoder.MFH264 || this.Task.VideoEncoder == VideoEncoder.MFH265)
 {
 if (!Equals(preset.Task.VideoPreset, this.Task.VideoPreset))
 {
@@ -1183,6 +1200,8 @@
 case VideoEncoder.VceH265:
 case VideoEncoder.NvencH264:
 case VideoEncoder.NvencH265:
+ case VideoEncoder.MFH264:
+ case VideoEncoder.MFH265:
 this.QualityMin = 0;
 this.QualityMax = 51;
 break;
@@ -1208,7 +1227,7 @@
 }
 
 /// <summary>
- /// The get actualx 264 query.
+ /// The get actual x264 query.
 /// </summary>
 /// <returns>
 /// The <see cref="string"/>.
@@ -1331,10 +1350,13 @@
 case VideoEncoder.VceH265:
 case VideoEncoder.NvencH264:
 case VideoEncoder.NvencH265:
+ case VideoEncoder.MFH264:
+ case VideoEncoder.MFH265:
 
 if (this.SelectedVideoEncoder == VideoEncoder.QuickSync || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265 || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH26510b
 || this.SelectedVideoEncoder == VideoEncoder.VceH264 || this.SelectedVideoEncoder == VideoEncoder.VceH265
- || this.SelectedVideoEncoder == VideoEncoder.NvencH264 || this.SelectedVideoEncoder == VideoEncoder.NvencH265)
+ || this.SelectedVideoEncoder == VideoEncoder.NvencH264 || this.SelectedVideoEncoder == VideoEncoder.NvencH265
+ || this.SelectedVideoEncoder == VideoEncoder.MFH264 || this.SelectedVideoEncoder == VideoEncoder.MFH265)
 {
 cqStep = 1;
 }
@@ -1435,14 +1457,9 @@
 }
 
 this.VideoPresetMaxValue = encoder.Presets.Count - 1;
- int middlePreset = (int)Math.Round((decimal)(this.VideoPresetMaxValue / 2), 0);
-
- if (selectedEncoder == VideoEncoder.NvencH264 || selectedEncoder == VideoEncoder.NvencH265)
- {
- middlePreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "slow"));
- }
+ 
 
- this.VideoPresetValue = middlePreset;
+ this.VideoPresetValue = GetDefaultEncoderPreset(selectedEncoder);
 }
 else
 {
@@ -1471,7 +1488,8 @@
 this.SelectedVideoEncoder == VideoEncoder.X265 || this.SelectedVideoEncoder == VideoEncoder.X265_10 || this.SelectedVideoEncoder == VideoEncoder.X265_12 ||
 this.SelectedVideoEncoder == VideoEncoder.QuickSync || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH265 || this.SelectedVideoEncoder == VideoEncoder.QuickSyncH26510b ||
 this.SelectedVideoEncoder == VideoEncoder.VceH264 || this.SelectedVideoEncoder == VideoEncoder.VceH265 ||
- this.SelectedVideoEncoder == VideoEncoder.NvencH264 || this.SelectedVideoEncoder == VideoEncoder.NvencH265;
+ this.SelectedVideoEncoder == VideoEncoder.NvencH264 || this.SelectedVideoEncoder == VideoEncoder.NvencH265 ||
+ this.SelectedVideoEncoder == VideoEncoder.MFH264 || this.SelectedVideoEncoder == VideoEncoder.MFH265;
 
 this.DisplayFastDecode = this.SelectedVideoEncoder == VideoEncoder.X264 || this.SelectedVideoEncoder == VideoEncoder.X264_10;
 this.NotifyOfPropertyChange(() => this.DisplayFastDecode);
@@ -1492,7 +1510,9 @@
 || this.SelectedVideoEncoder == VideoEncoder.VceH264
 || this.SelectedVideoEncoder == VideoEncoder.VceH265
 || this.SelectedVideoEncoder == VideoEncoder.NvencH264
- || this.SelectedVideoEncoder == VideoEncoder.NvencH265;
+ || this.SelectedVideoEncoder == VideoEncoder.NvencH265
+ || this.SelectedVideoEncoder == VideoEncoder.MFH264
+ || this.SelectedVideoEncoder == VideoEncoder.MFH265;
 
 // Refresh Display
 this.NotifyOfPropertyChange(() => this.Rfqp);
@@ -1500,17 +1520,14 @@
 this.NotifyOfPropertyChange(() => this.IsTwoPassEnabled);
 this.NotifyOfPropertyChange(() => this.DisplayTwoPass);
 
- // Handle some quicksync specific options.
- if (selectedEncoder == VideoEncoder.QuickSync || selectedEncoder == VideoEncoder.QuickSyncH265 || selectedEncoder == VideoEncoder.QuickSyncH26510b)
- {
- this.TwoPass = false;
- this.TurboFirstPass = false;
- this.SelectedFramerate = null;
- }
-
 if (selectedEncoder == VideoEncoder.NvencH264 || selectedEncoder == VideoEncoder.NvencH265 
 || selectedEncoder == VideoEncoder.VceH264 
- || selectedEncoder == VideoEncoder.VceH265)
+ || selectedEncoder == VideoEncoder.VceH265
+ || selectedEncoder == VideoEncoder.MFH264
+ || selectedEncoder == VideoEncoder.MFH265
+ || selectedEncoder == VideoEncoder.QuickSync
+ || selectedEncoder == VideoEncoder.QuickSyncH265
+ || selectedEncoder == VideoEncoder.QuickSyncH26510b)
 {
 this.TwoPass = false;
 this.TurboFirstPass = false;
@@ -1532,5 +1549,44 @@
 
 this.SetRF(displayRF);
 }
+
+ private int GetDefaultEncoderPreset(VideoEncoder selectedEncoder)
+ {
+ int defaultPreset = (int)Math.Round((decimal)(this.VideoPresetMaxValue / 2), 0);
+
+ // Override for NVEnc
+ if (selectedEncoder == VideoEncoder.NvencH264 || selectedEncoder == VideoEncoder.NvencH265)
+ {
+ defaultPreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "medium"));
+ }
+
+ // Override for QuickSync
+ if (selectedEncoder == VideoEncoder.QuickSyncH265 || selectedEncoder == VideoEncoder.QuickSyncH26510b)
+ {
+ if (HandBrakeHardwareEncoderHelper.QsvHardwareGeneration > 6) 
+ {
+ defaultPreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "speed")); // TGL
+ }
+ else
+ {
+ defaultPreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "balanced")); // ICL and Earlier.
+ }
+ }
+
+ if (selectedEncoder == VideoEncoder.QuickSync)
+ {
+ // h264 encoder hasn't changed much in recent years, so stick to balanced. 
+ defaultPreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "balanced")); 
+ }
+
+ // Override for VCE
+ if (selectedEncoder == VideoEncoder.VceH264 || selectedEncoder == VideoEncoder.VceH265)
+ {
+ // TODO Would be good to have VCE version detection.
+ defaultPreset = this.VideoPresets.IndexOf(this.VideoPresets.FirstOrDefault(s => s.ShortName == "balanced"));
+ }
+
+ return defaultPreset;
+ }
 }
 }
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AboutView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AboutView.xaml Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AboutView.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AddPresetView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AddPresetView.xaml Changed

@@ -6,8 +6,10 @@
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture"
 Title="{Binding Title}"
- Width="350"
+ Width="450"
+ MaxHeight="800"
 ResizeMode="NoResize"
 SizeToContent="Height"
 WindowStartupLocation="CenterScreen"
@@ -17,6 +19,7 @@
 <Window.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 <Converters:EnumComboConverter x:Key="enumComboConverter" />
+ <picture:ResolutionLimitConverter x:Key="resolutionLimitConverter" />
 
 <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
 <Setter Property="ToolTipService.ShowDuration" Value="20000" />
@@ -33,7 +36,7 @@
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.AddPresetView_AddPreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+ <TextBlock Text="{x:Static Properties:Resources.AddPresetView_AddPreset}" Style="{StaticResource windowTitle}" Margin="10,0,10,10" Grid.Row="0" />
 
 
 <Grid Grid.Row="1" Margin="10,0,10,0">
@@ -65,17 +68,11 @@
 
 
 
- <TextBlock Grid.Row="2"
- Grid.Column="0" Margin="0,10,0,0"
- Text="{x:Static Properties:Resources.AddPresetView_Description}" />
- <TextBox Grid.Row="2"
- Grid.Column="1" Margin="0,10,0,0"
- 
+ <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Description}" />
+ <TextBox Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" MinHeight="75" TextWrapping="WrapWithOverflow" VerticalContentAlignment="Top"
 Text="{Binding Preset.Description, UpdateSourceTrigger=PropertyChanged}" />
 
- <TextBlock Grid.Row="3"
- Grid.Column="0" Margin="0,10,0,0"
- Text="{x:Static Properties:Resources.AddPresetView_Category}" />
+ <TextBlock Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Category}" />
 <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Vertical" Margin="0,10,0,0">
 
 <ComboBox ItemsSource="{Binding PresetCategories}" SelectedItem="{Binding SelectedPresetCategory}" DisplayMemberPath="Category" />
@@ -84,42 +81,30 @@
 
 
 
- <TextBlock Grid.Row="4" Margin="0,10,10,0"
- Grid.Column="0"
- Style="{StaticResource LongToolTipHolder}"
- VerticalAlignment="Center"
- ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
- Text="{x:Static Properties:Resources.AddPresetView_SavePictureSize}" />
- <ComboBox Grid.Row="4" Margin="0,10,0,0"
- Grid.Column="1"
- Width="125"
- HorizontalAlignment="Left" VerticalAlignment="Center"
- ToolTip="{x:Static Properties:Resources.AddPreset_PictureSizeMode}"
- ItemsSource="{Binding PictureSettingsModes,
- Converter={StaticResource enumComboConverter}}"
- SelectedItem="{Binding SelectedPictureSettingMode,
- Converter={StaticResource enumComboConverter}}" />
-
- <StackPanel Grid.Row="5"
- Grid.Column="1"
- Margin="0,10,0,0"
- Orientation="Horizontal"
- Visibility="{Binding ShowCustomInputs,
- Converter={StaticResource boolToVisConverter}}">
- <controls:NumberBox Width="60" Number="{Binding CustomWidth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="0,0,0,5" 
- AllowEmpty="True" />
- <TextBlock Margin="10,0,10,0"
- FontWeight="Bold"
- Text="X" />
- <controls:NumberBox Width="60" Number="{Binding CustomHeight, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Margin="0,0,0,5" 
- AllowEmpty="True" />
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="0,15,0,5" />
+ <ComboBox ItemsSource="{Binding ResolutionLimitModes, Converter={StaticResource resolutionLimitConverter}}" 
+ SelectedItem="{Binding SelectedPictureSettingsResLimitMode, Converter={StaticResource resolutionLimitConverter}}" 
+ Width="150" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,5" 
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" />
+
+
+ 
+ <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal">
+ <controls:NumberBox Number="{Binding CustomWidth, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxWidth}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+
+ <TextBlock Text="x" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" Margin="10,0,10,0" />
+ <controls:NumberBox Number="{Binding CustomHeight, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxHeight}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
 </StackPanel>
- 
- <TextBlock Text="Audio:" Grid.Row="6" />
- <Button Content="{x:Static Properties:Resources.AudioViewModel_ConfigureDefaults}" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Margin="0,5,0,0" Padding="8,2"
+ 
+ <TextBlock Text="Audio:" Grid.Row="6" VerticalAlignment="Center" Margin="0,15,0,0" />
+ <Button Content="{x:Static Properties:Resources.AudioViewModel_ConfigureDefaults}" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,0" Padding="8,2"
 cal:Message.Attach="Event Click = Action EditAudioDefaults" />
 
- <TextBlock Text="Subtitles:" Grid.Row="7" />
+ <TextBlock Text="Subtitles:" Grid.Row="7" VerticalAlignment="Center" Margin="0,5,0,0" />
 <Button Content="{x:Static Properties:Resources.SubtitlesViewModel_ConfigureDefaults}" Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left" Margin="0,5,0,0" Padding="8,2"
 cal:Message.Attach="Event Click = Action EditSubtitleDefaults" />

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml Changed

@@ -3,13 +3,13 @@
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
 xmlns:cal="http://www.caliburnproject.org"
- xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
 d:DesignHeight="500"
 d:DesignWidth="800"
@@ -22,11 +22,12 @@
 x:Name="audioDefaultsTab">
 
 <Window.Resources>
- <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
 <Audio:AudioBehaviourConverter x:Key="audioBehaviourConverter" />
 <Audio:AudioTrackDefaultBehaviourConverter x:Key="audioTrackDefaultBehaviourConverter" />
- <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
+ <Converters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
+ <Audio:AudioRateTypeForDefaultsConverter x:Key="audioRateTypeForDefaultsConverter" />
 <Audio:AudioRateTypeConverter x:Key="audioRateTypeConverter" />
 <Audio:AudioControlVisibilityConverter x:Key="audioControlVisibilityConverter" />
 </Window.Resources>
@@ -51,10 +52,10 @@
 </Grid.ColumnDefinitions>
 
 <StackPanel Grid.Row="0" Margin="0,0,0,0">
- <TextBlock Text="{x:Static Properties:Resources.AudioDefaultsView_PaneTitle}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.AudioDefaultsView_PaneTitle}" Style="{StaticResource windowTitle}" />
 </StackPanel>
 
- 
+ 
 <Grid Margin="0,0,0,0" Grid.Row="1" Grid.Column="0" >
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -71,7 +72,7 @@
 </Grid.ColumnDefinitions>
 
 
- <TextBlock Text="{x:Static Properties:Resources.AudioDefaultView_Behaviours}" FontWeight="Bold" Margin="0,10,0,5" />
+ <TextBlock Text="{x:Static Properties:Resources.AudioDefaultView_Behaviours}" Style="{StaticResource subHeader}" Margin="0,10,0,5" />
 
 <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackSelectionBehaviour}" Grid.Column="0" Grid.Row="1" Margin="0,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
 <ComboBox Name="autoAudioMode" Grid.Column="1" Grid.Row="1" HorizontalAlignment="Left"
@@ -110,9 +111,9 @@
 </DockPanel>
 
 <StackPanel Orientation="Vertical" Grid.Column="2">
- <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLangages}" Margin="0,0,0,5"/>
- <ListBox Name="selectedLangauges" ItemsSource="{Binding AudioBehaviours.SelectedLangauges}" 
- helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
+ <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLanguages}" Margin="0,0,0,5"/>
+ <ListBox Name="selectedLanguages" ItemsSource="{Binding AudioBehaviours.SelectedLanguages}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedLanguagesToMove}" 
 SelectionMode="Extended" Width="140" Height="120"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
@@ -125,7 +126,7 @@
 
 
 <StackPanel Orientation="Vertical" Margin="15,0,15,5" Grid.Row="1" Grid.Column="1" Grid.RowSpan="3" HorizontalAlignment="Left">
- <TextBlock Text="{x:Static Properties:Resources.AudioView_AutoPassthruBehaviour}" FontWeight="Bold" Margin="0,10,0,5" />
+ <TextBlock Text="{x:Static Properties:Resources.AudioView_AutoPassthruBehaviour}" Style="{StaticResource subHeader}" Margin="0,10,0,5" />
 <StackPanel Margin="5,10,0,0"
 Orientation="Vertical">
 <TextBlock Margin="5,0,5,0" Text="{x:Static Properties:Resources.AudioView_WhenAutoPassthru}" VerticalAlignment="Center" />
@@ -139,24 +140,25 @@
 </Grid.ColumnDefinitions>
 
 <StackPanel Margin="10,10,0,0" Orientation="Vertical" Grid.Column="0">
- <CheckBox Margin="0,0,5,0" Content="MP3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowMP3Pass}" />
- <CheckBox Margin="0,0,5,0" Content="AAC" VerticalAlignment="Center" IsChecked="{Binding AudioAllowAACPass}" />
- <CheckBox Margin="0,0,5,0" Content="AC3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowAC3Pass}" />
- <CheckBox Margin="0,0,5,0" Content="E-AC3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowEAC3Pass}" />
+ <CheckBox Margin="0,2,5,0" Content="MP2" VerticalAlignment="Center" IsChecked="{Binding AudioAllowMP2Pass}" />
+ <CheckBox Margin="0,2,5,0" Content="MP3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowMP3Pass}" />
+ <CheckBox Margin="0,2,5,0" Content="AAC" VerticalAlignment="Center" IsChecked="{Binding AudioAllowAACPass}" />
+ <CheckBox Margin="0,2,5,0" Content="AC3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowAC3Pass}" />
+ <CheckBox Margin="0,2,5,0" Content="E-AC3" VerticalAlignment="Center" IsChecked="{Binding AudioAllowEAC3Pass}" />
 </StackPanel>
 
 <StackPanel Margin="10,10,0,0" Orientation="Vertical" Grid.Column="1">
- <CheckBox Margin="0,0,5,0" Content="FLAC" VerticalAlignment="Center" IsChecked="{Binding AudioAllowFlacPass}" />
- <CheckBox Margin="0,0,5,0" Content="DTS" VerticalAlignment="Center" IsChecked="{Binding AudioAllowDTSPass}" />
- <CheckBox Margin="0,0,5,0" Content="DTSHD" VerticalAlignment="Center" IsChecked="{Binding AudioAllowDTSHDPass}" />
- <CheckBox Margin="0,0,5,0" Content="TrueHD" VerticalAlignment="Center" IsChecked="{Binding AudioAllowTrueHDPass}" />
+ <CheckBox Margin="0,2,5,0" Content="FLAC" VerticalAlignment="Center" IsChecked="{Binding AudioAllowFlacPass}" />
+ <CheckBox Margin="0,2,5,0" Content="DTS" VerticalAlignment="Center" IsChecked="{Binding AudioAllowDTSPass}" />
+ <CheckBox Margin="0,2,5,0" Content="DTSHD" VerticalAlignment="Center" IsChecked="{Binding AudioAllowDTSHDPass}" />
+ <CheckBox Margin="0,2,5,0" Content="TrueHD" VerticalAlignment="Center" IsChecked="{Binding AudioAllowTrueHDPass}" />
 </StackPanel>
 </Grid>
 
 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
 <TextBlock Margin="10,0,5,0" Text="{x:Static Properties:Resources.AudioView_OtherwiseFallbackEncoder}" />
 
- <ComboBox VerticalAlignment="Center" Width="105" Height="22" Margin="5,0,5,0">
+ <ComboBox VerticalAlignment="Center" Width="110" Margin="5,0,5,0">
 <ComboBox.SelectedItem>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="AudioEncoderFallback" />
@@ -165,7 +167,7 @@
 <ComboBox.ItemsSource>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}" ConverterParameter="True">
 <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
- <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
+ <Binding Path="DataContext.OutputFormat" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
 </MultiBinding>
 </ComboBox.ItemsSource>
 </ComboBox>
@@ -174,7 +176,7 @@
 </StackPanel>
 
 
- <TextBlock Text="{x:Static Properties:Resources.AudioDefaultsView_AutoAddTracks}" FontWeight="Bold" Margin="0,20,0,0" Grid.Row="4" Grid.Column="0" />
+ <TextBlock Text="{x:Static Properties:Resources.AudioDefaultsView_AutoAddTracks}" Style="{StaticResource subHeader}" Margin="0,20,0,0" Grid.Row="4" Grid.Column="0" />
 
 <Grid Grid.Row="5" Margin="25,10,0,0" Grid.ColumnSpan="3">
 <Grid.ColumnDefinitions>
@@ -253,11 +255,11 @@
 </Grid.ColumnDefinitions>
 
 <Grid.RowDefinitions>
- <RowDefinition Height="26" />
+ <RowDefinition Height="28" />
 </Grid.RowDefinitions>
 
 
- <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">
+ <ComboBox Grid.Column="3" Width="100" Margin="5,0,5,0">
 <ComboBox.SelectedItem>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="Encoder" />
@@ -266,14 +268,19 @@
 <ComboBox.ItemsSource>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
- <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
+ <Binding Path="DataContext.OutputFormat" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
 </MultiBinding>
 </ComboBox.ItemsSource>
 </ComboBox>
 
- <ComboBox Grid.Column="4" Height="22" Width="65" HorizontalAlignment="Stretch" 
- ItemsSource="{Binding AudioEncoderRateTypes, Converter={StaticResource audioRateTypeConverter}}"
- SelectedItem="{Binding EncoderRateType, Converter={StaticResource audioRateTypeConverter}}">
+ <ComboBox Grid.Column="4" Width="65" HorizontalAlignment="Stretch" 
+ SelectedItem="{Binding EncoderRateType, Converter={StaticResource audioRateTypeConverter}}">
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource audioRateTypeForDefaultsConverter}">
+ <Binding Path="Encoder" />
+ <Binding Path="DataContext.AudioEncoderFallback" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type Window}}" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
 <ComboBox.Visibility>
 <MultiBinding Converter="{StaticResource audioControlVisibilityConverter}">
 <Binding Path="IsRateTypeVisible" />
@@ -283,7 +290,7 @@
 </ComboBox.Visibility>
 </ComboBox>
 
- <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding EncoderQualityValues}"
+ <ComboBox Grid.Column="5" Width="55" Margin="5,0,5,0" ItemsSource="{Binding EncoderQualityValues}"
 SelectedItem="{Binding Quality}" >
 <ComboBox.Visibility>
 <MultiBinding Converter="{StaticResource audioControlVisibilityConverter}">
@@ -294,7 +301,7 @@
 </ComboBox.Visibility>
 </ComboBox>
 
- <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding Bitrates}"
+ <ComboBox Grid.Column="5" Width="55" Margin="5,0,5,0" ItemsSource="{Binding Bitrates}"
 SelectedItem="{Binding Bitrate}" >
 <ComboBox.Visibility>
 <MultiBinding Converter="{StaticResource audioControlVisibilityConverter}">
@@ -305,7 +312,7 @@
 </ComboBox.Visibility>
 </ComboBox>
 
- <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ <ComboBox Grid.Row="0" Grid.Column="7" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
 ItemsSource="{Binding Mixdowns}" SelectedItem="{Binding MixDown}"
 DisplayMemberPath="DisplayName" >
 <ComboBox.Visibility>
@@ -317,7 +324,7 @@
 </ComboBox>
 
 
- <ComboBox Width="70" Height="22" Margin="5,0,5,0" Grid.Column="9" 
+ <ComboBox Width="70" Margin="5,0,5,0" Grid.Column="9" 
 ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
 SelectedItem="{Binding SampleRateDisplayValue}" >
 <ComboBox.Visibility>
@@ -328,7 +335,7 @@
 </ComboBox.Visibility>
 </ComboBox>
 
- <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="11" VerticalAlignment="Center" Height="22"
+ <controls:NumberBox Name="drcNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="11" VerticalAlignment="Center"
 Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" 
 ShowIncrementButtons="True" AllowEmpty="False">
 <controls:NumberBox.Visibility>
@@ -339,7 +346,7 @@
 </controls:NumberBox.Visibility>
 </controls:NumberBox>
 
- <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="13" VerticalAlignment="Center" Height="22"
+ <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="13" VerticalAlignment="Center" 
 Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" 
 ShowIncrementButtons="True" AllowEmpty="False" >
 <controls:NumberBox.Visibility>
@@ -375,7 +382,7 @@
 <Button Content="{x:Static Properties:Resources.AudioDefaultsView_Clear}" cal:Message.Attach="Event Click = Action ClearTracks" Padding="8,2"/>
 
 <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackSettingDefaultBehaviour}" Grid.Column="0" Grid.Row="1" Margin="15,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" />
- <ComboBox Name="audioTrackBeahaviorMode" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
+ <ComboBox Name="audioTrackBehaviorMode" Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left"
 ItemsSource="{Binding AudioTrackDefaultBehaviourModeList, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" 
 SelectedItem="{Binding AudioBehaviours.SelectedTrackDefaultBehaviour, Converter={StaticResource audioTrackDefaultBehaviourConverter}}" Width="210" Margin="0,0,5,0" />
 </StackPanel>
@@ -383,10 +390,11 @@
 </Grid>
 
 <Border BorderBrush="DarkGray" BorderThickness="0,1,0,0" SnapsToDevicePixels="True" Grid.Row="7" Grid.ColumnSpan="3" Margin="10,15,0,0" >
- <Grid Margin="0,10,0,0" Grid.Row="2" Grid.ColumnSpan="3">
+ <Grid Margin="0,10,0,0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
 <Button cal:Message.Attach="Event Click = Action LaunchHelp" Background="Transparent" BorderThickness="0" Grid.Column="0" HorizontalAlignment="Left" Padding="0,2">
@@ -396,8 +404,15 @@
 </Button>
 
 <Button Grid.Column="1"
- Click="Apply_OnClick"
- Content="{x:Static Properties:Resources.Generic_Apply}"
+ cal:Message.Attach="Event Click = Action Cancel"
+ Content="{x:Static Properties:Resources.Generic_Cancel}"
+ IsCancel="True"
+ Padding="8,2"
+ Margin="0,0,5,0"/>
+
+ <Button Grid.Column="2"
+ cal:Message.Attach="Event Click = Action Save"
+ Content="{x:Static Properties:Resources.Generic_Save}"
 IsDefault="True"
 Padding="8,2" />
 </Grid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AudioDefaultsView.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/AudioView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/AudioView.xaml Changed

@@ -3,34 +3,30 @@
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
 xmlns:cal="http://www.caliburnproject.org"
- xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 d:DesignHeight="500"
 d:DesignWidth="770"
- mc:Ignorable="d"
- x:Name="audioTab">
+ mc:Ignorable="d">
 
 <UserControl.Resources>
- <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
- <Conveters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
+ <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ <Converters:BooleanToHiddenVisibilityConverter x:Key="boolToHiddenVisConverter" />
 <Audio:AudioEncoderConverter x:Key="audioEncoderConverter" />
 <Audio:AudioRateTypeConverter x:Key="audioRateTypeConverter" />
 <Audio:AudioMixdownConverter x:Key="audioMixdownConverter" />
 <Audio:AudioMixdownListConverter x:Key="audioMixdownListConverter" />
- <Conveters:ThemeImageConverter x:Key="themeConverter" />
+ <Converters:ThemeImageConverter x:Key="themeConverter" />
 </UserControl.Resources>
 
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
@@ -39,16 +35,8 @@
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
-
 
- <TextBlock Grid.Row="0"
- Margin="10,5,0,0"
- FontWeight="Bold"
- VerticalAlignment="Top"
- Text="{Binding PanelTitle}" />
-
- 
- <Grid Grid.Row="1" Margin="10,5,10,0" Grid.Column="0" >
+ <Grid Grid.Row="0" Margin="10,5,10,0" Grid.Column="0" >
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
@@ -71,7 +59,7 @@
 
 <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="dropdownArrowPreset" />
 </StackPanel>
 </Button.Content>
 
@@ -86,26 +74,25 @@
 
 
 <Button MinWidth="65" Grid.Column="1"
- Margin="10,0,5,0"
+ Margin="10,0,5,0" FontWeight="Bold"
 cal:Message.Attach="Event Click = Action ShowAudioDefaults"
- Content="{Binding SwitchDisplayTitle}" />
+ ToolTip="{x:Static Properties:ResourcesTooltips.AudioView_AudioDefaults}"
+ Content="{x:Static Properties:Resources.AudioViewModel_ConfigureDefaults}" />
 
 <Button MinWidth="65" Grid.Column="2"
- cal:Message.Attach="Event Click = Action ReloadDefaults"
- Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />
+ cal:Message.Attach="Event Click = Action ReloadDefaults"
+ ToolTip="{x:Static Properties:ResourcesTooltips.BehavioursReload}"
+ Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />
 
 <Button MinWidth="65" Grid.Column="4"
 Margin="0,0,0,0"
 cal:Message.Attach="Event Click = Action Clear"
 Content="{x:Static Properties:Resources.Generic_Clear}" />
-
-
-
 </Grid>
 </Grid>
 
- 
- <ListBox Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch"
+ 
+ <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Stretch"
 Margin="10,10,10,10"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
@@ -129,6 +116,9 @@
 <MenuItem Header="{x:Static Properties:Resources.Generic_Clear}" cal:Message.Attach="Event Click = Action Clear" />
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.Shared_ConfigureDefaultBehaviours}" cal:Message.Attach="Event Click = Action ShowAudioDefaults" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.Shared_ExpandAll}" cal:Message.Attach="Event Click = Action ExpandAllTracks" />
+ <MenuItem Header="{x:Static Properties:Resources.Shared_CollapseAll}" cal:Message.Attach="Event Click = Action CollapseAllTracks" />
 </ContextMenu>
 </ListBox.ContextMenu>
 
@@ -160,6 +150,8 @@
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
 <Grid.RowDefinitions>
@@ -169,12 +161,12 @@
 <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Reorder.png'}" />
 
 
- <ComboBox Grid.Column="1" Height="22" Width="130" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ <ComboBox Grid.Column="1" Width="160" Margin="5,0,5,0" HorizontalAlignment="Stretch"
 ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding ScannedTrack}" />
 
 <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Codec}" />
- <ComboBox Grid.Column="3" Width="100" Height="22" Margin="5,0,5,0">
+ <ComboBox Grid.Column="3" Width="105" Margin="5,0,5,0">
 <ComboBox.SelectedItem>
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="Encoder" />
@@ -184,35 +176,49 @@
 <MultiBinding Converter="{StaticResource audioEncoderConverter}">
 <Binding Path="DataContext.AudioEncoders" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
 <Binding Path="DataContext.Task" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type UserControl}}" />
+ <Binding Path="ScannedTrack" />
 </MultiBinding>
 </ComboBox.ItemsSource>
 </ComboBox>
 
- <ComboBox Grid.Column="4" Height="22" Width="65" HorizontalAlignment="Stretch"
+ <ComboBox Grid.Column="4" Width="65" HorizontalAlignment="Stretch"
 ItemsSource="{Binding AudioEncoderRateTypes, Converter={StaticResource audioRateTypeConverter}}"
 SelectedItem="{Binding EncoderRateType, Converter={StaticResource audioRateTypeConverter}}"
 Visibility="{Binding IsRateTypeVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
- <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding EncoderQualityValues}"
+ <ComboBox Grid.Column="5" Width="55" Margin="5,0,5,0" ItemsSource="{Binding EncoderQualityValues}"
 SelectedItem="{Binding Quality}"
 Visibility="{Binding IsQualityVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
- <ComboBox Grid.Column="5" Width="55" Height="22" Margin="5,0,5,0" ItemsSource="{Binding Bitrates}"
+ <ComboBox Grid.Column="5" Width="55" Margin="5,0,5,0" ItemsSource="{Binding Bitrates}"
 SelectedItem="{Binding Bitrate}"
 Visibility="{Binding IsBitrateVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 
- 
 <TextBlock Grid.Row="0" Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Mixdown}"
 Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <ComboBox Grid.Row="0" Grid.Column="7" Height="22" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ <ComboBox Grid.Row="0" Grid.Column="7" Width="120" Margin="5,0,5,0" HorizontalAlignment="Stretch"
 ItemsSource="{Binding TrackReference, Converter={StaticResource audioMixdownListConverter}}"
 SelectedItem="{Binding MixDown, Converter={StaticResource audioMixdownConverter}}"
 DisplayMemberPath="DisplayName"
 Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
 
+ <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Samplerate}" Grid.Column="8"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox Width="70" Margin="5,0,5,0" Grid.Column="9"
+ ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ SelectedItem="{Binding SampleRateDisplayValue}"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+
+ <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Gain}" Grid.Column="10"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
 
- <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="8" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0"
- Padding="3,0" Height="22" HorizontalAlignment="Left" Background="Transparent" >
+ <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left" Grid.Column="11" VerticalAlignment="Center"
+ Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
+
+ <ToggleButton Name="advancedOptionsToggle" VerticalAlignment="Center" Grid.Column="12" Grid.Row="0" Grid.ColumnSpan="2" Margin="5,0,0,0"
+ Padding="3,0" HorizontalAlignment="Left" Background="Transparent" IsChecked="{Binding IsExpandedTrackView}" >
 <ToggleButton.Style>
 <Style TargetType="{x:Type ToggleButton}" BasedOn="{StaticResource {x:Type ToggleButton}}">
 <Setter Property="Content" Value="Show"/>
@@ -245,15 +251,8 @@
 </StackPanel>
 
 
- <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsChecked, ElementName=advancedOptionsToggle, Converter={StaticResource boolToVisConverter}}">
- <StackPanel Orientation="Horizontal" Margin="8,5,0,5" >
-
- <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Samplerate}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <ComboBox Width="70" Height="22" Margin="5,0,5,0"
- ItemsSource="{Binding DataContext.SampleRates, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
- SelectedItem="{Binding SampleRateDisplayValue}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Grid Grid.Column="1" Grid.Row="1" HorizontalAlignment="Stretch" Visibility="{Binding IsExpandedTrackView, Converter={StaticResource boolToVisConverter}}">
+ <StackPanel Orientation="Horizontal" Margin="22,5,0,5" >
 
 <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_DRC}"
 Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
@@ -262,15 +261,9 @@
 Minimum="0" Modulus="0.1" Maximum="4" Number="{Binding DRC, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
 Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
 
- <TextBlock VerticalAlignment="Center" FontWeight="Bold" Text="{x:Static Properties:Resources.AudioView_Gain}"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
- <controls:NumberBox Name="gainNumericCtl" Width="45" Margin="5,0,5,0" HorizontalAlignment="Left"
- Minimum="-20" Modulus="1" Maximum="20" Number="{Binding Gain, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
- Visibility="{Binding IsPassthru, Converter={StaticResource boolToHiddenVisConverter}, ConverterParameter=true}"/>
-
+ 
 <TextBlock Text="{x:Static Properties:Resources.AudioView_TrackName}" VerticalAlignment="Center" FontWeight="Bold" Margin="5,0,5,0" />
- <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="175" Height="22" />
+ <TextBox Text="{Binding TrackName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Width="250" />
 
 </StackPanel>
 </Grid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ChaptersView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ChaptersView.xaml Changed

@@ -10,25 +10,22 @@
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.ChaptersView_ChapterMarkers}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
-
- <Grid Grid.Row="1" Margin="10,5,10,0">
+ <Grid Grid.Row="0" Margin="10,5,10,0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
- <CheckBox Content="{x:Static Properties:Resources.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" />
+ <CheckBox Content="{x:Static Properties:Resources.ChaptersView_CreateChapterMarkers}" IsChecked="{Binding IncludeChapterMarkers}" Grid.Column="0" VerticalAlignment="Center" VerticalContentAlignment="Center" />
 <Button Content="{x:Static Properties:Resources.ChaptersView_Import}" Name="import" Grid.Column="2" Width="75" Margin="0,0,10,0" cal:Message.Attach="Event Click = Action Import" />
 <Button Content="{x:Static Properties:Resources.ChaptersView_Export}" Name="export" Grid.Column="3" Width="75" cal:Message.Attach="Event Click = Action Export" />
 </Grid>
 
- <DataGrid Grid.Row="2" Margin="10" ItemsSource="{Binding Chapters}" 
+ <DataGrid Grid.Row="1" Margin="10" ItemsSource="{Binding Chapters}" 
 VerticalAlignment="Stretch" AutoGenerateColumns="False"
 CanUserSortColumns="False" CanUserReorderColumns="False" CanUserResizeColumns="False" CanUserResizeRows="False"
 CanUserAddRows="False" CanUserDeleteRows="False" HeadersVisibility="Column"
@@ -50,8 +47,8 @@
 </ContextMenu>
 </DataGrid.ContextMenu>
 <DataGrid.Columns>
- <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_ChapterNumber}" Width="120" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
- <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_Duration}" Width="100" Binding="{Binding Duration}" IsReadOnly="True" />
+ <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_ChapterNumber}" MinWidth="100" Binding="{Binding ChapterNumber}" IsReadOnly="True" />
+ <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_Duration}" MinWidth="80" Binding="{Binding Duration}" IsReadOnly="True" />
 <DataGridTextColumn Header="{x:Static Properties:Resources.ChaptersView_ChapterName}" Width="*" Binding="{Binding ChapterName}" IsReadOnly="False" />
 </DataGrid.Columns>
 </DataGrid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/CountdownAlertView.xaml Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ErrorView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ErrorView.xaml Changed

@@ -24,51 +24,33 @@
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
 
- <StackPanel Grid.Row="0"
- Margin="0,0,0,0"
- Orientation="Horizontal">
+ <Image Width="64" Height="64" Margin="10,4,0,4" Source="Images/ErrorX.png" Grid.Column="0" />
 
- <Image Width="64"
- Height="64"
- Margin="10,4,0,4"
- Source="Images/ErrorX.png" />
- <Grid Margin="10,0,0,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
- </Grid.RowDefinitions>
- <TextBlock Grid.Row="0"
- Margin="0,5,0,0"
- FontWeight="Bold"
- Text="{Binding ErrorMessage}" />
- <TextBlock Grid.Row="1"
- Margin="0,5,0,0"
- Text="{Binding Solution}" TextWrapping="Wrap" />
+ <Grid Margin="10,0,0,0" Grid.Column="1">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
 
- <TextBlock Grid.Row="2"
- Margin="0,0,0,2"
- VerticalAlignment="Bottom"
- FontWeight="Bold"
- Text="{x:Static Properties:Resources.ErrorView_ErrorDetails}" />
- </Grid>
- </StackPanel>
+ <TextBlock Grid.Row="0" Margin="0,5,0,0" Text="{Binding ErrorMessage}" Style="{StaticResource subHeader}" TextWrapping="Wrap" />
+ <TextBlock Grid.Row="1" Margin="0,5,0,0" Text="{Binding Solution}" TextWrapping="Wrap" />
+ <TextBlock Grid.Row="2" Margin="0,15,0,0" VerticalAlignment="Bottom" Style="{StaticResource sectionHeader}" Text="{x:Static Properties:Resources.ErrorView_ErrorDetails}" />
+ </Grid>
 
 
- <TextBox Grid.Row="1"
- Margin="84,10,10,10"
- HorizontalAlignment="Stretch"
- VerticalAlignment="Stretch"
- IsReadOnly="True"
- Text="{Binding Details}"
- x:Name="errorText"
- TextWrapping="Wrap"
- VerticalScrollBarVisibility="Auto" />
-
+ <TextBox x:Name="errorText" Grid.Row="1" Margin="10,5,10,5" Grid.Column="1"
+ HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Top" IsReadOnly="True" Text="{Binding Details}"
+ TextWrapping="Wrap" VerticalScrollBarVisibility="Auto" />
 
 
- <Grid Grid.Row="2">
+ <Grid Grid.Row="2" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Margin="0,0,10,5">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
@@ -93,11 +75,7 @@
 </Grid>
 </Button>
 
- <Button Grid.Column="2"
- Margin="0,5,10,5"
- cal:Message.Attach="Event Click = Action Close"
- Content="{x:Static Properties:Resources.Generic_Close}"
- Padding="8,2" />
+ <Button Grid.Column="2" IsDefault="True" cal:Message.Attach="Event Click = Action Close" Content="{x:Static Properties:Resources.Generic_Close}"/>
 </Grid>
 </Grid>
 </Window>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ErrorView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ErrorView.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/FiltersView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/FiltersView.xaml Changed

@@ -7,6 +7,7 @@
 xmlns:filters="clr-namespace:HandBrakeWPF.Converters.Filters"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 mc:Ignorable="d" >
+
 <UserControl.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 <Converters:EnumComboConverter x:Key="boolComboConverter" />
@@ -15,198 +16,199 @@
 <filters:SharpenTuneConverter x:Key="SharpenTuneConverter" />
 </UserControl.Resources>
 
- <Grid>
+ <Grid Margin="10,10,0,0">
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="Auto" MinHeight="35" />
+ <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
 <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" MinWidth="125" />
+ <ColumnDefinition Width="Auto" MinWidth="100" />
 <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Filters}" FontWeight="Bold" Margin="10,5,0,0" Grid.Row="0" ></TextBlock>
-
- <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="0" Margin="10,10,0,0">
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition MinWidth="75" />
- <ColumnDefinition MinWidth="160" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Detelecine}" Grid.Row="0" Grid.Column="0" Margin="0,0,0,10" />
- <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineFilter.DetelecineOptions, Converter={StaticResource boolComboConverter}}" 
- SelectedItem="{Binding DetelecineFilter.SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1" Margin="0,0,0,10"
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Detelecine}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
+ <ComboBox Width="120" Grid.Row="0" ItemsSource="{Binding DetelecineFilter.DetelecineOptions, Converter={StaticResource boolComboConverter}}" 
+ SelectedItem="{Binding DetelecineFilter.SelectedDetelecine, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
 ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Detelecine}"
 HorizontalAlignment="Left" AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Detelecine}" />
- <TextBox Width="120" Grid.Row="0" Grid.Column="2" Margin="0,0,0,10" Text="{Binding DetelecineFilter.CustomDetelecine, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left"
- Visibility="{Binding DetelecineFilter.ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}"/>
+ <TextBox Width="450" Grid.Row="0" Grid.Column="2" Margin="10,0,0,0" 
+ Text="{Binding DetelecineFilter.CustomDetelecine, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" VerticalAlignment="Center"
+ Visibility="{Binding DetelecineFilter.ShowDetelecineCustom, Converter={StaticResource boolToVisConverter}}" />
 
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_InterlaceDetection}" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1" />
-
- <ComboBox Width="120" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding DeinterlaceFilter.CombDetectPresets, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_InterlaceDetection}" VerticalAlignment="Center" Margin="0,0,5,0" Grid.Row="1" Grid.Column="0" />
+ <ComboBox Width="120" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding DeinterlaceFilter.CombDetectPresets, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left" VerticalAlignment="Center"
 SelectedItem="{Binding DeinterlaceFilter.SelectedCombDetectPreset, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_InterlaceDetection}"
 VerticalContentAlignment="Center" AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_InterlaceDetection}"/>
-
- <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2">
- <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding DeinterlaceFilter.ShowCombDetectCustom, Converter={StaticResource boolToVisConverter}}" />
- <TextBox Width="120" Text="{Binding DeinterlaceFilter.CustomCombDetect, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left"
- Visibility="{Binding DeinterlaceFilter.ShowCombDetectCustom, Converter={StaticResource boolToVisConverter}}" MinHeight="22" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_InterlaceDetectionCustom}" />
- </StackPanel>
-
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deinterlace}" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" Margin="0,0,0,10" />
- <StackPanel Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="0,0,0,10">
- <ComboBox Width="120" ItemsSource="{Binding DeinterlaceFilter.DeinterlaceFilterOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
- SelectedItem="{Binding DeinterlaceFilter.SelectedDeinterlaceFilter, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deinterlace}"
- AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Deinterlace}" />
- </StackPanel>
-
- <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="0,0,0,10">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_DeinterlacePreset}" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding DeinterlaceFilter.IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}" />
- <ComboBox Width="120" ItemsSource="{Binding DeinterlaceFilter.DeinterlacePresets}" HorizontalAlignment="Left" VerticalAlignment="Center"
+ <TextBox Width="450" Grid.Row="1" Grid.Column="2" Margin="10,0,0,0" 
+ Text="{Binding DeinterlaceFilter.CustomCombDetect, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left" 
+ Visibility="{Binding DeinterlaceFilter.ShowCombDetectCustom, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_InterlaceDetectionCustom}" />
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deinterlace}" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" />
+ <ComboBox Width="120" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" 
+ ItemsSource="{Binding DeinterlaceFilter.DeinterlaceFilterOptions, Converter={StaticResource boolComboConverter}}" HorizontalAlignment="Left"
+ SelectedItem="{Binding DeinterlaceFilter.SelectedDeinterlaceFilter, Converter={StaticResource boolComboConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deinterlace}"
+ AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Deinterlace}" />
+
+ <StackPanel Grid.Row="2" Grid.Column="2" Orientation="Horizontal" Margin="10,0,0,0" MinWidth="450">
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_DeinterlacePreset}" VerticalAlignment="Center" Margin="0,0,5,0" Visibility="{Binding DeinterlaceFilter.IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}" />
+ <ComboBox Width="120" ItemsSource="{Binding DeinterlaceFilter.DeinterlacePresets}" HorizontalAlignment="Left" VerticalAlignment="Center"
 SelectedItem="{Binding DeinterlaceFilter.SelectedDeInterlacePreset}" DisplayMemberPath="Name" Visibility="{Binding DeinterlaceFilter.IsDeinterlaceEnabled, Converter={StaticResource boolToVisConverter}}"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DeinterlacePresetAuto}" />
 
- <TextBlock Text="Custom:" VerticalAlignment="Center" Margin="5,0,5,0" Visibility="{Binding DeinterlaceFilter.ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" />
- <TextBox Width="120" Text="{Binding DeinterlaceFilter.CustomDeinterlaceSettings, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left"
- Visibility="{Binding DeinterlaceFilter.ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" MinHeight="22" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DeinterlaceCustom}" />
- </StackPanel>
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" VerticalAlignment="Center" Margin="5,0,5,0" Visibility="{Binding DeinterlaceFilter.ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" />
+ <TextBox Text="{Binding DeinterlaceFilter.CustomDeinterlaceSettings, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Stretch" MinWidth="240"
+ Visibility="{Binding DeinterlaceFilter.ShowCustomDeinterlace, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DeinterlaceCustom}" />
+ </StackPanel>
 
 
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" Margin="0,0,0,10"/>
- <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseFilter.DenoiseOptions, Converter={StaticResource boolComboConverter}}" 
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Denoise}" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"/>
+ <ComboBox Width="120" Grid.Row="3" ItemsSource="{Binding DenoiseFilter.DenoiseOptions, Converter={StaticResource boolComboConverter}}" 
 SelectedItem="{Binding DenoiseFilter.SelectedDenoise, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
- HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}"
+ HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Denoise}"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Denoise}"/>
 
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="3" Grid.Column="2" Margin="0,0,0,10" 
- Visibility="{Binding DenoiseFilter.ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="0,0,5,0" />
- <ComboBox SelectedItem="{Binding DenoiseFilter.SelectedDenoisePreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoisePreset}"
+ <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="2" Margin="10,0,5,0" Visibility="{Binding DenoiseFilter.ShowDenoiseOptions, Converter={StaticResource boolToVisConverter}}">
+
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="0,0,5,0" VerticalAlignment="Center" />
+ <ComboBox SelectedItem="{Binding DenoiseFilter.SelectedDenoisePreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoisePreset}"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DenoisePresetAuto}"
- MinWidth="100" HorizontalAlignment="Center" VerticalAlignment="Center">
- <ComboBox.ItemsSource>
- <MultiBinding Converter="{StaticResource DenoisePresetConverter}">
- <Binding Path="DenoiseFilter.DenoisePresets" />
- <Binding Path="DenoiseFilter.SelectedDenoise" />
- </MultiBinding>
- </ComboBox.ItemsSource>
- </ComboBox>
-
- <StackPanel Orientation="Horizontal" Visibility="{Binding DenoiseFilter.ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />
- <ComboBox ItemsSource="{Binding DenoiseFilter.DenoiseTunes}" SelectedItem="{Binding DenoiseFilter.SelectedDenoiseTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoiseTune}"
+ MinWidth="120" HorizontalAlignment="Center" VerticalAlignment="Center" >
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource DenoisePresetConverter}">
+ <Binding Path="DenoiseFilter.DenoisePresets" />
+ <Binding Path="DenoiseFilter.SelectedDenoise" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
+ </ComboBox>
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding DenoiseFilter.ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" >
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />
+ <ComboBox ItemsSource="{Binding DenoiseFilter.DenoiseTunes}" SelectedItem="{Binding DenoiseFilter.SelectedDenoiseTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_DenoiseTune}"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_DenoiseTuneAuto}"
- Visibility="{Binding DenoiseFilter.ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
- </StackPanel>
+ Visibility="{Binding DenoiseFilter.ShowDenoiseTune, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
+ </StackPanel>
 
- <StackPanel Orientation="Horizontal" Visibility="{Binding DenoiseFilter.ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />
- <TextBox Width="120" Margin="0" Text="{Binding DenoiseFilter.CustomDenoise, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinHeight="22"
+ <StackPanel Orientation="Horizontal" Visibility="{Binding DenoiseFilter.ShowDenoiseCustom, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />
+ <TextBox Width="240" Text="{Binding DenoiseFilter.CustomDenoise, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" 
 ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_CustomDenoiseParams}" />
- </StackPanel>
+ </StackPanel>
+ </StackPanel>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_ChromaSmooth}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" />
+ <ComboBox Width="120" Grid.Row="4" Grid.Column="1" 
+ ItemsSource="{Binding ChromaSmoothFilter.Presets}" DisplayMemberPath="DisplayName"
+ SelectedItem="{Binding ChromaSmoothFilter.SelectedPreset}" 
+ AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_ChromaSmooth}"
+ HorizontalAlignment="Left" VerticalAlignment="Center" 
+ ToolTip="{x:Static Properties:ResourcesTooltips.FiltersView_ChromaSmooth}" />
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding ChromaSmoothFilter.ShowTune, Converter={StaticResource boolToVisConverter}}" Grid.Row="4" Grid.Column="2" Margin="10,0,0,0" >
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" />
+ <ComboBox ItemsSource="{Binding ChromaSmoothFilter.Tunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding ChromaSmoothFilter.SelectedTune}" 
+ MinWidth="120" VerticalAlignment="Center" Margin="5,0,0,0"
+ AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Tune}" />
+ </StackPanel>
+ <TextBox Width="450" Text="{Binding ChromaSmoothFilter.CustomSettings, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left"
+ Visibility="{Binding ChromaSmoothFilter.ShowCustom, Converter={StaticResource boolToVisConverter}}" Grid.Row="4" Grid.Column="2" Margin="10,0,0,0" />
 
- </StackPanel>
- 
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Sharpen}" Grid.Row="4" Grid.Column="0" Margin="0,0,0,10"/>
- <ComboBox Width="120" Grid.Row="4" ItemsSource="{Binding SharpenFilter.SharpenOptions, Converter={StaticResource boolComboConverter}}" 
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Sharpen}" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" />
+ <ComboBox Width="120" Grid.Row="5" ItemsSource="{Binding SharpenFilter.SharpenOptions, Converter={StaticResource boolComboConverter}}" 
 SelectedItem="{Binding SharpenFilter.SelectedSharpen, Converter={StaticResource boolComboConverter}}" Grid.Column="1"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Sharpen}"
- HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,10" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Sharpen}" />
- 
- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="4" Grid.Column="2" Margin="0,0,0,10" 
- Visibility="{Binding SharpenFilter.ShowSharpenOptions, Converter={StaticResource boolToVisConverter}}">
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="0,0,5,0" />
- <ComboBox SelectedItem="{Binding SharpenFilter.SelectedSharpenPreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenPreset}"
- MinWidth="100" HorizontalAlignment="Center" VerticalAlignment="Center" DisplayMemberPath="DisplayName"
+ HorizontalAlignment="Left" VerticalAlignment="Center" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Sharpen}" />
+ 
+ <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Grid.Row="5" Grid.Column="2" 
+ Visibility="{Binding SharpenFilter.ShowSharpenOptions, Converter={StaticResource boolToVisConverter}}">
+
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Preset}" Margin="10,0,5,0" />
+ <ComboBox SelectedItem="{Binding SharpenFilter.SelectedSharpenPreset}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenPreset}"
+ MinWidth="120" HorizontalAlignment="Center" VerticalAlignment="Center" DisplayMemberPath="DisplayName"
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_SharpenPresetAuto}" >
- <ComboBox.ItemsSource>
- <MultiBinding Converter="{StaticResource SharpenPresetConverter}">
- <Binding Path="SharpenFilter.SharpenPresets" />
- <Binding Path="SharpenFilter.SelectedSharpen" />
- </MultiBinding>
- </ComboBox.ItemsSource>
- </ComboBox>
-
- <StackPanel Orientation="Horizontal" Visibility="{Binding SharpenFilter.ShowSharpenTune, Converter={StaticResource boolToVisConverter}}">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />
- <ComboBox SelectedItem="{Binding SharpenFilter.SelectedSharpenTune}" MinWidth="100" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenTune}" VerticalAlignment="Center" DisplayMemberPath="DisplayName" 
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource SharpenPresetConverter}">
+ <Binding Path="SharpenFilter.SharpenPresets" />
+ <Binding Path="SharpenFilter.SelectedSharpen" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
+ </ComboBox>
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding SharpenFilter.ShowSharpenTune, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0">
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="0,0,5,0" />
+ <ComboBox SelectedItem="{Binding SharpenFilter.SelectedSharpenTune}" MinWidth="120" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_SharpenTune}" VerticalAlignment="Center" DisplayMemberPath="DisplayName" 
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_SharpenTuneAuto}" >
- <ComboBox.ItemsSource>
- <MultiBinding Converter="{StaticResource SharpenTuneConverter}">
- <Binding Path="SharpenFilter.SharpenTunes" />
- <Binding Path="SharpenFilter.SelectedSharpen" />
- </MultiBinding>
- </ComboBox.ItemsSource>
- </ComboBox>
- </StackPanel>
-
- <StackPanel Orientation="Horizontal" Visibility="{Binding SharpenFilter.ShowSharpenCustom, Converter={StaticResource boolToVisConverter}}">
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />
- <TextBox Width="120" Margin="0" Text="{Binding SharpenFilter.CustomSharpen, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinHeight="22"
+ <ComboBox.ItemsSource>
+ <MultiBinding Converter="{StaticResource SharpenTuneConverter}">
+ <Binding Path="SharpenFilter.SharpenTunes" />
+ <Binding Path="SharpenFilter.SelectedSharpen" />
+ </MultiBinding>
+ </ComboBox.ItemsSource>
+ </ComboBox>
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Visibility="{Binding SharpenFilter.ShowSharpenCustom, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" />
+ <TextBox Width="240" Text="{Binding SharpenFilter.CustomSharpen, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center"
 ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_CustomSharpenParams}" />
- </StackPanel>
+ </StackPanel>
 
- </StackPanel>
+ </StackPanel>
 
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deblock}" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" />
- <ComboBox Width="120" Grid.Row="5" Grid.Column="1"
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Deblock}" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center" />
+ <ComboBox Width="120" Grid.Row="6" Grid.Column="1"
 ItemsSource="{Binding DeblockFilter.Presets}" DisplayMemberPath="DisplayName"
 SelectedItem="{Binding DeblockFilter.SelectedPreset}" 
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersViewAuto_DeblockPreset}"
- HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,0,0,0" 
+ HorizontalAlignment="Left" VerticalAlignment="Center"
 ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Deblock}" />
 
- <StackPanel Orientation="Horizontal" Visibility="{Binding DeblockFilter.ShowDeblockTune, Converter={StaticResource boolToVisConverter}}" Grid.Row="5" Grid.Column="2" >
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="5,0,5,0" />
- <ComboBox ItemsSource="{Binding DeblockFilter.Tunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding DeblockFilter.SelectedTune}" 
- MinWidth="100" VerticalAlignment="Center" 
+ <StackPanel Orientation="Horizontal" Visibility="{Binding DeblockFilter.ShowDeblockTune, Converter={StaticResource boolToVisConverter}}" Grid.Row="6" Grid.Column="2" Margin="10,0,0,0" >
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Tune}" Margin="0,0,5,0" />
+ <ComboBox ItemsSource="{Binding DeblockFilter.Tunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding DeblockFilter.SelectedTune}" 
+ MinWidth="120" VerticalAlignment="Center" 
 AutomationProperties.Name="{x:Static Properties:Resources.FiltersViewAuto_DeblockTune}" />
- </StackPanel>
+ </StackPanel>
+ <TextBox Width="450" Margin="10,0,0,0" VerticalAlignment="Center" HorizontalAlignment="Left" Grid.Row="6" Grid.Column="2" 
+ Text="{Binding DeblockFilter.CustomDeblock, UpdateSourceTrigger=PropertyChanged}" Visibility="{Binding DeblockFilter.ShowDeblockCustom, Converter={StaticResource boolToVisConverter}}" />
 
- <StackPanel Orientation="Horizontal" Visibility="{Binding DeblockFilter.ShowDeblockCustom, Converter={StaticResource boolToVisConverter}}" Grid.Row="5" Grid.Column="2" >
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Custom}" Margin="5,0,5,0" VerticalAlignment="Center" />
- <TextBox Width="240" Margin="0" Text="{Binding DeblockFilter.CustomDeblock, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" MinHeight="22" />
- </StackPanel>
 
- 
- <CheckBox Content="{x:Static Properties:Resources.FiltersView_Grayscale}" IsChecked="{Binding GrayscaleFilter.Grayscale}" Grid.Row="6" Grid.Column="1" Margin="0,10,0,10"
- ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Grayscale}" />
 
- 
- <TextBlock Text="{x:Static Properties:Resources.FiltersView_Rotate}" Grid.Row="7" Grid.Column="0" Margin="0,0,0,0"/>
- <ComboBox Width="120" ItemsSource="{Binding RotateFlipFilter.RotationOptions}" Grid.Row="7" Grid.Column="1"
- SelectedItem="{Binding RotateFlipFilter.SelectedRotation}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Rotate}"
- AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Rotate}"
- HorizontalAlignment="Left" VerticalAlignment="Center" />
+ 
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_ColourSpace}" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center" />
+ <ComboBox Width="120" Grid.Row="7" Grid.Column="1" 
+ ItemsSource="{Binding ColourSpaceFilter.Presets}" DisplayMemberPath="DisplayName"
+ SelectedItem="{Binding ColourSpaceFilter.SelectedPreset}" 
+ AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_ColourSpace}"
+ HorizontalAlignment="Left" VerticalAlignment="Center"
+ ToolTip="{x:Static Properties:ResourcesTooltips.FiltersView_ColourSpace}" />
+ <TextBox Width="450" Text="{Binding ColourSpaceFilter.CustomColourspace, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Left" 
+ Visibility="{Binding ColourSpaceFilter.ShowColourspaceCustom, Converter={StaticResource boolToVisConverter}}" Grid.Row="7" Grid.Column="2" Margin="10,0,0,0" />
 
- <CheckBox Content="{x:Static Properties:Resources.FiltersView_FlipVideo}" Margin="5,0,0,0" VerticalAlignment="Center" Grid.Row="7" Grid.Column="2" IsChecked="{Binding RotateFlipFilter.FlipVideo, UpdateSourceTrigger=PropertyChanged}"
- ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Flip}"/>
- </Grid>
 
- </StackPanel>
 
+ 
+ <CheckBox Content="{x:Static Properties:Resources.FiltersView_Grayscale}" IsChecked="{Binding GrayscaleFilter.Grayscale}" Grid.Row="8" Grid.Column="1"
+ ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Grayscale}" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
 </Grid>
+
 </UserControl>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Images/pause_small.png Added

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/LogView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/LogView.xaml Changed

@@ -5,9 +5,9 @@
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
 Title="{Binding Title}"
- Width="600"
+ Width="740"
 Height="650"
- MinWidth="525"
+ MinWidth="625"
 MinHeight="600"
 WindowStartupLocation="CenterScreen"
 TextOptions.TextFormattingMode="Display">
@@ -30,6 +30,11 @@
 Loaded="ToolBarLoaded"
 >
 
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="Choose Log File: " Margin="5,0,5,0"></TextBlock>
+ <ComboBox ItemsSource="{Binding LogFiles}" SelectedItem="{Binding SelectedLogFile}" DisplayMemberPath="FileDisplayName" Width="250" MaxWidth="300" />
+ </StackPanel>
+
 <Button cal:Message.Attach="Event Click = Action CopyLog" Margin="10,0,0,0" 
 AutomationProperties.Name="{x:Static Properties:Resources.LogView_CopyClipboard}" >
 <StackPanel Orientation="Horizontal">
@@ -47,7 +52,7 @@
 
 </ToolBar>
 
- <TextBox Grid.Row="2" ScrollViewer.VerticalScrollBarVisibility="Visible" TextWrapping="Wrap" x:Name="logText">
+ <TextBox Grid.Row="2" ScrollViewer.VerticalScrollBarVisibility="Visible" TextWrapping="Wrap" x:Name="logText" VerticalContentAlignment="Top" IsReadOnly="True">
 
 <TextBox.ContextMenu>
 <ContextMenu>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/LogView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/LogView.xaml.cs Changed

@@ -14,81 +14,62 @@
 using System.Windows;
 using System.Windows.Controls;
 
+ using Caliburn.Micro;
+
 using HandBrakeWPF.Services.Logging.EventArgs;
+ using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels;
 
- /// <summary>
- /// Interaction logic for LogView.xaml
- /// </summary>
 public partial class LogView : Window
 {
- /// <summary>
- /// Initializes a new instance of the <see cref="LogView"/> class.
- /// </summary>
+ private DelayedActionProcessor delayProcessor = new DelayedActionProcessor();
+ private LogViewModel viewModel;
+ 
 public LogView()
 {
 this.InitializeComponent();
 this.DataContextChanged += this.LogView_DataContextChanged;
+ this.Closed += this.LogView_Closed;
+ }
+
+ private void LogView_Closed(object sender, EventArgs e)
+ {
+ ((LogViewModel)this.DataContext).LogMessageReceived -= this.Vm_LogMessageReceived;
+ ((LogViewModel)this.DataContext).LogResetEvent -= this.Vm_LogResetEvent;
 }
 
- /// <summary>
- /// The log view_ data context changed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void LogView_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
 {
 LogViewModel vm = e.NewValue as LogViewModel;
 if (vm != null)
 {
+ viewModel = vm;
 this.logText.AppendText(vm.ActivityLog);
 vm.LogMessageReceived += this.Vm_LogMessageReceived;
+ vm.LogResetEvent += this.Vm_LogResetEvent;
 }
 }
 
- /// <summary>
- /// The vm_ log message received.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
+ private void Vm_LogResetEvent(object sender, EventArgs e)
+ {
+ Execute.OnUIThread(
+ () =>
+ {
+ this.logText.Clear();
+ this.logText.AppendText(this.viewModel.ActivityLog.TrimStart());
+ });
+ }
+
 private void Vm_LogMessageReceived(object sender, LogEventArgs e)
 {
 try
- {
- if (e == null)
- {
- Caliburn.Micro.Execute.OnUIThread(
- () =>
- {
- LogViewModel vm = this.DataContext as LogViewModel;
- if (vm != null)
- {
- this.logText.Clear();
- this.logText.AppendText(vm.ActivityLog);
- }
- else
- {
- Debug.WriteLine("Failed to Reset Log correctly.");
- }
- }); 
- }
- else
- {
- // This works better than Data Binding because of the scroll.
- this.logText.AppendText(Environment.NewLine + e.Log.Content);
+ { 
+ // This works better than Data Binding because of the scroll.
+ this.logText.AppendText(e.Log.Content + Environment.NewLine);
 
- if (this.AutoScroll.IsChecked)
- {
- this.logText.ScrollToEnd();
- }
+ if (this.AutoScroll.IsChecked)
+ {
+ delayProcessor.PerformTask(() => Execute.BeginOnUIThread(() => this.logText.ScrollToEnd()), 100);
 }
 }
 catch (Exception exc)
@@ -97,15 +78,6 @@
 }
 }
 
- /// <summary>
- /// Hide the Toolbar Endplate.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void ToolBarLoaded(object sender, RoutedEventArgs e)
 {
 ToolBar toolBar = sender as ToolBar;

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/MainView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/MainView.xaml Changed

@@ -5,57 +5,35 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 xmlns:cal="http://www.caliburnproject.org"
- xmlns:menu="clr-namespace:HandBrakeWPF.Commands.Menu"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
- xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
- xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
- xmlns:loc="clr-namespace:HandBrakeWPF.Services.Presets.Model"
- xmlns:queue="clr-namespace:HandBrakeWPF.Converters.Queue"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
 xmlns:behaviours="clr-namespace:HandBrakeWPF.Behaviours"
+ xmlns:main="clr-namespace:HandBrakeWPF.Converters.Main"
 AllowDrop="True"
 FontSize="11"
 cal:Message.Attach="Event Loaded = Action Load"
 SnapsToDevicePixels="True"
- UseLayoutRounding="True">
+ UseLayoutRounding="True"
+ x:Name="mainView"
+ PreviewMouseDown="ParentGrid_OnPreviewMouseDown"
+ >
 
 <UserControl.Resources>
 <Converters:BooleanConverter x:Key="booleanConverter" />
 <Converters:PresetsMenuConverter x:Key="presetsMenuConverter"/>
 <Converters:LongToIntConverter x:Key="longToIntConverter" />
- <queue:InlineQueueConverter x:Key="InlineQueueConverter" />
 <Converters:BooleanConverter x:Key="NotBooleanConverter" />
 <Converters:ThemeImageConverter x:Key="themeConverter" />
 <Converters:EnumComboConverter x:Key="enumComboConverter" />
-
- <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
- <Setter Property="Padding" Value="8,2" />
- <Setter Property="VerticalAlignment" Value="Center" />
- <Setter Property="MinHeight" Value="22" />
- </Style>
+ <main:PointToPointConverter x:Key="PointToPointConverter" />
 
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 
- <Style x:Key="textBlockOrangeStyle" TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
- <Setter Property="FontWeight" Value="Bold" />
- <Setter Property="Padding" Value="5,5" />
+ <Style TargetType="MenuItem">
+ <Setter Property="ToolTipService.InitialShowDelay" Value="1000"/>
 </Style>
-
- <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">
- <Style.Resources>
- <Style TargetType="ContentPresenter">
- <Style.Resources>
- <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
- <Setter Property="TextWrapping" Value="Wrap" />
- </Style>
- </Style.Resources>
- </Style>
- </Style.Resources>
- <Setter Property="MaxWidth" Value="500" />
- </Style>
-
 </UserControl.Resources>
 
- <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+ <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
@@ -63,7 +41,7 @@
 </Grid.RowDefinitions>
 
 
- <StackPanel Grid.Row="0"
+ <StackPanel Grid.Row="0" IsEnabled="{Binding IsNavigationEnabled, Converter={StaticResource booleanConverter}, ConverterParameter=false}"
 HorizontalAlignment="Stretch"
 VerticalAlignment="Stretch"
 Orientation="Vertical">
@@ -81,6 +59,10 @@
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.MainView_StartEncode}" cal:Message.Attach="Event Click = Action StartEncode" InputGestureText="Ctrl + E"
 IsEnabled="{Binding IsEncoding, Converter={StaticResource NotBooleanConverter}, ConverterParameter=true}" />
+
+ <MenuItem Header="{x:Static Properties:Resources.MainView_Pause}" cal:Message.Attach="Event Click = Action PauseEncode" InputGestureText="Alt + P"
+ IsEnabled="{Binding IsEncoding, Converter={StaticResource NotBooleanConverter}, ConverterParameter=false}" />
+
 <MenuItem Header="{x:Static Properties:Resources.MainView_Stop}" cal:Message.Attach="Event Click = Action StopEncode" InputGestureText="Ctrl + K"
 IsEnabled="{Binding IsEncoding, Converter={StaticResource NotBooleanConverter}, ConverterParameter=false}" />
 <Separator />
@@ -110,17 +92,19 @@
 
 <MenuItem Header="{x:Static Properties:Resources.MainView_PresetsMenu}" ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}" />
 <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.PresetManger_Title}" cal:Message.Attach="Event Click = Action OpenPresetWindow" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_SaveNewPreset}" cal:Message.Attach="Event Click = Action PresetAdd" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="Event Click = Action PresetUpdate" />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_SetCurrentAsDefault}" cal:Message.Attach="Event Click = Action PresetSetDefault" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="Event Click = Action PresetManage" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_PresetRemove}" cal:Message.Attach="Event Click = Action PresetRemove" />
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.MainView_ImportFromFile}" cal:Message.Attach="Event Click = Action PresetImport" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_ExportToFile}" cal:Message.Attach="Event Click = Action PresetExport" />
 <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_SetCurrentAsDefault}" cal:Message.Attach="Event Click = Action PresetSetDefault" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_ResetPresets}" cal:Message.Attach="Event Click = Action PresetReset" />
- <Separator />
- <MenuItem IsCheckable="True" x:Name="showPresetPanelMenuItem" IsChecked="{Binding IsPresetPanelShowing}" Header="{x:Static Properties:Resources.MainView_ShowPresetPanel}" />
+ <MenuItem Header="{x:Static Properties:Resources.ManagePresetView_DeleteBuiltIn}" cal:Message.Attach="Event Click = Action PresetDeleteBuildIn" />
 </MenuItem>
 
 <MenuItem Header="{x:Static Properties:Resources.MainView_QueueMenu}" x:Name="queueMenu" Visibility="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">
@@ -128,12 +112,6 @@
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.MainView_AddToQueue}" cal:Message.Attach="Event Click = Action AddAllToQueue" InputGestureText="Ctrl + A" />
 <MenuItem Header="{x:Static Properties:Resources.MainView_AddSelection}" cal:Message.Attach="Event Click = Action AddSelectionToQueue" InputGestureText="Ctrl + Shift + A" />
- <Separator Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearCompleted}" Header="{x:Static Properties:Resources.QueueView_ClearCompleted}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearAll}" Header="{x:Static Properties:Resources.QueueView_ClearAll}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.ClearSelected}" Header="{x:Static Properties:Resources.QueueView_ClearSelected}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <Separator Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
- <MenuItem Command="{Binding QueueCommand}" CommandParameter="{x:Static menu:QueueCommandParams.Export}" Header="{x:Static Properties:Resources.QueueView_Export}" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
 <Separator />
 <MenuItem x:Name="queueRecoveryMenuItem" Header="{x:Static Properties:Resources.SourceSelection_QueueArchiveRecovery}" cal:Message.Attach="Event Click = Action RecoverQueue" />
 
@@ -145,16 +123,20 @@
 <Image Width="16" Height="16" Source="Images/information.png" />
 </MenuItem.Icon>
 </MenuItem>
- <Separator Visibility="{Binding IsUWP, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <MenuItem Header="{x:Static Properties:Resources.MainView_CheckForUpdates}" cal:Message.Attach="Event Click = Action CheckForUpdates" Visibility="{Binding IsUWP, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_CheckForUpdates}" cal:Message.Attach="Event Click = Action CheckForUpdates" />
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.MainView_About}" cal:Message.Attach="Event Click = Action OpenAboutApplication" />
 </MenuItem>
+
+ <MenuItem Header="Debug" Visibility="{Binding IsNightly, Converter={StaticResource boolToVisConverter}}">
+ <MenuItem Header="Export Scan Data" cal:Message.Attach="Event Click = Action ExportSourceData" />
+ <MenuItem Header="Import Scan Data" cal:Message.Attach="Event Click = Action ImportSourceData" />
+ </MenuItem>
 </Menu>
 
 
- <ToolBar Name="mainToolBar"
- HorizontalAlignment="Stretch"
+ <ToolBar HorizontalAlignment="Stretch"
 VerticalAlignment="Stretch"
 SnapsToDevicePixels="True"
 ToolBar.OverflowMode="AsNeeded"
@@ -190,9 +172,9 @@
 </StackPanel>
 
 <Grid x:Name="dropdown" Background="Transparent" >
- <Path Height="5" Margin="2,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"
+ <Path Height="5" Margin="4,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrow" />
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="dropdownArrow" />
 </Grid>
 
 </StackPanel>
@@ -266,7 +248,7 @@
 
 <Button Name="Pause" AutomationProperties.Name="{x:Static Properties:Resources.MainView_Pause}"
 cal:Message.Attach="Event Click = Action PauseEncode"
- Visibility="{Binding CanPause,
+ Visibility="{Binding IsEncoding,
 Converter={StaticResource boolToVisConverter},
 ConverterParameter=false}">
 <StackPanel Orientation="Horizontal">
@@ -289,17 +271,21 @@
 SnapsToDevicePixels="True"
 Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Queue.png'}"/>
 <Label Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:Resources.MainView_ShowQueue}'}"/>
+ VerticalAlignment="Center"
+ Content="{Binding QueueLabel, FallbackValue='{x:Static Properties:Resources.MainView_ShowQueue}'}"/>
+
+ <Border Background="#00579f" CornerRadius="9" BorderThickness="1" VerticalAlignment="Center" Visibility="{Binding IsQueueCountVisible, Converter={StaticResource boolToVisConverter}}">
+ <TextBlock Text="{Binding QueueCount}" VerticalAlignment="Center" Foreground="White" HorizontalAlignment="Center" Margin="9,2" />
+ </Border>
 </StackPanel>
 </Button>
 
- <Button Name="Preview" AutomationProperties.Name="Preview Picture Preview Window" cal:Message.Attach="Event Click = Action OpenPreviewWindow" >
+ <Button Name="Preview" AutomationProperties.Name="{x:Static Properties:Resources.MainView_ShowPreview}" cal:Message.Attach="Event Click = Action OpenPreviewWindow" >
 <StackPanel Orientation="Horizontal">
 <Image Width="32"
 Height="32"
 SnapsToDevicePixels="True"
- Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Queue.png'}"/>
+ Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Preview.png'}"/>
 <Label Margin="8,0,0,0"
 VerticalAlignment="Center"
 Content="{x:Static Properties:Resources.MainView_ShowPreview}"/>
@@ -317,22 +303,29 @@
 </StackPanel>
 </Button>
 
-
- <Button Name="PresetPane" AutomationProperties.Name="Show Preset Pane" cal:Message.Attach="Event Click = Action ShowPresetPane">
+ <Button x:Name="presetbtn" PreviewMouseLeftButtonDown="Presets_PreviewMouseDown" ContextMenuService.IsEnabled="False" AutomationProperties.Name="{x:Static Properties:Resources.MainView_Presets}">
 <StackPanel Orientation="Horizontal">
- <Image Width="32"
- Height="32"
- Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Presets2.png'}"/>
- <Label Margin="8,0,0,0"
- VerticalAlignment="Center"
- Content="{x:Static Properties:Resources.MainView_Presets}"/>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="32" Height="32" SnapsToDevicePixels="True" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Presets2.png'}" />
+ <Label Margin="8,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.MainView_Presets}" />
+ </StackPanel>
+
+ <Grid x:Name="presetsDropdown" Background="Transparent" >
+ <Path Height="5" Margin="4,2,2,0" VerticalAlignment="Center" HorizontalAlignment="Center"
+ Data="M 0 0 L 4 4 L 8 0 Z"
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="presetsDropdownArrow" />
+ </Grid>
 </StackPanel>
+
+ <Button.ContextMenu>
+ <ContextMenu ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}, ConverterParameter=true}" MaxHeight="600" />
+ </Button.ContextMenu>
 </Button>
 </ToolBar>
 </StackPanel>
 
 
- <Grid Grid.Row="1">
+ <Grid Grid.Row="1" x:Name="mainBodyGrid">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
@@ -340,9 +333,8 @@
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
- <RowDefinition x:Name="tabContentArea" Height="{Binding IsQueueShowingInLine, Converter={StaticResource InlineQueueConverter}}" />
+ <RowDefinition x:Name="tabContentArea" Height="*" />
 <RowDefinition Height="Auto" />
- <RowDefinition Height="{Binding IsQueueShowingInLine, Converter={StaticResource InlineQueueConverter}, ConverterParameter=true}"/>
 </Grid.RowDefinitions>
 
 
@@ -355,7 +347,7 @@
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- <Grid HorizontalAlignment="Stretch" Margin="0,0,10,0">
+ <Grid HorizontalAlignment="Stretch" Margin="0,0,10,5">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
@@ -363,9 +355,9 @@
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
 
- <Label Content="{x:Static Properties:Resources.MainView_Source}" FontWeight="Bold" Grid.Column="0" />
- <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" Margin="7,0,0,0" />
- <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,0,0,0" MaxWidth="360" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Source}" Grid.Column="0" Style="{StaticResource sectionHeader}" Margin="5,5,0,0" />
+ <TextBlock Text="{Binding Path=SourceLabel}" ToolTip="{Binding Path=SourceLabel}" TextTrimming="CharacterEllipsis" MaxWidth="595" Grid.Column="1" Margin="7,5,0,0" />
+ <TextBlock Text="{Binding SourceInfo}" HorizontalAlignment="Right" VerticalAlignment="Center" Foreground="DimGray" Grid.Column="2" Margin="10,5,0,0" MaxWidth="360" />
 </Grid>
 
 <Grid Grid.Row="1" Margin="0,5,5,0">
@@ -375,7 +367,7 @@
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
- <Label FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Title}" Grid.Column="0" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Title}" Grid.Column="0" Style="{StaticResource sectionHeader}" Margin="5,0,0,0" />
 <ComboBox Name="Titles" Grid.Column="1" 
 MinWidth="100" Margin="16,0,0,0"
 ItemsSource="{Binding ScannedSource.Titles}"
@@ -396,7 +388,7 @@
 </ComboBox.Style>
 </ComboBox>
 <StackPanel Orientation="Horizontal" Grid.Column="2" >
- <Label Margin="5,0,0,0" FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Angle}" />
+ <TextBlock Margin="10,0,0,0" Text="{x:Static Properties:Resources.MainView_Angle}" Style="{StaticResource sectionHeader}" />
 
 <ComboBox Name="Angles"
 MinWidth="60"
@@ -405,12 +397,12 @@
 SelectedItem="{Binding SelectedAngle}"
 ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Angle}" />
 
- <Label Margin="2,0,0,0" FontWeight="Bold" Content="{x:Static Properties:Resources.MainView_Range}" />
+ <TextBlock Margin="10,0,0,0" Text="{x:Static Properties:Resources.MainView_Range}" Style="{StaticResource sectionHeader}" />
 <ComboBox Name="PointToPointMode"
 MinWidth="80"
 Margin="5,0,0,0"
- ItemsSource="{Binding RangeMode}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Range}"
- SelectedItem="{Binding SelectedPointToPoint}" />
+ ItemsSource="{Binding RangeMode, Converter={StaticResource PointToPointConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Range}"
+ SelectedItem="{Binding SelectedPointToPoint, Converter={StaticResource PointToPointConverter}}" />
 <ComboBox Name="StartPoint"
 MinWidth="60"
 Margin="5,0,0,0"
@@ -427,7 +419,7 @@
 Converter={StaticResource boolToVisConverter},
 ConverterParameter=false}" />
 
- <Label Margin="4,0,0,0" Content="{x:Static Properties:Resources.MainView_through}" />
+ <TextBlock Margin="4,0,0,0" Text="{x:Static Properties:Resources.MainView_through}" />
 <ComboBox Name="EndPoint"
 MinWidth="60"
 Margin="4,0,0,0"
@@ -444,8 +436,8 @@
 Converter={StaticResource boolToVisConverter},
 ConverterParameter=false}" />
 
- <Label Margin="2,0,0,0" Content="{x:Static Properties:Resources.MainView_Duration}" FontWeight="Bold" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />
- <Label Margin="0,0,0,0" Content="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />
+ <TextBlock Margin="10,0,0,0" Text="{x:Static Properties:Resources.MainView_Duration}" Style="{StaticResource sectionHeader}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />
+ <TextBlock Margin="5,0,0,0" Text="{Binding Duration}" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Duration}" />
 
 </StackPanel>
 </Grid>
@@ -453,8 +445,8 @@
 
 
 <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,10,10,5" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">
- <Label Content="{x:Static Properties:Resources.MainView_Presets}" FontWeight="Bold" VerticalAlignment="Center" />
- <StackPanel Orientation="Horizontal" Margin="5,0,0,0" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+ <TextBlock Text="{x:Static Properties:Resources.MainView_SelectedPresets}" Style="{StaticResource sectionHeader}" Margin="5,0,5,0" />
+ <StackPanel Orientation="Horizontal" Margin="5,0,0,0">
 
 <Button x:Name="SelectPresetsButton" VerticalAlignment="Center" Click="SelectPreset_OnClick" Width="255">
 <Button.Content>
@@ -474,54 +466,18 @@
 
 <Path Height="8" Margin="2,0,0,1" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="3"
 Data="M 0 0 L 4 4 L 0 8 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowSelectPreset" />
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="dropdownArrowSelectPreset" />
 </Grid>
 </Button.Content>
 
 <Button.ContextMenu>
- <ContextMenu x:Name="PresetSelectContextMenu" ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}">
+ <ContextMenu x:Name="PresetSelectContextMenu" ItemsSource="{Binding PresetsCategories, Converter={StaticResource presetsMenuConverter}}" MaxHeight="600">
 </ContextMenu>
 </Button.ContextMenu>
 </Button>
 
 <Button Content="{x:Static Properties:Resources.MainView_Reload}" cal:Message.Attach="Event Click = Action PresetSelect" Margin="15,0,0,0" VerticalAlignment="Center" />
 <Button Content="{x:Static Properties:Resources.MainView_SaveNewPreset}" cal:Message.Attach="Event Click = Action PresetAdd" Margin="5,0,0,0" VerticalAlignment="Center" />
-
- <Button x:Name="MorePresetOptionsButton" Margin="15,0,0,0" VerticalAlignment="Center" Click="MorePresetOptionsButton_OnClick" Visibility="Collapsed">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <TextBlock Margin="0,0,5,0" Padding="0"
- VerticalAlignment="Center"
- Text="{x:Static Properties:Resources.MainView_Options}"
- AutomationProperties.Name="{x:Static Properties:Resources.MainView_PresetOptionsContextMenu}"
- ToolTip="{x:Static Properties:ResourcesTooltips.MainView_PresetOptionsContextMenu}"/>
-
- <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
- Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />
- </StackPanel>
- </Button.Content>
-
- <Button.ContextMenu>
- <ContextMenu x:Name="MainContextMenu">
- <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="Event Click = Action PresetSetDefault" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="Event Click = Action PresetUpdate" />
- <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="Event Click = Action PresetManage" />
- <MenuItem Header="{x:Static Properties:Resources.MainView_PresetRemove}" cal:Message.Attach="Event Click = Action PresetRemove" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="Event Click = Action PresetImport" />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="Event Click = Action PresetExport" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="Event Click = Action PresetReset" />
- </ContextMenu>
- </Button.ContextMenu>
- </Button>
- </StackPanel>
- <StackPanel Margin="8,0,0,0" Orientation="Horizontal" Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
- <TextBlock Text="{x:Static Properties:Resources.MainView_SelectedPreset}" Margin="5,0,0,0" />
- <TextBlock Text="{Binding SelectedPreset.Name}" Margin="5,0,0,0" />
- <TextBlock Text="{x:Static Properties:Resources.MainView_ModifiedPreset}" FontStyle="Italic" Visibility="{Binding IsModifiedPreset, Converter={StaticResource boolToVisConverter}}" Margin="5,0,0,0" />
 </StackPanel>
 </StackPanel>
 
@@ -531,8 +487,7 @@
 SelectedIndex="{Binding SelectedTab}"
 HorizontalAlignment="Stretch" 
 VerticalAlignment="Stretch"
- SelectionChanged="TabControl_OnSelectionChanged"
- Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+ SelectionChanged="TabControl_OnSelectionChanged">
 <TabItem Name="summaryTab" Header="{x:Static Properties:Resources.MainView_SummaryTab}">
 <ContentControl x:Name="SummaryViewModel" />
 </TabItem>
@@ -579,7 +534,12 @@
 </i:Interaction.Behaviors>
 <TextBox.ContextMenu>
 <ContextMenu>
- <MenuItem Header="Open this Directory" cal:Message.Attach="Event Click = Action OpenDestinationDirectory" />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_OpenDirectory}" cal:Message.Attach="Event Click = Action OpenDestinationDirectory" />
+ <MenuItem Header="{x:Static Properties:Resources.MainView_AutonameRegenerate}" cal:Message.Attach="Event Click = Action ReGenerateAutoName" />
+ <Separator />
+ <MenuItem Command="ApplicationCommands.Cut" />
+ <MenuItem Command="ApplicationCommands.Copy" />
+ <MenuItem Command="ApplicationCommands.Paste" />
 </ContextMenu>
 </TextBox.ContextMenu>
 </TextBox>
@@ -592,194 +552,18 @@
 />
 </Grid>
 </StackPanel>
+ </Grid>
 
- 
- <Grid Grid.Row="4" Grid.Column="0" Margin="10,0,10,10" Visibility="{Binding IsQueueShowingInLine, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" 
- HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="*" />
- </Grid.RowDefinitions>
- <Label Content="Queue" FontWeight="Bold" Grid.Row="0"/>
- <ContentControl cal:View.Model="{Binding QueueViewModel}" cal:View.Context="Embedded" Grid.Row="1" />
- </Grid>
-
- 
- <GroupBox Grid.Row="0" Grid.RowSpan="5"
- Grid.Column="1"
- HorizontalAlignment="Stretch"
- VerticalAlignment="Stretch"
- Header="Presets"
- Margin="0,5,5,5"
- MaxWidth="270"
- IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}"
- Visibility="{Binding IsPresetPanelShowing, Converter={StaticResource boolToVisConverter}}">
-
-
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="*" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.Resources>
-
- <HierarchicalDataTemplate DataType="{x:Type loc:Preset}">
- <StackPanel Orientation="Horizontal" >
- <StackPanel.Resources>
- <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
- <Style.Triggers>
- <DataTrigger Binding="{Binding IsDefault}" Value="True" >
- <Setter Property="FontStyle" Value="Italic" />
- </DataTrigger>
- <DataTrigger Binding="{Binding IsDefault}" Value="False" >
- <Setter Property="FontStyle" Value="Normal" />
- </DataTrigger>
- <DataTrigger Binding="{Binding IsSelected}" Value="True">
- <Setter Property="FontWeight" Value="Bold"/>
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </StackPanel.Resources>
- <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
- </StackPanel>
- </HierarchicalDataTemplate>
-
- <HierarchicalDataTemplate DataType="{x:Type loc:PresetDisplayCategory}" ItemsSource="{Binding Presets}">
- <StackPanel Orientation="Horizontal" >
- <TextBlock Text="{Binding Category}" FontSize="14" />
- </StackPanel>
- </HierarchicalDataTemplate>
- </Grid.Resources>
-
- <TreeView x:Name="presetListTree" HorizontalAlignment="Stretch" AutomationProperties.Name="Presets List" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Presets}"
- VerticalAlignment="Stretch" BorderThickness="0,0,0,1" BorderBrush="LightGray"
- ItemsSource="{Binding PresetsCategories}" MaxWidth="265"
- helpers:TreeViewHelper.TreeViewSelectedItem="{Binding Path=SelectedPreset, Mode=TwoWay}"
- PreviewMouseRightButtonDown="PresetListTree_OnPreviewMouseRightButtonDown">
-
- <TreeView.ItemContainerStyle>
- <Style BasedOn="{StaticResource {x:Type TreeViewItem}}" TargetType="TreeViewItem">
- <Setter Property="HorizontalAlignment" Value="Stretch" />
- <Setter Property="Padding" Value="4" />
- <Setter Property="ToolTip" Value="{Binding Description}" />
- <Setter Property="ToolTipService.InitialShowDelay" Value="1500"/>
- <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
- <EventSetter Event="TreeViewItem.Collapsed" Handler="PresetTreeviewItemCollasped" />
- <Style.Triggers>
- <Trigger Property="HasItems" Value="True">
- <Setter Property="Focusable" Value="false" />
- </Trigger>
-
- </Style.Triggers>
- </Style>
- </TreeView.ItemContainerStyle>
-
- <TreeView.ContextMenu>
- <ContextMenu AutomationProperties.Name="Presets List Context Menu">
- <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="Event Click = Action PresetSetDefault" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="Event Click = Action PresetUpdate" />
- <MenuItem Header="{x:Static Properties:Resources.MainView_PresetManage}" cal:Message.Attach="Event Click = Action PresetManage" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="Event Click = Action PresetImport" />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="Event Click = Action PresetExport" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="Event Click = Action PresetReset" />
- </ContextMenu>
-
- </TreeView.ContextMenu>
-
- <i:Interaction.Triggers>
- <commands:InputBindingTrigger>
- <commands:InputBindingTrigger.InputBinding>
- <KeyBinding Key="Delete"/>
- </commands:InputBindingTrigger.InputBinding>
- <cal:ActionMessage MethodName="PresetRemove" />
- </commands:InputBindingTrigger>
- </i:Interaction.Triggers>
-
- </TreeView>
-
- <ToolBar Name="presetsToolBar"
- Grid.Row="1"
- HorizontalAlignment="Center"
- VerticalAlignment="Stretch"
- SnapsToDevicePixels="False"
- UseLayoutRounding="False"
- ToolBar.OverflowMode="Never" 
- Background="Transparent"
- ToolBarTray.IsLocked="True"
- Loaded="ToolBarLoaded"
- KeyboardNavigation.TabNavigation="Continue" >
-
- <ToolBar.Resources>
- <Style TargetType="{x:Type ToolBarPanel}">
- <Setter Property="Orientation" Value="Vertical"/>
- <Setter Property="VerticalAlignment" Value="Center"/>
- </Style>
-
- <Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="{x:Type Button}" />
- </ToolBar.Resources>
-
- <ToolBarOverflowPanel>
- <Button cal:Message.Attach="Event Click = Action PresetAdd" AutomationProperties.Name="Add Preset" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AddPreset}">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <Image Width="18" Height="18" SnapsToDevicePixels="True"
- Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Add.png'}" />
- <TextBlock Margin="2,0,0,0"
- VerticalAlignment="Center"
- Style="{StaticResource textBlockOrangeStyle}"
- Text="{x:Static Properties:Resources.Generic_Add}"
- />
- </StackPanel>
- </Button.Content>
- </Button>
-
- <Button Background="Transparent" cal:Message.Attach="Event Click = Action PresetRemove" AutomationProperties.Name="Remove Preset" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_RemovePreset}">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <Image Width="18" Height="18"
- Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Remove.png'}" SnapsToDevicePixels="True" />
- <TextBlock Margin="2,0,0,0"
- VerticalAlignment="Center"
- Style="{StaticResource textBlockOrangeStyle}"
- Text="{x:Static Properties:Resources.MainView_Remove}" />
- </StackPanel>
- </Button.Content>
- </Button>
-
- <Menu Background="Transparent" AutomationProperties.Name="Preset Options Dropdown" MinHeight="22" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_PresetAdditionalOptions}">
- <MenuItem ToolBar.OverflowMode="Never">
- <MenuItem.Header>
- <StackPanel Orientation="Horizontal">
- <Image Width="20" Height="20" SnapsToDevicePixels="True"
- Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}"
- RenderOptions.BitmapScalingMode="Linear" />
- <TextBlock Margin="2,0,0,0"
- VerticalAlignment="Center"
- Style="{StaticResource textBlockOrangeStyle}"
- Text="{x:Static Properties:Resources.MainView_Options}" />
- </StackPanel>
- </MenuItem.Header>
- <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="Event Click = Action PresetSetDefault" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_UpdateSelectedPreset}" cal:Message.Attach="Event Click = Action PresetUpdate" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Import}" cal:Message.Attach="Event Click = Action PresetImport" />
- <MenuItem Header="{x:Static Properties:Resources.Preset_Export}" cal:Message.Attach="Event Click = Action PresetExport" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.MainView_ResetBuiltInPresets}" cal:Message.Attach="Event Click = Action PresetReset" />
- </MenuItem>
- </Menu>
- </ToolBarOverflowPanel>
-
- </ToolBar>
- </Grid>
- </GroupBox>
+ 
+ <Grid Panel.ZIndex="-1" x:Name="clickOffArea" IsHitTestVisible="True" Visibility="{Binding IsPresetPaneDisplayed, Converter={StaticResource boolToVisConverter}}" Grid.Row="1" Background="Transparent" 
+ Grid.RowSpan="2" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
 </Grid>
 
+ <Controls:PresetPaneControl x:Name="presetPaneControl" Visibility="{Binding IsPresetPaneDisplayed, Converter={StaticResource boolToVisConverter}}" Panel.ZIndex="11" 
+ DataContext="{Binding}" Grid.Row="1" HorizontalAlignment="Right" Margin="0,2,10,10" SelectedPreset="{Binding SelectedPreset}" />
+
 
 <Controls:SourceSelection x:Name="sourceSelection"
 Grid.Row="0" Grid.RowSpan="3"
@@ -802,11 +586,12 @@
 CancelAction="{Binding CancelAction}" />
 
 <Controls:AlertPanel x:Name="alertPanel"
+ KeyboardNavigation.DirectionalNavigation="Contained"
 Grid.Row="0"
 Grid.RowSpan="3"
 Visibility="{Binding ShowAlertWindow, Converter={StaticResource boolToVisConverter}, ConverterParameter=false, TargetNullValue=Collapsed, FallbackValue=Collapsed}"
 VerticalAlignment="Stretch" HorizontalAlignment="Stretch"
- Panel.ZIndex="10"
+ Panel.ZIndex="25"
 Message="{Binding AlertWindowHeader}"
 SubMessage="{Binding AlertWindowText}"
 ActionText="OK"
@@ -815,10 +600,10 @@
 </Controls:AlertPanel>
 
 
- <StatusBar Name="statusBar1" Height="32" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom">
+ <StatusBar Name="statusBar" Grid.Row="2" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" IsEnabled="{Binding HasSource, Converter={StaticResource booleanConverter}, ConverterParameter=false}">
 
 <StatusBarItem>
- <ProgressBar Value="{Binding ProgressPercentage}" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}}"
+ <ProgressBar Value="{Binding ProgressPercentage}" IsIndeterminate="{Binding IsMultiProcess}" Visibility="{Binding IsEncoding, Converter={StaticResource boolToVisConverter}}"
 Width="100" Height="18" VerticalAlignment="Center" />
 </StatusBarItem>
 <StatusBarItem>
@@ -834,7 +619,7 @@
 <Path Height="5"
 Margin="2,2,2,0"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" />
+ Fill="{DynamicResource ButtonGlyphBrush}" />
 </StackPanel>
 </MenuItem.Header>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/MainView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/MainView.xaml.cs Changed

@@ -64,6 +64,13 @@
             ((IMainViewModel)this.DataContext).AddToQueueWithErrorHandling();
         }
 
+        private void Presets_PreviewMouseDown(object sender, MouseButtonEventArgs e)
+        {
+            // Focus the keyboard navigation onto the floating panel and show it. 
+            KeyboardNavigation.SetTabNavigation(this.mainBodyGrid, ((MainViewModel)this.DataContext).IsPresetPaneDisplayed ? KeyboardNavigationMode.Continue : KeyboardNavigationMode.None);
+            ((MainViewModel)this.DataContext).TogglePresetPane();
+        }
+
         private void TabControl_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.Source is TabControl && e.AddedItems.Count > 0)
@@ -77,18 +84,7 @@
                 this.tabControl.Focus();
             }
         }
-
-        private void MorePresetOptionsButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            var button = sender as FrameworkElement;
-            if (button != null && button.ContextMenu != null)
-            {
-                button.ContextMenu.PlacementTarget = button;
-                button.ContextMenu.Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom;
-                button.ContextMenu.IsOpen = true;
-            }
-        }
-
+        
         private void SelectPreset_OnClick(object sender, RoutedEventArgs e)
         {
             var button = sender as FrameworkElement;
@@ -99,46 +95,22 @@
                 button.ContextMenu.IsOpen = true;
             }
         }
-
-        private void ToolBarLoaded(object sender, RoutedEventArgs e)
+        
+        private void ParentGrid_OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
         {
-            ToolBar toolBar = sender as ToolBar;
-            if (toolBar != null)
-            {
-                var overflowGrid = toolBar.Template.FindName("OverflowGrid", toolBar) as FrameworkElement;
-                if (overflowGrid != null)
-                {
-                    overflowGrid.Visibility = Visibility.Collapsed;
-                }
-            }
-        }
+            bool isPresetPaneDisplayed = ((MainViewModel)this.DataContext).IsPresetPaneDisplayed;
 
-        private void PresetTreeviewItemCollasped(object sender, RoutedEventArgs e)
-        {
-            if (e.Source.GetType() == typeof(TreeViewItem))
+            if (isPresetPaneDisplayed)
             {
-                TreeViewItem item = e.Source as TreeViewItem;
-                if (item != null) item.IsSelected = false;
-            }
-        }
-
-        private void PresetListTree_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
+                HitTestResult presetControlPressed = VisualTreeHelper.HitTest(presetPaneControl, e.GetPosition(presetPaneControl));
+                HitTestResult presetButtonPressed = VisualTreeHelper.HitTest(presetbtn, e.GetPosition(presetbtn));
 
-            if (treeViewItem != null)
-            {
-                treeViewItem.Focus();
-                e.Handled = true;
+                if (presetButtonPressed == null && presetControlPressed == null)
+                {
+                    KeyboardNavigation.SetTabNavigation(this.mainBodyGrid, KeyboardNavigationMode.Continue);
+                    ((MainViewModel)this.DataContext).TogglePresetPane(); // Clicked off the preset control
+                }
             }
         }
-
-        private static TreeViewItem VisualUpwardSearch(DependencyObject source)
-        {
-            while (source != null && !(source is TreeViewItem))
-                source = VisualTreeHelper.GetParent(source);
-
-            return source as TreeViewItem;
-        }
     }
 }

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ManagePresetView.xaml Changed

@@ -5,9 +5,11 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:Properties="clr-namespace:HandBrakeWPF.Properties" xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture"
 Title="{Binding Title}"
- Width="350"
+ Width="450"
 ResizeMode="NoResize"
 SizeToContent="Height"
 WindowStartupLocation="CenterScreen"
@@ -15,13 +17,9 @@
 mc:Ignorable="d">
 
 <Window.Resources>
+ <Converters:ThemeImageConverter x:Key="themeConverter" />
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
- <Converters:EnumComboConverter x:Key="enumComboConverter" />
-
- <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
- <Setter Property="ToolTipService.ShowDuration" Value="20000" />
- <Setter Property="Margin" Value="0,2,0,2" />
- </Style>
+ <picture:ResolutionLimitConverter x:Key="resolutionLimitConverter" />
 </Window.Resources>
 
 <Grid HorizontalAlignment="Stretch"
@@ -33,59 +31,137 @@
 <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_ManagePreset}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_PresetManage}" Style="{StaticResource windowTitle}" Margin="10,0,10,10" Grid.Row="0" />
 
 
- <Grid Grid.Row="1" Margin="10,0,10,0">
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="120" />
- <ColumnDefinition Width="*" />
- </Grid.ColumnDefinitions>
 
+
+ 
+ <Grid Grid.Row="1" >
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
 
- 
- <TextBlock Grid.Row="0"
- Grid.Column="0"
- Text="{x:Static Properties:Resources.AddPresetView_Name}" />
- <TextBox Grid.Row="0"
- Grid.Column="1"
- HorizontalAlignment="Stretch"
- Text="{Binding Preset.Name, UpdateSourceTrigger=PropertyChanged}" />
-
-
- 
- <TextBlock Grid.Row="2"
- Grid.Column="0" Margin="0,10,0,0"
- Text="{x:Static Properties:Resources.AddPresetView_Description}" />
- <TextBox Grid.Row="2"
- Grid.Column="1" Margin="0,10,0,0"
- 
- Text="{Binding Preset.Description, UpdateSourceTrigger=PropertyChanged}" />
-
- 
-
- <StackPanel Grid.Row="4"
- Grid.Column="1"
- Margin="0,10,0,0"
- Orientation="Horizontal"
- Visibility="{Binding ShowCustomInputs,
- Converter={StaticResource boolToVisConverter}}"/>
+ 
+ 
+
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_RestrictedPreset}" HorizontalAlignment="Center" FontStyle="Italic" Grid.Row="2"
+ Margin="0,5,0,10"
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+
+ 
+ <Grid Grid.Row="3" Margin="10,10,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="120" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ 
+ <TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static Properties:Resources.AddPresetView_Name}" />
+ <TextBox HorizontalAlignment="Stretch" Text="{Binding Preset.Name, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="1" 
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+ <TextBlock HorizontalAlignment="Stretch" Text="{Binding Preset.Name, UpdateSourceTrigger=PropertyChanged}" Grid.Row="0" Grid.Column="1"
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+ 
+
+ 
+ <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Description}" VerticalAlignment="Top" />
+ <TextBox Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" Text="{Binding Preset.Description, UpdateSourceTrigger=PropertyChanged}" Height="80" TextWrapping="WrapWithOverflow" VerticalContentAlignment="Top" 
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <TextBlock Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" Text="{Binding Preset.Description, UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow" 
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+ 
+ <TextBlock Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Category}" />
+ <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Vertical" Margin="0,10,0,0">
+
+ <ComboBox ItemsSource="{Binding UserPresetCategories}" SelectedItem="{Binding SelectedUserPresetCategory}" DisplayMemberPath="Category" Width="250" HorizontalAlignment="Left"
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+ <TextBlock Text="{Binding Preset.Category, UpdateSourceTrigger=PropertyChanged}" 
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ </StackPanel>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="0,15,0,5"
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox ItemsSource="{Binding ResolutionLimitModes, Converter={StaticResource resolutionLimitConverter}}" 
+ SelectedItem="{Binding SelectedPictureSettingsResLimitMode, Converter={StaticResource resolutionLimitConverter}}" 
+ Width="150" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,5" 
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_ResLimit}"
+ Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+
+ 
+ <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+ <controls:NumberBox Number="{Binding CustomWidth, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxWidth}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+
+ <TextBlock Text="x" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" Margin="10,0,10,0" />
+ <controls:NumberBox Number="{Binding CustomHeight, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxHeight}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+
+ <TextBlock Text="Audio:" Grid.Row="6" VerticalAlignment="Center" Margin="0,15,0,0" Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Button Content="{x:Static Properties:Resources.AudioViewModel_ConfigureDefaults}" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,0" Padding="8,2"
+ cal:Message.Attach="Event Click = Action EditAudioDefaults" Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ <TextBlock Text="Subtitles:" Grid.Row="7" VerticalAlignment="Center" Margin="0,5,0,0" Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Button Content="{x:Static Properties:Resources.SubtitlesViewModel_ConfigureDefaults}" Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left" Margin="0,5,0,0" Padding="8,2"
+ cal:Message.Attach="Event Click = Action EditSubtitleDefaults" Visibility="{Binding Preset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ </Grid>
 
 </Grid>
 
+
 
 <Grid Grid.Row="3"
- Margin="0,20,0,0">
+ Margin="0,10,0,0">
 
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/OptionsView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/OptionsView.xaml Changed

@@ -5,12 +5,6 @@
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">
 
 <UserControl.Resources>
- <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
- <Setter Property="Padding" Value="8,2" />
- <Setter Property="FontSize" Value="11.5" />
- <Setter Property="VerticalAlignment" Value="Center" />
- <Setter Property="MinHeight" Value="22" />
- </Style>
 
 <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
 <Setter Property="Margin" Value="0,0,5,0" />
@@ -41,6 +35,9 @@
 <Options:ProcessPriorityConverter x:Key="ProcessPriorityConverter" />
 <Options:Mp4BehaviourConverter x:Key="Mp4BehaviourConverter" />
 <Options:UpdateCheckConverter x:Key="UpdateCheckConverter" />
+ <Options:ThemeSettingConverter x:Key="ThemeSettingConverter" />
+ <Options:PresetDisplayModeConverter x:Key="PresetDisplayModeConverter" />
+ <Options:RightToLeftConverter x:Key="RightToLeftConverter" />
 
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 
@@ -66,41 +63,52 @@
 </Grid.RowDefinitions>
 
 
- <StackPanel Grid.Row="0" Grid.ColumnSpan="2" Orientation="Vertical">
- <TextBlock Text="{x:Static Properties:Resources.Preferences}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" Grid.ColumnSpan="2" />
- </StackPanel>
-
- <Border BorderBrush="DarkGray" Grid.Column="0" Grid.Row="1" BorderThickness="0,0,1,0">
-
- <StackPanel Orientation="Vertical" Margin="11,0,-1,0">
+ <Grid Grid.Row="0" Grid.ColumnSpan="2">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
 
+ <TextBlock Text="{x:Static Properties:Resources.Preferences}" Style="{StaticResource windowTitle}" Margin="10,10,10,10" Grid.Row="0" />
+ </Grid>
 
- <Button Content="{x:Static Properties:Resources.OptionsView_BackButton}" IsDefault="True" cal:Message.Attach="Event Click = Action Close" 
- HorizontalAlignment="Left" Padding="12,2" Margin="0,0,0,10" FontWeight="Bold" />
+ <Border BorderBrush="DarkGray" Grid.Column="0" Grid.Row="1" BorderThickness="0,0,1,0">
 
- <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"
- BorderThickness="0" Background="Transparent">
- <ListBox.ItemTemplate>
- <DataTemplate>
- <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
- </DataTemplate>
- </ListBox.ItemTemplate>
- </ListBox>
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*"/>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+ 
+ <StackPanel Orientation="Vertical" Margin="11,0,-1,0">
+
+ <Button Content="{x:Static Properties:Resources.OptionsView_BackButton}" IsDefault="True" cal:Message.Attach="Event Click = Action Close" 
+ HorizontalAlignment="Left" Padding="12,2" Margin="0,0,0,10" />
+
+ <ListBox ItemsSource="{Binding Source={StaticResource OptionTabsList}, Converter={StaticResource optionTabConverter}}" SelectedItem="{Binding SelectedTab}"
+ BorderThickness="0" Background="Transparent">
+ <ListBox.ItemTemplate>
+ <DataTemplate>
+ <TextBlock Text="{Binding Converter={StaticResource tabNameConverter}}"/>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </ListBox>
 
- </StackPanel>
+ </StackPanel>
+ </Grid>
 </Border>
-
+ 
 <ScrollViewer Grid.Column="1" Grid.Row="1">
 <StackPanel Orientation="Vertical">
 
 <StackPanel Name="General" Orientation="Vertical" Margin="10,5,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.General}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_General}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_General}" Style="{StaticResource pageHeader}" />
 
- <StackPanel Orientation="Vertical" Margin="0,10,0,10">
+ <StackPanel Orientation="Vertical" Margin="0,10,0,0" Visibility="{Binding CheckForUpdatesAllowed, Converter={StaticResource boolToVisConverter}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_OnStartup}" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_OnStartup}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <CheckBox Content="{x:Static Properties:Resources.Options_CheckForUpdates}" IsChecked="{Binding CheckForUpdates}" />
@@ -108,34 +116,54 @@
 </StackPanel>
 </StackPanel>
 
- <StackPanel Orientation="Vertical" Margin="0,0,0,10">
+ <StackPanel Orientation="Vertical" Margin="0,10,0,10">
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_UserInterface}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_UserInterface}" FontSize="14" Margin="0,0,0,10"/>
+ <StackPanel Orientation="Horizontal" Margin="20,0,0,5">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_Language}" Margin="0,0,0,0" VerticalAlignment="Center"/>
+ <ComboBox DisplayMemberPath="Name" ItemsSource="{Binding InterfaceLanguages}" SelectedItem="{Binding SelectedLanguage}" Margin="5,0,0,0" HorizontalAlignment="Left" Width="245" />
+ </StackPanel>
 
 <StackPanel Orientation="Horizontal" Margin="20,0,0,5">
- <TextBlock Text="{x:Static Properties:Resources.OptionsView_Language}" Margin="0,0,0,0" VerticalAlignment="Center"/> 
- <ComboBox DisplayMemberPath="Name" ItemsSource="{Binding InterfaceLanguages}" SelectedItem="{Binding SelectedLanguage}" Margin="5,0,0,0" HorizontalAlignment="Left" Width="150" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_RightToleftMode}" Margin="0,0,0,0" VerticalAlignment="Center"/>
+ <ComboBox ItemsSource="{Binding RightToLeftModes, Converter={StaticResource RightToLeftConverter}}" SelectedItem="{Binding SelectedRightToLeftMode, Converter={StaticResource RightToLeftConverter}}" 
+ Margin="5,0,0,0" HorizontalAlignment="Left" MinWidth="158" />
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Margin="20,15,0,5">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_DarkThemeMode}" Margin="0,0,0,0" VerticalAlignment="Center"/>
+ <ComboBox ItemsSource="{Binding DarkThemeModes, Converter={StaticResource ThemeSettingConverter}}" SelectedItem="{Binding DarkThemeMode, Converter={StaticResource ThemeSettingConverter}}" 
+ Margin="5,0,0,0" HorizontalAlignment="Left" Width="150" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_RequiresRestart}" Margin="5,0,0,0" />
 </StackPanel>
 
 <StackPanel Orientation="Vertical" Margin="20,5,0,0">
- <CheckBox Content="{x:Static Properties:Resources.Options_DarkTheme}" IsEnabled="{Binding IsWindows10}" IsChecked="{Binding UseDarkTheme}" />
 <CheckBox Content="{x:Static Properties:Resources.Options_MinimiseTray}" IsChecked="{Binding MinimiseToTray}" />
 <CheckBox Content="{x:Static Properties:Resources.Options_ClearCompleted}" IsChecked="{Binding ClearQueueOnEncodeCompleted}" />
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowStatusInTitleBar}" IsChecked="{Binding ShowStatusInTitleBar}" />
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_ShowPreviewOnSummaryTab}" IsChecked="{Binding ShowPreviewOnSummaryTab}" />
 </StackPanel>
 
+ <StackPanel Orientation="Horizontal" Margin="20,10,0,5">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_PresetDisplayMode}" Margin="0,0,0,0" VerticalAlignment="Center"/>
+ <ComboBox ItemsSource="{Binding PresetDisplayModes, Converter={StaticResource PresetDisplayModeConverter}}" SelectedItem="{Binding SelectedPresetDisplayMode, Converter={StaticResource PresetDisplayModeConverter}}" 
+ Margin="5,0,0,0" HorizontalAlignment="Left" Width="150" ToolTip="{x:Static Properties:ResourcesTooltips.OptionsView_PresetDisplayModes}" />
+ 
+ </StackPanel>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_ApplicaitonToolbar}" FontSize="14" Margin="0,10,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_ApplicationToolbar}" Style="{StaticResource subHeader}" Margin="0,10,0,10"/>
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <CheckBox Content="{x:Static Properties:Resources.Options_ShowToolbarAddAll}" IsChecked="{Binding ShowAddAllToQueue}" />
 <CheckBox Content="{x:Static Properties:Resources.Options_ShowToolbarAddSelection}" IsChecked="{Binding ShowAddSelectionToQueue}" />
 </StackPanel>
+
+ 
 </StackPanel>
 
 <StackPanel Orientation="Vertical" Margin="0,0,0,10">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_PathToVLC}" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_PathToMediaPlayer}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 
@@ -154,11 +182,11 @@
 <StackPanel Name="Output" Orientation="Vertical" Margin="10,5,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.OutputFiles}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Output}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Output}" Style="{StaticResource pageHeader}" />
 
 <StackPanel Orientation="Vertical" Margin="0,10,0,10">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_AutomaticFileNaming}" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_AutomaticFileNaming}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <CheckBox Content="{x:Static Properties:Resources.Options_AutoNameOutput}" IsChecked="{Binding AutomaticallyNameFiles}" />
@@ -183,13 +211,13 @@
 <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_DefaultPath}" Grid.Column="0" Grid.Row="0" />
 <TextBox Name="autoNameOutputPath" Text="{Binding AutoNameDefaultPath}" Width="380" Grid.Column="1" Grid.Row="0" ToolTip="{x:Static Properties:Resources.Options_DefaultPathAdditionalParams}" HorizontalAlignment="Left" />
 <Button Content="{x:Static Properties:Resources.Browse}" Margin="5,0,0,0" Grid.Column="2" Grid.Row="0" cal:Message.Attach="Event Click = Action BrowseAutoNamePath" HorizontalAlignment="Left" />
- <TextBlock Text="{x:Static Properties:Resources.OptionsView_PathOptions}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" FontStyle="Italic" FontSize="11" TextWrapping="Wrap" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_PathOptions}" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Style="{StaticResource subText}" TextWrapping="Wrap" />
 <CheckBox IsChecked="{Binding AlwaysUseDefaultPath}" Content="{x:Static Properties:Resources.OptionsView_AlwaysUseDefaultPath}" ToolTip="{x:Static Properties:ResourcesTooltips.OptionsView_AlwaysUseDefaultPath}" Grid.Row="2" Grid.Column="1" />
- 
+
 
 <TextBlock VerticalAlignment="Center" Text="{x:Static Properties:Resources.Options_Format}" Grid.Column="0" Grid.Row="4" Margin="0,5,0,0" />
- <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380" Grid.Column="1" Grid.Row="4" Margin="0,0,0,0" ToolTip="{x:Static Properties:Resources.Options_AdditionalFormatOptions}" HorizontalAlignment="Left" />
- <TextBlock Text="{x:Static Properties:Resources.OptionsView_FormatOptions}" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" FontStyle="Italic" FontSize="11" TextWrapping="Wrap" />
+ <TextBox Name="autoNameFormat" Text="{Binding AutonameFormat, UpdateSourceTrigger=PropertyChanged}" Width="380" Grid.Column="1" Grid.Row="4" Margin="0,0,0,0" ToolTip="{x:Static Properties:ResourcesTooltips.Options_AdditionalFormatOptions}" HorizontalAlignment="Left" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_FormatOptions}" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="2" Style="{StaticResource subText}" TextWrapping="Wrap" />
 </Grid>
 
 <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
@@ -211,7 +239,7 @@
 
 </StackPanel>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_UIBehaviour}" FontSize="14" Margin="0,20,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_UIBehaviour}" Style="{StaticResource subHeader}" Margin="0,20,0,10"/>
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
 
@@ -219,18 +247,20 @@
 <ComboBox Width="200" ItemsSource="{Binding FileOverwriteBehaviourList, Converter={StaticResource enumComboConverter}}" SelectedIndex="{Binding SelectedOverwriteBehaviour}" HorizontalAlignment="Left" />
 </StackPanel>
 </StackPanel>
+ 
 </StackPanel>
 </StackPanel>
 
 <StackPanel Name="WhenDone" Orientation="Vertical" Margin="10,5,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.WhenDone}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_WhenDone}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_WhenDone}" Style="{StaticResource pageHeader}" />
 
- <TextBlock Text="{x:Static Properties:Resources.Options_QueueCompleted}" FontSize="14" Margin="0,10,0,10" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_QueueCompleted}" Style="{StaticResource subHeader}" Margin="0,10,0,10" />
 
 <StackPanel Orientation="Vertical" Margin="0,0,0,10">
-
+ <CheckBox Content="{x:Static Properties:Resources.OptionsView_WindowsNotification}" IsChecked="{Binding SendSystemNotificationOnQueueDone}" Margin="20,5,0,5" />
+ 
 <Grid Margin="20,0,0,0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
@@ -240,21 +270,24 @@
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
 <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
 </Grid.RowDefinitions>
-
- <TextBlock Text="{x:Static Properties:Resources.Options_WhenDoneColon}" Grid.Row="0" Grid.Column="0" />
- <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions, Converter={StaticResource enumComboConverter}}" SelectedItem="{Binding WhenDone, Converter={StaticResource enumComboConverter}}" Width="120" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="1" />
- <CheckBox Content="{x:Static Properties:Resources.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="0,5,0,0" Grid.Row="1" Grid.Column="1" 
+ <TextBlock Text="{x:Static Properties:Resources.Options_WhenDoneColon}" Grid.Row="1" Grid.Column="0" />
+ <ComboBox Name="whenDone" ItemsSource="{Binding WhenDoneOptions, Converter={StaticResource enumComboConverter}}" SelectedItem="{Binding WhenDone, Converter={StaticResource enumComboConverter}}" 
+ Width="120" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="1" />
+ <CheckBox Content="{x:Static Properties:Resources.Options_ResetDoNothing}" VerticalAlignment="Center" Margin="0,5,0,0" Grid.Row="2" Grid.Column="1" 
 IsChecked="{Binding ResetWhenDoneAction}" />
- <CheckBox Content="{x:Static Properties:Resources.Options_PromptBeforeAction}" VerticalAlignment="Center" Margin="0,5,0,0" Grid.Row="2" Grid.Column="1" 
+ <CheckBox Content="{x:Static Properties:Resources.Options_PromptBeforeAction}" VerticalAlignment="Center" Margin="0,5,0,0" Grid.Row="3" Grid.Column="1" 
 IsChecked="{Binding WhenDonePerformActionImmediately}" />
 </Grid>
- 
- <TextBlock Text="{x:Static Properties:Resources.Options_EncodeCompleted}" FontSize="14" Margin="0,10,0,10" />
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_EncodeCompleted}" Style="{StaticResource subHeader}" Margin="0,10,0,10" />
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 
+ <CheckBox Content="{x:Static Properties:Resources.OptionsView_WindowsNotification}" IsChecked="{Binding SendSystemNotificationOnEncodeDone}" Margin="0" />
+ 
 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}" Margin="0,1,0,0">
+ <CheckBox VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding SendFileAfterEncode}">
 <StackPanel Orientation="Horizontal">
 <TextBlock Text="{x:Static Properties:Resources.Options_SendFileTo}" VerticalAlignment="Center" />
 <TextBlock Text="{Binding SendFileTo}" VerticalAlignment="Center" Margin="5,0,5,0" />
@@ -266,12 +299,12 @@
 
 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
 <TextBlock VerticalAlignment="Center" Margin="25,0,5,0" Text="{x:Static Properties:Resources.Options_Arguments}" />
- <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" />
+ <TextBox Name="SendToArguments" Text="{Binding Arguments}" Width="250" ToolTip="{x:Static Properties:ResourcesTooltips.OptionsView_SendFileToArguments}" />
 </StackPanel>
- <TextBlock Text="{x:Static Properties:Resources.OptionsView_SendFileToArgPlaceholders}" Margin="91,1,0,0" FontStyle="Italic"/>
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_SendFileToArgPlaceholders}" Margin="91,1,0,0" Style="{StaticResource subText}"/>
 </StackPanel>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Notifications}" FontSize="14" Margin="0,10,0,10" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Notifications}" Style="{StaticResource subHeader}" Margin="0,10,0,10" />
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <StackPanel Orientation="Vertical" Margin="0,7,0,0">
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_PlaySoundWhenDone}" 
@@ -294,14 +327,28 @@
 </StackPanel>
 </StackPanel>
 </StackPanel>
+
+
 </StackPanel>
 
 <StackPanel Name="Hardware" Orientation="Vertical" Margin="10,5,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Video}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Video}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Video}" Style="{StaticResource pageHeader}" />
+
+ 
+ <Grid Visibility="{Binding IsSafeMode, Converter={StaticResource boolToVisConverter}}" Margin="10,5,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Image Source="Images/warningsmall.png" Width="16" Height="16" VerticalAlignment="Center" Margin="0,0,10,0" Grid.Column="0" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_SafeMode}" TextWrapping="Wrap" Grid.Column="1" Style="{StaticResource subText}" />
+ </Grid>
+ 
 
- <Grid Visibility="{Binding IsHardwareFallbackMode, Converter={StaticResource boolToVisConverter}}" Margin="10,5,0,0" Grid.Row="1">
+ <Grid Visibility="{Binding IsHardwareFallbackMode, Converter={StaticResource boolToVisConverter}}" Margin="10,5,0,0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="*" />
@@ -311,24 +358,26 @@
 <TextBlock Text="{x:Static Properties:Resources.OptionsView_HardwareDetectFailed}" TextWrapping="Wrap" Grid.Column="1" />
 </Grid>
 
- <StackPanel Orientation="Vertical" Margin="0,0,0,20">
+ <StackPanel Orientation="Vertical" Margin="0,0,0,20" Visibility="{Binding IsHardwareOptionsVisible, Converter={StaticResource boolToVisConverter}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Encoding}" FontSize="14" Margin="0,10,0,10" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Encoding}" Style="{StaticResource subHeader}" Margin="0,10,0,10" />
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableQuicksyncEncoding}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncEncoding}" />
+ <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableQuicksyncLowPower}" Margin="25,2,0,10" Visibility="{Binding IsQuickSyncAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding EnableQuickSyncLowPower}" />
+
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableVceEncoding}" IsEnabled="{Binding IsVceAvailable}" IsChecked="{Binding EnableVceEncoder}" />
 <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableNvencEncoding}" IsEnabled="{Binding IsNvencAvailable}" IsChecked="{Binding EnableNvencEncoder}" />
 
- <TextBlock Text="{x:Static Properties:Resources.OptionsView_ChoiceOfEncoderHint}" Margin="0,15,0,0" FontStyle="Italic" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_ChoiceOfEncoderHint}" Margin="0,15,0,0" Style="{StaticResource subText}" />
 </StackPanel>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Decoding}" FontSize="14" Margin="0,10,0,10" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Decoding}" Style="{StaticResource subHeader}" Margin="0,10,0,10" />
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <CheckBox Content="{x:Static Properties:Resources.Options_QsvDecode}" IsEnabled="{Binding IsQuickSyncAvailable}" IsChecked="{Binding EnableQuickSyncDecoding}" />
 <CheckBox Content="{x:Static Properties:Resources.Options_QsvDecodeForNonFullPath}" Visibility="{Binding IsUseQsvDecAvailable, Converter={StaticResource boolToVisConverter}}" IsChecked="{Binding UseQSVDecodeForNonQSVEnc}" />
 </StackPanel>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Scaling}" FontSize="14" Margin="0,20,0,10" Visibility="Collapsed" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Scaling}" Style="{StaticResource subHeader}" Margin="0,20,0,10" Visibility="Collapsed" />
 
 <StackPanel Orientation="Horizontal" Margin="20,0,0,0" Visibility="Collapsed">
 <TextBlock Text="{x:Static Properties:Resources.Options_Scaler}" Margin="0,0,5,0" VerticalAlignment="Center" />
@@ -345,13 +394,14 @@
 <StackPanel Name="Advanced" Orientation="Vertical" Margin="10,5,0,0"
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Advanced}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Advanced}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Advanced}" Style="{StaticResource pageHeader}" />
 
 <StackPanel Orientation="Vertical" Margin="0,10,0,10">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_AdvancedOptions}" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_SystemOptions}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+ 
 <CheckBox Content="{x:Static Properties:Resources.Options_PreventSleep}" IsChecked="{Binding PreventSleep}" />
 
 <CheckBox Content="{x:Static Properties:Resources.Options_PauseOnLowBattery}" IsChecked="{Binding PauseOnLowBattery}" Visibility="{Binding HasSystemBattery, Converter={StaticResource boolToVisConverter}}" />
@@ -361,13 +411,32 @@
 <TextBlock Text="%" VerticalAlignment="Center" Margin="5,0,0,0" />
 </StackPanel>
 
+ <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+ <CheckBox Content="{x:Static Properties:Resources.Options_LowDiskspaceSize}" IsChecked="{Binding PauseOnLowDiskspace}" />
+ </StackPanel>
 
- <CheckBox Content="{x:Static Properties:Resources.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" Margin="0,8,0,0" />
 <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <CheckBox Content="{x:Static Properties:Resources.Options_LowDiskspaceSize}" IsChecked="{Binding PauseOnLowDiskspace}" Width="255" />
- <TextBox x:Name="PauseOnLowDiskspaceLevel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}" Width="120"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceLevelText}" TextWrapping="Wrap" Width="250" />
+ 
+ <TextBox x:Name="PauseOnLowDiskspaceLevel" Text="{Binding PauseOnLowDiskspaceLevel, Converter={StaticResource fileSizeConverter}, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" Width="120"/>
 <TextBlock Text="{x:Static Properties:Resources.Options_LowDiskspaceSizeGB}" VerticalAlignment="Center" Margin="5,0,0,0" />
 </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+ <TextBlock Text="{x:Static Properties:Resources.Options_PriorityLevel}" Width="250" VerticalAlignment="Center" />
+ <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions, Converter={StaticResource ProcessPriorityConverter}}" SelectedItem="{Binding SelectedPriority, Converter={StaticResource ProcessPriorityConverter}}" Width="120" />
+ </StackPanel>
+ </StackPanel>
+ </StackPanel>
+
+ <StackPanel Orientation="Vertical" Margin="0,10,0,10">
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_AdvancedOptions}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
+
+ <StackPanel Orientation="Vertical" Margin="20,0,0,0">
+
+ <CheckBox Content="{x:Static Properties:Resources.Options_DvdRead}" IsChecked="{Binding DisableLibdvdNav}" Margin="0,8,0,0" />
+ 
 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
 <TextBlock Text="{x:Static Properties:Resources.Options_PreviewScanCount}" VerticalAlignment="Center" Width="250" />
 <ComboBox Name="numberOfPreviews" ItemsSource="{Binding PreviewPicturesToScan}" SelectedItem="{Binding SelectedPreviewCount}" Width="120" />
@@ -377,25 +446,53 @@
 <TextBox x:Name="MinTitleLength" VerticalAlignment="Center" Text="{Binding MinLength}" Width="120"/>
 
 </StackPanel>
- <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
- <TextBlock Text="{x:Static Properties:Resources.Options_PriorityLevel}" Width="250" VerticalAlignment="Center" />
- <ComboBox Name="processPriorityLevel" ItemsSource="{Binding PriorityLevelOptions, Converter={StaticResource ProcessPriorityConverter}}" SelectedItem="{Binding SelectedPriority, Converter={StaticResource ProcessPriorityConverter}}" Width="120" />
- </StackPanel>
- </StackPanel>
+ </StackPanel>
 </StackPanel>
 
 <StackPanel Orientation="Vertical" Margin="0,10,0,10">
- <TextBlock Text="{x:Static Properties:Resources.Options_x264}" FontSize="14" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_x264}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 <StackPanel Orientation="Horizontal" Margin="20,0,0,0">
 <TextBlock Text="{x:Static Properties:Resources.Options_x264Granularity}" VerticalAlignment="Center" Width="250" />
- <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranulairty}" Width="120"/>
+ <ComboBox Name="x264Granularity" ItemsSource="{Binding ConstantQualityGranularity}" SelectedItem="{Binding SelectedGranularity}" Width="120"/>
 </StackPanel>
 </StackPanel>
 
+ <StackPanel Orientation="Vertical" Visibility="{Binding IsProcessIsolationAllowed, Converter={StaticResource boolToVisConverter}}" >
 
- <StackPanel Orientation="Vertical" Margin="0,10,0,10">
+ <StackPanel Orientation="Horizontal">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation}" Style="{StaticResource subHeader}" Margin="0,10,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_Win10Only}" Margin="15,10,0,10" />
+ </StackPanel>
+
+
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation_Warning1}" Margin="10,0,0,0" TextWrapping="Wrap" Style="{StaticResource subText}" />
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_ProcessIsolation_Warning2}" Margin="10,0,0,0" TextWrapping="Wrap" Style="{StaticResource subText}" />
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Logging}" FontSize="14" Margin="0,0,0,10"/>
+ <CheckBox Content="{x:Static Properties:Resources.OptionsView_EnableWorkerProcesses}" IsChecked="{Binding RemoteServiceEnabled}" Margin="10,10,0,0" />
+
+ <StackPanel Orientation="Horizontal" Margin="10,10,0,0">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_WorkerDefaultPort}" />
+ <TextBox Text="{Binding RemoteServicePort}" Width="100" IsEnabled="{Binding RemoteServiceEnabled}" />
+ </StackPanel>
+
+ <StackPanel Orientation="Horizontal" Margin="10,10,0,0" IsEnabled="{Binding IsSimultaneousEncodesSupported}" >
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_SimultaneousEncodes}" VerticalAlignment="Center"/>
+ <ComboBox ItemsSource="{Binding SimultaneousEncodesList}" SelectedItem="{Binding SimultaneousEncodes}" IsEnabled="{Binding RemoteServiceEnabled}" />
+ 
+ </StackPanel>
+ <StackPanel Orientation="Vertical">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_SimultaneousHardwareLimitNotice}" Visibility="{Binding IsSimultaneousEncodesSupported, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" 
+ Margin="10,0,0,0" TextWrapping="Wrap" Style="{StaticResource subText}" />
+
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_NotSupported}" Margin="10,0,0,0" Visibility="{Binding IsSimultaneousEncodesSupported, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ </StackPanel>
+
+ </StackPanel>
+
+
+ <StackPanel Orientation="Vertical" Margin="0,15,0,10">
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_Logging}" Style="{StaticResource subHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Vertical" Margin="20,0,0,0">
 <StackPanel Orientation="Horizontal">
@@ -404,7 +501,7 @@
 </StackPanel>
 
 <CheckBox Content="{x:Static Properties:Resources.Options_CopyLogToEncDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToEncodeDirectory}" />
- <CheckBox Content="{x:Static Properties:Resources.Options_CopyLogToDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToSepcficedLocation}" />
+ <CheckBox Content="{x:Static Properties:Resources.Options_CopyLogToDir}" Margin="0,5,0,0" IsChecked="{Binding CopyLogToSpecifiedLocation}" />
 <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
 <TextBlock Text="{x:Static Properties:Resources.Options_LogPath}" VerticalAlignment="Center" />
 <TextBox Width="380" Text="{Binding LogDirectory}" />
@@ -415,7 +512,7 @@
 <Button Content="{x:Static Properties:Resources.Options_ClearLogs}" cal:Message.Attach="Event Click = Action ClearLogHistory" />
 </StackPanel>
 
- <CheckBox Content="{x:Static Properties:Resources.Options_30DayLogClear}" Margin="0,10,0,0" IsChecked="{Binding ClearOldOlgs}" />
+ <CheckBox Content="{x:Static Properties:Resources.Options_7DayLogClear}" Margin="0,10,0,0" IsChecked="{Binding ClearOldLogs}" />
 </StackPanel>
 
 </StackPanel>
@@ -426,9 +523,9 @@
 Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Updates}}">
 
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" Style="{StaticResource pageHeader}" />
 
- <TextBlock Text="{x:Static Properties:Resources.Options_CurVersion}" FontSize="14" Margin="0,10,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_CurVersion}" Style="{StaticResource subHeader}" Margin="0,10,0,10"/>
 
 <Grid Margin="20,10,0,20">
 <Grid.ColumnDefinitions>
@@ -441,7 +538,7 @@
 <TextBox Grid.Column="1" Margin="0,0,0,0" VerticalAlignment="Bottom" Text="{Binding Version, Mode=OneWay}" BorderThickness="0" x:Name="versionTextBox" MouseDoubleClick="VersionTextBox_OnMouseDoubleClick" />
 </Grid>
 
- <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" FontSize="14" Margin="0,10,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.Options_Updates}" Style="{StaticResource subHeader}" Margin="0,10,0,10"/>
 
 <StackPanel Margin="20,0,0,0" Orientation="Horizontal">
 <Button Content="{x:Static Properties:Resources.Options_CheckForUpdates}" MaxWidth="130" Margin="0,0,5,0" cal:Message.Attach="Event Click = Action PerformUpdateCheck" />
@@ -456,34 +553,51 @@
 
 <TextBlock Text="{Binding UpdateMessage}" Margin="20,5,10,0" VerticalAlignment="Center" TextWrapping="Wrap" />
 
+ <TextBlock Text="{x:Static Properties:Resources.OptionsViewModel_UpdateNotice}" Margin="20,10,10,0" Visibility="{Binding UpdateAvailable, Converter={StaticResource boolToVisConverter}}" TextWrapping="Wrap" />
+
 </StackPanel>
 
- <StackPanel Name="About" Orientation="Vertical" Margin="10,5,0,0"
- Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">
+ <StackPanel Name="Reset" Orientation="Vertical" Margin="10,5,0,0"
+ Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.Reset}}">
 
- <TextBlock Text="{x:Static Properties:Resources.Options_About}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_Reset}" Style="{StaticResource pageHeader}" />
 
- <ContentControl x:Name="AboutViewModel" />
+ <TextBlock Text="{x:Static Properties:Resources.Options_UserSettings}" Style="{StaticResource subHeader}" Margin="0,10,0,10"/>
 
- </StackPanel>
+ <StackPanel Orientation="Horizontal" Margin="20,0,0,20">
+ <TextBlock Text="{x:Static Properties:Resources.OptionsView_ResetSettingsToDefaults}" />
+ <Button Content="{x:Static Properties:Resources.Options_Reset}" HorizontalAlignment="Left" cal:Message.Attach="Event Click = Action ResetHandBrake" />
+ </StackPanel>
 
- 
+ </StackPanel>
+
+ <StackPanel Name="About" Orientation="Vertical" Margin="10,5,0,0"
+ Visibility="{Binding SelectedTab, Converter={StaticResource tabConverter}, ConverterParameter={x:Static local:OptionsTab.About}}">
+
+ <TextBlock Text="{x:Static Properties:Resources.Options_About}" Style="{StaticResource pageHeader}" />
+
+ <ContentControl x:Name="AboutViewModel" />
+
+ </StackPanel>
 </StackPanel>
 </ScrollViewer>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/OptionsView.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/PictureSettingsView.xaml Changed

@@ -1,190 +1,305 @@
- <UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
+<UserControl x:Class="HandBrakeWPF.Views.PictureSettingsView"
 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
- xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture">
 
 <UserControl.Resources>
 <Converters:BooleanConverter x:Key="boolConverter" />
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
- <Converters:BooleanToHiddenVisibilityConverter x:Key="boolToVisHiddenConverter" />
+ <picture:ResolutionLimitConverter x:Key="resolutionLimitConverter" />
 <Style TargetType="controls:NumberBox">
 <Setter Property="Height" Value="24" />
 </Style>
 </UserControl.Resources>
 
- <Border Background="Transparent">
- <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+ <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
 
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ 
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_SourceDimensions}" Grid.Row="0" Grid.ColumnSpan="4" Style="{StaticResource sectionHeader}" Margin="10,5,0,0" />
+ <StackPanel Orientation="Horizontal" Margin="5,0,5,0" Grid.Row="1" Grid.ColumnSpan="4">
+ <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
+ </StackPanel>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_RotateAndCrop}" Style="{StaticResource sectionHeader}" Grid.Row="2" Grid.Column="0" Margin="10,5,0,5" />
+ <Grid Name="CropPanel" Margin="10,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="3" Grid.Column="0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
 <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- 
- <StackPanel Name="SizePanel" Orientation="Vertical" VerticalAlignment="Top" Margin="5,0,0,0" Grid.Column="0" Grid.Row="0">
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Size}" FontWeight="Bold" />
-
- 
- <StackPanel Orientation="Horizontal" Margin="0,0,5,0">
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Source}" />
- <Label Content="{Binding SourceInfo}" Name="sourceResolution"/>
- </StackPanel>
-
- 
- <StackPanel Orientation="Horizontal" Margin="0,0,5,0">
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Width}" />
- <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="True" IsEnabled="{Binding WidthControlEnabled}" 
- Modulus="{Binding SelectedModulus, Mode=OneWay}"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}" Minimum="0" Width="60"
- AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Width}" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Height}" />
- <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="True" 
- Modulus="{Binding SelectedModulus, Mode=OneWay}" 
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"
- AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Height}" />
- <CheckBox Content="{x:Static Properties:Resources.PictureSettingsView_KeepAR}" IsChecked="{Binding MaintainAspectRatio}"
- Visibility="{Binding ShowKeepAR, Converter={StaticResource boolToVisHiddenConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_KeepAR}"
- VerticalAlignment="Center" Margin="5,0,0,0" />
- </StackPanel>
-
- 
- <Grid Margin="0,15,5,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" Grid.Row="0" Grid.Column="0" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Modulus}" Grid.Row="1" Grid.Column="0" 
- Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" />
-
- <ComboBox Width="110" Grid.Row="0" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}"
- AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" />
- <ComboBox Width="110" Grid.Row="1" ItemsSource="{Binding ModulusValues}" SelectedItem="{Binding SelectedModulus}" 
- Visibility="{Binding ShowModulus, Converter={StaticResource boolToVisConverter}}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Modulus}"
- Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5"
- AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Modulus}"/>
- </Grid>
-
- 
- <Grid Margin="0,15,5,0" Visibility="{Binding ShowCustomAnamorphicControls, Converter={StaticResource boolToVisConverter}}">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_DisplayWitdh}" Grid.Row="0" Grid.Column="0" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_PAR}" Grid.Row="1" Grid.Column="0" />
-
- <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,5" 
- AllowEmpty="False" IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}"
- AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_DisplayWitdh}" />
- <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
- <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False"
- IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>
- <TextBlock Text="X" Margin="10,0,10,0" />
- <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False"
- IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="0,0,0,5"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>
- </StackPanel>
- </Grid>
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Flip}" Margin="0,0,0,0" Grid.Row="0" Grid.Column="0" />
+ <CheckBox Content="{x:Static Properties:Resources.FiltersView_FlipVideo}" Margin="0,0,0,0" VerticalAlignment="Center" IsChecked="{Binding RotateFlipFilter.FlipVideo, UpdateSourceTrigger=PropertyChanged}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Flip}" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" VerticalContentAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.FiltersView_Rotate}" Margin="0,0,0,0" Grid.Row="1" Grid.Column="0" />
+ <ComboBox Width="120" ItemsSource="{Binding RotateFlipFilter.RotationOptions}" Grid.Row="1" Grid.Column="1"
+ SelectedItem="{Binding RotateFlipFilter.SelectedRotation}" ToolTip="{x:Static Properties:ResourcesTooltips.FilterView_Rotate}"
+ AutomationProperties.Name="{x:Static Properties:Resources.FiltersView_Rotate}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Cropping}" Grid.Row="2" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" />
+ <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal" Grid.ColumnSpan="2" Margin="0,5,0,0">
+
+ <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Automatic}" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="0,0,0,0"
+ IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_AutoCrop}" />
 
+ <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Custom}" VerticalAlignment="Center" VerticalContentAlignment="Center" Margin="10,0,0,0"
+ IsChecked="{Binding IsCustomCrop}" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_ManualCrop}" />
 </StackPanel>
 
- 
- <StackPanel Name="CropPanel" Margin="15,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1">
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Cropping}" FontWeight="Bold" />
- <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}" Margin="10,0,0,0"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_AutoCrop}" />
- <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,5,0,0"
- ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_ManualCrop}" />
-
- <Grid Margin="0,10,0,0">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
-
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
-
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
+
+ <Grid Margin="0,10,0,0" Grid.Row="3" Grid.ColumnSpan="3">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
 Minimum="0" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
 ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}"
 AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Top}" />
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
 Minimum="0" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
 ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}"
 AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Bottom}" />
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
 Minimum="0" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
 ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"
 AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Left}"/>
 
- <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
 Minimum="0" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
 ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}"
 AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Right}"/>
+ </Grid>
+ </Grid>
 
- </Grid>
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResAndScaling}" Style="{StaticResource sectionHeader}" Grid.Row="2" Grid.Column="1" Margin="45,5,0,5" />
+ <Grid Name="SizePanel" Margin="45,0,0,0" Grid.Row="3" Grid.Column="1">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,5,0" />
+ <ComboBox ItemsSource="{Binding ResolutionLimitModes, Converter={StaticResource resolutionLimitConverter}}" VerticalAlignment="Center" VerticalContentAlignment="Center"
+ SelectedItem="{Binding SelectedPictureSettingsResLimitMode, Converter={StaticResource resolutionLimitConverter}}" 
+ Width="150" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Left" Margin="0,0,0,0" Grid.ColumnSpan="3"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" />
+
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_MaxSize}" Grid.Row="1" Grid.Column="0" Margin="0,0,5,0" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" />
+ <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,5,0,0" >
+ <controls:NumberBox Number="{Binding MaxWidth, Mode=TwoWay}" UpdateBindingOnTextChange="True" Grid.Row="1" Grid.Column="1"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxWidth}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+
+ <TextBlock Text="X" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,10,0" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+ <controls:NumberBox Number="{Binding MaxHeight, Mode=TwoWay}" UpdateBindingOnTextChange="True" Grid.Row="1" Grid.Column="3"
+ Modulus="2" 
+ Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxHeight}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
 </StackPanel>
+ 
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,5" />
+ <ComboBox Width="110" Grid.Row="2" ItemsSource="{Binding AnamorphicModes}" SelectedItem="{Binding SelectedAnamorphicMode}" Grid.Column="1" HorizontalAlignment="Left" Margin="0,5,0,5" Grid.ColumnSpan="3"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Anamorphic}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Anamorphic}" />
+
 
- 
- <StackPanel Name="PreviewPanel" Margin="5,5,0,0" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="1" Grid.Column="0">
- <Label Content="{x:Static Properties:Resources.PictureSettingsView_Output}" FontWeight="Bold" />
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_PAR}" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" />
+ <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.Column="1" Grid.ColumnSpan="3">
+ <controls:NumberBox Width="60" Number="{Binding ParWidth, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False" UpdateBindingOnTextChange="False"
+ IsEnabled="{Binding IsPixelAspectSettable}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>
+ <TextBlock Text=":" Width="10" HorizontalAlignment="Center" Margin="10,0,10,0" VerticalAlignment="Center" />
+ <controls:NumberBox Width="60" Number="{Binding ParHeight, Mode=TwoWay}" HorizontalAlignment="Left" AllowEmpty="False" UpdateBindingOnTextChange="False"
+ IsEnabled="{Binding IsPixelAspectSettable}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PAR}"/>
+ </StackPanel>
 
- <Grid >
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
 
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Width}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0" />
+ <StackPanel Orientation="Horizontal" Grid.Row="4" Grid.Column="1" Margin="0,5,0,0" >
+ <controls:NumberBox Number="{Binding Width, Mode=TwoWay}" UpdateBindingOnTextChange="False" IsEnabled="{Binding WidthControlEnabled}" 
+ Modulus="2" ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Width}" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Width}" />
 
- <Label Content="{Binding DisplaySize}" Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" Margin="0,0,0,5"
- Visibility="{Binding ShowDisplaySize, Converter={StaticResource boolToVisConverter}}" />
- </Grid>
- 
+ <TextBlock Text="X" Width="10" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="10,0,10,0" />
+ <controls:NumberBox Number="{Binding Height, Mode=TwoWay}" IsEnabled="{Binding HeightControlEnabled}" UpdateBindingOnTextChange="False"
+ Modulus="2"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_Height}" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Height}" />
 </StackPanel>
+
+ <CheckBox Content="Optimal Size" IsChecked="{Binding OptimalSize}" Grid.Row="5" Grid.Column="1" Grid.ColumnSpan="3" Margin="0,5,0,0" VerticalContentAlignment="Center" />
+ <CheckBox Content="Allow Upscaling" IsChecked="{Binding AllowUpscaling}" Grid.Row="6" Grid.Column="1" Grid.ColumnSpan="3" Margin="0,5,0,0" VerticalContentAlignment="Center" />
 </Grid>
- </Border>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Borders}" Style="{StaticResource sectionHeader}" Grid.Row="2" Grid.Column="2" Margin="45,5,0,5" />
+ <Grid Name="PaddingPanel" Margin="45,0,0,0" Grid.Row="3" Grid.Column="2">
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Padding}" Grid.Row="0" Grid.Column="0" />
+ <ComboBox ItemsSource="{Binding PaddingFilter.PaddingModes}" SelectedItem="{Binding PaddingFilter.Mode}" Grid.Row="0" Grid.Column="1" Width="140" />
+
+ <Grid Margin="0,10,0,10" Grid.Row="1" Grid.ColumnSpan="2">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding PaddingFilter.IsCustomPaddingEnabled}" Grid.Row="1" Grid.Column="2"
+ Minimum="0" Modulus="2" Number="{Binding PaddingFilter.Top, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Top}" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding PaddingFilter.IsCustomPaddingEnabled}" Grid.Row="3" Grid.Column="2"
+ Minimum="0" Modulus="2" Number="{Binding PaddingFilter.Bottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Bottom}" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding PaddingFilter.IsCustomPaddingEnabled}" Grid.Row="2" Grid.Column="1"
+ Minimum="0" Modulus="2" Number="{Binding PaddingFilter.Left, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Left}"/>
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding PaddingFilter.IsCustomPaddingEnabled}" Grid.Row="2" Grid.Column="3"
+ Minimum="0" Modulus="2" Number="{Binding PaddingFilter.Right, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Right}"/>
+ </Grid>
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_PaddingColour}" Grid.Row="2" Grid.Column="0" />
+ <ComboBox ItemsSource="{Binding PaddingFilter.PaddingColours}" SelectedItem="{Binding PaddingFilter.Colour}" Grid.Row="2" Grid.Column="1" Width="140"
+ IsEnabled="{Binding PaddingFilter.IsCustomPaddingEnabled}" />
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_PaddingCustomColour}" Grid.Row="3" Grid.Column="0" Visibility="{Binding PaddingFilter.IsCustomColourVisible, Converter={StaticResource boolToVisConverter}}" />
+ <TextBox Text="{Binding PaddingFilter.CustomColour, UpdateSourceTrigger=PropertyChanged}" Grid.Row="3" Grid.Column="1" Width="120" Visibility="{Binding PaddingFilter.IsCustomColourVisible, Converter={StaticResource boolToVisConverter}}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_PaddingCustomColourTooltip}"/>
+
+ </Grid>
+
+
+ 
+ <StackPanel Name="PreviewPanel" Margin="5,5,0,5" VerticalAlignment="Top" HorizontalAlignment="Stretch" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3">
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Output}" Style="{StaticResource sectionHeader}" />
+
+ <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
+ <TextBlock Text="{Binding DisplaySize}" HorizontalAlignment="Left" VerticalAlignment="Center" />
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_DisplayWidth}" VerticalAlignment="Center" Margin="15,0,0,0" />
+
+ <controls:NumberBox Width="60" Number="{Binding DisplayWidth, Mode=TwoWay}" HorizontalAlignment="Left" Margin="5,0,0,0" Modulus="2" UpdateBindingOnTextChange="False"
+ AllowEmpty="False" IsEnabled="{Binding MaintainAspectRatio, Converter={StaticResource boolConverter}, ConverterParameter=true}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_DisplayWidth}"/>
+
+ <CheckBox IsChecked="{Binding MaintainAspectRatio}" Margin="10,0,0,0" 
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_KeepAR}" 
+ VerticalAlignment="Center" VerticalContentAlignment="Center" HorizontalAlignment="Left">
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_KeepAR}" VerticalAlignment="Center" Margin="0,1,0,0" />
+ </CheckBox>
+
+ <TextBlock Text="{Binding OutputAspect}" Margin="20,0,0,0" />
+
+ </StackPanel>
+
+
+ </StackPanel>
+ </Grid>
+
 </UserControl>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml Added

@@ -0,0 +1,303 @@
+<Window x:Class="HandBrakeWPF.Views.PresetManagerView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:cal="http://www.caliburnproject.org"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:loc="clr-namespace:HandBrakeWPF.Services.Presets.Model"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+ xmlns:commands="clr-namespace:HandBrakeWPF.Commands"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:picture="clr-namespace:HandBrakeWPF.Converters.Picture"
+ Title="{Binding Title}"
+ Width="850"
+ Height="500"
+ MinWidth="850"
+ MinHeight="500"
+ WindowStartupLocation="CenterScreen"
+ TextOptions.TextFormattingMode="Display">
+
+ <Window.Resources>
+ <converters:ThemeImageConverter x:Key="themeConverter" />
+ <converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ <picture:ResolutionLimitConverter x:Key="resolutionLimitConverter" />
+ </Window.Resources>
+
+ <Grid>
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ 
+ <Grid Grid.Row="0" Grid.ColumnSpan="2">
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_ManagePreset}" Style="{StaticResource windowTitle}" Margin="10,0,0,0" Grid.Row="0" />
+
+ <Button cal:Message.Attach="Event Click = Action LaunchHelp" Background="Transparent" BorderThickness="0" Grid.Row="0" HorizontalAlignment="Right" Margin="0,5,5,0" Padding="8,2">
+ <Button.Content>
+ <Image Source="/Views/Images/question.png" Width="16" />
+ </Button.Content>
+ </Button>
+
+ </Grid>
+
+ 
+ <Grid Grid.Row="1">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ <Grid.Resources>
+
+ <HierarchicalDataTemplate DataType="{x:Type loc:Preset}">
+ <StackPanel Orientation="Horizontal" >
+ <StackPanel.Resources>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding IsDefault}" Value="True" >
+ <Setter Property="FontStyle" Value="Italic" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding IsDefault}" Value="False" >
+ <Setter Property="FontStyle" Value="Normal" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </StackPanel.Resources>
+ <TextBlock Text="{Binding Name}" TextTrimming="CharacterEllipsis" />
+ <TextBlock Text="{x:Static Properties:Resources.Preset_Default}" Margin="10,0,0,0" Visibility="{Binding IsDefault, Converter={StaticResource boolToVisConverter}}" />
+ <TextBlock Text="{x:Static Properties:Resources.Preset_NotAvailable}" Margin="10,0,0,0" Visibility="{Binding IsPresetDisabled, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+ </HierarchicalDataTemplate>
+
+ <HierarchicalDataTemplate DataType="{x:Type loc:PresetDisplayCategory}" ItemsSource="{Binding Presets}">
+ <StackPanel Orientation="Horizontal" >
+ <TextBlock Text="{Binding Category}" FontSize="14" />
+ </StackPanel>
+ </HierarchicalDataTemplate>
+ </Grid.Resources>
+
+ <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Bottom" Grid.Row="1" Margin="0,0,0,0" >
+ <MenuItem>
+ <MenuItem.Header>
+ <StackPanel Height="27" Orientation="Horizontal">
+ <Image Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}" Width="20" Height="20" VerticalAlignment="Center" />
+ <TextBlock VerticalAlignment="Center"
+ Text="{x:Static Properties:Resources.QueueView_Options}" Margin="5,0,0,0" />
+ <Path Height="5"
+ Margin="2,2,0,0"
+ Data="M 0 0 L 4 4 L 8 0 Z"
+ Fill="{DynamicResource ButtonGlyphBrush}" />
+ </StackPanel>
+ </MenuItem.Header>
+
+ <MenuItem cal:Message.Attach="Event Click = Action Import" Header="{x:Static Properties:Resources.ManagePresetView_Import}" />
+ <MenuItem cal:Message.Attach="Event Click = Action Export" Header="{x:Static Properties:Resources.ManagePresetView_Export}" />
+ <MenuItem cal:Message.Attach="Event Click = Action ExportUserPresets" Header="{x:Static Properties:Resources.ManagePresetView_ExportUserPresets}" />
+ <Separator />
+ <MenuItem cal:Message.Attach="Event Click = Action SetDefault" Header="{x:Static Properties:Resources.ManagePresetView_SetDefault}" />
+
+ <MenuItem cal:Message.Attach="Event Click = Action DeletePreset" Header="{x:Static Properties:Resources.PresetManagerView_Delete}" />
+ <Separator />
+ <MenuItem cal:Message.Attach="Event Click = Action ResetBuiltInPresets" Header="{x:Static Properties:Resources.MainView_ResetPresets}" />
+ <MenuItem cal:Message.Attach="Event Click = Action DeleteBuiltInPresets" Header="{x:Static Properties:Resources.ManagePresetView_DeleteBuiltIn}" />
+ </MenuItem>
+ </Menu>
+
+ <TreeView x:Name="presetListTree" HorizontalAlignment="Stretch" AutomationProperties.Name="Presets List" ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Presets}"
+ VerticalAlignment="Stretch" Grid.Row="2" Margin="10,0,0,10"
+ ItemsSource="{Binding PresetsCategories}" Width="300"
+ SelectedItemChanged="PresetListTree_OnSelectedItemChanged"
+ PreviewMouseRightButtonDown="PresetListTree_OnPreviewMouseRightButtonDown">
+
+ <TreeView.ItemContainerStyle>
+ <Style BasedOn="{StaticResource {x:Type TreeViewItem}}" TargetType="TreeViewItem">
+ <Setter Property="HorizontalAlignment" Value="Stretch" />
+ <Setter Property="Padding" Value="4" />
+ <Setter Property="ToolTip" Value="{Binding Description}" />
+ <Setter Property="ToolTipService.InitialShowDelay" Value="1500"/>
+ <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+ <EventSetter Event="TreeViewItem.Collapsed" Handler="PresetTreeviewItemCollapsed" />
+ <Style.Triggers>
+ <Trigger Property="HasItems" Value="True">
+ <Setter Property="Focusable" Value="false" />
+ </Trigger>
+ </Style.Triggers>
+ </Style>
+ </TreeView.ItemContainerStyle>
+
+ <TreeView.ContextMenu>
+ <ContextMenu AutomationProperties.Name="Presets List Context Menu">
+ <MenuItem Header="{x:Static Properties:Resources.MainView_SetDefault}" cal:Message.Attach="Event Click = Action SetDefault" />
+ <Separator />
+ <MenuItem cal:Message.Attach="Event Click = Action DeletePreset" Header="{x:Static Properties:Resources.PresetManagerView_Delete}" />
+ </ContextMenu>
+ </TreeView.ContextMenu>
+
+ <i:Interaction.Triggers>
+ <commands:InputBindingTrigger>
+ <commands:InputBindingTrigger.InputBinding>
+ <KeyBinding Key="Delete"/>
+ </commands:InputBindingTrigger.InputBinding>
+ <cal:ActionMessage MethodName="DeletePreset" />
+ </commands:InputBindingTrigger>
+ </i:Interaction.Triggers>
+
+ </TreeView>
+ </Grid>
+
+ 
+ <Border BorderThickness="1,0,0,0" BorderBrush="LightGray" Grid.Column="1" Grid.Row="1" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="5" >
+
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_NoPresetSelected}" HorizontalAlignment="Center" FontStyle="Italic" 
+ Visibility="{Binding IsPresetSelected, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ 
+ <Grid Visibility="{Binding IsPresetSelected, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_PresetInfo}" FontSize="16" Margin="10,0,0,15" Grid.Row="0" />
+
+ 
+ <StackPanel Orientation="Horizontal" Grid.Row="1" Margin="10,0,0,0" HorizontalAlignment="Stretch" >
+
+ <Button Content="Set Default" Margin="0,0,5,0" Visibility="{Binding SelectedPreset.IsDefault, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"
+ cal:Message.Attach="Event Click = Action SetCurrentPresetAsDefault" />
+
+ <Button AutomationProperties.Name="{x:Static Properties:Resources.PresetManagerView_Delete}" 
+ cal:Message.Attach="Event Click = Action DeletePreset" 
+ Visibility="{Binding SelectedPreset.IsDefault, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" >
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="16" Height="16" VerticalAlignment="Center" Margin="0,0,5,0"
+ Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Remove.png'}">
+ </Image>
+ <TextBlock Text="{x:Static Properties:Resources.PresetManagerView_Delete}" VerticalAlignment="Center" />
+ </StackPanel>
+
+ </Button.Content>
+ </Button>
+
+ </StackPanel>
+
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.ManagePresetView_RestrictedPreset}" HorizontalAlignment="Center" FontStyle="Italic" Grid.Row="2"
+ Margin="0,15,0,20"
+ Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+
+ 
+ <Grid Grid.Row="3" Margin="10,10,10,0">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="120" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*" />
+ </Grid.RowDefinitions>
+
+ 
+ <TextBlock Grid.Row="0" Grid.Column="0" Text="{x:Static Properties:Resources.AddPresetView_Name}" />
+ <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="1">
+ <TextBlock HorizontalAlignment="Stretch" Text="{Binding SelectedPreset.Name, UpdateSourceTrigger=PropertyChanged}" TextTrimming="CharacterEllipsis" />
+ </StackPanel>
+
+ <TextBlock Grid.Row="1" Grid.Column="0" Text="{x:Static Properties:Resources.AddPresetView_IsDefault}" Margin="0,10,0,0" />
+ <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,10,0,0" >
+ <TextBlock HorizontalAlignment="Stretch" Text="{x:Static Properties:Resources.Yes}" Visibility="{Binding SelectedPreset.IsDefault, Converter={StaticResource boolToVisConverter}, ConverterParameter=False}" />
+ <TextBlock HorizontalAlignment="Stretch" Text="{x:Static Properties:Resources.No}" Visibility="{Binding SelectedPreset.IsDefault, Converter={StaticResource boolToVisConverter}, ConverterParameter=True}" />
+ </StackPanel>
+
+ 
+ <TextBlock Grid.Row="2" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Description}" VerticalAlignment="Top" />
+ <TextBox Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" Text="{Binding SelectedPreset.Description, UpdateSourceTrigger=PropertyChanged}" Height="80" TextWrapping="WrapWithOverflow" VerticalContentAlignment="Top" 
+ Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <TextBlock Grid.Row="2" Grid.Column="1" Margin="0,10,0,0" Text="{Binding SelectedPreset.Description, UpdateSourceTrigger=PropertyChanged}" TextWrapping="WrapWithOverflow" 
+ Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+
+ 
+ <TextBlock Grid.Row="3" Grid.Column="0" Margin="0,10,0,0" Text="{x:Static Properties:Resources.AddPresetView_Category}" />
+ <StackPanel Grid.Row="3" Grid.Column="1" Orientation="Vertical" Margin="0,10,0,0">
+
+ <ComboBox ItemsSource="{Binding UserPresetCategories}" SelectedItem="{Binding SelectedUserPresetCategory}" DisplayMemberPath="Category" Width="250" HorizontalAlignment="Left"
+ Visibility="{Binding SelectedPreset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}"/>
+ <TextBlock Text="{Binding SelectedPreset.Category, UpdateSourceTrigger=PropertyChanged}" 
+ Visibility="{Binding SelectedPreset.IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}" />
+ </StackPanel>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_ResLimit}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center" Margin="0,15,0,5"
+ Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <ComboBox ItemsSource="{Binding ResolutionLimitModes, Converter={StaticResource resolutionLimitConverter}}" 
+ SelectedItem="{Binding SelectedPictureSettingsResLimitMode, Converter={StaticResource resolutionLimitConverter}}" 
+ Width="150" Grid.Row="4" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,5" 
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_ResLimit}"
+ Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+
+ 
+ <StackPanel Grid.Row="5" Grid.Column="1" Orientation="Horizontal" Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
+ <controls:NumberBox Number="{Binding CustomWidth, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxWidth}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+
+ <TextBlock Text="x" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" VerticalAlignment="Center" Margin="10,0,10,0" />
+ <controls:NumberBox Number="{Binding CustomHeight, Mode=TwoWay}" UpdateBindingOnTextChange="True"
+ Modulus="2" Minimum="0" Width="60"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_MaxHeight}" Visibility="{Binding IsCustomMaxRes, Converter={StaticResource boolToVisConverter}}" />
+ </StackPanel>
+
+ <TextBlock Text="Audio:" Grid.Row="6" VerticalAlignment="Center" Margin="0,15,0,0" Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Button Content="{x:Static Properties:Resources.AudioViewModel_ConfigureDefaults}" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Margin="0,15,0,0" Padding="8,2"
+ cal:Message.Attach="Event Click = Action EditAudioDefaults" Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ <TextBlock Text="Subtitles:" Grid.Row="7" VerticalAlignment="Center" Margin="0,5,0,0" Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <Button Content="{x:Static Properties:Resources.SubtitlesViewModel_ConfigureDefaults}" Grid.Row="7" Grid.Column="1" HorizontalAlignment="Left" Margin="0,5,0,0" Padding="8,2"
+ cal:Message.Attach="Event Click = Action EditSubtitleDefaults" Visibility="{Binding IsBuildIn, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ </Grid>
+
+ </Grid>
+ </Grid>
+
+
+ </Border>
+
+ </Grid>
+</Window>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/PresetManagerView.xaml.cs Added

@@ -0,0 +1,93 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="PresetManagerView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// <summary>
+// Interaction logic for PresetManagerView.xaml
+// </summary>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views
+{
+ using System.Windows;
+ using System.Windows.Controls;
+ using System.Windows.Input;
+ using System.Windows.Media;
+
+ using HandBrakeWPF.Services.Presets.Model;
+ using HandBrakeWPF.ViewModels;
+
+ public partial class PresetManagerView : Window
+ {
+ public PresetManagerView()
+ {
+ this.InitializeComponent();
+ this.Closing += this.PresetManagerView_Closing;
+ }
+
+ private void PresetManagerView_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+ {
+ this.Closing -= this.PresetManagerView_Closing;
+ ((PresetManagerViewModel)this.DataContext).Close();
+ }
+
+ private void PresetTreeviewItemCollapsed(object sender, RoutedEventArgs e)
+ {
+ if (e.Source.GetType() == typeof(TreeViewItem))
+ {
+ TreeViewItem item = e.Source as TreeViewItem;
+ if (item != null && item.DataContext?.GetType() == typeof(PresetDisplayCategory))
+ {
+ item.IsSelected = false;
+ }
+ }
+ }
+
+ private void PresetListTree_OnSelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+ {
+ if (e.Source.GetType() == typeof(TreeView))
+ {
+ if (e.NewValue != null && e.NewValue.GetType() == typeof(Preset))
+ {
+ ((PresetManagerViewModel)this.DataContext).SelectedPreset = (Preset)e.NewValue;
+ }
+ else if (e.NewValue != null && e.NewValue.GetType() == typeof(PresetDisplayCategory))
+ {
+ ((PresetManagerViewModel)this.DataContext).SelectedPresetCategory = (PresetDisplayCategory)e.NewValue;
+ } 
+ }
+ }
+
+ private void PresetListTree_OnPreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ TreeViewItem treeViewItem = VisualUpwardSearch(e.OriginalSource as DependencyObject);
+
+ if (treeViewItem != null)
+ {
+ treeViewItem.Focus();
+ e.Handled = true;
+ }
+ }
+
+ private static TreeViewItem VisualUpwardSearch(DependencyObject source)
+ {
+ while (source != null && !(source is TreeViewItem))
+ source = VisualTreeHelper.GetParent(source);
+
+ return source as TreeViewItem;
+ }
+
+ private void ToolBarLoaded(object sender, RoutedEventArgs e)
+ {
+ ToolBar toolBar = sender as ToolBar;
+ if (toolBar != null)
+ {
+ var overflowGrid = toolBar.Template.FindName("OverflowGrid", toolBar) as FrameworkElement;
+ if (overflowGrid != null)
+ {
+ overflowGrid.Visibility = Visibility.Collapsed;
+ }
+ }
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/QueueSelectionView.xaml Changed

@@ -4,7 +4,7 @@
 xmlns:cal="http://www.caliburnproject.org"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:Conveters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 Title="{Binding Title}"
 MinWidth="550"
@@ -22,7 +22,7 @@
 <Setter Property="Margin" Value="0,2,0,2" />
 </Style>
 
- <Conveters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
+ <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 </Window.Resources>
 
 <Grid HorizontalAlignment="Stretch"
@@ -36,7 +36,7 @@
 </Grid.RowDefinitions>
 
 
- <TextBlock Text="{x:Static Properties:Resources.QueueSelectionView_Title}" FontSize="26" FontFamily="Segoe UI Light" FontWeight="Bold" Margin="10,10,10,10" Grid.Row="0" />
+ <TextBlock Text="{x:Static Properties:Resources.QueueSelectionView_Title}" Style="{StaticResource windowTitle}" Margin="10,10,10,10" Grid.Row="0" />
 
 
 <StackPanel Orientation="Vertical" Grid.Row="1" Margin="10,0,10,0">
@@ -100,7 +100,7 @@
 </ListBox.ItemTemplate>
 </ListBox>
 
- 
+ 
 <StackPanel Orientation="Vertical" Grid.Row="3" Margin="10,10,10,0">
 <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
 <TextBlock Text="{Binding CurrentPreset}" TextWrapping="Wrap" />

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/QueueView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/QueueView.xaml Changed

@@ -5,7 +5,7 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 xmlns:Audio="clr-namespace:HandBrakeWPF.Converters.Audio"
 xmlns:Subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
@@ -14,6 +14,7 @@
 xmlns:helpers="clr-namespace:HandBrakeWPF.Helpers"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 xmlns:queue="clr-namespace:HandBrakeWPF.Converters.Queue"
+ xmlns:main="clr-namespace:HandBrakeWPF.Converters.Main" xmlns:Converters1="clr-namespace:HandBrakeWPF.Services.Presets.Model"
 Title="{Binding Title}"
 Width="975"
 Height="550"
@@ -28,19 +29,54 @@
 <Converters:BooleanToVisibilityConverter x:Key="boolToVisConverter" />
 <Converters:FullPathToFileNameConverter x:Key="filePathToFilenameConverter" />
 <Converters:EnumComboConverter x:Key="enumComboConverter" />
- <Converters:QueueStatusToVisibilityConverter x:Key="queueStatusVisConverter" />
 <Converters:InverseBooleanConverter x:Key="notBooleanConverter" />
 <Audio:AudioQueueDisplayConverter x:Key="audioTrackDisplayConverter" />
 <Subtitles:SubtitlesQueueDisplayConverter x:Key="subtitleTrackDisplayConverter" />
 <video:EncoderOptionsTooltipConverter x:Key="encoderOptionsTooltipConverter" />
 <video:VideoOptionsTooltipConverter x:Key="videoOptionsTooltipConverter" />
- <queue:PictureSettingsDescConveter x:Key="pictureSettingsDescConverter" />
+ <queue:PictureSettingsDescConverter x:Key="pictureSettingsDescConverter" />
+ <queue:FilterSettingsDescConverter x:Key="filterSettingsDescConverter" />
 <Converters:ThemeImageConverter x:Key="themeConverter" />
+ <main:PointToPointConverter x:Key="PointToPointConverter" />
 
 <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement">
 <Setter Property="ToolTipService.ShowDuration" Value="10000" />
 </Style>
 
+ <Style x:Key="RotatingImageStyle" TargetType="{x:Type Image}">
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
+ <Setter Property="Source" Value="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Source.png'}" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
+ <Setter Property="Source" Value="Images/Working0.png" />
+ <DataTrigger.EnterActions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="10">
+ <DoubleAnimation Duration="0:0:2" To="180" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)" RepeatBehavior="Forever" />
+ </Storyboard>
+ </BeginStoryboard>
+ </DataTrigger.EnterActions>
+ <DataTrigger.ExitActions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="10">
+ <DoubleAnimation Duration="0:0:0" To="0" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </DataTrigger.ExitActions>
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
+ <Setter Property="Source" Value="Images/Complete.png" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
+ <Setter Property="Source" Value="Images/WarningSmall.png" />
+ </DataTrigger>
+ <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Paused">
+ <Setter Property="Source" Value="Images/pause_small.png" />
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+
 </Window.Resources>
 
 <Grid>
@@ -59,7 +95,7 @@
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" FontSize="28" VerticalAlignment="Center" FontFamily="Segoe UI Light" Margin="10,0,0,0" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_ShowQueue}" Style="{StaticResource windowTitle}" Margin="10,0,0,0" />
 <TextBlock Text="{Binding JobsPending}" Grid.Column="1" Margin="15,0,0,5 " VerticalAlignment="Bottom" TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" />
 </Grid>
 
@@ -98,13 +134,24 @@
 </StackPanel>
 </Button>
 
- <Button Name="Pause" AutomationProperties.Name="Pause Queue" cal:Message.Attach="Event Click = Action PauseQueueToolbar" Grid.Column="1"
+ <StackPanel Grid.Column="1" Orientation="Horizontal">
+ <Button Name="Pause" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Pause}" cal:Message.Attach="Event Click = Action PauseQueueToolbar"
 Visibility="{Binding IsQueueRunning, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
- <StackPanel Orientation="Horizontal">
- <Image Width="16" Height="16" Margin="2,0,0,0" Source="Images/Pause.png" />
- <Label Margin="5,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.QueueView_Pause}" />
- </StackPanel>
- </Button>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="16" Height="16" Margin="2,0,0,0" Source="Images/Pause.png" />
+ <Label Margin="5,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.QueueView_Pause}" />
+ </StackPanel>
+ </Button>
+
+ <Button Name="Stop" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Stop}" cal:Message.Attach="Event Click = Action StopQueue"
+ Visibility="{Binding IsQueueRunning, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}"
+ Margin="5,0,0,0">
+ <StackPanel Orientation="Horizontal">
+ <Image Width="16" Height="16" Margin="2,0,0,0" Source="Images/stop.png" />
+ <Label Margin="5,0,0,0" VerticalAlignment="Center" Content="{x:Static Properties:Resources.QueueView_Stop}" />
+ </StackPanel>
+ </Button>
+ </StackPanel>
 
 <Menu HorizontalAlignment="Right" Background="Transparent" VerticalAlignment="Bottom" Grid.Column="3" Margin="0,0,0,0" >
 <MenuItem>
@@ -116,7 +163,7 @@
 <Path Height="5"
 Margin="2,2,0,0"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" />
+ Fill="{DynamicResource ButtonGlyphBrush}" />
 </StackPanel>
 </MenuItem.Header>
 <MenuItem cal:Message.Attach="Event Click = Action ResetFailed" Header="{x:Static Properties:Resources.QueueView_ResetFailed}" />
@@ -159,10 +206,13 @@
 <ContextMenu cal:Action.TargetWithoutContext="{Binding Path=PlacementTarget.Tag, RelativeSource={RelativeSource Self}}" Opened="ContextMenu_OnOpened">
 <MenuItem Header="{x:Static Properties:Resources.QueueView_PlayMediaFile}" cal:Message.Attach="Event Click = Action PlayFile" />
 <Separator />
- <MenuItem x:Name="ResetMenuItem" Header="{x:Static Properties:Resources.QueueView_Reset}" Click="QueueItem_Retry" />
- <MenuItem x:Name="DeleteMenuItem" Header="{x:Static Properties:Resources.QueueView_Delete}" Click="QueueItem_Delete" />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_MoveToTop}" x:Name="moveToTopMenuItem" cal:Message.Attach="Event Click = Action MoveToTop" />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_MoveToBottom}" x:Name="moveToBottomMenuItem" cal:Message.Attach="Event Click = Action MoveToBottom" />
 <Separator />
- <MenuItem x:Name="EditMenuItem" Header="{x:Static Properties:Resources.QueueView_Edit}" Click="QueueItem_Edit" />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_Reset}" x:Name="ResetMenuItem" Click="QueueItem_Retry" />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_Delete}" x:Name="DeleteMenuItem" Click="QueueItem_Delete" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_Edit}" x:Name="EditMenuItem" Click="QueueItem_Edit" />
 <Separator />
 <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" x:Name="openSourceDir" Click="OpenSourceDir_OnClick" />
 <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" x:Name="openDestDir" Click="OpenDestDir_OnClick" />
@@ -179,84 +229,85 @@
 
 <ListBox.ItemTemplate>
 <DataTemplate x:Name="QueueItemTemplate">
-
 <Grid>
- <Grid.ColumnDefinitions>
- <ColumnDefinition Width="40" />
- <ColumnDefinition Width="*" />
- <ColumnDefinition Width="Auto" />
- </Grid.ColumnDefinitions>
-
- 
- <Image Grid.Column="0" Width="16" Height="16" SnapsToDevicePixels="True">
-
- <Image.LayoutTransform>
- <RotateTransform CenterX="8" CenterY="8" Angle="0"/>
- </Image.LayoutTransform>
-
- <Image.Style>
- <Style TargetType="{x:Type Image}">
- <Style.Triggers>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Waiting">
- <Setter Property="Source" Value="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Source.png'}" />
- </DataTrigger>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="In Progress">
- <Setter Property="Source" Value="Images/Working0.png" />
- <DataTrigger.EnterActions>
- <BeginStoryboard>
- <Storyboard>
- <DoubleAnimation Duration="0:0:2" To="180" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)" RepeatBehavior="Forever" />
- </Storyboard>
- </BeginStoryboard>
- </DataTrigger.EnterActions>
- <DataTrigger.ExitActions>
- <BeginStoryboard>
- <Storyboard>
- <DoubleAnimation Duration="0:0:0" To="0" Storyboard.TargetProperty="(Image.LayoutTransform).(RotateTransform.Angle)"/>
- </Storyboard>
- </BeginStoryboard>
- </DataTrigger.ExitActions>
- </DataTrigger>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Completed">
- <Setter Property="Source" Value="Images/Complete.png" />
- </DataTrigger>
- <DataTrigger Binding="{Binding Status, Converter={StaticResource enumComboConverter}}" Value="Error">
- <Setter Property="Source" Value="Images/WarningSmall.png" />
- </DataTrigger>
- </Style.Triggers>
- </Style>
- </Image.Style>
- </Image>
-
- 
- <Grid Grid.Column="1" Margin="0,3,5,3" VerticalAlignment="Center">
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
 
+ <Grid Visibility="{Binding IsBreakpointTask, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}">
 <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="40" />
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
- <StackPanel Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">
- <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}" Grid.Row="0" Grid.Column="0"
+ 
+ <Image Grid.Column="0" Width="16" Height="16" SnapsToDevicePixels="True" Style="{StaticResource RotatingImageStyle}">
+ <Image.LayoutTransform>
+ <RotateTransform CenterX="8" CenterY="8" Angle="0"/>
+ </Image.LayoutTransform>
+ </Image>
+
+ 
+ <Grid Grid.Column="1" Margin="0,3,5,3" VerticalAlignment="Center" MinHeight="27">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <StackPanel Grid.Row="0" Grid.Column="0" VerticalAlignment="Center">
+ <TextBlock Text="{Binding Task.Destination, Converter={StaticResource filePathToFilenameConverter}}"
 TextWrapping="Wrap" VerticalAlignment="Center" Margin="0,0,5,0" />
 
- <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" HorizontalAlignment="Stretch" Margin="0,8,10,0"
- Value="{Binding DataContext.ProgressValue, ElementName=queueJobs}" IsIndeterminate="{Binding DataContext.IntermediateProgress, ElementName=queueJobs}"
+ <ProgressBar Minimum="0" Height="4" Maximum="100" Name="pbStatus" HorizontalAlignment="Stretch" Margin="0,8,10,0"
+ Value="{Binding JobProgress.ProgressValue}" IsIndeterminate="{Binding JobProgress.IntermediateProgress}"
 Visibility="{Binding ShowEncodeProgress, Converter={StaticResource boolToVisConverter}}" />
- </StackPanel>
- 
+ </StackPanel>
 
- <Button Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"
+ <Button Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"
 AutomationProperties.Name="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" >
- <Button.Template>
- <ControlTemplate>
- <Image Width="16" Height="16" VerticalAlignment="Center" Source="Images/close64.png" />
- </ControlTemplate>
- </Button.Template>
- </Button>
+ <Button.Template>
+ <ControlTemplate>
+ <Image Width="16" Height="16" VerticalAlignment="Center" Source="Images/close64.png" />
+ </ControlTemplate>
+ </Button.Template>
+ </Button>
+ </Grid>
+ </Grid>
+
+ <Grid Visibility="{Binding IsBreakpointTask, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="40" />
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ 
+ <Image Source="Images/stop.png" Grid.Column="0" Width="16" Height="16" SnapsToDevicePixels="True" />
+
+ 
+ <Grid Grid.Column="1" Margin="0,3,5,3" VerticalAlignment="Center" MinHeight="27">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="*" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <TextBlock Text="Stop" Grid.Column="0" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Center" />
+
+ <Button Grid.Row="0" Grid.Column="1" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="0,0,0,0" Click="QueueDeleteJob_OnClick"
+ AutomationProperties.Name="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_DeleteJob}" >
+ <Button.Template>
+ <ControlTemplate>
+ <Image Width="16" Height="16" VerticalAlignment="Center" Source="Images/close64.png" />
+ </ControlTemplate>
+ </Button.Template>
+ </Button>
+ </Grid>
+ 
 </Grid>
 </Grid>
 </DataTemplate>
@@ -278,7 +329,7 @@
 <Path Height="5"
 Margin="2,2,2,0"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" />
+ Fill="{DynamicResource ButtonGlyphBrush}" />
 </StackPanel>
 </MenuItem.Header>
 
@@ -308,92 +359,174 @@
 </Border>
 </Grid>
 
- <TabControl x:Name="summaryTabControl" Grid.Column="1" Margin="5,0,10,10" >
- <TabItem Header="{x:Static Properties:Resources.QueueView_Summary}" >
+ <TabControl x:Name="summaryTabControl" Grid.Column="1" Margin="5,0,10,10" SelectedIndex="{Binding SelectedTabIndex}" >
+ <TabItem Header="{x:Static Properties:Resources.QueueView_Summary}" IsEnabled="{Binding JobInfoVisible}" >
 <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="5,5,0,5">
 
- <StackPanel Orientation="Vertical" Margin="5,5,0,5">
+ <StackPanel>
+ <TextBlock Text="{x:Static Properties:Resources.QueueView_JobInformationNotAvailable}" Margin="0,10,0,0" 
+ Visibility="{Binding JobInfoVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
 
- <StackPanel Orientation="Horizontal" >
+ <StackPanel Orientation="Vertical" Margin="5,5,0,5" Visibility="{Binding JobInfoVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=false}">
 
- <StackPanel.Resources>
- <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
- <Setter Property="Padding" Value="8,2" />
- </Style>
- </StackPanel.Resources>
+ <StackPanel Orientation="Horizontal" >
+
+ <StackPanel.Resources>
+ <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+ <Setter Property="Padding" Value="8,2" />
+ </Style>
+ </StackPanel.Resources>
 
- <Button AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Reset}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"
+ <Button AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Reset}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_ResetJobStatus}">
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0"
 Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Refresh.png'}">
- </Image>
- <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" VerticalAlignment="Center" />
- </StackPanel>
+ </Image>
+ <TextBlock Text="{x:Static Properties:Resources.QueueView_Reset}" VerticalAlignment="Center" />
+ </StackPanel>
+
+ </Button.Content>
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Click">
+ <cal:ActionMessage MethodName="RetryJob">
+ <cal:Parameter Value="{Binding SelectedTask}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Button>
 
- </Button.Content>
- <i:Interaction.Triggers>
- <i:EventTrigger EventName="Click">
- <cal:ActionMessage MethodName="RetryJob">
- <cal:Parameter Value="{Binding SelectedTask}" />
- </cal:ActionMessage>
- </i:EventTrigger>
- </i:Interaction.Triggers>
- </Button>
-
- <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"
+ <Button Margin="10,0,0,0" AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Edit}" ToolTip="{x:Static Properties:ResourcesTooltips.QueueView_SendJobBack}">
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="20" Margin="0,0,5,0" Height="20" VerticalAlignment="Center"
 Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='New.png'}">
- </Image>
- <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" VerticalAlignment="Center" />
- </StackPanel>
- </Button.Content>
- <i:Interaction.Triggers>
- <i:EventTrigger EventName="Click">
- <cal:ActionMessage MethodName="EditJob">
- <cal:Parameter Value="{Binding SelectedTask}" />
- </cal:ActionMessage>
- </i:EventTrigger>
- </i:Interaction.Triggers>
- </Button>
-
- <Button x:Name="queueOptionsDropButton" Margin="10,0,0,0" Click="QueueOptionsDropButton_OnClick"
+ </Image>
+ <TextBlock Text="{x:Static Properties:Resources.QueueView_Edit}" VerticalAlignment="Center" />
+ </StackPanel>
+ </Button.Content>
+ <i:Interaction.Triggers>
+ <i:EventTrigger EventName="Click">
+ <cal:ActionMessage MethodName="EditJob">
+ <cal:Parameter Value="{Binding SelectedTask}" />
+ </cal:ActionMessage>
+ </i:EventTrigger>
+ </i:Interaction.Triggers>
+ </Button>
+
+ <Button x:Name="queueOptionsDropButton" Margin="10,0,0,0" Click="QueueOptionsDropButton_OnClick"
 AutomationProperties.Name="{x:Static Properties:Resources.QueueView_Actions}" IsEnabled="{Binding CanPerformActionOnSource}">
- <Button.Content>
- <StackPanel Orientation="Horizontal">
- <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
+ <Button.Content>
+ <StackPanel Orientation="Horizontal">
+ <Image Width="20" Height="20" VerticalAlignment="Center" Margin="0,0,5,0" 
 Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Advanced.png'}">
- </Image>
+ </Image>
 
- <TextBlock Margin="0,0,5,0" Padding="0"
+ <TextBlock Margin="0,0,5,0" Padding="0"
 VerticalAlignment="Center"
 Text="{x:Static Properties:Resources.QueueView_Actions}" />
 
- <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
+ <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />
- </StackPanel>
- </Button.Content>
-
- <Button.ContextMenu>
- <ContextMenu cal:Action.TargetWithoutContext="{Binding DataContext, RelativeSource={RelativeSource Self}}">
- <MenuItem Header="{x:Static Properties:Resources.QueueView_PlayMediaFile}" cal:Message.Attach="Event Click = Action PlayFile" />
- <Separator />
- <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" cal:Message.Attach="Event Click = Action OpenSourceDir" />
- <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" cal:Message.Attach="Event Click = Action OpenDestDir" />
- </ContextMenu>
- </Button.ContextMenu>
- </Button>
- </StackPanel>
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="dropdownArrowPreset" />
+ </StackPanel>
+ </Button.Content>
+
+ <Button.ContextMenu>
+ <ContextMenu cal:Action.TargetWithoutContext="{Binding DataContext, RelativeSource={RelativeSource Self}}">
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_PlayMediaFile}" cal:Message.Attach="Event Click = Action PlayFile" />
+ <Separator />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenSourceDir}" cal:Message.Attach="Event Click = Action OpenSourceDir" />
+ <MenuItem Header="{x:Static Properties:Resources.QueueView_OpenDestDir}" cal:Message.Attach="Event Click = Action OpenDestDir" />
+ </ContextMenu>
+ </Button.ContextMenu>
+ </Button>
+ </StackPanel>
+
+ 
+ <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,10,0,0" >
+ <Grid.Resources>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+ <Setter Property="Margin" Value="0,5,0,5" />
+ </Style>
+ </Grid.Resources>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" MinWidth="100" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top" Grid.Row="0" />
+ <TextBlock Text="{Binding SelectedTask.JobProgress.JobStatus}" TextWrapping="WrapWithOverflow" VerticalAlignment="Top" TextTrimming="CharacterEllipsis" Grid.Row="0" Grid.Column="1" />
 
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task.Source}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="Status:" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" Margin="0,15,10,5" Visibility="{Binding IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}" />
- <TextBlock Text="{Binding JobStatus}" Visibility="{Binding IsJobStatusVisible, Converter={StaticResource boolToVisConverter}}" 
- TextWrapping="WrapWithOverflow" TextTrimming="CharacterEllipsis" Margin="0,0,0,5" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.MainView_Title}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+ <StackPanel Orientation="Horizontal" Grid.Row="2" Grid.Column="1" Margin="0,0,0,0" >
+ <TextBlock Text="{Binding SelectedTask.Task.Title}" TextWrapping="Wrap"/>
+ <TextBlock Text="{Binding SelectedTask.Task.PointToPointMode, Converter={StaticResource PointToPointConverter}}" TextWrapping="Wrap" Margin="10,0,0,0" FontWeight="Bold"/>
+ <TextBlock Text=":" FontWeight="Bold" />
+ <TextBlock Text="{Binding SelectedTask.Task.StartPoint}" TextWrapping="Wrap" Margin="5,0,0,0"/>
+ <TextBlock Text="to" TextWrapping="Wrap" Margin="5,0,5,0"/>
+ <TextBlock Text="{Binding SelectedTask.Task.EndPoint}" TextWrapping="Wrap"/>
+ </StackPanel>
+
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task.Destination}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_SelectedPresets}" Grid.Row="4" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.SelectedPresetKey}" Grid.Row="4" Grid.Column="1" />
+ 
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="5" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="5" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FilterSettings}" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource filterSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="6" Grid.Column="1" />
+
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="7" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="7" Grid.Column="1" TextWrapping="Wrap" />
+
+ <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="8" Grid.Column="0" Text="{x:Static Properties:Resources.QueueView_Advanced}" />
+ <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="8" Grid.Column="1" TextWrapping="Wrap" />
+
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}" Grid.Row="9" Grid.Column="0" VerticalAlignment="Top"/>
+ <TextBlock Text="{Binding SelectedTask.Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}" Grid.Row="9" Grid.Column="1" />
 
- <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,10,0,0" >
+ <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="10" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}" Grid.Row="10" Grid.Column="1" />
+
+
+ </Grid>
+
+ </StackPanel>
+ </StackPanel>
+ 
+ </ScrollViewer>
+ </TabItem>
+
+ <TabItem Header="{x:Static Properties:Resources.QueueView_Statistics}" IsEnabled="{Binding JobInfoVisible}" >
+ <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="10,0,0,5">
+ <StackPanel>
+ <TextBlock Text="{x:Static Properties:Resources.QueueView_StatsNotAvailableYet}" Margin="0,10,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+
+ 
+ <TextBlock Text="Job" FontWeight="Bold" Margin="0,10,0,5" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}" />
+ <Grid Style="{StaticResource LongToolTipHolder}" Margin="10,5,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}">
 <Grid.Resources>
 <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
 <Setter Property="Margin" Value="0,5,0,5" />
@@ -411,44 +544,30 @@
 </Grid.RowDefinitions>
 
 <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" MinWidth="100" />
+ <ColumnDefinition Width="Auto" MinWidth="160" />
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Source}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Task.Source}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
-
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Destination}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Task.Destination}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.StartTimeDisplay}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PictureSettings}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource pictureSettingsDescConverter}}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.EndTimeDisplay}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Video}" Grid.Row="3" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource videoOptionsTooltipConverter}}" Grid.Row="3" Grid.Column="1" TextWrapping="Wrap" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Duration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.DurationDisplay}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Audio}" Grid.Row="4" Grid.Column="0" VerticalAlignment="Top"/>
- <TextBlock Text="{Binding SelectedTask.Task.AudioTracks, Converter={StaticResource audioTrackDisplayConverter}}"
- Grid.Row="4" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.PausedDisplay}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" VerticalAlignment="Top" Text="{x:Static Properties:Resources.QueueView_Subtitles}" Grid.Row="5" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Task.SubtitleTracks, Converter={StaticResource subtitleTrackDisplayConverter}}"
- Grid.Row="5" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_AverageEncodeSpeed}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.EncodingSpeedDisplay}" TextWrapping="Wrap" Grid.Row="4" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" VerticalAlignment="Top" Grid.Row="6" Grid.Column="0" Text="{x:Static Properties:Resources.QueueView_Advanced}" />
- <TextBlock Text="{Binding SelectedTask.Task, Converter={StaticResource encoderOptionsTooltipConverter}}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap" />
 </Grid>
 
- </StackPanel>
- </ScrollViewer>
- </TabItem>
-
- <TabItem Header="{x:Static Properties:Resources.QueueView_Statistics}" >
- <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="10,0,0,5">
- <StackPanel>
- <TextBlock Text="{x:Static Properties:Resources.QueueView_StatsNotAvailableYet}" Margin="0,10,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
-
- <Grid Style="{StaticResource LongToolTipHolder}" Margin="0,5,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}">
+ 
+ <TextBlock Text="Content" FontWeight="Bold" Margin="0,10,0,5" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}" />
+ <Grid Style="{StaticResource LongToolTipHolder}" Margin="10,5,0,0" Visibility="{Binding StatsVisible, Converter={StaticResource boolToVisConverter}}">
 <Grid.Resources>
 <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
 <Setter Property="Margin" Value="0,5,0,5" />
@@ -466,30 +585,25 @@
 </Grid.RowDefinitions>
 
 <Grid.ColumnDefinitions>
- <ColumnDefinition Width="Auto" MinWidth="125" />
+ <ColumnDefinition Width="Auto" MinWidth="160" />
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
+ 
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_SourceLength}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.SourceLength}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_StartTime}" VerticalAlignment="Top" Grid.Row="0" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Statistics.StartTimeDisplay}" TextWrapping="Wrap" Grid.Row="0" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Length}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.ContentLength}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
 
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_EndTime}" VerticalAlignment="Top" Grid.Row="1" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Statistics.EndTimeDisplay}" TextWrapping="Wrap" Grid.Row="1" Grid.Column="1" />
-
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_PausedDuration}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Statistics.PausedDisplay}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
-
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_Duration}" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Statistics.DurationDisplay}" TextWrapping="Wrap" Grid.Row="3" Grid.Column="1" />
-
- <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FileSize}" VerticalAlignment="Top" Grid.Row="4" Grid.Column="0" />
- <TextBlock Text="{Binding SelectedTask.Statistics.FileSizeDisplay}" TextWrapping="Wrap" Grid.Row="4" Grid.Column="1" />
+ <TextBlock FontWeight="Bold" Text="{x:Static Properties:Resources.QueueView_FileSize}" VerticalAlignment="Top" Grid.Row="2" Grid.Column="0" />
+ <TextBlock Text="{Binding SelectedTask.Statistics.FileSizeDisplay}" TextWrapping="Wrap" Grid.Row="2" Grid.Column="1" />
 </Grid>
+
 </StackPanel>
 </ScrollViewer>
 </TabItem>
 
- <TabItem Header="{x:Static Properties:Resources.MainView_ActivityLog}">
+ <TabItem Header="{x:Static Properties:Resources.MainView_ActivityLog}" IsEnabled="{Binding JobInfoVisible}">
 <TextBox ScrollViewer.VerticalScrollBarVisibility="Visible" Text="{Binding ActivityLog, Mode=OneWay}" TextWrapping="Wrap" x:Name="logText">
 <TextBox.ContextMenu>
 <ContextMenu>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/QueueView.xaml.cs Changed

@@ -1,15 +1,11 @@
 // --------------------------------------------------------------------------------------------------------------------
-// <copyright file="QueueTwoView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// <copyright file="QueueView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
 // This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
 // </copyright>
-// <summary>
-// Interaction logic for QueueTwoView.xaml
-// </summary>
 // --------------------------------------------------------------------------------------------------------------------
 
 namespace HandBrakeWPF.Views
 {
- using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -18,16 +14,10 @@
 using HandBrakeWPF.Services.Queue.Model;
 using HandBrakeWPF.ViewModels;
 
- /// <summary>
- /// Interaction logic for VideoView
- /// </summary>
 public partial class QueueView : Window
 {
 private QueueTask mouseActiveQueueTask;
 
- /// <summary>
- /// Initializes a new instance of the <see cref="QueueView"/> class.
- /// </summary>
 public QueueView()
 {
 this.InitializeComponent();
@@ -97,10 +87,11 @@
 
 this.DeleteMenuItem.Header = this.queueJobs.SelectedItems.Count > 1 ? Properties.Resources.QueueView_DeleteSelected : Properties.Resources.QueueView_Delete;
 this.DeleteMenuItem.IsEnabled = this.mouseActiveQueueTask != null || this.queueJobs.SelectedItems.Count >= 1;
-
 this.EditMenuItem.IsEnabled = this.mouseActiveQueueTask != null && this.queueJobs.SelectedItems.Count == 1;
 this.openSourceDir.IsEnabled = this.mouseActiveQueueTask != null && this.queueJobs.SelectedItems.Count == 1;
 this.openDestDir.IsEnabled = this.mouseActiveQueueTask != null && this.queueJobs.SelectedItems.Count == 1;
+ this.moveToBottomMenuItem.IsEnabled = this.mouseActiveQueueTask != null && this.queueJobs.SelectedItems.Count >= 1;
+ this.moveToTopMenuItem.IsEnabled = this.mouseActiveQueueTask != null && this.queueJobs.SelectedItems.Count >= 1;
 }
 
 private static T FindParent<T>(DependencyObject from) where T : class

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ShellView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ShellView.xaml Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/ShellView.xaml.cs Changed

@@ -12,31 +12,31 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
+ using System.Globalization;
 using System.IO;
 using System.Windows;
- using System.Windows.Forms;
+ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Resources;
 
 using Caliburn.Micro;
 
 using HandBrakeWPF.Commands;
+ using HandBrakeWPF.Model;
+ using HandBrakeWPF.Model.Options;
 using HandBrakeWPF.Services.Interfaces;
 using HandBrakeWPF.Utilities;
 using HandBrakeWPF.ViewModels.Interfaces;
 
 using Application = System.Windows.Application;
- using Execute = Caliburn.Micro.Execute;
+ using FlowDirection = System.Windows.FlowDirection;
 
 /// <summary>
 /// Interaction logic for ShellView.xaml
 /// </summary>
 public partial class ShellView
 {
- /// <summary>
- /// The my notify icon.
- /// </summary>
- private readonly NotifyIcon notifyIcon;
+ private INotifyIconService notifyIconService;
 
 /// <summary>
 /// Initializes a new instance of the <see cref="ShellView"/> class.
@@ -50,23 +50,21 @@
 
 if (minimiseToTray)
 {
- INotifyIconService notifyIconService = IoC.Get<INotifyIconService>();
- this.notifyIcon = new NotifyIcon();
- this.notifyIcon.ContextMenu = new ContextMenu(new { new MenuItem("Restore", NotifyIconClick), new MenuItem("Mini Status Display", ShowMiniStatusDisplay) });
- notifyIconService.RegisterNotifyIcon(this.notifyIcon);
-
 StreamResourceInfo streamResourceInfo = Application.GetResourceStream(new Uri("pack://application:,,,/handbrakepineapple.ico"));
 if (streamResourceInfo != null)
 {
 Stream iconStream = streamResourceInfo.Stream;
- this.notifyIcon.Icon = new Icon(iconStream);
+
+ notifyIconService = IoC.Get<INotifyIconService>();
+ notifyIconService.Setup(new Icon(iconStream));
+ this.notifyIconService.SetClickCallback(() => this.NotifyIconClick());
 }
 
- this.notifyIcon.Click += this.NotifyIconClick;
 this.StateChanged += this.ShellViewStateChanged;
 }
 
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.E, ModifierKeys.Control)), new KeyGesture(Key.E, ModifierKeys.Control))); // Start Encode
+ this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.P, ModifierKeys.Alt)), new KeyGesture(Key.P, ModifierKeys.Alt))); // Pause Encode
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.K, ModifierKeys.Control)), new KeyGesture(Key.K, ModifierKeys.Control))); // Stop Encode
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.L, ModifierKeys.Control)), new KeyGesture(Key.L, ModifierKeys.Control))); // Open Log Window
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.Q, ModifierKeys.Control)), new KeyGesture(Key.Q, ModifierKeys.Control))); // Open Queue Window
@@ -75,9 +73,9 @@
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.A, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.A, ModifierKeys.Control | ModifierKeys.Shift))); // Add selection to Queue
 
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Control)), new KeyGesture(Key.O, ModifierKeys.Control))); // File Scan
- this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Alt)), new KeyGesture(Key.O, ModifierKeys.Alt))); // Scan Window
+ this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Alt)), new KeyGesture(Key.O, ModifierKeys.Alt))); // Scan Window
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.O, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.O, ModifierKeys.Control | ModifierKeys.Shift))); // Scan a Folder
- this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift))); // Garbage Colleciton
+ this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift)), new KeyGesture(Key.G, ModifierKeys.Control | ModifierKeys.Shift))); // Garbage Collection
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.F1, ModifierKeys.None)), new KeyGesture(Key.F1, ModifierKeys.None))); // Help
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.S, ModifierKeys.Control)), new KeyGesture(Key.S, ModifierKeys.Control))); // Browse Destination
 
@@ -90,10 +88,26 @@
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.D6, ModifierKeys.Control)), new KeyGesture(Key.D6, ModifierKeys.Control)));
 this.InputBindings.Add(new InputBinding(new ProcessShortcutCommand(new KeyGesture(Key.D7, ModifierKeys.Control)), new KeyGesture(Key.D7, ModifierKeys.Control)));
 
- // Enable Windows 7 Taskbar progress indication.
+ // Enable Windows Taskbar progress indication.
 if (this.TaskbarItemInfo == null)
 {
- this.TaskbarItemInfo = Win7.WindowsTaskbar;
+ this.TaskbarItemInfo = WindowsTaskbar.GetTaskBar();
+ }
+
+ // Setup the Right To Left Mode
+ RightToLeftMode rightToLeft = (RightToLeftMode)userSettingService.GetUserSetting<int>(UserSettingConstants.RightToLeftUi);
+ switch (rightToLeft)
+ {
+ case RightToLeftMode.EntireInterface:
+ if (Application.Current.MainWindow != null)
+ {
+ Application.Current.MainWindow.FlowDirection = FlowDirection.RightToLeft;
+ }
+ break;
+ case RightToLeftMode.TextOnly:
+ FrameworkElement.FlowDirectionProperty.OverrideMetadata(typeof(TextBlock), new FrameworkPropertyMetadata(FlowDirection.RightToLeft));
+ FrameworkElement.FlowDirectionProperty.OverrideMetadata(typeof(TextBox), new FrameworkPropertyMetadata(FlowDirection.RightToLeft));
+ break;
 }
 }
 
@@ -116,45 +130,12 @@
 }
 }
 
- if (this.notifyIcon != null)
- {
- this.notifyIcon.Visible = false;
- }
+ this.notifyIconService?.SetVisibility(false);
 
 base.OnClosing(e);
 }
 
- /// <summary>
- /// The show mini status display.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void ShowMiniStatusDisplay(object sender, EventArgs e)
- {
- IMiniViewModel titleSpecificView = IoC.Get<IMiniViewModel>();
- IWindowManager windowManager = IoC.Get<IWindowManager>();
- Execute.OnUIThread(
- () =>
- {
- titleSpecificView.Activate();
- windowManager.ShowWindow(titleSpecificView);
- });
- }
-
- /// <summary>
- /// The notify icon_ click.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
- private void NotifyIconClick(object sender, EventArgs e)
+ private void NotifyIconClick()
 {
 this.WindowState = WindowState.Normal;
 
@@ -163,29 +144,17 @@
 this.Topmost = false;
 }
 
- /// <summary>
- /// The shell view state changed.
- /// </summary>
- /// <param name="sender">
- /// The sender.
- /// </param>
- /// <param name="e">
- /// The e.
- /// </param>
 private void ShellViewStateChanged(object sender, EventArgs e)
 {
- if (this.notifyIcon != null)
+ if (this.WindowState == WindowState.Minimized)
 {
- if (this.WindowState == WindowState.Minimized)
- {
- this.ShowInTaskbar = false;
- notifyIcon.Visible = true; 
- }
- else if (this.WindowState == WindowState.Normal)
- {
- notifyIcon.Visible = false;
- this.ShowInTaskbar = true;
- }
+ this.ShowInTaskbar = false;
+ this.notifyIconService?.SetVisibility(true);
+ }
+ else if (this.WindowState == WindowState.Normal)
+ {
+ this.notifyIconService?.SetVisibility(false);
+ this.ShowInTaskbar = true;
 }
 }
 }

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Standalone Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Standalone/CropPanelView.xaml Added

@@ -0,0 +1,107 @@
+ <UserControl x:Class="HandBrakeWPF.Views.Standalone.CropPanelView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties">
+
+ <UserControl.Resources>
+ <Converters:BooleanConverter x:Key="boolConverter" />
+ <Style TargetType="controls:NumberBox">
+ <Setter Property="Height" Value="24" />
+ </Style>
+ </UserControl.Resources>
+
+ <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ 
+ <TextBlock Text="{x:Static Properties:Resources.StaticPreviewView_FineTuning}" Style="{StaticResource sectionHeader}" Margin="0,5,0,10" Foreground="White" />
+ <Grid Name="CropPanel" Margin="0,0,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.Row="1">
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="*" />
+ </Grid.ColumnDefinitions>
+
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ 
+
+
+ <TextBlock Text="{x:Static Properties:Resources.PictureSettingsView_Cropping}" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Margin="0,0,0,0" Foreground="White" />
+
+ <StackPanel Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="10,0,0,0" >
+ <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Automatic}" IsChecked="{Binding IsCustomCrop, Converter={StaticResource boolConverter}, ConverterParameter=true}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_AutoCrop}" Margin="0,0,0,0" Foreground="White" />
+ <RadioButton Content="{x:Static Properties:Resources.PictureSettingsView_Custom}" IsChecked="{Binding IsCustomCrop}" Margin="10,0,0,0"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_ManualCrop}" Foreground="White" />
+ </StackPanel>
+
+
+ <Grid Margin="0,5,0,0" Grid.Row="2" Grid.ColumnSpan="3" HorizontalAlignment="Right">
+ <Grid.RowDefinitions>
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="Auto" />
+ </Grid.RowDefinitions>
+
+ <Grid.ColumnDefinitions>
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
+ </Grid.ColumnDefinitions>
+
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Top}" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" Foreground="White" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Bottom}" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center" Foreground="White" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Left}" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" Foreground="White" />
+ <Label Content="{x:Static Properties:Resources.PictureSettingsView_Right}" Grid.Row="2" Grid.Column="4" HorizontalAlignment="Center" Foreground="White" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="1" Grid.Column="2"
+ Minimum="0" Maximum="{Binding MaxCropTB}" Modulus="2" Number="{Binding CropTop, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropTop}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Top}" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="3" Grid.Column="2"
+ Minimum="0" Maximum="{Binding MaxCropTB}" Modulus="2" Number="{Binding CropBottom, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropBottom}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Bottom}" />
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="1"
+ Minimum="0" Maximum="{Binding MaxCropLR}" Modulus="2" Number="{Binding CropLeft, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropLeft}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Left}"/>
+
+ <controls:NumberBox Width="60" HorizontalAlignment="Left" Margin="0,0,0,5" IsEnabled="{Binding IsCustomCrop}" Grid.Row="2" Grid.Column="3"
+ Minimum="0" Maximum="{Binding MaxCropLR}" Modulus="2" Number="{Binding CropRight, Mode=TwoWay}" UpdateBindingOnTextChange="True" ShowIncrementButtons="True" AllowEmpty="False"
+ ToolTip="{x:Static Properties:ResourcesTooltips.PictureSettingsView_CropRight}"
+ AutomationProperties.Name="{x:Static Properties:Resources.PictureSettingsView_Right}"/>
+
+ </Grid>
+
+ </Grid>
+
+ </Grid>
+
+</UserControl>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Standalone/CropPanelView.xaml.cs Added

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Standalone/TextEntryView.xaml Added

@@ -0,0 +1,28 @@
+<Window x:Class="HandBrakeWPF.Views.Standalone.TextEntryView"
+ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+ xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ mc:Ignorable="d"
+ Title="TextEntryView" Height="450" Width="800">
+ <Grid>
+ <Grid.RowDefinitions>
+ <RowDefinition Height="*" />
+ <RowDefinition Height="Auto"/>
+ </Grid.RowDefinitions>
+
+
+ <StackPanel Grid.Row="0" Orientation="Horizontal" Margin="10,10,0,0">
+ <TextBlock Text="{x:Static Properties:Resources.TextEntryView_EnterName}" />
+ <TextBox x:Name="entryBox" />
+ </StackPanel>
+
+ <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,10,10">
+
+ <Button Content="{x:Static Properties:Resources.Generic_Save}" Click="Save" IsDefault="True" />
+ <Button Content="{x:Static Properties:Resources.Generic_Cancel}" Click="Cancel" IsCancel="False"/>
+ </StackPanel>
+
+ </Grid>
+</Window>

HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Standalone/TextEntryView.xaml.cs Added

@@ -0,0 +1,40 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="TextEntryView.xaml.cs" company="HandBrake Project (http://handbrake.fr)">
+// This file is part of the HandBrake source code - It may be used under the terms of the GNU General Public License.
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace HandBrakeWPF.Views.Standalone
+{
+ using System.Windows;
+
+ public partial class TextEntryView : Window
+ {
+ public TextEntryView()
+ {
+ this.InitializeComponent();
+ this.IsCancelled = false;
+ }
+
+ public string EntryBoxContent
+ {
+ get
+ {
+ return this.entryBox.Text;
+ }
+ }
+
+ public bool IsCancelled { get; private set; }
+
+ public void Save(object sender, RoutedEventArgs e)
+ {
+ this.Close();
+ }
+
+ public void Cancel(object sender, RoutedEventArgs e)
+ {
+ this.IsCancelled = true;
+ this.Close();
+ }
+ }
+}

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/StaticPreviewView.xaml Changed

@@ -6,14 +6,19 @@
 xmlns:cal="http://www.caliburnproject.org"
 xmlns:converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
+ xmlns:standalone="clr-namespace:HandBrakeWPF.Views.Standalone"
 mc:Ignorable="d" SizeToContent="WidthAndHeight"
 TextOptions.TextFormattingMode="Display"
 WindowStartupLocation="CenterScreen"
 cal:Message.Attach="Event Closing = Action Close"
- Title="{Binding Title}">
+ Title="{Binding Title}"
+ MinHeight="550">
 
 <Window.Resources>
 <converters:BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter" />
+ <converters:BooleanConverter x:Key="boolConverter" />
+
 </Window.Resources>
 <Grid>
 
@@ -24,8 +29,14 @@
 <Image x:Name="previewImage" Source="{Binding PreviewImage}" MaxWidth="{Binding Width}" MaxHeight="{Binding Height}" MouseWheel="PreviewImage_OnMouseWheel" />
 
 
+ <Border BorderBrush="WhiteSmoke" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Padding="8" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="20" MinWidth="200" Background="Black" Opacity="0.8"
+ Visibility="{Binding ShowPictureSettingControls, Converter={StaticResource booleanToVisibilityConverter}}">
+
+ <standalone:CropPanelView DataContext="{Binding PictureSettingsViewModel}" />
+ </Border>
+
 <Border BorderBrush="WhiteSmoke" BorderThickness="1,1,1,1" CornerRadius="8,8,8,8" Padding="8"
- VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="20" MinWidth="400" Background="Black" Opacity="0.70">
+ VerticalAlignment="Bottom" HorizontalAlignment="Center" Margin="20" MinWidth="450" Background="Black" Opacity="0.8">
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
@@ -40,16 +51,25 @@
 HorizontalAlignment="Stretch"
 Background="Transparent" TickPlacement="TopLeft" Margin="0,0,0,5" />
 
- <CheckBox IsChecked="{Binding PreviewRotateFlip}" Content="{x:Static Properties:Resources.StaticPreviewView_PreviewRotationFlip}" Foreground="White" Grid.Row="1" Margin="0,0,0,10" />
+ <StackPanel Orientation="Horizontal" Grid.Row="1">
+ <CheckBox IsChecked="{Binding ShowPictureSettingControls}" Margin="0,0,0,10">
+ <TextBlock Text="{x:Static Properties:Resources.StaticPreviewView_ShowPictureSettingsAdjustment}" Foreground="White" />
+ </CheckBox>
+ </StackPanel>
 
 <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Left">
- <Button Content="{x:Static Properties:Resources.StaticPreviewView_LivePreview}" Padding="8,2" cal:Message.Attach="Event Click = Action Play" />
+ <Button Content="{x:Static Properties:Resources.StaticPreviewView_LivePreview}" Padding="8,2" cal:Message.Attach="Event Click = Action Play" Visibility="{Binding IsEncoding, Converter={StaticResource booleanToVisibilityConverter}, ConverterParameter=true}" />
+ <Button Content="{x:Static Properties:Resources.StaticPreviewView_CancelPreview}" Padding="8,2" cal:Message.Attach="Event Click = Action CancelEncode" Visibility="{Binding IsEncoding, Converter={StaticResource booleanToVisibilityConverter}, ConverterParameter=false}" />
+
 <TextBlock Margin="10,0,5,0" VerticalAlignment="Center" Foreground="White" Text="{x:Static Properties:Resources.StaticPreviewView_Duration}" />
 <ComboBox Width="60"
 ItemsSource="{Binding AvailableDurations}"
 SelectedItem="{Binding Duration}" />
 
- <CheckBox VerticalAlignment="Center" Content="{x:Static Properties:Resources.StaticPreviewView_UseSystemDefault}" Foreground="White" Margin="10,0,0,0" IsChecked="{Binding UseSystemDefaultPlayer}" />
+ <CheckBox VerticalAlignment="Center" Margin="10,0,0,0" IsChecked="{Binding UseSystemDefaultPlayer}">
+ <TextBlock Text="{x:Static Properties:Resources.StaticPreviewView_UseSystemDefault}" Foreground="White" />
+ </CheckBox>
+
 </StackPanel>
 
 <Grid Margin="0,10,10,0" Grid.Row="3" Visibility="{Binding IsEncoding, Converter={StaticResource booleanToVisibilityConverter}}">

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/Styles/Styles.xaml Changed

@@ -1,14 +1,17 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:controls="clr-namespace:HandBrakeWPF.Controls">
 
 <Style x:Key="LongToolTipHolder" TargetType="FrameworkElement" >
 <Setter Property="ToolTipService.ShowDuration" Value="20000" />
 </Style>
 
 <Style TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Type ComboBox}}">
- <Setter Property="MinHeight" Value="22"/>
+ <Setter Property="MinHeight" Value="23"/>
 <Setter Property="Margin" Value="0,2,0,2" />
 <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+ <Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="VerticalContentAlignment" Value="Center" />
 </Style>
 
 <Style TargetType="{x:Type Slider}" BasedOn="{StaticResource {x:Type Slider}}">
@@ -21,18 +24,52 @@
 
 <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
 <Setter Property="VerticalContentAlignment" Value="Center"/>
- <Setter Property="MinHeight" Value="20"/>
+ <Setter Property="MinHeight" Value="23"/>
 </Style>
 
 <Style TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
- <Setter Property="MinHeight" Value="22"/>
+ <Setter Property="MinHeight" Value="23"/>
+ <Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="Padding" Value="8,2" />
 </Style>
 
- <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource {x:Type RadioButton}}">
+ <Style TargetType="{x:Type RadioButton}" BasedOn="{StaticResource MahApps.Styles.RadioButton}">
 <Setter Property="Margin" Value="0,0,0,8" />
+ <Setter Property="Background" Value="Transparent" />
 </Style>
 
- <SolidColorBrush x:Key="GlyphBrush" Color="#444"/>
+ <Style TargetType="{x:Type controls:NumberBox}" >
+ <Setter Property="MinHeight" Value="23"/>
+ <Setter Property="Margin" Value="0,2,0,2" />
+ <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+ <Setter Property="VerticalAlignment" Value="Center" />
+ </Style>
+
+ <Style TargetType="{x:Type ToggleButton}" >
+ <Setter Property="MinHeight" Value="23"/>
+ <Setter Property="Margin" Value="0,2,0,2" />
+ <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+ <Setter Property="VerticalAlignment" Value="Center" />
+ </Style>
+
+ <Style TargetType="ToolTip" BasedOn="{StaticResource {x:Type ToolTip}}">
+ <Style.Resources>
+ <Style TargetType="ContentPresenter">
+ <Style.Resources>
+ <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+ <Setter Property="TextWrapping" Value="Wrap" />
+ </Style>
+ </Style.Resources>
+ </Style>
+ </Style.Resources>
+ <Setter Property="MaxWidth" Value="500" />
+ </Style>
+
+ <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource MahApps.Styles.CheckBox}" >
+ <Setter Property="VerticalAlignment" Value="Center" />
+ <Setter Property="VerticalContentAlignment" Value="Center" />
+ <Setter Property="Margin" Value="0,2,0,2" />
+ </Style>
 
 <Style x:Key="DropButtonStyle" TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
 <Setter Property="Padding" Value="2,2" />
@@ -100,4 +137,32 @@
 <Setter Property="VerticalContentAlignment" Value="Center"/>
 </Style>
 
+
+ <Style x:Key="subText" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+ <Setter Property="FontWeight" Value="Regular" />
+ <Setter Property="FontSize" Value="12" />
+ <Setter Property="FontStyle" Value="Italic" />
+ </Style>
+
+ <Style x:Key="sectionHeader" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+ <Setter Property="FontWeight" Value="Bold" />
+ <Setter Property="FontSize" Value="12" />
+ </Style>
+
+ <Style x:Key="subHeader" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+ <Setter Property="FontWeight" Value="SemiBold" />
+ <Setter Property="FontSize" Value="14" />
+ </Style>
+
+ <Style x:Key="pageHeader" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+ <Setter Property="FontWeight" Value="SemiBold" />
+ <Setter Property="FontSize" Value="22" />
+ </Style>
+
+ <Style x:Key="windowTitle" TargetType="TextBlock" BasedOn="{StaticResource BaseTextBlockStyle}">
+ <Setter Property="FontWeight" Value="Regular" />
+ <Setter Property="FontSize" Value="26" />
+ </Style>
+
+
 </ResourceDictionary>
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml Changed

@@ -10,7 +10,7 @@
 xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 d:DesignHeight="350"
- d:DesignWidth="500"
+ d:DesignWidth="550"
 ResizeMode="NoResize"
 SizeToContent="WidthAndHeight"
 WindowStartupLocation="CenterScreen"
@@ -44,7 +44,7 @@
 </Grid.ColumnDefinitions>
 
 <StackPanel Grid.Row="0" Margin="10,0,0,0">
- <TextBlock Text="{x:Static Properties:Resources.SubtitlesDefaultsView_PaneTitle}" FontSize="20" FontFamily="Segoe UI Light" />
+ <TextBlock Text="{x:Static Properties:Resources.SubtitlesDefaultsView_PaneTitle}" Style="{StaticResource windowTitle}" />
 </StackPanel>
 
 
@@ -99,9 +99,9 @@
 </DockPanel>
 
 <StackPanel Orientation="Vertical" Grid.Column="2">
- <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLangages}" Margin="0,0,0,5"/>
- <ListBox Name="selectedLangauges" ItemsSource="{Binding SubtitleBehaviours.SelectedLangauges}" 
- helpers:ListBoxHelper.SelectedItems="{Binding SelectedLangaugesToMove}" 
+ <TextBlock Text="{x:Static Properties:Resources.Shared_ChosenLanguages}" Margin="0,0,0,5"/>
+ <ListBox Name="selectedLanguages" ItemsSource="{Binding SubtitleBehaviours.SelectedLanguages}" 
+ helpers:ListBoxHelper.SelectedItems="{Binding SelectedLanguagesToMove}" 
 SelectionMode="Extended" Width="140" Height="120"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
@@ -131,10 +131,11 @@
 </Grid>
 
 <Border BorderBrush="DarkGray" BorderThickness="0,1,0,0" SnapsToDevicePixels="True" Grid.Row="2" Grid.ColumnSpan="3" Margin="10,15,0,0" >
- <Grid Margin="0,10,0,0" Grid.Row="2" Grid.ColumnSpan="3">
+ <Grid Margin="0,10,0,0">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="*" />
 <ColumnDefinition Width="Auto" />
+ <ColumnDefinition Width="Auto" />
 </Grid.ColumnDefinitions>
 
 <Button cal:Message.Attach="Event Click = Action LaunchHelp" Background="Transparent" BorderThickness="0" Grid.Column="0" HorizontalAlignment="Left" Padding="0,2">
@@ -144,8 +145,15 @@
 </Button>
 
 <Button Grid.Column="1"
- Click="Apply_OnClick"
- Content="{x:Static Properties:Resources.Generic_Apply}"
+ cal:Message.Attach="Event Click = Action Cancel"
+ Content="{x:Static Properties:Resources.Generic_Cancel}"
+ IsCancel="True"
+ Padding="8,2"
+ Margin="0,0,5,0"/>
+
+ <Button Grid.Column="2"
+ cal:Message.Attach="Event Click = Action Save"
+ Content="{x:Static Properties:Resources.Generic_Save}"
 IsDefault="True"
 Padding="8,2" />
 </Grid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml.cs -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesDefaultsView.xaml.cs Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/SubtitlesView.xaml Changed

@@ -5,36 +5,24 @@
 xmlns:Converters="clr-namespace:HandBrakeWPF.Converters"
 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 xmlns:dd="clr-namespace:GongSolutions.Wpf.DragDrop;assembly=GongSolutions.Wpf.DragDrop"
- xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+ xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 xmlns:controls="clr-namespace:HandBrakeWPF.Controls"
- xmlns:splitButton="clr-namespace:HandBrakeWPF.Controls.SplitButton"
 xmlns:Properties="clr-namespace:HandBrakeWPF.Properties"
 xmlns:subtitles="clr-namespace:HandBrakeWPF.Converters.Subtitles"
- xmlns:viewModels="clr-namespace:HandBrakeWPF.ViewModels"
 d:DesignHeight="350"
 d:DesignWidth="500"
- mc:Ignorable="d"
- x:Name="subTab">
+ mc:Ignorable="d">
 <UserControl.Resources>
 <Converters:BooleanToVisibilityConverter x:Key="booleanToVisConverter" />
 <Converters:BooleanConverter x:Key="booleanConverter" />
 <subtitles:CanBurnSubtitleConverter x:Key="canBurnSubtitleConverter" />
 <Converters:ThemeImageConverter x:Key="themeConverter" />
-
- <Style x:Key="LongToolTip" TargetType="TextBlock">
- <Setter Property="Width" Value="400" />
- <Setter Property="TextWrapping" Value="Wrap" />
- <Setter Property="ToolTipService.ShowDuration" Value="20000" />
- <Setter Property="Margin" Value="0,2,0,2" />
- </Style>
-
 </UserControl.Resources>
 
 <Grid>
 <Grid.RowDefinitions>
 <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
@@ -44,14 +32,7 @@
 </Grid.ColumnDefinitions>
 
 
- <TextBlock Grid.Row="0" Grid.Column="0"
- Margin="10,5,0,0"
- FontWeight="Bold"
- VerticalAlignment="Top"
- Text="{Binding PanelTitle}" />
-
- 
- <Grid Grid.Row="1" Margin="10,5,10,0">
+ <Grid Grid.Row="0" Margin="10,5,10,0">
 
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="Auto" />
@@ -71,7 +52,7 @@
 
 <Path Height="5" Margin="2,2,0,0" VerticalAlignment="Center" HorizontalAlignment="Center"
 Data="M 0 0 L 4 4 L 8 0 Z"
- Fill="{DynamicResource GlyphBrush}" x:Name="dropdownArrowPreset" />
+ Fill="{DynamicResource ButtonGlyphBrush}" x:Name="dropdownArrowPreset" />
 </StackPanel>
 </Button.Content>
 
@@ -88,13 +69,16 @@
 </Button>
 
 
- <Button MinWidth="65" Grid.Column="2"
+ <Button MinWidth="65" Grid.Column="2" FontWeight="Bold"
 Margin="10,0,5,0"
 cal:Message.Attach="Event Click = Action ShowSubtitleDefaultsPanel"
- Content="{Binding SwitchDisplayTitle}" />
+ Content="{x:Static Properties:Resources.SubtitlesViewModel_ConfigureDefaults}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.SubtitleView_SubtitleDefaults}"
+ />
 
 <Button MinWidth="65" Grid.Column="3"
 cal:Message.Attach="Event Click = Action ReloadDefaults"
+ ToolTip="{x:Static Properties:ResourcesTooltips.BehavioursReload}"
 Content="{x:Static Properties:Resources.Shared_ReloadDefaults}" />
 
 <Button MinWidth="65" Grid.Column="5"
@@ -104,8 +88,8 @@
 </Grid>
 
 
- 
- <ListBox Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2"
+ 
+ <ListBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2"
 Margin="10,10,10,10" x:Name="subtitleListBox"
 dd:DragDrop.DropHandler="{Binding}"
 dd:DragDrop.IsDragSource="True"
@@ -164,14 +148,15 @@
 
 <Image Width="16" Source="{Binding Converter={StaticResource themeConverter}, ConverterParameter='Reorder.png'}" />
 
- <ComboBox Grid.Column="1" Height="22" Width="235" Margin="5,0,5,0" HorizontalAlignment="Stretch"
+ <ComboBox Grid.Column="1" Width="235" Margin="5,0,5,0" HorizontalAlignment="Stretch"
 ItemsSource="{Binding DataContext.SourceTracks, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding SourceTrack}" />
 
- <CheckBox Grid.Column="3" Margin="5,0,5,0" VerticalAlignment="Center" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" 
+ <CheckBox Grid.Column="3" Margin="5,1,5,0" IsEnabled="{Binding CanBeForced}" IsChecked="{Binding Forced}" 
 Content="{x:Static Properties:Resources.SubtitlesView_ForcedOnly}" FontWeight="Bold" />
 
- <CheckBox Grid.Column="4" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" x:Name="burnInCheckbox" Content="{x:Static Properties:Resources.SubtitlesView_BurnIn}" FontWeight="Bold">
+ <CheckBox Grid.Column="4" Margin="5,1,5,0" IsChecked="{Binding Burned}" x:Name="burnInCheckbox" Content="{x:Static Properties:Resources.SubtitlesView_BurnIn}" FontWeight="Bold"
+ ToolTip="{x:Static Properties:ResourcesTooltips.SubtitlesView_BurnIn}">
 <CheckBox.IsEnabled>
 <MultiBinding Converter="{StaticResource canBurnSubtitleConverter}">
 <Binding Path="CanBeBurned" />
@@ -188,7 +173,7 @@
 </i:Interaction.Triggers>
 </CheckBox>
 
- <CheckBox Grid.Column="5" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="{x:Static Properties:Resources.SubtitlesView_Default}" FontWeight="Bold"
+ <CheckBox Grid.Column="5" Margin="5,1,5,0" IsChecked="{Binding Default}" Content="{x:Static Properties:Resources.SubtitlesView_Default}" FontWeight="Bold"
 IsEnabled="{Binding DataContext.IsBurnableOnly, Converter={StaticResource booleanConverter}, ConverterParameter=true, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Click">
@@ -199,9 +184,9 @@
 </i:Interaction.Triggers>
 </CheckBox>
 
- <StackPanel Orientation="Horizontal" Grid.Column="6" Margin="5,0,0,0">
+ <StackPanel Orientation="Horizontal" Grid.Column="6" Margin="10,0,0,0">
 <TextBlock Text="Name: " FontWeight="Bold" Margin="0,0,5,0" VerticalAlignment="Center" />
- <TextBox x:Name="TrackName" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Width="120" />
+ <TextBox x:Name="TrackName" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Width="250" />
 </StackPanel>
 </Grid>
 
@@ -233,21 +218,20 @@
 Visibility="{Binding IsSrtSubtitle, Converter={StaticResource booleanToVisConverter}, ConverterParameter=false}" />
 
 <TextBlock Grid.Column="2" VerticalAlignment="Center" FontWeight="Bold" Text="Lang" />
- <ComboBox Grid.Column="3" Height="22" Width="85" Margin="5,0,5,0" HorizontalAlignment="Stretch" IsEnabled="{Binding IsSrtSubtitle}"
- ItemsSource="{Binding DataContext.Langauges, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
+ <ComboBox Grid.Column="3" Width="125" Margin="5,0,5,0" HorizontalAlignment="Stretch" IsEnabled="{Binding IsSrtSubtitle}"
+ ItemsSource="{Binding DataContext.Languages, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding SrtLang}" />
 
 <TextBlock Grid.Column="4" VerticalAlignment="Center" FontWeight="Bold" Text="Char Code" />
- <ComboBox Grid.Column="5" Width="70" Height="22" Margin="5,0,5,0" IsEnabled="{Binding IsSrtSubtitle}"
+ <ComboBox Grid.Column="5" Width="70" Margin="5,0,5,0" IsEnabled="{Binding IsSrtSubtitle}"
 ItemsSource="{Binding DataContext.CharacterCodes, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}"
 SelectedItem="{Binding SrtCharCode}" />
 
 <TextBlock Grid.Column="6" VerticalAlignment="Center" FontWeight="Bold" Text="Offset (ms)" />
- <controls:NumberBox Grid.Column="7" Width="58" Height="24" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" 
+ <controls:NumberBox Grid.Column="7" Width="58" Margin="5,0,5,0" Minimum="-9000000" Maximum="900000" 
 IsEnabled="{Binding IsSrtSubtitle}" Number="{Binding SrtOffset, Mode=TwoWay}" />
 
- <CheckBox Grid.Column="8" Margin="5,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}" Content="Burn In" FontWeight="Bold" 
- VerticalContentAlignment="Center">
+ <CheckBox Grid.Column="8" Margin="5,1,5,0" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding Burned}" IsEnabled="{Binding CanBeBurned}" Content="Burn In" FontWeight="Bold">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Click">
 <cal:ActionMessage MethodName="SetBurnedToFalseForAllExcept">
@@ -257,7 +241,7 @@
 </i:Interaction.Triggers>
 </CheckBox>
 
- <CheckBox Grid.Column="9" Margin="0,0,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold" VerticalContentAlignment="Center"
+ <CheckBox Grid.Column="9" Margin="0,1,5,0" VerticalAlignment="Center" IsChecked="{Binding Default}" Content="Default" FontWeight="Bold" VerticalContentAlignment="Center"
 IsEnabled="{Binding DataContext.IsBurnableOnly, Converter={StaticResource booleanConverter}, ConverterParameter=true, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type UserControl}}}">
 <i:Interaction.Triggers>
 <i:EventTrigger EventName="Click">
@@ -270,7 +254,7 @@
 
 <StackPanel Orientation="Horizontal" Grid.Column="10" Margin="5,0,0,0">
 <TextBlock Text="Name: " FontWeight="Bold" Margin="0,0,5,0" />
- <TextBox x:Name="TrackNameSrt" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Grid.Column="10" Width="120" />
+ <TextBox x:Name="TrackNameSrt" Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" Width="160" />
 </StackPanel>
 
 </Grid>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/SummaryView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/SummaryView.xaml Changed

@@ -49,49 +49,52 @@
 <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
 <Setter Property="Margin" Value="0,3,0,3" />
 </Style>
- <Style TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
- <Setter Property="Margin" Value="0,2,0,2" />
- </Style>
 </Grid.Resources>
 
 
- <TextBlock Text="{x:Static Properties:Resources.MainView_Format}" FontWeight="Bold" Grid.Row="0" VerticalAlignment="Center" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Format}" Style="{StaticResource sectionHeader}" Grid.Row="0" />
 <ComboBox Name="Container" Width="100" HorizontalAlignment="Left" Grid.Row="0" Grid.Column="1"
 ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Mux}" VerticalAlignment="Center"
 ItemsSource="{Binding OutputFormats, Converter={StaticResource enumComboConverter}}"
 SelectedItem="{Binding SelectedOutputFormat, Converter={StaticResource enumComboConverter}}" 
 AutomationProperties.Name="{x:Static Properties:Resources.MainView_Format}" />
- <CheckBox Name="WebOptimized" VerticalAlignment="Center" Grid.Row="1" Grid.Column="1"
- Content="{x:Static Properties:Resources.MainView_WebOptimized}"
- IsChecked="{Binding Path=OptimizeMP4}"
- ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"
- Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <CheckBox Name="AlignAVStart" VerticalAlignment="Center" Grid.Row="2" Grid.Column="1"
- Content="{x:Static Properties:Resources.MainView_AlignAVStart}"
- ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AlignAVStart}"
- IsChecked="{Binding Path=AlignAVStart}"
- Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
- <CheckBox Name="iPod5G" VerticalAlignment="Center" Grid.Row="3" Grid.Column="1"
- Content="{x:Static Properties:Resources.MainView_iPod5G}"
- ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"
- IsChecked="{Binding Path=IPod5GSupport}"
- Visibility="{Binding IsIpodAtomVisible, Converter={StaticResource boolToVisConverter}}" />
-
- <TextBlock Text="{x:Static Properties:Resources.MainView_Tracks}" FontWeight="Bold" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" />
+
+ <StackPanel Orientation="Vertical" Grid.Row="1" Grid.Column="1">
+ <CheckBox Name="WebOptimized" VerticalAlignment="Center" HorizontalAlignment="Left" 
+ Content="{x:Static Properties:Resources.MainView_WebOptimized}"
+ IsChecked="{Binding Path=OptimizeMP4}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.MainView_Optimise}"
+ Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <CheckBox Name="AlignAVStart" VerticalAlignment="Center" HorizontalAlignment="Left" 
+ Content="{x:Static Properties:Resources.MainView_AlignAVStart}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.MainView_AlignAVStart}"
+ IsChecked="{Binding Path=AlignAVStart}"
+ Visibility="{Binding IsMkvOrWebm, Converter={StaticResource boolToVisConverter}, ConverterParameter=true}" />
+ <CheckBox Name="iPod5G" VerticalAlignment="Center" HorizontalAlignment="Left" 
+ Content="{x:Static Properties:Resources.MainView_iPod5G}"
+ ToolTip="{x:Static Properties:ResourcesTooltips.MainView_IpodAtom}"
+ IsChecked="{Binding Path=IPod5GSupport}"
+ Visibility="{Binding IsIpodAtomVisible, Converter={StaticResource boolToVisConverter}}" />
+ <CheckBox Name="Metadata" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding Path=MetadataPassthru}"
+ Content="{x:Static Properties:Resources.SummaryView_MetadataPassthru}"/>
+
+ </StackPanel>
+
+
+
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Tracks}" Style="{StaticResource sectionHeader}" Grid.Row="5" Grid.Column="0" />
 <TextBlock Text="{Binding VideoTrackInfo}" Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" />
 <TextBlock Text="{Binding AudioTrackInfo}" Grid.Row="6" Grid.Column="1" TextWrapping="Wrap" />
 <TextBlock Text="{Binding SubtitleTrackInfo}" Grid.Row="7" Grid.Column="1" TextWrapping="Wrap" />
 <TextBlock Text="{Binding ChapterInfo}" Grid.Row="8" Grid.Column="1" />
 
- <TextBlock Text="{x:Static Properties:Resources.MainView_Filters}" FontWeight="Bold" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Filters}" Style="{StaticResource sectionHeader}" Grid.Row="10" Grid.Column="0" />
 <TextBlock Text="{Binding FiltersInfo}" Grid.Row="10" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Stretch" TextWrapping="Wrap" />
 
-
-
- <TextBlock Text="{x:Static Properties:Resources.MainView_Size}" FontWeight="Bold" Grid.Row="12" Grid.Column="0" VerticalAlignment="Center" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Size}" Style="{StaticResource sectionHeader}" Grid.Row="12" Grid.Column="0" />
 <TextBlock Text="{Binding DimensionInfo}" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="12" Grid.Column="1" />
 
- <TextBlock Text="{x:Static Properties:Resources.MainView_Aspect}" FontSize="14" Grid.Row="13" Grid.Column="0" VerticalAlignment="Center" Visibility="Collapsed" />
+ <TextBlock Text="{x:Static Properties:Resources.MainView_Aspect}" Style="{StaticResource sectionHeader}" Grid.Row="13" Grid.Column="0" Visibility="Collapsed" />
 <TextBlock Text="{Binding AspectInfo}" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="13" Grid.Column="1" Margin="5,0,0,0" Visibility="Collapsed" />
 </Grid>
 
@@ -110,9 +113,9 @@
 <Grid Grid.Row="0" Grid.ColumnSpan="2" HorizontalAlignment="Left" VerticalAlignment="Top" Background="Transparent">
 
 <Grid.RowDefinitions>
- <RowDefinition Height="*" />
+ <RowDefinition Height="Auto" />
+ <RowDefinition Height="*"/>
 <RowDefinition Height="Auto"/>
- <RowDefinition Height="32"/>
 </Grid.RowDefinitions>
 
 <Grid.ColumnDefinitions>
@@ -120,14 +123,16 @@
 <ColumnDefinition Width="*" />
 </Grid.ColumnDefinitions>
 
- <Image Source="{Binding PreviewImage}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,5,10,0" x:Name="previewImage" Panel.ZIndex="0" Grid.ColumnSpan="2"
+ <TextBlock Text="{x:Static Properties:Resources.SummaryView_SourcePreview}" Style="{StaticResource sectionHeader}" Grid.Row="0" Grid.ColumnSpan="2" VerticalAlignment="Center" />
+
+ <Image Source="{Binding PreviewImage}" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Margin="0,5,10,0" x:Name="previewImage" Grid.Row="1" Panel.ZIndex="0" Grid.ColumnSpan="2"
 MaxWidth="{Binding MaxWidth}" MaxHeight="{Binding MaxHeight}" MouseWheel="PreviewImage_OnMouseWheel" />
 
- <Border Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="Transparent" Margin="0,5,0,5">
- <TextBlock Text="{Binding PreviewInfo}" TextAlignment="Center" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}" />
+ <Border Grid.Row="1" Grid.ColumnSpan="2" VerticalAlignment="Bottom" HorizontalAlignment="Center" Background="Black" BorderBrush="White" CornerRadius="5" BorderThickness="1" Opacity="0.75" Margin="0,5,0,5">
+ <TextBlock Text="{Binding PreviewInfo}" Foreground="White" Padding="12,6" TextAlignment="Center" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}" />
 </Border>
 
- <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" HorizontalAlignment="Center" Width="84" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}">
+ <Grid Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="3" HorizontalAlignment="Center" Margin="0,3,0,0" Visibility="{Binding IsPreviewInfoVisible, Converter={StaticResource boolToVisConverter}}">
 <Grid.ColumnDefinitions>
 <ColumnDefinition Width="42" />
 <ColumnDefinition Width="42" />

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/Views/VideoView.xaml -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/Views/VideoView.xaml Changed

@@ -37,7 +37,7 @@
 
 <StackPanel Orientation="Vertical" Grid.Column="0" >
 
- <TextBlock Text="{x:Static Properties:Resources.VideoView_Video}" FontWeight="Bold" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.VideoView_Video}" Style="{StaticResource sectionHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
 <TextBlock Text="{x:Static Properties:Resources.VideoView_Codec}" Width="100" />
@@ -78,7 +78,7 @@
 </StackPanel>
 
 <StackPanel Orientation="Vertical" Grid.Column="1">
- <TextBlock Text="{x:Static Properties:Resources.VideoView_Quality}" FontWeight="Bold" Margin="0,0,0,10"/>
+ <TextBlock Text="{x:Static Properties:Resources.VideoView_Quality}" Style="{StaticResource sectionHeader}" Margin="0,0,0,10"/>
 
 <StackPanel Orientation="Horizontal" Margin="0,0,0,10" >
 <RadioButton Content="{x:Static Properties:Resources.VideoView_ConstantQuality}" IsChecked="{Binding IsConstantQuantity}" Margin="0,0,10,0"
@@ -128,7 +128,7 @@
 <RowDefinition Height="*" />
 </Grid.RowDefinitions>
 
- <TextBlock Text="{x:Static Properties:Resources.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0" Grid.ColumnSpan="2" FontWeight="Bold" VerticalAlignment="Center" />
+ <TextBlock Text="{x:Static Properties:Resources.VideoView_OptimiseVideo}" Margin="0,0,0,0" Grid.Row="0" Grid.ColumnSpan="2" Style="{StaticResource sectionHeader}" />
 
 <Grid Grid.Row="1" Margin="0,8,0,0">
 <Grid.RowDefinitions>
@@ -157,7 +157,7 @@
 
 <TextBlock Text="{x:Static Properties:Resources.VideoView_EncodeTune}" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Margin="0,5,0,0"
 Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}"/>
- <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" Height="22" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncodeTune}"
+ <ComboBox Width="100" Grid.Row="2" Grid.Column="1" Margin="5,5,5,0" AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncodeTune}"
 ItemsSource="{Binding VideoTunes}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoTune}" HorizontalAlignment="Left"
 ToolTip="{x:Static Properties:ResourcesTooltips.Video_EncoderTune}" Visibility="{Binding DisplayTuneControls, Converter={StaticResource boolToVisConverter}}" />
 <CheckBox IsChecked="{Binding FastDecode}" Content="{x:Static Properties:Resources.VideoView_FastDecode}" Grid.Row="2" Grid.Column="2" Margin="10,5,10,0" VerticalAlignment="Center" VerticalContentAlignment="Center"
@@ -166,12 +166,12 @@
 
 
 <TextBlock Text="{x:Static Properties:Resources.VideoView_EncoderProfile}" Grid.Row="3" Grid.Column="0" Margin="0,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"/>
- <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"
+ <ComboBox Width="100" Grid.Row="3" Grid.Column="1" Margin="5,5,5,0" VerticalAlignment="Center" Visibility="{Binding DisplayProfileControl, Converter={StaticResource boolToVisConverter}}"
 ItemsSource="{Binding VideoProfiles}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoProfile}" HorizontalAlignment="Left" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Profile}"
 AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncoderProfile}" />
 
 <TextBlock Text="{x:Static Properties:Resources.VideoView_EncoderLevel}" Grid.Row="3" Grid.Column="2" Margin="10,5,0,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}" />
- <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,5,5,0" Height="22" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"
+ <ComboBox Width="100" Grid.Row="3" Grid.Column="3" Margin="5,5,5,0" VerticalAlignment="Center" Visibility="{Binding DisplayLevelControl, Converter={StaticResource boolToVisConverter}}"
 ItemsSource="{Binding VideoLevels}" DisplayMemberPath="DisplayName" SelectedItem="{Binding VideoLevel}" ToolTip="{x:Static Properties:ResourcesTooltips.Video_Level}"
 AutomationProperties.Name="{x:Static Properties:Resources.VideoView_EncoderLevel}" />
 
@@ -183,6 +183,10 @@
 <TextBox.ContextMenu>
 <ContextMenu>
 <MenuItem Header="Copy Full Query" cal:Message.Attach="Event Click = Action CopyQuery" />
+ <Separator />
+ <MenuItem Command="ApplicationCommands.Cut" />
+ <MenuItem Command="ApplicationCommands.Copy" />
+ <MenuItem Command="ApplicationCommands.Paste" />
 </ContextMenu>
 </TextBox.ContextMenu>
 </TextBox>

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/app.manifest -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/app.manifest Changed

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/HandBrakeWPF/portable.ini.template -> HandBrake-1.5.1.tar.xz/win/CS/HandBrakeWPF/portable.ini.template Changed

@@ -3,11 +3,16 @@
 #################################
 # Notes:
 # - Rename this file to portable.ini to activate feature.
+#
 # - storage.dir => Stores Presets, Settings and Log Files.
 # - tmp.dir => temporary files only. (i.e Preview images)
-# - update.check =>  true | false   (enabled / disabled, default disabled for portable)
+# - update.check =>  true | false   (false disables the update check preference and disables update checking completely. true enables user-choice.)
 # - hardware.enabled => true | false (Enables the hardware encoders such as QSV, NVENC or VCE)
-#     
+# - process.isolation.enabled => true | false 
+#	(Process Isolation uses an HTTP server on 127.0.0.1 port 8037 or within +100 if in use. This is 'HandBrake.worker.exe' and it is designed to protect the user interface and queue should one job cause an application crash.)
+#   (Disabled by default for portable mode, but recommended to turn it on.) 
+# - software.render => true | false  (Only set to true if you are experiencing UI corruption or glitches)
+#
 # Set to 'cwd' to use the current applications directory. It will automatically create "storage" and "tmp" folders in this instance.
 # Leave blank to use the system "TMP" directory and the "AppData" user profile folder.
 #################################
@@ -15,4 +20,6 @@
 storage.dir = cwd
 tmp.dir = cwd
 update.check = false
-hardware.enabled = true
\ No newline at end of file
+hardware.enabled = true
+process.isolation.enabled = false
+software.rendering = false
\ No newline at end of file

HandBrake-1.4.0~git.20200212T221650.597e83496.tar.xz/win/CS/build.xml -> HandBrake-1.5.1.tar.xz/win/CS/build.xml Changed

@@ -6,75 +6,121 @@
 
 HandBrake Build Script for usage with Jenkins.
 Usage: 
- msbuild build.xml /t:Nightly
- msbuild build.xml /t:Release
+ msbuild build.xml /t:x64 /p:Profile=Nightly or Release
+ msbuild build.xml /t:arm64 /p:Profile=Nightly or Release
 Example with code signing:
- msbuild build.xml /t:Release /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/
+ msbuild build.xml /t:x64 /p:SignThumbprint=XYZ /p:SignTimestampServer=http://time.certum.pl/
+ msbuild build.xml /t:x64 /p:PfxFile=file.pfx /p:PfxPwd=XYZ /p:SignTimestampServer=http://time.certum.pl/
 
- Requires: libhb.dll to be in the release folder.
+ Requires: hb.dll to be in the release folder.
 
 -->
-<Project DefaultTargets="Nightly" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="x64" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
- 
- <PropertyGroup>
- <Configuration>Release</Configuration>
- <Platform Condition="'$(Platform)'==''">x64</Platform>
- <PlatformTarget>x64</PlatformTarget>
+ 
+ <Target Name="arm64" DependsOnTargets="$(ARM64DependsOn)"/>
+ <Target Name="x64" DependsOnTargets="$(X64DependsOn)"/>
+
+ <PropertyGroup Condition="'$(Profile)'==''">
+ <Profile>Nightly</Profile>
+ <Configuration>Debug</Configuration>
 </PropertyGroup>
 
- 
- <ItemGroup>
- <ProjectsToBuild Include="HandBrake.Interop\*proj" Exclude="$(MSBuildProjectFile)"/>
- <ProjectsToBuild Include="HandBrakeWPF\*proj" Exclude="$(MSBuildProjectFile)"/>
- </ItemGroup>
+ <PropertyGroup Condition="'$(Profile)'=='Nightly'">
+ <Configuration>Debug</Configuration>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(Profile)'=='Release'">
+ <Configuration>Release</Configuration>
+ </PropertyGroup>
 
- 
 <PropertyGroup>
- <NightlyDependsOn>BuildRelease;NightlyPostBuild</NightlyDependsOn>
- <InstallDependsOn>BuildRelease;ReleasePostBuild</InstallDependsOn>
+ <ARM64DependsOn>ARM64Setup;BuildSoftware;BuildInstaller</ARM64DependsOn>
+ <X64DependsOn>X64Setup;BuildSoftware;BuildInstaller</X64DependsOn>
 </PropertyGroup>
 
- 
- <Target Name="Nightly" DependsOnTargets="$(NightlyDependsOn)"/>
- <Target Name="Release" DependsOnTargets="$(InstallDependsOn)"/>
+ <Target Name="ARM64Setup">
+ <PropertyGroup>
+ <BuildProfile>publish_arm64</BuildProfile>
+ <Platform>arm64</Platform>
+ </PropertyGroup>
+ </Target>
+
+ <Target Name="X64Setup">
+ <PropertyGroup>
+ <BuildProfile>publish_x64</BuildProfile>
+ <Platform>x64</Platform>
+ </PropertyGroup>
+ </Target>
+
+ 
+ <Target Name="BuildSoftware">
+ <Exec Command="dotnet publish -p:PublishProfile=$(buildProfile)" />
+
+ 
+ <Exec Command="xcopy $(MSBuildProjectDirectory)\HandBrake.Worker\bin\publish $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /I /Y" />
+ <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\doc /I /Y" />
+ <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\doc /I /Y" />
+
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /Y" Condition="'$(Profile)'=='Release'"/>
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /Y" Condition="'$(Profile)'=='Nightly'"/>
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /Y" />
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /Y" />
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\portable.ini.template $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish /Y" />
+ </Target>
 
- 
- <Target Name="BuildRelease">
- <Message Text="Project File Name = $(Platform)" />
- <MSBuild Projects ="@(ProjectsToBuild)"
- ContinueOnError ="false"
- Properties="Configuration=$(Configuration);Platform=$(Platform)" >
+ 
+
+ <ItemGroup>
+ <InstallerToBuild Include="HandBrake.Installer\*wixproj" Exclude="$(MSBuildProjectFile)" >
+ <AdditionalProperties>HBPROFILE=$(Platform)</AdditionalProperties>
+ </InstallerToBuild>
+ </ItemGroup>
+
+ <Target Name="BuildInstaller">
+ <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\MakeNightly64.nsi" Condition="'$(Profile)'=='Nightly'" />
+ <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\Installer64.nsi" Condition="'$(Profile)'=='Release'" />
+
+ 
+ <MSBuild Projects ="@(InstallerToBuild)" ContinueOnError ="false" Properties="Configuration=$(Configuration)" >
 <Output ItemName="OutputFiles" TaskParameter="TargetOutputs"/>
 </MSBuild>
+
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrake.Installer\bin\$(Configuration)\HandBrake.msi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\HandBrake-$(Profile)-ARM64-Win_GUI.msi /Y" Condition="'$(Platform)'=='arm64'" />
+ <Exec Command="copy $(MSBuildProjectDirectory)\HandBrake.Installer\bin\$(Configuration)\HandBrake.msi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\HandBrake-$(Profile)-x86_64-Win_GUI.msi /Y" Condition="'$(Platform)'=='x64'" />
+
+ 
+ <Exec Command="del $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*.nsi" />
+ <Exec Command="del $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*.bmp" />
+ <Exec Command="del $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*.ico" />
+ <Exec Command="del $(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*.pdb" Condition="'$(Profile)'=='Release'" />
 </Target>
 
- 
+
+ 
+
 <PropertyGroup Condition="'$(SignToolLocation)'==''">
- <SignToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.15063.0\x64\SignTool.exe</SignToolLocation>
+ <SignToolLocation>C:\Program Files (x86)\Windows Kits\10\bin\10.0.18362.0\x64\SignTool.exe</SignToolLocation>
 </PropertyGroup>
 
- <PropertyGroup Condition="'$(SignThumbprint)'!=''">
+ <PropertyGroup Condition="'$(SignTimestampServer)'!=''">
 <SignTimestamp Condition="'$(SignTimestampServer)'!=''" >/t</SignTimestamp>
 </PropertyGroup>
 
- 
- <Target Name="NightlyPostBuild">
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
- <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />
- <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
- </Target>
+ <PropertyGroup Condition="'$(SignThumbprint)'!=''">
+ <SignType>/sha1</SignType>
+ <SignEnabled>true</SignEnabled>
+ </PropertyGroup>
+
+ <PropertyGroup Condition="'$(PfxFile)'!=''">
+ <SignType>/f</SignType>
+ <SignPwd Condition="'$(PfxPwd)'!=''">/p</SignPwd>
+ <SignEnabled>true</SignEnabled>
+ </PropertyGroup>
 
- <Target Name="ReleasePostBuild">
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
- <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
- <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />
- <Exec Command="&quot;$(SignToolLocation)&quot; sign /sha1 $(SignThumbprint) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\$(Platform)\Release\*Win_GUI.exe&quot;" Condition="'$(SignThumbprint)' != ''" />
+ <Target Name="CodeSign" Condition="'$(SignEnabled)' == 'true'">
+ <Exec Command="&quot;$(SignToolLocation)&quot; sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*Win_GUI.exe&quot;" />
+ <Exec Command="&quot;$(SignToolLocation)&quot; sign $(SignType) $(SignThumbprint)$(PfxFile) $(SignPwd) $(PfxPwd) $(SignTimestamp) $(SignTimestampServer) /v &quot;$(MSBuildProjectDirectory)\HandBrakeWPF\bin\publish\*Win_GUI.msi&quot;" />
 </Target>
 
 </Project>